/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
4763.2.4 by John Arbash Meinel
merge bzr.2.1 in preparation for NEWS entry.
1
# Copyright (C) 2006-2010 Canonical Ltd
2135.2.1 by Kent Gibson
Added glob module to replace broken fnmatch based ignore pattern matching (#57637)
2
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
2135.2.1 by Kent Gibson
Added glob module to replace broken fnmatch based ignore pattern matching (#57637)
16
17
"""Tools for converting globs to regular expressions.
18
19
This module provides functions for converting shell-like globs to regular
20
expressions.
21
"""
22
23
import re
24
5326.2.9 by Parth Malwankar
fixed import error in globbing.py
25
from bzrlib import errors
2135.2.1 by Kent Gibson
Added glob module to replace broken fnmatch based ignore pattern matching (#57637)
26
from bzrlib.trace import (
5326.2.7 by Parth Malwankar
Globster now mutters regex failure message before changing message
27
    mutter,
5326.2.1 by Parth Malwankar
added InvalidPattern error.
28
    warning,
2135.2.1 by Kent Gibson
Added glob module to replace broken fnmatch based ignore pattern matching (#57637)
29
    )
30
31
32
class Replacer(object):
33
    """Do a multiple-pattern substitution.
34
35
    The patterns and substitutions are combined into one, so the result of
36
    one replacement is never substituted again. Add the patterns and
37
    replacements via the add method and then call the object. The patterns
38
    must not contain capturing groups.
39
    """
40
41
    _expand = re.compile(ur'\\&')
42
43
    def __init__(self, source=None):
44
        self._pat = None
45
        if source:
46
            self._pats = list(source._pats)
47
            self._funs = list(source._funs)
48
        else:
49
            self._pats = []
50
            self._funs = []
51
52
    def add(self, pat, fun):
53
        r"""Add a pattern and replacement.
54
55
        The pattern must not contain capturing groups.
56
        The replacement might be either a string template in which \& will be
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
57
        replaced with the match, or a function that will get the matching text
58
        as argument. It does not get match object, because capturing is
2135.2.1 by Kent Gibson
Added glob module to replace broken fnmatch based ignore pattern matching (#57637)
59
        forbidden anyway.
60
        """
61
        self._pat = None
62
        self._pats.append(pat)
63
        self._funs.append(fun)
64
65
    def add_replacer(self, replacer):
66
        r"""Add all patterns from another replacer.
67
68
        All patterns and replacements from replacer are appended to the ones
69
        already defined.
70
        """
71
        self._pat = None
72
        self._pats.extend(replacer._pats)
73
        self._funs.extend(replacer._funs)
74
75
    def __call__(self, text):
76
        if not self._pat:
77
            self._pat = re.compile(
78
                    u'|'.join([u'(%s)' % p for p in self._pats]),
79
                    re.UNICODE)
80
        return self._pat.sub(self._do_sub, text)
81
82
    def _do_sub(self, m):
83
        fun = self._funs[m.lastindex - 1]
84
        if hasattr(fun, '__call__'):
85
            return fun(m.group(0))
86
        else:
87
            return self._expand.sub(m.group(0), fun)
88
89
90
_sub_named = Replacer()
91
_sub_named.add(ur'\[:digit:\]', ur'\d')
92
_sub_named.add(ur'\[:space:\]', ur'\s')
93
_sub_named.add(ur'\[:alnum:\]', ur'\w')
94
_sub_named.add(ur'\[:ascii:\]', ur'\0-\x7f')
95
_sub_named.add(ur'\[:blank:\]', ur' \t')
96
_sub_named.add(ur'\[:cntrl:\]', ur'\0-\x1f\x7f-\x9f')
97
98
99
def _sub_group(m):
100
    if m[1] in (u'!', u'^'):
101
        return u'[^' + _sub_named(m[2:-1]) + u']'
102
    return u'[' + _sub_named(m[1:-1]) + u']'
103
104
105
def _invalid_regex(repl):
106
    def _(m):
2135.2.7 by Kent Gibson
Implement JAM's review suggestions.
107
        warning(u"'%s' not allowed within a regular expression. "
108
                "Replacing with '%s'" % (m, repl))
2135.2.1 by Kent Gibson
Added glob module to replace broken fnmatch based ignore pattern matching (#57637)
109
        return repl
110
    return _
111
112
2298.8.1 by Kent Gibson
Normalise ignore patterns to use '/' path separator.
113
def _trailing_backslashes_regex(m):
2298.8.2 by Kent Gibson
Review fixes for lp86451 patch.
114
    """Check trailing backslashes.
115
116
    Does a head count on trailing backslashes to ensure there isn't an odd
117
    one on the end that would escape the brackets we wrap the RE in.
118
    """
119
    if (len(m) % 2) != 0:
2298.8.1 by Kent Gibson
Normalise ignore patterns to use '/' path separator.
120
        warning(u"Regular expressions cannot end with an odd number of '\\'. "
121
                "Dropping the final '\\'.")
122
        return m[:-1]
123
    return m
124
125
2135.2.1 by Kent Gibson
Added glob module to replace broken fnmatch based ignore pattern matching (#57637)
126
_sub_re = Replacer()
127
_sub_re.add(u'^RE:', u'')
128
_sub_re.add(u'\((?!\?)', u'(?:')
129
_sub_re.add(u'\(\?P<.*>', _invalid_regex(u'(?:'))
130
_sub_re.add(u'\(\?P=[^)]*\)', _invalid_regex(u''))
2298.8.1 by Kent Gibson
Normalise ignore patterns to use '/' path separator.
131
_sub_re.add(ur'\\+$', _trailing_backslashes_regex)
2135.2.1 by Kent Gibson
Added glob module to replace broken fnmatch based ignore pattern matching (#57637)
132
133
2135.2.2 by Kent Gibson
Ignore pattern matcher (glob.py) patches:
134
_sub_fullpath = Replacer()
135
_sub_fullpath.add(ur'^RE:.*', _sub_re) # RE:<anything> is a regex
136
_sub_fullpath.add(ur'\[\^?\]?(?:[^][]|\[:[^]]+:\])+\]', _sub_group) # char group
137
_sub_fullpath.add(ur'(?:(?<=/)|^)(?:\.?/)+', u'') # canonicalize path
138
_sub_fullpath.add(ur'\\.', ur'\&') # keep anything backslashed
139
_sub_fullpath.add(ur'[(){}|^$+.]', ur'\\&') # escape specials
140
_sub_fullpath.add(ur'(?:(?<=/)|^)\*\*+/', ur'(?:.*/)?') # **/ after ^ or /
141
_sub_fullpath.add(ur'\*+', ur'[^/]*') # * elsewhere
142
_sub_fullpath.add(ur'\?', ur'[^/]') # ? everywhere
143
144
145
_sub_basename = Replacer()
146
_sub_basename.add(ur'\[\^?\]?(?:[^][]|\[:[^]]+:\])+\]', _sub_group) # char group
147
_sub_basename.add(ur'\\.', ur'\&') # keep anything backslashed
148
_sub_basename.add(ur'[(){}|^$+.]', ur'\\&') # escape specials
149
_sub_basename.add(ur'\*+', ur'.*') # * everywhere
150
_sub_basename.add(ur'\?', ur'.') # ? everywhere
151
152
153
def _sub_extension(pattern):
154
    return _sub_basename(pattern[2:])
2135.2.1 by Kent Gibson
Added glob module to replace broken fnmatch based ignore pattern matching (#57637)
155
156
157
class Globster(object):
158
    """A simple wrapper for a set of glob patterns.
159
160
    Provides the capability to search the patterns to find a match for
161
    a given filename (including the full path).
162
163
    Patterns are translated to regular expressions to expidite matching.
164
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
165
    The regular expressions for multiple patterns are aggregated into
166
    a super-regex containing groups of up to 99 patterns.
2135.2.1 by Kent Gibson
Added glob module to replace broken fnmatch based ignore pattern matching (#57637)
167
    The 99 limitation is due to the grouping limit of the Python re module.
168
    The resulting super-regex and associated patterns are stored as a list of
169
    (regex,[patterns]) in _regex_patterns.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
170
2135.2.1 by Kent Gibson
Added glob module to replace broken fnmatch based ignore pattern matching (#57637)
171
    For performance reasons the patterns are categorised as extension patterns
172
    (those that match against a file extension), basename patterns
173
    (those that match against the basename of the filename),
174
    and fullpath patterns (those that match against the full path).
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
175
    The translations used for extensions and basenames are relatively simpler
2135.2.1 by Kent Gibson
Added glob module to replace broken fnmatch based ignore pattern matching (#57637)
176
    and therefore faster to perform than the fullpath patterns.
177
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
178
    Also, the extension patterns are more likely to find a match and
2135.2.1 by Kent Gibson
Added glob module to replace broken fnmatch based ignore pattern matching (#57637)
179
    so are matched first, then the basename patterns, then the fullpath
180
    patterns.
181
    """
182
    def __init__(self, patterns):
183
        self._regex_patterns = []
184
        path_patterns = []
185
        base_patterns = []
186
        ext_patterns = []
187
        for pat in patterns:
2298.8.1 by Kent Gibson
Normalise ignore patterns to use '/' path separator.
188
            pat = normalize_pattern(pat)
2135.2.1 by Kent Gibson
Added glob module to replace broken fnmatch based ignore pattern matching (#57637)
189
            if pat.startswith(u'RE:') or u'/' in pat:
190
                path_patterns.append(pat)
191
            elif pat.startswith(u'*.'):
192
                ext_patterns.append(pat)
193
            else:
194
                base_patterns.append(pat)
2135.2.2 by Kent Gibson
Ignore pattern matcher (glob.py) patches:
195
        self._add_patterns(ext_patterns,_sub_extension,
196
            prefix=r'(?:.*/)?(?!.*/)(?:.*\.)')
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
197
        self._add_patterns(base_patterns,_sub_basename,
2135.2.1 by Kent Gibson
Added glob module to replace broken fnmatch based ignore pattern matching (#57637)
198
            prefix=r'(?:.*/)?(?!.*/)')
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
199
        self._add_patterns(path_patterns,_sub_fullpath)
2135.2.1 by Kent Gibson
Added glob module to replace broken fnmatch based ignore pattern matching (#57637)
200
201
    def _add_patterns(self, patterns, translator, prefix=''):
202
        while patterns:
203
            grouped_rules = ['(%s)' % translator(pat) for pat in patterns[:99]]
204
            joined_rule = '%s(?:%s)$' % (prefix, '|'.join(grouped_rules))
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
205
            self._regex_patterns.append((re.compile(joined_rule, re.UNICODE),
2135.2.1 by Kent Gibson
Added glob module to replace broken fnmatch based ignore pattern matching (#57637)
206
                patterns[:99]))
207
            patterns = patterns[99:]
208
209
    def match(self, filename):
210
        """Searches for a pattern that matches the given filename.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
211
2135.2.1 by Kent Gibson
Added glob module to replace broken fnmatch based ignore pattern matching (#57637)
212
        :return A matching pattern or None if there is no matching pattern.
213
        """
5326.2.1 by Parth Malwankar
added InvalidPattern error.
214
        try:
215
            for regex, patterns in self._regex_patterns:
216
                match = regex.match(filename)
217
                if match:
218
                    return patterns[match.lastindex -1]
219
        except errors.InvalidPattern, e:
5339.1.1 by Parth Malwankar
fixes errors.InvalidPattern to work on Python2.5
220
            # We can't show the default e.msg to the user as thats for
5326.2.1 by Parth Malwankar
added InvalidPattern error.
221
            # the combined pattern we sent to regex. Instead we indicate to
222
            # the user that an ignore file needs fixing.
5339.1.1 by Parth Malwankar
fixes errors.InvalidPattern to work on Python2.5
223
            mutter('Invalid pattern found in regex: %s.', e.msg)
224
            e.msg = "File ~/.bazaar/ignore or .bzrignore contains errors."
5326.2.1 by Parth Malwankar
added InvalidPattern error.
225
            raise e
2135.2.1 by Kent Gibson
Added glob module to replace broken fnmatch based ignore pattern matching (#57637)
226
        return None
3398.1.1 by Ian Clatworthy
simplify the custom Globster to only care about ordering
227
4948.5.7 by John Whitley
Terminology change: exclusion => exception.
228
class ExceptionGlobster(object):
229
    """A Globster that supports exception patterns.
4948.5.5 by John Whitley
Add descriptive text to ExcludingGlobster.
230
    
4948.5.7 by John Whitley
Terminology change: exclusion => exception.
231
    Exceptions are ignore patterns prefixed with '!'.  Exception
232
    patterns take precedence over regular patterns and cause a 
233
    matching filename to return None from the match() function.  
234
    Patterns using a '!!' prefix are highest precedence, and act 
235
    as regular ignores. '!!' patterns are useful to establish ignores
236
    that apply under paths specified by '!' exception patterns.
4948.5.5 by John Whitley
Add descriptive text to ExcludingGlobster.
237
    """
4948.5.3 by John Whitley
Refactor the exclusion handling functionality out of
238
    
239
    def __init__(self,patterns):
4948.5.7 by John Whitley
Terminology change: exclusion => exception.
240
        ignores = [[], [], []]
4948.5.3 by John Whitley
Refactor the exclusion handling functionality out of
241
        for p in patterns:
4948.5.6 by John Whitley
A trial implementation of '!!' syntax for double-negative ignore exclusions.
242
            if p.startswith(u'!!'):
4948.5.7 by John Whitley
Terminology change: exclusion => exception.
243
                ignores[2].append(p[2:])
4948.5.6 by John Whitley
A trial implementation of '!!' syntax for double-negative ignore exclusions.
244
            elif p.startswith(u'!'):
4948.5.7 by John Whitley
Terminology change: exclusion => exception.
245
                ignores[1].append(p[1:])
4948.5.3 by John Whitley
Refactor the exclusion handling functionality out of
246
            else:
4948.5.7 by John Whitley
Terminology change: exclusion => exception.
247
                ignores[0].append(p)
248
        self._ignores = [Globster(i) for i in ignores]
4948.5.3 by John Whitley
Refactor the exclusion handling functionality out of
249
        
250
    def match(self, filename):
251
        """Searches for a pattern that matches the given filename.
252
253
        :return A matching pattern or None if there is no matching pattern.
254
        """
4948.5.7 by John Whitley
Terminology change: exclusion => exception.
255
        double_neg = self._ignores[2].match(filename)
4948.5.6 by John Whitley
A trial implementation of '!!' syntax for double-negative ignore exclusions.
256
        if double_neg:
257
            return "!!%s" % double_neg
4948.5.7 by John Whitley
Terminology change: exclusion => exception.
258
        elif self._ignores[1].match(filename):
4948.5.3 by John Whitley
Refactor the exclusion handling functionality out of
259
            return None
260
        else:
4948.5.7 by John Whitley
Terminology change: exclusion => exception.
261
            return self._ignores[0].match(filename)
3398.1.1 by Ian Clatworthy
simplify the custom Globster to only care about ordering
262
263
class _OrderedGlobster(Globster):
264
    """A Globster that keeps pattern order."""
265
266
    def __init__(self, patterns):
267
        """Constructor.
268
269
        :param patterns: sequence of glob patterns
270
        """
271
        # Note: This could be smarter by running like sequences together
272
        self._regex_patterns = []
273
        for pat in patterns:
274
            pat = normalize_pattern(pat)
275
            if pat.startswith(u'RE:') or u'/' in pat:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
276
                self._add_patterns([pat], _sub_fullpath)
3398.1.1 by Ian Clatworthy
simplify the custom Globster to only care about ordering
277
            elif pat.startswith(u'*.'):
278
                self._add_patterns([pat], _sub_extension,
279
                    prefix=r'(?:.*/)?(?!.*/)(?:.*\.)')
280
            else:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
281
                self._add_patterns([pat], _sub_basename,
3398.1.1 by Ian Clatworthy
simplify the custom Globster to only care about ordering
282
                    prefix=r'(?:.*/)?(?!.*/)')
283
2298.8.1 by Kent Gibson
Normalise ignore patterns to use '/' path separator.
284
4792.4.1 by Gordon Tyler
Fixed globbing.normalize_pattern to not strip '/' down to '' and normalize multiple slashes.
285
_slashes = re.compile(r'[\\/]+')
2298.8.1 by Kent Gibson
Normalise ignore patterns to use '/' path separator.
286
def normalize_pattern(pattern):
287
    """Converts backslashes in path patterns to forward slashes.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
288
2298.8.2 by Kent Gibson
Review fixes for lp86451 patch.
289
    Doesn't normalize regular expressions - they may contain escapes.
2298.8.1 by Kent Gibson
Normalise ignore patterns to use '/' path separator.
290
    """
4948.5.4 by John Whitley
bzrlib.globbing.normalize_pattern needed fix to avoid mangling ignore
291
    if not (pattern.startswith('RE:') or pattern.startswith('!RE:')):
4792.4.1 by Gordon Tyler
Fixed globbing.normalize_pattern to not strip '/' down to '' and normalize multiple slashes.
292
        pattern = _slashes.sub('/', pattern)
293
    if len(pattern) > 1:
294
        pattern = pattern.rstrip('/')
295
    return pattern