mdiff: extract blocks whitespace normalization in diffblocks() We want to reuse it in annotate for whitespace normalization.

merge with crew

setup: backout 8504699d1aa6 Change wasn't compatible with Python 2.x

tests: don't use stdout redirection for test data Stdout redirection is not binary safe everywhere - for example not on windows with msys.

tests: hide 'No such file or directory' messages Windows will use a different and localized message.

tests: add missing '(glob)'s to match '\' in paths in test output on windows

tests: add 'hghave system-sh' to skip tests on windows

tests: launch hghave with python interpreter without relying on hash-bang

tests: use the specified shell for running old fashioned sh tests

tests: add missing 'hghave unix-permissions'

tests: remove hacks for testing if file or directory exists

tests: don't leave temporary directories without write permission behind

merge with stable

hook: flush stdout before redirecting to stderr When hook output redirection is enabled (e.g. when cloning over ssh), hook output on stdout is redirected to stderr, to prevent the repository data on stdout from being corrupted. In certain cases, the redirection could cause part of the repository data to end up on stderr as well. In case of a clone, this causes: "abort: consistency error in delta!" This was seen with a clone over ssh, an outgoing hook present (any non-python type, e.g. 'pwd'), on certain repositories only, probably depending on the distribution of the sent data) This patch updates the hook redirection code to flush stdout before redirecting, removing the problem.