This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2568

lfs: convert hexdigest to bytes using sysbytes
ClosedPublic

Authored by durin42 on Mar 2 2018, 5:15 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGf6b9f9ddd0de: lfs: convert hexdigest to bytes using sysbytes
rHGcda13ec1a228: lfs: convert hexdigest to bytes using sysbytes
Summary

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

durin42 created this revision.Mar 2 2018, 5:15 PM
indygreg requested changes to this revision.Mar 2 2018, 5:19 PM
indygreg added a subscriber: indygreg.
indygreg added inline comments.
hgext/lfs/wrapper.py
89

In other places, we've done mercurial.node.hex(hashlib.sha256(text).digest())

This revision now requires changes to proceed.Mar 2 2018, 5:19 PM
durin42 updated this revision to Diff 6397.Mar 2 2018, 5:23 PM
indygreg accepted this revision.Mar 2 2018, 5:32 PM
This revision is now accepted and ready to land.Mar 2 2018, 5:32 PM
Closed by commit rHGcda13ec1a228: lfs: convert hexdigest to bytes using sysbytes (authored by durin42). · Explain WhyMar 2 2018, 5:35 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/lfs/wrapper.py (5 lines)

Diff 6398

hgext/lfs/wrapper.py

# wrapper.py - methods wrapping core mercurial logic # wrapper.py - methods wrapping core mercurial logic
# #
# Copyright 2017 Facebook, Inc. # Copyright 2017 Facebook, Inc.
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
import hashlib import hashlib
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial.node import bin, nullid, short from mercurial.node import bin, hex, nullid, short
from mercurial import ( from mercurial import (
error, error,
filelog, filelog,
pycompat,
revlog, revlog,
util, util,
) )
from ..largefiles import lfutil from ..largefiles import lfutil
from . import ( from . import (
blobstore, blobstore,
def writetostore(self, text): def writetostore(self, text):
# hg filelog metadata (includes rename, etc) # hg filelog metadata (includes rename, etc)
hgmeta, offset = filelog.parsemeta(text) hgmeta, offset = filelog.parsemeta(text)
if offset and offset > 0: if offset and offset > 0:
# lfs blob does not contain hg filelog metadata # lfs blob does not contain hg filelog metadata
text = text[offset:] text = text[offset:]
# git-lfs only supports sha256 # git-lfs only supports sha256
oid = hashlib.sha256(text).hexdigest() oid = hex(hashlib.sha256(text).digest())
indygregUnsubmitted
Not Done

In other places, we've done mercurial.node.hex(hashlib.sha256(text).digest())

indygreg: In other places, we've done `mercurial.node.hex(hashlib.sha256(text).digest())`
self.opener.lfslocalblobstore.write(oid, text) self.opener.lfslocalblobstore.write(oid, text)
# replace contents with metadata # replace contents with metadata
longoid = 'sha256:%s' % oid longoid = 'sha256:%s' % oid
metadata = pointer.gitlfspointer(oid=longoid, size='%d' % len(text)) metadata = pointer.gitlfspointer(oid=longoid, size='%d' % len(text))
# by default, we expect the content to be binary. however, LFS could also # by default, we expect the content to be binary. however, LFS could also
# be used for non-binary content. add a special entry for non-binary data. # be used for non-binary content. add a special entry for non-binary data.