t5500: test fix

[git.git] / git-svnimport.perl

diff --git a/git-svnimport.perl b/git-svnimport.perl
index 86837ed..4d5371c 100755 (executable)
--- a/git-svnimport.perl
+++ b/git-svnimport.perl
@@ -13,6 +13,7 @@
 use strict;
 use warnings;
 use Getopt::Std;
+use File::Copy;
 use File::Spec;
 use File::Temp qw(tempfile);
 use File::Path qw(mkpath);
@@ -68,10 +69,16 @@ if ($opt_M) {
        push (@mergerx, qr/$opt_M/);
 }
 
+# Absolutize filename now, since we will have chdir'ed by the time we
+# get around to opening it.
+$opt_A = File::Spec->rel2abs($opt_A) if $opt_A;
+
 our %users = ();
-if ($opt_A) {
-       die "Cannot open $opt_A\n" unless -f $opt_A;
-       open(my $authors,$opt_A);
+our $users_file = undef;
+sub read_users($) {
+       $users_file = File::Spec->rel2abs(@_);
+       die "Cannot open $users_file\n" unless -f $users_file;
+       open(my $authors,$users_file);
        while(<$authors>) {
                chomp;
                next unless /^(\S+?)\s*=\s*(.+?)\s*<(.+)>\s*$/;
@@ -302,6 +309,14 @@ EOM
 -d $git_dir
        or die "Could not create git subdir ($git_dir).\n";
 
+my $default_authors = "$git_dir/svn-authors";
+if ($opt_A) {
+       read_users($opt_A);
+       copy($opt_A,$default_authors) or die "Copy failed: $!";
+} else {
+       read_users($default_authors) if -f $default_authors;
+}
+
 open BRANCHES,">>", "$git_dir/svn2git";
 
 sub node_kind($$$) {
@@ -498,8 +513,8 @@ sub commit {
 
        if (not defined $author) {
                $author_name = $author_email = "unknown";
-       } elsif ($opt_A) {
-               die "User $author is not listed in $opt_A\n"
+       } elsif (defined $users_file) {
+               die "User $author is not listed in $users_file\n"
                    unless exists $users{$author};
                ($author_name,$author_email) = @{$users{$author}};
        } elsif ($author =~ /^(.*?)\s+<(.*)>$/) {
@@ -601,9 +616,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,\@parents);
-                               } elsif ($node_kind eq $SVN::Node::file) {
+                               if ($node_kind eq $SVN::Node::file) {
                                        my $f = get_file($revision,$branch,$path);
                                        if ($f) {
                                                push(@new,$f) if $f;
@@ -612,8 +625,15 @@ sub commit {
                                                print STDERR "$revision: $branch: could not fetch '$opath'\n";
                                        }
                                } elsif ($node_kind eq $SVN::Node::dir) {
-                                       get_ignore(\@new, \@old, $revision,
-                                                  $branch,$path);
+                                       if($action->[1]) {
+                                               copy_path($revision, $branch,
+                                                         $path, $action->[1],
+                                                         $action->[2], $node_kind,
+                                                         \@new, \@parents);
+                                       } else {
+                                               get_ignore(\@new, \@old, $revision,
+                                                          $branch, $path);
+                                       }
                                }
                        } elsif ($action->[0] eq "D") {
                                push(@old,$path);
@@ -836,7 +856,7 @@ sub commit_all {
 
 $opt_l = $svn->{'maxrev'} if not defined $opt_l or $opt_l > $svn->{'maxrev'};
 
-if ($svn->{'maxrev'} < $current_rev) {
+if ($opt_l < $current_rev) {
     print "Up to date: no new revisions to fetch!\n" if $opt_v;
     unlink("$git_dir/SVN2GIT_HEAD");
     exit;