[PATCH 2 of 2] localrepo: optimize internode status calls using withflags
Jesse Glick
typrase at gmail.com
Fri May 4 14:57:58 CDT 2012
# HG changeset patch
# User Jesse Glick <jesse.glick at oracle.com>
# Date 1336161405 14400
# Branch stable
# Node ID 66010e1680e7e39973f54f6e6e333880a483ce6d
# Parent 80278d4269997e8dee1093e5976db5e4c56acf79
localrepo: optimize internode status calls using withflags
Introduce manifestdict.withflags() to get a set of all files which have any
flags set, since these are likely to be a minority. Otherwise checking .flags()
for every file is a lot of dictionary lookups and is quite slow.
diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -1421,10 +1421,11 @@
mf2 = mfmatches(ctx2)
modified, added, clean = [], [], []
+ withflags = mf1.withflags() | mf2.withflags()
for fn in mf2:
if fn in mf1:
if (fn not in deleted and
- (mf1.flags(fn) != mf2.flags(fn) or
+ ((fn in withflags and mf1.flags(fn) != mf2.flags(fn)) or
(mf1[fn] != mf2[fn] and
(mf2[fn] or ctx1[fn].cmp(ctx2[fn]))))):
modified.append(fn)
diff --git a/mercurial/manifest.py b/mercurial/manifest.py
--- a/mercurial/manifest.py
+++ b/mercurial/manifest.py
@@ -19,6 +19,8 @@
self._flags = flags
def flags(self, f):
return self._flags.get(f, "")
+ def withflags(self):
+ return set(self._flags.keys())
def set(self, f, flags):
self._flags[f] = flags
def copy(self):
More information about the Mercurial-devel
mailing list