1598 hexfunc = repo.ui.debugflag and hex or short |
1598 hexfunc = repo.ui.debugflag and hex or short |
1599 revs = [hexfunc(node) for node in [node1, node2] if node] |
1599 revs = [hexfunc(node) for node in [node1, node2] if node] |
1600 |
1600 |
1601 copy = {} |
1601 copy = {} |
1602 if opts.git or opts.upgrade: |
1602 if opts.git or opts.upgrade: |
1603 copy = copies.copies(repo, ctx1, ctx2, repo[nullid])[0] |
1603 copy = copies.pathcopies(ctx1, ctx2) |
1604 |
1604 |
1605 difffn = lambda opts, losedata: trydiff(repo, revs, ctx1, ctx2, |
1605 difffn = lambda opts, losedata: trydiff(repo, revs, ctx1, ctx2, |
1606 modified, added, removed, copy, getfilectx, opts, losedata, prefix) |
1606 modified, added, removed, copy, getfilectx, opts, losedata, prefix) |
1607 if opts.upgrade and not opts.git: |
1607 if opts.upgrade and not opts.git: |
1608 try: |
1608 try: |