Mercurial > public > mercurial-scm > hg

diff hgext/sparse.py @ 33323:252500520d60

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sparse: refactor update actions filtering and call from core merge.calculateupdates() now filters the update actions through sparse by default. The filtering no-ops if sparse isn't enabled or no sparse config is defined. The function has been refactored to behave more like a filter instead of a wrapper of merge.calculateupdates(). We should arguably take sparse into account earlier in merge.calculateupdates(). This patch preserves the old behavior of applying sparse at the end of update calculation, which is the simplest and safest approach.
author Gregory Szorc <gregory.szorc@gmail.com>
date Thu, 06 Jul 2017 16:29:31 -0700
parents fa6c2c3064fd
children 33d0859c37bd
line wrap: on
line diff
--- a/hgext/sparse.py	Thu Jul 06 16:17:35 2017 -0700
+++ b/hgext/sparse.py	Thu Jul 06 16:29:31 2017 -0700
@@ -102,7 +102,6 @@
 command = registrar.command(cmdtable)
 
 def uisetup(ui):
-    _setupupdates(ui)
     _setupcommit(ui)
 
 def extsetup(ui):
@@ -136,10 +135,6 @@
         raise AttributeError(_("type '%s' has no property '%s'") % (origcls,
                              propname))
 
-def _setupupdates(ui):
-    extensions.wrapfunction(mergemod, 'calculateupdates',
-                            sparse.calculateupdates)
-
 def _setupcommit(ui):
     def _refreshoncommit(orig, self, node):
         """Refresh the checkout when commits touch .hgsparse