This is an archive of the discontinued Mercurial Phabricator instance.

Differential D853

py3: explicitly convert dict.keys() and dict.items() into a list
ClosedPublic

Authored by pulkit on Sep 30 2017, 8:50 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG1a5abc45e2fa: py3: explicitly convert dict.keys() and dict.items() into a list
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Sep 30 2017, 8:50 AM
durin42 requested changes to this revision.Sep 30 2017, 8:58 AM
durin42 added a subscriber: durin42.

One nit.

mercurial/copies.py
144

please use list(c) instead of list(c.keys()) - the latter allocates an extra list on Python 2, whereas the former works consistently on both 2 and 3.

This revision now requires changes to proceed.Sep 30 2017, 8:58 AM
pulkit updated this revision to Diff 2185.Sep 30 2017, 9:19 AM
durin42 accepted this revision.Sep 30 2017, 9:20 AM
This revision is now accepted and ready to land.Sep 30 2017, 9:20 AM
Closed by commit rHG1a5abc45e2fa: py3: explicitly convert dict.keys() and dict.items() into a list (authored by pulkit). · Explain WhySep 30 2017, 9:39 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/copies.py (4 lines)
Mmercurial/merge.py (4 lines)

Diff 2185

mercurial/copies.py

if am.get(f.path(), None) == f.filenode(): if am.get(f.path(), None) == f.filenode():
return f return f
if limit >= 0 and f.linkrev() < limit and f.rev() < limit: if limit >= 0 and f.linkrev() < limit and f.rev() < limit:
return None return None
def _dirstatecopies(d): def _dirstatecopies(d):
ds = d._repo.dirstate ds = d._repo.dirstate
c = ds.copies().copy() c = ds.copies().copy()
for k in c.keys(): for k in list(c):
durin42Unsubmitted
Not Done

please use list(c) instead of list(c.keys()) - the latter allocates an extra list on Python 2, whereas the former works consistently on both 2 and 3.

durin42: please use list(c) instead of list(c.keys()) - the latter allocates an extra list on Python 2…
if ds[k] not in 'anm': if ds[k] not in 'anm':
del c[k] del c[k]
return c return c
def _computeforwardmissing(a, b, match=None): def _computeforwardmissing(a, b, match=None):
"""Computes which files are in b but not a. """Computes which files are in b but not a.
This is its own function so extensions can easily wrap this call to see what This is its own function so extensions can easily wrap this call to see what
files _forwardcopies is about to process. files _forwardcopies is about to process.
incompletediverge) incompletediverge)
else: else:
_combinecopies(data1['incomplete'], data2['incomplete'], copy, diverge, _combinecopies(data1['incomplete'], data2['incomplete'], copy, diverge,
incompletediverge) incompletediverge)
renamedelete = {} renamedelete = {}
renamedeleteset = set() renamedeleteset = set()
divergeset = set() divergeset = set()
for of, fl in diverge.items(): for of, fl in list(diverge.items()):
if len(fl) == 1 or of in c1 or of in c2: if len(fl) == 1 or of in c1 or of in c2:
del diverge[of] # not actually divergent, or not a rename del diverge[of] # not actually divergent, or not a rename
if of not in c1 and of not in c2: if of not in c1 and of not in c2:
# renamed on one side, deleted on the other side, but filter # renamed on one side, deleted on the other side, but filter
# out files that have been renamed and then deleted # out files that have been renamed and then deleted
renamedelete[of] = [f for f in fl if f in c1 or f in c2] renamedelete[of] = [f for f in fl if f in c1 or f in c2]
renamedeleteset.update(fl) # reverse map for below renamedeleteset.update(fl) # reverse map for below
else: else:

mercurial/merge.py

# Pick the best bid for each file # Pick the best bid for each file
repo.ui.note(_('\nauction for merging merge bids\n')) repo.ui.note(_('\nauction for merging merge bids\n'))
actions = {} actions = {}
dms = [] # filenames that have dm actions dms = [] # filenames that have dm actions
for f, bids in sorted(fbids.items()): for f, bids in sorted(fbids.items()):
# bids is a mapping from action method to list af actions # bids is a mapping from action method to list af actions
# Consensus? # Consensus?
if len(bids) == 1: # all bids are the same kind of method if len(bids) == 1: # all bids are the same kind of method
m, l = bids.items()[0] m, l = list(bids.items())[0]
if all(a == l[0] for a in l[1:]): # len(bids) is > 1 if all(a == l[0] for a in l[1:]): # len(bids) is > 1
repo.ui.note(_(" %s: consensus for %s\n") % (f, m)) repo.ui.note(_(" %s: consensus for %s\n") % (f, m))
actions[f] = l[0] actions[f] = l[0]
if m == 'dm': if m == 'dm':
dms.append(f) dms.append(f)
continue continue
# If keep is an option, just do it. # If keep is an option, just do it.
if 'k' in bids: if 'k' in bids:
continue continue
# TODO: Consider other simple actions such as mode changes # TODO: Consider other simple actions such as mode changes
# Handle inefficient democrazy. # Handle inefficient democrazy.
repo.ui.note(_(' %s: multiple bids for merge action:\n') % f) repo.ui.note(_(' %s: multiple bids for merge action:\n') % f)
for m, l in sorted(bids.items()): for m, l in sorted(bids.items()):
for _f, args, msg in l: for _f, args, msg in l:
repo.ui.note(' %s -> %s\n' % (msg, m)) repo.ui.note(' %s -> %s\n' % (msg, m))
# Pick random action. TODO: Instead, prompt user when resolving # Pick random action. TODO: Instead, prompt user when resolving
m, l = bids.items()[0] m, l = list(bids.items())[0]
repo.ui.warn(_(' %s: ambiguous merge - picked %s action\n') % repo.ui.warn(_(' %s: ambiguous merge - picked %s action\n') %
(f, m)) (f, m))
actions[f] = l[0] actions[f] = l[0]
if m == 'dm': if m == 'dm':
dms.append(f) dms.append(f)
continue continue
# Work around 'dm' that can cause multiple actions for the same file # Work around 'dm' that can cause multiple actions for the same file
for f in dms: for f in dms: