Merge lp:~jelmer/brz/move-errors-lazy-regex into lp:brz

[Jelmer Vernooij]

Move InvalidPattern error to breezy.lazy_regex.

Move InvalidPattern error to breezy.lazy_regex.

[Martin Packman (gz)]

Seems sane.

review: Approve

=== modified file 'breezy/builtins.py'
--- breezy/builtins.py	2017-06-24 14:00:24 +0000
+++ breezy/builtins.py	2017-07-11 00:02:51 +0000
@@ -40,6 +40,7 @@
     errors,
     globbing,
     hooks,
+    lazy_regex,
     log,
     merge as _mod_merge,
     merge_directive,
@@ -3190,7 +3191,7 @@
                             'Invalid ignore patterns found. %s',
                             bad_patterns_count) % bad_patterns)
             ui.ui_factory.show_error(msg)
-            raise errors.InvalidPattern('')
+            raise lazy_regex.InvalidPattern('')
         for name_pattern in name_pattern_list:
             if (name_pattern[0] == '/' or
                 (len(name_pattern) > 1 and name_pattern[1] == ':')):
 
=== modified file 'breezy/errors.py'
--- breezy/errors.py	2017-07-04 20:03:11 +0000
+++ breezy/errors.py	2017-07-11 00:02:51 +0000
@@ -3181,14 +3181,6 @@
         'E.g. brz whoami "Your Name <[e-mail]>"')
 
 
-class InvalidPattern(BzrError):
-
-    _fmt = ('Invalid pattern(s) found. %(msg)s')
-
-    def __init__(self, msg):
-        self.msg = msg
-
-
 class RecursiveBind(BzrError):
 
     _fmt = ('Branch "%(branch_url)s" appears to be bound to itself. '
 
=== modified file 'breezy/globbing.py'
--- breezy/globbing.py	2017-05-22 00:56:52 +0000
+++ breezy/globbing.py	2017-07-11 00:02:51 +0000
@@ -242,7 +242,7 @@
                 match = regex.match(filename)
                 if match:
                     return patterns[match.lastindex -1]
-        except errors.InvalidPattern as e:
+        except lazy_regex.InvalidPattern as e:
             # We can't show the default e.msg to the user as thats for
             # the combined pattern we sent to regex. Instead we indicate to
             # the user that an ignore file needs fixing.
@@ -286,7 +286,7 @@
         try:
             re_obj = lazy_regex.lazy_compile(tpattern, re.UNICODE)
             re_obj.search("") # force compile
-        except errors.InvalidPattern as e:
+        except lazy_regex.InvalidPattern as e:
             result = False
         return result
 
 
=== modified file 'breezy/lazy_regex.py'
--- breezy/lazy_regex.py	2017-05-22 00:56:52 +0000
+++ breezy/lazy_regex.py	2017-07-11 00:02:51 +0000
@@ -31,6 +31,14 @@
 from . import errors
 
 
+class InvalidPattern(errors.BzrError):
+
+    _fmt = ('Invalid pattern(s) found. %(msg)s')
+
+    def __init__(self, msg):
+        self.msg = msg
+
+
 class LazyRegex(object):
     """A proxy around a real regex, which won't be compiled until accessed."""
 
@@ -71,7 +79,7 @@
         except re.error as e:
             # raise InvalidPattern instead of re.error as this gives a
             # cleaner message to the user.
-            raise errors.InvalidPattern('"' + args[0] + '" ' +str(e))
+            raise InvalidPattern('"' + args[0] + '" ' +str(e))
 
     def __getstate__(self):
         """Return the state to use when pickling."""
 
=== modified file 'breezy/tests/test_errors.py'
--- breezy/tests/test_errors.py	2017-06-10 18:39:27 +0000
+++ breezy/tests/test_errors.py	2017-07-11 00:02:51 +0000
@@ -619,11 +619,6 @@
         err = errors.NotBranchError('path', controldir=FakeBzrDir())
         self.assertEqual('Not a branch: "path": NotBranchError.', str(err))
 
-    def test_invalid_pattern(self):
-        error = errors.InvalidPattern('Bad pattern msg.')
-        self.assertEqualDiff("Invalid pattern(s) found. Bad pattern msg.",
-            str(error))
-
     def test_recursive_bind(self):
         error = errors.RecursiveBind('foo_bar_branch')
         msg = ('Branch "foo_bar_branch" appears to be bound to itself. '
 
=== modified file 'breezy/tests/test_globbing.py'
--- breezy/tests/test_globbing.py	2017-06-04 18:09:30 +0000
+++ breezy/tests/test_globbing.py	2017-07-11 00:02:51 +0000
@@ -17,7 +17,7 @@
 
 import re
 
-from .. import errors
+from .. import errors, lazy_regex
 from ..globbing import (
     Globster,
     ExceptionGlobster,
@@ -316,7 +316,7 @@
         """Ensure that globster handles bad patterns cleanly."""
         patterns = [u'RE:[', u'/home/foo', u'RE:*.cpp']
         g = Globster(patterns)
-        e = self.assertRaises(errors.InvalidPattern, g.match, 'filename')
+        e = self.assertRaises(lazy_regex.InvalidPattern, g.match, 'filename')
         self.assertContainsRe(e.msg,
             "File.*ignore.*contains error.*RE:\[.*RE:\*\.cpp", flags=re.DOTALL)
 
 
=== modified file 'breezy/tests/test_lazy_regex.py'
--- breezy/tests/test_lazy_regex.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/test_lazy_regex.py	2017-07-11 00:02:51 +0000
@@ -26,6 +26,14 @@
     )
 
 
+class ErrorTests(tests.TestCase):
+
+    def test_invalid_pattern(self):
+        error = lazy_regex.InvalidPattern('Bad pattern msg.')
+        self.assertEqualDiff("Invalid pattern(s) found. Bad pattern msg.",
+            str(error))
+
+
 class InstrumentedLazyRegex(lazy_regex.LazyRegex):
     """Keep track of actions on the lazy regex"""
 
@@ -71,7 +79,7 @@
         p = lazy_regex.lazy_compile('RE:[')
         # As p.match is lazy, we make it into a lambda so its handled
         # by assertRaises correctly.
-        e = self.assertRaises(errors.InvalidPattern, lambda: p.match('foo'))
+        e = self.assertRaises(lazy_regex.InvalidPattern, lambda: p.match('foo'))
         self.assertEqual(e.msg, '"RE:[" unexpected end of regular expression')