comparison mercurial/phases.py @ 51578:231a92eb1936

phases: more compact error handling in analyzeremotephases

using an intermediate variable result in more readable code, so let us use it.

51577:b5d494f7d28a

            continue
        node = bin(nhex)
        phase = int(phase)
        if phase == public:
            if node != repo.nullid:
                repo.ui.warn(
                    _(
                        b'ignoring inconsistent public root'
                        b' from remote: %s\n'
                    )
                    % nhex
                )
        elif phase == draft:
            if has_node(node):
                draftroots.append(node)
        else:
            repo.ui.warn(
                _(b'ignoring unexpected root from remote: %i %s\n')
                % (phase, nhex)
            )
    # compute heads
    publicheads = newheads(repo, subset, draftroots)
    return publicheads, draftroots

51578:231a92eb1936

            continue
        node = bin(nhex)
        phase = int(phase)
        if phase == public:
            if node != repo.nullid:
                msg = _(b'ignoring inconsistent public root from remote: %s\n')
                repo.ui.warn(msg % nhex)
        elif phase == draft:
            if has_node(node):
                draftroots.append(node)
        else:
            msg = _(b'ignoring unexpected root from remote: %i %s\n')
            repo.ui.warn(msg % (phase, nhex))
    # compute heads
    publicheads = newheads(repo, subset, draftroots)
    return publicheads, draftroots