def func(parser, options, args):
"""Show the tree diff
"""
args = git.ls_files(args)
directory.cd_to_topdir()
if options.revs:
rev_list = options.revs.split('..')
rev_list_len = len(rev_list)
if rev_list_len == 1:
rev1 = rev_list[0]
rev2 = None
elif rev_list_len == 2:
rev1 = rev_list[0]
rev2 = rev_list[1]
else:
parser.error('incorrect parameters to -r')
else:
rev1 = 'HEAD'
rev2 = None
if not options.stat:
options.diff_flags.extend(color_diff_flags())
diff_str = git.diff(args, rev1 and git_id(crt_series, rev1),
rev2 and git_id(crt_series, rev2),
diff_flags = options.diff_flags)
if options.stat:
out.stdout_raw(gitlib.diffstat(diff_str) + '\n')
else:
if diff_str:
pager(diff_str)
def func(parser, options, args):
"""Show the tree diff
"""
args = git.ls_files(args)
directory.cd_to_topdir()
if options.revs:
rev_list = options.revs.split('..')
rev_list_len = len(rev_list)
if rev_list_len == 1:
rev1 = rev_list[0]
rev2 = None
elif rev_list_len == 2:
rev1 = rev_list[0]
rev2 = rev_list[1]
else:
parser.error('incorrect parameters to -r')
else:
rev1 = 'HEAD'
rev2 = None
if not options.stat:
options.diff_flags.extend(color_diff_flags())
diff_str = git.diff(args,
rev1 and git_id(crt_series, rev1),
rev2 and git_id(crt_series, rev2),
diff_flags=options.diff_flags)
if options.stat:
out.stdout_raw(gitlib.diffstat(diff_str) + '\n')
else:
if diff_str:
pager(diff_str)
def func(parser, options, args):
"""Show the patches modifying a file
"""
if not args:
files = [path for (stat, path) in git.tree_status(verbose=True)]
# git.tree_status returns absolute paths
else:
files = git.ls_files(args)
directory.cd_to_topdir()
if not files:
raise CmdException('No files specified or no local changes')
applied = crt_series.get_applied()
if not applied:
raise CmdException('No patches applied')
revs = git.modifying_revs(files, crt_series.get_base(),
crt_series.get_head())
revs.reverse()
# build the patch/revision mapping
rev_patch = dict()
for name in applied:
patch = crt_series.get_patch(name)
rev_patch[patch.get_top()] = patch
# print the patch names
diff_lines = []
for rev in revs:
patch = rev_patch[rev]
if options.diff:
diff_lines.extend([
b'-' * 79,
patch.get_name().encode('utf-8'),
b'-' * 79,
patch.get_description().encode('utf-8'),
b'---',
b'',
git.diff(files, patch.get_bottom(), patch.get_top()),
])
else:
out.stdout(patch.get_name())
if options.diff:
pager(b'\n'.join(diff_lines))
def func(parser, options, args):
"""Show the tree status
"""
args = git.ls_files(args)
directory.cd_to_topdir()
if options.reset:
directory.log = True
if args:
conflicts = git.get_conflicts()
git.resolved([fn for fn in args if fn in conflicts])
git.reset(args)
else:
resolved_all()
git.reset()
else:
status(args, options.modified, options.new, options.deleted,
options.conflict, options.unknown, options.noexclude)
def func(parser, options, args):
"""Show the patches modifying a file
"""
if not args:
files = [path for (stat,path) in git.tree_status(verbose = True)]
# git.tree_status returns absolute paths
else:
files = git.ls_files(args)
directory.cd_to_topdir()
if not files:
raise CmdException('No files specified or no local changes')
applied = crt_series.get_applied()
if not applied:
raise CmdException('No patches applied')
revs = git.modifying_revs(files, crt_series.get_base(),
crt_series.get_head())
revs.reverse()
# build the patch/revision mapping
rev_patch = dict()
for name in applied:
patch = crt_series.get_patch(name)
rev_patch[patch.get_top()] = patch
# print the patch names
diff_output = ''
for rev in revs:
if rev in rev_patch:
patch = rev_patch[rev]
if options.diff:
diff_output += diff_tmpl \
% (patch.get_name(), patch.get_description(),
git.diff(files, patch.get_bottom(),
patch.get_top()))
else:
out.stdout(patch.get_name())
if options.diff:
pager(diff_output)
