comparison tests/test-push-warn.out @ 10925:a101a743c570 stable

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.

10923:1782278bab8a

comparing with inner
searching for changes
2: A a2
pushing to inner
searching for changes
note: unsynced remote changes!
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
% check prepush with new branch head on former topo head

comparing with inner
searching for changes
3: A a2
pushing to inner
searching for changes
note: unsynced remote changes!
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
% check prepush with new branch head and new child of former branch head

5: A b3
pushing to inner
searching for changes
abort: push creates new remote heads on branch 'A'!
(did you forget to merge? use push -f to force)

10925:a101a743c570

comparing with inner
searching for changes
2: A a2
pushing to inner
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
% check prepush with new branch head on former topo head

comparing with inner
searching for changes
3: A a2
pushing to inner
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
% check prepush with new branch head and new child of former branch head

5: A b3
pushing to inner
searching for changes
abort: push creates new remote heads on branch 'A'!
(did you forget to merge? use push -f to force)
pushing to inner
searching for changes
abort: push creates new remote heads on branch 'A'!
(did you forget to merge? use push -f to force)
comparing with inner
searching for changes
no changes found