facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-08 07:49:11 +03:00
Code Issues Projects Releases Wiki Activity

py3: use hex() to convert the hash to bytes

Browse Source
This commit is contained in:
Pulkit Goyal 2017-06-26 17:20:46 +05:30
parent 10c2f21384
commit 35cedf7901
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mercurial/merge.py
View File

@ -414,7 +414,7 @@ class mergestate(object):
if fcl.isabsent():
hash = nullhex
else:
hash = hashlib.sha1(fcl.path()).hexdigest()
hash = hex(hashlib.sha1(fcl.path()).digest())
self._repo.vfs.write('merge/' + hash, fcl.data())
self._state[fd] = ['u', hash, fcl.path(),
fca.path(), hex(fca.filenode()),