Patchwork [4,of,8] revset: added lazyset implementation to _matchfiles

login
register
mail settings
Submitter Lucas Moscovicz
Date Feb. 11, 2014, 9:54 p.m.
Message ID <7a047e944f639aa3663f.1392155682@dev1037.prn2.facebook.com>
Download mbox | patch
Permalink /patch/3594/
State Accepted
Commit 8dabcc889e3329ff3c5f2cbd4eda859a7712124c
Headers show

Comments

Lucas Moscovicz - Feb. 11, 2014, 9:54 p.m.
# HG changeset patch
# User Lucas Moscovicz <lmoscovicz@fb.com>
# Date 1391532667 28800
#      Tue Feb 04 08:51:07 2014 -0800
# Node ID 7a047e944f639aa3663f40e4f922ec9df9eb0c82
# Parent  f34fe1564f148a4c6e70e2e0e1409f8f723cf772
revset: added lazyset implementation to _matchfiles

Performance Benchmarking:

$ time hg log -qr "first(file(README))"
0:9117c6561b0b

real  0m2.234s
user  0m2.180s
sys 0m0.044s

$ time ./hg log -qr "first(file(README))"
0:9117c6561b0b

real  0m0.172s
user  0m0.129s
sys 0m0.042s

Patch

diff --git a/mercurial/revset.py b/mercurial/revset.py
--- a/mercurial/revset.py
+++ b/mercurial/revset.py
@@ -857,10 +857,10 @@ 
             hasset = True
     if not default:
         default = 'glob'
-    m = None
-    s = []
-    for r in subset:
-        c = repo[r]
+
+    def matches(x):
+        m = None
+        c = repo[x]
         if not m or (hasset and rev is None):
             ctx = c
             if rev is not None:
@@ -869,9 +869,10 @@ 
                                exclude=exc, ctx=ctx, default=default)
         for f in c.files():
             if m(f):
-                s.append(r)
-                break
-    return baseset(s)
+                return True
+        return False
+
+    return lazyset(subset, matches)
 
 def hasfile(repo, subset, x):
     """``file(pattern)``