Print conflict details with the new infrastructure (bug #11181)

[stgit] / stgit / commands / push.py

diff --git a/stgit/commands/push.py b/stgit/commands/push.py
index b91bc5e23536ab54d27917e590529659931d5df5..818e02df3d73241096d1a42b798cd23438d0ca60 100644 (file)
--- a/stgit/commands/push.py
+++ b/stgit/commands/push.py
@@ -17,68 +17,47 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 """
 
 import sys, os
 """
 
 import sys, os

-from optparse import OptionParser, make_option
-
+from stgit.argparse import opt

 from stgit.commands.common import *
 from stgit.utils import *
 from stgit.out import *
 from stgit.commands.common import *
 from stgit.utils import *
 from stgit.out import *

-from stgit import stack, git
-
-
-help = 'push one or more patches onto of the stack'
-usage = """%prog [options] [<patch1>] [<patch2>] [<patch3>..<patch4>]
+from stgit import argparse, stack, git

 
 

+help = 'Push one or more patches onto the stack'
+kind = 'stack'
+usage = ['[options] [<patch1>] [<patch2>] [<patch3>..<patch4>]']
+description = """

 Push one or more patches (defaulting to the first unapplied one) onto
 the stack. The 'push' operation allows patch reordering by commuting
 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.
+them with the three-way merge algorithm. If there are conflicts while
+pushing a patch, those conflicts are written to the work tree, and the
+command halts. Conflicts raised during the push operation have to be
+fixed and the 'resolved' command run (alternatively, you may undo the
+conflicting push with 'stg undo').

 
 The command also notifies when the patch becomes empty (fully merged
 upstream) or is modified (three-way merged) by the 'push' operation."""
 
 
 The command also notifies when the patch becomes empty (fully merged
 upstream) or is modified (three-way merged) by the 'push' operation."""
 

-directory = DirectoryHasRepository()
-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('--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 patch pushing',
-                       action = 'store_true')]
+args = [argparse.patch_range(argparse.unapplied_patches)]
+options = [
+    opt('-a', '--all', action = 'store_true',
+        short = 'Push all the unapplied patches'),
+    opt('-n', '--number', type = 'int',
+        short = 'Push the specified number of patches'),
+    opt('--reverse', action = 'store_true',
+        short = 'Push the patches in reverse order'),
+    opt('-m', '--merged', action = 'store_true',
+        short = 'Check for patches merged upstream')]

 
 

+directory = DirectoryGotoToplevel(log = True)

 
 def func(parser, options, args):
     """Pushes the given patch or all onto the series
     """
 
 
 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()
-        if not patch:
-            raise CmdException, 'No patch to undo'
-
-        out.start('Undoing push of "%s"' % patch)
-        resolved_all()
-        if crt_series.undo_push():
-            out.done()
-        else:
-            out.done('patch unchanged')
-        print_crt_patch()
-
-        return
-

     check_local_changes()
     check_conflicts()
     check_local_changes()
     check_conflicts()

-    check_head_top_equal()
+    check_head_top_equal(crt_series)

 
     unapplied = crt_series.get_unapplied()
     if not unapplied:
 
     unapplied = crt_series.get_unapplied()
     if not unapplied:


@@ -99,6 +78,6 @@ def func(parser, options, args):
     if options.reverse:
         patches.reverse()
 
     if options.reverse:
         patches.reverse()
 

-    push_patches(patches, options.merged)
+    push_patches(crt_series, patches, options.merged)

 
 

-    print_crt_patch()
+    print_crt_patch(crt_series)