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