merge stable together

merge with stable

shrink-revlog: avoid cryptic error when used as an extension When shrink-revlog is used as an extension, it would produce an error when switching back to stable because the script will try to execute itself.

transaction: initialize self.journal to None after deletion This avoid a warning when having an empty transaction, where hg would try to delete the journal twice.

subrepo: fix typo in help text

Merge with stable

relink: ensure consistent candidate order

commands: fix typo in help text

color: colorize output of hg resolve -l

color: improve coding style

Merge with crew-stable

ui: display progress with decimal notation

win32: close file when leaving _getfileinfo()

Add support for relinking on Windows. Test and minor code change by Patrick Mézard <pmezard@gmail.com>

Add test for relink extension

contrib: small documentation fixes in shrink-revlog.py

contrib: turn shrink-revlog.py into an extension

contrib: fix error handling in shrink-revlog.py to be more hg-like

contrib: use ui to write in shrink-revlog.py

Merge with stable.

Update test and man page for multiple matching encode/decode filters

commands: fix help string for pull -u and unbundle -u. They update to new branch head, not new tip -- same as 'hg update'.

Update copyright year to 2010

httprepo: always store the response url (issue1968) Fixes a regression caused by 54b518fc6671

Merge with stable

commands: update copyright year to 2010

test-convert-svn-branches: filter unwanted output Windows cmd.exe emits a different message than sh: """ foobar is not recognized as an internal or external command, operable program or batch file. """ Filter it.

Merge with crew-stable

patch: explicitely close input patch files when leaving If applydiff() raises an exception, the opened patch file is kept alive in the exception context. If it is a temporary file (for instance supplied by import command with stdin input), Windows cannot clean it up.

Merge with crew-stable

hgweb: improve IIS PATH_INFO fix ee8af8a4d905 (issue1580) Copy PHP IIS detection.

Minor svn conversion tests cleanup

subrepo: force en_US.UTF-8 locale when calling svn Parser only knows about en_US output. Forcing the encoding to UTF-8 might not be the best thing to do since the caller may receive some of the subversion output, but at least it should prevent conversion errors from svn client.

test-subrepo-svn: normalize OS specific path separator

subrepo: normalize svn output line-endings

test-subrepo-svn: avoid pushd/popd

Merge with stable

Added signature for changeset 296a0b14a686

Added tag 1.4.2 for changeset 296a0b14a686

Merge with crew

mq: qdiff with the same diff options than qrefresh (issue1350) Specifically, if current patch is a git patch and mq.git=keep, diff in git mode.

mq: upgrade to git patch when necessary (issue767)

patch: support diff data loss detection and upgrade In worst case, generating diff in upgrade mode can be two times more expensive than generating it in git mode directly: we may have to regenerate the whole diff again whenever a git feature is detected. Also, the first diff attempt is completely buffered instead of being streamed. That said, even without having profiled it yet, I am convinced we can fast-path the upgrade mode if necessary were it to be used in regular diff commands, and not only in mq where avoiding data loss is worth the price.

Merge with crew-stable

Merge with stable

mq: preserve --git flag when folding patches Without this, folding a git patch into a regular one downgrades the resulting patch to a regular patch.

mq: preserve --git flag when merging patches Without this, merging a patch queue without diff.git=1 downgrades all git patches to regular patches, losing data in the process.

mq: stop caching and sharing diff options Several mq commands mutate the shared options which causes hard to track bugs when multiple calls are combined.

subrepo: mark string for translation and fix case

Add RelaxNG schema to win32 installer

Merge with mpm

Merge with crew-stable

copies: don't report copies with unrelated branch

subrepo: Subversion support

subrepo: add table-based dispatch for subrepo types

dirstate: don't check state of subrepo directories

subrepo: load from a context where the subrepo exists

subrepo: fix includes support in .hgsub

Merge with stable

i18n: update po files for 703db37d186b and 0ddbc0299742

Merge with i18n

Merge with stable

Merge with i18n.

Merge with i18n-stable

i18n: merge with stable

i18n-da: import strings from default branch

i18n-sv: synchronized with 37679dbf2ee3

merge with i18n stable

i18n-it: removed extraneous '\r' from message

i18n-pt_BR: synchronized with 37679dbf2ee3

Added RelaxNG schema for hg log XML output format

Bugfix and test for hg log XML output

Added output of "extras" to hg log XML output

Merge with stable

run-tests.py: clears http_proxy for all tests

windows: expand environment vars in find_exe This allows us to use ${ProgramFiles} in our [merge-tools] sections so we can provide locale safe program paths.

Merge with stable

run-tests.py: clears http_proxy for all tests

Added XML output for hg log The XML format is based on the one used by Subversion. Currently the closing "</log>" tag is not written, since cmdutil.py does not support the "footer" template variable.

Added support for templatevar "footer" to cmdutil.py

patch: make git diffline generation more explicit

mq: untangle git patch detection

test-mq: better tests delimitation

Merge with crew-stable

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

keyword: go into restricted mode when transplanting Expanded keyword is read into diff with transplant -b otherwise. Test this scenario. Thanks to Adam Berkes for providing an example case.

keyword: do not monkeypatch diff when in restricted mode kw_diff actually disabled restricted mode when 2 revisions were given, because it effectively disables the extension in this case. But the commands working with diff and patch need restricted mode always enabled, i.e. expansion enabled when writing to the working directory and - crucial for these commands - no expansion when reading the filelog.

merge with default

mq: qnew -f should reject merge working directories

Merge with stable

hgext: enable extensions without "hgext." prefix in help texts