gitweb: Remove superfluous "|" in "commit" view
[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 19use File::Spec;
7ccd9009 20use File::Temp qw(tempfile tmpnam);
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
86d11cf2 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
86d11cf2 93if ($opt_d) {
2a3e1a85 94 $ENV{"CVSROOT"} = $opt_d;
86d11cf2 95} elsif (-f 'CVS/Root') {
f9714a4a
SV
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;
86d11cf2 101} elsif ($ENV{"CVSROOT"}) {
2a3e1a85
MU
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 143sub new {
86d11cf2 144 my ($what,$repo,$subdir) = @_;
a57a9493
MU
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'};
86d11cf2
JH
164 if ($repo =~ s/^:pserver(?:([^:]*)):(?:(.*?)(?::(.*?))?@)?([^:\/]*)(?::(\d*))?//) {
165 my ($param,$user,$pass,$serv,$port) = ($1,$2,$3,$4,$5);
73bcf533 166
86d11cf2
JH
167 my ($proxyhost,$proxyport);
168 if ($param && ($param =~ m/proxy=([^;]+)/)) {
73bcf533
IA
169 $proxyhost = $1;
170 # Default proxyport, if not specified, is 8080.
171 $proxyport = 8080;
86d11cf2 172 if ($ENV{"CVS_PROXY_PORT"}) {
73bcf533
IA
173 $proxyport = $ENV{"CVS_PROXY_PORT"};
174 }
86d11cf2 175 if ($param =~ m/proxyport=([^;]+)/) {
73bcf533
IA
176 $proxyport = $1;
177 }
178 }
179
a57a9493 180 $user="anonymous" unless defined $user;
2a3e1a85 181 my $rr2 = "-";
86d11cf2 182 unless ($port) {
a57a9493
MU
183 $rr2 = ":pserver:$user\@$serv:$repo";
184 $port=2401;
185 }
186 my $rr = ":pserver:$user\@$serv:$port$repo";
187
86d11cf2 188 unless ($pass) {
a57a9493
MU
189 open(H,$ENV{'HOME'}."/.cvspass") and do {
190 # :pserver:cvs@mea.tmt.tele.fi:/cvsroot/zmailer Ah<Z
86d11cf2 191 while (<H>) {
a57a9493
MU
192 chomp;
193 s/^\/\d+\s+//;
194 my ($w,$p) = split(/\s/,$_,2);
86d11cf2 195 if ($w eq $rr or $w eq $rr2) {
a57a9493
MU
196 $pass = $p;
197 last;
198 }
199 }
200 };
201 }
202 $pass="A" unless $pass;
203
73bcf533 204 my ($s, $rep);
86d11cf2 205 if ($proxyhost) {
73bcf533
IA
206
207 # Use a HTTP Proxy. Only works for HTTP proxies that
208 # don't require user authentication
209 #
210 # See: http://www.ietf.org/rfc/rfc2817.txt
211
212 $s = IO::Socket::INET->new(PeerHost => $proxyhost, PeerPort => $proxyport);
213 die "Socket to $proxyhost: $!\n" unless defined $s;
214 $s->write("CONNECT $serv:$port HTTP/1.1\r\nHost: $serv:$port\r\n\r\n")
215 or die "Write to $proxyhost: $!\n";
216 $s->flush();
217
218 $rep = <$s>;
219
220 # The answer should look like 'HTTP/1.x 2yy ....'
86d11cf2 221 if (!($rep =~ m#^HTTP/1\.. 2[0-9][0-9]#)) {
73bcf533
IA
222 die "Proxy connect: $rep\n";
223 }
224 # Skip up to the empty line of the proxy server output
225 # including the response headers.
226 while ($rep = <$s>) {
227 last if (!defined $rep ||
228 $rep eq "\n" ||
229 $rep eq "\r\n");
230 }
231 } else {
232 $s = IO::Socket::INET->new(PeerHost => $serv, PeerPort => $port);
233 die "Socket to $serv: $!\n" unless defined $s;
234 }
235
a57a9493
MU
236 $s->write("BEGIN AUTH REQUEST\n$repo\n$user\n$pass\nEND AUTH REQUEST\n")
237 or die "Write to $serv: $!\n";
238 $s->flush();
239
73bcf533 240 $rep = <$s>;
a57a9493 241
86d11cf2 242 if ($rep ne "I LOVE YOU\n") {
a57a9493
MU
243 $rep="<unknown>" unless $rep;
244 die "AuthReply: $rep\n";
245 }
246 $self->{'socketo'} = $s;
247 $self->{'socketi'} = $s;
34155390 248 } else { # local or ext: Fork off our own cvs server.
a57a9493
MU
249 my $pr = IO::Pipe->new();
250 my $pw = IO::Pipe->new();
251 my $pid = fork();
252 die "Fork: $!\n" unless defined $pid;
8d0ea311
SV
253 my $cvs = 'cvs';
254 $cvs = $ENV{CVS_SERVER} if exists $ENV{CVS_SERVER};
34155390
SV
255 my $rsh = 'rsh';
256 $rsh = $ENV{CVS_RSH} if exists $ENV{CVS_RSH};
257
258 my @cvs = ($cvs, 'server');
259 my ($local, $user, $host);
260 $local = $repo =~ s/:local://;
261 if (!$local) {
262 $repo =~ s/:ext://;
263 $local = !($repo =~ s/^(?:([^\@:]+)\@)?([^:]+)://);
264 ($user, $host) = ($1, $2);
265 }
266 if (!$local) {
267 if ($user) {
268 unshift @cvs, $rsh, '-l', $user, $host;
269 } else {
270 unshift @cvs, $rsh, $host;
271 }
272 }
273
86d11cf2 274 unless ($pid) {
a57a9493
MU
275 $pr->writer();
276 $pw->reader();
a57a9493
MU
277 dup2($pw->fileno(),0);
278 dup2($pr->fileno(),1);
279 $pr->close();
280 $pw->close();
34155390 281 exec(@cvs);
a57a9493
MU
282 }
283 $pw->writer();
284 $pr->reader();
285 $self->{'socketo'} = $pw;
286 $self->{'socketi'} = $pr;
287 }
288 $self->{'socketo'}->write("Root $repo\n");
289
290 # Trial and error says that this probably is the minimum set
b0921331 291 $self->{'socketo'}->write("Valid-responses ok error Valid-requests Mode M Mbinary E Checked-in Created Updated Merged Removed\n");
a57a9493
MU
292
293 $self->{'socketo'}->write("valid-requests\n");
294 $self->{'socketo'}->flush();
295
296 chomp(my $rep=$self->readline());
86d11cf2 297 if ($rep !~ s/^Valid-requests\s*//) {
a57a9493
MU
298 $rep="<unknown>" unless $rep;
299 die "Expected Valid-requests from server, but got: $rep\n";
300 }
301 chomp(my $res=$self->readline());
302 die "validReply: $res\n" if $res ne "ok";
303
304 $self->{'socketo'}->write("UseUnchanged\n") if $rep =~ /\bUseUnchanged\b/;
305 $self->{'repo'} = $repo;
306}
307
308sub readline {
86d11cf2 309 my ($self) = @_;
a57a9493
MU
310 return $self->{'socketi'}->getline();
311}
312
313sub _file {
314 # Request a file with a given revision.
315 # Trial and error says this is a good way to do it. :-/
86d11cf2 316 my ($self,$fn,$rev) = @_;
a57a9493
MU
317 $self->{'socketo'}->write("Argument -N\n") or return undef;
318 $self->{'socketo'}->write("Argument -P\n") or return undef;
abe05822
ML
319 # -kk: Linus' version doesn't use it - defaults to off
320 if ($opt_k) {
321 $self->{'socketo'}->write("Argument -kk\n") or return undef;
322 }
a57a9493
MU
323 $self->{'socketo'}->write("Argument -r\n") or return undef;
324 $self->{'socketo'}->write("Argument $rev\n") or return undef;
325 $self->{'socketo'}->write("Argument --\n") or return undef;
326 $self->{'socketo'}->write("Argument $self->{'subdir'}/$fn\n") or return undef;
327 $self->{'socketo'}->write("Directory .\n") or return undef;
328 $self->{'socketo'}->write("$self->{'repo'}\n") or return undef;
4f7c0caa 329 # $self->{'socketo'}->write("Sticky T1.0\n") or return undef;
a57a9493
MU
330 $self->{'socketo'}->write("co\n") or return undef;
331 $self->{'socketo'}->flush() or return undef;
332 $self->{'lines'} = 0;
333 return 1;
334}
335sub _line {
336 # Read a line from the server.
337 # ... except that 'line' may be an entire file. ;-)
86d11cf2 338 my ($self, $fh) = @_;
a57a9493
MU
339 die "Not in lines" unless defined $self->{'lines'};
340
341 my $line;
2eb6d82e 342 my $res=0;
86d11cf2 343 while (defined($line = $self->readline())) {
a57a9493
MU
344 # M U gnupg-cvs-rep/AUTHORS
345 # Updated gnupg-cvs-rep/
346 # /daten/src/rsync/gnupg-cvs-rep/AUTHORS
347 # /AUTHORS/1.1///T1.1
348 # u=rw,g=rw,o=rw
349 # 0
350 # ok
351
86d11cf2 352 if ($line =~ s/^(?:Created|Updated) //) {
a57a9493
MU
353 $line = $self->readline(); # path
354 $line = $self->readline(); # Entries line
355 my $mode = $self->readline(); chomp $mode;
356 $self->{'mode'} = $mode;
357 defined (my $cnt = $self->readline())
358 or die "EOF from server after 'Changed'\n";
359 chomp $cnt;
360 die "Duh: Filesize $cnt" if $cnt !~ /^\d+$/;
361 $line="";
55cad842 362 $res = $self->_fetchfile($fh, $cnt);
86d11cf2 363 } elsif ($line =~ s/^ //) {
2eb6d82e
SV
364 print $fh $line;
365 $res += length($line);
86d11cf2 366 } elsif ($line =~ /^M\b/) {
a57a9493 367 # output, do nothing
86d11cf2 368 } elsif ($line =~ /^Mbinary\b/) {
a57a9493
MU
369 my $cnt;
370 die "EOF from server after 'Mbinary'" unless defined ($cnt = $self->readline());
371 chomp $cnt;
372 die "Duh: Mbinary $cnt" if $cnt !~ /^\d+$/ or $cnt<1;
373 $line="";
55cad842 374 $res += $self->_fetchfile($fh, $cnt);
a57a9493
MU
375 } else {
376 chomp $line;
86d11cf2 377 if ($line eq "ok") {
a57a9493
MU
378 # print STDERR "S: ok (".length($res).")\n";
379 return $res;
86d11cf2 380 } elsif ($line =~ s/^E //) {
a57a9493 381 # print STDERR "S: $line\n";
86d11cf2 382 } elsif ($line =~ /^(Remove-entry|Removed) /i) {
8b8840e0
MU
383 $line = $self->readline(); # filename
384 $line = $self->readline(); # OK
385 chomp $line;
386 die "Unknown: $line" if $line ne "ok";
387 return -1;
a57a9493
MU
388 } else {
389 die "Unknown: $line\n";
390 }
391 }
392 }
39ba7d54 393 return undef;
a57a9493
MU
394}
395sub file {
86d11cf2 396 my ($self,$fn,$rev) = @_;
a57a9493
MU
397 my $res;
398
2eb6d82e
SV
399 my ($fh, $name) = tempfile('gitcvs.XXXXXX',
400 DIR => File::Spec->tmpdir(), UNLINK => 1);
401
402 $self->_file($fn,$rev) and $res = $self->_line($fh);
403
404 if (!defined $res) {
39ba7d54
MM
405 print STDERR "Server has gone away while fetching $fn $rev, retrying...\n";
406 truncate $fh, 0;
2eb6d82e 407 $self->conn();
39ba7d54 408 $self->_file($fn,$rev) or die "No file command send";
2eb6d82e 409 $res = $self->_line($fh);
39ba7d54 410 die "Retry failed" unless defined $res;
a57a9493 411 }
c619ad51 412 close ($fh);
a57a9493 413
2eb6d82e 414 return ($name, $res);
a57a9493 415}
55cad842
ML
416sub _fetchfile {
417 my ($self, $fh, $cnt) = @_;
61efa5e3 418 my $res = 0;
55cad842 419 my $bufsize = 1024 * 1024;
86d11cf2 420 while ($cnt) {
55cad842
ML
421 if ($bufsize > $cnt) {
422 $bufsize = $cnt;
423 }
424 my $buf;
425 my $num = $self->{'socketi'}->read($buf,$bufsize);
426 die "Server: Filesize $cnt: $num: $!\n" if not defined $num or $num<=0;
427 print $fh $buf;
428 $res += $num;
429 $cnt -= $num;
430 }
431 return $res;
432}
a57a9493
MU
433
434
435package main;
436
2a3e1a85 437my $cvs = CVSconn->new($opt_d, $cvs_tree);
a57a9493
MU
438
439
440sub pdate($) {
86d11cf2 441 my ($d) = @_;
a57a9493
MU
442 m#(\d{2,4})/(\d\d)/(\d\d)\s(\d\d):(\d\d)(?::(\d\d))?#
443 or die "Unparseable date: $d\n";
444 my $y=$1; $y-=1900 if $y>1900;
445 return timegm($6||0,$5,$4,$3,$2-1,$y);
9718a00b
TM
446}
447
a57a9493 448sub pmode($) {
86d11cf2 449 my ($mode) = @_;
a57a9493
MU
450 my $m = 0;
451 my $mm = 0;
452 my $um = 0;
453 for my $x(split(//,$mode)) {
86d11cf2 454 if ($x eq ",") {
a57a9493
MU
455 $m |= $mm&$um;
456 $mm = 0;
457 $um = 0;
86d11cf2
JH
458 } elsif ($x eq "u") { $um |= 0700;
459 } elsif ($x eq "g") { $um |= 0070;
460 } elsif ($x eq "o") { $um |= 0007;
461 } elsif ($x eq "r") { $mm |= 0444;
462 } elsif ($x eq "w") { $mm |= 0222;
463 } elsif ($x eq "x") { $mm |= 0111;
464 } elsif ($x eq "=") { # do nothing
a57a9493
MU
465 } else { die "Unknown mode: $mode\n";
466 }
467 }
468 $m |= $mm&$um;
469 return $m;
470}
d4f8b390 471
a57a9493
MU
472sub getwd() {
473 my $pwd = `pwd`;
474 chomp $pwd;
475 return $pwd;
d4f8b390
LT
476}
477
e73aefe4
JK
478sub is_sha1 {
479 my $s = shift;
480 return $s =~ /^[a-f0-9]{40}$/;
481}
db4b6582 482
e73aefe4 483sub get_headref ($$) {
db4b6582
ML
484 my $name = shift;
485 my $git_dir = shift;
db4b6582 486
e73aefe4 487 my $f = "$git_dir/refs/heads/$name";
86d11cf2 488 if (open(my $fh, $f)) {
e73aefe4
JK
489 chomp(my $r = <$fh>);
490 is_sha1($r) or die "Cannot get head id for $name ($r): $!";
491 return $r;
db4b6582 492 }
e73aefe4
JK
493 die "unable to open $f: $!" unless $! == POSIX::ENOENT;
494 return undef;
db4b6582
ML
495}
496
a57a9493
MU
497-d $git_tree
498 or mkdir($git_tree,0777)
499 or die "Could not create $git_tree: $!";
500chdir($git_tree);
d4f8b390 501
a57a9493 502my $last_branch = "";
46541669 503my $orig_branch = "";
a57a9493 504my %branch_date;
8a5f2eac 505my $tip_at_start = undef;
a57a9493
MU
506
507my $git_dir = $ENV{"GIT_DIR"} || ".git";
508$git_dir = getwd()."/".$git_dir unless $git_dir =~ m#^/#;
509$ENV{"GIT_DIR"} = $git_dir;
79ee456c
SV
510my $orig_git_index;
511$orig_git_index = $ENV{GIT_INDEX_FILE} if exists $ENV{GIT_INDEX_FILE};
8f732649
ML
512
513my %index; # holds filenames of one index per branch
061303f0 514
86d11cf2 515unless (-d $git_dir) {
a57a9493
MU
516 system("git-init-db");
517 die "Cannot init the GIT db at $git_tree: $?\n" if $?;
518 system("git-read-tree");
519 die "Cannot init an empty tree: $?\n" if $?;
520
521 $last_branch = $opt_o;
46541669 522 $orig_branch = "";
a57a9493 523} else {
866d1310 524 -f "$git_dir/refs/heads/$opt_o"
4c24e089
MU
525 or die "Branch '$opt_o' does not exist.\n".
526 "Either use the correct '-o branch' option,\n".
527 "or import to a new repository.\n";
528
8366a10a
PR
529 open(F, "git-symbolic-ref HEAD |") or
530 die "Cannot run git-symbolic-ref: $!\n";
531 chomp ($last_branch = <F>);
532 $last_branch = basename($last_branch);
533 close(F);
86d11cf2 534 unless ($last_branch) {
46541669
MU
535 warn "Cannot read the last branch name: $! -- assuming 'master'\n";
536 $last_branch = "master";
537 }
538 $orig_branch = $last_branch;
8a5f2eac 539 $tip_at_start = `git-rev-parse --verify HEAD`;
a57a9493
MU
540
541 # Get the last import timestamps
1f24c587
AW
542 my $fmt = '($ref, $author) = (%(refname), %(author));';
543 open(H, "git-for-each-ref --perl --format='$fmt' refs/heads |") or
544 die "Cannot run git-for-each-ref: $!\n";
86d11cf2 545 while (defined(my $entry = <H>)) {
1f24c587
AW
546 my ($ref, $author);
547 eval($entry) || die "cannot eval refs list: $@";
548 my ($head) = ($ref =~ m|^refs/heads/(.*)|);
549 $author =~ /^.*\s(\d+)\s[-+]\d{4}$/;
550 $branch_date{$head} = $1;
a57a9493 551 }
1f24c587 552 close(H);
a57a9493
MU
553}
554
555-d $git_dir
556 or die "Could not create git subdir ($git_dir).\n";
557
ffd97f3a
AE
558# now we read (and possibly save) author-info as well
559-f "$git_dir/cvs-authors" and
560 read_author_info("$git_dir/cvs-authors");
561if ($opt_A) {
562 read_author_info($opt_A);
563 write_author_info("$git_dir/cvs-authors");
564}
565
2f57c697
ML
566
567#
568# run cvsps into a file unless we are getting
569# it passed as a file via $opt_P
570#
571unless ($opt_P) {
572 print "Running cvsps...\n" if $opt_v;
573 my $pid = open(CVSPS,"-|");
574 die "Cannot fork: $!\n" unless defined $pid;
86d11cf2 575 unless ($pid) {
2f57c697
ML
576 my @opt;
577 @opt = split(/,/,$opt_p) if defined $opt_p;
578 unshift @opt, '-z', $opt_z if defined $opt_z;
579 unshift @opt, '-q' unless defined $opt_v;
580 unless (defined($opt_p) && $opt_p =~ m/--no-cvs-direct/) {
581 push @opt, '--cvs-direct';
582 }
583 exec("cvsps","--norc",@opt,"-u","-A",'--root',$opt_d,$cvs_tree);
584 die "Could not start cvsps: $!\n";
df73e9c6 585 }
2f57c697
ML
586 my ($cvspsfh, $cvspsfile) = tempfile('gitXXXXXX', SUFFIX => '.cvsps',
587 DIR => File::Spec->tmpdir());
588 while (<CVSPS>) {
589 print $cvspsfh $_;
211dcac6 590 }
2f57c697
ML
591 close CVSPS;
592 close $cvspsfh;
593 $opt_P = $cvspsfile;
a57a9493
MU
594}
595
596
2f57c697
ML
597open(CVS, "<$opt_P") or die $!;
598
a57a9493
MU
599## cvsps output:
600#---------------------
601#PatchSet 314
602#Date: 1999/09/18 13:03:59
603#Author: wkoch
604#Branch: STABLE-BRANCH-1-0
605#Ancestor branch: HEAD
606#Tag: (none)
607#Log:
608# See ChangeLog: Sat Sep 18 13:03:28 CEST 1999 Werner Koch
609#Members:
610# README:1.57->1.57.2.1
611# VERSION:1.96->1.96.2.1
612#
613#---------------------
614
615my $state = 0;
616
e73aefe4
JK
617sub update_index (\@\@) {
618 my $old = shift;
619 my $new = shift;
6a1871e1
JK
620 open(my $fh, '|-', qw(git-update-index -z --index-info))
621 or die "unable to open git-update-index: $!";
622 print $fh
623 (map { "0 0000000000000000000000000000000000000000\t$_\0" }
e73aefe4 624 @$old),
6a1871e1 625 (map { '100' . sprintf('%o', $_->[0]) . " $_->[1]\t$_->[2]\0" }
e73aefe4 626 @$new)
6a1871e1
JK
627 or die "unable to write to git-update-index: $!";
628 close $fh
629 or die "unable to write to git-update-index: $!";
630 $? and die "git-update-index reported error: $?";
e73aefe4 631}
a57a9493 632
e73aefe4
JK
633sub write_tree () {
634 open(my $fh, '-|', qw(git-write-tree))
635 or die "unable to open git-write-tree: $!";
636 chomp(my $tree = <$fh>);
637 is_sha1($tree)
638 or die "Cannot get tree id ($tree): $!";
639 close($fh)
a57a9493
MU
640 or die "Error running git-write-tree: $?\n";
641 print "Tree ID $tree\n" if $opt_v;
e73aefe4
JK
642 return $tree;
643}
a57a9493 644
86d11cf2
JH
645my ($patchset,$date,$author_name,$author_email,$branch,$ancestor,$tag,$logmsg);
646my (@old,@new,@skipped,%ignorebranch);
71b08148
ML
647
648# commits that cvsps cannot place anywhere...
649$ignorebranch{'#CVSPS_NO_BRANCH'} = 1;
650
e73aefe4 651sub commit {
c5f448b0
ML
652 if ($branch eq $opt_o && !$index{branch} && !get_headref($branch, $git_dir)) {
653 # looks like an initial commit
654 # use the index primed by git-init-db
655 $ENV{GIT_INDEX_FILE} = '.git/index';
656 $index{$branch} = '.git/index';
657 } else {
658 # use an index per branch to speed up
659 # imports of projects with many branches
660 unless ($index{$branch}) {
661 $index{$branch} = tmpnam();
662 $ENV{GIT_INDEX_FILE} = $index{$branch};
663 if ($ancestor) {
664 system("git-read-tree", $ancestor);
665 } else {
666 system("git-read-tree", $branch);
667 }
668 die "read-tree failed: $?\n" if $?;
669 }
670 }
671 $ENV{GIT_INDEX_FILE} = $index{$branch};
672
e73aefe4
JK
673 update_index(@old, @new);
674 @old = @new = ();
675 my $tree = write_tree();
676 my $parent = get_headref($last_branch, $git_dir);
677 print "Parent ID " . ($parent ? $parent : "(empty)") . "\n" if $opt_v;
678
679 my @commit_args;
680 push @commit_args, ("-p", $parent) if $parent;
681
682 # loose detection of merges
683 # based on the commit msg
684 foreach my $rx (@mergerx) {
685 next unless $logmsg =~ $rx && $1;
686 my $mparent = $1 eq 'HEAD' ? $opt_o : $1;
86d11cf2 687 if (my $sha1 = get_headref($mparent, $git_dir)) {
e73aefe4
JK
688 push @commit_args, '-p', $mparent;
689 print "Merge parent branch: $mparent\n" if $opt_v;
db4b6582 690 }
a57a9493 691 }
e73aefe4
JK
692
693 my $commit_date = strftime("+0000 %Y-%m-%d %H:%M:%S",gmtime($date));
62bf0d96
JK
694 $ENV{GIT_AUTHOR_NAME} = $author_name;
695 $ENV{GIT_AUTHOR_EMAIL} = $author_email;
696 $ENV{GIT_AUTHOR_DATE} = $commit_date;
697 $ENV{GIT_COMMITTER_NAME} = $author_name;
698 $ENV{GIT_COMMITTER_EMAIL} = $author_email;
699 $ENV{GIT_COMMITTER_DATE} = $commit_date;
e73aefe4 700 my $pid = open2(my $commit_read, my $commit_write,
e73aefe4 701 'git-commit-tree', $tree, @commit_args);
e371046b
MU
702
703 # compatibility with git2cvs
704 substr($logmsg,32767) = "" if length($logmsg) > 32767;
705 $logmsg =~ s/[\s\n]+\z//;
706
5179c8a5
ML
707 if (@skipped) {
708 $logmsg .= "\n\n\nSKIPPED:\n\t";
709 $logmsg .= join("\n\t", @skipped) . "\n";
f396f01f 710 @skipped = ();
5179c8a5
ML
711 }
712
e73aefe4 713 print($commit_write "$logmsg\n") && close($commit_write)
a57a9493 714 or die "Error writing to git-commit-tree: $!\n";
2a3e1a85 715
e73aefe4
JK
716 print "Committed patch $patchset ($branch $commit_date)\n" if $opt_v;
717 chomp(my $cid = <$commit_read>);
718 is_sha1($cid) or die "Cannot get commit id ($cid): $!\n";
a57a9493 719 print "Commit ID $cid\n" if $opt_v;
e73aefe4 720 close($commit_read);
2a3e1a85
MU
721
722 waitpid($pid,0);
723 die "Error running git-commit-tree: $?\n" if $?;
a57a9493 724
42277bc8 725 system("git-update-ref refs/heads/$branch $cid") == 0
a57a9493
MU
726 or die "Cannot write branch $branch for update: $!\n";
727
86d11cf2
JH
728 if ($tag) {
729 my ($in, $out) = ('','');
730 my ($xtag) = $tag;
0d821d4d
PA
731 $xtag =~ s/\s+\*\*.*$//; # Remove stuff like ** INVALID ** and ** FUNKY **
732 $xtag =~ tr/_/\./ if ( $opt_u );
34c99da2 733 $xtag =~ s/[\/]/$opt_s/g;
0d821d4d
PA
734
735 my $pid = open2($in, $out, 'git-mktag');
736 print $out "object $cid\n".
737 "type commit\n".
738 "tag $xtag\n".
94c23343 739 "tagger $author_name <$author_email>\n"
0d821d4d
PA
740 or die "Cannot create tag object $xtag: $!\n";
741 close($out)
742 or die "Cannot create tag object $xtag: $!\n";
743
744 my $tagobj = <$in>;
745 chomp $tagobj;
746
747 if ( !close($in) or waitpid($pid, 0) != $pid or
748 $? != 0 or $tagobj !~ /^[0123456789abcdef]{40}$/ ) {
749 die "Cannot create tag object $xtag: $!\n";
750 }
751
752
753 open(C,">$git_dir/refs/tags/$xtag")
754 or die "Cannot create tag $xtag: $!\n";
755 print C "$tagobj\n"
756 or die "Cannot write tag $xtag: $!\n";
a57a9493 757 close(C)
0d821d4d
PA
758 or die "Cannot write tag $xtag: $!\n";
759
760 print "Created tag '$xtag' on '$branch'\n" if $opt_v;
a57a9493 761 }
a57a9493
MU
762};
763
06918348 764my $commitcount = 1;
86d11cf2 765while (<CVS>) {
a57a9493 766 chomp;
86d11cf2 767 if ($state == 0 and /^-+$/) {
a57a9493 768 $state = 1;
86d11cf2 769 } elsif ($state == 0) {
a57a9493
MU
770 $state = 1;
771 redo;
86d11cf2 772 } elsif (($state==0 or $state==1) and s/^PatchSet\s+//) {
a57a9493
MU
773 $patchset = 0+$_;
774 $state=2;
86d11cf2 775 } elsif ($state == 2 and s/^Date:\s+//) {
a57a9493 776 $date = pdate($_);
86d11cf2 777 unless ($date) {
a57a9493
MU
778 print STDERR "Could not parse date: $_\n";
779 $state=0;
780 next;
781 }
782 $state=3;
86d11cf2 783 } elsif ($state == 3 and s/^Author:\s+//) {
a57a9493 784 s/\s+$//;
94c23343
JH
785 if (/^(.*?)\s+<(.*)>/) {
786 ($author_name, $author_email) = ($1, $2);
ffd97f3a
AE
787 } elsif ($conv_author_name{$_}) {
788 $author_name = $conv_author_name{$_};
789 $author_email = $conv_author_email{$_};
94c23343
JH
790 } else {
791 $author_name = $author_email = $_;
792 }
a57a9493 793 $state = 4;
86d11cf2 794 } elsif ($state == 4 and s/^Branch:\s+//) {
a57a9493 795 s/\s+$//;
fbfd60d6 796 s/[\/]/$opt_s/g;
a57a9493
MU
797 $branch = $_;
798 $state = 5;
86d11cf2 799 } elsif ($state == 5 and s/^Ancestor branch:\s+//) {
a57a9493
MU
800 s/\s+$//;
801 $ancestor = $_;
0fa2824f 802 $ancestor = $opt_o if $ancestor eq "HEAD";
a57a9493 803 $state = 6;
86d11cf2 804 } elsif ($state == 5) {
a57a9493
MU
805 $ancestor = undef;
806 $state = 6;
807 redo;
86d11cf2 808 } elsif ($state == 6 and s/^Tag:\s+//) {
a57a9493 809 s/\s+$//;
86d11cf2 810 if ($_ eq "(none)") {
a57a9493
MU
811 $tag = undef;
812 } else {
813 $tag = $_;
814 }
815 $state = 7;
86d11cf2 816 } elsif ($state == 7 and /^Log:/) {
a57a9493
MU
817 $logmsg = "";
818 $state = 8;
86d11cf2 819 } elsif ($state == 8 and /^Members:/) {
a57a9493 820 $branch = $opt_o if $branch eq "HEAD";
86d11cf2 821 if (defined $branch_date{$branch} and $branch_date{$branch} >= $date) {
a57a9493 822 # skip
9da07f34 823 print "skip patchset $patchset: $date before $branch_date{$branch}\n" if $opt_v;
a57a9493
MU
824 $state = 11;
825 next;
826 }
71b08148
ML
827 if (exists $ignorebranch{$branch}) {
828 print STDERR "Skipping $branch\n";
829 $state = 11;
830 next;
831 }
86d11cf2
JH
832 if ($ancestor) {
833 if ($ancestor eq $branch) {
71b08148
ML
834 print STDERR "Branch $branch erroneously stems from itself -- changed ancestor to $opt_o\n";
835 $ancestor = $opt_o;
836 }
86d11cf2 837 if (-f "$git_dir/refs/heads/$branch") {
a57a9493
MU
838 print STDERR "Branch $branch already exists!\n";
839 $state=11;
840 next;
841 }
86d11cf2 842 unless (open(H,"$git_dir/refs/heads/$ancestor")) {
a57a9493 843 print STDERR "Branch $ancestor does not exist!\n";
71b08148 844 $ignorebranch{$branch} = 1;
a57a9493
MU
845 $state=11;
846 next;
847 }
848 chomp(my $id = <H>);
849 close(H);
86d11cf2 850 unless (open(H,"> $git_dir/refs/heads/$branch")) {
a57a9493 851 print STDERR "Could not create branch $branch: $!\n";
71b08148 852 $ignorebranch{$branch} = 1;
a57a9493
MU
853 $state=11;
854 next;
855 }
856 print H "$id\n"
857 or die "Could not write branch $branch: $!";
858 close(H)
859 or die "Could not write branch $branch: $!";
860 }
46e63efc 861 $last_branch = $branch if $branch ne $last_branch;
a57a9493 862 $state = 9;
86d11cf2 863 } elsif ($state == 8) {
a57a9493 864 $logmsg .= "$_\n";
86d11cf2 865 } elsif ($state == 9 and /^\s+(.+?):(INITIAL|\d+(?:\.\d+)+)->(\d+(?:\.\d+)+)\s*$/) {
a57a9493 866# VERSION:1.96->1.96.2.1
2a3e1a85 867 my $init = ($2 eq "INITIAL");
a57a9493 868 my $fn = $1;
f65ae603
MU
869 my $rev = $3;
870 $fn =~ s#^/+##;
5179c8a5
ML
871 if ($opt_S && $fn =~ m/$opt_S/) {
872 print "SKIPPING $fn v $rev\n";
873 push(@skipped, $fn);
874 next;
875 }
876 print "Fetching $fn v $rev\n" if $opt_v;
2eb6d82e 877 my ($tmpname, $size) = $cvs->file($fn,$rev);
86d11cf2 878 if ($size == -1) {
8b8840e0
MU
879 push(@old,$fn);
880 print "Drop $fn\n" if $opt_v;
881 } else {
882 print "".($init ? "New" : "Update")." $fn: $size bytes\n" if $opt_v;
dd27478f
JH
883 my $pid = open(my $F, '-|');
884 die $! unless defined $pid;
885 if (!$pid) {
886 exec("git-hash-object", "-w", $tmpname)
8b8840e0 887 or die "Cannot create object: $!\n";
dd27478f 888 }
8b8840e0
MU
889 my $sha = <$F>;
890 chomp $sha;
891 close $F;
892 my $mode = pmode($cvs->{'mode'});
893 push(@new,[$mode, $sha, $fn]); # may be resurrected!
894 }
2eb6d82e 895 unlink($tmpname);
86d11cf2 896 } elsif ($state == 9 and /^\s+(.+?):\d+(?:\.\d+)+->(\d+(?:\.\d+)+)\(DEAD\)\s*$/) {
f65ae603
MU
897 my $fn = $1;
898 $fn =~ s#^/+##;
899 push(@old,$fn);
8b8840e0 900 print "Delete $fn\n" if $opt_v;
86d11cf2 901 } elsif ($state == 9 and /^\s*$/) {
a57a9493 902 $state = 10;
86d11cf2 903 } elsif (($state == 9 or $state == 10) and /^-+$/) {
4adcea99
LT
904 $commitcount++;
905 if ($opt_L && $commitcount > $opt_L) {
06918348
ML
906 last;
907 }
c4b16f8d 908 commit();
4adcea99
LT
909 if (($commitcount & 1023) == 0) {
910 system("git repack -a -d");
911 }
a57a9493 912 $state = 1;
86d11cf2 913 } elsif ($state == 11 and /^-+$/) {
a57a9493 914 $state = 1;
86d11cf2 915 } elsif (/^-+$/) { # end of unknown-line processing
a57a9493 916 $state = 1;
86d11cf2 917 } elsif ($state != 11) { # ignore stuff when skipping
a57a9493
MU
918 print "* UNKNOWN LINE * $_\n";
919 }
920}
c4b16f8d 921commit() if $branch and $state != 11;
d4f8b390 922
efe4abd1
JM
923# The heuristic of repacking every 1024 commits can leave a
924# lot of unpacked data. If there is more than 1MB worth of
925# not-packed objects, repack once more.
926my $line = `git-count-objects`;
927if ($line =~ /^(\d+) objects, (\d+) kilobytes$/) {
928 my ($n_objects, $kb) = ($1, $2);
929 1024 < $kb
930 and system("git repack -a -d");
931}
932
8f732649 933foreach my $git_index (values %index) {
c5f448b0
ML
934 if ($git_index ne '.git/index') {
935 unlink($git_index);
936 }
8f732649 937}
79ee456c 938
210569f9
SV
939if (defined $orig_git_index) {
940 $ENV{GIT_INDEX_FILE} = $orig_git_index;
941} else {
942 delete $ENV{GIT_INDEX_FILE};
943}
944
46541669 945# Now switch back to the branch we were in before all of this happened
86d11cf2 946if ($orig_branch) {
8a5f2eac
JH
947 print "DONE.\n" if $opt_v;
948 if ($opt_i) {
949 exit 0;
950 }
951 my $tip_at_end = `git-rev-parse --verify HEAD`;
952 if ($tip_at_start ne $tip_at_end) {
cb9594e2 953 for ($tip_at_start, $tip_at_end) { chomp; }
8a5f2eac
JH
954 print "Fetched into the current branch.\n" if $opt_v;
955 system(qw(git-read-tree -u -m),
956 $tip_at_start, $tip_at_end);
957 die "Fast-forward update failed: $?\n" if $?;
958 }
959 else {
960 system(qw(git-merge cvsimport HEAD), "refs/heads/$opt_o");
961 die "Could not merge $opt_o into the current branch.\n" if $?;
962 }
46541669
MU
963} else {
964 $orig_branch = "master";
965 print "DONE; creating $orig_branch branch\n" if $opt_v;
a541211e 966 system("git-update-ref", "refs/heads/master", "refs/heads/$opt_o")
46541669 967 unless -f "$git_dir/refs/heads/master";
8366a10a 968 system('git-update-ref', 'HEAD', "$orig_branch");
c1c774e7
SV
969 unless ($opt_i) {
970 system('git checkout');
971 die "checkout failed: $?\n" if $?;
972 }
46541669 973}