git-cvsimport-script

   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 aggregate CVS check-ins into related changes.
   7 # Fortunately, "cvsps" does that for us; all we have to do is to parse
   8 # its output.
   9 #
  10 # Checking out the files is done by a single long-running CVS connection
  11 # / server process.
  12 #
  13 # The head revision is on branch "origin" by default.
  14 # You can change that with the '-o' option.
  15
  16 use strict;
  17 use warnings;
  18 use Getopt::Std;
  19 use File::Spec;
  20 use File::Temp qw(tempfile);
  21 use File::Path qw(mkpath);
  22 use File::Basename qw(basename dirname);
  23 use Time::Local;
  24 use IO::Socket;
  25 use IO::Pipe;
  26 use POSIX qw(strftime dup2);
  27
  28 $SIG{'PIPE'}="IGNORE";
  29 $ENV{'TZ'}="UTC";
  30
  31 our($opt_h,$opt_o,$opt_v,$opt_d,$opt_p,$opt_C,$opt_z);
  32
  33 sub usage() {
  34         print STDERR <<END;
  35 Usage: ${\basename $0}     # fetch/update GIT from CVS
  36        [ -o branch-for-HEAD ] [ -h ] [ -v ] [ -d CVSROOT ]
  37        [ -p opts-for-cvsps ] [ -C GIT_repository ] [ -z fuzz ]
  38        [ CVS_module ]
  39 END
  40         exit(1);
  41 }
  42
  43 getopts("hqvo:d:p:C:z:") or usage();
  44 usage if $opt_h;
  45
  46 @ARGV <= 1 or usage();
  47
  48 if($opt_d) {
  49         $ENV{"CVSROOT"} = $opt_d;
  50 } elsif(-f 'CVS/Root') {
  51         open my $f, '<', 'CVS/Root' or die 'Failed to open CVS/Root';
  52         $opt_d = <$f>;
  53         chomp $opt_d;
  54         close $f;
  55         $ENV{"CVSROOT"} = $opt_d;
  56 } elsif($ENV{"CVSROOT"}) {
  57         $opt_d = $ENV{"CVSROOT"};
  58 } else {
  59         die "CVSROOT needs to be set";
  60 }
  61 $opt_o ||= "origin";
  62 my $git_tree = $opt_C;
  63 $git_tree ||= ".";
  64
  65 my $cvs_tree;
  66 if ($#ARGV == 0) {
  67         $cvs_tree = $ARGV[0];
  68 } elsif (-f 'CVS/Repository') {
  69         open my $f, '<', 'CVS/Repository' or
  70             die 'Failed to open CVS/Repository';
  71         $cvs_tree = <$f>;
  72         chomp $cvs_tree;
  73         close $f
  74 } else {
  75         usage();
  76 }
  77
  78 select(STDERR); $|=1; select(STDOUT);
  79
  80
  81 package CVSconn;
  82 # Basic CVS dialog.
  83 # We're only interested in connecting and downloading, so ...
  84
  85 use File::Spec;
  86 use File::Temp qw(tempfile);
  87 use POSIX qw(strftime dup2);
  88
  89 sub new {
  90         my($what,$repo,$subdir) = @_;
  91         $what=ref($what) if ref($what);
  92
  93         my $self = {};
  94         $self->{'buffer'} = "";
  95         bless($self,$what);
  96
  97         $repo =~ s#/+$##;
  98         $self->{'fullrep'} = $repo;
  99         $self->conn();
 100
 101         $self->{'subdir'} = $subdir;
 102         $self->{'lines'} = undef;
 103
 104         return $self;
 105 }
 106
 107 sub conn {
 108         my $self = shift;
 109         my $repo = $self->{'fullrep'};
 110         if($repo =~ s/^:pserver:(?:(.*?)(?::(.*?))?@)?([^:\/]*)(?::(\d*))?//) {
 111                 my($user,$pass,$serv,$port) = ($1,$2,$3,$4);
 112                 $user="anonymous" unless defined $user;
 113                 my $rr2 = "-";
 114                 unless($port) {
 115                         $rr2 = ":pserver:$user\@$serv:$repo";
 116                         $port=2401;
 117                 }
 118                 my $rr = ":pserver:$user\@$serv:$port$repo";
 119
 120                 unless($pass) {
 121                         open(H,$ENV{'HOME'}."/.cvspass") and do {
 122                                 # :pserver:cvs@mea.tmt.tele.fi:/cvsroot/zmailer Ah<Z
 123                                 while(<H>) {
 124                                         chomp;
 125                                         s/^\/\d+\s+//;
 126                                         my ($w,$p) = split(/\s/,$_,2);
 127                                         if($w eq $rr or $w eq $rr2) {
 128                                                 $pass = $p;
 129                                                 last;
 130                                         }
 131                                 }
 132                         };
 133                 }
 134                 $pass="A" unless $pass;
 135
 136                 my $s = IO::Socket::INET->new(PeerHost => $serv, PeerPort => $port);
 137                 die "Socket to $serv: $!\n" unless defined $s;
 138                 $s->write("BEGIN AUTH REQUEST\n$repo\n$user\n$pass\nEND AUTH REQUEST\n")
 139                         or die "Write to $serv: $!\n";
 140                 $s->flush();
 141
 142                 my $rep = <$s>;
 143
 144                 if($rep ne "I LOVE YOU\n") {
 145                         $rep="<unknown>" unless $rep;
 146                         die "AuthReply: $rep\n";
 147                 }
 148                 $self->{'socketo'} = $s;
 149                 $self->{'socketi'} = $s;
 150         } else { # local or ext: Fork off our own cvs server.
 151                 my $pr = IO::Pipe->new();
 152                 my $pw = IO::Pipe->new();
 153                 my $pid = fork();
 154                 die "Fork: $!\n" unless defined $pid;
 155                 my $cvs = 'cvs';
 156                 $cvs = $ENV{CVS_SERVER} if exists $ENV{CVS_SERVER};
 157                 my $rsh = 'rsh';
 158                 $rsh = $ENV{CVS_RSH} if exists $ENV{CVS_RSH};
 159
 160                 my @cvs = ($cvs, 'server');
 161                 my ($local, $user, $host);
 162                 $local = $repo =~ s/:local://;
 163                 if (!$local) {
 164                     $repo =~ s/:ext://;
 165                     $local = !($repo =~ s/^(?:([^\@:]+)\@)?([^:]+)://);
 166                     ($user, $host) = ($1, $2);
 167                 }
 168                 if (!$local) {
 169                     if ($user) {
 170                         unshift @cvs, $rsh, '-l', $user, $host;
 171                     } else {
 172                         unshift @cvs, $rsh, $host;
 173                     }
 174                 }
 175
 176                 unless($pid) {
 177                         $pr->writer();
 178                         $pw->reader();
 179                         dup2($pw->fileno(),0);
 180                         dup2($pr->fileno(),1);
 181                         $pr->close();
 182                         $pw->close();
 183                         exec(@cvs);
 184                 }
 185                 $pw->writer();
 186                 $pr->reader();
 187                 $self->{'socketo'} = $pw;
 188                 $self->{'socketi'} = $pr;
 189         }
 190         $self->{'socketo'}->write("Root $repo\n");
 191
 192         # Trial and error says that this probably is the minimum set
 193         $self->{'socketo'}->write("Valid-responses ok error Valid-requests Mode M Mbinary E F Checked-in Created Updated Merged Removed\n");
 194
 195         $self->{'socketo'}->write("valid-requests\n");
 196         $self->{'socketo'}->flush();
 197
 198         chomp(my $rep=$self->readline());
 199         if($rep !~ s/^Valid-requests\s*//) {
 200                 $rep="<unknown>" unless $rep;
 201                 die "Expected Valid-requests from server, but got: $rep\n";
 202         }
 203         chomp(my $res=$self->readline());
 204         die "validReply: $res\n" if $res ne "ok";
 205
 206         $self->{'socketo'}->write("UseUnchanged\n") if $rep =~ /\bUseUnchanged\b/;
 207         $self->{'repo'} = $repo;
 208 }
 209
 210 sub readline {
 211         my($self) = @_;
 212         return $self->{'socketi'}->getline();
 213 }
 214
 215 sub _file {
 216         # Request a file with a given revision.
 217         # Trial and error says this is a good way to do it. :-/
 218         my($self,$fn,$rev) = @_;
 219         $self->{'socketo'}->write("Argument -N\n") or return undef;
 220         $self->{'socketo'}->write("Argument -P\n") or return undef;
 221         # $self->{'socketo'}->write("Argument -ko\n") or return undef;
 222         # -ko: Linus' version doesn't use it
 223         $self->{'socketo'}->write("Argument -r\n") or return undef;
 224         $self->{'socketo'}->write("Argument $rev\n") or return undef;
 225         $self->{'socketo'}->write("Argument --\n") or return undef;
 226         $self->{'socketo'}->write("Argument $self->{'subdir'}/$fn\n") or return undef;
 227         $self->{'socketo'}->write("Directory .\n") or return undef;
 228         $self->{'socketo'}->write("$self->{'repo'}\n") or return undef;
 229         # $self->{'socketo'}->write("Sticky T1.0\n") or return undef;
 230         $self->{'socketo'}->write("co\n") or return undef;
 231         $self->{'socketo'}->flush() or return undef;
 232         $self->{'lines'} = 0;
 233         return 1;
 234 }
 235 sub _line {
 236         # Read a line from the server.
 237         # ... except that 'line' may be an entire file. ;-)
 238         my($self, $fh) = @_;
 239         die "Not in lines" unless defined $self->{'lines'};
 240
 241         my $line;
 242         my $res=0;
 243         while(defined($line = $self->readline())) {
 244                 # M U gnupg-cvs-rep/AUTHORS
 245                 # Updated gnupg-cvs-rep/
 246                 # /daten/src/rsync/gnupg-cvs-rep/AUTHORS
 247                 # /AUTHORS/1.1///T1.1
 248                 # u=rw,g=rw,o=rw
 249                 # 0
 250                 # ok
 251
 252                 if($line =~ s/^(?:Created|Updated) //) {
 253                         $line = $self->readline(); # path
 254                         $line = $self->readline(); # Entries line
 255                         my $mode = $self->readline(); chomp $mode;
 256                         $self->{'mode'} = $mode;
 257                         defined (my $cnt = $self->readline())
 258                                 or die "EOF from server after 'Changed'\n";
 259                         chomp $cnt;
 260                         die "Duh: Filesize $cnt" if $cnt !~ /^\d+$/;
 261                         $line="";
 262                         $res=0;
 263                         while($cnt) {
 264                                 my $buf;
 265                                 my $num = $self->{'socketi'}->read($buf,$cnt);
 266                                 die "Server: Filesize $cnt: $num: $!\n" if not defined $num or $num<=0;
 267                                 print $fh $buf;
 268                                 $res += $num;
 269                                 $cnt -= $num;
 270                         }
 271                 } elsif($line =~ s/^ //) {
 272                         print $fh $line;
 273                         $res += length($line);
 274                 } elsif($line =~ /^M\b/) {
 275                         # output, do nothing
 276                 } elsif($line =~ /^Mbinary\b/) {
 277                         my $cnt;
 278                         die "EOF from server after 'Mbinary'" unless defined ($cnt = $self->readline());
 279                         chomp $cnt;
 280                         die "Duh: Mbinary $cnt" if $cnt !~ /^\d+$/ or $cnt<1;
 281                         $line="";
 282                         while($cnt) {
 283                                 my $buf;
 284                                 my $num = $self->{'socketi'}->read($buf,$cnt);
 285                                 die "S: Mbinary $cnt: $num: $!\n" if not defined $num or $num<=0;
 286                                 print $fh $buf;
 287                                 $res += $num;
 288                                 $cnt -= $num;
 289                         }
 290                 } else {
 291                         chomp $line;
 292                         if($line eq "ok") {
 293                                 # print STDERR "S: ok (".length($res).")\n";
 294                                 return $res;
 295                         } elsif($line =~ s/^E //) {
 296                                 # print STDERR "S: $line\n";
 297                         } else {
 298                                 die "Unknown: $line\n";
 299                         }
 300                 }
 301         }
 302 }
 303 sub file {
 304         my($self,$fn,$rev) = @_;
 305         my $res;
 306
 307         my ($fh, $name) = tempfile('gitcvs.XXXXXX',
 308                     DIR => File::Spec->tmpdir(), UNLINK => 1);
 309
 310         $self->_file($fn,$rev) and $res = $self->_line($fh);
 311
 312         if (!defined $res) {
 313             # retry
 314             $self->conn();
 315             $self->_file($fn,$rev)
 316                     or die "No file command send\n";
 317             $res = $self->_line($fh);
 318             die "No input: $fn $rev\n" unless defined $res;
 319         }
 320
 321         return ($name, $res);
 322 }
 323
 324
 325 package main;
 326
 327 my $cvs = CVSconn->new($opt_d, $cvs_tree);
 328
 329
 330 sub pdate($) {
 331         my($d) = @_;
 332         m#(\d{2,4})/(\d\d)/(\d\d)\s(\d\d):(\d\d)(?::(\d\d))?#
 333                 or die "Unparseable date: $d\n";
 334         my $y=$1; $y-=1900 if $y>1900;
 335         return timegm($6||0,$5,$4,$3,$2-1,$y);
 336 }
 337
 338 sub pmode($) {
 339         my($mode) = @_;
 340         my $m = 0;
 341         my $mm = 0;
 342         my $um = 0;
 343         for my $x(split(//,$mode)) {
 344                 if($x eq ",") {
 345                         $m |= $mm&$um;
 346                         $mm = 0;
 347                         $um = 0;
 348                 } elsif($x eq "u") { $um |= 0700;
 349                 } elsif($x eq "g") { $um |= 0070;
 350                 } elsif($x eq "o") { $um |= 0007;
 351                 } elsif($x eq "r") { $mm |= 0444;
 352                 } elsif($x eq "w") { $mm |= 0222;
 353                 } elsif($x eq "x") { $mm |= 0111;
 354                 } elsif($x eq "=") { # do nothing
 355                 } else { die "Unknown mode: $mode\n";
 356                 }
 357         }
 358         $m |= $mm&$um;
 359         return $m;
 360 }
 361
 362 sub getwd() {
 363         my $pwd = `pwd`;
 364         chomp $pwd;
 365         return $pwd;
 366 }
 367
 368 -d $git_tree
 369         or mkdir($git_tree,0777)
 370         or die "Could not create $git_tree: $!";
 371 chdir($git_tree);
 372
 373 my $last_branch = "";
 374 my $orig_branch = "";
 375 my $forward_master = 0;
 376 my %branch_date;
 377
 378 my $git_dir = $ENV{"GIT_DIR"} || ".git";
 379 $git_dir = getwd()."/".$git_dir unless $git_dir =~ m#^/#;
 380 $ENV{"GIT_DIR"} = $git_dir;
 381 my $orig_git_index;
 382 $orig_git_index = $ENV{GIT_INDEX_FILE} if exists $ENV{GIT_INDEX_FILE};
 383 my ($git_ih, $git_index) = tempfile('gitXXXXXX', SUFFIX => '.idx',
 384                                     DIR => File::Spec->tmpdir());
 385 close ($git_ih);
 386 $ENV{GIT_INDEX_FILE} = $git_index;
 387 unless(-d $git_dir) {
 388         system("git-init-db");
 389         die "Cannot init the GIT db at $git_tree: $?\n" if $?;
 390         system("git-read-tree");
 391         die "Cannot init an empty tree: $?\n" if $?;
 392
 393         $last_branch = $opt_o;
 394         $orig_branch = "";
 395 } else {
 396         -f "$git_dir/refs/heads/$opt_o"
 397                 or die "Branch '$opt_o' does not exist.\n".
 398                        "Either use the correct '-o branch' option,\n".
 399                        "or import to a new repository.\n";
 400
 401         $last_branch = basename(readlink("$git_dir/HEAD"));
 402         unless($last_branch) {
 403                 warn "Cannot read the last branch name: $! -- assuming 'master'\n";
 404                 $last_branch = "master";
 405         }
 406         $orig_branch = $last_branch;
 407         if (-f "$git_dir/CVS2GIT_HEAD") {
 408                 die <<EOM;
 409 CVS2GIT_HEAD exists.
 410 Make sure your working directory corresponds to HEAD and remove CVS2GIT_HEAD.
 411 You may need to run
 412
 413     git-read-tree -m -u CVS2GIT_HEAD HEAD
 414 EOM
 415         }
 416         system('cp', "$git_dir/HEAD", "$git_dir/CVS2GIT_HEAD");
 417
 418         $forward_master =
 419             $opt_o ne 'master' && -f "$git_dir/refs/heads/master" &&
 420             system('cmp', '-s', "$git_dir/refs/heads/master",
 421                                 "$git_dir/refs/heads/$opt_o") == 0;
 422
 423         # populate index
 424         system('git-read-tree', $last_branch);
 425         die "read-tree failed: $?\n" if $?;
 426
 427         # Get the last import timestamps
 428         opendir(D,"$git_dir/refs/heads");
 429         while(defined(my $head = readdir(D))) {
 430                 next if $head =~ /^\./;
 431                 open(F,"$git_dir/refs/heads/$head")
 432                         or die "Bad head branch: $head: $!\n";
 433                 chomp(my $ftag = <F>);
 434                 close(F);
 435                 open(F,"git-cat-file commit $ftag |");
 436                 while(<F>) {
 437                         next unless /^author\s.*\s(\d+)\s[-+]\d{4}$/;
 438                         $branch_date{$head} = $1;
 439                         last;
 440                 }
 441                 close(F);
 442         }
 443         closedir(D);
 444 }
 445
 446 -d $git_dir
 447         or die "Could not create git subdir ($git_dir).\n";
 448
 449 my $pid = open(CVS,"-|");
 450 die "Cannot fork: $!\n" unless defined $pid;
 451 unless($pid) {
 452         my @opt;
 453         @opt = split(/,/,$opt_p) if defined $opt_p;
 454         unshift @opt, '-z', $opt_z if defined $opt_z;
 455         exec("cvsps",@opt,"-u","-A","--cvs-direct",'--root',$opt_d,$cvs_tree);
 456         die "Could not start cvsps: $!\n";
 457 }
 458
 459
 460 ## cvsps output:
 461 #---------------------
 462 #PatchSet 314
 463 #Date: 1999/09/18 13:03:59
 464 #Author: wkoch
 465 #Branch: STABLE-BRANCH-1-0
 466 #Ancestor branch: HEAD
 467 #Tag: (none)
 468 #Log:
 469 #    See ChangeLog: Sat Sep 18 13:03:28 CEST 1999  Werner Koch
 470 #Members:
 471 #       README:1.57->1.57.2.1
 472 #       VERSION:1.96->1.96.2.1
 473 #
 474 #---------------------
 475
 476 my $state = 0;
 477
 478 my($patchset,$date,$author,$branch,$ancestor,$tag,$logmsg);
 479 my(@old,@new);
 480 my $commit = sub {
 481         my $pid;
 482         while(@old) {
 483                 my @o2;
 484                 if(@old > 55) {
 485                         @o2 = splice(@old,0,50);
 486                 } else {
 487                         @o2 = @old;
 488                         @old = ();
 489                 }
 490                 system("git-update-cache","--force-remove","--",@o2);
 491                 die "Cannot remove files: $?\n" if $?;
 492         }
 493         while(@new) {
 494                 my @n2;
 495                 if(@new > 12) {
 496                         @n2 = splice(@new,0,10);
 497                 } else {
 498                         @n2 = @new;
 499                         @new = ();
 500                 }
 501                 system("git-update-cache","--add",
 502                         (map { ('--cacheinfo', @$_) } @n2));
 503                 die "Cannot add files: $?\n" if $?;
 504         }
 505
 506         $pid = open(C,"-|");
 507         die "Cannot fork: $!" unless defined $pid;
 508         unless($pid) {
 509                 exec("git-write-tree");
 510                 die "Cannot exec git-write-tree: $!\n";
 511         }
 512         chomp(my $tree = <C>);
 513         length($tree) == 40
 514                 or die "Cannot get tree id ($tree): $!\n";
 515         close(C)
 516                 or die "Error running git-write-tree: $?\n";
 517         print "Tree ID $tree\n" if $opt_v;
 518
 519         my $parent = "";
 520         if(open(C,"$git_dir/refs/heads/$last_branch")) {
 521                 chomp($parent = <C>);
 522                 close(C);
 523                 length($parent) == 40
 524                         or die "Cannot get parent id ($parent): $!\n";
 525                 print "Parent ID $parent\n" if $opt_v;
 526         }
 527
 528         my $pr = IO::Pipe->new() or die "Cannot open pipe: $!\n";
 529         my $pw = IO::Pipe->new() or die "Cannot open pipe: $!\n";
 530         $pid = fork();
 531         die "Fork: $!\n" unless defined $pid;
 532         unless($pid) {
 533                 $pr->writer();
 534                 $pw->reader();
 535                 dup2($pw->fileno(),0);
 536                 dup2($pr->fileno(),1);
 537                 $pr->close();
 538                 $pw->close();
 539
 540                 my @par = ();
 541                 @par = ("-p",$parent) if $parent;
 542                 exec("env",
 543                         "GIT_AUTHOR_NAME=$author",
 544                         "GIT_AUTHOR_EMAIL=$author",
 545                         "GIT_AUTHOR_DATE=".strftime("+0000 %Y-%m-%d %H:%M:%S",gmtime($date)),
 546                         "GIT_COMMITTER_NAME=$author",
 547                         "GIT_COMMITTER_EMAIL=$author",
 548                         "GIT_COMMITTER_DATE=".strftime("+0000 %Y-%m-%d %H:%M:%S",gmtime($date)),
 549                         "git-commit-tree", $tree,@par);
 550                 die "Cannot exec git-commit-tree: $!\n";
 551         }
 552         $pw->writer();
 553         $pr->reader();
 554
 555         # compatibility with git2cvs
 556         substr($logmsg,32767) = "" if length($logmsg) > 32767;
 557         $logmsg =~ s/[\s\n]+\z//;
 558
 559         print $pw "$logmsg\n"
 560                 or die "Error writing to git-commit-tree: $!\n";
 561         $pw->close();
 562
 563         print "Committed patch $patchset ($branch)\n" if $opt_v;
 564         chomp(my $cid = <$pr>);
 565         length($cid) == 40
 566                 or die "Cannot get commit id ($cid): $!\n";
 567         print "Commit ID $cid\n" if $opt_v;
 568         $pr->close();
 569
 570         waitpid($pid,0);
 571         die "Error running git-commit-tree: $?\n" if $?;
 572
 573         open(C,">$git_dir/refs/heads/$branch")
 574                 or die "Cannot open branch $branch for update: $!\n";
 575         print C "$cid\n"
 576                 or die "Cannot write branch $branch for update: $!\n";
 577         close(C)
 578                 or die "Cannot write branch $branch for update: $!\n";
 579
 580         if($tag) {
 581                 open(C,">$git_dir/refs/tags/$tag")
 582                         or die "Cannot create tag $tag: $!\n";
 583                 print C "$cid\n"
 584                         or die "Cannot write tag $branch: $!\n";
 585                 close(C)
 586                         or die "Cannot write tag $branch: $!\n";
 587                 print "Created tag '$tag' on '$branch'\n" if $opt_v;
 588         }
 589 };
 590
 591 while(<CVS>) {
 592         chomp;
 593         if($state == 0 and /^-+$/) {
 594                 $state = 1;
 595         } elsif($state == 0) {
 596                 $state = 1;
 597                 redo;
 598         } elsif(($state==0 or $state==1) and s/^PatchSet\s+//) {
 599                 $patchset = 0+$_;
 600                 $state=2;
 601         } elsif($state == 2 and s/^Date:\s+//) {
 602                 $date = pdate($_);
 603                 unless($date) {
 604                         print STDERR "Could not parse date: $_\n";
 605                         $state=0;
 606                         next;
 607                 }
 608                 $state=3;
 609         } elsif($state == 3 and s/^Author:\s+//) {
 610                 s/\s+$//;
 611                 $author = $_;
 612                 $state = 4;
 613         } elsif($state == 4 and s/^Branch:\s+//) {
 614                 s/\s+$//;
 615                 $branch = $_;
 616                 $state = 5;
 617         } elsif($state == 5 and s/^Ancestor branch:\s+//) {
 618                 s/\s+$//;
 619                 $ancestor = $_;
 620                 $ancestor = $opt_o if $ancestor eq "HEAD";
 621                 $state = 6;
 622         } elsif($state == 5) {
 623                 $ancestor = undef;
 624                 $state = 6;
 625                 redo;
 626         } elsif($state == 6 and s/^Tag:\s+//) {
 627                 s/\s+$//;
 628                 if($_ eq "(none)") {
 629                         $tag = undef;
 630                 } else {
 631                         $tag = $_;
 632                 }
 633                 $state = 7;
 634         } elsif($state == 7 and /^Log:/) {
 635                 $logmsg = "";
 636                 $state = 8;
 637         } elsif($state == 8 and /^Members:/) {
 638                 $branch = $opt_o if $branch eq "HEAD";
 639                 if(defined $branch_date{$branch} and $branch_date{$branch} >= $date) {
 640                         # skip
 641                         print "skip patchset $patchset: $date before $branch_date{$branch}\n" if $opt_v;
 642                         $state = 11;
 643                         next;
 644                 }
 645                 if($ancestor) {
 646                         if(-f "$git_dir/refs/heads/$branch") {
 647                                 print STDERR "Branch $branch already exists!\n";
 648                                 $state=11;
 649                                 next;
 650                         }
 651                         unless(open(H,"$git_dir/refs/heads/$ancestor")) {
 652                                 print STDERR "Branch $ancestor does not exist!\n";
 653                                 $state=11;
 654                                 next;
 655                         }
 656                         chomp(my $id = <H>);
 657                         close(H);
 658                         unless(open(H,"> $git_dir/refs/heads/$branch")) {
 659                                 print STDERR "Could not create branch $branch: $!\n";
 660                                 $state=11;
 661                                 next;
 662                         }
 663                         print H "$id\n"
 664                                 or die "Could not write branch $branch: $!";
 665                         close(H)
 666                                 or die "Could not write branch $branch: $!";
 667                 }
 668                 if(($ancestor || $branch) ne $last_branch) {
 669                         print "Switching from $last_branch to $branch\n" if $opt_v;
 670                         system("git-read-tree", $branch);
 671                         die "read-tree failed: $?\n" if $?;
 672                 }
 673                 $last_branch = $branch if $branch ne $last_branch;
 674                 $state = 9;
 675         } elsif($state == 8) {
 676                 $logmsg .= "$_\n";
 677         } elsif($state == 9 and /^\s+(\S+):(INITIAL|\d(?:\.\d+)+)->(\d(?:\.\d+)+)\s*$/) {
 678 #       VERSION:1.96->1.96.2.1
 679                 my $init = ($2 eq "INITIAL");
 680                 my $fn = $1;
 681                 my $rev = $3;
 682                 $fn =~ s#^/+##;
 683                 my ($tmpname, $size) = $cvs->file($fn,$rev);
 684                 print "".($init ? "New" : "Update")." $fn: $size bytes.\n" if $opt_v;
 685                 open my $F, '-|', "git-write-blob $tmpname"
 686                         or die "Cannot create object: $!\n";
 687                 my $sha = <$F>;
 688                 chomp $sha;
 689                 close $F;
 690                 unlink($tmpname);
 691                 my $mode = pmode($cvs->{'mode'});
 692                 push(@new,[$mode, $sha, $fn]); # may be resurrected!
 693         } elsif($state == 9 and /^\s+(\S+):\d(?:\.\d+)+->(\d(?:\.\d+)+)\(DEAD\)\s*$/) {
 694                 my $fn = $1;
 695                 $fn =~ s#^/+##;
 696                 push(@old,$fn);
 697         } elsif($state == 9 and /^\s*$/) {
 698                 $state = 10;
 699         } elsif(($state == 9 or $state == 10) and /^-+$/) {
 700                 &$commit();
 701                 $state = 1;
 702         } elsif($state == 11 and /^-+$/) {
 703                 $state = 1;
 704         } elsif(/^-+$/) { # end of unknown-line processing
 705                 $state = 1;
 706         } elsif($state != 11) { # ignore stuff when skipping
 707                 print "* UNKNOWN LINE * $_\n";
 708         }
 709 }
 710 &$commit() if $branch and $state != 11;
 711
 712 unlink($git_index);
 713
 714 if (defined $orig_git_index) {
 715         $ENV{GIT_INDEX_FILE} = $orig_git_index;
 716 } else {
 717         delete $ENV{GIT_INDEX_FILE};
 718 }
 719
 720 # Now switch back to the branch we were in before all of this happened
 721 if($orig_branch) {
 722         print "DONE\n" if $opt_v;
 723         system("cp","$git_dir/refs/heads/$opt_o","$git_dir/refs/heads/master")
 724                 if $forward_master;
 725         system('git-read-tree', '-m', '-u', 'CVS2GIT_HEAD', 'HEAD');
 726         die "read-tree failed: $?\n" if $?;
 727 } else {
 728         $orig_branch = "master";
 729         print "DONE; creating $orig_branch branch\n" if $opt_v;
 730         system("cp","$git_dir/refs/heads/$opt_o","$git_dir/refs/heads/master")
 731                 unless -f "$git_dir/refs/heads/master";
 732         unlink("$git_dir/HEAD");
 733         symlink("refs/heads/$orig_branch","$git_dir/HEAD");
 734         system('git checkout');
 735         die "checkout failed: $?\n" if $?;
 736 }
 737 unlink("$git_dir/CVS2GIT_HEAD");