view tests/test-diffstat @ 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 repo
cd repo
i=0; while [ "$i" -lt 213 ]; do echo a >> a; i=$(($i + 1)); done
hg add a

echo '% wide diffstat'
hg diff --stat

echo '% diffstat width'
COLUMNS=24 hg diff --config ui.interactive=true --stat

hg ci -m adda

cat >> a <<EOF
a
a
a
EOF

echo '% narrow diffstat'
hg diff --stat

hg ci -m appenda

printf '\0' > b
hg add b

echo '% binary diffstat'
hg diff --stat

echo '% binary git diffstat'
hg diff --stat --git