merge with stable

verify: improve progress descriptions For GUIs, the progress bar is disconnected visually from the text that is output by ui.write(), so it's better to be a little bit redundant in naming the status. "checking" is redundant, since the user is running the verify command. 'changesets', 'manifests', etc, tell the user what is being checked (the entity being counted in the progress bar.

pylint, pyflakes: remove unused or duplicate imports

Fix --blacklist when --jobs > 1 in run_tests.py. The options parsing logic replaces the options.blacklist initial value, a list of filenames, with a dict of test names to filenames. When runchildren rebuilds the command line to launch child processes the dict is flattened and provided as a malformed argument when a filename is expected. Fix is to remove the blacklist option from child invocations since the filtering is handled in the parent anyway.

merge with stable

run-tests.py: reset env variables set by hooks

checklink: use an explicit prefix for the temporary file

revlog: factor out _maxinline global. This lets us change the threshold at which a *.d file will be split out, which should make it much easier to construct test cases that probe revlogs with a separate data file. (issue2137)

fix test-pull after 468876bc3885

merge with stable

revlog: put graph related functions together

checkexec: use an explicit prefix for the temporary file

check-code: add a warnings level - demote "unwrapped ui message"

keyword: make the templater a local variable After 6722ba3bf80b a class attribute makes no sense.

rollback: improve message

transaction: use newlines to separate description elements

progress: fall back to indeterminate progress if position is >= total

mq: promote qnew, demote qinit in short help

commands: improve some command summaries

progress: show approximate progress info for pull

Merge with crew-stable

localrepo: do not store URL password in undo.desc

convert/subversion: fix default URL checker prototype

Merge with stable

patch: don't look for headers in diff lines If you have a diff line that matches a header line, the patch splitter currently breaks your patch at this line. For example a line like: +key: value This can lead to "malformed patch" exceptions. Now fixed.

rollback: add dry-run argument, emit transaction description

localrepo: add desc parameter to transaction All callers to localrepo.transaction() must supply a transaction description. The description and the existing repository tip are then stored (transactionally) into .hg/undo.desc; where rollback can later find it.

merge with stable

merge default

test-hgwebdir: correctly include '-' in sed expression. '\' can't be used to escape '-' from being interpreted as a range, so put it at the end.