Local cvsimport fixups
[git/git.git] / git-cvsimport-script
CommitLineData
a57a9493 1#!/usr/bin/perl -w
9718a00b 2
a57a9493
MU
3# 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.
15
16use strict;
17use warnings;
18use Getopt::Std;
19use File::Path qw(mkpath);
20use File::Basename qw(basename dirname);
21use Time::Local;
2a3e1a85
MU
22use IO::Socket;
23use IO::Pipe;
24use POSIX qw(strftime dup2);
a57a9493
MU
25
26$SIG{'PIPE'}="IGNORE";
27$ENV{'TZ'}="UTC";
28
2a3e1a85 29our($opt_h,$opt_o,$opt_v,$opt_d);
a57a9493
MU
30
31sub usage() {
32 print STDERR <<END;
2a3e1a85
MU
33Usage: ${\basename $0} # fetch/update GIT from CVS
34 [ -o branch-for-HEAD ] [ -h ] [ -v ] [ -d CVSROOT ]
35 CVS_module [ GIT_repository ]
a57a9493
MU
36END
37 exit(1);
38}
39
2a3e1a85 40getopts("hqvo:d:") or usage();
a57a9493
MU
41usage if $opt_h;
42
2a3e1a85 43@ARGV == 1 or @ARGV == 2 or usage();
a57a9493
MU
44
45my($cvs_tree, $git_tree) = @ARGV;
46
2a3e1a85
MU
47if($opt_d) {
48 $ENV{"CVSROOT"} = $opt_d;
49} elsif($ENV{"CVSROOT"}) {
50 $opt_d = $ENV{"CVSROOT"};
51} else {
52 die "CVSROOT needs to be set";
53}
54$opt_o ||= "origin";
55$git_tree ||= ".";
56
a57a9493
MU
57select(STDERR); $|=1; select(STDOUT);
58
59
60package CVSconn;
61# Basic CVS dialog.
2a3e1a85 62# We're only interested in connecting and downloading, so ...
a57a9493 63
f65ae603
MU
64use POSIX qw(strftime dup2);
65
a57a9493
MU
66sub new {
67 my($what,$repo,$subdir) = @_;
68 $what=ref($what) if ref($what);
69
70 my $self = {};
71 $self->{'buffer'} = "";
72 bless($self,$what);
73
74 $repo =~ s#/+$##;
75 $self->{'fullrep'} = $repo;
76 $self->conn();
77
78 $self->{'subdir'} = $subdir;
79 $self->{'lines'} = undef;
80
81 return $self;
82}
83
84sub conn {
85 my $self = shift;
86 my $repo = $self->{'fullrep'};
87 if($repo =~ s/^:pserver:(?:(.*?)(?::(.*?))?@)?([^:\/]*)(?::(\d*))?//) {
88 my($user,$pass,$serv,$port) = ($1,$2,$3,$4);
89 $user="anonymous" unless defined $user;
2a3e1a85 90 my $rr2 = "-";
a57a9493
MU
91 unless($port) {
92 $rr2 = ":pserver:$user\@$serv:$repo";
93 $port=2401;
94 }
95 my $rr = ":pserver:$user\@$serv:$port$repo";
96
97 unless($pass) {
98 open(H,$ENV{'HOME'}."/.cvspass") and do {
99 # :pserver:cvs@mea.tmt.tele.fi:/cvsroot/zmailer Ah<Z
100 while(<H>) {
101 chomp;
102 s/^\/\d+\s+//;
103 my ($w,$p) = split(/\s/,$_,2);
104 if($w eq $rr or $w eq $rr2) {
105 $pass = $p;
106 last;
107 }
108 }
109 };
110 }
111 $pass="A" unless $pass;
112
a57a9493
MU
113 my $s = IO::Socket::INET->new(PeerHost => $serv, PeerPort => $port);
114 die "Socket to $serv: $!\n" unless defined $s;
115 $s->write("BEGIN AUTH REQUEST\n$repo\n$user\n$pass\nEND AUTH REQUEST\n")
116 or die "Write to $serv: $!\n";
117 $s->flush();
118
119 my $rep = <$s>;
120
121 if($rep ne "I LOVE YOU\n") {
122 $rep="<unknown>" unless $rep;
123 die "AuthReply: $rep\n";
124 }
125 $self->{'socketo'} = $s;
126 $self->{'socketi'} = $s;
127 } else { # local: Fork off our own cvs server.
a57a9493
MU
128 my $pr = IO::Pipe->new();
129 my $pw = IO::Pipe->new();
130 my $pid = fork();
131 die "Fork: $!\n" unless defined $pid;
132 unless($pid) {
133 $pr->writer();
134 $pw->reader();
a57a9493
MU
135 dup2($pw->fileno(),0);
136 dup2($pr->fileno(),1);
137 $pr->close();
138 $pw->close();
139 exec("cvs","server");
140 }
141 $pw->writer();
142 $pr->reader();
143 $self->{'socketo'} = $pw;
144 $self->{'socketi'} = $pr;
145 }
146 $self->{'socketo'}->write("Root $repo\n");
147
148 # Trial and error says that this probably is the minimum set
149 $self->{'socketo'}->write("Valid-responses ok error Valid-requests Mode M Mbinary E F Checked-in Created Updated Merged Removed\n");
150
151 $self->{'socketo'}->write("valid-requests\n");
152 $self->{'socketo'}->flush();
153
154 chomp(my $rep=$self->readline());
155 if($rep !~ s/^Valid-requests\s*//) {
156 $rep="<unknown>" unless $rep;
157 die "Expected Valid-requests from server, but got: $rep\n";
158 }
159 chomp(my $res=$self->readline());
160 die "validReply: $res\n" if $res ne "ok";
161
162 $self->{'socketo'}->write("UseUnchanged\n") if $rep =~ /\bUseUnchanged\b/;
163 $self->{'repo'} = $repo;
164}
165
166sub readline {
167 my($self) = @_;
168 return $self->{'socketi'}->getline();
169}
170
171sub _file {
172 # Request a file with a given revision.
173 # Trial and error says this is a good way to do it. :-/
174 my($self,$fn,$rev) = @_;
175 $self->{'socketo'}->write("Argument -N\n") or return undef;
176 $self->{'socketo'}->write("Argument -P\n") or return undef;
177 # $self->{'socketo'}->write("Argument -ko\n") or return undef;
178 # -ko: Linus' version doesn't use it
179 $self->{'socketo'}->write("Argument -r\n") or return undef;
180 $self->{'socketo'}->write("Argument $rev\n") or return undef;
181 $self->{'socketo'}->write("Argument --\n") or return undef;
182 $self->{'socketo'}->write("Argument $self->{'subdir'}/$fn\n") or return undef;
183 $self->{'socketo'}->write("Directory .\n") or return undef;
184 $self->{'socketo'}->write("$self->{'repo'}\n") or return undef;
185 $self->{'socketo'}->write("Sticky T1.1\n") or return undef;
186 $self->{'socketo'}->write("co\n") or return undef;
187 $self->{'socketo'}->flush() or return undef;
188 $self->{'lines'} = 0;
189 return 1;
190}
191sub _line {
192 # Read a line from the server.
193 # ... except that 'line' may be an entire file. ;-)
194 my($self) = @_;
195 die "Not in lines" unless defined $self->{'lines'};
196
197 my $line;
198 my $res="";
199 while(defined($line = $self->readline())) {
200 # M U gnupg-cvs-rep/AUTHORS
201 # Updated gnupg-cvs-rep/
202 # /daten/src/rsync/gnupg-cvs-rep/AUTHORS
203 # /AUTHORS/1.1///T1.1
204 # u=rw,g=rw,o=rw
205 # 0
206 # ok
207
208 if($line =~ s/^(?:Created|Updated) //) {
209 $line = $self->readline(); # path
210 $line = $self->readline(); # Entries line
211 my $mode = $self->readline(); chomp $mode;
212 $self->{'mode'} = $mode;
213 defined (my $cnt = $self->readline())
214 or die "EOF from server after 'Changed'\n";
215 chomp $cnt;
216 die "Duh: Filesize $cnt" if $cnt !~ /^\d+$/;
217 $line="";
218 $res="";
219 while($cnt) {
220 my $buf;
221 my $num = $self->{'socketi'}->read($buf,$cnt);
222 die "Server: Filesize $cnt: $num: $!\n" if not defined $num or $num<=0;
223 $res .= $buf;
224 $cnt -= $num;
225 }
226 } elsif($line =~ s/^ //) {
227 $res .= $line;
228 } elsif($line =~ /^M\b/) {
229 # output, do nothing
230 } elsif($line =~ /^Mbinary\b/) {
231 my $cnt;
232 die "EOF from server after 'Mbinary'" unless defined ($cnt = $self->readline());
233 chomp $cnt;
234 die "Duh: Mbinary $cnt" if $cnt !~ /^\d+$/ or $cnt<1;
235 $line="";
236 while($cnt) {
237 my $buf;
238 my $num = $self->{'socketi'}->read($buf,$cnt);
239 die "S: Mbinary $cnt: $num: $!\n" if not defined $num or $num<=0;
240 $res .= $buf;
241 $cnt -= $num;
242 }
243 } else {
244 chomp $line;
245 if($line eq "ok") {
246 # print STDERR "S: ok (".length($res).")\n";
247 return $res;
248 } elsif($line =~ s/^E //) {
249 # print STDERR "S: $line\n";
250 } else {
251 die "Unknown: $line\n";
252 }
253 }
254 }
255}
256sub file {
257 my($self,$fn,$rev) = @_;
258 my $res;
259
260 if ($self->_file($fn,$rev)) {
261 $res = $self->_line();
262 return $res if defined $res;
263 }
264
265 # retry
266 $self->conn();
267 $self->_file($fn,$rev)
268 or die "No file command send\n";
269 $res = $self->_line();
270 die "No input: $fn $rev\n" unless defined $res;
271 return $res;
272}
273
274
275package main;
276
2a3e1a85 277my $cvs = CVSconn->new($opt_d, $cvs_tree);
a57a9493
MU
278
279
280sub pdate($) {
281 my($d) = @_;
282 m#(\d{2,4})/(\d\d)/(\d\d)\s(\d\d):(\d\d)(?::(\d\d))?#
283 or die "Unparseable date: $d\n";
284 my $y=$1; $y-=1900 if $y>1900;
285 return timegm($6||0,$5,$4,$3,$2-1,$y);
9718a00b
TM
286}
287
a57a9493
MU
288sub pmode($) {
289 my($mode) = @_;
290 my $m = 0;
291 my $mm = 0;
292 my $um = 0;
293 for my $x(split(//,$mode)) {
294 if($x eq ",") {
295 $m |= $mm&$um;
296 $mm = 0;
297 $um = 0;
298 } elsif($x eq "u") { $um |= 0700;
299 } elsif($x eq "g") { $um |= 0070;
300 } elsif($x eq "o") { $um |= 0007;
301 } elsif($x eq "r") { $mm |= 0444;
302 } elsif($x eq "w") { $mm |= 0222;
303 } elsif($x eq "x") { $mm |= 0111;
304 } elsif($x eq "=") { # do nothing
305 } else { die "Unknown mode: $mode\n";
306 }
307 }
308 $m |= $mm&$um;
309 return $m;
310}
d4f8b390 311
a57a9493 312my $tmpcv = "/var/cache/cvs";
d4f8b390 313
a57a9493
MU
314sub getwd() {
315 my $pwd = `pwd`;
316 chomp $pwd;
317 return $pwd;
d4f8b390
LT
318}
319
a57a9493
MU
320-d $git_tree
321 or mkdir($git_tree,0777)
322 or die "Could not create $git_tree: $!";
323chdir($git_tree);
d4f8b390 324
a57a9493
MU
325my $last_branch = "";
326my %branch_date;
327
328my $git_dir = $ENV{"GIT_DIR"} || ".git";
329$git_dir = getwd()."/".$git_dir unless $git_dir =~ m#^/#;
330$ENV{"GIT_DIR"} = $git_dir;
331unless(-d $git_dir) {
332 system("git-init-db");
333 die "Cannot init the GIT db at $git_tree: $?\n" if $?;
334 system("git-read-tree");
335 die "Cannot init an empty tree: $?\n" if $?;
336
337 $last_branch = $opt_o;
338} else {
339 $last_branch = basename(readlink("$git_dir/HEAD"));
340 die "Cannot read the last branch name: $!\n" unless $last_branch;
341
342 # Get the last import timestamps
343 opendir(D,"$git_dir/refs/heads");
344 while(defined(my $head = readdir(D))) {
345 next if $head =~ /^\./;
346 open(F,"$git_dir/refs/heads/$head")
347 or die "Bad head branch: $head: $!\n";
348 chomp(my $ftag = <F>);
349 close(F);
350 open(F,"git-cat-file commit $ftag |");
351 while(<F>) {
352 next unless /^author\s.*\s(\d+)\s[-+]\d{4}$/;
353 $branch_date{$head} = $1;
354 last;
355 }
356 close(F);
357 }
358 closedir(D);
359}
360
361-d $git_dir
362 or die "Could not create git subdir ($git_dir).\n";
363
364my $pid = open(CVS,"-|");
365die "Cannot fork: $!\n" unless defined $pid;
366unless($pid) {
367 exec("cvsps","-A","--cvs-direct",$cvs_tree);
368 die "Could not start cvsps: $!\n";
369}
370
371
372## cvsps output:
373#---------------------
374#PatchSet 314
375#Date: 1999/09/18 13:03:59
376#Author: wkoch
377#Branch: STABLE-BRANCH-1-0
378#Ancestor branch: HEAD
379#Tag: (none)
380#Log:
381# See ChangeLog: Sat Sep 18 13:03:28 CEST 1999 Werner Koch
382#Members:
383# README:1.57->1.57.2.1
384# VERSION:1.96->1.96.2.1
385#
386#---------------------
387
388my $state = 0;
389
390my($patchset,$date,$author,$branch,$ancestor,$tag,$logmsg);
391my(@old,@new);
392my $commit = sub {
393 my $pid;
394 system("git-update-cache","--force-remove","--",@old) if @old;
395 die "Cannot remove files: $?\n" if $?;
396 system("git-update-cache","--add","--",@new) if @new;
397 die "Cannot add files: $?\n" if $?;
398
399 $pid = open(C,"-|");
400 die "Cannot fork: $!" unless defined $pid;
401 unless($pid) {
402 exec("git-write-tree");
403 die "Cannot exec git-write-tree: $!\n";
404 }
405 chomp(my $tree = <C>);
406 length($tree) == 40
407 or die "Cannot get tree id ($tree): $!\n";
408 close(C)
409 or die "Error running git-write-tree: $?\n";
410 print "Tree ID $tree\n" if $opt_v;
411
412 my $parent = "";
413 if(open(C,"$git_dir/refs/heads/$last_branch")) {
414 chomp($parent = <C>);
415 close(C);
416 length($parent) == 40
417 or die "Cannot get parent id ($parent): $!\n";
418 print "Parent ID $parent\n" if $opt_v;
419 }
420
2a3e1a85
MU
421 my $pr = IO::Pipe->new();
422 my $pw = IO::Pipe->new();
423 $pid = fork();
424 die "Fork: $!\n" unless defined $pid;
a57a9493 425 unless($pid) {
2a3e1a85
MU
426 $pr->writer();
427 $pw->reader();
428 dup2($pw->fileno(),0);
429 dup2($pr->fileno(),1);
430 $pr->close();
431 $pw->close();
432
a57a9493
MU
433 my @par = ();
434 @par = ("-p",$parent) if $parent;
435 exec("env",
436 "GIT_AUTHOR_NAME=$author",
437 "GIT_AUTHOR_EMAIL=$author",
438 "GIT_AUTHOR_DATE=".strftime("+0000 %Y-%m-%d %H:%M:%S",gmtime($date)),
439 "GIT_COMMITTER_NAME=$author",
440 "GIT_COMMITTER_EMAIL=$author",
441 "GIT_COMMITTER_DATE=".strftime("+0000 %Y-%m-%d %H:%M:%S",gmtime($date)),
442 "git-commit-tree", $tree,@par);
443 die "Cannot exec git-commit-tree: $!\n";
444 }
2a3e1a85
MU
445 $pw->writer();
446 $pr->reader();
447 print $pw $logmsg
a57a9493 448 or die "Error writing to git-commit-tree: $!\n";
2a3e1a85
MU
449 $pw->close();
450
a57a9493 451 print "Committed patch $patchset ($branch)\n" if $opt_v;
2a3e1a85 452 chomp(my $cid = <$pr>);
a57a9493
MU
453 length($cid) == 40
454 or die "Cannot get commit id ($cid): $!\n";
455 print "Commit ID $cid\n" if $opt_v;
2a3e1a85
MU
456 $pr->close();
457
458 waitpid($pid,0);
459 die "Error running git-commit-tree: $?\n" if $?;
a57a9493
MU
460
461 open(C,">$git_dir/refs/heads/$branch")
462 or die "Cannot open branch $branch for update: $!\n";
463 print C "$cid\n"
464 or die "Cannot write branch $branch for update: $!\n";
465 close(C)
466 or die "Cannot write branch $branch for update: $!\n";
467
468 if($tag) {
469 open(C,">$git_dir/refs/tags/$tag")
470 or die "Cannot create tag $tag: $!\n";
471 print C "$cid\n"
472 or die "Cannot write tag $branch: $!\n";
473 close(C)
474 or die "Cannot write tag $branch: $!\n";
475 print "Created tag '$tag' on '$branch'\n" if $opt_v;
476 }
477
478 @old = ();
479 @new = ();
480};
481
482while(<CVS>) {
483 chomp;
484 if($state == 0 and /^-+$/) {
485 $state = 1;
486 } elsif($state == 0) {
487 $state = 1;
488 redo;
489 } elsif(($state==0 or $state==1) and s/^PatchSet\s+//) {
490 $patchset = 0+$_;
491 $state=2;
492 } elsif($state == 2 and s/^Date:\s+//) {
493 $date = pdate($_);
494 unless($date) {
495 print STDERR "Could not parse date: $_\n";
496 $state=0;
497 next;
498 }
499 $state=3;
500 } elsif($state == 3 and s/^Author:\s+//) {
501 s/\s+$//;
502 $author = $_;
503 $state = 4;
504 } elsif($state == 4 and s/^Branch:\s+//) {
505 s/\s+$//;
506 $branch = $_;
507 $state = 5;
508 } elsif($state == 5 and s/^Ancestor branch:\s+//) {
509 s/\s+$//;
510 $ancestor = $_;
511 $ancestor = $opt_o if $ancestor == "HEAD";
512 $state = 6;
513 } elsif($state == 5) {
514 $ancestor = undef;
515 $state = 6;
516 redo;
517 } elsif($state == 6 and s/^Tag:\s+//) {
518 s/\s+$//;
519 if($_ eq "(none)") {
520 $tag = undef;
521 } else {
522 $tag = $_;
523 }
524 $state = 7;
525 } elsif($state == 7 and /^Log:/) {
526 $logmsg = "";
527 $state = 8;
528 } elsif($state == 8 and /^Members:/) {
529 $branch = $opt_o if $branch eq "HEAD";
530 if(defined $branch_date{$branch} and $branch_date{$branch} >= $date) {
531 # skip
532 print "skip patchset $patchset: $date before $branch_date{$branch}\n";
533 $state = 11;
534 next;
535 }
536 if($ancestor) {
537 if(-f "$git_dir/refs/heads/$branch") {
538 print STDERR "Branch $branch already exists!\n";
539 $state=11;
540 next;
541 }
542 unless(open(H,"$git_dir/refs/heads/$ancestor")) {
543 print STDERR "Branch $ancestor does not exist!\n";
544 $state=11;
545 next;
546 }
547 chomp(my $id = <H>);
548 close(H);
549 unless(open(H,"> $git_dir/refs/heads/$branch")) {
550 print STDERR "Could not create branch $branch: $!\n";
551 $state=11;
552 next;
553 }
554 print H "$id\n"
555 or die "Could not write branch $branch: $!";
556 close(H)
557 or die "Could not write branch $branch: $!";
558 }
559 if(($ancestor || $branch) ne $last_branch) {
2a3e1a85 560 print "Switching from $last_branch to $branch\n" if $opt_v;
a57a9493
MU
561 system("git-read-tree -m -u $last_branch $branch");
562 die "read-tree $branch failed at $branch: $?\n" if $?;
563 }
564 if($branch ne $last_branch) {
565 unlink("$git_dir/HEAD");
566 symlink("refs/heads/$branch","$git_dir/HEAD");
567 $last_branch = $branch;
568 }
569 $state = 9;
570 } elsif($state == 8) {
571 $logmsg .= "$_\n";
2a3e1a85 572 } elsif($state == 9 and /^\s+(\S+):(INITIAL|\d(?:\.\d+)+)->(\d(?:\.\d+)+)\s*$/) {
a57a9493 573# VERSION:1.96->1.96.2.1
2a3e1a85 574 my $init = ($2 eq "INITIAL");
a57a9493 575 my $fn = $1;
f65ae603
MU
576 my $rev = $3;
577 $fn =~ s#^/+##;
578 my $data = $cvs->file($fn,$rev);
2a3e1a85 579 print "".($init ? "New" : "Update")." $fn: ".length($data)." bytes.\n";
a57a9493
MU
580 mkpath(dirname($fn),$opt_v);
581 open(F,"> ./$fn")
582 or die "Cannot create '$fn': $!\n";
583 print F $data
584 or die "Cannot write to '$fn': $!\n";
585 close(F)
586 or die "Cannot write to '$fn': $!\n";
587 chmod(pmode($cvs->{'mode'}), $fn);
588 push(@new,$fn); # may be resurrected!
589 } elsif($state == 9 and /^\s+(\S+):\d(?:\.\d+)+->(\d(?:\.\d+)+)\(DEAD\)\s*$/) {
f65ae603
MU
590 my $fn = $1;
591 $fn =~ s#^/+##;
592 push(@old,$fn);
a57a9493
MU
593 } elsif($state == 9 and /^\s*$/) {
594 $state = 10;
595 } elsif(($state == 9 or $state == 10) and /^-+$/) {
596 &$commit();
597 $state = 1;
598 } elsif($state == 11 and /^-+$/) {
599 $state = 1;
600 } elsif(/^-+$/) { # end of unknown-line processing
601 $state = 1;
602 } elsif($state != 11) { # ignore stuff when skipping
603 print "* UNKNOWN LINE * $_\n";
604 }
605}
606&$commit() if $branch and $state != 11;
d4f8b390 607
a57a9493 608print "DONE\n" if $opt_v;