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