30
my ($_revision,$_stdin,$_no_ignore_ext,$_no_stop_copy,$_help,$_rmdir,$_edit,
31
$_find_copies_harder, $_l, $_version, $_upgrade, $_authors);
32
my (@_branch_from, %tree_map, %users);
33
+my $_svn_co_url_revs;
34
35
my %fc_opts = ( 'no-ignore-externals' => \$_no_ignore_ext,
36
'branch|b=s' => \@_branch_from,
78
version() if $_version;
79
usage(1) unless defined $cmd;
80
load_authors() if $_authors;
80
-svn_check_ignore_externals();
81
+svn_compat_check();
82
$cmd{$cmd}->[0]->(@ARGV);
83
exit 0;
84
163
croak "SVN repository location required: $url\n";
164
}
165
$SVN_URL ||= $url;
165
- $SVN_UUID ||= setup_git_svn();
166
+ $SVN_UUID ||= $uuid;
167
+ setup_git_svn();
168
$latest = $rev;
169
}
170
assert_revision_eq_or_unknown($rev, $c);
173
}
174
close $rev_list or croak $?;
175
if (!chdir $SVN_WC) {
174
- my @svn_co = ('svn','co',"-r$latest");
175
- push @svn_co, '--ignore-externals' unless $_no_ignore_ext;
176
- sys(@svn_co, $SVN_URL, $SVN_WC);
176
+ svn_cmd_checkout($SVN_URL, $latest, $SVN_WC);
177
chdir $SVN_WC or croak $!;
178
}
179
222
my $base = shift @$svn_log or croak "No base revision!\n";
223
my $last_commit = undef;
224
unless (-d $SVN_WC) {
225
- my @svn_co = ('svn','co',"-r$base->{revision}");
226
- push @svn_co,'--ignore-externals' unless $_no_ignore_ext;
227
- sys(@svn_co, $SVN_URL, $SVN_WC);
225
+ svn_cmd_checkout($SVN_URL,$base->{revision},$SVN_WC);
226
chdir $SVN_WC or croak $!;
227
+ read_uuid();
228
$last_commit = git_commit($base, @parents);
229
assert_svn_wc_clean($base->{revision}, $last_commit);
230
} else {
231
chdir $SVN_WC or croak $!;
232
+ read_uuid();
233
$last_commit = file_to_s("$REV_DIR/$base->{revision}");
234
}
235
my @svn_up = qw(svn up);
275
276
fetch();
277
chdir $SVN_WC or croak $!;
278
- my $svn_current_rev = svn_info('.')->{'Last Changed Rev'};
278
+ my $info = svn_info('.');
279
+ read_uuid($info);
280
+ my $svn_current_rev = $info->{'Last Changed Rev'};
281
foreach my $c (@revs) {
282
my $mods = svn_checkout_tree($svn_current_rev, $c);
283
if (scalar @$mods == 0) {
316
317
########################### utility functions #########################
318
319
+sub read_uuid {
320
+ return if $SVN_UUID;
321
+ my $info = shift || svn_info('.');
322
+ $SVN_UUID = $info->{'Repository UUID'} or
323
+ croak "Repository UUID unreadable\n";
324
+ s_to_file($SVN_UUID,"$GIT_DIR/$GIT_SVN/info/uuid");
325
+}
326
+
327
sub setup_git_svn {
328
defined $SVN_URL or croak "SVN repository location required\n";
329
unless (-d $GIT_DIR) {
333
mkpath(["$GIT_DIR/$GIT_SVN/info"]);
334
mkpath([$REV_DIR]);
335
s_to_file($SVN_URL,"$GIT_DIR/$GIT_SVN/info/url");
326
- $SVN_UUID = svn_info($SVN_URL)->{'Repository UUID'} or
327
- croak "Repository UUID unreadable\n";
328
- s_to_file($SVN_UUID,"$GIT_DIR/$GIT_SVN/info/uuid");
336
337
open my $fd, '>>', "$GIT_DIR/$GIT_SVN/info/exclude" or croak $!;
338
print $fd '.svn',"\n";
339
close $fd or croak $!;
333
- return $SVN_UUID;
340
}
341
342
sub assert_svn_wc_clean {
866
my ($log_msg, @parents) = @_;
867
assert_revision_unknown($log_msg->{revision});
868
my $out_fh = IO::File->new_tmpfile or croak $!;
863
- $SVN_UUID ||= svn_info('.')->{'Repository UUID'};
869
870
map_tree_joins() if (@_branch_from && !%tree_map);
871
927
}
928
my @update_ref = ('git-update-ref',"refs/remotes/$GIT_SVN",$commit);
929
if (my $primary_parent = shift @exec_parents) {
925
- push @update_ref, $primary_parent;
930
+ $pid = fork;
931
+ defined $pid or croak $!;
932
+ if (!$pid) {
933
+ close STDERR;
934
+ close STDOUT;
935
+ exec 'git-rev-parse','--verify',
936
+ "refs/remotes/$GIT_SVN^0";
937
+ }
938
+ waitpid $pid, 0;
939
+ push @update_ref, $primary_parent unless $?;
940
}
941
sys(@update_ref);
942
sys('git-update-ref',"$GIT_SVN/revs/$log_msg->{revision}",$commit);
1009
return wantarray ? @ret : join('',@ret);
1010
}
1011
998
-sub svn_check_ignore_externals {
999
- return if $_no_ignore_ext;
1000
- unless (grep /ignore-externals/,(safe_qx(qw(svn co -h)))) {
1012
+sub svn_compat_check {
1013
+ my @co_help = safe_qx(qw(svn co -h));
1014
+ unless (grep /ignore-externals/,@co_help) {
1015
print STDERR "W: Installed svn version does not support ",
1016
"--ignore-externals\n";
1017
$_no_ignore_ext = 1;
1018
}
1019
+ if (grep /usage: checkout URL\[\@REV\]/,@co_help) {
1020
+ $_svn_co_url_revs = 1;
1021
+ }
1022
+}
1023
+
1024
+# *sigh*, new versions of svn won't honor -r<rev> without URL@<rev>,
1025
+# (and they won't honor URL@<rev> without -r<rev>, too!)
1026
+sub svn_cmd_checkout {
1027
+ my ($url, $rev, $dir) = @_;
1028
+ my @cmd = ('svn','co', "-r$rev");
1029
+ push @cmd, '--ignore-externals' unless $_no_ignore_ext;
1030
+ $url .= "\@$rev" if $_svn_co_url_revs;
1031
+ sys(@cmd, $url, $dir);
1032
}
1033
1034
sub check_upgrade_needed {