# HG changeset patch # User Martin von Zweigbergk # Date 1425419406 28800 # Node ID cbe9d50d9e650490fb6942a8ff7f0ab64a99166f # Parent 96cccf1e325748ff592d450810e66a1dcf960499 treemanifest: make filesnotin() faster Same rationale as the previous change. diff -r 96cccf1e3257 -r cbe9d50d9e65 mercurial/manifest.py --- a/mercurial/manifest.py Thu Feb 19 17:13:35 2015 -0800 +++ b/mercurial/manifest.py Tue Mar 03 13:50:06 2015 -0800 @@ -482,8 +482,20 @@ def filesnotin(self, m2): '''Set of files in this manifest that are not in the other''' - files = set(self.iterkeys()) - files.difference_update(m2.iterkeys()) + files = set() + def _filesnotin(t1, t2): + for d, m1 in t1._dirs.iteritems(): + if d in t2._dirs: + m2 = t2._dirs[d] + _filesnotin(m1, m2) + else: + files.update(m1.iterkeys()) + + for fn in t1._files.iterkeys(): + if fn not in t2._files: + files.add(t1._subpath(fn)) + + _filesnotin(self, m2) return files @propertycache