This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11857

mergestate: inline `_resolve()` into `resolve()`
ClosedPublic

Authored by martinvonz on Dec 4 2021, 2:06 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGf9bc36863923: mergestate: inline `_resolve()` into `resolve()`
Summary

The caller is now trivial, so the indirection is pointless.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Dec 4 2021, 2:06 AM
Alphare accepted this revision.Dec 7 2021, 10:27 AM
This revision is now accepted and ready to land.Dec 7 2021, 10:27 AM
martinvonz added a commit: rHGf9bc36863923: mergestate: inline `_resolve()` into `resolve()`.Dec 8 2021, 3:17 AM
Closed by commit rHGf9bc36863923: mergestate: inline `_resolve()` into `resolve()` (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/mergestate.py (14 lines)

Diff 31309

mercurial/mergestate.py

def allextras(self): def allextras(self):
"""return all extras information stored with the mergestate""" """return all extras information stored with the mergestate"""
return self._stateextras return self._stateextras
def extras(self, filename): def extras(self, filename):
"""return extras stored with the mergestate for the given filename""" """return extras stored with the mergestate for the given filename"""
return self._stateextras[filename] return self._stateextras[filename]
def _resolve(self, dfile, wctx): def resolve(self, dfile, wctx):
"""rerun merge process for file path `dfile`. """run merge process for dfile
Returns the return value of merge obtained from filemerge._filemerge().
""" Returns the exit code of the merge."""
if self[dfile] in ( if self[dfile] in (
MERGE_RECORD_RESOLVED, MERGE_RECORD_RESOLVED,
LEGACY_RECORD_DRIVER_RESOLVED, LEGACY_RECORD_DRIVER_RESOLVED,
): ):
return 0 return 0
stateentry = self._state[dfile] stateentry = self._state[dfile]
state, localkey, lfile, afile, anode, ofile, onode, flags = stateentry state, localkey, lfile, afile, anode, ofile, onode, flags = stateentry
octx = self._repo[self._other] octx = self._repo[self._other]
action = ACTION_ADD_MODIFIED action = ACTION_ADD_MODIFIED
else: else:
action = ACTION_ADD action = ACTION_ADD
# else: regular merges (no action necessary) # else: regular merges (no action necessary)
self._results[dfile] = merge_ret, action self._results[dfile] = merge_ret, action
return merge_ret 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): def counts(self):
"""return counts for updated, merged and removed files in this """return counts for updated, merged and removed files in this
session""" session"""
updated, merged, removed = 0, 0, 0 updated, merged, removed = 0, 0, 0
for r, action in pycompat.itervalues(self._results): for r, action in pycompat.itervalues(self._results):
if r is None: if r is None:
updated += 1 updated += 1
elif r == 0: elif r == 0: