annotate: deal with merges
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
annotate: deal with merges
This rewrite of the annotate code deals with merges:
- - find all ancestors
- - sort ancestors topologically
- - for each ancestor, pairwise annotate with parents
- - keep a cache of annotations for efficiency
manifest hash: b960d9b9c6a7f6ba351c97675b00a1dd3004dcf1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCnJclywK+sNU5EO8RAphZAKCkUuHh4jEJz7YwD9uzCT76GaSR/wCfUVUQ
VbGna/9jrOAFlrB3mZ3e4qg=
=yDFy
-----END PGP SIGNATURE-----
#!/usr/bin/env python
import sys, os, sha, base64, re
from mercurial import hg
ui = hg.ui()
repo = hg.repository(ui=ui)
known = {}
def encodepath(path):
s = sha.sha(path).digest()
s = base64.encodestring(s)[:-3]
s = re.sub("\+", "%", s)
s = re.sub("/", "_", s)
return s
for i in range(repo.changelog.count()):
n = repo.changelog.node(i)
changes = repo.changelog.read(n)
for f in changes[3]:
known[f] = 1
try:
os.mkdir(".hg/data-new")
except:
pass
files = known.keys()
files.sort()
for f in files:
pb = ".hg/data/" + encodepath(f)
pn = ".hg/data-new/" + f
print f
try:
file(pn+".i", "w").write(file(pb+"i").read())
except:
os.makedirs(os.path.dirname(pn))
# we actually copy the files to get nice disk layout
file(pn+".i", "w").write(file(pb+"i").read())
file(pn+".d", "w").write(file(pb).read())
os.rename(".hg/data", ".hg/data-old")
os.rename(".hg/data-new", ".hg/data")