git-cvsimport.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 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 tmpnam);
  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 ENOENT);
  27 use IPC::Open2;
  28
  29 $SIG{'PIPE'}="IGNORE";
  30 $ENV{'TZ'}="UTC";
  31
  32 our($opt_h,$opt_o,$opt_v,$opt_k,$opt_u,$opt_d,$opt_p,$opt_C,$opt_z,$opt_i,$opt_P, $opt_s,$opt_m,$opt_M,$opt_A,$opt_S,$opt_L);
  33 my (%conv_author_name, %conv_author_email);
  34
  35 sub usage() {
  36         print STDERR <<END;
  37 Usage: ${\basename $0}     # fetch/update GIT from CVS
  38        [-o branch-for-HEAD] [-h] [-v] [-d CVSROOT] [-A author-conv-file]
  39        [-p opts-for-cvsps] [-C GIT_repository] [-z fuzz] [-i] [-k] [-u]
  40        [-s subst] [-m] [-M regex] [-S regex] [CVS_module]
  41 END
  42         exit(1);
  43 }
  44
  45 sub read_author_info($) {
  46         my ($file) = @_;
  47         my $user;
  48         open my $f, '<', "$file" or die("Failed to open $file: $!\n");
  49
  50         while (<$f>) {
  51                 # Expected format is this:
  52                 #   exon=Andreas Ericsson <ae@op5.se>
  53                 if (m/^(\S+?)\s*=\s*(.+?)\s*<(.+)>\s*$/) {
  54                         $user = $1;
  55                         $conv_author_name{$user} = $2;
  56                         $conv_author_email{$user} = $3;
  57                 }
  58                 # However, we also read from CVSROOT/users format
  59                 # to ease migration.
  60                 elsif (/^(\w+):(['"]?)(.+?)\2\s*$/) {
  61                         my $mapped;
  62                         ($user, $mapped) = ($1, $3);
  63                         if ($mapped =~ /^\s*(.*?)\s*<(.*)>\s*$/) {
  64                                 $conv_author_name{$user} = $1;
  65                                 $conv_author_email{$user} = $2;
  66                         }
  67                         elsif ($mapped =~ /^<?(.*)>?$/) {
  68                                 $conv_author_name{$user} = $user;
  69                                 $conv_author_email{$user} = $1;
  70                         }
  71                 }
  72                 # NEEDSWORK: Maybe warn on unrecognized lines?
  73         }
  74         close ($f);
  75 }
  76
  77 sub write_author_info($) {
  78         my ($file) = @_;
  79         open my $f, '>', $file or
  80           die("Failed to open $file for writing: $!");
  81
  82         foreach (keys %conv_author_name) {
  83                 print $f "$_=$conv_author_name{$_} <$conv_author_email{$_}>\n";
  84         }
  85         close ($f);
  86 }
  87
  88 getopts("hivmkuo:d:p:C:z:s:M:P:A:S:L:") or usage();
  89 usage if $opt_h;
  90
  91 @ARGV <= 1 or usage();
  92
  93 if($opt_d) {
  94         $ENV{"CVSROOT"} = $opt_d;
  95 } elsif(-f 'CVS/Root') {
  96         open my $f, '<', 'CVS/Root' or die 'Failed to open CVS/Root';
  97         $opt_d = <$f>;
  98         chomp $opt_d;
  99         close $f;
 100         $ENV{"CVSROOT"} = $opt_d;
 101 } elsif($ENV{"CVSROOT"}) {
 102         $opt_d = $ENV{"CVSROOT"};
 103 } else {
 104         die "CVSROOT needs to be set";
 105 }
 106 $opt_o ||= "origin";
 107 $opt_s ||= "-";
 108 my $git_tree = $opt_C;
 109 $git_tree ||= ".";
 110
 111 my $cvs_tree;
 112 if ($#ARGV == 0) {
 113         $cvs_tree = $ARGV[0];
 114 } elsif (-f 'CVS/Repository') {
 115         open my $f, '<', 'CVS/Repository' or
 116             die 'Failed to open CVS/Repository';
 117         $cvs_tree = <$f>;
 118         chomp $cvs_tree;
 119         close $f;
 120 } else {
 121         usage();
 122 }
 123
 124 our @mergerx = ();
 125 if ($opt_m) {
 126         @mergerx = ( qr/\W(?:from|of|merge|merging|merged) (\w+)/i );
 127 }
 128 if ($opt_M) {
 129         push (@mergerx, qr/$opt_M/);
 130 }
 131
 132 select(STDERR); $|=1; select(STDOUT);
 133
 134
 135 package CVSconn;
 136 # Basic CVS dialog.
 137 # We're only interested in connecting and downloading, so ...
 138
 139 use File::Spec;
 140 use File::Temp qw(tempfile);
 141 use POSIX qw(strftime dup2);
 142
 143 sub new {
 144         my($what,$repo,$subdir) = @_;
 145         $what=ref($what) if ref($what);
 146
 147         my $self = {};
 148         $self->{'buffer'} = "";
 149         bless($self,$what);
 150
 151         $repo =~ s#/+$##;
 152         $self->{'fullrep'} = $repo;
 153         $self->conn();
 154
 155         $self->{'subdir'} = $subdir;
 156         $self->{'lines'} = undef;
 157
 158         return $self;
 159 }
 160
 161 sub conn {
 162         my $self = shift;
 163         my $repo = $self->{'fullrep'};
 164         if($repo =~ s/^:pserver:(?:(.*?)(?::(.*?))?@)?([^:\/]*)(?::(\d*))?//) {
 165                 my($user,$pass,$serv,$port) = ($1,$2,$3,$4);
 166                 $user="anonymous" unless defined $user;
 167                 my $rr2 = "-";
 168                 unless($port) {
 169                         $rr2 = ":pserver:$user\@$serv:$repo";
 170                         $port=2401;
 171                 }
 172                 my $rr = ":pserver:$user\@$serv:$port$repo";
 173
 174                 unless($pass) {
 175                         open(H,$ENV{'HOME'}."/.cvspass") and do {
 176                                 # :pserver:cvs@mea.tmt.tele.fi:/cvsroot/zmailer Ah<Z
 177                                 while(<H>) {
 178                                         chomp;
 179                                         s/^\/\d+\s+//;
 180                                         my ($w,$p) = split(/\s/,$_,2);
 181                                         if($w eq $rr or $w eq $rr2) {
 182                                                 $pass = $p;
 183                                                 last;
 184                                         }
 185                                 }
 186                         };
 187                 }
 188                 $pass="A" unless $pass;
 189
 190                 my $s = IO::Socket::INET->new(PeerHost => $serv, PeerPort => $port);
 191                 die "Socket to $serv: $!\n" unless defined $s;
 192                 $s->write("BEGIN AUTH REQUEST\n$repo\n$user\n$pass\nEND AUTH REQUEST\n")
 193                         or die "Write to $serv: $!\n";
 194                 $s->flush();
 195
 196                 my $rep = <$s>;
 197
 198                 if($rep ne "I LOVE YOU\n") {
 199                         $rep="<unknown>" unless $rep;
 200                         die "AuthReply: $rep\n";
 201                 }
 202                 $self->{'socketo'} = $s;
 203                 $self->{'socketi'} = $s;
 204         } else { # local or ext: Fork off our own cvs server.
 205                 my $pr = IO::Pipe->new();
 206                 my $pw = IO::Pipe->new();
 207                 my $pid = fork();
 208                 die "Fork: $!\n" unless defined $pid;
 209                 my $cvs = 'cvs';
 210                 $cvs = $ENV{CVS_SERVER} if exists $ENV{CVS_SERVER};
 211                 my $rsh = 'rsh';
 212                 $rsh = $ENV{CVS_RSH} if exists $ENV{CVS_RSH};
 213
 214                 my @cvs = ($cvs, 'server');
 215                 my ($local, $user, $host);
 216                 $local = $repo =~ s/:local://;
 217                 if (!$local) {
 218                     $repo =~ s/:ext://;
 219                     $local = !($repo =~ s/^(?:([^\@:]+)\@)?([^:]+)://);
 220                     ($user, $host) = ($1, $2);
 221                 }
 222                 if (!$local) {
 223                     if ($user) {
 224                         unshift @cvs, $rsh, '-l', $user, $host;
 225                     } else {
 226                         unshift @cvs, $rsh, $host;
 227                     }
 228                 }
 229
 230                 unless($pid) {
 231                         $pr->writer();
 232                         $pw->reader();
 233                         dup2($pw->fileno(),0);
 234                         dup2($pr->fileno(),1);
 235                         $pr->close();
 236                         $pw->close();
 237                         exec(@cvs);
 238                 }
 239                 $pw->writer();
 240                 $pr->reader();
 241                 $self->{'socketo'} = $pw;
 242                 $self->{'socketi'} = $pr;
 243         }
 244         $self->{'socketo'}->write("Root $repo\n");
 245
 246         # Trial and error says that this probably is the minimum set
 247         $self->{'socketo'}->write("Valid-responses ok error Valid-requests Mode M Mbinary E Checked-in Created Updated Merged Removed\n");
 248
 249         $self->{'socketo'}->write("valid-requests\n");
 250         $self->{'socketo'}->flush();
 251
 252         chomp(my $rep=$self->readline());
 253         if($rep !~ s/^Valid-requests\s*//) {
 254                 $rep="<unknown>" unless $rep;
 255                 die "Expected Valid-requests from server, but got: $rep\n";
 256         }
 257         chomp(my $res=$self->readline());
 258         die "validReply: $res\n" if $res ne "ok";
 259
 260         $self->{'socketo'}->write("UseUnchanged\n") if $rep =~ /\bUseUnchanged\b/;
 261         $self->{'repo'} = $repo;
 262 }
 263
 264 sub readline {
 265         my($self) = @_;
 266         return $self->{'socketi'}->getline();
 267 }
 268
 269 sub _file {
 270         # Request a file with a given revision.
 271         # Trial and error says this is a good way to do it. :-/
 272         my($self,$fn,$rev) = @_;
 273         $self->{'socketo'}->write("Argument -N\n") or return undef;
 274         $self->{'socketo'}->write("Argument -P\n") or return undef;
 275         # -kk: Linus' version doesn't use it - defaults to off
 276         if ($opt_k) {
 277             $self->{'socketo'}->write("Argument -kk\n") or return undef;
 278         }
 279         $self->{'socketo'}->write("Argument -r\n") or return undef;
 280         $self->{'socketo'}->write("Argument $rev\n") or return undef;
 281         $self->{'socketo'}->write("Argument --\n") or return undef;
 282         $self->{'socketo'}->write("Argument $self->{'subdir'}/$fn\n") or return undef;
 283         $self->{'socketo'}->write("Directory .\n") or return undef;
 284         $self->{'socketo'}->write("$self->{'repo'}\n") or return undef;
 285         # $self->{'socketo'}->write("Sticky T1.0\n") or return undef;
 286         $self->{'socketo'}->write("co\n") or return undef;
 287         $self->{'socketo'}->flush() or return undef;
 288         $self->{'lines'} = 0;
 289         return 1;
 290 }
 291 sub _line {
 292         # Read a line from the server.
 293         # ... except that 'line' may be an entire file. ;-)
 294         my($self, $fh) = @_;
 295         die "Not in lines" unless defined $self->{'lines'};
 296
 297         my $line;
 298         my $res=0;
 299         while(defined($line = $self->readline())) {
 300                 # M U gnupg-cvs-rep/AUTHORS
 301                 # Updated gnupg-cvs-rep/
 302                 # /daten/src/rsync/gnupg-cvs-rep/AUTHORS
 303                 # /AUTHORS/1.1///T1.1
 304                 # u=rw,g=rw,o=rw
 305                 # 0
 306                 # ok
 307
 308                 if($line =~ s/^(?:Created|Updated) //) {
 309                         $line = $self->readline(); # path
 310                         $line = $self->readline(); # Entries line
 311                         my $mode = $self->readline(); chomp $mode;
 312                         $self->{'mode'} = $mode;
 313                         defined (my $cnt = $self->readline())
 314                                 or die "EOF from server after 'Changed'\n";
 315                         chomp $cnt;
 316                         die "Duh: Filesize $cnt" if $cnt !~ /^\d+$/;
 317                         $line="";
 318                         $res = $self->_fetchfile($fh, $cnt);
 319                 } elsif($line =~ s/^ //) {
 320                         print $fh $line;
 321                         $res += length($line);
 322                 } elsif($line =~ /^M\b/) {
 323                         # output, do nothing
 324                 } elsif($line =~ /^Mbinary\b/) {
 325                         my $cnt;
 326                         die "EOF from server after 'Mbinary'" unless defined ($cnt = $self->readline());
 327                         chomp $cnt;
 328                         die "Duh: Mbinary $cnt" if $cnt !~ /^\d+$/ or $cnt<1;
 329                         $line="";
 330                         $res += $self->_fetchfile($fh, $cnt);
 331                 } else {
 332                         chomp $line;
 333                         if($line eq "ok") {
 334                                 # print STDERR "S: ok (".length($res).")\n";
 335                                 return $res;
 336                         } elsif($line =~ s/^E //) {
 337                                 # print STDERR "S: $line\n";
 338                         } elsif($line =~ /^(Remove-entry|Removed) /i) {
 339                                 $line = $self->readline(); # filename
 340                                 $line = $self->readline(); # OK
 341                                 chomp $line;
 342                                 die "Unknown: $line" if $line ne "ok";
 343                                 return -1;
 344                         } else {
 345                                 die "Unknown: $line\n";
 346                         }
 347                 }
 348         }
 349         return undef;
 350 }
 351 sub file {
 352         my($self,$fn,$rev) = @_;
 353         my $res;
 354
 355         my ($fh, $name) = tempfile('gitcvs.XXXXXX',
 356                     DIR => File::Spec->tmpdir(), UNLINK => 1);
 357
 358         $self->_file($fn,$rev) and $res = $self->_line($fh);
 359
 360         if (!defined $res) {
 361             print STDERR "Server has gone away while fetching $fn $rev, retrying...\n";
 362             truncate $fh, 0;
 363             $self->conn();
 364             $self->_file($fn,$rev) or die "No file command send";
 365             $res = $self->_line($fh);
 366             die "Retry failed" unless defined $res;
 367         }
 368         close ($fh);
 369
 370         return ($name, $res);
 371 }
 372 sub _fetchfile {
 373         my ($self, $fh, $cnt) = @_;
 374         my $res = 0;
 375         my $bufsize = 1024 * 1024;
 376         while($cnt) {
 377             if ($bufsize > $cnt) {
 378                 $bufsize = $cnt;
 379             }
 380             my $buf;
 381             my $num = $self->{'socketi'}->read($buf,$bufsize);
 382             die "Server: Filesize $cnt: $num: $!\n" if not defined $num or $num<=0;
 383             print $fh $buf;
 384             $res += $num;
 385             $cnt -= $num;
 386         }
 387         return $res;
 388 }
 389
 390
 391 package main;
 392
 393 my $cvs = CVSconn->new($opt_d, $cvs_tree);
 394
 395
 396 sub pdate($) {
 397         my($d) = @_;
 398         m#(\d{2,4})/(\d\d)/(\d\d)\s(\d\d):(\d\d)(?::(\d\d))?#
 399                 or die "Unparseable date: $d\n";
 400         my $y=$1; $y-=1900 if $y>1900;
 401         return timegm($6||0,$5,$4,$3,$2-1,$y);
 402 }
 403
 404 sub pmode($) {
 405         my($mode) = @_;
 406         my $m = 0;
 407         my $mm = 0;
 408         my $um = 0;
 409         for my $x(split(//,$mode)) {
 410                 if($x eq ",") {
 411                         $m |= $mm&$um;
 412                         $mm = 0;
 413                         $um = 0;
 414                 } elsif($x eq "u") { $um |= 0700;
 415                 } elsif($x eq "g") { $um |= 0070;
 416                 } elsif($x eq "o") { $um |= 0007;
 417                 } elsif($x eq "r") { $mm |= 0444;
 418                 } elsif($x eq "w") { $mm |= 0222;
 419                 } elsif($x eq "x") { $mm |= 0111;
 420                 } elsif($x eq "=") { # do nothing
 421                 } else { die "Unknown mode: $mode\n";
 422                 }
 423         }
 424         $m |= $mm&$um;
 425         return $m;
 426 }
 427
 428 sub getwd() {
 429         my $pwd = `pwd`;
 430         chomp $pwd;
 431         return $pwd;
 432 }
 433
 434 sub is_sha1 {
 435         my $s = shift;
 436         return $s =~ /^[a-f0-9]{40}$/;
 437 }
 438
 439 sub get_headref ($$) {
 440     my $name    = shift;
 441     my $git_dir = shift;
 442
 443     my $f = "$git_dir/refs/heads/$name";
 444     if(open(my $fh, $f)) {
 445             chomp(my $r = <$fh>);
 446             is_sha1($r) or die "Cannot get head id for $name ($r): $!";
 447             return $r;
 448     }
 449     die "unable to open $f: $!" unless $! == POSIX::ENOENT;
 450     return undef;
 451 }
 452
 453 -d $git_tree
 454         or mkdir($git_tree,0777)
 455         or die "Could not create $git_tree: $!";
 456 chdir($git_tree);
 457
 458 my $last_branch = "";
 459 my $orig_branch = "";
 460 my %branch_date;
 461 my $tip_at_start = undef;
 462
 463 my $git_dir = $ENV{"GIT_DIR"} || ".git";
 464 $git_dir = getwd()."/".$git_dir unless $git_dir =~ m#^/#;
 465 $ENV{"GIT_DIR"} = $git_dir;
 466 my $orig_git_index;
 467 $orig_git_index = $ENV{GIT_INDEX_FILE} if exists $ENV{GIT_INDEX_FILE};
 468
 469 my %index; # holds filenames of one index per branch
 470
 471 unless(-d $git_dir) {
 472         system("git-init-db");
 473         die "Cannot init the GIT db at $git_tree: $?\n" if $?;
 474         system("git-read-tree");
 475         die "Cannot init an empty tree: $?\n" if $?;
 476
 477         $last_branch = $opt_o;
 478         $orig_branch = "";
 479 } else {
 480         -f "$git_dir/refs/heads/$opt_o"
 481                 or die "Branch '$opt_o' does not exist.\n".
 482                        "Either use the correct '-o branch' option,\n".
 483                        "or import to a new repository.\n";
 484
 485         open(F, "git-symbolic-ref HEAD |") or
 486                 die "Cannot run git-symbolic-ref: $!\n";
 487         chomp ($last_branch = <F>);
 488         $last_branch = basename($last_branch);
 489         close(F);
 490         unless($last_branch) {
 491                 warn "Cannot read the last branch name: $! -- assuming 'master'\n";
 492                 $last_branch = "master";
 493         }
 494         $orig_branch = $last_branch;
 495         $tip_at_start = `git-rev-parse --verify HEAD`;
 496
 497         # Get the last import timestamps
 498         my $fmt = '($ref, $author) = (%(refname), %(author));';
 499         open(H, "git-for-each-ref --perl --format='$fmt' refs/heads |") or
 500                 die "Cannot run git-for-each-ref: $!\n";
 501         while(defined(my $entry = <H>)) {
 502                 my ($ref, $author);
 503                 eval($entry) || die "cannot eval refs list: $@";
 504                 my ($head) = ($ref =~ m|^refs/heads/(.*)|);
 505                 $author =~ /^.*\s(\d+)\s[-+]\d{4}$/;
 506                 $branch_date{$head} = $1;
 507         }
 508         close(H);
 509 }
 510
 511 -d $git_dir
 512         or die "Could not create git subdir ($git_dir).\n";
 513
 514 # now we read (and possibly save) author-info as well
 515 -f "$git_dir/cvs-authors" and
 516   read_author_info("$git_dir/cvs-authors");
 517 if ($opt_A) {
 518         read_author_info($opt_A);
 519         write_author_info("$git_dir/cvs-authors");
 520 }
 521
 522
 523 #
 524 # run cvsps into a file unless we are getting
 525 # it passed as a file via $opt_P
 526 #
 527 unless ($opt_P) {
 528         print "Running cvsps...\n" if $opt_v;
 529         my $pid = open(CVSPS,"-|");
 530         die "Cannot fork: $!\n" unless defined $pid;
 531         unless($pid) {
 532                 my @opt;
 533                 @opt = split(/,/,$opt_p) if defined $opt_p;
 534                 unshift @opt, '-z', $opt_z if defined $opt_z;
 535                 unshift @opt, '-q'         unless defined $opt_v;
 536                 unless (defined($opt_p) && $opt_p =~ m/--no-cvs-direct/) {
 537                         push @opt, '--cvs-direct';
 538                 }
 539                 exec("cvsps","--norc",@opt,"-u","-A",'--root',$opt_d,$cvs_tree);
 540                 die "Could not start cvsps: $!\n";
 541         }
 542         my ($cvspsfh, $cvspsfile) = tempfile('gitXXXXXX', SUFFIX => '.cvsps',
 543                                              DIR => File::Spec->tmpdir());
 544         while (<CVSPS>) {
 545             print $cvspsfh $_;
 546         }
 547         close CVSPS;
 548         close $cvspsfh;
 549         $opt_P = $cvspsfile;
 550 }
 551
 552
 553 open(CVS, "<$opt_P") or die $!;
 554
 555 ## cvsps output:
 556 #---------------------
 557 #PatchSet 314
 558 #Date: 1999/09/18 13:03:59
 559 #Author: wkoch
 560 #Branch: STABLE-BRANCH-1-0
 561 #Ancestor branch: HEAD
 562 #Tag: (none)
 563 #Log:
 564 #    See ChangeLog: Sat Sep 18 13:03:28 CEST 1999  Werner Koch
 565 #Members:
 566 #       README:1.57->1.57.2.1
 567 #       VERSION:1.96->1.96.2.1
 568 #
 569 #---------------------
 570
 571 my $state = 0;
 572
 573 sub update_index (\@\@) {
 574         my $old = shift;
 575         my $new = shift;
 576         open(my $fh, '|-', qw(git-update-index -z --index-info))
 577                 or die "unable to open git-update-index: $!";
 578         print $fh
 579                 (map { "0 0000000000000000000000000000000000000000\t$_\0" }
 580                         @$old),
 581                 (map { '100' . sprintf('%o', $_->[0]) . " $_->[1]\t$_->[2]\0" }
 582                         @$new)
 583                 or die "unable to write to git-update-index: $!";
 584         close $fh
 585                 or die "unable to write to git-update-index: $!";
 586         $? and die "git-update-index reported error: $?";
 587 }
 588
 589 sub write_tree () {
 590         open(my $fh, '-|', qw(git-write-tree))
 591                 or die "unable to open git-write-tree: $!";
 592         chomp(my $tree = <$fh>);
 593         is_sha1($tree)
 594                 or die "Cannot get tree id ($tree): $!";
 595         close($fh)
 596                 or die "Error running git-write-tree: $?\n";
 597         print "Tree ID $tree\n" if $opt_v;
 598         return $tree;
 599 }
 600
 601 my($patchset,$date,$author_name,$author_email,$branch,$ancestor,$tag,$logmsg);
 602 my(@old,@new,@skipped,%ignorebranch);
 603
 604 # commits that cvsps cannot place anywhere...
 605 $ignorebranch{'#CVSPS_NO_BRANCH'} = 1;
 606
 607 sub commit {
 608         if ($branch eq $opt_o && !$index{branch} && !get_headref($branch, $git_dir)) {
 609             # looks like an initial commit
 610             # use the index primed by git-init-db
 611             $ENV{GIT_INDEX_FILE} = '.git/index';
 612             $index{$branch} = '.git/index';
 613         } else {
 614             # use an index per branch to speed up
 615             # imports of projects with many branches
 616             unless ($index{$branch}) {
 617                 $index{$branch} = tmpnam();
 618                 $ENV{GIT_INDEX_FILE} = $index{$branch};
 619                 if ($ancestor) {
 620                     system("git-read-tree", $ancestor);
 621                 } else {
 622                     system("git-read-tree", $branch);
 623                 }
 624                 die "read-tree failed: $?\n" if $?;
 625             }
 626         }
 627         $ENV{GIT_INDEX_FILE} = $index{$branch};
 628
 629         update_index(@old, @new);
 630         @old = @new = ();
 631         my $tree = write_tree();
 632         my $parent = get_headref($last_branch, $git_dir);
 633         print "Parent ID " . ($parent ? $parent : "(empty)") . "\n" if $opt_v;
 634
 635         my @commit_args;
 636         push @commit_args, ("-p", $parent) if $parent;
 637
 638         # loose detection of merges
 639         # based on the commit msg
 640         foreach my $rx (@mergerx) {
 641                 next unless $logmsg =~ $rx && $1;
 642                 my $mparent = $1 eq 'HEAD' ? $opt_o : $1;
 643                 if(my $sha1 = get_headref($mparent, $git_dir)) {
 644                         push @commit_args, '-p', $mparent;
 645                         print "Merge parent branch: $mparent\n" if $opt_v;
 646                 }
 647         }
 648
 649         my $commit_date = strftime("+0000 %Y-%m-%d %H:%M:%S",gmtime($date));
 650         $ENV{GIT_AUTHOR_NAME} = $author_name;
 651         $ENV{GIT_AUTHOR_EMAIL} = $author_email;
 652         $ENV{GIT_AUTHOR_DATE} = $commit_date;
 653         $ENV{GIT_COMMITTER_NAME} = $author_name;
 654         $ENV{GIT_COMMITTER_EMAIL} = $author_email;
 655         $ENV{GIT_COMMITTER_DATE} = $commit_date;
 656         my $pid = open2(my $commit_read, my $commit_write,
 657                 'git-commit-tree', $tree, @commit_args);
 658
 659         # compatibility with git2cvs
 660         substr($logmsg,32767) = "" if length($logmsg) > 32767;
 661         $logmsg =~ s/[\s\n]+\z//;
 662
 663         if (@skipped) {
 664             $logmsg .= "\n\n\nSKIPPED:\n\t";
 665             $logmsg .= join("\n\t", @skipped) . "\n";
 666             @skipped = ();
 667         }
 668
 669         print($commit_write "$logmsg\n") && close($commit_write)
 670                 or die "Error writing to git-commit-tree: $!\n";
 671
 672         print "Committed patch $patchset ($branch $commit_date)\n" if $opt_v;
 673         chomp(my $cid = <$commit_read>);
 674         is_sha1($cid) or die "Cannot get commit id ($cid): $!\n";
 675         print "Commit ID $cid\n" if $opt_v;
 676         close($commit_read);
 677
 678         waitpid($pid,0);
 679         die "Error running git-commit-tree: $?\n" if $?;
 680
 681         system("git-update-ref refs/heads/$branch $cid") == 0
 682                 or die "Cannot write branch $branch for update: $!\n";
 683
 684         if($tag) {
 685                 my($in, $out) = ('','');
 686                 my($xtag) = $tag;
 687                 $xtag =~ s/\s+\*\*.*$//; # Remove stuff like ** INVALID ** and ** FUNKY **
 688                 $xtag =~ tr/_/\./ if ( $opt_u );
 689                 $xtag =~ s/[\/]/$opt_s/g;
 690
 691                 my $pid = open2($in, $out, 'git-mktag');
 692                 print $out "object $cid\n".
 693                     "type commit\n".
 694                     "tag $xtag\n".
 695                     "tagger $author_name <$author_email>\n"
 696                     or die "Cannot create tag object $xtag: $!\n";
 697                 close($out)
 698                     or die "Cannot create tag object $xtag: $!\n";
 699
 700                 my $tagobj = <$in>;
 701                 chomp $tagobj;
 702
 703                 if ( !close($in) or waitpid($pid, 0) != $pid or
 704                      $? != 0 or $tagobj !~ /^[0123456789abcdef]{40}$/ ) {
 705                     die "Cannot create tag object $xtag: $!\n";
 706                 }
 707
 708
 709                 open(C,">$git_dir/refs/tags/$xtag")
 710                         or die "Cannot create tag $xtag: $!\n";
 711                 print C "$tagobj\n"
 712                         or die "Cannot write tag $xtag: $!\n";
 713                 close(C)
 714                         or die "Cannot write tag $xtag: $!\n";
 715
 716                 print "Created tag '$xtag' on '$branch'\n" if $opt_v;
 717         }
 718 };
 719
 720 my $commitcount = 1;
 721 while(<CVS>) {
 722         chomp;
 723         if($state == 0 and /^-+$/) {
 724                 $state = 1;
 725         } elsif($state == 0) {
 726                 $state = 1;
 727                 redo;
 728         } elsif(($state==0 or $state==1) and s/^PatchSet\s+//) {
 729                 $patchset = 0+$_;
 730                 $state=2;
 731         } elsif($state == 2 and s/^Date:\s+//) {
 732                 $date = pdate($_);
 733                 unless($date) {
 734                         print STDERR "Could not parse date: $_\n";
 735                         $state=0;
 736                         next;
 737                 }
 738                 $state=3;
 739         } elsif($state == 3 and s/^Author:\s+//) {
 740                 s/\s+$//;
 741                 if (/^(.*?)\s+<(.*)>/) {
 742                     ($author_name, $author_email) = ($1, $2);
 743                 } elsif ($conv_author_name{$_}) {
 744                         $author_name = $conv_author_name{$_};
 745                         $author_email = $conv_author_email{$_};
 746                 } else {
 747                     $author_name = $author_email = $_;
 748                 }
 749                 $state = 4;
 750         } elsif($state == 4 and s/^Branch:\s+//) {
 751                 s/\s+$//;
 752                 s/[\/]/$opt_s/g;
 753                 $branch = $_;
 754                 $state = 5;
 755         } elsif($state == 5 and s/^Ancestor branch:\s+//) {
 756                 s/\s+$//;
 757                 $ancestor = $_;
 758                 $ancestor = $opt_o if $ancestor eq "HEAD";
 759                 $state = 6;
 760         } elsif($state == 5) {
 761                 $ancestor = undef;
 762                 $state = 6;
 763                 redo;
 764         } elsif($state == 6 and s/^Tag:\s+//) {
 765                 s/\s+$//;
 766                 if($_ eq "(none)") {
 767                         $tag = undef;
 768                 } else {
 769                         $tag = $_;
 770                 }
 771                 $state = 7;
 772         } elsif($state == 7 and /^Log:/) {
 773                 $logmsg = "";
 774                 $state = 8;
 775         } elsif($state == 8 and /^Members:/) {
 776                 $branch = $opt_o if $branch eq "HEAD";
 777                 if(defined $branch_date{$branch} and $branch_date{$branch} >= $date) {
 778                         # skip
 779                         print "skip patchset $patchset: $date before $branch_date{$branch}\n" if $opt_v;
 780                         $state = 11;
 781                         next;
 782                 }
 783                 if (exists $ignorebranch{$branch}) {
 784                         print STDERR "Skipping $branch\n";
 785                         $state = 11;
 786                         next;
 787                 }
 788                 if($ancestor) {
 789                         if($ancestor eq $branch) {
 790                                 print STDERR "Branch $branch erroneously stems from itself -- changed ancestor to $opt_o\n";
 791                                 $ancestor = $opt_o;
 792                         }
 793                         if(-f "$git_dir/refs/heads/$branch") {
 794                                 print STDERR "Branch $branch already exists!\n";
 795                                 $state=11;
 796                                 next;
 797                         }
 798                         unless(open(H,"$git_dir/refs/heads/$ancestor")) {
 799                                 print STDERR "Branch $ancestor does not exist!\n";
 800                                 $ignorebranch{$branch} = 1;
 801                                 $state=11;
 802                                 next;
 803                         }
 804                         chomp(my $id = <H>);
 805                         close(H);
 806                         unless(open(H,"> $git_dir/refs/heads/$branch")) {
 807                                 print STDERR "Could not create branch $branch: $!\n";
 808                                 $ignorebranch{$branch} = 1;
 809                                 $state=11;
 810                                 next;
 811                         }
 812                         print H "$id\n"
 813                                 or die "Could not write branch $branch: $!";
 814                         close(H)
 815                                 or die "Could not write branch $branch: $!";
 816                 }
 817                 $last_branch = $branch if $branch ne $last_branch;
 818                 $state = 9;
 819         } elsif($state == 8) {
 820                 $logmsg .= "$_\n";
 821         } elsif($state == 9 and /^\s+(.+?):(INITIAL|\d+(?:\.\d+)+)->(\d+(?:\.\d+)+)\s*$/) {
 822 #       VERSION:1.96->1.96.2.1
 823                 my $init = ($2 eq "INITIAL");
 824                 my $fn = $1;
 825                 my $rev = $3;
 826                 $fn =~ s#^/+##;
 827                 if ($opt_S && $fn =~ m/$opt_S/) {
 828                     print "SKIPPING $fn v $rev\n";
 829                     push(@skipped, $fn);
 830                     next;
 831                 }
 832                 print "Fetching $fn   v $rev\n" if $opt_v;
 833                 my ($tmpname, $size) = $cvs->file($fn,$rev);
 834                 if($size == -1) {
 835                         push(@old,$fn);
 836                         print "Drop $fn\n" if $opt_v;
 837                 } else {
 838                         print "".($init ? "New" : "Update")." $fn: $size bytes\n" if $opt_v;
 839                         my $pid = open(my $F, '-|');
 840                         die $! unless defined $pid;
 841                         if (!$pid) {
 842                             exec("git-hash-object", "-w", $tmpname)
 843                                 or die "Cannot create object: $!\n";
 844                         }
 845                         my $sha = <$F>;
 846                         chomp $sha;
 847                         close $F;
 848                         my $mode = pmode($cvs->{'mode'});
 849                         push(@new,[$mode, $sha, $fn]); # may be resurrected!
 850                 }
 851                 unlink($tmpname);
 852         } elsif($state == 9 and /^\s+(.+?):\d+(?:\.\d+)+->(\d+(?:\.\d+)+)\(DEAD\)\s*$/) {
 853                 my $fn = $1;
 854                 $fn =~ s#^/+##;
 855                 push(@old,$fn);
 856                 print "Delete $fn\n" if $opt_v;
 857         } elsif($state == 9 and /^\s*$/) {
 858                 $state = 10;
 859         } elsif(($state == 9 or $state == 10) and /^-+$/) {
 860                 $commitcount++;
 861                 if ($opt_L && $commitcount > $opt_L) {
 862                         last;
 863                 }
 864                 commit();
 865                 if (($commitcount & 1023) == 0) {
 866                         system("git repack -a -d");
 867                 }
 868                 $state = 1;
 869         } elsif($state == 11 and /^-+$/) {
 870                 $state = 1;
 871         } elsif(/^-+$/) { # end of unknown-line processing
 872                 $state = 1;
 873         } elsif($state != 11) { # ignore stuff when skipping
 874                 print "* UNKNOWN LINE * $_\n";
 875         }
 876 }
 877 commit() if $branch and $state != 11;
 878
 879 foreach my $git_index (values %index) {
 880     if ($git_index ne '.git/index') {
 881         unlink($git_index);
 882     }
 883 }
 884
 885 if (defined $orig_git_index) {
 886         $ENV{GIT_INDEX_FILE} = $orig_git_index;
 887 } else {
 888         delete $ENV{GIT_INDEX_FILE};
 889 }
 890
 891 # Now switch back to the branch we were in before all of this happened
 892 if($orig_branch) {
 893         print "DONE.\n" if $opt_v;
 894         if ($opt_i) {
 895                 exit 0;
 896         }
 897         my $tip_at_end = `git-rev-parse --verify HEAD`;
 898         if ($tip_at_start ne $tip_at_end) {
 899                 for ($tip_at_start, $tip_at_end) { chomp; }
 900                 print "Fetched into the current branch.\n" if $opt_v;
 901                 system(qw(git-read-tree -u -m),
 902                        $tip_at_start, $tip_at_end);
 903                 die "Fast-forward update failed: $?\n" if $?;
 904         }
 905         else {
 906                 system(qw(git-merge cvsimport HEAD), "refs/heads/$opt_o");
 907                 die "Could not merge $opt_o into the current branch.\n" if $?;
 908         }
 909 } else {
 910         $orig_branch = "master";
 911         print "DONE; creating $orig_branch branch\n" if $opt_v;
 912         system("git-update-ref", "refs/heads/master", "refs/heads/$opt_o")
 913                 unless -f "$git_dir/refs/heads/master";
 914         system('git-update-ref', 'HEAD', "$orig_branch");
 915         unless ($opt_i) {
 916                 system('git checkout');
 917                 die "checkout failed: $?\n" if $?;
 918         }
 919 }