2012-03-01 16:26:38 +04:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2012 Zbigniew Jędrzejewski-Szmek
|
|
|
|
#
|
|
|
|
|
|
|
|
test_description='test --stat output of various commands'
|
|
|
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
. "$TEST_DIRECTORY"/lib-terminal.sh
|
|
|
|
|
|
|
|
# 120 character name
|
|
|
|
name=aaaaaaaaaa
|
|
|
|
name=$name$name$name$name$name$name$name$name$name$name$name$name
|
|
|
|
test_expect_success 'preparation' '
|
|
|
|
>"$name" &&
|
|
|
|
git add "$name" &&
|
|
|
|
git commit -m message &&
|
|
|
|
echo a >"$name" &&
|
|
|
|
git commit -m message "$name"
|
|
|
|
'
|
|
|
|
|
2018-02-01 15:47:50 +03:00
|
|
|
cat >expect72 <<-'EOF'
|
|
|
|
...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1 +
|
|
|
|
EOF
|
|
|
|
test_expect_success "format-patch: small change with long name gives more space to the name" '
|
|
|
|
git format-patch -1 --stdout >output &&
|
|
|
|
grep " | " output >actual &&
|
|
|
|
test_cmp expect72 actual
|
|
|
|
'
|
|
|
|
|
2012-03-01 16:26:38 +04:00
|
|
|
while read cmd args
|
|
|
|
do
|
2018-02-01 15:47:50 +03:00
|
|
|
cat >expect80 <<-'EOF'
|
2012-05-01 00:38:58 +04:00
|
|
|
...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1 +
|
2012-03-01 16:26:38 +04:00
|
|
|
EOF
|
2012-03-01 16:26:43 +04:00
|
|
|
test_expect_success "$cmd: small change with long name gives more space to the name" '
|
2012-03-01 16:26:38 +04:00
|
|
|
git $cmd $args >output &&
|
|
|
|
grep " | " output >actual &&
|
2018-02-01 15:47:50 +03:00
|
|
|
test_cmp expect80 actual
|
2012-03-01 16:26:38 +04:00
|
|
|
'
|
2018-02-01 15:47:50 +03:00
|
|
|
done <<\EOF
|
|
|
|
diff HEAD^ HEAD --stat
|
|
|
|
show --stat
|
|
|
|
log -1 --stat
|
|
|
|
EOF
|
2012-03-01 16:26:38 +04:00
|
|
|
|
2018-02-01 15:47:50 +03:00
|
|
|
while read cmd args
|
|
|
|
do
|
2012-03-01 16:26:38 +04:00
|
|
|
cat >expect <<-'EOF'
|
2012-05-01 00:38:58 +04:00
|
|
|
...aaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1 +
|
2012-03-01 16:26:38 +04:00
|
|
|
EOF
|
2012-03-01 16:26:43 +04:00
|
|
|
test_expect_success "$cmd --stat=width: a long name is given more room when the bar is short" '
|
2012-03-01 16:26:38 +04:00
|
|
|
git $cmd $args --stat=40 >output &&
|
|
|
|
grep " | " output >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success "$cmd --stat-width=width with long name" '
|
|
|
|
git $cmd $args --stat-width=40 >output &&
|
|
|
|
grep " | " output >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
cat >expect <<-'EOF'
|
2012-05-01 00:38:58 +04:00
|
|
|
...aaaaaaaaaaaaaaaaaaaaaaaaaaa | 1 +
|
2012-03-01 16:26:38 +04:00
|
|
|
EOF
|
|
|
|
test_expect_success "$cmd --stat=...,name-width with long name" '
|
|
|
|
git $cmd $args --stat=60,30 >output &&
|
|
|
|
grep " | " output >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success "$cmd --stat-name-width with long name" '
|
|
|
|
git $cmd $args --stat-name-width=30 >output &&
|
|
|
|
grep " | " output >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
done <<\EOF
|
|
|
|
format-patch -1 --stdout
|
|
|
|
diff HEAD^ HEAD --stat
|
|
|
|
show --stat
|
|
|
|
log -1 --stat
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
|
|
test_expect_success 'preparation for big change tests' '
|
|
|
|
>abcd &&
|
|
|
|
git add abcd &&
|
|
|
|
git commit -m message &&
|
|
|
|
i=0 &&
|
|
|
|
while test $i -lt 1000
|
|
|
|
do
|
|
|
|
echo $i && i=$(($i + 1))
|
|
|
|
done >abcd &&
|
|
|
|
git commit -m message abcd
|
|
|
|
'
|
|
|
|
|
2018-02-01 15:47:50 +03:00
|
|
|
cat >expect72 <<'EOF'
|
|
|
|
abcd | 1000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
2012-03-01 16:26:38 +04:00
|
|
|
EOF
|
2018-02-01 15:47:50 +03:00
|
|
|
cat >expect72-graph <<'EOF'
|
|
|
|
| abcd | 1000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
2012-04-16 14:44:49 +04:00
|
|
|
EOF
|
diff --stat: use the full terminal width
Default to the real terminal width for diff --stat output, instead
of the hard-coded 80 columns.
Some projects (especially in Java), have long filename paths, with
nested directories or long individual filenames. When files are
renamed, the filename part in stat output can be almost useless. If
the middle part between { and } is long (because the file was moved to
a completely different directory), then most of the path would be
truncated.
It makes sense to detect and use the full terminal width and display
full filenames if possible.
The are commands like diff, show, and log, which can adapt the output
to the terminal width. There are also commands like format-patch,
whose output should be independent of the terminal width. Since it is
safer to use the 80-column default, the real terminal width is only
used if requested by the calling code by setting diffopts.stat_width=-1.
Normally this value is 0, and can be set by the user only to a
non-negative value, so -1 is safe to use internally.
This patch only changes the diff builtin to use the full terminal width.
Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-03-01 16:26:39 +04:00
|
|
|
cat >expect200 <<'EOF'
|
|
|
|
abcd | 1000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
|
|
EOF
|
2012-04-16 14:44:49 +04:00
|
|
|
cat >expect200-graph <<'EOF'
|
2012-04-16 14:44:52 +04:00
|
|
|
| abcd | 1000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
2012-04-16 14:44:49 +04:00
|
|
|
EOF
|
2012-03-01 16:26:38 +04:00
|
|
|
while read verb expect cmd args
|
|
|
|
do
|
|
|
|
test_expect_success "$cmd $verb COLUMNS (big change)" '
|
2015-03-20 13:06:44 +03:00
|
|
|
COLUMNS=200 git $cmd $args >output &&
|
2012-03-01 16:26:38 +04:00
|
|
|
grep " | " output >actual &&
|
|
|
|
test_cmp "$expect" actual
|
|
|
|
'
|
2012-04-16 14:44:49 +04:00
|
|
|
|
2015-03-11 05:13:02 +03:00
|
|
|
case "$cmd" in diff|show) continue;; esac
|
2012-04-16 14:44:49 +04:00
|
|
|
|
|
|
|
test_expect_success "$cmd --graph $verb COLUMNS (big change)" '
|
2015-03-20 13:06:44 +03:00
|
|
|
COLUMNS=200 git $cmd $args --graph >output &&
|
2012-04-16 14:44:49 +04:00
|
|
|
grep " | " output >actual &&
|
|
|
|
test_cmp "$expect-graph" actual
|
|
|
|
'
|
2012-03-01 16:26:38 +04:00
|
|
|
done <<\EOF
|
2018-02-01 15:47:50 +03:00
|
|
|
ignores expect72 format-patch -1 --stdout
|
diff --stat: use the full terminal width
Default to the real terminal width for diff --stat output, instead
of the hard-coded 80 columns.
Some projects (especially in Java), have long filename paths, with
nested directories or long individual filenames. When files are
renamed, the filename part in stat output can be almost useless. If
the middle part between { and } is long (because the file was moved to
a completely different directory), then most of the path would be
truncated.
It makes sense to detect and use the full terminal width and display
full filenames if possible.
The are commands like diff, show, and log, which can adapt the output
to the terminal width. There are also commands like format-patch,
whose output should be independent of the terminal width. Since it is
safer to use the 80-column default, the real terminal width is only
used if requested by the calling code by setting diffopts.stat_width=-1.
Normally this value is 0, and can be set by the user only to a
non-negative value, so -1 is safe to use internally.
This patch only changes the diff builtin to use the full terminal width.
Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-03-01 16:26:39 +04:00
|
|
|
respects expect200 diff HEAD^ HEAD --stat
|
2012-03-01 16:26:40 +04:00
|
|
|
respects expect200 show --stat
|
2012-03-01 16:26:41 +04:00
|
|
|
respects expect200 log -1 --stat
|
2012-03-01 16:26:38 +04:00
|
|
|
EOF
|
|
|
|
|
2012-03-01 16:26:44 +04:00
|
|
|
cat >expect40 <<'EOF'
|
|
|
|
abcd | 1000 ++++++++++++++++++++++++++
|
|
|
|
EOF
|
2012-04-16 14:44:49 +04:00
|
|
|
cat >expect40-graph <<'EOF'
|
2012-04-16 14:44:52 +04:00
|
|
|
| abcd | 1000 ++++++++++++++++++++++++
|
2012-04-16 14:44:49 +04:00
|
|
|
EOF
|
2012-03-01 16:26:44 +04:00
|
|
|
while read verb expect cmd args
|
|
|
|
do
|
|
|
|
test_expect_success "$cmd $verb not enough COLUMNS (big change)" '
|
2015-03-20 13:06:44 +03:00
|
|
|
COLUMNS=40 git $cmd $args >output &&
|
2012-03-01 16:26:44 +04:00
|
|
|
grep " | " output >actual &&
|
|
|
|
test_cmp "$expect" actual
|
|
|
|
'
|
2012-03-01 16:26:46 +04:00
|
|
|
|
2015-03-11 05:13:02 +03:00
|
|
|
case "$cmd" in diff|show) continue;; esac
|
2012-04-16 14:44:49 +04:00
|
|
|
|
|
|
|
test_expect_success "$cmd --graph $verb not enough COLUMNS (big change)" '
|
2015-03-20 13:06:44 +03:00
|
|
|
COLUMNS=40 git $cmd $args --graph >output &&
|
2012-04-16 14:44:49 +04:00
|
|
|
grep " | " output >actual &&
|
|
|
|
test_cmp "$expect-graph" actual
|
|
|
|
'
|
2012-04-16 14:44:52 +04:00
|
|
|
done <<\EOF
|
2018-02-01 15:47:50 +03:00
|
|
|
ignores expect72 format-patch -1 --stdout
|
2012-04-16 14:44:52 +04:00
|
|
|
respects expect40 diff HEAD^ HEAD --stat
|
|
|
|
respects expect40 show --stat
|
|
|
|
respects expect40 log -1 --stat
|
|
|
|
EOF
|
|
|
|
|
|
|
|
cat >expect40 <<'EOF'
|
|
|
|
abcd | 1000 ++++++++++++++++++++++++++
|
|
|
|
EOF
|
|
|
|
cat >expect40-graph <<'EOF'
|
|
|
|
| abcd | 1000 ++++++++++++++++++++++++++
|
|
|
|
EOF
|
|
|
|
while read verb expect cmd args
|
|
|
|
do
|
|
|
|
test_expect_success "$cmd $verb statGraphWidth config" '
|
2015-03-20 13:06:44 +03:00
|
|
|
git -c diff.statGraphWidth=26 $cmd $args >output &&
|
2012-04-16 14:44:52 +04:00
|
|
|
grep " | " output >actual &&
|
|
|
|
test_cmp "$expect" actual
|
|
|
|
'
|
|
|
|
|
2015-03-11 05:13:02 +03:00
|
|
|
case "$cmd" in diff|show) continue;; esac
|
2012-04-16 14:44:49 +04:00
|
|
|
|
|
|
|
test_expect_success "$cmd --graph $verb statGraphWidth config" '
|
2015-03-20 13:06:44 +03:00
|
|
|
git -c diff.statGraphWidth=26 $cmd $args --graph >output &&
|
2012-04-16 14:44:49 +04:00
|
|
|
grep " | " output >actual &&
|
|
|
|
test_cmp "$expect-graph" actual
|
|
|
|
'
|
2012-03-01 16:26:44 +04:00
|
|
|
done <<\EOF
|
2018-02-01 15:47:50 +03:00
|
|
|
ignores expect72 format-patch -1 --stdout
|
2012-03-01 16:26:44 +04:00
|
|
|
respects expect40 diff HEAD^ HEAD --stat
|
|
|
|
respects expect40 show --stat
|
|
|
|
respects expect40 log -1 --stat
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
2012-03-01 16:26:38 +04:00
|
|
|
cat >expect <<'EOF'
|
|
|
|
abcd | 1000 ++++++++++++++++++++++++++
|
|
|
|
EOF
|
2012-04-16 14:44:49 +04:00
|
|
|
cat >expect-graph <<'EOF'
|
|
|
|
| abcd | 1000 ++++++++++++++++++++++++++
|
|
|
|
EOF
|
2012-03-01 16:26:38 +04:00
|
|
|
while read cmd args
|
|
|
|
do
|
|
|
|
test_expect_success "$cmd --stat=width with big change" '
|
2015-03-20 13:06:44 +03:00
|
|
|
git $cmd $args --stat=40 >output &&
|
2012-03-01 16:26:38 +04:00
|
|
|
grep " | " output >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success "$cmd --stat-width=width with big change" '
|
2015-03-20 13:06:44 +03:00
|
|
|
git $cmd $args --stat-width=40 >output &&
|
2012-03-01 16:26:38 +04:00
|
|
|
grep " | " output >actual &&
|
|
|
|
test_cmp expect actual
|
2012-03-01 16:26:45 +04:00
|
|
|
'
|
|
|
|
|
2012-04-16 14:44:49 +04:00
|
|
|
test_expect_success "$cmd --stat-graph-width with big change" '
|
2015-03-20 13:06:44 +03:00
|
|
|
git $cmd $args --stat-graph-width=26 >output &&
|
2012-03-01 16:26:45 +04:00
|
|
|
grep " | " output >actual &&
|
|
|
|
test_cmp expect actual
|
2012-03-01 16:26:38 +04:00
|
|
|
'
|
2012-04-16 14:44:49 +04:00
|
|
|
|
2015-03-11 05:13:02 +03:00
|
|
|
case "$cmd" in diff|show) continue;; esac
|
2012-04-16 14:44:49 +04:00
|
|
|
|
|
|
|
test_expect_success "$cmd --stat-width=width --graph with big change" '
|
2015-03-20 13:06:44 +03:00
|
|
|
git $cmd $args --stat-width=40 --graph >output &&
|
2012-04-16 14:44:49 +04:00
|
|
|
grep " | " output >actual &&
|
|
|
|
test_cmp expect-graph actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success "$cmd --stat-graph-width --graph with big change" '
|
2015-03-20 13:06:44 +03:00
|
|
|
git $cmd $args --stat-graph-width=26 --graph >output &&
|
2012-04-16 14:44:49 +04:00
|
|
|
grep " | " output >actual &&
|
|
|
|
test_cmp expect-graph actual
|
|
|
|
'
|
2012-03-01 16:26:38 +04:00
|
|
|
done <<\EOF
|
|
|
|
format-patch -1 --stdout
|
|
|
|
diff HEAD^ HEAD --stat
|
|
|
|
show --stat
|
|
|
|
log -1 --stat
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'preparation for long filename tests' '
|
|
|
|
cp abcd aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa &&
|
|
|
|
git add aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa &&
|
|
|
|
git commit -m message
|
|
|
|
'
|
|
|
|
|
|
|
|
cat >expect <<'EOF'
|
2012-03-01 16:26:43 +04:00
|
|
|
...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1000 ++++++++++++
|
2012-03-01 16:26:38 +04:00
|
|
|
EOF
|
2012-04-16 14:44:49 +04:00
|
|
|
cat >expect-graph <<'EOF'
|
|
|
|
| ...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1000 ++++++++++++
|
|
|
|
EOF
|
2012-03-01 16:26:38 +04:00
|
|
|
while read cmd args
|
|
|
|
do
|
2012-03-01 16:26:43 +04:00
|
|
|
test_expect_success "$cmd --stat=width with big change is more balanced" '
|
2012-03-01 16:26:38 +04:00
|
|
|
git $cmd $args --stat-width=60 >output &&
|
|
|
|
grep " | " output >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
2012-04-16 14:44:49 +04:00
|
|
|
|
2015-03-11 05:13:02 +03:00
|
|
|
case "$cmd" in diff|show) continue;; esac
|
2012-04-16 14:44:49 +04:00
|
|
|
|
|
|
|
test_expect_success "$cmd --stat=width --graph with big change is balanced" '
|
|
|
|
git $cmd $args --stat-width=60 --graph >output &&
|
|
|
|
grep " | " output >actual &&
|
|
|
|
test_cmp expect-graph actual
|
|
|
|
'
|
2012-03-01 16:26:38 +04:00
|
|
|
done <<\EOF
|
|
|
|
format-patch -1 --stdout
|
|
|
|
diff HEAD^ HEAD --stat
|
|
|
|
show --stat
|
|
|
|
log -1 --stat
|
|
|
|
EOF
|
|
|
|
|
2018-02-01 15:47:50 +03:00
|
|
|
cat >expect72 <<'EOF'
|
|
|
|
...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1000 +++++++++++++++++
|
2012-03-01 16:26:38 +04:00
|
|
|
EOF
|
2018-02-01 15:47:50 +03:00
|
|
|
cat >expect72-graph <<'EOF'
|
|
|
|
| ...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1000 +++++++++++++++++
|
2012-04-16 14:44:49 +04:00
|
|
|
EOF
|
diff --stat: use the full terminal width
Default to the real terminal width for diff --stat output, instead
of the hard-coded 80 columns.
Some projects (especially in Java), have long filename paths, with
nested directories or long individual filenames. When files are
renamed, the filename part in stat output can be almost useless. If
the middle part between { and } is long (because the file was moved to
a completely different directory), then most of the path would be
truncated.
It makes sense to detect and use the full terminal width and display
full filenames if possible.
The are commands like diff, show, and log, which can adapt the output
to the terminal width. There are also commands like format-patch,
whose output should be independent of the terminal width. Since it is
safer to use the 80-column default, the real terminal width is only
used if requested by the calling code by setting diffopts.stat_width=-1.
Normally this value is 0, and can be set by the user only to a
non-negative value, so -1 is safe to use internally.
This patch only changes the diff builtin to use the full terminal width.
Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-03-01 16:26:39 +04:00
|
|
|
cat >expect200 <<'EOF'
|
2012-03-01 16:26:43 +04:00
|
|
|
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1000 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
diff --stat: use the full terminal width
Default to the real terminal width for diff --stat output, instead
of the hard-coded 80 columns.
Some projects (especially in Java), have long filename paths, with
nested directories or long individual filenames. When files are
renamed, the filename part in stat output can be almost useless. If
the middle part between { and } is long (because the file was moved to
a completely different directory), then most of the path would be
truncated.
It makes sense to detect and use the full terminal width and display
full filenames if possible.
The are commands like diff, show, and log, which can adapt the output
to the terminal width. There are also commands like format-patch,
whose output should be independent of the terminal width. Since it is
safer to use the 80-column default, the real terminal width is only
used if requested by the calling code by setting diffopts.stat_width=-1.
Normally this value is 0, and can be set by the user only to a
non-negative value, so -1 is safe to use internally.
This patch only changes the diff builtin to use the full terminal width.
Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-03-01 16:26:39 +04:00
|
|
|
EOF
|
2012-04-16 14:44:49 +04:00
|
|
|
cat >expect200-graph <<'EOF'
|
2012-04-16 14:44:52 +04:00
|
|
|
| aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1000 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
2012-04-16 14:44:49 +04:00
|
|
|
EOF
|
2012-03-01 16:26:38 +04:00
|
|
|
while read verb expect cmd args
|
|
|
|
do
|
|
|
|
test_expect_success "$cmd $verb COLUMNS (long filename)" '
|
2015-03-20 13:06:44 +03:00
|
|
|
COLUMNS=200 git $cmd $args >output &&
|
2012-03-01 16:26:38 +04:00
|
|
|
grep " | " output >actual &&
|
|
|
|
test_cmp "$expect" actual
|
|
|
|
'
|
2012-04-16 14:44:49 +04:00
|
|
|
|
2015-03-11 05:13:02 +03:00
|
|
|
case "$cmd" in diff|show) continue;; esac
|
2012-04-16 14:44:49 +04:00
|
|
|
|
|
|
|
test_expect_success "$cmd --graph $verb COLUMNS (long filename)" '
|
2015-03-20 13:06:44 +03:00
|
|
|
COLUMNS=200 git $cmd $args --graph >output &&
|
2012-04-16 14:44:49 +04:00
|
|
|
grep " | " output >actual &&
|
|
|
|
test_cmp "$expect-graph" actual
|
|
|
|
'
|
2012-03-01 16:26:38 +04:00
|
|
|
done <<\EOF
|
2018-02-01 15:47:50 +03:00
|
|
|
ignores expect72 format-patch -1 --stdout
|
diff --stat: use the full terminal width
Default to the real terminal width for diff --stat output, instead
of the hard-coded 80 columns.
Some projects (especially in Java), have long filename paths, with
nested directories or long individual filenames. When files are
renamed, the filename part in stat output can be almost useless. If
the middle part between { and } is long (because the file was moved to
a completely different directory), then most of the path would be
truncated.
It makes sense to detect and use the full terminal width and display
full filenames if possible.
The are commands like diff, show, and log, which can adapt the output
to the terminal width. There are also commands like format-patch,
whose output should be independent of the terminal width. Since it is
safer to use the 80-column default, the real terminal width is only
used if requested by the calling code by setting diffopts.stat_width=-1.
Normally this value is 0, and can be set by the user only to a
non-negative value, so -1 is safe to use internally.
This patch only changes the diff builtin to use the full terminal width.
Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-03-01 16:26:39 +04:00
|
|
|
respects expect200 diff HEAD^ HEAD --stat
|
2012-03-01 16:26:40 +04:00
|
|
|
respects expect200 show --stat
|
2012-03-01 16:26:41 +04:00
|
|
|
respects expect200 log -1 --stat
|
2012-03-01 16:26:38 +04:00
|
|
|
EOF
|
|
|
|
|
2012-04-19 01:09:33 +04:00
|
|
|
cat >expect1 <<'EOF'
|
|
|
|
...aaaaaaa | 1000 ++++++
|
|
|
|
EOF
|
|
|
|
cat >expect1-graph <<'EOF'
|
|
|
|
| ...aaaaaaa | 1000 ++++++
|
|
|
|
EOF
|
2012-04-19 01:12:18 +04:00
|
|
|
while read verb expect cmd args
|
2012-04-19 01:09:33 +04:00
|
|
|
do
|
2012-04-27 13:25:25 +04:00
|
|
|
test_expect_success COLUMNS_CAN_BE_1 \
|
|
|
|
"$cmd $verb prefix greater than COLUMNS (big change)" '
|
2015-03-20 13:06:44 +03:00
|
|
|
COLUMNS=1 git $cmd $args >output &&
|
2012-04-19 01:09:33 +04:00
|
|
|
grep " | " output >actual &&
|
|
|
|
test_cmp "$expect" actual
|
|
|
|
'
|
|
|
|
|
2015-03-11 05:13:02 +03:00
|
|
|
case "$cmd" in diff|show) continue;; esac
|
2012-04-19 01:09:33 +04:00
|
|
|
|
2012-04-27 13:25:25 +04:00
|
|
|
test_expect_success COLUMNS_CAN_BE_1 \
|
|
|
|
"$cmd --graph $verb prefix greater than COLUMNS (big change)" '
|
2015-03-20 13:06:44 +03:00
|
|
|
COLUMNS=1 git $cmd $args --graph >output &&
|
2012-04-19 01:09:33 +04:00
|
|
|
grep " | " output >actual &&
|
|
|
|
test_cmp "$expect-graph" actual
|
|
|
|
'
|
|
|
|
done <<\EOF
|
2018-02-01 15:47:50 +03:00
|
|
|
ignores expect72 format-patch -1 --stdout
|
2012-04-19 01:12:18 +04:00
|
|
|
respects expect1 diff HEAD^ HEAD --stat
|
|
|
|
respects expect1 show --stat
|
|
|
|
respects expect1 log -1 --stat
|
2012-04-19 01:09:33 +04:00
|
|
|
EOF
|
|
|
|
|
2012-03-01 16:26:38 +04:00
|
|
|
cat >expect <<'EOF'
|
2012-03-01 16:26:42 +04:00
|
|
|
abcd | 1000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
2012-03-01 16:26:38 +04:00
|
|
|
EOF
|
2012-03-01 16:26:42 +04:00
|
|
|
test_expect_success 'merge --stat respects COLUMNS (big change)' '
|
2012-03-01 16:26:38 +04:00
|
|
|
git checkout -b branch HEAD^^ &&
|
|
|
|
COLUMNS=100 git merge --stat --no-ff master^ >output &&
|
2015-03-20 13:06:44 +03:00
|
|
|
grep " | " output >actual &&
|
2012-03-01 16:26:38 +04:00
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
cat >expect <<'EOF'
|
2012-03-01 16:26:43 +04:00
|
|
|
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1000 +++++++++++++++++++++++++++++++++++++++
|
2012-03-01 16:26:38 +04:00
|
|
|
EOF
|
2012-03-01 16:26:42 +04:00
|
|
|
test_expect_success 'merge --stat respects COLUMNS (long filename)' '
|
2012-03-01 16:26:38 +04:00
|
|
|
COLUMNS=100 git merge --stat --no-ff master >output &&
|
2015-03-20 13:06:44 +03:00
|
|
|
grep " | " output >actual &&
|
2012-03-01 16:26:38 +04:00
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_done
|