Mercurial > hg
comparison mercurial/revset.py @ 43106:d783f945a701
py3: finish porting iteritems() to pycompat and remove source transformer
This commit finishes porting .iteritems() to pycompat.iteritems()
for the mercurial package.
The translation of .iteritems() to .items() was the last conversion
performed by the source transformer. With the porting to pycompat
complete, we no longer have a need for the source transformer. So
the source transformer has been removed. Good riddance! The code
base is now compatible with Python 2 and Python 3.
For the record, as the person who introduced the source transformer,
it brings me joy to delete it. It accomplished its goal to facilitate
a port to Python 3 without overly burdening people on some painful
low-level differences between Python 2 and 3. It is unfortunate we
still have to wallpaper over many differences with the pycompat
shim. But it is what it is.
Differential Revision: https://phab.mercurial-scm.org/D7015
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Mon, 07 Oct 2019 00:04:04 -0400 |
parents | c59eb1560c44 |
children | 8ff1ecfadcd1 |
comparison
equal
deleted
inserted
replaced
43105:649d3ac37a12 | 43106:d783f945a701 |
---|---|
575 _(b"bookmark '%s' does not exist") % pattern | 575 _(b"bookmark '%s' does not exist") % pattern |
576 ) | 576 ) |
577 bms.add(repo[bmrev].rev()) | 577 bms.add(repo[bmrev].rev()) |
578 else: | 578 else: |
579 matchrevs = set() | 579 matchrevs = set() |
580 for name, bmrev in repo._bookmarks.iteritems(): | 580 for name, bmrev in pycompat.iteritems(repo._bookmarks): |
581 if matcher(name): | 581 if matcher(name): |
582 matchrevs.add(bmrev) | 582 matchrevs.add(bmrev) |
583 for bmrev in matchrevs: | 583 for bmrev in matchrevs: |
584 bms.add(repo[bmrev].rev()) | 584 bms.add(repo[bmrev].rev()) |
585 else: | 585 else: |
1610 raise error.RepoLookupError( | 1610 raise error.RepoLookupError( |
1611 _(b"namespace '%s' does not exist") % ns | 1611 _(b"namespace '%s' does not exist") % ns |
1612 ) | 1612 ) |
1613 namespaces.add(repo.names[pattern]) | 1613 namespaces.add(repo.names[pattern]) |
1614 else: | 1614 else: |
1615 for name, ns in repo.names.iteritems(): | 1615 for name, ns in pycompat.iteritems(repo.names): |
1616 if matcher(name): | 1616 if matcher(name): |
1617 namespaces.add(ns) | 1617 namespaces.add(ns) |
1618 | 1618 |
1619 names = set() | 1619 names = set() |
1620 for ns in namespaces: | 1620 for ns in namespaces: |
2679 | 2679 |
2680 | 2680 |
2681 def loadpredicate(ui, extname, registrarobj): | 2681 def loadpredicate(ui, extname, registrarobj): |
2682 """Load revset predicates from specified registrarobj | 2682 """Load revset predicates from specified registrarobj |
2683 """ | 2683 """ |
2684 for name, func in registrarobj._table.iteritems(): | 2684 for name, func in pycompat.iteritems(registrarobj._table): |
2685 symbols[name] = func | 2685 symbols[name] = func |
2686 if func._safe: | 2686 if func._safe: |
2687 safesymbols.add(name) | 2687 safesymbols.add(name) |
2688 | 2688 |
2689 | 2689 |