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

echo "[extensions]" >> $HGRCPATH
echo "color=" >> $HGRCPATH

hg init repo
cd repo
cat > a <<EOF
c
c
a
a
b
a
a
c
c
EOF
hg ci -Am adda
cat > a <<EOF
c
c
a
a
dd
a
a
c
c
EOF

echo '% default context'
hg diff --nodates --color=always

echo '% --unified=2'
hg diff --nodates -U 2  --color=always

echo '% diffstat'
hg diff --stat --color=always

echo "record=" >> $HGRCPATH
echo "[ui]" >> $HGRCPATH
echo "interactive=true" >> $HGRCPATH
echo "[diff]" >> $HGRCPATH
echo "git=True" >> $HGRCPATH

echo % record
chmod 0755 a
hg record --color=always -m moda a <<EOF
y
y
EOF
echo

echo "[extensions]" >> $HGRCPATH
echo "mq=" >> $HGRCPATH

hg rollback
echo % qrecord
hg qrecord --color=always -m moda patch <<EOF
y
y
EOF
echo