Merge with TAH -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Merge with TAH fixup history messages to not interfere with GPG signing manifest hash: aea3a92e4699dfe0cbd98e6e2c8c6971218a59b8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCrkK4ywK+sNU5EO8RAqxHAKCNyjTE5F/7EvM+ipjhgzIUk1aWZACgm7zz eBcKlHcOA8ceUcn4IEBLQpM= =YfHT -----END PGP SIGNATURE-----

Use common output function show_changeset() for hg heads|history|log|tip. show_changeset() uses functions from ui.py instead of print.

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-----

Tweak README for branch, push, and .hgrc -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Tweak README for branch, push, and .hgrc manifest hash: f1937ad49013e7e40e6555f2acf1210563e6a96d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCrhBSywK+sNU5EO8RAr0OAJ9T+DcMcIvXp9ajI46kXM40GuHosgCfRxfY 8uhwZqdaR0JWlWff0nC6t1Y= =3I60 -----END PGP SIGNATURE-----

mdiff: fix the fix -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 mdiff: fix the fix I saw you check in the thing back in but with another typo. You check in "la < lenb", should be "la < lena". So we are even :-) Chris manifest hash: 57157502250b0120bcc12a75a530d4c133673b39 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCrg5tywK+sNU5EO8RAvLPAKCOs76LKPniKHFa15YwzWWsNZ5/xACfesl3 WCiUjdeYUtU3jVKCEwmjAT0= =+GFy -----END PGP SIGNATURE-----

mdiff: reinstate new algorithm -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 mdiff: reinstate new algorithm This unreverts the new algorithm with a fix from Chris (s/len/lena) and adds some comments on what it's doing. manifest hash: 75fc1acee1926e57d495f67a44cd88d9555f2356 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCrf4UywK+sNU5EO8RAoRzAKCA2vpUAGNqTkDeba3YHo6XXht7VgCfXQK0 /j5yv5cucnsYezCdclpftOA= =FNMD -----END PGP SIGNATURE-----

hg merge: some getchangegroup fixups -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg merge: some getchangegroup fixups - - filter more duplicates - - request batching - - lookup ordering - - request counting After these fixes, grabbing 1800 changesets on top of the 28k changeset kernel history takes 23 round trips rather than a couple hundred. manifest hash: 78e893b68000267a8c7ea49fd38758f2fc96269f -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCrea0ywK+sNU5EO8RAv3cAKCQveivdApJIlslTCMLMp2VogRXfACeNRnx Ihsf5yLz60fFpqlzAmZBACk= =Euku -----END PGP SIGNATURE-----

lazyparser speed ups -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 lazyparser speed ups When we do __contains__ on a map, we might as well load the whole index. Not doing this was slowing down finding new changesets quite by a factor of 20. When we do a full load, we also attempt to replace the revlog's index and nodemap with normal Python objects to avoid the lazymap overhead. manifest hash: 9b2b20aacc508f9027d115426c63a381d28e5485 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCreYIywK+sNU5EO8RAoNHAJ9+LmXqsTQb9Bh3mZHq0A0VfQOleQCffHmn jC/O0vnfx5FCRsX2bUFG794= =BDTz -----END PGP SIGNATURE-----

hgweb: Fix reloading of index -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hgweb: Fix reloading of index We were reloading every request because we weren't saving the old mtime. manifest hash: 507330727957ff53c48b38f427f0b70469a49271 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCreVpywK+sNU5EO8RAp/YAJ9cXh2II4DGAQtRc58yj4hi49C8jgCfT7bV 22w73T2FiYBjzMk8N8STUVI= =eghX -----END PGP SIGNATURE-----

Transparent proxy support -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Transparent proxy support Originally from "Michael S. Tsirkin" <mst@mellanox.co.il> manifest hash: 74cf7456ef35ff8d4c007544f0d1a57c69d3c929 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCrSIUywK+sNU5EO8RAje1AJ41ALW8soF78Mo3UTraV1QQvJoFSQCgrqvc I9ohlI4hzdjOD+wSwRGlERQ= =Ugfi -----END PGP SIGNATURE-----

hg push: propagate return code -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg push: propagate return code manifest hash: 3c4c5a0eba4c2eb431e4830fafe3138c12f9bddf -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCrQ3sywK+sNU5EO8RAkGpAJ40HsYprOWEZzmqw47ZYvZukMzKvgCeIGfD H6gB6idJV4K2SpEaFUByRYE= =LV1Z -----END PGP SIGNATURE-----

stopgap hg push support -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 stopgap hg push support This does hg push by running hg serve and tunnelling it over ssh to a client at the destination doing hg pull. manifest hash: 552607f1e8bea238b4c585209af93f0594121dd1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCrP8NywK+sNU5EO8RAmGJAKCJ9kQSz6Bs/4cYCvKU7TpDXPHSbgCdEE1X FfZe2y2xtgSeHQa/uZLqEBQ= =KlPp -----END PGP SIGNATURE-----

mdiff: revert grouping optimization for the time being -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 mdiff: revert grouping optimization for the time being This had trouble with Ted T'so import test while the original didn't. manifest hash: e2fc49b5277096bd4c5081558af5efe9964d5310 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCrHzXywK+sNU5EO8RArocAJwKlxrnyVpdYaKzgJG/b4gSVOYBTwCgkl2t zD807fsMULRDdDe1k9jVPcU= =Iivz -----END PGP SIGNATURE-----

hg commit: user and date options -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg commit: user and date options - From Ted Ts'o manifest hash: f6ce29eed387664c6f0631b666158eb930876cb3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCrHx4ywK+sNU5EO8RAp/uAKCEGhvm1tpBJ9Bub8BlalWaIpMeqgCfUejo IoevMbk4cjxQ5P3Zo2pSFs8= =Ibp3 -----END PGP SIGNATURE-----

Add new convert-repo script -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add new convert-repo script This is the beginnings of a generalized framework for converting repositories. Currently hardwired to convert from git to hg. manifest hash: dc3b72de2c45bfdaffcc1cf71da530228793facd -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCrGf/ywK+sNU5EO8RAi9EAJ0eQ++cwSgn5j2PHiTvF7r3JNiv4gCePY+X do12pUvCczyBKVCoBN7y/uI= =YtzI -----END PGP SIGNATURE-----

Remove the old convert-repo script for .4-era hg repositories -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Remove the old convert-repo script for .4-era hg repositories manifest hash: f203e562f8e66750b7abe5dd5a3040bae7b0951b -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCrGetywK+sNU5EO8RAslSAJ9Eav+ufW7jjtP4k79waEXxUQVUMgCgivZ/ 053y3CQhBPFCe/TaqViVEfE= =jw59 -----END PGP SIGNATURE-----