/[svn2cvs]/trunk/svn2cvs.pl
This is repository of my old source code which isn't updated any more. Go to git.rot13.org for current projects!
ViewVC logotype

Diff of /trunk/svn2cvs.pl

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 15 by dpavlin, Sun Mar 14 21:53:44 2004 UTC revision 30 by dpavlin, Mon Aug 20 08:37:22 2007 UTC
# Line 13  Line 13 
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    
20    # do we want to sync just part of repository?
21    my $partial_import = 1;
22    
23  if (@ARGV < 2) {  if (@ARGV < 2) {
24          print "usage: $0 SVN_URL CVSROOT CVSREPOSITORY\n";          print "usage: $0 SVN_URL CVSROOT CVSREPOSITORY\n";
25          exit 1;          exit 1;
# Line 28  if ($SVNROOT !~ m,^[\w+]+:///*\w+,) { Line 32  if ($SVNROOT !~ m,^[\w+]+:///*\w+,) {
32          exit 1;          exit 1;
33  }  }
34    
35    # Ensure File::Temp::END can clean up:
36    $SIG{__DIE__} = sub { chdir("/tmp"); die @_ };
37    
38  my $TMPDIR=tempdir( "/tmp/checkoutXXXXX", CLEANUP => 1 );  my $TMPDIR=tempdir( "/tmp/checkoutXXXXX", CLEANUP => 1 );
39    
40  chdir($TMPDIR) || die "can't cd to $TMPDIR: $!";  sub cd_tmp {
41            chdir($TMPDIR) || die "can't cd to $TMPDIR: $!";
42    }
43    
44    sub cd_rep {
45            chdir("$TMPDIR/$CVSREP") || die "can't cd to $TMPDIR/$CVSREP: $!";
46    }
47    
48    print "## using TMPDIR $TMPDIR\n";
49    
50  # cvs command with root  # cvs command with root
51  my $cvs="cvs -d $CVSROOT";  my $cvs="cvs -f -d $CVSROOT";
52    
53    # current revision in CVS
54    my $rev;
55    
56  #  #
57  # sub to do logging and system calls  # sub to do logging and system calls
# Line 60  sub commit_svnrev { Line 78  sub commit_svnrev {
78          my $path=".svnrev";          my $path=".svnrev";
79    
80          if ($add_new) {          if ($add_new) {
81                  system "$cvs add $path" || die "cvs add of $path failed: $!";                  system "$cvs add '$path'" || die "cvs add of $path failed: $!";
82          } else {          } else {
83                  my $msg="subversion revision $rev commited to CVS";                  my $msg="subversion revision $rev commited to CVS";
84                  print "$msg\n";                  print "$msg\n";
85                  system "$cvs commit -m '$msg' $path" || die "cvs commit of $path failed: $!";                  system "$cvs commit -m '$msg' '$path'" || die "cvs commit of $path failed: $!";
86            }
87    }
88    
89    sub add_dir($$) {
90            my ($path,$msg) = @_;
91            print "# add_dir($path)\n";
92            die "add_dir($path) is not directory" unless (-d $path);
93    
94            my $curr_dir;
95    
96            foreach my $d (split(m#/#, $path)) {
97                    $curr_dir .= ( $curr_dir ? '/' : '') . $d;
98    
99                    next if in_entries($curr_dir);
100                    next if (-e "$curr_dir/CVS");
101    
102                    log_system("$cvs add '$curr_dir'", "cvs add of $curr_dir failed");
103          }          }
104  }  }
105    
106  # ok, now do the checkout  # ok, now do the checkout
107    eval {
108            cd_tmp;
109            log_system("$cvs -q checkout $CVSREP", "cvs checkout failed");
110    };
111    
112  log_system("$cvs -q checkout $CVSREP", "cvs checkout failed");  if ($@) {
113            print <<_NEW_REP_;
114    
115  chdir($CVSREP) || die "can't cd to $TMPDIR/$CVSREP: $!";  There is no CVS repository '$CVSREP' in your CVS. I will assume that
116    this is import of new module in your CVS and start from revision 0.
117    
118    Press enter to continue importing new CVS repository or CTRL+C to abort.
119    
120  my $rev;  _NEW_REP_
121    
122  # check if svnrev exists          print "start import of new module [yes]: ";
123  if (! -e ".svnrev") {          my $in = <STDIN>;
124          print <<_USAGE_;          cd_tmp;
125            mkdir($CVSREP) || die "can't create $CVSREP: $!";
126            cd_rep;
127    
128            open(SVNREV,"> .svnrev") || die "can't open $CVSREP/.svnrev: $!";
129            print SVNREV "0";
130            close(SVNREV);
131    
132            $rev = 0;
133    
134            # create new module
135            cd_rep;
136            log_system("$cvs import -d -m 'new CVS module' $CVSREP svn r$rev", "import of new repository");
137            cd_tmp;
138            rmtree($CVSREP) || die "can't remove $CVSREP";
139            log_system("$cvs -q checkout $CVSREP", "cvs checkout failed");
140            cd_rep;
141    
142    } else {
143            # import into existing module directory in CVS
144    
145            cd_rep;
146            # check if svnrev exists
147            if (! -e ".svnrev") {
148                    print <<_USAGE_;
149    
150  Your CVS repository doesn't have .svnrev file!  Your CVS repository doesn't have .svnrev file!
151    
# Line 97  Subversion repository to CVS, correct re Line 163  Subversion repository to CVS, correct re
163    
164  _USAGE_  _USAGE_
165    
166          print "svn revision corresponding to CVS [abort]: ";                  print "svn revision corresponding to CVS [abort]: ";
167          my $in = <STDIN>;                  my $in = <STDIN>;
168          chomp($in);                  chomp($in);
169          if ($in !~ /^\d+$/) {                  if ($in !~ /^\d+$/) {
170                  print "Aborting: revision not a number\n";                          print "Aborting: revision not a number\n";
171                  exit 1;                          exit 1;
172                    } else {
173                            $rev = $in;
174                            commit_svnrev($rev,1);  # create new
175                    }
176          } else {          } else {
177                  $rev = $in;                  open(SVNREV,".svnrev") || die "can't open $TMPDIR/$CVSREP/.svnrev: $!";
178                  commit_svnrev($rev,1);  # create new                  $rev = <SVNREV>;
179                    chomp($rev);
180                    close(SVNREV);
181          }          }
 } else {  
         open(SVNREV,".svnrev") || die "can't open $TMPDIR/$CVSREP/.svnrev: $!";  
         $rev = <SVNREV>;  
         chomp($rev);  
         close(SVNREV);  
 }  
182    
183  print "Starting after revision $rev\n";          print "Starting after revision $rev\n";
184  $rev++;          $rev++;
185    }
186    
187    
188  #  #
# Line 132  while(<LOG>) { Line 199  while(<LOG>) {
199  }  }
200  close(LOG);  close(LOG);
201    
202  my $xml = XMLin($log, ForceArray => [ 'logentry', 'path' ]);  
203    my $xml;
204    eval {
205            $xml = XMLin($log, ForceArray => [ 'logentry', 'path' ]);
206    };
207    
208    
209  #=begin log_example  #=begin log_example
# Line 158  sub in_entries($) { Line 229  sub in_entries($) {
229                  die "can't split '$path' to dir and file!";                  die "can't split '$path' to dir and file!";
230          } else {          } else {
231                  my ($d,$f) = ($1,$2);                  my ($d,$f) = ($1,$2);
232                  if ($d !~ m,/$,) {                  if ($d !~ m,/$, && $d ne "") {
233                          $d .= "/";                          $d .= "/";
234                  }                  }
235                  open(E, $d."CVS/Entries") || die "can't open ${d}CVS/Entries: $!";                  open(E, $d."CVS/Entries") || return 0;
236                  while(<E>) {                  while(<E>) {
237                          return(1) if (m,^/$f/,);                          return(1) if (m,^/$f/,);
238                  }                  }
# Line 170  sub in_entries($) { Line 241  sub in_entries($) {
241          }          }
242  }  }
243    
244    cd_tmp;
245    cd_rep;
246    
247  foreach my $e (@{$xml->{'logentry'}}) {  foreach my $e (@{$xml->{'logentry'}}) {
248          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'});
249          $rev = $e->{'revision'};          $rev = $e->{'revision'};
# Line 180  foreach my $e (@{$xml->{'logentry'}}) { Line 254  foreach my $e (@{$xml->{'logentry'}}) {
254          my $tmpsvn = $SVNROOT || die "BUG: SVNROOT empty!";          my $tmpsvn = $SVNROOT || die "BUG: SVNROOT empty!";
255          my $tmppath = $e->{'paths'}->{'path'}->[0]->{'content'} || die "BUG: tmppath empty!";          my $tmppath = $e->{'paths'}->{'path'}->[0]->{'content'} || die "BUG: tmppath empty!";
256          do {          do {
257                  if ($tmpsvn =~ s,(/\w+/*)$,,) {                  if ($tmpsvn =~ s#(/[^/]+)/*$##) {
258                          $SVNREP .= $1;                          $SVNREP = $1 . $SVNREP;
259                    } elsif ($e->{'paths'}->{'path'}->[0]->{'copyfrom-path'}) {
260                            print "NOTICE: copyfrom outside synced repository ignored - skipping\n";
261                            next;
262                  } else {                  } else {
263                          print "NOTICE: can't deduce svn dir from $SVNROOT - skipping\n";                          print "NOTICE: can't deduce svn dir from $SVNROOT - skipping\n";
264                          next;                          next;
# Line 191  foreach my $e (@{$xml->{'logentry'}}) { Line 268  foreach my $e (@{$xml->{'logentry'}}) {
268          print "NOTICE: using $SVNREP as directory for svn\n";          print "NOTICE: using $SVNREP as directory for svn\n";
269    
270          printf($fmt, $e->{'revision'}, $e->{'author'}, $e->{'date'}, $e->{'msg'});          printf($fmt, $e->{'revision'}, $e->{'author'}, $e->{'date'}, $e->{'msg'});
271            my @commit;
272    
273          foreach my $p (@{$e->{'paths'}->{'path'}}) {          foreach my $p (@{$e->{'paths'}->{'path'}}) {
274                  my ($action,$path) = ($p->{'action'},$p->{'content'});                  my ($action,$path) = ($p->{'action'},$p->{'content'});
275    
276                    next if ($path =~ m#/\.svnrev$#);
277    
278                  print "svn2cvs: $action $path\n";                  print "svn2cvs: $action $path\n";
279    
280                  # prepare path and message                  # prepare path and message
281                  my $file = $path;                  my $file = $path;
282                  $path =~ s,^$SVNREP/*,, || die "BUG: can't strip SVNREP from path";                  if ( $path !~ s#^\Q$SVNREP\E/*## ) {
283                            print "NOTICE: skipping '$path' which isn't under repository root '$SVNREP'\n";
284                            die unless $partial_import;
285                            next;
286                    }
287    
288                  if (! $path) {                  if (! $path) {
289                          print "NOTICE: skipped this operation. Probably trunk creation\n";                          print "NOTICE: skipped this operation. Probably trunk creation\n";
# Line 209  foreach my $e (@{$xml->{'logentry'}}) { Line 294  foreach my $e (@{$xml->{'logentry'}}) {
294                  $msg =~ s/'/'\\''/g;    # quote "                  $msg =~ s/'/'\\''/g;    # quote "
295    
296                  if ($action =~ /M/) {                  if ($action =~ /M/) {
297                          print "svn2cvs: modify $path -- nop\n";                          if ( in_entries( $path ) ) {
298                                    print "svn2cvs: modify $path -- nop\n";
299                            } else {
300                                    print "WARNING: modify $path which isn't in CVS, adding...\n";
301                                    log_system("$cvs add '$path'", "cvs add of $path failed");
302                            }
303                  } elsif ($action =~ /A/) {                  } elsif ($action =~ /A/) {
304                          if (-d $path) {                          if (-d $path) {
305                                  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");  
                                 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: $!";  
306                          } elsif ($path =~ m,^(.+)/[^/]+$, && ! -e "$1/CVS/Root") {                          } elsif ($path =~ m,^(.+)/[^/]+$, && ! -e "$1/CVS/Root") {
307                                  my $dir = $1;                                  my $dir = $1;
308                                  in_entries($dir) || log_system("$cvs add $dir", "cvs add of dir $dir failed");                                  in_entries($dir) || add_dir($dir, $msg);
309                                  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");
310                          } else {                          } else {
311                                  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");
312                          }                          }
313                  } elsif ($action =~ /D/) {                  } elsif ($action =~ /D/) {
314                          unlink $path || die "can't delete $path: $!";                          if (-e $path) {
315                          log_system("$cvs delete $path", "cvs delete of $path failed");                                  unlink $path || die "can't delete $path: $!";
316                                    log_system("$cvs delete '$path'", "cvs delete of $path failed");
317                            } else {
318                                    print "WARNING: $path is not present, skipping...\n";
319                                    undef $path;
320                            }
321                  } else {                  } else {
322                          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";
323                  }                  }
324    
325                  # now commit changes                  # save commits for later
326                  log_system("$cvs commit -m '$msg' $path", "cvs commit of $path failed");                  push @commit, $path if ($path);
327    
328          }          }
329    
330            my $msg = $e->{'msg'};
331            $msg =~ s/'/'\\''/g;    # quote "
332    
333            # now commit changes
334            log_system("$cvs commit -m '$msg' '".join("' '",@commit)."'", "cvs commit of ".join(",",@commit)." failed");
335    
336          commit_svnrev($rev);          commit_svnrev($rev);
337  }  }
338    
339    # cd out of $CVSREP before File::Temp::END is called
340    chdir("/tmp") || die "can't cd to /tmp: $!";
341    
342  __END__  __END__
343    
344  =pod  =pod
# Line 258  Usage example (used to self-host this sc Line 358  Usage example (used to self-host this sc
358    
359  =head1 DESCRIPTION  =head1 DESCRIPTION
360    
361  This script will allow you to commit changes made to Subversion repository also to (read-only) CVS repository manually or from Subversion's C<post-commit> hook.  This script will allows you to commit changes made to Subversion repository to
362    (read-only) CVS repository manually or from Subversion's C<post-commit> hook.
363    
364  It's using F<.svnrev> file (which will be created on first run) in  It's using F<.svnrev> file (which will be created on first run) in
365  B<CVSROOT/CVSREPOSITORY> to store last Subversion revision which was  B<CVSROOT/CVSREPOSITORY> to store last Subversion revision which was
# Line 310  again. Line 411  again.
411  "Cheap" copy operations in Subversion are not at all cheap in CVS. They will  "Cheap" copy operations in Subversion are not at all cheap in CVS. They will
412  create multiple copies of files in CVS repository!  create multiple copies of files in CVS repository!
413    
414    This script assume that you want to sync your C<trunk> (or any other
415    directory for that matter) directory with CVS, not root of your subversion.
416    This might be considered bug, but since common practise is to have
417    directories C<trunk> and C<branches> in svn and source code in them, it's
418    not serious limitation.
419    
420  =head1 RELATED PROJECTS  =head1 RELATED PROJECTS
421    
422  B<Subversion> L<http://subversion.tigris.org/> version control system that is a  B<Subversion> L<http://subversion.tigris.org/> version control system that is a
# Line 319  B<cvs2svn> L<http://cvs2svn.tigris.org/> Line 426  B<cvs2svn> L<http://cvs2svn.tigris.org/>
426  Subversion repository. It is designed for one-time conversions, not for  Subversion repository. It is designed for one-time conversions, not for
427  repeated synchronizations between CVS and Subversion.  repeated synchronizations between CVS and Subversion.
428    
429    =head1 CHANGES
430    
431    Versions of this utility are actually Subversion repository revisions,
432    so they might not be in sequence.
433    
434    =over 3
435    
436    =item r10
437    
438    First release available to public
439    
440    =item r15
441    
442    Addition of comprehensive documentation, fixes for quoting in commit
443    messages, and support for skipping changes which are not under current
444    Subversion checkout root (e.g. branches).
445    
446    =item r18
447    
448    Support for importing your svn into empty CVS repository (it will first
449    create module and than dump all revisions).
450    Group commit operations to save round-trips to CVS server.
451    Documentation improvements and other small fixes.
452    
453    =item r20
454    
455    Fixed path deduction (overlap between Subversion reporistory and CVS checkout).
456    
457    =item r21
458    
459    Use C<update -d> instead of checkout after import.
460    Added fixes by Paul Egan <paulegan@mail.com> for XMLin and fixing working
461    directory.
462    
463    =item r22
464    
465    Rewritten import from revision 0 to empty repository, better importing
466    of deep directory structures, initial support for recovery from partial
467    commit.
468    
469    =back
470    
471  =head1 AUTHOR  =head1 AUTHOR
472    
473  Dobrica Pavlinusic <dpavlin@rot13.org>  Dobrica Pavlinusic <dpavlin@rot13.org>
Legend:
Removed from v.15  
changed lines
  Added in v.30
  ViewVC Help
Powered by ViewVC 1.1.26