Mercurial > hg-stable
changeset 40659:3fa4183e7803
py3: use node.hex(h.digest()) instead of h.hexdigest()
hashlib.sha1.hexdigest() returns str on Python 3.
Differential Revision: https://phab.mercurial-scm.org/D5261
| author | Pulkit Goyal <pulkit@yandex-team.ru> |
|---|---|
| date | Tue, 13 Nov 2018 18:07:21 +0300 |
| parents | 5e3b3f88c2e4 |
| children | 9769e0f6ffe0 |
| files | hgext/remotefilelog/debugcommands.py hgext/remotefilelog/fileserverclient.py hgext/remotefilelog/shallowutil.py |
| diffstat | 3 files changed, 9 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/remotefilelog/debugcommands.py Tue Nov 13 17:41:54 2018 +0300 +++ b/hgext/remotefilelog/debugcommands.py Tue Nov 13 18:07:21 2018 +0300 @@ -15,6 +15,7 @@ from mercurial import ( error, filelog, + node as nodemod, revlog, ) from . import ( @@ -52,7 +53,7 @@ def buildtemprevlog(repo, file): # get filename key - filekey = hashlib.sha1(file).hexdigest() + filekey = nodemod.hex(hashlib.sha1(file).digest()) filedir = os.path.join(repo.path, 'store/data', filekey) # sort all entries based on linkrev @@ -344,7 +345,7 @@ ui.write("%s %s %s %s\n" % ( hashformatter(node), hashformatter(deltabasenode), - hashlib.sha1(delta).hexdigest(), + nodemod.hex(hashlib.sha1(delta).digest()), len(delta))) def debughistorypack(ui, path):
--- a/hgext/remotefilelog/fileserverclient.py Tue Nov 13 17:41:54 2018 +0300 +++ b/hgext/remotefilelog/fileserverclient.py Tue Nov 13 18:07:21 2018 +0300 @@ -18,6 +18,7 @@ from mercurial.node import bin, hex, nullid from mercurial import ( error, + node, pycompat, revlog, sshpeer, @@ -44,11 +45,11 @@ _downloading = _('downloading') def getcachekey(reponame, file, id): - pathhash = hashlib.sha1(file).hexdigest() + pathhash = node.hex(hashlib.sha1(file).digest()) return os.path.join(reponame, pathhash[:2], pathhash[2:], id) def getlocalkey(file, id): - pathhash = hashlib.sha1(file).hexdigest() + pathhash = node.hex(hashlib.sha1(file).digest()) return os.path.join(pathhash, id) def peersetup(ui, peer):
--- a/hgext/remotefilelog/shallowutil.py Tue Nov 13 17:41:54 2018 +0300 +++ b/hgext/remotefilelog/shallowutil.py Tue Nov 13 18:07:21 2018 +0300 @@ -17,6 +17,7 @@ from mercurial.i18n import _ from mercurial import ( error, + node, pycompat, revlog, util, @@ -35,11 +36,11 @@ return constants.SHALLOWREPO_REQUIREMENT in repo.requirements def getcachekey(reponame, file, id): - pathhash = hashlib.sha1(file).hexdigest() + pathhash = node.hex(hashlib.sha1(file).digest()) return os.path.join(reponame, pathhash[:2], pathhash[2:], id) def getlocalkey(file, id): - pathhash = hashlib.sha1(file).hexdigest() + pathhash = node.hex(hashlib.sha1(file).digest()) return os.path.join(pathhash, id) def getcachepath(ui, allowempty=False):