debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Mainly useful for reusing DAGs somewhere else, for example for attaching them to a bug report, or for importing them into other environments (like my test environment for incoming/outgoing discovery).

dagparser: parses and formats DAGs as concise text As discussed during the sprint. See the doc comment and doctests for specification and examples. This is used in subsequent patches to export revlog and changelog DAGs, and to generate a repo with a given changelog DAG.

tests: fix up webraw encoding

strip: backup bundles should use the .hg extension

hgweb: specify a charset when sending raw text files Gets the charset from encoding.encoding parameter.

summary: report copies and renames

provide pre- and post- hooks with parsed command line arguments. python hooks are passed two new keyword arguments: - opts: a dict of options; unsepcified options are set to their default - pats: a list of arguments shell hooks receive two new variables containing string representations of the above data: - $HG_OPTS - $HG_PATS for example, the opts and pats for 'hg -f v1.1' would be: {'force': True, 'message': '', 'rev': '', 'user': '', 'date': '', 'local': None, 'remove': None, 'mq': None} ['v1.1']

tests: fix some branch head fallout

pager: set ui.formatted() prior to redirecting stdout.

mq: use ui.formatted() instead of ui.plain().

color: use ui.formatted().

ui: document the formatted(), interactive() & plain() functions.

ui: add ui.formatted configuration variable and accessor function. This new configuration variable is similar in nature `ui.interactive', but applying to output instead of input. This allows as to support non-interactive sessions where formatted should be enabled, such as when using the pager extension. The variable itself is left undocumented; it is not intended for use outside Mercurial and its extensions.

revlog: fix inconsistent comment formatting

improve --branch processing (and differentiate from # syntax) Previously #foo and --branch foo were handled identically. The behavior of #foo hasn't changed, but --branch now works like this: 1) If branchmap is not supported on the remote, the operation fails. 2) If branch is '.', substitute with branch of the working dir parent. 3) If branch exists remotely, its heads are expanded. 4) Otherwise, the operation fails. Tests have been added for the new cases.

help: show value requirement and multiple occurrence of options this helps users to know what kind of option is: - no value is required(flag option) - value is required - value is required, and multiple occurrences are allowed each kinds are shown as below: -f --force force push -e --ssh CMD specify ssh command to use -b --branch BRANCH [+] a specific branch you would like to push if one or more 3rd type options are shown, explanation for '[+]' mark is also shown as footnote.

keyword: pass context to kwtemplater.overwrite Now that we have retrieved the context in every calling function except commit, pass it as argument to kwtemplater.overwrite to avoid looking it up twice. Reorder arguments to kwtemplater.overwrite to reflect their importance. Turn node argument into a simple boolean and rename it to iswctx.

parser: fix missing param in _match

commit: add tests for the 'created new head' message

commit: fix display of 'created new head' message (issue2186) To avoid recurrent fixes for the display of this message, a summary table with all case combinations has been added to the code. Basically, there is two condition for the message to be printed: * this is not an initial (named branch or topo) root * none of the parents are in the current branch heads

rebase: --abort doesn't strip away the target changeset (issue2220) When a changeset is skipped, rebase keeps the previous target as next target and if the skipped cset is the first one, the recorded target is actually the original target. --abort did not detect this situation but simply stripped away the cset.

test-branch-option: Updated output to match rev 3f1409082720

Merge with mpm

discovery: fix description line

Merge with stable

Merge backout

Backed out changeset: e1dde7363601

ui: handle leading newlines/spaces/commas in configlist Thanks to Greg Ward for spotting the problem introduced in 0a548640e012 and for supplying the test case.

mergetools: add configuration for Ultra Compare (issue2226) Initial config provided by Tim Pietzcker

mq: use hg reST role some more