( )⚙ D6266 copies: replace .items() by .values() where appropriate

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6266

copies: replace .items() by .values() where appropriate
ClosedPublic

Authored by martinvonz on Apr 17 2019, 5:12 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGa20d7c6abff2: copies: replace .items() by .values() where appropriate
Summary

As pointed out by Pierre-Yves.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Apr 17 2019, 5:12 PM
martinvonz updated this revision to Diff 14945.Apr 28 2019, 3:00 AM
martinvonz updated this revision to Diff 14966.Apr 29 2019, 6:52 PM
Closed by commit rHGa20d7c6abff2: copies: replace .items() by .values() where appropriate (authored by martinvonz). · Explain WhyMay 1 2019, 10:13 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/copies.py (4 lines)

Diff 14945

mercurial/copies.py

# copied/renamed only on side 1 # copied/renamed only on side 1
_checksinglesidecopies(src, dsts1, m1, m2, mb, copy, renamedelete) _checksinglesidecopies(src, dsts1, m1, m2, mb, copy, renamedelete)
elif dsts2: elif dsts2:
# copied/renamed only on side 2 # copied/renamed only on side 2
_checksinglesidecopies(src, dsts2, m2, m1, mb, copy, renamedelete) _checksinglesidecopies(src, dsts2, m2, m1, mb, copy, renamedelete)
renamedeleteset = set() renamedeleteset = set()
divergeset = set() divergeset = set()
for src, dsts in diverge.items(): for dsts in diverge.values():
divergeset.update(dsts) divergeset.update(dsts)
for src, dsts in renamedelete.items(): for dsts in renamedelete.values():
renamedeleteset.update(dsts) renamedeleteset.update(dsts)
# find interesting file sets from manifests # find interesting file sets from manifests
addedinm1 = m1.filesnotin(mb, repo.narrowmatch()) addedinm1 = m1.filesnotin(mb, repo.narrowmatch())
addedinm2 = m2.filesnotin(mb, repo.narrowmatch()) addedinm2 = m2.filesnotin(mb, repo.narrowmatch())
u1 = sorted(addedinm1 - addedinm2) u1 = sorted(addedinm1 - addedinm2)
u2 = sorted(addedinm2 - addedinm1) u2 = sorted(addedinm2 - addedinm1)