This is an archive of the discontinued Mercurial Phabricator instance.

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 7656

	if not cahs:			if not cahs:
	anc = nullid			anc = nullid
	elif len(cahs) == 1:			elif len(cahs) == 1:
	anc = cahs[0]			anc = cahs[0]
	else:			else:
	# experimental config: merge.preferancestor			# experimental config: merge.preferancestor
	for r in self._repo.ui.configlist('merge', 'preferancestor'):			for r in self._repo.ui.configlist('merge', 'preferancestor'):
	try:			try:
	ctx = changectx(self._repo, r)			ctx = scmutil.revsymbol(self._repo, r)
	except error.RepoLookupError:			except error.RepoLookupError:
	continue			continue
	anc = ctx.node()			anc = ctx.node()
	if anc in cahs:			if anc in cahs:
	break			break
	else:			else:
	anc = self._repo.changelog.ancestor(self._node, n2)			anc = self._repo.changelog.ancestor(self._node, n2)
	if warn:			if warn: