This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8737

mergestate: remove unnecessary recordactions() from mergestate class
ClosedPublic

Authored by pulkit on Jul 14 2020, 8:30 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG7f41e824a02b: mergestate: remove unnecessary recordactions() from mergestate class
Summary

This function is updating dirstate which sounds like not something which a
method on mergestate class should do. Also this just calls another function.
Lets directly call that function and remove this reducing mergestate
responsibility a bit.

There was single caller which is updated.

Diff Detail

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

Event Timeline

pulkit created this revision.Jul 14 2020, 8:30 AM
pulkit added a commit: rHG7f41e824a02b: mergestate: remove unnecessary recordactions() from mergestate class.Jul 19 2020, 6:38 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG7f41e824a02b: mergestate: remove unnecessary recordactions() from mergestate class (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (3 lines)
Mmercurial/mergestate.py (5 lines)

Diff 21889

mercurial/commands.py

a = repo.wjoin(f) a = repo.wjoin(f)
try: try:
util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f)) util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f))
except OSError as inst: except OSError as inst:
if inst.errno != errno.ENOENT: if inst.errno != errno.ENOENT:
raise raise
ms.commit() ms.commit()
ms.recordactions() branchmerge = repo.dirstate.p2() != nullid
mergestatemod.recordupdates(repo, ms.actions(), branchmerge, None)
if not didwork and pats: if not didwork and pats:
hint = None hint = None
if not any([p for p in pats if p.find(b':') >= 0]): if not any([p for p in pats if p.find(b':') >= 0]):
pats = [b'path:%s' % p for p in pats] pats = [b'path:%s' % p for p in pats]
m = scmutil.match(wctx, pats, opts) m = scmutil.match(wctx, pats, opts)
for f in ms: for f in ms:
if not m(f): if not m(f):

mercurial/mergestate.py

ACTION_ADD_MODIFIED: [], ACTION_ADD_MODIFIED: [],
ACTION_GET: [], ACTION_GET: [],
} }
for f, (r, action) in pycompat.iteritems(self._results): for f, (r, action) in pycompat.iteritems(self._results):
if action is not None: if action is not None:
actions[action].append((f, None, b"merge result")) actions[action].append((f, None, b"merge result"))
return actions return actions
def recordactions(self):
"""record remove/add/get actions in the dirstate"""
branchmerge = self._repo.dirstate.p2() != nullid
recordupdates(self._repo, self.actions(), branchmerge, None)
def queueremove(self, f): def queueremove(self, f):
"""queues a file to be removed from the dirstate """queues a file to be removed from the dirstate
Meant for use by custom merge drivers.""" Meant for use by custom merge drivers."""
self._results[f] = 0, ACTION_REMOVE self._results[f] = 0, ACTION_REMOVE
def queueadd(self, f): def queueadd(self, f):
"""queues a file to be added to the dirstate """queues a file to be added to the dirstate