merge with stable

tests: test-largefiles.t should not try to escape from $TESTTMP

largefiles: file storage should be relative to repo, not relative to cwd Revealed by the test in 1fd126cd2d91.

clone: don't save user's password in .hg/hgrc (Issue3122)

posix: add extended support for OS X path folding OS X does the following transformation on paths for comparisons: a) 8-bit strings are decoded as UTF-8 to UTF-16 b) undecodable bytes are percent-escaped c) accented characters are converted to NFD decomposed form, approximately d) characters are converted to _lowercase_ using internal tables Both (c) and (d) are done using internal tables that vary from release to release and match Unicode specs to greater or lesser extent. We approximate these functions using Python's internal Unicode data. With this change, Mercurial will (in almost all cases) match OS X folding and not report unknown file aliases for files in UTF-8 or other encodings.

dirstate: use util.normcase to build foldmap

merge with stable

largefiles: fix 'hg clone . ../foo' OSError abort Operating on a non-existant file can cause both IOError and OSError, depending on the function used: open raises IOError, os.lstat raises OSError. The largefiles code called dirstate.normal, which in turn calls os.lstat, so OSError is the right exception to catch here.

tests: test-patchbomb.t cleanup Let commit messages and file names describe the facts without making incorrect guess of the actual handling of it.

tests: show actual output in test-patchbomb.t Drop fixheader and decode base64 encoded content and show non-ascii content.

tests: test findexe() access check fixed in 58f96703a9ab

check-code: fix return code initialization Don't crash when nothing is tested, but return failure when other files than the last one fails.

merge with stable

tests: make test-commandserver.py independent of line ending and slash direction

tests: make test-commandserver.py output readable

tests: 'hghave unix-permissions' for test-import.t 'hg import' of a patch with mode changes requires unix permissions support in the file system.

tests: skip color test on platforms without tic

update: don't clobber untracked files with wrong casing

merge with i18n

merge with i18n

i18n-pt_BR: synchronized with 00276525e2b7

merge with stable

help: Backed out changeset e99facd2cd2a, description of file urls This help entry didn't try to describe the 'localhost' notation. It described a non-standard host-less notation where 'local' just was the first part of a sample relative path. It describe "urls" with relative and absolute paths like: file://file.txt file:///tmp/file.txt file://c:/tmp/file.txt

revset: follow(nosuchfile) should give an empty set (issue3114)

subrepo: fix git status false positive (issue3109) It turns out there's a separate command to force git to look at file contents if the stat has changed.

mdiff: replace wscleanup() regexps with C loops On my system it reduces: hg annotate -w mercurial/commands.py from 36s to less than 8s, to be compared with 6.3s when run without whitespace options.

mdiff: split lines in allblocks() only when necessary These are only required to handle the --ignore-blank-lines case

annotate: support diff whitespace filtering flags (issue3030) splitblock() was added to handle blocks returned by bdiff.blocks() which differ only by blank lines but are not made only of blank lines. I do not know exactly how it could happen but mdiff.blocks() threshold behaviour makes me think it can if those blocks are made of very popular lines mixed with popular blank lines. If it is proven to be wrong, the function can be dropped. The first implementation made annotate share diff configuration entries. But it looks like users will user -w/b for annotate but not for diff, on both the command line and hgweb. Since the latter cannot use command line entries, we introduce a new [annotate] section duplicating the diff whitespace options.

setup: fix py2exe generation broken by c3a6ec304055 (issue3116) Py2exe is patching default distutils Distribution class. This patch ensures that the right one is taken when calling hgdist class.

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