Merge branch 'stable'

[stgit] / stgit / commands / pick.py

diff --git a/stgit/commands/pick.py b/stgit/commands/pick.py
index add2a33b12a77adce5bb56d4ed380896778f8648..44b461e7f4a9ecbac9e859b2ed33fe91831eae02 100644 (file)
--- a/stgit/commands/pick.py
+++ b/stgit/commands/pick.py
@@ -83,12 +83,12 @@ def __pick_commit(commit_id, patchname, options):
 
         # try a direct git apply first
         if not git.apply_diff(bottom, top):
 
         # try a direct git apply first
         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(crt_series, '//bottom')
-        rev2 = git_id(crt_series, '//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)


@@ -115,10 +115,8 @@ def __pick_commit(commit_id, patchname, options):
         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(patchname)
-        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