Mon, 24 Mar 2008 11:12:57 -0500 Merge with crew
Matt Mackall <mpm@selenic.com> [Mon, 24 Mar 2008 11:12:57 -0500] rev 6378
Merge with crew
Mon, 24 Mar 2008 17:02:31 +0100 test-convert-mtn: test directory move
Patrick Mezard <pmezard@gmail.com> [Mon, 24 Mar 2008 17:02:31 +0100] rev 6377
test-convert-mtn: test directory move
Mon, 24 Mar 2008 17:02:08 +0100 convert: record deleted files in monotone source
Patrick Mezard <pmezard@gmail.com> [Mon, 24 Mar 2008 17:02:08 +0100] rev 6376
convert: record deleted files in monotone source
Mon, 24 Mar 2008 10:01:05 -0500 update: better logic and messages for updates
Matt Mackall <mpm@selenic.com> [Mon, 24 Mar 2008 10:01:05 -0500] rev 6375
update: better logic and messages for updates - complain about attempts to merge with ancestor - when updating, differentiate between - crossing named branches with no local changes (jump) - crossing named branches with local changes (complain) - nonlinear update on the same named branch, no changes (complain some more) - nonlinear update on the same named branch, changes (different complaining)
Mon, 24 Mar 2008 16:20:15 +0100 hgweb: fix breakage in python < 2.5 introduced in 2c370f08c486
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 24 Mar 2008 16:20:15 +0100] rev 6374
hgweb: fix breakage in python < 2.5 introduced in 2c370f08c486
Sun, 23 Mar 2008 21:35:57 -0300 setup.py: hide compiler error messages while searching for inotify
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 23 Mar 2008 21:35:57 -0300] rev 6373
setup.py: hide compiler error messages while searching for inotify
Sun, 23 Mar 2008 23:18:20 +0100 Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com> [Sun, 23 Mar 2008 23:18:20 +0100] rev 6372
Add a test for monotone conversion
Sun, 23 Mar 2008 21:03:24 -0300 don't use hasattr in repo.invalidate
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 23 Mar 2008 21:03:24 -0300] rev 6371
don't use hasattr in repo.invalidate hasattr ends up calling __getattr__ which will instantiate the very attributes we want to remove.
Sun, 23 Mar 2008 21:03:24 -0300 localrepo.commit: grab locks before getting the list of files to commit
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 23 Mar 2008 21:03:24 -0300] rev 6370
localrepo.commit: grab locks before getting the list of files to commit Somebody may change the dirstate after we've determined the parents of the working dir and run repo.status, but before we called wlock(). This should also fix issue997, where backout would change a file without changing its size and then call repo.commit without passing the list of files. If this happened in less than one second, we wouldn't detect any file changes - the in-memory dirstate still has the cached stat data for that file. Grabbing the wlock early causes the dirstate to be invalidated and we end up reading the dirstate file again, which has that file marked for lookup (size == -1). A better fix would be for backout to give repo.commit the exact list of files, but that'll require some changes to the revert operation. A significant user-visible change is that the precommit hook is always run with both locks grabbed - previously, hg commit would run it before grabbing any locks, but hg import would run it after grabbing locks.
Sun, 23 Mar 2008 21:03:24 -0300 Avoid calling heads() twice on every hg commit.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 23 Mar 2008 21:03:24 -0300] rev 6369
Avoid calling heads() twice on every hg commit. In an extreme case (merging two revisions with very low revision numbers) this could be slower than the previous code, but it should be much faster in the usual cases (parents are near the tip). It also avoids some races in some uninteresting cases (e.g. two concurrent hg commits).
(0) -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 +3000 +10000 +30000 tip