undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svnimport: Parse log message for Signed-off-by: lines

Browse Source 
This add '-S' option. When specified svn-import will try to parse
commit message for 'Signed-off-by: ...' line, and if found will use
the name and email address extracted at first occurrence as this commit
author name and author email address. Committer name and email are
extracted in usual way.

Signed-off-by: Sasha Khapyorsky <sashak@voltaire.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Sasha Khapyorsky 2006-09-05 21:46:11 +03:00 committed by Junio C Hamano
parent 3d5c0cc938
commit ae35b30433
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
git-svnimport.perl
View File

@ -31,7 +31,7 @@ $SIG{'PIPE'}="IGNORE";
$ENV{'TZ'}="UTC"; $ENV{'TZ'}="UTC";
our($opt_h,$opt_o,$opt_v,$opt_u,$opt_C,$opt_i,$opt_m,$opt_M,$opt_t,$opt_T, our($opt_h,$opt_o,$opt_v,$opt_u,$opt_C,$opt_i,$opt_m,$opt_M,$opt_t,$opt_T,
$opt_b,$opt_r,$opt_I,$opt_A,$opt_s,$opt_l,$opt_d,$opt_D); $opt_b,$opt_r,$opt_I,$opt_A,$opt_s,$opt_l,$opt_d,$opt_D,$opt_S);
sub usage() { sub usage() {
print STDERR <<END; print STDERR <<END;
@ -39,12 +39,12 @@ Usage: ${\basename $0} # fetch/update GIT from SVN
[-o branch-for-HEAD] [-h] [-v] [-l max_rev] [-o branch-for-HEAD] [-h] [-v] [-l max_rev]
[-C GIT_repository] [-t tagname] [-T trunkname] [-b branchname] [-C GIT_repository] [-t tagname] [-T trunkname] [-b branchname]
[-d|-D] [-i] [-u] [-r] [-I ignorefilename] [-s start_chg] [-d|-D] [-i] [-u] [-r] [-I ignorefilename] [-s start_chg]
[-m] [-M regex] [-A author_file] [SVN_URL] [-m] [-M regex] [-A author_file] [-S] [SVN_URL]
END END
exit(1); exit(1);
} }
getopts("A:b:C:dDhiI:l:mM:o:rs:t:T:uv") or usage(); getopts("A:b:C:dDhiI:l:mM:o:rs:t:T:Suv") or usage();
usage if $opt_h; usage if $opt_h;
my $tag_name = $opt_t || "tags"; my $tag_name = $opt_t || "tags";
@ -531,21 +531,30 @@ sub copy_path($$$$$$$$) {
sub commit { sub commit {
my($branch, $changed_paths, $revision, $author, $date, $message) = @_; my($branch, $changed_paths, $revision, $author, $date, $message) = @_;
my($author_name,$author_email,$dest); my($committer_name,$committer_email,$dest);
my($author_name,$author_email);
my(@old,@new,@parents); my(@old,@new,@parents);
if (not defined $author or $author eq "") { if (not defined $author or $author eq "") {
$author_name = $author_email = "unknown"; $committer_name = $committer_email = "unknown";
} elsif (defined $users_file) { } elsif (defined $users_file) {
die "User $author is not listed in $users_file\n" die "User $author is not listed in $users_file\n"
unless exists $users{$author}; unless exists $users{$author};
($author_name,$author_email) = @{$users{$author}}; ($committer_name,$committer_email) = @{$users{$author}};
} elsif ($author =~ /^(.*?)\s+<(.*)>$/) { } elsif ($author =~ /^(.*?)\s+<(.*)>$/) {
($author_name, $author_email) = ($1, $2); ($committer_name, $committer_email) = ($1, $2);
} else { } else {
$author =~ s/^<(.*)>$/$1/; $author =~ s/^<(.*)>$/$1/;
$author_name = $author_email = $author; $committer_name = $committer_email = $author;
} }
if ($opt_S && $message =~ /Signed-off-by:\s+(.*?)\s+<(.*)>\s*\n/) {
($author_name, $author_email) = ($1, $2);
} else {
$author_name = $committer_name;
$author_email = $committer_email;
}
$date = pdate($date); $date = pdate($date);
my $tag; my $tag;
@ -772,8 +781,8 @@ sub commit {
"GIT_AUTHOR_NAME=$author_name", "GIT_AUTHOR_NAME=$author_name",
"GIT_AUTHOR_EMAIL=$author_email", "GIT_AUTHOR_EMAIL=$author_email",
"GIT_AUTHOR_DATE=".strftime("+0000 %Y-%m-%d %H:%M:%S",gmtime($date)), "GIT_AUTHOR_DATE=".strftime("+0000 %Y-%m-%d %H:%M:%S",gmtime($date)),
"GIT_COMMITTER_NAME=$author_name", "GIT_COMMITTER_NAME=$committer_name",
"GIT_COMMITTER_EMAIL=$author_email", "GIT_COMMITTER_EMAIL=$committer_email",
"GIT_COMMITTER_DATE=".strftime("+0000 %Y-%m-%d %H:%M:%S",gmtime($date)), "GIT_COMMITTER_DATE=".strftime("+0000 %Y-%m-%d %H:%M:%S",gmtime($date)),
"git-commit-tree", $tree,@par); "git-commit-tree", $tree,@par);
die "Cannot exec git-commit-tree: $!\n"; die "Cannot exec git-commit-tree: $!\n";
@ -825,7 +834,7 @@ sub commit {
print $out ("object $cid\n". print $out ("object $cid\n".
"type commit\n". "type commit\n".
"tag $dest\n". "tag $dest\n".
"tagger $author_name <$author_email>\n") and "tagger $committer_name <$committer_email>\n") and
close($out) close($out)
or die "Cannot create tag object $dest: $!\n"; or die "Cannot create tag object $dest: $!\n";