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

From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> add hg tag command Tweaks by mpm: clean up error messages handle non-existent .hgtags file add tests update test-help output manifest hash: 569c7fe01193159919af2566e8f5089409ffad65 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuMMwywK+sNU5EO8RAuUdAJ90TkT/D9lDOnEVAW2d3WT7K8Ct3QCggiJA c9Qbd79K4UWKQAVkYq03cOY= =SWS8 -----END PGP SIGNATURE-----

Add a fast binary diff extension (not yet used) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add a fast binary diff extension (not yet used) manifest hash: fbfdcab2b1f4856af45176fcf2423d602dfe88c4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuL6eywK+sNU5EO8RAoT+AJ95z9gx2IrucBS30CnCQFkZT7lSbgCgnXh5 ScZcgwzJ/mEo9i5vuKNlCIs= =Gr58 -----END PGP SIGNATURE-----

Delete error logs one test at a time -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Delete error logs one test at a time manifest hash: 746674a89f762a39cf1a679a258a92cd02440f95 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuL3ZywK+sNU5EO8RAmYeAJ4uUd+zBdGx/H/CGKxXLjKX0vlDBwCfVRAA zVnvyYT9CnmsctYE0NKXVVU= =G53w -----END PGP SIGNATURE-----

Quiet successful test install in run-tests -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Quiet successful test install in run-tests manifest hash: 73bb9dbf52a1c0d7ec50f4f7801c23735b67f94f -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuL00ywK+sNU5EO8RAvoqAJ0QY538fracpIu1/TgVnqQXlAZKOwCghbMO SLTy7QnYViCHjvYj9oegx/s= =BgHs -----END PGP SIGNATURE-----

From: Andrew Thompson <andrewkt@aktzero.com> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 From: Andrew Thompson <andrewkt@aktzero.com> Make a local temporary install of hg for running tests Delete old error files before running tests manifest hash: bbae21d506ce5be8df5dc97f14fcd0f8aece0b20 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuLyQywK+sNU5EO8RAvROAJ93xEPZNphcpoLxGCMNkZ7SfL6+AQCfXCHZ 3kMQAuZnxo0dn98of/LVecY= =bsV2 -----END PGP SIGNATURE-----

Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli. Changes from the original patch: - - Use 'diff -r ...' instead of 'hg diff -r ...' to support filetype detection by at least file(1) and vim. - - Adjusted tests for this change. - - Some cleanups. manifest hash: 5f37d1ef75ea7f4e48b53f02371053ba54fb70f8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCsyZzW7P1GVgWeRoRAqczAJ479lR9Z289sP+VH5L+N7pQRU14SACfUueq 88ABloIR3VyRIa4qbujnZio= =Vva9 -----END PGP SIGNATURE-----

commands: report http exceptions nicely -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 commands: report http exceptions nicely manifest hash: 37760b304eedffcea9c1c01d03334cf4f6048fd3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsx6QywK+sNU5EO8RAnyEAKC3RBzwlVAyI+SSYHj1Z+Psn1Aq3gCcDQJf pqPitXBuvdZbLdK0ti2kFOk= =ZjC9 -----END PGP SIGNATURE-----

Add COPYING -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add COPYING manifest hash: 7ca259e873d941d922b46c7fbf39696e258149ce -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCswkdywK+sNU5EO8RAtB9AKCrG7JLOFwEKLjr/TwdvcqjjHmzJQCfcFUK lBazBFg3F2G3knOABzuSqPA= =i2Qb -----END PGP SIGNATURE-----

hg init: add -u flag to update -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg init: add -u flag to update From: Andrew Thompson <andrewkt@aktzero.com> I was trying to get init to run update by passing an option. The basic part works, but if you use the -u option, you have to specify the changeset number, tag, or tip. Anyone see a way to make this work easier? (minor tweaks by mpm) manifest hash: 9e39e822693e1f175cd5e02a8d4a984d82afbd92 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCswJaywK+sNU5EO8RAuILAJ42ZVtnHnlbq/xz6SxhaWLtI4KZ/QCgqS6F 6EDjkfy1F8dmBTf8Ob3ac/s= =f3WC -----END PGP SIGNATURE-----

Tidy up conflict and pull tests -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Tidy up conflict and pull tests Fix failure to kill hg serve process and pipeline ordering with set -e manifest hash: eaf968ea8ae9fe1fc94f04b99080eabcc6eafd88 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsv9vywK+sNU5EO8RAh2aAJ4iynCcNhmQeOy9+dq+v+9IundFIwCfWHgg pI3IH2BvqUlckdLwx3M5jcQ= =s/QA -----END PGP SIGNATURE-----

hgweb: pull cgitb into CGI script example, where it can easily be disabled -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hgweb: pull cgitb into CGI script example, where it can easily be disabled This also eliminates cgitb dumps in the logging output of hg serve manifest hash: a0aa07a706c2c388c0b49505e2960197f716920c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsv9DywK+sNU5EO8RAieFAJwOjdfkz7pILNVUTvpMkRa6/OIhIQCgo2TP I2E4hxQ0N7mTtl45pXEFLsk= =tG0v -----END PGP SIGNATURE-----

create .hg/hgrc with [paths] default entry only if source was given on hg init. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 create .hg/hgrc with [paths] default entry only if source was given on hg init. manifest hash: 8229e52ba4d3a6be51e053986230d195cff78966 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCstisW7P1GVgWeRoRAqaVAJ0SK+3Sjki5OD61bCZj1HEo5hYcsQCfRV0z MJpYg9kiWJg8a4CzASoa+Hs= =Ql0q -----END PGP SIGNATURE-----

Updated TODO -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Updated TODO manifest hash: d56c5efd51558453626e53cb8e5802d7c64cbb2c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCstaMW7P1GVgWeRoRAitJAKCKQ+EE1LBTBu7kMkR6Je0uQSQ4rwCcDTpd D9Yes77z/o00nq0g/kiT+pw= =SFsE -----END PGP SIGNATURE-----

Fixed tests for displaying tags in hg history and hg parents. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fixed tests for displaying tags in hg history and hg parents. manifest hash: 1ff138f68590e11a20e1f375c0c7293bdfb9f1fb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCsp/XW7P1GVgWeRoRAtS1AJ90tbAlt89jZr//nYMEgoVv2UL6GwCgih7L yFwVR4cWpSGyrl0zvYM3AiU= =6OjG -----END PGP SIGNATURE-----

Show tags in hg history etc. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Show tags in hg history etc. manifest hash: 5520d8f5be86d5183c5b6f84e25cb99eb35ad4b7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCsphGW7P1GVgWeRoRAtujAJ97McEv8gL8m1uZz79ufKgbzFf6ZACfd7vQ 49wFPb65oMSwro9XjOoGgCk= =BSsw -----END PGP SIGNATURE-----

Improvements for hg identify: -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Improvements for hg identify: Don't add the modified flag if unknown files are found. Remove extra space if there was no tag found. Multiple tags for a single parent separated by '/'. Getting rid of sum() to aid porting to Python 2.2. manifest hash: f91224afcb239908ba3ef02299fcf2b0380ebd1a -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCspWvW7P1GVgWeRoRAnqbAJwL1DIzOxOrdqpPj9vsYJeeiq+VrQCcCyli P+b/S0s2n628ku1IfrW3Elo= =lgRY -----END PGP SIGNATURE-----

Fixed problems with extra spaces around tags in .hgtags -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fixed problems with extra spaces around tags in .hgtags manifest hash: 2a40f403d5d7d9c4d39e52fa6edefa74d5797167 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCspTvW7P1GVgWeRoRAg9PAJ9OWdUii+qO+U5ioaAbkFeIROA/7gCdGgau ZP8jmI1h95ZK3KS/QlQMeQ4= =lRFd -----END PGP SIGNATURE-----

mpatch: attempt to handle unpack alignment issues on Solaris -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 mpatch: attempt to handle unpack alignment issues on Solaris manifest hash: e185dc380bab61cf11a9973ee3ddd2e904e56299 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsnOtywK+sNU5EO8RAlzQAJ9YIhbL8BJjT+J/pOiQVES2wsF0igCgnFRl ok5f8i8GbNk77sRbpsGnUF0= =m0Zh -----END PGP SIGNATURE-----

hg merge: fix time asymmetry bug with deleting files on update to past -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg merge: fix time asymmetry bug with deleting files on update to past manifest hash: 41feb7bf9b56e071a538a0918224898acb2bd31c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsm6XywK+sNU5EO8RAncbAKCwn/W4cr6civp4Zt79JFH6um0/lQCdFCh8 F7ZOQ+S/PL3HL4iE6avOBDc= =kHPm -----END PGP SIGNATURE-----

test suite: fix timezone problems and port collision problem -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 test suite: fix timezone problems and port collision problem manifest hash: 44652133f49c24679b289c0250eb591682225c54 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsaq7ywK+sNU5EO8RAluQAKCSuUGge7bQPbWbQoIfWETDFRibNwCgs12e /TSLCPJ0aHvqttMhJSaYOSU= =5OYO -----END PGP SIGNATURE-----

Ancestor algorithm fix -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Ancestor algorithm fix The ancestor algorithm was a bit too optimistic about node ordering still. Add revision numbers to the comparison to sort things out. manifest hash: f4eaf95057b5623e864359706dcaee820b10fd20 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsTrCywK+sNU5EO8RAtqMAJ9fEJEesPn+0SMg/i/g5vZYmX/pBgCfVnhl +s88q/Wilw27MVWP6J6oqX8= =k9AU -----END PGP SIGNATURE-----

Merge with TAH -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Merge with TAH manifest hash: 18cf61cc2b6611d74ffc490b6b733537b879d69e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsQy7ywK+sNU5EO8RAoi/AKCC0XbK73oemLr52KOQWEK4WlE9pgCgkk/8 C/m6MZJqlOKhIT4jazPwngU= =ECGy -----END PGP SIGNATURE-----

Updated TODO -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Updated TODO manifest hash: ee511d64271017729839799c4ea066b2046579d9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCsQyGW7P1GVgWeRoRAifOAJ9hUcsM2+OPfjichr083EAhKfMSSACeIhtK d3QXNNmPpmk6lLFFFujImEU= =kCMx -----END PGP SIGNATURE-----