Merge branches 'jc/checkout', 'jc/format-patch', 'jc/octopus', 'jc/sb' and 'jc/clone'
[git/git.git] / git-cvsimport.perl
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;
79ee456c
SV
19use File::Spec;
20use File::Temp qw(tempfile);
a57a9493
MU
21use File::Path qw(mkpath);
22use File::Basename qw(basename dirname);
23use Time::Local;
2a3e1a85
MU
24use IO::Socket;
25use IO::Pipe;
26use POSIX qw(strftime dup2);
0d821d4d 27use IPC::Open2;
a57a9493
MU
28
29$SIG{'PIPE'}="IGNORE";
30$ENV{'TZ'}="UTC";
31
211dcac6 32our($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);
a57a9493
MU
33
34sub usage() {
35 print STDERR <<END;
2a3e1a85 36Usage: ${\basename $0} # fetch/update GIT from CVS
0d821d4d
PA
37 [-o branch-for-HEAD] [-h] [-v] [-d CVSROOT]
38 [-p opts-for-cvsps] [-C GIT_repository] [-z fuzz]
39 [-i] [-k] [-u] [-s subst] [-m] [-M regex] [CVS_module]
a57a9493
MU
40END
41 exit(1);
42}
43
211dcac6 44getopts("hivmkuo:d:p:C:z:s:M:P:") or usage();
a57a9493
MU
45usage if $opt_h;
46
f9714a4a 47@ARGV <= 1 or usage();
a57a9493 48
2a3e1a85
MU
49if($opt_d) {
50 $ENV{"CVSROOT"} = $opt_d;
f9714a4a
SV
51} elsif(-f 'CVS/Root') {
52 open my $f, '<', 'CVS/Root' or die 'Failed to open CVS/Root';
53 $opt_d = <$f>;
54 chomp $opt_d;
55 close $f;
56 $ENV{"CVSROOT"} = $opt_d;
2a3e1a85
MU
57} elsif($ENV{"CVSROOT"}) {
58 $opt_d = $ENV{"CVSROOT"};
59} else {
60 die "CVSROOT needs to be set";
61}
62$opt_o ||= "origin";
fbfd60d6 63$opt_s ||= "-";
f9714a4a 64my $git_tree = $opt_C;
2a3e1a85
MU
65$git_tree ||= ".";
66
f9714a4a
SV
67my $cvs_tree;
68if ($#ARGV == 0) {
69 $cvs_tree = $ARGV[0];
70} elsif (-f 'CVS/Repository') {
71 open my $f, '<', 'CVS/Repository' or
72 die 'Failed to open CVS/Repository';
73 $cvs_tree = <$f>;
74 chomp $cvs_tree;
db4b6582 75 close $f;
f9714a4a
SV
76} else {
77 usage();
78}
79
db4b6582
ML
80our @mergerx = ();
81if ($opt_m) {
82 @mergerx = ( qr/\W(?:from|of|merge|merging|merged) (\w+)/i );
83}
84if ($opt_M) {
85 push (@mergerx, qr/$opt_M/);
86}
87
a57a9493
MU
88select(STDERR); $|=1; select(STDOUT);
89
90
91package CVSconn;
92# Basic CVS dialog.
2a3e1a85 93# We're only interested in connecting and downloading, so ...
a57a9493 94
2eb6d82e
SV
95use File::Spec;
96use File::Temp qw(tempfile);
f65ae603
MU
97use POSIX qw(strftime dup2);
98
a57a9493
MU
99sub new {
100 my($what,$repo,$subdir) = @_;
101 $what=ref($what) if ref($what);
102
103 my $self = {};
104 $self->{'buffer'} = "";
105 bless($self,$what);
106
107 $repo =~ s#/+$##;
108 $self->{'fullrep'} = $repo;
109 $self->conn();
110
111 $self->{'subdir'} = $subdir;
112 $self->{'lines'} = undef;
113
114 return $self;
115}
116
117sub conn {
118 my $self = shift;
119 my $repo = $self->{'fullrep'};
120 if($repo =~ s/^:pserver:(?:(.*?)(?::(.*?))?@)?([^:\/]*)(?::(\d*))?//) {
121 my($user,$pass,$serv,$port) = ($1,$2,$3,$4);
122 $user="anonymous" unless defined $user;
2a3e1a85 123 my $rr2 = "-";
a57a9493
MU
124 unless($port) {
125 $rr2 = ":pserver:$user\@$serv:$repo";
126 $port=2401;
127 }
128 my $rr = ":pserver:$user\@$serv:$port$repo";
129
130 unless($pass) {
131 open(H,$ENV{'HOME'}."/.cvspass") and do {
132 # :pserver:cvs@mea.tmt.tele.fi:/cvsroot/zmailer Ah<Z
133 while(<H>) {
134 chomp;
135 s/^\/\d+\s+//;
136 my ($w,$p) = split(/\s/,$_,2);
137 if($w eq $rr or $w eq $rr2) {
138 $pass = $p;
139 last;
140 }
141 }
142 };
143 }
144 $pass="A" unless $pass;
145
a57a9493
MU
146 my $s = IO::Socket::INET->new(PeerHost => $serv, PeerPort => $port);
147 die "Socket to $serv: $!\n" unless defined $s;
148 $s->write("BEGIN AUTH REQUEST\n$repo\n$user\n$pass\nEND AUTH REQUEST\n")
149 or die "Write to $serv: $!\n";
150 $s->flush();
151
152 my $rep = <$s>;
153
154 if($rep ne "I LOVE YOU\n") {
155 $rep="<unknown>" unless $rep;
156 die "AuthReply: $rep\n";
157 }
158 $self->{'socketo'} = $s;
159 $self->{'socketi'} = $s;
34155390 160 } else { # local or ext: Fork off our own cvs server.
a57a9493
MU
161 my $pr = IO::Pipe->new();
162 my $pw = IO::Pipe->new();
163 my $pid = fork();
164 die "Fork: $!\n" unless defined $pid;
8d0ea311
SV
165 my $cvs = 'cvs';
166 $cvs = $ENV{CVS_SERVER} if exists $ENV{CVS_SERVER};
34155390
SV
167 my $rsh = 'rsh';
168 $rsh = $ENV{CVS_RSH} if exists $ENV{CVS_RSH};
169
170 my @cvs = ($cvs, 'server');
171 my ($local, $user, $host);
172 $local = $repo =~ s/:local://;
173 if (!$local) {
174 $repo =~ s/:ext://;
175 $local = !($repo =~ s/^(?:([^\@:]+)\@)?([^:]+)://);
176 ($user, $host) = ($1, $2);
177 }
178 if (!$local) {
179 if ($user) {
180 unshift @cvs, $rsh, '-l', $user, $host;
181 } else {
182 unshift @cvs, $rsh, $host;
183 }
184 }
185
a57a9493
MU
186 unless($pid) {
187 $pr->writer();
188 $pw->reader();
a57a9493
MU
189 dup2($pw->fileno(),0);
190 dup2($pr->fileno(),1);
191 $pr->close();
192 $pw->close();
34155390 193 exec(@cvs);
a57a9493
MU
194 }
195 $pw->writer();
196 $pr->reader();
197 $self->{'socketo'} = $pw;
198 $self->{'socketi'} = $pr;
199 }
200 $self->{'socketo'}->write("Root $repo\n");
201
202 # Trial and error says that this probably is the minimum set
b0921331 203 $self->{'socketo'}->write("Valid-responses ok error Valid-requests Mode M Mbinary E Checked-in Created Updated Merged Removed\n");
a57a9493
MU
204
205 $self->{'socketo'}->write("valid-requests\n");
206 $self->{'socketo'}->flush();
207
208 chomp(my $rep=$self->readline());
209 if($rep !~ s/^Valid-requests\s*//) {
210 $rep="<unknown>" unless $rep;
211 die "Expected Valid-requests from server, but got: $rep\n";
212 }
213 chomp(my $res=$self->readline());
214 die "validReply: $res\n" if $res ne "ok";
215
216 $self->{'socketo'}->write("UseUnchanged\n") if $rep =~ /\bUseUnchanged\b/;
217 $self->{'repo'} = $repo;
218}
219
220sub readline {
221 my($self) = @_;
222 return $self->{'socketi'}->getline();
223}
224
225sub _file {
226 # Request a file with a given revision.
227 # Trial and error says this is a good way to do it. :-/
228 my($self,$fn,$rev) = @_;
229 $self->{'socketo'}->write("Argument -N\n") or return undef;
230 $self->{'socketo'}->write("Argument -P\n") or return undef;
abe05822
ML
231 # -kk: Linus' version doesn't use it - defaults to off
232 if ($opt_k) {
233 $self->{'socketo'}->write("Argument -kk\n") or return undef;
234 }
a57a9493
MU
235 $self->{'socketo'}->write("Argument -r\n") or return undef;
236 $self->{'socketo'}->write("Argument $rev\n") or return undef;
237 $self->{'socketo'}->write("Argument --\n") or return undef;
238 $self->{'socketo'}->write("Argument $self->{'subdir'}/$fn\n") or return undef;
239 $self->{'socketo'}->write("Directory .\n") or return undef;
240 $self->{'socketo'}->write("$self->{'repo'}\n") or return undef;
4f7c0caa 241 # $self->{'socketo'}->write("Sticky T1.0\n") or return undef;
a57a9493
MU
242 $self->{'socketo'}->write("co\n") or return undef;
243 $self->{'socketo'}->flush() or return undef;
244 $self->{'lines'} = 0;
245 return 1;
246}
247sub _line {
248 # Read a line from the server.
249 # ... except that 'line' may be an entire file. ;-)
2eb6d82e 250 my($self, $fh) = @_;
a57a9493
MU
251 die "Not in lines" unless defined $self->{'lines'};
252
253 my $line;
2eb6d82e 254 my $res=0;
a57a9493
MU
255 while(defined($line = $self->readline())) {
256 # M U gnupg-cvs-rep/AUTHORS
257 # Updated gnupg-cvs-rep/
258 # /daten/src/rsync/gnupg-cvs-rep/AUTHORS
259 # /AUTHORS/1.1///T1.1
260 # u=rw,g=rw,o=rw
261 # 0
262 # ok
263
264 if($line =~ s/^(?:Created|Updated) //) {
265 $line = $self->readline(); # path
266 $line = $self->readline(); # Entries line
267 my $mode = $self->readline(); chomp $mode;
268 $self->{'mode'} = $mode;
269 defined (my $cnt = $self->readline())
270 or die "EOF from server after 'Changed'\n";
271 chomp $cnt;
272 die "Duh: Filesize $cnt" if $cnt !~ /^\d+$/;
273 $line="";
2eb6d82e 274 $res=0;
a57a9493
MU
275 while($cnt) {
276 my $buf;
277 my $num = $self->{'socketi'}->read($buf,$cnt);
278 die "Server: Filesize $cnt: $num: $!\n" if not defined $num or $num<=0;
2eb6d82e
SV
279 print $fh $buf;
280 $res += $num;
a57a9493
MU
281 $cnt -= $num;
282 }
283 } elsif($line =~ s/^ //) {
2eb6d82e
SV
284 print $fh $line;
285 $res += length($line);
a57a9493
MU
286 } elsif($line =~ /^M\b/) {
287 # output, do nothing
288 } elsif($line =~ /^Mbinary\b/) {
289 my $cnt;
290 die "EOF from server after 'Mbinary'" unless defined ($cnt = $self->readline());
291 chomp $cnt;
292 die "Duh: Mbinary $cnt" if $cnt !~ /^\d+$/ or $cnt<1;
293 $line="";
294 while($cnt) {
295 my $buf;
296 my $num = $self->{'socketi'}->read($buf,$cnt);
297 die "S: Mbinary $cnt: $num: $!\n" if not defined $num or $num<=0;
2eb6d82e
SV
298 print $fh $buf;
299 $res += $num;
a57a9493
MU
300 $cnt -= $num;
301 }
302 } else {
303 chomp $line;
304 if($line eq "ok") {
305 # print STDERR "S: ok (".length($res).")\n";
306 return $res;
307 } elsif($line =~ s/^E //) {
308 # print STDERR "S: $line\n";
8b8840e0
MU
309 } elsif($line =~ /^Remove-entry /i) {
310 $line = $self->readline(); # filename
311 $line = $self->readline(); # OK
312 chomp $line;
313 die "Unknown: $line" if $line ne "ok";
314 return -1;
a57a9493
MU
315 } else {
316 die "Unknown: $line\n";
317 }
318 }
319 }
320}
321sub file {
322 my($self,$fn,$rev) = @_;
323 my $res;
324
2eb6d82e
SV
325 my ($fh, $name) = tempfile('gitcvs.XXXXXX',
326 DIR => File::Spec->tmpdir(), UNLINK => 1);
327
328 $self->_file($fn,$rev) and $res = $self->_line($fh);
329
330 if (!defined $res) {
331 # retry
332 $self->conn();
333 $self->_file($fn,$rev)
334 or die "No file command send\n";
335 $res = $self->_line($fh);
336 die "No input: $fn $rev\n" unless defined $res;
a57a9493 337 }
c619ad51 338 close ($fh);
a57a9493 339
d44e8cf0
ML
340 if ($res eq '') {
341 die "Looks like the server has gone away while fetching $fn $rev -- exiting!";
342 }
343
2eb6d82e 344 return ($name, $res);
a57a9493
MU
345}
346
347
348package main;
349
2a3e1a85 350my $cvs = CVSconn->new($opt_d, $cvs_tree);
a57a9493
MU
351
352
353sub pdate($) {
354 my($d) = @_;
355 m#(\d{2,4})/(\d\d)/(\d\d)\s(\d\d):(\d\d)(?::(\d\d))?#
356 or die "Unparseable date: $d\n";
357 my $y=$1; $y-=1900 if $y>1900;
358 return timegm($6||0,$5,$4,$3,$2-1,$y);
9718a00b
TM
359}
360
a57a9493
MU
361sub pmode($) {
362 my($mode) = @_;
363 my $m = 0;
364 my $mm = 0;
365 my $um = 0;
366 for my $x(split(//,$mode)) {
367 if($x eq ",") {
368 $m |= $mm&$um;
369 $mm = 0;
370 $um = 0;
371 } elsif($x eq "u") { $um |= 0700;
372 } elsif($x eq "g") { $um |= 0070;
373 } elsif($x eq "o") { $um |= 0007;
374 } elsif($x eq "r") { $mm |= 0444;
375 } elsif($x eq "w") { $mm |= 0222;
376 } elsif($x eq "x") { $mm |= 0111;
377 } elsif($x eq "=") { # do nothing
378 } else { die "Unknown mode: $mode\n";
379 }
380 }
381 $m |= $mm&$um;
382 return $m;
383}
d4f8b390 384
a57a9493
MU
385sub getwd() {
386 my $pwd = `pwd`;
387 chomp $pwd;
388 return $pwd;
d4f8b390
LT
389}
390
db4b6582
ML
391
392sub get_headref($$) {
393 my $name = shift;
394 my $git_dir = shift;
395 my $sha;
396
397 if (open(C,"$git_dir/refs/heads/$name")) {
398 chomp($sha = <C>);
399 close(C);
400 length($sha) == 40
401 or die "Cannot get head id for $name ($sha): $!\n";
402 }
403 return $sha;
404}
405
406
a57a9493
MU
407-d $git_tree
408 or mkdir($git_tree,0777)
409 or die "Could not create $git_tree: $!";
410chdir($git_tree);
d4f8b390 411
a57a9493 412my $last_branch = "";
46541669 413my $orig_branch = "";
210569f9 414my $forward_master = 0;
a57a9493
MU
415my %branch_date;
416
417my $git_dir = $ENV{"GIT_DIR"} || ".git";
418$git_dir = getwd()."/".$git_dir unless $git_dir =~ m#^/#;
419$ENV{"GIT_DIR"} = $git_dir;
79ee456c
SV
420my $orig_git_index;
421$orig_git_index = $ENV{GIT_INDEX_FILE} if exists $ENV{GIT_INDEX_FILE};
422my ($git_ih, $git_index) = tempfile('gitXXXXXX', SUFFIX => '.idx',
423 DIR => File::Spec->tmpdir());
424close ($git_ih);
425$ENV{GIT_INDEX_FILE} = $git_index;
a57a9493
MU
426unless(-d $git_dir) {
427 system("git-init-db");
428 die "Cannot init the GIT db at $git_tree: $?\n" if $?;
429 system("git-read-tree");
430 die "Cannot init an empty tree: $?\n" if $?;
431
432 $last_branch = $opt_o;
46541669 433 $orig_branch = "";
a57a9493 434} else {
866d1310 435 -f "$git_dir/refs/heads/$opt_o"
4c24e089
MU
436 or die "Branch '$opt_o' does not exist.\n".
437 "Either use the correct '-o branch' option,\n".
438 "or import to a new repository.\n";
439
8366a10a
PR
440 open(F, "git-symbolic-ref HEAD |") or
441 die "Cannot run git-symbolic-ref: $!\n";
442 chomp ($last_branch = <F>);
443 $last_branch = basename($last_branch);
444 close(F);
46541669
MU
445 unless($last_branch) {
446 warn "Cannot read the last branch name: $! -- assuming 'master'\n";
447 $last_branch = "master";
448 }
449 $orig_branch = $last_branch;
210569f9
SV
450 if (-f "$git_dir/CVS2GIT_HEAD") {
451 die <<EOM;
452CVS2GIT_HEAD exists.
453Make sure your working directory corresponds to HEAD and remove CVS2GIT_HEAD.
454You may need to run
455
456 git-read-tree -m -u CVS2GIT_HEAD HEAD
457EOM
458 }
459 system('cp', "$git_dir/HEAD", "$git_dir/CVS2GIT_HEAD");
460
461 $forward_master =
462 $opt_o ne 'master' && -f "$git_dir/refs/heads/master" &&
463 system('cmp', '-s', "$git_dir/refs/heads/master",
464 "$git_dir/refs/heads/$opt_o") == 0;
a57a9493 465
79ee456c
SV
466 # populate index
467 system('git-read-tree', $last_branch);
17501132 468 die "read-tree failed: $?\n" if $?;
a57a9493
MU
469
470 # Get the last import timestamps
471 opendir(D,"$git_dir/refs/heads");
472 while(defined(my $head = readdir(D))) {
473 next if $head =~ /^\./;
474 open(F,"$git_dir/refs/heads/$head")
475 or die "Bad head branch: $head: $!\n";
476 chomp(my $ftag = <F>);
477 close(F);
478 open(F,"git-cat-file commit $ftag |");
479 while(<F>) {
480 next unless /^author\s.*\s(\d+)\s[-+]\d{4}$/;
481 $branch_date{$head} = $1;
482 last;
483 }
484 close(F);
485 }
486 closedir(D);
487}
488
489-d $git_dir
490 or die "Could not create git subdir ($git_dir).\n";
491
492my $pid = open(CVS,"-|");
493die "Cannot fork: $!\n" unless defined $pid;
494unless($pid) {
2be4fcc3
MU
495 my @opt;
496 @opt = split(/,/,$opt_p) if defined $opt_p;
28537171 497 unshift @opt, '-z', $opt_z if defined $opt_z;
9acb552d 498 unshift @opt, '-q' unless defined $opt_v;
e1757689 499 unless (defined($opt_p) && $opt_p =~ m/--no-cvs-direct/) {
df73e9c6
ML
500 push @opt, '--cvs-direct';
501 }
211dcac6
ML
502 if ($opt_P) {
503 exec("cat", $opt_P);
504 } else {
2c52a42d 505 exec("cvsps","--norc",@opt,"-u","-A",'--root',$opt_d,$cvs_tree);
211dcac6
ML
506 die "Could not start cvsps: $!\n";
507 }
a57a9493
MU
508}
509
510
511## cvsps output:
512#---------------------
513#PatchSet 314
514#Date: 1999/09/18 13:03:59
515#Author: wkoch
516#Branch: STABLE-BRANCH-1-0
517#Ancestor branch: HEAD
518#Tag: (none)
519#Log:
520# See ChangeLog: Sat Sep 18 13:03:28 CEST 1999 Werner Koch
521#Members:
522# README:1.57->1.57.2.1
523# VERSION:1.96->1.96.2.1
524#
525#---------------------
526
527my $state = 0;
528
94c23343 529my($patchset,$date,$author_name,$author_email,$branch,$ancestor,$tag,$logmsg);
a57a9493
MU
530my(@old,@new);
531my $commit = sub {
532 my $pid;
4abdecbf
MU
533 while(@old) {
534 my @o2;
535 if(@old > 55) {
536 @o2 = splice(@old,0,50);
537 } else {
538 @o2 = @old;
539 @old = ();
540 }
215a7ad1 541 system("git-update-index","--force-remove","--",@o2);
4abdecbf
MU
542 die "Cannot remove files: $?\n" if $?;
543 }
544 while(@new) {
545 my @n2;
2eb6d82e
SV
546 if(@new > 12) {
547 @n2 = splice(@new,0,10);
4abdecbf
MU
548 } else {
549 @n2 = @new;
550 @new = ();
551 }
215a7ad1 552 system("git-update-index","--add",
2eb6d82e 553 (map { ('--cacheinfo', @$_) } @n2));
4abdecbf
MU
554 die "Cannot add files: $?\n" if $?;
555 }
a57a9493
MU
556
557 $pid = open(C,"-|");
558 die "Cannot fork: $!" unless defined $pid;
559 unless($pid) {
560 exec("git-write-tree");
561 die "Cannot exec git-write-tree: $!\n";
562 }
563 chomp(my $tree = <C>);
564 length($tree) == 40
565 or die "Cannot get tree id ($tree): $!\n";
566 close(C)
567 or die "Error running git-write-tree: $?\n";
568 print "Tree ID $tree\n" if $opt_v;
569
570 my $parent = "";
571 if(open(C,"$git_dir/refs/heads/$last_branch")) {
572 chomp($parent = <C>);
573 close(C);
574 length($parent) == 40
575 or die "Cannot get parent id ($parent): $!\n";
576 print "Parent ID $parent\n" if $opt_v;
577 }
578
17501132
SV
579 my $pr = IO::Pipe->new() or die "Cannot open pipe: $!\n";
580 my $pw = IO::Pipe->new() or die "Cannot open pipe: $!\n";
2a3e1a85
MU
581 $pid = fork();
582 die "Fork: $!\n" unless defined $pid;
a57a9493 583 unless($pid) {
2a3e1a85
MU
584 $pr->writer();
585 $pw->reader();
89764f5d 586 open(OUT,">&STDOUT");
2a3e1a85
MU
587 dup2($pw->fileno(),0);
588 dup2($pr->fileno(),1);
589 $pr->close();
590 $pw->close();
591
a57a9493
MU
592 my @par = ();
593 @par = ("-p",$parent) if $parent;
db4b6582
ML
594
595 # loose detection of merges
596 # based on the commit msg
597 foreach my $rx (@mergerx) {
598 if ($logmsg =~ $rx) {
599 my $mparent = $1;
049f28c3 600 if ($mparent eq 'HEAD') { $mparent = $opt_o };
db4b6582
ML
601 if ( -e "$git_dir/refs/heads/$mparent") {
602 $mparent = get_headref($mparent, $git_dir);
603 push @par, '-p', $mparent;
89764f5d 604 print OUT "Merge parent branch: $mparent\n" if $opt_v;
db4b6582 605 }
29504118 606 }
db4b6582
ML
607 }
608
a57a9493 609 exec("env",
94c23343
JH
610 "GIT_AUTHOR_NAME=$author_name",
611 "GIT_AUTHOR_EMAIL=$author_email",
a57a9493 612 "GIT_AUTHOR_DATE=".strftime("+0000 %Y-%m-%d %H:%M:%S",gmtime($date)),
94c23343
JH
613 "GIT_COMMITTER_NAME=$author_name",
614 "GIT_COMMITTER_EMAIL=$author_email",
a57a9493
MU
615 "GIT_COMMITTER_DATE=".strftime("+0000 %Y-%m-%d %H:%M:%S",gmtime($date)),
616 "git-commit-tree", $tree,@par);
617 die "Cannot exec git-commit-tree: $!\n";
618 }
2a3e1a85
MU
619 $pw->writer();
620 $pr->reader();
e371046b
MU
621
622 # compatibility with git2cvs
623 substr($logmsg,32767) = "" if length($logmsg) > 32767;
624 $logmsg =~ s/[\s\n]+\z//;
625
626 print $pw "$logmsg\n"
a57a9493 627 or die "Error writing to git-commit-tree: $!\n";
2a3e1a85
MU
628 $pw->close();
629
8b8840e0 630 print "Committed patch $patchset ($branch ".strftime("%Y-%m-%d %H:%M:%S",gmtime($date)).")\n" if $opt_v;
2a3e1a85 631 chomp(my $cid = <$pr>);
a57a9493
MU
632 length($cid) == 40
633 or die "Cannot get commit id ($cid): $!\n";
634 print "Commit ID $cid\n" if $opt_v;
2a3e1a85
MU
635 $pr->close();
636
637 waitpid($pid,0);
638 die "Error running git-commit-tree: $?\n" if $?;
a57a9493
MU
639
640 open(C,">$git_dir/refs/heads/$branch")
641 or die "Cannot open branch $branch for update: $!\n";
642 print C "$cid\n"
643 or die "Cannot write branch $branch for update: $!\n";
644 close(C)
645 or die "Cannot write branch $branch for update: $!\n";
646
647 if($tag) {
0d821d4d
PA
648 my($in, $out) = ('','');
649 my($xtag) = $tag;
650 $xtag =~ s/\s+\*\*.*$//; # Remove stuff like ** INVALID ** and ** FUNKY **
651 $xtag =~ tr/_/\./ if ( $opt_u );
34c99da2 652 $xtag =~ s/[\/]/$opt_s/g;
0d821d4d
PA
653
654 my $pid = open2($in, $out, 'git-mktag');
655 print $out "object $cid\n".
656 "type commit\n".
657 "tag $xtag\n".
94c23343 658 "tagger $author_name <$author_email>\n"
0d821d4d
PA
659 or die "Cannot create tag object $xtag: $!\n";
660 close($out)
661 or die "Cannot create tag object $xtag: $!\n";
662
663 my $tagobj = <$in>;
664 chomp $tagobj;
665
666 if ( !close($in) or waitpid($pid, 0) != $pid or
667 $? != 0 or $tagobj !~ /^[0123456789abcdef]{40}$/ ) {
668 die "Cannot create tag object $xtag: $!\n";
669 }
670
671
672 open(C,">$git_dir/refs/tags/$xtag")
673 or die "Cannot create tag $xtag: $!\n";
674 print C "$tagobj\n"
675 or die "Cannot write tag $xtag: $!\n";
a57a9493 676 close(C)
0d821d4d
PA
677 or die "Cannot write tag $xtag: $!\n";
678
679 print "Created tag '$xtag' on '$branch'\n" if $opt_v;
a57a9493 680 }
a57a9493
MU
681};
682
683while(<CVS>) {
684 chomp;
685 if($state == 0 and /^-+$/) {
686 $state = 1;
687 } elsif($state == 0) {
688 $state = 1;
689 redo;
690 } elsif(($state==0 or $state==1) and s/^PatchSet\s+//) {
691 $patchset = 0+$_;
692 $state=2;
693 } elsif($state == 2 and s/^Date:\s+//) {
694 $date = pdate($_);
695 unless($date) {
696 print STDERR "Could not parse date: $_\n";
697 $state=0;
698 next;
699 }
700 $state=3;
701 } elsif($state == 3 and s/^Author:\s+//) {
702 s/\s+$//;
94c23343
JH
703 if (/^(.*?)\s+<(.*)>/) {
704 ($author_name, $author_email) = ($1, $2);
705 } else {
706 $author_name = $author_email = $_;
707 }
a57a9493
MU
708 $state = 4;
709 } elsif($state == 4 and s/^Branch:\s+//) {
710 s/\s+$//;
fbfd60d6 711 s/[\/]/$opt_s/g;
a57a9493
MU
712 $branch = $_;
713 $state = 5;
714 } elsif($state == 5 and s/^Ancestor branch:\s+//) {
715 s/\s+$//;
716 $ancestor = $_;
0fa2824f 717 $ancestor = $opt_o if $ancestor eq "HEAD";
a57a9493
MU
718 $state = 6;
719 } elsif($state == 5) {
720 $ancestor = undef;
721 $state = 6;
722 redo;
723 } elsif($state == 6 and s/^Tag:\s+//) {
724 s/\s+$//;
725 if($_ eq "(none)") {
726 $tag = undef;
727 } else {
728 $tag = $_;
729 }
730 $state = 7;
731 } elsif($state == 7 and /^Log:/) {
732 $logmsg = "";
733 $state = 8;
734 } elsif($state == 8 and /^Members:/) {
735 $branch = $opt_o if $branch eq "HEAD";
736 if(defined $branch_date{$branch} and $branch_date{$branch} >= $date) {
737 # skip
9da07f34 738 print "skip patchset $patchset: $date before $branch_date{$branch}\n" if $opt_v;
a57a9493
MU
739 $state = 11;
740 next;
741 }
742 if($ancestor) {
743 if(-f "$git_dir/refs/heads/$branch") {
744 print STDERR "Branch $branch already exists!\n";
745 $state=11;
746 next;
747 }
748 unless(open(H,"$git_dir/refs/heads/$ancestor")) {
749 print STDERR "Branch $ancestor does not exist!\n";
750 $state=11;
751 next;
752 }
753 chomp(my $id = <H>);
754 close(H);
755 unless(open(H,"> $git_dir/refs/heads/$branch")) {
756 print STDERR "Could not create branch $branch: $!\n";
757 $state=11;
758 next;
759 }
760 print H "$id\n"
761 or die "Could not write branch $branch: $!";
762 close(H)
763 or die "Could not write branch $branch: $!";
764 }
765 if(($ancestor || $branch) ne $last_branch) {
2a3e1a85 766 print "Switching from $last_branch to $branch\n" if $opt_v;
46e63efc 767 system("git-read-tree", $branch);
46541669 768 die "read-tree failed: $?\n" if $?;
a57a9493 769 }
46e63efc 770 $last_branch = $branch if $branch ne $last_branch;
a57a9493
MU
771 $state = 9;
772 } elsif($state == 8) {
773 $logmsg .= "$_\n";
8b8840e0 774 } elsif($state == 9 and /^\s+(.+?):(INITIAL|\d+(?:\.\d+)+)->(\d+(?:\.\d+)+)\s*$/) {
a57a9493 775# VERSION:1.96->1.96.2.1
2a3e1a85 776 my $init = ($2 eq "INITIAL");
a57a9493 777 my $fn = $1;
f65ae603
MU
778 my $rev = $3;
779 $fn =~ s#^/+##;
2eb6d82e 780 my ($tmpname, $size) = $cvs->file($fn,$rev);
8b8840e0
MU
781 if($size == -1) {
782 push(@old,$fn);
783 print "Drop $fn\n" if $opt_v;
784 } else {
785 print "".($init ? "New" : "Update")." $fn: $size bytes\n" if $opt_v;
786 open my $F, '-|', "git-hash-object -w $tmpname"
787 or die "Cannot create object: $!\n";
788 my $sha = <$F>;
789 chomp $sha;
790 close $F;
791 my $mode = pmode($cvs->{'mode'});
792 push(@new,[$mode, $sha, $fn]); # may be resurrected!
793 }
2eb6d82e 794 unlink($tmpname);
b0921331 795 } elsif($state == 9 and /^\s+(.+?):\d+(?:\.\d+)+->(\d+(?:\.\d+)+)\(DEAD\)\s*$/) {
f65ae603
MU
796 my $fn = $1;
797 $fn =~ s#^/+##;
798 push(@old,$fn);
8b8840e0 799 print "Delete $fn\n" if $opt_v;
a57a9493
MU
800 } elsif($state == 9 and /^\s*$/) {
801 $state = 10;
802 } elsif(($state == 9 or $state == 10) and /^-+$/) {
803 &$commit();
804 $state = 1;
805 } elsif($state == 11 and /^-+$/) {
806 $state = 1;
807 } elsif(/^-+$/) { # end of unknown-line processing
808 $state = 1;
809 } elsif($state != 11) { # ignore stuff when skipping
810 print "* UNKNOWN LINE * $_\n";
811 }
812}
813&$commit() if $branch and $state != 11;
d4f8b390 814
79ee456c
SV
815unlink($git_index);
816
210569f9
SV
817if (defined $orig_git_index) {
818 $ENV{GIT_INDEX_FILE} = $orig_git_index;
819} else {
820 delete $ENV{GIT_INDEX_FILE};
821}
822
46541669
MU
823# Now switch back to the branch we were in before all of this happened
824if($orig_branch) {
79ee456c 825 print "DONE\n" if $opt_v;
210569f9
SV
826 system("cp","$git_dir/refs/heads/$opt_o","$git_dir/refs/heads/master")
827 if $forward_master;
c1c774e7
SV
828 unless ($opt_i) {
829 system('git-read-tree', '-m', '-u', 'CVS2GIT_HEAD', 'HEAD');
830 die "read-tree failed: $?\n" if $?;
831 }
46541669
MU
832} else {
833 $orig_branch = "master";
834 print "DONE; creating $orig_branch branch\n" if $opt_v;
835 system("cp","$git_dir/refs/heads/$opt_o","$git_dir/refs/heads/master")
836 unless -f "$git_dir/refs/heads/master";
8366a10a 837 system('git-update-ref', 'HEAD', "$orig_branch");
c1c774e7
SV
838 unless ($opt_i) {
839 system('git checkout');
840 die "checkout failed: $?\n" if $?;
841 }
46541669 842}
210569f9 843unlink("$git_dir/CVS2GIT_HEAD");