comparison mercurial/revlog.py @ 29339:a9e010cd66e1

revlog: use hashlib.sha1 directly instead of through util

Also remove module-local _sha alias, which was barely used.

29338:81c38cb9c1a1

from __future__ import absolute_import

import collections
import errno
import os
import struct
import zlib

# import stuff from node for others to import from revlog

_pack = struct.pack
_unpack = struct.unpack
_compress = zlib.compress
_decompress = zlib.decompress
_sha = util.sha1

# revlog header flags
REVLOGV0 = 0
REVLOGNG = 1
REVLOGNGINLINEDATA = (1 << 16)

    return int(q & 0xFFFF)

def offset_type(offset, type):
    return long(long(offset) << 16 | type)

_nullhash = _sha(nullid)

def hash(text, p1, p2):
    """generate a hash from the given text and its parent hashes

    This hash combines both the current file contents and its history

        s.update(p1)
    else:
        # none of the parent nodes are nullid
        l = [p1, p2]
        l.sort()
        s = _sha(l[0])
        s.update(l[1])
    s.update(text)
    return s.digest()

def decompress(bin):

29339:a9e010cd66e1

from __future__ import absolute_import

import collections
import errno
import hashlib
import os
import struct
import zlib

# import stuff from node for others to import from revlog

_pack = struct.pack
_unpack = struct.unpack
_compress = zlib.compress
_decompress = zlib.decompress

# revlog header flags
REVLOGV0 = 0
REVLOGNG = 1
REVLOGNGINLINEDATA = (1 << 16)

    return int(q & 0xFFFF)

def offset_type(offset, type):
    return long(long(offset) << 16 | type)

_nullhash = hashlib.sha1(nullid)

def hash(text, p1, p2):
    """generate a hash from the given text and its parent hashes

    This hash combines both the current file contents and its history

        s.update(p1)
    else:
        # none of the parent nodes are nullid
        l = [p1, p2]
        l.sort()
        s = hashlib.sha1(l[0])
        s.update(l[1])
    s.update(text)
    return s.digest()

def decompress(bin):