mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 07:17:55 +03:00
graphlog: fix log -G --removed
Current version was mispelled and processed like a valued argument.
This commit is contained in:
parent
caf334a147
commit
eec16f919e
@ -223,20 +223,22 @@ def check_unsupported_flags(opts):
|
||||
def revset(pats, opts):
|
||||
"""Return revset str built of revisions, log options and file patterns.
|
||||
"""
|
||||
opt2revset = dict(only_merges='merge',
|
||||
opt2revset = dict(only_merges='merge()',
|
||||
only_branch='branch',
|
||||
no_merges='not merge',
|
||||
no_merges='not merge()',
|
||||
include='file',
|
||||
exclude='not file',
|
||||
prune='not follow')
|
||||
prune='not follow',
|
||||
follow='follow()',
|
||||
removed='removes("*")')
|
||||
revset = []
|
||||
for op, val in opts.iteritems():
|
||||
if not val:
|
||||
continue
|
||||
revop = opt2revset.get(op, op)
|
||||
if op in ('follow', 'only_merges', 'no_merges'):
|
||||
revset.append('%s()' % revop)
|
||||
elif op in ('date', 'remove'):
|
||||
if op in ('follow', 'only_merges', 'no_merges', 'removed'):
|
||||
revset.append('%s' % revop)
|
||||
elif op in ('date',):
|
||||
revset.append('%s(%s)' % (revop, val))
|
||||
elif op in ('include', 'exclude', 'user', 'branch', 'keyword',
|
||||
'prune', 'only_branch'):
|
||||
|
@ -1405,4 +1405,12 @@ Test log -G options
|
||||
abort: unknown revision 'something nice'!
|
||||
[255]
|
||||
$ hg log -G --include 'some file' --exclude 'another file'
|
||||
$ hg log -G --follow --template 'nodetag {rev}\n' | grep nodetag | wc -l
|
||||
\s*36 (re)
|
||||
$ hg log -G --removed --template 'nodetag {rev}\n' | grep nodetag | wc -l
|
||||
\s*0 (re)
|
||||
$ hg log -G --only-merges --template 'nodetag {rev}\n' | grep nodetag | wc -l
|
||||
\s*28 (re)
|
||||
$ hg log -G --no-merges --template 'nodetag {rev}\n' | grep nodetag | wc -l
|
||||
\s*9 (re)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user