From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Ulrich Windl <Ulrich.Windl@rz.uni-regensburg.de>
Cc: peff@peff.net, Johannes Schindelin <Johannes.Schindelin@gmx.de>,
git@vger.kernel.org
Subject: Re: Antw: [EXT] Re: git add --interactive patch improvement for split hunks
Date: Mon, 28 Jun 2021 13:20:46 +0200 [thread overview]
Message-ID: <87eecmgrnx.fsf@evledraar.gmail.com> (raw)
In-Reply-To: <60D9A01C020000A100042099@gwsmtp.uni-regensburg.de>
On Mon, Jun 28 2021, Ulrich Windl wrote:
>>>> Jeff King <peff@peff.net> schrieb am 24.06.2021 um 17:41 in Nachricht
> <YNSnlhbE30xDfVMY@coredump.intra.peff.net>:
>
> [...]
>> One thing you may not like, though: both the builtin version and that
>> patch only put the funcname context in the _first_ hunk of the split.
>> Doing it for subsequent hunks is much trickier, since there can be a
>> funcname in the split context itself. E.g.:
>>
>> @@ ... @@ void foo()
>> int x;
>> - int y = 1;
>> + int y = 2;
>>
>> - x = 3;
>> + x = 4;
>> }
>>
>> could split into two hunks, both annotated with "void foo()". But:
>>
>> @@ ... @@ void foo()
>> int x;
>> - x = 3;
>> + x = 4;
>> }
>> void bar()
>> {
>> - int y = 1;
>> + int y = 2;
>> }
>>
>> would be wrong to say "void foo()" for the second hunk. We'd have to
>> re-scan the interior context lines for a funcname to find it. That's
>> all-but-impossible in the perl version, but might be do-able in the C
>> version (since it has easy access to the funcname-matching patterns and
>> machinery).
>
> There always was a related bug (IMHO) that showed the context of the
> previous function even though the actual change was within a new
> function (that starts within the context lines). So if that bug were
> fixed, my guess is that the other would be as well.
> However I don't know how easy or hard the fix will be.
> Maybe the "definition" of function context is just different; I don't really know.
Does that bug perhaps have anything to do with:
https://lore.kernel.org/git/20210215155020.2804-2-avarab@gmail.com/
I have some planned fixes to that behavior, but it's currently blocked
on a combination of myself having a lot of outstanding patches, and that
linked patch needing another series (as of yet unsubmitted/un-re-rolled)
to get us proper testing in this area of git. I.e. our testing of what
function context we should find is really lacking.
next prev parent reply other threads:[~2021-06-28 11:22 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-24 10:35 git add --interactive patch improvement for split hunks Ulrich Windl
2021-06-24 15:41 ` Jeff King
2021-06-28 10:10 ` Antw: [EXT] " Ulrich Windl
2021-06-28 11:20 ` Ævar Arnfjörð Bjarmason [this message]
2021-06-30 2:16 ` Jeff King
2021-06-30 6:09 ` Junio C Hamano
2021-06-30 7:31 ` Jeff King
2021-06-30 8:27 ` Ævar Arnfjörð Bjarmason
2021-06-30 17:06 ` Jeff King
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=87eecmgrnx.fsf@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=Ulrich.Windl@rz.uni-regensburg.de \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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).