From 13a8a43f057875d8499bf2d0b99e57f79258bcf1 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 28 Jul 2008 14:16:59 +0200 Subject: [PATCH] git-svn.perl: strip ChangeLog bits. --- git-svn.perl | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/git-svn.perl b/git-svn.perl index cf6dbbc..47524bf 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -66,7 +66,7 @@ my ($_stdin, $_help, $_edit, $_version, $_fetch_all, $_no_rebase, $_merge, $_strategy, $_dry_run, $_local, $_prefix, $_no_checkout, $_url, $_verbose, - $_git_format); + $_git_format, $_cut_changelog_bits); $Git::SVN::_follow_parent = 1; my %remote_opts = ( 'username=s' => \$Git::SVN::Prompt::_username, 'config-dir=s' => \$Git::SVN::Ra::config_dir, @@ -109,9 +109,11 @@ my %cmd = ( fetch => [ \&cmd_fetch, "Download new revisions from SVN", { 'revision|r=s' => \$_revision, 'fetch-all|all' => \$_fetch_all, + 'cut-changelog-bits' => \$_cut_changelog_bits, %fc_opts } ], clone => [ \&cmd_clone, "Initialize and fetch revisions", { 'revision|r=s' => \$_revision, + 'cut-changelog-bits' => \$_cut_changelog_bits, %fc_opts, %init_opts } ], init => [ \&cmd_init, "Initialize a repo for tracking" . " (requires URL argument)", @@ -2463,6 +2465,16 @@ sub make_log_entry { close $un or croak $!; $log_entry{date} = parse_svn_date($log_entry{date}); + if (defined $_cut_changelog_bits) { + $log_entry{log} =~ s/^((\n|\s)*(199|200)[0-9](-[0-9]{2}){2}\s+.*<.*>\s*\n\s+)//; + $log_entry{log} =~ s/(^|\n)\s*/$1/g; + $log_entry{log} =~ s/(^|\n)\* /\n$1/g; + # $log_entry{log} =~ s/(^|\n)\* [^ \t():]+\s*(\([^)]+\)([, \t\n]*))*\s*:\s*/$1\n/g; + # $log_entry{log} =~ s/(^|\n)\t/$1/g; + $log_entry{log} =~ s/^[\n\s]*//; + $log_entry{log} =~ s/\n\s*/ /g if length ($log_entry{log}) < 81; + $log_entry{log} .= "\n"; + } $log_entry{log} .= "\n"; my $author = $log_entry{author} = check_author($log_entry{author}); my ($name, $email) = defined $::users{$author} ? @{$::users{$author}} -- 1.6.0.rc0.44.g67270