Re: [RFC PATCH] gitweb: improve title shortening heuristics
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jul 27, 2022, 06:31 UTC
- Message-ID
- <xmqq4jz3vzgb.fsf@gitster.g>
- In-Reply-To
- <20220726135911.ycvgwbkixb3ei6w3@jrouhaud>
Julien Rouhaud <rjuju123@gmail.com> writes:
Show 12 quoted lines
> Hi, > > On Mon, Jul 25, 2022 at 07:54:34AM +0200, Ævar Arnfjörð Bjarmason wrote: >> >> Please "inline" your patches, see "Sending your patches" in >> Documentation/SubmittingPatches (I.e. send it with git-send-email, or >> similar). I see this as: >> >> > [2. text/plain; v2-0001-gitweb-Remove-title_short-shortening-heuristics.patch]... > > Ah I'm sorry about that. For the archives sake (and to make sure that I > correctly configured my MUA), I'm reattaching the v2 inline.
Thanks. It is not for the archives' sake; I do not take (or notice in the first place) patches in attachments, simply because rarely anybody reviews attachments.
Show 16 quoted lines
>> This looks good to me, The one thing I'd add is that we're just running: >> >> git rev-list --parents --header --max-count=1 HEAD >> >> And parsing that, but if we're truncating things perhaps we should just >> run "git log" or "git show" with the "%<(<N>[,trunc|ltrunc|mtrunc])" >> syntax or similar. >> >> That's obviously a follow-up, but if anyone's interested in deleting >> even more code here... > > Note that I didn't try to do anything about that. I have the feeling that > gitweb isn't wildly used nowadays, especially for bigger projects, so it didn't > seems worth spending too much efforts. > > From ea4f31c0a2276f042322a11e258e55223863cd35 Mon Sep 17 00:00:00 2001
When you are sending the patch in for real, after making a non-patch discussion (all of the above), you can write a "scissors" line
----- >8 -----
right here, immediately before your "From:" and "Subject:". What it does is to tell "git am" on the receiving end to ignore everything it saw up to that point and pretend the message starts there.
You do not want to include "From <object name>" line that is used as an internal separator in the mailbox format. You do not want to include the "Date:" in-body header, either. "From:" and "Subject:" are used often because they are frequently different from the e-mail (e.g. in the message I am responding to, the sender is rjuju123@gmail, not julien.rouhaud@free.fr, and we want the latter on the From: line because that is what appears on the Signed-off-by: line).
Show 13 quoted lines
> From: Julien Rouhaud <julien.rouhaud@free.fr> > Subject: [PATCH v2] gitweb: Remove title_short shortening heuristics > > Those heuristics are way outdated and too general to be useful outside of > kernel.org. Since kernel.org doesn't use gitweb anymore and at least one > project complained about incorrect behavior, entirely remove them. > > Signed-off-by: Julien Rouhaud <julien.rouhaud@free.fr> > --- > > Notes: > Patch re-submitted inline rather than in attachment, sorry about the > previous attachments.
Thanks. Will queue.
Show 33 quoted lines
> gitweb/gitweb.perl | 17 -----------------
> 1 file changed, 17 deletions(-)
>
> diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
> index 1835487ab2..e66eb3d9ba 100755
> --- a/gitweb/gitweb.perl
> +++ b/gitweb/gitweb.perl
> @@ -3560,23 +3560,6 @@ sub parse_commit_text {
> $title =~ s/^ //;
> if ($title ne "") {
> $co{'title'} = chop_str($title, 80, 5);
> - # remove leading stuff of merges to make the interesting part visible
> - if (length($title) > 50) {
> - $title =~ s/^Automatic //;
> - $title =~ s/^merge (of|with) /Merge ... /i;
> - if (length($title) > 50) {
> - $title =~ s/(http|rsync):\/\///;
> - }
> - if (length($title) > 50) {
> - $title =~ s/(master|www|rsync)\.//;
> - }
> - if (length($title) > 50) {
> - $title =~ s/kernel.org:?//;
> - }
> - if (length($title) > 50) {
> - $title =~ s/\/pub\/scm//;
> - }
> - }
> $co{'title_short'} = chop_str($title, 50, 5);
> last;
> }
> --
> 2.37.0