This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2250

merge: coerce nodes to bytes, not str
ClosedPublic

Authored by durin42 on Feb 14 2018, 12:35 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG187f2474bc11: merge: coerce nodes to bytes, not str
rHG82ae565f0d8c: merge: coerce nodes to bytes, not str

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 created this revision.Feb 14 2018, 12:35 AM
indygreg accepted this revision.Feb 14 2018, 12:55 AM
This revision is now accepted and ready to land.Feb 14 2018, 12:55 AM
Closed by commit rHG82ae565f0d8c: merge: coerce nodes to bytes, not str (authored by durin42). · Explain WhyFeb 14 2018, 12:58 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (2 lines)

Diff 5685

mercurial/merge.py

p2 = repo[node] 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(), str(p1), str(p2) fp1, fp2, xp1, xp2 = p1.node(), p2.node(), bytes(p1), bytes(p2)
### 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"))