equal
deleted
inserted
replaced
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 |