X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/26aab5b04fa4ba13f48948de73e497cf0a315ad1..9e3f506f0d0e1b0c09d1e9d7051af23bfede7834:/stgit/commands/push.py

diff --git a/stgit/commands/push.py b/stgit/commands/push.py
index 6325483..a636ad2 100644
--- a/stgit/commands/push.py
+++ b/stgit/commands/push.py
@@ -24,39 +24,40 @@ from stgit.utils import *
 from stgit import stack, git
 
 
-help = 'push a patch on top of the series'
-usage = """%prog [options] [<name>]
+help = 'push one or more patches onto of the stack'
+usage = """%prog [options] [<patch1>] [<patch2>] [<patch3>..<patch4>]
 
-Push a patch (defaulting to the first unapplied one) or range of
-patches to the stack. The 'push' operation allows patch reordering by
-commuting them with the three-way merge algorithm. If the result of
-the 'push' operation is not acceptable or if there are too many
-conflicts, the '--undo' option can be used to revert the patch and the
-tree to the state before the operation. Conflicts raised during the
-push operation have to be fixed and the 'resolved' command run.
+Push one or more patches (defaulting to the first unapplied one) onto
+the stack. The 'push' operation allows patch reordering by commuting
+them with the three-way merge algorithm. If the result of the 'push'
+operation is not acceptable or if there are too many conflicts, the
+'--undo' option can be used to revert the last pushed patch. Conflicts
+raised during the push operation have to be fixed and the 'resolved'
+command run.
 
-The 'push' command also notifies when the patch becomes empty after
-the merge operation (i.e. it was fully merged upstream)."""
+The command also notifies when the patch becomes empty (fully merged
+upstream) or is modified (three-way merged) by the 'push' operation."""
 
 options = [make_option('-a', '--all',
                        help = 'push all the unapplied patches',
                        action = 'store_true'),
            make_option('-n', '--number', type = 'int',
                        help = 'push the specified number of patches'),
-           make_option('-t', '--to', metavar = 'PATCH1[:PATCH2]',
-                       help = 'push all patches to PATCH1 or between '
-                       'PATCH1 and PATCH2'),
            make_option('--reverse',
                        help = 'push the patches in reverse order',
                        action = 'store_true'),
+           make_option('-m', '--merged',
+                       help = 'check for patches merged upstream',
+                       action = 'store_true'),
            make_option('--undo',
-                       help = 'undo the last push operation',
+                       help = 'undo the last patch pushing',
                        action = 'store_true')]
 
 
 def func(parser, options, args):
     """Pushes the given patch or all onto the series
     """
+
     # If --undo is passed, do the work and exit
     if options.undo:
         patch = crt_series.get_current()
@@ -66,8 +67,10 @@ def func(parser, options, args):
         print 'Undoing the "%s" push...' % patch,
         sys.stdout.flush()
         resolved_all()
-        crt_series.undo_push()
-        print 'done'
+        if crt_series.undo_push():
+            print 'done'
+        else:
+            print 'done (patch unchanged)'
         print_crt_patch()
 
         return
@@ -80,35 +83,14 @@ def func(parser, options, args):
     if not unapplied:
         raise CmdException, 'No more patches to push'
 
-    if options.to:
-        boundaries = options.to.split(':')
-        if len(boundaries) == 1:
-            if boundaries[0] not in unapplied:
-                raise CmdException, 'Patch "%s" not unapplied' % boundaries[0]
-            patches = unapplied[:unapplied.index(boundaries[0])+1]
-        elif len(boundaries) == 2:
-            if boundaries[0] not in unapplied:
-                raise CmdException, 'Patch "%s" not unapplied' % boundaries[0]
-            if boundaries[1] not in unapplied:
-                raise CmdException, 'Patch "%s" not unapplied' % boundaries[1]
-            lb = unapplied.index(boundaries[0])
-            hb = unapplied.index(boundaries[1])
-            if lb > hb:
-                raise CmdException, 'Patch "%s" after "%s"' \
-                      % (boundaries[0], boundaries[1])
-            patches = unapplied[lb:hb+1]
-        else:
-            raise CmdException, 'incorrect parameters to "--to"'
-    elif options.number:
+    if options.number:
         patches = unapplied[:options.number]
     elif options.all:
         patches = unapplied
     elif len(args) == 0:
         patches = [unapplied[0]]
-    elif len(args) == 1:
-        patches = [args[0]]
     else:
-        parser.error('incorrect number of arguments')
+        patches = parse_patches(args, unapplied)
 
     if patches == []:
         raise CmdException, 'No patches to push'
@@ -116,14 +98,6 @@ def func(parser, options, args):
     if options.reverse:
         patches.reverse()
 
-    for p in patches:
-        print 'Pushing patch "%s"...' % p,
-        sys.stdout.flush()
-
-        crt_series.push_patch(p)
+    push_patches(patches, options.merged)
 
-        if crt_series.empty_patch(p):
-            print 'done (empty patch)'
-        else:
-            print 'done'
     print_crt_patch()