This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5287

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

Authored by pulkit on Nov 19 2018, 1:14 PM.

Details

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

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

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Nov 19 2018, 1:14 PM
yuja added a subscriber: yuja.Nov 20 2018, 7:22 AM

diff --git a/hgext/remotefilelog/basepack.py b/hgext/remotefilelog/basepack.py

  • a/hgext/remotefilelog/basepack.py

+++ b/hgext/remotefilelog/basepack.py
@@ -10,6 +10,7 @@
from mercurial.i18n import _
from mercurial import (
+ node,

hgext/remotefilelog/basepack.py:472: import 'node' from line 12 shadowed by loop variable

pulkit updated this revision to Diff 12574.Nov 20 2018, 11:54 AM
pulkit added a comment.Nov 20 2018, 11:55 AM
In D5287#78759, @yuja wrote:

diff --git a/hgext/remotefilelog/basepack.py b/hgext/remotefilelog/basepack.py

  • a/hgext/remotefilelog/basepack.py

+++ b/hgext/remotefilelog/basepack.py
@@ -10,6 +10,7 @@
from mercurial.i18n import _
from mercurial import (
+ node,

hgext/remotefilelog/basepack.py:472: import 'node' from line 12 shadowed by loop variable

Looks like a False positive/negative.

yuja added a comment.Nov 21 2018, 7:41 AM
> hgext/remotefilelog/basepack.py:472: import 'node' from line 12 shadowed by loop variable
Looks like a False positive/negative.

Might be, but it's better to not shadow global names by local ones.

Queued, thanks.

Closed by commit rHG9fcf8084ada8: py3: use node.hex(m.digest()) instead of m.hexdigest() (authored by pulkit). · Explain WhyNov 21 2018, 7:49 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 12575

hgext/fastannotate/context.py

.replace('.m/', '.m.hg/') .replace('.m/', '.m.hg/')
.replace('.lock/', '.lock.hg/')) .replace('.lock/', '.lock.hg/'))
def hashdiffopts(diffopts): def hashdiffopts(diffopts):
diffoptstr = stringutil.pprint(sorted( diffoptstr = stringutil.pprint(sorted(
(k, getattr(diffopts, k)) (k, getattr(diffopts, k))
for k in mdiff.diffopts.defaults for k in mdiff.diffopts.defaults
)) ))
return hashlib.sha1(diffoptstr).hexdigest()[:6] return node.hex(hashlib.sha1(diffoptstr).digest())[:6]
_defaultdiffopthash = hashdiffopts(mdiff.defaultopts) _defaultdiffopthash = hashdiffopts(mdiff.defaultopts)
class annotateopts(object): class annotateopts(object):
"""like mercurial.mdiff.diffopts, but is for annotate """like mercurial.mdiff.diffopts, but is for annotate
followrename: follow renames, like "hg annotate -f" followrename: follow renames, like "hg annotate -f"
followmerge: follow p2 of a merge changeset, otherwise p2 is ignored followmerge: follow p2 of a merge changeset, otherwise p2 is ignored

hgext/largefiles/lfcommands.py

if 'l' in fctx.flags(): if 'l' in fctx.flags():
renamed = fctx.renamed() renamed = fctx.renamed()
if renamed and renamed[0] in lfiles: if renamed and renamed[0] in lfiles:
raise error.Abort(_('largefile %s becomes symlink') % f) raise error.Abort(_('largefile %s becomes symlink') % f)
# largefile was modified, update standins # largefile was modified, update standins
m = hashlib.sha1('') m = hashlib.sha1('')
m.update(ctx[f].data()) m.update(ctx[f].data())
hash = m.hexdigest() hash = node.hex(m.digest())
if f not in lfiletohash or lfiletohash[f] != hash: if f not in lfiletohash or lfiletohash[f] != hash:
rdst.wwrite(f, ctx[f].data(), ctx[f].flags()) rdst.wwrite(f, ctx[f].data(), ctx[f].flags())
executable = 'x' in ctx[f].flags() executable = 'x' in ctx[f].flags()
lfutil.writestandin(rdst, fstandin, hash, lfutil.writestandin(rdst, fstandin, hash,
executable) executable)
lfiletohash[f] = hash lfiletohash[f] = hash
else: else:
# normal file # normal file

hgext/lfs/blobstore.py

import re import re
import socket import socket
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial import ( from mercurial import (
encoding, encoding,
error, error,
node,
pathutil, pathutil,
pycompat, pycompat,
url as urlmod, url as urlmod,
util, util,
vfs as vfsmod, vfs as vfsmod,
worker, worker,
) )
and write to this local blobstore.""" and write to this local blobstore."""
sha256 = hashlib.sha256() sha256 = hashlib.sha256()
with self.vfs(oid, 'wb', atomictemp=True) as fp: with self.vfs(oid, 'wb', atomictemp=True) as fp:
for chunk in util.filechunkiter(src, size=1048576): for chunk in util.filechunkiter(src, size=1048576):
fp.write(chunk) fp.write(chunk)
sha256.update(chunk) sha256.update(chunk)
realoid = sha256.hexdigest() realoid = node.hex(sha256.digest())
if realoid != oid: if realoid != oid:
raise LfsCorruptionError(_('corrupt remote lfs object: %s') raise LfsCorruptionError(_('corrupt remote lfs object: %s')
% oid) % oid)
self._linktousercache(oid) self._linktousercache(oid)
def write(self, oid, data): def write(self, oid, data):
"""Write blob to local blobstore. """Write blob to local blobstore.
if not self.vfs.exists(oid): if not self.vfs.exists(oid):
blob = self._read(self.cachevfs, oid, verify) blob = self._read(self.cachevfs, oid, verify)
# Even if revlog will verify the content, it needs to be verified # Even if revlog will verify the content, it needs to be verified
# now before making the hardlink to avoid propagating corrupt blobs. # now before making the hardlink to avoid propagating corrupt blobs.
# Don't abort if corruption is detected, because `hg verify` will # Don't abort if corruption is detected, because `hg verify` will
# give more useful info about the corruption- simply don't add the # give more useful info about the corruption- simply don't add the
# hardlink. # 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) self.ui.note(_('lfs: found %s in the usercache\n') % oid)
lfutil.link(self.cachevfs.join(oid), self.vfs.join(oid)) lfutil.link(self.cachevfs.join(oid), self.vfs.join(oid))
else: else:
self.ui.note(_('lfs: found %s in the local lfs store\n') % oid) self.ui.note(_('lfs: found %s in the local lfs store\n') % oid)
blob = self._read(self.vfs, oid, verify) blob = self._read(self.vfs, oid, verify)
return blob return blob
def _read(self, vfs, oid, verify): def _read(self, vfs, oid, verify):
"""Read blob (after verifying) from the given store""" """Read blob (after verifying) from the given store"""
blob = vfs.read(oid) blob = vfs.read(oid)
if verify: if verify:
_verify(oid, blob) _verify(oid, blob)
return blob return blob
def verify(self, oid): def verify(self, oid):
"""Indicate whether or not the hash of the underlying file matches its """Indicate whether or not the hash of the underlying file matches its
name.""" name."""
sha256 = hashlib.sha256() sha256 = hashlib.sha256()
with self.open(oid) as fp: with self.open(oid) as fp:
for chunk in util.filechunkiter(fp, size=1048576): for chunk in util.filechunkiter(fp, size=1048576):
sha256.update(chunk) sha256.update(chunk)
return oid == sha256.hexdigest() return oid == node.hex(sha256.digest())
def has(self, oid): def has(self, oid):
"""Returns True if the local blobstore contains the requested blob, """Returns True if the local blobstore contains the requested blob,
False otherwise.""" False otherwise."""
return self.cachevfs.exists(oid) or self.vfs.exists(oid) return self.cachevfs.exists(oid) or self.vfs.exists(oid)
def _urlerrorreason(urlerror): def _urlerrorreason(urlerror):
'''Create a friendly message for the given URLError to be used in an '''Create a friendly message for the given URLError to be used in an
def _deduplicate(pointers): def _deduplicate(pointers):
"""Remove any duplicate oids that exist in the list""" """Remove any duplicate oids that exist in the list"""
reduced = util.sortdict() reduced = util.sortdict()
for p in pointers: for p in pointers:
reduced[p.oid()] = p reduced[p.oid()] = p
return reduced.values() return reduced.values()
def _verify(oid, content): def _verify(oid, content):
realoid = hashlib.sha256(content).hexdigest() realoid = node.hex(hashlib.sha256(content).digest())
if realoid != oid: if realoid != oid:
raise LfsCorruptionError(_('detected corrupt lfs object: %s') % oid, raise LfsCorruptionError(_('detected corrupt lfs object: %s') % oid,
hint=_('run hg verify')) hint=_('run hg verify'))
def remote(repo, remote=None): def remote(repo, remote=None):
"""remotestore factory. return a store in _storemap depending on config """remotestore factory. return a store in _storemap depending on config
If ``lfs.url`` is specified, use that remote endpoint. Otherwise, try to If ``lfs.url`` is specified, use that remote endpoint. Otherwise, try to

hgext/remotefilelog/basepack.py

from __future__ import absolute_import from __future__ import absolute_import
import collections import collections
import errno import errno
import hashlib import hashlib
import mmap import mmap
import os import os
import struct import struct
import time import time
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial import ( from mercurial import (
node as nodemod,
policy, policy,
pycompat, pycompat,
util, util,
vfs as vfsmod, vfs as vfsmod,
) )
from . import shallowutil from . import shallowutil
osutil = policy.importmod(r'osutil') osutil = policy.importmod(r'osutil')
self.packfp.write(data) self.packfp.write(data)
self.sha.update(data) self.sha.update(data)
def close(self, ledger=None): def close(self, ledger=None):
if self._closed: if self._closed:
return return
try: try:
sha = self.sha.hexdigest() sha = nodemod.hex(self.sha.digest())
self.packfp.close() self.packfp.close()
self.writeindex() self.writeindex()
if len(self.entries) == 0: if len(self.entries) == 0:
# Empty pack # Empty pack
self._cleantemppacks() self._cleantemppacks()
self._closed = True self._closed = True
return None return None