hg pull: more query fixes -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg pull: more query fixes Pull was getting confused by single-element branches because it had seen the top end already. Also, the previous change to do seenbranch on the base of the branch was bogus. Minor cleanup and a bit more diagnostics in the branch-narrowing code. manifest hash: 71d4dced9f74bef43d3a54d086dccd0a96d68e26 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCrjLgywK+sNU5EO8RAsxSAJ92U31Pz7K14Ctje4SEec2857Ut7QCgoVwY ho65mloslCSidLsEnxYfBDI= =Wts9 -----END PGP SIGNATURE-----

#!/usr/bin/env python
import sys, os
from mercurial import hg

f = sys.argv[1]

r1 = hg.revlog(open, f + ".i", f + ".d")
r2 = hg.revlog(open, f + ".i2", f + ".d2")

tr = hg.transaction(open, "journal")

for i in xrange(r1.count()):
    n = r1.node(i)
    p1, p2 = r1.parents(n)
    l = r1.linkrev(n)
    t = r1.revision(n)
    n2 = r2.addrevision(t, tr, l, p1, p2)
tr.close()

os.rename(f + ".i", f + ".i.old")
os.rename(f + ".d", f + ".d.old")
os.rename(f + ".i2", f + ".i")
os.rename(f + ".d2", f + ".d")