| indygreg |
| hg-reviewers |
This is similar to the previous patch, but moves the separation one
step further out, to merge.py.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/merge.py (5 lines) | |||
| M | mercurial/mergestate.py (3 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| (updated, merged, removed, unresolved) that describes how many | (updated, merged, removed, unresolved) that describes how many | ||||
| files were affected by the update, and filedata is as described in | files were affected by the update, and filedata is as described in | ||||
| batchget. | batchget. | ||||
| """ | """ | ||||
| _prefetchfiles(repo, mctx, mresult) | _prefetchfiles(repo, mctx, mresult) | ||||
| updated, merged, removed = 0, 0, 0 | updated, merged, removed = 0, 0, 0 | ||||
| ms = mergestatemod.mergestate.clean( | ms = mergestatemod.mergestate.clean(repo) | ||||
| repo, wctx.p1().node(), mctx.node(), labels | ms.start(wctx.p1().node(), mctx.node(), labels) | ||||
| ) | |||||
| for f, op in pycompat.iteritems(mresult.commitinfo): | for f, op in pycompat.iteritems(mresult.commitinfo): | ||||
| # the other side of filenode was choosen while merging, store this in | # the other side of filenode was choosen while merging, store this in | ||||
| # mergestate so that it can be reused on commit | # mergestate so that it can be reused on commit | ||||
| ms.addcommitinfo(f, op) | ms.addcommitinfo(f, op) | ||||
| numupdates = mresult.len() - mresult.len(mergeresult.NO_OP_ACTIONS) | numupdates = mresult.len() - mresult.len(mergeresult.NO_OP_ACTIONS) | ||||
| progress = repo.ui.makeprogress( | progress = repo.ui.makeprogress( | ||||
| The resolve command transitions between 'u' and 'r' for conflicts and | The resolve command transitions between 'u' and 'r' for conflicts and | ||||
| 'pu' and 'pr' for path conflicts. | 'pu' and 'pr' for path conflicts. | ||||
| ''' | ''' | ||||
| statepathv1 = b'merge/state' | statepathv1 = b'merge/state' | ||||
| statepathv2 = b'merge/state2' | statepathv2 = b'merge/state2' | ||||
| @staticmethod | @staticmethod | ||||
| def clean(repo, node=None, other=None, labels=None): | def clean(repo): | ||||
| """Initialize a brand new merge state, removing any existing state on | """Initialize a brand new merge state, removing any existing state on | ||||
| disk.""" | disk.""" | ||||
| ms = mergestate(repo) | ms = mergestate(repo) | ||||
| ms.reset() | ms.reset() | ||||
| ms.start(node, other, labels) | |||||
| return ms | return ms | ||||
| @staticmethod | @staticmethod | ||||
| def read(repo): | def read(repo): | ||||
| """Initialize the merge state, reading it from disk.""" | """Initialize the merge state, reading it from disk.""" | ||||
| ms = mergestate(repo) | ms = mergestate(repo) | ||||
| ms._read() | ms._read() | ||||
| return ms | return ms | ||||