Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/cmdutil.py @ 49004: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
| 49003:a0674e916fb6 | 49004:f254fc73d956 |
|---|---|
| 624 return commitfunc(ui, repo, *newfiles, **pycompat.strkwargs(opts)) | 624 return commitfunc(ui, repo, *newfiles, **pycompat.strkwargs(opts)) |
| 625 finally: | 625 finally: |
| 626 # 5. finally restore backed-up files | 626 # 5. finally restore backed-up files |
| 627 try: | 627 try: |
| 628 dirstate = repo.dirstate | 628 dirstate = repo.dirstate |
| 629 for realname, tmpname in pycompat.iteritems(backups): | 629 for realname, tmpname in backups.items(): |
| 630 ui.debug(b'restoring %r to %r\n' % (tmpname, realname)) | 630 ui.debug(b'restoring %r to %r\n' % (tmpname, realname)) |
| 631 | 631 |
| 632 if dirstate.get_entry(realname).maybe_clean: | 632 if dirstate.get_entry(realname).maybe_clean: |
| 633 # without normallookup, restoring timestamp | 633 # without normallookup, restoring timestamp |
| 634 # may cause partially committed files | 634 # may cause partially committed files |