comparison hgext/rebase.py @ 44167:4263aaab651d

rebase: clarify a little by calculating a set in Python instead of in revset

By calculating the set in Python, we can give it a name, which helps
readability.

Differential Revision: https://phab.mercurial-scm.org/D7904

44166:faec51c76b7b

        for i, base in enumerate(bases):
            if base == nullrev:
                continue
            # Revisions in the side (not chosen as merge base) branch that
            # might contain "surprising" contents
            siderevs = list(
                repo.revs(b'((%ld-%d) %% (%d+%d))', bases, base, base, dest)
            )

            # If those revisions are covered by rebaseset, the result is good.
            # A merge in rebaseset would be considered to cover its ancestors.
            if siderevs:

44167:4263aaab651d

        for i, base in enumerate(bases):
            if base == nullrev:
                continue
            # Revisions in the side (not chosen as merge base) branch that
            # might contain "surprising" contents
            other_bases = set(bases) - {base}
            siderevs = list(
                repo.revs(b'(%ld %% (%d+%d))', other_bases, base, dest)
            )

            # If those revisions are covered by rebaseset, the result is good.
            # A merge in rebaseset would be considered to cover its ancestors.
            if siderevs: