git-svnimport.perl

   1 #!/usr/bin/perl -w
   2
   3 # This tool is copyright (c) 2005, Matthias Urlichs.
   4 # It is released under the Gnu Public License, version 2.
   5 #
   6 # The basic idea is to pull and analyze SVN changes.
   7 #
   8 # Checking out the files is done by a single long-running SVN connection.
   9 #
  10 # The head revision is on branch "origin" by default.
  11 # You can change that with the '-o' option.
  12
  13 use strict;
  14 use warnings;
  15 use Getopt::Std;
  16 use File::Copy;
  17 use File::Spec;
  18 use File::Temp qw(tempfile);
  19 use File::Path qw(mkpath);
  20 use File::Basename qw(basename dirname);
  21 use Time::Local;
  22 use IO::Pipe;
  23 use POSIX qw(strftime dup2);
  24 use IPC::Open2;
  25 use SVN::Core;
  26 use SVN::Ra;
  27
  28 die "Need SVN:Core 1.2.1 or better" if $SVN::Core::VERSION lt "1.2.1";
  29
  30 $SIG{'PIPE'}="IGNORE";
  31 $ENV{'TZ'}="UTC";
  32
  33 our($opt_h,$opt_o,$opt_v,$opt_u,$opt_C,$opt_i,$opt_m,$opt_M,$opt_t,$opt_T,
  34     $opt_b,$opt_r,$opt_I,$opt_A,$opt_s,$opt_l,$opt_d,$opt_D,$opt_S,$opt_F);
  35
  36 sub usage() {
  37         print STDERR <<END;
  38 Usage: ${\basename $0}     # fetch/update GIT from SVN
  39        [-o branch-for-HEAD] [-h] [-v] [-l max_rev]
  40        [-C GIT_repository] [-t tagname] [-T trunkname] [-b branchname]
  41        [-d|-D] [-i] [-u] [-r] [-I ignorefilename] [-s start_chg]
  42        [-m] [-M regex] [-A author_file] [-S] [-F] [SVN_URL]
  43 END
  44         exit(1);
  45 }
  46
  47 getopts("A:b:C:dDFhiI:l:mM:o:rs:t:T:Suv") or usage();
  48 usage if $opt_h;
  49
  50 my $tag_name = $opt_t || "tags";
  51 my $trunk_name = $opt_T || "trunk";
  52 my $branch_name = $opt_b || "branches";
  53
  54 @ARGV == 1 or @ARGV == 2 or usage();
  55
  56 $opt_o ||= "origin";
  57 $opt_s ||= 1;
  58 my $git_tree = $opt_C;
  59 $git_tree ||= ".";
  60
  61 my $svn_url = $ARGV[0];
  62 my $svn_dir = $ARGV[1];
  63
  64 our @mergerx = ();
  65 if ($opt_m) {
  66         my $branch_esc = quotemeta ($branch_name);
  67         my $trunk_esc  = quotemeta ($trunk_name);
  68         @mergerx =
  69         (
  70                 qr!\b(?:merg(?:ed?|ing))\b.*?\b((?:(?<=$branch_esc/)[\w\.\-]+)|(?:$trunk_esc))\b!i,
  71                 qr!\b(?:from|of)\W+((?:(?<=$branch_esc/)[\w\.\-]+)|(?:$trunk_esc))\b!i,
  72                 qr!\b(?:from|of)\W+(?:the )?([\w\.\-]+)[-\s]branch\b!i
  73         );
  74 }
  75 if ($opt_M) {
  76         unshift (@mergerx, qr/$opt_M/);
  77 }
  78
  79 # Absolutize filename now, since we will have chdir'ed by the time we
  80 # get around to opening it.
  81 $opt_A = File::Spec->rel2abs($opt_A) if $opt_A;
  82
  83 our %users = ();
  84 our $users_file = undef;
  85 sub read_users($) {
  86         $users_file = File::Spec->rel2abs(@_);
  87         die "Cannot open $users_file\n" unless -f $users_file;
  88         open(my $authors,$users_file);
  89         while(<$authors>) {
  90                 chomp;
  91                 next unless /^(\S+?)\s*=\s*(.+?)\s*<(.+)>\s*$/;
  92                 (my $user,my $name,my $email) = ($1,$2,$3);
  93                 $users{$user} = [$name,$email];
  94         }
  95         close($authors);
  96 }
  97
  98 select(STDERR); $|=1; select(STDOUT);
  99
 100
 101 package SVNconn;
 102 # Basic SVN connection.
 103 # We're only interested in connecting and downloading, so ...
 104
 105 use File::Spec;
 106 use File::Temp qw(tempfile);
 107 use POSIX qw(strftime dup2);
 108 use Fcntl qw(SEEK_SET);
 109
 110 sub new {
 111         my($what,$repo) = @_;
 112         $what=ref($what) if ref($what);
 113
 114         my $self = {};
 115         $self->{'buffer'} = "";
 116         bless($self,$what);
 117
 118         $repo =~ s#/+$##;
 119         $self->{'fullrep'} = $repo;
 120         $self->conn();
 121
 122         return $self;
 123 }
 124
 125 sub conn {
 126         my $self = shift;
 127         my $repo = $self->{'fullrep'};
 128         my $auth = SVN::Core::auth_open ([SVN::Client::get_simple_provider,
 129                           SVN::Client::get_ssl_server_trust_file_provider,
 130                           SVN::Client::get_username_provider]);
 131         my $s = SVN::Ra->new(url => $repo, auth => $auth);
 132         die "SVN connection to $repo: $!\n" unless defined $s;
 133         $self->{'svn'} = $s;
 134         $self->{'repo'} = $repo;
 135         $self->{'maxrev'} = $s->get_latest_revnum();
 136 }
 137
 138 sub file {
 139         my($self,$path,$rev) = @_;
 140
 141         my ($fh, $name) = tempfile('gitsvn.XXXXXX',
 142                     DIR => File::Spec->tmpdir(), UNLINK => 1);
 143
 144         print "... $rev $path ...\n" if $opt_v;
 145         my (undef, $properties);
 146         my $pool = SVN::Pool->new();
 147         eval { (undef, $properties)
 148                    = $self->{'svn'}->get_file($path,$rev,$fh,$pool); };
 149         $pool->clear;
 150         if($@) {
 151                 return undef if $@ =~ /Attempted to get checksum/;
 152                 die $@;
 153         }
 154         my $mode;
 155         if (exists $properties->{'svn:executable'}) {
 156                 $mode = '100755';
 157         } elsif (exists $properties->{'svn:special'}) {
 158                 my ($special_content, $filesize);
 159                 $filesize = tell $fh;
 160                 seek $fh, 0, SEEK_SET;
 161                 read $fh, $special_content, $filesize;
 162                 if ($special_content =~ s/^link //) {
 163                         $mode = '120000';
 164                         seek $fh, 0, SEEK_SET;
 165                         truncate $fh, 0;
 166                         print $fh $special_content;
 167                 } else {
 168                         die "unexpected svn:special file encountered";
 169                 }
 170         } else {
 171                 $mode = '100644';
 172         }
 173         close ($fh);
 174
 175         return ($name, $mode);
 176 }
 177
 178 sub ignore {
 179         my($self,$path,$rev) = @_;
 180
 181         print "... $rev $path ...\n" if $opt_v;
 182         my (undef,undef,$properties)
 183             = $self->{'svn'}->get_dir($path,$rev,undef);
 184         if (exists $properties->{'svn:ignore'}) {
 185                 my ($fh, $name) = tempfile('gitsvn.XXXXXX',
 186                                            DIR => File::Spec->tmpdir(),
 187                                            UNLINK => 1);
 188                 print $fh $properties->{'svn:ignore'};
 189                 close($fh);
 190                 return $name;
 191         } else {
 192                 return undef;
 193         }
 194 }
 195
 196 package main;
 197 use URI;
 198
 199 our $svn = $svn_url;
 200 $svn .= "/$svn_dir" if defined $svn_dir;
 201 my $svn2 = SVNconn->new($svn);
 202 $svn = SVNconn->new($svn);
 203
 204 my $lwp_ua;
 205 if($opt_d or $opt_D) {
 206         $svn_url = URI->new($svn_url)->canonical;
 207         if($opt_D) {
 208                 $svn_dir =~ s#/*$#/#;
 209         } else {
 210                 $svn_dir = "";
 211         }
 212         if ($svn_url->scheme eq "http") {
 213                 use LWP::UserAgent;
 214                 $lwp_ua = LWP::UserAgent->new(keep_alive => 1, requests_redirectable => []);
 215         } else {
 216                 print STDERR "Warning: not HTTP; turning off direct file access\n";
 217                 $opt_d=0;
 218         }
 219 }
 220
 221 sub pdate($) {
 222         my($d) = @_;
 223         $d =~ m#(\d\d\d\d)-(\d\d)-(\d\d)T(\d\d):(\d\d):(\d\d)#
 224                 or die "Unparseable date: $d\n";
 225         my $y=$1; $y-=1900 if $y>1900;
 226         return timegm($6||0,$5,$4,$3,$2-1,$y);
 227 }
 228
 229 sub getwd() {
 230         my $pwd = `pwd`;
 231         chomp $pwd;
 232         return $pwd;
 233 }
 234
 235
 236 sub get_headref($$) {
 237     my $name    = shift;
 238     my $git_dir = shift;
 239     my $sha;
 240
 241     if (open(C,"$git_dir/refs/heads/$name")) {
 242         chomp($sha = <C>);
 243         close(C);
 244         length($sha) == 40
 245             or die "Cannot get head id for $name ($sha): $!\n";
 246     }
 247     return $sha;
 248 }
 249
 250
 251 -d $git_tree
 252         or mkdir($git_tree,0777)
 253         or die "Could not create $git_tree: $!";
 254 chdir($git_tree);
 255
 256 my $orig_branch = "";
 257 my $forward_master = 0;
 258 my %branches;
 259
 260 my $git_dir = $ENV{"GIT_DIR"} || ".git";
 261 $git_dir = getwd()."/".$git_dir unless $git_dir =~ m#^/#;
 262 $ENV{"GIT_DIR"} = $git_dir;
 263 my $orig_git_index;
 264 $orig_git_index = $ENV{GIT_INDEX_FILE} if exists $ENV{GIT_INDEX_FILE};
 265 my ($git_ih, $git_index) = tempfile('gitXXXXXX', SUFFIX => '.idx',
 266                                     DIR => File::Spec->tmpdir());
 267 close ($git_ih);
 268 $ENV{GIT_INDEX_FILE} = $git_index;
 269 my $maxnum = 0;
 270 my $last_rev = "";
 271 my $last_branch;
 272 my $current_rev = $opt_s || 1;
 273 unless(-d $git_dir) {
 274         system("git-init-db");
 275         die "Cannot init the GIT db at $git_tree: $?\n" if $?;
 276         system("git-read-tree");
 277         die "Cannot init an empty tree: $?\n" if $?;
 278
 279         $last_branch = $opt_o;
 280         $orig_branch = "";
 281 } else {
 282         -f "$git_dir/refs/heads/$opt_o"
 283                 or die "Branch '$opt_o' does not exist.\n".
 284                        "Either use the correct '-o branch' option,\n".
 285                        "or import to a new repository.\n";
 286
 287         -f "$git_dir/svn2git"
 288                 or die "'$git_dir/svn2git' does not exist.\n".
 289                        "You need that file for incremental imports.\n";
 290         open(F, "git-symbolic-ref HEAD |") or
 291                 die "Cannot run git-symbolic-ref: $!\n";
 292         chomp ($last_branch = <F>);
 293         $last_branch = basename($last_branch);
 294         close(F);
 295         unless($last_branch) {
 296                 warn "Cannot read the last branch name: $! -- assuming 'master'\n";
 297                 $last_branch = "master";
 298         }
 299         $orig_branch = $last_branch;
 300         $last_rev = get_headref($orig_branch, $git_dir);
 301         if (-f "$git_dir/SVN2GIT_HEAD") {
 302                 die <<EOM;
 303 SVN2GIT_HEAD exists.
 304 Make sure your working directory corresponds to HEAD and remove SVN2GIT_HEAD.
 305 You may need to run
 306
 307     git-read-tree -m -u SVN2GIT_HEAD HEAD
 308 EOM
 309         }
 310         system('cp', "$git_dir/HEAD", "$git_dir/SVN2GIT_HEAD");
 311
 312         $forward_master =
 313             $opt_o ne 'master' && -f "$git_dir/refs/heads/master" &&
 314             system('cmp', '-s', "$git_dir/refs/heads/master",
 315                                 "$git_dir/refs/heads/$opt_o") == 0;
 316
 317         # populate index
 318         system('git-read-tree', $last_rev);
 319         die "read-tree failed: $?\n" if $?;
 320
 321         # Get the last import timestamps
 322         open my $B,"<", "$git_dir/svn2git";
 323         while(<$B>) {
 324                 chomp;
 325                 my($num,$branch,$ref) = split;
 326                 $branches{$branch}{$num} = $ref;
 327                 $branches{$branch}{"LAST"} = $ref;
 328                 $current_rev = $num+1 if $current_rev <= $num;
 329         }
 330         close($B);
 331 }
 332 -d $git_dir
 333         or die "Could not create git subdir ($git_dir).\n";
 334
 335 my $default_authors = "$git_dir/svn-authors";
 336 if ($opt_A) {
 337         read_users($opt_A);
 338         copy($opt_A,$default_authors) or die "Copy failed: $!";
 339 } else {
 340         read_users($default_authors) if -f $default_authors;
 341 }
 342
 343 open BRANCHES,">>", "$git_dir/svn2git";
 344
 345 sub node_kind($$$) {
 346         my ($branch, $path, $revision) = @_;
 347         my $pool=SVN::Pool->new;
 348         my $kind = $svn->{'svn'}->check_path(revert_split_path($branch,$path),$revision,$pool);
 349         $pool->clear;
 350         return $kind;
 351 }
 352
 353 sub revert_split_path($$) {
 354         my($branch,$path) = @_;
 355
 356         my $svnpath;
 357         $path = "" if $path eq "/"; # this should not happen, but ...
 358         if($branch eq "/") {
 359                 $svnpath = "$trunk_name/$path";
 360         } elsif($branch =~ m#^/#) {
 361                 $svnpath = "$tag_name$branch/$path";
 362         } else {
 363                 $svnpath = "$branch_name/$branch/$path";
 364         }
 365
 366         $svnpath =~ s#/+$##;
 367         return $svnpath;
 368 }
 369
 370 sub get_file($$$) {
 371         my($rev,$branch,$path) = @_;
 372
 373         my $svnpath = revert_split_path($branch,$path);
 374
 375         # now get it
 376         my ($name,$mode);
 377         if($opt_d) {
 378                 my($req,$res);
 379
 380                 # /svn/!svn/bc/2/django/trunk/django-docs/build.py
 381                 my $url=$svn_url->clone();
 382                 $url->path($url->path."/!svn/bc/$rev/$svn_dir$svnpath");
 383                 print "... $path...\n" if $opt_v;
 384                 $req = HTTP::Request->new(GET => $url);
 385                 $res = $lwp_ua->request($req);
 386                 if ($res->is_success) {
 387                         my $fh;
 388                         ($fh, $name) = tempfile('gitsvn.XXXXXX',
 389                         DIR => File::Spec->tmpdir(), UNLINK => 1);
 390                         print $fh $res->content;
 391                         close($fh) or die "Could not write $name: $!\n";
 392                 } else {
 393                         return undef if $res->code == 301; # directory?
 394                         die $res->status_line." at $url\n";
 395                 }
 396                 $mode = '0644'; # can't obtain mode via direct http request?
 397         } else {
 398                 ($name,$mode) = $svn->file("$svnpath",$rev);
 399                 return undef unless defined $name;
 400         }
 401
 402         my $pid = open(my $F, '-|');
 403         die $! unless defined $pid;
 404         if (!$pid) {
 405             exec("git-hash-object", "-w", $name)
 406                 or die "Cannot create object: $!\n";
 407         }
 408         my $sha = <$F>;
 409         chomp $sha;
 410         close $F;
 411         unlink $name;
 412         return [$mode, $sha, $path];
 413 }
 414
 415 sub get_ignore($$$$$) {
 416         my($new,$old,$rev,$branch,$path) = @_;
 417
 418         return unless $opt_I;
 419         my $svnpath = revert_split_path($branch,$path);
 420         my $name = $svn->ignore("$svnpath",$rev);
 421         if ($path eq '/') {
 422                 $path = $opt_I;
 423         } else {
 424                 $path = File::Spec->catfile($path,$opt_I);
 425         }
 426         if (defined $name) {
 427                 my $pid = open(my $F, '-|');
 428                 die $! unless defined $pid;
 429                 if (!$pid) {
 430                         exec("git-hash-object", "-w", $name)
 431                             or die "Cannot create object: $!\n";
 432                 }
 433                 my $sha = <$F>;
 434                 chomp $sha;
 435                 close $F;
 436                 unlink $name;
 437                 push(@$new,['0644',$sha,$path]);
 438         } else {
 439                 push(@$old,$path);
 440         }
 441 }
 442
 443 sub split_path($$) {
 444         my($rev,$path) = @_;
 445         my $branch;
 446
 447         if($path =~ s#^/\Q$tag_name\E/([^/]+)/?##) {
 448                 $branch = "/$1";
 449         } elsif($path =~ s#^/\Q$trunk_name\E/?##) {
 450                 $branch = "/";
 451         } elsif($path =~ s#^/\Q$branch_name\E/([^/]+)/?##) {
 452                 $branch = $1;
 453         } else {
 454                 my %no_error = (
 455                         "/" => 1,
 456                         "/$tag_name" => 1,
 457                         "/$branch_name" => 1
 458                 );
 459                 print STDERR "$rev: Unrecognized path: $path\n" unless (defined $no_error{$path});
 460                 return ()
 461         }
 462         $path = "/" if $path eq "";
 463         return ($branch,$path);
 464 }
 465
 466 sub branch_rev($$) {
 467
 468         my ($srcbranch,$uptorev) = @_;
 469
 470         my $bbranches = $branches{$srcbranch};
 471         my @revs = reverse sort { ($a eq 'LAST' ? 0 : $a) <=> ($b eq 'LAST' ? 0 : $b) } keys %$bbranches;
 472         my $therev;
 473         foreach my $arev(@revs) {
 474                 next if  ($arev eq 'LAST');
 475                 if ($arev <= $uptorev) {
 476                         $therev = $arev;
 477                         last;
 478                 }
 479         }
 480         return $therev;
 481 }
 482
 483 sub copy_path($$$$$$$$) {
 484         # Somebody copied a whole subdirectory.
 485         # We need to find the index entries from the old version which the
 486         # SVN log entry points to, and add them to the new place.
 487
 488         my($newrev,$newbranch,$path,$oldpath,$rev,$node_kind,$new,$parents) = @_;
 489
 490         my($srcbranch,$srcpath) = split_path($rev,$oldpath);
 491         unless(defined $srcbranch) {
 492                 print "Path not found when copying from $oldpath @ $rev\n";
 493                 return;
 494         }
 495         my $therev = branch_rev($srcbranch, $rev);
 496         my $gitrev = $branches{$srcbranch}{$therev};
 497         unless($gitrev) {
 498                 print STDERR "$newrev:$newbranch: could not find $oldpath \@ $rev\n";
 499                 return;
 500         }
 501         if ($srcbranch ne $newbranch) {
 502                 push(@$parents, $branches{$srcbranch}{'LAST'});
 503         }
 504         print "$newrev:$newbranch:$path: copying from $srcbranch:$srcpath @ $rev\n" if $opt_v;
 505         if ($node_kind eq $SVN::Node::dir) {
 506                         $srcpath =~ s#/*$#/#;
 507         }
 508
 509         my $pid = open my $f,'-|';
 510         die $! unless defined $pid;
 511         if (!$pid) {
 512                 exec("git-ls-tree","-r","-z",$gitrev,$srcpath)
 513                         or die $!;
 514         }
 515         local $/ = "\0";
 516         while(<$f>) {
 517                 chomp;
 518                 my($m,$p) = split(/\t/,$_,2);
 519                 my($mode,$type,$sha1) = split(/ /,$m);
 520                 next if $type ne "blob";
 521                 if ($node_kind eq $SVN::Node::dir) {
 522                         $p = $path . substr($p,length($srcpath)-1);
 523                 } else {
 524                         $p = $path;
 525                 }
 526                 push(@$new,[$mode,$sha1,$p]);
 527         }
 528         close($f) or
 529                 print STDERR "$newrev:$newbranch: could not list files in $oldpath \@ $rev\n";
 530 }
 531
 532 sub commit {
 533         my($branch, $changed_paths, $revision, $author, $date, $message) = @_;
 534         my($committer_name,$committer_email,$dest);
 535         my($author_name,$author_email);
 536         my(@old,@new,@parents);
 537
 538         if (not defined $author or $author eq "") {
 539                 $committer_name = $committer_email = "unknown";
 540         } elsif (defined $users_file) {
 541                 die "User $author is not listed in $users_file\n"
 542                     unless exists $users{$author};
 543                 ($committer_name,$committer_email) = @{$users{$author}};
 544         } elsif ($author =~ /^(.*?)\s+<(.*)>$/) {
 545                 ($committer_name, $committer_email) = ($1, $2);
 546         } else {
 547                 $author =~ s/^<(.*)>$/$1/;
 548                 $committer_name = $committer_email = $author;
 549         }
 550
 551         if ($opt_F && $message =~ /From:\s+(.*?)\s+<(.*)>\s*\n/) {
 552                 ($author_name, $author_email) = ($1, $2);
 553                 print "Author from From: $1 <$2>\n" if ($opt_v);;
 554         } elsif ($opt_S && $message =~ /Signed-off-by:\s+(.*?)\s+<(.*)>\s*\n/) {
 555                 ($author_name, $author_email) = ($1, $2);
 556                 print "Author from Signed-off-by: $1 <$2>\n" if ($opt_v);;
 557         } else {
 558                 $author_name = $committer_name;
 559                 $author_email = $committer_email;
 560         }
 561
 562         $date = pdate($date);
 563
 564         my $tag;
 565         my $parent;
 566         if($branch eq "/") { # trunk
 567                 $parent = $opt_o;
 568         } elsif($branch =~ m#^/(.+)#) { # tag
 569                 $tag = 1;
 570                 $parent = $1;
 571         } else { # "normal" branch
 572                 # nothing to do
 573                 $parent = $branch;
 574         }
 575         $dest = $parent;
 576
 577         my $prev = $changed_paths->{"/"};
 578         if($prev and $prev->[0] eq "A") {
 579                 delete $changed_paths->{"/"};
 580                 my $oldpath = $prev->[1];
 581                 my $rev;
 582                 if(defined $oldpath) {
 583                         my $p;
 584                         ($parent,$p) = split_path($revision,$oldpath);
 585                         if($parent eq "/") {
 586                                 $parent = $opt_o;
 587                         } else {
 588                                 $parent =~ s#^/##; # if it's a tag
 589                         }
 590                 } else {
 591                         $parent = undef;
 592                 }
 593         }
 594
 595         my $rev;
 596         if($revision > $opt_s and defined $parent) {
 597                 open(H,"git-rev-parse --verify $parent |");
 598                 $rev = <H>;
 599                 close(H) or do {
 600                         print STDERR "$revision: cannot find commit '$parent'!\n";
 601                         return;
 602                 };
 603                 chop $rev;
 604                 if(length($rev) != 40) {
 605                         print STDERR "$revision: cannot find commit '$parent'!\n";
 606                         return;
 607                 }
 608                 $rev = $branches{($parent eq $opt_o) ? "/" : $parent}{"LAST"};
 609                 if($revision != $opt_s and not $rev) {
 610                         print STDERR "$revision: do not know ancestor for '$parent'!\n";
 611                         return;
 612                 }
 613         } else {
 614                 $rev = undef;
 615         }
 616
 617 #       if($prev and $prev->[0] eq "A") {
 618 #               if(not $tag) {
 619 #                       unless(open(H,"> $git_dir/refs/heads/$branch")) {
 620 #                               print STDERR "$revision: Could not create branch $branch: $!\n";
 621 #                               $state=11;
 622 #                               next;
 623 #                       }
 624 #                       print H "$rev\n"
 625 #                               or die "Could not write branch $branch: $!";
 626 #                       close(H)
 627 #                               or die "Could not write branch $branch: $!";
 628 #               }
 629 #       }
 630         if(not defined $rev) {
 631                 unlink($git_index);
 632         } elsif ($rev ne $last_rev) {
 633                 print "Switching from $last_rev to $rev ($branch)\n" if $opt_v;
 634                 system("git-read-tree", $rev);
 635                 die "read-tree failed for $rev: $?\n" if $?;
 636                 $last_rev = $rev;
 637         }
 638
 639         push (@parents, $rev) if defined $rev;
 640
 641         my $cid;
 642         if($tag and not %$changed_paths) {
 643                 $cid = $rev;
 644         } else {
 645                 my @paths = sort keys %$changed_paths;
 646                 foreach my $path(@paths) {
 647                         my $action = $changed_paths->{$path};
 648
 649                         if ($action->[0] eq "R") {
 650                                 # refer to a file/tree in an earlier commit
 651                                 push(@old,$path); # remove any old stuff
 652                         }
 653                         if(($action->[0] eq "A") || ($action->[0] eq "R")) {
 654                                 my $node_kind = node_kind($branch,$path,$revision);
 655                                 if ($node_kind eq $SVN::Node::file) {
 656                                         my $f = get_file($revision,$branch,$path);
 657                                         if ($f) {
 658                                                 push(@new,$f) if $f;
 659                                         } else {
 660                                                 my $opath = $action->[3];
 661                                                 print STDERR "$revision: $branch: could not fetch '$opath'\n";
 662                                         }
 663                                 } elsif ($node_kind eq $SVN::Node::dir) {
 664                                         if($action->[1]) {
 665                                                 copy_path($revision, $branch,
 666                                                           $path, $action->[1],
 667                                                           $action->[2], $node_kind,
 668                                                           \@new, \@parents);
 669                                         } else {
 670                                                 get_ignore(\@new, \@old, $revision,
 671                                                            $branch, $path);
 672                                         }
 673                                 }
 674                         } elsif ($action->[0] eq "D") {
 675                                 push(@old,$path);
 676                         } elsif ($action->[0] eq "M") {
 677                                 my $node_kind = node_kind($branch,$path,$revision);
 678                                 if ($node_kind eq $SVN::Node::file) {
 679                                         my $f = get_file($revision,$branch,$path);
 680                                         push(@new,$f) if $f;
 681                                 } elsif ($node_kind eq $SVN::Node::dir) {
 682                                         get_ignore(\@new, \@old, $revision,
 683                                                    $branch,$path);
 684                                 }
 685                         } else {
 686                                 die "$revision: unknown action '".$action->[0]."' for $path\n";
 687                         }
 688                 }
 689
 690                 while(@old) {
 691                         my @o1;
 692                         if(@old > 55) {
 693                                 @o1 = splice(@old,0,50);
 694                         } else {
 695                                 @o1 = @old;
 696                                 @old = ();
 697                         }
 698                         my $pid = open my $F, "-|";
 699                         die "$!" unless defined $pid;
 700                         if (!$pid) {
 701                                 exec("git-ls-files", "-z", @o1) or die $!;
 702                         }
 703                         @o1 = ();
 704                         local $/ = "\0";
 705                         while(<$F>) {
 706                                 chomp;
 707                                 push(@o1,$_);
 708                         }
 709                         close($F);
 710
 711                         while(@o1) {
 712                                 my @o2;
 713                                 if(@o1 > 55) {
 714                                         @o2 = splice(@o1,0,50);
 715                                 } else {
 716                                         @o2 = @o1;
 717                                         @o1 = ();
 718                                 }
 719                                 system("git-update-index","--force-remove","--",@o2);
 720                                 die "Cannot remove files: $?\n" if $?;
 721                         }
 722                 }
 723                 while(@new) {
 724                         my @n2;
 725                         if(@new > 12) {
 726                                 @n2 = splice(@new,0,10);
 727                         } else {
 728                                 @n2 = @new;
 729                                 @new = ();
 730                         }
 731                         system("git-update-index","--add",
 732                                 (map { ('--cacheinfo', @$_) } @n2));
 733                         die "Cannot add files: $?\n" if $?;
 734                 }
 735
 736                 my $pid = open(C,"-|");
 737                 die "Cannot fork: $!" unless defined $pid;
 738                 unless($pid) {
 739                         exec("git-write-tree");
 740                         die "Cannot exec git-write-tree: $!\n";
 741                 }
 742                 chomp(my $tree = <C>);
 743                 length($tree) == 40
 744                         or die "Cannot get tree id ($tree): $!\n";
 745                 close(C)
 746                         or die "Error running git-write-tree: $?\n";
 747                 print "Tree ID $tree\n" if $opt_v;
 748
 749                 my $pr = IO::Pipe->new() or die "Cannot open pipe: $!\n";
 750                 my $pw = IO::Pipe->new() or die "Cannot open pipe: $!\n";
 751                 $pid = fork();
 752                 die "Fork: $!\n" unless defined $pid;
 753                 unless($pid) {
 754                         $pr->writer();
 755                         $pw->reader();
 756                         open(OUT,">&STDOUT");
 757                         dup2($pw->fileno(),0);
 758                         dup2($pr->fileno(),1);
 759                         $pr->close();
 760                         $pw->close();
 761
 762                         my @par = ();
 763
 764                         # loose detection of merges
 765                         # based on the commit msg
 766                         foreach my $rx (@mergerx) {
 767                                 if ($message =~ $rx) {
 768                                         my $mparent = $1;
 769                                         if ($mparent eq 'HEAD') { $mparent = $opt_o };
 770                                         if ( -e "$git_dir/refs/heads/$mparent") {
 771                                                 $mparent = get_headref($mparent, $git_dir);
 772                                                 push (@parents, $mparent);
 773                                                 print OUT "Merge parent branch: $mparent\n" if $opt_v;
 774                                         }
 775                                 }
 776                         }
 777                         my %seen_parents = ();
 778                         my @unique_parents = grep { ! $seen_parents{$_} ++ } @parents;
 779                         foreach my $bparent (@unique_parents) {
 780                                 push @par, '-p', $bparent;
 781                                 print OUT "Merge parent branch: $bparent\n" if $opt_v;
 782                         }
 783
 784                         exec("env",
 785                                 "GIT_AUTHOR_NAME=$author_name",
 786                                 "GIT_AUTHOR_EMAIL=$author_email",
 787                                 "GIT_AUTHOR_DATE=".strftime("+0000 %Y-%m-%d %H:%M:%S",gmtime($date)),
 788                                 "GIT_COMMITTER_NAME=$committer_name",
 789                                 "GIT_COMMITTER_EMAIL=$committer_email",
 790                                 "GIT_COMMITTER_DATE=".strftime("+0000 %Y-%m-%d %H:%M:%S",gmtime($date)),
 791                                 "git-commit-tree", $tree,@par);
 792                         die "Cannot exec git-commit-tree: $!\n";
 793                 }
 794                 $pw->writer();
 795                 $pr->reader();
 796
 797                 $message =~ s/[\s\n]+\z//;
 798                 $message = "r$revision: $message" if $opt_r;
 799
 800                 print $pw "$message\n"
 801                         or die "Error writing to git-commit-tree: $!\n";
 802                 $pw->close();
 803
 804                 print "Committed change $revision:$branch ".strftime("%Y-%m-%d %H:%M:%S",gmtime($date)).")\n" if $opt_v;
 805                 chomp($cid = <$pr>);
 806                 length($cid) == 40
 807                         or die "Cannot get commit id ($cid): $!\n";
 808                 print "Commit ID $cid\n" if $opt_v;
 809                 $pr->close();
 810
 811                 waitpid($pid,0);
 812                 die "Error running git-commit-tree: $?\n" if $?;
 813         }
 814
 815         if (not defined $cid) {
 816                 $cid = $branches{"/"}{"LAST"};
 817         }
 818
 819         if(not defined $dest) {
 820                 print "... no known parent\n" if $opt_v;
 821         } elsif(not $tag) {
 822                 print "Writing to refs/heads/$dest\n" if $opt_v;
 823                 open(C,">$git_dir/refs/heads/$dest") and
 824                 print C ("$cid\n") and
 825                 close(C)
 826                         or die "Cannot write branch $dest for update: $!\n";
 827         }
 828
 829         if($tag) {
 830                 my($in, $out) = ('','');
 831                 $last_rev = "-" if %$changed_paths;
 832                 # the tag was 'complex', i.e. did not refer to a "real" revision
 833
 834                 $dest =~ tr/_/\./ if $opt_u;
 835                 $branch = $dest;
 836
 837                 my $pid = open2($in, $out, 'git-mktag');
 838                 print $out ("object $cid\n".
 839                     "type commit\n".
 840                     "tag $dest\n".
 841                     "tagger $committer_name <$committer_email>\n") and
 842                 close($out)
 843                     or die "Cannot create tag object $dest: $!\n";
 844
 845                 my $tagobj = <$in>;
 846                 chomp $tagobj;
 847
 848                 if ( !close($in) or waitpid($pid, 0) != $pid or
 849                                 $? != 0 or $tagobj !~ /^[0123456789abcdef]{40}$/ ) {
 850                         die "Cannot create tag object $dest: $!\n";
 851                 }
 852
 853                 open(C,">$git_dir/refs/tags/$dest") and
 854                 print C ("$tagobj\n") and
 855                 close(C)
 856                         or die "Cannot create tag $branch: $!\n";
 857
 858                 print "Created tag '$dest' on '$branch'\n" if $opt_v;
 859         }
 860         $branches{$branch}{"LAST"} = $cid;
 861         $branches{$branch}{$revision} = $cid;
 862         $last_rev = $cid;
 863         print BRANCHES "$revision $branch $cid\n";
 864         print "DONE: $revision $dest $cid\n" if $opt_v;
 865 }
 866
 867 sub commit_all {
 868         # Recursive use of the SVN connection does not work
 869         local $svn = $svn2;
 870
 871         my ($changed_paths, $revision, $author, $date, $message, $pool) = @_;
 872         my %p;
 873         while(my($path,$action) = each %$changed_paths) {
 874                 $p{$path} = [ $action->action,$action->copyfrom_path, $action->copyfrom_rev, $path ];
 875         }
 876         $changed_paths = \%p;
 877
 878         my %done;
 879         my @col;
 880         my $pref;
 881         my $branch;
 882
 883         while(my($path,$action) = each %$changed_paths) {
 884                 ($branch,$path) = split_path($revision,$path);
 885                 next if not defined $branch;
 886                 $done{$branch}{$path} = $action;
 887         }
 888         while(($branch,$changed_paths) = each %done) {
 889                 commit($branch, $changed_paths, $revision, $author, $date, $message);
 890         }
 891 }
 892
 893 $opt_l = $svn->{'maxrev'} if not defined $opt_l or $opt_l > $svn->{'maxrev'};
 894
 895 if ($opt_l < $current_rev) {
 896     print "Up to date: no new revisions to fetch!\n" if $opt_v;
 897     unlink("$git_dir/SVN2GIT_HEAD");
 898     exit;
 899 }
 900
 901 print "Fetching from $current_rev to $opt_l ...\n" if $opt_v;
 902
 903 my $pool=SVN::Pool->new;
 904 $svn->{'svn'}->get_log("/",$current_rev,$opt_l,0,1,1,\&commit_all,$pool);
 905 $pool->clear;
 906
 907
 908 unlink($git_index);
 909
 910 if (defined $orig_git_index) {
 911         $ENV{GIT_INDEX_FILE} = $orig_git_index;
 912 } else {
 913         delete $ENV{GIT_INDEX_FILE};
 914 }
 915
 916 # Now switch back to the branch we were in before all of this happened
 917 if($orig_branch) {
 918         print "DONE\n" if $opt_v and (not defined $opt_l or $opt_l > 0);
 919         system("cp","$git_dir/refs/heads/$opt_o","$git_dir/refs/heads/master")
 920                 if $forward_master;
 921         unless ($opt_i) {
 922                 system('git-read-tree', '-m', '-u', 'SVN2GIT_HEAD', 'HEAD');
 923                 die "read-tree failed: $?\n" if $?;
 924         }
 925 } else {
 926         $orig_branch = "master";
 927         print "DONE; creating $orig_branch branch\n" if $opt_v and (not defined $opt_l or $opt_l > 0);
 928         system("cp","$git_dir/refs/heads/$opt_o","$git_dir/refs/heads/master")
 929                 unless -f "$git_dir/refs/heads/master";
 930         system('git-update-ref', 'HEAD', "$orig_branch");
 931         unless ($opt_i) {
 932                 system('git checkout');
 933                 die "checkout failed: $?\n" if $?;
 934         }
 935 }
 936 unlink("$git_dir/SVN2GIT_HEAD");
 937 close(BRANCHES);