This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3078

revset: use revsymbol() for checking if a symbol is valid
ClosedPublic

Authored by martinvonz on Apr 4 2018, 6:53 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGe32dfff71529: revset: use revsymbol() for checking if a symbol is valid

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Apr 4 2018, 6:53 PM
indygreg accepted this revision.Apr 4 2018, 8:44 PM
indygreg added a subscriber: indygreg.

I'm accepting this because it seems correct. But I'd really appreciate @yuya's review on this because I'm not sure if the change to revset.matchany() has unintended consequences.

This revision is now accepted and ready to land.Apr 4 2018, 8:44 PM
Closed by commit rHGe32dfff71529: revset: use revsymbol() for checking if a symbol is valid (authored by martinvonz). · Explain WhyApr 4 2018, 8:50 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/debugcommands.py (2 lines)
Mmercurial/revset.py (5 lines)
Mmercurial/scmutil.py (7 lines)
Mtests/test-revset.t (2 lines)

Diff 7664

mercurial/debugcommands.py

else: else:
for n in opts['show_stage']: for n in opts['show_stage']:
if n not in stagenames: if n not in stagenames:
raise error.Abort(_('invalid stage name: %s') % n) raise error.Abort(_('invalid stage name: %s') % n)
showalways.update(opts['show_stage']) showalways.update(opts['show_stage'])
treebystage = {} treebystage = {}
printedtree = None printedtree = None
tree = revsetlang.parse(expr, lookup=repo.__contains__) tree = revsetlang.parse(expr, lookup=revset.lookupfn(repo))
for n, f in stages: for n, f in stages:
treebystage[n] = tree = f(tree) treebystage[n] = tree = f(tree)
if n in showalways or (n in showchanged and tree != printedtree): if n in showalways or (n in showchanged and tree != printedtree):
if opts['show_stage'] or n != 'parsed': if opts['show_stage'] or n != 'parsed':
ui.write(("* %s:\n") % n) ui.write(("* %s:\n") % n)
ui.write(revsetlang.prettyformat(tree), "\n") ui.write(revsetlang.prettyformat(tree), "\n")
printedtree = tree printedtree = tree

mercurial/revset.py

"parent": parentspec, "parent": parentspec,
"parentpost": parentpost, "parentpost": parentpost,
} }
def posttreebuilthook(tree, repo): def posttreebuilthook(tree, repo):
# hook for extensions to execute code on the optimized tree # hook for extensions to execute code on the optimized tree
pass pass
def lookupfn(repo):
return lambda symbol: scmutil.isrevsymbol(repo, symbol)
def match(ui, spec, repo=None): def match(ui, spec, repo=None):
"""Create a matcher for a single revision spec""" """Create a matcher for a single revision spec"""
return matchany(ui, [spec], repo=repo) return matchany(ui, [spec], repo=repo)
def matchany(ui, specs, repo=None, localalias=None): def matchany(ui, specs, repo=None, localalias=None):
"""Create a matcher that will include any revisions matching one of the """Create a matcher that will include any revisions matching one of the
given specs given specs
If localalias is not None, it is a dict {name: definitionstring}. It takes If localalias is not None, it is a dict {name: definitionstring}. It takes
precedence over [revsetalias] config section. precedence over [revsetalias] config section.
""" """
if not specs: if not specs:
def mfunc(repo, subset=None): def mfunc(repo, subset=None):
return baseset() return baseset()
return mfunc return mfunc
if not all(specs): if not all(specs):
raise error.ParseError(_("empty query")) raise error.ParseError(_("empty query"))
lookup = None lookup = None
if repo: if repo:
lookup = repo.__contains__ lookup = lookupfn(repo)
if len(specs) == 1: if len(specs) == 1:
tree = revsetlang.parse(specs[0], lookup) tree = revsetlang.parse(specs[0], lookup)
else: else:
tree = ('or', tree = ('or',
('list',) + tuple(revsetlang.parse(s, lookup) for s in specs)) ('list',) + tuple(revsetlang.parse(s, lookup) for s in specs))
aliases = [] aliases = []
warn = None warn = None

mercurial/scmutil.py

def formatrevnode(ui, rev, node): def formatrevnode(ui, rev, node):
"""Format given revision and node depending on the current verbosity""" """Format given revision and node depending on the current verbosity"""
if ui.debugflag: if ui.debugflag:
hexfunc = hex hexfunc = hex
else: else:
hexfunc = short hexfunc = short
return '%d:%s' % (rev, hexfunc(node)) return '%d:%s' % (rev, hexfunc(node))
def isrevsymbol(repo, symbol):
try:
revsymbol(repo, symbol)
return True
except error.RepoLookupError:
return False
def revsymbol(repo, symbol): def revsymbol(repo, symbol):
"""Returns a context given a single revision symbol (as string). """Returns a context given a single revision symbol (as string).
This is similar to revsingle(), but accepts only a single revision symbol, This is similar to revsingle(), but accepts only a single revision symbol,
i.e. things like ".", "tip", "1234", "deadbeef", "my-bookmark" work, but i.e. things like ".", "tip", "1234", "deadbeef", "my-bookmark" work, but
not "max(public())". not "max(public())".
""" """
if not isinstance(symbol, bytes): if not isinstance(symbol, bytes):

tests/test-revset.t

> @command(b'debugrevlistspec', > @command(b'debugrevlistspec',
> [(b'', b'optimize', None, b'print parsed tree after optimizing'), > [(b'', b'optimize', None, b'print parsed tree after optimizing'),
> (b'', b'bin', None, b'unhexlify arguments')]) > (b'', b'bin', None, b'unhexlify arguments')])
> def debugrevlistspec(ui, repo, fmt, *args, **opts): > def debugrevlistspec(ui, repo, fmt, *args, **opts):
> if opts['bin']: > if opts['bin']:
> args = map(nodemod.bin, args) > args = map(nodemod.bin, args)
> expr = revsetlang.formatspec(fmt, list(args)) > expr = revsetlang.formatspec(fmt, list(args))
> if ui.verbose: > if ui.verbose:
> tree = revsetlang.parse(expr, lookup=repo.__contains__) > tree = revsetlang.parse(expr, lookup=revset.lookupfn(repo))
> ui.note(revsetlang.prettyformat(tree), b"\n") > ui.note(revsetlang.prettyformat(tree), b"\n")
> if opts["optimize"]: > if opts["optimize"]:
> opttree = revsetlang.optimize(revsetlang.analyze(tree)) > opttree = revsetlang.optimize(revsetlang.analyze(tree))
> ui.note(b"* optimized:\n", revsetlang.prettyformat(opttree), > ui.note(b"* optimized:\n", revsetlang.prettyformat(opttree),
> b"\n") > b"\n")
> func = revset.match(ui, expr, repo) > func = revset.match(ui, expr, repo)
> revs = func(repo) > revs = func(repo)
> if ui.verbose: > if ui.verbose: