This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6471

merge: reorder some initialization to make more sense
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG72522fe7fb95: merge: reorder some initialization to make more sense
Summary

This puts the closely related definitions of "pl", "p1", "p2", "pas"
close together, and moves the definition of "overwrite" away and
closer to where it's first used.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

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 rHG72522fe7fb95: merge: reorder some initialization to make more sense (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 (6 lines)

Diff 15319

mercurial/merge.py

partial = False partial = False
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]
pas = [None] pas = [None]
if ancestor is not None: if ancestor is not None:
pas = [repo[ancestor]] pas = [repo[ancestor]]
overwrite = force and not branchmerge
p2 = repo[node]
if pas[0] is None: if pas[0] is None:
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)
overwrite = force and not branchmerge
### check phase ### check phase
if not overwrite: if not overwrite:
if len(pl) > 1: if len(pl) > 1:
raise error.Abort(_("outstanding uncommitted merge")) raise error.Abort(_("outstanding uncommitted merge"))
ms = mergestate.read(repo) ms = mergestate.read(repo)
if list(ms.unresolved()): if list(ms.unresolved()):
raise error.Abort(_("outstanding merge conflicts")) raise error.Abort(_("outstanding merge conflicts"))
if branchmerge: if branchmerge: