util._matcher: fix handling of path: patterns

mercurial/util.py

@@ -479,14 +479,14 def _matcher(canonroot, cwd, names, inc,
             name = canonpath(canonroot, cwd, name)
             if name == '':
                 kind, name = 'glob', '**'
-        elif kind == 'relglob':
+        elif kind in ('relglob', 'path'):
             name = normpath(name)
-        if kind in ('glob', 'path', 're', 'relglob'):
+        if kind in ('glob', 're', 'relglob'):
             pats.append((kind, name))
         if kind == 'glob':
             root = globprefix(name)
             roots.append(root)
-        elif kind == 'relpath':
+        elif kind in ('relpath', 'path'):
             files.append((kind, name))
             roots.append(name)
         elif kind == 'relglob':

tests/test-walk

@@ -48,6 +48,7 hg debugwalk beans/.hg
 hg debugwalk glob:\*
 hg debugwalk 're:.*[kb]$'
 hg debugwalk path:beans/black
+hg debugwalk path:beans//black
 hg debugwalk relglob:Procyonidae
 hg debugwalk relglob:Procyonidae/ fennel
 hg debugwalk beans 'glob:beans/*'

tests/test-walk.out

@@ -83,7 +83,8 f beans/black beans/black
 f  fenugreek      fenugreek
 f  glob:glob      glob:glob
 f  mammals/skunk  mammals/skunk
-f  beans/black  beans/black
+f  beans/black  beans/black  exact
+f  beans/black  beans/black  exact
 f  mammals/Procyonidae/cacomistle  mammals/Procyonidae/cacomistle
 f  mammals/Procyonidae/coatimundi  mammals/Procyonidae/coatimundi
 f  mammals/Procyonidae/raccoon     mammals/Procyonidae/raccoon