changeset 16204:aca34cc63479

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.
author Gary V. Vaughan <gary@gnu.org>
date Fri, 30 Dec 2011 18:47:55 +0100
parents 5f1e304b4966
children 49f7527f743f
files ChangeLog build-aux/gitlog-to-changelog
diffstat 2 files changed, 19 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-12-30  Gary V. Vaughan  <gary@gnu.org>
+
+	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.
+
 2012-01-01  Jim Meyering  <meyering@redhat.com>
 
 	test-framework-sh: init.sh: fix "make dist" failure
--- a/build-aux/gitlog-to-changelog
+++ b/build-aux/gitlog-to-changelog
@@ -3,7 +3,7 @@
     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 @@
       $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.