unify checkout and resolve into update -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 unify checkout and resolve into update This replaces checkout and resolve with a single command: $ hg help co hg update [node] update or merge working directory If there are no outstanding changes in the working directory and there is a linear relationship between the current version and the requested version, the result is the requested version. Otherwise the result is a merge between the contents of the current working directory and the requested version. Files that changed between either parent are marked as changed for the next commit and a commit must be performed before any further updates are allowed. manifest hash: 513d285d7fb775d0560de49387042a685ea062f7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFComS7ywK+sNU5EO8RAmgRAJ96GA6qvHLy0Jp0fzUrR2os2azPuACePsdC YBldZtA7yIuTnV2vIbn7OSE= =QtM/ -----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")