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
"$TESTDIR/hghave" gpg || exit 80
cat <<EOF >> $HGRCPATH
[extensions]
gpg=
[gpg]
cmd=gpg --no-permission-warning --no-secmem-warning --homedir $TESTDIR/gpg
EOF
hg init r
cd r
echo foo > foo
hg ci -Amfoo
echo '% no signatures'
hg sigs
echo '% hg sign 0'
hg sign 0
echo '% hg sigs'
hg sigs
echo '% hg sigcheck 0'
hg sigcheck 0