merge with stable

commands: correct diff -c explanation

httprepo: send Content-Type instead of content-type

httprepo: use content-type application/mercurial-0.1 for POST Previously, application/octet-stream was used. The content-type is currently ignored by the server.

patch: fix patching with fuzz and eol normalization

make the progress extension honor ui.quiet

subrepo: Update .hgsubstate in case of deleted subrepo When a subrepo is deleted from .hgsub, it also needs to be removed from .hgsubstate. Previous code was updating .hgsubstate only in case of newly or modified subrepo.

Do not use osutil.c with python 2.4 and Windows (issue1364) Windows python 2.4 os.stat() reports times including DST offset, while osutil.c reports the correct value, which makes status() systematically compare files content. This bug is fixed in python 2.5. Using osutil.py instead of osutil.c is 4x times slower on large repositories but current code is completely unusable. Given few people are likely to use python 2.4 on Windows this solution was considered a good trade-off compared to more invasive solutions trying to address the offset issue.

commands: mention diff -c

progress: mark units for translation

patch, i18n: avoid parameterized messages Singular message removed for simplicity.

gpg: do not call status on the whole repository, only on '.hgsigs'

pager: set ui.interactive=False when enabled This stops interactive-only things like progress bars from showing up inside the pager.

identify: don't include unknown in status

zeroconf: suppress traceback during shutdown If the read thred is in select when the main thread is in close, the main thread may close the socket between select and read, generating a noisy traceback. This can be ignored if the shutdown flag is set.

contrib/wix: switch *.wxs files to LF eol

Merge with stable

url: *args argument is a tuple, not a list (found by pylint) E1101:514:httpshandler._makeconnection: Instance of 'tuple' has no 'pop' member E1101:516:httpshandler._makeconnection: Instance of 'tuple' has no 'pop' member

i18n: mark more strings for translation

shrink-revlog: remove unneeded imports and useless code

shrink-revlog: add strings for translation / import _ before using it

ui: unset ui.slash when HGPLAIN is set

ui: suppress aliases when HGPLAIN is set

merge: fix --preview to show all nodes that will be merged (issue2043). Formerly, it omitted nodes that were not descendants of the least common ancestor of the two merge parents, even though those nodes contribute to the merge. The new algorithm uses revlog.findmissing() instead of ancestor() + nodesbetween().

test-merge-default: make content of test repo clearer. Makes it easier to understand and modify the test. (issue2043).

contrib/wix: MSVC CRT libraries are installed in WinSxS not in %system32%

Add WiX installer scripts to contrib/wix

import: if in doubt, consume stream until start of diff This prevents a header-like line in the message body from causing a spurious split.

bdiff: do not use recursion / avoid stackoverflow (issue1940)

keyword: mark improved demo commit message for translation s/config/configuration/ Inside the quoted command put the message in single quotes in case the translation contains apostrophes.