comparison mercurial/discovery.py @ 15713:cff25e4b37d2

phases: do not exchange secret changesets

Any secret changesets will be excluded from pull and push. Phase data are
properly synchronized on pull and push if a changeset is seen as secret locally
but is non-secret remote side.

This patch does not handle the case of a changeset secret on remote but known
locally.

15712:06b8b74720d6

    common, revs = findcommonoutgoing(repo, remote, onlyheads=revs,
                                      commoninc=commoninc, force=force)
    _common, inc, remoteheads = commoninc

    cl = repo.changelog
    outg = cl.findmissing(common, revs)

    if not outg:
        repo.ui.status(_("no changes found\n"))
        return None, 1, common

    if not force and remoteheads != [nullid]:
        if remote.capable('branchmap'):
            # Check for each named branch if we're creating new remote heads.
            # To be a remote head after push, node must be either:

15713:cff25e4b37d2

    common, revs = findcommonoutgoing(repo, remote, onlyheads=revs,
                                      commoninc=commoninc, force=force)
    _common, inc, remoteheads = commoninc

    cl = repo.changelog
    alloutg = cl.findmissing(common, revs)
    outg = []
    secret = []
    for o in alloutg:
        if repo[o].phase() >= 2:
            secret.append(o)
        else:
            outg.append(o)

    if not outg:
        if secret:
            repo.ui.status(_("no changes to push but %i secret changesets\n")
                           % len(secret))
        else:
            repo.ui.status(_("no changes found\n"))
        return None, 1, common

    if secret:
        # recompute target revs
        revs = [ctx.node() for ctx in repo.set('heads(::(%ld))',
                                               map(repo.changelog.rev, outg))]

    if not force and remoteheads != [nullid]:
        if remote.capable('branchmap'):
            # Check for each named branch if we're creating new remote heads.
            # To be a remote head after push, node must be either: