Fix the rebasing with an external command

[stgit] / stgit / commands / pull.py

diff --git a/stgit/commands/pull.py b/stgit/commands/pull.py
index 83a2725cbdbcd2279150d365c9157b9e37d50df1..052ea2b6de47ea09d12f218bb9d137f47edf2faa 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.commands.common import *
 from stgit.utils import *

+from stgit.out import *
+from stgit.config import GitConfigException

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


@@ -41,18 +43,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_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:
     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,13 +78,21 @@ def func(parser, options, args):
     check_conflicts()
     check_head_top_equal()
 
     check_conflicts()
     check_head_top_equal()
 

-    applied = prepare_rebase()
+    if policy not in ['pull', 'fetch-rebase', 'rebase']:
+        raise GitConfigException, 'Unsupported pull-policy "%s"' % policy
+
+    applied = prepare_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'):
+    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)

         rebase(git.fetch_head())
         rebase(git.fetch_head())

+    elif policy == 'rebase':
+        rebase(crt_series.get_parent_branch())

 
     post_rebase(applied, options.nopush, options.merged)
 
 
     post_rebase(applied, options.nopush, options.merged)