Mercurial > hg > mercurial-crew-with-dirclash

diff mercurial/revlog.py @ 542:eda4c32c167a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with upstream -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Merge with upstream manifest hash: 78c3657547aa957be685a4d54462570eb4b5e181 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCxFpbW7P1GVgWeRoRAqWGAKCkLQPbZpdLCBWKD+pecMtTRiu9EACfbuz4 dtHuM/86dYZ6CRqQHohJVjk= =v+Vv -----END PGP SIGNATURE-----
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 30 Jun 2005 21:47:23 +0100
parents 03f27b1381f9 0e9234a1a3f6
children 4fc63e22b1fe
line wrap: on
line diff
--- a/mercurial/revlog.py
+++ b/mercurial/revlog.py
@@ -37,7 +37,10 @@ def decompress(bin):
 def hash(text, p1, p2):
     l = [p1, p2]
     l.sort()
-    return sha.sha(l[0] + l[1] + text).digest()
+    s = sha.new(l[0])
+    s.update(l[1])
+    s.update(text)
+    return s.digest()
 
 nullid = "\0" * 20
 indexformat = ">4l20s20s20s"