comparison hgext3rd/topic/stack.py @ 4434:432f2155d106

stack: handle external-children just like other states

This also fixes color labels: previously when external-children was combined
with another state, --color=debug would show something like:

  [topic.stack.index topic.stack.index.current - external-children|s4]

Now there is a separate label for each state.

4433:a19d8196b0c9

    # super crude initial version
    for idx, isentry, ctx in entries[::-1]:

        symbol = None
        states = []
        msg = ''
        iscurrentrevision = repo.revs('%d and parents()', ctx.rev())
        if opts.get('children'):
            expr = 'children(%d) and merge() - %ld'
            revisions = repo.revs(expr, ctx.rev(), st.revs[1:])
            if len(revisions) > 0:
                msg = 'external-children'

        if iscurrentrevision:
            symbol = '@'
            if msg:
                states.append('current - ' + msg)
            else:
                states.append('current')

        if ctx.orphan():
            symbol = '$'
            if msg:
                states.append('orphan - ' + msg)
            else:
                states.append('orphan')

        if not isentry:
            symbol = '^'
            # "base" is kind of a "ghost" entry
            states.append('base')

        # none of the above if statments get executed
        if not symbol:
            symbol = ':'
            if msg:
                states.append(msg)
            else:
                states.append('clean')

        states.sort()

        fm.startitem()
        fm.data(isentry=isentry)

4434:432f2155d106

    # super crude initial version
    for idx, isentry, ctx in entries[::-1]:

        symbol = None
        states = []
        iscurrentrevision = repo.revs('%d and parents()', ctx.rev())
        if opts.get('children'):
            expr = 'children(%d) and merge() - %ld'
            revisions = repo.revs(expr, ctx.rev(), st.revs[1:])
            if len(revisions) > 0:
                states.append('external-children')

        if iscurrentrevision:
            symbol = '@'
            states.append('current')

        if ctx.orphan():
            symbol = '$'
            states.append('orphan')

        if not isentry:
            symbol = '^'
            # "base" is kind of a "ghost" entry
            states.append('base')

        # none of the above if statments get executed
        if not symbol:
            symbol = ':'

        if not states:
            states.append('clean')

        states.sort()

        fm.startitem()
        fm.data(isentry=isentry)