~mdw / stgit / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Infrastructure for current directory handling
[stgit] / stgit / commands / pull.py
diff --git a/stgit/commands/pull.py b/stgit/commands/pull.py
index ab7466e..5fcf2cc 100644 (file)
--- a/stgit/commands/pull.py
+++ b/stgit/commands/pull.py
@@ -20,72 +20,89 @@ from optparse import OptionParser, make_option
 
 from stgit.commands.common import *
 from stgit.utils import *
 
 from stgit.commands.common import *
 from stgit.utils import *
+from stgit.out import *
+from stgit.config import GitConfigException
 from stgit import stack, git
 
 
 help = 'pull the changes from the remote repository'
 from stgit import stack, git
 
 
 help = 'pull the changes from the remote repository'
-usage = """%prog [options]
+usage = """%prog [options] [<repository>]
 
 
-Pull the latest changes from the parent repository. This command works
+Pull the latest changes from the given remote repository (defaulting
+to branch.<name>.remote, or 'origin' if not set). This command works
 by popping all the patches from the stack, pulling the changes in the
 parent repository, setting the base of the stack to the latest parent
 by popping all the patches from the stack, pulling the changes in the
 parent repository, setting the base of the stack to the latest parent
-HEAD and pusing the patches back (unless '--nopush' is specified). The
-'push' operation can fail if there are conflicts. They need to be
-resolved and the patch pushed again. The URL of the parent repository
-is specified in the .git/branches/<head> file.
+HEAD and pushing the patches back (unless '--nopush' is specified).
+The 'push' operation can fail if there are conflicts. They need to be
+resolved and the patch pushed again.
 
 
-Note that this command doesn't perform any merge operation for the
-base of the stack, it only performs merges with the patches being
-pushed."""
+Check the 'git fetch' documentation for the <repository> format."""
 
 
+directory = DirectoryHasRepository()
 options = [make_option('-n', '--nopush',
                        help = 'do not push the patches back after pulling',
                        action = 'store_true'),
 options = [make_option('-n', '--nopush',
                        help = 'do not push the patches back after pulling',
                        action = 'store_true'),
-           make_option('--head', metavar='OTHER_HEAD',
-                       help = 'pull OTHER_HEAD instead of HEAD'),
-           make_option('--tag',
-                       help = 'pull TAG')]
-
+           make_option('-m', '--merged',
+                       help = 'check for patches merged upstream',
+                       action = 'store_true')]
 
 def func(parser, options, args):
     """Pull the changes from a remote repository
     """
 
 def func(parser, options, args):
     """Pull the changes from a remote repository
     """
-    if len(args) != 0:
-        parser.error('incorrect number of arguments')
+    policy = config.get('branch.%s.stgit.pull-policy' % crt_series.get_name()) or \
+             config.get('stgit.pull-policy')
+
+    if policy == 'rebase':
+        # parent is local
+        if len(args) == 1:
+            parser.error('specifying a repository is meaningless for policy="%s"' % policy)
+        if len(args) > 0:
+            parser.error('incorrect number of arguments')
+
+    else:
+        # parent is remote
+        if len(args) > 1:
+            parser.error('incorrect number of arguments')
+
+        if len(args) >= 1:
+            repository = args[0]
+        else:
+            repository = crt_series.get_parent_remote()
+
+    if crt_series.get_protected():
+        raise CmdException, 'This branch is protected. Pulls are not permitted'
 
     check_local_changes()
     check_conflicts()
     check_head_top_equal()
 
 
     check_local_changes()
     check_conflicts()
     check_head_top_equal()
 
-    branch = git.get_head_file()
-    location = read_string(os.path.join(git.base_dir, 'branches', branch))
-
-    print 'Pulling from "%s"...' % location
-    new_head = git.fetch(location, options.head, options.tag)
-    print 'done'
-
-    if new_head == git_id('base'):
-        print 'Branch already up-to-date'
-    else:
-        applied = crt_series.get_applied()
-
-        if len(applied) > 0:
-            print 'Popping all patches...',
-            sys.stdout.flush()
-            crt_series.pop_patch(applied[0])
-            print 'done'
-
-        git.switch(new_head)
-
-        if options.nopush:
-            applied = []
-        for p in applied:
-            print 'Pushing patch "%s"...' % p,
-            sys.stdout.flush()
-            crt_series.push_patch(p)
-            if crt_series.empty_patch(p):
-                print 'done (empty patch)'
-            else:
-                print 'done'
+    if policy not in ['pull', 'fetch-rebase', 'rebase']:
+        raise GitConfigException, 'Unsupported pull-policy "%s"' % policy
+
+    applied = prepare_rebase()
+
+    # pull the remote changes
+    if policy == 'pull':
+        out.info('Pulling from "%s"' % repository)
+        git.pull(repository)
+    elif policy == 'fetch-rebase':
+        out.info('Fetching from "%s"' % repository)
+        git.fetch(repository)
+        try:
+            target = git.fetch_head()
+        except git.GitException:
+            out.error('Could not find the remote head to rebase onto, pushing any patches back...')
+            post_rebase(applied, False, False)
+            raise CmdException, 'Could not find the remote head to rebase onto - fix branch.%s.merge in .git/config' % crt_series.get_name()
+
+        rebase(target)
+    elif policy == 'rebase':
+        rebase(crt_series.get_parent_branch())
+
+    post_rebase(applied, options.nopush, options.merged)
+
+    # maybe tidy up
+    if config.get('stgit.keepoptimized') == 'yes':
+        git.repack()
 
     print_crt_patch()
 
     print_crt_patch()
GIT patch-maintenance porcelain (local modifications)