backout: deprecate/hide support for backing out merges This has never worked usefully: - it can't undo a completely unwanted merge, as it leaves the merge in the DAG - it can't undo a faulty merge as that means doing a merge correctly, not simply reverting to one or the other parent Both of these kinds of merge also require coordinated action among developers to avoid the bad merge continuing to affect future merges, so we should stop pretending that backout is of any help here. As backing out a merge now requires a hidden option, it can't be done by accident, but will continue to 'work' for anyone who's already dependent on --parent for some unknown reason.

backout: add a note about not working on merges

backout: mark some help verbose

merge with stable

acl: more descriptive error messages

largefiles: fix commit of specified file on non-windows

convert: detect false cset boundaries in cvsps descriptions

transplant: wrap a transaction around the whole command

help: generate command help into a single RST string for formatting

help: unify the two -v notes for command help

diff: enhance highlighting with color (issue3034) Now the highlighter knows whether it is in the header of the patch or not.

debuginstall: report the template path

extensions: print some debug info on import failure This is handy if hgext.foo exists but has a bogus "import blah": previously we just discarded the "No module named blah" error. Now at least you can see it with --debug. Not perfect, but better than nothing.

import: wrap a transaction around the whole command Now 'rollback' after 'import' is less surprising: it rolls back all of the imported changesets, not just the last one. As an extra added benefit, you don't need 'rollback -f' after 'import --bypass', which was an undesired side effect of fixing issue2998 (59e8bc22506e).. Note that this is a different take on issue963, which complained that rollback after importing multiple patches returned the working dir parent to the starting point, not to the second-last patch applied. Since we now rollback the entire import, returning the working dir to the starting point is entirely logical. So this change also undoes a732eebf1958, the fix to issue963, and updates its tests accordingly. Bottom line: rollback after import was weird before issue963, understandable since the fix for issue963, and even better now.

import: improve error reporting When applying a series of patch files, it's nice to be explicitly told *which* file is broken.