This is an archive of the discontinued Mercurial Phabricator instance.

Differential D931

merge: ensure that we always commit the mergestate
ClosedPublic

Authored by ryanmce on Oct 4 2017, 9:55 AM.

Details

Reviewers
mbthomas
durin42
Group Reviewers
hg-reviewers
Commits
rHGc0a524f77e8a: merge: ensure that we always commit the mergestate
Summary

In future patches, we may halt the merge process based on configuration or
user requests by raising exceptions. We need to ensure that the mergestate
is unconditionally committed even when such an exception is raised.

Depends on D930.

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

ryanmce created this revision.Oct 4 2017, 9:55 AM
mbthomas accepted this revision.Oct 6 2017, 5:08 AM
ryanmce updated this revision to Diff 2500.Oct 6 2017, 9:51 AM
quark set the repository for this revision to rHG Mercurial.Oct 7 2017, 1:14 PM
durin42 accepted this revision.Oct 14 2017, 12:29 AM
This revision is now accepted and ready to land.Oct 14 2017, 12:29 AM
Closed by commit rHGc0a524f77e8a: merge: ensure that we always commit the mergestate (authored by ryanmce). · Explain WhyOct 14 2017, 12:55 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (46 lines)

Diff 2714

mercurial/merge.py

# error out # error out
return updated, merged, removed, max(len(unresolvedf), 1) return updated, merged, removed, max(len(unresolvedf), 1)
newactions = [] newactions = []
for f, args, msg in mergeactions: for f, args, msg in mergeactions:
if f in unresolvedf: if f in unresolvedf:
newactions.append((f, args, msg)) newactions.append((f, args, msg))
mergeactions = newactions mergeactions = newactions
try:
# premerge # premerge
tocomplete = [] tocomplete = []
for f, args, msg in mergeactions: for f, args, msg in mergeactions:
repo.ui.debug(" %s: %s -> m (premerge)\n" % (f, msg)) repo.ui.debug(" %s: %s -> m (premerge)\n" % (f, msg))
z += 1 z += 1
progress(_updating, z, item=f, total=numupdates, unit=_files) progress(_updating, z, item=f, total=numupdates, unit=_files)
if f == '.hgsubstate': # subrepo states need updating if f == '.hgsubstate': # subrepo states need updating
subrepo.submerge(repo, wctx, mctx, wctx.ancestor(mctx), subrepo.submerge(repo, wctx, mctx, wctx.ancestor(mctx),
overwrite, labels) overwrite, labels)
continue continue
wctx[f].audit() wctx[f].audit()
complete, r = ms.preresolve(f, wctx) complete, r = ms.preresolve(f, wctx)
if not complete: if not complete:
numupdates += 1 numupdates += 1
tocomplete.append((f, args, msg)) tocomplete.append((f, args, msg))
# merge # merge
for f, args, msg in tocomplete: for f, args, msg in tocomplete:
repo.ui.debug(" %s: %s -> m (merge)\n" % (f, msg)) repo.ui.debug(" %s: %s -> m (merge)\n" % (f, msg))
z += 1 z += 1
progress(_updating, z, item=f, total=numupdates, unit=_files) progress(_updating, z, item=f, total=numupdates, unit=_files)
ms.resolve(f, wctx) ms.resolve(f, wctx)
finally:
ms.commit() ms.commit()
unresolved = ms.unresolvedcount() unresolved = ms.unresolvedcount()
if usemergedriver and not unresolved and ms.mdstate() != 's': if usemergedriver and not unresolved and ms.mdstate() != 's':
if not driverconclude(repo, ms, wctx, labels=labels): if not driverconclude(repo, ms, wctx, labels=labels):
# XXX setting unresolved to at least 1 is a hack to make sure we # XXX setting unresolved to at least 1 is a hack to make sure we
# error out # error out
unresolved = max(unresolved, 1) unresolved = max(unresolved, 1)