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.
19 use File::Path qw(mkpath);
20 use File::Basename qw(basename dirname);
22 use POSIX qw(strftime);
24 $SIG{'PIPE'}="IGNORE";
27 our($opt_h,$opt_o,$opt_v);
31 Usage: ${\basename $0} -- fetch/update GIT from CVS
33 [ -v (verbose) ] [ -o name-of-HEAD ]
39 getopts("hqvo:") or usage();
42 @ARGV == 2 or usage();
45 my($cvs_tree, $git_tree) = @ARGV;
47 select(STDERR); $|=1; select(STDOUT);
52 # We're only interested in downloading files.
55 my($what,$repo,$subdir) = @_;
56 $what=ref($what) if ref($what);
59 $self->{'buffer'} = "";
63 $self->{'fullrep'} = $repo;
66 $self->{'subdir'} = $subdir;
67 $self->{'lines'} = undef;
74 my $repo = $self->{'fullrep'};
75 if($repo =~ s/^:pserver:(?:(.*?)(?::(.*?))?@)?([^:\/]*)(?::(\d*))?//) {
76 my($user,$pass,$serv,$port) = ($1,$2,$3,$4);
77 $user="anonymous" unless defined $user;
80 $rr2 = ":pserver:$user\@$serv:$repo";
83 my $rr = ":pserver:$user\@$serv:$port$repo";
86 open(H,$ENV{'HOME'}."/.cvspass") and do {
87 # :pserver:cvs@mea.tmt.tele.fi:/cvsroot/zmailer Ah<Z
91 my ($w,$p) = split(/\s/,$_,2);
92 if($w eq $rr or $w eq $rr2) {
99 $pass="A" unless $pass;
102 my $s = IO::Socket::INET->new(PeerHost => $serv, PeerPort => $port);
103 die "Socket to $serv: $!\n" unless defined $s;
104 $s->write("BEGIN AUTH REQUEST\n$repo\n$user\n$pass\nEND AUTH REQUEST\n")
105 or die "Write to $serv: $!\n";
110 if($rep ne "I LOVE YOU\n") {
111 $rep="<unknown>" unless $rep;
112 die "AuthReply: $rep\n";
114 $self->{'socketo'} = $s;
115 $self->{'socketi'} = $s;
116 } else { # local: Fork off our own cvs server.
118 my $pr = IO::Pipe->new();
119 my $pw = IO::Pipe->new();
121 die "Fork: $!\n" unless defined $pid;
126 dup2($pw->fileno(),0);
127 dup2($pr->fileno(),1);
130 exec("cvs","server");
134 $self->{'socketo'} = $pw;
135 $self->{'socketi'} = $pr;
137 $self->{'socketo'}->write("Root $repo\n");
139 # Trial and error says that this probably is the minimum set
140 $self->{'socketo'}->write("Valid-responses ok error Valid-requests Mode M Mbinary E F Checked-in Created Updated Merged Removed\n");
142 $self->{'socketo'}->write("valid-requests\n");
143 $self->{'socketo'}->flush();
145 chomp(my $rep=$self->readline());
146 if($rep !~ s/^Valid-requests\s*//) {
147 $rep="<unknown>" unless $rep;
148 die "Expected Valid-requests from server, but got: $rep\n";
150 chomp(my $res=$self->readline());
151 die "validReply: $res\n" if $res ne "ok";
153 $self->{'socketo'}->write("UseUnchanged\n") if $rep =~ /\bUseUnchanged\b/;
154 $self->{'repo'} = $repo;
159 return $self->{'socketi'}->getline();
163 # Request a file with a given revision.
164 # Trial and error says this is a good way to do it. :-/
165 my($self,$fn,$rev) = @_;
166 $self->{'socketo'}->write("Argument -N\n") or return undef;
167 $self->{'socketo'}->write("Argument -P\n") or return undef;
168 # $self->{'socketo'}->write("Argument -ko\n") or return undef;
169 # -ko: Linus' version doesn't use it
170 $self->{'socketo'}->write("Argument -r\n") or return undef;
171 $self->{'socketo'}->write("Argument $rev\n") or return undef;
172 $self->{'socketo'}->write("Argument --\n") or return undef;
173 $self->{'socketo'}->write("Argument $self->{'subdir'}/$fn\n") or return undef;
174 $self->{'socketo'}->write("Directory .\n") or return undef;
175 $self->{'socketo'}->write("$self->{'repo'}\n") or return undef;
176 $self->{'socketo'}->write("Sticky T1.1\n") or return undef;
177 $self->{'socketo'}->write("co\n") or return undef;
178 $self->{'socketo'}->flush() or return undef;
179 $self->{'lines'} = 0;
183 # Read a line from the server.
184 # ... except that 'line' may be an entire file. ;-)
186 die "Not in lines" unless defined $self->{'lines'};
190 while(defined($line = $self->readline())) {
191 # M U gnupg-cvs-rep/AUTHORS
192 # Updated gnupg-cvs-rep/
193 # /daten/src/rsync/gnupg-cvs-rep/AUTHORS
194 # /AUTHORS/1.1///T1.1
199 if($line =~ s/^(?:Created|Updated) //) {
200 $line = $self->readline(); # path
201 $line = $self->readline(); # Entries line
202 my $mode = $self->readline(); chomp $mode;
203 $self->{'mode'} = $mode;
204 defined (my $cnt = $self->readline())
205 or die "EOF from server after 'Changed'\n";
207 die "Duh: Filesize $cnt" if $cnt !~ /^\d+$/;
212 my $num = $self->{'socketi'}->read($buf,$cnt);
213 die "Server: Filesize $cnt: $num: $!\n" if not defined $num or $num<=0;
217 } elsif($line =~ s/^ //) {
219 } elsif($line =~ /^M\b/) {
221 } elsif($line =~ /^Mbinary\b/) {
223 die "EOF from server after 'Mbinary'" unless defined ($cnt = $self->readline());
225 die "Duh: Mbinary $cnt" if $cnt !~ /^\d+$/ or $cnt<1;
229 my $num = $self->{'socketi'}->read($buf,$cnt);
230 die "S: Mbinary $cnt: $num: $!\n" if not defined $num or $num<=0;
237 # print STDERR "S: ok (".length($res).")\n";
239 } elsif($line =~ s/^E //) {
240 # print STDERR "S: $line\n";
242 die "Unknown: $line\n";
248 my($self,$fn,$rev) = @_;
251 if ($self->_file($fn,$rev)) {
252 $res = $self->_line();
253 return $res if defined $res;
258 $self->_file($fn,$rev)
259 or die "No file command send\n";
260 $res = $self->_line();
261 die "No input: $fn $rev\n" unless defined $res;
268 my $cvs = CVSconn->new(dirname($cvs_tree), basename($cvs_tree));
273 m#(\d{2,4})/(\d\d)/(\d\d)\s(\d\d):(\d\d)(?::(\d\d))?#
274 or die "Unparseable date: $d\n";
275 my $y=$1; $y-=1900 if $y>1900;
276 return timegm($6||0,$5,$4,$3,$2-1,$y);
284 for my $x(split(//,$mode)) {
289 } elsif($x eq "u") { $um |= 0700;
290 } elsif($x eq "g") { $um |= 0070;
291 } elsif($x eq "o") { $um |= 0007;
292 } elsif($x eq "r") { $mm |= 0444;
293 } elsif($x eq "w") { $mm |= 0222;
294 } elsif($x eq "x") { $mm |= 0111;
295 } elsif($x eq "=") { # do nothing
296 } else { die "Unknown mode: $mode\n";
303 my $tmpcv = "/var/cache/cvs";
312 or mkdir($git_tree,0777)
313 or die "Could not create $git_tree: $!";
316 my $last_branch = "";
319 my $git_dir = $ENV{"GIT_DIR"} || ".git";
320 $git_dir = getwd()."/".$git_dir unless $git_dir =~ m#^/#;
321 $ENV{"GIT_DIR"} = $git_dir;
322 unless(-d $git_dir) {
323 system("git-init-db");
324 die "Cannot init the GIT db at $git_tree: $?\n" if $?;
325 system("git-read-tree");
326 die "Cannot init an empty tree: $?\n" if $?;
328 $last_branch = $opt_o;
330 $last_branch = basename(readlink("$git_dir/HEAD"));
331 die "Cannot read the last branch name: $!\n" unless $last_branch;
333 # Get the last import timestamps
334 opendir(D,"$git_dir/refs/heads");
335 while(defined(my $head = readdir(D))) {
336 next if $head =~ /^\./;
337 open(F,"$git_dir/refs/heads/$head")
338 or die "Bad head branch: $head: $!\n";
339 chomp(my $ftag = <F>);
341 open(F,"git-cat-file commit $ftag |");
343 next unless /^author\s.*\s(\d+)\s[-+]\d{4}$/;
344 $branch_date{$head} = $1;
353 or die "Could not create git subdir ($git_dir).\n";
355 my $pid = open(CVS,"-|");
356 die "Cannot fork: $!\n" unless defined $pid;
358 exec("cvsps","-A","--cvs-direct",$cvs_tree);
359 die "Could not start cvsps: $!\n";
364 #---------------------
366 #Date: 1999/09/18 13:03:59
368 #Branch: STABLE-BRANCH-1-0
369 #Ancestor branch: HEAD
372 # See ChangeLog: Sat Sep 18 13:03:28 CEST 1999 Werner Koch
374 # README:1.57->1.57.2.1
375 # VERSION:1.96->1.96.2.1
377 #---------------------
381 my($patchset,$date,$author,$branch,$ancestor,$tag,$logmsg);
385 system("git-update-cache","--force-remove","--",@old) if @old;
386 die "Cannot remove files: $?\n" if $?;
387 system("git-update-cache","--add","--",@new) if @new;
388 die "Cannot add files: $?\n" if $?;
391 die "Cannot fork: $!" unless defined $pid;
393 exec("git-write-tree");
394 die "Cannot exec git-write-tree: $!\n";
396 chomp(my $tree = <C>);
398 or die "Cannot get tree id ($tree): $!\n";
400 or die "Error running git-write-tree: $?\n";
401 print "Tree ID $tree\n" if $opt_v;
404 if(open(C,"$git_dir/refs/heads/$last_branch")) {
405 chomp($parent = <C>);
407 length($parent) == 40
408 or die "Cannot get parent id ($parent): $!\n";
409 print "Parent ID $parent\n" if $opt_v;
413 or die "No pipe: $!\n";
415 die "Cannot fork: $!" unless defined $pid;
420 @par = ("-p",$parent) if $parent;
422 "GIT_AUTHOR_NAME=$author",
423 "GIT_AUTHOR_EMAIL=$author",
424 "GIT_AUTHOR_DATE=".strftime("+0000 %Y-%m-%d %H:%M:%S",gmtime($date)),
425 "GIT_COMMITTER_NAME=$author",
426 "GIT_COMMITTER_EMAIL=$author",
427 "GIT_COMMITTER_DATE=".strftime("+0000 %Y-%m-%d %H:%M:%S",gmtime($date)),
428 "git-commit-tree", $tree,@par);
429 die "Cannot exec git-commit-tree: $!\n";
433 or die "Error writing to git-commit-tree: $!\n";
435 or die "Error running git-commit-tree: $?\n";
436 print "Committed patch $patchset ($branch)\n" if $opt_v;
437 chomp(my $cid = <I>);
439 or die "Cannot get commit id ($cid): $!\n";
440 print "Commit ID $cid\n" if $opt_v;
443 open(C,">$git_dir/refs/heads/$branch")
444 or die "Cannot open branch $branch for update: $!\n";
446 or die "Cannot write branch $branch for update: $!\n";
448 or die "Cannot write branch $branch for update: $!\n";
451 open(C,">$git_dir/refs/tags/$tag")
452 or die "Cannot create tag $tag: $!\n";
454 or die "Cannot write tag $branch: $!\n";
456 or die "Cannot write tag $branch: $!\n";
457 print "Created tag '$tag' on '$branch'\n" if $opt_v;
466 if($state == 0 and /^-+$/) {
468 } elsif($state == 0) {
471 } elsif(($state==0 or $state==1) and s/^PatchSet\s+//) {
474 } elsif($state == 2 and s/^Date:\s+//) {
477 print STDERR "Could not parse date: $_\n";
482 } elsif($state == 3 and s/^Author:\s+//) {
486 } elsif($state == 4 and s/^Branch:\s+//) {
490 } elsif($state == 5 and s/^Ancestor branch:\s+//) {
493 $ancestor = $opt_o if $ancestor == "HEAD";
495 } elsif($state == 5) {
499 } elsif($state == 6 and s/^Tag:\s+//) {
507 } elsif($state == 7 and /^Log:/) {
510 } elsif($state == 8 and /^Members:/) {
511 $branch = $opt_o if $branch eq "HEAD";
512 if(defined $branch_date{$branch} and $branch_date{$branch} >= $date) {
514 print "skip patchset $patchset: $date before $branch_date{$branch}\n";
519 if(-f "$git_dir/refs/heads/$branch") {
520 print STDERR "Branch $branch already exists!\n";
524 unless(open(H,"$git_dir/refs/heads/$ancestor")) {
525 print STDERR "Branch $ancestor does not exist!\n";
531 unless(open(H,"> $git_dir/refs/heads/$branch")) {
532 print STDERR "Could not create branch $branch: $!\n";
537 or die "Could not write branch $branch: $!";
539 or die "Could not write branch $branch: $!";
541 if(($ancestor || $branch) ne $last_branch) {
542 system("git-read-tree -m -u $last_branch $branch");
543 die "read-tree $branch failed at $branch: $?\n" if $?;
545 if($branch ne $last_branch) {
546 unlink("$git_dir/HEAD");
547 symlink("refs/heads/$branch","$git_dir/HEAD");
548 $last_branch = $branch;
551 } elsif($state == 8) {
553 } elsif($state == 9 and /^\s+(\S+):(?:INITIAL|\d(?:\.\d+)+)->(\d(?:\.\d+)+)\s*$/) {
554 # VERSION:1.96->1.96.2.1
556 my $data = $cvs->file($fn,$2);
557 print "Update $fn: ".length($data)." bytes.\n";
558 mkpath(dirname($fn),$opt_v);
560 or die "Cannot create '$fn': $!\n";
562 or die "Cannot write to '$fn': $!\n";
564 or die "Cannot write to '$fn': $!\n";
565 chmod(pmode($cvs->{'mode'}), $fn);
566 push(@new,$fn); # may be resurrected!
567 } elsif($state == 9 and /^\s+(\S+):\d(?:\.\d+)+->(\d(?:\.\d+)+)\(DEAD\)\s*$/) {
569 } elsif($state == 9 and /^\s*$/) {
571 } elsif(($state == 9 or $state == 10) and /^-+$/) {
574 } elsif($state == 11 and /^-+$/) {
576 } elsif(/^-+$/) { # end of unknown-line processing
578 } elsif($state != 11) { # ignore stuff when skipping
579 print "* UNKNOWN LINE * $_\n";
582 &$commit() if $branch and $state != 11;
584 print "DONE\n" if $opt_v;