( )⚙ D5261 py3: use node.hex(h.digest()) instead of h.hexdigest()

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5261

py3: use node.hex(h.digest()) instead of h.hexdigest()
ClosedPublic

Authored by pulkit on Nov 13 2018, 10:27 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG3fa4183e7803: py3: use node.hex(h.digest()) instead of h.hexdigest()
Summary

hashlib.sha1.hexdigest() returns str on Python 3.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Nov 13 2018, 10:27 AM
Closed by commit rHG3fa4183e7803: py3: use node.hex(h.digest()) instead of h.hexdigest() (authored by pulkit). · Explain WhyNov 13 2018, 1:49 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 12518

hgext/remotefilelog/debugcommands.py

import os import os
import zlib import zlib
from mercurial.node import bin, hex, nullid, short from mercurial.node import bin, hex, nullid, short
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial import ( from mercurial import (
error, error,
filelog, filelog,
node as nodemod,
revlog, revlog,
) )
from . import ( from . import (
constants, constants,
datapack, datapack,
extutil, extutil,
fileserverclient, fileserverclient,
historypack, historypack,
(short(node), short(p1), short(p2), short(linknode), copyfrom)) (short(node), short(p1), short(p2), short(linknode), copyfrom))
if p1 != nullid: if p1 != nullid:
queue.append(p1) queue.append(p1)
if p2 != nullid: if p2 != nullid:
queue.append(p2) queue.append(p2)
def buildtemprevlog(repo, file): def buildtemprevlog(repo, file):
# get filename key # get filename key
filekey = hashlib.sha1(file).hexdigest() filekey = nodemod.hex(hashlib.sha1(file).digest())
filedir = os.path.join(repo.path, 'store/data', filekey) filedir = os.path.join(repo.path, 'store/data', filekey)
# sort all entries based on linkrev # sort all entries based on linkrev
fctxs = [] fctxs = []
for filenode in os.listdir(filedir): for filenode in os.listdir(filedir):
if '_old' not in filenode: if '_old' not in filenode:
fctxs.append(repo.filectx(file, fileid=bin(filenode))) fctxs.append(repo.filectx(file, fileid=bin(filenode)))
"Delta Base".ljust(hashlen), "Delta Base".ljust(hashlen),
"Delta SHA1".ljust(hashlen), "Delta SHA1".ljust(hashlen),
"Delta Length".ljust(6), "Delta Length".ljust(6),
)) ))
ui.write("%s %s %s %s\n" % ( ui.write("%s %s %s %s\n" % (
hashformatter(node), hashformatter(node),
hashformatter(deltabasenode), hashformatter(deltabasenode),
hashlib.sha1(delta).hexdigest(), nodemod.hex(hashlib.sha1(delta).digest()),
len(delta))) len(delta)))
def debughistorypack(ui, path): def debughistorypack(ui, path):
if '.hist' in path: if '.hist' in path:
path = path[:path.index('.hist')] path = path[:path.index('.hist')]
hpack = historypack.historypack(path) hpack = historypack.historypack(path)
lastfilename = None lastfilename = None

hgext/remotefilelog/fileserverclient.py

import threading import threading
import time import time
import zlib import zlib
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial.node import bin, hex, nullid from mercurial.node import bin, hex, nullid
from mercurial import ( from mercurial import (
error, error,
node,
pycompat, pycompat,
revlog, revlog,
sshpeer, sshpeer,
util, util,
wireprotov1peer, wireprotov1peer,
) )
from mercurial.utils import procutil from mercurial.utils import procutil
fetches = 0 fetches = 0
fetched = 0 fetched = 0
fetchmisses = 0 fetchmisses = 0
_lfsmod = None _lfsmod = None
_downloading = _('downloading') _downloading = _('downloading')
def getcachekey(reponame, file, id): 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) return os.path.join(reponame, pathhash[:2], pathhash[2:], id)
def getlocalkey(file, id): def getlocalkey(file, id):
pathhash = hashlib.sha1(file).hexdigest() pathhash = node.hex(hashlib.sha1(file).digest())
return os.path.join(pathhash, id) return os.path.join(pathhash, id)
def peersetup(ui, peer): def peersetup(ui, peer):
class remotefilepeer(peer.__class__): class remotefilepeer(peer.__class__):
@wireprotov1peer.batchable @wireprotov1peer.batchable
def x_rfl_getfile(self, file, node): def x_rfl_getfile(self, file, node):
if not self.capable('x_rfl_getfile'): if not self.capable('x_rfl_getfile'):

hgext/remotefilelog/shallowutil.py

import os import os
import stat import stat
import struct import struct
import tempfile import tempfile
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial import ( from mercurial import (
error, error,
node,
pycompat, pycompat,
revlog, revlog,
util, util,
) )
from mercurial.utils import ( from mercurial.utils import (
storageutil, storageutil,
stringutil, stringutil,
) )
from . import constants from . import constants
if not pycompat.iswindows: if not pycompat.iswindows:
import grp import grp
def isenabled(repo): def isenabled(repo):
"""returns whether the repository is remotefilelog enabled or not""" """returns whether the repository is remotefilelog enabled or not"""
return constants.SHALLOWREPO_REQUIREMENT in repo.requirements return constants.SHALLOWREPO_REQUIREMENT in repo.requirements
def getcachekey(reponame, file, id): 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) return os.path.join(reponame, pathhash[:2], pathhash[2:], id)
def getlocalkey(file, id): def getlocalkey(file, id):
pathhash = hashlib.sha1(file).hexdigest() pathhash = node.hex(hashlib.sha1(file).digest())
return os.path.join(pathhash, id) return os.path.join(pathhash, id)
def getcachepath(ui, allowempty=False): def getcachepath(ui, allowempty=False):
cachepath = ui.config("remotefilelog", "cachepath") cachepath = ui.config("remotefilelog", "cachepath")
if not cachepath: if not cachepath:
if allowempty: if allowempty:
return None return None
else: else: