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 27fdf9cd516858b64746bcd31e5451a9f17d96d6..ee08c01c5219114647217ac73df315199f9c3b36 100644 (file)
--- a/stgit/commands/pick.py
+++ b/stgit/commands/pick.py
@@ -16,73 +16,59 @@ 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.commands.common import *
 from stgit.utils import *

-from stgit import stack, git
+from stgit.out import *
+from stgit import argparse, stack, git

 from stgit.stack import Series
 
 from stgit.stack import Series
 

-
-help = 'import a patch from a different branch or a commit object'
-usage = """%prog [options] [<patch@branch>|<commit>]
-
-Import a patch from a different branch or a commit object into the
-current series. By default, the name of the imported patch is used as
-the name of the current patch. It can be overridden with the '--name'
-option. A commit object can be reverted with the '--reverse'
-option. The log and author information are those of the commit object."""
-
-options = [make_option('-n', '--name',
-                       help = 'use NAME as the patch name'),
-           make_option('-r', '--reverse',
-                       help = 'reverse the commit object before importing',
-                       action = 'store_true'),
-           make_option('-p', '--parent', metavar = 'COMMITID',
-                       help = 'use COMMITID as parent'),
-           make_option('-x', '--expose',
-                       help = 'append the imported commit id to the patch log',
-                       action = 'store_true'),
-           make_option('--fold',
-                       help = 'fold the commit object into the current patch',
-                       action = 'store_true'),
-           make_option('--update',
-                       help = 'like fold but only update the current patch files',
-                       action = 'store_true'),
-           make_option('--unapplied',
-                       help = 'keep the patch unapplied',
-                       action = 'store_true')]
-
-
-def func(parser, options, args):
-    """Import a commit object as a new patch
+help = 'Import a patch from a different branch or a commit object'
+kind = 'patch'
+usage = ['[options] ([<patch1>] [<patch2>] [<patch3>..<patch4>])|<commit>']
+description = """
+Import one or more patches from a different branch or a commit object
+into the current series. By default, the name of the imported patch is
+used as the name of the current patch. It can be overridden with the
+'--name' option. A commit object can be reverted with the '--reverse'
+option. The log and author information are those of the commit
+object."""
+
+args = [argparse.patch_range(argparse.applied_patches,
+                             argparse.unapplied_patches,
+                             argparse.hidden_patches)]
+options = [
+    opt('-n', '--name',
+        short = 'Use NAME as the patch name'),
+    opt('-B', '--ref-branch', args = [argparse.stg_branches],
+        short = 'Pick patches from BRANCH'),
+    opt('-r', '--reverse', action = 'store_true',
+        short = 'Reverse the commit object before importing'),
+    opt('-p', '--parent', metavar = 'COMMITID', args = [argparse.commit],
+        short = 'Use COMMITID as parent'),
+    opt('-x', '--expose', action = 'store_true',
+        short = 'Append the imported commit id to the patch log'),
+    opt('--fold', action = 'store_true',
+        short = 'Fold the commit object into the current patch'),
+    opt('--update', action = 'store_true',
+        short = 'Like fold but only update the current patch files'),
+    opt('--unapplied', action = 'store_true',
+        short = 'Keep the patch unapplied')]
+
+directory = DirectoryGotoToplevel(log = True)
+
+def __pick_commit(commit_id, patchname, options):
+    """Pick a commit id.

     """
     """

-    if len(args) != 1:
-        parser.error('incorrect number of arguments')
-
-    if not options.unapplied:
-        check_local_changes()
-        check_conflicts()
-        check_head_top_equal()
-
-    commit_str = args[0]
-    commit_id = git_id(commit_str)

     commit = git.Commit(commit_id)
 
     commit = git.Commit(commit_id)
 

-    if options.fold or options.update:
-        if not crt_series.get_current():
-            raise CmdException, 'No patches applied'
-    else:
-        patch_branch = commit_str.split('@')
-        if options.name:
-            patchname = options.name
-        elif len(patch_branch) == 2:
-            patchname = patch_branch[0]
-        else:
-            patchname = None
+    if options.name:
+        patchname = options.name
+    if patchname:
+        patchname = find_patch_name(patchname, crt_series.patch_exists)

 
     if options.parent:
 
     if options.parent:

-        parent = git_id(options.parent)
+        parent = git_id(crt_series, options.parent)

     else:
         parent = commit.get_parent()
 
     else:
         parent = commit.get_parent()
 


@@ -96,14 +82,14 @@ def func(parser, options, args):
     if options.fold:
         out.start('Folding commit %s' % commit_id)
 
     if options.fold:
         out.start('Folding commit %s' % commit_id)
 

-        # try a direct git-apply first
+        # try a direct git apply first

         if not git.apply_diff(bottom, top):
         if not git.apply_diff(bottom, top):

-            git.merge(bottom, git.get_head(), top, recursive = True)
+            git.merge_recursive(bottom, git.get_head(), top)

 
         out.done()
     elif options.update:
 
         out.done()
     elif options.update:

-        rev1 = git_id('//bottom')
-        rev2 = git_id('//top')
+        rev1 = git_id(crt_series, 'HEAD^')
+        rev2 = git_id(crt_series, 'HEAD')

         files = git.barefiles(rev1, rev2).split('\n')
 
         out.start('Updating with commit %s' % commit_id)
         files = git.barefiles(rev1, rev2).split('\n')
 
         out.start('Updating with commit %s' % commit_id)


@@ -130,10 +116,8 @@ def func(parser, options, args):
         patchname = newpatch.get_name()
 
         # find a patchlog to fork from
         patchname = newpatch.get_name()
 
         # find a patchlog to fork from

-        (refpatchname, refbranchname, refpatchid) = parse_rev(commit_str)
-        if refpatchname and not refpatchid and \
-               (not refpatchid or refpatchid == 'top'):
-            # FIXME: should also support picking //top.old
+        refbranchname, refpatchname = parse_rev(patchname)
+        if refpatchname:

             if refbranchname:
                 # assume the refseries is OK, since we already resolved
                 # commit_str to a git_id
             if refbranchname:
                 # assume the refseries is OK, since we already resolved
                 # commit_str to a git_id


@@ -161,4 +145,54 @@ def func(parser, options, args):
         else:
             out.done()
 
         else:
             out.done()
 

-    print_crt_patch()
+
+def func(parser, options, args):
+    """Import a commit object as a new patch
+    """
+    if not args:
+        parser.error('incorrect number of arguments')
+
+    if not options.unapplied:
+        check_local_changes()
+        check_conflicts()
+        check_head_top_equal(crt_series)
+
+    if options.ref_branch:
+        remote_series = Series(options.ref_branch)
+    else:
+        remote_series = crt_series
+
+    applied = remote_series.get_applied()
+    unapplied = remote_series.get_unapplied()
+    try:
+        patches = parse_patches(args, applied + unapplied, len(applied))
+        commit_id = None
+    except CmdException:
+        if len(args) > 1:
+            raise
+        # no patches found, try a commit id
+        commit_id = git_id(remote_series, args[0])
+
+    if not commit_id and len(patches) > 1:
+        if options.name:
+            raise CmdException, '--name can only be specified with one patch'
+        if options.parent:
+            raise CmdException, '--parent can only be specified with one patch'
+
+    if options.update and not crt_series.get_current():
+        raise CmdException, 'No patches applied'
+
+    if commit_id:
+        # 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()
+        for patch in patches:
+            __pick_commit(git_id(remote_series, patch), patch, options)
+
+    print_crt_patch(crt_series)