Patchwork [6,of,7] match: delete icasefsmatcher now that it's same as matcher

login
register
mail settings
Submitter via Mercurial-devel
Date May 22, 2017, 6:16 a.m.
Message ID <9e10877c30246447a997.1495433766@martinvonz.svl.corp.google.com>
Download mbox | patch
Permalink /patch/20819/
State Accepted
Headers show

Comments

via Mercurial-devel - May 22, 2017, 6:16 a.m.
# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1495151282 25200
#      Thu May 18 16:48:02 2017 -0700
# Node ID 9e10877c30246447a99745c70f3303ee11c33fac
# Parent  5d46130266daa706a08f1457827fb21f9233a659
match: delete icasefsmatcher now that it's same as matcher

Patch

diff --git a/mercurial/match.py b/mercurial/match.py
--- a/mercurial/match.py
+++ b/mercurial/match.py
@@ -145,10 +145,9 @@ 
             kindpats.append((kind, pats, source))
         return kindpats
 
-    return icasefsmatcher(root, cwd, normalize, patterns=patterns,
-                          include=include, exclude=exclude, default=default,
-                          auditor=auditor, ctx=ctx, listsubrepos=listsubrepos,
-                          badfn=badfn)
+    return matcher(root, cwd, normalize, patterns=patterns, include=include,
+                   exclude=exclude, default=default, auditor=auditor, ctx=ctx,
+                   listsubrepos=listsubrepos, badfn=badfn)
 
 def exact(root, cwd, files, badfn=None):
     return match(root, cwd, files, exact=True, badfn=badfn)
@@ -453,16 +452,6 @@ 
             dir = self._path + "/" + dir
         return self._matcher.visitdir(dir)
 
-class icasefsmatcher(matcher):
-
-    def __init__(self, root, cwd, normalize, patterns, include, exclude,
-                 default, auditor, ctx, listsubrepos=False, badfn=None):
-        init = super(icasefsmatcher, self).__init__
-
-        init(root, cwd, normalize=normalize, patterns=patterns, include=include,
-             exclude=exclude, default=default, auditor=auditor,
-             ctx=ctx, listsubrepos=listsubrepos, badfn=badfn)
-
 def patkind(pattern, default=None):
     '''If pattern is 'kind:pat' with a known kind, return kind.'''
     return _patsplit(pattern, default)[0]