[PATCH 1 of 5 V2] revlog: return lazy set from findcommonmissing

Durham Goode durham at fb.com
Wed Nov 13 15:31:02 CST 2013


# HG changeset patch
# User Durham Goode <durham at fb.com>
# Date 1384216802 28800
#      Mon Nov 11 16:40:02 2013 -0800
# Node ID e243df7f91498e4423c5854c3f38322854304760
# Parent  aa80446aacc3b1574211649cd8f190250b6b04b3
revlog: return lazy set from findcommonmissing

When computing the commonmissing, it greedily computes the entire set
immediately. On a large repo where the majority of history is irrelevant, this
causes a significant slow down.

Replacing it with a lazy set makes amend go from 11 seconds to 8.7 seconds.

diff --git a/mercurial/revlog.py b/mercurial/revlog.py
--- a/mercurial/revlog.py
+++ b/mercurial/revlog.py
@@ -401,7 +401,29 @@
         heads = [self.rev(n) for n in heads]
 
         # we want the ancestors, but inclusive
-        has = set(self.ancestors(common))
+        class lazyset(object):
+            def __init__(self, lazyvalues):
+                self.addedvalues = set()
+                self.lazyvalues = lazyvalues
+
+            def __contains__(self, value):
+                return value in self.addedvalues or value in self.lazyvalues
+
+            def __iter__(self):
+                added = self.addedvalues
+                for r in added:
+                    yield r
+                for r in self.lazyvalues:
+                    if not r in added:
+                        yield r
+
+            def add(self, value):
+                self.addedvalues.add(value)
+
+            def update(self, values):
+                self.addedvalues.update(values)
+
+        has = lazyset(self.ancestors(common))
         has.add(nullrev)
         has.update(common)
 


More information about the Mercurial-devel mailing list