3 # This tool is copyright (c) 2005, Matthias Urlichs.
4 # It is released under the Gnu Public License, version 2.
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
10 # Checking out the files is done by a single long-running CVS connection
13 # The head revision is on branch "origin" by default.
14 # You can change that with the '-o' option.
20 use File
::Temp
qw(tempfile tmpnam);
21 use File
::Path
qw(mkpath);
22 use File
::Basename
qw(basename dirname);
26 use POSIX
qw(strftime dup2 ENOENT);
29 $SIG{'PIPE'}="IGNORE";
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, $opt_a, $opt_r);
33 my (%conv_author_name, %conv_author_email);
37 print(STDERR
"Error: $msg\n") if $msg;
39 Usage: ${\basename $0} # fetch/update GIT from CVS
40 [-o branch-for-HEAD] [-h] [-v] [-d CVSROOT] [-A author-conv-file]
41 [-p opts-for-cvsps] [-P file] [-C GIT_repository] [-z fuzz] [-i] [-k]
42 [-u] [-s subst] [-a] [-m] [-M regex] [-S regex] [-L commitlimit]
43 [-r remote] [CVS_module]
48 sub read_author_info
($) {
51 open my $f, '<', "$file" or die("Failed to open $file: $!\n");
54 # Expected format is this:
55 # exon=Andreas Ericsson <ae@op5.se>
56 if (m/^(\S+?)\s*=\s*(.+?)\s*<(.+)>\s*$/) {
58 $conv_author_name{$user} = $2;
59 $conv_author_email{$user} = $3;
61 # However, we also read from CVSROOT/users format
63 elsif (/^(\w+):(['"]?)(.+?)\2\s*$/) {
65 ($user, $mapped) = ($1, $3);
66 if ($mapped =~ /^\s*(.*?)\s*<(.*)>\s*$/) {
67 $conv_author_name{$user} = $1;
68 $conv_author_email{$user} = $2;
70 elsif ($mapped =~ /^<?(.*)>?$/) {
71 $conv_author_name{$user} = $user;
72 $conv_author_email{$user} = $1;
75 # NEEDSWORK: Maybe warn on unrecognized lines?
80 sub write_author_info
($) {
82 open my $f, '>', $file or
83 die("Failed to open $file for writing: $!");
85 foreach (keys %conv_author_name) {
86 print $f "$_=$conv_author_name{$_} <$conv_author_email{$_}>\n";
91 # convert getopts specs for use by git config
92 sub read_repo_config
{
93 # Split the string between characters, unless there is a ':'
94 # So "abc:de" becomes ["a", "b", "c:", "d", "e"]
95 my @opts = split(/ *(?!:)/, shift);
96 foreach my $o (@opts) {
99 my $arg = 'git config';
100 $arg .= ' --bool' if ($o !~ /:$/);
102 chomp(my $tmp = `$arg --get cvsimport.$key`);
103 if ($tmp && !($arg =~ /--bool/ && $tmp eq 'false')) {
105 my $opt_name = "opt_" . $key;
113 my $opts = "haivmkuo:d:p:r:C:z:s:M:P:A:S:L:";
114 read_repo_config
($opts);
115 Getopt
::Long
::Configure
( 'no_ignore_case', 'bundling' );
117 # turn the Getopt::Std specification in a Getopt::Long one,
118 # with support for multiple -M options
119 GetOptions
( map { s/:/=s/; /M/ ?
"$_\@" : $_ } split( /(?!:)/, $opts ) )
124 chomp(my $module = `git config --get cvsimport.module`);
125 push(@ARGV, $module) if $?
== 0;
127 @ARGV <= 1 or usage
("You can't specify more than one CVS module");
130 $ENV{"CVSROOT"} = $opt_d;
131 } elsif (-f
'CVS/Root') {
132 open my $f, '<', 'CVS/Root' or die 'Failed to open CVS/Root';
136 $ENV{"CVSROOT"} = $opt_d;
137 } elsif ($ENV{"CVSROOT"}) {
138 $opt_d = $ENV{"CVSROOT"};
140 usage
("CVSROOT needs to be set");
145 my $git_tree = $opt_C;
149 if (defined $opt_r) {
150 $remote = 'refs/remotes/' . $opt_r;
154 $remote = 'refs/heads';
159 $cvs_tree = $ARGV[0];
160 } elsif (-f
'CVS/Repository') {
161 open my $f, '<', 'CVS/Repository' or
162 die 'Failed to open CVS/Repository';
167 usage
("CVS module has to be specified");
172 @mergerx = ( qr/\b(?:from|of|merge|merging|merged) ([-\w]+)/i );
175 push (@mergerx, map { qr/$_/ } @opt_M);
178 # Remember UTC of our starting time
179 # we'll want to avoid importing commits
180 # that are too recent
181 our $starttime = time();
183 select(STDERR
); $|=1; select(STDOUT
);
188 # We're only interested in connecting and downloading, so ...
191 use File
::Temp
qw(tempfile);
192 use POSIX
qw(strftime dup2);
195 my ($what,$repo,$subdir) = @_;
196 $what=ref($what) if ref($what);
199 $self->{'buffer'} = "";
203 $self->{'fullrep'} = $repo;
206 $self->{'subdir'} = $subdir;
207 $self->{'lines'} = undef;
214 my $repo = $self->{'fullrep'};
215 if ($repo =~ s/^:pserver(?:([^:]*)):(?:(.*?)(?::(.*?))?@)?([^:\/]*)(?::(\d*))?//) {
216 my ($param,$user,$pass,$serv,$port) = ($1,$2,$3,$4,$5);
218 my ($proxyhost,$proxyport);
219 if ($param && ($param =~ m/proxy=([^;]+)/)) {
221 # Default proxyport, if not specified, is 8080.
223 if ($ENV{"CVS_PROXY_PORT"}) {
224 $proxyport = $ENV{"CVS_PROXY_PORT"};
226 if ($param =~ m/proxyport=([^;]+)/) {
231 # if username is not explicit in CVSROOT, then use current user, as cvs would
232 $user=(getlogin() || $ENV{'LOGNAME'} || $ENV{'USER'} || "anonymous") unless $user;
235 $rr2 = ":pserver:$user\@$serv:$repo";
238 my $rr = ":pserver:$user\@$serv:$port$repo";
241 open(H
,$ENV{'HOME'}."/.cvspass") and do {
242 # :pserver:cvs@mea.tmt.tele.fi:/cvsroot/zmailer Ah<Z
246 my ($w,$p) = split(/\s/,$_,2);
247 if ($w eq $rr or $w eq $rr2) {
254 $pass="A" unless $pass;
259 # Use a HTTP Proxy. Only works for HTTP proxies that
260 # don't require user authentication
262 # See: http://www.ietf.org/rfc/rfc2817.txt
264 $s = IO
::Socket
::INET
->new(PeerHost
=> $proxyhost, PeerPort
=> $proxyport);
265 die "Socket to $proxyhost: $!\n" unless defined $s;
266 $s->write("CONNECT $serv:$port HTTP/1.1\r\nHost: $serv:$port\r\n\r\n")
267 or die "Write to $proxyhost: $!\n";
272 # The answer should look like 'HTTP/1.x 2yy ....'
273 if (!($rep =~ m
#^HTTP/1\.. 2[0-9][0-9]#)) {
274 die "Proxy connect: $rep\n";
276 # Skip up to the empty line of the proxy server output
277 # including the response headers.
278 while ($rep = <$s>) {
279 last if (!defined $rep ||
284 $s = IO
::Socket
::INET
->new(PeerHost
=> $serv, PeerPort
=> $port);
285 die "Socket to $serv: $!\n" unless defined $s;
288 $s->write("BEGIN AUTH REQUEST\n$repo\n$user\n$pass\nEND AUTH REQUEST\n")
289 or die "Write to $serv: $!\n";
294 if ($rep ne "I LOVE YOU\n") {
295 $rep="<unknown>" unless $rep;
296 die "AuthReply: $rep\n";
298 $self->{'socketo'} = $s;
299 $self->{'socketi'} = $s;
300 } else { # local or ext: Fork off our own cvs server.
301 my $pr = IO
::Pipe
->new();
302 my $pw = IO
::Pipe
->new();
304 die "Fork: $!\n" unless defined $pid;
306 $cvs = $ENV{CVS_SERVER
} if exists $ENV{CVS_SERVER
};
308 $rsh = $ENV{CVS_RSH
} if exists $ENV{CVS_RSH
};
310 my @cvs = ($cvs, 'server');
311 my ($local, $user, $host);
312 $local = $repo =~ s/:local://;
315 $local = !($repo =~ s/^(?:([^\@:]+)\@)?([^:]+)://);
316 ($user, $host) = ($1, $2);
320 unshift @cvs, $rsh, '-l', $user, $host;
322 unshift @cvs, $rsh, $host;
329 dup2
($pw->fileno(),0);
330 dup2
($pr->fileno(),1);
337 $self->{'socketo'} = $pw;
338 $self->{'socketi'} = $pr;
340 $self->{'socketo'}->write("Root $repo\n");
342 # Trial and error says that this probably is the minimum set
343 $self->{'socketo'}->write("Valid-responses ok error Valid-requests Mode M Mbinary E Checked-in Created Updated Merged Removed\n");
345 $self->{'socketo'}->write("valid-requests\n");
346 $self->{'socketo'}->flush();
348 chomp(my $rep=$self->readline());
349 if ($rep !~ s/^Valid-requests\s*//) {
350 $rep="<unknown>" unless $rep;
351 die "Expected Valid-requests from server, but got: $rep\n";
353 chomp(my $res=$self->readline());
354 die "validReply: $res\n" if $res ne "ok";
356 $self->{'socketo'}->write("UseUnchanged\n") if $rep =~ /\bUseUnchanged\b/;
357 $self->{'repo'} = $repo;
362 return $self->{'socketi'}->getline();
366 # Request a file with a given revision.
367 # Trial and error says this is a good way to do it. :-/
368 my ($self,$fn,$rev) = @_;
369 $self->{'socketo'}->write("Argument -N\n") or return undef;
370 $self->{'socketo'}->write("Argument -P\n") or return undef;
371 # -kk: Linus' version doesn't use it - defaults to off
373 $self->{'socketo'}->write("Argument -kk\n") or return undef;
375 $self->{'socketo'}->write("Argument -r\n") or return undef;
376 $self->{'socketo'}->write("Argument $rev\n") or return undef;
377 $self->{'socketo'}->write("Argument --\n") or return undef;
378 $self->{'socketo'}->write("Argument $self->{'subdir'}/$fn\n") or return undef;
379 $self->{'socketo'}->write("Directory .\n") or return undef;
380 $self->{'socketo'}->write("$self->{'repo'}\n") or return undef;
381 # $self->{'socketo'}->write("Sticky T1.0\n") or return undef;
382 $self->{'socketo'}->write("co\n") or return undef;
383 $self->{'socketo'}->flush() or return undef;
384 $self->{'lines'} = 0;
388 # Read a line from the server.
389 # ... except that 'line' may be an entire file. ;-)
390 my ($self, $fh) = @_;
391 die "Not in lines" unless defined $self->{'lines'};
395 while (defined($line = $self->readline())) {
396 # M U gnupg-cvs-rep/AUTHORS
397 # Updated gnupg-cvs-rep/
398 # /daten/src/rsync/gnupg-cvs-rep/AUTHORS
399 # /AUTHORS/1.1///T1.1
404 if ($line =~ s/^(?:Created|Updated) //) {
405 $line = $self->readline(); # path
406 $line = $self->readline(); # Entries line
407 my $mode = $self->readline(); chomp $mode;
408 $self->{'mode'} = $mode;
409 defined (my $cnt = $self->readline())
410 or die "EOF from server after 'Changed'\n";
412 die "Duh: Filesize $cnt" if $cnt !~ /^\d+$/;
414 $res = $self->_fetchfile($fh, $cnt);
415 } elsif ($line =~ s/^ //) {
417 $res += length($line);
418 } elsif ($line =~ /^M\b/) {
420 } elsif ($line =~ /^Mbinary\b/) {
422 die "EOF from server after 'Mbinary'" unless defined ($cnt = $self->readline());
424 die "Duh: Mbinary $cnt" if $cnt !~ /^\d+$/ or $cnt<1;
426 $res += $self->_fetchfile($fh, $cnt);
430 # print STDERR "S: ok (".length($res).")\n";
432 } elsif ($line =~ s/^E //) {
433 # print STDERR "S: $line\n";
434 } elsif ($line =~ /^(Remove-entry|Removed) /i) {
435 $line = $self->readline(); # filename
436 $line = $self->readline(); # OK
438 die "Unknown: $line" if $line ne "ok";
441 die "Unknown: $line\n";
448 my ($self,$fn,$rev) = @_;
451 my ($fh, $name) = tempfile
('gitcvs.XXXXXX',
452 DIR
=> File
::Spec
->tmpdir(), UNLINK
=> 1);
454 $self->_file($fn,$rev) and $res = $self->_line($fh);
457 print STDERR
"Server has gone away while fetching $fn $rev, retrying...\n";
460 $self->_file($fn,$rev) or die "No file command send";
461 $res = $self->_line($fh);
462 die "Retry failed" unless defined $res;
466 return ($name, $res);
469 my ($self, $fh, $cnt) = @_;
471 my $bufsize = 1024 * 1024;
473 if ($bufsize > $cnt) {
477 my $num = $self->{'socketi'}->read($buf,$bufsize);
478 die "Server: Filesize $cnt: $num: $!\n" if not defined $num or $num<=0;
489 my $cvs = CVSconn
->new($opt_d, $cvs_tree);
494 m
#(\d{2,4})/(\d\d)/(\d\d)\s(\d\d):(\d\d)(?::(\d\d))?#
495 or die "Unparseable date: $d\n";
496 my $y=$1; $y-=1900 if $y>1900;
497 return timegm
($6||0,$5,$4,$3,$2-1,$y);
505 for my $x(split(//,$mode)) {
510 } elsif ($x eq "u") { $um |= 0700;
511 } elsif ($x eq "g") { $um |= 0070;
512 } elsif ($x eq "o") { $um |= 0007;
513 } elsif ($x eq "r") { $mm |= 0444;
514 } elsif ($x eq "w") { $mm |= 0222;
515 } elsif ($x eq "x") { $mm |= 0111;
516 } elsif ($x eq "=") { # do nothing
517 } else { die "Unknown mode: $mode\n";
532 return $s =~ /^[a-f0-9]{40}$/;
535 sub get_headref
($) {
537 my $r = `git rev-parse --verify '$name' 2>/dev/null`;
538 return undef unless $?
== 0;
544 or mkdir($git_tree,0777)
545 or die "Could not create $git_tree: $!";
548 my $last_branch = "";
549 my $orig_branch = "";
551 my $tip_at_start = undef;
553 my $git_dir = $ENV{"GIT_DIR"} || ".git";
554 $git_dir = getwd
()."/".$git_dir unless $git_dir =~ m
#^/#;
555 $ENV{"GIT_DIR"} = $git_dir;
557 $orig_git_index = $ENV{GIT_INDEX_FILE
} if exists $ENV{GIT_INDEX_FILE
};
559 my %index; # holds filenames of one index per branch
561 unless (-d
$git_dir) {
563 die "Cannot init the GIT db at $git_tree: $?\n" if $?
;
564 system("git-read-tree");
565 die "Cannot init an empty tree: $?\n" if $?
;
567 $last_branch = $opt_o;
570 open(F
, "git-symbolic-ref HEAD |") or
571 die "Cannot run git-symbolic-ref: $!\n";
572 chomp ($last_branch = <F
>);
573 $last_branch = basename
($last_branch);
575 unless ($last_branch) {
576 warn "Cannot read the last branch name: $! -- assuming 'master'\n";
577 $last_branch = "master";
579 $orig_branch = $last_branch;
580 $tip_at_start = `git-rev-parse --verify HEAD`;
582 # Get the last import timestamps
583 my $fmt = '($ref, $author) = (%(refname), %(author));';
584 open(H
, "git-for-each-ref --perl --format='$fmt' $remote |") or
585 die "Cannot run git-for-each-ref: $!\n";
586 while (defined(my $entry = <H
>)) {
588 eval($entry) || die "cannot eval refs list: $@";
589 my ($head) = ($ref =~ m
|^$remote/(.*)|);
590 $author =~ /^.*\s(\d+)\s[-+]\d{4}$/;
591 $branch_date{$head} = $1;
594 if (!exists $branch_date{$opt_o}) {
595 die "Branch '$opt_o' does not exist.\n".
596 "Either use the correct '-o branch' option,\n".
597 "or import to a new repository.\n";
602 or die "Could not create git subdir ($git_dir).\n";
604 # now we read (and possibly save) author-info as well
605 -f
"$git_dir/cvs-authors" and
606 read_author_info
("$git_dir/cvs-authors");
608 read_author_info
($opt_A);
609 write_author_info
("$git_dir/cvs-authors");
614 # run cvsps into a file unless we are getting
615 # it passed as a file via $opt_P
619 print "Running cvsps...\n" if $opt_v;
620 my $pid = open(CVSPS
,"-|");
622 die "Cannot fork: $!\n" unless defined $pid;
625 @opt = split(/,/,$opt_p) if defined $opt_p;
626 unshift @opt, '-z', $opt_z if defined $opt_z;
627 unshift @opt, '-q' unless defined $opt_v;
628 unless (defined($opt_p) && $opt_p =~ m/--no-cvs-direct/) {
629 push @opt, '--cvs-direct';
631 exec("cvsps","--norc",@opt,"-u","-A",'--root',$opt_d,$cvs_tree);
632 die "Could not start cvsps: $!\n";
634 ($cvspsfh, $cvspsfile) = tempfile
('gitXXXXXX', SUFFIX
=> '.cvsps',
635 DIR
=> File
::Spec
->tmpdir());
640 $?
== 0 or die "git-cvsimport: fatal: cvsps reported error\n";
646 open(CVS
, "<$cvspsfile") or die $!;
649 #---------------------
651 #Date: 1999/09/18 13:03:59
653 #Branch: STABLE-BRANCH-1-0
654 #Ancestor branch: HEAD
657 # See ChangeLog: Sat Sep 18 13:03:28 CEST 1999 Werner Koch
659 # README:1.57->1.57.2.1
660 # VERSION:1.96->1.96.2.1
662 #---------------------
666 sub update_index
(\@\@
) {
669 open(my $fh, '|-', qw(git-update-index -z --index-info))
670 or die "unable to open git-update-index: $!";
672 (map { "0 0000000000000000000000000000000000000000\t$_\0" }
674 (map { '100' . sprintf('%o', $_->[0]) . " $_->[1]\t$_->[2]\0" }
676 or die "unable to write to git-update-index: $!";
678 or die "unable to write to git-update-index: $!";
679 $?
and die "git-update-index reported error: $?";
683 open(my $fh, '-|', qw(git-write-tree))
684 or die "unable to open git-write-tree: $!";
685 chomp(my $tree = <$fh>);
687 or die "Cannot get tree id ($tree): $!";
689 or die "Error running git-write-tree: $?\n";
690 print "Tree ID $tree\n" if $opt_v;
694 my ($patchset,$date,$author_name,$author_email,$branch,$ancestor,$tag,$logmsg);
695 my (@old,@new,@skipped,%ignorebranch);
697 # commits that cvsps cannot place anywhere...
698 $ignorebranch{'#CVSPS_NO_BRANCH'} = 1;
701 if ($branch eq $opt_o && !$index{branch
} &&
702 !get_headref
("$remote/$branch")) {
703 # looks like an initial commit
704 # use the index primed by git-init
705 $ENV{GIT_INDEX_FILE
} = "$git_dir/index";
706 $index{$branch} = "$git_dir/index";
708 # use an index per branch to speed up
709 # imports of projects with many branches
710 unless ($index{$branch}) {
711 $index{$branch} = tmpnam
();
712 $ENV{GIT_INDEX_FILE
} = $index{$branch};
714 system("git-read-tree", "$remote/$ancestor");
716 system("git-read-tree", "$remote/$branch");
718 die "read-tree failed: $?\n" if $?
;
721 $ENV{GIT_INDEX_FILE
} = $index{$branch};
723 update_index
(@old, @new);
725 my $tree = write_tree
();
726 my $parent = get_headref
("$remote/$last_branch");
727 print "Parent ID " . ($parent ?
$parent : "(empty)") . "\n" if $opt_v;
730 push @commit_args, ("-p", $parent) if $parent;
732 # loose detection of merges
733 # based on the commit msg
734 foreach my $rx (@mergerx) {
735 next unless $logmsg =~ $rx && $1;
736 my $mparent = $1 eq 'HEAD' ?
$opt_o : $1;
737 if (my $sha1 = get_headref
("$remote/$mparent")) {
738 push @commit_args, '-p', "$remote/$mparent";
739 print "Merge parent branch: $mparent\n" if $opt_v;
743 my $commit_date = strftime
("+0000 %Y-%m-%d %H:%M:%S",gmtime($date));
744 $ENV{GIT_AUTHOR_NAME
} = $author_name;
745 $ENV{GIT_AUTHOR_EMAIL
} = $author_email;
746 $ENV{GIT_AUTHOR_DATE
} = $commit_date;
747 $ENV{GIT_COMMITTER_NAME
} = $author_name;
748 $ENV{GIT_COMMITTER_EMAIL
} = $author_email;
749 $ENV{GIT_COMMITTER_DATE
} = $commit_date;
750 my $pid = open2
(my $commit_read, my $commit_write,
751 'git-commit-tree', $tree, @commit_args);
753 # compatibility with git2cvs
754 substr($logmsg,32767) = "" if length($logmsg) > 32767;
755 $logmsg =~ s/[\s\n]+\z//;
758 $logmsg .= "\n\n\nSKIPPED:\n\t";
759 $logmsg .= join("\n\t", @skipped) . "\n";
763 print($commit_write "$logmsg\n") && close($commit_write)
764 or die "Error writing to git-commit-tree: $!\n";
766 print "Committed patch $patchset ($branch $commit_date)\n" if $opt_v;
767 chomp(my $cid = <$commit_read>);
768 is_sha1
($cid) or die "Cannot get commit id ($cid): $!\n";
769 print "Commit ID $cid\n" if $opt_v;
773 die "Error running git-commit-tree: $?\n" if $?
;
775 system('git-update-ref', "$remote/$branch", $cid) == 0
776 or die "Cannot write branch $branch for update: $!\n";
780 $xtag =~ s/\s+\*\*.*$//; # Remove stuff like ** INVALID ** and ** FUNKY **
781 $xtag =~ tr/_/\./ if ( $opt_u );
782 $xtag =~ s/[\/]/$opt_s/g
;
784 system('git-tag', '-f', $xtag, $cid) == 0
785 or die "Cannot create tag $xtag: $!\n";
787 print "Created tag '$xtag' on '$branch'\n" if $opt_v;
794 if ($state == 0 and /^-+$/) {
796 } elsif ($state == 0) {
799 } elsif (($state==0 or $state==1) and s/^PatchSet\s+//) {
802 } elsif ($state == 2 and s/^Date:\s+//) {
805 print STDERR
"Could not parse date: $_\n";
810 } elsif ($state == 3 and s/^Author:\s+//) {
812 if (/^(.*?)\s+<(.*)>/) {
813 ($author_name, $author_email) = ($1, $2);
814 } elsif ($conv_author_name{$_}) {
815 $author_name = $conv_author_name{$_};
816 $author_email = $conv_author_email{$_};
818 $author_name = $author_email = $_;
821 } elsif ($state == 4 and s/^Branch:\s+//) {
823 tr/_/\./ if ( $opt_u );
827 } elsif ($state == 5 and s/^Ancestor branch:\s+//) {
830 $ancestor = $opt_o if $ancestor eq "HEAD";
832 } elsif ($state == 5) {
836 } elsif ($state == 6 and s/^Tag:\s+//) {
838 if ($_ eq "(none)") {
844 } elsif ($state == 7 and /^Log:/) {
847 } elsif ($state == 8 and /^Members:/) {
848 $branch = $opt_o if $branch eq "HEAD";
849 if (defined $branch_date{$branch} and $branch_date{$branch} >= $date) {
851 print "skip patchset $patchset: $date before $branch_date{$branch}\n" if $opt_v;
855 if (!$opt_a && $starttime - 300 - (defined $opt_z ?
$opt_z : 300) <= $date) {
856 # skip if the commit is too recent
857 # given that the cvsps default fuzz is 300s, we give ourselves another
858 # 300s just in case -- this also prevents skipping commits
859 # due to server clock drift
860 print "skip patchset $patchset: $date too recent\n" if $opt_v;
864 if (exists $ignorebranch{$branch}) {
865 print STDERR
"Skipping $branch\n";
870 if ($ancestor eq $branch) {
871 print STDERR
"Branch $branch erroneously stems from itself -- changed ancestor to $opt_o\n";
874 if (defined get_headref
("$remote/$branch")) {
875 print STDERR
"Branch $branch already exists!\n";
879 my $id = get_headref
("$remote/$ancestor");
881 print STDERR
"Branch $ancestor does not exist!\n";
882 $ignorebranch{$branch} = 1;
887 system(qw(git update-ref -m cvsimport),
888 "$remote/$branch", $id);
890 print STDERR
"Could not create branch $branch\n";
891 $ignorebranch{$branch} = 1;
896 $last_branch = $branch if $branch ne $last_branch;
898 } elsif ($state == 8) {
900 } elsif ($state == 9 and /^\s+(.+?):(INITIAL|\d+(?:\.\d+)+)->(\d+(?:\.\d+)+)\s*$/) {
901 # VERSION:1.96->1.96.2.1
902 my $init = ($2 eq "INITIAL");
906 if ($opt_S && $fn =~ m/$opt_S/) {
907 print "SKIPPING $fn v $rev\n";
911 print "Fetching $fn v $rev\n" if $opt_v;
912 my ($tmpname, $size) = $cvs->file($fn,$rev);
915 print "Drop $fn\n" if $opt_v;
917 print "".($init ?
"New" : "Update")." $fn: $size bytes\n" if $opt_v;
918 my $pid = open(my $F, '-|');
919 die $! unless defined $pid;
921 exec("git-hash-object", "-w", $tmpname)
922 or die "Cannot create object: $!\n";
927 my $mode = pmode
($cvs->{'mode'});
928 push(@new,[$mode, $sha, $fn]); # may be resurrected!
931 } elsif ($state == 9 and /^\s+(.+?):\d+(?:\.\d+)+->(\d+(?:\.\d+)+)\(DEAD\)\s*$/) {
935 print "Delete $fn\n" if $opt_v;
936 } elsif ($state == 9 and /^\s*$/) {
938 } elsif (($state == 9 or $state == 10) and /^-+$/) {
940 if ($opt_L && $commitcount > $opt_L) {
944 if (($commitcount & 1023) == 0) {
945 system("git repack -a -d");
948 } elsif ($state == 11 and /^-+$/) {
950 } elsif (/^-+$/) { # end of unknown-line processing
952 } elsif ($state != 11) { # ignore stuff when skipping
953 print "* UNKNOWN LINE * $_\n";
956 commit
() if $branch and $state != 11;
962 # The heuristic of repacking every 1024 commits can leave a
963 # lot of unpacked data. If there is more than 1MB worth of
964 # not-packed objects, repack once more.
965 my $line = `git-count-objects`;
966 if ($line =~ /^(\d+) objects, (\d+) kilobytes$/) {
967 my ($n_objects, $kb) = ($1, $2);
969 and system("git repack -a -d");
972 foreach my $git_index (values %index) {
973 if ($git_index ne "$git_dir/index") {
978 if (defined $orig_git_index) {
979 $ENV{GIT_INDEX_FILE
} = $orig_git_index;
981 delete $ENV{GIT_INDEX_FILE
};
984 # Now switch back to the branch we were in before all of this happened
986 print "DONE.\n" if $opt_v;
990 my $tip_at_end = `git-rev-parse --verify HEAD`;
991 if ($tip_at_start ne $tip_at_end) {
992 for ($tip_at_start, $tip_at_end) { chomp; }
993 print "Fetched into the current branch.\n" if $opt_v;
994 system(qw(git-read-tree -u -m),
995 $tip_at_start, $tip_at_end);
996 die "Fast-forward update failed: $?\n" if $?
;
999 system(qw(git-merge cvsimport HEAD), "$remote/$opt_o");
1000 die "Could not merge $opt_o into the current branch.\n" if $?
;
1003 $orig_branch = "master";
1004 print "DONE; creating $orig_branch branch\n" if $opt_v;
1005 system("git-update-ref", "refs/heads/master", "$remote/$opt_o")
1006 unless defined get_headref
('refs/heads/master');
1007 system("git-symbolic-ref", "$remote/HEAD", "$remote/$opt_o")
1008 if ($opt_r && $opt_o ne 'HEAD');
1009 system('git-update-ref', 'HEAD', "$orig_branch");
1011 system('git checkout -f');
1012 die "checkout failed: $?\n" if $?
;