@matheusbsbs / matheus-bagliano / commits / 4a91b796e3
Fork 0

svn import: remove some CVS cruft

Some remains of CVS still lingered. Removed. Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>

Matthias Urlichs committed Oct 11, 2005 at 17:02 UTC 4a91b796e3f48ad01d06cce46df28321b7a1500b
1 file changed +4 -35
git-svnimport.perl
+4 -35
@@ -5,8 +5,7 @@
5 #
6 # The basic idea is to pull and analyze SVN changes.
7 #
8 -# Checking out the files is done by a single long-running CVS connection
9 -# / server process.
8 +# Checking out the files is done by a single long-running SVN connection.
9 #
10 # The head revision is on branch "origin" by default.
11 # You can change that with the '-o' option.
@@ -50,7 +49,7 @@ my $tag_name = $opt_t || "tags";
49 my $trunk_name = $opt_T || "trunk";
50 my $branch_name = $opt_b || "branches";
51
53 -@ARGV <= 1 or usage();
52 +@ARGV == 1 or usage();
53
54 $opt_o ||= "origin";
55 $opt_s ||= 1;
@@ -58,18 +57,7 @@ $opt_l = 100 unless defined $opt_l;
57 my $git_tree = $opt_C;
58 $git_tree ||= ".";
59
61 -my $cvs_tree;
62 -if ($#ARGV == 0) {
63 - $cvs_tree = $ARGV[0];
64 -} elsif (-f 'CVS/Repository') {
65 - open my $f, '<', 'CVS/Repository' or
66 - die 'Failed to open CVS/Repository';
67 - $cvs_tree = <$f>;
68 - chomp $cvs_tree;
69 - close $f;
70 -} else {
71 - usage();
72 -}
60 +my $svn_url = $ARGV[0];
61
62 our @mergerx = ();
63 if ($opt_m) {
@@ -140,7 +128,7 @@ sub file {
128
129 package main;
130
143 -my $svn = SVNconn->new($cvs_tree);
131 +my $svn = SVNconn->new($svn_url);
132
133
134 sub pdate($) {
@@ -255,25 +243,6 @@ EOM
243
244 open BRANCHES,">>", "$git_dir/svn2git";
245
258 -
259 -## cvsps output:
260 -#---------------------
261 -#PatchSet 314
262 -#Date: 1999/09/18 13:03:59
263 -#Author: wkoch
264 -#Branch: STABLE-BRANCH-1-0
265 -#Ancestor branch: HEAD
266 -#Tag: (none)
267 -#Log:
268 -# See ChangeLog: Sat Sep 18 13:03:28 CEST 1999 Werner Koch
269 -#Members:
270 -# README:1.57->1.57.2.1
271 -# VERSION:1.96->1.96.2.1
272 -#
273 -#---------------------
274 -
275 -my $state = 0;
276 -
246 sub get_file($$$) {
247 my($rev,$branch,$path) = @_;
248