equal
deleted
inserted
replaced
62 |
62 |
63 self.revmap = {} |
63 self.revmap = {} |
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 " |
76 "multiple revisions")) |
76 "multiple revisions")) |
77 |
77 |