git-svn: convert 'init' to use Git::SVN
While we're at it, fix up some bugs in Git::SVN. Signed-off-by: Eric Wong <normalperson@yhbt.net>
Eric Wong committed
Jan 11, 2007 at 12:26 UTC
d2866f9e1fbe24d9ac9e24501a9be07c3c189d34
1 file changed
+18
-20
git-svn.perl
+18
-20
@@ -111,7 +111,7 @@ my %cmt_opts = ( 'edit|e' => \$_edit,
111
my %cmd = (
112
fetch => [ \&cmd_fetch, "Download new revisions from SVN",
113
{ 'revision|r=s' => \$_revision, %fc_opts } ],
114
- init => [ \&init, "Initialize a repo for tracking" .
114
+ init => [ \&cmd_init, "Initialize a repo for tracking" .
115
" (requires URL argument)",
116
\%init_opts ],
117
dcommit => [ \&dcommit, 'Commit several diffs to merge with upstream',
@@ -278,27 +278,24 @@ sub rebuild {
278
command_close_pipe($rev_list, $ctx);
279
}
280
281
-sub init {
281
+sub cmd_init {
282
my $url = shift or die "SVN repository location required " .
283
"as a command-line argument\n";
284
- $url =~ s!/+$!!; # strip trailing slash
285
-
284
if (my $repo_path = shift) {
285
unless (-d $repo_path) {
286
mkpath([$repo_path]);
287
}
290
- $GIT_DIR = $ENV{GIT_DIR} = $repo_path . "/.git";
291
- init_vars();
288
+ chdir $repo_path or croak $!;
289
+ $ENV{GIT_DIR} = $repo_path . "/.git";
290
}
291
294
- $SVN_URL = $url;
295
- unless (-d $GIT_DIR) {
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
}
301
- setup_git_svn();
298
+ Git::SVN->init(undef, $url);
299
}
300
301
sub cmd_fetch {
@@ -596,7 +593,7 @@ sub multi_init {
593
print "GIT_SVN_ID set to 'trunk' for ",
594
"$trunk_url ($_trunk)\n";
595
}
599
- init($trunk_url);
596
+ cmd_init($trunk_url);
597
command_noisy('config', 'svn.trunk', $trunk_url);
598
}
599
}
@@ -917,7 +914,7 @@ sub complete_url_ls_init {
914
init_vars();
915
unless (-d $GIT_SVN_DIR) {
916
print "init $u => $id\n";
920
- init($u);
917
+ cmd_init($u);
918
}
919
}
920
exit 0;
@@ -1582,6 +1579,7 @@ sub find_rev_before {
1579
1580
sub init_vars {
1581
$GIT_SVN ||= $ENV{GIT_SVN_ID} || 'git-svn';
1582
+ $Git::SVN::default = $GIT_SVN;
1583
$GIT_SVN_DIR = "$GIT_DIR/svn/$GIT_SVN";
1584
$REVDB = "$GIT_SVN_DIR/.rev_db";
1585
$GIT_SVN_INDEX = "$GIT_SVN_DIR/index";
@@ -1932,7 +1930,7 @@ sub init {
1930
mkpath(["$self->{dir}/info"]);
1931
if (defined $url) {
1932
$url =~ s!/+$!!; # strip trailing slash
1935
- s_to_file($url, "$self->{dir}/info/url");
1933
+ ::s_to_file($url, "$self->{dir}/info/url");
1934
}
1935
$self->{url} = $url;
1936
open my $fh, '>>', $self->{db_path} or croak $!;
@@ -1943,7 +1941,7 @@ sub init {
1941
sub new {
1942
my ($class, $id) = @_;
1943
my $self = _new($class, $id);
1946
- $self->{url} = file_to_s("$self->{dir}/info/url");
1944
+ $self->{url} = ::file_to_s("$self->{dir}/info/url");
1945
$self;
1946
}
1947
@@ -1995,9 +1993,9 @@ sub last_rev_commit {
1993
if (defined $self->{last_rev} && defined $self->{last_commit}) {
1994
return ($self->{last_rev}, $self->{last_commit});
1995
}
1998
- my $c = verify_ref($self->refname.'^0');
1996
+ my $c = ::verify_ref($self->refname.'^0');
1997
if (defined $c && length $c) {
2000
- my $rev = (cmt_metadata($c))[1];
1998
+ my $rev = (::cmt_metadata($c))[1];
1999
if (defined $rev) {
2000
($self->{last_rev}, $self->{last_commit}) = ($rev, $c);
2001
return ($rev, $c);
@@ -2090,7 +2088,7 @@ sub get_commit_parents {
2088
push @tmp, $p if $p =~ /^$::sha1_short$/o;
2089
}
2090
}
2093
- if (my $cur = verify_ref($self->refname.'^0')) {
2091
+ if (my $cur = ::verify_ref($self->refname.'^0')) {
2092
push @tmp, $cur;
2093
}
2094
push @tmp, $_ foreach (@{$log_msg->{parents}}, @tmp);
@@ -2115,10 +2113,10 @@ sub check_upgrade_needed {
2113
open my $fh, '>>', $self->{db_path} or croak $!;
2114
close $fh;
2115
}
2118
- return unless verify_ref($self->{id}.'-HEAD^0');
2119
- my $head = verify_ref($self->refname.'^0');
2116
+ return unless ::verify_ref($self->{id}.'-HEAD^0');
2117
+ my $head = ::verify_ref($self->refname.'^0');
2118
if ($@ || !$head) {
2121
- fatal("Please run: $0 rebuild --upgrade\n");
2119
+ ::fatal("Please run: $0 rebuild --upgrade\n");
2120
}
2121
}
2122
@@ -2128,7 +2126,7 @@ sub do_git_commit {
2126
croak "$log_msg->{revision} = $c already exists! ",
2127
"Why are we refetching it?\n";
2128
}
2131
- my ($name, $email) = author_name_email($log_msg->{author}, $self->ra);
2129
+ my ($name, $email) = ::author_name_email($log_msg->{author}, $self->ra);
2130
$ENV{GIT_AUTHOR_NAME} = $ENV{GIT_COMMITTER_NAME} = $name;
2131
$ENV{GIT_AUTHOR_EMAIL} = $ENV{GIT_COMMITTER_EMAIL} = $email;
2132
$ENV{GIT_AUTHOR_DATE} = $ENV{GIT_COMMITTER_DATE} = $log_msg->{date};