Mercurial > hg-stable

changeset 6517:fcfb6a0a0a84

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
python-2.6: use sha wrapper from util for new merge code
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Fri, 11 Apr 2008 12:04:26 +0200
parents 7a6243bf209d
children 92ccccb55ba3
files mercurial/merge.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/merge.py	Fri Apr 11 09:27:28 2008 +0200
+++ b/mercurial/merge.py	Fri Apr 11 12:04:26 2008 +0200
@@ -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 @@
         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()),