from stgit.commands.common import *
from stgit.utils import *
from stgit import stack, git
+from stgit.stack import Series
help = 'import a patch from a different branch or a commit object'
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 overriden with the '--name'
+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."""
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('--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')]
if len(args) != 1:
parser.error('incorrect number of arguments')
- check_local_changes()
- check_conflicts()
- check_head_top_equal()
+ 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)
- if options.fold:
+ 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:
- patch = options.name
+ patchname = options.name
elif len(patch_branch) == 2:
- patch = patch_branch[0]
+ patchname = patch_branch[0]
else:
- raise CmdException, 'Unkown patch name'
+ patchname = None
- commit_id = git_id(commit_str)
- commit = git.Commit(commit_id)
+ if options.parent:
+ parent = git_id(options.parent)
+ else:
+ parent = commit.get_parent()
if not options.reverse:
- bottom = commit.get_parent()
+ bottom = parent
top = commit_id
else:
bottom = commit_id
- top = commit.get_parent()
+ top = parent
if options.fold:
print 'Folding commit %s...' % commit_id,
# try a direct git-apply first
if not git.apply_diff(bottom, top):
- git.merge(bottom, git.get_head(), top)
+ git.merge(bottom, git.get_head(), top, recursive = True)
+
+ print 'done'
+ elif options.update:
+ rev1 = git_id('//bottom')
+ rev2 = git_id('//top')
+ files = git.barefiles(rev1, rev2).split('\n')
+
+ print 'Updating with commit %s...' % commit_id,
+ sys.stdout.flush()
+
+ if not git.apply_diff(bottom, top, files = files):
+ raise CmdException, 'Patch updating failed'
print 'done'
else:
print 'Importing commit %s...' % commit_id,
sys.stdout.flush()
- crt_series.new_patch(patch, message = message, can_edit = False,
- unapplied = True, bottom = bottom, top = top,
- author_name = author_name,
- author_email = author_email,
- author_date = author_date)
- modified = crt_series.push_patch(patch)
+ newpatch = crt_series.new_patch(patchname, message = message, can_edit = False,
+ unapplied = True, bottom = bottom, top = top,
+ author_name = author_name,
+ author_email = author_email,
+ author_date = author_date)
+ # 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
+ if refbranchname:
+ # assume the refseries is OK, since we already resolved
+ # commit_str to a git_id
+ refseries = Series(refbranchname)
+ else:
+ refseries = crt_series
+ patch = refseries.get_patch(refpatchname)
+ if patch.get_log():
+ print"log was %s" % newpatch.get_log()
+ print "setting log to %s\n" % patch.get_log()
+ newpatch.set_log(patch.get_log())
+ print"log is now %s" % newpatch.get_log()
+ else:
+ print "no log for %s\n" % patchname
+
+ if not options.unapplied:
+ modified = crt_series.push_patch(patchname)
+ else:
+ modified = False
- if crt_series.empty_patch(patch):
+ if crt_series.empty_patch(patchname):
print 'done (empty patch)'
elif modified:
print 'done (modified)'