Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/revlog.py @ 542:eda4c32c167a
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 |
comparison
equal
deleted
inserted
replaced
541:abaea35387a8 | 542:eda4c32c167a |
---|---|
35 raise "unknown compression type %s" % t | 35 raise "unknown compression type %s" % t |
36 | 36 |
37 def hash(text, p1, p2): | 37 def hash(text, p1, p2): |
38 l = [p1, p2] | 38 l = [p1, p2] |
39 l.sort() | 39 l.sort() |
40 return sha.sha(l[0] + l[1] + text).digest() | 40 s = sha.new(l[0]) |
41 s.update(l[1]) | |
42 s.update(text) | |
43 return s.digest() | |
41 | 44 |
42 nullid = "\0" * 20 | 45 nullid = "\0" * 20 |
43 indexformat = ">4l20s20s20s" | 46 indexformat = ">4l20s20s20s" |
44 | 47 |
45 class lazyparser: | 48 class lazyparser: |