Mercurial > hg

changeset 4236:34c4540c04c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
util._matcher: remove superfluous variable
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Fri, 16 Mar 2007 22:48:23 -0300
parents eca3277c4220
children da6b14877195 e14b6980a014
files mercurial/util.py
diffstat 1 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/util.py	Fri Mar 16 22:48:22 2007 -0300
+++ b/mercurial/util.py	Fri Mar 16 22:48:23 2007 -0300
@@ -476,7 +476,6 @@
 
     def normalizepats(names, default):
         pats = []
-        files = []
         roots = []
         anypats = False
         for kind, name in [patkind(p, default) for p in names]:
@@ -484,18 +483,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 or '.')
             elif kind == 'relglob':
                 roots.append('.')
-        return roots, pats + files, anypats
+        return roots, pats, anypats
 
     roots, pats, anypats = normalizepats(names, dflt_pat)