dirstate: report bad subdirectories as match.bad, not just a warning (BC)

This seems simpler and more correct.

The only test coverage for this is test-permissions.t when it says:
  dir: Permission denied
This commit is contained in:
Mads Kiilerich 2013-10-03 18:01:21 +02:00
parent 67a2ed988d
commit eb39238a97

View File

@ -637,10 +637,6 @@ class dirstate(object):
# implementation doesn't use it at all. This satisfies the contract
# because we only guarantee a "maybe".
def fwarn(f, msg):
self._ui.warn('%s: %s\n' % (self.pathto(f), msg))
return False
if ignored:
ignore = util.never
dirignore = util.never
@ -695,7 +691,7 @@ class dirstate(object):
entries = listdir(join(nd), stat=True, skip=skip)
except OSError, inst:
if inst.errno in (errno.EACCES, errno.ENOENT):
fwarn(nd, inst.strerror)
match.bad(self.pathto(nd), inst.strerror)
continue
raise
for f, kind, st in entries: