]>
Commit | Line | Data |
---|---|---|
1 | #!/usr/bin/perl -w | |
2 | ||
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 | ||
16 | use strict; | |
17 | use warnings; | |
18 | use Getopt::Std; | |
19 | use File::Spec; | |
20 | use File::Temp qw(tempfile tmpnam); | |
21 | use File::Path qw(mkpath); | |
22 | use File::Basename qw(basename dirname); | |
23 | use Time::Local; | |
24 | use IO::Socket; | |
25 | use IO::Pipe; | |
26 | use POSIX qw(strftime dup2 ENOENT); | |
27 | use IPC::Open2; | |
28 | ||
29 | $SIG{'PIPE'}="IGNORE"; | |
30 | $ENV{'TZ'}="UTC"; | |
31 | ||
32 | our ($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, $opt_a, $opt_r); | |
33 | my (%conv_author_name, %conv_author_email); | |
34 | ||
35 | sub usage(;$) { | |
36 | my $msg = shift; | |
37 | print(STDERR "Error: $msg\n") if $msg; | |
38 | print STDERR <<END; | |
39 | Usage: ${\basename $0} # fetch/update GIT from CVS | |
40 | [-o branch-for-HEAD] [-h] [-v] [-d CVSROOT] [-A author-conv-file] | |
41 | [-p opts-for-cvsps] [-P file] [-C GIT_repository] [-z fuzz] [-i] [-k] | |
42 | [-u] [-s subst] [-a] [-m] [-M regex] [-S regex] [-L commitlimit] | |
43 | [-r remote] [CVS_module] | |
44 | END | |
45 | exit(1); | |
46 | } | |
47 | ||
48 | sub read_author_info($) { | |
49 | my ($file) = @_; | |
50 | my $user; | |
51 | open my $f, '<', "$file" or die("Failed to open $file: $!\n"); | |
52 | ||
53 | while (<$f>) { | |
54 | # Expected format is this: | |
55 | # exon=Andreas Ericsson <ae@op5.se> | |
56 | if (m/^(\S+?)\s*=\s*(.+?)\s*<(.+)>\s*$/) { | |
57 | $user = $1; | |
58 | $conv_author_name{$user} = $2; | |
59 | $conv_author_email{$user} = $3; | |
60 | } | |
61 | # However, we also read from CVSROOT/users format | |
62 | # to ease migration. | |
63 | elsif (/^(\w+):(['"]?)(.+?)\2\s*$/) { | |
64 | my $mapped; | |
65 | ($user, $mapped) = ($1, $3); | |
66 | if ($mapped =~ /^\s*(.*?)\s*<(.*)>\s*$/) { | |
67 | $conv_author_name{$user} = $1; | |
68 | $conv_author_email{$user} = $2; | |
69 | } | |
70 | elsif ($mapped =~ /^<?(.*)>?$/) { | |
71 | $conv_author_name{$user} = $user; | |
72 | $conv_author_email{$user} = $1; | |
73 | } | |
74 | } | |
75 | # NEEDSWORK: Maybe warn on unrecognized lines? | |
76 | } | |
77 | close ($f); | |
78 | } | |
79 | ||
80 | sub write_author_info($) { | |
81 | my ($file) = @_; | |
82 | open my $f, '>', $file or | |
83 | die("Failed to open $file for writing: $!"); | |
84 | ||
85 | foreach (keys %conv_author_name) { | |
86 | print $f "$_=$conv_author_name{$_} <$conv_author_email{$_}>\n"; | |
87 | } | |
88 | close ($f); | |
89 | } | |
90 | ||
91 | # convert getopts specs for use by git-repo-config | |
92 | sub read_repo_config { | |
93 | # Split the string between characters, unless there is a ':' | |
94 | # So "abc:de" becomes ["a", "b", "c:", "d", "e"] | |
95 | my @opts = split(/ *(?!:)/, shift); | |
96 | foreach my $o (@opts) { | |
97 | my $key = $o; | |
98 | $key =~ s/://g; | |
99 | my $arg = 'git-repo-config'; | |
100 | $arg .= ' --bool' if ($o !~ /:$/); | |
101 | ||
102 | chomp(my $tmp = `$arg --get cvsimport.$key`); | |
103 | if ($tmp && !($arg =~ /--bool/ && $tmp eq 'false')) { | |
104 | no strict 'refs'; | |
105 | my $opt_name = "opt_" . $key; | |
106 | if (!$$opt_name) { | |
107 | $$opt_name = $tmp; | |
108 | } | |
109 | } | |
110 | } | |
111 | if (@ARGV == 0) { | |
112 | chomp(my $module = `git-repo-config --get cvsimport.module`); | |
113 | push(@ARGV, $module); | |
114 | } | |
115 | } | |
116 | ||
117 | my $opts = "haivmkuo:d:p:r:C:z:s:M:P:A:S:L:"; | |
118 | read_repo_config($opts); | |
119 | getopts($opts) or usage(); | |
120 | usage if $opt_h; | |
121 | ||
122 | @ARGV <= 1 or usage("You can't specify more than one CVS module"); | |
123 | ||
124 | if ($opt_d) { | |
125 | $ENV{"CVSROOT"} = $opt_d; | |
126 | } elsif (-f 'CVS/Root') { | |
127 | open my $f, '<', 'CVS/Root' or die 'Failed to open CVS/Root'; | |
128 | $opt_d = <$f>; | |
129 | chomp $opt_d; | |
130 | close $f; | |
131 | $ENV{"CVSROOT"} = $opt_d; | |
132 | } elsif ($ENV{"CVSROOT"}) { | |
133 | $opt_d = $ENV{"CVSROOT"}; | |
134 | } else { | |
135 | usage("CVSROOT needs to be set"); | |
136 | } | |
137 | $opt_s ||= "-"; | |
138 | $opt_a ||= 0; | |
139 | ||
140 | my $git_tree = $opt_C; | |
141 | $git_tree ||= "."; | |
142 | ||
143 | my $remote; | |
144 | if (defined $opt_r) { | |
145 | $remote = 'refs/remotes/' . $opt_r; | |
146 | $opt_o ||= "master"; | |
147 | } else { | |
148 | $opt_o ||= "origin"; | |
149 | $remote = 'refs/heads'; | |
150 | } | |
151 | ||
152 | my $cvs_tree; | |
153 | if ($#ARGV == 0) { | |
154 | $cvs_tree = $ARGV[0]; | |
155 | } elsif (-f 'CVS/Repository') { | |
156 | open my $f, '<', 'CVS/Repository' or | |
157 | die 'Failed to open CVS/Repository'; | |
158 | $cvs_tree = <$f>; | |
159 | chomp $cvs_tree; | |
160 | close $f; | |
161 | } else { | |
162 | usage("CVS module has to be specified"); | |
163 | } | |
164 | ||
165 | our @mergerx = (); | |
166 | if ($opt_m) { | |
167 | @mergerx = ( qr/\W(?:from|of|merge|merging|merged) (\w+)/i ); | |
168 | } | |
169 | if ($opt_M) { | |
170 | push (@mergerx, qr/$opt_M/); | |
171 | } | |
172 | ||
173 | # Remember UTC of our starting time | |
174 | # we'll want to avoid importing commits | |
175 | # that are too recent | |
176 | our $starttime = time(); | |
177 | ||
178 | select(STDERR); $|=1; select(STDOUT); | |
179 | ||
180 | ||
181 | package CVSconn; | |
182 | # Basic CVS dialog. | |
183 | # We're only interested in connecting and downloading, so ... | |
184 | ||
185 | use File::Spec; | |
186 | use File::Temp qw(tempfile); | |
187 | use POSIX qw(strftime dup2); | |
188 | ||
189 | sub new { | |
190 | my ($what,$repo,$subdir) = @_; | |
191 | $what=ref($what) if ref($what); | |
192 | ||
193 | my $self = {}; | |
194 | $self->{'buffer'} = ""; | |
195 | bless($self,$what); | |
196 | ||
197 | $repo =~ s#/+$##; | |
198 | $self->{'fullrep'} = $repo; | |
199 | $self->conn(); | |
200 | ||
201 | $self->{'subdir'} = $subdir; | |
202 | $self->{'lines'} = undef; | |
203 | ||
204 | return $self; | |
205 | } | |
206 | ||
207 | sub conn { | |
208 | my $self = shift; | |
209 | my $repo = $self->{'fullrep'}; | |
210 | if ($repo =~ s/^:pserver(?:([^:]*)):(?:(.*?)(?::(.*?))?@)?([^:\/]*)(?::(\d*))?//) { | |
211 | my ($param,$user,$pass,$serv,$port) = ($1,$2,$3,$4,$5); | |
212 | ||
213 | my ($proxyhost,$proxyport); | |
214 | if ($param && ($param =~ m/proxy=([^;]+)/)) { | |
215 | $proxyhost = $1; | |
216 | # Default proxyport, if not specified, is 8080. | |
217 | $proxyport = 8080; | |
218 | if ($ENV{"CVS_PROXY_PORT"}) { | |
219 | $proxyport = $ENV{"CVS_PROXY_PORT"}; | |
220 | } | |
221 | if ($param =~ m/proxyport=([^;]+)/) { | |
222 | $proxyport = $1; | |
223 | } | |
224 | } | |
225 | ||
226 | $user="anonymous" unless defined $user; | |
227 | my $rr2 = "-"; | |
228 | unless ($port) { | |
229 | $rr2 = ":pserver:$user\@$serv:$repo"; | |
230 | $port=2401; | |
231 | } | |
232 | my $rr = ":pserver:$user\@$serv:$port$repo"; | |
233 | ||
234 | unless ($pass) { | |
235 | open(H,$ENV{'HOME'}."/.cvspass") and do { | |
236 | # :pserver:cvs@mea.tmt.tele.fi:/cvsroot/zmailer Ah<Z | |
237 | while (<H>) { | |
238 | chomp; | |
239 | s/^\/\d+\s+//; | |
240 | my ($w,$p) = split(/\s/,$_,2); | |
241 | if ($w eq $rr or $w eq $rr2) { | |
242 | $pass = $p; | |
243 | last; | |
244 | } | |
245 | } | |
246 | }; | |
247 | } | |
248 | $pass="A" unless $pass; | |
249 | ||
250 | my ($s, $rep); | |
251 | if ($proxyhost) { | |
252 | ||
253 | # Use a HTTP Proxy. Only works for HTTP proxies that | |
254 | # don't require user authentication | |
255 | # | |
256 | # See: http://www.ietf.org/rfc/rfc2817.txt | |
257 | ||
258 | $s = IO::Socket::INET->new(PeerHost => $proxyhost, PeerPort => $proxyport); | |
259 | die "Socket to $proxyhost: $!\n" unless defined $s; | |
260 | $s->write("CONNECT $serv:$port HTTP/1.1\r\nHost: $serv:$port\r\n\r\n") | |
261 | or die "Write to $proxyhost: $!\n"; | |
262 | $s->flush(); | |
263 | ||
264 | $rep = <$s>; | |
265 | ||
266 | # The answer should look like 'HTTP/1.x 2yy ....' | |
267 | if (!($rep =~ m#^HTTP/1\.. 2[0-9][0-9]#)) { | |
268 | die "Proxy connect: $rep\n"; | |
269 | } | |
270 | # Skip up to the empty line of the proxy server output | |
271 | # including the response headers. | |
272 | while ($rep = <$s>) { | |
273 | last if (!defined $rep || | |
274 | $rep eq "\n" || | |
275 | $rep eq "\r\n"); | |
276 | } | |
277 | } else { | |
278 | $s = IO::Socket::INET->new(PeerHost => $serv, PeerPort => $port); | |
279 | die "Socket to $serv: $!\n" unless defined $s; | |
280 | } | |
281 | ||
282 | $s->write("BEGIN AUTH REQUEST\n$repo\n$user\n$pass\nEND AUTH REQUEST\n") | |
283 | or die "Write to $serv: $!\n"; | |
284 | $s->flush(); | |
285 | ||
286 | $rep = <$s>; | |
287 | ||
288 | if ($rep ne "I LOVE YOU\n") { | |
289 | $rep="<unknown>" unless $rep; | |
290 | die "AuthReply: $rep\n"; | |
291 | } | |
292 | $self->{'socketo'} = $s; | |
293 | $self->{'socketi'} = $s; | |
294 | } else { # local or ext: Fork off our own cvs server. | |
295 | my $pr = IO::Pipe->new(); | |
296 | my $pw = IO::Pipe->new(); | |
297 | my $pid = fork(); | |
298 | die "Fork: $!\n" unless defined $pid; | |
299 | my $cvs = 'cvs'; | |
300 | $cvs = $ENV{CVS_SERVER} if exists $ENV{CVS_SERVER}; | |
301 | my $rsh = 'rsh'; | |
302 | $rsh = $ENV{CVS_RSH} if exists $ENV{CVS_RSH}; | |
303 | ||
304 | my @cvs = ($cvs, 'server'); | |
305 | my ($local, $user, $host); | |
306 | $local = $repo =~ s/:local://; | |
307 | if (!$local) { | |
308 | $repo =~ s/:ext://; | |
309 | $local = !($repo =~ s/^(?:([^\@:]+)\@)?([^:]+)://); | |
310 | ($user, $host) = ($1, $2); | |
311 | } | |
312 | if (!$local) { | |
313 | if ($user) { | |
314 | unshift @cvs, $rsh, '-l', $user, $host; | |
315 | } else { | |
316 | unshift @cvs, $rsh, $host; | |
317 | } | |
318 | } | |
319 | ||
320 | unless ($pid) { | |
321 | $pr->writer(); | |
322 | $pw->reader(); | |
323 | dup2($pw->fileno(),0); | |
324 | dup2($pr->fileno(),1); | |
325 | $pr->close(); | |
326 | $pw->close(); | |
327 | exec(@cvs); | |
328 | } | |
329 | $pw->writer(); | |
330 | $pr->reader(); | |
331 | $self->{'socketo'} = $pw; | |
332 | $self->{'socketi'} = $pr; | |
333 | } | |
334 | $self->{'socketo'}->write("Root $repo\n"); | |
335 | ||
336 | # Trial and error says that this probably is the minimum set | |
337 | $self->{'socketo'}->write("Valid-responses ok error Valid-requests Mode M Mbinary E Checked-in Created Updated Merged Removed\n"); | |
338 | ||
339 | $self->{'socketo'}->write("valid-requests\n"); | |
340 | $self->{'socketo'}->flush(); | |
341 | ||
342 | chomp(my $rep=$self->readline()); | |
343 | if ($rep !~ s/^Valid-requests\s*//) { | |
344 | $rep="<unknown>" unless $rep; | |
345 | die "Expected Valid-requests from server, but got: $rep\n"; | |
346 | } | |
347 | chomp(my $res=$self->readline()); | |
348 | die "validReply: $res\n" if $res ne "ok"; | |
349 | ||
350 | $self->{'socketo'}->write("UseUnchanged\n") if $rep =~ /\bUseUnchanged\b/; | |
351 | $self->{'repo'} = $repo; | |
352 | } | |
353 | ||
354 | sub readline { | |
355 | my ($self) = @_; | |
356 | return $self->{'socketi'}->getline(); | |
357 | } | |
358 | ||
359 | sub _file { | |
360 | # Request a file with a given revision. | |
361 | # Trial and error says this is a good way to do it. :-/ | |
362 | my ($self,$fn,$rev) = @_; | |
363 | $self->{'socketo'}->write("Argument -N\n") or return undef; | |
364 | $self->{'socketo'}->write("Argument -P\n") or return undef; | |
365 | # -kk: Linus' version doesn't use it - defaults to off | |
366 | if ($opt_k) { | |
367 | $self->{'socketo'}->write("Argument -kk\n") or return undef; | |
368 | } | |
369 | $self->{'socketo'}->write("Argument -r\n") or return undef; | |
370 | $self->{'socketo'}->write("Argument $rev\n") or return undef; | |
371 | $self->{'socketo'}->write("Argument --\n") or return undef; | |
372 | $self->{'socketo'}->write("Argument $self->{'subdir'}/$fn\n") or return undef; | |
373 | $self->{'socketo'}->write("Directory .\n") or return undef; | |
374 | $self->{'socketo'}->write("$self->{'repo'}\n") or return undef; | |
375 | # $self->{'socketo'}->write("Sticky T1.0\n") or return undef; | |
376 | $self->{'socketo'}->write("co\n") or return undef; | |
377 | $self->{'socketo'}->flush() or return undef; | |
378 | $self->{'lines'} = 0; | |
379 | return 1; | |
380 | } | |
381 | sub _line { | |
382 | # Read a line from the server. | |
383 | # ... except that 'line' may be an entire file. ;-) | |
384 | my ($self, $fh) = @_; | |
385 | die "Not in lines" unless defined $self->{'lines'}; | |
386 | ||
387 | my $line; | |
388 | my $res=0; | |
389 | while (defined($line = $self->readline())) { | |
390 | # M U gnupg-cvs-rep/AUTHORS | |
391 | # Updated gnupg-cvs-rep/ | |
392 | # /daten/src/rsync/gnupg-cvs-rep/AUTHORS | |
393 | # /AUTHORS/1.1///T1.1 | |
394 | # u=rw,g=rw,o=rw | |
395 | # 0 | |
396 | # ok | |
397 | ||
398 | if ($line =~ s/^(?:Created|Updated) //) { | |
399 | $line = $self->readline(); # path | |
400 | $line = $self->readline(); # Entries line | |
401 | my $mode = $self->readline(); chomp $mode; | |
402 | $self->{'mode'} = $mode; | |
403 | defined (my $cnt = $self->readline()) | |
404 | or die "EOF from server after 'Changed'\n"; | |
405 | chomp $cnt; | |
406 | die "Duh: Filesize $cnt" if $cnt !~ /^\d+$/; | |
407 | $line=""; | |
408 | $res = $self->_fetchfile($fh, $cnt); | |
409 | } elsif ($line =~ s/^ //) { | |
410 | print $fh $line; | |
411 | $res += length($line); | |
412 | } elsif ($line =~ /^M\b/) { | |
413 | # output, do nothing | |
414 | } elsif ($line =~ /^Mbinary\b/) { | |
415 | my $cnt; | |
416 | die "EOF from server after 'Mbinary'" unless defined ($cnt = $self->readline()); | |
417 | chomp $cnt; | |
418 | die "Duh: Mbinary $cnt" if $cnt !~ /^\d+$/ or $cnt<1; | |
419 | $line=""; | |
420 | $res += $self->_fetchfile($fh, $cnt); | |
421 | } else { | |
422 | chomp $line; | |
423 | if ($line eq "ok") { | |
424 | # print STDERR "S: ok (".length($res).")\n"; | |
425 | return $res; | |
426 | } elsif ($line =~ s/^E //) { | |
427 | # print STDERR "S: $line\n"; | |
428 | } elsif ($line =~ /^(Remove-entry|Removed) /i) { | |
429 | $line = $self->readline(); # filename | |
430 | $line = $self->readline(); # OK | |
431 | chomp $line; | |
432 | die "Unknown: $line" if $line ne "ok"; | |
433 | return -1; | |
434 | } else { | |
435 | die "Unknown: $line\n"; | |
436 | } | |
437 | } | |
438 | } | |
439 | return undef; | |
440 | } | |
441 | sub file { | |
442 | my ($self,$fn,$rev) = @_; | |
443 | my $res; | |
444 | ||
445 | my ($fh, $name) = tempfile('gitcvs.XXXXXX', | |
446 | DIR => File::Spec->tmpdir(), UNLINK => 1); | |
447 | ||
448 | $self->_file($fn,$rev) and $res = $self->_line($fh); | |
449 | ||
450 | if (!defined $res) { | |
451 | print STDERR "Server has gone away while fetching $fn $rev, retrying...\n"; | |
452 | truncate $fh, 0; | |
453 | $self->conn(); | |
454 | $self->_file($fn,$rev) or die "No file command send"; | |
455 | $res = $self->_line($fh); | |
456 | die "Retry failed" unless defined $res; | |
457 | } | |
458 | close ($fh); | |
459 | ||
460 | return ($name, $res); | |
461 | } | |
462 | sub _fetchfile { | |
463 | my ($self, $fh, $cnt) = @_; | |
464 | my $res = 0; | |
465 | my $bufsize = 1024 * 1024; | |
466 | while ($cnt) { | |
467 | if ($bufsize > $cnt) { | |
468 | $bufsize = $cnt; | |
469 | } | |
470 | my $buf; | |
471 | my $num = $self->{'socketi'}->read($buf,$bufsize); | |
472 | die "Server: Filesize $cnt: $num: $!\n" if not defined $num or $num<=0; | |
473 | print $fh $buf; | |
474 | $res += $num; | |
475 | $cnt -= $num; | |
476 | } | |
477 | return $res; | |
478 | } | |
479 | ||
480 | ||
481 | package main; | |
482 | ||
483 | my $cvs = CVSconn->new($opt_d, $cvs_tree); | |
484 | ||
485 | ||
486 | sub pdate($) { | |
487 | my ($d) = @_; | |
488 | m#(\d{2,4})/(\d\d)/(\d\d)\s(\d\d):(\d\d)(?::(\d\d))?# | |
489 | or die "Unparseable date: $d\n"; | |
490 | my $y=$1; $y-=1900 if $y>1900; | |
491 | return timegm($6||0,$5,$4,$3,$2-1,$y); | |
492 | } | |
493 | ||
494 | sub pmode($) { | |
495 | my ($mode) = @_; | |
496 | my $m = 0; | |
497 | my $mm = 0; | |
498 | my $um = 0; | |
499 | for my $x(split(//,$mode)) { | |
500 | if ($x eq ",") { | |
501 | $m |= $mm&$um; | |
502 | $mm = 0; | |
503 | $um = 0; | |
504 | } elsif ($x eq "u") { $um |= 0700; | |
505 | } elsif ($x eq "g") { $um |= 0070; | |
506 | } elsif ($x eq "o") { $um |= 0007; | |
507 | } elsif ($x eq "r") { $mm |= 0444; | |
508 | } elsif ($x eq "w") { $mm |= 0222; | |
509 | } elsif ($x eq "x") { $mm |= 0111; | |
510 | } elsif ($x eq "=") { # do nothing | |
511 | } else { die "Unknown mode: $mode\n"; | |
512 | } | |
513 | } | |
514 | $m |= $mm&$um; | |
515 | return $m; | |
516 | } | |
517 | ||
518 | sub getwd() { | |
519 | my $pwd = `pwd`; | |
520 | chomp $pwd; | |
521 | return $pwd; | |
522 | } | |
523 | ||
524 | sub is_sha1 { | |
525 | my $s = shift; | |
526 | return $s =~ /^[a-f0-9]{40}$/; | |
527 | } | |
528 | ||
529 | sub get_headref ($) { | |
530 | my $name = shift; | |
531 | my $r = `git rev-parse --verify '$name' 2>/dev/null`; | |
532 | return undef unless $? == 0; | |
533 | chomp $r; | |
534 | return $r; | |
535 | } | |
536 | ||
537 | -d $git_tree | |
538 | or mkdir($git_tree,0777) | |
539 | or die "Could not create $git_tree: $!"; | |
540 | chdir($git_tree); | |
541 | ||
542 | my $last_branch = ""; | |
543 | my $orig_branch = ""; | |
544 | my %branch_date; | |
545 | my $tip_at_start = undef; | |
546 | ||
547 | my $git_dir = $ENV{"GIT_DIR"} || ".git"; | |
548 | $git_dir = getwd()."/".$git_dir unless $git_dir =~ m#^/#; | |
549 | $ENV{"GIT_DIR"} = $git_dir; | |
550 | my $orig_git_index; | |
551 | $orig_git_index = $ENV{GIT_INDEX_FILE} if exists $ENV{GIT_INDEX_FILE}; | |
552 | ||
553 | my %index; # holds filenames of one index per branch | |
554 | ||
555 | unless (-d $git_dir) { | |
556 | system("git-init"); | |
557 | die "Cannot init the GIT db at $git_tree: $?\n" if $?; | |
558 | system("git-read-tree"); | |
559 | die "Cannot init an empty tree: $?\n" if $?; | |
560 | ||
561 | $last_branch = $opt_o; | |
562 | $orig_branch = ""; | |
563 | } else { | |
564 | open(F, "git-symbolic-ref HEAD |") or | |
565 | die "Cannot run git-symbolic-ref: $!\n"; | |
566 | chomp ($last_branch = <F>); | |
567 | $last_branch = basename($last_branch); | |
568 | close(F); | |
569 | unless ($last_branch) { | |
570 | warn "Cannot read the last branch name: $! -- assuming 'master'\n"; | |
571 | $last_branch = "master"; | |
572 | } | |
573 | $orig_branch = $last_branch; | |
574 | $tip_at_start = `git-rev-parse --verify HEAD`; | |
575 | ||
576 | # Get the last import timestamps | |
577 | my $fmt = '($ref, $author) = (%(refname), %(author));'; | |
578 | open(H, "git-for-each-ref --perl --format='$fmt' $remote |") or | |
579 | die "Cannot run git-for-each-ref: $!\n"; | |
580 | while (defined(my $entry = <H>)) { | |
581 | my ($ref, $author); | |
582 | eval($entry) || die "cannot eval refs list: $@"; | |
583 | my ($head) = ($ref =~ m|^$remote/(.*)|); | |
584 | $author =~ /^.*\s(\d+)\s[-+]\d{4}$/; | |
585 | $branch_date{$head} = $1; | |
586 | } | |
587 | close(H); | |
588 | if (!exists $branch_date{$opt_o}) { | |
589 | die "Branch '$opt_o' does not exist.\n". | |
590 | "Either use the correct '-o branch' option,\n". | |
591 | "or import to a new repository.\n"; | |
592 | } | |
593 | } | |
594 | ||
595 | -d $git_dir | |
596 | or die "Could not create git subdir ($git_dir).\n"; | |
597 | ||
598 | # now we read (and possibly save) author-info as well | |
599 | -f "$git_dir/cvs-authors" and | |
600 | read_author_info("$git_dir/cvs-authors"); | |
601 | if ($opt_A) { | |
602 | read_author_info($opt_A); | |
603 | write_author_info("$git_dir/cvs-authors"); | |
604 | } | |
605 | ||
606 | ||
607 | # | |
608 | # run cvsps into a file unless we are getting | |
609 | # it passed as a file via $opt_P | |
610 | # | |
611 | my $cvspsfile; | |
612 | unless ($opt_P) { | |
613 | print "Running cvsps...\n" if $opt_v; | |
614 | my $pid = open(CVSPS,"-|"); | |
615 | my $cvspsfh; | |
616 | die "Cannot fork: $!\n" unless defined $pid; | |
617 | unless ($pid) { | |
618 | my @opt; | |
619 | @opt = split(/,/,$opt_p) if defined $opt_p; | |
620 | unshift @opt, '-z', $opt_z if defined $opt_z; | |
621 | unshift @opt, '-q' unless defined $opt_v; | |
622 | unless (defined($opt_p) && $opt_p =~ m/--no-cvs-direct/) { | |
623 | push @opt, '--cvs-direct'; | |
624 | } | |
625 | exec("cvsps","--norc",@opt,"-u","-A",'--root',$opt_d,$cvs_tree); | |
626 | die "Could not start cvsps: $!\n"; | |
627 | } | |
628 | ($cvspsfh, $cvspsfile) = tempfile('gitXXXXXX', SUFFIX => '.cvsps', | |
629 | DIR => File::Spec->tmpdir()); | |
630 | while (<CVSPS>) { | |
631 | print $cvspsfh $_; | |
632 | } | |
633 | close CVSPS; | |
634 | close $cvspsfh; | |
635 | } else { | |
636 | $cvspsfile = $opt_P; | |
637 | } | |
638 | ||
639 | open(CVS, "<$cvspsfile") or die $!; | |
640 | ||
641 | ## cvsps output: | |
642 | #--------------------- | |
643 | #PatchSet 314 | |
644 | #Date: 1999/09/18 13:03:59 | |
645 | #Author: wkoch | |
646 | #Branch: STABLE-BRANCH-1-0 | |
647 | #Ancestor branch: HEAD | |
648 | #Tag: (none) | |
649 | #Log: | |
650 | # See ChangeLog: Sat Sep 18 13:03:28 CEST 1999 Werner Koch | |
651 | #Members: | |
652 | # README:1.57->1.57.2.1 | |
653 | # VERSION:1.96->1.96.2.1 | |
654 | # | |
655 | #--------------------- | |
656 | ||
657 | my $state = 0; | |
658 | ||
659 | sub update_index (\@\@) { | |
660 | my $old = shift; | |
661 | my $new = shift; | |
662 | open(my $fh, '|-', qw(git-update-index -z --index-info)) | |
663 | or die "unable to open git-update-index: $!"; | |
664 | print $fh | |
665 | (map { "0 0000000000000000000000000000000000000000\t$_\0" } | |
666 | @$old), | |
667 | (map { '100' . sprintf('%o', $_->[0]) . " $_->[1]\t$_->[2]\0" } | |
668 | @$new) | |
669 | or die "unable to write to git-update-index: $!"; | |
670 | close $fh | |
671 | or die "unable to write to git-update-index: $!"; | |
672 | $? and die "git-update-index reported error: $?"; | |
673 | } | |
674 | ||
675 | sub write_tree () { | |
676 | open(my $fh, '-|', qw(git-write-tree)) | |
677 | or die "unable to open git-write-tree: $!"; | |
678 | chomp(my $tree = <$fh>); | |
679 | is_sha1($tree) | |
680 | or die "Cannot get tree id ($tree): $!"; | |
681 | close($fh) | |
682 | or die "Error running git-write-tree: $?\n"; | |
683 | print "Tree ID $tree\n" if $opt_v; | |
684 | return $tree; | |
685 | } | |
686 | ||
687 | my ($patchset,$date,$author_name,$author_email,$branch,$ancestor,$tag,$logmsg); | |
688 | my (@old,@new,@skipped,%ignorebranch); | |
689 | ||
690 | # commits that cvsps cannot place anywhere... | |
691 | $ignorebranch{'#CVSPS_NO_BRANCH'} = 1; | |
692 | ||
693 | sub commit { | |
694 | if ($branch eq $opt_o && !$index{branch} && | |
695 | !get_headref("$remote/$branch")) { | |
696 | # looks like an initial commit | |
697 | # use the index primed by git-init | |
698 | $ENV{GIT_INDEX_FILE} = "$git_dir/index"; | |
699 | $index{$branch} = "$git_dir/index"; | |
700 | } else { | |
701 | # use an index per branch to speed up | |
702 | # imports of projects with many branches | |
703 | unless ($index{$branch}) { | |
704 | $index{$branch} = tmpnam(); | |
705 | $ENV{GIT_INDEX_FILE} = $index{$branch}; | |
706 | if ($ancestor) { | |
707 | system("git-read-tree", "$remote/$ancestor"); | |
708 | } else { | |
709 | system("git-read-tree", "$remote/$branch"); | |
710 | } | |
711 | die "read-tree failed: $?\n" if $?; | |
712 | } | |
713 | } | |
714 | $ENV{GIT_INDEX_FILE} = $index{$branch}; | |
715 | ||
716 | update_index(@old, @new); | |
717 | @old = @new = (); | |
718 | my $tree = write_tree(); | |
719 | my $parent = get_headref("$remote/$last_branch"); | |
720 | print "Parent ID " . ($parent ? $parent : "(empty)") . "\n" if $opt_v; | |
721 | ||
722 | my @commit_args; | |
723 | push @commit_args, ("-p", $parent) if $parent; | |
724 | ||
725 | # loose detection of merges | |
726 | # based on the commit msg | |
727 | foreach my $rx (@mergerx) { | |
728 | next unless $logmsg =~ $rx && $1; | |
729 | my $mparent = $1 eq 'HEAD' ? $opt_o : $1; | |
730 | if (my $sha1 = get_headref("$remote/$mparent")) { | |
731 | push @commit_args, '-p', $mparent; | |
732 | print "Merge parent branch: $mparent\n" if $opt_v; | |
733 | } | |
734 | } | |
735 | ||
736 | my $commit_date = strftime("+0000 %Y-%m-%d %H:%M:%S",gmtime($date)); | |
737 | $ENV{GIT_AUTHOR_NAME} = $author_name; | |
738 | $ENV{GIT_AUTHOR_EMAIL} = $author_email; | |
739 | $ENV{GIT_AUTHOR_DATE} = $commit_date; | |
740 | $ENV{GIT_COMMITTER_NAME} = $author_name; | |
741 | $ENV{GIT_COMMITTER_EMAIL} = $author_email; | |
742 | $ENV{GIT_COMMITTER_DATE} = $commit_date; | |
743 | my $pid = open2(my $commit_read, my $commit_write, | |
744 | 'git-commit-tree', $tree, @commit_args); | |
745 | ||
746 | # compatibility with git2cvs | |
747 | substr($logmsg,32767) = "" if length($logmsg) > 32767; | |
748 | $logmsg =~ s/[\s\n]+\z//; | |
749 | ||
750 | if (@skipped) { | |
751 | $logmsg .= "\n\n\nSKIPPED:\n\t"; | |
752 | $logmsg .= join("\n\t", @skipped) . "\n"; | |
753 | @skipped = (); | |
754 | } | |
755 | ||
756 | print($commit_write "$logmsg\n") && close($commit_write) | |
757 | or die "Error writing to git-commit-tree: $!\n"; | |
758 | ||
759 | print "Committed patch $patchset ($branch $commit_date)\n" if $opt_v; | |
760 | chomp(my $cid = <$commit_read>); | |
761 | is_sha1($cid) or die "Cannot get commit id ($cid): $!\n"; | |
762 | print "Commit ID $cid\n" if $opt_v; | |
763 | close($commit_read); | |
764 | ||
765 | waitpid($pid,0); | |
766 | die "Error running git-commit-tree: $?\n" if $?; | |
767 | ||
768 | system("git-update-ref $remote/$branch $cid") == 0 | |
769 | or die "Cannot write branch $branch for update: $!\n"; | |
770 | ||
771 | if ($tag) { | |
772 | my ($xtag) = $tag; | |
773 | $xtag =~ s/\s+\*\*.*$//; # Remove stuff like ** INVALID ** and ** FUNKY ** | |
774 | $xtag =~ tr/_/\./ if ( $opt_u ); | |
775 | $xtag =~ s/[\/]/$opt_s/g; | |
776 | ||
777 | system('git-tag', '-f', $xtag, $cid) == 0 | |
778 | or die "Cannot create tag $xtag: $!\n"; | |
779 | ||
780 | print "Created tag '$xtag' on '$branch'\n" if $opt_v; | |
781 | } | |
782 | }; | |
783 | ||
784 | my $commitcount = 1; | |
785 | while (<CVS>) { | |
786 | chomp; | |
787 | if ($state == 0 and /^-+$/) { | |
788 | $state = 1; | |
789 | } elsif ($state == 0) { | |
790 | $state = 1; | |
791 | redo; | |
792 | } elsif (($state==0 or $state==1) and s/^PatchSet\s+//) { | |
793 | $patchset = 0+$_; | |
794 | $state=2; | |
795 | } elsif ($state == 2 and s/^Date:\s+//) { | |
796 | $date = pdate($_); | |
797 | unless ($date) { | |
798 | print STDERR "Could not parse date: $_\n"; | |
799 | $state=0; | |
800 | next; | |
801 | } | |
802 | $state=3; | |
803 | } elsif ($state == 3 and s/^Author:\s+//) { | |
804 | s/\s+$//; | |
805 | if (/^(.*?)\s+<(.*)>/) { | |
806 | ($author_name, $author_email) = ($1, $2); | |
807 | } elsif ($conv_author_name{$_}) { | |
808 | $author_name = $conv_author_name{$_}; | |
809 | $author_email = $conv_author_email{$_}; | |
810 | } else { | |
811 | $author_name = $author_email = $_; | |
812 | } | |
813 | $state = 4; | |
814 | } elsif ($state == 4 and s/^Branch:\s+//) { | |
815 | s/\s+$//; | |
816 | tr/_/\./ if ( $opt_u ); | |
817 | s/[\/]/$opt_s/g; | |
818 | $branch = $_; | |
819 | $state = 5; | |
820 | } elsif ($state == 5 and s/^Ancestor branch:\s+//) { | |
821 | s/\s+$//; | |
822 | $ancestor = $_; | |
823 | $ancestor = $opt_o if $ancestor eq "HEAD"; | |
824 | $state = 6; | |
825 | } elsif ($state == 5) { | |
826 | $ancestor = undef; | |
827 | $state = 6; | |
828 | redo; | |
829 | } elsif ($state == 6 and s/^Tag:\s+//) { | |
830 | s/\s+$//; | |
831 | if ($_ eq "(none)") { | |
832 | $tag = undef; | |
833 | } else { | |
834 | $tag = $_; | |
835 | } | |
836 | $state = 7; | |
837 | } elsif ($state == 7 and /^Log:/) { | |
838 | $logmsg = ""; | |
839 | $state = 8; | |
840 | } elsif ($state == 8 and /^Members:/) { | |
841 | $branch = $opt_o if $branch eq "HEAD"; | |
842 | if (defined $branch_date{$branch} and $branch_date{$branch} >= $date) { | |
843 | # skip | |
844 | print "skip patchset $patchset: $date before $branch_date{$branch}\n" if $opt_v; | |
845 | $state = 11; | |
846 | next; | |
847 | } | |
848 | if (!$opt_a && $starttime - 300 - (defined $opt_z ? $opt_z : 300) <= $date) { | |
849 | # skip if the commit is too recent | |
850 | # that the cvsps default fuzz is 300s, we give ourselves another | |
851 | # 300s just in case -- this also prevents skipping commits | |
852 | # due to server clock drift | |
853 | print "skip patchset $patchset: $date too recent\n" if $opt_v; | |
854 | $state = 11; | |
855 | next; | |
856 | } | |
857 | if (exists $ignorebranch{$branch}) { | |
858 | print STDERR "Skipping $branch\n"; | |
859 | $state = 11; | |
860 | next; | |
861 | } | |
862 | if ($ancestor) { | |
863 | if ($ancestor eq $branch) { | |
864 | print STDERR "Branch $branch erroneously stems from itself -- changed ancestor to $opt_o\n"; | |
865 | $ancestor = $opt_o; | |
866 | } | |
867 | if (-f "$git_dir/$remote/$branch") { | |
868 | print STDERR "Branch $branch already exists!\n"; | |
869 | $state=11; | |
870 | next; | |
871 | } | |
872 | unless (open(H,"$git_dir/$remote/$ancestor")) { | |
873 | print STDERR "Branch $ancestor does not exist!\n"; | |
874 | $ignorebranch{$branch} = 1; | |
875 | $state=11; | |
876 | next; | |
877 | } | |
878 | chomp(my $id = <H>); | |
879 | close(H); | |
880 | unless (open(H,"> $git_dir/$remote/$branch")) { | |
881 | print STDERR "Could not create branch $branch: $!\n"; | |
882 | $ignorebranch{$branch} = 1; | |
883 | $state=11; | |
884 | next; | |
885 | } | |
886 | print H "$id\n" | |
887 | or die "Could not write branch $branch: $!"; | |
888 | close(H) | |
889 | or die "Could not write branch $branch: $!"; | |
890 | } | |
891 | $last_branch = $branch if $branch ne $last_branch; | |
892 | $state = 9; | |
893 | } elsif ($state == 8) { | |
894 | $logmsg .= "$_\n"; | |
895 | } elsif ($state == 9 and /^\s+(.+?):(INITIAL|\d+(?:\.\d+)+)->(\d+(?:\.\d+)+)\s*$/) { | |
896 | # VERSION:1.96->1.96.2.1 | |
897 | my $init = ($2 eq "INITIAL"); | |
898 | my $fn = $1; | |
899 | my $rev = $3; | |
900 | $fn =~ s#^/+##; | |
901 | if ($opt_S && $fn =~ m/$opt_S/) { | |
902 | print "SKIPPING $fn v $rev\n"; | |
903 | push(@skipped, $fn); | |
904 | next; | |
905 | } | |
906 | print "Fetching $fn v $rev\n" if $opt_v; | |
907 | my ($tmpname, $size) = $cvs->file($fn,$rev); | |
908 | if ($size == -1) { | |
909 | push(@old,$fn); | |
910 | print "Drop $fn\n" if $opt_v; | |
911 | } else { | |
912 | print "".($init ? "New" : "Update")." $fn: $size bytes\n" if $opt_v; | |
913 | my $pid = open(my $F, '-|'); | |
914 | die $! unless defined $pid; | |
915 | if (!$pid) { | |
916 | exec("git-hash-object", "-w", $tmpname) | |
917 | or die "Cannot create object: $!\n"; | |
918 | } | |
919 | my $sha = <$F>; | |
920 | chomp $sha; | |
921 | close $F; | |
922 | my $mode = pmode($cvs->{'mode'}); | |
923 | push(@new,[$mode, $sha, $fn]); # may be resurrected! | |
924 | } | |
925 | unlink($tmpname); | |
926 | } elsif ($state == 9 and /^\s+(.+?):\d+(?:\.\d+)+->(\d+(?:\.\d+)+)\(DEAD\)\s*$/) { | |
927 | my $fn = $1; | |
928 | $fn =~ s#^/+##; | |
929 | push(@old,$fn); | |
930 | print "Delete $fn\n" if $opt_v; | |
931 | } elsif ($state == 9 and /^\s*$/) { | |
932 | $state = 10; | |
933 | } elsif (($state == 9 or $state == 10) and /^-+$/) { | |
934 | $commitcount++; | |
935 | if ($opt_L && $commitcount > $opt_L) { | |
936 | last; | |
937 | } | |
938 | commit(); | |
939 | if (($commitcount & 1023) == 0) { | |
940 | system("git repack -a -d"); | |
941 | } | |
942 | $state = 1; | |
943 | } elsif ($state == 11 and /^-+$/) { | |
944 | $state = 1; | |
945 | } elsif (/^-+$/) { # end of unknown-line processing | |
946 | $state = 1; | |
947 | } elsif ($state != 11) { # ignore stuff when skipping | |
948 | print "* UNKNOWN LINE * $_\n"; | |
949 | } | |
950 | } | |
951 | commit() if $branch and $state != 11; | |
952 | ||
953 | unless ($opt_P) { | |
954 | unlink($cvspsfile); | |
955 | } | |
956 | ||
957 | # The heuristic of repacking every 1024 commits can leave a | |
958 | # lot of unpacked data. If there is more than 1MB worth of | |
959 | # not-packed objects, repack once more. | |
960 | my $line = `git-count-objects`; | |
961 | if ($line =~ /^(\d+) objects, (\d+) kilobytes$/) { | |
962 | my ($n_objects, $kb) = ($1, $2); | |
963 | 1024 < $kb | |
964 | and system("git repack -a -d"); | |
965 | } | |
966 | ||
967 | foreach my $git_index (values %index) { | |
968 | if ($git_index ne "$git_dir/index") { | |
969 | unlink($git_index); | |
970 | } | |
971 | } | |
972 | ||
973 | if (defined $orig_git_index) { | |
974 | $ENV{GIT_INDEX_FILE} = $orig_git_index; | |
975 | } else { | |
976 | delete $ENV{GIT_INDEX_FILE}; | |
977 | } | |
978 | ||
979 | # Now switch back to the branch we were in before all of this happened | |
980 | if ($orig_branch) { | |
981 | print "DONE.\n" if $opt_v; | |
982 | if ($opt_i) { | |
983 | exit 0; | |
984 | } | |
985 | my $tip_at_end = `git-rev-parse --verify HEAD`; | |
986 | if ($tip_at_start ne $tip_at_end) { | |
987 | for ($tip_at_start, $tip_at_end) { chomp; } | |
988 | print "Fetched into the current branch.\n" if $opt_v; | |
989 | system(qw(git-read-tree -u -m), | |
990 | $tip_at_start, $tip_at_end); | |
991 | die "Fast-forward update failed: $?\n" if $?; | |
992 | } | |
993 | else { | |
994 | system(qw(git-merge cvsimport HEAD), "$remote/$opt_o"); | |
995 | die "Could not merge $opt_o into the current branch.\n" if $?; | |
996 | } | |
997 | } else { | |
998 | $orig_branch = "master"; | |
999 | print "DONE; creating $orig_branch branch\n" if $opt_v; | |
1000 | system("git-update-ref", "refs/heads/master", "$remote/$opt_o") | |
1001 | unless -f "$git_dir/refs/heads/master"; | |
1002 | system("git-symbolic-ref", "$remote/HEAD", "$remote/$opt_o") | |
1003 | if ($opt_r && $opt_o ne 'HEAD'); | |
1004 | system('git-update-ref', 'HEAD', "$orig_branch"); | |
1005 | unless ($opt_i) { | |
1006 | system('git checkout -f'); | |
1007 | die "checkout failed: $?\n" if $?; | |
1008 | } | |
1009 | } |