2464 if src not in ctx1: |
2464 if src not in ctx1: |
2465 # Files merged in during a merge and then copied/renamed are |
2465 # Files merged in during a merge and then copied/renamed are |
2466 # reported as copies. We want to show them in the diff as additions. |
2466 # reported as copies. We want to show them in the diff as additions. |
2467 del copy[dst] |
2467 del copy[dst] |
2468 |
2468 |
|
2469 prefetchmatch = scmutil.matchfiles( |
|
2470 repo, list(modifiedset | addedset | removedset)) |
|
2471 scmutil.prefetchfiles(repo, [ctx1.rev(), ctx2.rev()], prefetchmatch) |
|
2472 |
2469 def difffn(opts, losedata): |
2473 def difffn(opts, losedata): |
2470 return trydiff(repo, revs, ctx1, ctx2, modified, added, removed, |
2474 return trydiff(repo, revs, ctx1, ctx2, modified, added, removed, |
2471 copy, getfilectx, opts, losedata, prefix, relroot) |
2475 copy, getfilectx, opts, losedata, prefix, relroot) |
2472 if opts.upgrade and not opts.git: |
2476 if opts.upgrade and not opts.git: |
2473 try: |
2477 try: |