# HG changeset patch # User Alexis S. L. Carvalho # Date 1174096103 10800 # Node ID 34c4540c04c577932a9ca3cb623636070edfdc2d # Parent eca3277c4220efba23daccb3663d375c043236f1 util._matcher: remove superfluous variable diff --git a/mercurial/util.py b/mercurial/util.py --- a/mercurial/util.py +++ b/mercurial/util.py @@ -476,7 +476,6 @@ def _matcher(canonroot, cwd, names, inc, def normalizepats(names, default): pats = [] - files = [] roots = [] anypats = False for kind, name in [patkind(p, default) for p in names]: @@ -484,18 +483,20 @@ def _matcher(canonroot, cwd, names, inc, 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 or '.') elif kind == 'relglob': roots.append('.') - return roots, pats + files, anypats + return roots, pats, anypats roots, pats, anypats = normalizepats(names, dflt_pat)