This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6472

merge: simplify initialization of "pas"
ClosedPublic

Authored by martinvonz on Jun 1 2019, 3:32 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGa5b5ecff5f37: merge: simplify initialization of "pas"
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.Jun 1 2019, 3:32 AM
pulkit accepted this revision.Jun 3 2019, 9:51 AM
Closed by commit rHGa5b5ecff5f37: merge: simplify initialization of "pas" (authored by martinvonz). · Explain WhyJun 3 2019, 10:06 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (3 lines)

Diff 15330

mercurial/merge.py

else: else:
partial = True partial = True
with repo.wlock(): with repo.wlock():
if wc is None: if wc is None:
wc = repo[None] wc = repo[None]
pl = wc.parents() pl = wc.parents()
p1 = pl[0] p1 = pl[0]
p2 = repo[node] p2 = repo[node]
pas = [None]
if ancestor is not None: if ancestor is not None:
pas = [repo[ancestor]] pas = [repo[ancestor]]
if pas[0] is None: else:
if repo.ui.configlist('merge', 'preferancestor') == ['*']: if repo.ui.configlist('merge', 'preferancestor') == ['*']:
cahs = repo.changelog.commonancestorsheads(p1.node(), p2.node()) cahs = repo.changelog.commonancestorsheads(p1.node(), p2.node())
pas = [repo[anc] for anc in (sorted(cahs) or [nullid])] pas = [repo[anc] for anc in (sorted(cahs) or [nullid])]
else: else:
pas = [p1.ancestor(p2, warn=branchmerge)] pas = [p1.ancestor(p2, warn=branchmerge)]
fp1, fp2, xp1, xp2 = p1.node(), p2.node(), bytes(p1), bytes(p2) fp1, fp2, xp1, xp2 = p1.node(), p2.node(), bytes(p1), bytes(p2)