--- a/mercurial/util.py Fri Mar 16 00:45:18 2007 -0300
+++ b/mercurial/util.py Fri Mar 16 22:58:49 2007 -0300
@@ -496,7 +496,6 @@
def normalizepats(names, default):
pats = []
- files = []
roots = []
anypats = False
for kind, name in [patkind(p, default) for p in names]:
@@ -504,18 +503,20 @@
name = canonpath(canonroot, cwd, name)
elif kind in ('relglob', 'path'):
name = normpath(name)
+
+ pats.append((kind, name))
+
if kind in ('glob', 're', 'relglob', 'relre'):
- pats.append((kind, name))
anypats = True
+
if kind == 'glob':
root = globprefix(name)
roots.append(root)
elif kind in ('relpath', 'path'):
- files.append((kind, name))
- roots.append(name)
+ roots.append(name or '.')
elif kind == 'relglob':
roots.append('.')
- return roots, pats + files, anypats
+ return roots, pats, anypats
roots, pats, anypats = normalizepats(names, dflt_pat)