Add an Emacs interface in contrib.

diff --git a/git-svnimport.perl b/git-svnimport.perl
index cb241d1b5174fad6b6eb081635e614d251688f0d..c536d7026d4c56dbf5ca0ccb1a93c25a956a64ba 100755 (executable)
--- a/git-svnimport.perl
+++ b/git-svnimport.perl
@@ -30,19 +30,19 @@
 $SIG{'PIPE'}="IGNORE";
 $ENV{'TZ'}="UTC";
 
-our($opt_h,$opt_o,$opt_v,$opt_u,$opt_C,$opt_i,$opt_m,$opt_M,$opt_t,$opt_T,$opt_b,$opt_s,$opt_l,$opt_d,$opt_D);
+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_s,$opt_l,$opt_d,$opt_D);
 
 sub usage() {
        print STDERR <<END;
 Usage: ${\basename $0}     # fetch/update GIT from SVN
        [-o branch-for-HEAD] [-h] [-v] [-l max_rev]
        [-C GIT_repository] [-t tagname] [-T trunkname] [-b branchname]
-       [-d|-D] [-i] [-u] [-s start_chg] [-m] [-M regex] [SVN_URL]
+       [-d|-D] [-i] [-u] [-r] [-s start_chg] [-m] [-M regex] [SVN_URL]
 END
        exit(1);
 }
 
-getopts("b:C:dDhil:mM:o:s:t:T:uv") or usage();
+getopts("b:C:dDhil:mM:o:rs:t:T:uv") or usage();
 usage if $opt_h;
 
 my $tag_name = $opt_t || "tags";
@@ -96,8 +96,10 @@ sub new {
 sub conn {
        my $self = shift;
        my $repo = $self->{'fullrep'};
-       my $s = SVN::Ra->new($repo);
-
+       my $auth = SVN::Core::auth_open ([SVN::Client::get_simple_provider,
+                         SVN::Client::get_ssl_server_trust_file_provider,
+                         SVN::Client::get_username_provider]);
+       my $s = SVN::Ra->new(url => $repo, auth => $auth);
        die "SVN connection to $repo: $!\n" unless defined $s;
        $self->{'svn'} = $s;
        $self->{'repo'} = $repo;
@@ -316,7 +318,7 @@ ($$$)
                        die $res->status_line." at $url\n";
                }
        } else {
-               $name = $svn->file("/$svnpath",$rev);
+               $name = $svn->file("$svnpath",$rev);
                return undef unless defined $name;
        }
 
@@ -544,23 +546,30 @@ sub commit {
                        }
                }
 
-               if(@old) {
-                       open my $F, "-|", "git-ls-files", "-z", @old or die $!;
-                       @old = ();
+               while(@old) {
+                       my @o1;
+                       if(@old > 55) {
+                               @o1 = splice(@old,0,50);
+                       } else {
+                               @o1 = @old;
+                               @old = ();
+                       }
+                       open my $F, "-|", "git-ls-files", "-z", @o1 or die $!;
+                       @o1 = ();
                        local $/ = "\0";
                        while(<$F>) {
                                chomp;
-                               push(@old,$_);
+                               push(@o1,$_);
                        }
                        close($F);
 
-                       while(@old) {
+                       while(@o1) {
                                my @o2;
-                               if(@old > 55) {
-                                       @o2 = splice(@old,0,50);
+                               if(@o1 > 55) {
+                                       @o2 = splice(@o1,0,50);
                                } else {
-                                       @o2 = @old;
-                                       @old = ();
+                                       @o2 = @o1;
+                                       @o1 = ();
                                }
                                system("git-update-index","--force-remove","--",@o2);
                                die "Cannot remove files: $?\n" if $?;
@@ -641,6 +650,7 @@ sub commit {
                $pr->reader();
 
                $message =~ s/[\s\n]+\z//;
+               $message = "r$revision: $message" if $opt_r;
 
                print $pw "$message\n"
                        or die "Error writing to git-commit-tree: $!\n";