Mercurial > public > mercurial-scm > hg
diff mercurial/subrepo.py @ 29341:0d83ad967bf8
cleanup: replace uses of util.(md5|sha1|sha256|sha512) with hashlib.\1
All versions of Python we support or hope to support make the hash
functions available in the same way under the same name, so we may as
well drop the util forwards.
| author | Augie Fackler <raf@durin42.com> |
|---|---|
| date | Fri, 10 Jun 2016 00:12:33 -0400 |
| parents | 28dc0030228a |
| children | 98e8313dcd9e |
line wrap: on
line diff
--- a/mercurial/subrepo.py Fri Jun 10 00:25:07 2016 -0400 +++ b/mercurial/subrepo.py Fri Jun 10 00:12:33 2016 -0400 @@ -9,6 +9,7 @@ import copy import errno +import hashlib import os import posixpath import re @@ -50,7 +51,7 @@ def _getstorehashcachename(remotepath): '''get a unique filename for the store hash cache of a remote repository''' - return util.sha1(_expandedabspath(remotepath)).hexdigest()[0:12] + return hashlib.sha1(_expandedabspath(remotepath)).hexdigest()[0:12] class SubrepoAbort(error.Abort): """Exception class used to avoid handling a subrepo error more than once""" @@ -659,7 +660,7 @@ yield '# %s\n' % _expandedabspath(remotepath) vfs = self._repo.vfs for relname in filelist: - filehash = util.sha1(vfs.tryread(relname)).hexdigest() + filehash = hashlib.sha1(vfs.tryread(relname)).hexdigest() yield '%s = %s\n' % (relname, filehash) @propertycache