Show More
@@ -434,12 +434,15 b' class dirstate(object):' | |||||
434 | self._ui.warn(_('%s: unsupported file type (type is %s)\n') |
|
434 | self._ui.warn(_('%s: unsupported file type (type is %s)\n') | |
435 | % (self.pathto(f), kind)) |
|
435 | % (self.pathto(f), kind)) | |
436 |
|
436 | |||
437 | # TODO: don't walk unknown directories if unknown and ignored are False |
|
|||
438 | ignore = self._ignore |
|
437 | ignore = self._ignore | |
439 | dirignore = self._dirignore |
|
438 | dirignore = self._dirignore | |
440 | if ignored: |
|
439 | if ignored: | |
441 | ignore = util.never |
|
440 | ignore = util.never | |
442 | dirignore = util.never |
|
441 | dirignore = util.never | |
|
442 | elif not unknown: | |||
|
443 | # if unknown and ignored are False, skip step 2 | |||
|
444 | ignore = util.always | |||
|
445 | dirignore = util.always | |||
443 |
|
446 | |||
444 | matchfn = match.matchfn |
|
447 | matchfn = match.matchfn | |
445 | dmap = self._map |
|
448 | dmap = self._map |
General Comments 0
You need to be logged in to leave comments.
Login now