equal
deleted
inserted
replaced
40 self.lastbranch = {} |
40 self.lastbranch = {} |
41 self.parent = {} |
41 self.parent = {} |
42 self.encoding = "latin_1" |
42 self.encoding = "latin_1" |
43 self.depotname = {} # mapping from local name to depot name |
43 self.depotname = {} # mapping from local name to depot name |
44 self.modecache = {} |
44 self.modecache = {} |
45 self.re_type = re.compile("([a-z]+)?(text|binary|symlink|apple|resource|unicode|utf\d+)(\+\w+)?$") |
45 self.re_type = re.compile( |
46 self.re_keywords = re.compile(r"\$(Id|Header|Date|DateTime|Change|File|Revision|Author):[^$\n]*\$") |
46 "([a-z]+)?(text|binary|symlink|apple|resource|unicode|utf\d+)" |
|
47 "(\+\w+)?$") |
|
48 self.re_keywords = re.compile( |
|
49 r"\$(Id|Header|Date|DateTime|Change|File|Revision|Author)" |
|
50 r":[^$\n]*\$") |
47 self.re_keywords_old = re.compile("\$(Id|Header):[^$\n]*\$") |
51 self.re_keywords_old = re.compile("\$(Id|Header):[^$\n]*\$") |
48 |
52 |
49 self._parse(ui, path) |
53 self._parse(ui, path) |
50 |
54 |
51 def _parse_view(self, path): |
55 def _parse_view(self, path): |
116 else: |
120 else: |
117 parents = [] |
121 parents = [] |
118 |
122 |
119 date = (int(d["time"]), 0) # timezone not set |
123 date = (int(d["time"]), 0) # timezone not set |
120 c = commit(author=self.recode(d["user"]), date=util.datestr(date), |
124 c = commit(author=self.recode(d["user"]), date=util.datestr(date), |
121 parents=parents, desc=desc, branch='', extra={"p4": change}) |
125 parents=parents, desc=desc, branch='', |
|
126 extra={"p4": change}) |
122 |
127 |
123 files = [] |
128 files = [] |
124 i = 0 |
129 i = 0 |
125 while ("depotFile%d" % i) in d and ("rev%d" % i) in d: |
130 while ("depotFile%d" % i) in d and ("rev%d" % i) in d: |
126 oldname = d["depotFile%d" % i] |
131 oldname = d["depotFile%d" % i] |