Date: Wed, 16 Aug 2023 21:14:25 -0600 From: Warner Losh <imp@bsdimp.com> To: Alexey Dokuchaev <danfe@freebsd.org> Cc: Jessica Clarke <jrtc27@freebsd.org>, Warner Losh <imp@freebsd.org>, src-committers <src-committers@freebsd.org>, "<dev-commits-src-all@freebsd.org>" <dev-commits-src-all@freebsd.org>, "<dev-commits-src-main@freebsd.org>" <dev-commits-src-main@freebsd.org> Subject: Re: git: da5432eda807 - main - Remove $FreeBSD$: alt two-line .c pattern Message-ID: <CANCZdfr_E_UNYwxb7ePL0pTHD_ro1_pAJPNLj158m2Euip_G_g@mail.gmail.com> In-Reply-To: <ZN2NCk1uzBXu3uhB@FreeBSD.org> References: <202308161757.37GHv2ca059368@gitrepo.freebsd.org> <83CE52EE-11ED-4650-A515-F4CE19345BB9@freebsd.org> <CANCZdfoFgucwiOvVeLdxeVSHiZAmEW%2Bodp9Ri9o2jbxAFUBZWw@mail.gmail.com> <ZN2NCk1uzBXu3uhB@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--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 <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
> > > >
> > > > 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
> <cdefs.h>...__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
<div dir=3D"ltr"><div dir=3D"ltr"><br></div><br><div class=3D"gmail_quote">=
<div dir=3D"ltr" class=3D"gmail_attr">On Wed, Aug 16, 2023 at 8:59=E2=80=AF=
PM Alexey Dokuchaev <<a href=3D"mailto:danfe@freebsd.org">danfe@freebsd.=
org</a>> wrote:<br></div><blockquote class=3D"gmail_quote" style=3D"marg=
in:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1e=
x">On Wed, Aug 16, 2023 at 12:30:58PM -0600, Warner Losh wrote:<br>
> On Wed, Aug 16, 2023, 12:15 PM Jessica Clarke wrote:<br>
> > On 16 Aug 2023, at 18:57, Warner Losh wrote:<br>
> > > commit da5432eda807c4b7232d030d5157d5b417ea4f52<br>
> > ><br>
> > >=C2=A0 =C2=A0 Remove $FreeBSD$: alt two-line .c pattern<br>
> > ><br>
> > >=C2=A0 =C2=A0 Remove /^\s*__RCSID\("\$FreeBSD\$"\);=
\n\n/<br>
> > > ...<br>
> > > diff --git a/sbin/routed/if.c b/sbin/routed/if.c<br>
> > > index 83d8fe503893..72894942fe05 100644<br>
> > > --- a/sbin/routed/if.c<br>
> > > +++ b/sbin/routed/if.c<br>
> > > @@ -33,9 +33,6 @@<br>
> > ><br>
> > > #include "defs.h"<br>
> > > #include "pathnames.h"<br>
> > > -<br>
> > > -__RCSID("$FreeBSD$");<br>
> > > -<br>
> > > struct ifhead ifnet =3D LIST_HEAD_INITIALIZER(ifnet); /* all=
interfaces */<br>
> ><br>
> > Alas these diffs aren't style(9)-compliant.<br>
> <br>
> Fixes welcome. I'm sure there's a hundred errors in the 32k ch=
anges<br>
> I made. I tried to catch as many as I could...<br>
<br>
I think I've also noticed some triple \n\n\n as well, when #include<br>
<cdefs.h>...__RCSID() were following top comment. </blockquote><div><=
br></div><div>Yea, I'm slowly gathering up the 'problem' patter=
ns that I'll need to</div><div>do a followup commits with. But so for t=
hey seem to be relatively small.</div><div>I should have had more patterns =
for __RCSID. And we know about</div><div>the hard-coded static char rcsid[]=
stuff. And the blank lines at the start</div><div>of Makefiles (and a few =
others). There's so much variation that it's hard</div><div>to capt=
ure it all (my 18 patterns weren't enough to capture all the nuance).</=
div><div>=C2=A0</div><blockquote class=3D"gmail_quote" style=3D"margin:0px =
0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">On a=
related note,<br>
can we expect to see $FreeBSD$ back one day, when Git will be replaced<br>
with something which does support keywords properly?<br></blockquote><div><=
br></div><div>I highly doubt it. Nobody is going to put something like that=
back into the</div><div>source tree with 32k files. We've removed them=
, and the current thinking</div><div>is they are never coming back. But who=
knows what will happen in 10 or 20</div><div>years when we replace git wit=
h the next thing, so it may be unwise to say</div><div>never, but I'd b=
e greatly surprised if keywords came back into vogue.<br></div><div><br></d=
iv><div>Warner</div><div><br></div></div></div>
--000000000000d7d92a060315cf2d--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfr_E_UNYwxb7ePL0pTHD_ro1_pAJPNLj158m2Euip_G_g>