martinvonz created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches.
REVISION SUMMARY The caller is now trivial, so the indirection is pointless. REPOSITORY rHG Mercurial BRANCH default 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 Cc: mercurial-patches, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
