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);
33 my (%conv_author_name, %conv_author_email);
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] [-P file] [-C GIT_repository] [-z fuzz] [-i] [-k]
40 [-u] [-s subst] [-a] [-m] [-M regex] [-S regex] [-L commitlimit]
46 sub read_author_info
($) {
49 open my $f, '<', "$file" or die("Failed to open $file: $!\n");
52 # Expected format is this:
53 # exon=Andreas Ericsson <ae@op5.se>
54 if (m/^(\S+?)\s*=\s*(.+?)\s*<(.+)>\s*$/) {
56 $conv_author_name{$user} = $2;
57 $conv_author_email{$user} = $3;
59 # However, we also read from CVSROOT/users format
61 elsif (/^(\w+):(['"]?)(.+?)\2\s*$/) {
63 ($user, $mapped) = ($1, $3);
64 if ($mapped =~ /^\s*(.*?)\s*<(.*)>\s*$/) {
65 $conv_author_name{$user} = $1;
66 $conv_author_email{$user} = $2;
68 elsif ($mapped =~ /^<?(.*)>?$/) {
69 $conv_author_name{$user} = $user;
70 $conv_author_email{$user} = $1;
73 # NEEDSWORK: Maybe warn on unrecognized lines?
78 sub write_author_info
($) {
80 open my $f, '>', $file or
81 die("Failed to open $file for writing: $!");
83 foreach (keys %conv_author_name) {
84 print $f "$_=$conv_author_name{$_} <$conv_author_email{$_}>\n";
89 # convert getopts specs for use by git-repo-config
90 sub read_repo_config
{
91 # Split the string between characters, unless there is a ':'
92 # So "abc:de" becomes ["a", "b", "c:", "d", "e"]
93 my @opts = split(/ *(?!:)/, shift);
94 foreach my $o (@opts) {
97 my $arg = 'git-repo-config';
98 $arg .= ' --bool' if ($o !~ /:$/);
100 chomp(my $tmp = `$arg --get cvsimport.$key`);
101 if ($tmp && !($arg =~ /--bool/ && $tmp eq 'false')) {
103 my $opt_name = "opt_" . $key;
110 chomp(my $module = `git-repo-config --get cvsimport.module`);
111 push(@ARGV, $module);
115 my $opts = "haivmkuo:d:p:C:z:s:M:P:A:S:L:";
116 read_repo_config
($opts);
117 getopts
($opts) or usage
();
120 @ARGV <= 1 or usage
();
123 $ENV{"CVSROOT"} = $opt_d;
124 } elsif (-f
'CVS/Root') {
125 open my $f, '<', 'CVS/Root' or die 'Failed to open CVS/Root';
129 $ENV{"CVSROOT"} = $opt_d;
130 } elsif ($ENV{"CVSROOT"}) {
131 $opt_d = $ENV{"CVSROOT"};
133 die "CVSROOT needs to be set";
139 my $git_tree = $opt_C;
144 $cvs_tree = $ARGV[0];
145 } elsif (-f
'CVS/Repository') {
146 open my $f, '<', 'CVS/Repository' or
147 die 'Failed to open CVS/Repository';
157 @mergerx = ( qr/\W(?:from|of|merge|merging|merged) (\w+)/i );
160 push (@mergerx, qr/$opt_M/);
163 # Remember UTC of our starting time
164 # we'll want to avoid importing commits
165 # that are too recent
166 our $starttime = time();
168 select(STDERR
); $|=1; select(STDOUT
);
173 # We're only interested in connecting and downloading, so ...
176 use File
::Temp
qw(tempfile);
177 use POSIX
qw(strftime dup2);
180 my ($what,$repo,$subdir) = @_;
181 $what=ref($what) if ref($what);
184 $self->{'buffer'} = "";
188 $self->{'fullrep'} = $repo;
191 $self->{'subdir'} = $subdir;
192 $self->{'lines'} = undef;
199 my $repo = $self->{'fullrep'};
200 if ($repo =~ s/^:pserver(?:([^:]*)):(?:(.*?)(?::(.*?))?@)?([^:\/]*)(?::(\d*))?//) {
201 my ($param,$user,$pass,$serv,$port) = ($1,$2,$3,$4,$5);
203 my ($proxyhost,$proxyport);
204 if ($param && ($param =~ m/proxy=([^;]+)/)) {
206 # Default proxyport, if not specified, is 8080.
208 if ($ENV{"CVS_PROXY_PORT"}) {
209 $proxyport = $ENV{"CVS_PROXY_PORT"};
211 if ($param =~ m/proxyport=([^;]+)/) {
216 $user="anonymous" unless defined $user;
219 $rr2 = ":pserver:$user\@$serv:$repo";
222 my $rr = ":pserver:$user\@$serv:$port$repo";
225 open(H
,$ENV{'HOME'}."/.cvspass") and do {
226 # :pserver:cvs@mea.tmt.tele.fi:/cvsroot/zmailer Ah<Z
230 my ($w,$p) = split(/\s/,$_,2);
231 if ($w eq $rr or $w eq $rr2) {
238 $pass="A" unless $pass;
243 # Use a HTTP Proxy. Only works for HTTP proxies that
244 # don't require user authentication
246 # See: http://www.ietf.org/rfc/rfc2817.txt
248 $s = IO
::Socket
::INET
->new(PeerHost
=> $proxyhost, PeerPort
=> $proxyport);
249 die "Socket to $proxyhost: $!\n" unless defined $s;
250 $s->write("CONNECT $serv:$port HTTP/1.1\r\nHost: $serv:$port\r\n\r\n")
251 or die "Write to $proxyhost: $!\n";
256 # The answer should look like 'HTTP/1.x 2yy ....'
257 if (!($rep =~ m
#^HTTP/1\.. 2[0-9][0-9]#)) {
258 die "Proxy connect: $rep\n";
260 # Skip up to the empty line of the proxy server output
261 # including the response headers.
262 while ($rep = <$s>) {
263 last if (!defined $rep ||
268 $s = IO
::Socket
::INET
->new(PeerHost
=> $serv, PeerPort
=> $port);
269 die "Socket to $serv: $!\n" unless defined $s;
272 $s->write("BEGIN AUTH REQUEST\n$repo\n$user\n$pass\nEND AUTH REQUEST\n")
273 or die "Write to $serv: $!\n";
278 if ($rep ne "I LOVE YOU\n") {
279 $rep="<unknown>" unless $rep;
280 die "AuthReply: $rep\n";
282 $self->{'socketo'} = $s;
283 $self->{'socketi'} = $s;
284 } else { # local or ext: Fork off our own cvs server.
285 my $pr = IO
::Pipe
->new();
286 my $pw = IO
::Pipe
->new();
288 die "Fork: $!\n" unless defined $pid;
290 $cvs = $ENV{CVS_SERVER
} if exists $ENV{CVS_SERVER
};
292 $rsh = $ENV{CVS_RSH
} if exists $ENV{CVS_RSH
};
294 my @cvs = ($cvs, 'server');
295 my ($local, $user, $host);
296 $local = $repo =~ s/:local://;
299 $local = !($repo =~ s/^(?:([^\@:]+)\@)?([^:]+)://);
300 ($user, $host) = ($1, $2);
304 unshift @cvs, $rsh, '-l', $user, $host;
306 unshift @cvs, $rsh, $host;
313 dup2
($pw->fileno(),0);
314 dup2
($pr->fileno(),1);
321 $self->{'socketo'} = $pw;
322 $self->{'socketi'} = $pr;
324 $self->{'socketo'}->write("Root $repo\n");
326 # Trial and error says that this probably is the minimum set
327 $self->{'socketo'}->write("Valid-responses ok error Valid-requests Mode M Mbinary E Checked-in Created Updated Merged Removed\n");
329 $self->{'socketo'}->write("valid-requests\n");
330 $self->{'socketo'}->flush();
332 chomp(my $rep=$self->readline());
333 if ($rep !~ s/^Valid-requests\s*//) {
334 $rep="<unknown>" unless $rep;
335 die "Expected Valid-requests from server, but got: $rep\n";
337 chomp(my $res=$self->readline());
338 die "validReply: $res\n" if $res ne "ok";
340 $self->{'socketo'}->write("UseUnchanged\n") if $rep =~ /\bUseUnchanged\b/;
341 $self->{'repo'} = $repo;
346 return $self->{'socketi'}->getline();
350 # Request a file with a given revision.
351 # Trial and error says this is a good way to do it. :-/
352 my ($self,$fn,$rev) = @_;
353 $self->{'socketo'}->write("Argument -N\n") or return undef;
354 $self->{'socketo'}->write("Argument -P\n") or return undef;
355 # -kk: Linus' version doesn't use it - defaults to off
357 $self->{'socketo'}->write("Argument -kk\n") or return undef;
359 $self->{'socketo'}->write("Argument -r\n") or return undef;
360 $self->{'socketo'}->write("Argument $rev\n") or return undef;
361 $self->{'socketo'}->write("Argument --\n") or return undef;
362 $self->{'socketo'}->write("Argument $self->{'subdir'}/$fn\n") or return undef;
363 $self->{'socketo'}->write("Directory .\n") or return undef;
364 $self->{'socketo'}->write("$self->{'repo'}\n") or return undef;
365 # $self->{'socketo'}->write("Sticky T1.0\n") or return undef;
366 $self->{'socketo'}->write("co\n") or return undef;
367 $self->{'socketo'}->flush() or return undef;
368 $self->{'lines'} = 0;
372 # Read a line from the server.
373 # ... except that 'line' may be an entire file. ;-)
374 my ($self, $fh) = @_;
375 die "Not in lines" unless defined $self->{'lines'};
379 while (defined($line = $self->readline())) {
380 # M U gnupg-cvs-rep/AUTHORS
381 # Updated gnupg-cvs-rep/
382 # /daten/src/rsync/gnupg-cvs-rep/AUTHORS
383 # /AUTHORS/1.1///T1.1
388 if ($line =~ s/^(?:Created|Updated) //) {
389 $line = $self->readline(); # path
390 $line = $self->readline(); # Entries line
391 my $mode = $self->readline(); chomp $mode;
392 $self->{'mode'} = $mode;
393 defined (my $cnt = $self->readline())
394 or die "EOF from server after 'Changed'\n";
396 die "Duh: Filesize $cnt" if $cnt !~ /^\d+$/;
398 $res = $self->_fetchfile($fh, $cnt);
399 } elsif ($line =~ s/^ //) {
401 $res += length($line);
402 } elsif ($line =~ /^M\b/) {
404 } elsif ($line =~ /^Mbinary\b/) {
406 die "EOF from server after 'Mbinary'" unless defined ($cnt = $self->readline());
408 die "Duh: Mbinary $cnt" if $cnt !~ /^\d+$/ or $cnt<1;
410 $res += $self->_fetchfile($fh, $cnt);
414 # print STDERR "S: ok (".length($res).")\n";
416 } elsif ($line =~ s/^E //) {
417 # print STDERR "S: $line\n";
418 } elsif ($line =~ /^(Remove-entry|Removed) /i) {
419 $line = $self->readline(); # filename
420 $line = $self->readline(); # OK
422 die "Unknown: $line" if $line ne "ok";
425 die "Unknown: $line\n";
432 my ($self,$fn,$rev) = @_;
435 my ($fh, $name) = tempfile
('gitcvs.XXXXXX',
436 DIR
=> File
::Spec
->tmpdir(), UNLINK
=> 1);
438 $self->_file($fn,$rev) and $res = $self->_line($fh);
441 print STDERR
"Server has gone away while fetching $fn $rev, retrying...\n";
444 $self->_file($fn,$rev) or die "No file command send";
445 $res = $self->_line($fh);
446 die "Retry failed" unless defined $res;
450 return ($name, $res);
453 my ($self, $fh, $cnt) = @_;
455 my $bufsize = 1024 * 1024;
457 if ($bufsize > $cnt) {
461 my $num = $self->{'socketi'}->read($buf,$bufsize);
462 die "Server: Filesize $cnt: $num: $!\n" if not defined $num or $num<=0;
473 my $cvs = CVSconn
->new($opt_d, $cvs_tree);
478 m
#(\d{2,4})/(\d\d)/(\d\d)\s(\d\d):(\d\d)(?::(\d\d))?#
479 or die "Unparseable date: $d\n";
480 my $y=$1; $y-=1900 if $y>1900;
481 return timegm
($6||0,$5,$4,$3,$2-1,$y);
489 for my $x(split(//,$mode)) {
494 } elsif ($x eq "u") { $um |= 0700;
495 } elsif ($x eq "g") { $um |= 0070;
496 } elsif ($x eq "o") { $um |= 0007;
497 } elsif ($x eq "r") { $mm |= 0444;
498 } elsif ($x eq "w") { $mm |= 0222;
499 } elsif ($x eq "x") { $mm |= 0111;
500 } elsif ($x eq "=") { # do nothing
501 } else { die "Unknown mode: $mode\n";
516 return $s =~ /^[a-f0-9]{40}$/;
519 sub get_headref
($$) {
523 my $f = "$git_dir/refs/heads/$name";
524 if (open(my $fh, $f)) {
525 chomp(my $r = <$fh>);
526 is_sha1
($r) or die "Cannot get head id for $name ($r): $!";
529 die "unable to open $f: $!" unless $! == POSIX
::ENOENT
;
534 or mkdir($git_tree,0777)
535 or die "Could not create $git_tree: $!";
538 my $last_branch = "";
539 my $orig_branch = "";
541 my $tip_at_start = undef;
543 my $git_dir = $ENV{"GIT_DIR"} || ".git";
544 $git_dir = getwd
()."/".$git_dir unless $git_dir =~ m
#^/#;
545 $ENV{"GIT_DIR"} = $git_dir;
547 $orig_git_index = $ENV{GIT_INDEX_FILE
} if exists $ENV{GIT_INDEX_FILE
};
549 my %index; # holds filenames of one index per branch
551 unless (-d
$git_dir) {
553 die "Cannot init the GIT db at $git_tree: $?\n" if $?
;
554 system("git-read-tree");
555 die "Cannot init an empty tree: $?\n" if $?
;
557 $last_branch = $opt_o;
560 -f
"$git_dir/refs/heads/$opt_o"
561 or die "Branch '$opt_o' does not exist.\n".
562 "Either use the correct '-o branch' option,\n".
563 "or import to a new repository.\n";
565 open(F
, "git-symbolic-ref HEAD |") or
566 die "Cannot run git-symbolic-ref: $!\n";
567 chomp ($last_branch = <F
>);
568 $last_branch = basename
($last_branch);
570 unless ($last_branch) {
571 warn "Cannot read the last branch name: $! -- assuming 'master'\n";
572 $last_branch = "master";
574 $orig_branch = $last_branch;
575 $tip_at_start = `git-rev-parse --verify HEAD`;
577 # Get the last import timestamps
578 my $fmt = '($ref, $author) = (%(refname), %(author));';
579 open(H
, "git-for-each-ref --perl --format='$fmt' refs/heads |") or
580 die "Cannot run git-for-each-ref: $!\n";
581 while (defined(my $entry = <H
>)) {
583 eval($entry) || die "cannot eval refs list: $@";
584 my ($head) = ($ref =~ m
|^refs
/heads/(.*)|);
585 $author =~ /^.*\s(\d+)\s[-+]\d{4}$/;
586 $branch_date{$head} = $1;
592 or die "Could not create git subdir ($git_dir).\n";
594 # now we read (and possibly save) author-info as well
595 -f
"$git_dir/cvs-authors" and
596 read_author_info
("$git_dir/cvs-authors");
598 read_author_info
($opt_A);
599 write_author_info
("$git_dir/cvs-authors");
604 # run cvsps into a file unless we are getting
605 # it passed as a file via $opt_P
609 print "Running cvsps...\n" if $opt_v;
610 my $pid = open(CVSPS
,"-|");
612 die "Cannot fork: $!\n" unless defined $pid;
615 @opt = split(/,/,$opt_p) if defined $opt_p;
616 unshift @opt, '-z', $opt_z if defined $opt_z;
617 unshift @opt, '-q' unless defined $opt_v;
618 unless (defined($opt_p) && $opt_p =~ m/--no-cvs-direct/) {
619 push @opt, '--cvs-direct';
621 exec("cvsps","--norc",@opt,"-u","-A",'--root',$opt_d,$cvs_tree);
622 die "Could not start cvsps: $!\n";
624 ($cvspsfh, $cvspsfile) = tempfile
('gitXXXXXX', SUFFIX
=> '.cvsps',
625 DIR
=> File
::Spec
->tmpdir());
635 open(CVS
, "<$cvspsfile") or die $!;
638 #---------------------
640 #Date: 1999/09/18 13:03:59
642 #Branch: STABLE-BRANCH-1-0
643 #Ancestor branch: HEAD
646 # See ChangeLog: Sat Sep 18 13:03:28 CEST 1999 Werner Koch
648 # README:1.57->1.57.2.1
649 # VERSION:1.96->1.96.2.1
651 #---------------------
655 sub update_index
(\@\@
) {
658 open(my $fh, '|-', qw(git-update-index -z --index-info))
659 or die "unable to open git-update-index: $!";
661 (map { "0 0000000000000000000000000000000000000000\t$_\0" }
663 (map { '100' . sprintf('%o', $_->[0]) . " $_->[1]\t$_->[2]\0" }
665 or die "unable to write to git-update-index: $!";
667 or die "unable to write to git-update-index: $!";
668 $?
and die "git-update-index reported error: $?";
672 open(my $fh, '-|', qw(git-write-tree))
673 or die "unable to open git-write-tree: $!";
674 chomp(my $tree = <$fh>);
676 or die "Cannot get tree id ($tree): $!";
678 or die "Error running git-write-tree: $?\n";
679 print "Tree ID $tree\n" if $opt_v;
683 my ($patchset,$date,$author_name,$author_email,$branch,$ancestor,$tag,$logmsg);
684 my (@old,@new,@skipped,%ignorebranch);
686 # commits that cvsps cannot place anywhere...
687 $ignorebranch{'#CVSPS_NO_BRANCH'} = 1;
690 if ($branch eq $opt_o && !$index{branch
} && !get_headref
($branch, $git_dir)) {
691 # looks like an initial commit
692 # use the index primed by git-init
693 $ENV{GIT_INDEX_FILE
} = '.git/index';
694 $index{$branch} = '.git/index';
696 # use an index per branch to speed up
697 # imports of projects with many branches
698 unless ($index{$branch}) {
699 $index{$branch} = tmpnam
();
700 $ENV{GIT_INDEX_FILE
} = $index{$branch};
702 system("git-read-tree", $ancestor);
704 system("git-read-tree", $branch);
706 die "read-tree failed: $?\n" if $?
;
709 $ENV{GIT_INDEX_FILE
} = $index{$branch};
711 update_index
(@old, @new);
713 my $tree = write_tree
();
714 my $parent = get_headref
($last_branch, $git_dir);
715 print "Parent ID " . ($parent ?
$parent : "(empty)") . "\n" if $opt_v;
718 push @commit_args, ("-p", $parent) if $parent;
720 # loose detection of merges
721 # based on the commit msg
722 foreach my $rx (@mergerx) {
723 next unless $logmsg =~ $rx && $1;
724 my $mparent = $1 eq 'HEAD' ?
$opt_o : $1;
725 if (my $sha1 = get_headref
($mparent, $git_dir)) {
726 push @commit_args, '-p', $mparent;
727 print "Merge parent branch: $mparent\n" if $opt_v;
731 my $commit_date = strftime
("+0000 %Y-%m-%d %H:%M:%S",gmtime($date));
732 $ENV{GIT_AUTHOR_NAME
} = $author_name;
733 $ENV{GIT_AUTHOR_EMAIL
} = $author_email;
734 $ENV{GIT_AUTHOR_DATE
} = $commit_date;
735 $ENV{GIT_COMMITTER_NAME
} = $author_name;
736 $ENV{GIT_COMMITTER_EMAIL
} = $author_email;
737 $ENV{GIT_COMMITTER_DATE
} = $commit_date;
738 my $pid = open2
(my $commit_read, my $commit_write,
739 'git-commit-tree', $tree, @commit_args);
741 # compatibility with git2cvs
742 substr($logmsg,32767) = "" if length($logmsg) > 32767;
743 $logmsg =~ s/[\s\n]+\z//;
746 $logmsg .= "\n\n\nSKIPPED:\n\t";
747 $logmsg .= join("\n\t", @skipped) . "\n";
751 print($commit_write "$logmsg\n") && close($commit_write)
752 or die "Error writing to git-commit-tree: $!\n";
754 print "Committed patch $patchset ($branch $commit_date)\n" if $opt_v;
755 chomp(my $cid = <$commit_read>);
756 is_sha1
($cid) or die "Cannot get commit id ($cid): $!\n";
757 print "Commit ID $cid\n" if $opt_v;
761 die "Error running git-commit-tree: $?\n" if $?
;
763 system("git-update-ref refs/heads/$branch $cid") == 0
764 or die "Cannot write branch $branch for update: $!\n";
767 my ($in, $out) = ('','');
769 $xtag =~ s/\s+\*\*.*$//; # Remove stuff like ** INVALID ** and ** FUNKY **
770 $xtag =~ tr/_/\./ if ( $opt_u );
771 $xtag =~ s/[\/]/$opt_s/g
;
773 my $pid = open2
($in, $out, 'git-mktag');
774 print $out "object $cid\n".
777 "tagger $author_name <$author_email>\n"
778 or die "Cannot create tag object $xtag: $!\n";
780 or die "Cannot create tag object $xtag: $!\n";
785 if ( !close($in) or waitpid($pid, 0) != $pid or
786 $?
!= 0 or $tagobj !~ /^[0123456789abcdef]{40}$/ ) {
787 die "Cannot create tag object $xtag: $!\n";
791 open(C
,">$git_dir/refs/tags/$xtag")
792 or die "Cannot create tag $xtag: $!\n";
794 or die "Cannot write tag $xtag: $!\n";
796 or die "Cannot write tag $xtag: $!\n";
798 print "Created tag '$xtag' on '$branch'\n" if $opt_v;
805 if ($state == 0 and /^-+$/) {
807 } elsif ($state == 0) {
810 } elsif (($state==0 or $state==1) and s/^PatchSet\s+//) {
813 } elsif ($state == 2 and s/^Date:\s+//) {
816 print STDERR
"Could not parse date: $_\n";
821 } elsif ($state == 3 and s/^Author:\s+//) {
823 if (/^(.*?)\s+<(.*)>/) {
824 ($author_name, $author_email) = ($1, $2);
825 } elsif ($conv_author_name{$_}) {
826 $author_name = $conv_author_name{$_};
827 $author_email = $conv_author_email{$_};
829 $author_name = $author_email = $_;
832 } elsif ($state == 4 and s/^Branch:\s+//) {
837 } elsif ($state == 5 and s/^Ancestor branch:\s+//) {
840 $ancestor = $opt_o if $ancestor eq "HEAD";
842 } elsif ($state == 5) {
846 } elsif ($state == 6 and s/^Tag:\s+//) {
848 if ($_ eq "(none)") {
854 } elsif ($state == 7 and /^Log:/) {
857 } elsif ($state == 8 and /^Members:/) {
858 $branch = $opt_o if $branch eq "HEAD";
859 if (defined $branch_date{$branch} and $branch_date{$branch} >= $date) {
861 print "skip patchset $patchset: $date before $branch_date{$branch}\n" if $opt_v;
865 if (!$opt_a && $starttime - 300 - (defined $opt_z ?
$opt_z : 300) <= $date) {
866 # skip if the commit is too recent
867 # that the cvsps default fuzz is 300s, we give ourselves another
868 # 300s just in case -- this also prevents skipping commits
869 # due to server clock drift
870 print "skip patchset $patchset: $date too recent\n" if $opt_v;
874 if (exists $ignorebranch{$branch}) {
875 print STDERR
"Skipping $branch\n";
880 if ($ancestor eq $branch) {
881 print STDERR
"Branch $branch erroneously stems from itself -- changed ancestor to $opt_o\n";
884 if (-f
"$git_dir/refs/heads/$branch") {
885 print STDERR
"Branch $branch already exists!\n";
889 unless (open(H
,"$git_dir/refs/heads/$ancestor")) {
890 print STDERR
"Branch $ancestor does not exist!\n";
891 $ignorebranch{$branch} = 1;
897 unless (open(H
,"> $git_dir/refs/heads/$branch")) {
898 print STDERR
"Could not create branch $branch: $!\n";
899 $ignorebranch{$branch} = 1;
904 or die "Could not write branch $branch: $!";
906 or die "Could not write branch $branch: $!";
908 $last_branch = $branch if $branch ne $last_branch;
910 } elsif ($state == 8) {
912 } elsif ($state == 9 and /^\s+(.+?):(INITIAL|\d+(?:\.\d+)+)->(\d+(?:\.\d+)+)\s*$/) {
913 # VERSION:1.96->1.96.2.1
914 my $init = ($2 eq "INITIAL");
918 if ($opt_S && $fn =~ m/$opt_S/) {
919 print "SKIPPING $fn v $rev\n";
923 print "Fetching $fn v $rev\n" if $opt_v;
924 my ($tmpname, $size) = $cvs->file($fn,$rev);
927 print "Drop $fn\n" if $opt_v;
929 print "".($init ?
"New" : "Update")." $fn: $size bytes\n" if $opt_v;
930 my $pid = open(my $F, '-|');
931 die $! unless defined $pid;
933 exec("git-hash-object", "-w", $tmpname)
934 or die "Cannot create object: $!\n";
939 my $mode = pmode
($cvs->{'mode'});
940 push(@new,[$mode, $sha, $fn]); # may be resurrected!
943 } elsif ($state == 9 and /^\s+(.+?):\d+(?:\.\d+)+->(\d+(?:\.\d+)+)\(DEAD\)\s*$/) {
947 print "Delete $fn\n" if $opt_v;
948 } elsif ($state == 9 and /^\s*$/) {
950 } elsif (($state == 9 or $state == 10) and /^-+$/) {
952 if ($opt_L && $commitcount > $opt_L) {
956 if (($commitcount & 1023) == 0) {
957 system("git repack -a -d");
960 } elsif ($state == 11 and /^-+$/) {
962 } elsif (/^-+$/) { # end of unknown-line processing
964 } elsif ($state != 11) { # ignore stuff when skipping
965 print "* UNKNOWN LINE * $_\n";
968 commit
() if $branch and $state != 11;
974 # The heuristic of repacking every 1024 commits can leave a
975 # lot of unpacked data. If there is more than 1MB worth of
976 # not-packed objects, repack once more.
977 my $line = `git-count-objects`;
978 if ($line =~ /^(\d+) objects, (\d+) kilobytes$/) {
979 my ($n_objects, $kb) = ($1, $2);
981 and system("git repack -a -d");
984 foreach my $git_index (values %index) {
985 if ($git_index ne '.git/index') {
990 if (defined $orig_git_index) {
991 $ENV{GIT_INDEX_FILE
} = $orig_git_index;
993 delete $ENV{GIT_INDEX_FILE
};
996 # Now switch back to the branch we were in before all of this happened
998 print "DONE.\n" if $opt_v;
1002 my $tip_at_end = `git-rev-parse --verify HEAD`;
1003 if ($tip_at_start ne $tip_at_end) {
1004 for ($tip_at_start, $tip_at_end) { chomp; }
1005 print "Fetched into the current branch.\n" if $opt_v;
1006 system(qw(git-read-tree -u -m),
1007 $tip_at_start, $tip_at_end);
1008 die "Fast-forward update failed: $?\n" if $?
;
1011 system(qw(git-merge cvsimport HEAD), "refs/heads/$opt_o");
1012 die "Could not merge $opt_o into the current branch.\n" if $?
;
1015 $orig_branch = "master";
1016 print "DONE; creating $orig_branch branch\n" if $opt_v;
1017 system("git-update-ref", "refs/heads/master", "refs/heads/$opt_o")
1018 unless -f
"$git_dir/refs/heads/master";
1019 system('git-update-ref', 'HEAD', "$orig_branch");
1021 system('git checkout');
1022 die "checkout failed: $?\n" if $?
;