From nobody Thu Aug 17 03:14:25 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RR98v4RMZz4q5dj for ; Thu, 17 Aug 2023 03:14:39 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RR98v2FBTz3FrD for ; Thu, 17 Aug 2023 03:14:39 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x52d.google.com with SMTP id 4fb4d7f45d1cf-51bece5d935so9334565a12.1 for ; Wed, 16 Aug 2023 20:14:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20221208.gappssmtp.com; s=20221208; t=1692242076; x=1692846876; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=03MpvTcZY9GLmxTfCWZFBxei4CSBU87Klr/XNS6lWmY=; b=SHl9Hi613z8YQQfKi/xN0+CQzBM00VOfUGbA2W3WeKeI9b69eC7JQfORxS42wsLSHL QDqGlo2WXcjg6tiYa0O+7XOA0QNnBr4O1O8eLX/hM0lUh7MPg8mHWT7XC63kd3K+/57J xq5iOq4SC+mn3sMNBkwiQcReNyZRjVh1b3XVHtaRdoHJEu2dFOvHdbcd4KlM6nTUR/F9 WC7+eFQ6utBU6eEB9t+FI4pEASQJkGUwbvKc3qftBRRRc1qk0d+vIWkb4drbchMcPaIS vO5nOqkqvn4c0pVxr7+5TsQDSIrJZbvDpiYETaG7ef0BtXuKe9ZTajCwm7mUUzahKMYM tq1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692242076; x=1692846876; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=03MpvTcZY9GLmxTfCWZFBxei4CSBU87Klr/XNS6lWmY=; b=cBWh+0Nn2BGp8g8w/kig6Bm0wZa5P2/qiXtLz25t37Cz4pG7kcSwVXgGWYxyzlqNmf jAh+K/E3iTkCesMqUy7oPwEibLmWgVskc7dwuQACfUStu11afKU2fgHYNLtUmF+Z1Q5h 0ZpmI18J8i0BbflPG0AKIMPXo/yu1K554pAE+DcWTcXTZBOOjIqm65WR7dhFAfbzv/cB iHz85XDisPFAWudSNBD5yZ+qFNyt5CNbF0EhdplFBTcJRJiai8bHxAUBrddjHwjeBdWo 2rLd1DOArtykL31/zxm4umhE1FEbk/BVdBFnMJMGblwSMBtIAA84bYhpCOd8SxqNJCib Wmgg== X-Gm-Message-State: AOJu0YzKe1vTPGicQvZ6Fvv0QFN8bRulqQH+ZtY810uvCuFdO1IJVzJX Q0BIPSDaRlDSFGBMdcouKzopRwTvjljzHesYomja3A== X-Google-Smtp-Source: AGHT+IGrx3iXimew99aUZopQSDOXBSA9aVWZLE4Fut2eX95lW5zOJiDzlGMGNZrUNf4bxLr6+3vHuXGi0mEnGVAE8JI= X-Received: by 2002:a05:6402:1858:b0:523:3e77:7eb5 with SMTP id v24-20020a056402185800b005233e777eb5mr2887460edy.2.1692242076482; Wed, 16 Aug 2023 20:14:36 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202308161757.37GHv2ca059368@gitrepo.freebsd.org> <83CE52EE-11ED-4650-A515-F4CE19345BB9@freebsd.org> In-Reply-To: From: Warner Losh Date: Wed, 16 Aug 2023 21:14:25 -0600 Message-ID: Subject: Re: git: da5432eda807 - main - Remove $FreeBSD$: alt two-line .c pattern To: Alexey Dokuchaev Cc: Jessica Clarke , Warner Losh , src-committers , "" , "" Content-Type: multipart/alternative; boundary="000000000000d7d92a060315cf2d" X-Rspamd-Queue-Id: 4RR98v2FBTz3FrD X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] --000000000000d7d92a060315cf2d Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, Aug 16, 2023 at 8:59=E2=80=AFPM Alexey Dokuchaev wrote: > On Wed, Aug 16, 2023 at 12:30:58PM -0600, Warner Losh wrote: > > On Wed, Aug 16, 2023, 12:15 PM Jessica Clarke wrote: > > > On 16 Aug 2023, at 18:57, Warner Losh wrote: > > > > commit da5432eda807c4b7232d030d5157d5b417ea4f52 > > > > > > > > Remove $FreeBSD$: alt two-line .c pattern > > > > > > > > Remove /^\s*__RCSID\("\$FreeBSD\$"\);\n\n/ > > > > ... > > > > diff --git a/sbin/routed/if.c b/sbin/routed/if.c > > > > index 83d8fe503893..72894942fe05 100644 > > > > --- a/sbin/routed/if.c > > > > +++ b/sbin/routed/if.c > > > > @@ -33,9 +33,6 @@ > > > > > > > > #include "defs.h" > > > > #include "pathnames.h" > > > > - > > > > -__RCSID("$FreeBSD$"); > > > > - > > > > struct ifhead ifnet =3D LIST_HEAD_INITIALIZER(ifnet); /* all > interfaces */ > > > > > > Alas these diffs aren't style(9)-compliant. > > > > Fixes welcome. I'm sure there's a hundred errors in the 32k changes > > I made. I tried to catch as many as I could... > > I think I've also noticed some triple \n\n\n as well, when #include > ...__RCSID() were following top comment. Yea, I'm slowly gathering up the 'problem' patterns that I'll need to do a followup commits with. But so for they seem to be relatively small. I should have had more patterns for __RCSID. And we know about the hard-coded static char rcsid[] stuff. And the blank lines at the start of Makefiles (and a few others). There's so much variation that it's hard to capture it all (my 18 patterns weren't enough to capture all the nuance)= . > On a related note, > can we expect to see $FreeBSD$ back one day, when Git will be replaced > with something which does support keywords properly? > I highly doubt it. Nobody is going to put something like that back into the source tree with 32k files. We've removed them, and the current thinking is they are never coming back. But who knows what will happen in 10 or 20 years when we replace git with the next thing, so it may be unwise to say never, but I'd be greatly surprised if keywords came back into vogue. Warner --000000000000d7d92a060315cf2d Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Wed, Aug 16, 2023 at 8:59=E2=80=AF= PM Alexey Dokuchaev <danfe@freebsd.= org> wrote:
On Wed, Aug 16, 2023 at 12:30:58PM -0600, Warner Losh wrote:
> On Wed, Aug 16, 2023, 12:15 PM Jessica Clarke wrote:
> > On 16 Aug 2023, at 18:57, Warner Losh wrote:
> > > commit da5432eda807c4b7232d030d5157d5b417ea4f52
> > >
> > >=C2=A0 =C2=A0 Remove $FreeBSD$: alt two-line .c pattern
> > >
> > >=C2=A0 =C2=A0 Remove /^\s*__RCSID\("\$FreeBSD\$"\);= \n\n/
> > > ...
> > > diff --git a/sbin/routed/if.c b/sbin/routed/if.c
> > > index 83d8fe503893..72894942fe05 100644
> > > --- a/sbin/routed/if.c
> > > +++ b/sbin/routed/if.c
> > > @@ -33,9 +33,6 @@
> > >
> > > #include "defs.h"
> > > #include "pathnames.h"
> > > -
> > > -__RCSID("$FreeBSD$");
> > > -
> > > struct ifhead ifnet =3D LIST_HEAD_INITIALIZER(ifnet); /* all= interfaces */
> >
> > Alas these diffs aren't style(9)-compliant.
>
> Fixes welcome. I'm sure there's a hundred errors in the 32k ch= anges
> I made. I tried to catch as many as I could...

I think I've also noticed some triple \n\n\n as well, when #include
<cdefs.h>...__RCSID() were following top comment.
<= br>
Yea, I'm slowly gathering up the 'problem' patter= ns that I'll need to
do a followup commits with. But so for t= hey seem to be relatively small.
I should have had more patterns = for __RCSID. And we know about
the hard-coded static char rcsid[]= stuff. And the blank lines at the start
of Makefiles (and a few = others). There's so much variation that it's hard
to capt= ure it all (my 18 patterns weren't enough to capture all the nuance).
=C2=A0
On a= related note,
can we expect to see $FreeBSD$ back one day, when Git will be replaced
with something which does support keywords properly?
<= br>
I highly doubt it. Nobody is going to put something like that= back into the
source tree with 32k files. We've removed them= , and the current thinking
is they are never coming back. But who= knows what will happen in 10 or 20
years when we replace git wit= h the next thing, so it may be unwise to say
never, but I'd b= e greatly surprised if keywords came back into vogue.

Warner

--000000000000d7d92a060315cf2d--