Bundle file copies from multiple branches into a merge.

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>

diff --git a/git-svnimport.perl b/git-svnimport.perl
index 9cee629f10e17272e1ca41c18212a74a44cc7f82..ae82a7c0970e9fcea2d510a5e382be45908a6cf1 100755 (executable)
--- a/git-svnimport.perl
+++ b/git-svnimport.perl
@@ -365,12 +365,12 @@ ($$)
        return $therev;
 }
 
        return $therev;
 }
 

-sub copy_path($$$$$$$) {
+sub copy_path($$$$$$$$) {

        # Somebody copied a whole subdirectory.
        # 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.
 
        # Somebody copied a whole subdirectory.
        # 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.
 

-       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 $therev = branch_rev($srcbranch, $rev);
 
        my($srcbranch,$srcpath) = split_path($rev,$oldpath);
        my $therev = branch_rev($srcbranch, $rev);


@@ -379,6 +379,9 @@ ($$$$$$$)
                print STDERR "$newrev:$newbranch: could not find $oldpath \@ $rev\n";
                return;
        }
                print STDERR "$newrev:$newbranch: could not find $oldpath \@ $rev\n";
                return;
        }

+       if ($srcbranch ne $newbranch) {
+               push(@$parents, $branches{$srcbranch}{'LAST'});
+       }

        print "$newrev:$newbranch:$path: copying from $srcbranch:$srcpath @ $rev\n" if $opt_v;
        if ($node_kind eq $SVN::Node::dir) {
                        $srcpath =~ s#/*$#/#;
        print "$newrev:$newbranch:$path: copying from $srcbranch:$srcpath @ $rev\n" if $opt_v;
        if ($node_kind eq $SVN::Node::dir) {
                        $srcpath =~ s#/*$#/#;


@@ -405,7 +408,7 @@ ($$$$$$$)
 sub commit {
        my($branch, $changed_paths, $revision, $author, $date, $message) = @_;
        my($author_name,$author_email,$dest);
 sub commit {
        my($branch, $changed_paths, $revision, $author, $date, $message) = @_;
        my($author_name,$author_email,$dest);

-       my(@old,@new);
+       my(@old,@new,@parents);

 
        if (not defined $author) {
                $author_name = $author_email = "unknown";
 
        if (not defined $author) {
                $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;
        if($tag and not %$changed_paths) {
                $cid = $rev;
        my $cid;
        if($tag and not %$changed_paths) {
                $cid = $rev;


@@ -507,7 +512,7 @@ sub commit {
                        if(($action->[0] eq "A") || ($action->[0] eq "R")) {
                                my $node_kind = node_kind($branch,$path,$revision);
                                if($action->[1]) {
                        if(($action->[0] eq "A") || ($action->[0] eq "R")) {
                                my $node_kind = node_kind($branch,$path,$revision);
                                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) {
                                        my $f = get_file($revision,$branch,$path);
                                        if ($f) {
                                } elsif ($node_kind eq $SVN::Node::file) {
                                        my $f = get_file($revision,$branch,$path);
                                        if ($f) {


@@ -592,7 +597,6 @@ sub commit {
                        $pw->close();
 
                        my @par = ();
                        $pw->close();
 
                        my @par = ();

-                       @par = ("-p",$rev) if defined $rev;

 
                        # loose detection of merges
                        # based on the commit msg
 
                        # loose detection of merges
                        # based on the commit msg


@@ -602,11 +606,17 @@ sub commit {
                                        if ($mparent eq 'HEAD') { $mparent = $opt_o };
                                        if ( -e "$git_dir/refs/heads/$mparent") {
                                                $mparent = get_headref($mparent, $git_dir);
                                        if ($mparent eq 'HEAD') { $mparent = $opt_o };
                                        if ( -e "$git_dir/refs/heads/$mparent") {
                                                $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",
                                "GIT_AUTHOR_NAME=$author_name",
 
                        exec("env",
                                "GIT_AUTHOR_NAME=$author_name",