/breezy/trunk

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/trunk

« back to all changes in this revision

Viewing changes to breezy/globbing.py

  • Committer: Jelmer Vernooij
  • Date: 2017-07-23 22:06:41 UTC
  • mfrom: (6738 trunk)
  • mto: This revision was merged to the branch mainline in revision 6739.
  • Revision ID: jelmer@jelmer.uk-20170723220641-69eczax9bmv8d6kk
Merge trunk, address review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
242
242
                match = regex.match(filename)
243
243
                if match:
244
244
                    return patterns[match.lastindex -1]
245
 
        except errors.InvalidPattern as e:
 
245
        except lazy_regex.InvalidPattern as e:
246
246
            # We can't show the default e.msg to the user as thats for
247
247
            # the combined pattern we sent to regex. Instead we indicate to
248
248
            # the user that an ignore file needs fixing.
286
286
        try:
287
287
            re_obj = lazy_regex.lazy_compile(tpattern, re.UNICODE)
288
288
            re_obj.search("") # force compile
289
 
        except errors.InvalidPattern as e:
 
289
        except lazy_regex.InvalidPattern as e:
290
290
            result = False
291
291
        return result
292
292