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

More tweaking to rawcommit for repo conversion -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 More tweaking to rawcommit for repo conversion manifest hash: 912e7d61fc15845fd24baada9f553c2d38b26f06 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCrGdBywK+sNU5EO8RApbrAKCPVvxnSgkzAWpwc6uRDCCYAsqO7QCeMonn tZS4URbMI2aDQYw15wDEZHg= =C2Vn -----END PGP SIGNATURE-----

Minor caching improvement for manifest -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Minor caching improvement for manifest manifest hash: 91d827f4041f1151875a52199618cdd1a219ac79 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCrGGBywK+sNU5EO8RAotVAJ93JTk6XoHnZrbGzcZQ1N+P7kNKiACfYj+F RlcmcLHc3rEMkcM127BszDg= =5zAN -----END PGP SIGNATURE-----

Optimize diff and status in subdirectories -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Optimize diff and status in subdirectories This walks the tree from the subdirectory down. Based on a patch by Arun Sharma manifest hash: 3a8545369b4eb6911b9d0fcdd8e4dc77784fa3d8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCrF6/ywK+sNU5EO8RAosUAKC0KWcMfsLErEInDk1X1vpM54HFEgCfUwcN gXhaAviQZJ8h0ssl3BMmMfI= =KnRD -----END PGP SIGNATURE-----

fix KeyErrors from reading empty dirstate -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 fix KeyErrors from reading empty dirstate manifest hash: 04a797f1b53e34153c8ea18950a5dd0eefb4694d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD4DBQFCqyj+ywK+sNU5EO8RAoepAJYp2TjjaMq3l+ZrRfogyvUGCebgAJ9nKPdr nP/Y3F1GvOle58NTIQ6UBA== =0k3O -----END PGP SIGNATURE-----

hg patch: add default commit text -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg patch: add default commit text I was doing some benchmarks via hg import and found a few patches where the commit string ended up empty. hg would then try to prompt you for the commit string. The patch below forces a default string based on the patch name. Signed-off-by: Chris Mason <mason@suse.com> Modified to only be added if there's no commit text - mpm manifest hash: 35da46e3832a98e2d288604e6be8c82e85405ef8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCqg+/ywK+sNU5EO8RAqCIAJ4/Nj6c3MusY3HyD8HeHjqc+GlFMQCbBWA5 HhCmOoJuL5Uoz7WlGPlpumw= =M3/j -----END PGP SIGNATURE-----

add easy profiling support -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 add easy profiling support Now you can do hg -p [command] and it will run it under the hotshot profiler manifest hash: fcad346798243ad2434bc5458ed8d3456707c599 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCqgqYywK+sNU5EO8RAp9BAJsFI7iUWYEMvXWYaVt4VmrlOF3enwCdEFRJ l/EZmMLecbfQcbbh5oo0yHs= =voa0 -----END PGP SIGNATURE-----

Add tip to tags -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add tip to tags This makes a tag for the current tip that always overrides what's in the tags files. manifest hash: b1a17d0238aa84ee30773be79e4a32dca321a0c3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCqfzVywK+sNU5EO8RAgdEAJ41VvLHIIzNZbIC/nHmoJOpZL0+4gCfRxpC eSq341nfmMZNcrqmGYYALe4= =miH1 -----END PGP SIGNATURE-----

add tip to repo.lookup

Merge with TAH -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Merge with TAH manifest hash: 9ce3631dbbe2070e6e0b8a72e197790c911896e2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCqc+mywK+sNU5EO8RAshrAJ4rqQXCJqB1rqgDQ5ujwOhFqqRuuQCdEUsK wpBCgWEm3xr9mxQ6rLLsihU= =Ozg9 -----END PGP SIGNATURE-----

more merge fixes -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 more merge fixes Logic for getting a remote change should work going backwards and forwards Mark all the changes in the merge that we don't get or merge so we have the right list of files in the changeset manifest hash: 88be742f510a2c58b276172ae538f9533f5e7491 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCqc+CywK+sNU5EO8RAjOKAJwNkC7phUO77IGW20R7MKyWBGP01gCgjxP6 K2CqUESHr2+0J96q3N74Siw= =zb2f -----END PGP SIGNATURE-----

Use vi if $EDITOR is unset.

Check if $DISPLAY is set before using tkdiff or kdiff3.

various fixups for git import -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 various fixups for git import cache manifest flags properly after add rawcommit handle flags handle multiple parents better commit a complete manifest verify changesets and manifests are no longer necessarily 1:1 check for duplicate nodes manifest hash: 5bf65f506d2b0da94d42d9fb1f792d58f6453c58 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCqU9wywK+sNU5EO8RApUUAJ9sXVIKMcmLChdk2M95U6DW37qNNQCgid08 /1E9Y4vw25HcxwJlXopV1lU= =oohz -----END PGP SIGNATURE-----

revlog: allow duplicates -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 revlog: allow duplicates If two branches make the same change to the same parent, the result will be an identical hash. Git apparently does this all the time. Deal with it gracefully. manifest hash: c6217eab4b310e1ae529dd75ab90e717dbe5d55d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCqU61ywK+sNU5EO8RAkFqAJ9KhWUQgjZbzzB/+mTkolH0GkT1awCfa+Mj ulbI4xCRZcvfQE492mcNwQA= =N6In -----END PGP SIGNATURE-----

hg init: when hardlinking, remove dirstate -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg init: when hardlinking, remove dirstate manifest hash: 48d32cdfe7eacf17b012226a884384e48377b0d8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCqU5gywK+sNU5EO8RAmzxAJ4hQUt/qrIcPzuGHf5dazJkKc9wgwCgpqV/ zSC4SHAvJQ2VptJSSVCEOAg= =QVG+ -----END PGP SIGNATURE-----

Merge with TAH -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Merge with TAH manifest hash: 5a7d047acc6df6ba03db532657f54c0d38e4cffe -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD4DBQFCqIECywK+sNU5EO8RAg56AJ95hB6uw7Fc55XgwgZls4UUNRt1jACYrkrq V9VJhhv29Fd/LEZy+ydoGQ== =unEK -----END PGP SIGNATURE-----

Turn on +x for every +r bit when making a file executable and obey umask.

Fixed usage of removed variable 'wp'.

hg update: fix clobbering files when going backwards -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg update: fix clobbering files when going backwards spotted by Andrew Thompson manifest hash: 0cfc2d189a395fb8761391d9918864034aa7a9b8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCqH9BywK+sNU5EO8RAoHrAJwN9Y2Jrvbdp/seTkGl6D/g1uxK0wCglZWz jQ6F3A6ikzTXwhEq+KsR8Qw= =9IPU -----END PGP SIGNATURE-----

Fix hg import fix -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix hg import fix Spotted by TAH. manifest hash: f8d648c43c090537d3af1a79cc53784357a2f057 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCp9umywK+sNU5EO8RAkovAKCwRyUN7HOEFTnqK8OJ3zVY+CYEHACgtj5f naeGpDbq0haT628rPDbtAB0= =W8Zf -----END PGP SIGNATURE-----

hg patch: fix to actually take a list of patches

hg help improvements -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg help improvements Handle showing option help in commands.py rather than fancyopts Show getopt exception string if argument parsing fails and call help Show help for invalid arguments Show exception string for invalid arguments with -d manifest hash: 9bd3e908cc080c21bb5e85822f675c35a8396fef -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCp8GNywK+sNU5EO8RAoJfAJ4pB0I4xH4CTuGmAwArfBzIsT9plACeImkm 4ml9x78fmPgKpDYIr/qhfVY= =YeZv -----END PGP SIGNATURE-----

Make most file opening binary -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Make most file opening binary This should make Windows happier manifest hash: 4a906f7c55d8af4e962385c645852d0b3d858b42 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCp52mywK+sNU5EO8RAtOzAJwK8MOtl3B0MDAXyJDnDFt9mHNINwCfVdRG 8z35hXvIJhz3sRo0ogdUZ0s= =eM45 -----END PGP SIGNATURE-----

Add wopener for opening files in the working directory -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add wopener for opening files in the working directory manifest hash: cad3a930764244a32f8e45c2ea95fa9b98690b5f -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCp5qxywK+sNU5EO8RAkfAAJ9C7V8zlbUVM8Dfs4raXMtT2bk4RQCfRfVt IfYoaVsbOUW4U1XipOZycAw= =5JDH -----END PGP SIGNATURE-----

replace hg branch with hg init [source] -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 replace hg branch with hg init [source] This does the hardlink trick if both repos are on the same filesystem, otherwise it does a pull. manifest hash: 780a3a0aca6e4a535909c6221ee94394701ec1c9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCp5anywK+sNU5EO8RArdDAJ9Tiia0YZmZ6xiTYdKhZJ2UZY8V5wCfeoPy DamQ2Zyz3yTjNqu4ge0CuRQ= =EXv5 -----END PGP SIGNATURE-----

hg commit: add -t and -l options -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg commit: add -t and -l options This lets you specify commit text on the command line or point to a file containing it. manifest hash: 38201933edb1a89a5c3e0054d1b733cc4af46880 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCp40yywK+sNU5EO8RAgirAJ9ZAkfN+RyhPQGJBXKz3f7cR2xC0gCgo5l2 I9LQHVXT22rPb4tYUVq/bgQ= =pA04 -----END PGP SIGNATURE-----

commit: edit text fixups -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 commit: edit text fixups if given text, don't call editor if editor returned only whitespace, abort manifest hash: 7b6158a37568d91be1443b487d0a2cea1ba55dd3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCp4zXywK+sNU5EO8RAqCrAJ921nNgI/akM8oacXewkIYdxaoiAgCffOP5 UOIl4GzvkOkcqd5YFS83pa8= =seZT -----END PGP SIGNATURE-----

commit: abort with empty commit text -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 commit: abort with empty commit text manifest hash: d932ca95c920d6a4d33281d29e605c6995930016 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCp4oLywK+sNU5EO8RAulBAKCOhHn6p/xNaJUFs/IsOY8+1ad3ZQCfbUNb XigHO+zgvzzsFWIvLnZFiGI= =lldi -----END PGP SIGNATURE-----

hg pull: ditch .hgpaths for new .hgrc -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg pull: ditch .hgpaths for new .hgrc The format is like this: [paths] main = http://selenic.com/hg hgweb = http://edge2.net/hg/hgweb/ hgdoc = http://edge2.net/hg/man/ manifest hash: fc99889443381bdecc223f09ee65a74a8d5952c1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCp3VKywK+sNU5EO8RAsbfAKCrzNh2yKI0KF9qCzHPz7eXjx688wCeKmIL RXfAOuycKOTVJU6oFnBbBBo= =OjMb -----END PGP SIGNATURE-----

ui: add configuration file support -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 ui: add configuration file support manifest hash: 2d0768a6f3797d4ccc870170b874bfd7aeb2f787 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCp3TyywK+sNU5EO8RArYYAJ4+wWQmO7HIXewuGwB3a5DjiWGHwgCcDpeF Pz2lScnpVZPPbDQiS+VnBnM= =ffwc -----END PGP SIGNATURE-----

verify: don't die from new permission bits -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 verify: don't die from new permission bits manifest hash: f8799eb3574dab3ee1523ae61b1a513eff1a7044 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCp3TQywK+sNU5EO8RAkiSAKCd0wEciYzcZYmeMic+9QLVtbf9SACginpE 1pjBr5SyqQu66rh+zWPgZqQ= =cgDM -----END PGP SIGNATURE-----

minor hgk fixes -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 minor hgk fixes From: Chris Mason <mason@suse.com> hgk was missing the last commit when reading the output from hgit rev-list -c Some how a debugging puts snuck into the hgk I sent out. Remove it: manifest hash: cc0ec1d46fbbe9b7e9bf6404f9dbe2ec787811ba -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCp13mywK+sNU5EO8RAnkqAJ49W/i1mwt38Yws4t0mEQeKttsOSQCgi9fS /t42Uy0Qj9yeVppGPLel/bI= =eIrI -----END PGP SIGNATURE-----

mpatch: properly NULL out return in lalloc -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 mpatch: properly NULL out return in lalloc From: K Thananchayan <thananck@yahoo.com> manifest hash: 69952cb34e184eff19e3abff7638eb3a446f4dca -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCp0B+ywK+sNU5EO8RAuGdAJ4iZOnxExpZuhTjO0fcOFE9mNn/IACgjXbw 7mVqfBJeLbxViBorImLE12k= =A1Vj -----END PGP SIGNATURE-----

hg cat: relative file support -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg cat: relative file support also fix a bug in relpath From: K Thananchayan <thananck@yahoo.com> manifest hash: a443a66dfb90b38ea491de1e817b2877170bc9f8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCp0AGywK+sNU5EO8RAgfVAJ9vlXfLKs1A/TegG3wuPeuxoSQMCACbBPGF RObiYj1st0k1zQYBlvSlQbk= =GZbB -----END PGP SIGNATURE-----

Mark the usual things executable -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Mark the usual things executable manifest hash: e55dde46fd1a97ce338c1ac71278b67ca9d96bf7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCpz5RywK+sNU5EO8RAnypAJwLpjrQ09nMSJUELtCondHI0fvuVACfQu2J mFi9D3L9ULGO457NWB4h3kY= =3bcD -----END PGP SIGNATURE-----

permissions merge: remove a debugging print -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 permissions merge: remove a debugging print manifest hash: 488144aeb1544ecc377ab41983e6cabd4a8b1f5f -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCpz4KywK+sNU5EO8RAi+YAKCBmiiDkhe2ygCv4LF21RS3/iH0VgCeLwd5 c/yhTklZ9lnLWXy5dmuPNZk= =UtDf -----END PGP SIGNATURE-----

unidiff: handle empty diffs more gracefully -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 unidiff: handle empty diffs more gracefully manifest hash: e2030f7e55dc333ba0cd5b0847d1f1a08e3c5d64 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCpz0uywK+sNU5EO8RAnt4AJ9pyaS6/xNnlhCUocq3m0HbCwHJ/gCgrP/H IvBJtq1eXvRedfitF25vBgw= =pd5n -----END PGP SIGNATURE-----

merge: update permissions even if file contents didn't change -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 merge: update permissions even if file contents didn't change manifest hash: f24ed7970c6ca48329a7aa9c2037d96333f7172e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCpz0PywK+sNU5EO8RArOMAJ9CImCJMdubq5HsB3KrxOt1EG7PEgCgpPWg lnVxviZhv31EHtnxujQBoqM= =qxYq -----END PGP SIGNATURE-----

add tracking of execute permissions -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 add tracking of execute permissions Changes to executable permissions are now tracked. We only track one bit here as the others tends to be problematic. "hg manifest" now shows file permissions. manifest hash: b76b85d12a9550fdc9fbc4f9446a812f3a2bbe88 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCpzYBywK+sNU5EO8RAgkMAJ48l2ac12E20EFS24/i8ScwOtG4HwCgkbaE ue6l1RJroqzNA7vNeqwCwK4= =sEmJ -----END PGP SIGNATURE-----

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

[PATCH] hgk should parse dates in the diff output -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] hgk should parse dates in the diff output hgk doesn't deal well with the difflib style diffs, it expects the filename to be the last thing on the line. This patch fixes the regexp to stop reading the filename at the first tab. Signed-off-by: Chris Mason <mason@suse.com> manifest hash: 9c5bcf427455dcf306ab6f91b1986723caa83f36 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCpl/HywK+sNU5EO8RAgAjAKCOuZsRtJDbdurTQry+7krtLTtRQQCfXLuN LZEFkcOGS0jiAC6vci/RLJ0= =jkr1 -----END PGP SIGNATURE-----

merge: Fix bug where we overwrote local when local was newer -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 merge: Fix bug where we overwrote local when local was newer Spotted by Arun Sharma manifest hash: b81acb971c6471d95748cd349590cc70e448dce3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCpl9oywK+sNU5EO8RAtseAJ92EEMovbVy0J1rFuxcGvED066m+ACfaWYF Q1/PcvkuH9aIqwMNkMK+aPU= =61JM -----END PGP SIGNATURE-----

diff: use tab to separate date from filename -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 diff: use tab to separate date from filename manifest hash: 73812de990e0e787320c11f7bd83c4ca91a52c4c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCpdDxywK+sNU5EO8RAhKwAKCFcUa/p6ALbjoOl4I8VKJknZtu7gCdFvoE HQn1iq4gnJoeurB7YLMRpqc= =ltYP -----END PGP SIGNATURE-----

hgweb: ignore pipe errors -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hgweb: ignore pipe errors manifest hash: 3a3baaa175a422bf499f414b5186ed551827db56 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCpVkhywK+sNU5EO8RAo5aAJ9KPR/Gwp8YBswhyKqzVYVlgBl49ACghr65 sGKxB7ctoX9XB1WDht8WUzk= =J2bp -----END PGP SIGNATURE-----

Reverse order of hg log and hg history lists -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Reverse order of hg log and hg history lists Suggested by Arun Sharma manifest hash: 5f663a03e7ace601383c7291a17f83c9aeeccdda -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCpVXDywK+sNU5EO8RApeOAJsFXG0qeO+yidIwyPrBHSmDMaKfdwCeMAWl uClUZxGNburRXmNLLAPHk9k= =1ytE -----END PGP SIGNATURE-----

hgweb: shrink the default changelog list to 10 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hgweb: shrink the default changelog list to 10 manifest hash: 4d5f9f35b3dcb6bf05c0f25ab89cedba269ad924 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCpVUbywK+sNU5EO8RAlmTAJ9HzQz9C1lmL22IGU0tXYDTLqcVAQCfTD1U pDF449wXA8ocjAF+UUJ7sL8= =YyBZ -----END PGP SIGNATURE-----

unknown command fixups -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 unknown command fixups from Andrew Thompson manifest hash: 3ed1956585a905a52d93491ea95096be23c9acf8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCpVTaywK+sNU5EO8RAkvLAJ0ff8/kVQc93jGy5t1uJ5R8m0M4OACfZ1Ba O7CldaLkwEzqybw/5iL6NAw= =WGtU -----END PGP SIGNATURE-----

Initial import of hgit and hgk -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Initial import of hgit and hgk Support for git compatibility sufficient to run gitk on top of hg repositories. This includes: hgit diff-tree hgit rev-list hgit rev-tree hgit cat-file Signed-off-by: Chris Mason <mason@suse.com> hgk is a slightly modified version of gitk1.1 from Paul Mackerras. It has been changed to use hgit commands, and has support for the extended rev-list -c to speed up the commit listing. Signed-off-by: Chris Mason <mason@suse.com> manifest hash: 5a4a27135bc85bab2a3a1e35018a08a985d8d146 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCpVQ4ywK+sNU5EO8RAl3QAJ9p6VyZ8fCHfgt0p8ksgL2P215DXQCfZU47 d+u5GpZvkOTOc3+LU3Ny3nE= =rjsC -----END PGP SIGNATURE-----

Fix argument processing for patch and rawcommit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix argument processing for patch and rawcommit manifest hash: fc76fcd22ca69185bbec1855f72dda5b692e03f3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCpVNMywK+sNU5EO8RAn2nAJ4gBbdn8K6xN55Igh6J2ZJEMgRGBACgr0Xb KkjbnOrNL5uQmBHx59C7HdY= =qsQi -----END PGP SIGNATURE-----

hgweb: fix non-existent source or destination for diff -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hgweb: fix non-existent source or destination for diff manifest hash: c076bc00ba04911392085f3d0697106f4d24b808 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCpJtjywK+sNU5EO8RAsaTAKCso0BDI3GQxN9ZZRNeMXjeZXCXLgCfYM+R JpTBR7gUZtV+pEexSfFlRDQ= =moF8 -----END PGP SIGNATURE-----

Attempt to make diff deal with null sources properly -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Attempt to make diff deal with null sources properly manifest hash: 7766ed2b885640157b93474b6e42573ec061fcfb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCpJsdywK+sNU5EO8RAr5gAJ9sIik+3FDyI8UvIvrWlku4QgMZWQCcDFvh MvtqY8pFYTFLp7tM2zzTlu4= =a0oy -----END PGP SIGNATURE-----

Fix empty repository transaction bug -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix empty repository transaction bug manifest hash: df334795ea545f2401d08f734b8b6933af053d7b -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCo0lbywK+sNU5EO8RAr0TAJ9g9703187KXlpBOffNUGcYKGTLzwCgrqdq jYjtTvZZ3nRCt8biaTcad3c= =+riB -----END PGP SIGNATURE-----

implement demand loading hack -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 implement demand loading hack This attempts to speed up start-up times without pushing imports down into local scopes. manifest hash: f9c18897e67f7872b44f5c89bdde00edfc3628ce -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCo0kHywK+sNU5EO8RAg5HAKCxRKAz3FXDyv4wScq1ZbwTgfPa2gCfW9K+ dg5nC3Uvp4FilP8waF6liAY= =dolF -----END PGP SIGNATURE-----

Update README -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Update README manifest hash: 6c869ba7478b4fead8cffa88bfb704a03ec918b3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCo0esywK+sNU5EO8RAtEYAJ4r+9tCMQKO0vkRx+gWolO7p5iXhwCfbKf5 41ghEeWPQrFXPv2GMruR7t0= =o1eg -----END PGP SIGNATURE-----

Some tweaking of notes.txt -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Some tweaking of notes.txt manifest hash: c32913f139f35f28a87a4e432b5dd63deaab3c2b -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCorsEywK+sNU5EO8RAph7AKCT8zmySShpwxUI9lNbe/Ctc0sZiwCgtAKG TaNy7+0p62smfYecxxvBwS4= =mLc6 -----END PGP SIGNATURE-----

fix addremove -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 fix addremove manifest hash: 15a37c156e2186e89ef086ef974541bf1c695280 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoqunywK+sNU5EO8RAuICAJ9x7W0xz1ZBJ7nFYiiQEBljyYwqhACfVE7R oiP0nigB4SzQMMmifrQ7UkA= =/c5l -----END PGP SIGNATURE-----

hgweb: watch changelog for changes -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hgweb: watch changelog for changes Check the mtime of the changelog for updates on each invocation of run(). For the standalone server, this means you don't need to re-run it to pick up changes. manifest hash: 398bdbf03b867df27da9e803a094dd265f62e12c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFConlTywK+sNU5EO8RAljMAKCigJKR2aXabt1kuYeiAl+PZEN1owCeKShZ oZKfo+I7e967FqI9l7NIPFE= =pTp6 -----END PGP SIGNATURE-----

Sort tags in revision order -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Sort tags in revision order manifest hash: 23f33a4ece3d36e4387d9c096a87e3d758db0cbc -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFConLsywK+sNU5EO8RAkBTAJ0c71AIsyi3YFyNIZTAMgEIMgEHNACggAKC YrPLqJ3nzAX/tLSprvR/SUY= =WTsq -----END PGP SIGNATURE-----

minor fixes for update() -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 minor fixes for update() manifest hash: ee88b90b933d83d5a9e108ec5519da93629bf29b -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCom+pywK+sNU5EO8RAqOxAJ9Cbk8NTlFAmlF3phcmz9MlaVYRuwCdGDjC oMFBjhRhvif/nBJbHjqW2Qw= =RN0T -----END PGP SIGNATURE-----

hg help: use docstrings only -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg help: use docstrings only Now all Mercurial commands are at least partially self-documenting manifest hash: 177e5f0fb13c258cc56d9b42cf762e55c3141531 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFComzMywK+sNU5EO8RAr3dAJ0dtlW4h7xZgaj1T3lchPnO2HHb/QCfcSnJ e3SRVwd8DjsfxHFNQfOx+Qk= =+6jb -----END PGP SIGNATURE-----

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

Remove invalid state from dirstate -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Remove invalid state from dirstate It's no longer needed now that we backup and restore dirstate properly manifest hash: 74c98540d685a76bd95dd7ebf4aaeff678706952 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCojZgywK+sNU5EO8RApaEAKCXO9Tl5h8vAC7GcQyUCx+feFExyACaAjfp 2hWiAJ9+B7EQgx2BJFE9Xek= =apay -----END PGP SIGNATURE-----

Handle unknown commands nicely -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Handle unknown commands nicely manifest hash: 787091fe5d983cdcd12491daaaf3cf60e9e950cc -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCojXfywK+sNU5EO8RAlniAJ4gow9qBZ80Rvv8J3Rp8Ow2J/HOzwCglI3z Ra50GpqCglTuqWvPcBNfdMQ= =2s1i -----END PGP SIGNATURE-----

backup dirstate for undo -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 backup dirstate for undo manifest hash: 2999407c1f8999e91ba0e23828cb406803b364a5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCojXDywK+sNU5EO8RAotIAKC3P3Oz+9n/EgqkFc0UMTlUErSNAQCgpjYm hpuZlC4lNO6aRiDfPVDL8Cw= =DDtT -----END PGP SIGNATURE-----

Catch broken pipes in command interpreter -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Catch broken pipes in command interpreter manifest hash: b1550ec705836af571bf0c0921d9e768ac5e5e80 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoipEywK+sNU5EO8RAg2WAKCu3NUArYzOX2UwGj8pv3AnDQCwoQCffPWk RcaNt0+COwST2FlbQQOxEk8= =jbZG -----END PGP SIGNATURE-----

import and startup cleanups -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 import and startup cleanups add commands:run() add copyright notice to commands eliminate/reorganize imports to speed up start time: 0.5b: $ time bash -c 'for i in `seq 100`; do ~/bin/hg > /dev/null; done' real 0m7.718s user 0m6.719s sys 0m0.794s new: $ time bash -c 'for i in `seq 100`; do hg > /dev/null; done' real 0m2.171s user 0m1.684s sys 0m0.444s just python: $ time bash -c 'for i in `seq 100`; do python -c pass; done' real 0m0.988s user 0m0.771s sys 0m0.207s Ignoring the fixed cost of loading the Python interpreter, we're 5.6 times faster. With the Python load time, we're still 3.5 times faster. manifest hash: acce5882a55c76eb165316f5741724c8ce4ef587 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoihAywK+sNU5EO8RAqMdAJwMe6Ur0R9G6jjayNa5hH2C3c4k/gCeIYvc N178vaWWGciX9zq+g5qCAls= =buhv -----END PGP SIGNATURE-----

migrate remaining commands -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 migrate remaining commands This removes basically everything from the top-level hg script manifest hash: 34883e89d8def30e28936b38a9342d2f650f4c94 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoiD7ywK+sNU5EO8RAh0cAKCeOO9vahYs0tGmMNKk8bflw35p2wCgr6Wr y0SNLHSVBMCzXtC9zlfDPog= =3nJx -----END PGP SIGNATURE-----

migrate verify -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 migrate verify Move the bulk of the verify code into the localrepository class and move the command into commands.py manifest hash: 793a8d0094d56ab0a411cd11d7fe7f39c923f209 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCog33ywK+sNU5EO8RApfBAJ4mCmiMmZE1fEfbR6sA+aP1csPvqQCfXHzY 3XK7yc19AivXf5HGKEOL3eM= =GISf -----END PGP SIGNATURE-----

Migrate rawcommit, import, export, history, and merge -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Migrate rawcommit, import, export, history, and merge manifest hash: f932108ee40e34b460e94b6fe60d6a06ac9f760c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoguVywK+sNU5EO8RAtohAKCe9Qr5R+YeLRluJlTxRGrJW/nnoQCfW/+F I0BSOeNpb6jdUxTZY1jV0xo= =hNXm -----END PGP SIGNATURE-----

big heap of command clean-up work -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 big heap of command clean-up work Migrate add, forget, remove, commit, diff, addremove, tip, log, recover, and serve. Fix up filterfiles, relfilter, and relpath to be a bit more bulletproof Alphabetize functions and the command table Make everything in commands.py relative-path aware manifest hash: f0856031a7be4e49289677b467f29bcf24ebce4a -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCof6gywK+sNU5EO8RAoW1AJsHu8vchPSjls7wVbvsq/UKlGhqtgCgtnnl xSBxyf/TEVWjHIk3uTa8WSE= =YPMl -----END PGP SIGNATURE-----

root relative IO and valid commit states -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 root relative IO and valid commit states do all working dir manipulation relative to localrepository.root change the valid commit states manifest hash: def7de4dfb4cad1fd4ef6f713fa3b5c903e05c58 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCof1VywK+sNU5EO8RArEVAJ9F/zFYqRvS2dWxOhONCm1OjEjILQCfcmDq ARbGkSFSyVmyUSBSEq4n//E= =qIEI -----END PGP SIGNATURE-----

fix heads for rev 0 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 fix heads for rev 0 manifest hash: 7b2f4607f6c54b660d63ac35ba953576464e1511 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCofyyywK+sNU5EO8RAjkeAJ4rfOQ9HV+gpndsTzuoS6R3f+mzEQCfcb0P IWhTz6XDpTWEkjzcK++mZ4k= =mINY -----END PGP SIGNATURE-----

hgmerge: use diff3 if available -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hgmerge: use diff3 if available diff3 may be more readily available than merge manifest hash: 67a314ac42aa78410d64a6c3d36c2d575a588533 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoRUtywK+sNU5EO8RAmFPAJ0aN8VNvN9zpE/zov6wT3M98vGfDwCfXEOk xZlQHYIGrCLOFQiCQxIfr7I= =Asv9 -----END PGP SIGNATURE-----

Resolve bits from TAH -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Resolve bits from TAH manifest hash: dc639d419de857b22da9f707cbb557c328eb12f5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoRIaywK+sNU5EO8RAswQAKCiEcQ5RV3C2JZXgQBch28VO3NpSgCdEzcD Td8bV8IKVUIXtvrcy1rCZTY= =tAU7 -----END PGP SIGNATURE-----

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

mdiff.py: kill #! line, add copyright notice -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 mdiff.py: kill #! line, add copyright notice manifest hash: acb4e14d5947d0fde5b89a874af0476773ee1cee -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoM9CywK+sNU5EO8RAizVAJ41dqQxxx8nouBxJMcFmoVRRo4GfACbB9RV Xc0cqaoPVL7p87opPKjgNWw= =HyjH -----END PGP SIGNATURE-----

hgweb.py: kill #! line, clean up copyright notice -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hgweb.py: kill #! line, clean up copyright notice manifest hash: a2910abe3f58687ccf55179ab37f66dee2b6e775 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoM71ywK+sNU5EO8RAil4AJ9edZ1FJ0WbikVBYBMNO+MldBRqnACfRtuH Nw/BuBueQfEhaI3i+9+Q9/g= =vV8+ -----END PGP SIGNATURE-----

Merge from tah

Removed extra closing brace from date string.

Obfuscate author in all HTML templates.

ui.warn can use more than one argument like the other ui methods.

Add missing > to </td> in templates.

hg resolve: merge a given node into the working directory -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg resolve: merge a given node into the working directory This is the first pass at working directory-based merges. Doing a resolve adds a second parent to the working directory state for the next commit. manifest hash: 827b19995dd2d7686286da3b62c7d5fe3e0bc48c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoMSHywK+sNU5EO8RAnOkAJsHH9jviMJcQJ4JurFuSlrbIwKqRACdHgNC kkfoAxX2E5jkuOeSJ1Hjalk= =bdrT -----END PGP SIGNATURE-----

add 'm' state to dirstates -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 add 'm' state to dirstates This state indicates that a file has been merged with resolve and must be in the next commit. manifest hash: dc90629b73056b671f7be3de0283039c96c9ca0f -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoMQSywK+sNU5EO8RAuxHAKCHckvSiLwegl5hbF5x5EeQg0MA2gCcCYD+ 78Ol99Y9nk5ZA2bbYgM+AQw= =vMOg -----END PGP SIGNATURE-----

make diffdir default to dirstate.parents() -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 make diffdir default to dirstate.parents() update various diffdir users to use default manifest hash: aeca2b9da1aca278dd5e3f27cc2906667803577d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoMPcywK+sNU5EO8RAkY8AJ90UHQXnJnkG9PJKG7IsgPeOZ2WZACgiarS HhS2zX3TRM9WdZHo5nLvZGw= =7YyP -----END PGP SIGNATURE-----

teach commit about dirstate.parents() -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 teach commit about dirstate.parents() manifest hash: 89374a15a1e680a251f1a084c18136cb27ad2b42 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoMOeywK+sNU5EO8RAj6rAJ9NBf0401gAlzA315m7gaEPeteaewCfe6A4 Bn3nm77acgIukB1ePfK1o1Y= =P2y2 -----END PGP SIGNATURE-----

teach rawcommit about dirstate.parents() -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 teach rawcommit about dirstate.parents() manifest hash: 776f28b896f8de8c39c9edb0956faca78c1a827a -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoMN2ywK+sNU5EO8RAnJpAKCh5MVSMNlk1GRYPm7IOavhurYPLgCfYc9w k4bTiV62lgoyItdmkynS1Jg= =gVyk -----END PGP SIGNATURE-----

move repo.current to dirstate.parents() -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 move repo.current to dirstate.parents() dirstate now tracks the parents for the working dir add a parents command to show them manifest hash: cd69237838c3f69f7937723c4a6803d47cb27cfa -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoMGuywK+sNU5EO8RAg5UAKCVLUrsJtkoIOTM+e0BLqEVN3Ni3gCeNDyy ZF8jD728cl9K7S4sIN4gX4Y= =P4bu -----END PGP SIGNATURE-----

merge: don't bail on outstanding changes -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 merge: don't bail on outstanding changes With multiple heads, we don't need to worry about the working dir's uncommitted changes at pull time manifest hash: 5b4e024f220fa616732310ce5f48e71abfa910e0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoMFQywK+sNU5EO8RApLyAKCoNDF84wFzgnpS+WLuXdkGxeHFPwCdFsMy CysB458dNcFuB/vDFhgJr58= =gG+u -----END PGP SIGNATURE-----

fix repo locking -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 fix repo locking We've actually got to assign the lock to a local variable, otherwise it gets released immediately. manifest hash: d55fc8858649c59ed9fa1f8cb90b63b33a71c223 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoMERywK+sNU5EO8RAgqwAKCPhmTOK/n5bjJ6Xh4mC9Q8mJDx4wCfZBGX Uik+3sUcQRqgHjsP0fIjjiU= =U1p0 -----END PGP SIGNATURE-----

fix bad assumption about uniqueness of file versions -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 fix bad assumption about uniqueness of file versions Mercurial had assumed that a given file hash could show up in only one changeset, and thus that the mapping from file revision to changeset was 1-to-1. But if two people perform the same edit with the same parents, we can get an identical hash in different changesets. So we've got to loosen up our uniqueness checks in addgroup and in verify. manifest hash: 5462003241e7d071ffa1741b87a59f646c9988ed -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoMDkywK+sNU5EO8RAg9PAJ9YWSknfFBoeYve/+Z5DDGGvytDkwCgoMwj kT01PcjNzGPr1/Oe5WRvulE= =HC4t -----END PGP SIGNATURE-----

add back tempfile import -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 add back tempfile import manifest hash: e6673585d42d0992230d23c8334a9e26eb94d34a -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoMBAywK+sNU5EO8RAvTAAKCwlVzxvm9enBR+xMmkj2aRMEYkkwCfXUqT SlEdijBZ9fnktzxadp7/evU= =uL7e -----END PGP SIGNATURE-----

make pull work for multiple heads -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 make pull work for multiple heads add repository.heads() teach remoterepository and hgweb about heads command teach getchangegroup about multiple heads break apart addchangegroup and merge (cleaning up merge saved for later) after this change, it is now possible to pull and get multiple heads, but not possible to merge the heads manifest hash: 86fe3ede296254698fdd4c97df02944993ef2cbb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCn8SZywK+sNU5EO8RAkSvAJ9NOA4UZ3cFyyzymlYBZnV+PpGRcACeLL+R PFaSgJHGKvxsXpvPYiZA0O0= =L2Xr -----END PGP SIGNATURE-----

Beginning of multi-head support -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Beginning of multi-head support Add revlog.heads() Add heads command to list changeset heads manifest hash: 50df6fffe59a40c19782e2c77c8077db026fde67 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCn7tFywK+sNU5EO8RAusWAJ9EojIxgqEEt8VZd5S+5Laj8tHV+ACfWLb5 TC7AnsoFGg50jAWF0EsofDA= =nzyH -----END PGP SIGNATURE-----

change dircache into dirstate -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 change dircache into dirstate The dircache now tracks adds and removes directly diffdir now makes a proper distinction between added and unknown files Add a forget command to unadd files Undo tries to fix up the state of just the files in the undone commit Add and remove complain about files that are not in a proper state of existence manifest hash: ca0cd6abc5e119670acf11a54fefa2bc986eadf3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCn7TRywK+sNU5EO8RAhnSAKC2oHg1HJOCGsvpUYj4SBEq0HmuJQCgr5gl jEBTs5AFD5IhF73YAgrcnkE= =prQA -----END PGP SIGNATURE-----

hg checkout: refuse to checkout if there are outstanding changes -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg checkout: refuse to checkout if there are outstanding changes This is a stop-gap until I make the working dir logic smarter manifest hash: a3f6adcb7eecec294000039057d59771958f4186 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCnnrKywK+sNU5EO8RAtqBAJwPQQrW5GhjMP9HMkFtfD7qhqxIcgCfXvA4 oXHO13uzBn5JOaTH3KwsMbQ= =IzTY -----END PGP SIGNATURE-----

hgweb: put map-raw in setup.py and MANIFEST.in -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hgweb: put map-raw in setup.py and MANIFEST.in manifest hash: 75f24a191ade74c1cbfafbaaf5fb9b6a4c5da02c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCnlpVywK+sNU5EO8RAoDGAKCsyEhpJGPZjRp4RZD1Q1ijwNGC2wCdGSjL IGWUxQqqS4W4GJNesvADNVs= =O3Wg -----END PGP SIGNATURE-----

merge: catch unexpected responses -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 merge: catch unexpected responses This dumps the data received from the remote server in case we fail to parse its output. manifest hash: da5232649a0e02645bccd8b50665d9c3e247fdc2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCnkMRywK+sNU5EO8RApAGAKCw7ZHF4YUaTi3ychbUe5Lr47OsCwCfUqKg lxA/sgDmeDMbmwbV5S+Beik= =y6TB -----END PGP SIGNATURE-----

hg annotate: actually annotate the given version -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg annotate: actually annotate the given version Bug spotted by Edouard Gomez manifest hash: 3e29a7a8eb70b92483958ceffe94045a82899c61 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCnkF7ywK+sNU5EO8RAvvnAJsFjkpFdzQ+cPyrvQE25V16/z3dBQCeIyzf S/N2S/RcfFd9Ca56Xvf/jAM= =0qMq -----END PGP SIGNATURE-----

hgweb: import ui -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hgweb: import ui Fix from Edouard Gomez manifest hash: 6157f19523d28465a6f0c49adec96c17aa9df118 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCnj3YywK+sNU5EO8RAgHBAJ0b+oHTOyDVDtC5vsQvAzpn0saRAACfYmAU 5q/mDghl/UWYGiSAY1i/l0w= =i9MB -----END PGP SIGNATURE-----

catch TERM signal in command processor -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 catch TERM signal in command processor This keeps kill from interrupting a transaction without cleanup. manifest hash: c50091696a3396dfed5c3168bd9e0d94c457a04b -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCniLNywK+sNU5EO8RAvepAKCCnEX7vPheIyOu2IvV6dDahdFMWACeMih6 E2R3rA/MGACxG9HpSNH6lak= =HR1s -----END PGP SIGNATURE-----

commands: migrate status and branch -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 commands: migrate status and branch manifest hash: 7d893a81a81539173fc74d86152062a1a70bed13 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCnhESywK+sNU5EO8RAlBJAKCmv2gHefMOXfX/UUCy1tfV0cOqOQCfbeX8 oaT15B7GBL2lcalGrPXkzY8= =8gVe -----END PGP SIGNATURE-----

commands: better argument processing, per-command help -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 commands: better argument processing, per-command help This passes command line arguments as positional arguments rather than as a list and attempt to catch exceptions if the arguments don't match up. It also adds 'hg help [cmd]' which prints the syntax and docstring for the given command. manifest hash: cef3ac7076f99fce4265a5dc7acb57fb03d93270 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCnghXywK+sNU5EO8RAv+5AJ9MfCCRxE+pNu3i44v5I4IyQoRaiQCeNqEK wBzAiP+Q6F/9PL2xOrrZGHw= =EYdk -----END PGP SIGNATURE-----

commands: fix up some help strings -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 commands: fix up some help strings manifest hash: e9e6061cd37d77e8061cab6a0cd3ca701e6900d7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCngG/ywK+sNU5EO8RAnhCAJ422e7LecJ5D/15I5PcQZxGvsgvvQCeOWIb 7LTyyAYDeht6yOQCdLWmXIE= =bjQG -----END PGP SIGNATURE-----

hg undo: fixup working dir state -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg undo: fixup working dir state manifest hash: 60fd7a5621f7c4e87c7c36097aaf11b22e7ee0b4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCngETywK+sNU5EO8RAiC/AKChvIgy61YfOLJcTQg5BKkTLLErRgCgnJMr +xb+XsjeNfK+83MzeuE8UOk= =EIlj -----END PGP SIGNATURE-----

Beginning of new command parsing interface -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Beginning of new command parsing interface This adds commands.py, with a primary interface dispatch(args) Dispatch searches a table of known commands, handles switches, sets up a repo object if appropriate, and dispatches the command. It also handles KeyboardInterrupt and can handle similar exceptions in the future. If the command is unknown, it falls through to the current command handler. Commands currently handled by the new scheme: help, init, and annotate manifest hash: 134cd032c880985e3f92f82efb8b629dd862ba4c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCnXEGywK+sNU5EO8RAuDAAJ9q7K4w7qGVWv1NWjCPFGO/UJc6VQCdEhMQ sBBlSRzah9QPy8K94catZyg= =wuRf -----END PGP SIGNATURE-----