From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: phillip.wood@dunelm.org.uk
Cc: Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org, Taylor Blau <me@ttaylorr.com>
Subject: Re: [PATCH] range-diff: support reading mbox files
Date: Fri, 18 Nov 2022 13:53:36 +0100 (CET) [thread overview]
Message-ID: <nn1s836q-nro7-10rp-6r89-170p9r942062@tzk.qr> (raw)
In-Reply-To: <50d8767b-cb8c-74c5-b280-43472fa074a2@dunelm.org.uk>
[-- Attachment #1: Type: text/plain, Size: 3866 bytes --]
Hi Phillip,
On Thu, 17 Nov 2022, Phillip Wood wrote:
> On 16/11/2022 14:40, Phillip Wood wrote:
> > > + } else if (state == MBOX_IN_DIFF) {
> > > + switch (line[0]) {
> > > + case '\0':
> > > + continue; /* ignore empty lines after diff */
> > > + case '+':
> > > + case '-':
> > > + case ' ':
> > > + if (!old_count && !new_count)
> > > + break;
> >
> > This shouldn't happen in a well formed diff. Below we happily accept bad
> > counts, is there a reason to reject them here?
>
> I think this might be picking up the "--" at the end of the patch as we don't
> want to break here at the end of a hunk. If so then a comment would be
> helpful.
Agreed. And yes, it is picking up the "-- " line at the end of the patch.
> > > + if (old_count && line[0] != '+')
> > > + old_count--;
> > > + if (new_count && line[0] != '-')
> > > + new_count--;
> >
> > The diff is malformed if old_count == 0 and we see '-' or ' ' or new_count
> > == 0 and we see '+' or ' '. The code is careful not to decrement the count
> > in that case so I think it is harmless to accept diffs with bad line counts
> > in the hunk header.
I might be overly cautious here, but as you mentioned elsewhere, it is
really bad if a `size_t` is decremented below 0, and
`new_count`/`old_count` are of that type.
> > > + /* fallthrough */
> > > + case '\\':
> > > + strbuf_addstr(&buf, line);
> > > + strbuf_addch(&buf, '\n');
> > > + util->diffsize++;
> >
> > I think this might be a better place to break if old_count and new_count are
> > both zero.
>
> It would be the right place to break at the end of each hunk, but I don't
> think we want to do that.
It would not even be the right place to break here then: think of the
`\ No newline at end of file` lines: they come after the preceding line
decremented `old_count`/`new_count`, yet we still want them to be part of
the diff.
>
> > > + continue;
> > > + case '@':
> > > + if (parse_hunk_header(line, &old_count,
> > > + &new_count, &p))
> > > + break;
> > > +
> > > + strbuf_addstr(&buf, "@@");
> > > + if (current_filename && *p)
> > > + strbuf_addf(&buf, " %s:",
> > > + current_filename);
> > > + strbuf_addstr(&buf, p);
> > > + strbuf_addch(&buf, '\n');
> > > + util->diffsize++;
> > > + continue;
> > > + }
> >
> > This is effectively the `default:` clause as it is executed when we don't
> > handle the line above. We ignore the contents of this line which makes me
> > wonder what happens if it is the start of another diff.
>
> We'll pick that up earlier with "if (starts_with(line, "diff --git"))"
>
> We only get here at the end of a patch (assuming it has the "--" line from
> format-patch)
We also get here in case of garbage in the middle of a diff ;-)
Thank you for setting a fantastic example how to review code in a
constructive, helpful manner!
Dscho
next prev parent reply other threads:[~2022-11-18 12:53 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-15 18:20 [PATCH] range-diff: support reading mbox files Johannes Schindelin via GitGitGadget
2022-11-16 2:09 ` Taylor Blau
2022-11-16 14:40 ` Phillip Wood
2022-11-17 10:26 ` Phillip Wood
2022-11-18 12:53 ` Johannes Schindelin [this message]
2022-11-18 13:16 ` Johannes Schindelin
2022-11-17 18:24 ` Ævar Arnfjörð Bjarmason
2022-11-18 11:39 ` Johannes Schindelin
2022-11-19 23:11 ` [PATCH v2] " Johannes Schindelin via GitGitGadget
2022-11-21 10:08 ` Phillip Wood
2022-11-22 7:40 ` Johannes Schindelin
2022-11-22 14:20 ` Phillip Wood
2022-11-22 9:08 ` [PATCH v3] " Johannes Schindelin via GitGitGadget
2022-11-22 14:23 ` Phillip Wood
2022-11-22 23:58 ` Junio C Hamano
2023-03-03 22:02 ` 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=nn1s836q-nro7-10rp-6r89-170p9r942062@tzk.qr \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=me@ttaylorr.com \
--cc=phillip.wood@dunelm.org.uk \
/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).