Add a boundary to parse_patches in pick.py

[stgit] / stgit / commands / pull.py

diff --git a/stgit/commands/pull.py b/stgit/commands/pull.py
index 990244e..bec7fd7 100644 (file)
--- a/stgit/commands/pull.py
+++ b/stgit/commands/pull.py
@@ -20,6 +20,8 @@ from optparse import OptionParser, make_option
 
 from stgit.commands.common import *
 from stgit.utils import *
+from stgit.out import *
+from stgit.config import GitConfigException
 from stgit import stack, git
 
 
@@ -36,47 +38,72 @@ resolved and the patch pushed again.
 
 Check the 'git fetch' documentation for the <repository> format."""
 
+directory = DirectoryGotoToplevel()
 options = [make_option('-n', '--nopush',
                        help = 'do not push the patches back after pulling',
                        action = 'store_true'),
            make_option('-m', '--merged',
                        help = 'check for patches merged upstream',
-                       action = 'store_true'),
-           make_option('--force',
-                       help = 'force rebase even if the stack based was moved by (un)commits',
                        action = 'store_true')]
 
 def func(parser, options, args):
     """Pull the changes from a remote repository
     """
-    if len(args) > 1:
-        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')
 
-    if len(args) >= 1:
-        repository = args[0]
     else:
-        repository = crt_series.get_parent_remote()
+        # 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_head_top_equal(crt_series)
 
-    must_rebase = (config.get('stgit.pull-does-rebase') == 'yes')
-    applied = prepare_rebase(real_rebase=must_rebase, force=options.force)
+    if policy not in ['pull', 'fetch-rebase', 'rebase']:
+        raise GitConfigException, 'Unsupported pull-policy "%s"' % policy
 
-    # pull the remote changes
-    print 'Pulling from "%s"...' % repository
-    git.fetch(repository)
-    if must_rebase:
-        rebase(git.fetch_head())
+    applied = prepare_rebase(crt_series)
 
-    post_rebase(applied, options.nopush, options.merged)
+    # 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 - fix branch.%s.merge in .git/config' % crt_series.get_name())
+            out.error('Pushing any patches back...')
+            post_rebase(crt_series, applied, False, False)
+            raise
+
+        rebase(crt_series, target)
+    elif policy == 'rebase':
+        rebase(crt_series, crt_series.get_parent_branch())
+
+    post_rebase(crt_series, applied, options.nopush, options.merged)
 
     # maybe tidy up
     if config.get('stgit.keepoptimized') == 'yes':
         git.repack()
 
-    print_crt_patch()
+    print_crt_patch(crt_series)