Comments
Patch
@@ -686,7 +686,7 @@
for nf in iter(visit):
# Report ignored items in the dmap as long as they are not
# under a symlink directory.
- if ignore(nf) and audit_path.isvalidpath(nf):
+ if ignore(nf) and audit_path.check(nf):
results[nf] = util.statfiles([join(nf)])[0]
else:
# It's either missing or under a symlink directory
@@ -752,17 +752,14 @@
ctx = repo[None]
walkresults = repo.dirstate.walk(m, sorted(ctx.substate), True, False)
for abs in sorted(walkresults):
- good = audit_path.check(abs)
-
st = walkresults[abs]
dstate = repo.dirstate[abs]
- if good and dstate == '?':
+ if dstate == '?' and audit_path.check(abs):
unknown.append(abs)
if repo.ui.verbose or not m.exact(abs):
rel = m.rel(abs)
repo.ui.status(_('adding %s\n') % ((pats and rel) or abs))
- elif (dstate != 'r' and
- (not good or not st or
+ elif (dstate != 'r' and (not st or
(stat.S_ISDIR(st.st_mode) and not stat.S_ISLNK(st.st_mode)))):
deleted.append(abs)
if repo.ui.verbose or not m.exact(abs):