comparison hgext3rd/evolve/obshistory.py @ 2411:bd937b7ce7d2

debugobshistory: handle multiple cycles

We previously handled up to one cycle only. This is now fixed.

2410:0756d36696bc

    o = object()
    path = [o]
    path_set = set(path)
    stack = [iter(graph)]
    while stack:
        for v in stack[-1]:
            if v in path_set:
                path_set.remove(o)
                return path_set
            elif v not in visited:
                visited.add(v)

    """

    # Get the list of nodes and links between them
    candidates, nodesucc, nodeprec = _obshistorywalker_links(repo, revs)

    # If we have a cycle
    cycle = cyclic(nodesucc)
    # XXX We might have multiple cycles
    if cycle:
        # Break the cycle
        breaknode = sorted(cycle)[0]
        # By removing one of the node in the cycle successors
        del nodesucc[breaknode]
        repo.ui.debug('obs-cycle detected, breaking at %s\n'
                      % nodemod.short(breaknode))

    # Shown, set of nodes presents in items
    shown = set()

    def isvalidcandidate(candidate):
        """ Function to filter candidates, check the candidate succ are

        # Filter out candidates, returns only nodes with all their successors
        # already shown
        validcandidates = filter(isvalidcandidate, candidates)

        # Check for cycles
        assert validcandidates

        for cand in sorted(validcandidates):
            # Remove candidate from candidates set
            candidates.remove(cand)
            shown.add(cand)

            # Add the right changectx class
            if cand in repo:
                changectx = repo[cand]

2411:bd937b7ce7d2

    o = object()
    path = [o]
    path_set = set(path)
    stack = [iter(graph)]
    while stack:
        for v in sorted(stack[-1]):
            if v in path_set:
                path_set.remove(o)
                return path_set
            elif v not in visited:
                visited.add(v)

    """

    # Get the list of nodes and links between them
    candidates, nodesucc, nodeprec = _obshistorywalker_links(repo, revs)

    # Shown, set of nodes presents in items
    shown = set()

    def isvalidcandidate(candidate):
        """ Function to filter candidates, check the candidate succ are

        # Filter out candidates, returns only nodes with all their successors
        # already shown
        validcandidates = filter(isvalidcandidate, candidates)

        # If we likely have a cycle
        if not validcandidates:
            cycle = cyclic(nodesucc)
            assert cycle

            # Then choose a random node from the cycle
            breaknode = sorted(cycle)[0]
            # And display it by force
            repo.ui.debug('obs-cycle detected, forcing display of %s\n'
                          % nodemod.short(breaknode))
            validcandidates = [breaknode]

        # Display all valid candidates
        for cand in sorted(validcandidates):
            # Remove candidate from candidates set
            candidates.remove(cand)
            # And remove it from nodesucc in case of future cycle detected
            try:
                del nodesucc[cand]
            except KeyError:
                pass

            shown.add(cand)

            # Add the right changectx class
            if cand in repo:
                changectx = repo[cand]