view tests/test-identify @ 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

"$TESTDIR/hghave" no-outer-repo || exit 80

echo % no repo
hg id

echo % create repo
hg init test
cd test
echo a > a
hg ci -Ama

echo % basic id usage
hg id
hg id --debug
hg id -q
hg id -v

echo % with options
hg id -r.
hg id -n
hg id -t
hg id -b
hg id -i
hg id -n -t -b -i

echo % with modifications
echo b > a
hg id -n -t -b -i

echo % other local repo
cd ..
hg -R test id
hg id test

echo % with remote http repo
cd test
hg serve -p $HGPORT1 -d --pid-file=hg.pid
cat hg.pid >> $DAEMON_PIDS
hg id http://localhost:$HGPORT1/

echo % remote with tags?
hg id -t http://localhost:$HGPORT1/

true # ends with util.Abort -> returns 255