phases: basic I/O logic Add function to read and write phase roots. Add a _phaseroots filecache on localrepo class to access the phaseroots data.

phases: Minimal first add.

run-tests: minor cleanups

run-tests: pull out line matching function

run-tests: pull out unified matching funcs

tests: add some comments to the unified test code

tests: rewrite inline Python support Tests with inline Python could turn '>>>' into their underlying python invocation if the test got updated with -i.

merge with stable

add: support adding explicit files in subrepos Change the behavior of the add command such that explicit paths in subrepos are always added. This eliminates the previous behavior where if you called "hg add" for an explicit path in a subrepo without specifying the -S option, it would be silently ignored. If you specify patterns, or no arguments at all, the -S option will still be needed to activate recursion into subrepos.

tests: add test for add of explicit path in subrepo Add test coverage for the existing behavior where adds of explicit paths in subrepos are silently ignored. This is in preparation for changing the behavior of the add command to have better support for subrepos.

largefiles: ensure destination directory exists before findfile links to there When (1) findfile links a largefile from the user cache to the store and (2) the store directory doesn't exist yet, findfile errors out. A simple call to util.makedirs fixes it.

misc: adding missing file close() calls Spotted by Victor Stinner <victor.stinner@haypocalc.com>

bisect: remove superfluous parameter in label() The argument is not used. This is a left-over of non-published iterations, and it passed through. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

log: hide some low-utility options

localrepo: convert various repo.set() users to repo.revs()

localrepo: add revs helper method

merge with stable, reopen default branch

Added signature for changeset 41453d55b481

Added tag 2.0 for changeset 41453d55b481

dirstate: don't fail when dropping a not-tracked file (issue3080) Complex merges with divergent renames can cause a file to be 'moved' twice, causing dirstate.drop() to be called twice. Rather than try to ensure there are no unexpected corner cases where this can happen, we simply ignore drops of files that aren't tracked.

tests: fix readline escape characters in heredoctest.py/test-url.py This fix mirrors the changes made to test-doctest.py in b856071435f7 and 967adcf5910d. Without this change, tests running heredoctest.py can fail on certain versions of OS X when TERM is set to xterm-256color: $ /opt/local/Library/Frameworks/Python.framework/Versions/2.7/Resources/Python.app/Contents/MacOS/Python -m heredoctest <<EOF > >>> open('b', 'w').write('this' * 1000) > EOF + \x1b[?1034h (no-eol) (esc) A similar problem occurs with test-url.py: $ ./run-tests.py test-url.py --- .../tests/test-url.py.out +++ .../tests/test-url.py.err @@ -0,0 +1 @@ + ERROR: .../test-url.py output changed ! Failed test-url.py: output changed # Ran 1 tests, 0 skipped, 1 failed.

merge with i18n

i18n-pt_BR: synchronized with a53888685a6c

merge with i18n

i18n-ja: synchronized with b357a972d6cd

minirst: use unicode string as intermediate form for replacement # this change redones part of 521c8e0c93bf, backed out by 0ad0ebe67815 Some character encodings use ASCII characters other than control/alphabet/digit as a part of multi-bytes characters, so direct replacing with such characters on strings in local encoding causes invalid byte sequences. [mpm: test changed to simple doctest]

util: add a doctest for empty sha() calls

largefiles: replace tempfile.NamedTemporaryFile with tempfile.mkstemp This is consistent with the rest of Mercurial's code, mirroring the try-finally-unlink structure elsewhere. Furthermore, it fixes the case where largefiles throws an IOError on Windows when the temporary file is opened a second time by copytocacheabsolute. This patch creates the temporary file in the repo's largefiles store rather than /tmp, which might be a different filesystem.

util: allow sha1() with no args Normally this works because we replace util.sha1 with hashlib.sha1 after first use, but if the first user doesn't provide an arg, it breaks.

tests: use md5sum.py instead of sha1sum, add check