hgweb: make PATH_INFO handling slightly more robust

Merge with crew

Merge with crew-stable

Merge with crew-stable.

Merge with stable

minor typo fix in templater's docstring

Add test for issue 529 - "mq aborts when merging patch deleting files".

mq: don't abort when merging a patch that removes files

atomicfile: don't copy the original file if it'll be truncated

use atomictemp files to write the dirstate

use atomictemp files to write branch.cache

util.opener: if requested, use atomicfile even if the file doesn't exist Right now, surprisingly enough, if you request an atomic file but the file still doesn't exist, you get a regular file. AFAICS, the only time this happens is during the initial creation of the dirstate.

cache os.umask even on windows

pull umask-checking up

Merge with crew-stable.

help: log --keyword is case-insensitive

hgweb: expand keyword search to full list of files

log: expand keyword search to full list of files

run-tests.py: use coverage.py with "#!/usr/bin/env python" tests

run-tests.py: small cleanup

run-tests.py: use coverage.py with *.py tests

run-tests.py: tell coverage.py to ignore errors Otherwise there'll be some IOErrors when it tries to open python files created during the execution of e.g. test-hook.

test-bad-pull: try to avoid timing-related failures

Try to find diffstat in PATH before calling it At least on Solaris, /bin/sh will print a "command not found" message even if we redirect stderr.

Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output This should make it easier to discover global options. As a bonus, they are no longer displayed by something like a hg -v help dates

revlog.py: fix/tweak read ahead code in lazyparser

Merge with Matt

Merge with Matt

Move back the purge extension in hgext

purge: abort with missing files avoiding problems with name-mangling fs In a name mangling filesystem (e.g. a case insensitive one) dirstate.walk() can yield filenames different from the ones stored in the dirstate. This already confuses the status and add commands, but with purge this may cause data loss. To prevent this purge refuses to work if there are missing files and has a 'force' option if the user knows it is safe. Even with the force option purge checks if any of the missing files is still available in the working dir: if so there may be some problem with the underlying filesystem, so it unconditionally aborts.

Merge last few matcher/locate fixes.

locate: don't print "file not found" messages. This should fix issue204.

change relglob: patterns to be consistent with glob: patterns With this change, you have to use "hg locate 'hgweb/**'" to locate all the files in directories named hgweb. OTOH, "hg locate '*l'" will locate only files that end with "l" - e.g. a file called "hg.py" will not be matched just because it's in a directory whose name ends with "l" (e.g. "mercurial").

Revert changeset ef1f1a4b2efb; add another test for glob: patterns With that changeset, it's impossible to use a glob: pattern to match e.g. all files ending in .py - glob:**.py would also match all files in a directory called dir.py.

Merge with stable

merge: fix a bug where copies were ignored

merge: fix a bug where copies were getting ignored

Fixups for recent changes in revlog version handling

hgweb: don't display heads in gitweb-style summary page

hgweb: display named branches in gitweb-style summary page

test-ssh-clone-r: avoid a shell script

test-ssh: avoid a shell script

test-init: avoid a shell script

test-rename-merge2: avoid a shell script

test-merge6: avoid a shell script

test-merge1: avoid a shell script

test-filebranch: avoid a shell script

Use printf(1) instead of using bash-specific shell code. Submitted by: Benoit Boissinot <bboissin@gmail.com>

test-ssh: use printenv.py

test-static-http: use printenv.py

test-http: use printenv.py

test-push-http: use printenv.py

test-bundle: use printenv.py

test-hook: use printenv.py

Add tests/printenv.py This is a small script that can be used as a hook to print the HG_* environment variables without relying on the shell.

Add a filename for the bundle

Slight refining to help text in patchbomb.py

hgweb: short hash for tip archive name

add util.lexists

Improve documentation for patchbomb and email