Mercurial > hg

diff mercurial/sparse.py @ 45525:590a840fa367

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mergestate: define NO_OP_ACTION in module scope instead of inside mergeresult This makes sure it isn't intended to be overridden by subclasses. Thanks to Yuya for the nice suggestion. Differential Revision: https://phab.mercurial-scm.org/D9025
author Pulkit Goyal <7895pulkit@gmail.com>
date Wed, 16 Sep 2020 18:09:32 +0530
parents 14b3dbfa4eeb
children d55b71393907
line wrap: on
line diff
--- a/mercurial/sparse.py	Wed Sep 09 16:49:19 2020 +0530
+++ b/mercurial/sparse.py	Wed Sep 16 18:09:32 2020 +0530
@@ -399,7 +399,7 @@
             temporaryfiles.append(file)
             prunedactions[file] = action
         elif branchmerge:
-            if type not in mergemod.mergeresult.NO_OP_ACTIONS:
+            if type not in mergestatemod.NO_OP_ACTIONS:
                 temporaryfiles.append(file)
                 prunedactions[file] = action
         elif type == mergestatemod.ACTION_FORGET: