Patchwork D2568: lfs: convert hexdigest to bytes using sysbytes

login
register
mail settings
Submitter phabricator
Date March 2, 2018, 10:23 p.m.
Message ID <133d62998062a40c42f794cc31447376@localhost.localdomain>
Download mbox | patch
Permalink /patch/28736/
State Not Applicable
Headers show

Comments

phabricator - March 2, 2018, 10:23 p.m.
durin42 updated this revision to Diff 6397.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2568?vs=6391&id=6397

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

AFFECTED FILES
  hgext/lfs/wrapper.py

CHANGE DETAILS




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
@@ -10,11 +10,12 @@ 
 import hashlib
 
 from mercurial.i18n import _
-from mercurial.node import bin, nullid, short
+from mercurial.node import bin, hex, nullid, short
 
 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 = hex(hashlib.sha256(text).digest())
     self.opener.lfslocalblobstore.write(oid, text)
 
     # replace contents with metadata