--- a/hgext/largefiles/basestore.py Mon Apr 15 23:32:33 2013 +0200
+++ b/hgext/largefiles/basestore.py Mon Apr 15 23:35:18 2013 +0200
@@ -8,7 +8,6 @@
'''base class for store implementations and store-related utility code'''
-import binascii
import re
from mercurial import util, node, hg
@@ -74,7 +73,7 @@
createmode=self.repo.store.createmode)
try:
- hhash = binascii.hexlify(self._getfile(tmpfile, filename, hash))
+ hhash = self._getfile(tmpfile, filename, hash)
except StoreError, err:
ui.warn(err.longmessage())
hhash = ""
@@ -128,7 +127,7 @@
def _getfile(self, tmpfile, filename, hash):
'''Fetch one revision of one file from the store and write it
to tmpfile. Compute the hash of the file on-the-fly as it
- downloads and return the binary hash. Close tmpfile. Raise
+ downloads and return the hash. Close tmpfile. Raise
StoreError if unable to download the file (e.g. it does not
exist in the store).'''
raise NotImplementedError('abstract method')
--- a/hgext/largefiles/lfutil.py Mon Apr 15 23:32:33 2013 +0200
+++ b/hgext/largefiles/lfutil.py Mon Apr 15 23:35:18 2013 +0200
@@ -290,7 +290,7 @@
def copyandhash(instream, outfile):
'''Read bytes from instream (iterable) and write them to outfile,
computing the SHA-1 hash of the data along the way. Close outfile
- when done and return the binary hash.'''
+ when done and return the hash.'''
hasher = util.sha1('')
for data in instream:
hasher.update(data)
@@ -301,7 +301,7 @@
# outfile was opened just to copy and hash.
outfile.close()
- return hasher.digest()
+ return hasher.hexdigest()
def hashrepofile(repo, file):
return hashfile(repo.wjoin(file))