Thomas Arendsen Hein <thomas@intevation.de> [Mon, 24 Mar 2008 20:28:13 +0100] rev 6381
Fix missing space in one of the new update messages.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 24 Mar 2008 16:17:19 -0300] rev 6380
qclone: do not abort if remote hasn't enabled mq (issue1040)
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 24 Mar 2008 13:45:01 -0300] rev 6379
hgweb: add compatibility code for old templates
Up to changeset 3340aa5a64f7, HTTP headers were expected to be embedded
in the "headers" template. Since that changeset, the content-type is
supposed to be defined as the "mimetype" template in the map file.
This changeset makes sure the old templates still work.
Matt Mackall <mpm@selenic.com> [Mon, 24 Mar 2008 11:12:57 -0500] rev 6378
Merge with crew
Patrick Mezard <pmezard@gmail.com> [Mon, 24 Mar 2008 17:02:31 +0100] rev 6377
test-convert-mtn: test directory move
Patrick Mezard <pmezard@gmail.com> [Mon, 24 Mar 2008 17:02:08 +0100] rev 6376
convert: record deleted files in monotone source
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)
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
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
Patrick Mezard <pmezard@gmail.com> [Sun, 23 Mar 2008 23:18:20 +0100] rev 6372
Add a test for monotone conversion
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.
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.
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).
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sun, 23 Mar 2008 23:08:18 +0100] rev 6368
hgweb: better error messages
Patrick Mezard <pmezard@gmail.com> [Sun, 23 Mar 2008 22:15:47 +0100] rev 6367
Remove unexpected "Alternately" word from tip help.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 23 Mar 2008 21:48:38 +0100] rev 6366
run-tests.py: Allow environment variables to set jobs/timeout/port.
Patrick Mezard <pmezard@gmail.com> [Sun, 23 Mar 2008 21:41:03 +0100] rev 6365
convertrepo: make it work with refactored convert extension
Patrick Mezard <pmezard@gmail.com> [Sun, 23 Mar 2008 21:40:27 +0100] rev 6364
Make tip help more helpful
Patrick Mezard <pmezard@gmail.com> [Sun, 23 Mar 2008 20:37:04 +0100] rev 6363
test-imerge: test resolve subcommand
Patrick Mezard <pmezard@gmail.com> [Sun, 23 Mar 2008 20:37:02 +0100] rev 6362
imerge: replace "merge" with "internal:merge" when non-interactive
Patrick Mezard <pmezard@gmail.com> [Sun, 23 Mar 2008 18:52:02 +0100] rev 6361
hgk: display orphan revisions content (issue 1041)
Patrick Mezard <pmezard@gmail.com> [Sun, 23 Mar 2008 16:07:27 +0100] rev 6360
test-mq-symlinks: skip if symlinks are not supported
Florent Guillaume <fg@nuxeo.com> [Sun, 23 Mar 2008 01:23:03 +0100] rev 6359
test-notify: make it pass on Mac OS X 10.5
Florent Guillaume <fg@nuxeo.com> [Sun, 23 Mar 2008 01:13:56 +0100] rev 6358
test-remove: make tests really pass
Ah, the joys of cross-platform shell scripting...
Florent Guillaume <fg@nuxeo.com> [Sun, 23 Mar 2008 01:04:51 +0100] rev 6357
test-remove: fix for non-gnu find
Florent Guillaume <fg@nuxeo.com> [Sat, 22 Mar 2008 21:13:22 +0100] rev 6356
test-remove: make it pass on Mac OS X 10.5
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 22 Mar 2008 20:16:30 +0100] rev 6355
tests: add highlight extension tests
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 22 Mar 2008 18:33:10 +0100] rev 6354
tests: add tests for hgweb to test-keyword