[PATCH] localrepo: use node.hex instead of awkward .encode('latin1')

Augie Fackler raf at durin42.com
Tue Mar 21 02:07:04 UTC 2017


# HG changeset patch
# User Augie Fackler <augie at google.com>
# Date 1490062017 14400
#      Mon Mar 20 22:06:57 2017 -0400
# Node ID f42ec07db6a995d972fee8ce2a7fb122c5372109
# Parent  23fc9b98445fac79d216570017227673b2492347
localrepo: use node.hex instead of awkward .encode('latin1')

Spotted as an option by Yuya. Thanks!

diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -1083,9 +1083,7 @@ class localrepository(object):
                 hint=_("run 'hg recover' to clean up transaction"))
 
         idbase = "%.40f#%f" % (random.random(), time.time())
-        ha = hashlib.sha1(idbase).hexdigest()
-        if pycompat.ispy3:
-            ha = ha.encode('latin1')
+        ha = hex(hashlib.sha1(idbase).digest())
         txnid = 'TXN:' + ha
         self.hook('pretxnopen', throw=True, txnname=desc, txnid=txnid)
 


More information about the Mercurial-devel mailing list