diff -r 649d3ac37a12 -r d783f945a701 mercurial/commands.py --- a/mercurial/commands.py Sun Oct 06 19:25:18 2019 -0400 +++ b/mercurial/commands.py Mon Oct 07 00:04:04 2019 -0400 @@ -2355,7 +2355,7 @@ ) def debugcommands(ui, cmd=b'', *args): """list all available commands and options""" - for cmd, vals in sorted(table.iteritems()): + for cmd, vals in sorted(pycompat.iteritems(table)): cmd = cmd.split(b'|')[0] opts = b', '.join([i[1] for i in vals[1]]) ui.write(b'%s: %s\n' % (cmd, opts)) @@ -3906,7 +3906,9 @@ hexremoterev = hex(remoterev) bms = [ bm - for bm, bmr in peer.listkeys(b'bookmarks').iteritems() + for bm, bmr in pycompat.iteritems( + peer.listkeys(b'bookmarks') + ) if bmr == hexremoterev ] @@ -5146,11 +5148,11 @@ if search: pathitems = [ (name, path) - for name, path in ui.paths.iteritems() + for name, path in pycompat.iteritems(ui.paths) if name == search ] else: - pathitems = sorted(ui.paths.iteritems()) + pathitems = sorted(pycompat.iteritems(ui.paths)) fm = ui.formatter(b'paths', opts) if fm.isplain(): @@ -6959,7 +6961,7 @@ c = repo.dirstate.copies() copied, renamed = [], [] - for d, s in c.iteritems(): + for d, s in pycompat.iteritems(c): if s in status.removed: status.removed.remove(s) renamed.append(d)