view tests/test-pull @ 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 38f2ef9c134b
children
line wrap: on
line source

#!/bin/sh

mkdir test
cd test
echo foo>foo
hg init
hg addremove
hg commit -m 1
hg verify
hg serve -p $HGPORT -d --pid-file=hg.pid
cat hg.pid >> $DAEMON_PIDS
cd ..

hg clone --pull http://foo:bar@localhost:$HGPORT/ copy | sed -e "s,:$HGPORT/,:\$HGPORT/,"
cd copy
hg verify
hg co
cat foo
hg manifest --debug
hg pull | sed -e "s,:$HGPORT/,:\$HGPORT/,"
hg rollback --dry-run --verbose | sed -e "s,:$HGPORT/,:\$HGPORT/,"

echo % issue 622
cd ..
hg init empty
cd empty
hg pull -u ../test

echo % test file: uri handling
hg pull -q file://../test-doesnt-exist 2>&1 \
    | sed 's%abort: repository.*/test-doesnt-exist%abort: repository /test-doesnt-exist%'
hg pull -q file:../test
# It's tricky to make file:// URLs working on every platforms
# with regular shell commands.
URL=`python -c "import os; print 'file://foobar' + ('/' + os.getcwd().replace(os.sep, '/')).replace('//', '/') + '/../test'"`
hg pull -q "$URL"