This is an archive of the discontinued Mercurial Phabricator instance.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	9758		Aug 1 2018, 5:57 PM	★	★
Diff 2	9890		Aug 4 2018, 1:26 AM	★	★
Diff 3	9897	rHGa01200b25da69bf3e0d78200abe1bdfc8d18a5db	Apr 17 2018, 2:49 AM	★	★

Commit	Parents	Author	Summary	Date
		Martin von Zweigbergk		Apr 17 2018, 2:49 AM

Status	Author	Revision
Closed	martinvonz	D4042 shortest: use 'x' prefix to disambiguate from revnum if configured
Closed	martinvonz	D4041 revisions: allow "x123" to refer to nodeid prefix "123"
Closed	martinvonz	D4040 shortest: make isrev() a top-level function
Closed	martinvonz	D4039 shortest: cache disambiguation revset
Closed	martinvonz	D4038 scmutil: make shortest() respect disambiguation revset
Closed	martinvonz	D4037 lookup: add option to disambiguate prefix within revset
Closed	martinvonz	D4036 revlog: use specialized exception for ambiguous prefix lookup

Diff 9758

	def shortesthexnodeidprefix(repo, node, minlength=1):			def shortesthexnodeidprefix(repo, node, minlength=1):
	"""Find the shortest unambiguous prefix that matches hexnode."""			"""Find the shortest unambiguous prefix that matches hexnode."""
	# _partialmatch() of filtered changelog could take O(len(repo)) time,			# _partialmatch() of filtered changelog could take O(len(repo)) time,
	# which would be unacceptably slow. so we look for hash collision in			# which would be unacceptably slow. so we look for hash collision in
	# unfiltered space, which means some hashes may be slightly longer.			# unfiltered space, which means some hashes may be slightly longer.

	def disambiguate(prefix):			def disambiguate(prefix):
	"""Disambiguate against revnums."""			"""Disambiguate against revnums."""
				if repo.ui.configbool('experimental', 'revisions.prefixhexnode'):
				if mayberevnum(repo, prefix):
				return 'x' + prefix
				else:
				return prefix

	hexnode = hex(node)			hexnode = hex(node)
	for length in range(len(prefix), len(hexnode) + 1):			for length in range(len(prefix), len(hexnode) + 1):
	prefix = hexnode[:length]			prefix = hexnode[:length]
	if not mayberevnum(repo, prefix):			if not mayberevnum(repo, prefix):
	return prefix			return prefix

	cl = repo.unfiltered().changelog			cl = repo.unfiltered().changelog
	revset = repo.ui.config('experimental', 'revisions.disambiguatewithin')			revset = repo.ui.config('experimental', 'revisions.disambiguatewithin')

	node '10' conflicts with the revision number '10' even if it is hidden			node '10' conflicts with the revision number '10' even if it is hidden
	(we could exclude hidden revision numbers, but currently we don't)			(we could exclude hidden revision numbers, but currently we don't)

	$ hg log -r 4 -T '{rev}:{shortest(node, 0)}\n'			$ hg log -r 4 -T '{rev}:{shortest(node, 0)}\n'
	4:107			4:107
	$ hg log -r 4 -T '{rev}:{shortest(node, 0)}\n' --hidden			$ hg log -r 4 -T '{rev}:{shortest(node, 0)}\n' --hidden
	4:107			4:107

				$ hg --config experimental.revisions.prefixhexnode=yes log -r 4 -T '{rev}:{shortest(node, 0)}\n'
				4:x10
				$ hg --config experimental.revisions.prefixhexnode=yes log -r 4 -T '{rev}:{shortest(node, 0)}\n' --hidden
				4:x10

	node 'c562' should be unique if the other 'c562' nodes are hidden			node 'c562' should be unique if the other 'c562' nodes are hidden
	(but we don't try the slow path to filter out hidden nodes for now)			(but we don't try the slow path to filter out hidden nodes for now)

	$ hg log -r 8 -T '{rev}:{node\|shortest}\n'			$ hg log -r 8 -T '{rev}:{node\|shortest}\n'
	8:c5625			8:c5625
	$ hg log -r 8:10 -T '{rev}:{node\|shortest}\n' --hidden			$ hg log -r 8:10 -T '{rev}:{node\|shortest}\n' --hidden
	8:c5625			8:c5625
	9:c5623			9:c5623