{"thread":{"id":"30258","subject":"[PATCH v3 0/7] diff stat calculation adjustments","startedAt":"2012-04-16T10:44:48Z","lastAt":"2012-04-18T02:31:24Z","messageCount":15,"participants":["Lucian Poston","Junio C Hamano"],"isPatch":true,"patchVersion":3,"patchTotal":7},"messages":[{"id":"189381","messageId":"1334573095-32286-1-git-send-email-lucian.poston@gmail.com","threadId":"30258","inReplyTo":null,"subject":"[PATCH v3 0/7] diff stat calculation adjustments","fromName":"Lucian Poston","fromEmail":"lucian.poston@gmail.com","sentAt":"2012-04-16T10:44:48Z","receivedAt":"2012-04-16T10:44:48Z","isPatch":true,"sender":{"key":"lucian.poston@gmail.com","avatar":"https://avatars.githubusercontent.com/u/646121?v=4"},"body":"I broke the patch series up into smaller patches. Hopefully this makes the\nintent of the changes easier to follow.\n\nZbigniew's tests were added as PATCH 1/7.\n\nThe order of the options->stat_graph_width test was reverted back to the\noriginal order as per Zbigniew's feedback. There remains an issue where\nname_width (or graph_width) could be set to a value greater than\nstat_name_width (or stat_graph_width). This patch doesn't address the issue --\nv2 had a partial fix, but it resulted in other problems anyway.\n\nLucian Poston (6):\n Add output_prefix_length to diff_options\n Adjust stat width calculations to take --graph output into account\n t4052: Adjust --graph --stat output for prefixes\n t4052: Add tests to illustrate issues with restrictive COLUMNS\n Prevent graph_width of stat width from falling below min\n t4052: Adjust --stat output for minimum graph_width\n\nZbigniew Jędrzejewski-Szmek (1):\n t4052: test --stat output with --graph\n\n diff.c | 8 ++-\n diff.h | 1 +\n graph.c | 3 +\n t/t4052-stat-output.sh | 122 ++++++++++++++++++++++++++++++++++++++++++++++--\n 4 files changed, 128 insertions(+), 6 deletions(-)\n\n-- \n1.7.3.4\n"},{"id":"189382","messageId":"1334573095-32286-2-git-send-email-lucian.poston@gmail.com","threadId":"30258","inReplyTo":"1334573095-32286-1-git-send-email-lucian.poston@gmail.com","subject":"[PATCH v3 1/7] t4052: test --stat output with --graph","fromName":"Lucian Poston","fromEmail":"lucian.poston@gmail.com","sentAt":"2012-04-16T10:44:49Z","receivedAt":"2012-04-16T10:44:49Z","isPatch":true,"sender":{"key":"lucian.poston@gmail.com","avatar":"https://avatars.githubusercontent.com/u/646121?v=4"},"body":"From: Zbigniew Jędrzejewski-Szmek \n\nAdd tests which show that the width of the --prefix added by --graph\nis not taken into consideration when the diff stat output width is\ncalculated.\n\nSigned-off-by: Zbigniew Jędrzejewski-Szmek \nSigned-off-by: Lucian Poston \n---\n t/t4052-stat-output.sh | 78 +++++++++++++++++++++++++++++++++++++++++++++--\n 1 files changed, 74 insertions(+), 4 deletions(-)\n\ndiff --git a/t/t4052-stat-output.sh b/t/t4052-stat-output.sh\nindex 328aa8f..da14984 100755\n--- a/t/t4052-stat-output.sh\n+++ b/t/t4052-stat-output.sh\n@@ -82,11 +82,15 @@ test_expect_success 'preparation for big change tests' '\n cat >expect80 <<'EOF'\n abcd | 1000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n EOF\n-\n+cat >expect80-graph <<'EOF'\n+| abcd | 1000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n+EOF\n cat >expect200 <<'EOF'\n abcd | 1000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n EOF\n-\n+cat >expect200-graph <<'EOF'\n+| abcd | 1000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n+EOF\n while read verb expect cmd args\n do\n \ttest_expect_success \"$cmd $verb COLUMNS (big change)\" '\n@@ -94,6 +98,14 @@ do\n \t\tgrep \" | \" output >actual &&\n \t\ttest_cmp \"$expect\" actual\n \t'\n+\n+\ttest \"$cmd\" != diff || continue\n+\n+\ttest_expect_success \"$cmd --graph $verb COLUMNS (big change)\" '\n+\t\tCOLUMNS=200 git $cmd $args --graph >output\n+\t\tgrep \" | \" output >actual &&\n+\t\ttest_cmp \"$expect-graph\" actual\n+\t'\n done <<\\EOF\n ignores expect80 format-patch -1 --stdout\n respects expect200 diff HEAD^ HEAD --stat\n@@ -104,7 +116,9 @@ EOF\n cat >expect40 <<'EOF'\n abcd | 1000 ++++++++++++++++++++++++++\n EOF\n-\n+cat >expect40-graph <<'EOF'\n+| abcd | 1000 ++++++++++++++++++++++++++\n+EOF\n while read verb expect cmd args\n do\n \ttest_expect_success \"$cmd $verb not enough COLUMNS (big change)\" '\n@@ -118,6 +132,20 @@ do\n \t\tgrep \" | \" output >actual &&\n \t\ttest_cmp \"$expect\" actual\n \t'\n+\n+\ttest \"$cmd\" != diff || continue\n+\n+\ttest_expect_success \"$cmd --graph $verb not enough COLUMNS (big change)\" '\n+\t\tCOLUMNS=40 git $cmd $args --graph >output\n+\t\tgrep \" | \" output >actual &&\n+\t\ttest_cmp \"$expect-graph\" actual\n+\t'\n+\n+\ttest_expect_success \"$cmd --graph $verb statGraphWidth config\" '\n+\t\tgit -c diff.statGraphWidth=26 $cmd $args --graph >output\n+\t\tgrep \" | \" output >actual &&\n+\t\ttest_cmp \"$expect-graph\" actual\n+\t'\n done <<\\EOF\n ignores expect80 format-patch -1 --stdout\n respects expect40 diff HEAD^ HEAD --stat\n@@ -129,6 +157,9 @@ EOF\n cat >expect <<'EOF'\n abcd | 1000 ++++++++++++++++++++++++++\n EOF\n+cat >expect-graph <<'EOF'\n+| abcd | 1000 ++++++++++++++++++++++++++\n+EOF\n while read cmd args\n do\n \ttest_expect_success \"$cmd --stat=width with big change\" '\n@@ -143,11 +174,25 @@ do\n \t\ttest_cmp expect actual\n \t'\n \n-\ttest_expect_success \"$cmd --stat-graph--width with big change\" '\n+\ttest_expect_success \"$cmd --stat-graph-width with big change\" '\n \t\tgit $cmd $args --stat-graph-width=26 >output\n \t\tgrep \" | \" output >actual &&\n \t\ttest_cmp expect actual\n \t'\n+\n+\ttest \"$cmd\" != diff || continue\n+\n+\ttest_expect_success \"$cmd --stat-width=width --graph with big change\" '\n+\t\tgit $cmd $args --stat-width=40 --graph >output\n+\t\tgrep \" | \" output >actual &&\n+\t\ttest_cmp expect-graph actual\n+\t'\n+\n+\ttest_expect_success \"$cmd --stat-graph-width --graph with big change\" '\n+\t\tgit $cmd $args --stat-graph-width=26 --graph >output\n+\t\tgrep \" | \" output >actual &&\n+\t\ttest_cmp expect-graph actual\n+\t'\n done <<\\EOF\n format-patch -1 --stdout\n diff HEAD^ HEAD --stat\n@@ -164,6 +209,9 @@ test_expect_success 'preparation for long filename tests' '\n cat >expect <<'EOF'\n ...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1000 ++++++++++++\n EOF\n+cat >expect-graph <<'EOF'\n+| ...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1000 ++++++++++++\n+EOF\n while read cmd args\n do\n \ttest_expect_success \"$cmd --stat=width with big change is more balanced\" '\n@@ -171,6 +219,14 @@ do\n \t\tgrep \" | \" output >actual &&\n \t\ttest_cmp expect actual\n \t'\n+\n+\ttest \"$cmd\" != diff || continue\n+\n+\ttest_expect_success \"$cmd --stat=width --graph with big change is balanced\" '\n+\t\tgit $cmd $args --stat-width=60 --graph >output &&\n+\t\tgrep \" | \" output >actual &&\n+\t\ttest_cmp expect-graph actual\n+\t'\n done <<\\EOF\n format-patch -1 --stdout\n diff HEAD^ HEAD --stat\n@@ -181,9 +237,15 @@ EOF\n cat >expect80 <<'EOF'\n ...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1000 ++++++++++++++++++++\n EOF\n+cat >expect80-graph <<'EOF'\n+| ...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1000 ++++++++++++++++++++\n+EOF\n cat >expect200 <<'EOF'\n aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1000 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n EOF\n+cat >expect200-graph <<'EOF'\n+| aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1000 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n+EOF\n while read verb expect cmd args\n do\n \ttest_expect_success \"$cmd $verb COLUMNS (long filename)\" '\n@@ -191,6 +253,14 @@ do\n \t\tgrep \" | \" output >actual &&\n \t\ttest_cmp \"$expect\" actual\n \t'\n+\n+\ttest \"$cmd\" != diff || continue\n+\n+\ttest_expect_success \"$cmd --graph $verb COLUMNS (long filename)\" '\n+\t\tCOLUMNS=200 git $cmd $args --graph >output\n+\t\tgrep \" | \" output >actual &&\n+\t\ttest_cmp \"$expect-graph\" actual\n+\t'\n done <<\\EOF\n ignores expect80 format-patch -1 --stdout\n respects expect200 diff HEAD^ HEAD --stat\n-- \n1.7.3.4\n"},{"id":"189383","messageId":"1334573095-32286-3-git-send-email-lucian.poston@gmail.com","threadId":"30258","inReplyTo":"1334573095-32286-1-git-send-email-lucian.poston@gmail.com","subject":"[PATCH v3 2/7] Add output_prefix_length to diff_options","fromName":"Lucian Poston","fromEmail":"lucian.poston@gmail.com","sentAt":"2012-04-16T10:44:50Z","receivedAt":"2012-04-16T10:44:50Z","isPatch":true,"sender":{"key":"lucian.poston@gmail.com","avatar":"https://avatars.githubusercontent.com/u/646121?v=4"},"body":"Add output_prefix_length to diff_options. Initialize the value to 0 and only\nset it when graph.c:diff_output_prefix_callback() is called.\n\nSigned-off-by: Lucian Poston \n---\n diff.h | 1 +\n graph.c | 3 +++\n 2 files changed, 4 insertions(+), 0 deletions(-)\n\ndiff --git a/diff.h b/diff.h\nindex cb68743..19d762f 100644\n--- a/diff.h\n+++ b/diff.h\n@@ -150,6 +150,7 @@ struct diff_options {\n \tdiff_format_fn_t format_callback;\n \tvoid *format_callback_data;\n \tdiff_prefix_fn_t output_prefix;\n+\tint output_prefix_length;\n \tvoid *output_prefix_data;\n };\n \ndiff --git a/graph.c b/graph.c\nindex 7358416..7e0a099 100644\n--- a/graph.c\n+++ b/graph.c\n@@ -194,8 +194,10 @@ static struct strbuf *diff_output_prefix_callback(struct diff_options *opt, void\n \tstruct git_graph *graph = data;\n \tstatic struct strbuf msgbuf = STRBUF_INIT;\n \n+\tassert(opt);\n \tassert(graph);\n \n+\topt->output_prefix_length = graph->width;\n \tstrbuf_reset(&msgbuf);\n \tgraph_padding_line(graph, &msgbuf);\n \treturn &msgbuf;\n@@ -245,6 +247,7 @@ struct git_graph *graph_init(struct rev_info *opt)\n \t */\n \topt->diffopt.output_prefix = diff_output_prefix_callback;\n \topt->diffopt.output_prefix_data = graph;\n+\topt->diffopt.output_prefix_length = 0;\n \n \treturn graph;\n }\n-- \n1.7.3.4\n"},{"id":"189384","messageId":"1334573095-32286-4-git-send-email-lucian.poston@gmail.com","threadId":"30258","inReplyTo":"1334573095-32286-1-git-send-email-lucian.poston@gmail.com","subject":"[PATCH v3 3/7] Adjust stat width calculations to take --graph output into account","fromName":"Lucian Poston","fromEmail":"lucian.poston@gmail.com","sentAt":"2012-04-16T10:44:51Z","receivedAt":"2012-04-16T10:44:51Z","isPatch":true,"sender":{"key":"lucian.poston@gmail.com","avatar":"https://avatars.githubusercontent.com/u/646121?v=4"},"body":"The recent change to compute the width of diff --stat did not take into\nconsideration the output from --graph. The consequence is that when both\noptions are used, e.g. in 'log --stat --graph', the lines are too long.\n\nAdjust stat width calculations to take --graph output into account.\n\nSigned-off-by: Lucian Poston \n---\n diff.c | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/diff.c b/diff.c\nindex 377ec1e..0b61cf7 100644\n--- a/diff.c\n+++ b/diff.c\n@@ -1445,7 +1445,7 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)\n \t */\n \n \tif (options->stat_width == -1)\n-\t\twidth = term_columns();\n+\t\twidth = term_columns() - options->output_prefix_length;\n \telse\n \t\twidth = options->stat_width ? options->stat_width : 80;\n \n-- \n1.7.3.4\n"},{"id":"189385","messageId":"1334573095-32286-5-git-send-email-lucian.poston@gmail.com","threadId":"30258","inReplyTo":"1334573095-32286-1-git-send-email-lucian.poston@gmail.com","subject":"[PATCH v3 4/7] t4052: Adjust --graph --stat output for prefixes","fromName":"Lucian Poston","fromEmail":"lucian.poston@gmail.com","sentAt":"2012-04-16T10:44:52Z","receivedAt":"2012-04-16T10:44:52Z","isPatch":true,"sender":{"key":"lucian.poston@gmail.com","avatar":"https://avatars.githubusercontent.com/u/646121?v=4"},"body":"Adjust tests to verify that the commit history graph tree is taken into\nconsideration when the diff stat output width is calculated.\n\nSigned-off-by: Lucian Poston \n---\n t/t4052-stat-output.sh | 34 +++++++++++++++++++++++++---------\n 1 files changed, 25 insertions(+), 9 deletions(-)\n\ndiff --git a/t/t4052-stat-output.sh b/t/t4052-stat-output.sh\nindex da14984..d748e5e 100755\n--- a/t/t4052-stat-output.sh\n+++ b/t/t4052-stat-output.sh\n@@ -89,7 +89,7 @@ cat >expect200 <<'EOF'\n abcd | 1000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n EOF\n cat >expect200-graph <<'EOF'\n-| abcd | 1000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n+| abcd | 1000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n EOF\n while read verb expect cmd args\n do\n@@ -117,7 +117,7 @@ cat >expect40 <<'EOF'\n abcd | 1000 ++++++++++++++++++++++++++\n EOF\n cat >expect40-graph <<'EOF'\n-| abcd | 1000 ++++++++++++++++++++++++++\n+| abcd | 1000 ++++++++++++++++++++++++\n EOF\n while read verb expect cmd args\n do\n@@ -127,12 +127,6 @@ do\n \t\ttest_cmp \"$expect\" actual\n \t'\n \n-\ttest_expect_success \"$cmd $verb statGraphWidth config\" '\n-\t\tgit -c diff.statGraphWidth=26 $cmd $args >output\n-\t\tgrep \" | \" output >actual &&\n-\t\ttest_cmp \"$expect\" actual\n-\t'\n-\n \ttest \"$cmd\" != diff || continue\n \n \ttest_expect_success \"$cmd --graph $verb not enough COLUMNS (big change)\" '\n@@ -140,6 +134,28 @@ do\n \t\tgrep \" | \" output >actual &&\n \t\ttest_cmp \"$expect-graph\" actual\n \t'\n+done <<\\EOF\n+ignores expect80 format-patch -1 --stdout\n+respects expect40 diff HEAD^ HEAD --stat\n+respects expect40 show --stat\n+respects expect40 log -1 --stat\n+EOF\n+\n+cat >expect40 <<'EOF'\n+ abcd | 1000 ++++++++++++++++++++++++++\n+EOF\n+cat >expect40-graph <<'EOF'\n+| abcd | 1000 ++++++++++++++++++++++++++\n+EOF\n+while read verb expect cmd args\n+do\n+\ttest_expect_success \"$cmd $verb statGraphWidth config\" '\n+\t\tgit -c diff.statGraphWidth=26 $cmd $args >output\n+\t\tgrep \" | \" output >actual &&\n+\t\ttest_cmp \"$expect\" actual\n+\t'\n+\n+\ttest \"$cmd\" != diff || continue\n \n \ttest_expect_success \"$cmd --graph $verb statGraphWidth config\" '\n \t\tgit -c diff.statGraphWidth=26 $cmd $args --graph >output\n@@ -244,7 +260,7 @@ cat >expect200 <<'EOF'\n aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1000 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n EOF\n cat >expect200-graph <<'EOF'\n-| aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1000 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n+| aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1000 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n EOF\n while read verb expect cmd args\n do\n-- \n1.7.3.4\n"},{"id":"189386","messageId":"1334573095-32286-6-git-send-email-lucian.poston@gmail.com","threadId":"30258","inReplyTo":"1334573095-32286-1-git-send-email-lucian.poston@gmail.com","subject":"[PATCH v3 5/7] t4052: Add tests to illustrate issues with restrictive COLUMNS","fromName":"Lucian Poston","fromEmail":"lucian.poston@gmail.com","sentAt":"2012-04-16T10:44:53Z","receivedAt":"2012-04-16T10:44:53Z","isPatch":true,"sender":{"key":"lucian.poston@gmail.com","avatar":"https://avatars.githubusercontent.com/u/646121?v=4"},"body":"\nSigned-off-by: Lucian Poston \n---\n t/t4052-stat-output.sh | 28 ++++++++++++++++++++++++++++\n 1 files changed, 28 insertions(+), 0 deletions(-)\n\ndiff --git a/t/t4052-stat-output.sh b/t/t4052-stat-output.sh\nindex d748e5e..6cac95b 100755\n--- a/t/t4052-stat-output.sh\n+++ b/t/t4052-stat-output.sh\n@@ -284,6 +284,34 @@ respects expect200 show --stat\n respects expect200 log -1 --stat\n EOF\n \n+cat >expect1 <<'EOF'\n+ ...aaaaaaaaaaaaaa | 1000 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n+EOF\n+cat >expect1-graph <<'EOF'\n+| ...aaaaaaaaaaaaaa | 1000 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n+EOF\n+while read verb expect cmd args\n+do\n+\ttest_expect_success \"$cmd $verb prefix greater than COLUMNS (big change)\" '\n+\t\tCOLUMNS=1 git $cmd $args >output\n+\t\tgrep \" | \" output >actual &&\n+\t\ttest_cmp \"$expect\" actual\n+\t'\n+\n+\ttest \"$cmd\" != diff || continue\n+\n+\ttest_expect_success \"$cmd --graph $verb prefix greater than COLUMNS (big change)\" '\n+\t\tCOLUMNS=1 git $cmd $args --graph >output\n+\t\tgrep \" | \" output >actual &&\n+\t\ttest_cmp \"$expect-graph\" actual\n+\t'\n+done <<\\EOF\n+ignores expect80 format-patch -1 --stdout\n+respects expect1 diff HEAD^ HEAD --stat\n+respects expect1 show --stat\n+respects expect1 log -1 --stat\n+EOF\n+\n cat >expect <<'EOF'\n abcd | 1000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n EOF\n-- \n1.7.3.4\n"},{"id":"189387","messageId":"1334573095-32286-7-git-send-email-lucian.poston@gmail.com","threadId":"30258","inReplyTo":"1334573095-32286-1-git-send-email-lucian.poston@gmail.com","subject":"[PATCH v3 6/7] Prevent graph_width of diff stat from falling below min","fromName":"Lucian Poston","fromEmail":"lucian.poston@gmail.com","sentAt":"2012-04-16T10:44:54Z","receivedAt":"2012-04-16T10:44:54Z","isPatch":true,"sender":{"key":"lucian.poston@gmail.com","avatar":"https://avatars.githubusercontent.com/u/646121?v=4"},"body":"\nSigned-off-by: Lucian Poston \n---\n diff.c | 6 +++++-\n 1 files changed, 5 insertions(+), 1 deletions(-)\n\ndiff --git a/diff.c b/diff.c\nindex 0b61cf7..f08b41a 100644\n--- a/diff.c\n+++ b/diff.c\n@@ -1473,8 +1473,12 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)\n \t * Adjust adjustable widths not to exceed maximum width\n \t */\n \tif (name_width + number_width + 6 + graph_width > width) {\n-\t\tif (graph_width > width * 3/8 - number_width - 6)\n+\t\tif (graph_width > width * 3/8 - number_width - 6) {\n \t\t\tgraph_width = width * 3/8 - number_width - 6;\n+\t\t\tif (graph_width < 6)\n+\t\t\t\tgraph_width = 6;\n+\t\t}\n+\n \t\tif (options->stat_graph_width &&\n \t\t graph_width > options->stat_graph_width)\n \t\t\tgraph_width = options->stat_graph_width;\n-- \n1.7.3.4\n"},{"id":"189388","messageId":"1334573095-32286-8-git-send-email-lucian.poston@gmail.com","threadId":"30258","inReplyTo":"1334573095-32286-1-git-send-email-lucian.poston@gmail.com","subject":"[PATCH v3 7/7] t4052: Adjust --stat output for minimum graph_width","fromName":"Lucian Poston","fromEmail":"lucian.poston@gmail.com","sentAt":"2012-04-16T10:44:55Z","receivedAt":"2012-04-16T10:44:55Z","isPatch":true,"sender":{"key":"lucian.poston@gmail.com","avatar":"https://avatars.githubusercontent.com/u/646121?v=4"},"body":"\nSigned-off-by: Lucian Poston \n---\n t/t4052-stat-output.sh | 4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/t/t4052-stat-output.sh b/t/t4052-stat-output.sh\nindex 6cac95b..ced32db 100755\n--- a/t/t4052-stat-output.sh\n+++ b/t/t4052-stat-output.sh\n@@ -285,10 +285,10 @@ respects expect200 log -1 --stat\n EOF\n \n cat >expect1 <<'EOF'\n- ...aaaaaaaaaaaaaa | 1000 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n+ ...aaaaaaa | 1000 ++++++\n EOF\n cat >expect1-graph <<'EOF'\n-| ...aaaaaaaaaaaaaa | 1000 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n+| ...aaaaaaa | 1000 ++++++\n EOF\n while read verb expect cmd args\n do\n-- \n1.7.3.4\n"},{"id":"189446","messageId":"7v7gxfv7h5.fsf@alter.siamese.dyndns.org","threadId":"30258","inReplyTo":"1334573095-32286-6-git-send-email-lucian.poston@gmail.com","subject":"Re: [PATCH v3 5/7] t4052: Add tests to illustrate issues with restrictive COLUMNS","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-04-16T18:48:06Z","receivedAt":"2012-04-16T18:48:06Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Lucian Poston writes:\n\n> Signed-off-by: Lucian Poston \n> ---\n\nSorry, the patch text itself does not tell me what it wants to \"illustate\"\nat all.\n\nI _guess_ that you are saying that the output for expect1 and\nexpect1-graph should be limited to very narrow width, not like the\nhumongous output like we see in the added test vector, and it will be\nfixed with your patch 6/7.\n\nIf that is the case, please structure this part of the series like this:\n\n\t5/7: add test vector to illustrate what the correct output should\n\t be, but mark the test with \"test_expect_failure\".\n\n 6/7: update the code to fix it, and flip the \"test_expect_failure\"\n in 5/7 to \"test_expect_success\".\n\nAnd 7/7 will become unneeded.\n\nThanks.\n\n> t/t4052-stat-output.sh | 28 ++++++++++++++++++++++++++++\n> 1 files changed, 28 insertions(+), 0 deletions(-)\n>\n> diff --git a/t/t4052-stat-output.sh b/t/t4052-stat-output.sh\n> index d748e5e..6cac95b 100755\n> --- a/t/t4052-stat-output.sh\n> +++ b/t/t4052-stat-output.sh\n> @@ -284,6 +284,34 @@ respects expect200 show --stat\n> respects expect200 log -1 --stat\n> EOF\n> \n> +cat >expect1 <<'EOF'\n> + ...aaaaaaaaaaaaaa | 1000 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n ++\n> +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n> +EOF\n> +cat >expect1-graph <<'EOF'\n> +| ...aaaaaaaaaaaaaa | 1000 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n ++\n> +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n> +EOF\n> +while read verb expect cmd args\n> +do\n> +\ttest_expect_success \"$cmd $verb prefix greater than COLUMNS (big change)\" '\n> +\t\tCOLUMNS=1 git $cmd $args >output\n> +\t\tgrep \" | \" output >actual &&\n> +\t\ttest_cmp \"$expect\" actual\n> +\t'\n> +\n> +\ttest \"$cmd\" != diff || continue\n> +\n> +\ttest_expect_success \"$cmd --graph $verb prefix greater than COLUMNS (big change)\" '\n> +\t\tCOLUMNS=1 git $cmd $args --graph >output\n> +\t\tgrep \" | \" output >actual &&\n> +\t\ttest_cmp \"$expect-graph\" actual\n> +\t'\n> +done <<\\EOF\n> +ignores expect80 format-patch -1 --stdout\n> +respects expect1 diff HEAD^ HEAD --stat\n> +respects expect1 show --stat\n> +respects expect1 log -1 --stat\n> +EOF\n> +\n> cat >expect <<'EOF'\n> abcd | 1000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n> EOF\n"},{"id":"189447","messageId":"7vzkabtsw9.fsf@alter.siamese.dyndns.org","threadId":"30258","inReplyTo":"1334573095-32286-5-git-send-email-lucian.poston@gmail.com","subject":"Re: [PATCH v3 4/7] t4052: Adjust --graph --stat output for prefixes","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-04-16T18:48:22Z","receivedAt":"2012-04-16T18:48:22Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Lucian Poston writes:\n\n> Adjust tests to verify that the commit history graph tree is taken into\n> consideration when the diff stat output width is calculated.\n>\n> Signed-off-by: Lucian Poston \n> ---\n> t/t4052-stat-output.sh | 34 +++++++++++++++++++++++++---------\n> 1 files changed, 25 insertions(+), 9 deletions(-)\n>\n> diff --git a/t/t4052-stat-output.sh b/t/t4052-stat-output.sh\n> index da14984..d748e5e 100755\n> --- a/t/t4052-stat-output.sh\n> +++ b/t/t4052-stat-output.sh\n> @@ -89,7 +89,7 @@ cat >expect200 <<'EOF'\n> abcd | 1000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n> EOF\n> cat >expect200-graph <<'EOF'\n> -| abcd | 1000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n> +| abcd | 1000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n> EOF\n\nThis change is easily explainable. Earlier, the code did not take the \"|\n\" part at the very left end (i.e. ancestry graph) and drew the --stat\noutput too wide by two columns, but now the code is updated to compensate\nfor that, because \"200\" is coming from COLUMNS to clip the whole width,\nnot just the stat-width part.\n\n> while read verb expect cmd args\n> do\n> @@ -117,7 +117,7 @@ cat >expect40 <<'EOF'\n> abcd | 1000 ++++++++++++++++++++++++++\n> EOF\n> cat >expect40-graph <<'EOF'\n> -| abcd | 1000 ++++++++++++++++++++++++++\n> +| abcd | 1000 ++++++++++++++++++++++++\n> EOF\n\nLikewise.\n\n> while read verb expect cmd args\n> do\n> @@ -127,12 +127,6 @@ do\n> \t\ttest_cmp \"$expect\" actual\n> \t'\n> \n> -\ttest_expect_success \"$cmd $verb statGraphWidth config\" '\n> -\t\tgit -c diff.statGraphWidth=26 $cmd $args >output\n> -\t\tgrep \" | \" output >actual &&\n> -\t\ttest_cmp \"$expect\" actual\n> -\t'\n> -\n\nThis is unclear. Why does this need to be removed?\n"},{"id":"189448","messageId":"7vsjg3tsvv.fsf@alter.siamese.dyndns.org","threadId":"30258","inReplyTo":"1334573095-32286-3-git-send-email-lucian.poston@gmail.com","subject":"Re: [PATCH v3 2/7] Add output_prefix_length to diff_options","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-04-16T18:48:36Z","receivedAt":"2012-04-16T18:48:36Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Lucian Poston writes:\n\n> Add output_prefix_length to diff_options. Initialize the value to 0 and only\n> set it when graph.c:diff_output_prefix_callback() is called.\n>\n> Signed-off-by: Lucian Poston \n> ---\n> diff.h | 1 +\n> graph.c | 3 +++\n> 2 files changed, 4 insertions(+), 0 deletions(-)\n\nThis patch is a no-op, as nobody pays attention to the value this field\ncontains. I think it is better to squash this with 3/7 where you\nintroduce the only user of this field.\n\nAlso when that happens, you would need to adjust the test vector, which\nmay mean that you need to squash the result with 4/7 as well.\n\n> diff --git a/diff.h b/diff.h\n> index cb68743..19d762f 100644\n> --- a/diff.h\n> +++ b/diff.h\n> @@ -150,6 +150,7 @@ struct diff_options {\n> \tdiff_format_fn_t format_callback;\n> \tvoid *format_callback_data;\n> \tdiff_prefix_fn_t output_prefix;\n> +\tint output_prefix_length;\n> \tvoid *output_prefix_data;\n> };\n> \n> diff --git a/graph.c b/graph.c\n> index 7358416..7e0a099 100644\n> --- a/graph.c\n> +++ b/graph.c\n> @@ -194,8 +194,10 @@ static struct strbuf *diff_output_prefix_callback(struct diff_options *opt, void\n> \tstruct git_graph *graph = data;\n> \tstatic struct strbuf msgbuf = STRBUF_INIT;\n> \n> +\tassert(opt);\n> \tassert(graph);\n> \n> +\topt->output_prefix_length = graph->width;\n> \tstrbuf_reset(&msgbuf);\n> \tgraph_padding_line(graph, &msgbuf);\n> \treturn &msgbuf;\n> @@ -245,6 +247,7 @@ struct git_graph *graph_init(struct rev_info *opt)\n> \t */\n> \topt->diffopt.output_prefix = diff_output_prefix_callback;\n> \topt->diffopt.output_prefix_data = graph;\n> +\topt->diffopt.output_prefix_length = 0;\n> \n> \treturn graph;\n> }\n"},{"id":"189449","messageId":"7vobqrtqxj.fsf@alter.siamese.dyndns.org","threadId":"30258","inReplyTo":"1334573095-32286-1-git-send-email-lucian.poston@gmail.com","subject":"Re: [PATCH v3 0/7] diff stat calculation adjustments","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-04-16T19:30:48Z","receivedAt":"2012-04-16T19:30:48Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Lucian Poston writes:\n\n> I broke the patch series up into smaller patches. Hopefully this makes the\n> intent of the changes easier to follow.\n>\n> Zbigniew's tests were added as PATCH 1/7.\n\nThanks. Overall it looks nicely done, except that the structure of the\nseries may want a few squashing, moving and use of test_expect_failure\nthat later turns into test_expect_success.\n\nWhen I learned from you that you will be rerolling, I was expecting to see\nthe other series, i.e.\n\n * lp/maint-diff-three-dash-with-graph (2012-03-20) 3 commits\n - t4202: add test for \"log --graph --stat -p\" separator lines\n - log --graph: fix break in graph lines\n - log --graph --stat: three-dash separator should come after graph lines\n\nbut I think this was $gmane/193490 split into three and didn't have\nanything controversial.\n\nI'll merge it to 'next'.\n\nThanks.\n"},{"id":"189591","messageId":"CACz_eyfvC9OWwBscCTHVvs+udRW5_QUReZnxpPVWSrL1MAC6rA@mail.gmail.com","threadId":"30258","inReplyTo":"7vzkabtsw9.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH v3 4/7] t4052: Adjust --graph --stat output for prefixes","fromName":"Lucian Poston","fromEmail":"lucian.poston@gmail.com","sentAt":"2012-04-18T02:23:49Z","receivedAt":"2012-04-18T02:23:49Z","isPatch":true,"sender":{"key":"lucian.poston@gmail.com","avatar":"https://avatars.githubusercontent.com/u/646121?v=4"},"body":"On Mon, Apr 16, 2012 at 11:48, Junio C Hamano wrote:\n>> @@ -117,7 +117,7 @@ cat >expect40 <<'EOF'\n>>   abcd | 1000 ++++++++++++++++++++++++++\n>>  EOF\n>>  cat >expect40-graph <<'EOF'\n>> -|  abcd | 1000 ++++++++++++++++++++++++++\n>> +|  abcd | 1000 ++++++++++++++++++++++++\n>>  EOF\n>>  while read verb expect cmd args\n>>  do\n>> @@ -127,12 +127,6 @@ do\n>>               test_cmp \"$expect\" actual\n>>       '\n>>\n>> -     test_expect_success \"$cmd $verb statGraphWidth config\" '\n>> -             git -c diff.statGraphWidth=26 $cmd $args >output\n>> -             grep \" | \" output >actual &&\n>> -             test_cmp \"$expect\" actual\n>> -     '\n>> -\n>\n> This is unclear.  Why does this need to be removed?\n\nThis test was actually only moved. There were 4 test_expect_success in\na while loop -- 2 tested COLUMNS=40, and 2 tested\ndiff.statGraphWidth=26. I moved the two tests for diff.statGraphWidth\nto a new while loop. expect40-graph varies between these two sets of\ntests, so I thought it cleaner to separate them so that the\nexpectation could be defined separately.\n"},{"id":"189593","messageId":"CACz_eyftA6GQhSMscoucEbzKagjTSU3Psd8z+d9_oWWrKD--+w@mail.gmail.com","threadId":"30258","inReplyTo":"7vsjg3tsvv.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH v3 2/7] Add output_prefix_length to diff_options","fromName":"Lucian Poston","fromEmail":"lucian.poston@gmail.com","sentAt":"2012-04-18T02:31:12Z","receivedAt":"2012-04-18T02:31:12Z","isPatch":true,"sender":{"key":"lucian.poston@gmail.com","avatar":"https://avatars.githubusercontent.com/u/646121?v=4"},"body":"On Mon, Apr 16, 2012 at 11:48, Junio C Hamano wrote:\n> Lucian Poston writes:\n>\n>> Add output_prefix_length to diff_options. Initialize the value to 0 and only\n>> set it when graph.c:diff_output_prefix_callback() is called.\n>>\n>> Signed-off-by: Lucian Poston \n>> ---\n>>  diff.h  |    1 +\n>>  graph.c |    3 +++\n>>  2 files changed, 4 insertions(+), 0 deletions(-)\n>\n> This patch is a no-op, as nobody pays attention to the value this field\n> contains.  I think it is better to squash this with 3/7 where you\n> introduce the only user of this field.\n>\n> Also when that happens, you would need to adjust the test vector, which\n> may mean that you need to squash the result with 4/7 as well.\n\nSquashed.\n"},{"id":"189594","messageId":"CACz_eydRcYNs1TOpRjM91tzmBrXjs4sKzBrFFvXGk0hEQ9zEMw@mail.gmail.com","threadId":"30258","inReplyTo":"7v7gxfv7h5.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH v3 5/7] t4052: Add tests to illustrate issues with restrictive COLUMNS","fromName":"Lucian Poston","fromEmail":"lucian.poston@gmail.com","sentAt":"2012-04-18T02:31:24Z","receivedAt":"2012-04-18T02:31:24Z","isPatch":true,"sender":{"key":"lucian.poston@gmail.com","avatar":"https://avatars.githubusercontent.com/u/646121?v=4"},"body":"On Mon, Apr 16, 2012 at 11:48, Junio C Hamano wrote:\n> Lucian Poston writes:\n>\n>> Signed-off-by: Lucian Poston \n>> ---\n>\n> Sorry, the patch text itself does not tell me what it wants to \"illustate\"\n> at all.\n>\n> I _guess_ that you are saying that the output for expect1 and\n> expect1-graph should be limited to very narrow width, not like the\n> humongous output like we see in the added test vector, and it will be\n> fixed with your patch 6/7.\n>\n> If that is the case, please structure this part of the series like this:\n>\n>        5/7: add test vector to illustrate what the correct output should\n>             be, but mark the test with \"test_expect_failure\".\n>\n>        6/7: update the code to fix it, and flip the \"test_expect_failure\"\n>             in 5/7 to \"test_expect_success\".\n>\n> And 7/7 will become unneeded.\n\nDone. Thanks.\n"}]}