diff mercurial/merge.py @ 29341:0d83ad967bf8

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.

--- a/mercurial/merge.py	Fri Jun 10 00:25:07 2016 -0400
+++ b/mercurial/merge.py	Fri Jun 10 00:12:33 2016 -0400
@@ -8,6 +8,7 @@
 from __future__ import absolute_import
 
 import errno
+import hashlib
 import os
 import shutil
 import struct
@@ -408,7 +409,7 @@
         if fcl.isabsent():
             hash = nullhex
         else:
-            hash = util.sha1(fcl.path()).hexdigest()
+            hash = hashlib.sha1(fcl.path()).hexdigest()
             self._repo.vfs.write('merge/' + hash, fcl.data())
         self._state[fd] = ['u', hash, fcl.path(),
                            fca.path(), hex(fca.filenode()),