equal
deleted
inserted
replaced
223 files.append(fn) |
223 files.append(fn) |
224 filecontent[fn] = p2[fn].data() |
224 filecontent[fn] = p2[fn].data() |
225 |
225 |
226 def fctxfn(repo, cx, path): |
226 def fctxfn(repo, cx, path): |
227 if path in filecontent: |
227 if path in filecontent: |
228 return context.memfilectx(repo, path, filecontent[path]) |
228 return context.memfilectx(repo, cx, path, |
|
229 filecontent[path]) |
229 return None |
230 return None |
230 |
231 |
231 if len(ps) == 0 or ps[0] < 0: |
232 if len(ps) == 0 or ps[0] < 0: |
232 pars = [None, None] |
233 pars = [None, None] |
233 elif len(ps) == 1: |
234 elif len(ps) == 1: |