setup.py: hide compiler error messages while searching for inotify

Add a test for monotone conversion

don't use hasattr in repo.invalidate hasattr ends up calling __getattr__ which will instantiate the very attributes we want to remove.

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.

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

hgweb: better error messages

Remove unexpected "Alternately" word from tip help.

run-tests.py: Allow environment variables to set jobs/timeout/port.

convertrepo: make it work with refactored convert extension

Make tip help more helpful

test-imerge: test resolve subcommand

imerge: replace "merge" with "internal:merge" when non-interactive

hgk: display orphan revisions content (issue 1041)

test-mq-symlinks: skip if symlinks are not supported

test-notify: make it pass on Mac OS X 10.5

test-remove: make tests really pass Ah, the joys of cross-platform shell scripting...

test-remove: fix for non-gnu find

test-remove: make it pass on Mac OS X 10.5

tests: add highlight extension tests

tests: add tests for hgweb to test-keyword

Merge main and crew.

removed trailing spaces

ui: disallow newlines in usernames (issue1034)

update: no -C needed to switch branches without outstanding changes