# HG changeset patch
# User Alexis S. L. Carvalho <alexis@cecm.usp.br>
# Date 1174015372 10800
# Node ID 281f9f8f1bd44d68a5b9d908f1c00c38eb784231
# Parent  2216535f07d752e93f5626a9d9df1eae7934efef
Fix confusing message from hg revert (issue332)

   % mkdir sub1
   % touch sub1/file1
   % hg add sub1/
   adding sub1/file1
   % hg rev sub1
   sub1: No such file in rev e4c586763258
   forgetting sub1/file1

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -2166,9 +2166,19 @@ def revert(ui, repo, *pats, **opts):
 
     # walk target manifest.
 
+    def badmatch(path):
+        if path in names:
+            return True
+        path_ = path + '/'
+        for f in names:
+            if f.startswith(path_):
+                return True
+        return False
+
     for src, abs, rel, exact in cmdutil.walk(repo, pats, opts, node=node,
-                                             badmatch=names.has_key):
-        if abs in names: continue
+                                             badmatch=badmatch):
+        if abs in names or src == 'b':
+            continue
         names[abs] = (rel, exact)
         target_only[abs] = True
 
diff --git a/tests/test-revert b/tests/test-revert
--- a/tests/test-revert
+++ b/tests/test-revert
@@ -88,5 +88,8 @@ hg revert --all -rtip
 echo %% issue332
 hg ci -A -m b -d '1000001 0'
 echo foobar > b/b
-hg revert b
+mkdir newdir
+echo foo > newdir/newfile
+hg add newdir/newfile
+hg revert b newdir
 true
diff --git a/tests/test-revert.out b/tests/test-revert.out
--- a/tests/test-revert.out
+++ b/tests/test-revert.out
@@ -61,3 +61,4 @@ reverting a
 %% issue332
 adding b/b
 reverting b/b
+forgetting newdir/newfile