cvsimport: complete the cvsps run before starting the import
[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;
e49289df 26use POSIX qw(strftime dup2 ENOENT);
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="";
55cad842 318 $res = $self->_fetchfile($fh, $cnt);
a57a9493 319 } elsif($line =~ s/^ //) {
2eb6d82e
SV
320 print $fh $line;
321 $res += length($line);
a57a9493
MU
322 } elsif($line =~ /^M\b/) {
323 # output, do nothing
324 } elsif($line =~ /^Mbinary\b/) {
325 my $cnt;
326 die "EOF from server after 'Mbinary'" unless defined ($cnt = $self->readline());
327 chomp $cnt;
328 die "Duh: Mbinary $cnt" if $cnt !~ /^\d+$/ or $cnt<1;
329 $line="";
55cad842 330 $res += $self->_fetchfile($fh, $cnt);
a57a9493
MU
331 } else {
332 chomp $line;
333 if($line eq "ok") {
334 # print STDERR "S: ok (".length($res).")\n";
335 return $res;
336 } elsif($line =~ s/^E //) {
337 # print STDERR "S: $line\n";
be0c7e06 338 } elsif($line =~ /^(Remove-entry|Removed) /i) {
8b8840e0
MU
339 $line = $self->readline(); # filename
340 $line = $self->readline(); # OK
341 chomp $line;
342 die "Unknown: $line" if $line ne "ok";
343 return -1;
a57a9493
MU
344 } else {
345 die "Unknown: $line\n";
346 }
347 }
348 }
39ba7d54 349 return undef;
a57a9493
MU
350}
351sub file {
352 my($self,$fn,$rev) = @_;
353 my $res;
354
2eb6d82e
SV
355 my ($fh, $name) = tempfile('gitcvs.XXXXXX',
356 DIR => File::Spec->tmpdir(), UNLINK => 1);
357
358 $self->_file($fn,$rev) and $res = $self->_line($fh);
359
360 if (!defined $res) {
39ba7d54
MM
361 print STDERR "Server has gone away while fetching $fn $rev, retrying...\n";
362 truncate $fh, 0;
2eb6d82e 363 $self->conn();
39ba7d54 364 $self->_file($fn,$rev) or die "No file command send";
2eb6d82e 365 $res = $self->_line($fh);
39ba7d54 366 die "Retry failed" unless defined $res;
a57a9493 367 }
c619ad51 368 close ($fh);
a57a9493 369
2eb6d82e 370 return ($name, $res);
a57a9493 371}
55cad842
ML
372sub _fetchfile {
373 my ($self, $fh, $cnt) = @_;
61efa5e3 374 my $res = 0;
55cad842
ML
375 my $bufsize = 1024 * 1024;
376 while($cnt) {
377 if ($bufsize > $cnt) {
378 $bufsize = $cnt;
379 }
380 my $buf;
381 my $num = $self->{'socketi'}->read($buf,$bufsize);
382 die "Server: Filesize $cnt: $num: $!\n" if not defined $num or $num<=0;
383 print $fh $buf;
384 $res += $num;
385 $cnt -= $num;
386 }
387 return $res;
388}
a57a9493
MU
389
390
391package main;
392
2a3e1a85 393my $cvs = CVSconn->new($opt_d, $cvs_tree);
a57a9493
MU
394
395
396sub pdate($) {
397 my($d) = @_;
398 m#(\d{2,4})/(\d\d)/(\d\d)\s(\d\d):(\d\d)(?::(\d\d))?#
399 or die "Unparseable date: $d\n";
400 my $y=$1; $y-=1900 if $y>1900;
401 return timegm($6||0,$5,$4,$3,$2-1,$y);
9718a00b
TM
402}
403
a57a9493
MU
404sub pmode($) {
405 my($mode) = @_;
406 my $m = 0;
407 my $mm = 0;
408 my $um = 0;
409 for my $x(split(//,$mode)) {
410 if($x eq ",") {
411 $m |= $mm&$um;
412 $mm = 0;
413 $um = 0;
414 } elsif($x eq "u") { $um |= 0700;
415 } elsif($x eq "g") { $um |= 0070;
416 } elsif($x eq "o") { $um |= 0007;
417 } elsif($x eq "r") { $mm |= 0444;
418 } elsif($x eq "w") { $mm |= 0222;
419 } elsif($x eq "x") { $mm |= 0111;
420 } elsif($x eq "=") { # do nothing
421 } else { die "Unknown mode: $mode\n";
422 }
423 }
424 $m |= $mm&$um;
425 return $m;
426}
d4f8b390 427
a57a9493
MU
428sub getwd() {
429 my $pwd = `pwd`;
430 chomp $pwd;
431 return $pwd;
d4f8b390
LT
432}
433
e73aefe4
JK
434sub is_sha1 {
435 my $s = shift;
436 return $s =~ /^[a-f0-9]{40}$/;
437}
db4b6582 438
e73aefe4 439sub get_headref ($$) {
db4b6582
ML
440 my $name = shift;
441 my $git_dir = shift;
db4b6582 442
e73aefe4
JK
443 my $f = "$git_dir/refs/heads/$name";
444 if(open(my $fh, $f)) {
445 chomp(my $r = <$fh>);
446 is_sha1($r) or die "Cannot get head id for $name ($r): $!";
447 return $r;
db4b6582 448 }
e73aefe4
JK
449 die "unable to open $f: $!" unless $! == POSIX::ENOENT;
450 return undef;
db4b6582
ML
451}
452
a57a9493
MU
453-d $git_tree
454 or mkdir($git_tree,0777)
455 or die "Could not create $git_tree: $!";
456chdir($git_tree);
d4f8b390 457
a57a9493 458my $last_branch = "";
46541669 459my $orig_branch = "";
a57a9493 460my %branch_date;
8a5f2eac 461my $tip_at_start = undef;
a57a9493
MU
462
463my $git_dir = $ENV{"GIT_DIR"} || ".git";
464$git_dir = getwd()."/".$git_dir unless $git_dir =~ m#^/#;
465$ENV{"GIT_DIR"} = $git_dir;
79ee456c
SV
466my $orig_git_index;
467$orig_git_index = $ENV{GIT_INDEX_FILE} if exists $ENV{GIT_INDEX_FILE};
468my ($git_ih, $git_index) = tempfile('gitXXXXXX', SUFFIX => '.idx',
469 DIR => File::Spec->tmpdir());
470close ($git_ih);
471$ENV{GIT_INDEX_FILE} = $git_index;
a57a9493
MU
472unless(-d $git_dir) {
473 system("git-init-db");
474 die "Cannot init the GIT db at $git_tree: $?\n" if $?;
475 system("git-read-tree");
476 die "Cannot init an empty tree: $?\n" if $?;
477
478 $last_branch = $opt_o;
46541669 479 $orig_branch = "";
a57a9493 480} else {
866d1310 481 -f "$git_dir/refs/heads/$opt_o"
4c24e089
MU
482 or die "Branch '$opt_o' does not exist.\n".
483 "Either use the correct '-o branch' option,\n".
484 "or import to a new repository.\n";
485
8366a10a
PR
486 open(F, "git-symbolic-ref HEAD |") or
487 die "Cannot run git-symbolic-ref: $!\n";
488 chomp ($last_branch = <F>);
489 $last_branch = basename($last_branch);
490 close(F);
46541669
MU
491 unless($last_branch) {
492 warn "Cannot read the last branch name: $! -- assuming 'master'\n";
493 $last_branch = "master";
494 }
495 $orig_branch = $last_branch;
8a5f2eac 496 $tip_at_start = `git-rev-parse --verify HEAD`;
a57a9493 497
79ee456c
SV
498 # populate index
499 system('git-read-tree', $last_branch);
17501132 500 die "read-tree failed: $?\n" if $?;
a57a9493
MU
501
502 # Get the last import timestamps
503 opendir(D,"$git_dir/refs/heads");
504 while(defined(my $head = readdir(D))) {
505 next if $head =~ /^\./;
506 open(F,"$git_dir/refs/heads/$head")
507 or die "Bad head branch: $head: $!\n";
508 chomp(my $ftag = <F>);
509 close(F);
510 open(F,"git-cat-file commit $ftag |");
511 while(<F>) {
512 next unless /^author\s.*\s(\d+)\s[-+]\d{4}$/;
513 $branch_date{$head} = $1;
514 last;
515 }
516 close(F);
517 }
518 closedir(D);
519}
520
521-d $git_dir
522 or die "Could not create git subdir ($git_dir).\n";
523
ffd97f3a
AE
524# now we read (and possibly save) author-info as well
525-f "$git_dir/cvs-authors" and
526 read_author_info("$git_dir/cvs-authors");
527if ($opt_A) {
528 read_author_info($opt_A);
529 write_author_info("$git_dir/cvs-authors");
530}
531
2f57c697
ML
532
533#
534# run cvsps into a file unless we are getting
535# it passed as a file via $opt_P
536#
537unless ($opt_P) {
538 print "Running cvsps...\n" if $opt_v;
539 my $pid = open(CVSPS,"-|");
540 die "Cannot fork: $!\n" unless defined $pid;
541 unless($pid) {
542 my @opt;
543 @opt = split(/,/,$opt_p) if defined $opt_p;
544 unshift @opt, '-z', $opt_z if defined $opt_z;
545 unshift @opt, '-q' unless defined $opt_v;
546 unless (defined($opt_p) && $opt_p =~ m/--no-cvs-direct/) {
547 push @opt, '--cvs-direct';
548 }
549 exec("cvsps","--norc",@opt,"-u","-A",'--root',$opt_d,$cvs_tree);
550 die "Could not start cvsps: $!\n";
df73e9c6 551 }
2f57c697
ML
552 my ($cvspsfh, $cvspsfile) = tempfile('gitXXXXXX', SUFFIX => '.cvsps',
553 DIR => File::Spec->tmpdir());
554 while (<CVSPS>) {
555 print $cvspsfh $_;
211dcac6 556 }
2f57c697
ML
557 close CVSPS;
558 close $cvspsfh;
559 $opt_P = $cvspsfile;
a57a9493
MU
560}
561
562
2f57c697
ML
563open(CVS, "<$opt_P") or die $!;
564
a57a9493
MU
565## cvsps output:
566#---------------------
567#PatchSet 314
568#Date: 1999/09/18 13:03:59
569#Author: wkoch
570#Branch: STABLE-BRANCH-1-0
571#Ancestor branch: HEAD
572#Tag: (none)
573#Log:
574# See ChangeLog: Sat Sep 18 13:03:28 CEST 1999 Werner Koch
575#Members:
576# README:1.57->1.57.2.1
577# VERSION:1.96->1.96.2.1
578#
579#---------------------
580
581my $state = 0;
582
e73aefe4
JK
583sub update_index (\@\@) {
584 my $old = shift;
585 my $new = shift;
6a1871e1
JK
586 open(my $fh, '|-', qw(git-update-index -z --index-info))
587 or die "unable to open git-update-index: $!";
588 print $fh
589 (map { "0 0000000000000000000000000000000000000000\t$_\0" }
e73aefe4 590 @$old),
6a1871e1 591 (map { '100' . sprintf('%o', $_->[0]) . " $_->[1]\t$_->[2]\0" }
e73aefe4 592 @$new)
6a1871e1
JK
593 or die "unable to write to git-update-index: $!";
594 close $fh
595 or die "unable to write to git-update-index: $!";
596 $? and die "git-update-index reported error: $?";
e73aefe4 597}
a57a9493 598
e73aefe4
JK
599sub write_tree () {
600 open(my $fh, '-|', qw(git-write-tree))
601 or die "unable to open git-write-tree: $!";
602 chomp(my $tree = <$fh>);
603 is_sha1($tree)
604 or die "Cannot get tree id ($tree): $!";
605 close($fh)
a57a9493
MU
606 or die "Error running git-write-tree: $?\n";
607 print "Tree ID $tree\n" if $opt_v;
e73aefe4
JK
608 return $tree;
609}
a57a9493 610
e73aefe4 611my($patchset,$date,$author_name,$author_email,$branch,$ancestor,$tag,$logmsg);
71b08148
ML
612my(@old,@new,@skipped,%ignorebranch);
613
614# commits that cvsps cannot place anywhere...
615$ignorebranch{'#CVSPS_NO_BRANCH'} = 1;
616
e73aefe4
JK
617sub commit {
618 update_index(@old, @new);
619 @old = @new = ();
620 my $tree = write_tree();
621 my $parent = get_headref($last_branch, $git_dir);
622 print "Parent ID " . ($parent ? $parent : "(empty)") . "\n" if $opt_v;
623
624 my @commit_args;
625 push @commit_args, ("-p", $parent) if $parent;
626
627 # loose detection of merges
628 # based on the commit msg
629 foreach my $rx (@mergerx) {
630 next unless $logmsg =~ $rx && $1;
631 my $mparent = $1 eq 'HEAD' ? $opt_o : $1;
632 if(my $sha1 = get_headref($mparent, $git_dir)) {
633 push @commit_args, '-p', $mparent;
634 print "Merge parent branch: $mparent\n" if $opt_v;
db4b6582 635 }
a57a9493 636 }
e73aefe4
JK
637
638 my $commit_date = strftime("+0000 %Y-%m-%d %H:%M:%S",gmtime($date));
62bf0d96
JK
639 $ENV{GIT_AUTHOR_NAME} = $author_name;
640 $ENV{GIT_AUTHOR_EMAIL} = $author_email;
641 $ENV{GIT_AUTHOR_DATE} = $commit_date;
642 $ENV{GIT_COMMITTER_NAME} = $author_name;
643 $ENV{GIT_COMMITTER_EMAIL} = $author_email;
644 $ENV{GIT_COMMITTER_DATE} = $commit_date;
e73aefe4 645 my $pid = open2(my $commit_read, my $commit_write,
e73aefe4 646 'git-commit-tree', $tree, @commit_args);
e371046b
MU
647
648 # compatibility with git2cvs
649 substr($logmsg,32767) = "" if length($logmsg) > 32767;
650 $logmsg =~ s/[\s\n]+\z//;
651
5179c8a5
ML
652 if (@skipped) {
653 $logmsg .= "\n\n\nSKIPPED:\n\t";
654 $logmsg .= join("\n\t", @skipped) . "\n";
f396f01f 655 @skipped = ();
5179c8a5
ML
656 }
657
e73aefe4 658 print($commit_write "$logmsg\n") && close($commit_write)
a57a9493 659 or die "Error writing to git-commit-tree: $!\n";
2a3e1a85 660
e73aefe4
JK
661 print "Committed patch $patchset ($branch $commit_date)\n" if $opt_v;
662 chomp(my $cid = <$commit_read>);
663 is_sha1($cid) or die "Cannot get commit id ($cid): $!\n";
a57a9493 664 print "Commit ID $cid\n" if $opt_v;
e73aefe4 665 close($commit_read);
2a3e1a85
MU
666
667 waitpid($pid,0);
668 die "Error running git-commit-tree: $?\n" if $?;
a57a9493 669
42277bc8 670 system("git-update-ref refs/heads/$branch $cid") == 0
a57a9493
MU
671 or die "Cannot write branch $branch for update: $!\n";
672
673 if($tag) {
0d821d4d
PA
674 my($in, $out) = ('','');
675 my($xtag) = $tag;
676 $xtag =~ s/\s+\*\*.*$//; # Remove stuff like ** INVALID ** and ** FUNKY **
677 $xtag =~ tr/_/\./ if ( $opt_u );
34c99da2 678 $xtag =~ s/[\/]/$opt_s/g;
0d821d4d
PA
679
680 my $pid = open2($in, $out, 'git-mktag');
681 print $out "object $cid\n".
682 "type commit\n".
683 "tag $xtag\n".
94c23343 684 "tagger $author_name <$author_email>\n"
0d821d4d
PA
685 or die "Cannot create tag object $xtag: $!\n";
686 close($out)
687 or die "Cannot create tag object $xtag: $!\n";
688
689 my $tagobj = <$in>;
690 chomp $tagobj;
691
692 if ( !close($in) or waitpid($pid, 0) != $pid or
693 $? != 0 or $tagobj !~ /^[0123456789abcdef]{40}$/ ) {
694 die "Cannot create tag object $xtag: $!\n";
695 }
696
697
698 open(C,">$git_dir/refs/tags/$xtag")
699 or die "Cannot create tag $xtag: $!\n";
700 print C "$tagobj\n"
701 or die "Cannot write tag $xtag: $!\n";
a57a9493 702 close(C)
0d821d4d
PA
703 or die "Cannot write tag $xtag: $!\n";
704
705 print "Created tag '$xtag' on '$branch'\n" if $opt_v;
a57a9493 706 }
a57a9493
MU
707};
708
06918348 709my $commitcount = 1;
a57a9493
MU
710while(<CVS>) {
711 chomp;
712 if($state == 0 and /^-+$/) {
713 $state = 1;
714 } elsif($state == 0) {
715 $state = 1;
716 redo;
717 } elsif(($state==0 or $state==1) and s/^PatchSet\s+//) {
718 $patchset = 0+$_;
719 $state=2;
720 } elsif($state == 2 and s/^Date:\s+//) {
721 $date = pdate($_);
722 unless($date) {
723 print STDERR "Could not parse date: $_\n";
724 $state=0;
725 next;
726 }
727 $state=3;
728 } elsif($state == 3 and s/^Author:\s+//) {
729 s/\s+$//;
94c23343
JH
730 if (/^(.*?)\s+<(.*)>/) {
731 ($author_name, $author_email) = ($1, $2);
ffd97f3a
AE
732 } elsif ($conv_author_name{$_}) {
733 $author_name = $conv_author_name{$_};
734 $author_email = $conv_author_email{$_};
94c23343
JH
735 } else {
736 $author_name = $author_email = $_;
737 }
a57a9493
MU
738 $state = 4;
739 } elsif($state == 4 and s/^Branch:\s+//) {
740 s/\s+$//;
fbfd60d6 741 s/[\/]/$opt_s/g;
a57a9493
MU
742 $branch = $_;
743 $state = 5;
744 } elsif($state == 5 and s/^Ancestor branch:\s+//) {
745 s/\s+$//;
746 $ancestor = $_;
0fa2824f 747 $ancestor = $opt_o if $ancestor eq "HEAD";
a57a9493
MU
748 $state = 6;
749 } elsif($state == 5) {
750 $ancestor = undef;
751 $state = 6;
752 redo;
753 } elsif($state == 6 and s/^Tag:\s+//) {
754 s/\s+$//;
755 if($_ eq "(none)") {
756 $tag = undef;
757 } else {
758 $tag = $_;
759 }
760 $state = 7;
761 } elsif($state == 7 and /^Log:/) {
762 $logmsg = "";
763 $state = 8;
764 } elsif($state == 8 and /^Members:/) {
765 $branch = $opt_o if $branch eq "HEAD";
766 if(defined $branch_date{$branch} and $branch_date{$branch} >= $date) {
767 # skip
9da07f34 768 print "skip patchset $patchset: $date before $branch_date{$branch}\n" if $opt_v;
a57a9493
MU
769 $state = 11;
770 next;
771 }
71b08148
ML
772 if (exists $ignorebranch{$branch}) {
773 print STDERR "Skipping $branch\n";
774 $state = 11;
775 next;
776 }
a57a9493 777 if($ancestor) {
71b08148
ML
778 if($ancestor eq $branch) {
779 print STDERR "Branch $branch erroneously stems from itself -- changed ancestor to $opt_o\n";
780 $ancestor = $opt_o;
781 }
a57a9493
MU
782 if(-f "$git_dir/refs/heads/$branch") {
783 print STDERR "Branch $branch already exists!\n";
784 $state=11;
785 next;
786 }
787 unless(open(H,"$git_dir/refs/heads/$ancestor")) {
788 print STDERR "Branch $ancestor does not exist!\n";
71b08148 789 $ignorebranch{$branch} = 1;
a57a9493
MU
790 $state=11;
791 next;
792 }
793 chomp(my $id = <H>);
794 close(H);
795 unless(open(H,"> $git_dir/refs/heads/$branch")) {
796 print STDERR "Could not create branch $branch: $!\n";
71b08148 797 $ignorebranch{$branch} = 1;
a57a9493
MU
798 $state=11;
799 next;
800 }
801 print H "$id\n"
802 or die "Could not write branch $branch: $!";
803 close(H)
804 or die "Could not write branch $branch: $!";
805 }
806 if(($ancestor || $branch) ne $last_branch) {
2a3e1a85 807 print "Switching from $last_branch to $branch\n" if $opt_v;
46e63efc 808 system("git-read-tree", $branch);
46541669 809 die "read-tree failed: $?\n" if $?;
a57a9493 810 }
46e63efc 811 $last_branch = $branch if $branch ne $last_branch;
a57a9493
MU
812 $state = 9;
813 } elsif($state == 8) {
814 $logmsg .= "$_\n";
8b8840e0 815 } elsif($state == 9 and /^\s+(.+?):(INITIAL|\d+(?:\.\d+)+)->(\d+(?:\.\d+)+)\s*$/) {
a57a9493 816# VERSION:1.96->1.96.2.1
2a3e1a85 817 my $init = ($2 eq "INITIAL");
a57a9493 818 my $fn = $1;
f65ae603
MU
819 my $rev = $3;
820 $fn =~ s#^/+##;
5179c8a5
ML
821 if ($opt_S && $fn =~ m/$opt_S/) {
822 print "SKIPPING $fn v $rev\n";
823 push(@skipped, $fn);
824 next;
825 }
826 print "Fetching $fn v $rev\n" if $opt_v;
2eb6d82e 827 my ($tmpname, $size) = $cvs->file($fn,$rev);
8b8840e0
MU
828 if($size == -1) {
829 push(@old,$fn);
830 print "Drop $fn\n" if $opt_v;
831 } else {
832 print "".($init ? "New" : "Update")." $fn: $size bytes\n" if $opt_v;
dd27478f
JH
833 my $pid = open(my $F, '-|');
834 die $! unless defined $pid;
835 if (!$pid) {
836 exec("git-hash-object", "-w", $tmpname)
8b8840e0 837 or die "Cannot create object: $!\n";
dd27478f 838 }
8b8840e0
MU
839 my $sha = <$F>;
840 chomp $sha;
841 close $F;
842 my $mode = pmode($cvs->{'mode'});
843 push(@new,[$mode, $sha, $fn]); # may be resurrected!
844 }
2eb6d82e 845 unlink($tmpname);
b0921331 846 } elsif($state == 9 and /^\s+(.+?):\d+(?:\.\d+)+->(\d+(?:\.\d+)+)\(DEAD\)\s*$/) {
f65ae603
MU
847 my $fn = $1;
848 $fn =~ s#^/+##;
849 push(@old,$fn);
8b8840e0 850 print "Delete $fn\n" if $opt_v;
a57a9493
MU
851 } elsif($state == 9 and /^\s*$/) {
852 $state = 10;
853 } elsif(($state == 9 or $state == 10) and /^-+$/) {
4adcea99
LT
854 $commitcount++;
855 if ($opt_L && $commitcount > $opt_L) {
06918348
ML
856 last;
857 }
c4b16f8d 858 commit();
4adcea99
LT
859 if (($commitcount & 1023) == 0) {
860 system("git repack -a -d");
861 }
a57a9493
MU
862 $state = 1;
863 } elsif($state == 11 and /^-+$/) {
864 $state = 1;
865 } elsif(/^-+$/) { # end of unknown-line processing
866 $state = 1;
867 } elsif($state != 11) { # ignore stuff when skipping
868 print "* UNKNOWN LINE * $_\n";
869 }
870}
c4b16f8d 871commit() if $branch and $state != 11;
d4f8b390 872
79ee456c
SV
873unlink($git_index);
874
210569f9
SV
875if (defined $orig_git_index) {
876 $ENV{GIT_INDEX_FILE} = $orig_git_index;
877} else {
878 delete $ENV{GIT_INDEX_FILE};
879}
880
46541669
MU
881# Now switch back to the branch we were in before all of this happened
882if($orig_branch) {
8a5f2eac
JH
883 print "DONE.\n" if $opt_v;
884 if ($opt_i) {
885 exit 0;
886 }
887 my $tip_at_end = `git-rev-parse --verify HEAD`;
888 if ($tip_at_start ne $tip_at_end) {
cb9594e2 889 for ($tip_at_start, $tip_at_end) { chomp; }
8a5f2eac
JH
890 print "Fetched into the current branch.\n" if $opt_v;
891 system(qw(git-read-tree -u -m),
892 $tip_at_start, $tip_at_end);
893 die "Fast-forward update failed: $?\n" if $?;
894 }
895 else {
896 system(qw(git-merge cvsimport HEAD), "refs/heads/$opt_o");
897 die "Could not merge $opt_o into the current branch.\n" if $?;
898 }
46541669
MU
899} else {
900 $orig_branch = "master";
901 print "DONE; creating $orig_branch branch\n" if $opt_v;
a541211e 902 system("git-update-ref", "refs/heads/master", "refs/heads/$opt_o")
46541669 903 unless -f "$git_dir/refs/heads/master";
8366a10a 904 system('git-update-ref', 'HEAD', "$orig_branch");
c1c774e7
SV
905 unless ($opt_i) {
906 system('git checkout');
907 die "checkout failed: $?\n" if $?;
908 }
46541669 909}