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

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