| hg-reviewers |
This avoids a SyntaxWarning on Python 3.8.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/convert/monotone.py (2 lines) | |||
| M | hgext/convert/p4.py (10 lines) |
| def mtngetcerts(self, rev): | def mtngetcerts(self, rev): | ||||
| certs = {"author":"<missing>", "date":"<missing>", | certs = {"author":"<missing>", "date":"<missing>", | ||||
| "changelog":"<missing>", "branch":"<missing>"} | "changelog":"<missing>", "branch":"<missing>"} | ||||
| certlist = self.mtnrun("certs", rev) | certlist = self.mtnrun("certs", rev) | ||||
| # mtn < 0.45: | # mtn < 0.45: | ||||
| # key "test@selenic.com" | # key "test@selenic.com" | ||||
| # mtn >= 0.45: | # mtn >= 0.45: | ||||
| # key [ff58a7ffb771907c4ff68995eada1c4da068d328] | # key [ff58a7ffb771907c4ff68995eada1c4da068d328] | ||||
| certlist = re.split('\n\n key ["\[]', certlist) | certlist = re.split(br'\n\n key ["\[]', certlist) | ||||
| for e in certlist: | for e in certlist: | ||||
| m = self.cert_re.match(e) | m = self.cert_re.match(e) | ||||
| if m: | if m: | ||||
| name, value = m.groups() | name, value = m.groups() | ||||
| value = value.replace(r'\"', '"') | value = value.replace(r'\"', '"') | ||||
| value = value.replace(r'\\', '\\') | value = value.replace(r'\\', '\\') | ||||
| certs[name] = value | certs[name] = value | ||||
| # Monotone may have subsecond dates: 2005-02-05T09:39:12.364306 | # Monotone may have subsecond dates: 2005-02-05T09:39:12.364306 | ||||
| path) | path) | ||||
| common.checktool('p4', abort=False) | common.checktool('p4', abort=False) | ||||
| self.revmap = {} | self.revmap = {} | ||||
| self.encoding = self.ui.config('convert', 'p4.encoding', | self.encoding = self.ui.config('convert', 'p4.encoding', | ||||
| convcmd.orig_encoding) | convcmd.orig_encoding) | ||||
| self.re_type = re.compile( | self.re_type = re.compile( | ||||
| "([a-z]+)?(text|binary|symlink|apple|resource|unicode|utf\d+)" | br"([a-z]+)?(text|binary|symlink|apple|resource|unicode|utf\d+)" | ||||
| "(\+\w+)?$") | br"(\+\w+)?$") | ||||
| self.re_keywords = re.compile( | self.re_keywords = re.compile( | ||||
| r"\$(Id|Header|Date|DateTime|Change|File|Revision|Author)" | br"\$(Id|Header|Date|DateTime|Change|File|Revision|Author)" | ||||
| r":[^$\n]*\$") | br":[^$\n]*\$") | ||||
| self.re_keywords_old = re.compile("\$(Id|Header):[^$\n]*\$") | self.re_keywords_old = re.compile(br"\$(Id|Header):[^$\n]*\$") | ||||
| if revs and len(revs) > 1: | if revs and len(revs) > 1: | ||||
| raise error.Abort(_("p4 source does not support specifying " | raise error.Abort(_("p4 source does not support specifying " | ||||
| "multiple revisions")) | "multiple revisions")) | ||||
| def setrevmap(self, revmap): | def setrevmap(self, revmap): | ||||
| """Sets the parsed revmap dictionary. | """Sets the parsed revmap dictionary. | ||||