mirror of
https://github.com/git/git.git
synced 2024-10-30 05:47:53 +01:00
dc801e71a7
Number of columns required for change counts is now computed based on the maximum number of changed lines instead of being fixed. This means that usually a few more columns will be available for the filenames and the graph. The graph width logic is also modified to include enough space for "Bin XXX -> YYY bytes". If changes to binary files are mixed with changes to text files, change counts are padded to take at least three columns. And the other way around, if change counts require more than three columns, then "Bin"s are padded to align with the change count. This way, the +- part starts in the same column as "XXX -> YYY" part for binary files. This makes the graph easier to parse visually thanks to the empty column. This mimics the layout of diff --stat before this change. Tests and the tutorial are updated to reflect the new --stat output. This means either the removal of extra padding and/or the addition of up to three extra characters to truncated filenames. One test is added to check the graph alignment when a binary file change and text file change of more than 999 lines are committed together. Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> Signed-off-by: Junio C Hamano <gitster@pobox.com>
89 lines
2.4 KiB
Bash
Executable file
89 lines
2.4 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2007 Junio C Hamano
|
|
#
|
|
|
|
test_description='Quoting paths in diff output.
|
|
'
|
|
|
|
. ./test-lib.sh
|
|
|
|
P0='pathname'
|
|
P1='pathname with HT'
|
|
P2='pathname with SP'
|
|
P3='pathname
|
|
with LF'
|
|
if : 2>/dev/null >"$P1" && test -f "$P1" && rm -f "$P1"
|
|
then
|
|
test_set_prereq TABS_IN_FILENAMES
|
|
else
|
|
say 'Your filesystem does not allow tabs in filenames'
|
|
fi
|
|
|
|
test_expect_success TABS_IN_FILENAMES setup '
|
|
echo P0.0 >"$P0.0" &&
|
|
echo P0.1 >"$P0.1" &&
|
|
echo P0.2 >"$P0.2" &&
|
|
echo P0.3 >"$P0.3" &&
|
|
echo P1.0 >"$P1.0" &&
|
|
echo P1.2 >"$P1.2" &&
|
|
echo P1.3 >"$P1.3" &&
|
|
git add . &&
|
|
git commit -m initial &&
|
|
git mv "$P0.0" "R$P0.0" &&
|
|
git mv "$P0.1" "R$P1.0" &&
|
|
git mv "$P0.2" "R$P2.0" &&
|
|
git mv "$P0.3" "R$P3.0" &&
|
|
git mv "$P1.0" "R$P0.1" &&
|
|
git mv "$P1.2" "R$P2.1" &&
|
|
git mv "$P1.3" "R$P3.1" &&
|
|
:
|
|
'
|
|
|
|
test_expect_success TABS_IN_FILENAMES 'setup expected files' '
|
|
cat >expect <<\EOF
|
|
rename pathname.1 => "Rpathname\twith HT.0" (100%)
|
|
rename pathname.3 => "Rpathname\nwith LF.0" (100%)
|
|
rename "pathname\twith HT.3" => "Rpathname\nwith LF.1" (100%)
|
|
rename pathname.2 => Rpathname with SP.0 (100%)
|
|
rename "pathname\twith HT.2" => Rpathname with SP.1 (100%)
|
|
rename pathname.0 => Rpathname.0 (100%)
|
|
rename "pathname\twith HT.0" => Rpathname.1 (100%)
|
|
EOF
|
|
'
|
|
|
|
test_expect_success TABS_IN_FILENAMES 'git diff --summary -M HEAD' '
|
|
git diff --summary -M HEAD >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success TABS_IN_FILENAMES 'git diff --numstat -M HEAD' '
|
|
cat >expect <<-\EOF &&
|
|
0 0 pathname.1 => "Rpathname\twith HT.0"
|
|
0 0 pathname.3 => "Rpathname\nwith LF.0"
|
|
0 0 "pathname\twith HT.3" => "Rpathname\nwith LF.1"
|
|
0 0 pathname.2 => Rpathname with SP.0
|
|
0 0 "pathname\twith HT.2" => Rpathname with SP.1
|
|
0 0 pathname.0 => Rpathname.0
|
|
0 0 "pathname\twith HT.0" => Rpathname.1
|
|
EOF
|
|
git diff --numstat -M HEAD >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success TABS_IN_FILENAMES 'git diff --stat -M HEAD' '
|
|
cat >expect <<-\EOF &&
|
|
pathname.1 => "Rpathname\twith HT.0" | 0
|
|
pathname.3 => "Rpathname\nwith LF.0" | 0
|
|
"pathname\twith HT.3" => "Rpathname\nwith LF.1" | 0
|
|
pathname.2 => Rpathname with SP.0 | 0
|
|
"pathname\twith HT.2" => Rpathname with SP.1 | 0
|
|
pathname.0 => Rpathname.0 | 0
|
|
"pathname\twith HT.0" => Rpathname.1 | 0
|
|
7 files changed, 0 insertions(+), 0 deletions(-)
|
|
EOF
|
|
git diff --stat -M HEAD >actual &&
|
|
test_i18ncmp expect actual
|
|
'
|
|
|
|
test_done
|