Mercurial > public > mercurial-scm > hg-stable
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 45503:08c6d6962b2a | 45504:2c10876bb320 |
|---|---|
| 1396 """ | 1396 """ |
| 1397 | 1397 |
| 1398 _prefetchfiles(repo, mctx, mresult) | 1398 _prefetchfiles(repo, mctx, mresult) |
| 1399 | 1399 |
| 1400 updated, merged, removed = 0, 0, 0 | 1400 updated, merged, removed = 0, 0, 0 |
| 1401 ms = mergestatemod.mergestate.clean( | 1401 ms = mergestatemod.mergestate.clean(repo) |
| 1402 repo, wctx.p1().node(), mctx.node(), labels | 1402 ms.start(wctx.p1().node(), mctx.node(), labels) |
| 1403 ) | |
| 1404 | 1403 |
| 1405 for f, op in pycompat.iteritems(mresult.commitinfo): | 1404 for f, op in pycompat.iteritems(mresult.commitinfo): |
| 1406 # the other side of filenode was choosen while merging, store this in | 1405 # the other side of filenode was choosen while merging, store this in |
| 1407 # mergestate so that it can be reused on commit | 1406 # mergestate so that it can be reused on commit |
| 1408 ms.addcommitinfo(f, op) | 1407 ms.addcommitinfo(f, op) |