( )⚙ D12332 merge: remove pycompat.iteritems()

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12332

merge: remove pycompat.iteritems()
ClosedPublic

Authored by indygreg on Mar 3 2022, 4:21 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGc17aee610bab: merge: remove pycompat.iteritems()

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

indygreg created this revision.Mar 3 2022, 4:21 PM
Alphare accepted this revision.Mar 8 2022, 4:30 AM
This revision is now accepted and ready to land.Mar 8 2022, 4:30 AM
indygreg added a commit: rHGc17aee610bab: merge: remove pycompat.iteritems().Mar 8 2022, 5:59 AM
Closed by commit rHGc17aee610bab: merge: remove pycompat.iteritems() (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (4 lines)

Diff 32543

mercurial/merge.py

Returns a list of tuple of form (filename, data, message) Returns a list of tuple of form (filename, data, message)
""" """
for a in actions: for a in actions:
if sort: if sort:
for f in sorted(self._actionmapping[a]): for f in sorted(self._actionmapping[a]):
args, msg = self._actionmapping[a][f] args, msg = self._actionmapping[a][f]
yield f, args, msg yield f, args, msg
else: else:
for f, (args, msg) in pycompat.iteritems( for f, (args, msg) in self._actionmapping[a].items():
self._actionmapping[a]
):
yield f, args, msg yield f, args, msg
def len(self, actions=None): def len(self, actions=None):
"""returns number of files which needs actions """returns number of files which needs actions
if actions is passed, total of number of files in that action if actions is passed, total of number of files in that action
only is returned""" only is returned"""