Mercurial > public > mercurial-scm > hg-stable

diff mercurial/exchange.py @ 29341:0d83ad967bf8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleanup: replace uses of util.(md5|sha1|sha256|sha512) with hashlib.\1 All versions of Python we support or hope to support make the hash functions available in the same way under the same name, so we may as well drop the util forwards.
author Augie Fackler <raf@durin42.com>
date Fri, 10 Jun 2016 00:12:33 -0400
parents 9dc27a334fb1
children 113d0b23321a
line wrap: on
line diff
--- a/mercurial/exchange.py	Fri Jun 10 00:25:07 2016 -0400
+++ b/mercurial/exchange.py	Fri Jun 10 00:12:33 2016 -0400
@@ -8,6 +8,7 @@
 from __future__ import absolute_import
 
 import errno
+import hashlib
 
 from .i18n import _
 from .node import (
@@ -1646,7 +1647,7 @@
     Used by peer for unbundling.
     """
     heads = repo.heads()
-    heads_hash = util.sha1(''.join(sorted(heads))).digest()
+    heads_hash = hashlib.sha1(''.join(sorted(heads))).digest()
     if not (their_heads == ['force'] or their_heads == heads or
             their_heads == ['hashed', heads_hash]):
         # someone else committed/pushed/unbundled while we