Show More
@@ -565,7 +565,7 b' class queue(object):' | |||||
565 | return index |
|
565 | return index | |
566 | return None |
|
566 | return None | |
567 |
|
567 | |||
568 | guard_re = re.compile(r'\s?#([-+][^-+# \t\r\n\f][^# \t\r\n\f]*)') |
|
568 | guard_re = re.compile(br'\s?#([-+][^-+# \t\r\n\f][^# \t\r\n\f]*)') | |
569 |
|
569 | |||
570 | def parseseries(self): |
|
570 | def parseseries(self): | |
571 | self.series = [] |
|
571 | self.series = [] |
@@ -404,7 +404,7 b' def aliasinterpolate(name, args, cmd):' | |||||
404 | # tokenize each argument into exactly one word. |
|
404 | # tokenize each argument into exactly one word. | |
405 | replacemap['"$@"'] = ' '.join(util.shellquote(arg) for arg in args) |
|
405 | replacemap['"$@"'] = ' '.join(util.shellquote(arg) for arg in args) | |
406 | # escape '\$' for regex |
|
406 | # escape '\$' for regex | |
407 | regex = '|'.join(replacemap.keys()).replace('$', r'\$') |
|
407 | regex = '|'.join(replacemap.keys()).replace('$', br'\$') | |
408 | r = re.compile(regex) |
|
408 | r = re.compile(regex) | |
409 | return r.sub(lambda x: replacemap[x.group()], cmd) |
|
409 | return r.sub(lambda x: replacemap[x.group()], cmd) | |
410 |
|
410 | |||
@@ -449,7 +449,7 b' class cmdalias(object):' | |||||
449 | "of %i variable in alias '%s' definition." |
|
449 | "of %i variable in alias '%s' definition." | |
450 | % (int(m.groups()[0]), self.name)) |
|
450 | % (int(m.groups()[0]), self.name)) | |
451 | return '' |
|
451 | return '' | |
452 | cmd = re.sub(r'\$(\d+|\$)', _checkvar, self.definition[1:]) |
|
452 | cmd = re.sub(br'\$(\d+|\$)', _checkvar, self.definition[1:]) | |
453 | cmd = aliasinterpolate(self.name, args, cmd) |
|
453 | cmd = aliasinterpolate(self.name, args, cmd) | |
454 | return ui.system(cmd, environ=env, |
|
454 | return ui.system(cmd, environ=env, | |
455 | blockedtag='alias_%s' % self.name) |
|
455 | blockedtag='alias_%s' % self.name) |
@@ -2667,7 +2667,7 b' def interpolate(prefix, mapping, s, fn=N' | |||||
2667 | else: |
|
2667 | else: | |
2668 | prefix_char = prefix |
|
2668 | prefix_char = prefix | |
2669 | mapping[prefix_char] = prefix_char |
|
2669 | mapping[prefix_char] = prefix_char | |
2670 | r = remod.compile(r'%s(%s)' % (prefix, patterns)) |
|
2670 | r = remod.compile(br'%s(%s)' % (prefix, patterns)) | |
2671 | return r.sub(lambda x: fn(mapping[x.group()[1:]]), s) |
|
2671 | return r.sub(lambda x: fn(mapping[x.group()[1:]]), s) | |
2672 |
|
2672 | |||
2673 | def getport(port): |
|
2673 | def getport(port): |
General Comments 0
You need to be logged in to leave comments.
Login now