83b70f9bb8451e557dedd07f5ee507502123e7f7
   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
  13require 5.008; # for shell-safe open("-|",LIST)
  14use strict;
  15use warnings;
  16use Getopt::Std;
  17use File::Spec;
  18use File::Temp qw(tempfile);
  19use File::Path qw(mkpath);
  20use File::Basename qw(basename dirname);
  21use Time::Local;
  22use IO::Pipe;
  23use POSIX qw(strftime dup2);
  24use IPC::Open2;
  25use SVN::Core;
  26use SVN::Ra;
  27
  28die "Need CVN:Core 1.2.1 or better" if $SVN::Core::VERSION lt "1.2.1";
  29
  30$SIG{'PIPE'}="IGNORE";
  31$ENV{'TZ'}="UTC";
  32
  33our($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);
  34
  35sub usage() {
  36        print STDERR <<END;
  37Usage: ${\basename $0}     # fetch/update GIT from CVS
  38       [-o branch-for-HEAD] [-h] [-v] [-l max_num_changes]
  39       [-C GIT_repository] [-t tagname] [-T trunkname] [-b branchname]
  40       [-d|-D] [-i] [-u] [-s start_chg] [-m] [-M regex] [SVN_URL]
  41END
  42        exit(1);
  43}
  44
  45getopts("b:C:dDhil:mM:o:s:t:T:uv") or usage();
  46usage if $opt_h;
  47
  48my $tag_name = $opt_t || "tags";
  49my $trunk_name = $opt_T || "trunk";
  50my $branch_name = $opt_b || "branches";
  51
  52@ARGV == 1 or @ARGV == 2 or usage();
  53
  54$opt_o ||= "origin";
  55$opt_s ||= 1;
  56$opt_l = 100 unless defined $opt_l;
  57my $git_tree = $opt_C;
  58$git_tree ||= ".";
  59
  60my $svn_url = $ARGV[0];
  61my $svn_dir = $ARGV[1];
  62
  63our @mergerx = ();
  64if ($opt_m) {
  65        @mergerx = ( qr/\W(?:from|of|merge|merging|merged) (\w+)/i );
  66}
  67if ($opt_M) {
  68        push (@mergerx, qr/$opt_M/);
  69}
  70
  71select(STDERR); $|=1; select(STDOUT);
  72
  73
  74package SVNconn;
  75# Basic SVN connection.
  76# We're only interested in connecting and downloading, so ...
  77
  78use File::Spec;
  79use File::Temp qw(tempfile);
  80use POSIX qw(strftime dup2);
  81
  82sub new {
  83        my($what,$repo) = @_;
  84        $what=ref($what) if ref($what);
  85
  86        my $self = {};
  87        $self->{'buffer'} = "";
  88        bless($self,$what);
  89
  90        $repo =~ s#/+$##;
  91        $self->{'fullrep'} = $repo;
  92        $self->conn();
  93
  94        return $self;
  95}
  96
  97sub conn {
  98        my $self = shift;
  99        my $repo = $self->{'fullrep'};
 100        my $s = SVN::Ra->new($repo);
 101
 102        die "SVN connection to $repo: $!\n" unless defined $s;
 103        $self->{'svn'} = $s;
 104        $self->{'repo'} = $repo;
 105        $self->{'maxrev'} = $s->get_latest_revnum();
 106}
 107
 108sub file {
 109        my($self,$path,$rev) = @_;
 110
 111        my ($fh, $name) = tempfile('gitsvn.XXXXXX',
 112                    DIR => File::Spec->tmpdir(), UNLINK => 1);
 113
 114        print "... $rev $path ...\n" if $opt_v;
 115        my $pool = SVN::Pool->new();
 116        eval { $self->{'svn'}->get_file($path,$rev,$fh,$pool); };
 117        $pool->clear;
 118        if($@) {
 119                return undef if $@ =~ /Attempted to get checksum/;
 120                die $@;
 121        }
 122        close ($fh);
 123
 124        return $name;
 125}
 126
 127package main;
 128use URI;
 129
 130my $svn = $svn_url;
 131$svn .= "/$svn_dir" if defined $svn_dir;
 132$svn = SVNconn->new($svn);
 133
 134my $lwp_ua;
 135if($opt_d or $opt_D) {
 136        $svn_url = URI->new($svn_url)->canonical;
 137        if($opt_D) {
 138                $svn_dir =~ s#/*$#/#;
 139        } else {
 140                $svn_dir = "";
 141        }
 142        if ($svn_url->scheme eq "http") {
 143                use LWP::UserAgent;
 144                $lwp_ua = LWP::UserAgent->new(keep_alive => 1, requests_redirectable => []);
 145        } else {
 146                print STDERR "Warning: not HTTP; turning off direct file access\n";
 147                $opt_d=0;
 148        }
 149}
 150
 151sub pdate($) {
 152        my($d) = @_;
 153        $d =~ m#(\d\d\d\d)-(\d\d)-(\d\d)T(\d\d):(\d\d):(\d\d)#
 154                or die "Unparseable date: $d\n";
 155        my $y=$1; $y-=1900 if $y>1900;
 156        return timegm($6||0,$5,$4,$3,$2-1,$y);
 157}
 158
 159sub getwd() {
 160        my $pwd = `pwd`;
 161        chomp $pwd;
 162        return $pwd;
 163}
 164
 165
 166sub get_headref($$) {
 167    my $name    = shift;
 168    my $git_dir = shift;
 169    my $sha;
 170
 171    if (open(C,"$git_dir/refs/heads/$name")) {
 172        chomp($sha = <C>);
 173        close(C);
 174        length($sha) == 40
 175            or die "Cannot get head id for $name ($sha): $!\n";
 176    }
 177    return $sha;
 178}
 179
 180
 181-d $git_tree
 182        or mkdir($git_tree,0777)
 183        or die "Could not create $git_tree: $!";
 184chdir($git_tree);
 185
 186my $orig_branch = "";
 187my $forward_master = 0;
 188my %branches;
 189
 190my $git_dir = $ENV{"GIT_DIR"} || ".git";
 191$git_dir = getwd()."/".$git_dir unless $git_dir =~ m#^/#;
 192$ENV{"GIT_DIR"} = $git_dir;
 193my $orig_git_index;
 194$orig_git_index = $ENV{GIT_INDEX_FILE} if exists $ENV{GIT_INDEX_FILE};
 195my ($git_ih, $git_index) = tempfile('gitXXXXXX', SUFFIX => '.idx',
 196                                    DIR => File::Spec->tmpdir());
 197close ($git_ih);
 198$ENV{GIT_INDEX_FILE} = $git_index;
 199my $maxnum = 0;
 200my $last_rev = "";
 201my $last_branch;
 202my $current_rev = $opt_s-1;
 203unless(-d $git_dir) {
 204        system("git-init-db");
 205        die "Cannot init the GIT db at $git_tree: $?\n" if $?;
 206        system("git-read-tree");
 207        die "Cannot init an empty tree: $?\n" if $?;
 208
 209        $last_branch = $opt_o;
 210        $orig_branch = "";
 211} else {
 212        -f "$git_dir/refs/heads/$opt_o"
 213                or die "Branch '$opt_o' does not exist.\n".
 214                       "Either use the correct '-o branch' option,\n".
 215                       "or import to a new repository.\n";
 216
 217        -f "$git_dir/svn2git"
 218                or die "'$git_dir/svn2git' does not exist.\n".
 219                       "You need that file for incremental imports.\n";
 220        $last_branch = basename(readlink("$git_dir/HEAD"));
 221        unless($last_branch) {
 222                warn "Cannot read the last branch name: $! -- assuming 'master'\n";
 223                $last_branch = "master";
 224        }
 225        $orig_branch = $last_branch;
 226        $last_rev = get_headref($orig_branch, $git_dir);
 227        if (-f "$git_dir/SVN2GIT_HEAD") {
 228                die <<EOM;
 229SVN2GIT_HEAD exists.
 230Make sure your working directory corresponds to HEAD and remove SVN2GIT_HEAD.
 231You may need to run
 232
 233    git-read-tree -m -u SVN2GIT_HEAD HEAD
 234EOM
 235        }
 236        system('cp', "$git_dir/HEAD", "$git_dir/SVN2GIT_HEAD");
 237
 238        $forward_master =
 239            $opt_o ne 'master' && -f "$git_dir/refs/heads/master" &&
 240            system('cmp', '-s', "$git_dir/refs/heads/master",
 241                                "$git_dir/refs/heads/$opt_o") == 0;
 242
 243        # populate index
 244        system('git-read-tree', $last_rev);
 245        die "read-tree failed: $?\n" if $?;
 246
 247        # Get the last import timestamps
 248        open my $B,"<", "$git_dir/svn2git";
 249        while(<$B>) {
 250                chomp;
 251                my($num,$branch,$ref) = split;
 252                $branches{$branch}{$num} = $ref;
 253                $branches{$branch}{"LAST"} = $ref;
 254                $current_rev = $num if $current_rev < $num;
 255        }
 256        close($B);
 257}
 258-d $git_dir
 259        or die "Could not create git subdir ($git_dir).\n";
 260
 261open BRANCHES,">>", "$git_dir/svn2git";
 262
 263sub node_kind($$$) {
 264        my ($branch, $path, $revision) = @_;
 265        my $pool=SVN::Pool->new;
 266        my $kind = $svn->{'svn'}->check_path(revert_split_path($branch,$path),$revision,$pool);
 267        $pool->clear;
 268        return $kind;
 269}
 270
 271sub revert_split_path($$) {
 272        my($branch,$path) = @_;
 273
 274        my $svnpath;
 275        $path = "" if $path eq "/"; # this should not happen, but ...
 276        if($branch eq "/") {
 277                $svnpath = "$trunk_name/$path";
 278        } elsif($branch =~ m#^/#) {
 279                $svnpath = "$tag_name$branch/$path";
 280        } else {
 281                $svnpath = "$branch_name/$branch/$path";
 282        }
 283
 284        return $svnpath
 285}
 286
 287sub get_file($$$) {
 288        my($rev,$branch,$path) = @_;
 289
 290        my $svnpath = revert_split_path($branch,$path);
 291
 292        # now get it
 293        my $name;
 294        if($opt_d) {
 295                my($req,$res);
 296
 297                # /svn/!svn/bc/2/django/trunk/django-docs/build.py
 298                my $url=$svn_url->clone();
 299                $url->path($url->path."/!svn/bc/$rev/$svn_dir$svnpath");
 300                print "... $path...\n" if $opt_v;
 301                $req = HTTP::Request->new(GET => $url);
 302                $res = $lwp_ua->request($req);
 303                if ($res->is_success) {
 304                        my $fh;
 305                        ($fh, $name) = tempfile('gitsvn.XXXXXX',
 306                        DIR => File::Spec->tmpdir(), UNLINK => 1);
 307                        print $fh $res->content;
 308                        close($fh) or die "Could not write $name: $!\n";
 309                } else {
 310                        return undef if $res->code == 301; # directory?
 311                        die $res->status_line." at $url\n";
 312                }
 313        } else {
 314                $name = $svn->file("/$svnpath",$rev);
 315                return undef unless defined $name;
 316        }
 317
 318        open my $F, '-|', "git-hash-object", "-w", $name
 319                or die "Cannot create object: $!\n";
 320        my $sha = <$F>;
 321        chomp $sha;
 322        close $F;
 323        unlink $name;
 324        my $mode = "0644"; # SV does not seem to store any file modes
 325        return [$mode, $sha, $path];
 326}
 327
 328sub split_path($$) {
 329        my($rev,$path) = @_;
 330        my $branch;
 331
 332        if($path =~ s#^/\Q$tag_name\E/([^/]+)/?##) {
 333                $branch = "/$1";
 334        } elsif($path =~ s#^/\Q$trunk_name\E/?##) {
 335                $branch = "/";
 336        } elsif($path =~ s#^/\Q$branch_name\E/([^/]+)/?##) {
 337                $branch = $1;
 338        } else {
 339                print STDERR "$rev: Unrecognized path: $path\n";
 340                return ()
 341        }
 342        $path = "/" if $path eq "";
 343        return ($branch,$path);
 344}
 345
 346sub copy_subdir($$$$$$) {
 347        # Somebody copied a whole subdirectory.
 348        # We need to find the index entries from the old version which the
 349        # SVN log entry points to, and add them to the new place.
 350
 351        my($newrev,$newbranch,$path,$oldpath,$rev,$new) = @_;
 352        my($branch,$srcpath) = split_path($rev,$oldpath);
 353
 354        my $gitrev = $branches{$branch}{$rev};
 355        unless($gitrev) {
 356                print STDERR "$newrev:$newbranch: could not find $oldpath \@ $rev\n";
 357                return;
 358        }
 359        print "$newrev:$newbranch:$path: copying from $branch:$srcpath @ $rev\n" if $opt_v;
 360        $srcpath =~ s#/*$#/#;
 361        open my $f,"-|","git-ls-tree","-r","-z",$gitrev,$srcpath;
 362        local $/ = "\0";
 363        while(<$f>) {
 364                chomp;
 365                my($m,$p) = split(/\t/,$_,2);
 366                my($mode,$type,$sha1) = split(/ /,$m);
 367                next if $type ne "blob";
 368                $p = substr($p,length($srcpath)-1);
 369                print "... found $path$p ...\n" if $opt_v;
 370                push(@$new,[$mode,$sha1,$path.$p]);
 371        }
 372        close($f) or
 373                print STDERR "$newrev:$newbranch: could not list files in $oldpath \@ $rev\n";
 374}
 375
 376sub commit {
 377        my($branch, $changed_paths, $revision, $author, $date, $message) = @_;
 378        my($author_name,$author_email,$dest);
 379        my(@old,@new);
 380
 381        if (not defined $author) {
 382                $author_name = $author_email = "unknown";
 383        } elsif ($author =~ /^(.*?)\s+<(.*)>$/) {
 384                ($author_name, $author_email) = ($1, $2);
 385        } else {
 386                $author =~ s/^<(.*)>$/$1/;
 387                $author_name = $author_email = $author;
 388        }
 389        $date = pdate($date);
 390
 391        my $tag;
 392        my $parent;
 393        if($branch eq "/") { # trunk
 394                $parent = $opt_o;
 395        } elsif($branch =~ m#^/(.+)#) { # tag
 396                $tag = 1;
 397                $parent = $1;
 398        } else { # "normal" branch
 399                # nothing to do
 400                $parent = $branch;
 401        }
 402        $dest = $parent;
 403
 404        my $prev = $changed_paths->{"/"};
 405        if($prev and $prev->[0] eq "A") {
 406                delete $changed_paths->{"/"};
 407                my $oldpath = $prev->[1];
 408                my $rev;
 409                if(defined $oldpath) {
 410                        my $p;
 411                        ($parent,$p) = split_path($revision,$oldpath);
 412                        if($parent eq "/") {
 413                                $parent = $opt_o;
 414                        } else {
 415                                $parent =~ s#^/##; # if it's a tag
 416                        }
 417                } else {
 418                        $parent = undef;
 419                }
 420        }
 421
 422        my $rev;
 423        if($revision > $opt_s and defined $parent) {
 424                open(H,"git-rev-parse --verify $parent |");
 425                $rev = <H>;
 426                close(H) or do {
 427                        print STDERR "$revision: cannot find commit '$parent'!\n";
 428                        return;
 429                };
 430                chop $rev;
 431                if(length($rev) != 40) {
 432                        print STDERR "$revision: cannot find commit '$parent'!\n";
 433                        return;
 434                }
 435                $rev = $branches{($parent eq $opt_o) ? "/" : $parent}{"LAST"};
 436                if($revision != $opt_s and not $rev) {
 437                        print STDERR "$revision: do not know ancestor for '$parent'!\n";
 438                        return;
 439                }
 440        } else {
 441                $rev = undef;
 442        }
 443
 444#       if($prev and $prev->[0] eq "A") {
 445#               if(not $tag) {
 446#                       unless(open(H,"> $git_dir/refs/heads/$branch")) {
 447#                               print STDERR "$revision: Could not create branch $branch: $!\n";
 448#                               $state=11;
 449#                               next;
 450#                       }
 451#                       print H "$rev\n"
 452#                               or die "Could not write branch $branch: $!";
 453#                       close(H)
 454#                               or die "Could not write branch $branch: $!";
 455#               }
 456#       }
 457        if(not defined $rev) {
 458                unlink($git_index);
 459        } elsif ($rev ne $last_rev) {
 460                print "Switching from $last_rev to $rev ($branch)\n" if $opt_v;
 461                system("git-read-tree", $rev);
 462                die "read-tree failed for $rev: $?\n" if $?;
 463                $last_rev = $rev;
 464        }
 465
 466        my $cid;
 467        if($tag and not %$changed_paths) {
 468                $cid = $rev;
 469        } else {
 470                my @paths = sort keys %$changed_paths;
 471                foreach my $path(@paths) {
 472                        my $action = $changed_paths->{$path};
 473
 474                        if ($action->[0] eq "A") {
 475                                my $f = get_file($revision,$branch,$path);
 476                                if($f) {
 477                                        push(@new,$f) if $f;
 478                                } elsif($action->[1]) {
 479                                        copy_subdir($revision,$branch,$path,$action->[1],$action->[2],\@new);
 480                                } else {
 481                                        my $opath = $action->[3];
 482                                        print STDERR "$revision: $branch: could not fetch '$opath'\n";
 483                                }
 484                        } elsif ($action->[0] eq "D") {
 485                                push(@old,$path);
 486                        } elsif ($action->[0] eq "M") {
 487                                my $f = get_file($revision,$branch,$path);
 488                                push(@new,$f) if $f;
 489                        } elsif ($action->[0] eq "R") {
 490                                # refer to a file/tree in an earlier commit
 491                                push(@old,$path); # remove any old stuff
 492
 493                                # ... and add any new stuff
 494                                my($b,$srcpath) = split_path($revision,$action->[1]);
 495                                $srcpath =~ s#/*$#/#;
 496                                open my $F,"-|","git-ls-tree","-r","-z", $branches{$b}{$action->[2]}, $srcpath;
 497                                local $/ = "\0";
 498                                while(<$F>) {
 499                                        chomp;
 500                                        my($m,$p) = split(/\t/,$_,2);
 501                                        my($mode,$type,$sha1) = split(/ /,$m);
 502                                        next if $type ne "blob";
 503                                        $p = substr($p,length($srcpath)-1);
 504                                        push(@new,[$mode,$sha1,$path.$p]);
 505                                }
 506                                close($F);
 507                        } else {
 508                                die "$revision: unknown action '".$action->[0]."' for $path\n";
 509                        }
 510                }
 511
 512                if(@old) {
 513                        open my $F, "-|", "git-ls-files", "-z", @old or die $!;
 514                        @old = ();
 515                        local $/ = "\0";
 516                        while(<$F>) {
 517                                chomp;
 518                                push(@old,$_);
 519                        }
 520                        close($F);
 521
 522                        while(@old) {
 523                                my @o2;
 524                                if(@old > 55) {
 525                                        @o2 = splice(@old,0,50);
 526                                } else {
 527                                        @o2 = @old;
 528                                        @old = ();
 529                                }
 530                                system("git-update-index","--force-remove","--",@o2);
 531                                die "Cannot remove files: $?\n" if $?;
 532                        }
 533                }
 534                while(@new) {
 535                        my @n2;
 536                        if(@new > 12) {
 537                                @n2 = splice(@new,0,10);
 538                        } else {
 539                                @n2 = @new;
 540                                @new = ();
 541                        }
 542                        system("git-update-index","--add",
 543                                (map { ('--cacheinfo', @$_) } @n2));
 544                        die "Cannot add files: $?\n" if $?;
 545                }
 546
 547                my $pid = open(C,"-|");
 548                die "Cannot fork: $!" unless defined $pid;
 549                unless($pid) {
 550                        exec("git-write-tree");
 551                        die "Cannot exec git-write-tree: $!\n";
 552                }
 553                chomp(my $tree = <C>);
 554                length($tree) == 40
 555                        or die "Cannot get tree id ($tree): $!\n";
 556                close(C)
 557                        or die "Error running git-write-tree: $?\n";
 558                print "Tree ID $tree\n" if $opt_v;
 559
 560                my $pr = IO::Pipe->new() or die "Cannot open pipe: $!\n";
 561                my $pw = IO::Pipe->new() or die "Cannot open pipe: $!\n";
 562                $pid = fork();
 563                die "Fork: $!\n" unless defined $pid;
 564                unless($pid) {
 565                        $pr->writer();
 566                        $pw->reader();
 567                        open(OUT,">&STDOUT");
 568                        dup2($pw->fileno(),0);
 569                        dup2($pr->fileno(),1);
 570                        $pr->close();
 571                        $pw->close();
 572
 573                        my @par = ();
 574                        @par = ("-p",$rev) if defined $rev;
 575
 576                        # loose detection of merges
 577                        # based on the commit msg
 578                        foreach my $rx (@mergerx) {
 579                                if ($message =~ $rx) {
 580                                        my $mparent = $1;
 581                                        if ($mparent eq 'HEAD') { $mparent = $opt_o };
 582                                        if ( -e "$git_dir/refs/heads/$mparent") {
 583                                                $mparent = get_headref($mparent, $git_dir);
 584                                                push @par, '-p', $mparent;
 585                                                print OUT "Merge parent branch: $mparent\n" if $opt_v;
 586                                        }
 587                                }
 588                        }
 589
 590                        exec("env",
 591                                "GIT_AUTHOR_NAME=$author_name",
 592                                "GIT_AUTHOR_EMAIL=$author_email",
 593                                "GIT_AUTHOR_DATE=".strftime("+0000 %Y-%m-%d %H:%M:%S",gmtime($date)),
 594                                "GIT_COMMITTER_NAME=$author_name",
 595                                "GIT_COMMITTER_EMAIL=$author_email",
 596                                "GIT_COMMITTER_DATE=".strftime("+0000 %Y-%m-%d %H:%M:%S",gmtime($date)),
 597                                "git-commit-tree", $tree,@par);
 598                        die "Cannot exec git-commit-tree: $!\n";
 599                }
 600                $pw->writer();
 601                $pr->reader();
 602
 603                $message =~ s/[\s\n]+\z//;
 604
 605                print $pw "$message\n"
 606                        or die "Error writing to git-commit-tree: $!\n";
 607                $pw->close();
 608
 609                print "Committed change $revision:$branch ".strftime("%Y-%m-%d %H:%M:%S",gmtime($date)).")\n" if $opt_v;
 610                chomp($cid = <$pr>);
 611                length($cid) == 40
 612                        or die "Cannot get commit id ($cid): $!\n";
 613                print "Commit ID $cid\n" if $opt_v;
 614                $pr->close();
 615
 616                waitpid($pid,0);
 617                die "Error running git-commit-tree: $?\n" if $?;
 618        }
 619
 620        if(not defined $dest) {
 621                print "... no known parent\n" if $opt_v;
 622        } elsif(not $tag) {
 623                print "Writing to refs/heads/$dest\n" if $opt_v;
 624                open(C,">$git_dir/refs/heads/$dest") and
 625                print C ("$cid\n") and
 626                close(C)
 627                        or die "Cannot write branch $dest for update: $!\n";
 628        }
 629
 630        if($tag) {
 631                my($in, $out) = ('','');
 632                $last_rev = "-" if %$changed_paths;
 633                # the tag was 'complex', i.e. did not refer to a "real" revision
 634
 635                $dest =~ tr/_/\./ if $opt_u;
 636
 637                my $pid = open2($in, $out, 'git-mktag');
 638                print $out ("object $cid\n".
 639                    "type commit\n".
 640                    "tag $dest\n".
 641                    "tagger $author_name <$author_email>\n") and
 642                close($out)
 643                    or die "Cannot create tag object $dest: $!\n";
 644
 645                my $tagobj = <$in>;
 646                chomp $tagobj;
 647
 648                if ( !close($in) or waitpid($pid, 0) != $pid or
 649                                $? != 0 or $tagobj !~ /^[0123456789abcdef]{40}$/ ) {
 650                        die "Cannot create tag object $dest: $!\n";
 651                }
 652
 653                open(C,">$git_dir/refs/tags/$dest") and
 654                print C ("$tagobj\n") and
 655                close(C)
 656                        or die "Cannot create tag $branch: $!\n";
 657
 658                print "Created tag '$dest' on '$branch'\n" if $opt_v;
 659        }
 660        $branches{$branch}{"LAST"} = $cid;
 661        $branches{$branch}{$revision} = $cid;
 662        $last_rev = $cid;
 663        print BRANCHES "$revision $branch $cid\n";
 664        print "DONE: $revision $dest $cid\n" if $opt_v;
 665}
 666
 667my ($changed_paths, $revision, $author, $date, $message, $pool) = @_;
 668sub _commit_all {
 669        ($changed_paths, $revision, $author, $date, $message, $pool) = @_;
 670        my %p;
 671        while(my($path,$action) = each %$changed_paths) {
 672                $p{$path} = [ $action->action,$action->copyfrom_path, $action->copyfrom_rev, $path ];
 673        }
 674        $changed_paths = \%p;
 675}
 676
 677sub commit_all {
 678        my %done;
 679        my @col;
 680        my $pref;
 681        my $branch;
 682
 683        while(my($path,$action) = each %$changed_paths) {
 684                ($branch,$path) = split_path($revision,$path);
 685                next if not defined $branch;
 686                $done{$branch}{$path} = $action;
 687        }
 688        while(($branch,$changed_paths) = each %done) {
 689                commit($branch, $changed_paths, $revision, $author, $date, $message);
 690        }
 691}
 692
 693while(++$current_rev <= $svn->{'maxrev'}) {
 694        my $pool=SVN::Pool->new;
 695        $svn->{'svn'}->get_log("/",$current_rev,$current_rev,1,1,1,\&_commit_all,$pool);
 696        $pool->clear;
 697        commit_all();
 698        if($opt_l and not --$opt_l) {
 699                print STDERR "Stopping, because there is a memory leak (in the SVN library).\n";
 700                print STDERR "Please repeat this command; it will continue safely\n";
 701                last;
 702        }
 703}
 704
 705
 706unlink($git_index);
 707
 708if (defined $orig_git_index) {
 709        $ENV{GIT_INDEX_FILE} = $orig_git_index;
 710} else {
 711        delete $ENV{GIT_INDEX_FILE};
 712}
 713
 714# Now switch back to the branch we were in before all of this happened
 715if($orig_branch) {
 716        print "DONE\n" if $opt_v and (not defined $opt_l or $opt_l > 0);
 717        system("cp","$git_dir/refs/heads/$opt_o","$git_dir/refs/heads/master")
 718                if $forward_master;
 719        unless ($opt_i) {
 720                system('git-read-tree', '-m', '-u', 'SVN2GIT_HEAD', 'HEAD');
 721                die "read-tree failed: $?\n" if $?;
 722        }
 723} else {
 724        $orig_branch = "master";
 725        print "DONE; creating $orig_branch branch\n" if $opt_v and (not defined $opt_l or $opt_l > 0);
 726        system("cp","$git_dir/refs/heads/$opt_o","$git_dir/refs/heads/master")
 727                unless -f "$git_dir/refs/heads/master";
 728        unlink("$git_dir/HEAD");
 729        symlink("refs/heads/$orig_branch","$git_dir/HEAD");
 730        unless ($opt_i) {
 731                system('git checkout');
 732                die "checkout failed: $?\n" if $?;
 733        }
 734}
 735unlink("$git_dir/SVN2GIT_HEAD");
 736close(BRANCHES);