Show More
@@ -134,7 +134,7 b' def state(ctx, ui):' | |||
|
134 | 134 | # However, we still want to allow back references to go |
|
135 | 135 | # through unharmed, so we turn r'\\1' into r'\1'. Again, |
|
136 | 136 | # extra escapes are needed because re.sub string decodes. |
|
137 | repl = re.sub(r'\\\\([0-9]+)', r'\\\1', repl) | |
|
137 | repl = re.sub(br'\\\\([0-9]+)', br'\\\1', repl) | |
|
138 | 138 | try: |
|
139 | 139 | src = re.sub(pattern, repl, src, 1) |
|
140 | 140 | except re.error as e: |
@@ -1154,7 +1154,7 b' class svnsubrepo(abstractsubrepo):' | |||
|
1154 | 1154 | @propertycache |
|
1155 | 1155 | def _svnversion(self): |
|
1156 | 1156 | output, err = self._svncommand(['--version', '--quiet'], filename=None) |
|
1157 | m = re.search(r'^(\d+)\.(\d+)', output) | |
|
1157 | m = re.search(br'^(\d+)\.(\d+)', output) | |
|
1158 | 1158 | if not m: |
|
1159 | 1159 | raise error.Abort(_('cannot retrieve svn tool version')) |
|
1160 | 1160 | return (int(m.group(1)), int(m.group(2))) |
@@ -1373,11 +1373,11 b' class gitsubrepo(abstractsubrepo):' | |||
|
1373 | 1373 | |
|
1374 | 1374 | @staticmethod |
|
1375 | 1375 | def _gitversion(out): |
|
1376 | m = re.search(r'^git version (\d+)\.(\d+)\.(\d+)', out) | |
|
1376 | m = re.search(br'^git version (\d+)\.(\d+)\.(\d+)', out) | |
|
1377 | 1377 | if m: |
|
1378 | 1378 | return (int(m.group(1)), int(m.group(2)), int(m.group(3))) |
|
1379 | 1379 | |
|
1380 | m = re.search(r'^git version (\d+)\.(\d+)', out) | |
|
1380 | m = re.search(br'^git version (\d+)\.(\d+)', out) | |
|
1381 | 1381 | if m: |
|
1382 | 1382 | return (int(m.group(1)), int(m.group(2)), 0) |
|
1383 | 1383 |
General Comments 0
You need to be logged in to leave comments.
Login now