--- a/mercurial/ignore.py	Sat May 16 15:45:06 2015 -0700
+++ b/mercurial/ignore.py	Sat May 16 15:45:46 2015 -0700
@@ -11,7 +11,7 @@
 
 _commentre = None
 
-def readignorefile(filepath, warn):
+def readpatternfile(filepath, warn):
     '''parse a pattern file, returning a list of
     patterns. These patterns should be given to compile()
     to be validated and converted into a match function.'''
@@ -64,7 +64,7 @@
         if f in pats:
             continue
         try:
-            pats[f] = readignorefile(f, warn)
+            pats[f] = readpatternfile(f, warn)
         except IOError, inst:
             warn(_("skipping unreadable ignore file '%s': %s\n") %
                  (f, inst.strerror))