[PATCH 3 of 3] Fix ignore regression

Bryan O'Sullivan bos at serpentine.com
Sat Sep 17 02:38:33 CDT 2005


# HG changeset patch
# User Bryan O'Sullivan <bos at serpentine.com>
# Node ID 9ab14ca22e378a26c5c70406d2be9992000e16c0
# Parent  fc3b41570082cea350ad4017e2b715a880749522
Fix ignore regression.
An empty or non-existent hgignore file must return False (don't
ignore) for everything.

diff -r fc3b41570082 -r 9ab14ca22e37 mercurial/dirstate.py
--- a/mercurial/dirstate.py	Sat Sep 17 07:27:27 2005
+++ b/mercurial/dirstate.py	Sat Sep 17 07:37:14 2005
@@ -84,8 +84,12 @@
         if self.blockignore:
             return False
         if not self.ignorefunc:
-            files, self.ignorefunc, anypats = util.matcher(self.root,
-                                                           inc=self.hgignore())
+            ignore = self.hgignore()
+            if ignore:
+                files, self.ignorefunc, anypats = util.matcher(self.root,
+                                                               inc=ignore)
+            else:
+                self.ignorefunc = util.never
         return self.ignorefunc(fn)
 
     def __del__(self):


More information about the Mercurial mailing list