Mercurial > hg
comparison mercurial/copies.py @ 44163:782e0d9c3b74
copies: avoid calculating debug-only stuff without --debug
`renamedeleteset` and `divergeset` is only used with
`repo.ui.debugflag`, so let's avoid calculating them otherwise. While
at it, I also added a `del renamedeleteset` for consistency.
Differential Revision: https://phab.mercurial-scm.org/D7976
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 22 Jan 2020 15:23:30 -0800 |
| parents | baf3fe2977cc |
| children | 45192589555c |
comparison
equal
deleted
inserted
replaced
| 44162:baf3fe2977cc | 44163:782e0d9c3b74 |
|---|---|
| 612 # copied/renamed only on side 2 | 612 # copied/renamed only on side 2 |
| 613 _checksinglesidecopies( | 613 _checksinglesidecopies( |
| 614 src, dsts2, m2, m1, mb, c1, base, copy, renamedelete | 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 # find interesting file sets from manifests | 617 # find interesting file sets from manifests |
| 625 addedinm1 = m1.filesnotin(mb, repo.narrowmatch()) | 618 addedinm1 = m1.filesnotin(mb, repo.narrowmatch()) |
| 626 addedinm2 = m2.filesnotin(mb, repo.narrowmatch()) | 619 addedinm2 = m2.filesnotin(mb, repo.narrowmatch()) |
| 627 u1 = sorted(addedinm1 - addedinm2) | 620 u1 = sorted(addedinm1 - addedinm2) |
| 628 u2 = sorted(addedinm2 - addedinm1) | 621 u2 = sorted(addedinm2 - addedinm1) |
| 635 | 628 |
| 636 fullcopy = copies1.copy() | 629 fullcopy = copies1.copy() |
| 637 fullcopy.update(copies2) | 630 fullcopy.update(copies2) |
| 638 | 631 |
| 639 if repo.ui.debugflag: | 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 repo.ui.debug( | 640 repo.ui.debug( |
| 641 b" all copies found (* = to merge, ! = divergent, " | 641 b" all copies found (* = to merge, ! = divergent, " |
| 642 b"% = renamed and deleted):\n" | 642 b"% = renamed and deleted):\n" |
| 643 ) | 643 ) |
| 644 for f in sorted(fullcopy): | 644 for f in sorted(fullcopy): |
| 650 if f in renamedeleteset: | 650 if f in renamedeleteset: |
| 651 note += b"%" | 651 note += b"%" |
| 652 repo.ui.debug( | 652 repo.ui.debug( |
| 653 b" src: '%s' -> dst: '%s' %s\n" % (fullcopy[f], f, note) | 653 b" src: '%s' -> dst: '%s' %s\n" % (fullcopy[f], f, note) |
| 654 ) | 654 ) |
| 655 del divergeset | 655 del renamedeleteset |
| 656 del divergeset | |
| 656 | 657 |
| 657 repo.ui.debug(b" checking for directory renames\n") | 658 repo.ui.debug(b" checking for directory renames\n") |
| 658 | 659 |
| 659 # generate a directory move map | 660 # generate a directory move map |
| 660 d1, d2 = c1.dirs(), c2.dirs() | 661 d1, d2 = c1.dirs(), c2.dirs() |