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

Bundle file copies from multiple branches into a merge.

Browse Source 
When copying files and/or directories from several branches in one single
revision, all these branches are used as parents of the commit.

Signed-off-by: Yaacov Akiba Slama <ya@slamail.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Yaacov Akiba Slama 2005-11-02 23:51:57 +02:00 committed by Junio C Hamano
parent 8168373fe7
commit 109fc2b97b
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
git-svnimport.perl
View File

@ -365,12 +365,12 @@ sub branch_rev($$) {
return $therev; return $therev;
} }
sub copy_path($$$$$$$) { sub copy_path($$$$$$$$) {
# Somebody copied a whole subdirectory. # Somebody copied a whole subdirectory.
# We need to find the index entries from the old version which the # We need to find the index entries from the old version which the
# SVN log entry points to, and add them to the new place. # SVN log entry points to, and add them to the new place.
my($newrev,$newbranch,$path,$oldpath,$rev,$node_kind,$new) = @_; my($newrev,$newbranch,$path,$oldpath,$rev,$node_kind,$new,$parents) = @_;
my($srcbranch,$srcpath) = split_path($rev,$oldpath); my($srcbranch,$srcpath) = split_path($rev,$oldpath);
my $therev = branch_rev($srcbranch, $rev); my $therev = branch_rev($srcbranch, $rev);
@ -379,6 +379,9 @@ sub copy_path($$$$$$$) {
print STDERR "$newrev:$newbranch: could not find $oldpath \@ $rev\n"; print STDERR "$newrev:$newbranch: could not find $oldpath \@ $rev\n";
return; return;
} }
if ($srcbranch ne $newbranch) {
push(@$parents, $branches{$srcbranch}{'LAST'});
}
print "$newrev:$newbranch:$path: copying from $srcbranch:$srcpath @ $rev\n" if $opt_v; print "$newrev:$newbranch:$path: copying from $srcbranch:$srcpath @ $rev\n" if $opt_v;
if ($node_kind eq $SVN::Node::dir) { if ($node_kind eq $SVN::Node::dir) {
$srcpath =~ s#/*$#/#; $srcpath =~ s#/*$#/#;
@ -405,7 +408,7 @@ 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($author_name,$author_email,$dest);
my(@old,@new); my(@old,@new,@parents);
if (not defined $author) { if (not defined $author) {
$author_name = $author_email = "unknown"; $author_name = $author_email = "unknown";
@ -492,6 +495,8 @@ sub commit {
$last_rev = $rev; $last_rev = $rev;
} }
push (@parents, $rev) if defined $rev;
my $cid; my $cid;
if($tag and not %$changed_paths) { if($tag and not %$changed_paths) {
$cid = $rev; $cid = $rev;
@ -507,7 +512,7 @@ sub commit {
if(($action->[0] eq "A") || ($action->[0] eq "R")) { if(($action->[0] eq "A") || ($action->[0] eq "R")) {
my $node_kind = node_kind($branch,$path,$revision); my $node_kind = node_kind($branch,$path,$revision);
if($action->[1]) { if($action->[1]) {
copy_path($revision,$branch,$path,$action->[1],$action->[2],$node_kind,\@new); copy_path($revision,$branch,$path,$action->[1],$action->[2],$node_kind,\@new,\@parents);
} elsif ($node_kind eq $SVN::Node::file) { } elsif ($node_kind eq $SVN::Node::file) {
my $f = get_file($revision,$branch,$path); my $f = get_file($revision,$branch,$path);
if ($f) { if ($f) {
@ -592,7 +597,6 @@ sub commit {
$pw->close(); $pw->close();
my @par = (); my @par = ();
@par = ("-p",$rev) if defined $rev;
# loose detection of merges # loose detection of merges
# based on the commit msg # based on the commit msg
@ -602,11 +606,17 @@ sub commit {
if ($mparent eq 'HEAD') { $mparent = $opt_o }; if ($mparent eq 'HEAD') { $mparent = $opt_o };
if ( -e "$git_dir/refs/heads/$mparent") { if ( -e "$git_dir/refs/heads/$mparent") {
$mparent = get_headref($mparent, $git_dir); $mparent = get_headref($mparent, $git_dir);
push @par, '-p', $mparent; push (@parents, $mparent);
print OUT "Merge parent branch: $mparent\n" if $opt_v; print OUT "Merge parent branch: $mparent\n" if $opt_v;
} }
} }
} }
my %seen_parents = ();
my @unique_parents = grep { ! $seen_parents{$_} ++ } @parents;
foreach my $bparent (@unique_parents) {
push @par, '-p', $bparent;
print OUT "Merge parent branch: $bparent\n" if $opt_v;
}
exec("env", exec("env",
"GIT_AUTHOR_NAME=$author_name", "GIT_AUTHOR_NAME=$author_name",