mercurial/dirstate.py
changeset 8676 acd69fc201a5
parent 8675 fb74e1e69da0
child 8677 34df078b8b1b
equal deleted inserted replaced
8675:fb74e1e69da0 8676:acd69fc201a5
   423         '''
   423         '''
   424 
   424 
   425         def fwarn(f, msg):
   425         def fwarn(f, msg):
   426             self._ui.warn('%s: %s\n' % (self.pathto(f), msg))
   426             self._ui.warn('%s: %s\n' % (self.pathto(f), msg))
   427             return False
   427             return False
   428         badfn = fwarn
       
   429         if hasattr(match, 'bad'):
       
   430             badfn = match.bad
       
   431 
   428 
   432         def badtype(f, mode):
   429         def badtype(f, mode):
   433             kind = _('unknown')
   430             kind = _('unknown')
   434             if stat.S_ISCHR(mode): kind = _('character device')
   431             if stat.S_ISCHR(mode): kind = _('character device')
   435             elif stat.S_ISBLK(mode): kind = _('block device')
   432             elif stat.S_ISBLK(mode): kind = _('block device')
   448             # if unknown and ignored are False, skip step 2
   445             # if unknown and ignored are False, skip step 2
   449             ignore = util.always
   446             ignore = util.always
   450             dirignore = util.always
   447             dirignore = util.always
   451 
   448 
   452         matchfn = match.matchfn
   449         matchfn = match.matchfn
       
   450         badfn = match.bad
   453         dmap = self._map
   451         dmap = self._map
   454         normpath = util.normpath
   452         normpath = util.normpath
   455         normalize = self.normalize
   453         normalize = self.normalize
   456         listdir = osutil.listdir
   454         listdir = osutil.listdir
   457         lstat = os.lstat
   455         lstat = os.lstat