20 |
# do we want to sync just part of repository? |
# do we want to sync just part of repository? |
21 |
my $partial_import = 1; |
my $partial_import = 1; |
22 |
|
|
23 |
|
# do we want to add svk-like prefix with original revision, author and date? |
24 |
|
my $decorate_commit_message = 1; |
25 |
|
|
26 |
if (@ARGV < 2) { |
if (@ARGV < 2) { |
27 |
print "usage: $0 SVN_URL CVSROOT CVSREPOSITORY\n"; |
print "usage: $0 SVN_URL CVSROOT CVSREPOSITORY\n"; |
28 |
exit 1; |
exit 1; |
225 |
exit 0; |
exit 0; |
226 |
} |
} |
227 |
|
|
228 |
|
# return all files in CVS/Entries |
229 |
|
sub entries($) { |
230 |
|
my $dir = shift; |
231 |
|
die "entries expects directory argument!" unless -d $dir; |
232 |
|
my @entries; |
233 |
|
open(my $fh, "./$dir/CVS/Entries") || return 0; |
234 |
|
while(<$fh>) { |
235 |
|
if ( m{^D/([^/]+)}, ) { |
236 |
|
my $sub_dir = $1; |
237 |
|
warn "#### entries recurse into: $dir/$sub_dir"; |
238 |
|
push @entries, map { "$sub_dir/$_" } entries("$dir/$sub_dir"); |
239 |
|
push @entries, $sub_dir; |
240 |
|
} elsif ( m{^/([^/]+)/} ) { |
241 |
|
push @entries, $1; |
242 |
|
} elsif ( ! m{^D$} ) { |
243 |
|
die "can't decode entries line: $_"; |
244 |
|
} |
245 |
|
} |
246 |
|
close($fh); |
247 |
|
warn "#### entries($dir) => ",join("|",@entries); |
248 |
|
return @entries; |
249 |
|
} |
250 |
|
|
251 |
# check if file exists in CVS/Entries |
# check if file exists in CVS/Entries |
252 |
sub in_entries($) { |
sub in_entries($) { |
253 |
my $path = shift; |
my $path = shift; |
254 |
if ($path !~ m,^(.*?/*)([^/]+)$,) { |
if ($path =~ m,^(.*?/*)([^/]+)$,) { |
255 |
die "can't split '$path' to dir and file!"; |
my ($dir,$file) = ($1,$2); |
256 |
} else { |
if ($dir !~ m,/$, && $dir ne "") { |
257 |
my ($d,$f) = ($1,$2); |
$dir .= "/"; |
|
if ($d !~ m,/$, && $d ne "") { |
|
|
$d .= "/"; |
|
258 |
} |
} |
259 |
open(E, $d."CVS/Entries") || return 0; |
|
260 |
while(<E>) { |
open(my $fh, "./$dir/CVS/Entries") || return 0; #die "no entries file: $dir/CVS/Entries"; |
261 |
return(1) if (m,^/$f/,); |
while(<$fh>) { |
262 |
|
return 1 if (m{^/$file/}); |
263 |
} |
} |
264 |
close(E); |
close($fh); |
265 |
return 0; |
return 0; |
266 |
|
} else { |
267 |
|
die "can't split '$path' to dir and file!"; |
268 |
} |
} |
269 |
} |
} |
270 |
|
|
281 |
my $tmpsvn = $SVNROOT || die "BUG: SVNROOT empty!"; |
my $tmpsvn = $SVNROOT || die "BUG: SVNROOT empty!"; |
282 |
my $tmppath = $e->{'paths'}->{'path'}->[0]->{'content'} || die "BUG: tmppath empty!"; |
my $tmppath = $e->{'paths'}->{'path'}->[0]->{'content'} || die "BUG: tmppath empty!"; |
283 |
do { |
do { |
284 |
if ($tmpsvn =~ s#(/[^/]+)/*$##) { |
if ($tmpsvn =~ s#(/[^/]+)/*$##) { # vim fix |
285 |
$SVNREP = $1 . $SVNREP; |
$SVNREP = $1 . $SVNREP; |
286 |
} elsif ($e->{'paths'}->{'path'}->[0]->{'copyfrom-path'}) { |
} elsif ($e->{'paths'}->{'path'}->[0]->{'copyfrom-path'}) { |
287 |
print "NOTICE: copyfrom outside synced repository ignored - skipping\n"; |
print "NOTICE: copyfrom outside synced repository ignored - skipping\n"; |
297 |
printf($fmt, $e->{'revision'}, $e->{'author'}, $e->{'date'}, $e->{'msg'}); |
printf($fmt, $e->{'revision'}, $e->{'author'}, $e->{'date'}, $e->{'msg'}); |
298 |
my @commit; |
my @commit; |
299 |
|
|
300 |
|
my $msg = $e->{'msg'}; |
301 |
|
$msg =~ s/'/'\\''/g; # quote " |
302 |
|
|
303 |
|
$msg = 'r' . $rev . ' ' . $e->{author} . ' | ' . $e->{date} . "\n" . $msg if $decorate_commit_message; |
304 |
|
|
305 |
|
sub cvs_commit { |
306 |
|
my $msg = shift || die "no msg?"; |
307 |
|
if ( ! @_ ) { |
308 |
|
warn "commit ignored, no files\n"; |
309 |
|
return; |
310 |
|
} |
311 |
|
log_system("$cvs commit -m '$msg' '".join("' '",@_)."'", "cvs commit of ".join(",",@_)." failed"); |
312 |
|
} |
313 |
|
|
314 |
foreach my $p (@{$e->{'paths'}->{'path'}}) { |
foreach my $p (@{$e->{'paths'}->{'path'}}) { |
315 |
my ($action,$path) = ($p->{'action'},$p->{'content'}); |
my ($action,$path) = ($p->{'action'},$p->{'content'}); |
316 |
|
|
334 |
my $msg = $e->{'msg'}; |
my $msg = $e->{'msg'}; |
335 |
$msg =~ s/'/'\\''/g; # quote " |
$msg =~ s/'/'\\''/g; # quote " |
336 |
|
|
337 |
if ($action =~ /M/) { |
sub add_path { |
338 |
if ( in_entries( $path ) ) { |
my $path = shift || die "no path?"; |
339 |
print "svn2cvs: modify $path -- nop\n"; |
|
|
} else { |
|
|
print "WARNING: modify $path which isn't in CVS, adding...\n"; |
|
|
log_system("$cvs add '$path'", "cvs add of $path failed"); |
|
|
} |
|
|
} elsif ($action =~ /A/) { |
|
340 |
if (-d $path) { |
if (-d $path) { |
341 |
add_dir($path, $msg); |
add_dir($path, $msg); |
342 |
} elsif ($path =~ m,^(.+)/[^/]+$, && ! -e "$1/CVS/Root") { |
} elsif ($path =~ m,^(.+)/[^/]+$, && ! -e "$1/CVS/Root") { |
346 |
} else { |
} else { |
347 |
in_entries($path) || log_system("$cvs add '$path'", "cvs add of $path failed"); |
in_entries($path) || log_system("$cvs add '$path'", "cvs add of $path failed"); |
348 |
} |
} |
349 |
|
} |
350 |
|
|
351 |
|
if ($action =~ /M/) { |
352 |
|
if ( in_entries( $path ) ) { |
353 |
|
print "svn2cvs: modify $path -- nop\n"; |
354 |
|
} else { |
355 |
|
print "WARNING: modify $path which isn't in CVS, adding...\n"; |
356 |
|
add_path($path); |
357 |
|
} |
358 |
|
} elsif ($action =~ /A/) { |
359 |
|
add_path($path); |
360 |
} elsif ($action =~ /D/) { |
} elsif ($action =~ /D/) { |
361 |
if (-e $path) { |
if (-e $path) { |
362 |
unlink $path || die "can't delete $path: $!"; |
if ( -d $path ) { |
363 |
log_system("$cvs delete '$path'", "cvs delete of $path failed"); |
warn "#### remove directory: $path"; |
364 |
|
my @sub_commit; |
365 |
|
foreach my $f ( entries($path) ) { |
366 |
|
$f = "$path/$f"; |
367 |
|
if ( -f $f ) { |
368 |
|
unlink($f) || die "can't delete file $f: $!"; |
369 |
|
# } else { |
370 |
|
# rmtree($f) || die "can't delete dir $f: $!"; |
371 |
|
} |
372 |
|
log_system("$cvs delete '$f'", "cvs delete of file $f failed"); |
373 |
|
push @sub_commit, $f; |
374 |
|
} |
375 |
|
log_system("$cvs delete '$path'", "cvs delete of file $path failed"); |
376 |
|
cvs_commit($msg, @sub_commit, $path); |
377 |
|
log_system("$cvs update -dP '$path'", "cvs update -dP $path failed"); |
378 |
|
undef $path; |
379 |
|
} else { |
380 |
|
warn "#### remove file: $path"; |
381 |
|
unlink($path) || die "can't delete $path: $!"; |
382 |
|
log_system("$cvs delete '$path'", "cvs delete of dir $path failed"); |
383 |
|
} |
384 |
} else { |
} else { |
385 |
print "WARNING: $path is not present, skipping...\n"; |
print "WARNING: $path is not present, skipping...\n"; |
386 |
undef $path; |
undef $path; |
394 |
|
|
395 |
} |
} |
396 |
|
|
|
my $msg = $e->{'msg'}; |
|
|
$msg =~ s/'/'\\''/g; # quote " |
|
|
|
|
397 |
# now commit changes |
# now commit changes |
398 |
log_system("$cvs commit -m '$msg' '".join("' '",@commit)."'", "cvs commit of ".join(",",@commit)." failed"); |
cvs_commit($msg, @commit); |
399 |
|
|
400 |
commit_svnrev($rev); |
commit_svnrev($rev); |
401 |
} |
} |