Show More
@@ -64,7 +64,6 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 | default=convcmd.orig_encoding) |
|
65 | default=convcmd.orig_encoding) | |
66 | self.depotname = {} # mapping from local name to depot name |
|
66 | self.depotname = {} # mapping from local name to depot name | |
67 | self.localname = {} # mapping from depot name to local name |
|
|||
68 | self.re_type = re.compile( |
|
67 | self.re_type = re.compile( | |
69 | "([a-z]+)?(text|binary|symlink|apple|resource|unicode|utf\d+)" |
|
68 | "([a-z]+)?(text|binary|symlink|apple|resource|unicode|utf\d+)" | |
70 | "(\+\w+)?$") |
|
69 | "(\+\w+)?$") | |
@@ -168,6 +167,7 b' class p4_source(common.converter_source)' | |||||
168 | files = [] |
|
167 | files = [] | |
169 | copies = {} |
|
168 | copies = {} | |
170 | copiedfiles = [] |
|
169 | copiedfiles = [] | |
|
170 | localname = {} | |||
171 | i = 0 |
|
171 | i = 0 | |
172 | while ("depotFile%d" % i) in d and ("rev%d" % i) in d: |
|
172 | while ("depotFile%d" % i) in d and ("rev%d" % i) in d: | |
173 | oldname = d["depotFile%d" % i] |
|
173 | oldname = d["depotFile%d" % i] | |
@@ -181,7 +181,7 b' class p4_source(common.converter_source)' | |||||
181 | self.depotname[filename] = oldname |
|
181 | self.depotname[filename] = oldname | |
182 | if (d.get("action%d" % i) == "move/add"): |
|
182 | if (d.get("action%d" % i) == "move/add"): | |
183 | copiedfiles.append(filename) |
|
183 | copiedfiles.append(filename) | |
184 |
|
|
184 | localname[oldname] = filename | |
185 | i += 1 |
|
185 | i += 1 | |
186 |
|
186 | |||
187 | # Collect information about copied files |
|
187 | # Collect information about copied files | |
@@ -208,8 +208,8 b' class p4_source(common.converter_source)' | |||||
208 | j += 1 |
|
208 | j += 1 | |
209 | i += 1 |
|
209 | i += 1 | |
210 |
|
210 | |||
211 |
if copiedoldname and copiedoldname in |
|
211 | if copiedoldname and copiedoldname in localname: | |
212 |
copiedfilename = |
|
212 | copiedfilename = localname[copiedoldname] | |
213 | break |
|
213 | break | |
214 |
|
214 | |||
215 | if copiedfilename: |
|
215 | if copiedfilename: |
General Comments 0
You need to be logged in to leave comments.
Login now