This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3082

context: use revsymbol() in "merge.preferancestor" code
ClosedPublic

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

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGa6014392837e: context: use revsymbol() in "merge.preferancestor" code
Summary

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:47 PM
This revision is now accepted and ready to land.Apr 4 2018, 8:47 PM
Closed by commit rHGa6014392837e: context: use revsymbol() in "merge.preferancestor" code (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/context.py (2 lines)

Diff 7668

mercurial/context.py

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: