diff -r 7126d8b8e0e6 -r a61287a95dc3 mercurial/obsolete.py --- a/mercurial/obsolete.py Mon Jan 13 17:14:19 2020 -0500 +++ b/mercurial/obsolete.py Mon Jan 13 17:15:14 2020 -0500 @@ -70,7 +70,6 @@ from __future__ import absolute_import import errno -import hashlib import struct from .i18n import _ @@ -85,7 +84,10 @@ pycompat, util, ) -from .utils import dateutil +from .utils import ( + dateutil, + hashutil, +) parsers = policy.importmod('parsers') @@ -1028,7 +1030,7 @@ def makefoldid(relation, user): - folddigest = hashlib.sha1(user) + folddigest = hashutil.sha1(user) for p in relation[0] + relation[1]: folddigest.update(b'%d' % p.rev()) folddigest.update(p.node())