comparison mercurial/bundle2.py @ 48913:f254fc73d956

global: bulk replace simple pycompat.iteritems(x) with x.items() pycompat.iteritems() just calls .items(). This commit applies a regular expression search and replace to convert simple instances of pycompat.iteritems() with .items(). There are still a handful of calls to pycompat.iteritems() remaining. But these all have more complicated expressions that I wasn't comfortable performing an automated replace on. In addition, some simple replacements were withheld because they broke pytype. These will be handled by their own changesets. Differential Revision: https://phab.mercurial-scm.org/D12318
author Gregory Szorc <gregory.szorc@gmail.com>
date Thu, 03 Mar 2022 18:28:30 -0800
parents 6000f5b25c9b
children 642e31cb55f0
comparison
equal deleted inserted replaced
48912:a0674e916fb6 48913:f254fc73d956
2237 phasecache = unfi._phasecache 2237 phasecache = unfi._phasecache
2238 msg = ( 2238 msg = (
2239 b'remote repository changed while pushing - please try again ' 2239 b'remote repository changed while pushing - please try again '
2240 b'(%s is %s expected %s)' 2240 b'(%s is %s expected %s)'
2241 ) 2241 )
2242 for expectedphase, nodes in pycompat.iteritems(phasetonodes): 2242 for expectedphase, nodes in phasetonodes.items():
2243 for n in nodes: 2243 for n in nodes:
2244 actualphase = phasecache.phase(unfi, cl.rev(n)) 2244 actualphase = phasecache.phase(unfi, cl.rev(n))
2245 if actualphase != expectedphase: 2245 if actualphase != expectedphase:
2246 finalmsg = msg % ( 2246 finalmsg = msg % (
2247 short(n), 2247 short(n),