Mercurial > public > mercurial-scm > hg-stable
diff hgext/lfs/blobstore.py @ 40714:9fcf8084ada8
py3: use node.hex(m.digest()) instead of m.hexdigest()
hashlib.sha1.hexdigest() returns str on Python 3.
Differential Revision: https://phab.mercurial-scm.org/D5287
author | Pulkit Goyal <pulkit@yandex-team.ru> |
---|---|
date | Mon, 19 Nov 2018 21:12:13 +0300 |
parents | fb379b78b93e |
children | 02d0a7774882 |
line wrap: on
line diff
--- a/hgext/lfs/blobstore.py Sun Nov 18 02:40:47 2018 +0100 +++ b/hgext/lfs/blobstore.py Mon Nov 19 21:12:13 2018 +0300 @@ -20,6 +20,7 @@ from mercurial import ( encoding, error, + node, pathutil, pycompat, url as urlmod, @@ -156,7 +157,7 @@ fp.write(chunk) sha256.update(chunk) - realoid = sha256.hexdigest() + realoid = node.hex(sha256.digest()) if realoid != oid: raise LfsCorruptionError(_('corrupt remote lfs object: %s') % oid) @@ -206,7 +207,7 @@ # Don't abort if corruption is detected, because `hg verify` will # give more useful info about the corruption- simply don't add the # hardlink. - if verify or hashlib.sha256(blob).hexdigest() == oid: + if verify or node.hex(hashlib.sha256(blob).digest()) == oid: self.ui.note(_('lfs: found %s in the usercache\n') % oid) lfutil.link(self.cachevfs.join(oid), self.vfs.join(oid)) else: @@ -230,7 +231,7 @@ for chunk in util.filechunkiter(fp, size=1048576): sha256.update(chunk) - return oid == sha256.hexdigest() + return oid == node.hex(sha256.digest()) def has(self, oid): """Returns True if the local blobstore contains the requested blob, @@ -587,7 +588,7 @@ return reduced.values() def _verify(oid, content): - realoid = hashlib.sha256(content).hexdigest() + realoid = node.hex(hashlib.sha256(content).digest()) if realoid != oid: raise LfsCorruptionError(_('detected corrupt lfs object: %s') % oid, hint=_('run hg verify'))