Mercurial > hg
view tests/test-hgrc @ 11638:79231258503b stable
transplant: crash if repo.commit() finds nothing to commit
(makes issue2135, issue2264 more obvious, but does nothing to fix
either one)
This seems to happen in two distinct cases:
* patch.patch() claims success but changes nothing (e.g.
the transplanted changeset adds an empty file that already
exists)
* patch.patch() makes changes, but repo.status() fails to report them
Both of these seem like bugs in other parts of Mercurial, so arguably
it's not transplant's job to detect the failure to commit. However:
* detecting the problem as soon as possible is desirable
* it prevents a more obscure crash later, in transplants.write()
* there might be other lurking (or future) bugs that cause
repo.commit() to do nothing
Also, in the case of issue2264 (source changesets silently dropped by
transplant), the only way to spot the problem currently is the crash
in transplants.write(). Failure to transplant a patch should abort
immediately, whether it's user error (patch does not apply) or a
Mercurial bug (e.g. repo.status() failing to report changes).
author | Greg Ward <greg-hg@gerg.ca> |
---|---|
date | Sun, 18 Jul 2010 21:29:29 -0400 |
parents | d6dbd5e4ee72 |
children |
line wrap: on
line source
#!/bin/sh echo "invalid" > $HGRCPATH hg version 2>&1 | sed -e "s|$HGRCPATH|\$HGRCPATH|" echo "" > $HGRCPATH # issue1199: escaping hg init "foo%bar" hg clone "foo%bar" foobar p=`pwd` cd foobar cat .hg/hgrc | sed -e "s:$p:...:" hg paths | sed -e "s:$p:...:" hg showconfig | sed -e "s:$p:...:" cd .. # issue1829: wrong indentation echo '[foo]' > $HGRCPATH echo ' x = y' >> $HGRCPATH hg version 2>&1 | sed -e "s|$HGRCPATH|\$HGRCPATH|" python -c "print '[foo]\nbar = a\n b\n c \n de\n fg \nbaz = bif cb \n'" \ > $HGRCPATH hg showconfig foo FAKEPATH=/path/to/nowhere export FAKEPATH echo '%include $FAKEPATH/no-such-file' > $HGRCPATH hg version 2>&1 | sed -e "s|$HGRCPATH|\$HGRCPATH|" unset FAKEPATH echo "% username expansion" olduser=$HGUSER unset HGUSER FAKEUSER='John Doe' export FAKEUSER echo '[ui]' > $HGRCPATH echo 'username = $FAKEUSER' >> $HGRCPATH hg init usertest cd usertest touch bar hg commit --addremove --quiet -m "added bar" hg log --template "{author}\n" cd .. hg showconfig | sed -e "s:$p:...:" unset FAKEUSER HGUSER=$olduser export HGUSER # HGPLAIN cd .. p=`pwd` echo "[ui]" > $HGRCPATH echo "debug=true" >> $HGRCPATH echo "fallbackencoding=ASCII" >> $HGRCPATH echo "quiet=true" >> $HGRCPATH echo "slash=true" >> $HGRCPATH echo "traceback=true" >> $HGRCPATH echo "verbose=true" >> $HGRCPATH echo "style=~/.hgstyle" >> $HGRCPATH echo "logtemplate={node}" >> $HGRCPATH echo "[defaults]" >> $HGRCPATH echo "identify=-n" >> $HGRCPATH echo "[alias]" >> $HGRCPATH echo "log=log -g" >> $HGRCPATH echo '% customized hgrc' hg showconfig | sed -e "s:$p:...:" echo '% plain hgrc' HGPLAIN=; export HGPLAIN hg showconfig --config ui.traceback=True --debug | sed -e "s:$p:...:"