This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1481

py3: ensure hashes are bytes in sparse.py
AbandonedPublic

Authored by indygreg on Nov 21 2017, 2:53 AM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Summary

hashlib's .hexdigest() returns a unicode in Python 3. We need to use
bytes to make the rest of Mercurial happy.

This was in the top #25 crashes in Python 3.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Nov 21 2017, 2:53 AM
yuja added a subscriber: yuja.Nov 21 2017, 7:41 AM

We can do nodemod.hex(h.digest()) instead.

yuja requested changes to this revision.Dec 1 2017, 9:31 PM
This revision now requires changes to proceed.Dec 1 2017, 9:31 PM
indygreg abandoned this revision.Jan 14 2018, 2:41 PM

This was addressed in D1792.

Revision Contents
Changeset List

Diff 3721

mercurial/sparse.py

signature = cache.get('signature') signature = cache.get('signature')
if includetemp: if includetemp:
tempsignature = cache.get('tempsignature') tempsignature = cache.get('tempsignature')
else: else:
tempsignature = '0' tempsignature = '0'
if signature is None or (includetemp and tempsignature is None): if signature is None or (includetemp and tempsignature is None):
signature = hashlib.sha1(repo.vfs.tryread('sparse')).hexdigest() signature = pycompat.bytestr(
hashlib.sha1(repo.vfs.tryread('sparse')).hexdigest())
cache['signature'] = signature cache['signature'] = signature
if includetemp: if includetemp:
raw = repo.vfs.tryread('tempsparse') raw = repo.vfs.tryread('tempsparse')
tempsignature = hashlib.sha1(raw).hexdigest() tempsignature = pycompat.bytestr(hashlib.sha1(raw).hexdigest())
cache['tempsignature'] = tempsignature cache['tempsignature'] = tempsignature
return '%s %s' % (signature, tempsignature) return '%s %s' % (signature, tempsignature)
def writeconfig(repo, includes, excludes, profiles): def writeconfig(repo, includes, excludes, profiles):
"""Write the sparse config file given a sparse configuration.""" """Write the sparse config file given a sparse configuration."""
with repo.vfs('sparse', 'wb') as fh: with repo.vfs('sparse', 'wb') as fh:
for p in sorted(profiles): for p in sorted(profiles):