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.

import: join base with patchurl *after* checking for stdin This only matters when using the deprecated --base option, and combining --base with a patch on stdin makes no sense. But it's such an obvious bug and easy fix that I couldn't pass it by.

import: rename some local variables

import: simplify status reporting logic (and make it more I18N-friendly) The old code printed (with ui.status()) the changeset ID created by patch N after committing patch N+1, e.g. applying patch1 applying patch2 applied 1d4bd90af0e4 where 1d4bd90af0e4 is the changeset ID resulting from patch1. That's just weird. It's also inconsistent: we only reported the changeset ID when applying >1 patches. And it's inconsistent with 'commit', which only tells you the new changeset ID in verbose mode. Finally, the existing code was I18N-hostile, since it concatenated translated strings. The new way is to print the just-created changeset ID with ui.note() immediately after committing it. It also clarifies what the user message is for easier I18N.

convert: fix crazy rollback call, broken by recent rollback safety checks This was causing test-convert-cvs.t to fail.

rst: fix detection of single-row tables This fixes option lists for commands with only an --mq option.

subrepo: fix repo relative path calculation for root directories (issue3033)

subrepo: improve error message when svn isn't found subprocess was returning the following unhelpful message: abort: No such file or directory

merge with stable

largefiles: don't break existing tests (syntax error, bad imports)

rollback: use a hint for force

Added signature for changeset 351a9292e430

Added tag 1.9.3 for changeset 351a9292e430

record: use command wrapper properly for qnew/qrefresh (issue3001)

rollback: avoid unsafe rollback when not at tip (issue2998) You can get into trouble if you commit, update back to an older changeset, and then rollback. The update removes your valuable changes from the working dir, then rollback removes them history. Oops: you've just irretrievably lost data running nothing but core Mercurial commands. (More subtly: rollback from a shared clone that was already at an older changeset -- no update required, just rollback from the wrong directory.) The fix assumes that only "commit" transactions have irreplaceable data, and allows rolling back non-commit transactions as always. But when rolling back a commit, check that the working dir is checked out to tip, i.e. the changeset we're about to destroy. If not, abort. You can get back the old (dangerous) behaviour with --force.

merge with stable

merge with i18n

i18n-ja: synchronized with 31c9e2a702d1

clone: add help examples

clone: add a note about -u/-U

clone: move portions of help into the verbose section

clone: clarify destination URLs