##// END OF EJS Templates
prepush: add more precise error messages...
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.

File last commit:

r9590:07a62819 default
r10396:65a90c8e default
Show More
test-mq-qpush-fail
62 lines | 1.1 KiB | text/plain | TextLexer
/ tests / test-mq-qpush-fail
Alexis S. L. Carvalho
mq: test that qpush cleans things up when it fails
r4658 #!/bin/sh
# Test that qpush cleans things up if it doesn't complete
echo "[extensions]" >> $HGRCPATH
echo "mq=" >> $HGRCPATH
hg init repo
cd repo
echo foo > foo
Martin Geisler
tests: removed redundant "-d '0 0'" from test scripts...
r8167 hg ci -Am 'add foo'
Alexis S. L. Carvalho
mq: test that qpush cleans things up when it fails
r4658
touch untracked-file
echo 'syntax: glob' > .hgignore
echo '.hgignore' >> .hgignore
hg qinit
Adrian Buehlmann
mq: eliminate warning on qpush with empty series...
r8795
echo '% test qpush on empty series'
hg qpush
Alexis S. L. Carvalho
mq: test that qpush cleans things up when it fails
r4658 hg qnew patch1
echo >> foo
hg qrefresh -m 'patch 1'
hg qnew patch2
echo bar > bar
hg add bar
hg qrefresh -m 'patch 2'
hg qnew bad-patch
echo >> foo
hg qrefresh
hg qpop -a
python -c 'print "\xe9"' > message
cat .hg/patches/bad-patch >> message
mv message .hg/patches/bad-patch
hg qpush -a && echo 'qpush succeded?!'
hg parents
echo '% bar should be gone; other unknown/ignored files should still be around'
hg status -A
Dirkjan Ochtman
mq: fix error message for qpush inexistent-patch (issue1702)
r8875
echo '% preparing qpush of a missing patch'
hg qpop -a
hg qpush
rm .hg/patches/patch2
echo '% now we expect the push to fail, but it should NOT complain about patch1'
hg qpush
Benoit Allard
mq: fix traceback for qpush inexistant-patch with no patch applied
r9590 echo '% preparing qpush of missing patch with no patch applied'
hg qpop -a
rm .hg/patches/patch1
echo '% qpush should fail the same way as below'
hg qpush
Dirkjan Ochtman
mq: fix error message for qpush inexistent-patch (issue1702)
r8875 true # happy ending