This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5262

py3: don't use dict.iterkeys()
ClosedPublic

Authored by pulkit on Nov 13 2018, 10:27 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG9769e0f6ffe0: py3: don't use dict.iterkeys()
Summary

dict.iterkeys() is not present on Python 3.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Nov 13 2018, 10:27 AM
indygreg added a subscriber: indygreg.Nov 13 2018, 1:46 PM
indygreg added inline comments.
hgext/remotefilelog/repack.py
510

This can be reduced to list(entries).

646

Ditto.

Closed by commit rHG9769e0f6ffe0: py3: don't use dict.iterkeys() (authored by pulkit). · Explain WhyNov 13 2018, 1:49 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 12519

hgext/remotefilelog/basepack.py

else: else:
params = indexparams(SMALLFANOUTPREFIX, self.VERSION) params = indexparams(SMALLFANOUTPREFIX, self.VERSION)
fanouttable = [EMPTYFANOUT] * params.fanoutcount fanouttable = [EMPTYFANOUT] * params.fanoutcount
# Precompute the location of each entry # Precompute the location of each entry
locations = {} locations = {}
count = 0 count = 0
for node in sorted(self.entries.iterkeys()): for node in sorted(self.entries):
location = count * self.INDEXENTRYLENGTH location = count * self.INDEXENTRYLENGTH
locations[node] = location locations[node] = location
count += 1 count += 1
# Must use [0] on the unpack result since it's always a tuple. # Must use [0] on the unpack result since it's always a tuple.
fanoutkey = struct.unpack(params.fanoutstruct, fanoutkey = struct.unpack(params.fanoutstruct,
node[:params.fanoutprefix])[0] node[:params.fanoutprefix])[0]
if fanouttable[fanoutkey] == EMPTYFANOUT: if fanouttable[fanoutkey] == EMPTYFANOUT:

hgext/remotefilelog/fileserverclient.py

self.ui.progress(_downloading, 0, total=count) self.ui.progress(_downloading, 0, total=count)
missed = [] missed = []
count = 0 count = 0
while True: while True:
missingid = cache.receiveline() missingid = cache.receiveline()
if not missingid: if not missingid:
missedset = set(missed) missedset = set(missed)
for missingid in idmap.iterkeys(): for missingid in idmap:
if not missingid in missedset: if not missingid in missedset:
missed.append(missingid) missed.append(missingid)
self.ui.warn(_("warning: cache connection closed early - " + self.ui.warn(_("warning: cache connection closed early - " +
"falling back to server\n")) "falling back to server\n"))
break break
if missingid == "0": if missingid == "0":
break break
if missingid.startswith("_hits_"): if missingid.startswith("_hits_"):

hgext/remotefilelog/remotefilelog.py

allparents.add(p1) allparents.add(p1)
if p2 != nullid: if p2 != nullid:
parents.append(p2) parents.append(p2)
allparents.add(p2) allparents.add(p2)
# Breadth first traversal to build linkrev graph # Breadth first traversal to build linkrev graph
parentrevs = collections.defaultdict(list) parentrevs = collections.defaultdict(list)
revmap = {} revmap = {}
queue = collections.deque(((None, n) for n in parentsmap.iterkeys() queue = collections.deque(((None, n) for n in parentsmap
if n not in allparents)) if n not in allparents))
while queue: while queue:
prevrev, current = queue.pop() prevrev, current = queue.pop()
if current in revmap: if current in revmap:
if prevrev: if prevrev:
parentrevs[prevrev].append(revmap[current]) parentrevs[prevrev].append(revmap[current])
continue continue

hgext/remotefilelog/repack.py

byfile.setdefault(entry.filename, {})[entry.node] = entry byfile.setdefault(entry.filename, {})[entry.node] = entry
count = 0 count = 0
for filename, entries in sorted(byfile.iteritems()): for filename, entries in sorted(byfile.iteritems()):
ui.progress(_("repacking data"), count, unit=self.unit, ui.progress(_("repacking data"), count, unit=self.unit,
total=len(byfile)) total=len(byfile))
ancestors = {} ancestors = {}
nodes = list(node for node in entries.iterkeys()) nodes = list(node for node in entries)
indygregUnsubmitted
Not Done

This can be reduced to list(entries).

indygreg: This can be reduced to `list(entries)`.
nohistory = [] nohistory = []
for i, node in enumerate(nodes): for i, node in enumerate(nodes):
if node in ancestors: if node in ancestors:
continue continue
ui.progress(_("building history"), i, unit='nodes', ui.progress(_("building history"), i, unit='nodes',
total=len(nodes)) total=len(nodes))
try: try:
ancestors.update(self.fullhistory.getancestors(filename, ancestors.update(self.fullhistory.getancestors(filename,
byfile = {} byfile = {}
for entry in ledger.entries.itervalues(): for entry in ledger.entries.itervalues():
if entry.historysource: if entry.historysource:
byfile.setdefault(entry.filename, {})[entry.node] = entry byfile.setdefault(entry.filename, {})[entry.node] = entry
count = 0 count = 0
for filename, entries in sorted(byfile.iteritems()): for filename, entries in sorted(byfile.iteritems()):
ancestors = {} ancestors = {}
nodes = list(node for node in entries.iterkeys()) nodes = list(node for node in entries)
indygregUnsubmitted
Not Done

Ditto.

indygreg: Ditto.
for node in nodes: for node in nodes:
if node in ancestors: if node in ancestors:
continue continue
ancestors.update(self.history.getancestors(filename, node, ancestors.update(self.history.getancestors(filename, node,
known=ancestors)) known=ancestors))
# Order the nodes children first # Order the nodes children first