comparison mercurial/phases.py @ 51580:b70628a9aa7e

phases: use revision number in new_heads

All graph operations will be done using revision numbers, so passing nodes only
means they will eventually get converted to revision numbers internally.

As part of an effort to align the code on using revision number we make the
`phases.newheads` function operated on revision number, taking them as input
and using them in returns, instead of the node-id it used to consume and
produce.

This is part of multiple changesets effort to translate more part of the logic,
but is done step by step to facilitate the identification of issue that might
arise in mercurial core and extensions.

To make the change simpler to handle for third party extensions, we also rename
the function, using a more modern form. This will help detecting the different
between the node-id version and the rev-num version.

I also take this as an opportunity to add some comment about possible
performance improvement for the future. They don't matter too much now, but they
are worse exploring in a while.

51579:87655e6dc108

import weakref

from typing import (
    Any,
    Callable,
    Dict,
    Iterable,
    List,
    Optional,
    Set,

    short,
    wdirrev,
)
from . import (
    error,
    pycompat,
    requirements,
    smartset,
    txnutil,
    util,
)

                draft_roots.append(rev)
        else:
            msg = _(b'ignoring unexpected root from remote: %i %s\n')
            repo.ui.warn(msg % (phase, nhex))
    # compute heads
    draft_nodes = [to_node(r) for r in draft_roots]
    publicheads = newheads(repo, subset, draft_nodes)
    return publicheads, draft_nodes


class remotephasessummary:
    """summarize phase information on the remote side

        # Get the list of all "heads" revs draft on remote
        dheads = unfi.set(b'heads(%ln::%ln)', self.draftroots, remotesubset)
        self.draftheads = [c.node() for c in dheads]


def newheads(repo, heads, roots):
    """compute new head of a subset minus another

    * `heads`: define the first subset
    * `roots`: define the second we subtract from the first"""
    # prevent an import cycle
    # phases > dagop > patch > copies > scmutil > obsolete > obsutil > phases
    from . import dagop

    repo = repo.unfiltered()
    cl = repo.changelog
    rev = cl.index.get_rev
    if not roots:
        return heads
    if not heads or heads == [repo.nullid]:
        return []
    # The logic operated on revisions, convert arguments early for convenience
    new_heads = {rev(n) for n in heads if n != repo.nullid}
    roots = [rev(n) for n in roots]
    # compute the area we need to remove
    affected_zone = repo.revs(b"(%ld::%ld)", roots, new_heads)
    # heads in the area are no longer heads
    new_heads.difference_update(affected_zone)
    # revisions in the area have children outside of it,

        new_heads.update(candidates)
        prunestart = repo.revs(b"parents(%ld) and not null", new_heads)
        pruned = dagop.reachableroots(repo, candidates, prunestart)
        new_heads.difference_update(pruned)

    return pycompat.maplist(cl.node, sorted(new_heads))


def newcommitphase(ui: "uimod.ui") -> int:
    """helper to get the target phase of new commit

51580:b70628a9aa7e

import weakref

from typing import (
    Any,
    Callable,
    Collection,
    Dict,
    Iterable,
    List,
    Optional,
    Set,

    short,
    wdirrev,
)
from . import (
    error,
    requirements,
    smartset,
    txnutil,
    util,
)

                draft_roots.append(rev)
        else:
            msg = _(b'ignoring unexpected root from remote: %i %s\n')
            repo.ui.warn(msg % (phase, nhex))
    # compute heads
    subset_revs = [to_rev(n) for n in subset]
    public_heads = new_heads(repo, subset_revs, draft_roots)
    draft_nodes = [to_node(r) for r in draft_roots]
    public_nodes = [to_node(r) for r in public_heads]
    return public_nodes, draft_nodes


class remotephasessummary:
    """summarize phase information on the remote side

        # Get the list of all "heads" revs draft on remote
        dheads = unfi.set(b'heads(%ln::%ln)', self.draftroots, remotesubset)
        self.draftheads = [c.node() for c in dheads]


def new_heads(
    repo,
    heads: Collection[int],
    roots: Collection[int],
) -> Collection[int]:
    """compute new head of a subset minus another

    * `heads`: define the first subset
    * `roots`: define the second we subtract from the first"""
    # prevent an import cycle
    # phases > dagop > patch > copies > scmutil > obsolete > obsutil > phases
    from . import dagop

    if not roots:
        return heads
    if not heads or heads == [nullrev]:
        return []
    # The logic operated on revisions, convert arguments early for convenience
    # PERF-XXX: maybe heads could directly comes as a set without impacting
    # other user of that value
    new_heads = set(heads)
    new_heads.discard(nullrev)
    # compute the area we need to remove
    affected_zone = repo.revs(b"(%ld::%ld)", roots, new_heads)
    # heads in the area are no longer heads
    new_heads.difference_update(affected_zone)
    # revisions in the area have children outside of it,

        new_heads.update(candidates)
        prunestart = repo.revs(b"parents(%ld) and not null", new_heads)
        pruned = dagop.reachableroots(repo, candidates, prunestart)
        new_heads.difference_update(pruned)

    # PERF-XXX: do we actually need a sorted list here? Could we simply return
    # a set?
    return sorted(new_heads)


def newcommitphase(ui: "uimod.ui") -> int:
    """helper to get the target phase of new commit