mercurial/dirstate.py
changeset 1268 c631f26346ca
parent 1245 d0a960b437a8
child 1270 fc3b41570082
equal deleted inserted replaced
1266:703783bc09c4 1268:c631f26346ca
   331             def checkappend(l, fn):
   331             def checkappend(l, fn):
   332                 if match is util.always or match(fn):
   332                 if match is util.always or match(fn):
   333                     l.append(fn)
   333                     l.append(fn)
   334 
   334 
   335             if not s or stat.S_ISDIR(s.st_mode):
   335             if not s or stat.S_ISDIR(s.st_mode):
   336                 return self.ignore(fn) and False or match(fn)
   336                 if self.ignore(fn): return False
       
   337                 return match(fn)
   337 
   338 
   338             if not stat.S_ISREG(s.st_mode):
   339             if not stat.S_ISREG(s.st_mode):
   339                 return False
   340                 return False
   340             c = dc.pop(fn, None)
   341             c = dc.pop(fn, None)
   341             if c:
   342             if c: