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.
paragraphs formatted to fit within 60 characters:
----------------------------------------------------------------------
This is some text in the first paragraph.
A small indented paragraph. It is followed by some lines
containing random whitespace.
The third and final paragraph.
----------------------------------------------------------------------
paragraphs formatted to fit within 30 characters:
----------------------------------------------------------------------
This is some text in the first
paragraph.
A small indented paragraph.
It is followed by some lines
containing random
whitespace.
The third and final paragraph.
----------------------------------------------------------------------
definitions formatted to fit within 60 characters:
----------------------------------------------------------------------
A Term
Definition. The indented lines make up the definition.
Another Term
Another definition. The final line in the definition
determines the indentation, so this will be indented
with four spaces.
A Nested/Indented Term
Definition.
----------------------------------------------------------------------
definitions formatted to fit within 30 characters:
----------------------------------------------------------------------
A Term
Definition. The indented
lines make up the
definition.
Another Term
Another definition. The
final line in the
definition determines the
indentation, so this will
be indented with four
spaces.
A Nested/Indented Term
Definition.
----------------------------------------------------------------------
literals formatted to fit within 60 characters:
----------------------------------------------------------------------
The fully minimized form is the most convenient form:
Hello
literal
world
In the partially minimized form a paragraph simply ends with
space-double-colon.
////////////////////////////////////////
long un-wrapped line in a literal block
\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
This literal block is started with '::',
the so-called expanded form. The paragraph
with '::' disappears in the final output.
----------------------------------------------------------------------
literals formatted to fit within 30 characters:
----------------------------------------------------------------------
The fully minimized form is
the most convenient form:
Hello
literal
world
In the partially minimized
form a paragraph simply ends
with space-double-colon.
////////////////////////////////////////
long un-wrapped line in a literal block
\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
This literal block is started with '::',
the so-called expanded form. The paragraph
with '::' disappears in the final output.
----------------------------------------------------------------------
lists formatted to fit within 60 characters:
----------------------------------------------------------------------
- This is the first list item.
Second paragraph in the first list item.
- List items need not be separated by a blank line.
- And will be rendered without one in any case.
We can have indented lists:
- This is an indented list item
- Another indented list item:
- A literal block in the middle
of an indented list.
(The above is not a list item since we are in the literal block.)
Literal block with no indentation (apart from
the two spaces added to all literal blocks).
1. This is an enumerated list (first item).
2. Continuing with the second item.
(1) foo
(2) bar
1) Another
2) List
Line blocks are also a form of list:
This is the first line. The line continues here.
This is the second line.
----------------------------------------------------------------------
lists formatted to fit within 30 characters:
----------------------------------------------------------------------
- This is the first list item.
Second paragraph in the
first list item.
- List items need not be
separated by a blank line.
- And will be rendered without
one in any case.
We can have indented lists:
- This is an indented list
item
- Another indented list
item:
- A literal block in the middle
of an indented list.
(The above is not a list item since we are in the literal block.)
Literal block with no indentation (apart from
the two spaces added to all literal blocks).
1. This is an enumerated list
(first item).
2. Continuing with the second
item.
(1) foo
(2) bar
1) Another
2) List
Line blocks are also a form of
list:
This is the first line. The
line continues here.
This is the second line.
----------------------------------------------------------------------
options formatted to fit within 60 characters:
----------------------------------------------------------------------
There is support for simple option lists, but only with long
options:
-X --exclude filter an option with a short and long option
with an argument
-I --include an option with both a short option and
a long option
--all Output all.
--both Output both (this description is quite
long).
--long Output all day long.
--par This option has two paragraphs in its
description. This is the first.
This is the second. Blank lines may
be omitted between options (as above)
or left in (as here).
The next paragraph looks like an option list, but lacks the
two-space marker after the option. It is treated as a normal
paragraph:
--foo bar baz
----------------------------------------------------------------------
options formatted to fit within 30 characters:
----------------------------------------------------------------------
There is support for simple
option lists, but only with
long options:
-X --exclude filter an
option
with a
short
and
long
option
with an
argumen
t
-I --include an
option
with
both a
short
option
and a
long
option
--all Output
all.
--both Output
both
(this d
escript
ion is
quite
long).
--long Output
all day
long.
--par This
option
has two
paragra
phs in
its des
criptio
n. This
is the
first.
This is
the
second.
Blank
lines
may be
omitted
between
options
(as
above)
or left
in (as
here).
The next paragraph looks like
an option list, but lacks the
two-space marker after the
option. It is treated as a
normal paragraph:
--foo bar baz
----------------------------------------------------------------------
fields formatted to fit within 60 characters:
----------------------------------------------------------------------
a First item.
ab Second item. Indentation and wrapping is handled
automatically.
Next list:
small The larger key below triggers full indentation
here.
much too large
This key is big enough to get its own line.
----------------------------------------------------------------------
fields formatted to fit within 30 characters:
----------------------------------------------------------------------
a First item.
ab Second item. Indentation
and wrapping is handled
automatically.
Next list:
small The larger key
below triggers
full indentation
here.
much too large
This key is big
enough to get its
own line.
----------------------------------------------------------------------
containers (normal) formatted to fit within 60 characters:
----------------------------------------------------------------------
Normal output.
----------------------------------------------------------------------
containers (verbose) formatted to fit within 60 characters:
----------------------------------------------------------------------
Normal output.
Verbose output.
----------------------------------------------------------------------
['debug', 'debug']
----------------------------------------------------------------------
containers (debug) formatted to fit within 60 characters:
----------------------------------------------------------------------
Normal output.
Initial debug output.
----------------------------------------------------------------------
['verbose']
----------------------------------------------------------------------
containers (verbose debug) formatted to fit within 60 characters:
----------------------------------------------------------------------
Normal output.
Initial debug output.
Verbose output.
Debug output.
----------------------------------------------------------------------
[]
----------------------------------------------------------------------
roles formatted to fit within 60 characters:
----------------------------------------------------------------------
Please see "hg add".
----------------------------------------------------------------------
sections formatted to fit within 20 characters:
----------------------------------------------------------------------
Title
=====
Section
-------
Subsection
''''''''''
Markup: "foo" and "hg help"
---------------------------
----------------------------------------------------------------------
admonitions formatted to fit within 30 characters:
----------------------------------------------------------------------
Note:
This is a note
- Bullet 1
- Bullet 2
Warning!
This is a warning Second
input line of warning
!Danger!
This is danger
----------------------------------------------------------------------
comments formatted to fit within 30 characters:
----------------------------------------------------------------------
Some text.
Some indented text.
Empty comment above
----------------------------------------------------------------------
=== === ========================================
a b c
=== === ========================================
1 2 3
foo bar baz this list is very very very long man
=== === ========================================
table formatted to fit within 30 characters:
----------------------------------------------------------------------
a b c
------------------------------
1 2 3
foo bar baz this list is
very very very long
man
----------------------------------------------------------------------