Show More
@@ -614,13 +614,6 b' def _fullcopytracing(repo, c1, c2, base)' | |||
|
614 | 614 | src, dsts2, m2, m1, mb, c1, base, copy, renamedelete |
|
615 | 615 | ) |
|
616 | 616 | |
|
617 | renamedeleteset = set() | |
|
618 | divergeset = set() | |
|
619 | for dsts in diverge.values(): | |
|
620 | divergeset.update(dsts) | |
|
621 | for dsts in renamedelete.values(): | |
|
622 | renamedeleteset.update(dsts) | |
|
623 | ||
|
624 | 617 | # find interesting file sets from manifests |
|
625 | 618 | addedinm1 = m1.filesnotin(mb, repo.narrowmatch()) |
|
626 | 619 | addedinm2 = m2.filesnotin(mb, repo.narrowmatch()) |
@@ -637,6 +630,13 b' def _fullcopytracing(repo, c1, c2, base)' | |||
|
637 | 630 | fullcopy.update(copies2) |
|
638 | 631 | |
|
639 | 632 | if repo.ui.debugflag: |
|
633 | renamedeleteset = set() | |
|
634 | divergeset = set() | |
|
635 | for dsts in diverge.values(): | |
|
636 | divergeset.update(dsts) | |
|
637 | for dsts in renamedelete.values(): | |
|
638 | renamedeleteset.update(dsts) | |
|
639 | ||
|
640 | 640 | repo.ui.debug( |
|
641 | 641 | b" all copies found (* = to merge, ! = divergent, " |
|
642 | 642 | b"% = renamed and deleted):\n" |
@@ -652,7 +652,8 b' def _fullcopytracing(repo, c1, c2, base)' | |||
|
652 | 652 | repo.ui.debug( |
|
653 | 653 | b" src: '%s' -> dst: '%s' %s\n" % (fullcopy[f], f, note) |
|
654 | 654 | ) |
|
655 |
del |
|
|
655 | del renamedeleteset | |
|
656 | del divergeset | |
|
656 | 657 | |
|
657 | 658 | repo.ui.debug(b" checking for directory renames\n") |
|
658 | 659 |
General Comments 0
You need to be logged in to leave comments.
Login now