def func(parser, options, args):
"""Show the files modified by a patch (or the current patch)
"""
if options.bare and options.stat:
raise CmdException('Cannot specify both --bare and --stat')
repository = directory.repository
if len(args) == 0:
stack = repository.current_stack
commit = stack.top
elif len(args) == 1:
branch, name = parse_rev(args[0])
stack = repository.get_stack(branch)
if not stack.patches.exists(name):
raise CmdException('%s: Unknown patch name' % name)
commit = stack.patches.get(name).commit
else:
parser.error('incorrect number of arguments')
if options.stat:
cmd = ['git', 'diff-tree', '--stat', '--summary', '--no-commit-id']
cmd.extend(options.diff_flags)
cmd.extend(color_diff_flags())
cmd.append(commit.sha1)
out.stdout_bytes(repository.run(cmd).decoding(None).raw_output())
else:
used = set()
for dt in repository.diff_tree_files(
commit.data.parent.data.tree, commit.data.tree
):
_, _, _, _, status, oldname, newname = dt
for filename in [oldname, newname]:
if filename in used:
continue
else:
used.add(filename)
if options.bare:
out.stdout(filename)
else:
out.stdout('%s %s' % (status, filename))
def func(parser, options, args):
"""Import a commit object as a new patch
"""
if not args:
parser.error('incorrect number of arguments')
if options.file and not options.fold:
parser.error('--file can only be specified with --fold')
repository = directory.repository
stack = repository.get_stack()
iw = repository.default_iw
if not options.unapplied:
check_local_changes(repository)
check_conflicts(iw)
check_head_top_equal(stack)
if options.ref_branch:
ref_stack = repository.get_stack(options.ref_branch)
else:
ref_stack = stack
try:
patches = parse_patches(
args,
ref_stack.patchorder.all_visible,
len(ref_stack.patchorder.applied),
)
commit = None
except CmdException:
if len(args) > 1:
raise
branch, patch = parse_rev(args[0])
if not branch:
commit = git_commit(patch, repository, options.ref_branch)
patches = []
else:
ref_stack = repository.get_stack(branch)
patches = parse_patches(
[patch],
ref_stack.patchorder.all_visible,
len(ref_stack.patchorder.applied),
)
commit = None
if not commit 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 stack.patchorder.applied:
raise CmdException('No patches applied')
if commit:
patchname = None
retval = __pick_commit(stack, ref_stack, iw, commit, patchname,
options)
else:
if options.unapplied:
patches.reverse()
for patchname in patches:
commit = git_commit(patchname, repository, ref_stack.name)
retval = __pick_commit(stack, ref_stack, iw, commit, patchname,
options)
if retval != STGIT_SUCCESS:
break
if retval == STGIT_SUCCESS:
print_current_patch(stack)
return retval
def __pick_commit(commit_id, patchname, options):
"""Pick a commit id.
"""
commit = git.Commit(commit_id)
if options.name:
patchname = options.name
elif patchname and options.revert:
patchname = 'revert-' + patchname
if patchname:
patchname = find_patch_name(patchname, crt_series.patch_exists)
if options.parent:
parent = git_id(crt_series, options.parent)
else:
parent = commit.get_parent()
if not options.revert:
bottom = parent
top = commit_id
else:
bottom = commit_id
top = parent
if options.fold:
out.start('Folding commit %s' % commit_id)
# try a direct git apply first
if not git.apply_diff(bottom, top, files=options.file):
if options.file:
raise CmdException('Patch folding failed')
else:
git.merge_recursive(bottom, git.get_head(), top)
out.done()
elif options.update:
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)
if not git.apply_diff(bottom, top, files=files):
raise CmdException('Patch updating failed')
out.done()
else:
message = commit.get_log()
if options.revert:
if message:
lines = message.splitlines()
subject = lines[0]
body = '\n'.join(lines[2:])
else:
subject = commit.get_id_hash()
body = ''
message = 'Revert "%s"\n\nThis reverts commit %s.\n\n%s\n' % (
subject, commit.get_id_hash(), body)
elif options.expose:
if not message.endswith('\n'):
message += '\n'
message += '(imported from commit %s)\n' % commit.get_id_hash()
(author_name, author_email,
author_date) = name_email_date(commit.get_author())
if options.revert:
author_name = author_email = None
out.start('Importing commit %s' % commit_id)
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,
)
# in case the patch name was automatically generated
patchname = newpatch.get_name()
# find a patchlog to fork from
refbranchname, refpatchname = parse_rev(patchname)
if refpatchname:
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():
out.info("Log was %s" % newpatch.get_log())
out.info("Setting log to %s\n" % patch.get_log())
newpatch.set_log(patch.get_log())
out.info("Log is now %s" % newpatch.get_log())
else:
out.info("No log for %s\n" % patchname)
if not options.unapplied:
modified = crt_series.push_patch(patchname)
else:
modified = False
if crt_series.empty_patch(patchname):
out.done('empty patch')
elif modified:
out.done('modified')
else:
out.done()
def __pick_commit(commit_id, patchname, options):
"""Pick a commit id.
"""
commit = git.Commit(commit_id)
if options.name:
patchname = options.name
elif patchname and options.revert:
patchname = 'revert-' + patchname
if patchname:
patchname = find_patch_name(patchname, crt_series.patch_exists)
if options.parent:
parent = git_id(crt_series, options.parent)
else:
parent = commit.get_parent()
if not options.revert:
bottom = parent
top = commit_id
else:
bottom = commit_id
top = parent
if options.fold:
out.start('Folding commit %s' % commit_id)
# try a direct git apply first
if not git.apply_diff(bottom, top, files = options.file):
if options.file:
raise CmdException('Patch folding failed')
else:
git.merge_recursive(bottom, git.get_head(), top)
out.done()
elif options.update:
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)
if not git.apply_diff(bottom, top, files = files):
raise CmdException('Patch updating failed')
out.done()
else:
message = commit.get_log()
if options.revert:
if message:
lines = message.splitlines()
subject = lines[0]
body = '\n'.join(lines[2:])
else:
subject = commit.get_id_hash()
body = ''
message = 'Revert "%s"\n\nThis reverts commit %s.\n\n%s\n' \
% (subject, commit.get_id_hash(), body)
elif options.expose:
if not message.endswith('\n'):
message += '\n'
message += '(imported from commit %s)\n' % commit.get_id_hash()
author_name, author_email, author_date = \
name_email_date(commit.get_author())
if options.revert:
author_name = author_email = None
out.start('Importing commit %s' % commit_id)
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)
# in case the patch name was automatically generated
patchname = newpatch.get_name()
# find a patchlog to fork from
refbranchname, refpatchname = parse_rev(patchname)
if refpatchname:
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():
out.info("Log was %s" % newpatch.get_log())
out.info("Setting log to %s\n" % patch.get_log())
newpatch.set_log(patch.get_log())
out.info("Log is now %s" % newpatch.get_log())
else:
out.info("No log for %s\n" % patchname)
if not options.unapplied:
modified = crt_series.push_patch(patchname)
else:
modified = False
if crt_series.empty_patch(patchname):
out.done('empty patch')
elif modified:
out.done('modified')
else:
out.done()
