comparison mercurial/cmdutil.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

48912:a0674e916fb6

            return commitfunc(ui, repo, *newfiles, **pycompat.strkwargs(opts))
        finally:
            # 5. finally restore backed-up files
            try:
                dirstate = repo.dirstate
                for realname, tmpname in pycompat.iteritems(backups):
                    ui.debug(b'restoring %r to %r\n' % (tmpname, realname))

                    if dirstate.get_entry(realname).maybe_clean:
                        # without normallookup, restoring timestamp
                        # may cause partially committed files

48913:f254fc73d956

            return commitfunc(ui, repo, *newfiles, **pycompat.strkwargs(opts))
        finally:
            # 5. finally restore backed-up files
            try:
                dirstate = repo.dirstate
                for realname, tmpname in backups.items():
                    ui.debug(b'restoring %r to %r\n' % (tmpname, realname))

                    if dirstate.get_entry(realname).maybe_clean:
                        # without normallookup, restoring timestamp
                        # may cause partially committed files