make_option('-u', '--unapplied',
help = 'show the unapplied patches',
action = 'store_true'),
- make_option('-O', '--diff-opts',
- help = 'options to pass to git-diff')]
+ make_option('-O', '--show-opts',
+ help = 'options to pass to "git show"')]
def func(parser, options, args):
patches = parse_patches(args, applied + unapplied +\
crt_series.get_hidden(), len(applied))
- if options.diff_opts:
- diff_flags = options.diff_opts.split()
+ if options.show_opts:
+ show_flags = options.show_opts.split()
else:
- diff_flags = []
+ show_flags = []
commit_ids = [git_id(crt_series, patch) for patch in patches]
- commit_str = '\n'.join([git.pretty_commit(commit_id, diff_flags=diff_flags)
+ commit_str = '\n'.join([git.pretty_commit(commit_id, flags = show_flags)
for commit_id in commit_ids])
if commit_str:
pager(commit_str)
return '\n'.join(result)
-def pretty_commit(commit_id = 'HEAD', diff_flags = []):
+def pretty_commit(commit_id = 'HEAD', flags = []):
"""Return a given commit (log + diff)
"""
- return GRun('diff-tree',
- *(diff_flags
- + ['--cc', '--always', '--pretty', '-r', commit_id])
- ).raw_output()
+ return GRun('show', *(flags + [commit_id])).raw_output()
def checkout(files = None, tree_id = None, force = False):
"""Check out the given or all files