Re: [PATCH v2 2/3] Adjust stat width calculations to take --graph output into account
- From
Lucian Poston <lucian.poston@gmail.com>
- Date
- Mar 23, 2012, 04:38 UTC
- Message-ID
- <CACz_eycFU564bz1aO6-QF3=6GV8oHvGYfMWHRfgT1-j9AcAX-g@mail.gmail.com>
- In-Reply-To
- <4F6B8B59.4010106@in.waw.pl>
2012/3/22 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>:
Show 36 quoted lines
> On 03/22/2012 08:27 PM, Lucian Poston wrote:
>>
>> The recent change to compute the width of diff --stat did not take into
>> consideration the output from --graph. The consequence is that when both
>> options are used, e.g. in 'log --stat --graph', the lines are too long.
>>
>> Adjust stat width calculations to take --graph output into account.
>
> (1)
>
>> Adjust stat width calculations to reserve space for required characters
>> before
>> scaling the widths for the filename and graph portions of the diff-stat.
>> For
>> example, consider:
>>
>> " diff.c | 66 ++-"
>>
>> Before calculating the widths allocated to the filename, "diff.c", and the
>> graph, "++-", reserve space for the initial " " and the part between the
>> filename and graph portions " | 66 ". Then, divide the remaining space
>> so
>> that 5/8ths is given to the filename and 3/8ths for the graph.
>
> (2)
>
> Hi,
>
> I think that (1) is good. It fixes the bug and even makes the code more
> readable. But (2) should be separated, IMHO... There was a motivation for
> the layout in 1b058bc30df5f: not changing previous behaviour ("... at least
> 5/8 of available space is devoted to filenames. On a standard 80 column
> terminal, or if not connected to a terminal and using the default of 80
> columns, this gives the same partition as before.").
> (2) would change the way format-patch --stat output looks, which probably is
> not wanted.I suppose changing the format of format-patch --stat output could be annoying to anyone expecting it to remain unchanged. I'll update the patch so that the diff-stat output using the default of 80 columns remains unmodified.