Mercurial > hg
changeset 16316:0f1e621d3d3b
graphlog: handle old-style --rev values
--rev options cannot be merged into a single revset because we do not know if
they are valid revset or old-style revision specifications, like 'foo-bar'
tags. Instead, a base revision set is generated with scmutil.revrange() then
filtered with the revset built from log options. It also fixes incorrect or
hostile expressions passed in --rev.
| author | Patrick Mezard <patrick@mezard.eu> |
|---|---|
| date | Thu, 29 Mar 2012 22:42:03 +0200 |
| parents | f89284d72a61 |
| children | 73f4e05287b4 |
| files | hgext/graphlog.py tests/test-glog.t |
| diffstat | 2 files changed, 93 insertions(+), 74 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/graphlog.py Thu Mar 29 17:13:23 2012 +0200 +++ b/hgext/graphlog.py Thu Mar 29 22:42:03 2012 +0200 @@ -18,6 +18,7 @@ from mercurial.node import nullrev from mercurial import cmdutil, commands, extensions, scmutil from mercurial import hg, util, graphmod, templatekw +from mercurial import revset as revsetmod cmdtable = {} command = cmdutil.command(cmdtable) @@ -272,16 +273,20 @@ def revset(repo, pats, opts): """Return (expr, filematcher) where expr is a revset string built - of revisions, log options and file patterns. If --stat or --patch - are not passed filematcher is None. Otherwise it a a callable - taking a revision number and returning a match objects filtering - the files to be detailed when displaying the revision. + log options and file patterns, or None. Note that --rev options + are ignored when building expr because we do not know if they are + proper revsets or legacy expressions like a 'foo-bar' tags. If + --stat or --patch are not passed filematcher is None. Otherwise it + a a callable taking a revision number and returning a match + objects filtering the files to be detailed when displaying the + revision. """ opt2revset = { 'follow': ('follow()', None), 'follow_first': ('_followfirst()', None), 'no_merges': ('not merge()', None), 'only_merges': ('merge()', None), + '_matchfiles': ('_matchfiles(%(val)s)', None), 'date': ('date(%(val)r)', None), 'branch': ('branch(%(val)r)', ' or '), '_patslog': ('filelog(%(val)r)', ' or '), @@ -290,7 +295,6 @@ 'keyword': ('keyword(%(val)r)', ' or '), 'prune': ('not (%(val)r or ancestors(%(val)r))', ' and '), 'user': ('user(%(val)r)', ' or '), - 'rev': ('%(val)s', ' or '), } opts = dict(opts) @@ -343,7 +347,7 @@ for p in opts.get('exclude', []): matchargs.append('x:' + p) matchargs = ','.join(('%r' % p) for p in matchargs) - opts['rev'] = opts.get('rev', []) + ['_matchfiles(%s)' % matchargs] + opts['_matchfiles'] = matchargs else: if follow: if followfirst: @@ -385,7 +389,7 @@ if revset: revset = '(' + ' and '.join(revset) + ')' else: - revset = 'all()' + revset = None return revset, filematcher def generate(ui, dag, displayer, showparents, edgefn, getrenamed=None, @@ -431,7 +435,13 @@ check_unsupported_flags(pats, opts) expr, filematcher = revset(repo, pats, opts) - revs = sorted(scmutil.revrange(repo, [expr]), reverse=1) + if opts.get('rev'): + revs = scmutil.revrange(repo, opts['rev']) + else: + revs = range(len(repo)) + if expr: + revs = revsetmod.match(repo.ui, expr)(repo, revs) + revs = sorted(revs, reverse=1) limit = cmdutil.loglimit(opts) if limit is not None: revs = revs[:limit]
--- a/tests/test-glog.t Thu Mar 29 17:13:23 2012 +0200 +++ b/tests/test-glog.t Thu Mar 29 22:42:03 2012 +0200 @@ -91,8 +91,12 @@ > def printrevset(orig, ui, repo, *pats, **opts): > if opts.get('print_revset'): > expr = graphlog.revset(repo, pats, opts)[0] - > tree = revset.parse(expr)[0] - > ui.write(revset.prettyformat(tree), "\n") + > if expr: + > tree = revset.parse(expr)[0] + > else: + > tree = [] + > ui.write('%r\n' % (opts.get('rev', []),)) + > ui.write(revset.prettyformat(tree) + '\n') > return 0 > return orig(ui, repo, *pats, **opts) > entry = extensions.wrapcommand(commands.table, 'log', printrevset) @@ -1430,19 +1434,8 @@ glog always reorders nodes which explains the difference with log $ testlog -r 27 -r 25 -r 21 -r 34 -r 32 -r 31 - (group - (group - (or - (or - (or - (or - (or - ('symbol', '27') - ('symbol', '25')) - ('symbol', '21')) - ('symbol', '34')) - ('symbol', '32')) - ('symbol', '31')))) + ['27', '25', '21', '34', '32', '31'] + [] --- log.nodes * (glob) +++ glog.nodes * (glob) @@ -1,6 +1,6 @@ @@ -1457,6 +1450,7 @@ +nodetag 21 [1] $ testlog -u test -u not-a-user + [] (group (group (or @@ -1467,6 +1461,7 @@ ('symbol', 'user') ('string', 'not-a-user'))))) $ testlog -b not-a-branch + [] (group (group (func @@ -1475,6 +1470,7 @@ abort: unknown revision 'not-a-branch'! abort: unknown revision 'not-a-branch'! $ testlog -b default -b branch --only-branch branch + [] (group (group (or @@ -1489,6 +1485,7 @@ ('symbol', 'branch') ('string', 'branch'))))) $ testlog -k expand -k merge + [] (group (group (or @@ -1499,17 +1496,20 @@ ('symbol', 'keyword') ('string', 'merge'))))) $ testlog --only-merges + [] (group (func ('symbol', 'merge') None)) $ testlog --no-merges + [] (group (not (func ('symbol', 'merge') None))) $ testlog --date '2 0 to 4 0' + [] (group (func ('symbol', 'date') @@ -1518,6 +1518,7 @@ abort: invalid date: 'brace ) in a date' [255] $ testlog --prune 31 --prune 32 + [] (group (group (and @@ -1577,12 +1578,14 @@ $ testlog a + [] (group (group (func ('symbol', 'filelog') ('string', 'a')))) $ testlog a b + [] (group (group (or @@ -1596,36 +1599,36 @@ Test falling back to slow path for non-existing files $ testlog a c + [] (group - (group - (func - ('symbol', '_matchfiles') + (func + ('symbol', '_matchfiles') + (list (list - (list - ('string', 'r:') - ('string', 'p:a')) - ('string', 'p:c'))))) + ('string', 'r:') + ('string', 'p:a')) + ('string', 'p:c')))) Test multiple --include/--exclude/paths $ testlog --include a --include e --exclude b --exclude e a e + [] (group - (group - (func - ('symbol', '_matchfiles') + (func + ('symbol', '_matchfiles') + (list (list (list (list (list (list - (list - ('string', 'r:') - ('string', 'p:a')) - ('string', 'p:e')) - ('string', 'i:a')) - ('string', 'i:e')) - ('string', 'x:b')) - ('string', 'x:e'))))) + ('string', 'r:') + ('string', 'p:a')) + ('string', 'p:e')) + ('string', 'i:a')) + ('string', 'i:e')) + ('string', 'x:b')) + ('string', 'x:e')))) Test glob expansion of pats @@ -1636,6 +1639,7 @@ > else > testlog a*; > fi; + [] (group (group (func @@ -1667,6 +1671,7 @@ $ hg up -q 2 $ testlog -f a + [] (group (group (func @@ -1677,6 +1682,7 @@ $ hg up -q tip $ testlog -f e + [] (group (group (func @@ -1687,6 +1693,7 @@ $ hg up -q 2 $ testlog -f g + [] (group (group (func @@ -1698,6 +1705,7 @@ nodetag 0 $ hg up -q tip $ testlog -f g + [] (group (group (func @@ -1711,6 +1719,7 @@ Test --follow and multiple files $ testlog -f g e + [] (group (group (or @@ -1739,6 +1748,7 @@ $ echo merge > e $ hg ci -m "merge 5 and 4" $ testlog --follow-first + [] (group (func ('symbol', '_followfirst') @@ -1747,6 +1757,7 @@ Cannot compare with log --follow-first FILE as it never worked $ hg log -G --print-revset --follow-first e + [] (group (group (func @@ -1780,47 +1791,38 @@ $ hg up -q 4 $ testlog "set:copied()" - (group - (group - (func - ('symbol', '_matchfiles') - (list - ('string', 'r:') - ('string', 'p:set:copied()'))))) - $ testlog --include "set:copied()" + [] (group - (group - (func - ('symbol', '_matchfiles') - (list - ('string', 'r:') - ('string', 'i:set:copied()'))))) - $ testlog -r "sort(file('set:copied()'), -rev)" + (func + ('symbol', '_matchfiles') + (list + ('string', 'r:') + ('string', 'p:set:copied()')))) + $ testlog --include "set:copied()" + [] (group - (group - (func - ('symbol', 'sort') - (list - (func - ('symbol', 'file') - ('string', 'set:copied()')) - (negate - ('symbol', 'rev')))))) + (func + ('symbol', '_matchfiles') + (list + ('string', 'r:') + ('string', 'i:set:copied()')))) + $ testlog -r "sort(file('set:copied()'), -rev)" + ["sort(file('set:copied()'), -rev)"] + [] Test --removed $ testlog --removed - (func - ('symbol', 'all') - None) + [] + [] $ testlog --removed a + [] (group - (group - (func - ('symbol', '_matchfiles') - (list - ('string', 'r:') - ('string', 'p:a'))))) + (func + ('symbol', '_matchfiles') + (list + ('string', 'r:') + ('string', 'p:a')))) $ testlog --removed --follow a abort: can only follow copies/renames for explicit filenames abort: can only follow copies/renames for explicit filenames @@ -1921,3 +1923,10 @@ | | @@ -0,0 +1,1 @@ | | +ee | | + +Test old-style --rev + + $ hg tag 'foo-bar' + $ testlog -r 'foo-bar' + ['foo-bar'] + []