comparison mercurial/discovery.py @ 32727:32c8f98aebf4

checkheads: perform obsolescence post processing directly in _headssummary

The goal is to have the function directly return something meaningful and
useful for the whole pull.

Note: we skip adding post-processing in '_oldheadssummary' because if a client
is too old for branchmap it will be too old for obsolescence too.

32726:993f58db2045

        headssum[branch][1][:] = newheads
    for branch, items in headssum.iteritems():
        for l in items:
            if l is not None:
                l.sort()
    return headssum

def _oldheadssummary(repo, remoteheads, outgoing, inc=False):
    """Compute branchmapsummary for repo without branchmap support"""

    # 3. Check for new heads.
    # If there are more heads after the push than before, a suitable
    # error message, depending on unsynced status, is displayed.
    errormsg = None
    # If there are no obsstore, no post-processing are needed.
    if repo.obsstore:
        allmissing = set(outgoing.missing)
        cctx = repo.set('%ld', outgoing.common)
        allfuturecommon = set(c.node() for c in cctx)
        allfuturecommon.update(allmissing)
        for branch, heads in sorted(headssum.iteritems()):
            remoteheads, newheads, unsyncedheads = heads
            result = _postprocessobsolete(pushop, allfuturecommon, newheads)
            newheads = sorted(result[0])
            headssum[branch] = (remoteheads, newheads, unsyncedheads)
    for branch, heads in sorted(headssum.iteritems()):
        remoteheads, newheads, unsyncedheads = heads
        # add unsynced data
        if remoteheads is None:
            oldhs = set()

32727:32c8f98aebf4

        headssum[branch][1][:] = newheads
    for branch, items in headssum.iteritems():
        for l in items:
            if l is not None:
                l.sort()
    # If there are no obsstore, no post processing are needed.
    if repo.obsstore:
        allmissing = set(outgoing.missing)
        cctx = repo.set('%ld', outgoing.common)
        allfuturecommon = set(c.node() for c in cctx)
        allfuturecommon.update(allmissing)
        for branch, heads in sorted(headssum.iteritems()):
            remoteheads, newheads, unsyncedheads = heads
            result = _postprocessobsolete(pushop, allfuturecommon, newheads)
            newheads = sorted(result[0])
            headssum[branch] = (remoteheads, newheads, unsyncedheads)
    return headssum

def _oldheadssummary(repo, remoteheads, outgoing, inc=False):
    """Compute branchmapsummary for repo without branchmap support"""

    # 3. Check for new heads.
    # If there are more heads after the push than before, a suitable
    # error message, depending on unsynced status, is displayed.
    errormsg = None
    for branch, heads in sorted(headssum.iteritems()):
        remoteheads, newheads, unsyncedheads = heads
        # add unsynced data
        if remoteheads is None:
            oldhs = set()