@matheusbsbs / matheus-bagliano / commits / 8164b6525e
Fork 0

git-svn: convert multi-init over to using Git::SVN

Signed-off-by: Eric Wong <normalperson@yhbt.net>

Eric Wong committed Jan 11, 2007 at 15:35 UTC 8164b6525ef6d95d4b656a8f4226f1758a611989
1 file changed +31 -41
git-svn.perl
+31 -41
@@ -133,7 +133,7 @@ my %cmd = (
133 'branch-all-refs|B' => \$_branch_all_refs,
134 'no-default-regex' => \$_no_default_regex,
135 'no-graft-copy' => \$_no_graft_copy } ],
136 - 'multi-init' => [ \&multi_init,
136 + 'multi-init' => [ \&cmd_multi_init,
137 'Initialize multiple trees (like git-svnimport)',
138 { %multi_opts, %init_opts,
139 'revision|r=i' => \$_revision,
@@ -278,6 +278,15 @@ sub rebuild {
278 command_close_pipe($rev_list, $ctx);
279 }
280
281 +sub do_git_init_db {
282 + unless (-d $ENV{GIT_DIR}) {
283 + my @init_db = ('init');
284 + push @init_db, "--template=$_template" if defined $_template;
285 + push @init_db, "--shared" if defined $_shared;
286 + command_noisy(@init_db);
287 + }
288 +}
289 +
290 sub cmd_init {
291 my $url = shift or die "SVN repository location required " .
292 "as a command-line argument\n";
@@ -288,13 +297,8 @@ sub cmd_init {
297 chdir $repo_path or croak $!;
298 $ENV{GIT_DIR} = $repo_path . "/.git";
299 }
300 + do_git_init_db();
301
292 - unless (-d $ENV{GIT_DIR}) {
293 - my @init_db = ('init');
294 - push @init_db, "--template=$_template" if defined $_template;
295 - push @init_db, "--shared" if defined $_shared;
296 - command_noisy(@init_db);
297 - }
302 Git::SVN->init(undef, $url);
303 }
304
@@ -575,29 +579,22 @@ sub graft_branches {
579 unlink "$gr_file~$gr_sha1" if $gr_sha1;
580 }
581
578 -sub multi_init {
582 +sub cmd_multi_init {
583 my $url = shift;
584 unless (defined $_trunk || defined $_branches || defined $_tags) {
585 usage(1);
586 }
587 + do_git_init_db();
588 + $_prefix = '' unless defined $_prefix;
589 if (defined $_trunk) {
584 - my $trunk_url = complete_svn_url($url, $_trunk);
585 - my $ch_id;
586 - if ($GIT_SVN eq 'git-svn') {
587 - $ch_id = 1;
588 - $GIT_SVN = $ENV{GIT_SVN_ID} = 'trunk';
589 - }
590 - init_vars();
591 - unless (-d $GIT_SVN_DIR) {
592 - if ($ch_id) {
593 - print "GIT_SVN_ID set to 'trunk' for ",
594 - "$trunk_url ($_trunk)\n";
595 - }
596 - cmd_init($trunk_url);
590 + my $gs_trunk = eval { Git::SVN->new($_prefix . 'trunk') };
591 + unless ($gs_trunk) {
592 + my $trunk_url = complete_svn_url($url, $_trunk);
593 + $gs_trunk = Git::SVN->init($_prefix . 'trunk',
594 + $trunk_url);
595 command_noisy('config', 'svn.trunk', $trunk_url);
596 }
597 }
600 - $_prefix = '' unless defined $_prefix;
598 complete_url_ls_init($url, $_branches, '--branches/-b', $_prefix);
599 complete_url_ls_init($url, $_tags, '--tags/-t', $_prefix . 'tags/');
600 }
@@ -900,27 +897,20 @@ sub complete_url_ls_init {
897 }
898 my $full_url = complete_svn_url($url, $path);
899 my @ls = libsvn_ls_fullurl($full_url);
903 - defined(my $pid = fork) or croak $!;
904 - if (!$pid) {
905 - foreach my $u (map { "$full_url/$_" } (grep m!/$!, @ls)) {
906 - $u =~ s#/+$##;
907 - if ($u !~ m!\Q$full_url\E/(.+)$!) {
908 - print STDERR "W: Unrecognized URL: $u\n";
909 - die "This should never happen\n";
910 - }
911 - # don't try to init already existing refs
912 - my $id = $pfx.$1;
913 - $GIT_SVN = $ENV{GIT_SVN_ID} = $id;
914 - init_vars();
915 - unless (-d $GIT_SVN_DIR) {
916 - print "init $u => $id\n";
917 - cmd_init($u);
918 - }
900 + foreach my $u (map { "$full_url/$_" } (grep m!/$!, @ls)) {
901 + $u =~ s#/+$##;
902 + if ($u !~ m!\Q$full_url\E/(.+)$!) {
903 + print STDERR "W: Unrecognized URL: $u\n";
904 + die "This should never happen\n";
905 + }
906 + # don't try to init already existing refs
907 + my $id = $pfx.$1;
908 + my $gs = eval { Git::SVN->new($id) };
909 + unless ($gs) {
910 + print "init $u => $id\n";
911 + Git::SVN->init($id, $u);
912 }
920 - exit 0;
913 }
922 - waitpid $pid, 0;
923 - croak $? if $?;
914 my ($n) = ($switch =~ /^--(\w+)/);
915 command_noisy('config', "svn.$n", $full_url);
916 }