comparison mercurial/revlog.py @ 38102:9bf0bd4d7a2e

revlog: suggest other parent when a parent was refused for a delta (issue5481)

Without aggressivemergedeltas, ensure that when we decline the closest parent
(by revision number), the other parent is examined too.

38101:6acf41bb8d40

            if revlog._generaldelta:
                # exclude already lazy tested base if any
                parents = [p for p in (p1r, p2r)
                           if p != nullrev and p not in tested]
                if parents and not revlog._aggressivemergedeltas:
                    # Pick whichever parent is closer to us (to minimize the
                    # chance of having to build a fulltext).
                    parents = [max(parents)]
                tested.update(parents)
                yield parents

            if prev not in tested:
                # other approach failed try against prev to hopefully save us a
                # fulltext.
                yield (prev,)

38102:9bf0bd4d7a2e

            if revlog._generaldelta:
                # exclude already lazy tested base if any
                parents = [p for p in (p1r, p2r)
                           if p != nullrev and p not in tested]

                if not revlog._aggressivemergedeltas and len(parents) == 2:
                    parents.sort()
                    # To minimize the chance of having to build a fulltext,
                    # pick first whichever parent is closest to us (max rev)
                    yield (parents[1],)
                    # then the other one (min rev) if the first did not fit
                    yield (parents[0],)
                    tested.update(parents)
                elif len(parents) > 0:
                    # Test all parents (1 or 2), and keep the best candidate
                    yield parents
                    tested.update(parents)

            if prev not in tested:
                # other approach failed try against prev to hopefully save us a
                # fulltext.
                yield (prev,)