##// END OF EJS Templates
ignore: process hgignore files in deterministic order...
Bryan O'Sullivan -
r18089:0127366d default
parent child Browse files
Show More
@@ -70,7 +70,7 b' def readpats(root, files, warn):'
70 if f != files[0]:
70 if f != files[0]:
71 warn(_("skipping unreadable ignore file '%s': %s\n") %
71 warn(_("skipping unreadable ignore file '%s': %s\n") %
72 (f, inst.strerror))
72 (f, inst.strerror))
73 return pats
73 return [(f, pats[f]) for f in files if f in pats]
74
74
75 def ignore(root, files, warn):
75 def ignore(root, files, warn):
76 '''return matcher covering patterns in 'files'.
76 '''return matcher covering patterns in 'files'.
@@ -95,7 +95,7 b' def ignore(root, files, warn):'
95 pats = readpats(root, files, warn)
95 pats = readpats(root, files, warn)
96
96
97 allpats = []
97 allpats = []
98 for patlist in pats.values():
98 for f, patlist in pats:
99 allpats.extend(patlist)
99 allpats.extend(patlist)
100 if not allpats:
100 if not allpats:
101 return util.never
101 return util.never
@@ -104,7 +104,7 b' def ignore(root, files, warn):'
104 ignorefunc = match.match(root, '', [], allpats)
104 ignorefunc = match.match(root, '', [], allpats)
105 except util.Abort:
105 except util.Abort:
106 # Re-raise an exception where the src is the right file
106 # Re-raise an exception where the src is the right file
107 for f, patlist in pats.iteritems():
107 for f, patlist in pats:
108 try:
108 try:
109 match.match(root, '', [], patlist)
109 match.match(root, '', [], patlist)
110 except util.Abort, inst:
110 except util.Abort, inst:
General Comments 0
You need to be logged in to leave comments. Login now