test-bisect: test handling of invalid commands without relying on sh

diffhelpers: fix variable declaration for MSVC (not C99)

dirstate: improve docstring formatting Triple-quoted strings are easier to spot than single-quoted strings.

test-help: improve test coverage Adds a test for displaying a help topic. Extends test coverage of commands.help_ by 5 lines.

test-help: improve test coverage Adds a test for displaying a command list with a command with no help text. Extends test coverage of commands.help_ by 1 line.

test-help: improve test coverage Adds a test that extension commands are omitted from the default command list. Extends test coverage of commands.help_ by 1 line.

test-help: improve test coverage Adds a test for commands without help text. Extends test coverage of commands.help_ by 1 line.

test-help: improve test coverage Adds a test for help on a command with no options. Extends test coverage of commands.help_ by 2 lines.

test-help: improve test coverage Adds a test for handling ambiguous command help Extends test coverage of commands.help_ by 4 lines.

merge with stable

monoblue: fix title for branches page

Merge with crew-stable

patch: better handling of sequence of offset patch hunks (issue1941) The built-in patch implementation applied the hunks to the wrong lines of the file if the file in the repo has been modified to skew the patch line numbers and the file contains repetitive sequences of lines.

Makefile: added instructions on how to override PREFIX

Merge with stable

win32text: do not mention hgext in warning

patch: drop unused hunk.newctrl()

test-import-eol: improve binary hunks test

diffhelpers: handle CRLF in hunk last line without EOL Note that diff generation code always ends last lines without newline with a LF, so this is a tolerance.

patch: drop eol normalization fast-path for 'lf' and 'crlf' With eolmode set to 'lf' or 'crlf' we avoided the hunk duplication and normalization by reading the input patch in text mode. Dropping this optimization simplifies code expectations for a small overhead. The change in test-mq-eol comes from a tolerance to CRLF instead of LF for last lines without newlines being broken by this revision. This tolerance was only partially supported and will be added again in a better way.

patch: fix eolmode=auto with new files If target file does not exist or has no eol, current code was normalizing eols to LF. Preserve patch file eols instead.

Merge with stable

tests highlight, keyword: load extensions with "ext ="

setup.py: keep Python 2.3 compatibility Though we only support Python 2.4 or greater, we should keep setup.py compatible with earlier versions on the syntactic level. Otherwise people will simply get a SyntaxError when trying to install Mercurial with an old version of Python. With this change, the setup.py file can be imported with Python 2.3 and we then issue a friendly error message when we detect that Python is too old.

Merge with stable

extensions help: make disabling example analogous to enabling example The example for enabling an extension in the module search path is: foo = foo can only be disabled by: foo = ! and not by: hgext.foo = ! As the examples now omit "hgext." the example hgext.bar = ! is misleading.

test-help: improve test coverage Adds a test for using the help option with the version option. Extends test coverage of commands.help_ by another 2 lines.

setup: ignore 'not importing' warnings during version detection Python will issue an ImportWarning when seeing 'import locale' if there is a locale/ directory present without a __init__.py file. The warning is silent by default, but it somehow shows up anyway on Windows when setup.py executed hg. The warning causes runcmd to panic since it sees output on stderr. This patch ignores warnings on stderr about not importing a package.

tests: load with "ext =" instead of "hgext.ext ="

Merge with stable