1#!/usr/bin/perl -w
2# 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.
15use strict;
17use warnings;
18use Getopt::Std;
19use File::Spec;
20use File::Temp qw(tempfile tmpnam);
21use File::Path qw(mkpath);
22use File::Basename qw(basename dirname);
23use Time::Local;
24use IO::Socket;
25use IO::Pipe;
26use POSIX qw(strftime dup2 ENOENT);
27use IPC::Open2;
28$SIG{'PIPE'}="IGNORE";
30$ENV{'TZ'}="UTC";
31our($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);
33my (%conv_author_name, %conv_author_email);
34sub usage() {
36 print STDERR <<END;
37Usage: ${\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]
41END
42 exit(1);
43}
44sub read_author_info($) {
46 my ($file) = @_;
47 my $user;
48 open my $f, '<', "$file" or die("Failed to open $file: $!\n");
49 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}
76sub write_author_info($) {
78 my ($file) = @_;
79 open my $f, '>', $file or
80 die("Failed to open $file for writing: $!");
81 foreach (keys %conv_author_name) {
83 print $f "$_=$conv_author_name{$_} <$conv_author_email{$_}>\n";
84 }
85 close ($f);
86}
87getopts("hivmkuo:d:p:C:z:s:M:P:A:S:L:") or usage();
89usage if $opt_h;
90@ARGV <= 1 or usage();
92if($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 ||= "-";
108my $git_tree = $opt_C;
109$git_tree ||= ".";
110my $cvs_tree;
112if ($#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}
123our @mergerx = ();
125if ($opt_m) {
126 @mergerx = ( qr/\W(?:from|of|merge|merging|merged) (\w+)/i );
127}
128if ($opt_M) {
129 push (@mergerx, qr/$opt_M/);
130}
131select(STDERR); $|=1; select(STDOUT);
133package CVSconn;
136# Basic CVS dialog.
137# We're only interested in connecting and downloading, so ...
138use File::Spec;
140use File::Temp qw(tempfile);
141use POSIX qw(strftime dup2);
142sub new {
144 my($what,$repo,$subdir) = @_;
145 $what=ref($what) if ref($what);
146 my $self = {};
148 $self->{'buffer'} = "";
149 bless($self,$what);
150 $repo =~ s#/+$##;
152 $self->{'fullrep'} = $repo;
153 $self->conn();
154 $self->{'subdir'} = $subdir;
156 $self->{'lines'} = undef;
157 return $self;
159}
160sub 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 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 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 my $rep = <$s>;
197 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 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 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 # 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 $self->{'socketo'}->write("valid-requests\n");
250 $self->{'socketo'}->flush();
251 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 $self->{'socketo'}->write("UseUnchanged\n") if $rep =~ /\bUseUnchanged\b/;
261 $self->{'repo'} = $repo;
262}
263sub readline {
265 my($self) = @_;
266 return $self->{'socketi'}->getline();
267}
268sub _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}
291sub _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 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 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}
351sub file {
352 my($self,$fn,$rev) = @_;
353 my $res;
354 my ($fh, $name) = tempfile('gitcvs.XXXXXX',
356 DIR => File::Spec->tmpdir(), UNLINK => 1);
357 $self->_file($fn,$rev) and $res = $self->_line($fh);
359 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 return ($name, $res);
371}
372sub _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}
389package main;
392my $cvs = CVSconn->new($opt_d, $cvs_tree);
394sub 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}
403sub 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}
427sub getwd() {
429 my $pwd = `pwd`;
430 chomp $pwd;
431 return $pwd;
432}
433sub is_sha1 {
435 my $s = shift;
436 return $s =~ /^[a-f0-9]{40}$/;
437}
438sub 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-d $git_tree
454 or mkdir($git_tree,0777)
455 or die "Could not create $git_tree: $!";
456chdir($git_tree);
457my $last_branch = "";
459my $orig_branch = "";
460my %branch_date;
461my $tip_at_start = undef;
462my $git_dir = $ENV{"GIT_DIR"} || ".git";
464$git_dir = getwd()."/".$git_dir unless $git_dir =~ m#^/#;
465$ENV{"GIT_DIR"} = $git_dir;
466my $orig_git_index;
467$orig_git_index = $ENV{GIT_INDEX_FILE} if exists $ENV{GIT_INDEX_FILE};
468my %index; # holds filenames of one index per branch
470$index{$opt_o} = tmpnam();
471$ENV{GIT_INDEX_FILE} = $index{$opt_o};
473system("git-read-tree", $opt_o);
474die "read-tree failed: $?\n" if $?;
475unless(-d $git_dir) {
477 system("git-init-db");
478 die "Cannot init the GIT db at $git_tree: $?\n" if $?;
479 system("git-read-tree");
480 die "Cannot init an empty tree: $?\n" if $?;
481 $last_branch = $opt_o;
483 $orig_branch = "";
484} else {
485 -f "$git_dir/refs/heads/$opt_o"
486 or die "Branch '$opt_o' does not exist.\n".
487 "Either use the correct '-o branch' option,\n".
488 "or import to a new repository.\n";
489 open(F, "git-symbolic-ref HEAD |") or
491 die "Cannot run git-symbolic-ref: $!\n";
492 chomp ($last_branch = <F>);
493 $last_branch = basename($last_branch);
494 close(F);
495 unless($last_branch) {
496 warn "Cannot read the last branch name: $! -- assuming 'master'\n";
497 $last_branch = "master";
498 }
499 $orig_branch = $last_branch;
500 $tip_at_start = `git-rev-parse --verify HEAD`;
501 # populate index
503 unless ($index{$last_branch}) {
504 $index{$last_branch} = tmpnam();
505 }
506 $ENV{GIT_INDEX_FILE} = $index{$last_branch};
507 system('git-read-tree', $last_branch);
508 die "read-tree failed: $?\n" if $?;
509 # Get the last import timestamps
511 opendir(D,"$git_dir/refs/heads");
512 while(defined(my $head = readdir(D))) {
513 next if $head =~ /^\./;
514 open(F,"$git_dir/refs/heads/$head")
515 or die "Bad head branch: $head: $!\n";
516 chomp(my $ftag = <F>);
517 close(F);
518 open(F,"git-cat-file commit $ftag |");
519 while(<F>) {
520 next unless /^author\s.*\s(\d+)\s[-+]\d{4}$/;
521 $branch_date{$head} = $1;
522 last;
523 }
524 close(F);
525 }
526 closedir(D);
527}
528-d $git_dir
530 or die "Could not create git subdir ($git_dir).\n";
531# now we read (and possibly save) author-info as well
533-f "$git_dir/cvs-authors" and
534 read_author_info("$git_dir/cvs-authors");
535if ($opt_A) {
536 read_author_info($opt_A);
537 write_author_info("$git_dir/cvs-authors");
538}
539#
542# run cvsps into a file unless we are getting
543# it passed as a file via $opt_P
544#
545unless ($opt_P) {
546 print "Running cvsps...\n" if $opt_v;
547 my $pid = open(CVSPS,"-|");
548 die "Cannot fork: $!\n" unless defined $pid;
549 unless($pid) {
550 my @opt;
551 @opt = split(/,/,$opt_p) if defined $opt_p;
552 unshift @opt, '-z', $opt_z if defined $opt_z;
553 unshift @opt, '-q' unless defined $opt_v;
554 unless (defined($opt_p) && $opt_p =~ m/--no-cvs-direct/) {
555 push @opt, '--cvs-direct';
556 }
557 exec("cvsps","--norc",@opt,"-u","-A",'--root',$opt_d,$cvs_tree);
558 die "Could not start cvsps: $!\n";
559 }
560 my ($cvspsfh, $cvspsfile) = tempfile('gitXXXXXX', SUFFIX => '.cvsps',
561 DIR => File::Spec->tmpdir());
562 while (<CVSPS>) {
563 print $cvspsfh $_;
564 }
565 close CVSPS;
566 close $cvspsfh;
567 $opt_P = $cvspsfile;
568}
569open(CVS, "<$opt_P") or die $!;
572## cvsps output:
574#---------------------
575#PatchSet 314
576#Date: 1999/09/18 13:03:59
577#Author: wkoch
578#Branch: STABLE-BRANCH-1-0
579#Ancestor branch: HEAD
580#Tag: (none)
581#Log:
582# See ChangeLog: Sat Sep 18 13:03:28 CEST 1999 Werner Koch
583#Members:
584# README:1.57->1.57.2.1
585# VERSION:1.96->1.96.2.1
586#
587#---------------------
588my $state = 0;
590sub update_index (\@\@) {
592 my $old = shift;
593 my $new = shift;
594 open(my $fh, '|-', qw(git-update-index -z --index-info))
595 or die "unable to open git-update-index: $!";
596 print $fh
597 (map { "0 0000000000000000000000000000000000000000\t$_\0" }
598 @$old),
599 (map { '100' . sprintf('%o', $_->[0]) . " $_->[1]\t$_->[2]\0" }
600 @$new)
601 or die "unable to write to git-update-index: $!";
602 close $fh
603 or die "unable to write to git-update-index: $!";
604 $? and die "git-update-index reported error: $?";
605}
606sub write_tree () {
608 open(my $fh, '-|', qw(git-write-tree))
609 or die "unable to open git-write-tree: $!";
610 chomp(my $tree = <$fh>);
611 is_sha1($tree)
612 or die "Cannot get tree id ($tree): $!";
613 close($fh)
614 or die "Error running git-write-tree: $?\n";
615 print "Tree ID $tree\n" if $opt_v;
616 return $tree;
617}
618my($patchset,$date,$author_name,$author_email,$branch,$ancestor,$tag,$logmsg);
620my(@old,@new,@skipped,%ignorebranch);
621# commits that cvsps cannot place anywhere...
623$ignorebranch{'#CVSPS_NO_BRANCH'} = 1;
624sub commit {
626 update_index(@old, @new);
627 @old = @new = ();
628 my $tree = write_tree();
629 my $parent = get_headref($last_branch, $git_dir);
630 print "Parent ID " . ($parent ? $parent : "(empty)") . "\n" if $opt_v;
631 my @commit_args;
633 push @commit_args, ("-p", $parent) if $parent;
634 # loose detection of merges
636 # based on the commit msg
637 foreach my $rx (@mergerx) {
638 next unless $logmsg =~ $rx && $1;
639 my $mparent = $1 eq 'HEAD' ? $opt_o : $1;
640 if(my $sha1 = get_headref($mparent, $git_dir)) {
641 push @commit_args, '-p', $mparent;
642 print "Merge parent branch: $mparent\n" if $opt_v;
643 }
644 }
645 my $commit_date = strftime("+0000 %Y-%m-%d %H:%M:%S",gmtime($date));
647 $ENV{GIT_AUTHOR_NAME} = $author_name;
648 $ENV{GIT_AUTHOR_EMAIL} = $author_email;
649 $ENV{GIT_AUTHOR_DATE} = $commit_date;
650 $ENV{GIT_COMMITTER_NAME} = $author_name;
651 $ENV{GIT_COMMITTER_EMAIL} = $author_email;
652 $ENV{GIT_COMMITTER_DATE} = $commit_date;
653 my $pid = open2(my $commit_read, my $commit_write,
654 'git-commit-tree', $tree, @commit_args);
655 # compatibility with git2cvs
657 substr($logmsg,32767) = "" if length($logmsg) > 32767;
658 $logmsg =~ s/[\s\n]+\z//;
659 if (@skipped) {
661 $logmsg .= "\n\n\nSKIPPED:\n\t";
662 $logmsg .= join("\n\t", @skipped) . "\n";
663 @skipped = ();
664 }
665 print($commit_write "$logmsg\n") && close($commit_write)
667 or die "Error writing to git-commit-tree: $!\n";
668 print "Committed patch $patchset ($branch $commit_date)\n" if $opt_v;
670 chomp(my $cid = <$commit_read>);
671 is_sha1($cid) or die "Cannot get commit id ($cid): $!\n";
672 print "Commit ID $cid\n" if $opt_v;
673 close($commit_read);
674 waitpid($pid,0);
676 die "Error running git-commit-tree: $?\n" if $?;
677 system("git-update-ref refs/heads/$branch $cid") == 0
679 or die "Cannot write branch $branch for update: $!\n";
680 if($tag) {
682 my($in, $out) = ('','');
683 my($xtag) = $tag;
684 $xtag =~ s/\s+\*\*.*$//; # Remove stuff like ** INVALID ** and ** FUNKY **
685 $xtag =~ tr/_/\./ if ( $opt_u );
686 $xtag =~ s/[\/]/$opt_s/g;
687
688 my $pid = open2($in, $out, 'git-mktag');
689 print $out "object $cid\n".
690 "type commit\n".
691 "tag $xtag\n".
692 "tagger $author_name <$author_email>\n"
693 or die "Cannot create tag object $xtag: $!\n";
694 close($out)
695 or die "Cannot create tag object $xtag: $!\n";
696 my $tagobj = <$in>;
698 chomp $tagobj;
699 if ( !close($in) or waitpid($pid, 0) != $pid or
701 $? != 0 or $tagobj !~ /^[0123456789abcdef]{40}$/ ) {
702 die "Cannot create tag object $xtag: $!\n";
703 }
704
705 open(C,">$git_dir/refs/tags/$xtag")
707 or die "Cannot create tag $xtag: $!\n";
708 print C "$tagobj\n"
709 or die "Cannot write tag $xtag: $!\n";
710 close(C)
711 or die "Cannot write tag $xtag: $!\n";
712 print "Created tag '$xtag' on '$branch'\n" if $opt_v;
714 }
715};
716my $commitcount = 1;
718while(<CVS>) {
719 chomp;
720 if($state == 0 and /^-+$/) {
721 $state = 1;
722 } elsif($state == 0) {
723 $state = 1;
724 redo;
725 } elsif(($state==0 or $state==1) and s/^PatchSet\s+//) {
726 $patchset = 0+$_;
727 $state=2;
728 } elsif($state == 2 and s/^Date:\s+//) {
729 $date = pdate($_);
730 unless($date) {
731 print STDERR "Could not parse date: $_\n";
732 $state=0;
733 next;
734 }
735 $state=3;
736 } elsif($state == 3 and s/^Author:\s+//) {
737 s/\s+$//;
738 if (/^(.*?)\s+<(.*)>/) {
739 ($author_name, $author_email) = ($1, $2);
740 } elsif ($conv_author_name{$_}) {
741 $author_name = $conv_author_name{$_};
742 $author_email = $conv_author_email{$_};
743 } else {
744 $author_name = $author_email = $_;
745 }
746 $state = 4;
747 } elsif($state == 4 and s/^Branch:\s+//) {
748 s/\s+$//;
749 s/[\/]/$opt_s/g;
750 $branch = $_;
751 $state = 5;
752 } elsif($state == 5 and s/^Ancestor branch:\s+//) {
753 s/\s+$//;
754 $ancestor = $_;
755 $ancestor = $opt_o if $ancestor eq "HEAD";
756 $state = 6;
757 } elsif($state == 5) {
758 $ancestor = undef;
759 $state = 6;
760 redo;
761 } elsif($state == 6 and s/^Tag:\s+//) {
762 s/\s+$//;
763 if($_ eq "(none)") {
764 $tag = undef;
765 } else {
766 $tag = $_;
767 }
768 $state = 7;
769 } elsif($state == 7 and /^Log:/) {
770 $logmsg = "";
771 $state = 8;
772 } elsif($state == 8 and /^Members:/) {
773 $branch = $opt_o if $branch eq "HEAD";
774 if(defined $branch_date{$branch} and $branch_date{$branch} >= $date) {
775 # skip
776 print "skip patchset $patchset: $date before $branch_date{$branch}\n" if $opt_v;
777 $state = 11;
778 next;
779 }
780 if (exists $ignorebranch{$branch}) {
781 print STDERR "Skipping $branch\n";
782 $state = 11;
783 next;
784 }
785 if($ancestor) {
786 if($ancestor eq $branch) {
787 print STDERR "Branch $branch erroneously stems from itself -- changed ancestor to $opt_o\n";
788 $ancestor = $opt_o;
789 }
790 if(-f "$git_dir/refs/heads/$branch") {
791 print STDERR "Branch $branch already exists!\n";
792 $state=11;
793 next;
794 }
795 unless(open(H,"$git_dir/refs/heads/$ancestor")) {
796 print STDERR "Branch $ancestor does not exist!\n";
797 $ignorebranch{$branch} = 1;
798 $state=11;
799 next;
800 }
801 chomp(my $id = <H>);
802 close(H);
803 unless(open(H,"> $git_dir/refs/heads/$branch")) {
804 print STDERR "Could not create branch $branch: $!\n";
805 $ignorebranch{$branch} = 1;
806 $state=11;
807 next;
808 }
809 print H "$id\n"
810 or die "Could not write branch $branch: $!";
811 close(H)
812 or die "Could not write branch $branch: $!";
813 }
814 if(($ancestor || $branch) ne $last_branch) {
815 print "Switching from $last_branch to $branch\n" if $opt_v;
816 unless ($index{$branch}) {
817 $index{$branch} = tmpnam();
818 $ENV{GIT_INDEX_FILE} = $index{$branch};
819 system("git-read-tree", $branch);
820 die "read-tree failed: $?\n" if $?;
821 }
822 # just in case
823 $ENV{GIT_INDEX_FILE} = $index{$branch};
824 if ($ancestor) {
825 print "have ancestor $ancestor" if $opt_v;
826 system("git-read-tree", $ancestor);
827 die "read-tree failed: $?\n" if $?;
828 }
829 } else {
830 # just in case
831 unless ($index{$branch}) {
832 $index{$branch} = tmpnam();
833 $ENV{GIT_INDEX_FILE} = $index{$branch};
834 system("git-read-tree", $branch);
835 die "read-tree failed: $?\n" if $?;
836 }
837 }
838 $last_branch = $branch if $branch ne $last_branch;
839 $state = 9;
840 } elsif($state == 8) {
841 $logmsg .= "$_\n";
842 } elsif($state == 9 and /^\s+(.+?):(INITIAL|\d+(?:\.\d+)+)->(\d+(?:\.\d+)+)\s*$/) {
843# VERSION:1.96->1.96.2.1
844 my $init = ($2 eq "INITIAL");
845 my $fn = $1;
846 my $rev = $3;
847 $fn =~ s#^/+##;
848 if ($opt_S && $fn =~ m/$opt_S/) {
849 print "SKIPPING $fn v $rev\n";
850 push(@skipped, $fn);
851 next;
852 }
853 print "Fetching $fn v $rev\n" if $opt_v;
854 my ($tmpname, $size) = $cvs->file($fn,$rev);
855 if($size == -1) {
856 push(@old,$fn);
857 print "Drop $fn\n" if $opt_v;
858 } else {
859 print "".($init ? "New" : "Update")." $fn: $size bytes\n" if $opt_v;
860 my $pid = open(my $F, '-|');
861 die $! unless defined $pid;
862 if (!$pid) {
863 exec("git-hash-object", "-w", $tmpname)
864 or die "Cannot create object: $!\n";
865 }
866 my $sha = <$F>;
867 chomp $sha;
868 close $F;
869 my $mode = pmode($cvs->{'mode'});
870 push(@new,[$mode, $sha, $fn]); # may be resurrected!
871 }
872 unlink($tmpname);
873 } elsif($state == 9 and /^\s+(.+?):\d+(?:\.\d+)+->(\d+(?:\.\d+)+)\(DEAD\)\s*$/) {
874 my $fn = $1;
875 $fn =~ s#^/+##;
876 push(@old,$fn);
877 print "Delete $fn\n" if $opt_v;
878 } elsif($state == 9 and /^\s*$/) {
879 $state = 10;
880 } elsif(($state == 9 or $state == 10) and /^-+$/) {
881 $commitcount++;
882 if ($opt_L && $commitcount > $opt_L) {
883 last;
884 }
885 commit();
886 if (($commitcount & 1023) == 0) {
887 system("git repack -a -d");
888 }
889 $state = 1;
890 } elsif($state == 11 and /^-+$/) {
891 $state = 1;
892 } elsif(/^-+$/) { # end of unknown-line processing
893 $state = 1;
894 } elsif($state != 11) { # ignore stuff when skipping
895 print "* UNKNOWN LINE * $_\n";
896 }
897}
898commit() if $branch and $state != 11;
899foreach my $git_index (values %index) {
901 unlink($git_index);
902}
903if (defined $orig_git_index) {
905 $ENV{GIT_INDEX_FILE} = $orig_git_index;
906} else {
907 delete $ENV{GIT_INDEX_FILE};
908}
909# Now switch back to the branch we were in before all of this happened
911if($orig_branch) {
912 print "DONE.\n" if $opt_v;
913 if ($opt_i) {
914 exit 0;
915 }
916 my $tip_at_end = `git-rev-parse --verify HEAD`;
917 if ($tip_at_start ne $tip_at_end) {
918 for ($tip_at_start, $tip_at_end) { chomp; }
919 print "Fetched into the current branch.\n" if $opt_v;
920 system(qw(git-read-tree -u -m),
921 $tip_at_start, $tip_at_end);
922 die "Fast-forward update failed: $?\n" if $?;
923 }
924 else {
925 system(qw(git-merge cvsimport HEAD), "refs/heads/$opt_o");
926 die "Could not merge $opt_o into the current branch.\n" if $?;
927 }
928} else {
929 $orig_branch = "master";
930 print "DONE; creating $orig_branch branch\n" if $opt_v;
931 system("git-update-ref", "refs/heads/master", "refs/heads/$opt_o")
932 unless -f "$git_dir/refs/heads/master";
933 system('git-update-ref', 'HEAD', "$orig_branch");
934 unless ($opt_i) {
935 system('git checkout');
936 die "checkout failed: $?\n" if $?;
937 }
938}