This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2315

py3: use default dict iterator instead of iterkeys
ClosedPublic

Authored by durin42 on Feb 18 2018, 1:00 AM.

Details

Reviewers
pulkit
indygreg
Group Reviewers
hg-reviewers
Commits
rHG238646784294: py3: use default dict iterator instead of iterkeys
Summary

These are the easy cases. Some cases in manifest.py will require more
careful inspection.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 created this revision.Feb 18 2018, 1:00 AM
pulkit accepted this revision.Feb 18 2018, 6:55 AM
indygreg accepted this revision.Feb 18 2018, 11:22 AM
This revision is now accepted and ready to land.Feb 18 2018, 11:22 AM
Closed by commit rHG238646784294: py3: use default dict iterator instead of iterkeys (authored by durin42). · Explain WhyFeb 18 2018, 11:24 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/synthrepo.py (2 lines)
Mhgext/convert/subversion.py (2 lines)
Mhgext/rebase.py (2 lines)

Diff 5833

contrib/synthrepo.py

dir = os.path.dirname(dir) dir = os.path.dirname(dir)
def filectxfn(repo, memctx, path): def filectxfn(repo, memctx, path):
return context.memfilectx(repo, memctx, path, files[path]) return context.memfilectx(repo, memctx, path, files[path])
ui.progress(_synthesizing, None) ui.progress(_synthesizing, None)
message = 'synthesized wide repo with %d files' % (len(files),) message = 'synthesized wide repo with %d files' % (len(files),)
mc = context.memctx(repo, [pctx.node(), nullid], message, mc = context.memctx(repo, [pctx.node(), nullid], message,
files.iterkeys(), filectxfn, ui.username(), files, filectxfn, ui.username(),
'%d %d' % util.makedate()) '%d %d' % util.makedate())
initnode = mc.commit() initnode = mc.commit()
if ui.debugflag: if ui.debugflag:
hexfn = hex hexfn = hex
else: else:
hexfn = short hexfn = short
ui.status(_('added commit %s with %d files\n') ui.status(_('added commit %s with %d files\n')
% (hexfn(initnode), len(files))) % (hexfn(initnode), len(files)))

hgext/convert/subversion.py

if os.path.exists(os.path.join(url, '.svn/entries')): if os.path.exists(os.path.join(url, '.svn/entries')):
self.wc = url self.wc = url
else: else:
self.wc = None self.wc = None
self.convertfp = None self.convertfp = None
def setrevmap(self, revmap): def setrevmap(self, revmap):
lastrevs = {} lastrevs = {}
for revid in revmap.iterkeys(): for revid in revmap:
uuid, module, revnum = revsplit(revid) uuid, module, revnum = revsplit(revid)
lastrevnum = lastrevs.setdefault(module, revnum) lastrevnum = lastrevs.setdefault(module, revnum)
if revnum > lastrevnum: if revnum > lastrevnum:
lastrevs[module] = revnum lastrevs[module] = revnum
self.lastrevs = lastrevs self.lastrevs = lastrevs
def exists(self, path, optrev): def exists(self, path, optrev):
try: try:

hgext/rebase.py

newnode = concludenode(repo, revtoreuse, p1, self.external, newnode = concludenode(repo, revtoreuse, p1, self.external,
commitmsg=commitmsg, commitmsg=commitmsg,
extrafn=_makeextrafn(self.extrafns), extrafn=_makeextrafn(self.extrafns),
editor=editor, editor=editor,
keepbranches=self.keepbranchesf, keepbranches=self.keepbranchesf,
date=self.date) date=self.date)
if newnode is not None: if newnode is not None:
newrev = repo[newnode].rev() newrev = repo[newnode].rev()
for oldrev in self.state.iterkeys(): for oldrev in self.state:
self.state[oldrev] = newrev self.state[oldrev] = newrev
if 'qtip' in repo.tags(): if 'qtip' in repo.tags():
updatemq(repo, self.state, self.skipped, **opts) updatemq(repo, self.state, self.skipped, **opts)
# restore original working directory # restore original working directory
# (we do this before stripping) # (we do this before stripping)
newwd = self.state.get(self.originalwd, self.originalwd) newwd = self.state.get(self.originalwd, self.originalwd)