If neither bottom nor top are given but a '//' is present, the command
shows the specified patch (defaulting to the current one)."""
-options = [make_option('-r', metavar = 'rev1[:[rev2]]', dest = 'revs',
+options = [make_option('-r', '--range',
+ metavar = 'rev1[..[rev2]]', dest = 'revs',
help = 'show the diff between revisions'),
+ make_option('--binary',
+ help = 'output a diff even for binary files',
+ action = 'store_true'),
make_option('-s', '--stat',
help = 'show the stat instead of the diff',
action = 'store_true')]
"""Show the tree diff
"""
if options.revs:
- rev_list = options.revs.split(':')
+ rev_list = options.revs.split('..')
rev_list_len = len(rev_list)
if rev_list_len == 1:
rev = rev_list[0]
if options.stat:
print git.diffstat(args, git_id(rev1), git_id(rev2))
else:
- pager(git.diff(args, git_id(rev1), git_id(rev2)))
+ diff_str = git.diff(args, git_id(rev1), git_id(rev2),
+ binary = options.binary)
+ if diff_str:
+ pager(diff_str)