D931: merge: ensure that we always commit the mergestate
ryanmce (Ryan McElroy)
phabricator at mercurial-scm.org
Sat Oct 14 00:55:41 EDT 2017
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGc0a524f77e8a: merge: ensure that we always commit the mergestate (authored by ryanmce, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D931?vs=2500&id=2714
REVISION DETAIL
https://phab.mercurial-scm.org/D931
AFFECTED FILES
mercurial/merge.py
CHANGE DETAILS
diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -1537,30 +1537,32 @@
newactions.append((f, args, msg))
mergeactions = newactions
- # premerge
- tocomplete = []
- for f, args, msg in mergeactions:
- repo.ui.debug(" %s: %s -> m (premerge)\n" % (f, msg))
- z += 1
- progress(_updating, z, item=f, total=numupdates, unit=_files)
- if f == '.hgsubstate': # subrepo states need updating
- subrepo.submerge(repo, wctx, mctx, wctx.ancestor(mctx),
- overwrite, labels)
- continue
- wctx[f].audit()
- complete, r = ms.preresolve(f, wctx)
- if not complete:
- numupdates += 1
- tocomplete.append((f, args, msg))
+ try:
+ # premerge
+ tocomplete = []
+ for f, args, msg in mergeactions:
+ repo.ui.debug(" %s: %s -> m (premerge)\n" % (f, msg))
+ z += 1
+ progress(_updating, z, item=f, total=numupdates, unit=_files)
+ if f == '.hgsubstate': # subrepo states need updating
+ subrepo.submerge(repo, wctx, mctx, wctx.ancestor(mctx),
+ overwrite, labels)
+ continue
+ wctx[f].audit()
+ complete, r = ms.preresolve(f, wctx)
+ if not complete:
+ numupdates += 1
+ tocomplete.append((f, args, msg))
- # merge
- for f, args, msg in tocomplete:
- repo.ui.debug(" %s: %s -> m (merge)\n" % (f, msg))
- z += 1
- progress(_updating, z, item=f, total=numupdates, unit=_files)
- ms.resolve(f, wctx)
+ # merge
+ for f, args, msg in tocomplete:
+ repo.ui.debug(" %s: %s -> m (merge)\n" % (f, msg))
+ z += 1
+ progress(_updating, z, item=f, total=numupdates, unit=_files)
+ ms.resolve(f, wctx)
- ms.commit()
+ finally:
+ ms.commit()
unresolved = ms.unresolvedcount()
To: ryanmce, #hg-reviewers, mbthomas, durin42
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list