Check git pull remote before defaulting to 'origin'

[stgit] / stgit / commands / pull.py

diff --git a/stgit/commands/pull.py b/stgit/commands/pull.py
index 2aba444..7c5db22 100644 (file)
--- a/stgit/commands/pull.py
+++ b/stgit/commands/pull.py
@@ -24,43 +24,48 @@ from stgit import stack, git
 
 
 help = 'pull the changes from the remote repository'
-usage = """%prog [options] [<location>]
+usage = """%prog [options] [<repository>] [<refspec>]
 
-Pull the latest changes from the given URL or branch (defaulting to
+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 pusing the patches back
+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.
 
-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 pull' documentation for the <repository> and <refspec>
+format."""
 
 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
     """
-    if len(args) == 0:
-        location = read_string(os.path.join(git.base_dir, 'branches',
-                                            'origin'))
-    elif len(args) == 1:
-        location = args[0]
-        branch = os.path.join(git.base_dir, 'branches', location)
-        if os.path.isfile(branch):
-            location = read_string(branch)
-    else:
+    if len(args) > 2:
         parser.error('incorrect number of arguments')
 
+    if len(args) >= 1:
+        repository = args[0]
+    else:
+        section = 'branch "%s"' % git.get_head_file()
+        if config.has_option(section, 'remote'):
+            repository = config.get(section, 'remote')
+        else:
+            repository = 'origin'
+
+    refspec = None
+    if len(args) == 2:
+        refspec = args[1]
+
+    if crt_series.get_protected():
+        raise CmdException, 'This branch is protected. Pulls are not permitted'
+
     check_local_changes()
     check_conflicts()
     check_head_top_equal()
@@ -68,26 +73,23 @@ def func(parser, options, args):
     # pop all patches
     applied = crt_series.get_applied()
     if len(applied) > 0:
-        print 'Popping all patches...',
+        print 'Popping all applied patches...',
         sys.stdout.flush()
         crt_series.pop_patch(applied[0])
         print 'done'
 
     # pull the remote changes
-    print 'Pulling from "%s"...' % location
-    git.pull(location, options.head, options.tag)
+    print 'Pulling from "%s"...' % repository
+    git.pull(repository, refspec)
     print 'done'
 
     # push the patches back
-    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 not options.nopush:
+        push_patches(applied, options.merged)
+
+    # maybe tidy up
+    repack = config.get('stgit', 'keepoptimized')
+    if repack == 'yes':
+        git.repack()
 
     print_crt_patch()