comparison mercurial/revset.py @ 25143:91c49621b2b8

_revancestors: use 'next' to remove the verbose try except clauses

The 'next()' built-in can return a default value, making the final iteration
case simpler and clearer.

25142:24140873ca4c

    def iterate():
        revs.sort(reverse=True)
        irevs = iter(revs)
        h = []
        try:
            inputrev = irevs.next()
            heapq.heappush(h, -inputrev)
        except StopIteration:
            return

        seen = set()
        while h:
            current = -heapq.heappop(h)
            if current == inputrev:
                try:
                    inputrev = irevs.next()
                    heapq.heappush(h, -inputrev)
                except StopIteration:
                    pass
            if current not in seen:
                seen.add(current)
                yield current
                for parent in cl.parentrevs(current)[:cut]:
                    if parent != node.nullrev:

25143:91c49621b2b8

    def iterate():
        revs.sort(reverse=True)
        irevs = iter(revs)
        h = []

        inputrev = next(irevs, None)
        if inputrev is not None:
            heapq.heappush(h, -inputrev)

        seen = set()
        while h:
            current = -heapq.heappop(h)
            if current == inputrev:
                inputrev = next(irevs, None)
                if inputrev is not None:
                    heapq.heappush(h, -inputrev)
            if current not in seen:
                seen.add(current)
                yield current
                for parent in cl.parentrevs(current)[:cut]:
                    if parent != node.nullrev: