[PATCH] Fix use of util.CommandError -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Fix use of util.CommandError From: Bryan O'Sullivan <bos@serpentine.com> Fix CommandError so error messages don't say "abort: abort: ...". manifest hash: 2aea4c8043d321882dcdf846a42a55403ce1086f -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwvOZywK+sNU5EO8RAqF/AJ9IIr6JPPUc15tb7w4lnI7yMFxSmgCfQUYn OX7Uz7G3dJNRIjAxJtGwCLo= =xj/W -----END PGP SIGNATURE-----

Add some TODO items -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add some TODO items manifest hash: d188abf3c84b6ca98279b4bf053ce2844da83a03 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwvKyywK+sNU5EO8RAh9ZAJ9kYA0a/R7XynWqZGGr6JqUvXa37wCfd2a2 F9fCY85bSZgErvdrklP29bQ= =FtlU -----END PGP SIGNATURE-----

Add a CONTRIBUTORS file -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add a CONTRIBUTORS file Compiled by Rafael Villar Burke <pachi@mmn-arquitectos.com> manifest hash: 20acfff6abdd47408d8262d15b19099c33b85151 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwvDlywK+sNU5EO8RAuujAJ4wYp+deMoUO54W8qBAFXKY3IHGPACeJNpO x1rRm1amHz3V2RAfk/Rh9ZM= =8t0h -----END PGP SIGNATURE-----

Fix failed clone in current directory -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix failed clone in current directory Spotted by Edouard Gomez. manifest hash: 83fd3bb8056c531f2d696f00c5bd6a61274783eb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwu0jywK+sNU5EO8RAqPiAJ9tCL5PhHoGMTbaQzpt5dl+EkCH9QCgh4WL EOFeD2th0Ucs7Npu3t+VUB0= =p/Ig -----END PGP SIGNATURE-----

Add --repository option -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add --repository option From: Goffredo Baroncelli <kreijack@libero.it> manifest hash: 714316cb69ed5fcd981aa1bdb12de499e8348997 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwuyRywK+sNU5EO8RAmh7AKCtUxqC0KFcMYmoh/voLAbh6BncpwCgrL42 zzSMZAiUg4KEO9BxxlJOcDs= =eUcM -----END PGP SIGNATURE-----

Change getchangegroup to findincoming -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Change getchangegroup to findincoming manifest hash: 46dbdc025ead342f7c70a0051d1c596cfcbb6699 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwuwAywK+sNU5EO8RAoV/AJ9GaoLTKMo2aoycSIZyBt/8r073vQCeK/tO W1PwSot4HmnmcpR6RVIy9+0= =PiBt -----END PGP SIGNATURE-----

Whitespace cleanups -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Whitespace cleanups manifest hash: ac954bc3a4f034c12638a259ecd65841f5b63c5c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwuubywK+sNU5EO8RAluIAJ98XQpNdZUpSmYKgDmrMRlbL76ZzQCfes0t rknNUN/PhtyA4bzL646dOz4= =UyCE -----END PGP SIGNATURE-----

change unrelated repository error to a warning -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 change unrelated repository error to a warning manifest hash: 7c1481639c7e7ba91fd391a9fa6eb17e838f894e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwZ+xywK+sNU5EO8RAnnjAJ494NZfAdMVP48VegHQ+WeZ05DPogCbBEWC d3N47FYG87x1CJOh9VzwVCQ= =lrGp -----END PGP SIGNATURE-----

hg clone: don't try to delete "." -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg clone: don't try to delete "." manifest hash: 7e7bd5375f7729812b7188b7a53287b3c6049823 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwZvlywK+sNU5EO8RAjn6AKCaBNWdLSNXIDqQZ3vMcN5ie5ZZaQCfaG37 hAN32PbYoQh8UC88AeOKOk4= =kBOD -----END PGP SIGNATURE-----

Remove unnecessary deletion in hg clone -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Remove unnecessary deletion in hg clone manifest hash: 4a750332a8b1fe07b63f77ccede89d6486a478e9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwZpIywK+sNU5EO8RAq0IAKCsEtjbl9pe25FAkiDZo8+kAW8mpwCdGS7a JIMPHNUQeb552c4jaPjoyBs= =Jp3X -----END PGP SIGNATURE-----

Disallow merging of unrelated projects -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Disallow merging of unrelated projects manifest hash: 40badbca64e1ccfd83fee8cd7bf5099f57b6f8bf -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwZn6ywK+sNU5EO8RAmdeAJ9TAaGSe0nGMdL+Du3AGwm9x28IUgCgpfGG UunOBkobMVLGdHegnOvQkmQ= =VwVi -----END PGP SIGNATURE-----

More fiddling with uint32_t includes for extensions -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 More fiddling with uint32_t includes for extensions manifest hash: 1ad16a0262e9bd2769e32c13c7fd0c7b0cd7dde7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwS+/ywK+sNU5EO8RAhK1AKCtF/57nKCc1AU+l0sR74kHhY1NCwCfSvQK QQc5i8abuGkFpU5VUBJt5XQ= =H+CX -----END PGP SIGNATURE-----

[PATCH] replace history with log -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] replace history with log From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> Merge hg history into hg log leaving the first as an alias (tweaked by mpm: update docs, tests, use existing alias mechanism) manifest hash: f85001a4373b8b823a6221ba5c506628059d6779 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwSr1ywK+sNU5EO8RAmbAAJ9HlFkf8/qLOAQUtj8CWxGRPEyzVgCgtXwP SdnAg1a2q4693+TBiOjrimY= =w9rf -----END PGP SIGNATURE-----

[PATCH] Harden os.system -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Harden os.system From: Bryan O'Sullivan <bos@serpentine.com> Add util.system function. This is similar to os.system, but will either succeed (if the process finishes with a zero exit code) or raise a util.CommandError (if the process exits uncleanly or is killed by a signal). Add util.explain_exit function. This tends to be ubiquitous in code that calls other processes, and must describe what has gone wrong. Change some uses of os.system over to util.system. manifest hash: e3bf4adcac5b915432ec0af00efdbcef86bea4b1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwSipywK+sNU5EO8RAr0RAJkBDt8XQ7mYQAWNHNgTOVt1eyWU1QCfe1oO 2OwxyWqpbRNACVJHHfZ3/Xw= =OaRX -----END PGP SIGNATURE-----

README: mention lib64/ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 README: mention lib64/ manifest hash: 66865206771f64e1257235c8cf551edf77d2712c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwSemywK+sNU5EO8RAn/kAJ9NhZLCNdOI09rSL22p6zVsoMLyXACdGzVh 6hfXMuxEjn84xTLS4xJ2OLo= =VQie -----END PGP SIGNATURE-----

[PATCH] Add ui.expandpath command -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Add ui.expandpath command From: Bryan O'Sullivan <bos@serpentine.com> Add ui.expandpath function. manifest hash: dd2b9e536b94b453b06604b88ba339d93698b2e0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwSbMywK+sNU5EO8RAibuAJ9jAMqhR3cbTqbPG3g9M8INgFmbvACgjAU2 LpalLI+zhalEUIf1Uw8W5l8= =fqB8 -----END PGP SIGNATURE-----

[PATCH] Fix "no-update" option to clone -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Fix "no-update" option to clone From: Bryan O'Sullivan <bos@serpentine.com> Turn "no-update" (invalid Python identifier) into "noupdate". manifest hash: 1dfb3212b97531437d5a243813896c090a05d95a -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwST1ywK+sNU5EO8RAvGnAJ9/RvohYRxpMTWkK6YCiF6r3U68FACeNRcr mE/NYJzVbijiLK9TwWm8QgQ= =w/KV -----END PGP SIGNATURE-----

Use $USERNAME as a fallback for commit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Use $USERNAME as a fallback for commit Suggested by Giuseppe Bilotta <bilotta78@hotpop.com> manifest hash: 3f86a63aebaf6c30eaa3a2081e1e5f9caa20caa1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwSPvywK+sNU5EO8RAqpYAKCmwfTfeNGCTqy2wuBs/bmtxMKt1ACeIpRo /vencPT6Z/WNXW+6p9NlZRY= =jFZ/ -----END PGP SIGNATURE-----

Fix troubles with clone and exception handling -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix troubles with clone and exception handling Clone deletes its directory on failure This was deleting the lockfile out from under the lock object before it got destroyed This patch shuts lock up and makes the cleanup code for clone a little cleaner. manifest hash: f666fddcf6f3a905020a091f5e9fd2cb5d806cdd -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwSGOywK+sNU5EO8RAkx2AKCIxPczl9YWnuUM+bMQnpVr8kv6uQCeNWld SUxSB99PGJHhq1LWFaSJJNw= =Frk/ -----END PGP SIGNATURE-----

Update undo test -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Update undo test manifest hash: b168c0b983b6aaeaf9cf4c74d65047eb4a5629f9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwSDBywK+sNU5EO8RAswoAKCb98RFAlTrEjsqGKhDX70m/CqriwCdGDOj LFlbZE+HoloZxTjXPaLpVmI= =dYu8 -----END PGP SIGNATURE-----

Better messages for rollback and undo -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Better messages for rollback and undo manifest hash: 22eeb8848b0e07e1f23a896b03c37f7d6f4bd82d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwSBtywK+sNU5EO8RAhNEAJ9MGJxgZjIKegh1TA7++wGbAzkovACgqL3I k1ii4X5PEWEDcoyOp0VqJn4= =wzlT -----END PGP SIGNATURE-----

[PATCH] Clean up destination directory if a clone fails. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Clean up destination directory if a clone fails. From: Bryan O'Sullivan <bos@serpentine.com> On Mon, 2005-06-27 at 16:27 +0800, Soh Tk-r28629 wrote: > Hg clone left the dest directory if the source isn't valid. > I think it should either validate the source before mkdir, or do a > rmdir to clean it up. Good suggestion, thanks. As validating the source in advance isn't really practical, I opted for the latter. manifest hash: 1508afddd2402142f9d8b2387652d4cb28ccc1f5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwRGPywK+sNU5EO8RApBOAJ9Fj22MP3pYJhxWsj8BYbcgWzIOKwCff9yC lX87RrDKicM1W61lBpQl20w= =efck -----END PGP SIGNATURE-----

Add exception class for repository errors -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add exception class for repository errors This gives friendlier errors for repo exceptions manifest hash: f3bef1ddb0c3911b9866ebdafa1fe72df48c8ecd -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwRCfywK+sNU5EO8RAg7fAJ9PMka8pJCy7mMTqFFJ5aQFemHpxwCfezPR cZRAXmbWTTI+/WnVFDjpfM0= =8crk -----END PGP SIGNATURE-----

Various doc clean-ups and spelling fixes -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Various doc clean-ups and spelling fixes manifest hash: 4115506709314aabfb4a66973ef2bc8f22f2225b -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwQ5YywK+sNU5EO8RAkAlAJoCsXCgEQ1lmS58aSrUyPf+KIK99gCeLY/v Tg9JhygJjwsu5xocc9Nh04Y= =JTG4 -----END PGP SIGNATURE-----

[PATCH] doc cleanups -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] doc cleanups From: Pachi <pachi@mmn-arquitectos.com> manifest hash: e6f721b21befe56fca36aac122b4e60755caafdb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwQMPywK+sNU5EO8RAsLuAJ0ezRwgJxAhTiC8S5svurQUvACYvQCcCCUS 1KjmG2VxQo2bgtu97I/AUEE= =bI7g -----END PGP SIGNATURE-----

[PATCH] simplify init -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] simplify init From: Bryan O'Sullivan <bos@serpentine.com> Remove source directory option from "hg init". manifest hash: 2ace7b16c962fb434340b937fbcd494f3098a85f -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwQG/ywK+sNU5EO8RArbCAJ9DG45GepMI0Z9KWXqV8gmEbV1WfwCgotih LGAkD8iTfOLn7HIPVqt9FWY= =65uW -----END PGP SIGNATURE-----

Pull from TAH -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Pull from TAH manifest hash: 08b55e07198b8a4272753895fe3727d9f52ebb75 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwO5YywK+sNU5EO8RArUtAJ9gsYYNbZH22COOz9B7ppwgCDxM8ACfYWcl n9Dim3Z7qepGUXvRDEeFZ9c= =JMQx -----END PGP SIGNATURE-----

Fixed test for previous change of 'hg -v history'. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fixed test for previous change of 'hg -v history'. manifest hash: 5a7d918645596751577b95d0dfba28fd70274b48 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCwOjDW7P1GVgWeRoRAvL7AJwO27B6qhOZZC+16SPjIxJBKz3BSwCghmkB OMzLY0CjZSHixF5xs0ZU6Dw= =F04F -----END PGP SIGNATURE-----

Make show_changeset show added/deleted files only in debug mode. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Make show_changeset show added/deleted files only in debug mode. This was necessary due to performance reasons. manifest hash: 35af5e8ff88a8706406fc8c42251ada79c7c9549 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCwOUkW7P1GVgWeRoRAvB5AKCJ9x/P3XOJVlQnCoh8cblnye+9RgCgkXLW 7Bt8/5yhPnsejYIGUMnppgo= =DNsf -----END PGP SIGNATURE-----

Use "kill $!" to kill running background processes. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Use "kill $!" to kill running background processes. manifest hash: 94563ef45ac0c8d15c9c827430f3d87380946434 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCv5QNW7P1GVgWeRoRAm+1AJwMopIWkvc/eG21mm/gbTrC9sCvhACePQl/ VOPdJKQxutQTCdAqA8iMzck= =7ejv -----END PGP SIGNATURE-----

Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags. manifest hash: b6c5a0bb17de794fc5822b0672af8b977bd77950 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCv5GIW7P1GVgWeRoRAimoAJ9s2RlZ3ljH8DZE2vbCmoWJX973LQCglo+s GmajRX7o3kJxY88aNGy+TNs= =TKmo -----END PGP SIGNATURE-----

Make show_changeset show added and deleted files in verbose mode. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Make show_changeset show added and deleted files in verbose mode. manifest hash: 189c2da64862f471b75b9d205907bff86c7423a3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCv4voW7P1GVgWeRoRAlLaAJsHGWEfNMMfDdsnk9/G9w86nf2I2QCgi4Rc 3HgiUFeTPi71I0tH+SV5Gsc= =/see -----END PGP SIGNATURE-----

[PATCH] umask for run-tests -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] umask for run-tests From: Bryan O'Sullivan <bos@serpentine.com> Another local factor affecting test breakage: umask. Mine is 002, but some other people seem to use 022. This patch makes run-tests explicitly set a umask. manifest hash: 39aaea44746b113e992bcf0a9e93d9de3961c907 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwOz8ywK+sNU5EO8RAvr7AJ9gRknqzQD6UmV1SpzHGqQyclcuxgCeItoD W7yNbrtIAPyMJsfwhVECx3s= =KhYb -----END PGP SIGNATURE-----

[PATCH] Set locale before run-tests does anything -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Set locale before run-tests does anything From: Bryan O'Sullivan <bos@serpentine.com> On Mon, 2005-06-27 at 11:58 -0700, Bryan O'Sullivan wrote: > I'm in en_us.UTF-8. This discrepancy between my locale and Matt's broke several tests for me, by the way. I think that the run-tests script should forcibly set the locale to either "C" or "en_us.UTF-8" before it runs anything. Since "C" is likely to be more portable, it's probably the right choice. Here's the patch. manifest hash: 1bf3291eafbde0cdeb1222bb72295c0e2974f236 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwOyVywK+sNU5EO8RAk18AJ4pYmvvJMZfFIR39NqvquXhhWPUTQCcDhhg Ce12AHU8o+m/aFToyRaaQL8= =5nRs -----END PGP SIGNATURE-----

Add initial hook support -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add initial hook support This adds the basic hook code as well as pre and post-commit hooks. Argument passing is by environment variable key/value pairs so that extra data can be passed over time. File lists will generally not be passed to hooks as these can be extremely long (>1M). manifest hash: 45cf9bab432782c391bc9c1c048c84cc75d52740 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwOukywK+sNU5EO8RAsVsAJ9QipR2aKRSSvoRNo+3If6JddUDkwCgkZrM KEmZpUOxhNHqezFVrHDRTjE= =aedm -----END PGP SIGNATURE-----

Remove stdint.h from mpatch and bdiff -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Remove stdint.h from mpatch and bdiff It's only there for ntohl and htonl and should be pulled in by in.h. manifest hash: 65954290279241ac92c9ce04c21cf1a3c9dd54e0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwD8KywK+sNU5EO8RAhv2AJ40R/T72XK63IbeEFqMLSRJbRJWdACcDa9r dOL9XpyYxR09REbAHw0JrlE= =8wkZ -----END PGP SIGNATURE-----

[PATCH] add clone command -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] add clone command Add clone command. Mark with-source version of "init" as deprecated. manifest hash: 3c31263474977c3d8303f45f71c44f7b7e10e97e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvzhOywK+sNU5EO8RAmh+AJwIlRfX143oxKShgPWF2dbDvCuH3gCbBrAW isIHptwVRX8pcA0lU638pHo= =ZoQy -----END PGP SIGNATURE-----

Pull from TAH -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Pull from TAH manifest hash: 470ea90dd95189a019f4d96016a45db8a297b841 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvzZzywK+sNU5EO8RAkZhAKCUJKX1vFtkFxV7qFwbuWQj62zcnQCfU687 jxKpBVesIXSOpBO4NbW/RIM= =hSBe -----END PGP SIGNATURE-----

Updated TODO -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Updated TODO manifest hash: c73376bc97920d14c8e29311a76313afd71ed457 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCvtiZW7P1GVgWeRoRAsdeAKCazz6dq6fiuq37FGsRKbavfW+4xwCeKbmG N7HBvJ71yVTX45heHiSh8c8= =AgqS -----END PGP SIGNATURE-----

Removed some unused variables. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Removed some unused variables. manifest hash: 89f5eba2fb642276b32d13dc12fe4c72448e47e4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCvquwW7P1GVgWeRoRAuLCAJ4lzcbSrQT2m+Kqxgktvih5FRlM9wCgmYDh a8QVhV8JyZBi5BbRNV2RHSo= =YpXM -----END PGP SIGNATURE-----

hg import checking for quiet mode didn't work. Fixed using the ui module. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg import checking for quiet mode didn't work. Fixed using the ui module. manifest hash: 3418ba604188b5abb2554615aff0ae59f4fee882 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCvqsfW7P1GVgWeRoRAjWVAJ9eNW+GnTJGvXMLxr1uPy5wM40gcQCeP6QO 7qW+m8/YmXLLi+vn2ETyWrM= =UGui -----END PGP SIGNATURE-----

Fixed call to ui.warn() -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fixed call to ui.warn() manifest hash: 3b82298c61822aaa41b4d9b579ec94a968a4b610 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCvqpMW7P1GVgWeRoRAotJAKCKG1BH2RKobak9ebapjViN8cQI1ACgisqU jghqrq9978lFUA9zjA/N2eE= =g65B -----END PGP SIGNATURE-----

Cleaned up command alias handling in help. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Cleaned up command alias handling in help. manifest hash: cfff5b739437073beddbc6e1f4c47ca958eeb1b2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCvqocW7P1GVgWeRoRAkM/AJ9iXHfhyAJH8kL167OiG95EJSsAKwCfWZFt 5S2AiXffxtPLIzxb/evzHZQ= =ppvs -----END PGP SIGNATURE-----

Update of doc/hg.1.txt -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Update of doc/hg.1.txt - - set date to release date of Mercurial 0.6 - - remove trailing spaces and other trivial changes - - add 'hg root' and $HGEDITOR. - - add another repository in the [paths] example manifest hash: 873f058d10bf58c1e54381715c82c1d1aeeee1e9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCvqRXW7P1GVgWeRoRAv/NAKCeiaHsrnUFDdlMMRj1QhL4gKvi6gCgkAL4 QhH/bw/Gjs7R+9LHJW/chxs= =G3kF -----END PGP SIGNATURE-----

Handle errors in .hgtags or hgrc [tags] section more gracefully. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Handle errors in .hgtags or hgrc [tags] section more gracefully. manifest hash: 85c62e1bf3ad78b243ee60f43c3c577700a8c96d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCvp6jW7P1GVgWeRoRAo23AKCZRU22IweynNtf9k3q4pEyqEaozACeMIRV 6tNOkr3h6jTiMZ2bJgPeabg= =+U5s -----END PGP SIGNATURE-----

Really _call_ method revlog.count in revlog.lookup() -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Really _call_ method revlog.count in revlog.lookup() This fixes e.g. 'hg export 398737777' (exists in the mercurial repo). manifest hash: 9de9ad4c40d0746cb3db346a01c373e3b4aba54a -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCvovbW7P1GVgWeRoRAiyEAJ9gVZZiMGA3YItcWRHeai/9C+dMTgCbBiii QoFaXQ9wZDds8fVVsvENAYw= =msWK -----END PGP SIGNATURE-----

Fixed diff generation in hgeditor if a list of files is given to hg commit. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fixed diff generation in hgeditor if a list of files is given to hg commit. manifest hash: 3eadc3637963778a35000fa75f229eb6b44ffc3d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCvoRsW7P1GVgWeRoRArNpAJ4p5NQBkv1X+eHwWU7+aqoGkcqwlACgklk2 e/vr9qiIPcOVrbYViapZD9E= =3fRb -----END PGP SIGNATURE-----

Minor speed improvements for bdiff -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Minor speed improvements for bdiff Consolidate the jpos/jlen arrays to improve cache locality. Do the same for the hash head/length arrays. manifest hash: e6d9ed36782741b1d6fcce8c2d00155a9540e81d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvzWxywK+sNU5EO8RAlTMAJ9+yl0dKIeWv4RegeLy7g6wcnoYwgCgk6la ip6KEAyBb7ktsX14KyZ5+/s= =utNJ -----END PGP SIGNATURE-----

[PATCH] Get run-tests working on 64-bit machines. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Get run-tests working on 64-bit machines. From: Bryan O'Sullivan <bos@serpentine.com> manifest hash: 3704997be1744478414cddcd79c7bea5ccd6a1b1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvfdvywK+sNU5EO8RAm5iAJ9mWxI4o2j7IM7Mko7IjfKfNtWJqwCcDekn 6GDlcDo/Q3nv8ybFzykwQjY= =tS2i -----END PGP SIGNATURE-----

extensions: use stdint.h -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 extensions: use stdint.h Not sure why I didn't do this the first time around. Hopefully still builds everywhere. manifest hash: 965582286a190728f8cc0dfb8e11ee56628a59a5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvfRgywK+sNU5EO8RAg9SAJ4/ZVpQZcDY5xovLDTZK2txEegEgwCdF2b+ lzSIP109qq8D+KIdUWsbEPc= =+0Yy -----END PGP SIGNATURE-----

Minor annotate performance tweaks -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Minor annotate performance tweaks manifest hash: 2edd508182c7b3dfb2e0b9b90baebdd364cb29f0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvfQeywK+sNU5EO8RAsYSAJ0R8SuWnyQxVgauoaEuezOe3Taq/wCbBnEs +VG0LNrXnQM9khQyc0+pCeg= =U5gX -----END PGP SIGNATURE-----

Fix up version module name and command conflict -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix up version module name and command conflict This unties the command name from the function name manifest hash: 926d097f75cbb5eb2464bb253e9a89050c6208bd -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvRLnywK+sNU5EO8RAvryAJ9RU0PLFOXjjtQjs8UVyOC9wde69gCgrV+G 8jYfMyWwvwsmOM7wMblPGqM= =Acyk -----END PGP SIGNATURE-----

Various node id lookup tweaks -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Various node id lookup tweaks - - lookup of nullid with lazymap fixed - - do the Pythonic thing with negative rev numbers (-1 == tip) - - bound ranges on rev numbers - - catch exceptions more correctly - - restrict node id matching to beginning of string on manifest hash: 15918cb74f41ac4bbf8bf02bc3bb599f24f0b5b8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvQzDywK+sNU5EO8RAnKfAJ4vzXnrGmRwOlPqNQFxxrUKchzAzQCcDkbi g3T3KiiVUckrWpziGq67YUE= =vrSU -----END PGP SIGNATURE-----

[PATCH] add "root" command -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] add "root" command From: Bryan O'Sullivan <bos@serpentine.com> Add "root" command Useful for scripting. manifest hash: a2df76139130ac034e53872f24f21f31b083bc42 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvQZGywK+sNU5EO8RAtYSAKCKRyuxzcDOTV9q+GY5WZDJ/VZgzwCfXhut VvGtiSnIqoBeQ/PtPsokMb0= =gUsq -----END PGP SIGNATURE-----

Add version command -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add version command Suggested by Arun Sharma manifest hash: 7fc056ffe45ee854f00e76916a560fba28c74a91 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvQW+ywK+sNU5EO8RAqGQAJ91Eysw4tHVpOB7ICeN9hMF/p+lfQCgksmg TAKr5VNrw2wIZtSKjgQRqiA= =8w84 -----END PGP SIGNATURE-----

Add hgmerge manpage -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add hgmerge manpage - From Vincent Danjean manifest hash: db96fb3109a588052b21e49df81cfe65c98e72d7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvQT2ywK+sNU5EO8RAmuFAJ0TFJ7K88OP/dMJVcFtD6Tiuon8SwCgl+W+ 4NgyQCJKwgfGF6nEhqJkgck= =Ymjz -----END PGP SIGNATURE-----

Add a doc makefile -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add a doc makefile - From Vincent Danjean manifest hash: ef14a37f8bdee641148e705ba13ce386cf29316a -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvQSmywK+sNU5EO8RAh/QAJoCDQVUKS8uYO5kcIqJBsrKYtj+FACgmSvI FnYSmWjUX5kLbDHdQqM6jls= =fPAM -----END PGP SIGNATURE-----

Merge from http://moffetthome.net:8012/ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Merge from http://moffetthome.net:8012/ manifest hash: 3a67864af6b0276eabe640274633ca2625dbd4a5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvQKkywK+sNU5EO8RArUHAKCSGtpEfJwYGoAIpj4mBDvcPted9wCgnzML xr8WQ8DdPkJ9DVsLjvsbhJU= =O7Fd -----END PGP SIGNATURE-----

Added stdint.h include to fix build on Mac OS X Tiger [v10.4]

Fix pipe timing for copy test -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix pipe timing for copy test manifest hash: 75c389c84f4edacdd9163b6e5234f3ea334ca4b3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvQEDywK+sNU5EO8RAtGDAJ0QKBXRg8qQ/Vkye9xEatVUREtU1ACcCISd cJDQzk62ukLW2/gcCLOHHMQ= =tpar -----END PGP SIGNATURE-----

[PATCH] /dev/null for other OS -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] /dev/null for other OS From: K Thananchayan <thananck@yahoo.com> Null device name is platform dependent. Introduce util.nulldev - - platform dependent constant and use it instead of '/dev/null' manifest hash: 95a1bfdb712c53ef97aaff73f7f4c87e9299cf59 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvQCGywK+sNU5EO8RAiRBAKCcXasCCFT2+6wgklkgqIt4l3UwugCeKWii h/8iRYEw8Rp8B67abiFiwyY= =L3Mk -----END PGP SIGNATURE-----

add dirstate debugging commands -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 add dirstate debugging commands As I've played with various different merges and more recently rawcommit, I've found the following patch to be very very helpful in figuring out whether the dirstate is being left in a consistent or inconsistent state with respect to the current manifest. I attempted to deduce the invariants that were assumed by the current code, and then check it in this code. I may or may not have captured the design intent in this check; if not, I'd be very happy to hear more clearly what was intended, so that I can write tests to that expectation. Anyway, here's the patch. Not sure if it's a good idea to commit it to the mainline, or just leave it as a debugging aid. I attempted to package it so that it doesn't interfere with normal usage. Michael Fetterman (tweaked by mpm: remove -d magic) manifest hash: 869f5b5f954dc0f46ba27322359e811d5e21d71c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvP77ywK+sNU5EO8RArmtAKCCVuI2slANzWZ26P5edtH/ixdwNwCfZLWl 5P+V+C92II3usO4YW2MULKY= =/Pv4 -----END PGP SIGNATURE-----

Add an RPM spec file -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add an RPM spec file manifest hash: 4b0a028ee71e7bf1faa4fd6fe0d9efce0b04bf3a -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvP1jywK+sNU5EO8RAiWVAJ9083+cHfhDn4kjnULikci6nQEvMACdFGyg 1Lv0tujumR2E9lvFe2c4eIw= =kKKS -----END PGP SIGNATURE-----

Added tag 0.6 for changeset 12e0fdbc57a0be78f0e817fd1d170a3615cd35da

Release tweaks -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Release tweaks manifest hash: ded5f9b4432ab05c28d6e0ca56adbf3d14b8e6f6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvGzZywK+sNU5EO8RAlzYAJ4ix4F5cKYXBo8L6UwwZJbnZa7RpgCgme9H ByLO3Pcf9RSmQEO6vxYfuLs= =7fKS -----END PGP SIGNATURE-----

More FAQ bits. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 More FAQ bits. manifest hash: dd8aa534d3e72aa33f4fd7270d3750cefc2c40a9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCu54aywK+sNU5EO8RAud5AJ4699rQiuiZ2TKdZzkG6iGU/UaG8wCgr4Jz euPp7E7arLNoOYtzCbGCSks= =l3sX -----END PGP SIGNATURE-----

More FAQ updates -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 More FAQ updates manifest hash: 98447c3da5aefcc6c4071d03d8014944cf4cbb79 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCu3TCywK+sNU5EO8RArRjAJ0ZtMHztUL1cQw7FC0C3uJ0YIfKjwCfWfSe JndrQxPs1QeCPK/RbfYiKjE= =aMHP -----END PGP SIGNATURE-----

Add 'local' tags -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add 'local' tags Local tags are repository-private tags that override the usual tags. They're not version controlled. manifest hash: cce27c853d36f03adba4bd543a37c8faf1a0c749 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCu3SSywK+sNU5EO8RAlVAAJ9sTyIW2EkzBPSPp+3uU6a+6DUC6QCcD0vE jiwqhtfCuvG5LLs54LkzamY= =D9IP -----END PGP SIGNATURE-----

Clarify doc/README a bit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Clarify doc/README a bit manifest hash: db94c24344b56655bea5123ff79db75c7fa2d44c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCu2cHywK+sNU5EO8RAuh7AKCZu3ZyrLaCvwlUvc8yY49hNOr2FwCfeQ8w Rpnt3GiIZ5PN01SwFt0B5jE= =953M -----END PGP SIGNATURE-----

rawcommit: do lookup of parents at the appropriate layer -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 rawcommit: do lookup of parents at the appropriate layer manifest hash: fc4b2d4416d00da5db2f4659e42ecba2a96dba1e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCu2UoywK+sNU5EO8RApdDAJ9Vph6qVyzL++YeXyFC8HKf9ZhkGgCeNc0Y j2AMu6aWmuLuy2XwztS8gms= =f8mQ -----END PGP SIGNATURE-----

Make lookup a bit smarter -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Make lookup a bit smarter Handle overflow error Handle "0000" -> nullid, not 0 manifest hash: f3af0c171216687c621fd0214efe45775e5a1d34 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCu2PrywK+sNU5EO8RArqWAJ9hafXgnHjCDE/Sxtvyo+e+qmPaGgCfR8AV DCG3i0NasG3ItbPvux2Dm5Q= =zjqN -----END PGP SIGNATURE-----

Get set_exec from util in convert_repo -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Get set_exec from util in convert_repo manifest hash: 82fa9db49fa56127d59a7aae70b3c0527420ddad -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCu2LTywK+sNU5EO8RAjBwAJ4+8ME5PPzQumB4u8R0zpX84tqm8QCgqhzE cd83i0X45u09mKFNFruaHYY= =9LfW -----END PGP SIGNATURE-----

Cleaned up some asciidoc bits in the FAQ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Cleaned up some asciidoc bits in the FAQ manifest hash: d21d57210696587dbb6a30a711f77612ed20f40e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuzPpywK+sNU5EO8RAm6JAJ4kgJKyU2v0e/TL3elPWt+8IiN+2wCeKwVa iaJSNgsrzdNmNhhlzaQ267c= =A8Xr -----END PGP SIGNATURE-----

Minor packaging fixups -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Minor packaging fixups manifest hash: f588ece18c1e43697c4188d94ecb034e591913a1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuy7aywK+sNU5EO8RAoxdAJ4l8MRhmzBo15LPnk/kb11MbSYwMQCgrLuJ o8LeT5YpTESNtXcKqA+2dxg= =lcNo -----END PGP SIGNATURE-----

Update TODO -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Update TODO manifest hash: 6de50aff50eb482a3358a72ff0108b446688d034 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuy6CywK+sNU5EO8RAuJsAJ9Ruxq09SmJSrGY9nlQvieYohFEAQCgjzc1 rjTPS0nh0mHuoE41orgop5A= =q2oN -----END PGP SIGNATURE-----

The beginnings of a FAQ file -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 The beginnings of a FAQ file manifest hash: 234ee7d9fb5cd3b0bd794e615a74f96a4cc234e0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuy48ywK+sNU5EO8RAmdYAJ923bFC/a6q28nVYumWsaQ+axlKawCfS7IC kh1xVlj5OYOloicyaHDhLU4= =7CJ2 -----END PGP SIGNATURE-----

README tidy-up -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 README tidy-up manifest hash: 3093d78dfb6ba9ce83ae96d0a04ad5351b3088af -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuy4WywK+sNU5EO8RAiwBAJ46tZBe1PLzKM+e70rdEF7wYtVrwgCfZoeo Gjt1DE0ZxkSFyWW5erIqyfI= =xF6B -----END PGP SIGNATURE-----

Add rawcommit tests -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add rawcommit tests manifest hash: 6989f36a35fd7278393814623cd10b919b3c3803 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuyrVywK+sNU5EO8RAoG/AJ9OZktC6aDopPIKdJT+WHTZrG9mLgCfbAFM 0JL5AQ67+IazfIvMATCz97Y= =QJWw -----END PGP SIGNATURE-----

hg import error checking -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg import error checking From: Chris Mason <mason@suse.com> hg import wasn't checking the return value of patch and wasn't making sure the list of files collected was unique. manifest hash: 85b2a0f0602cfff6ba6a61128a50d79d7fb6e1c7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuym/ywK+sNU5EO8RAlwSAJ48h8hHi3JMNwrVq0CXIfgMCTGRRQCfSfpP 9kHam+Rt8tra46lCQ4d27G4= =P00x -----END PGP SIGNATURE-----

rawcommit dirstate tweak -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 rawcommit dirstate tweak Before this patch, rawcommit can mess up the dirstate unless it is committing against the current parent. This patch changes rawcommit, such that when adding a child to some node other than the current parent, rawcommit does not attempt update the current dirstate. This seems easily debatable; it creates an asymmetric behavior for rawcommit. It means that when doing a rawcommit against the current parent, there's effectively an implied "hg update" to the newly created node. When doing a rawcommit against any other node, no such "hg update" occurs. The other obvious alternates would be: 1) rawcommit never update the dirstate 2) rawcommit always does an "hg update"... This patch also includes a test for various uses of rawcommit... Michael Fetterman manifest hash: 428517d82a02501f14b0d8fac064411980780e91 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuymPywK+sNU5EO8RAvdvAKCxW1QZtyOviNfuwO592IaKApwvEACfdrYD 83m/o8oJvRKu3yGvNGHtwfk= =KbmU -----END PGP SIGNATURE-----

Permission handling for the other OS -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Permission handling for the other OS From: K Thananchayan <thananck@yahoo.com> Preserve exec permission under Windows on existing source files. Not an ideal solution as there is no way to specify exec permission for a new file. Nevertheless, this helps working on crossplatform projects. manifest hash: c50da52ad4645f40bd6204c4fd458e880bc3f801 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuvJeywK+sNU5EO8RAscXAJ40eAHZjTip5to6BGPdoXxxL5gNQQCgl5GT 8S1Ckank5I/0ScGtapZKqTA= =QrQp -----END PGP SIGNATURE-----

Fix up tests for command name changes -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix up tests for command name changes manifest hash: 04b04d0b2ca96f29b3b9a52e4ed8478ee7e2761f -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuvDTywK+sNU5EO8RAnKzAJ9JSRUsVy/kHp3CweXpsJiu+fXCKQCgq0Pt OOUKYPj6aJOvxB+Zz17X8dg= =EyYE -----END PGP SIGNATURE-----

Use __inline instead of inline -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Use __inline instead of inline This should let us compile bdiff.c on the other OS. manifest hash: c1233bb3c7fc060e49dbd2597c122d903797db9e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuu/WywK+sNU5EO8RAtqvAKC0d8Kv8He6xNCwmFnvKcff9BT4gACeLq7n 9JDFxYtWMrgjwlShfay1nL4= =GDFt -----END PGP SIGNATURE-----

Update docs -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Update docs General editing of man page adding new commands, removing old, updating usage Remove generated docs manifest hash: 68e3fa38e8ec38e80debd95854e1374a9d24fbe0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCule6ywK+sNU5EO8RAm6SAJ0eQwB5eFG1WeswqNMRqUEclmMaNQCeMcYY Y+UCHuN6vQ4PgEUKt91+rEo= =PAAA -----END PGP SIGNATURE-----

Commands cleanup -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Commands cleanup move patch function to import_ strip underbars from function names in help remove debugaddchangegroup and debugchangegroup remove -q option from import remove some aliases: ann, dump, dumpmanifest, merge, resolve add rm alias manifest hash: a3259c52d69be93e272b336098ab8549ec1922bb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCulc9ywK+sNU5EO8RAvLqAJ0fIvuSCYZgXUBubBREL7dfg5y/yQCglYte AwWOEQJoLGHXbpvPYI1uljo= =hQeO -----END PGP SIGNATURE-----

Optimize annotate a bit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Optimize annotate a bit Keep the original text around so we don't need to rejoin it Use slice insert-in-place rather than += to construct new lists Construct the decorated list with list multiply rather than comprehension manifest hash: 8c0effb9777750d524d71ad3a2eade3c6ddd579e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuca0ywK+sNU5EO8RAtvQAJwOViomGCtlZx/R76i8/CZGvGPqUwCfdybd nRUv1854GjzCbfygzXfeIes= =6Q+E -----END PGP SIGNATURE-----

Fix a compile warning for bdiff -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix a compile warning for bdiff manifest hash: 263a8d670a4960f57b6738d41b40626efe1d90d5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD4DBQFCubyMywK+sNU5EO8RAvw5AJ4usI49PlchNMgytp29Fajf+6aGfgCY/7YV PBZf1pfbBH3nO0gEi33CNg== =cw8/ -----END PGP SIGNATURE-----

Replace difflib with bdiff for annotate -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Replace difflib with bdiff for annotate This is a quick hack to get bdiff working for annotate, can still be optimized quite a bit. manifest hash: 380ae3092c73b7e1946952edec3588248bc13c5e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCubxGywK+sNU5EO8RAv7RAJ9lTdxRAVqzGs4XnPoZAmx/fbeUZwCfWar2 RqLGipS5JmMOy1pL1ehNxqY= =KLgM -----END PGP SIGNATURE-----

Add bdiff.blocks / minor performance tweaks -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add bdiff.blocks / minor performance tweaks This refactors bdiff.bdiff so that we can get a list of matching blocks of line numbers for use by annotate/unidiff. Minor performance tweaks: - - add a field for equivalence so we can keep h around a bit longer for cmp - - mix len into the hash to reduce collisions - - move an operation into the slow path in longest_match manifest hash: b1aee590b6291b31069ea8a86b6aa8fb259ac244 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCubu2ywK+sNU5EO8RAm4FAJ9r10aJpT7qA96nqGYFHcuy4XcIHgCfeFx5 q0PyTXeZQc7Fw5kwEPcoykI= =QXSb -----END PGP SIGNATURE-----

Start using bdiff for generating deltas -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Start using bdiff for generating deltas manifest hash: bf6ed7d17d96810b7f40b50811b104b568c64b4b -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCubqVywK+sNU5EO8RAor6AKCm8Zqg0DIhLzaMPp5/GKPKk/GjKwCfbCe+ /CBmpvcTxSJofY9RE08cCVY= =2yu2 -----END PGP SIGNATURE-----

convert-repo fixups -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 convert-repo fixups - - deal with octopus merge uniqueify parent list add a series of identical commits with "(octopus merge fixup)" - - add "committer" field from git to the commit message manifest hash: e33d802afe35edecfc5cc9b567def6db2b0cb885 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCubogywK+sNU5EO8RAkWgAJ9OVHeumKd/nRIfvS/nQ9eSbORqNgCgpBIE Dza0L59OSJHHmm3Dbp7ygds= =OEvJ -----END PGP SIGNATURE-----

Fix up test-merge1 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix up test-merge1 The third test was wrong and showed up after fixing the typo in compare code manifest hash: 306ab9936457ad90e7c7a226d6407ca586262650 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuPH8ywK+sNU5EO8RAql+AJsH/bxFMTMbUiaEoLNhXS6wNkzLAgCfQxDJ 3j5pZ3MzrtPD0y4wC3vIAA4= =VKEy -----END PGP SIGNATURE-----

Pull from TAH -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Pull from TAH manifest hash: 600d04efbd836d555d11a3bd9d821d1d8c0a9790 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuPFxywK+sNU5EO8RAjfzAKC18Zc2EOkXhy1zcpgGnyPHnFMdmgCfW5Ut I5HSWqZMt8H0WJx1Or7ajNc= =27D5 -----END PGP SIGNATURE-----

Fix typo in merging new files -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix typo in merging new files manifest hash: 4a6fee1e54c5c465a74f4d756a1ac549b15fdb2f -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuOvVywK+sNU5EO8RArovAJ4ua9EhnO8wWfKRZ36E6F4Wrv5JPACghCXn sHr/TSkxdy48OUVkhTbhhhQ= =poww -----END PGP SIGNATURE-----

Make it possible to specify a version number in setup.py. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Make it possible to specify a version number in setup.py. manifest hash: 905feb305205801eb3833e5a84161fb57b83c86e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCtc/QW7P1GVgWeRoRAlCaAJ9G2GRf0wIEVEbYNoV4PjV4b024bQCfcUFf WVYQlTXqninDXyKas2yQYdo= =ofg/ -----END PGP SIGNATURE-----

Allow hgrc's proxy host and $http_proxy env var to start with http:// -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Allow hgrc's proxy host and $http_proxy env var to start with http:// manifest hash: 5bf4bb43606f3e5544d55be886502ab5a61f9ff3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCtcR6W7P1GVgWeRoRArk0AKCgHpelPjAKjbzh3iifZayAhovm+gCeL0hl XU7LBUrK2Z2qQHN0w9I8XUk= =QaAW -----END PGP SIGNATURE-----

remember_version() only writes version if called in a Mercurial repository. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 remember_version() only writes version if called in a Mercurial repository. forget_version() resets version only if remember_version() wrote it. manifest hash: b30df9d93c233f4bf07150cc5067f294a98c16f4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCtXFiW7P1GVgWeRoRAgkjAJ9jkwCAHf3yJyDI8R582XjNFNFeWgCZAe27 iqGPYzrRErf6gPKZcoBMsD4= =t2Bx -----END PGP SIGNATURE-----

Allow override of HTTP_PROXY, http_proxy and no_proxy; make no_proxy work. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Allow override of HTTP_PROXY, http_proxy and no_proxy; make no_proxy work. manifest hash: cfddccef1e8acaa8b06e652e5bbc274d31f0df1d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCtIp/W7P1GVgWeRoRAgNRAJ4//Ptbq9Cba7S2L5ltvP92gcijZQCeKuU/ S/togHQXp34v2ypVH+8wyP4= =jpn2 -----END PGP SIGNATURE-----

Support for 'hg --version'. setup.py stores version from hg repository. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Support for 'hg --version'. setup.py stores version from hg repository. manifest hash: c69058298ea12035f2cf356f987ba2fb5ff4bbae -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCtD6ZW7P1GVgWeRoRAnGHAKCLscthht2UlBEMDmxL9cku4PlcswCffOVo wTOhYkW4Ie5+8bdmL8EqsvY= =uGpn -----END PGP SIGNATURE-----

[PATCH] Enables lock work under the other 'OS' -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Enables lock work under the other 'OS' From: K Thananchayan <thananck@yahoo.com> os.symlink is not supported under Windows. This patch introduces util.mklockf, util.getlowner that use regular files under Winodws but symlink under unix. tweaked by mpm: - changed function names - fixed to work on UNIX manifest hash: 6f650a78a3b203dcad2f861582500b6b4036599a -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuN5sywK+sNU5EO8RAva8AJ9L9z/JHRAJS1bix48ZzSpn9ZUyPwCffhmg UfLSFBmd5tPDDi3mgsrdDEA= =ZYS9 -----END PGP SIGNATURE-----

[PATCH] rename under the other OS -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] rename under the other OS From: K Thananchayan <thananck@yahoo.com> Rename fails under windows if dest file exists. This patch add a rename method to util module that removes the dest file and retries if initial attempt fails. manifest hash: 2744d9fd1717e15133b411a269df909fa8ec0faf -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNzDywK+sNU5EO8RAsPBAJ9NQN3bTuJvTem5x+utGnoMkhYc0QCbBFSJ PoMP69H1UnVE6drFlnlFE0s= =pePw -----END PGP SIGNATURE-----

[PATCH] Repo locator fix for the other `OS' -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Repo locator fix for the other `OS' From: K Thananchayan <thananck@yahoo.com> The following patch modifies repo locator to behave properly under windows. manifest hash: 481252f9667ab5408dc1985a72a1916f903f4f2b -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNv5ywK+sNU5EO8RAvD9AJ9mYSzmn99sc2vNtw68sPaKKWe2UQCgoiLd 1q1t+JMs57+I0LUdwrwsEDw= =dlmm -----END PGP SIGNATURE-----

[PATCH] file seperator handling for the other 'OS' -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] file seperator handling for the other 'OS' From: K Thananchayan <thananck@yahoo.com> The following patch maintains repo root relative source file names in canonical form (with '/' as file seperator). Mercurial calls os.path.join, os.path.normpath, os.path.walk that use platform's file seperator. This patch does not change seperator in these circumstances (except when the result refer to source files). manifest hash: 2fbb4cb0d3d0bc4f4de5c7c8803fb738072ec6c5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNuBywK+sNU5EO8RAhAZAKCV8cz11+rdof9n1tHb0uDScF34GgCeITNi 4aVikToPXqXyReN9kFP5pnY= =xcV5 -----END PGP SIGNATURE-----

Minor tweak to binary mode patch -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Minor tweak to binary mode patch manifest hash: 4fce0b7b405b124e035526d4a458e888d9bd82ef -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNr1ywK+sNU5EO8RAs83AJ9i+yafrjWWjWm1lTwCr0fO8cAU+gCghmxg +S1W1KuMzgxJAtuhq6h6uBk= =9JhP -----END PGP SIGNATURE-----

[PATCH] file type fixes for the other 'OS' -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] file type fixes for the other 'OS' From: K Thananchayan <thananck@yahoo.com> Filetype fixes: All working files and files in the repository are processed as binary. .hgignore is read as text when constructing ignorelist as this file is intended to be edited. manifest hash: c034cdcc54011fd3de9e32f1aa8b2b6f84e1b2b8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNoRywK+sNU5EO8RAjarAJ9ScUoFL1A7mpO7qorCy6okhi0nggCcDgpp dfDl4dALGQA0PqXqtI+T5gU= =IVxr -----END PGP SIGNATURE-----

[PATCH] Removal of a file added by merging branches -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Removal of a file added by merging branches From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk> Fixing a bug where removal of a file which is added when doing a merge would cause python exception to be thrown. manifest hash: 0bdd80e8abcee6aaa4804bb588f9939596fb3dd0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNjLywK+sNU5EO8RAo44AJ4mvjsJcYOj/EmVDFrdkK3D3WHFSwCffxfV cRl8mXc252/oRcYaMZbgrlg= =S5x6 -----END PGP SIGNATURE-----

[PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk> If an "hg update" is attempted across branches, it is aborted with an error message, basically saying that "update -m" is required. Don't prompt the user for "keep vs delete" kinds of questions before deciding to abort. manifest hash: 250d3a0e866af2feac9344d499b26c254c33abc4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNeDywK+sNU5EO8RAu2BAJwNWXXN2L+4TnOUGaOe9iBj6CgOYgCfRKIE RF5czx2UQ2pSIP119xzq9mQ= =Akj6 -----END PGP SIGNATURE-----

Fix ls output for test-flags -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix ls output for test-flags manifest hash: 491b49f66da7c19cbfe9635dc03e4ba510052ed3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNc4ywK+sNU5EO8RAilRAJ4gOaWbFqXOkat4jCZfierb8aTZvACgr8NP TrvpZ3vWf0aY0bYkkGQDSDw= =HVCS -----END PGP SIGNATURE-----

remove double assignment -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 remove double assignment spotted by Goffredo Baroncelli manifest hash: a0406a618ce5b2b9b10073b29960d594094aa3ed -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNXhywK+sNU5EO8RAh9yAJ0aVTnxsumDAdF3JORp1pDebxeE8wCgisdG vf/JwxHbQEqGrefU1nbs928= =NDGW -----END PGP SIGNATURE-----

[PATCH]: Typo in localrepository.update -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH]: Typo in localrepository.update From: Goffredo Baroncelli <kreijack@libero.it> I think that there is an error in the method update() of the class localrepository. The variable 'm2n' was used instead of 'man'; so the parent2 flags is computed instead of the ancestor flags. manifest hash: dc11810367615245c4b39660d135ab3c0e71b85d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNWpywK+sNU5EO8RAv9ZAKCxwbd242xZQ1CCrW2WDdQ4gclKtACghXYl 7j1YTRpINItwdXzak3cBS60= =+Tf8 -----END PGP SIGNATURE-----

Add 'other OS' bits to bdiff.c / style cleanups -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add 'other OS' bits to bdiff.c / style cleanups manifest hash: 9a0ef60a59af0594f95a2b22de243fe8ef059762 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNL0ywK+sNU5EO8RAg+yAKCe8dG411HdZZvsxB25AtfBBApQBQCgnb7O MGO0xvEBgAtt+3F+VJBkiU4= =F7r7 -----END PGP SIGNATURE-----

Make mpatch.c compilable under the other `OS' -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Make mpatch.c compilable under the other `OS' From: K Thananchayan <thananck@yahoo.com> manifest hash: 7b3033b761b147149fb0bcd6ff6120ccb73f16f1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNJCywK+sNU5EO8RAtMVAKCJxQYOa7VX4DYKDPw02ILjINiDmwCggreC 9Xw/stNxkV7zVY2IFDC14is= =tFmZ -----END PGP SIGNATURE-----

Pick up tests from previous patch -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Pick up tests from previous patch manifest hash: 3ec4c3cb96e15322f7489d89b7b92ee214f6cfb9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNIaywK+sNU5EO8RAuGOAJ9YXXfXstC6wysknsXPAL9jDeiUDwCgpFJ3 P5goy7Zw3ypinBEwZrhgXM8= =6fKs -----END PGP SIGNATURE-----

[PATCH] Merging files that are deleted in both branches -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Merging files that are deleted in both branches From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk> OK, attached is an improved version of this patch... When I went back through it, I discovered that the prior version was wrong when doing real merges (as opposed to jumping between revisions that have a simple linear relationship). So that's been addressed here, too. > Here's an hg changeset patch that deals with simultaneous deletion of a file > in both the working directory and in a merged branch. > > Test case included in the patch. manifest hash: c8078733c252403314d8046efa6ecefc49c83050 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNF8ywK+sNU5EO8RArtdAJ9syw/JXRZzP1sxnEYXzZywkJLAPACeKpqL 5osA3AggrCbbSLTNcYVXJ8U= =T5Ik -----END PGP SIGNATURE-----

[PATCH] Merging identical changes from another branch -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Merging identical changes from another branch From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk> The issue comes up when a local uncommitted *new* file (i.e. not in the current manifest) is being merged with an identical file from a branch. Since the file is not in the current manifest (it's either in the current "to-be-added" list, or in the "unknown" state), there's no (local) node from which to create a mergepoint. manifest hash: 4e64ce654a6473524789a97bbaf8bff61b4343af -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuM/1ywK+sNU5EO8RAn7xAKCJoH/CgzVK4h4xPJDrd2lY9XOINACgmt01 92uuMswZXcoCchQAaxew7C0= =qRsk -----END PGP SIGNATURE-----

[PATCH] Using monotone-viz/git-viz with mercurial -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Using monotone-viz/git-viz with mercurial From: Vincent Danjean <vdanjean.ml@free.fr> monotone-viz is a small GTK+ application that visualizes monotone ancestry graphs. Its home page is: http://oandrieu.nerim.net/monotone-viz/ As monotone and git are similar, the author adapted the 0.9 version to display git ancestry graphs and call it git-viz. I cannot see any link from the homepage, but looking in the archive of git ML, it can be found here: http://oandrieu.nerim.net/monotone-viz/git-viz-0.1.tar.gz I few days ago, I adapted it so that it works with the last versions of git/cogito. Patches and package are available here: http://dept-info.labri.fr/~danjean/deb.html#git-viz Today, I patched hgit so that it respects the output of git-diff-tree, I added git-{diff-tree,cat-file,rev-list,rev-tree} that call hgit (2 lines scripts), and added the script 'hg-viz'. hg-viz create a .git directory and store the SHA1 of the tip in .git/HEAD and then call my git-viz. All these modifications are in the attached patch. I try it in the mercurial repository. After applying the patch, you just have to add the contrib directory in your PATH and call hg-viz. An example of what we can see is on my web page (probably not for a long time) : http://dept-info.labri.fr/~danjean/temp/hg-viz.png Vincent -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuM50ywK+sNU5EO8RAtlvAJ425JJI9chCdSi8D+R2Af/vJEOUpACffC9e fxjJ3umBkffj5g86jWaRGZ0= =LwA2 -----END PGP SIGNATURE-----

Check if repository exists -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Check if repository exists From: Goffredo Baroncelli <kreijack@libero.it> Subject: Re: Trivial: in remoterepository.__init__ check if the repository exist I hope that this is correct :-) Another typo, another patch, tank to Peter Stamfest and Radoslaw Szkodzinski. The patch is trivial: adds a check in the body of the init method of the +remoterepository class. Before if the path didn't exist, hg would not raise any error. Test manually performed after the patch has been merged: test: result create a new repository from another local repository OK ( no problem ) create an empty repository OK ( no problem ) pull from a not existent repositary OK ( raise an error ) (error message tweaked by mpm) manifest hash: ac7f625a8d87c693b61718b9fc5604d28b882bbd -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuM0gywK+sNU5EO8RAsnGAJ42HE3m01tlGqrIR3GVfuhvCjEJkgCfffvp bEhfvjaiAdBV50HMULq8N00= =QDHW -----END PGP SIGNATURE-----

[PATCH] Unintuive use -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Unintuive use From: Vincent Danjean <vdanjean.ml@free.fr> > 1) "hg pull" does not tell what and if it does something. > 2) hg does not tell if the data have been merge or not, if we have to > call resolve, ... Here is a patch for 1) and 2). It also add an option to 'pull' to call update if there is something new. Tweaked by mpm: - change message style - use ui.status - change option from resolve to update manifest hash: a61a7af00ef2f33867f6c88f95dc8258cb1a3e51 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuMcpywK+sNU5EO8RAucjAKC06gwAico7Wz5YOcp5u9NVxEhItwCfcIzA VmiifZTj5ZUjTTcPhmiKh2M= =rbLT -----END PGP SIGNATURE-----

[PATCH] rawcommit fix again -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] rawcommit fix again From: Christopher Li <hg@chrisli.org> Rawcommit need to allow no argument when using file list options. Chris manifest hash: 049977598f355ad9e54eeb18f8831fc4c1fee36d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuMR9ywK+sNU5EO8RArXFAJ98iZaSIzsc0KBgtMW5v4yVuWfpZQCdH2yQ bYOgCTRNapYqq5YtnOHfErk= =1Poe -----END PGP SIGNATURE-----

[PATCH] (3/4) Removing an added file -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] (3/4) Removing an added file From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk> Here's an hg changeset that deals with "hg add"ing and then "hg remove"ing a file without ever committing it. Previously, this caused a python exception at commit time. Test case included in the patch. manifest hash: 4d012f3f8b1aa664fed9e8bc2849931b28728acd -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuMPtywK+sNU5EO8RAuxMAKCmeMLqOUBmUfCfbQgYOAysOvKkwgCfcJai 2My0M7KqhwnJSbZXbGIOcow= =N7N0 -----END PGP SIGNATURE-----