comparison mercurial/phases.py @ 15953:52dc2b33d0be stable

phase: fix warning text from invalid remote phase

add missing end of line and substitution.

15952:ec8a9e06cf05

            continue
        node = bin(nhex)
        phase = int(phase)
        if phase == 0:
            if node != nullid:
                msg = _('ignoring inconsistent public root from remote: %s')
                repo.ui.warn(msg, nhex)
        elif phase == 1:
            if node in nodemap:
                draftroots.append(node)
        else:
            msg = _('ignoring unexpected root from remote: %i %s')
            repo.ui.warn(msg, phase, nhex)
    # compute heads
    revset = repo.set('heads((%ln + parents(%ln)) - (%ln::%ln))',
                      subset, draftroots, draftroots, subset)
    publicheads = [c.node() for c in revset]
    return publicheads, draftroots

15953:52dc2b33d0be

            continue
        node = bin(nhex)
        phase = int(phase)
        if phase == 0:
            if node != nullid:
                repo.ui.warn(_('ignoring inconsistent public root'
                               ' from remote: %s\n') % nhex)
        elif phase == 1:
            if node in nodemap:
                draftroots.append(node)
        else:
            repo.ui.warn(_('ignoring unexpected root from remote: %i %s\n')
                         % (phase, nhex))
    # compute heads
    revset = repo.set('heads((%ln + parents(%ln)) - (%ln::%ln))',
                      subset, draftroots, draftroots, subset)
    publicheads = [c.node() for c in revset]
    return publicheads, draftroots