Stop recording branch.*.remote to '.' for local parents.

[stgit] / stgit / commands / pull.py

diff --git a/stgit/commands/pull.py b/stgit/commands/pull.py
index 330cc256d3f7bf410e9ade341dc1b4a3963504bc..f551b981d1f3d07a442f36322f384a4251cc1978 100644 (file)
--- a/stgit/commands/pull.py
+++ b/stgit/commands/pull.py
@@ -20,6 +20,7 @@ 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.config import GitConfigException

 from stgit import stack, git
 
 
 from stgit import stack, git
 
 


@@ -41,18 +42,33 @@ options = [make_option('-n', '--nopush',
                        action = 'store_true'),
            make_option('-m', '--merged',
                        help = 'check for patches merged upstream',
                        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
     """
                        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_branch()) 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:
     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'
 
     if crt_series.get_protected():
         raise CmdException, 'This branch is protected. Pulls are not permitted'


@@ -61,25 +77,29 @@ def func(parser, options, args):
     check_conflicts()
     check_head_top_equal()
 
     check_conflicts()
     check_head_top_equal()
 

-    # pop all patches
-    applied = crt_series.get_applied()
-    if len(applied) > 0:
-        print 'Popping all applied patches...',
-        sys.stdout.flush()
-        crt_series.pop_patch(applied[0])
-        print 'done'
+    if policy == 'pull':
+        must_rebase = 0
+    elif policy == 'fetch-rebase':
+        must_rebase = 1
+    elif policy == 'rebase':
+        must_rebase = 1
+    else:
+        raise GitConfigException, 'Unsupported pull-policy "%s"' % policy
+
+    applied = prepare_rebase(real_rebase=must_rebase, force=options.force)

 
     # pull the remote changes
 
     # pull the remote changes

-    print 'Pulling from "%s"...' % repository
-    git.fetch(repository)
-    if (config.get('stgit.pull-does-rebase') == 'yes'):
-        print "rebasing to '%s'..." % crt_series.get_parent_branch()
-        git.reset(tree_id = git.rev_parse(crt_series.get_parent_branch()))
-    print 'done'
-
-    # push the patches back
-    if not options.nopush:
-        push_patches(applied, options.merged)
+    if policy == 'pull':
+        print 'Pulling from "%s"...' % repository
+        git.pull(repository)
+    elif policy == 'fetch-rebase':
+        print 'Fetching from "%s"...' % repository
+        git.fetch(repository)
+        rebase(git.fetch_head())
+    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':
 
     # maybe tidy up
     if config.get('stgit.keepoptimized') == 'yes':