stable: merge with default

README: minimal test command line

Merge with stable

rollback: clarifies the message about the reverted state (issue2628) Previously, when rolling back a transaction, some users could be confused between the level to which the store is rolled back, and the new parents of the working directory. $ hg rollback rolling back to revision 4 (undo commit) With this change: $ hg rollback repository tip rolled back to tip revision 4 (undo commit) working directory now based on revision 2 and 1 So now the user can realize that the store has been rolled back to an older tip, but also that the working directory may not on the tip (here we are rolling back the merge of the heads 2 and 1) [ original upstream message ]

Merge with stable

run-tests: handle mixed comment lines in blacklists [ original upstream message ]

Merge with stable

explicitly close files Add missing calls to close() to many places where files are opened. Relying on reference counting to catch them soon-ish is not portable and fails in environments with a proper GC, such as PyPy. [ original upstream description ]

Merge with stable

run-tests: only call WIFEXITED on systems it exists not on Windows or in jython [ original upstream message ]

run-tests: loadable as module [ original upstream message ]

stable: merge with default

Move repo.__class__ assignment out of monkeypatch context A cosmetic change to improve readability.

Inform user about current keywordset in kwdemo The kwdemo --default output now looks roughly like this: configuration using default cvs keywordset [extensions] keyword = [keyword] demo.txt = [keywordset] * section added with this change svn = False [keywordmaps] ...

Update documentation for kwshrink * remove obsolete reference to potential problems with merge and import * emphasize that running kwshrink before configuration changes which affect active/expanded keywords is mandatory

Merge with default

Make kwfiles show deleted files configured for expansion

Colorize hg kwfiles output

Merge with default

Copy: when copied source is a symlink, follow it 1) hg cp symlink copy -> copy is a symlink. 2) cp symlink copy; hg cp -A symlink copy -> copy is a regular file. In the second case we have to follow the symlink to its target to find out whether we have to unexpand keywords in the copy. Add test covering the case where the copied link's target is ignored by keyword but has content which would match the regex for expanded keywords to check whether we indeed leave the destination alone.

Merge with stable

code style: prefer 'is' and 'is not' tests with singletons [ original upstream description ]

Merge with default

s/config/configuration/ in help

Merge with stable

run-tests: fix --debug for .t tests When --debug is given to the test runner, run() returns (retcode, None). Do not try to use None output as a string, and return directly, similarly as other testers. [ original upstream message ]

Merge with stable

run-test: fixed wrong parenthesis Fixed wrong placement of end parenthesis, from b911cb80c671 [ original upstream message ]

Merge with stable

tests: use (esc) markup for string-escape This makes test output less ambiguous. Failing test output will be escaped and marked up if necessary. A Python string-escape compatible encoding is used, but not everything is encoded - especially not \n and \t and '. [ original upstream message ]