[Updated] D11857: mergestate: inline `_resolve()` into `resolve()`
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Wed Dec 8 08:17:39 UTC 2021
Closed by commit rHGf9bc36863923: mergestate: inline `_resolve()` into `resolve()` (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D11857?vs=31309&id=31381
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D11857/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D11857
AFFECTED FILES
mercurial/mergestate.py
CHANGE DETAILS
diff --git a/mercurial/mergestate.py b/mercurial/mergestate.py
--- a/mercurial/mergestate.py
+++ b/mercurial/mergestate.py
@@ -313,10 +313,10 @@
"""return extras stored with the mergestate for the given filename"""
return self._stateextras[filename]
- def _resolve(self, dfile, wctx):
- """rerun merge process for file path `dfile`.
- Returns the return value of merge obtained from filemerge._filemerge().
- """
+ def resolve(self, dfile, wctx):
+ """run merge process for dfile
+
+ Returns the exit code of the merge."""
if self[dfile] in (
MERGE_RECORD_RESOLVED,
LEGACY_RECORD_DRIVER_RESOLVED,
@@ -405,12 +405,6 @@
return merge_ret
- def resolve(self, dfile, wctx):
- """run merge process for dfile
-
- Returns the exit code of the merge."""
- return self._resolve(dfile, wctx)
-
def counts(self):
"""return counts for updated, merged and removed files in this
session"""
To: martinvonz, #hg-reviewers, Alphare
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20211208/7256547b/attachment-0002.html>
More information about the Mercurial-patches
mailing list