view tests/test-http @ 6297:fed1a9c22076

dirstate.remove: during merges, remember the previous file state

We encode the previous state as a negative file size (AFAICS, previous
versions of hg always have size == 0 when state == 'r').

We save the state of 'm'erged and dirty files, because they're the
two states that indicate that a file has to be committed on a merge
to correctly record per-file history.

#!/bin/sh

cp "$TESTDIR"/printenv.py .

hg init test
cd test
echo foo>foo
hg commit -A -d '0 0' -m 1
hg --config server.uncompressed=True serve -p $HGPORT -d --pid-file=../hg1.pid
hg serve -p $HGPORT1 -d --pid-file=../hg2.pid
# Test server address cannot be reused
hg serve -p $HGPORT1 2>&1 | sed -e "s/abort: cannot start server at ':$HGPORT1':.*/abort: cannot start server at ':20060':/"
cd ..
cat hg1.pid hg2.pid >> $DAEMON_PIDS

echo % clone via stream
http_proxy= hg clone --uncompressed http://localhost:$HGPORT/ copy 2>&1 | \
  sed -e 's/[0-9][0-9.]*/XXX/g' -e 's/[KM]\(B\/sec\)/X\1/'
hg verify -R copy

echo % try to clone via stream, should use pull instead
http_proxy= hg clone --uncompressed http://localhost:$HGPORT1/ copy2

echo % clone via pull
http_proxy= hg clone http://localhost:$HGPORT1/ copy-pull
hg verify -R copy-pull

cd test
echo bar > bar
hg commit -A -d '1 0' -m 2
cd ..

echo % pull
cd copy-pull
echo '[hooks]' >> .hg/hgrc
echo 'changegroup = python ../printenv.py changegroup' >> .hg/hgrc
hg pull | sed -e 's,:[0-9][0-9]*/,/,'
cd ..