##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

subrepo: avoids empty commit when .hgsubstate is dirty (issue2403)...
subrepo: avoids empty commit when .hgsubstate is dirty (issue2403) This patch avoids empty commit when .hgsubstate is dirty. Empty commit was caused by .hgsubstate being updated back to the state of the working copy parent when committing, if a user had changed it manually and not made any changes in subrepositories. The subrepository state from the working copies parent is compared with the state calculated as a result of trying to commit the subrepositories. If the two states are the same, then return None otherwise the commit is just done. The line: "committing subrepository x" will be written if there is nothing committed, but .hgsubstate is dirty for x subrepository.
Mads Kiilerich - - Load All Authors

File last commit:

r12578:fdb0983a default
r13155:f02d7a56 default
Show More
test-serve
58 lines | 1.2 KiB | text/plain | TextLexer
/ tests / test-serve
History | Annotation | Raw |Copy content |Copy permalink
#!/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/