prepush: rewrite most of the code from scratch
For servers with branchmap support, the algorithm now works as follows:
1. A list of branches in outgoing changesets is created.
2. Using the remote branchmap, a check for new branches is performed.
3. A map (from branch to head list) of locally known remote heads before
the push is created, and one which, after step 4, will contain the locally
known remote heads after the push.
4. The post-push head map is updated with the outgoing changesets, using the
branch cache update mechanism.
5. A check for new heads is performed, by comparing the length of the head list
before and after push, for each branch. If there are new heads, an error
depending on whether or not there are incoming changes on the branch,
is returned.
6. If the push is allowed, a warning is written if there are incoming changes
on any branches involved in the push.
For old servers, an algorithm similar to step 4-6 above is used to check for
new topological heads only.
Two bugs are also fixed:
1. Sometimes you would be allowed to push new branch heads without --force.
A test for this case was added.
2. You would get the "note: unsynced remote changes!" warning if there were any
incoming changesets, even if they were on unrelated branches.
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:
--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:
--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
----------------------------------------------------------------------
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.
----------------------------------------------------------------------
[]
----------------------------------------------------------------------