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