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

[stgit] / stgit / commands / pick.py

diff --git a/stgit/commands/pick.py b/stgit/commands/pick.py
index 0fc54b8296154c4757508c68b75109ba42aa6b3d..ee08c01c5219114647217ac73df315199f9c3b36 100644 (file)
--- a/stgit/commands/pick.py
+++ b/stgit/commands/pick.py
@@ -64,6 +64,8 @@ def __pick_commit(commit_id, patchname, options):
 
     if options.name:
         patchname = options.name
 
     if options.name:
         patchname = options.name

+    if patchname:
+        patchname = find_patch_name(patchname, crt_series.patch_exists)

 
     if options.parent:
         parent = git_id(crt_series, options.parent)
 
     if options.parent:
         parent = git_id(crt_series, options.parent)


@@ -181,7 +183,12 @@ def func(parser, options, args):
         raise CmdException, 'No patches applied'
 
     if commit_id:
         raise CmdException, 'No patches applied'
 
     if commit_id:

-        __pick_commit(commit_id, None, options)
+        # Try to guess a patch name if the argument was <branch>:<patch>
+        try:
+            patchname = args[0].split(':')[1]
+        except IndexError:
+            patchname = None
+        __pick_commit(commit_id, patchname, options)

     else:
         if options.unapplied:
             patches.reverse()
     else:
         if options.unapplied:
             patches.reverse()