view tests/test-hgweb-filelog @ 9717:68a1b9d0663e

update: allow branch crossing without -c or -C, with no uncommitted changes

Update will now allow crossing branches within the same named branch,
when given a specific revision, if the working dir is clean, without
requiring the -c or -C option. Abort if no revision is given and
this would cross branches.  Minor change to abort message if
uncommitted changes are found.

Modify test-update-branches and output to reflect the altered case. Modify
test-merge5.out to reflect the altered case. Modify
test-up-local-change.out with new message.

#!/bin/sh

hg init test
cd test

echo b > b
hg ci -Am "b"

echo a > a
hg ci -Am "first a"

hg rm a
hg ci -m "del a"

echo b > a
hg ci -Am "second a"

hg rm a
hg ci -m "del2 a"

hg mv b c
hg ci -m "mv b"

echo c >> c
hg ci -m "change c"

hg log -p

hg serve -n test -p $HGPORT -d --pid-file=hg.pid -E errors.log
cat hg.pid >> $DAEMON_PIDS

echo % tip - two revisions
("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/log/tip/a')

echo % second version - two revisions
("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/log/3/a')

echo % first deleted - one revision
("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/log/2/a')

echo % first version - one revision
("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/log/1/a')

echo % before addition - error
("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/log/0/a')

echo % should show base link, use spartan because it shows it
("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/log/tip/c?style=spartan')

echo % errors
cat errors.log