Mercurial > hg
view tests/test-serve @ 13134:ea3c93b53fdb stable
tag: fix uncommitted merge check and error message (issue2542)
This patch corrects the check for tagging on an uncommitted merge. We
should never commit a new tag changeset on an uncommitted merge, whether
or not --rev is specified. It also changes the error message from:
abort: cannot partially commit a merge (do not specify files or patterns)
to the much more accurate (and terse):
abort: uncommitted merge
Local tags are ok.
author | Kevin Bullock <kbullock@ringworld.org> |
---|---|
date | Tue, 07 Dec 2010 08:02:54 +0100 |
parents | fdb0983ad395 |
children |
line wrap: on
line source
#!/bin/sh hgserve() { hg serve -a localhost -d --pid-file=hg.pid -E errors.log -v $@ \ | sed -e "s/:$HGPORT1\\([^0-9]\\)/:HGPORT1\1/g" \ -e "s/:$HGPORT2\\([^0-9]\\)/:HGPORT2\1/g" \ -e 's/http:\/\/[^/]*\//http:\/\/localhost\//' cat hg.pid >> "$DAEMON_PIDS" echo % errors cat errors.log sleep 1 if [ "$KILLQUIETLY" = "Y" ]; then kill `cat hg.pid` 2>/dev/null else kill `cat hg.pid` fi sleep 1 } hg init test cd test echo '[web]' > .hg/hgrc echo 'accesslog = access.log' >> .hg/hgrc echo "port = $HGPORT1" >> .hg/hgrc echo % Without -v hg serve -a localhost -p $HGPORT -d --pid-file=hg.pid -E errors.log cat hg.pid >> "$DAEMON_PIDS" if [ -f access.log ]; then echo 'access log created - .hg/hgrc respected' fi echo % errors cat errors.log echo % With -v hgserve echo % With -v and -p HGPORT2 hgserve -p "$HGPORT2" echo '% With -v and -p daytime (should fail because low port)' KILLQUIETLY=Y hgserve -p daytime KILLQUIETLY=N echo % With --prefix foo hgserve --prefix foo echo % With --prefix /foo hgserve --prefix /foo echo % With --prefix foo/ hgserve --prefix foo/ echo % With --prefix /foo/ hgserve --prefix /foo/