From: "Роман Донченко" <dpb@corrigendum.ru>
To: Stefan Beller <sbeller@google.com>
Cc: git <git@vger.kernel.org>, Paul Mackerras <paulus@ozlabs.org>
Subject: Re: [PATCH] gitk: don't highlight submodule diff lines outside submodule diffs
Date: Wed, 7 Nov 2018 00:56:40 +0300 [thread overview]
Message-ID: <fc89fa11-4809-9cb7-93d9-5e9d29c7b82b@corrigendum.ru> (raw)
In-Reply-To: <CAGZ79kZKN8U5+F+BAhQMkLuJVupgAvUgCaMt5-e_FDmY1RUY5g@mail.gmail.com>
06.11.2018 23:06, Stefan Beller пишет:
> On Tue, Nov 6, 2018 at 12:03 PM Роман Донченко <dpb@corrigendum.ru> wrote:
>>
>> A line that starts with " <" or " >" is not necessarily a submodule
>> diff line. It might just be a context line in a normal diff, representing
>> a line starting with " <" or " >" respectively.
>>
>> Use the currdiffsubmod variable to track whether we are currently
>> inside a submodule diff and only highlight these lines if we are.
>
> This explanation makes sense, some prior art is at
> https://public-inbox.org/git/20181021163401.4458-1-dummy@example.com/
> which was not taken AFAICT.
Didn't see that patch. That said, I think it's incorrect, since it never
resets currdiffsubmod back to the empty string, so if a normal diff
follows a submodule diff, the same issue will occur.
(The `set $currdiffsubmod ""` lines that are already there are
effectively useless because they set the variable whose name is the
contents of currdiffsubmod, rather than currdiffsubmod itself. I assume
it was a typo.)
-Roman
>
> Thanks,
> Stefan
>
>>
>> Signed-off-by: Роман Донченко <dpb@corrigendum.ru>
>> ---
>> gitk | 8 ++++----
>> 1 file changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/gitk b/gitk
>> index a14d7a1..6bb6dc6 100755
>> --- a/gitk
>> +++ b/gitk
>> @@ -8109,6 +8109,8 @@ proc parseblobdiffline {ids line} {
>> }
>> # start of a new file
>> set diffinhdr 1
>> + set currdiffsubmod ""
>> +
>> $ctext insert end "\n"
>> set curdiffstart [$ctext index "end - 1c"]
>> lappend ctext_file_names ""
>> @@ -8191,12 +8193,10 @@ proc parseblobdiffline {ids line} {
>> } else {
>> $ctext insert end "$line\n" filesep
>> }
>> - } elseif {![string compare -length 3 " >" $line]} {
>> - set $currdiffsubmod ""
>> + } elseif {$currdiffsubmod ne "" && ![string compare -length 3 " >" $line]} {
>> set line [encoding convertfrom $diffencoding $line]
>> $ctext insert end "$line\n" dresult
>> - } elseif {![string compare -length 3 " <" $line]} {
>> - set $currdiffsubmod ""
>> + } elseif {$currdiffsubmod ne "" && ![string compare -length 3 " <" $line]} {
>> set line [encoding convertfrom $diffencoding $line]
>> $ctext insert end "$line\n" d0
>> } elseif {$diffinhdr} {
>> --
>> 2.19.1.windows.1
>>
prev parent reply other threads:[~2018-11-06 22:03 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-06 19:54 [PATCH] gitk: don't highlight submodule diff lines outside submodule diffs Роман Донченко
2018-11-06 20:06 ` Stefan Beller
2018-11-06 21:56 ` Роман Донченко [this message]
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=fc89fa11-4809-9cb7-93d9-5e9d29c7b82b@corrigendum.ru \
--to=dpb@corrigendum.ru \
--cc=git@vger.kernel.org \
--cc=paulus@ozlabs.org \
--cc=sbeller@google.com \
/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).