Patchwork D2568: lfs: convert hexdigest to bytes using sysbytes

login
register
mail settings
Submitter phabricator
Date March 2, 2018, 10:15 p.m.
Message ID <differential-rev-PHID-DREV-prw36xq7wgvmwncobccg-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/28730/
State Superseded
Headers show

Comments

phabricator - March 2, 2018, 10:15 p.m.
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D2568

AFFECTED FILES
  hgext/lfs/wrapper.py

CHANGE DETAILS




To: durin42, #hg-reviewers
Cc: mercurial-devel
phabricator - March 2, 2018, 10:19 p.m.
indygreg requested changes to this revision.
indygreg added inline comments.
This revision now requires changes to proceed.

INLINE COMMENTS

> wrapper.py:89
>      # git-lfs only supports sha256
> -    oid = hashlib.sha256(text).hexdigest()
> +    oid = pycompat.sysbytes(hashlib.sha256(text).hexdigest())
>      self.opener.lfslocalblobstore.write(oid, text)

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

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D2568

To: durin42, #hg-reviewers, indygreg
Cc: indygreg, mercurial-devel

Patch

diff --git a/hgext/lfs/wrapper.py b/hgext/lfs/wrapper.py
--- a/hgext/lfs/wrapper.py
+++ b/hgext/lfs/wrapper.py
@@ -15,6 +15,7 @@ 
 from mercurial import (
     error,
     filelog,
+    pycompat,
     revlog,
     util,
 )
@@ -85,7 +86,7 @@ 
         text = text[offset:]
 
     # git-lfs only supports sha256
-    oid = hashlib.sha256(text).hexdigest()
+    oid = pycompat.sysbytes(hashlib.sha256(text).hexdigest())
     self.opener.lfslocalblobstore.write(oid, text)
 
     # replace contents with metadata