--- trunk/svn2cvs.pl 2004/03/09 21:54:36 4 +++ trunk/svn2cvs.pl 2004/03/13 17:22:53 12 @@ -8,30 +8,25 @@ # http://raw.no/personal/blog # # 2004-03-09 Dobrica Pavlinusic +# +# documentation is after __END__ use strict; use File::Temp qw/ tempdir /; use Data::Dumper; use XML::Simple; -# get current user home directory -my $HOME = $ENV{'HOME'} || die "can't get home directory!"; +if (@ARGV < 2) { + print "usage: $0 SVN_URL CVSROOT CVSREPOSITORY\n"; + exit 1; +} + +my ($SVNROOT,$CVSROOT, $CVSREP) = @ARGV; -# cvsroot directory -my $CVSROOT="$HOME/x/cvsroot"; -# name of cvs repository to commit to -my $CVSREP="svn2cvs"; - -# svnroot directory -my $SVNROOT="file://$HOME/private/svn/svn2cvs"; -# name of respository -my $SVNREP="trunk"; - -# webpac example -#$CVSROOT="$HOME/x/cvsroot"; -#$CVSREP="webpac"; -#$SVNROOT="file://$HOME/private/svn/webpac/"; -#$SVNREP="trunk"; +if ($SVNROOT !~ m,^[\w+]+:///*\w+,) { + print "ERROR: invalid svn root $SVNROOT\n"; + exit 1; +} my $TMPDIR=tempdir( "/tmp/checkoutXXXXX", CLEANUP => 1 ); @@ -40,14 +35,13 @@ # cvs command with root my $cvs="cvs -d $CVSROOT"; - # # sub to do logging and system calls # sub log_system($$) { my ($cmd,$errmsg) = @_; print STDERR "## $cmd\n"; - system $cmd || die "$errmsg: $!"; + system($cmd) == 0 || die "$errmsg: $!"; } # @@ -59,35 +53,37 @@ die "commit_svnrev needs revision" if (! defined($rev)); - open(SVNREV,"> $CVSREP/.svnrev") || die "can't open $TMPDIR/$CVSREP/.svnrev: $!"; + open(SVNREV,"> .svnrev") || die "can't open $TMPDIR/$CVSREP/.svnrev: $!"; print SVNREV $rev; close(SVNREV); my $path=".svnrev"; if ($add_new) { - system "$cvs add $CVSREP/$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\" $CVSREP/$path" || die "cvs commit of $path failed: $!"; + system "$cvs commit -m '$msg' $path" || die "cvs commit of $path failed: $!"; } } - # ok, now do the checkout -log_system("$cvs -q checkout $CVSREP","cvs checkout failed"); +log_system("$cvs -q checkout $CVSREP", "cvs checkout failed"); + +chdir($CVSREP) || die "can't cd to $TMPDIR/$CVSREP: $!"; + my $rev; # check if svnrev exists -if (! -e "$CVSREP/.svnrev") { +if (! -e ".svnrev") { print <<_USAGE_; Your CVS repository doesn't have .svnrev file! -This file is used to keep CVS repository and SubVersion in sync, so +This file is used to keep CVS repository and Subversion in sync, so that only newer changes will be commited. It's quote possible that this is first svn2cvs run for this repository. @@ -96,8 +92,8 @@ been checkouted. If you migrated your cvs repository to svn using cvs2svn, this will be -last SubVersion revision. If this is initial run of conversion of -SubVersion repository to CVS, correct revision is 0. +last Subversion revision. If this is initial run of conversion of +Subversion repository to CVS, correct revision is 0. _USAGE_ @@ -112,8 +108,8 @@ commit_svnrev($rev,1); # create new } } else { - open(SVNREV,"$CVSREP/.svnrev") || die "can't open $TMPDIR/$CVSREP/.svnrev: $!"; - my $rev = ; + open(SVNREV,".svnrev") || die "can't open $TMPDIR/$CVSREP/.svnrev: $!"; + $rev = ; chomp($rev); close(SVNREV); } @@ -129,7 +125,7 @@ # case much about accuracy and completnes of logs there, this might # be good. YMMV # -open(LOG, "svn log -r $rev:HEAD -v --xml $SVNROOT/$SVNREP |") || die "svn log for repository $SVNROOT/$SVNREP failed: $!"; +open(LOG, "svn log -r $rev:HEAD -v --xml $SVNROOT |") || die "svn log for repository $SVNROOT failed: $!"; my $log; while() { $log .= $_; @@ -139,26 +135,41 @@ my $xml = XMLin($log, ForceArray => [ 'logentry', 'path' ]); -=begin log_example - ------------------------------------------------------------------------- -r256 | dpavlin | 2004-03-09 13:18:17 +0100 (Tue, 09 Mar 2004) | 2 lines - -ported r254 from hidra branch - -=cut +#=begin log_example +# +#------------------------------------------------------------------------ +#r256 | dpavlin | 2004-03-09 13:18:17 +0100 (Tue, 09 Mar 2004) | 2 lines +# +#ported r254 from hidra branch +# +#=cut my $fmt = "\n" . "-" x 79 . "\nr%5s| %8s | %s\n\n%s\n"; if (! $xml->{'logentry'}) { - print "no newer log entries in SubVersion repostory. CVS is current\n"; + print "no newer log entries in Subversion repostory. CVS is current\n"; exit 0; } foreach my $e (@{$xml->{'logentry'}}) { die "BUG: revision from .svnrev ($rev) greater than from subversion (".$e->{'revision'}.")" if ($rev > $e->{'revision'}); $rev = $e->{'revision'}; - log_system("svn export --force -q -r $rev $SVNROOT/$SVNREP $CVSREP", "svn export of revision $rev failed"); + log_system("svn export --force -q -r $rev $SVNROOT $TMPDIR/$CVSREP", "svn export of revision $rev failed"); + + # deduce name of svn directory + my $SVNREP = ""; + my $tmpsvn = $SVNROOT || die "BUG: SVNROOT empty!"; + my $tmppath = $e->{'paths'}->{'path'}->[0]->{'content'} || die "BUG: tmppath empty!"; + do { +print "## tmppath: $tmppath tmpsvn: $tmpsvn SVNREP: $SVNREP\n"; + if ($tmpsvn =~ s,(/\w+/*)$,,) { + $SVNREP .= $1; + } else { + die "ERROR: can't deduce svn dir from $SVNROOT.\nUsing root of snv repository for current version instead of /trunk/ is not supported.\n"; + } + } until ($tmppath =~ m/^$SVNREP/); + + print "NOTICE: using $SVNREP as directory for svn\n"; printf($fmt, $e->{'revision'}, $e->{'author'}, $e->{'date'}, $e->{'msg'}); foreach my $p (@{$e->{'paths'}->{'path'}}) { @@ -168,22 +179,36 @@ # prepare path and message my $file = $path; - $path =~ s,^/$SVNREP/*,, || die "BUG: can't strip SVNREP from path"; + $path =~ s,^$SVNREP/*,, || die "BUG: can't strip SVNREP from path"; + + if (! $path) { + print "NOTICE: skipped this operation. Probably trunk creation\n"; + next; + } + my $msg = $e->{'msg'}; - $msg =~ s/"/\\"/g; # quote " + $msg =~ s/'/\\'/g; # quote " if ($action =~ /M/) { print "svn2cvs: modify $path -- nop\n"; } elsif ($action =~ /A/) { - log_system("$cvs add -m \"$msg\" $CVSREP/$path", "cvs add of $path failed"); + 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"); + 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: $!"; + } else { + log_system("$cvs add -m '$msg' $path", "cvs add of $path failed"); + } } elsif ($action =~ /D/) { - log_system("$cvs delete -m \"$msg\" $CVSREP/$path", "cvs delete of $path failed"); + log_system("$cvs delete -m '$msg' $path", "cvs delete of $path failed"); } else { print "WARNING: action $action not implemented on $path. Bug or missing feature of $0\n"; } # now commit changes - log_system("$cvs commit -m \"$msg\" $CVSREP/$path", "cvs commit of $path failed"); + log_system("$cvs commit -m '$msg' $path", "cvs commit of $path failed"); } @@ -192,20 +217,93 @@ __END__ -svn export --force "$SVNROOT/$SVNREP" "$CVSREP" - -cd dotfiles - -for file in $(find -type f -not -path \*CVS\*); do - FILE=$(basename $file) - DIR=$(dirname $file) - if ! grep -q "^/$FILE/" $DIR/CVS/Entries ; then - cvs add $file - fi -done - -#cvs commit -m "Automatic commit from SVN" - -#rm -rf $TMPDIR +=pod + +=head1 NAME + +svn2cvs - save subversion commits to (read-only) cvs repository + +=head1 SYNOPSIS + + ./svn2cvs.pl SVN_URL CVSROOT CVSREPOSITORY + +Usage example (used to self-host this script): + + ./svn2cvs.pl file:///home/dpavlin/private/svn/svn2cvs/trunk/ \ + :pserver:dpavlin@cvs.tigris.org:/cvs svn2cvs/src + +=head1 DESCRIPTION + +This script will allow you to commit changes made to Subversion repository also to (read-only) CVS repository manually or from Subversion's C hook. + +It's using F<.svnrev> file (which will be created on first run) in +B to store last Subversion revision which was +committed into CVS. + +One run will do following things: + +=over 4 + +=item * +checkout B from B to temporary directory + +=item * +check if F<.svnrev> file exists and create it if it doesn't + +=item * +loop through all revisions from current in B (using +F<.svnrev>) up to B (current one) + +=over 5 + +=item * +checkout next Subversion revision from B over CVS checkout +temporary directory + +=item * +make modification (add and/or delete) done in that revision + +=item * +commit modification (added, deleted or modified files/dirs) while +preserving original message from CVS + +=item * +update F<.svnrev> to match current revision + +=back + +=item * +cleanup temporary directory + +=back + +If checkout fails for some reason (e.g. flaky ssh connection), you will +still have valid CVS repository, so all you have to do is run B +again. + +=head1 WARNINGS + +"Cheap" copy operations in Subversion are not at all cheap in CVS. They will +create multiple copies of files in CVS repository! + +=head1 RELATED PROJECTS + +B L version control system that is a +compelling replacement for CVS in the open source community. + +B L converts a CVS repository to a +Subversion repository. It is designed for one-time conversions, not for +repeated synchronizations between CVS and Subversion. + +=head1 AUTHOR + +Dobrica Pavlinusic + +L + +=head1 LICENSE + +This product is licensed under GNU Public License (GPL) v2 or later. + +=cut -echo "cvs left in $TMPDIR"