comparison hgext3rd/topic/evolvebits.py @ 2694:8a222745a71c

topic: adapt to function migrate to obsutil

Mercurial 4.3 has a new module "obsutil"  and multiple functions moved there. We
handle the move for the one we care about.

2693:f4b0351fa813

import collections
from mercurial import obsolete

# Copied from evolve 081605c2e9b6

def _orderrevs(repo, revs):
    """Compute an ordering to solve instability for the given revs

    if not p.obsolete():
        return p.rev()
    obs = repo[p]
    ui = repo.ui
    newer = obsolete.successorssets(repo, obs.node())
    # search of a parent which is not killed
    while not newer:
        ui.debug("stabilize target %s is plain dead,"
                 " trying to stabilize on its parent\n" %
                 obs)
        obs = obs.parents()[0]
        newer = obsolete.successorssets(repo, obs.node())
    if len(newer) > 1 or len(newer[0]) > 1:
        raise MultipleSuccessorsError(newer)

    return repo[newer[0][0]].rev()

2694:8a222745a71c

import collections
from mercurial import obsolete

successorssets = None
try:
    from mercurial import obsutil
    successorssets = getattr(obsutil, 'successorssets', None)
except ImportError:
    pass

if successorssets is None:
    successorssets = obsolete.successorssets

# Copied from evolve 081605c2e9b6

def _orderrevs(repo, revs):
    """Compute an ordering to solve instability for the given revs

    if not p.obsolete():
        return p.rev()
    obs = repo[p]
    ui = repo.ui
    newer = successorssets(repo, obs.node())
    # search of a parent which is not killed
    while not newer:
        ui.debug("stabilize target %s is plain dead,"
                 " trying to stabilize on its parent\n" %
                 obs)
        obs = obs.parents()[0]
        newer = successorssets(repo, obs.node())
    if len(newer) > 1 or len(newer[0]) > 1:
        raise MultipleSuccessorsError(newer)

    return repo[newer[0][0]].rev()