Browse Source

Avoid unnecessary escaping.

Jelmer Vernooij 7 years ago
parent
commit
e78edbcff9
2 changed files with 13 additions and 13 deletions
  1. 4 4
      dulwich/ignore.py
  2. 9 9
      dulwich/tests/test_ignore.py

+ 4 - 4
dulwich/ignore.py

@@ -38,12 +38,12 @@ def translate(pat):
 
     if b'/' not in pat:
         # If there's no slash, this is a filename-based match
-        res = res + b'(.*\/)?'
+        res = res + b'(.*/)?'
 
     if pat.startswith(b'**/'):
         # Leading **/
         pat = pat[2:]
-        res = res + b'(.*\/)?'
+        res = res + b'(.*/)?'
 
     if pat.startswith(b'/'):
         pat = pat[1:]
@@ -52,13 +52,13 @@ def translate(pat):
 
     while i < n:
         if pat[i:i+3] == b'/**':
-            res = res + b'(\\/.*)?'
+            res = res + b'(/.*)?'
             i = i+3
             continue
         c = pat[i:i+1]
         i = i+1
         if c == b'*':
-            res = res + b'[^\/]+'
+            res = res + b'[^/]+'
         elif c == b'?':
             res = res + b'.'
         elif c == b'[':

+ 9 - 9
dulwich/tests/test_ignore.py

@@ -57,16 +57,16 @@ NEGATIVE_MATCH_TESTS = [
 
 
 TRANSLATE_TESTS = [
-    (b"*.c", b'(?ms)(.*\\/)?[^\\/]+\\.c\\Z'),
-    (b"foo.c", b'(?ms)(.*\\/)?foo\\.c\\Z'),
-    (b"/*.c", b'(?ms)[^\\/]+\\.c\\Z'),
+    (b"*.c", b'(?ms)(.*/)?[^/]+\\.c\\Z'),
+    (b"foo.c", b'(?ms)(.*/)?foo\\.c\\Z'),
+    (b"/*.c", b'(?ms)[^/]+\\.c\\Z'),
     (b"/foo.c", b'(?ms)foo\\.c\\Z'),
-    (b"foo.c", b'(?ms)(.*\\/)?foo\\.c\\Z'),
-    (b"foo.[ch]", b'(?ms)(.*\\/)?foo\\.[ch]\\Z'),
-    (b"foo/**", b'(?ms)foo(\\/.*)?\\Z'),
-    (b"foo/**/blie.c", b'(?ms)foo(\\/.*)?\\/blie\\.c\\Z'),
-    (b"**/bla.c", b'(?ms)(.*\\/)?bla\\.c\\Z'),
-    (b"foo/**/bar", b'(?ms)foo(\\/.*)?\\/bar\\Z'),
+    (b"foo.c", b'(?ms)(.*/)?foo\\.c\\Z'),
+    (b"foo.[ch]", b'(?ms)(.*/)?foo\\.[ch]\\Z'),
+    (b"foo/**", b'(?ms)foo(/.*)?\\Z'),
+    (b"foo/**/blie.c", b'(?ms)foo(/.*)?\\/blie\\.c\\Z'),
+    (b"**/bla.c", b'(?ms)(.*/)?bla\\.c\\Z'),
+    (b"foo/**/bar", b'(?ms)foo(/.*)?\\/bar\\Z'),
 ]