comparison mercurial/obsolete.py @ 46113:59fa3890d40a

node: import symbols explicitly

There is no point in lazy importing mercurial.node, it is used all over
the place anyway. So consistently import the used symbols directly.
Fix one file using symbols indirectly via mercurial.revlog.

Differential Revision: https://phab.mercurial-scm.org/D9480

46112:d6afa9c149c3

import errno
import struct

from .i18n import _
from .pycompat import getattr
from . import (
    encoding,
    error,
    node,
    obsutil,
    phases,
    policy,
    pycompat,
    util,

            parents = (metadata.pop(b'p1', None),)
        elif b'p0' in metadata:
            parents = ()
        if parents is not None:
            try:
                parents = tuple(node.bin(p) for p in parents)
                # if parent content is not a nodeid, drop the data
                for p in parents:
                    if len(p) != 20:
                        parents = None
                        break

    if parents is not None:
        if not parents:
            # mark that we explicitly recorded no parents
            metadata[b'p0'] = b''
        for i, p in enumerate(parents, 1):
            metadata[b'p%i' % i] = node.hex(p)
    metadata = _fm0encodemeta(metadata)
    numsuc = len(sucs)
    format = _fm0fixed + (_fm0node * numsuc)
    data = [numsuc, len(metadata), flags, pre]
    data.extend(sucs)

    Exist as a separated function to allow the evolve extension for a more
    subtle handling.
    """
    for mark in markers:
        if node.nullid in mark[1]:
            raise error.Abort(
                _(
                    b'bad obsolescence marker detected: '
                    b'invalid successors nullid'
                )

            for succ in succs:
                if len(succ) != 20:
                    raise ValueError(succ)
        if prec in succs:
            raise ValueError(
                'in-marker cycle with %s' % pycompat.sysstr(node.hex(prec))
            )

        metadata = tuple(sorted(pycompat.iteritems(metadata)))
        for k, v in metadata:
            try:

    for p in relation[0] + relation[1]:
        folddigest.update(b'%d' % p.rev())
        folddigest.update(p.node())
    # Since fold only has to compete against fold for the same successors, it
    # seems fine to use a small ID. Smaller ID save space.
    return node.hex(folddigest.digest())[:8]


def createmarkers(
    repo, relations, flag=0, date=None, metadata=None, operation=None
):

46113:59fa3890d40a

import errno
import struct

from .i18n import _
from .pycompat import getattr
from .node import (
    bin,
    hex,
    nullid,
)
from . import (
    encoding,
    error,
    obsutil,
    phases,
    policy,
    pycompat,
    util,

            parents = (metadata.pop(b'p1', None),)
        elif b'p0' in metadata:
            parents = ()
        if parents is not None:
            try:
                parents = tuple(bin(p) for p in parents)
                # if parent content is not a nodeid, drop the data
                for p in parents:
                    if len(p) != 20:
                        parents = None
                        break

    if parents is not None:
        if not parents:
            # mark that we explicitly recorded no parents
            metadata[b'p0'] = b''
        for i, p in enumerate(parents, 1):
            metadata[b'p%i' % i] = hex(p)
    metadata = _fm0encodemeta(metadata)
    numsuc = len(sucs)
    format = _fm0fixed + (_fm0node * numsuc)
    data = [numsuc, len(metadata), flags, pre]
    data.extend(sucs)

    Exist as a separated function to allow the evolve extension for a more
    subtle handling.
    """
    for mark in markers:
        if nullid in mark[1]:
            raise error.Abort(
                _(
                    b'bad obsolescence marker detected: '
                    b'invalid successors nullid'
                )

            for succ in succs:
                if len(succ) != 20:
                    raise ValueError(succ)
        if prec in succs:
            raise ValueError(
                'in-marker cycle with %s' % pycompat.sysstr(hex(prec))
            )

        metadata = tuple(sorted(pycompat.iteritems(metadata)))
        for k, v in metadata:
            try:

    for p in relation[0] + relation[1]:
        folddigest.update(b'%d' % p.rev())
        folddigest.update(p.node())
    # Since fold only has to compete against fold for the same successors, it
    # seems fine to use a small ID. Smaller ID save space.
    return hex(folddigest.digest())[:8]


def createmarkers(
    repo, relations, flag=0, date=None, metadata=None, operation=None
):