# HG changeset patch # User Pulkit Goyal <7895pulkit@gmail.com> # Date 1594299054 -19800 # Node ID 7f41e824a02bd833f7e466af9bbb6774a26a4abd # Parent f69253935bf8bd39946b2872205ab410b9d79ca1 mergestate: remove unnecessary recordactions() from mergestate class 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. Differential Revision: https://phab.mercurial-scm.org/D8737 diff -r f69253935bf8 -r 7f41e824a02b mercurial/commands.py --- a/mercurial/commands.py Thu Jul 09 17:05:41 2020 +0530 +++ b/mercurial/commands.py Thu Jul 09 18:20:54 2020 +0530 @@ -6129,7 +6129,8 @@ raise ms.commit() - ms.recordactions() + branchmerge = repo.dirstate.p2() != nullid + mergestatemod.recordupdates(repo, ms.actions(), branchmerge, None) if not didwork and pats: hint = None diff -r f69253935bf8 -r 7f41e824a02b mercurial/mergestate.py --- a/mercurial/mergestate.py Thu Jul 09 17:05:41 2020 +0530 +++ b/mercurial/mergestate.py Thu Jul 09 18:20:54 2020 +0530 @@ -756,11 +756,6 @@ actions[action].append((f, None, b"merge result")) 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): """queues a file to be removed from the dirstate