# HG changeset patch
# User Dirkjan Ochtman <dirkjan@ochtman.nl>
# Date 2008-04-11 10:04:26
# Node ID fcfb6a0a0a84960861b022f5bb3911f728734220
# Parent  7a6243bf209dd2baadc3f62fde7129f235b94b5d

python-2.6: use sha wrapper from util for new merge code

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -7,7 +7,7 @@
 
 from node import nullid, nullrev, hex
 from i18n import _
-import errno, util, os, filemerge, copies, sha, shutil
+import errno, util, os, filemerge, copies, shutil
 
 class mergestate(object):
     '''track 3-way merge state of individual files'''
@@ -19,7 +19,7 @@ class mergestate(object):
         self._local = node
         shutil.rmtree(self._repo.join("merge"), True)
     def add(self, fcl, fco, fca, fd, flags):
-        hash = sha.sha(fcl.path()).hexdigest()
+        hash = util.sha1(fcl.path()).hexdigest()
         self._repo.opener("merge/" + hash, "w").write(fcl.data())
         self._state[fd] = 'u'
         self._data[fd] = (hash, fcl.path(), fca.path(), hex(fca.filenode()),