mdiff: make diffblocks() return all blocks, matching and changed Annotate uses matching blocks not changed ones.

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.

import: fix parent selection when importing merges With "wp1" and "wp2" the current working directory parents, "p1" and "p2" the patch parents and "parents" the resulting commit parents, the current behaviour is: --bypass --exact p2 parents 0 0 0 [wp1, wp2] 0 0 1 [wp1, wp2]/buggy 0 1 0 [p1] 0 1 1 [p1, p2] 1 0 0 [wp1, wp2] 1 0 1 [p1, p2] 1 1 0 [p1] 1 1 1 [p1, p2] The original behaviour before f53dc0787424 was: --bypass --exact p2 parents 0 0 0 [wp1, wp2] 0 0 1 if p1 == wp1 then [p1, p2] otherwise [wp1, wp2] 0 1 0 [p1] 0 1 1 [p1, p2] This patch restores the previous behaviour when --bypass is not set, and align --bypass behaviour when --exact is not set with merge diffs.

patch: simplify hunk extents parsing Do not capture unwanted groups in regexps

diff: --ignore-blank-lines was too enthusiastic It was ignoring changes from: ab to: a b

graft: disallow grafting grafted csets in specific situations (issue3091) In particular, we do not allow: - grafting an already grafted cset onto its original branch - grafting already grafted csets with the same origin onto each other

graft: use revs to make tests more readable

graft: preserve original source in subsequent grafts

makedate: wrong timezone offset if DST rules changed this year (issue2511) Python's time module sets timezone and altzone based on UTC offsets of two dates: first and middle day of the current year. This approach doesn't work on a year when DST rules change. For example Russia abandoned winter time this year, so the correct UTC offset should be +4 now, but time.timezone returns 3 hours difference because that's what it was on 01.01.2011. Related python issue: http://bugs.python.org/issue1647654

posix: fix findexe() to check for file type and access

forget: use forward slashes for internal paths forget into a subrepo failed on windows because pathes were joined with \.

check-code: add --nolineno option for hiding line numbers This makes the output more stable when it is used as a whitelist.

merge: give a special message for internal:merge failure (issue3105)

setup: raise when executing with python3 without c2to3 argument

posix: fix findexe() to check for file type and access

subrepo: use correct paths for subrepos with ..-relative paths on windows posixpath normpath of c:\foo\bar/../baz is baz, so now we pconvert first.

add missing localization markup

url: handle file://localhost/c:/foo "correctly" The path was parsed correctly, but localpath prepended an extra '/' (as in '/c:/foo') because it assumed it was an absolute unix path.

help: it is 'file://localhost/', not 'file://local/' The documentation has apparently always been wrong.