mercurial/cmdutil.py
changeset 6656 2cbe0f72c379
parent 6603 41eb20cc1c02
parent 6651 7f0dd352fb4d
child 6739 c9fbd6ec3489
--- a/mercurial/cmdutil.py	Tue Jun 03 21:20:52 2008 +0200
+++ b/mercurial/cmdutil.py	Sat Jun 07 11:43:16 2008 +0200
@@ -276,17 +276,23 @@
         similarity = float(opts.get('similarity') or 0)
     add, remove = [], []
     mapping = {}
+    audit_path = util.path_auditor(repo.root)
     m = match(repo, pats, opts)
     for abs in repo.walk(m):
         target = repo.wjoin(abs)
+        good = True
+        try:
+            audit_path(abs)
+        except:
+            good = False
         rel = m.rel(abs)
         exact = m.exact(abs)
-        if abs not in repo.dirstate:
+        if good and abs not in repo.dirstate:
             add.append(abs)
             mapping[abs] = rel, m.exact(abs)
             if repo.ui.verbose or not exact:
                 repo.ui.status(_('adding %s\n') % ((pats and rel) or abs))
-        if repo.dirstate[abs] != 'r' and (not util.lexists(target)
+        if repo.dirstate[abs] != 'r' and (not good or not util.lexists(target)
             or (os.path.isdir(target) and not os.path.islink(target))):
             remove.append(abs)
             mapping[abs] = rel, exact