comparison mercurial/pvec.py @ 32201:4462a981e8df

base85: proxy through util module

I'm going to replace hgimporter with a simpler import function, so we can
access to pure/cext modules by name:

  # util.py
  base85 = policy.importmod('base85')  # select pure.base85 or cext.base85

  # cffi/base85.py
  from ..pure.base85 import *  # may re-export pure.base85 functions

This means we'll have to use policy.importmod() function in place of the
standard import statement, but we wouldn't want to write it every place where
C extension modules are used. So this patch makes util host base85 functions.

32200:2d84947cd85d

from __future__ import absolute_import

from .node import nullrev
from . import (
    base85,
    util,
)

_size = 448 # 70 chars b85-encoded
_bytes = _size / 8

                    d, v = pvc[p1]
                    pvc[n] = (d + 1, _flipbit(v, node))
                else:
                    pvc[n] = _mergevec(pvc[p1], pvc[p2], node)
    bs = _join(*pvc[ctx.rev()])
    return pvec(base85.b85encode(bs))

class pvec(object):
    def __init__(self, hashorctx):
        if isinstance(hashorctx, str):
            self._bs = hashorctx
            self._depth, self._vec = _split(base85.b85decode(hashorctx))
        else:
            self._vec = ctxpvec(hashorctx)

    def __str__(self):
        return self._bs

32201:4462a981e8df

from __future__ import absolute_import

from .node import nullrev
from . import (
    util,
)

_size = 448 # 70 chars b85-encoded
_bytes = _size / 8

                    d, v = pvc[p1]
                    pvc[n] = (d + 1, _flipbit(v, node))
                else:
                    pvc[n] = _mergevec(pvc[p1], pvc[p2], node)
    bs = _join(*pvc[ctx.rev()])
    return pvec(util.b85encode(bs))

class pvec(object):
    def __init__(self, hashorctx):
        if isinstance(hashorctx, str):
            self._bs = hashorctx
            self._depth, self._vec = _split(util.b85decode(hashorctx))
        else:
            self._vec = ctxpvec(hashorctx)

    def __str__(self):
        return self._bs