view tests/test-diffstat @ 10185:7637fe4f525d stable

mq: preserve --git flag when merging patches

Without this, merging a patch queue without diff.git=1 downgrades all git
patches to regular patches, losing data in the process.

#!/bin/sh

hg init repo
cd repo
i=0; while [ "$i" -lt 213 ]; do echo a >> a; i=`expr $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