1 eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}'
2 & eval 'exec perl -wS "$0" $argv:q'
4 # Convert git log output to ChangeLog format.
6 my $VERSION = '2015-04-09 16:03'; # UTC
7 # The definition above must lie within the first 8 lines in order
8 # for the Emacs time-stamp write hook (at end) to update it.
9 # If you change this file with Emacs, please let the write hook
10 # do its job. Otherwise, update this string manually.
12 # Copyright (C) 2008-2015 Free Software Foundation, Inc.
14 # This program is free software: you can redistribute it and/or modify
15 # it under the terms of the GNU General Public License as published by
16 # the Free Software Foundation, either version 3 of the License, or
17 # (at your option) any later version.
19 # This program is distributed in the hope that it will be useful,
20 # but WITHOUT ANY WARRANTY; without even the implied warranty of
21 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22 # GNU General Public License for more details.
24 # You should have received a copy of the GNU General Public License
25 # along with this program. If not, see <http://www.gnu.org/licenses/>.
27 # Written by Jim Meyering
32 use POSIX qw(strftime);
34 (my $ME = $0) =~ s|.*/||;
36 # use File::Coda; # http://meyering.net/code/Coda/
38 defined fileno STDOUT or return;
39 close STDOUT and return;
40 warn "$ME: failed to close standard output: $!\n";
47 my $STREAM = ($exit_code == 0 ? *STDOUT : *STDERR);
50 print $STREAM "Try '$ME --help' for more information.\n";
55 Usage: $ME [OPTIONS] [ARGS]
57 Convert git log output to ChangeLog format. If present, any ARGS
58 are passed to "git log". To avoid ARGS being parsed as options to
59 $ME, they may be preceded by '--'.
63 --amend=FILE FILE maps from an SHA1 to perl code (i.e., s/old/new/) that
64 makes a change to SHA1's commit log text or metadata.
65 --append-dot append a dot to the first line of each commit message if
66 there is no other punctuation or blank at the end.
67 --no-cluster never cluster commit messages under the same date/author
68 header; the default is to cluster adjacent commit messages
69 if their headers are the same and neither commit message
70 contains multiple paragraphs.
71 --srcdir=DIR the root of the source tree, from which the .git/
72 directory can be derived.
73 --since=DATE convert only the logs since DATE;
74 the default is to convert all log entries.
75 --until=DATE convert only the logs older than DATE.
76 --ignore-matching=PAT ignore commit messages whose first lines match PAT.
77 --format=FMT set format string for commit subject and body;
78 see 'man git-log' for the list of format metacharacters;
79 the default is '%s%n%b%n'
80 --strip-tab remove one additional leading TAB from commit message lines.
81 --strip-cherry-pick remove data inserted by "git cherry-pick";
82 this includes the "cherry picked from commit ..." line,
83 and the possible final "Conflicts:" paragraph.
84 --help display this help and exit
85 --version output version information and exit
89 $ME --since=2008-01-01 > ChangeLog
90 $ME -- -n 5 foo > last-5-commits-to-branch-foo
94 The following types of strings are interpreted specially when they appear
95 at the beginning of a log message line. They are not copied to the output.
97 Copyright-paperwork-exempt: Yes
98 Append the "(tiny change)" notation to the usual "date name email"
99 ChangeLog header to mark a change that does not require a copyright
101 Co-authored-by: Joe User <user\@example.com>
102 List the specified name and email address on a second
103 ChangeLog header, denoting a co-author.
104 Signed-off-by: Joe User <user\@example.com>
105 These lines are simply elided.
107 In a FILE specified via --amend, comment lines (starting with "#") are ignored.
108 FILE must consist of <SHA,CODE+> pairs where SHA is a 40-byte SHA1 (alone on
109 a line) referring to a commit in the current project, and CODE refers to one
110 or more consecutive lines of Perl code. Pairs must be separated by one or
113 Here is sample input for use with --amend=FILE, from coreutils:
115 3a169f4c5d9159283548178668d2fae6fced3030
117 s/all tile types/all file types/
119 1379ed974f1fa39b12e2ffab18b3f7a607082202
120 # Due to a bug in vc-dwim, I mis-attributed a patch by Paul to myself.
121 # Change the author to be Paul. Note the escaped "@":
122 s,Jim .*>,Paul Eggert <eggert\\\@cs.ucla.edu>,
129 # If the string $S is a well-behaved file name, simply return it.
130 # If it contains white space, quotes, etc., quote it, and return the new string.
134 if ($s =~ m![^\w+/.,-]!)
136 # Convert each single quote to '\''
137 $s =~ s/\'/\'\\\'\'/g;
138 # Then single quote the string.
146 return join (' ', map {shell_quote $_} @_);
150 # Comment lines (starting with "#") are ignored.
151 # F must consist of <SHA,CODE+> pairs where SHA is a 40-byte SHA1
152 # (alone on a line) referring to a commit in the current project, and
153 # CODE refers to one or more consecutive lines of Perl code.
154 # Pairs must be separated by one or more blank line.
155 sub parse_amend_file($)
160 or die "$ME: $f: failed to open for reading: $!\n";
166 while (defined (my $line = <F>))
172 and $in_code = 0, next;
176 $line =~ /^([0-9a-fA-F]{40})$/
177 or (warn "$ME: $f:$.: invalid line; expected an SHA1\n"),
182 and (warn "$ME: $f:$.: duplicate SHA1\n"),
188 $h->{$sha} .= "$line\n";
199 # git_dir_option $SRCDIR
201 # From $SRCDIR, the --git-dir option to pass to git (none if $SRCDIR
202 # is undef). Return as a list (0 or 1 element).
203 sub git_dir_option($)
209 my $qdir = shell_quote $srcdir;
210 my $cmd = "cd $qdir && git rev-parse --show-toplevel";
211 my $qcmd = shell_quote $cmd;
212 my $git_dir = qx($cmd);
214 or die "$ME: cannot run $qcmd: $!\n";
216 or die "$ME: $qcmd had unexpected exit code or signal ($?)\n";
218 push @res, "--git-dir=$git_dir/.git";
226 my $format_string = '%s%n%b%n';
232 my $strip_cherry_pick = 0;
236 help => sub { usage 0 },
237 version => sub { print "$ME version $VERSION\n"; exit },
238 'since=s' => \$since_date,
239 'until=s' => \$until_date,
240 'format=s' => \$format_string,
241 'amend=s' => \$amend_file,
242 'append-dot' => \$append_dot,
243 'cluster!' => \$cluster,
244 'ignore-matching=s' => \$ignore_matching,
245 'strip-tab' => \$strip_tab,
246 'strip-cherry-pick' => \$strip_cherry_pick,
247 'srcdir=s' => \$srcdir,
251 and unshift @ARGV, "--since=$since_date";
253 and unshift @ARGV, "--until=$until_date";
255 # This is a hash that maps an SHA1 to perl code (i.e., s/old/new/)
256 # that makes a correction in the log or attribution of that commit.
257 my $amend_code = defined $amend_file ? parse_amend_file $amend_file : {};
260 git_dir_option $srcdir,
262 '--pretty=format:%H:%ct %an <%ae>%n%n'.$format_string, @ARGV);
263 open PIPE, '-|', @cmd
264 or die ("$ME: failed to run '". quoted_cmd (@cmd) ."': $!\n"
265 . "(Is your Git too old? Version 1.5.1 or later is required.)\n");
267 my $prev_multi_paragraph;
268 my $prev_date_line = '';
269 my @prev_coauthors = ();
272 defined (my $in = <PIPE>)
274 $in =~ /^log size (\d+)$/
275 or die "$ME:$.: Invalid line (expected log size):\n$in";
279 my $n_read = read PIPE, $log, $log_nbytes;
280 $n_read == $log_nbytes
281 or die "$ME:$.: unexpected EOF\n";
283 # Extract leading hash.
284 my ($sha, $rest) = split ':', $log, 2;
286 or die "$ME:$.: malformed log entry\n";
287 $sha =~ /^[0-9a-fA-F]{40}$/
288 or die "$ME:$.: invalid SHA1: $sha\n";
290 # If this commit's log requires any transformation, do it now.
291 my $code = $amend_code->{$sha};
296 # Put the unpreprocessed entry into "$_".
299 # Let $code operate on it, safely.
300 my $r = $s->reval("$code")
301 or die "$ME:$.:$sha: failed to eval \"$code\":\n$@\n";
303 # Note that we've used this entry.
304 delete $amend_code->{$sha};
306 # Update $rest upon success.
310 # Remove lines inserted by "git cherry-pick".
311 if ($strip_cherry_pick)
313 $rest =~ s/^\s*Conflicts:\n.*//sm;
314 $rest =~ s/^\s*\(cherry picked from commit [\da-f]+\)\n//m;
317 my @line = split /\s*\n/, $rest;
318 my $author_line = shift @line;
320 or die "$ME:$.: unexpected EOF\n";
321 $author_line =~ /^(\d+) (.*>)$/
322 or die "$ME:$.: Invalid line "
323 . "(expected date/author/email):\n$author_line\n";
325 # Format 'Copyright-paperwork-exempt: Yes' as a standard ChangeLog
326 # `(tiny change)' annotation.
327 my $tiny = (grep (/^Copyright-paperwork-exempt:\s+[Yy]es$/, @line)
328 ? ' (tiny change)' : '');
330 my $date_line = sprintf "%s %s$tiny\n",
331 strftime ("%Y-%m-%d", localtime ($1)), $2;
333 my @coauthors = grep /^Co-authored-by:.*$/, @line;
334 # Omit meta-data lines we've already interpreted.
335 @line = grep !/^(?:Signed-off-by:[ ].*>$
337 |Copyright-paperwork-exempt:[ ]
340 # Remove leading and trailing blank lines.
343 while ($line[0] =~ /^\s*$/) { shift @line; }
344 while ($line[$#line] =~ /^\s*$/) { pop @line; }
347 # Ignore commits that match the --ignore-matching pattern, if specified.
348 if (! (defined $ignore_matching
349 && @line && $line[0] =~ /$ignore_matching/))
351 # Record whether there are two or more paragraphs.
352 my $multi_paragraph = grep /^\s*$/, @line;
354 # Format 'Co-authored-by: A U Thor <email@example.com>' lines in
355 # standard multi-author ChangeLog format.
358 s/^Co-authored-by:\s*/\t /;
362 or warn "$ME: warning: missing email address for "
363 . substr ($_, 5) . "\n";
366 # If clustering of commit messages has been disabled, if this header
367 # would be different from the previous date/name/etc. header,
368 # or if this or the previous entry consists of two or more paragraphs,
369 # then print the header.
371 || $date_line ne $prev_date_line
372 || "@coauthors" ne "@prev_coauthors"
374 || $prev_multi_paragraph)
376 $prev_date_line eq ''
380 and print join ("\n", @coauthors), "\n";
382 $prev_date_line = $date_line;
383 @prev_coauthors = @coauthors;
384 $prev_multi_paragraph = $multi_paragraph;
386 # If there were any lines
389 warn "$ME: warning: empty commit message:\n $date_line\n";
395 # If the first line of the message has enough room, then
396 if (length $line[0] < 72)
398 # append a dot if there is no other punctuation or blank
400 $line[0] =~ /[[:punct:]\s]$/
405 # Remove one additional leading TAB from each line.
407 and map { s/^\t// } @line;
409 # Prefix each non-empty line with a TAB.
410 @line = map { length $_ ? "\t$_" : '' } @line;
412 print "\n", join ("\n", @line), "\n";
416 defined ($in = <PIPE>)
419 and die "$ME:$.: unexpected line:\n$in";
423 or die "$ME: error closing pipe from " . quoted_cmd (@cmd) . "\n";
424 # FIXME-someday: include $PROCESS_STATUS in the diagnostic
426 # Complain about any unused entry in the --amend=F specified file.
428 foreach my $sha (keys %$amend_code)
430 warn "$ME:$amend_file: unused entry: $sha\n";
439 # indent-tabs-mode: nil
440 # eval: (add-hook 'write-file-hooks 'time-stamp)
441 # time-stamp-start: "my $VERSION = '"
442 # time-stamp-format: "%:y-%02m-%02d %02H:%02M"
443 # time-stamp-time-zone: "UTC"
444 # time-stamp-end: "'; # UTC"