comparison hgext3rd/topic/__init__.py @ 3578:10c3e69bb5bf

branching: merge stable into default

Some bugfix that we could use here (also getting ready for a release).

3577:279d8b610ac5

)

from . import (
    compat,
    constants,
    flow,
    revset as topicrevset,
    destination,
    stack,
    topicmap,
    discovery,
    randomname
)

if util.safehasattr(registrar, 'command'):
    commandfunc = registrar.command
else: # compat with hg < 4.3

        # however t0 is related to  'currenttopic' which has no place here.
        return None
    revlist = stack.stack(self._repo, topic=topic)
    try:
        return revlist.index(self.rev())
    except IndexError:
        # Lets move to the last ctx of the current topic
        return None
context.basectx.topicidx = _contexttopicidx

3578:10c3e69bb5bf

)

from . import (
    compat,
    constants,
    destination,
    discovery,
    evolvebits,
    flow,
    randomname,
    revset as topicrevset,
    stack,
    topicmap,
)

if util.safehasattr(registrar, 'command'):
    commandfunc = registrar.command
else: # compat with hg < 4.3

        # however t0 is related to  'currenttopic' which has no place here.
        return None
    revlist = stack.stack(self._repo, topic=topic)
    try:
        return revlist.index(self.rev())
    except ValueError:
        if self.obsolete():
            succ = evolvebits._singlesuccessor(self._repo, self)
            if succ not in revlist:
                return None
            return revlist.index(succ)
    except IndexError:
        # Lets move to the last ctx of the current topic
        return None
context.basectx.topicidx = _contexttopicidx