bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] gitlog-to-changelog: Copyright-paperwork-exempt: yes == (tiny ch


From: Jim Meyering
Subject: [PATCH] gitlog-to-changelog: Copyright-paperwork-exempt: yes == (tiny change)
Date: Fri, 30 Dec 2011 19:06:31 +0100

I've decided to go ahead and make this change, in spite of the lack of
policy anywhere else.  I'll update --help with a note about this separately.
Gary, it's based on the change from you and is still in your name, so
I'll wait for an ACK before I push.

Jim

>From 9301160f1f63d1193402a4cecf17c33da2305020 Mon Sep 17 00:00:00 2001
From: "Gary V. Vaughan" <address@hidden>
Date: Fri, 30 Dec 2011 18:47:55 +0100
Subject: [PATCH] gitlog-to-changelog: Copyright-paperwork-exempt: yes ==
 (tiny change)

* build-aux/gitlog-to-changelog (main): Map the string, at beginning
of line in a git commit log, "Copyright-paperwork-exempt: yes", to
the "  (tiny change)" notation that is appended to the standard
ChangeLog "date  name  email" header line.
---
 ChangeLog                     |    8 ++++++++
 build-aux/gitlog-to-changelog |   14 +++++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ff9c84a..0e5f204 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-12-30  Gary V. Vaughan  <address@hidden>
+
+       gitlog-to-changelog: Copyright-paperwork-exempt: yes == (tiny change)
+       * build-aux/gitlog-to-changelog (main): Map the string, at beginning
+       of line in a git commit log, "Copyright-paperwork-exempt: yes", to
+       the "  (tiny change)" notation that is appended to the standard
+       ChangeLog "date  name  email" header line.
+
 2011-12-30  Pádraig Brady  <address@hidden>

        canonicalize: fix references to stat() and lstat()
diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog
index 8d6bc7b..529d7be 100755
--- a/build-aux/gitlog-to-changelog
+++ b/build-aux/gitlog-to-changelog
@@ -3,7 +3,7 @@ eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}'
     if 0;
 # Convert git log output to ChangeLog format.

-my $VERSION = '2011-12-30 14:31'; # UTC
+my $VERSION = '2011-12-30 17:43'; # UTC
 # The definition above must lie within the first 8 lines in order
 # for the Emacs time-stamp write hook (at end) to update it.
 # If you change this file with Emacs, please let the write hook
@@ -249,12 +249,20 @@ sub parse_amend_file($)
       $author_line =~ /^(\d+)  (.*>)$/
         or die "$ME:$.: Invalid line "
           . "(expected date/author/email):\n$author_line\n";
-      my $date_line = sprintf "%s  $2\n", strftime ("%F", localtime ($1));
+
+      # Format 'Copyright-paperwork-exempt: Yes' as a standard ChangeLog
+      # `(tiny change)' annotation.
+      my $tiny = (grep (/^Copyright-paperwork-exempt:\s+[Yy]es$/, @line)
+                  ? '  (tiny change)' : '');
+
+      my $date_line = sprintf "%s  $2$tiny\n",
+        strftime ("%F", localtime ($1));

       my @coauthors = grep /^Co-authored-by:.*$/, @line;
-      # Omit "Co-authored-by..." and "Signed-off-by..." lines.
+      # Omit meta-data lines we've already interpreted.
       @line = grep !/^(?:Signed-off-by:[ ].*>$
                        |Co-authored-by:[ ]
+                       |Copyright-paperwork-exempt:[ ]
                        )/x, @line;

       # Remove leading and trailing blank lines.
--
1.7.8.1.391.g2c2ad



reply via email to

[Prev in Thread] Current Thread [Next in Thread]