Consolidated some code.

pre_commit/git.py

@@ -1,14 +1,12 @@
+import functools
 import os
-import re
 import pkg_resources
+import re
 from plumbum import local
 
 from pre_commit.util import memoize_by_cwd
 
 
-def _get_root_original():
-    return local['git']['rev-parse', '--show-toplevel']().strip()
-
 def _get_root_new():
     path = os.getcwd()
     while len(path) > 1:
@@ -22,7 +20,6 @@ def _get_root_new():
 @memoize_by_cwd
 def get_root():
     return _get_root_new()
-    return local['git']['rev-parse', '--show-toplevel']().strip()
 
 
 @memoize_by_cwd
@@ -50,23 +47,24 @@ def get_staged_files():
     return local['git']['diff', '--staged', '--name-only']().splitlines()
 
 
-@memoize_by_cwd
-def get_staged_files_matching(expr):
-    regex = re.compile(expr)
-    return set(
-        filename for filename in get_staged_files() if regex.search(filename)
-    )
-
-
 @memoize_by_cwd
 def get_all_files():
     return local['git']['ls-files']().splitlines()
 
 
-# Smell: this is duplicated above
+def get_files_matching(all_file_list_strategy):
-@memoize_by_cwd
+    @functools.wraps(all_file_list_strategy)
-def get_all_files_matching(expr):
+    @memoize_by_cwd
-    regex = re.compile(expr)
+    def wrapper(expr):
-    return set(
+        regex = re.compile(expr)
-        filename for filename in get_all_files() if regex.search(filename)
+        return set(
-    )
+            filename
+            for filename in all_file_list_strategy()
+            if regex.search(filename)
+        )
+    return wrapper
+
+
+
+get_staged_files_matching = get_files_matching(get_staged_files)
+get_all_files_matching = get_files_matching(get_all_files)

pre_commit/util.py

@@ -22,15 +22,16 @@ class cached_property(object):
 
 def memoize_by_cwd(func):
     """Memoize a function call based on os.getcwd()."""
-    cache = {}
     @functools.wraps(func)
     def wrapper(*args):
         cwd = os.getcwd()
         key = (cwd,) + args
         try:
-            return cache[key]
+            return wrapper._cache[key]
         except KeyError:
-            ret = cache[key] = func(*args)
+            ret = wrapper._cache[key] = func(*args)
             return ret
 
+    wrapper._cache = {}
+
     return wrapper