status: support revsets with --change

merge with stable

largefiles: avoid use of uinitialized variable in case of errors

tests: remove unstable debugstate output in test-largefiles.t

largefiles: simplify lfutil.writehash This was unnecessarily verbose: there is no need to unlink the file when we open it for write anyway, and there is no need to check if the file exists after we created it.

merge with stable

largefiles: copy files into .hg/largefiles atomically Copying from the user cache into .hg/largefiles could fail halfway though with a partially written file.

largefiles: write .hg/largefiles/ files atomically Before, it was possible to create a .hg/largefiles/hash file with truncated content, i.e., content where SHA-1(content) != hash This breaks the fundamental invariant in largefiles that the file content for files in .hg/largefiles hash to the filename.

largefiles: add comment about non-atomic working directory When updating the working copy with a normal 'hg update', we also don't use atomic writes.

tests: use an alias to make msys 'pwd' return paths with forward slashes

tests: skip cvs tests with msys on windows They will fail with weird 'ssh' errors.

tests: introduce 'hghave msys' to skip tests that would fail because of msys

merge with stable

convert: handle trailing slashes in filemap better (issue3124)

tests: remove test-casecollision-i18n.t The result of this test is quite suspect. Remove it for now as it now correctly breaks on HFS+.

posix: fix HFS+ percent-encoding folding We use 'ignore' rather than 'replace' so we don't have to deal with u+FFFD in UTF-8 round-trip.

mail: use quoted-printable for mime encoding to avoid too long lines (issue3075) Quoted-printable was already used for the more critical patch mails, so it should be fine for everything else as well.

notify: add option for writing to mbox This makes it possible to test how the mails that are sent _really_ look like.

mail: mbox handling as a part of mail handling, refactored from patchbomb

patchbomb: minor refactoring of mbox functionality, preparing for move This allows reuse of the mbox functionality but causes minor changes in the patchbomb console output when writing to a mbox.

tests: run check-code with warnings and maintain a whitelist check-code has fine warning checks, but they are a bit noisy and nobody used them. Now the warnings will be run in the test suite, where a list of accepted warnings will be maintained. Those who introduce or touch a line with a warning will now have to update the whitelist ... or fix the warning.

tests: convert test-check-code-hg.py to .t

test-keyword: use inline doctest syntax

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.