13 |
|
|
14 |
use strict; |
use strict; |
15 |
use File::Temp qw/ tempdir /; |
use File::Temp qw/ tempdir /; |
16 |
|
use File::Path; |
17 |
use Data::Dumper; |
use Data::Dumper; |
18 |
use XML::Simple; |
use XML::Simple; |
19 |
|
|
29 |
exit 1; |
exit 1; |
30 |
} |
} |
31 |
|
|
32 |
|
# Ensure File::Temp::END can clean up: |
33 |
|
$SIG{__DIE__} = sub { chdir("/tmp"); die @_ }; |
34 |
|
|
35 |
my $TMPDIR=tempdir( "/tmp/checkoutXXXXX", CLEANUP => 1 ); |
my $TMPDIR=tempdir( "/tmp/checkoutXXXXX", CLEANUP => 1 ); |
36 |
|
|
37 |
chdir($TMPDIR) || die "can't cd to $TMPDIR: $!"; |
sub cd_tmp { |
38 |
|
chdir($TMPDIR) || die "can't cd to $TMPDIR: $!"; |
39 |
|
} |
40 |
|
|
41 |
|
sub cd_rep { |
42 |
|
chdir("$TMPDIR/$CVSREP") || die "can't cd to $TMPDIR/$CVSREP: $!"; |
43 |
|
} |
44 |
|
|
45 |
|
print "## using TMPDIR $TMPDIR\n"; |
46 |
|
|
47 |
# cvs command with root |
# cvs command with root |
48 |
my $cvs="cvs -d $CVSROOT"; |
my $cvs="cvs -d $CVSROOT"; |
49 |
|
|
50 |
|
# current revision in CVS |
51 |
|
my $rev; |
52 |
|
|
53 |
# |
# |
54 |
# sub to do logging and system calls |
# sub to do logging and system calls |
55 |
# |
# |
83 |
} |
} |
84 |
} |
} |
85 |
|
|
86 |
# current revision in CVS |
sub add_dir($$) { |
87 |
my $rev; |
my ($path,$msg) = @_; |
88 |
|
print "# add_dir($path)\n"; |
89 |
|
die "add_dir($path) is not directory" unless (-d $path); |
90 |
|
|
91 |
|
my $curr_dir; |
92 |
|
|
93 |
|
foreach my $d (split(m#/#, $path)) { |
94 |
|
$curr_dir .= ( $curr_dir ? '/' : '') . $d; |
95 |
|
|
96 |
|
next if in_entries($curr_dir); |
97 |
|
next if (-e "$curr_dir/CVS"); |
98 |
|
|
99 |
|
log_system("$cvs add $curr_dir", "cvs add of $curr_dir failed"); |
100 |
|
} |
101 |
|
} |
102 |
|
|
103 |
# ok, now do the checkout |
# ok, now do the checkout |
104 |
eval { |
eval { |
105 |
|
cd_tmp; |
106 |
log_system("$cvs -q checkout $CVSREP", "cvs checkout failed"); |
log_system("$cvs -q checkout $CVSREP", "cvs checkout failed"); |
107 |
}; |
}; |
108 |
|
|
118 |
|
|
119 |
print "start import of new module [yes]: "; |
print "start import of new module [yes]: "; |
120 |
my $in = <STDIN>; |
my $in = <STDIN>; |
121 |
|
cd_tmp; |
122 |
mkdir($CVSREP) || die "can't create $CVSREP: $!"; |
mkdir($CVSREP) || die "can't create $CVSREP: $!"; |
123 |
|
cd_rep; |
|
chdir($CVSREP) || die "can't cd to $TMPDIR/$CVSREP: $!"; |
|
124 |
|
|
125 |
open(SVNREV,"> .svnrev") || die "can't open $CVSREP/.svnrev: $!"; |
open(SVNREV,"> .svnrev") || die "can't open $CVSREP/.svnrev: $!"; |
126 |
print SVNREV "0"; |
print SVNREV "0"; |
129 |
$rev = 0; |
$rev = 0; |
130 |
|
|
131 |
# create new module |
# create new module |
132 |
log_system("$cvs import -m 'new CVS module' $CVSREP svn2cvs r0", "can't import new module into $CVSREP"); |
cd_rep; |
133 |
|
log_system("$cvs import -d -m 'new CVS module' $CVSREP svn r$rev", "import of new repository"); |
134 |
unlink ".svnrev" || die "can't remove .svnrev: $!"; |
cd_tmp; |
135 |
chdir($TMPDIR) || die "can't cd to $TMPDIR: $!"; |
rmtree($CVSREP) || die "can't remove $CVSREP"; |
|
rmdir $CVSREP || die "can't remove $CVSREP: $!"; |
|
|
|
|
|
# and checkout it |
|
136 |
log_system("$cvs -q checkout $CVSREP", "cvs checkout failed"); |
log_system("$cvs -q checkout $CVSREP", "cvs checkout failed"); |
137 |
|
cd_rep; |
|
chdir($CVSREP) || die "can't cd to $TMPDIR/$CVSREP: $!"; |
|
138 |
|
|
139 |
} else { |
} else { |
|
|
|
140 |
# import into existing module directory in CVS |
# import into existing module directory in CVS |
141 |
|
|
142 |
chdir($CVSREP) || die "can't cd to $TMPDIR/$CVSREP: $!"; |
cd_rep; |
|
|
|
|
|
|
143 |
# check if svnrev exists |
# check if svnrev exists |
144 |
if (! -e ".svnrev") { |
if (! -e ".svnrev") { |
145 |
print <<_USAGE_; |
print <<_USAGE_; |
196 |
} |
} |
197 |
close(LOG); |
close(LOG); |
198 |
|
|
199 |
my $xml = XMLin($log, ForceArray => [ 'logentry', 'path' ]); |
|
200 |
|
my $xml; |
201 |
|
eval { |
202 |
|
$xml = XMLin($log, ForceArray => [ 'logentry', 'path' ]); |
203 |
|
}; |
204 |
|
|
205 |
|
|
206 |
#=begin log_example |
#=begin log_example |
229 |
if ($d !~ m,/$, && $d ne "") { |
if ($d !~ m,/$, && $d ne "") { |
230 |
$d .= "/"; |
$d .= "/"; |
231 |
} |
} |
232 |
open(E, $d."CVS/Entries") || die "can't open ${d}CVS/Entries: $!"; |
open(E, $d."CVS/Entries") || return 0; |
233 |
while(<E>) { |
while(<E>) { |
234 |
return(1) if (m,^/$f/,); |
return(1) if (m,^/$f/,); |
235 |
} |
} |
238 |
} |
} |
239 |
} |
} |
240 |
|
|
241 |
|
cd_tmp; |
242 |
|
cd_rep; |
243 |
|
|
244 |
foreach my $e (@{$xml->{'logentry'}}) { |
foreach my $e (@{$xml->{'logentry'}}) { |
245 |
die "BUG: revision from .svnrev ($rev) greater than from subversion (".$e->{'revision'}.")" if ($rev > $e->{'revision'}); |
die "BUG: revision from .svnrev ($rev) greater than from subversion (".$e->{'revision'}.")" if ($rev > $e->{'revision'}); |
246 |
$rev = $e->{'revision'}; |
$rev = $e->{'revision'}; |
271 |
|
|
272 |
# prepare path and message |
# prepare path and message |
273 |
my $file = $path; |
my $file = $path; |
274 |
$path =~ s,^$SVNREP/*,, || die "BUG: can't strip SVNREP '$SVNREP' from path"; |
$path =~ s#^\Q$SVNREP\E/*## || die "BUG: can't strip SVNREP '$SVNREP' from path"; |
275 |
|
|
276 |
if (! $path) { |
if (! $path) { |
277 |
print "NOTICE: skipped this operation. Probably trunk creation\n"; |
print "NOTICE: skipped this operation. Probably trunk creation\n"; |
285 |
print "svn2cvs: modify $path -- nop\n"; |
print "svn2cvs: modify $path -- nop\n"; |
286 |
} elsif ($action =~ /A/) { |
} elsif ($action =~ /A/) { |
287 |
if (-d $path) { |
if (-d $path) { |
288 |
chdir($path) || die "can't cd into dir $path for import: $!"; |
add_dir($path, $msg); |
|
log_system("$cvs import -d -m '$msg' $CVSREP/$path svn r$rev", "cvs import of $path failed"); |
|
|
if (-d "$CVSREP/$path") { |
|
|
rmdir "$CVSREP/$path" || die "can't remove $CVSREP/$path: $!"; |
|
|
} else { |
|
|
unlink "$CVSREP/$path" || die "can't remove $CVSREP/$path: $!"; |
|
|
} |
|
|
chdir("$TMPDIR") || die "can't cd to $TMPDIR/$CVSREP: $!"; |
|
|
log_system("$cvs checkout $CVSREP/$path", "cvs checkout of imported dir $path failed"); |
|
|
chdir("$TMPDIR/$CVSREP") || die "can't cd back to $TMPDIR/$CVSREP: $!"; |
|
289 |
} elsif ($path =~ m,^(.+)/[^/]+$, && ! -e "$1/CVS/Root") { |
} elsif ($path =~ m,^(.+)/[^/]+$, && ! -e "$1/CVS/Root") { |
290 |
my $dir = $1; |
my $dir = $1; |
291 |
in_entries($dir) || log_system("$cvs add $dir", "cvs add of dir $dir failed"); |
in_entries($dir) || add_dir($dir, $msg); |
292 |
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"); |
293 |
} else { |
} else { |
294 |
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"); |
295 |
} |
} |
296 |
} elsif ($action =~ /D/) { |
} elsif ($action =~ /D/) { |
297 |
unlink $path || die "can't delete $path: $!"; |
if (-e $path) { |
298 |
log_system("$cvs delete $path", "cvs delete of $path failed"); |
unlink $path || die "can't delete $path: $!"; |
299 |
|
log_system("$cvs delete $path", "cvs delete of $path failed"); |
300 |
|
} else { |
301 |
|
print "WARNING: $path is not present, skipping...\n"; |
302 |
|
undef $path; |
303 |
|
} |
304 |
} else { |
} else { |
305 |
print "WARNING: action $action not implemented on $path. Bug or missing feature of $0\n"; |
print "WARNING: action $action not implemented on $path. Bug or missing feature of $0\n"; |
306 |
} |
} |
307 |
|
|
308 |
# save commits for later |
# save commits for later |
309 |
push @commit, $path; |
push @commit, $path if ($path); |
310 |
|
|
311 |
} |
} |
312 |
|
|
319 |
commit_svnrev($rev); |
commit_svnrev($rev); |
320 |
} |
} |
321 |
|
|
322 |
|
# cd out of $CVSREP before File::Temp::END is called |
323 |
|
chdir("/tmp") || die "can't cd to /tmp: $!"; |
324 |
|
|
325 |
__END__ |
__END__ |
326 |
|
|
327 |
=pod |
=pod |
437 |
|
|
438 |
Fixed path deduction (overlap between Subversion reporistory and CVS checkout). |
Fixed path deduction (overlap between Subversion reporistory and CVS checkout). |
439 |
|
|
440 |
|
=item r21 |
441 |
|
|
442 |
|
Use C<update -d> instead of checkout after import. |
443 |
|
Added fixes by Paul Egan <paulegan@mail.com> for XMLin and fixing working |
444 |
|
directory. |
445 |
|
|
446 |
|
=item r22 |
447 |
|
|
448 |
|
Rewritten import from revision 0 to empty repository, better importing |
449 |
|
of deep directory structures, initial support for recovery from partial |
450 |
|
commit. |
451 |
|
|
452 |
=back |
=back |
453 |
|
|
454 |
=head1 AUTHOR |
=head1 AUTHOR |