GNU bug report logs - #76601
[PATCH 0/1] dir-locals: Add copyrights.

Previous Next

Package: guix-patches;

Reported by: Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>

Date: Wed, 26 Feb 2025 21:29:01 UTC

Severity: normal

Tags: patch

Done: Christopher Baines <mail <at> cbaines.net>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 76601 in the body.
You can then email your comments to 76601 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#76601; Package guix-patches. (Wed, 26 Feb 2025 21:29:02 GMT) Full text and rfc822 format available.

Acknowledgement sent to Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Wed, 26 Feb 2025 21:29:02 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
To: guix-patches <at> gnu.org
Cc: Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
Subject: [PATCH 0/1] dir-locals: Add copyrights.
Date: Wed, 26 Feb 2025 22:27:04 +0100
Hi,

I'd like to reuse .dir-locals.el in another package (GNU Boot), and already
having correct copyright ownership on .dir-locals.el makes it easier to do
that.

Denis 'GNUtoo' Carikli (1):
  dir-locals: Add copyrights.

 .dir-locals.el | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)


base-commit: 8bc831325a905dbd9015739b58e3a5138d2217da
-- 
2.46.0





Information forwarded to guix <at> cbaines.net, ludo <at> gnu.org, othacehe <at> gnu.org, zimon.toutoune <at> gmail.com, me <at> tobias.gr, jgart <at> dismail.de, guix-patches <at> gnu.org:
bug#76601; Package guix-patches. (Wed, 26 Feb 2025 21:31:02 GMT) Full text and rfc822 format available.

Message #8 received at 76601 <at> debbugs.gnu.org (full text, mbox):

From: Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
To: 76601 <at> debbugs.gnu.org
Cc: Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
Subject: [PATCH 1/1] dir-locals: Add copyrights.
Date: Wed, 26 Feb 2025 22:29:52 +0100
* .dir-locals.el: Add copyrights.

The list was first generated with the 'git log --reverse --oneline
--pretty=";;; Copyright © %ad %an <%ae>" --follow --date="format:%Y" --
.dir-locals.el' command, and then the lines were regrouped together by hand,
and finally the names and mails were updated to the ones currently used with
the help of git grep.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
Change-Id: I010f1e5e3afc8b646da39dc6341f7870f0c9bf45
---
 .dir-locals.el | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/.dir-locals.el b/.dir-locals.el
index d629b51c8a..b215f53227 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -1,5 +1,35 @@
-;; Per-directory local variables for GNU Emacs 23 and later.
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2012-2023 Ludovic Courtès <ludo <at> gnu.org>
+;;; Copyright © 2013,2014 Mark H Weaver <mhw <at> netris.org>
+;;; Copyright © 2014 Taylan Ulrich Bayırlı/Kammer <taylanbayirli <at> gmail.com>
+;;; Copyright © 2015 David Thompson <davet <at> gnu.org>
+;;; Copyright © 2016 Hartmut Goebel <h.goebel <at> crazy-compilers.com>
+;;; Copyright © 2017 Alex Kost <alezost <at> gmail.com>
+;;; Copyright © 2018-2020 Caleb Ristvedt <caleb.ristvedt <at> cune.org>
+;;; Copyright © 2020-2023 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
+;;; Copyright © 2020 Miguel Ángel Arruga Vivas <rosen644835 <at> gmail.com>
+;;; Copyright © 2020 Christine Lemmer-Webber <cwebber <at> dustycloud.org>
+;;; Copyright © 2022 Liliana Marie Prikler <liliana.prikler <at> gmail.com>
+;;; Copyright © 2022 Andrew Tropin <andrew <at> trop.in>
+;;; Copyright © 2022 Brian Cully <bjc <at> kublai.com>
+;;; Copyright © 2023 (unmatched-parenthesis ew syntax <paren <at> disroot.org>
+;;; Copyright © 2024 Christopher Baines <mail <at> cbaines.net>
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;; Per-directory local variables for GNU Emacs 23 and later.
 ((nil
   . ((fill-column . 78)
      (tab-width   .  8)
-- 
2.46.0





Information forwarded to guix-patches <at> gnu.org:
bug#76601; Package guix-patches. (Thu, 27 Feb 2025 00:33:02 GMT) Full text and rfc822 format available.

Message #11 received at 76601 <at> debbugs.gnu.org (full text, mbox):

From: Tomas Volf <~@wolfsden.cz>
To: Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
Cc: Simon Tournier <zimon.toutoune <at> gmail.com>, 76601 <at> debbugs.gnu.org,
 Ludovic Courtès <ludo <at> gnu.org>,
 Tobias Geerinckx-Rice <me <at> tobias.gr>, jgart <jgart <at> dismail.de>,
 Mathieu Othacehe <othacehe <at> gnu.org>, Christopher Baines <guix <at> cbaines.net>
Subject: Re: [bug#76601] [PATCH 1/1] dir-locals: Add copyrights.
Date: Thu, 27 Feb 2025 01:32:08 +0100
Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org> writes:

> * .dir-locals.el: Add copyrights.
>
> The list was first generated with the 'git log --reverse --oneline
> --pretty=";;; Copyright © %ad %an <%ae>" --follow --date="format:%Y" --
> .dir-locals.el' command, and then the lines were regrouped together by hand,
> and finally the names and mails were updated to the ones currently used with
> the help of git grep.
>
> Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
> Change-Id: I010f1e5e3afc8b646da39dc6341f7870f0c9bf45
> ---
>  .dir-locals.el | 32 +++++++++++++++++++++++++++++++-
>  1 file changed, 31 insertions(+), 1 deletion(-)
>
> diff --git a/.dir-locals.el b/.dir-locals.el
> index d629b51c8a..b215f53227 100644
> --- a/.dir-locals.el
> +++ b/.dir-locals.el
> @@ -1,5 +1,35 @@
> -;; Per-directory local variables for GNU Emacs 23 and later.
> +;;; GNU Guix --- Functional package management for GNU
> +;;; Copyright © 2012-2023 Ludovic Courtès <ludo <at> gnu.org>
> +;;; Copyright © 2013,2014 Mark H Weaver <mhw <at> netris.org>
> +;;; Copyright © 2014 Taylan Ulrich Bayırlı/Kammer <taylanbayirli <at> gmail.com>
> +;;; Copyright © 2015 David Thompson <davet <at> gnu.org>
> +;;; Copyright © 2016 Hartmut Goebel <h.goebel <at> crazy-compilers.com>
> +;;; Copyright © 2017 Alex Kost <alezost <at> gmail.com>
> +;;; Copyright © 2018-2020 Caleb Ristvedt <caleb.ristvedt <at> cune.org>
> +;;; Copyright © 2020-2023 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
> +;;; Copyright © 2020 Miguel Ángel Arruga Vivas <rosen644835 <at> gmail.com>
> +;;; Copyright © 2020 Christine Lemmer-Webber <cwebber <at> dustycloud.org>
> +;;; Copyright © 2022 Liliana Marie Prikler <liliana.prikler <at> gmail.com>
> +;;; Copyright © 2022 Andrew Tropin <andrew <at> trop.in>
> +;;; Copyright © 2022 Brian Cully <bjc <at> kublai.com>
> +;;; Copyright © 2023 (unmatched-parenthesis ew syntax <paren <at> disroot.org>
> +;;; Copyright © 2024 Christopher Baines <mail <at> cbaines.net>

Interesting, for some reason I am missing here.  I wonder why your
command missed these two commits.

--8<---------------cut here---------------start------------->8---
350be583d4 .dir-locals.el: Configure indentation for home-environment.
9dce86b1cb .dir-locals: Configure indentation for swap-space.
--8<---------------cut here---------------end--------------->8---

Actually, it look like for example Nicolas Graves is also missing.

> +;;; This file is part of GNU Guix.
> +;;;
> +;;; GNU Guix is free software; you can redistribute it and/or modify it
> +;;; under the terms of the GNU General Public License as published by
> +;;; the Free Software Foundation; either version 3 of the License, or (at
> +;;; your option) any later version.
> +;;;
> +;;; GNU Guix is distributed in the hope that it will be useful, but
> +;;; WITHOUT ANY WARRANTY; without even the implied warranty of
> +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +;;; GNU General Public License for more details.
> +;;;
> +;;; You should have received a copy of the GNU General Public License
> +;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
>  
> +;; Per-directory local variables for GNU Emacs 23 and later.
>  ((nil
>    . ((fill-column . 78)
>       (tab-width   .  8)

-- 
There are only two hard things in Computer Science:
cache invalidation, naming things and off-by-one errors.




Information forwarded to guix-patches <at> gnu.org:
bug#76601; Package guix-patches. (Sun, 16 Mar 2025 02:30:05 GMT) Full text and rfc822 format available.

Message #14 received at 76601 <at> debbugs.gnu.org (full text, mbox):

From: Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
To: Tomas Volf <~@wolfsden.cz>
Cc: Simon Tournier <zimon.toutoune <at> gmail.com>, 76601 <at> debbugs.gnu.org,
 Ludovic Courtès <ludo <at> gnu.org>,
 Tobias Geerinckx-Rice <me <at> tobias.gr>, jgart <jgart <at> dismail.de>,
 Mathieu Othacehe <othacehe <at> gnu.org>, Christopher Baines <guix <at> cbaines.net>
Subject: Re: [bug#76601] [PATCH 1/1] dir-locals: Add copyrights.
Date: Sun, 16 Mar 2025 03:28:42 +0100
[Message part 1 (text/plain, inline)]
Hi,

On Thu, 27 Feb 2025 01:32:08 +0100
Tomas Volf <~@wolfsden.cz> wrote:
> Interesting, for some reason I am missing here.  I wonder why your
> command missed these two commits.
Thanks a lot for spotting that. I had the same issue with GNU Boot few
days ago and there, using --reverse also missed some commits (the ones
you found and also one from Maxim Cournoyer in 2025).

I'll send a v2 with the missing commits/copyrights.

Denis.
[Message part 2 (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#76601; Package guix-patches. (Sun, 16 Mar 2025 03:15:03 GMT) Full text and rfc822 format available.

Message #17 received at 76601 <at> debbugs.gnu.org (full text, mbox):

From: Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
To: 76601 <at> debbugs.gnu.org
Cc: Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
Subject: [PATCH v2] dir-locals: Add copyrights.
Date: Sun, 16 Mar 2025 04:13:39 +0100
* .dir-locals.el: Add copyrights.

The list was first generated with the 'git log --oneline
--pretty=";;; Copyright © %ad %an <%ae>" --follow --date="format:%Y" --
.dir-locals.el' command, and then the lines were regrouped together by hand,
and finally the names and mails were updated to the ones currently used with
the help of git grep.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
Change-Id: I010f1e5e3afc8b646da39dc6341f7870f0c9bf45
---
ChangeLog v1->v2:
=================
* Fixed the command in the commit log (it didn't list all the commits).
* Added missing Copyrights (Tomas Volf, Nicolas Graves, and 2025 for Maxim
  Cournoyer). Thanks to Tomas Volf who found the issue.
---
 .dir-locals.el | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/.dir-locals.el b/.dir-locals.el
index 76c9e12992..983a92f5a6 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -1,5 +1,37 @@
-;; Per-directory local variables for GNU Emacs 23 and later.
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2012-2023 Ludovic Courtès <ludo <at> gnu.org>
+;;; Copyright © 2013,2014 Mark H Weaver <mhw <at> netris.org>
+;;; Copyright © 2014 Taylan Ulrich Bayırlı/Kammer <taylanbayirli <at> gmail.com>
+;;; Copyright © 2015 David Thompson <davet <at> gnu.org>
+;;; Copyright © 2016 Hartmut Goebel <h.goebel <at> crazy-compilers.com>
+;;; Copyright © 2017 Alex Kost <alezost <at> gmail.com>
+;;; Copyright © 2018-2020 Caleb Ristvedt <caleb.ristvedt <at> cune.org>
+;;; Copyright © 2020-2023,2025 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
+;;; Copyright © 2020 Miguel Ángel Arruga Vivas <rosen644835 <at> gmail.com>
+;;; Copyright © 2020 Christine Lemmer-Webber <cwebber <at> dustycloud.org>
+;;; Copyright © 2022 Liliana Marie Prikler <liliana.prikler <at> gmail.com>
+;;; Copyright © 2022 Andrew Tropin <andrew <at> trop.in>
+;;; Copyright © 2022 Brian Cully <bjc <at> kublai.com>
+;;; Copyright © 2023 (unmatched-parenthesis ew syntax <paren <at> disroot.org>
+;;; Copyright © 2024 Christopher Baines <mail <at> cbaines.net>
+;;; Copyright © 2024 Tomas Volf <~@wolfsden.cz>
+;;; Copyright © 2024 Nicolas Graves <ngraves <at> ngraves.fr>
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;; Per-directory local variables for GNU Emacs 23 and later.
 ((nil
   . ((fill-column . 78)
      (tab-width   .  8)

base-commit: 51c28379d64ab361473964f8f634224f0dfb24c1
-- 
2.46.0





Information forwarded to guix-patches <at> gnu.org:
bug#76601; Package guix-patches. (Sun, 16 Mar 2025 15:27:03 GMT) Full text and rfc822 format available.

Message #20 received at 76601 <at> debbugs.gnu.org (full text, mbox):

From: Tomas Volf <~@wolfsden.cz>
To: Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
Cc: 76601 <at> debbugs.gnu.org
Subject: Re: [bug#76601] [PATCH v2] dir-locals: Add copyrights.
Date: Sun, 16 Mar 2025 16:26:15 +0100
[Message part 1 (text/plain, inline)]
Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org> writes:

> * .dir-locals.el: Add copyrights.
>
> The list was first generated with the 'git log --oneline
> --pretty=";;; Copyright © %ad %an <%ae>" --follow --date="format:%Y" --
> .dir-locals.el' command, and then the lines were regrouped together by hand,
> and finally the names and mails were updated to the ones currently used with
> the help of git grep.

I have used the following command to verify the content of the patch:

--8<---------------cut here---------------start------------->8---
git log --pretty='format:%as %an %ae' orig-master -- .dir-locals.el \
    | sed -E 's/-[0-9]{2}-[0-9]{2}//'                               \
    | sed -E 's/(....) (.*)/\2 \1/'                                 \
    | sort -u
--8<---------------cut here---------------end--------------->8---

>
> Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
> Change-Id: I010f1e5e3afc8b646da39dc6341f7870f0c9bf45
> ---
> ChangeLog v1->v2:
> =================
> * Fixed the command in the commit log (it didn't list all the commits).
> * Added missing Copyrights (Tomas Volf, Nicolas Graves, and 2025 for Maxim
>   Cournoyer). Thanks to Tomas Volf who found the issue.
> ---
>  .dir-locals.el | 34 +++++++++++++++++++++++++++++++++-
>  1 file changed, 33 insertions(+), 1 deletion(-)
>
> diff --git a/.dir-locals.el b/.dir-locals.el
> index 76c9e12992..983a92f5a6 100644
> --- a/.dir-locals.el
> +++ b/.dir-locals.el
> @@ -1,5 +1,37 @@
> -;; Per-directory local variables for GNU Emacs 23 and later.
> +;;; GNU Guix --- Functional package management for GNU
> +;;; Copyright © 2012-2023 Ludovic Courtès <ludo <at> gnu.org>
> +;;; Copyright © 2013,2014 Mark H Weaver <mhw <at> netris.org>
> +;;; Copyright © 2014 Taylan Ulrich Bayırlı/Kammer <taylanbayirli <at> gmail.com>
> +;;; Copyright © 2015 David Thompson <davet <at> gnu.org>
> +;;; Copyright © 2016 Hartmut Goebel <h.goebel <at> crazy-compilers.com>
> +;;; Copyright © 2017 Alex Kost <alezost <at> gmail.com>
> +;;; Copyright © 2018-2020 Caleb Ristvedt <caleb.ristvedt <at> cune.org>
> +;;; Copyright © 2020-2023,2025 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
> +;;; Copyright © 2020 Miguel Ángel Arruga Vivas <rosen644835 <at> gmail.com>
> +;;; Copyright © 2020 Christine Lemmer-Webber <cwebber <at> dustycloud.org>
> +;;; Copyright © 2022 Liliana Marie Prikler <liliana.prikler <at> gmail.com>
> +;;; Copyright © 2022 Andrew Tropin <andrew <at> trop.in>
> +;;; Copyright © 2022 Brian Cully <bjc <at> kublai.com>
> +;;; Copyright © 2023 (unmatched-parenthesis ew syntax <paren <at> disroot.org>
> +;;; Copyright © 2024 Christopher Baines <mail <at> cbaines.net>
> +;;; Copyright © 2024 Tomas Volf <~@wolfsden.cz>
> +;;; Copyright © 2024 Nicolas Graves <ngraves <at> ngraves.fr>

Hi, me again :) I think you are missing David Elsing.  I am not sure how
fresh your git checkout is, but on current master I see:

--8<---------------cut here---------------start------------->8---
commit 30e51cb6b42e86f9f94d6380f69a1020ee99ff39
Author: David Elsing <david.elsing <at> posteo.net>
Date:   Tue Mar 4 20:33:08 2025 +0000
--8<---------------cut here---------------end--------------->8---

One more nitpick could be that paren <at> disroot.org is known under multiple
names in our git history, and I am not sure which one is preferred.
Edits to .dir-locals.el were made under two of them, you picked the last
name used.  However last commit to Guix repository itself uses different
name (just `(unmatched-parenthesis').

Other than that LGTM.

Tomas

Reviewed-by: Tomas Volf <~@wolfsden.cz>

-- 
There are only two hard things in Computer Science:
cache invalidation, naming things and off-by-one errors.
[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#76601; Package guix-patches. (Tue, 18 Mar 2025 23:56:02 GMT) Full text and rfc822 format available.

Message #23 received at 76601 <at> debbugs.gnu.org (full text, mbox):

From: Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
To: 76601 <at> debbugs.gnu.org,
	Tomas Volf <~@wolfsden.cz>
Cc: Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
Subject: [PATCH v3] dir-locals: Add copyrights.
Date: Wed, 19 Mar 2025 00:55:22 +0100
* .dir-locals.el: Add copyrights.

The list was first generated in this way:
- I started with "git log --pretty='format:%h %ad %an <%ae>' origin/master \
  --date="format:%Y" -- .dir-locals.el".
- I took the name at the bottom and do a grep with it like that: "git log \
  --pretty='format:%h %ad %an <%ae>' origin/master --date="format:%Y" -- \
  .dir-locals.el | grep 'Ludovic Courtès'"
- I then filled in the copyright for that name
- I then repeat the first command with grep -v instead, like that:
  "git log --pretty='format:%h %ad %an <%ae>' origin/master \
   --date="format:%Y" -- .dir-locals.el | grep -v 'Ludovic Courtès'"

I also used "git log --pretty='format:%h %ad %an <%ae>' origin/master \
--date="format:%Y" --merges -- .dir-locals.el" to verify which commits I
should not take into account, when they didn't modify .dir-locals.el (I
checked that with git show <hash>).

For updating the names and/or email addresses being used I used git log
--author with either part of the name or the email (though it is easy to miss
things with this approach).

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
Change-Id: I010f1e5e3afc8b646da39dc6341f7870f0c9bf45
---
ChangeLog v2->v3:
=================
* Fixed "unmatched-parenthesis"'s name.
* Added "David Elsing" who was missing.
* Documented better my process for comming up
  with the name list inside the commit message.

ChangeLog v1->v2:
=================
* Fixed the command in the commit log (it didn't list all the commits).
* Added missing Copyrights (Tomas Volf, Nicolas Graves, and 2025 for Maxim
  Cournoyer). Thanks to Tomas Volf who found the issue.
---
 .dir-locals.el | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/.dir-locals.el b/.dir-locals.el
index 76c9e12992..69a5d8065e 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -1,5 +1,38 @@
-;; Per-directory local variables for GNU Emacs 23 and later.
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2012-2023 Ludovic Courtès <ludo <at> gnu.org>
+;;; Copyright © 2013,2014 Mark H Weaver <mhw <at> netris.org>
+;;; Copyright © 2014 Taylan Ulrich Bayırlı/Kammer <taylanbayirli <at> gmail.com>
+;;; Copyright © 2015 David Thompson <davet <at> gnu.org>
+;;; Copyright © 2016 Hartmut Goebel <h.goebel <at> crazy-compilers.com>
+;;; Copyright © 2017 Alex Kost <alezost <at> gmail.com>
+;;; Copyright © 2018-2020 Caleb Ristvedt <caleb.ristvedt <at> cune.org>
+;;; Copyright © 2020-2023,2025 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
+;;; Copyright © 2020 Miguel Ángel Arruga Vivas <rosen644835 <at> gmail.com>
+;;; Copyright © 2020 Christine Lemmer-Webber <cwebber <at> dustycloud.org>
+;;; Copyright © 2022 Liliana Marie Prikler <liliana.prikler <at> gmail.com>
+;;; Copyright © 2022 Andrew Tropin <andrew <at> trop.in>
+;;; Copyright © 2022 Brian Cully <bjc <at> kublai.com>
+;;; Copyright © 2023 (unmatched-parenthesis <paren <at> disroot.org>
+;;; Copyright © 2024 Christopher Baines <mail <at> cbaines.net>
+;;; Copyright © 2024 Tomas Volf <~@wolfsden.cz>
+;;; Copyright © 2024 Nicolas Graves <ngraves <at> ngraves.fr>
+;;; Copyright © 2025 David Elsing <david.elsing <at> posteo.net>
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;; Per-directory local variables for GNU Emacs 23 and later.
 ((nil
   . ((fill-column . 78)
      (tab-width   .  8)

base-commit: fa39695bbc0c5f79838cbca55d55eebd821a8efa
-- 
2.46.0





Information forwarded to guix-patches <at> gnu.org:
bug#76601; Package guix-patches. (Tue, 18 Mar 2025 23:56:03 GMT) Full text and rfc822 format available.

Message #26 received at 76601 <at> debbugs.gnu.org (full text, mbox):

From: Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
To: Tomas Volf <~@wolfsden.cz>
Cc: 76601 <at> debbugs.gnu.org
Subject: Re: [bug#76601] [PATCH v2] dir-locals: Add copyrights.
Date: Wed, 19 Mar 2025 00:44:16 +0100
[Message part 1 (text/plain, inline)]
On Sun, 16 Mar 2025 16:26:15 +0100
Tomas Volf <~@wolfsden.cz> wrote:

> I think you are missing David Elsing
I probably had an older revision when I worked on it (I did the work
offline, in public transports) and rebased the commit at the end before
sending the patch, without re-checking everything.

Also note that I'm not good at manual repetitive processes so your help
with the review is greatly appreciated (and I'm also not good at
reviewing my own work).

> I have used the following command to verify the content of the patch:
> 
> --8<---------------cut here---------------start------------->8---
> git log --pretty='format:%as %an %ae' orig-master -- .dir-locals.el \
>     | sed -E 's/-[0-9]{2}-[0-9]{2}//'                               \
>     | sed -E 's/(....) (.*)/\2 \1/'                                 \
>     | sort -u
> --8<---------------cut here---------------end--------------->8---

I've updated the commit message with the new method I used to re-verify
things.

We also have merge commits:
> $ git log --pretty='format:%h %ad %an <%ae>' origin/master \
> --date="format:%Y" --merges -- .dir-locals.el 
> c4133c43c7 2021 Marius Bakke <marius <at> gnu.org> 
> 0e47fcced4 2021 Ludovic Courtès <ludo <at> gnu.org>
> 129b9b16d9 2020 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>

But didn't see anything touching .dir-locals.el with 'git show
c4133c43c7', so I didn't include Marius Bakke, so it would be good if
you can verify if my theory is right. 

This is also because I don't like and/or understand all the potential
side effects of git merges, so I try to avoid them as much as possible
unless the merge commit have no diff within them (so part of the
history is linear and bisects work as usual for instance).

As for Ludovic and Maxim, they both modified .dir-locals.el in
respectively 2021 and 2020 in other commits.

I'll send a v3. Feel free to modify the commit message and/or add
Marius Bakke if needed.

Denis.
[Message part 2 (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#76601; Package guix-patches. (Wed, 19 Mar 2025 16:43:01 GMT) Full text and rfc822 format available.

Message #29 received at 76601 <at> debbugs.gnu.org (full text, mbox):

From: Tomas Volf <~@wolfsden.cz>
To: 76601 <at> debbugs.gnu.org
Cc: Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
Subject: Re: [PATCH v3] dir-locals: Add copyrights.
Date: Wed, 19 Mar 2025 17:42:16 +0100
Reviewed-by: Tomas Volf <~@wolfsden.cz>

-- 
There are only two hard things in Computer Science:
cache invalidation, naming things and off-by-one errors.




Information forwarded to guix-patches <at> gnu.org:
bug#76601; Package guix-patches. (Wed, 19 Mar 2025 16:48:02 GMT) Full text and rfc822 format available.

Message #32 received at 76601 <at> debbugs.gnu.org (full text, mbox):

From: Tomas Volf <~@wolfsden.cz>
To: Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
Cc: 76601 <at> debbugs.gnu.org
Subject: Re: [bug#76601] [PATCH v2] dir-locals: Add copyrights.
Date: Wed, 19 Mar 2025 17:46:57 +0100
Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org> writes:

> We also have merge commits:
>> $ git log --pretty='format:%h %ad %an <%ae>' origin/master \
>> --date="format:%Y" --merges -- .dir-locals.el 
>> c4133c43c7 2021 Marius Bakke <marius <at> gnu.org> 
>> 0e47fcced4 2021 Ludovic Courtès <ludo <at> gnu.org>
>> 129b9b16d9 2020 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
>
> But didn't see anything touching .dir-locals.el with 'git show
> c4133c43c7', so I didn't include Marius Bakke, so it would be good if
> you can verify if my theory is right.

Yes, I have encountered the commit as well during the verification and
arrived to the same conclusion (== he modified nothing).  I do not
understand why the commit is listed.

I think it looks good now, I have added my reviewed-by reply to the bug
and applied the appropriate user tag, so hopefully some committer will
pick it up.  ^_^

Have a nice day,
Tomas

-- 
There are only two hard things in Computer Science:
cache invalidation, naming things and off-by-one errors.




Reply sent to Christopher Baines <mail <at> cbaines.net>:
You have taken responsibility. (Sun, 06 Apr 2025 18:20:02 GMT) Full text and rfc822 format available.

Notification sent to Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>:
bug acknowledged by developer. (Sun, 06 Apr 2025 18:20:02 GMT) Full text and rfc822 format available.

Message #37 received at 76601-done <at> debbugs.gnu.org (full text, mbox):

From: Christopher Baines <mail <at> cbaines.net>
To: Tomas Volf <~@wolfsden.cz>
Cc: 76601-done <at> debbugs.gnu.org,
 Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
Subject: Re: [bug#76601] [PATCH v3] dir-locals: Add copyrights.
Date: Sun, 06 Apr 2025 19:12:21 +0100
[Message part 1 (text/plain, inline)]
Tomas Volf <~@wolfsden.cz> writes:

> Reviewed-by: Tomas Volf <~@wolfsden.cz>

Thanks both, I've pushed this to master as
db523cfaa834ac9778f436e7f94647508733c0a1.

Chris
[signature.asc (application/pgp-signature, inline)]

bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Mon, 05 May 2025 11:24:06 GMT) Full text and rfc822 format available.

This bug report was last modified 46 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.