From: Junio C Hamano <gitster@pobox.com>
To: "Zbigniew Jędrzejewski-Szmek" <zbyszek@in.waw.pl>
Cc: git@vger.kernel.org, Michael J Gruber <git@drmicha.warpmail.net>,
pclouds@gmail.com
Subject: Re: [PATCH 1/3 v5] diff --stat: tests for long filenames and big change counts
Date: Wed, 15 Feb 2012 09:12:50 -0800 [thread overview]
Message-ID: <7vvcn810ml.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1329303808-16989-1-git-send-email-zbyszek@in.waw.pl> ("Zbigniew Jędrzejewski-Szmek"'s message of "Wed, 15 Feb 2012 12:03:26 +0100")
Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> writes:
> Eleven tests for various combinations of a long filename and/or big
> change count and ways to specify widths for diff --stat.
> ---
Sign-off?
> Tests added in previous version of 'diff --stat: use full terminal width'
> are extracted into a separate patch. The tests are usefull independently
> of that patch anyway.
Thanks.
> +# 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\"
> +"
Just for future reference.
The last parameter to test_expect_success shell function is `eval`ed by
the shell and $name is visible inside it; you do not have to use double
quote around it and then use backquote to quote the inner double quote.
> +cat >expect <<'EOF'
> + ...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1 +
> +EOF
> +test_expect_success 'format patch graph width defaults to 80 columns' '
> + git format-patch --stat --stdout -1 >output &&
> + grep " | " output >actual &&
> + test_cmp expect actual
> +'
Hrm, this does not seem to pass, making the result of applying [1/3] fail;
I see that the elided name is shown much shorter than the above expects.
Perhaps this test found a bug in a "very long name, small changes" corner
case? If that is the case, we'd mark it as test_expect_failure, and
explain the tests that expect failure demonstrates a buggy behaviour, e.g.
When a pathname is so long that it cannot fit on the column, the
current code truncates it to make sure that the graph part has at
least N columns (enough room to show a meaningful graph). If the
actual change is small (e.g. only one line changed), this results
in the final output that is shorter than the width we aim for. A
couple of new tests marked with test_expect_failure demonstrate
this bug.
in the log message (note that I am not sure if that is the nature of the
bug, or what the actual value of N is).
And then a later patch [2/3] that updates the allocation between name and
graph will turn test_expect_failure to test_expect_success; that will make
it clear that your update fixed the bug.
> +cat >expect <<'EOF'
> + ...aaaaaaaaaaaaaaaaaaaaaaaaaa | 1 +
> +EOF
> +test_expect_success 'format patch --stat=width with long name' '
> + git format-patch --stat=40 --stdout -1 >output &&
> + grep " | " output >actual &&
> + test_cmp expect actual
> +'
Likewise.
> +test_expect_success 'format patch --stat-width=width works with long name' '
> + git format-patch --stat-width=40 --stdout -1 >output &&
> + grep " | " output >actual &&
> + test_cmp expect actual
> +'
Likewise.
> +test_expect_success 'format patch --stat=...,name-width with long name' '
> + git format-patch --stat=60,29 --stdout -1 >output &&
> + grep " | " output >actual &&
> + test_cmp expect actual
> +'
> +
> +test_expect_success 'format patch --stat-name-width with long name' '
> + git format-patch --stat-name-width=29 --stdout -1 >output &&
> + grep " | " output >actual &&
> + test_cmp expect actual
> +'
Likewise.
> +test_expect_success 'preparation' '
There was another "preparation" in this script already, which originally
threw me off while chasing which part of the test is failing. Can you
reword/retitle this one?
> +cat >expect <<'EOF'
> + abcd | 1000 ++++++++++++++++++++++++++++++++++++++++
> +EOF
> +test_expect_success 'format patch graph part width is 40 columns' '
> + git format-patch --stat --stdout -1 >output &&
> + grep " | " output >actual &&
> + test_cmp expect actual
> +'
This test shouldn't be added in [1/3] because "cap the graph to 40-col" is
a new feature that is introduced in the later step.
> +test_expect_success 'format patch ignores COLUMNS' '
> + COLUMNS=200 git format-patch --stat --stdout -1 >output
> + grep " | " output >actual &&
> + test_cmp expect actual
> +'
This is a good test to have in [1/3], but the expectation should not cap the
graph part to 40 columns. The patch that updates diff.c to implement the
cap in [2/3] should have an update to the expectation, whose diff hunk may
look liks this:
@@
cat >expect <<'EOF'
+ abcd | 1000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- abcd | 1000 ++++++++++++++++++++++++++++++++++++++++
EOF
That would make the effect of the patch clearer.
> +cat >expect <<'EOF'
> + ...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1000 ++++++++++++
> +EOF
> +test_expect_success 'format patch --stat=width with big change and long name' '
> + cp abcd aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa &&
> + git add aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa &&
> + git commit -m message &&
> + git format-patch --stat-width=60 --stdout -1 >output &&
> + grep " | " output >actual &&
> + test_cmp expect actual
> +'
> +
> test_done
The same comment as the previous one. Because you change the allocation
to the graph part in your patch to diff.c, which hasn't happened in [1/3]
yet, this should expect the existing behaviour (narrower graph) in this
step, and then be updated to expect the output shown above in the [2/3]
patch that changes the implementation in diff.c.
next prev parent reply other threads:[~2012-02-15 17:13 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-09 23:58 (unknown), Zbigniew Jędrzejewski-Szmek
2012-02-09 23:58 ` [PATCH 1/4] Move git_version_string to help.c in preparation for diff changes Zbigniew Jędrzejewski-Szmek
2012-02-10 0:46 ` Junio C Hamano
2012-02-09 23:58 ` [PATCH 2/4] help.c: make term_columns() cached and export it Zbigniew Jędrzejewski-Szmek
2012-02-10 0:50 ` Junio C Hamano
2012-02-09 23:58 ` [PATCH 3/4] diff --stat: use the real terminal width Zbigniew Jędrzejewski-Szmek
2012-02-10 0:54 ` Junio C Hamano
2012-02-10 6:15 ` Nguyen Thai Ngoc Duy
2012-02-10 11:25 ` Zbigniew Jędrzejewski-Szmek
2012-02-10 13:00 ` Nguyen Thai Ngoc Duy
2012-02-10 16:39 ` [PATCH 0/3 v2] " Zbigniew Jędrzejewski-Szmek
2012-02-10 16:39 ` [PATCH 1/3] Move git_version_string to help.c before diff changes Zbigniew Jędrzejewski-Szmek
2012-02-10 17:58 ` Junio C Hamano
2012-02-10 16:39 ` [PATCH 2/3] help.c: make term_columns() cached and export it Zbigniew Jędrzejewski-Szmek
2012-02-11 4:36 ` Nguyen Thai Ngoc Duy
2012-02-11 10:49 ` Zbigniew Jędrzejewski-Szmek
2012-02-12 9:40 ` Junio C Hamano
2012-02-12 14:12 ` [PATCH 1/2] Save terminal width before setting up pager and export term_columns() Zbigniew Jędrzejewski-Szmek
2012-02-13 23:00 ` Junio C Hamano
2012-02-14 11:44 ` Nguyen Thai Ngoc Duy
2012-02-14 11:53 ` Zbigniew Jędrzejewski-Szmek
2012-02-12 14:16 ` [PATCH 2/2] Rename lineno_width to decimal_width and export it Zbigniew Jędrzejewski-Szmek
2012-02-13 23:29 ` Junio C Hamano
2012-02-14 12:24 ` [PATCH v2] make lineno_width() from blame reusable for others Zbigniew Jędrzejewski-Szmek
2012-02-10 16:39 ` [PATCH 3/3] diff --stat: use the real terminal width Zbigniew Jędrzejewski-Szmek
2012-02-10 18:24 ` [PATCH 0/3 v2] " Junio C Hamano
2012-02-12 14:30 ` [PATCH v3] diff --stat: use the full " Zbigniew Jędrzejewski-Szmek
2012-02-14 1:08 ` Junio C Hamano
2012-02-14 23:45 ` [PATCH 1/3 v4] " Zbigniew Jędrzejewski-Szmek
2012-02-14 23:45 ` [PATCH 2/3 v4] diff --stat: better alignment for binary files Zbigniew Jędrzejewski-Szmek
2012-02-14 23:45 ` [PATCH 3/3 v4] Update diff --stat output in tests and tutorial Zbigniew Jędrzejewski-Szmek
2012-02-15 1:21 ` Junio C Hamano
2012-02-15 11:03 ` [PATCH 1/3 v5] diff --stat: tests for long filenames and big change counts Zbigniew Jędrzejewski-Szmek
2012-02-15 11:03 ` [PATCH 2/3 v5] diff --stat: use the full terminal width Zbigniew Jędrzejewski-Szmek
2012-02-15 18:07 ` Junio C Hamano
2012-02-15 11:03 ` [PATCH 3/3 v5] diff --stat: use less columns for change counts Zbigniew Jędrzejewski-Szmek
2012-02-15 12:12 ` Nguyen Thai Ngoc Duy
2012-02-15 17:12 ` Junio C Hamano [this message]
2012-02-15 17:33 ` [PATCH 1/3 v5] diff --stat: tests for long filenames and big " Junio C Hamano
2012-02-16 9:57 ` Zbigniew Jędrzejewski-Szmek
2012-02-16 20:01 ` Junio C Hamano
2012-02-15 0:07 ` [PATCH 1/3 v4] diff --stat: use the full terminal width Junio C Hamano
2012-02-15 1:18 ` Junio C Hamano
2012-02-15 7:39 ` Johannes Sixt
2012-02-09 23:58 ` [PATCH 4/4] diff --stat: use most of the space for file names Zbigniew Jędrzejewski-Szmek
2012-02-10 0:55 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vvcn810ml.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=pclouds@gmail.com \
--cc=zbyszek@in.waw.pl \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).