This is an archive of the discontinued Mercurial Phabricator instance.

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

			Path	Packages
M			mercurial/debugcommands.py (2 lines)
M			mercurial/revset.py (5 lines)
M			mercurial/scmutil.py (7 lines)
M			tests/test-revset.t (2 lines)

Status	Author	Revision
Closed	martinvonz	D3089 convert: use repo.lookup() for converting to nodeid
Closed	martinvonz	D3088 extdatasource: use revsymbol() for converting to node
Closed	martinvonz	D3087 bookmarks: calculateupdate() returns a bookmark, not a rev
Closed	martinvonz	D3086 pull: pass rev to check out as integer to postincoming()
Closed	martinvonz	D3085 children: support specifying revision by revset
Closed	martinvonz	D3084 heads: add support for specying branches by revset
Closed	martinvonz	D3083 perf: make perfmanifest and perfnodelookup work with revsets
Closed	martinvonz	D3082 context: use revsymbol() in "merge.preferancestor" code
Closed	martinvonz	D3081 wireproto: use repo.lookup() for lookup command
Closed	martinvonz	D3080 localrepo: use revsymbol in lookupbranch() too
Closed	martinvonz	D3079 localrepo: drop "remote" argument from lookupbranch() (API)
Closed	martinvonz	D3078 revset: use revsymbol() for checking if a symbol is valid

Diff 7652

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:

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	7652		Apr 4 2018, 6:53 PM	★	★
Diff 2	7664	rHGe32dfff71529779a6cc94347a1be71d13e256ce2	Apr 2 2018, 1:48 AM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

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

Details

Diff Detail

Event Timeline