Mercurial > public > mercurial-scm > hg

comparison mercurial/revset.py @ 48913:f254fc73d956

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 63fd0282ad40
comparison
equal deleted inserted replaced
48912:a0674e916fb6 48913:f254fc73d956
592 _(b"bookmark '%s' does not exist") % pattern 592 _(b"bookmark '%s' does not exist") % pattern
593 ) 593 )
594 bms.add(repo[bmrev].rev()) 594 bms.add(repo[bmrev].rev())
595 else: 595 else:
596 matchrevs = set() 596 matchrevs = set()
597 for name, bmrev in pycompat.iteritems(repo._bookmarks): 597 for name, bmrev in repo._bookmarks.items():
598 if matcher(name): 598 if matcher(name):
599 matchrevs.add(bmrev) 599 matchrevs.add(bmrev)
600 for bmrev in matchrevs: 600 for bmrev in matchrevs:
601 bms.add(repo[bmrev].rev()) 601 bms.add(repo[bmrev].rev())
602 else: 602 else:
1704 raise error.RepoLookupError( 1704 raise error.RepoLookupError(
1705 _(b"namespace '%s' does not exist") % ns 1705 _(b"namespace '%s' does not exist") % ns
1706 ) 1706 )
1707 namespaces.add(repo.names[pattern]) 1707 namespaces.add(repo.names[pattern])
1708 else: 1708 else:
1709 for name, ns in pycompat.iteritems(repo.names): 1709 for name, ns in repo.names.items():
1710 if matcher(name): 1710 if matcher(name):
1711 namespaces.add(ns) 1711 namespaces.add(ns)
1712 1712
1713 names = set() 1713 names = set()
1714 for ns in namespaces: 1714 for ns in namespaces:
2801 return mfunc 2801 return mfunc
2802 2802
2803 2803
2804 def loadpredicate(ui, extname, registrarobj): 2804 def loadpredicate(ui, extname, registrarobj):
2805 """Load revset predicates from specified registrarobj""" 2805 """Load revset predicates from specified registrarobj"""
2806 for name, func in pycompat.iteritems(registrarobj._table): 2806 for name, func in registrarobj._table.items():
2807 symbols[name] = func 2807 symbols[name] = func
2808 if func._safe: 2808 if func._safe:
2809 safesymbols.add(name) 2809 safesymbols.add(name)
2810 2810
2811 2811