Mercurial > public > mercurial-scm > hg
diff mercurial/commands.py @ 45164:7f41e824a02b
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
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Thu, 09 Jul 2020 18:20:54 +0530 |
parents | 487df3676d2c |
children | 5178dd2233d0 |
line wrap: on
line diff
--- 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