@matheusbsbs / matheus-bagliano / commits / 883d0a78d2
Fork 0

git-svn: Move all git-svn-related paths into $GIT_DIR/svn

Since GIT_SVN_ID usage is probably going to become more widespread <evil grin>, we won't run the chance of somebody having a GIT_SVN_ID name that conflicts with one of the default directories that already exist in $GIT_DIR (branches/tags). Signed-off-by: Eric Wong <normalperson@yhbt.net>

Eric Wong committed May 24, 2006 at 01:22 UTC 883d0a78d2a28add079f809ffb8dd077f4a766d8
2 files changed +85 -16
contrib/git-svn/git-svn.perl
+84 -15
@@ -6,7 +6,7 @@ use strict;
6 use vars qw/ $AUTHOR $VERSION
7 $SVN_URL $SVN_INFO $SVN_WC $SVN_UUID
8 $GIT_SVN_INDEX $GIT_SVN
9 - $GIT_DIR $REV_DIR/;
9 + $GIT_DIR $REV_DIR $GIT_SVN_DIR/;
10 $AUTHOR = 'Eric Wong <normalperson@yhbt.net>';
11 $VERSION = '1.1.0-pre';
12
@@ -37,6 +37,7 @@ my ($_revision,$_stdin,$_no_ignore_ext,$_no_stop_copy,$_help,$_rmdir,$_edit,
37 $_version, $_upgrade, $_authors, $_branch_all_refs);
38 my (@_branch_from, %tree_map, %users);
39 my ($_svn_co_url_revs, $_svn_pg_peg_revs);
40 +my @repo_path_split_cache;
41
42 my %fc_opts = ( 'no-ignore-externals' => \$_no_ignore_ext,
43 'branch|b=s' => \@_branch_from,
@@ -100,10 +101,11 @@ GetOptions(%opts, 'help|H|h' => \$_help,
101 'id|i=s' => \$GIT_SVN) or exit 1;
102
103 $GIT_SVN ||= $ENV{GIT_SVN_ID} || 'git-svn';
103 -$GIT_SVN_INDEX = "$GIT_DIR/$GIT_SVN/index";
104 +$GIT_SVN_DIR = "$GIT_DIR/svn/$GIT_SVN";
105 +$GIT_SVN_INDEX = "$GIT_SVN_DIR/index";
106 $SVN_URL = undef;
105 -$REV_DIR = "$GIT_DIR/$GIT_SVN/revs";
106 -$SVN_WC = "$GIT_DIR/$GIT_SVN/tree";
107 +$REV_DIR = "$GIT_SVN_DIR/revs";
108 +$SVN_WC = "$GIT_SVN_DIR/tree";
109
110 usage(0) if $_help;
111 version() if $_version;
@@ -111,6 +113,7 @@ usage(1) unless defined $cmd;
113 load_authors() if $_authors;
114 load_all_refs() if $_branch_all_refs;
115 svn_compat_check();
116 +migration_check() unless $cmd eq 'init';
117 $cmd{$cmd}->[0]->(@ARGV);
118 exit 0;
119
@@ -200,7 +203,7 @@ sub rebuild {
203 $latest = $rev;
204 }
205 assert_revision_eq_or_unknown($rev, $c);
203 - sys('git-update-ref',"$GIT_SVN/revs/$rev",$c);
206 + sys('git-update-ref',"svn/$GIT_SVN/revs/$rev",$c);
207 $newest_rev = $rev if ($rev > $newest_rev);
208 }
209 close $rev_list or croak $?;
@@ -241,7 +244,7 @@ sub init {
244 sub fetch {
245 my (@parents) = @_;
246 check_upgrade_needed();
244 - $SVN_URL ||= file_to_s("$GIT_DIR/$GIT_SVN/info/url");
247 + $SVN_URL ||= file_to_s("$GIT_SVN_DIR/info/url");
248 my @log_args = -d $SVN_WC ? ($SVN_WC) : ($SVN_URL);
249 unless ($_revision) {
250 $_revision = -d $SVN_WC ? 'BASE:HEAD' : '0:HEAD';
@@ -350,7 +353,7 @@ sub show_ignore {
353 chomp(my @excludes = (<$fh>));
354 close $fh or croak $!;
355
353 - $SVN_URL ||= file_to_s("$GIT_DIR/$GIT_SVN/info/url");
356 + $SVN_URL ||= file_to_s("$GIT_SVN_DIR/info/url");
357 chdir $SVN_WC or croak $!;
358 my %ign;
359 File::Find::find({wanted=>sub{if(lstat $_ && -d _ && -d "$_/.svn"){
@@ -374,7 +377,44 @@ sub read_uuid {
377 my $info = shift || svn_info('.');
378 $SVN_UUID = $info->{'Repository UUID'} or
379 croak "Repository UUID unreadable\n";
377 - s_to_file($SVN_UUID,"$GIT_DIR/$GIT_SVN/info/uuid");
380 + s_to_file($SVN_UUID,"$GIT_SVN_DIR/info/uuid");
381 +}
382 +
383 +sub quiet_run {
384 + my $pid = fork;
385 + defined $pid or croak $!;
386 + if (!$pid) {
387 + open my $null, '>', '/dev/null' or croak $!;
388 + open STDERR, '>&', $null or croak $!;
389 + open STDOUT, '>&', $null or croak $!;
390 + exec @_ or croak $!;
391 + }
392 + waitpid $pid, 0;
393 + return $?;
394 +}
395 +
396 +sub repo_path_split {
397 + my $full_url = shift;
398 + $full_url =~ s#/+$##;
399 +
400 + foreach (@repo_path_split_cache) {
401 + if ($full_url =~ s#$_##) {
402 + my $u = $1;
403 + $full_url =~ s#^/+##;
404 + return ($u, $full_url);
405 + }
406 + }
407 +
408 + my ($url, $path) = ($full_url =~ m!^([a-z\+]+://[^/]*)(.*)$!i);
409 + $path =~ s#^/+##;
410 + my @paths = split(m#/+#, $path);
411 +
412 + while (quiet_run(qw/svn ls --non-interactive/, $url)) {
413 + my $n = shift @paths || last;
414 + $url .= "/$n";
415 + }
416 + push @repo_path_split_cache, qr/^(\Q$url\E)/;
417 + return ($url, $path);
418 }
419
420 sub setup_git_svn {
@@ -382,14 +422,17 @@ sub setup_git_svn {
422 unless (-d $GIT_DIR) {
423 croak "GIT_DIR=$GIT_DIR does not exist!\n";
424 }
385 - mkpath(["$GIT_DIR/$GIT_SVN"]);
386 - mkpath(["$GIT_DIR/$GIT_SVN/info"]);
425 + mkpath([$GIT_SVN_DIR]);
426 + mkpath(["$GIT_SVN_DIR/info"]);
427 mkpath([$REV_DIR]);
388 - s_to_file($SVN_URL,"$GIT_DIR/$GIT_SVN/info/url");
428 + s_to_file($SVN_URL,"$GIT_SVN_DIR/info/url");
429
390 - open my $fd, '>>', "$GIT_DIR/$GIT_SVN/info/exclude" or croak $!;
430 + open my $fd, '>>', "$GIT_SVN_DIR/info/exclude" or croak $!;
431 print $fd '.svn',"\n";
432 close $fd or croak $!;
433 + my ($url, $path) = repo_path_split($SVN_URL);
434 + s_to_file($url, "$GIT_SVN_DIR/info/repo_url");
435 + s_to_file($path, "$GIT_SVN_DIR/info/repo_path");
436 }
437
438 sub assert_svn_wc_clean {
@@ -688,7 +731,7 @@ sub handle_rmdir {
731
732 sub svn_commit_tree {
733 my ($svn_rev, $commit) = @_;
691 - my $commit_msg = "$GIT_DIR/$GIT_SVN/.svn-commit.tmp.$$";
734 + my $commit_msg = "$GIT_SVN_DIR/.svn-commit.tmp.$$";
735 my %log_msg = ( msg => '' );
736 open my $msg, '>', $commit_msg or croak $!;
737
@@ -965,7 +1008,7 @@ sub index_changes {
1008 'remove',
1009 $no_text_base);
1010 do_update_index([qw/git-ls-files -z --others/,
968 - "--exclude-from=$GIT_DIR/$GIT_SVN/info/exclude"],
1011 + "--exclude-from=$GIT_SVN_DIR/info/exclude"],
1012 'add',
1013 $no_text_base);
1014 }
@@ -1097,7 +1140,7 @@ sub git_commit {
1140 push @update_ref, $primary_parent unless $?;
1141 }
1142 sys(@update_ref);
1100 - sys('git-update-ref',"$GIT_SVN/revs/$log_msg->{revision}",$commit);
1143 + sys('git-update-ref',"svn/$GIT_SVN/revs/$log_msg->{revision}",$commit);
1144 print "r$log_msg->{revision} = $commit\n";
1145 return $commit;
1146 }
@@ -1283,6 +1326,32 @@ sub svn_propget_base {
1326 return safe_qx(qw/svn propget/, $p, $f);
1327 }
1328
1329 +sub migration_check {
1330 + return if (-d "$GIT_DIR/svn" || !-d $GIT_DIR);
1331 + print "Upgrading repository...\n";
1332 + unless (-d "$GIT_DIR/svn") {
1333 + mkdir "$GIT_DIR/svn" or croak $!;
1334 + }
1335 + print "Data from a previous version of git-svn exists, but\n\t",
1336 + "$GIT_SVN_DIR\n\t(required for this version ",
1337 + "($VERSION) of git-svn) does not.\n";
1338 +
1339 + foreach my $x (`git-rev-parse --symbolic --all`) {
1340 + next unless $x =~ s#^refs/remotes/##;
1341 + chomp $x;
1342 + next unless -f "$GIT_DIR/$x/info/url";
1343 + my $u = eval { file_to_s("$GIT_DIR/$x/info/url") };
1344 + next unless $u;
1345 + my $dn = dirname("$GIT_DIR/svn/$x");
1346 + mkpath([$dn]) unless -d $dn;
1347 + rename "$GIT_DIR/$x", "$GIT_DIR/svn/$x" or croak "$!: $x";
1348 + my ($url, $path) = repo_path_split($u);
1349 + s_to_file($url, "$GIT_DIR/svn/$x/info/repo_url");
1350 + s_to_file($path, "$GIT_DIR/svn/$x/info/repo_path");
1351 + }
1352 + print "Done upgrading.\n";
1353 +}
1354 +
1355 __END__
1356
1357 Data structures:
contrib/git-svn/t/lib-git-svn.sh
+1 -1
@@ -10,7 +10,7 @@ fi
10 . ./test-lib.sh
11
12 GIT_DIR=$PWD/.git
13 -GIT_SVN_DIR=$GIT_DIR/git-svn
13 +GIT_SVN_DIR=$GIT_DIR/svn/git-svn
14 SVN_TREE=$GIT_SVN_DIR/tree
15
16 svnadmin >/dev/null 2>&1