Show More
@@ -214,7 +214,7 b' class monotone_source(common.converter_s' | |||||
214 | # key "test@selenic.com" |
|
214 | # key "test@selenic.com" | |
215 | # mtn >= 0.45: |
|
215 | # mtn >= 0.45: | |
216 | # key [ff58a7ffb771907c4ff68995eada1c4da068d328] |
|
216 | # key [ff58a7ffb771907c4ff68995eada1c4da068d328] | |
217 | certlist = re.split('\n\n key ["\[]', certlist) |
|
217 | certlist = re.split(br'\n\n key ["\[]', certlist) | |
218 | for e in certlist: |
|
218 | for e in certlist: | |
219 | m = self.cert_re.match(e) |
|
219 | m = self.cert_re.match(e) | |
220 | if m: |
|
220 | if m: |
@@ -64,12 +64,12 b' class p4_source(common.converter_source)' | |||||
64 | self.encoding = self.ui.config('convert', 'p4.encoding', |
|
64 | self.encoding = self.ui.config('convert', 'p4.encoding', | |
65 | convcmd.orig_encoding) |
|
65 | convcmd.orig_encoding) | |
66 | self.re_type = re.compile( |
|
66 | self.re_type = re.compile( | |
67 | "([a-z]+)?(text|binary|symlink|apple|resource|unicode|utf\d+)" |
|
67 | br"([a-z]+)?(text|binary|symlink|apple|resource|unicode|utf\d+)" | |
68 | "(\+\w+)?$") |
|
68 | br"(\+\w+)?$") | |
69 | self.re_keywords = re.compile( |
|
69 | self.re_keywords = re.compile( | |
70 | r"\$(Id|Header|Date|DateTime|Change|File|Revision|Author)" |
|
70 | br"\$(Id|Header|Date|DateTime|Change|File|Revision|Author)" | |
71 | r":[^$\n]*\$") |
|
71 | br":[^$\n]*\$") | |
72 | self.re_keywords_old = re.compile("\$(Id|Header):[^$\n]*\$") |
|
72 | self.re_keywords_old = re.compile(br"\$(Id|Header):[^$\n]*\$") | |
73 |
|
73 | |||
74 | if revs and len(revs) > 1: |
|
74 | if revs and len(revs) > 1: | |
75 | raise error.Abort(_("p4 source does not support specifying " |
|
75 | raise error.Abort(_("p4 source does not support specifying " |
General Comments 0
You need to be logged in to leave comments.
Login now