equal
deleted
inserted
replaced
2641 copy = copies.pathcopies(ctx1, ctx2, match=match) |
2641 copy = copies.pathcopies(ctx1, ctx2, match=match) |
2642 |
2642 |
2643 if copysourcematch: |
2643 if copysourcematch: |
2644 # filter out copies where source side isn't inside the matcher |
2644 # filter out copies where source side isn't inside the matcher |
2645 # (copies.pathcopies() already filtered out the destination) |
2645 # (copies.pathcopies() already filtered out the destination) |
2646 copy = { |
2646 copy = {dst: src for dst, src in copy.items() if copysourcematch(src)} |
2647 dst: src |
|
2648 for dst, src in pycompat.iteritems(copy) |
|
2649 if copysourcematch(src) |
|
2650 } |
|
2651 |
2647 |
2652 modifiedset = set(modified) |
2648 modifiedset = set(modified) |
2653 addedset = set(added) |
2649 addedset = set(added) |
2654 removedset = set(removed) |
2650 removedset = set(removed) |
2655 for f in modified: |
2651 for f in modified: |