##// END OF EJS Templates
Fix dirstate.changes for ignored directories....
Bryan O'Sullivan -
r1276:25e5b108 default
parent child Browse files
Show More
@@ -399,8 +399,19 b' class dirstate:'
399 for src, fn in self.walkhelper(files, statmatch, dc):
399 for src, fn in self.walkhelper(files, statmatch, dc):
400 pass
400 pass
401
401
402 # there may be patterns in the .hgignore file that prevent us
403 # from examining entire directories in the dirstate map, so we
404 # go back and explicitly examine any matching files we've
405 # ignored
406 unexamined = [fn for fn in dc.iterkeys()
407 if self.ignore(fn) and match(fn)]
408
409 for src, fn in self.walkhelper(unexamined, statmatch, dc):
410 pass
411
402 # anything left in dc didn't exist in the filesystem
412 # anything left in dc didn't exist in the filesystem
403 for fn, c in [(fn, c) for fn, c in dc.items() if match(fn)]:
413 for fn, c in dc.iteritems():
414 if not match(fn): continue
404 if c[0] == 'r':
415 if c[0] == 'r':
405 removed.append(fn)
416 removed.append(fn)
406 else:
417 else:
General Comments 0
You need to be logged in to leave comments. Login now