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 8f26f4daf346c87e83b377de3a86c5e09e718d8b..052ea2b6de47ea09d12f218bb9d137f47edf2faa 100644 (file)
--- a/stgit/commands/pull.py
+++ b/stgit/commands/pull.py
@@ -20,42 +20,56 @@ 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] [<repository>] [<refspec>]
+usage = """%prog [options] [<repository>]

 
 

-Pull the latest changes from the given repository (defaulting to
-'origin'). 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 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.
+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
+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.

 
 

-Check the 'git pull' documentation for the <repository> and <refspec>
-format."""
+Check the 'git fetch' documentation for the <repository> format."""

 
 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',
 
 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
     """
                        action = 'store_true')]
 
 def func(parser, options, args):
     """Pull the changes from a remote repository
     """

-    if len(args) > 2:
-        parser.error('incorrect number of arguments')
-
-    repository = 'origin'
-    refspec = None
-    if len(args) >= 1:
-        repository = args[0]
-    if len(args) == 2:
-        refspec = args[1]
+    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'
 
     if crt_series.get_protected():
         raise CmdException, 'This branch is protected. Pulls are not permitted'


@@ -64,21 +78,26 @@ 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 not in ['pull', 'fetch-rebase', 'rebase']:
+        raise GitConfigException, 'Unsupported pull-policy "%s"' % policy

 
 

-    # pull the remote changes
-    print 'Pulling from "%s"...' % repository
-    git.pull(repository, refspec)
-    print 'done'
+    applied = prepare_rebase(force=options.force)

 
 

-    # push the patches back
-    if not options.nopush:
-        push_patches(applied, 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)
+        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':
+        git.repack()

 
     print_crt_patch()
 
     print_crt_patch()