|
#!/bin/sh |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
eval 'exec perl -wSx "$0" "$@"' |
|
if 0; |
|
|
|
my $VERSION = '2022-01-27 18:49'; |
|
|
|
|
|
|
|
|
|
|
|
use strict; |
|
use warnings; |
|
use Getopt::Long; |
|
use POSIX qw(strftime); |
|
|
|
(my $ME = $0) =~ s|.*/||; |
|
|
|
|
|
END { |
|
defined fileno STDOUT or return; |
|
close STDOUT and return; |
|
warn "$ME: failed to close standard output: $!\n"; |
|
$? ||= 1; |
|
} |
|
|
|
sub usage ($) |
|
{ |
|
my ($exit_code) = @_; |
|
my $STREAM = ($exit_code == 0 ? *STDOUT : *STDERR); |
|
if ($exit_code != 0) |
|
{ |
|
print $STREAM "Try '$ME --help' for more information.\n"; |
|
} |
|
else |
|
{ |
|
print $STREAM <<EOF; |
|
Usage: $ME [OPTIONS] [ARGS] |
|
|
|
Convert git log output to ChangeLog format. If present, any ARGS |
|
are passed to "git log". To avoid ARGS being parsed as options to |
|
$ME, they may be preceded by '--'. |
|
|
|
OPTIONS: |
|
|
|
--amend=FILE FILE maps from an SHA1 to perl code (i.e., s/old/new/) that |
|
makes a change to SHA1's commit log text or metadata. |
|
--append-dot append a dot to the first line of each commit message if |
|
there is no other punctuation or blank at the end. |
|
--no-cluster never cluster commit messages under the same date/author |
|
header; the default is to cluster adjacent commit messages |
|
if their headers are the same and neither commit message |
|
contains multiple paragraphs. |
|
--srcdir=DIR the root of the source tree, from which the .git/ |
|
directory can be derived. |
|
--since=DATE convert only the logs since DATE; |
|
the default is to convert all log entries. |
|
--until=DATE convert only the logs older than DATE. |
|
--ignore-matching=PAT ignore commit messages whose first lines match PAT. |
|
--ignore-line=PAT ignore lines of commit messages that match PAT. |
|
--format=FMT set format string for commit subject and body; |
|
see 'man git-log' for the list of format metacharacters; |
|
the default is '%s%n%b%n' |
|
--strip-tab remove one additional leading TAB from commit message lines. |
|
--strip-cherry-pick remove data inserted by "git cherry-pick"; |
|
this includes the "cherry picked from commit ..." line, |
|
and the possible final "Conflicts:" paragraph. |
|
--help display this help and exit |
|
--version output version information and exit |
|
|
|
EXAMPLE: |
|
|
|
$ME --since=2008-01-01 > ChangeLog |
|
$ME -- -n 5 foo > last-5-commits-to-branch-foo |
|
|
|
SPECIAL SYNTAX: |
|
|
|
The following types of strings are interpreted specially when they appear |
|
at the beginning of a log message line. They are not copied to the output. |
|
|
|
Copyright-paperwork-exempt: Yes |
|
Append the "(tiny change)" notation to the usual "date name email" |
|
ChangeLog header to mark a change that does not require a copyright |
|
assignment. |
|
Co-authored-by: Joe User <user\@example.com> |
|
List the specified name and email address on a second |
|
ChangeLog header, denoting a co-author. |
|
Signed-off-by: Joe User <user\@example.com> |
|
These lines are simply elided. |
|
|
|
In a FILE specified via --amend, comment lines (starting with "#") are ignored. |
|
FILE must consist of <SHA,CODE+> pairs where SHA is a 40-byte SHA1 (alone on |
|
a line) referring to a commit in the current project, and CODE refers to one |
|
or more consecutive lines of Perl code. Pairs must be separated by one or |
|
more blank line. |
|
|
|
Here is sample input for use with --amend=FILE, from coreutils: |
|
|
|
3a169f4c5d9159283548178668d2fae6fced3030 |
|
# fix typo in title: |
|
s/all tile types/all file types/ |
|
|
|
1379ed974f1fa39b12e2ffab18b3f7a607082202 |
|
# Due to a bug in vc-dwim, I mis-attributed a patch by Paul to myself. |
|
# Change the author to be Paul. Note the escaped "@": |
|
s,Jim .*>,Paul Eggert <eggert\\\@cs.ucla.edu>, |
|
|
|
EOF |
|
} |
|
exit $exit_code; |
|
} |
|
|
|
|
|
|
|
sub shell_quote($) |
|
{ |
|
my ($s) = @_; |
|
if ($s =~ m![^\w+/.,-]!) |
|
{ |
|
|
|
$s =~ s/\'/\'\\\'\'/g; |
|
|
|
$s = "'$s'"; |
|
} |
|
return $s; |
|
} |
|
|
|
sub quoted_cmd(@) |
|
{ |
|
return join (' ', map {shell_quote $_} @_); |
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
sub parse_amend_file($) |
|
{ |
|
my ($f) = @_; |
|
|
|
open F, '<', $f |
|
or die "$ME: $f: failed to open for reading: $!\n"; |
|
|
|
my $fail; |
|
my $h = {}; |
|
my $in_code = 0; |
|
my $sha; |
|
while (defined (my $line = <F>)) |
|
{ |
|
$line =~ /^\ |
|
and next; |
|
chomp $line; |
|
$line eq '' |
|
and $in_code = 0, next; |
|
|
|
if (!$in_code) |
|
{ |
|
$line =~ /^([[:xdigit:]]{40})$/ |
|
or (warn "$ME: $f:$.: invalid line; expected an SHA1\n"), |
|
$fail = 1, next; |
|
$sha = lc $1; |
|
$in_code = 1; |
|
exists $h->{$sha} |
|
and (warn "$ME: $f:$.: duplicate SHA1\n"), |
|
$fail = 1, next; |
|
} |
|
else |
|
{ |
|
$h->{$sha} ||= ''; |
|
$h->{$sha} .= "$line\n"; |
|
} |
|
} |
|
close F; |
|
|
|
$fail |
|
and exit 1; |
|
|
|
return $h; |
|
} |
|
|
|
|
|
|
|
|
|
|
|
sub git_dir_option($) |
|
{ |
|
my ($srcdir) = @_; |
|
my @res = (); |
|
if (defined $srcdir) |
|
{ |
|
my $qdir = shell_quote $srcdir; |
|
my $cmd = "cd $qdir && git rev-parse --show-toplevel"; |
|
my $qcmd = shell_quote $cmd; |
|
my $git_dir = qx($cmd); |
|
defined $git_dir |
|
or die "$ME: cannot run $qcmd: $!\n"; |
|
$? == 0 |
|
or die "$ME: $qcmd had unexpected exit code or signal ($?)\n"; |
|
chomp $git_dir; |
|
push @res, "--git-dir=$git_dir/.git"; |
|
} |
|
@res; |
|
} |
|
|
|
{ |
|
my $since_date; |
|
my $until_date; |
|
my $format_string = '%s%n%b%n'; |
|
my $amend_file; |
|
my $append_dot = 0; |
|
my $cluster = 1; |
|
my $ignore_matching; |
|
my $ignore_line; |
|
my $strip_tab = 0; |
|
my $strip_cherry_pick = 0; |
|
my $srcdir; |
|
GetOptions |
|
( |
|
help => sub { usage 0 }, |
|
version => sub { print "$ME version $VERSION\n"; exit }, |
|
'since=s' => \$since_date, |
|
'until=s' => \$until_date, |
|
'format=s' => \$format_string, |
|
'amend=s' => \$amend_file, |
|
'append-dot' => \$append_dot, |
|
'cluster!' => \$cluster, |
|
'ignore-matching=s' => \$ignore_matching, |
|
'ignore-line=s' => \$ignore_line, |
|
'strip-tab' => \$strip_tab, |
|
'strip-cherry-pick' => \$strip_cherry_pick, |
|
'srcdir=s' => \$srcdir, |
|
) or usage 1; |
|
|
|
defined $since_date |
|
and unshift @ARGV, "--since=$since_date"; |
|
defined $until_date |
|
and unshift @ARGV, "--until=$until_date"; |
|
|
|
|
|
|
|
my $amend_code = defined $amend_file ? parse_amend_file $amend_file : {}; |
|
|
|
my @cmd = ('git', |
|
git_dir_option $srcdir, |
|
qw(log --log-size), |
|
'--pretty=format:%H:%ct %an <%ae>%n%n'.$format_string, @ARGV); |
|
open PIPE, '-|', @cmd |
|
or die ("$ME: failed to run '". quoted_cmd (@cmd) ."': $!\n" |
|
. "(Is your Git too old? Version 1.5.1 or later is required.)\n"); |
|
|
|
my $prev_multi_paragraph; |
|
my $prev_date_line = ''; |
|
my @prev_coauthors = (); |
|
my @skipshas = (); |
|
while (1) |
|
{ |
|
defined (my $in = <PIPE>) |
|
or last; |
|
$in =~ /^log size (\d+)$/ |
|
or die "$ME:$.: Invalid line (expected log size):\n$in"; |
|
my $log_nbytes = $1; |
|
|
|
my $log; |
|
my $n_read = read PIPE, $log, $log_nbytes; |
|
$n_read == $log_nbytes |
|
or die "$ME:$.: unexpected EOF\n"; |
|
|
|
|
|
my ($sha, $rest) = split ':', $log, 2; |
|
defined $sha |
|
or die "$ME:$.: malformed log entry\n"; |
|
$sha =~ /^[[:xdigit:]]{40}$/ |
|
or die "$ME:$.: invalid SHA1: $sha\n"; |
|
|
|
my $skipflag = 0; |
|
if (@skipshas) |
|
{ |
|
foreach(@skipshas) |
|
{ |
|
if ($sha =~ /^$_/) |
|
{ |
|
$skipflag = $_; |
|
last; |
|
} |
|
} |
|
} |
|
|
|
|
|
my $code = $amend_code->{$sha}; |
|
if (defined $code) |
|
{ |
|
eval 'use Safe'; |
|
my $s = new Safe; |
|
|
|
$_ = $rest; |
|
|
|
|
|
my $r = $s->reval("$code") |
|
or die "$ME:$.:$sha: failed to eval \"$code\":\n$@\n"; |
|
|
|
|
|
delete $amend_code->{$sha}; |
|
|
|
|
|
$rest = $_; |
|
} |
|
|
|
|
|
if ($strip_cherry_pick) |
|
{ |
|
$rest =~ s/^\s*Conflicts:\n.*//sm; |
|
$rest =~ s/^\s*\(cherry picked from commit [\da-f]+\)\n//m; |
|
} |
|
|
|
my @line = split /[ \t]*\n/, $rest; |
|
my $author_line = shift @line; |
|
defined $author_line |
|
or die "$ME:$.: unexpected EOF\n"; |
|
$author_line =~ /^(\d+) (.*>)$/ |
|
or die "$ME:$.: Invalid line " |
|
. "(expected date/author/email):\n$author_line\n"; |
|
|
|
|
|
|
|
my $tiny = (grep (/^(?:Copyright-paperwork-exempt|Tiny-change):\s+[Yy]es$/, @line) |
|
? ' (tiny change)' : ''); |
|
|
|
my $date_line = sprintf "%s %s$tiny\n", |
|
strftime ("%Y-%m-%d", localtime ($1)), $2; |
|
|
|
my @coauthors = grep /^Co-authored-by:.*$/, @line; |
|
|
|
@line = grep !/^(?:Signed-off-by:[ ].*>$ |
|
|Co-authored-by:[ ] |
|
|Copyright-paperwork-exempt:[ ] |
|
|Tiny-change:[ ] |
|
)/x, @line; |
|
|
|
|
|
if (@line) |
|
{ |
|
while ($line[0] =~ /^\s*$/) { shift @line; } |
|
while ($line[$#line] =~ /^\s*$/) { pop @line; } |
|
} |
|
|
|
|
|
|
|
if ( grep /^(; )?Merge from /, @line ) |
|
{ |
|
my $found = 0; |
|
foreach (@line) |
|
{ |
|
if (grep /^The following commit.*skipped:$/, $_) |
|
{ |
|
$found = 1; |
|
|
|
@skipshas = (); |
|
next; |
|
} |
|
if ($found && $_ =~ /^([[:xdigit:]]{7,}) [^ ]/) |
|
{ |
|
push ( @skipshas, $1 ); |
|
} |
|
} |
|
} |
|
|
|
|
|
if (defined $ignore_matching && @line && $line[0] =~ /$ignore_matching/) |
|
{ |
|
$skipflag = 1; |
|
} |
|
elsif ($skipflag) |
|
{ |
|
|
|
warn "$ME: warning: skipping $sha due to $skipflag\n"; |
|
} |
|
|
|
if (! $skipflag) |
|
{ |
|
if (defined $ignore_line && @line) |
|
{ |
|
@line = grep ! /$ignore_line/, @line; |
|
while ($line[$#line] =~ /^\s*$/) { pop @line; } |
|
} |
|
|
|
|
|
my $multi_paragraph = grep /^\s*$/, @line; |
|
|
|
|
|
|
|
for (@coauthors) |
|
{ |
|
s/^Co-authored-by:\s*/\t /; |
|
s/\s*</ </; |
|
|
|
/<.*?@.*\..*>/ |
|
or warn "$ME: warning: missing email address for " |
|
. substr ($_, 5) . "\n"; |
|
} |
|
|
|
|
|
|
|
|
|
|
|
if ( ! $cluster |
|
|| $date_line ne $prev_date_line |
|
|| "@coauthors" ne "@prev_coauthors" |
|
|| $multi_paragraph |
|
|| $prev_multi_paragraph) |
|
{ |
|
$prev_date_line eq '' |
|
or print "\n"; |
|
print $date_line; |
|
@coauthors |
|
and print join ("\n", @coauthors), "\n"; |
|
} |
|
$prev_date_line = $date_line; |
|
@prev_coauthors = @coauthors; |
|
$prev_multi_paragraph = $multi_paragraph; |
|
|
|
|
|
if (@line == 0) |
|
{ |
|
warn "$ME: warning: empty commit message:\n" |
|
. " commit $sha\n $date_line\n"; |
|
} |
|
else |
|
{ |
|
if ($append_dot) |
|
{ |
|
|
|
if (length $line[0] < 72) |
|
{ |
|
|
|
|
|
$line[0] =~ /[[:punct:]\s]$/ |
|
or $line[0] .= '.'; |
|
} |
|
} |
|
|
|
|
|
$strip_tab |
|
and map { s/^\t// } @line; |
|
|
|
|
|
@line = map { length $_ ? "\t$_" : '' } @line; |
|
|
|
print "\n", join ("\n", @line), "\n"; |
|
} |
|
} |
|
|
|
defined ($in = <PIPE>) |
|
or last; |
|
$in ne "\n" |
|
and die "$ME:$.: unexpected line:\n$in"; |
|
} |
|
|
|
close PIPE |
|
or die "$ME: error closing pipe from " . quoted_cmd (@cmd) . "\n"; |
|
|
|
|
|
|
|
my $fail = 0; |
|
foreach my $sha (keys %$amend_code) |
|
{ |
|
warn "$ME:$amend_file: unused entry: $sha\n"; |
|
$fail = 1; |
|
} |
|
|
|
exit $fail; |
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|