Mercurial > public > mercurial-scm > hg-stable
diff mercurial/merge.py @ 45504:2c10876bb320
mergestate: make clean() only be about creating a clean mergestate
This is similar to the previous patch, but moves the separation one
step further out, to `merge.py`.
Differential Revision: https://phab.mercurial-scm.org/D9034
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 17 Sep 2020 09:23:21 -0700 |
| parents | c4f14db3da1d |
| children | 19590b126764 |
line wrap: on
line diff
--- a/mercurial/merge.py Wed Sep 16 10:09:37 2020 -0700 +++ b/mercurial/merge.py Thu Sep 17 09:23:21 2020 -0700 @@ -1398,9 +1398,8 @@ _prefetchfiles(repo, mctx, mresult) updated, merged, removed = 0, 0, 0 - ms = mergestatemod.mergestate.clean( - repo, wctx.p1().node(), mctx.node(), labels - ) + ms = mergestatemod.mergestate.clean(repo) + ms.start(wctx.p1().node(), mctx.node(), labels) for f, op in pycompat.iteritems(mresult.commitinfo): # the other side of filenode was choosen while merging, store this in