[PATCH 6 of 6] merge.mergestate: use mergectx wrapper
Siddharth Agarwal
sid0 at fb.com
Fri Oct 9 13:46:13 CDT 2015
# HG changeset patch
# User Siddharth Agarwal <sid0 at fb.com>
# Date 1444372511 25200
# Thu Oct 08 23:35:11 2015 -0700
# Node ID b9680b02e1d11a2b0888f17c627cf6e127e38205
# Parent 9e90b12aded615f7d16c042637a69f4b85847a9b
merge.mergestate: use mergectx wrapper
This is much cleaner to use.
diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -309,13 +309,11 @@ class mergestate(object):
f = self._repo.vfs('merge/' + hash)
self._repo.wwrite(dfile, f.read(), flags)
f.close()
- mergecr = filemerge.filemerge(self._repo, self._local, lfile, fcd, fco,
+ mergectx = filemerge.mergectx(self._repo, self._local, lfile, fcd, fco,
fca, labels=labels)
- try:
- next(mergecr) # premerge
- next(mergecr) # merge
- except StopIteration as e:
- r = e.args[0]
+ paused, r = mergectx.premerge()
+ if paused:
+ r = mergectx.merge()
if r is None:
# no real conflict
More information about the Mercurial-devel
mailing list