prepush: add more precise error messages
Part of the patch is from timeless@mozdev.org
- indicate the branch name where there are multiple heads
- give better advice when hitting a possible race, where new heads are added
between discovery and the call to branchmap(). In that case, asking the user
to merge isn't helpful, since only remote has the changes.
#!/bin/sh
cat <<EOF >> $HGRCPATH
[extensions]
schemes=
[schemes]
l = http://localhost:$HGPORT/
parts = http://{1}:$HGPORT/
EOF
hg init test
cd test
echo a > a
hg ci -Am initial
hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
cat hg.pid >> $DAEMON_PIDS
hg incoming l://
echo % check that {1} syntax works
hg incoming --debug parts://localhost | sed 's/[0-9]//g'
echo % errors
cat errors.log