--- trunk/svn2cvs.pl 2005/04/18 16:43:08 20 +++ trunk/svn2cvs.pl 2007/09/07 17:16:48 37 @@ -13,9 +13,16 @@ use strict; use File::Temp qw/ tempdir /; +use File::Path; use Data::Dumper; use XML::Simple; +# do we want to sync just part of repository? +my $partial_import = 1; + +# do we want to add svk-like prefix with original revision, author and date? +my $decorate_commit_message = 1; + if (@ARGV < 2) { print "usage: $0 SVN_URL CVSROOT CVSREPOSITORY\n"; exit 1; @@ -28,12 +35,26 @@ exit 1; } +# Ensure File::Temp::END can clean up: +$SIG{__DIE__} = sub { chdir("/tmp"); die @_ }; + my $TMPDIR=tempdir( "/tmp/checkoutXXXXX", CLEANUP => 1 ); -chdir($TMPDIR) || die "can't cd to $TMPDIR: $!"; +sub cd_tmp { + chdir($TMPDIR) || die "can't cd to $TMPDIR: $!"; +} + +sub cd_rep { + chdir("$TMPDIR/$CVSREP") || die "can't cd to $TMPDIR/$CVSREP: $!"; +} + +print "## using TMPDIR $TMPDIR\n"; # cvs command with root -my $cvs="cvs -d $CVSROOT"; +my $cvs="cvs -f -d $CVSROOT"; + +# current revision in CVS +my $rev; # # sub to do logging and system calls @@ -60,19 +81,34 @@ my $path=".svnrev"; if ($add_new) { - system "$cvs add $path" || die "cvs add of $path failed: $!"; + system "$cvs add '$path'" || die "cvs add of $path failed: $!"; } else { my $msg="subversion revision $rev commited to CVS"; print "$msg\n"; - system "$cvs commit -m '$msg' $path" || die "cvs commit of $path failed: $!"; + system "$cvs commit -m '$msg' '$path'" || die "cvs commit of $path failed: $!"; } } -# current revision in CVS -my $rev; +sub add_dir($$) { + my ($path,$msg) = @_; + print "# add_dir($path)\n"; + die "add_dir($path) is not directory" unless (-d $path); + + my $curr_dir; + + foreach my $d (split(m#/#, $path)) { + $curr_dir .= ( $curr_dir ? '/' : '') . $d; + + next if in_entries($curr_dir); + next if (-e "$curr_dir/CVS"); + + log_system("$cvs add '$curr_dir'", "cvs add of $curr_dir failed"); + } +} # ok, now do the checkout eval { + cd_tmp; log_system("$cvs -q checkout $CVSREP", "cvs checkout failed"); }; @@ -88,9 +124,9 @@ print "start import of new module [yes]: "; my $in = ; + cd_tmp; mkdir($CVSREP) || die "can't create $CVSREP: $!"; - - chdir($CVSREP) || die "can't cd to $TMPDIR/$CVSREP: $!"; + cd_rep; open(SVNREV,"> .svnrev") || die "can't open $CVSREP/.svnrev: $!"; print SVNREV "0"; @@ -99,24 +135,17 @@ $rev = 0; # create new module - log_system("$cvs import -m 'new CVS module' $CVSREP svn2cvs r0", "can't import new module into $CVSREP"); - - unlink ".svnrev" || die "can't remove .svnrev: $!"; - chdir($TMPDIR) || die "can't cd to $TMPDIR: $!"; - rmdir $CVSREP || die "can't remove $CVSREP: $!"; - - # and checkout it + cd_rep; + log_system("$cvs import -d -m 'new CVS module' $CVSREP svn r$rev", "import of new repository"); + cd_tmp; + rmtree($CVSREP) || die "can't remove $CVSREP"; log_system("$cvs -q checkout $CVSREP", "cvs checkout failed"); - - chdir($CVSREP) || die "can't cd to $TMPDIR/$CVSREP: $!"; + cd_rep; } else { - # import into existing module directory in CVS - chdir($CVSREP) || die "can't cd to $TMPDIR/$CVSREP: $!"; - - + cd_rep; # check if svnrev exists if (! -e ".svnrev") { print <<_USAGE_; @@ -173,7 +202,11 @@ } close(LOG); -my $xml = XMLin($log, ForceArray => [ 'logentry', 'path' ]); + +my $xml; +eval { + $xml = XMLin($log, ForceArray => [ 'logentry', 'path' ]); +}; #=begin log_example @@ -192,25 +225,52 @@ exit 0; } +# return all files in CVS/Entries +sub entries($) { + my $dir = shift; + die "entries expects directory argument!" unless -d $dir; + my @entries; + open(my $fh, "$dir/CVS/Entries") || return 0; + while(<$fh>) { + if ( m{^D/([^/]+)}, ) { + my $sub_dir = $1; + warn "#### entries recurse into: $dir/$sub_dir"; + push @entries, map { "$sub_dir/$_" } entries("$dir/$sub_dir"); + push @entries, $sub_dir; + } elsif ( m{^/([^/]+)/} ) { + push @entries, $1; + } elsif ( ! m{^D$} ) { + die "can't decode entries line: $_"; + } + } + close($fh); + warn "#### entries($dir) => ",join("|",@entries); + return @entries; +} + # check if file exists in CVS/Entries sub in_entries($) { my $path = shift; - if ($path !~ m,^(.*?/*)([^/]+)$,) { - die "can't split '$path' to dir and file!"; - } else { - my ($d,$f) = ($1,$2); - if ($d !~ m,/$, && $d ne "") { - $d .= "/"; + if ($path =~ m,^(.*?/*)([^/]+)$,) { + my ($dir,$file) = ($1,$2); + if ($dir !~ m,/$, && $dir ne "") { + $dir .= "/"; } - open(E, $d."CVS/Entries") || die "can't open ${d}CVS/Entries: $!"; - while() { - return(1) if (m,^/$f/,); + + open(my $fh, "$dir/CVS/Entries") || return 0; #die "no entries file: $dir/CVS/Entries"; + while(<$fh>) { + return 1 if (m{^/$file/}); } - close(E); + close($fh); return 0; + } else { + die "can't split '$path' to dir and file!"; } } +cd_tmp; +cd_rep; + foreach my $e (@{$xml->{'logentry'}}) { die "BUG: revision from .svnrev ($rev) greater than from subversion (".$e->{'revision'}.")" if ($rev > $e->{'revision'}); $rev = $e->{'revision'}; @@ -221,8 +281,11 @@ my $tmpsvn = $SVNROOT || die "BUG: SVNROOT empty!"; my $tmppath = $e->{'paths'}->{'path'}->[0]->{'content'} || die "BUG: tmppath empty!"; do { - if ($tmpsvn =~ s#(/[^/]+)/*$##) { + if ($tmpsvn =~ s#(/[^/]+)/*$##) { # vim fix $SVNREP = $1 . $SVNREP; + } elsif ($e->{'paths'}->{'path'}->[0]->{'copyfrom-path'}) { + print "NOTICE: copyfrom outside synced repository ignored - skipping\n"; + next; } else { print "NOTICE: can't deduce svn dir from $SVNROOT - skipping\n"; next; @@ -234,14 +297,34 @@ printf($fmt, $e->{'revision'}, $e->{'author'}, $e->{'date'}, $e->{'msg'}); my @commit; + my $msg = $e->{'msg'}; + $msg =~ s/'/'\\''/g; # quote " + + $msg = 'r' . $rev . ' ' . $e->{author} . ' | ' . $e->{date} . "\n" . $msg if $decorate_commit_message; + + sub cvs_commit { + my $msg = shift || die "no msg?"; + if ( ! @_ ) { + warn "commit ignored, no files\n"; + return; + } + log_system("$cvs commit -m '$msg' '".join("' '",@_)."'", "cvs commit of ".join(",",@_)." failed"); + } + foreach my $p (@{$e->{'paths'}->{'path'}}) { my ($action,$path) = ($p->{'action'},$p->{'content'}); + next if ($path =~ m#/\.svnrev$#); + print "svn2cvs: $action $path\n"; # prepare path and message my $file = $path; - $path =~ s,^$SVNREP/*,, || die "BUG: can't strip SVNREP '$SVNREP' from path"; + if ( $path !~ s#^\Q$SVNREP\E/*## ) { + print "NOTICE: skipping '$path' which isn't under repository root '$SVNREP'\n"; + die unless $partial_import; + next; + } if (! $path) { print "NOTICE: skipped this operation. Probably trunk creation\n"; @@ -251,48 +334,74 @@ my $msg = $e->{'msg'}; $msg =~ s/'/'\\''/g; # quote " - if ($action =~ /M/) { - print "svn2cvs: modify $path -- nop\n"; - } elsif ($action =~ /A/) { + sub add_path { + my $path = shift || die "no path?"; + if (-d $path) { - chdir($path) || die "can't cd into dir $path for import: $!"; - 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: $!"; + add_dir($path, $msg); } elsif ($path =~ m,^(.+)/[^/]+$, && ! -e "$1/CVS/Root") { my $dir = $1; - in_entries($dir) || log_system("$cvs add $dir", "cvs add of dir $dir failed"); - in_entries($path) || log_system("$cvs add $path", "cvs add of $path failed"); + in_entries($dir) || add_dir($dir, $msg); + in_entries($path) || log_system("$cvs add '$path'", "cvs add of $path failed"); } else { - 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"); } + } + + if ($action =~ /M/) { + if ( in_entries( $path ) ) { + print "svn2cvs: modify $path -- nop\n"; + } else { + print "WARNING: modify $path which isn't in CVS, adding...\n"; + add_path($path); + } + } elsif ($action =~ /A/) { + add_path($path); } elsif ($action =~ /D/) { - unlink $path || die "can't delete $path: $!"; - log_system("$cvs delete $path", "cvs delete of $path failed"); + if (-e $path) { + if ( -d $path ) { + warn "#### remove directory: $path"; + my @sub_commit; + foreach my $f ( entries($path) ) { + $f = "$path/$f"; + if ( -f $f ) { + unlink($f) || die "can't delete file $f: $!"; +# } else { +# rmtree($f) || die "can't delete dir $f: $!"; + } + log_system("$cvs delete '$f'", "cvs delete of file $f failed"); + push @sub_commit, $f; + } + log_system("$cvs delete '$path'", "cvs delete of file $path failed"); + cvs_commit($msg, @sub_commit, $path); + log_system("$cvs update -dP '$path'", "cvs update -dP $path failed"); + } else { + warn "#### remove file: $path"; + unlink($path) || die "can't delete $path: $!"; + log_system("$cvs delete '$path'", "cvs delete of dir $path failed"); + } + } else { + print "WARNING: $path is not present, skipping...\n"; + undef $path; + } } else { print "WARNING: action $action not implemented on $path. Bug or missing feature of $0\n"; } # save commits for later - push @commit, $path; + push @commit, $path if ($path); } - my $msg = $e->{'msg'}; - $msg =~ s/'/'\\''/g; # quote " - # now commit changes - log_system("$cvs commit -m '$msg' ".join(" ",@commit), "cvs commit of ".join(",",@commit)." failed"); + cvs_commit($msg, @commit); commit_svnrev($rev); } +# cd out of $CVSREP before File::Temp::END is called +chdir("/tmp") || die "can't cd to /tmp: $!"; + __END__ =pod @@ -408,6 +517,18 @@ Fixed path deduction (overlap between Subversion reporistory and CVS checkout). +=item r21 + +Use C instead of checkout after import. +Added fixes by Paul Egan for XMLin and fixing working +directory. + +=item r22 + +Rewritten import from revision 0 to empty repository, better importing +of deep directory structures, initial support for recovery from partial +commit. + =back =head1 AUTHOR