various merge improvements
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
various merge improvements
add -C flag: force update and overwrite local changes
add -m flag: allow merges with conflicts
we no longer do merge by default
and we print a warning message when the merge fails
fix bug in printing merge failure message
fix bug diffing files in 'm' state
manifest hash: 75545a6db45d1e371082343d01c9f177df0f9db3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCpm6tywK+sNU5EO8RAvb+AJ0euC3YkUYA944hds3ooPxbw6NpVwCfc1dj
TiNsPIds560S5jgw44eWNto=
=GPXN
-----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")