Mercurial > hg
view tests/test-serve @ 10505:b3311e26f94f stable
merge: fix --preview to show all nodes that will be merged (issue2043).
Formerly, it omitted nodes that were not descendants of the least
common ancestor of the two merge parents, even though those nodes
contribute to the merge. The new algorithm uses revlog.findmissing()
instead of ancestor() + nodesbetween().
author | Greg Ward <greg-hg@gerg.ca> |
---|---|
date | Mon, 15 Feb 2010 15:25:29 -0500 |
parents | eb69e7989145 |
children | 3318431f2ab4 |
line wrap: on
line source
#!/bin/sh hgserve() { hg serve -a localhost -p $HGPORT1 -d --pid-file=hg.pid -E errors.log -v $@ \ | sed -e 's/:[0-9][0-9]*//g' -e 's/http:\/\/[^/]*\//http:\/\/localhost\//' cat hg.pid >> "$DAEMON_PIDS" echo % errors cat errors.log sleep 1 kill `cat hg.pid` sleep 1 } hg init test cd test echo '[web]' > .hg/hgrc echo 'accesslog = access.log' >> .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 --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/