This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8569

merge: get mergestate from context instead of directly
AbandonedPublic

Authored by durin42 on May 18 2020, 6:08 PM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Summary

This causes hg fix (and probably others) to use the new in-memory mergestate
object instead of the on-disk one, which may incidentally correct some
defects.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

durin42 created this revision.May 18 2020, 6:08 PM
durin42 updated this revision to Diff 21613.Jun 11 2020, 12:07 PM
marmoute requested changes to this revision.Jul 31 2020, 12:03 PM
marmoute added a subscriber: marmoute.

According to IRC discussion, this series is not ready for review, so moving it out of yadda.

This revision now requires changes to proceed.Jul 31 2020, 12:03 PM
durin42 abandoned this revision.Oct 2 2020, 2:49 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (7 lines)

Diff 21613

mercurial/merge.py

(updated, merged, removed, unresolved) that describes how many (updated, merged, removed, unresolved) that describes how many
files were affected by the update, and filedata is as described in files were affected by the update, and filedata is as described in
batchget. batchget.
""" """
_prefetchfiles(repo, mctx, actions) _prefetchfiles(repo, mctx, actions)
updated, merged, removed = 0, 0, 0 updated, merged, removed = 0, 0, 0
ms = mergestatemod.mergestate.clean( ms = wctx.mergestate(clean=True)
repo, wctx.p1().node(), mctx.node(), labels ms.reset(wctx.p1().node(), mctx.node(), labels)
)
# add ACTION_GET_OTHER_AND_STORE to mergestate # add ACTION_GET_OTHER_AND_STORE to mergestate
for e in actions[mergestatemod.ACTION_GET_OTHER_AND_STORE]: for e in actions[mergestatemod.ACTION_GET_OTHER_AND_STORE]:
ms.addmergedother(e[0]) ms.addmergedother(e[0])
moves = [] moves = []
for m, l in actions.items(): for m, l in actions.items():
l.sort() l.sort()
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 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(_(b"outstanding uncommitted merge")) raise error.Abort(_(b"outstanding uncommitted merge"))
ms = mergestatemod.mergestate.read(repo) ms = wc.mergestate()
if ms.unresolvedcount(): if ms.unresolvedcount():
raise error.Abort( raise error.Abort(
_(b"outstanding merge conflicts"), _(b"outstanding merge conflicts"),
hint=_(b"use 'hg resolve' to resolve"), hint=_(b"use 'hg resolve' to resolve"),
) )
if branchmerge: if branchmerge:
if pas == [p2]: if pas == [p2]:
raise error.Abort( raise error.Abort(