# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2009-05-24 07:56:14
# Node ID 8388ef8d21cdc8445718927c52db0c6a0065cc31
# Parent  c7bab7fede4c3ad757f4a81a7a5ae7f934dad1e6

match: tweak some names

diff --git a/mercurial/match.py b/mercurial/match.py
--- a/mercurial/match.py
+++ b/mercurial/match.py
@@ -166,11 +166,11 @@ def _globprefix(pat):
         root.append(p)
     return '/'.join(root) or '.'
 
-def _normalizepats(names, default, canonroot, cwd):
+def _normalize(names, default, root, cwd):
     pats = []
     for kind, name in [_patsplit(p, default) for p in names]:
         if kind in ('glob', 'relpath'):
-            name = util.canonpath(canonroot, cwd, name)
+            name = util.canonpath(root, cwd, name)
         elif kind in ('relglob', 'path'):
             name = util.normpath(name)
 
@@ -226,14 +226,14 @@ def _matcher(root, cwd='', names=[], inc
     anypats = bool(inc or exc)
 
     if names:
-        pats = _normalizepats(names, dflt_pat, root, cwd)
+        pats = _normalize(names, dflt_pat, root, cwd)
         roots = _roots(pats)
         anypats = anypats or _anypats(pats)
         patmatch = _matchfn(pats, '$')
     if inc:
-        incmatch = _matchfn(_normalizepats(inc, 'glob', root, cwd), '(?:/|$)')
+        incmatch = _matchfn(_normalize(inc, 'glob', root, cwd), '(?:/|$)')
     if exc:
-        excmatch = _matchfn(_normalizepats(exc, 'glob', root, cwd), '(?:/|$)')
+        excmatch = _matchfn(_normalize(exc, 'glob', root, cwd), '(?:/|$)')
 
     if names:
         if inc: