Fix confusing git-update-ref error message

[git.git] / git-svnimport.perl

diff --git a/git-svnimport.perl b/git-svnimport.perl
index 9cee629..cb9afb9 100755 (executable)
--- a/git-svnimport.perl
+++ b/git-svnimport.perl
@@ -25,7 +25,7 @@ use IPC::Open2;
 use SVN::Core;
 use SVN::Ra;
 
-die "Need CVN:Core 1.2.1 or better" if $SVN::Core::VERSION lt "1.2.1";
+die "Need SVN:Core 1.2.1 or better" if $SVN::Core::VERSION lt "1.2.1";
 
 $SIG{'PIPE'}="IGNORE";
 $ENV{'TZ'}="UTC";
@@ -34,7 +34,7 @@ our($opt_h,$opt_o,$opt_v,$opt_u,$opt_C,$opt_i,$opt_m,$opt_M,$opt_t,$opt_T,$opt_b
 
 sub usage() {
        print STDERR <<END;
-Usage: ${\basename $0}     # fetch/update GIT from CVS
+Usage: ${\basename $0}     # fetch/update GIT from SVN
        [-o branch-for-HEAD] [-h] [-v] [-l max_num_changes]
        [-C GIT_repository] [-t tagname] [-T trunkname] [-b branchname]
        [-d|-D] [-i] [-u] [-s start_chg] [-m] [-M regex] [SVN_URL]
@@ -53,7 +53,6 @@ my $branch_name = $opt_b || "branches";
 
 $opt_o ||= "origin";
 $opt_s ||= 1;
-$opt_l = 100 unless defined $opt_l;
 my $git_tree = $opt_C;
 $git_tree ||= ".";
 
@@ -365,12 +364,12 @@ sub branch_rev($$) {
        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.
 
-       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);
@@ -379,6 +378,9 @@ sub copy_path($$$$$$$) {
                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#/*$#/#;
@@ -405,7 +407,7 @@ sub copy_path($$$$$$$) {
 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";
@@ -492,6 +494,8 @@ sub commit {
                $last_rev = $rev;
        }
 
+       push (@parents, $rev) if defined $rev;
+
        my $cid;
        if($tag and not %$changed_paths) {
                $cid = $rev;
@@ -507,7 +511,7 @@ sub commit {
                        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) {
@@ -592,7 +596,6 @@ sub commit {
                        $pw->close();
 
                        my @par = ();
-                       @par = ("-p",$rev) if defined $rev;
 
                        # loose detection of merges
                        # based on the commit msg
@@ -602,11 +605,17 @@ sub commit {
                                        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;
                                        }
                                }
                        }
+                       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",
@@ -638,6 +647,10 @@ sub commit {
                die "Error running git-commit-tree: $?\n" if $?;
        }
 
+       if (not defined $cid) {
+               $cid = $branches{"/"}{"LAST"};
+       }
+
        if(not defined $dest) {
                print "... no known parent\n" if $opt_v;
        } elsif(not $tag) {
@@ -654,6 +667,7 @@ sub commit {
                # the tag was 'complex', i.e. did not refer to a "real" revision
 
                $dest =~ tr/_/\./ if $opt_u;
+               $branch = $dest;
 
                my $pid = open2($in, $out, 'git-mktag');
                print $out ("object $cid\n".
@@ -712,15 +726,16 @@ sub commit_all {
 }
 
 while(++$current_rev <= $svn->{'maxrev'}) {
+       if (defined $opt_l) {
+               $opt_l--;
+               if ($opt_l < 0) {
+                       last;
+               }
+       }
        my $pool=SVN::Pool->new;
        $svn->{'svn'}->get_log("/",$current_rev,$current_rev,1,1,1,\&_commit_all,$pool);
        $pool->clear;
        commit_all();
-       if($opt_l and not --$opt_l) {
-               print STDERR "Stopping, because there is a memory leak (in the SVN library).\n";
-               print STDERR "Please repeat this command; it will continue safely\n";
-               last;
-       }
 }