1 |
#!/usr/bin/perl -w |
2 |
|
3 |
# This script will transfer changes from Subversion repository |
4 |
# to CVS repository (e.g. SourceForge) while preserving commit |
5 |
# logs. |
6 |
# |
7 |
# Based on original shell version by Tollef Fog Heen available at |
8 |
# http://raw.no/personal/blog |
9 |
# |
10 |
# 2004-03-09 Dobrica Pavlinusic <dpavlin@rot13.org> |
11 |
# |
12 |
# documentation is after __END__ |
13 |
|
14 |
use strict; |
15 |
use File::Temp qw/ tempdir /; |
16 |
use File::Path; |
17 |
use Data::Dumper; |
18 |
use XML::Simple; |
19 |
|
20 |
# do we want to sync just part of repository? |
21 |
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) { |
27 |
print "usage: $0 SVN_URL CVSROOT CVSREPOSITORY\n"; |
28 |
exit 1; |
29 |
} |
30 |
|
31 |
my ($SVNROOT,$CVSROOT, $CVSREP) = @ARGV; |
32 |
|
33 |
if ($SVNROOT !~ m,^[\w+]+:///*\w+,) { |
34 |
print "ERROR: invalid svn root $SVNROOT\n"; |
35 |
exit 1; |
36 |
} |
37 |
|
38 |
# Ensure File::Temp::END can clean up: |
39 |
$SIG{__DIE__} = sub { chdir("/tmp"); die @_ }; |
40 |
|
41 |
my $TMPDIR=tempdir( "/tmp/checkoutXXXXX", CLEANUP => 1 ); |
42 |
|
43 |
sub cd_tmp { |
44 |
chdir($TMPDIR) || die "can't cd to $TMPDIR: $!"; |
45 |
} |
46 |
|
47 |
sub cd_rep { |
48 |
chdir("$TMPDIR/$CVSREP") || die "can't cd to $TMPDIR/$CVSREP: $!"; |
49 |
} |
50 |
|
51 |
print "## using TMPDIR $TMPDIR\n"; |
52 |
|
53 |
# cvs command with root |
54 |
my $cvs="cvs -f -d $CVSROOT"; |
55 |
|
56 |
# current revision in CVS |
57 |
my $rev; |
58 |
|
59 |
# |
60 |
# sub to do logging and system calls |
61 |
# |
62 |
sub log_system($$) { |
63 |
my ($cmd,$errmsg) = @_; |
64 |
print STDERR "## $cmd\n"; |
65 |
system($cmd) == 0 || die "$errmsg: $!"; |
66 |
} |
67 |
|
68 |
# |
69 |
# sub to commit .svn rev file later |
70 |
# |
71 |
sub commit_svnrev { |
72 |
my $rev = shift @_; |
73 |
my $add_new = shift @_; |
74 |
|
75 |
die "commit_svnrev needs revision" if (! defined($rev)); |
76 |
|
77 |
open(SVNREV,"> .svnrev") || die "can't open $TMPDIR/$CVSREP/.svnrev: $!"; |
78 |
print SVNREV $rev; |
79 |
close(SVNREV); |
80 |
|
81 |
my $path=".svnrev"; |
82 |
|
83 |
if ($add_new) { |
84 |
system "$cvs add '$path'" || die "cvs add of $path failed: $!"; |
85 |
} else { |
86 |
my $msg="subversion revision $rev commited to CVS"; |
87 |
print "$msg\n"; |
88 |
system "$cvs commit -m '$msg' '$path'" || die "cvs commit of $path failed: $!"; |
89 |
} |
90 |
} |
91 |
|
92 |
sub add_dir($$) { |
93 |
my ($path,$msg) = @_; |
94 |
print "# add_dir($path)\n"; |
95 |
die "add_dir($path) is not directory" unless (-d $path); |
96 |
|
97 |
my $curr_dir; |
98 |
|
99 |
foreach my $d (split(m#/#, $path)) { |
100 |
$curr_dir .= ( $curr_dir ? '/' : '') . $d; |
101 |
|
102 |
next if in_entries($curr_dir); |
103 |
next if (-e "$curr_dir/CVS"); |
104 |
|
105 |
log_system("$cvs add '$curr_dir'", "cvs add of $curr_dir failed"); |
106 |
} |
107 |
} |
108 |
|
109 |
# ok, now do the checkout |
110 |
eval { |
111 |
cd_tmp; |
112 |
log_system("$cvs -q checkout $CVSREP", "cvs checkout failed"); |
113 |
}; |
114 |
|
115 |
if ($@) { |
116 |
print <<_NEW_REP_; |
117 |
|
118 |
There is no CVS repository '$CVSREP' in your CVS. I will assume that |
119 |
this is import of new module in your CVS and start from revision 0. |
120 |
|
121 |
Press enter to continue importing new CVS repository or CTRL+C to abort. |
122 |
|
123 |
_NEW_REP_ |
124 |
|
125 |
print "start import of new module [yes]: "; |
126 |
my $in = <STDIN>; |
127 |
cd_tmp; |
128 |
mkdir($CVSREP) || die "can't create $CVSREP: $!"; |
129 |
cd_rep; |
130 |
|
131 |
open(SVNREV,"> .svnrev") || die "can't open $CVSREP/.svnrev: $!"; |
132 |
print SVNREV "0"; |
133 |
close(SVNREV); |
134 |
|
135 |
$rev = 0; |
136 |
|
137 |
# create new module |
138 |
cd_rep; |
139 |
log_system("$cvs import -d -m 'new CVS module' $CVSREP svn r$rev", "import of new repository"); |
140 |
cd_tmp; |
141 |
rmtree($CVSREP) || die "can't remove $CVSREP"; |
142 |
log_system("$cvs -q checkout $CVSREP", "cvs checkout failed"); |
143 |
cd_rep; |
144 |
|
145 |
} else { |
146 |
# import into existing module directory in CVS |
147 |
|
148 |
cd_rep; |
149 |
# check if svnrev exists |
150 |
if (! -e ".svnrev") { |
151 |
print <<_USAGE_; |
152 |
|
153 |
Your CVS repository doesn't have .svnrev file! |
154 |
|
155 |
This file is used to keep CVS repository and Subversion in sync, so |
156 |
that only newer changes will be commited. |
157 |
|
158 |
It's quote possible that this is first svn2cvs run for this repository. |
159 |
If so, you will have to identify correct svn revision which |
160 |
corresponds to current version of CVS repository that has just |
161 |
been checkouted. |
162 |
|
163 |
If you migrated your cvs repository to svn using cvs2svn, this will be |
164 |
last Subversion revision. If this is initial run of conversion of |
165 |
Subversion repository to CVS, correct revision is 0. |
166 |
|
167 |
_USAGE_ |
168 |
|
169 |
print "svn revision corresponding to CVS [abort]: "; |
170 |
my $in = <STDIN>; |
171 |
chomp($in); |
172 |
if ($in !~ /^\d+$/) { |
173 |
print "Aborting: revision not a number\n"; |
174 |
exit 1; |
175 |
} else { |
176 |
$rev = $in; |
177 |
commit_svnrev($rev,1); # create new |
178 |
} |
179 |
} else { |
180 |
open(SVNREV,".svnrev") || die "can't open $TMPDIR/$CVSREP/.svnrev: $!"; |
181 |
$rev = <SVNREV>; |
182 |
chomp($rev); |
183 |
close(SVNREV); |
184 |
} |
185 |
|
186 |
print "Starting after revision $rev\n"; |
187 |
$rev++; |
188 |
} |
189 |
|
190 |
|
191 |
# |
192 |
# FIXME!! HEAD should really be next verison and loop because this way we |
193 |
# loose multiple edits of same file and corresponding messages. On the |
194 |
# other hand, if you want to compress your traffic to CVS server and don't |
195 |
# case much about accuracy and completnes of logs there, this might |
196 |
# be good. YMMV |
197 |
# |
198 |
open(LOG, "svn log -r $rev:HEAD -v --xml $SVNROOT |") || die "svn log for repository $SVNROOT failed: $!"; |
199 |
my $log; |
200 |
while(<LOG>) { |
201 |
$log .= $_; |
202 |
} |
203 |
close(LOG); |
204 |
|
205 |
|
206 |
my $xml; |
207 |
eval { |
208 |
$xml = XMLin($log, ForceArray => [ 'logentry', 'path' ]); |
209 |
}; |
210 |
|
211 |
|
212 |
#=begin log_example |
213 |
# |
214 |
#------------------------------------------------------------------------ |
215 |
#r256 | dpavlin | 2004-03-09 13:18:17 +0100 (Tue, 09 Mar 2004) | 2 lines |
216 |
# |
217 |
#ported r254 from hidra branch |
218 |
# |
219 |
#=cut |
220 |
|
221 |
my $fmt = "\n" . "-" x 79 . "\nr%5s| %8s | %s\n\n%s\n"; |
222 |
|
223 |
if (! $xml->{'logentry'}) { |
224 |
print "no newer log entries in Subversion repostory. CVS is current\n"; |
225 |
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 |
252 |
sub in_entries($) { |
253 |
my $path = shift; |
254 |
if ($path =~ m,^(.*?/*)([^/]+)$,) { |
255 |
my ($dir,$file) = ($1,$2); |
256 |
if ($dir !~ m,/$, && $dir ne "") { |
257 |
$dir .= "/"; |
258 |
} |
259 |
|
260 |
open(my $fh, "./$dir/CVS/Entries") || return 0; #die "no entries file: $dir/CVS/Entries"; |
261 |
while(<$fh>) { |
262 |
return 1 if (m{^/$file/}); |
263 |
} |
264 |
close($fh); |
265 |
return 0; |
266 |
} else { |
267 |
die "can't split '$path' to dir and file!"; |
268 |
} |
269 |
} |
270 |
|
271 |
cd_tmp; |
272 |
cd_rep; |
273 |
|
274 |
foreach my $e (@{$xml->{'logentry'}}) { |
275 |
die "BUG: revision from .svnrev ($rev) greater than from subversion (".$e->{'revision'}.")" if ($rev > $e->{'revision'}); |
276 |
$rev = $e->{'revision'}; |
277 |
log_system("svn export --force -q -r $rev $SVNROOT $TMPDIR/$CVSREP", "svn export of revision $rev failed"); |
278 |
|
279 |
# deduce name of svn directory |
280 |
my $SVNREP = ""; |
281 |
my $tmpsvn = $SVNROOT || die "BUG: SVNROOT empty!"; |
282 |
my $tmppath = $e->{'paths'}->{'path'}->[0]->{'content'} || die "BUG: tmppath empty!"; |
283 |
do { |
284 |
if ($tmpsvn =~ s#(/[^/]+)/*$##) { # vim fix |
285 |
$SVNREP = $1 . $SVNREP; |
286 |
} elsif ($e->{'paths'}->{'path'}->[0]->{'copyfrom-path'}) { |
287 |
print "NOTICE: copyfrom outside synced repository ignored - skipping\n"; |
288 |
next; |
289 |
} else { |
290 |
print "NOTICE: can't deduce svn dir from $SVNROOT - skipping\n"; |
291 |
next; |
292 |
} |
293 |
} until ($tmppath =~ m/^$SVNREP/); |
294 |
|
295 |
print "NOTICE: using $SVNREP as directory for svn\n"; |
296 |
|
297 |
printf($fmt, $e->{'revision'}, $e->{'author'}, $e->{'date'}, $e->{'msg'}); |
298 |
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'}}) { |
315 |
my ($action,$path) = ($p->{'action'},$p->{'content'}); |
316 |
|
317 |
next if ($path =~ m#/\.svnrev$#); |
318 |
|
319 |
print "svn2cvs: $action $path\n"; |
320 |
|
321 |
# prepare path and message |
322 |
my $file = $path; |
323 |
if ( $path !~ s#^\Q$SVNREP\E/*## ) { |
324 |
print "NOTICE: skipping '$path' which isn't under repository root '$SVNREP'\n"; |
325 |
die unless $partial_import; |
326 |
next; |
327 |
} |
328 |
|
329 |
if (! $path) { |
330 |
print "NOTICE: skipped this operation. Probably trunk creation\n"; |
331 |
next; |
332 |
} |
333 |
|
334 |
my $msg = $e->{'msg'}; |
335 |
$msg =~ s/'/'\\''/g; # quote " |
336 |
|
337 |
sub add_path { |
338 |
my $path = shift || die "no path?"; |
339 |
|
340 |
if (-d $path) { |
341 |
add_dir($path, $msg); |
342 |
} elsif ($path =~ m,^(.+)/[^/]+$, && ! -e "$1/CVS/Root") { |
343 |
my $dir = $1; |
344 |
in_entries($dir) || add_dir($dir, $msg); |
345 |
in_entries($path) || log_system("$cvs add '$path'", "cvs add of $path failed"); |
346 |
} else { |
347 |
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/) { |
361 |
if (-e $path) { |
362 |
if ( -d $path ) { |
363 |
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 { |
385 |
print "WARNING: $path is not present, skipping...\n"; |
386 |
undef $path; |
387 |
} |
388 |
} else { |
389 |
print "WARNING: action $action not implemented on $path. Bug or missing feature of $0\n"; |
390 |
} |
391 |
|
392 |
# save commits for later |
393 |
push @commit, $path if ($path); |
394 |
|
395 |
} |
396 |
|
397 |
# now commit changes |
398 |
cvs_commit($msg, @commit); |
399 |
|
400 |
commit_svnrev($rev); |
401 |
} |
402 |
|
403 |
# cd out of $CVSREP before File::Temp::END is called |
404 |
chdir("/tmp") || die "can't cd to /tmp: $!"; |
405 |
|
406 |
__END__ |
407 |
|
408 |
=pod |
409 |
|
410 |
=head1 NAME |
411 |
|
412 |
svn2cvs - save subversion commits to (read-only) cvs repository |
413 |
|
414 |
=head1 SYNOPSIS |
415 |
|
416 |
./svn2cvs.pl SVN_URL CVSROOT CVSREPOSITORY |
417 |
|
418 |
Usage example (used to self-host this script): |
419 |
|
420 |
./svn2cvs.pl file:///home/dpavlin/private/svn/svn2cvs/trunk/ \ |
421 |
:pserver:dpavlin@cvs.tigris.org:/cvs svn2cvs/src |
422 |
|
423 |
=head1 DESCRIPTION |
424 |
|
425 |
This script will allows you to commit changes made to Subversion repository to |
426 |
(read-only) CVS repository manually or from Subversion's C<post-commit> hook. |
427 |
|
428 |
It's using F<.svnrev> file (which will be created on first run) in |
429 |
B<CVSROOT/CVSREPOSITORY> to store last Subversion revision which was |
430 |
committed into CVS. |
431 |
|
432 |
One run will do following things: |
433 |
|
434 |
=over 4 |
435 |
|
436 |
=item * |
437 |
checkout B<CVSREPOSITORY> from B<CVSROOT> to temporary directory |
438 |
|
439 |
=item * |
440 |
check if F<.svnrev> file exists and create it if it doesn't |
441 |
|
442 |
=item * |
443 |
loop through all revisions from current in B<CVSROOT/CVSREPOSITORY> (using |
444 |
F<.svnrev>) up to B<HEAD> (current one) |
445 |
|
446 |
=over 5 |
447 |
|
448 |
=item * |
449 |
checkout next Subversion revision from B<SVN_URL> over CVS checkout |
450 |
temporary directory |
451 |
|
452 |
=item * |
453 |
make modification (add and/or delete) done in that revision |
454 |
|
455 |
=item * |
456 |
commit modification (added, deleted or modified files/dirs) while |
457 |
preserving original message from CVS |
458 |
|
459 |
=item * |
460 |
update F<.svnrev> to match current revision |
461 |
|
462 |
=back |
463 |
|
464 |
=item * |
465 |
cleanup temporary directory |
466 |
|
467 |
=back |
468 |
|
469 |
If checkout fails for some reason (e.g. flaky ssh connection), you will |
470 |
still have valid CVS repository, so all you have to do is run B<svn2cvs.pl> |
471 |
again. |
472 |
|
473 |
=head1 WARNINGS |
474 |
|
475 |
"Cheap" copy operations in Subversion are not at all cheap in CVS. They will |
476 |
create multiple copies of files in CVS repository! |
477 |
|
478 |
This script assume that you want to sync your C<trunk> (or any other |
479 |
directory for that matter) directory with CVS, not root of your subversion. |
480 |
This might be considered bug, but since common practise is to have |
481 |
directories C<trunk> and C<branches> in svn and source code in them, it's |
482 |
not serious limitation. |
483 |
|
484 |
=head1 RELATED PROJECTS |
485 |
|
486 |
B<Subversion> L<http://subversion.tigris.org/> version control system that is a |
487 |
compelling replacement for CVS in the open source community. |
488 |
|
489 |
B<cvs2svn> L<http://cvs2svn.tigris.org/> converts a CVS repository to a |
490 |
Subversion repository. It is designed for one-time conversions, not for |
491 |
repeated synchronizations between CVS and Subversion. |
492 |
|
493 |
=head1 CHANGES |
494 |
|
495 |
Versions of this utility are actually Subversion repository revisions, |
496 |
so they might not be in sequence. |
497 |
|
498 |
=over 3 |
499 |
|
500 |
=item r10 |
501 |
|
502 |
First release available to public |
503 |
|
504 |
=item r15 |
505 |
|
506 |
Addition of comprehensive documentation, fixes for quoting in commit |
507 |
messages, and support for skipping changes which are not under current |
508 |
Subversion checkout root (e.g. branches). |
509 |
|
510 |
=item r18 |
511 |
|
512 |
Support for importing your svn into empty CVS repository (it will first |
513 |
create module and than dump all revisions). |
514 |
Group commit operations to save round-trips to CVS server. |
515 |
Documentation improvements and other small fixes. |
516 |
|
517 |
=item r20 |
518 |
|
519 |
Fixed path deduction (overlap between Subversion reporistory and CVS checkout). |
520 |
|
521 |
=item r21 |
522 |
|
523 |
Use C<update -d> instead of checkout after import. |
524 |
Added fixes by Paul Egan <paulegan@mail.com> for XMLin and fixing working |
525 |
directory. |
526 |
|
527 |
=item r22 |
528 |
|
529 |
Rewritten import from revision 0 to empty repository, better importing |
530 |
of deep directory structures, initial support for recovery from partial |
531 |
commit. |
532 |
|
533 |
=back |
534 |
|
535 |
=head1 AUTHOR |
536 |
|
537 |
Dobrica Pavlinusic <dpavlin@rot13.org> |
538 |
|
539 |
L<http://www.rot13.org/~dpavlin/> |
540 |
|
541 |
=head1 LICENSE |
542 |
|
543 |
This product is licensed under GNU Public License (GPL) v2 or later. |
544 |
|
545 |
=cut |
546 |
|