Mercurial > hg > mercurial-crew-with-dirclash
view convert-repo @ 240:737c66b68290
Replace tkmerge with hgmerge
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Replace tkmerge with hgmerge
hgmerge attempts to find and use merge, kdiff3, tkmerge, and diff+patch.
hg will use hgmerge unless overridden with HGMERGE
manifest hash: 9137a620df4b235e66343b0fd0dba87fe631546e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCoRGrywK+sNU5EO8RAi2VAJ9bh97ChGJymP/p8rvCuyNAMnk1bQCgrIGP
vYI6qlyWKQZ01ObUTAIg92o=
=+mRH
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Fri, 03 Jun 2005 18:27:55 -0800 |
parents | 2c80f6f8fc08 |
children |
line wrap: on
line source
#!/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")