Show More
@@ -2735,10 +2735,10 b' def diffstatui(*args, **kw):' | |||||
2735 | if line and line[-1] in '+-': |
|
2735 | if line and line[-1] in '+-': | |
2736 | name, graph = line.rsplit(' ', 1) |
|
2736 | name, graph = line.rsplit(' ', 1) | |
2737 | yield (name + ' ', '') |
|
2737 | yield (name + ' ', '') | |
2738 | m = re.search(r'\++', graph) |
|
2738 | m = re.search(br'\++', graph) | |
2739 | if m: |
|
2739 | if m: | |
2740 | yield (m.group(0), 'diffstat.inserted') |
|
2740 | yield (m.group(0), 'diffstat.inserted') | |
2741 | m = re.search(r'-+', graph) |
|
2741 | m = re.search(br'-+', graph) | |
2742 | if m: |
|
2742 | if m: | |
2743 | yield (m.group(0), 'diffstat.deleted') |
|
2743 | yield (m.group(0), 'diffstat.deleted') | |
2744 | else: |
|
2744 | else: |
@@ -1257,7 +1257,7 b' class ui(object):' | |||||
1257 | # prompt to start parsing. Sadly, we also can't rely on |
|
1257 | # prompt to start parsing. Sadly, we also can't rely on | |
1258 | # choices containing spaces, ASCII, or basically anything |
|
1258 | # choices containing spaces, ASCII, or basically anything | |
1259 | # except an ampersand followed by a character. |
|
1259 | # except an ampersand followed by a character. | |
1260 | m = re.match(r'(?s)(.+?)\$\$([^\$]*&[^ \$].*)', prompt) |
|
1260 | m = re.match(br'(?s)(.+?)\$\$([^\$]*&[^ \$].*)', prompt) | |
1261 | msg = m.group(1) |
|
1261 | msg = m.group(1) | |
1262 | choices = [p.strip(' ') for p in m.group(2).split('$$')] |
|
1262 | choices = [p.strip(' ') for p in m.group(2).split('$$')] | |
1263 | return (msg, |
|
1263 | return (msg, |
@@ -2840,7 +2840,7 b' class url(object):' | |||||
2840 | return True # remote URL |
|
2840 | return True # remote URL | |
2841 | if hasdriveletter(self.path): |
|
2841 | if hasdriveletter(self.path): | |
2842 | return True # absolute for our purposes - can't be joined() |
|
2842 | return True # absolute for our purposes - can't be joined() | |
2843 | if self.path.startswith(r'\\'): |
|
2843 | if self.path.startswith(br'\\'): | |
2844 | return True # Windows UNC path |
|
2844 | return True # Windows UNC path | |
2845 | if self.path.startswith('/'): |
|
2845 | if self.path.startswith('/'): | |
2846 | return True # POSIX-style |
|
2846 | return True # POSIX-style |
General Comments 0
You need to be logged in to leave comments.
Login now