| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499 | 
							- eval '(exit $?0)' && eval 'exec perl -wS "$0" "$@"'
 
-   & eval 'exec perl -wS "$0" $argv:q'
 
-     if 0;
 
- # Convert git log output to ChangeLog format.
 
- my $VERSION = '2016-03-22 21:49'; # 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
 
- # do its job.  Otherwise, update this string manually.
 
- # Copyright (C) 2008-2017 Free Software Foundation, Inc.
 
- # This program 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.
 
- # This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
 
- # Written by Jim Meyering
 
- use strict;
 
- use warnings;
 
- use Getopt::Long;
 
- use POSIX qw(strftime);
 
- (my $ME = $0) =~ s|.*/||;
 
- # use File::Coda; # http://meyering.net/code/Coda/
 
- 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;
 
- }
 
- # If the string $S is a well-behaved file name, simply return it.
 
- # If it contains white space, quotes, etc., quote it, and return the new string.
 
- sub shell_quote($)
 
- {
 
-   my ($s) = @_;
 
-   if ($s =~ m![^\w+/.,-]!)
 
-     {
 
-       # Convert each single quote to '\''
 
-       $s =~ s/\'/\'\\\'\'/g;
 
-       # Then single quote the string.
 
-       $s = "'$s'";
 
-     }
 
-   return $s;
 
- }
 
- sub quoted_cmd(@)
 
- {
 
-   return join (' ', map {shell_quote $_} @_);
 
- }
 
- # Parse file F.
 
- # Comment lines (starting with "#") are ignored.
 
- # F 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.
 
- 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 =~ /^([0-9a-fA-F]{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;
 
- }
 
- # git_dir_option $SRCDIR
 
- #
 
- # From $SRCDIR, the --git-dir option to pass to git (none if $SRCDIR
 
- # is undef).  Return as a list (0 or 1 element).
 
- 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";
 
-   # This is a hash that maps an SHA1 to perl code (i.e., s/old/new/)
 
-   # that makes a correction in the log or attribution of that commit.
 
-   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";
 
-       # Extract leading hash.
 
-       my ($sha, $rest) = split ':', $log, 2;
 
-       defined $sha
 
-         or die "$ME:$.: malformed log entry\n";
 
-       $sha =~ /^[0-9a-fA-F]{40}$/
 
-         or die "$ME:$.: invalid SHA1: $sha\n";
 
-       my $skipflag = 0;
 
-       if (@skipshas)
 
-         {
 
-           foreach(@skipshas)
 
-             {
 
-               if ($sha =~ /^$_/)
 
-                 {
 
-                   $skipflag = $_;
 
-                   last;
 
-                 }
 
-             }
 
-         }
 
-       # If this commit's log requires any transformation, do it now.
 
-       my $code = $amend_code->{$sha};
 
-       if (defined $code)
 
-         {
 
-           eval 'use Safe';
 
-           my $s = new Safe;
 
-           # Put the unpreprocessed entry into "$_".
 
-           $_ = $rest;
 
-           # Let $code operate on it, safely.
 
-           my $r = $s->reval("$code")
 
-             or die "$ME:$.:$sha: failed to eval \"$code\":\n$@\n";
 
-           # Note that we've used this entry.
 
-           delete $amend_code->{$sha};
 
-           # Update $rest upon success.
 
-           $rest = $_;
 
-         }
 
-       # Remove lines inserted by "git cherry-pick".
 
-       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";
 
-       # Format 'Copyright-paperwork-exempt: Yes' as a standard ChangeLog
 
-       # `(tiny change)' annotation.
 
-       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;
 
-       # Omit meta-data lines we've already interpreted.
 
-       @line = grep !/^(?:Signed-off-by:[ ].*>$
 
-                        |Co-authored-by:[ ]
 
-                        |Copyright-paperwork-exempt:[ ]
 
-                        |Tiny-change:[ ]
 
-                        )/x, @line;
 
-       # Remove leading and trailing blank lines.
 
-       if (@line)
 
-         {
 
-           while ($line[0] =~ /^\s*$/) { shift @line; }
 
-           while ($line[$#line] =~ /^\s*$/) { pop @line; }
 
-         }
 
-       # Handle Emacs gitmerge.el "skipped" commits.
 
-       # Yes, this should be controlled by an option.  So sue me.
 
-       if ( grep /^(; )?Merge from /, @line )
 
-       {
 
-           my $found = 0;
 
-           foreach (@line)
 
-           {
 
-               if (grep /^The following commit.*skipped:$/, $_)
 
-               {
 
-                   $found = 1;
 
-                   ## Reset at each merge to reduce chance of false matches.
 
-                   @skipshas = ();
 
-                   next;
 
-               }
 
-               if ($found && $_ =~ /^([0-9a-fA-F]{7,}) [^ ]/)
 
-               {
 
-                   push ( @skipshas, $1 );
 
-               }
 
-           }
 
-       }
 
-       # Ignore commits that match the --ignore-matching pattern, if specified.
 
-       if (defined $ignore_matching && @line && $line[0] =~ /$ignore_matching/)
 
-         {
 
-           $skipflag = 1;
 
-         }
 
-       elsif ($skipflag)
 
-         {
 
-           ## Perhaps only warn if a pattern matches more than once?
 
-           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; }
 
-             }
 
-           # Record whether there are two or more paragraphs.
 
-           my $multi_paragraph = grep /^\s*$/, @line;
 
-           # Format 'Co-authored-by: A U Thor <email@example.com>' lines in
 
-           # standard multi-author ChangeLog format.
 
-           for (@coauthors)
 
-             {
 
-               s/^Co-authored-by:\s*/\t    /;
 
-               s/\s*</  </;
 
-               /<.*?@.*\..*>/
 
-                 or warn "$ME: warning: missing email address for "
 
-                   . substr ($_, 5) . "\n";
 
-             }
 
-           # If clustering of commit messages has been disabled, if this header
 
-           # would be different from the previous date/name/etc. header,
 
-           # or if this or the previous entry consists of two or more paragraphs,
 
-           # then print the header.
 
-           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 there were any lines
 
-           if (@line == 0)
 
-             {
 
-               warn "$ME: warning: empty commit message:\n  $date_line\n";
 
-             }
 
-           else
 
-             {
 
-               if ($append_dot)
 
-                 {
 
-                   # If the first line of the message has enough room, then
 
-                   if (length $line[0] < 72)
 
-                     {
 
-                       # append a dot if there is no other punctuation or blank
 
-                       # at the end.
 
-                       $line[0] =~ /[[:punct:]\s]$/
 
-                         or $line[0] .= '.';
 
-                     }
 
-                 }
 
-               # Remove one additional leading TAB from each line.
 
-               $strip_tab
 
-                 and map { s/^\t// } @line;
 
-               # Prefix each non-empty line with a TAB.
 
-               @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";
 
-   # FIXME-someday: include $PROCESS_STATUS in the diagnostic
 
-   # Complain about any unused entry in the --amend=F specified file.
 
-   my $fail = 0;
 
-   foreach my $sha (keys %$amend_code)
 
-     {
 
-       warn "$ME:$amend_file: unused entry: $sha\n";
 
-       $fail = 1;
 
-     }
 
-   exit $fail;
 
- }
 
- # Local Variables:
 
- # mode: perl
 
- # indent-tabs-mode: nil
 
- # eval: (add-hook 'write-file-hooks 'time-stamp)
 
- # time-stamp-start: "my $VERSION = '"
 
- # time-stamp-format: "%:y-%02m-%02d %02H:%02M"
 
- # time-stamp-time-zone: "UTC0"
 
- # time-stamp-end: "'; # UTC"
 
- # End:
 
 
  |