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.
#!/bin/sh
mkdir t
cd t
hg init
echo import > port
hg add port
hg commit -m 0 -u spam -d '0 0'
echo export >> port
hg commit -m 1 -u eggs -d '1 0'
echo export > port
echo vaportight >> port
echo 'import/export' >> port
hg commit -m 2 -u spam -d '2 0'
echo 'import/export' >> port
hg commit -m 3 -u eggs -d '3 0'
head -n 3 port > port1
mv port1 port
hg commit -m 4 -u spam -d '4 0'
echo % pattern error
hg grep '**test**'
echo % simple
hg grep port port
echo % all
hg grep --traceback --all -nu port port
echo % other
hg grep import port
hg cp port port2
hg commit -m 4 -u spam -d '5 0'
echo % follow
hg grep --traceback -f 'import$' port2
echo deport >> port2
hg commit -m 5 -u eggs -d '6 0'
hg grep -f --all -nu port port2
cd ..
hg init t2
cd t2
hg grep foobar foo
hg grep foobar
echo blue >> color
echo black >> color
hg add color
hg ci -m 0
echo orange >> color
hg ci -m 1
echo black > color
hg ci -m 2
echo orange >> color
echo blue >> color
hg ci -m 3
hg grep orange
hg grep --all orange
echo % match in last "line" without newline
python -c 'fp = open("noeol", "wb"); fp.write("no infinite loop"); fp.close();'
hg ci -Amnoeol
echo % last character omitted in output to avoid infinite loop
hg grep loop
# Got a traceback when using grep on a single
# revision with renamed files.
cd ..
echo % issue 685
hg init issue685
cd issue685
echo octarine > color
hg ci -Amcolor
hg rename color colour
hg ci -Am rename
hg grep octarine
# Used to crash here
hg grep -r 1 octarine
# Issue337: test that grep follows parent-child relationships instead
# of just using revision numbers.
cd ..
echo % issue 337
hg init issue337
cd issue337
echo white > color
hg commit -A -m "0 white"
echo red > color
hg commit -A -m "1 red"
hg update 0
echo black > color
hg commit -A -m "2 black"
hg update --clean 1
echo blue > color
hg commit -A -m "3 blue"
hg grep --all red