Show More
@@ -183,7 +183,7 b' def debugbuilddag(ui, repo, text=None,' | |||||
183 | id, ps = data |
|
183 | id, ps = data | |
184 |
|
184 | |||
185 | files = [] |
|
185 | files = [] | |
186 |
f |
|
186 | filecontent = {} | |
187 |
|
187 | |||
188 | p2 = None |
|
188 | p2 = None | |
189 | if mergeable_file: |
|
189 | if mergeable_file: | |
@@ -204,27 +204,29 b' def debugbuilddag(ui, repo, text=None,' | |||||
204 | ml[id * linesperrev] += " r%i" % id |
|
204 | ml[id * linesperrev] += " r%i" % id | |
205 | mergedtext = "\n".join(ml) |
|
205 | mergedtext = "\n".join(ml) | |
206 | files.append(fn) |
|
206 | files.append(fn) | |
207 |
f |
|
207 | filecontent[fn] = mergedtext | |
208 |
|
208 | |||
209 | if overwritten_file: |
|
209 | if overwritten_file: | |
210 | fn = "of" |
|
210 | fn = "of" | |
211 | files.append(fn) |
|
211 | files.append(fn) | |
212 |
f |
|
212 | filecontent[fn] = "r%i\n" % id | |
213 |
|
213 | |||
214 | if new_file: |
|
214 | if new_file: | |
215 | fn = "nf%i" % id |
|
215 | fn = "nf%i" % id | |
216 | files.append(fn) |
|
216 | files.append(fn) | |
217 |
f |
|
217 | filecontent[fn] = "r%i\n" % id | |
218 | if len(ps) > 1: |
|
218 | if len(ps) > 1: | |
219 | if not p2: |
|
219 | if not p2: | |
220 | p2 = repo[ps[1]] |
|
220 | p2 = repo[ps[1]] | |
221 | for fn in p2: |
|
221 | for fn in p2: | |
222 | if fn.startswith("nf"): |
|
222 | if fn.startswith("nf"): | |
223 | files.append(fn) |
|
223 | files.append(fn) | |
224 |
f |
|
224 | filecontent[fn] = p2[fn].data() | |
225 |
|
225 | |||
226 | def fctxfn(repo, cx, path): |
|
226 | def fctxfn(repo, cx, path): | |
227 | return fctxs.get(path) |
|
227 | if path in filecontent: | |
|
228 | return context.memfilectx(repo, path, filecontent[path]) | |||
|
229 | return None | |||
228 |
|
230 | |||
229 | if len(ps) == 0 or ps[0] < 0: |
|
231 | if len(ps) == 0 or ps[0] < 0: | |
230 | pars = [None, None] |
|
232 | pars = [None, None] |
General Comments 0
You need to be logged in to leave comments.
Login now