Mercurial > hg
comparison mercurial/copies.py @ 42224:a20d7c6abff2
copies: replace .items() by .values() where appropriate
As pointed out by Pierre-Yves.
Differential Revision: https://phab.mercurial-scm.org/D6266
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 17 Apr 2019 14:11:54 -0700 |
| parents | d69bc8ffbe6f |
| children | d8ca7b99fc51 |
comparison
equal
deleted
inserted
replaced
| 42223:d69bc8ffbe6f | 42224:a20d7c6abff2 |
|---|---|
| 525 _checksinglesidecopies(src, dsts2, m2, m1, mb, c1, base, | 525 _checksinglesidecopies(src, dsts2, m2, m1, mb, c1, base, |
| 526 copy, renamedelete) | 526 copy, renamedelete) |
| 527 | 527 |
| 528 renamedeleteset = set() | 528 renamedeleteset = set() |
| 529 divergeset = set() | 529 divergeset = set() |
| 530 for src, dsts in diverge.items(): | 530 for dsts in diverge.values(): |
| 531 divergeset.update(dsts) | 531 divergeset.update(dsts) |
| 532 for src, dsts in renamedelete.items(): | 532 for dsts in renamedelete.values(): |
| 533 renamedeleteset.update(dsts) | 533 renamedeleteset.update(dsts) |
| 534 | 534 |
| 535 # find interesting file sets from manifests | 535 # find interesting file sets from manifests |
| 536 addedinm1 = m1.filesnotin(mb, repo.narrowmatch()) | 536 addedinm1 = m1.filesnotin(mb, repo.narrowmatch()) |
| 537 addedinm2 = m2.filesnotin(mb, repo.narrowmatch()) | 537 addedinm2 = m2.filesnotin(mb, repo.narrowmatch()) |