comparison hgext/fastannotate/context.py @ 44062:2d49482d0dd4

hgext: replace references to hashlib.sha1 with hashutil.sha1

When in a non-pure build of Mercurial, this will provide protections
against SHA1 collision attacks.

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

44061:cbc5755df6bf

from __future__ import absolute_import

import collections
import contextlib
import hashlib
import os

from mercurial.i18n import _
from mercurial.pycompat import (
    getattr,

    node,
    pycompat,
    scmutil,
    util,
)
from mercurial.utils import stringutil

from . import (
    error as faerror,
    revmap as revmapmod,
)

def hashdiffopts(diffopts):
    diffoptstr = stringutil.pprint(
        sorted((k, getattr(diffopts, k)) for k in mdiff.diffopts.defaults)
    )
    return node.hex(hashlib.sha1(diffoptstr).digest())[:6]


_defaultdiffopthash = hashdiffopts(mdiff.defaultopts)

44062:2d49482d0dd4

from __future__ import absolute_import

import collections
import contextlib
import os

from mercurial.i18n import _
from mercurial.pycompat import (
    getattr,

    node,
    pycompat,
    scmutil,
    util,
)
from mercurial.utils import (
    hashutil,
    stringutil,
)

from . import (
    error as faerror,
    revmap as revmapmod,
)

def hashdiffopts(diffopts):
    diffoptstr = stringutil.pprint(
        sorted((k, getattr(diffopts, k)) for k in mdiff.diffopts.defaults)
    )
    return node.hex(hashutil.sha1(diffoptstr).digest())[:6]


_defaultdiffopthash = hashdiffopts(mdiff.defaultopts)