git-svn: Ignore usernames in URLs in find_by_url
[git/git.git] / git-svn.perl
CommitLineData
3397f9df 1#!/usr/bin/env perl
551ce28f
EW
2# Copyright (C) 2006, Eric Wong <normalperson@yhbt.net>
3# License: GPL v2 or later
3397f9df
EW
4use warnings;
5use strict;
6use vars qw/ $AUTHOR $VERSION
9760adcc
EW
7 $sha1 $sha1_short $_revision
8 $_q $_authors %users/;
3397f9df 9$AUTHOR = 'Eric Wong <normalperson@yhbt.net>';
60d02ccc 10$VERSION = '@@GIT_VERSION@@';
13ccd6d4 11
5253dc33 12my $git_dir_user_set = 1 if defined $ENV{GIT_DIR};
706587fc 13$ENV{GIT_DIR} ||= '.git';
9fa00b65 14$Git::SVN::default_repo_id = 'svn';
8b8fc068 15$Git::SVN::default_ref_id = $ENV{GIT_SVN_ID} || 'git-svn';
6af1db44 16$Git::SVN::Ra::_log_window_size = 100;
13ccd6d4 17
f8c9d1d2 18$Git::SVN::Log::TZ = $ENV{TZ};
3397f9df 19$ENV{TZ} = 'UTC';
a00439ac 20$| = 1; # unbuffer STDOUT
3397f9df 21
6fda05ae 22sub fatal (@) { print STDERR @_; exit 1 }
b9c85187
EW
23require SVN::Core; # use()-ing this causes segfaults for me... *shrug*
24require SVN::Ra;
25require SVN::Delta;
26if ($SVN::Core::VERSION lt '1.1.0') {
27 fatal "Need SVN::Core 1.1.0 or better (got $SVN::Core::VERSION)\n";
28}
d81bf827 29push @Git::SVN::Ra::ISA, 'SVN::Ra';
b9c85187
EW
30push @SVN::Git::Editor::ISA, 'SVN::Delta::Editor';
31push @SVN::Git::Fetcher::ISA, 'SVN::Delta::Editor';
3397f9df
EW
32use Carp qw/croak/;
33use IO::File qw//;
34use File::Basename qw/dirname basename/;
35use File::Path qw/mkpath/;
512b620b 36use Getopt::Long qw/:config gnu_getopt no_ignore_case auto_abbrev/;
968bdf1f 37use IPC::Open3;
336f1714 38use Git;
a5e0cedc 39
336f1714
EW
40BEGIN {
41 my $s;
42 foreach (qw/command command_oneline command_noisy command_output_pipe
43 command_input_pipe command_close_pipe/) {
44 $s .= "*SVN::Git::Editor::$_ = *SVN::Git::Fetcher::$_ = ".
706587fc 45 "*Git::SVN::Migration::$_ = ".
f8c9d1d2 46 "*Git::SVN::Log::$_ = *Git::SVN::$_ = *$_ = *Git::$_; ";
336f1714
EW
47 }
48 eval $s;
49}
50
b9c85187 51my ($SVN);
83e9940a 52
f8c9d1d2
EW
53$sha1 = qr/[a-f\d]{40}/;
54$sha1_short = qr/[a-f\d]{4,40}/;
44320b9e 55my ($_stdin, $_help, $_edit,
9760adcc 56 $_message, $_file,
d05d72e0 57 $_template, $_shared,
e98671e5 58 $_version, $_fetch_all,
dee41f3e 59 $_merge, $_strategy, $_dry_run, $_local,
905f8b7d 60 $_prefix, $_no_checkout, $_verbose);
0bed5eaa 61$Git::SVN::_follow_parent = 1;
706587fc
EW
62my %remote_opts = ( 'username=s' => \$Git::SVN::Prompt::_username,
63 'config-dir=s' => \$Git::SVN::Ra::config_dir,
64 'no-auth-cache' => \$Git::SVN::Prompt::_no_auth_cache );
0bed5eaa 65my %fc_opts = ( 'follow-parent|follow!' => \$Git::SVN::_follow_parent,
dc5869c0 66 'authors-file|A=s' => \$_authors,
ecc712dd 67 'repack:i' => \$Git::SVN::_repack,
97ae0911
EW
68 'noMetadata' => \$Git::SVN::_no_metadata,
69 'useSvmProps' => \$Git::SVN::_use_svm_props,
62e349d2 70 'useSvnsyncProps' => \$Git::SVN::_use_svnsync_props,
6af1db44 71 'log-window-size=i' => \$Git::SVN::Ra::_log_window_size,
1e889ef3 72 'no-checkout' => \$_no_checkout,
80f50749 73 'quiet|q' => \$_q,
ecc712dd
EW
74 'repack-flags|repack-args|repack-opts=s' =>
75 \$Git::SVN::_repack_flags,
706587fc 76 %remote_opts );
36f5b1f0 77
9d55b41a 78my ($_trunk, $_tags, $_branches);
0dfaf0a4 79my %icv;
dadc6d2a
EW
80my %init_opts = ( 'template=s' => \$_template, 'shared:s' => \$_shared,
81 'trunk|T=s' => \$_trunk, 'tags|t=s' => \$_tags,
82 'branches|b=s' => \$_branches, 'prefix=s' => \$_prefix,
0dfaf0a4
EW
83 'no-metadata' => sub { $icv{noMetadata} = 1 },
84 'use-svm-props' => sub { $icv{useSvmProps} = 1 },
85 'use-svnsync-props' => sub { $icv{useSvnsyncProps} = 1 },
86 'rewrite-root=s' => sub { $icv{rewriteRoot} = $_[1] },
dadc6d2a 87 %remote_opts );
27e9fb8d 88my %cmt_opts = ( 'edit|e' => \$_edit,
24e22aa8
EW
89 'rmdir' => \$SVN::Git::Editor::_rmdir,
90 'find-copies-harder' => \$SVN::Git::Editor::_find_copies_harder,
91 'l=i' => \$SVN::Git::Editor::_rename_limit,
92 'copy-similarity|C=i'=> \$SVN::Git::Editor::_cp_similarity
27e9fb8d 93);
9d55b41a 94
3397f9df 95my %cmd = (
2a3240be 96 fetch => [ \&cmd_fetch, "Download new revisions from SVN",
e98671e5 97 { 'revision|r=s' => \$_revision,
905f8b7d 98 'fetch-all|all' => \$_fetch_all,
e98671e5 99 %fc_opts } ],
0425ea90
EW
100 clone => [ \&cmd_clone, "Initialize and fetch revisions",
101 { 'revision|r=s' => \$_revision,
102 %fc_opts, %init_opts } ],
d2866f9e 103 init => [ \&cmd_init, "Initialize a repo for tracking" .
f8ab6b73 104 " (requires URL argument)",
9d55b41a 105 \%init_opts ],
dadc6d2a
EW
106 'multi-init' => [ \&cmd_multi_init,
107 "Deprecated alias for ".
108 "'$0 init -T<trunk> -b<branches> -t<tags>'",
109 \%init_opts ],
d7ad3bed
EW
110 dcommit => [ \&cmd_dcommit,
111 'Commit several diffs to merge with upstream',
3289e86e
EW
112 { 'merge|m|M' => \$_merge,
113 'strategy|s=s' => \$_strategy,
905f8b7d 114 'verbose|v' => \$_verbose,
3289e86e 115 'dry-run|n' => \$_dry_run,
905f8b7d 116 'fetch-all|all' => \$_fetch_all,
4b155223 117 %cmt_opts, %fc_opts } ],
1ce255dc
EW
118 'set-tree' => [ \&cmd_set_tree,
119 "Set an SVN repository to a git tree-ish",
120 { 'stdin|' => \$_stdin, %cmt_opts, %fc_opts, } ],
5969cbe1 121 'show-ignore' => [ \&cmd_show_ignore, "Show svn:ignore listings",
a5e0cedc 122 { 'revision|r=i' => \$_revision } ],
1c8443b0 123 'multi-fetch' => [ \&cmd_multi_fetch,
e98671e5
EW
124 "Deprecated alias for $0 fetch --all",
125 { 'revision|r=s' => \$_revision, %fc_opts } ],
706587fc
EW
126 'migrate' => [ sub { },
127 # no-op, we automatically run this anyways,
706587fc
EW
128 'Migrate configuration/metadata/layout from
129 previous versions of git-svn',
a836a0e1
EW
130 { 'minimize' => \$Git::SVN::Migration::_minimize,
131 %remote_opts } ],
f8c9d1d2
EW
132 'log' => [ \&Git::SVN::Log::cmd_show_log, 'Show commit logs',
133 { 'limit=i' => \$Git::SVN::Log::limit,
79bb8d88 134 'revision|r=s' => \$_revision,
f8c9d1d2
EW
135 'verbose|v' => \$Git::SVN::Log::verbose,
136 'incremental' => \$Git::SVN::Log::incremental,
137 'oneline' => \$Git::SVN::Log::oneline,
138 'show-commit' => \$Git::SVN::Log::show_commit,
139 'non-recursive' => \$Git::SVN::Log::non_recursive,
79bb8d88 140 'authors-file|A=s' => \$_authors,
f8c9d1d2
EW
141 'color' => \$Git::SVN::Log::color,
142 'pager=s' => \$Git::SVN::Log::pager,
79bb8d88 143 } ],
905f8b7d
EW
144 'rebase' => [ \&cmd_rebase, "Fetch and rebase your working directory",
145 { 'merge|m|M' => \$_merge,
146 'verbose|v' => \$_verbose,
147 'strategy|s=s' => \$_strategy,
dee41f3e 148 'local|l' => \$_local,
905f8b7d
EW
149 'fetch-all|all' => \$_fetch_all,
150 %fc_opts } ],
44320b9e
EW
151 'commit-diff' => [ \&cmd_commit_diff,
152 'Commit a diff between two trees',
27e9fb8d
EW
153 { 'message|m=s' => \$_message,
154 'file|F=s' => \$_file,
45bf473a 155 'revision|r=s' => \$_revision,
27e9fb8d 156 %cmt_opts } ],
3397f9df 157);
9d55b41a 158
3397f9df
EW
159my $cmd;
160for (my $i = 0; $i < @ARGV; $i++) {
161 if (defined $cmd{$ARGV[$i]}) {
162 $cmd = $ARGV[$i];
163 splice @ARGV, $i, 1;
164 last;
165 }
166};
167
448c81b4 168my %opts = %{$cmd{$cmd}->[2]} if (defined $cmd);
a9612be2 169
b8c92cad 170read_repo_config(\%opts);
c284914a 171Getopt::Long::Configure('pass_through') if ($cmd && $cmd eq 'log');
9760adcc
EW
172my $rv = GetOptions(%opts, 'help|H|h' => \$_help, 'version|V' => \$_version,
173 'minimize-connections' => \$Git::SVN::Migration::_minimize,
174 'id|i=s' => \$Git::SVN::default_ref_id,
befc9adc
EW
175 'svn-remote|remote|R=s' => sub {
176 $Git::SVN::no_reuse_existing = 1;
177 $Git::SVN::default_repo_id = $_[1] });
c284914a 178exit 1 if (!$rv && $cmd && $cmd ne 'log');
6f0783cf 179
3397f9df 180usage(0) if $_help;
551ce28f 181version() if $_version;
eeb0abe0
EW
182usage(1) unless defined $cmd;
183load_authors() if $_authors;
5253dc33
EW
184
185# make sure we're always running
186unless ($cmd =~ /(?:clone|init|multi-init)$/) {
187 unless (-d $ENV{GIT_DIR}) {
188 if ($git_dir_user_set) {
189 die "GIT_DIR=$ENV{GIT_DIR} explicitly set, ",
190 "but it is not a directory\n";
191 }
192 my $git_dir = delete $ENV{GIT_DIR};
193 chomp(my $cdup = command_oneline(qw/rev-parse --show-cdup/));
194 unless (length $cdup) {
195 die "Already at toplevel, but $git_dir ",
196 "not found '$cdup'\n";
197 }
198 chdir $cdup or die "Unable to chdir up to '$cdup'\n";
199 unless (-d $git_dir) {
200 die "$git_dir still not found after going to ",
201 "'$cdup'\n";
202 }
203 $ENV{GIT_DIR} = $git_dir;
204 }
205}
0425ea90 206unless ($cmd =~ /^(?:clone|init|multi-init|commit-diff)$/) {
706587fc
EW
207 Git::SVN::Migration::migration_check();
208}
ecc712dd 209Git::SVN::init_vars();
b805b44a
EW
210eval {
211 Git::SVN::verify_remotes_sanity();
212 $cmd{$cmd}->[0]->(@ARGV);
213};
214fatal $@ if $@;
1e889ef3 215post_fetch_checkout();
3397f9df
EW
216exit 0;
217
218####################### primary functions ######################
219sub usage {
220 my $exit = shift || 0;
221 my $fd = $exit ? \*STDERR : \*STDOUT;
222 print $fd <<"";
223git-svn - bidirectional operations between a single Subversion tree and git
224Usage: $0 <command> [options] [arguments]\n
448c81b4
EW
225
226 print $fd "Available commands:\n" unless $cmd;
3397f9df
EW
227
228 foreach (sort keys %cmd) {
448c81b4 229 next if $cmd && $cmd ne $_;
a836a0e1 230 next if /^multi-/; # don't show deprecated commands
b203b769 231 print $fd ' ',pack('A17',$_),$cmd{$_}->[1],"\n";
448c81b4 232 foreach (keys %{$cmd{$_}->[2]}) {
512b620b
EW
233 # mixed-case options are for .git/config only
234 next if /[A-Z]/ && /^[a-z]+$/i;
448c81b4 235 # prints out arguments as they should be passed:
b8c92cad 236 my $x = s#[:=]s$## ? '<arg>' : s#[:=]i$## ? '<num>' : '';
b203b769 237 print $fd ' ' x 21, join(', ', map { length $_ > 1 ?
448c81b4
EW
238 "--$_" : "-$_" }
239 split /\|/,$_)," $x\n";
240 }
3397f9df
EW
241 }
242 print $fd <<"";
448c81b4
EW
243\nGIT_SVN_ID may be set in the environment or via the --id/-i switch to an
244arbitrary identifier if you're tracking multiple SVN branches/repositories in
245one git repository and want to keep them separate. See git-svn(1) for more
246information.
3397f9df
EW
247
248 exit $exit;
249}
250
551ce28f 251sub version {
7d60ab2c 252 print "git-svn version $VERSION (svn $SVN::Core::VERSION)\n";
551ce28f
EW
253 exit 0;
254}
255
8164b652
EW
256sub do_git_init_db {
257 unless (-d $ENV{GIT_DIR}) {
258 my @init_db = ('init');
259 push @init_db, "--template=$_template" if defined $_template;
dadc6d2a
EW
260 if (defined $_shared) {
261 if ($_shared =~ /[a-z]/) {
262 push @init_db, "--shared=$_shared";
263 } else {
264 push @init_db, "--shared";
265 }
266 }
8164b652
EW
267 command_noisy(@init_db);
268 }
0dfaf0a4
EW
269 my $set;
270 my $pfx = "svn-remote.$Git::SVN::default_repo_id";
271 foreach my $i (keys %icv) {
272 die "'$set' and '$i' cannot both be set\n" if $set;
273 next unless defined $icv{$i};
274 command_noisy('config', "$pfx.$i", $icv{$i});
275 $set = $i;
276 }
8164b652
EW
277}
278
dadc6d2a
EW
279sub init_subdir {
280 my $repo_path = shift or return;
281 mkpath([$repo_path]) unless -d $repo_path;
282 chdir $repo_path or die "Couldn't chdir to $repo_path: $!\n";
f30603fc 283 $ENV{GIT_DIR} = '.git';
dadc6d2a
EW
284}
285
0425ea90
EW
286sub cmd_clone {
287 my ($url, $path) = @_;
288 if (!defined $path &&
289 (defined $_trunk || defined $_branches || defined $_tags) &&
290 $url !~ m#^[a-z\+]+://#) {
291 $path = $url;
292 }
0425ea90 293 $path = basename($url) if !defined $path || !length $path;
f30603fc 294 cmd_init($url, $path);
0425ea90
EW
295 Git::SVN::fetch_all($Git::SVN::default_repo_id);
296}
297
d2866f9e 298sub cmd_init {
dadc6d2a
EW
299 if (defined $_trunk || defined $_branches || defined $_tags) {
300 return cmd_multi_init(@_);
03e0ea87 301 }
dadc6d2a
EW
302 my $url = shift or die "SVN repository location required ",
303 "as a command-line argument\n";
304 init_subdir(@_);
8164b652 305 do_git_init_db();
03e0ea87 306
706587fc 307 Git::SVN->init($url);
3397f9df
EW
308}
309
2a3240be 310sub cmd_fetch {
e98671e5
EW
311 if (grep /^\d+=./, @_) {
312 die "'<rev>=<commit>' fetch arguments are ",
313 "no longer supported.\n";
07a1c950 314 }
e98671e5
EW
315 my ($remote) = @_;
316 if (@_ > 1) {
905f8b7d 317 die "Usage: $0 fetch [--all] [svn-remote]\n";
e98671e5
EW
318 }
319 $remote ||= $Git::SVN::default_repo_id;
320 if ($_fetch_all) {
321 cmd_multi_fetch();
322 } else {
323 Git::SVN::fetch_all($remote, Git::SVN::read_all_remotes());
1c8443b0 324 }
2a3240be
EW
325}
326
1ce255dc 327sub cmd_set_tree {
3397f9df
EW
328 my (@commits) = @_;
329 if ($_stdin || !@commits) {
330 print "Reading from stdin...\n";
331 @commits = ();
332 while (<STDIN>) {
1ca72aef 333 if (/\b($sha1_short)\b/o) {
3397f9df
EW
334 unshift @commits, $1;
335 }
336 }
337 }
338 my @revs;
8de010ad 339 foreach my $c (@commits) {
aef4e921 340 my @tmp = command('rev-parse',$c);
8de010ad
EW
341 if (scalar @tmp == 1) {
342 push @revs, $tmp[0];
343 } elsif (scalar @tmp > 1) {
aef4e921 344 push @revs, reverse(command('rev-list',@tmp));
8de010ad 345 } else {
1ce255dc 346 fatal "Failed to rev-parse $c\n";
8de010ad 347 }
3397f9df 348 }
1ce255dc
EW
349 my $gs = Git::SVN->new;
350 my ($r_last, $cmt_last) = $gs->last_rev_commit;
351 $gs->fetch;
97f6987a 352 if (defined $gs->{last_rev} && $r_last != $gs->{last_rev}) {
1ce255dc
EW
353 fatal "There are new revisions that were fetched ",
354 "and need to be merged (or acknowledged) ",
355 "before committing.\nlast rev: $r_last\n",
356 " current: $gs->{last_rev}\n";
a5e0cedc 357 }
1ce255dc
EW
358 $gs->set_tree($_) foreach @revs;
359 print "Done committing ",scalar @revs," revisions to SVN\n";
a5e0cedc 360}
8f22562c 361
d7ad3bed
EW
362sub cmd_dcommit {
363 my $head = shift;
d7ad3bed 364 $head ||= 'HEAD';
a8ae2623 365 my @refs;
13c823fb
EW
366 my ($url, $rev, $uuid, $gs) = working_head_info($head, \@refs);
367 unless ($gs) {
a8ae2623 368 die "Unable to determine upstream SVN information from ",
905f8b7d 369 "$head history\n";
a8ae2623 370 }
13c823fb 371 my $c = $refs[-1];
45bf473a 372 my $last_rev;
a8ae2623 373 foreach my $d (@refs) {
aef4e921 374 if (!verify_ref("$d~1")) {
d7ad3bed
EW
375 fatal "Commit $d\n",
376 "has no parent commit, and therefore ",
377 "nothing to diff against.\n",
378 "You should be working from a repository ",
379 "originally created by git-svn\n";
48d044b5 380 }
45bf473a
EW
381 unless (defined $last_rev) {
382 (undef, $last_rev, undef) = cmt_metadata("$d~1");
383 unless (defined $last_rev) {
d7ad3bed
EW
384 fatal "Unable to extract revision information ",
385 "from commit $d~1\n";
45bf473a
EW
386 }
387 }
b22d4497
EW
388 if ($_dry_run) {
389 print "diff-tree $d~1 $d\n";
390 } else {
d7ad3bed 391 my %ed_opts = ( r => $last_rev,
61395354 392 log => get_commit_entry($d)->{log},
a8ae2623 393 ra => Git::SVN::Ra->new($url),
61395354
EW
394 tree_a => "$d~1",
395 tree_b => $d,
396 editor_cb => sub {
397 print "Committed r$_[0]\n";
398 $last_rev = $_[0]; },
a8ae2623 399 svn_path => '');
61395354 400 if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) {
d7ad3bed
EW
401 print "No changes\n$d~1 == $d\n";
402 }
b22d4497
EW
403 }
404 }
405 return if $_dry_run;
60d9c97a
EW
406 unless ($gs) {
407 warn "Could not determine fetch information for $url\n",
408 "Will not attempt to fetch and rebase commits.\n",
409 "This probably means you have useSvmProps and should\n",
410 "now resync your SVN::Mirror repository.\n";
411 return;
412 }
905f8b7d 413 $_fetch_all ? $gs->fetch_all : $gs->fetch;
d7ad3bed
EW
414 # we always want to rebase against the current HEAD, not any
415 # head that was passed to us
416 my @diff = command('diff-tree', 'HEAD', $gs->refname, '--');
b22d4497
EW
417 my @finish;
418 if (@diff) {
905f8b7d 419 @finish = rebase_cmd();
d7ad3bed
EW
420 print STDERR "W: HEAD and ", $gs->refname, " differ, ",
421 "using @finish:\n", "@diff";
b22d4497 422 } else {
d7ad3bed
EW
423 print "No changes between current HEAD and ",
424 $gs->refname, "\nResetting to the latest ",
425 $gs->refname, "\n";
4769489a 426 @finish = qw/reset --mixed/;
b22d4497 427 }
d7ad3bed 428 command_noisy(@finish, $gs->refname);
b22d4497
EW
429}
430
905f8b7d
EW
431sub cmd_rebase {
432 command_noisy(qw/update-index --refresh/);
13c823fb
EW
433 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
434 unless ($gs) {
905f8b7d
EW
435 die "Unable to determine upstream SVN information from ",
436 "working tree history\n";
437 }
905f8b7d
EW
438 if (command(qw/diff-index HEAD --/)) {
439 print STDERR "Cannot rebase with uncommited changes:\n";
440 command_noisy('status');
441 exit 1;
442 }
dee41f3e
EW
443 unless ($_local) {
444 $_fetch_all ? $gs->fetch_all : $gs->fetch;
445 }
905f8b7d
EW
446 command_noisy(rebase_cmd(), $gs->refname);
447}
448
5969cbe1 449sub cmd_show_ignore {
13c823fb
EW
450 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
451 $gs ||= Git::SVN->new;
5969cbe1 452 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
102a0a2d 453 $gs->traverse_ignore(\*STDOUT, $gs->{path}, $r);
a5e0cedc
EW
454}
455
8164b652 456sub cmd_multi_init {
9d55b41a 457 my $url = shift;
98327e58
EW
458 unless (defined $_trunk || defined $_branches || defined $_tags) {
459 usage(1);
9d55b41a 460 }
8164b652 461 $_prefix = '' unless defined $_prefix;
dadc6d2a
EW
462 if (defined $url) {
463 $url =~ s#/+$##;
464 init_subdir(@_);
465 }
f30603fc 466 do_git_init_db();
98327e58 467 if (defined $_trunk) {
706587fc
EW
468 my $trunk_ref = $_prefix . 'trunk';
469 # try both old-style and new-style lookups:
470 my $gs_trunk = eval { Git::SVN->new($trunk_ref) };
8164b652 471 unless ($gs_trunk) {
706587fc
EW
472 my ($trunk_url, $trunk_path) =
473 complete_svn_url($url, $_trunk);
474 $gs_trunk = Git::SVN->init($trunk_url, $trunk_path,
475 undef, $trunk_ref);
98327e58 476 }
c35b96e7 477 }
706587fc 478 return unless defined $_branches || defined $_tags;
e7db67e6
EW
479 my $ra = $url ? Git::SVN::Ra->new($url) : undef;
480 complete_url_ls_init($ra, $_branches, '--branches/-b', $_prefix);
481 complete_url_ls_init($ra, $_tags, '--tags/-t', $_prefix . 'tags/');
9d55b41a
EW
482}
483
1c8443b0 484sub cmd_multi_fetch {
0af9c9f9
EW
485 my $remotes = Git::SVN::read_all_remotes();
486 foreach my $repo_id (sort keys %$remotes) {
db03cd24 487 if ($remotes->{$repo_id}->{url}) {
4bb9ed04
EW
488 Git::SVN::fetch_all($repo_id, $remotes);
489 }
9d55b41a 490 }
9d55b41a
EW
491}
492
44320b9e
EW
493# this command is special because it requires no metadata
494sub cmd_commit_diff {
495 my ($ta, $tb, $url) = @_;
496 my $usage = "Usage: $0 commit-diff -r<revision> ".
497 "<tree-ish> <tree-ish> [<URL>]\n";
498 fatal($usage) if (!defined $ta || !defined $tb);
d3a840dc 499 my $svn_path;
44320b9e
EW
500 if (!defined $url) {
501 my $gs = eval { Git::SVN->new };
502 if (!$gs) {
503 fatal("Needed URL or usable git-svn --id in ",
504 "the command-line\n", $usage);
505 }
506 $url = $gs->{url};
d3a840dc 507 $svn_path = $gs->{path};
44320b9e
EW
508 }
509 unless (defined $_revision) {
510 fatal("-r|--revision is a required argument\n", $usage);
511 }
512 if (defined $_message && defined $_file) {
513 fatal("Both --message/-m and --file/-F specified ",
514 "for the commit message.\n",
515 "I have no idea what you mean\n");
516 }
517 if (defined $_file) {
518 $_message = file_to_s($_file);
519 } else {
520 $_message ||= get_commit_entry($tb)->{log};
521 }
522 my $ra ||= Git::SVN::Ra->new($url);
d3a840dc 523 $svn_path ||= $ra->{svn_path};
44320b9e
EW
524 my $r = $_revision;
525 if ($r eq 'HEAD') {
526 $r = $ra->get_latest_revnum;
527 } elsif ($r !~ /^\d+$/) {
528 die "revision argument: $r not understood by git-svn\n";
529 }
61395354
EW
530 my %ed_opts = ( r => $r,
531 log => $_message,
532 ra => $ra,
533 tree_a => $ta,
534 tree_b => $tb,
535 editor_cb => sub { print "Committed r$_[0]\n" },
536 svn_path => $svn_path );
537 if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) {
44320b9e
EW
538 print "No changes\n$ta == $tb\n";
539 }
44320b9e
EW
540}
541
3397f9df
EW
542########################### utility functions #########################
543
905f8b7d
EW
544sub rebase_cmd {
545 my @cmd = qw/rebase/;
546 push @cmd, '-v' if $_verbose;
547 push @cmd, qw/--merge/ if $_merge;
548 push @cmd, "--strategy=$_strategy" if $_strategy;
549 @cmd;
550}
551
1e889ef3
EW
552sub post_fetch_checkout {
553 return if $_no_checkout;
554 my $gs = $Git::SVN::_head or return;
555 return if verify_ref('refs/heads/master^0');
556
557 my $valid_head = verify_ref('HEAD^0');
558 command_noisy(qw(update-ref refs/heads/master), $gs->refname);
559 return if ($valid_head || !verify_ref('HEAD^0'));
560
561 return if $ENV{GIT_DIR} !~ m#^(?:.*/)?\.git$#;
562 my $index = $ENV{GIT_INDEX_FILE} || "$ENV{GIT_DIR}/index";
563 return if -f $index;
564
565 chomp(my $bare = `git config --bool --get core.bare`);
566 return if $bare eq 'true';
567 return if command_oneline(qw/rev-parse --is-inside-git-dir/) eq 'true';
568 command_noisy(qw/read-tree -m -u -v HEAD HEAD/);
569 print STDERR "Checked out HEAD:\n ",
570 $gs->full_url, " r", $gs->last_rev, "\n";
571}
572
98327e58
EW
573sub complete_svn_url {
574 my ($url, $path) = @_;
575 $path =~ s#/+$##;
98327e58 576 if ($path !~ m#^[a-z\+]+://#) {
98327e58
EW
577 if (!defined $url || $url !~ m#^[a-z\+]+://#) {
578 fatal("E: '$path' is not a complete URL ",
579 "and a separate URL is not specified\n");
580 }
706587fc 581 return ($url, $path);
98327e58 582 }
706587fc 583 return ($path, '');
98327e58
EW
584}
585
9d55b41a 586sub complete_url_ls_init {
706587fc
EW
587 my ($ra, $repo_path, $switch, $pfx) = @_;
588 unless ($repo_path) {
9d55b41a
EW
589 print STDERR "W: $switch not specified\n";
590 return;
591 }
706587fc
EW
592 $repo_path =~ s#/+$##;
593 if ($repo_path =~ m#^[a-z\+]+://#) {
594 $ra = Git::SVN::Ra->new($repo_path);
595 $repo_path = '';
e7db67e6 596 } else {
706587fc 597 $repo_path =~ s#^/+##;
e7db67e6 598 unless ($ra) {
706587fc 599 fatal("E: '$repo_path' is not a complete URL ",
e7db67e6 600 "and a separate URL is not specified\n");
8164b652 601 }
e7db67e6 602 }
706587fc 603 my $url = $ra->{url};
b4d57e5e
EW
604 my $gs = Git::SVN->init($url, undef, undef, undef, 1);
605 my $k = "svn-remote.$gs->{repo_id}.url";
606 my $orig_url = eval { command_oneline(qw/config --get/, $k) };
607 if ($orig_url && ($orig_url ne $gs->{url})) {
608 die "$k already set: $orig_url\n",
609 "wanted to set to: $gs->{url}\n";
88cf4107 610 }
b4d57e5e
EW
611 command_oneline('config', $k, $gs->{url}) unless $orig_url;
612 my $remote_path = "$ra->{svn_path}/$repo_path/*";
613 $remote_path =~ s#/+#/#g;
614 $remote_path =~ s#^/##g;
615 my ($n) = ($switch =~ /^--(\w+)/);
616 if (length $pfx && $pfx !~ m#/$#) {
617 die "--prefix='$pfx' must have a trailing slash '/'\n";
9d55b41a 618 }
b4d57e5e
EW
619 command_noisy('config', "svn-remote.$gs->{repo_id}.$n",
620 "$remote_path:refs/remotes/$pfx*");
9d55b41a
EW
621}
622
aef4e921
EW
623sub verify_ref {
624 my ($ref) = @_;
2c5c1d53
EW
625 eval { command_oneline([ 'rev-parse', '--verify', $ref ],
626 { STDERR => 0 }); };
aef4e921
EW
627}
628
a5e0cedc 629sub get_tree_from_treeish {
cf52b8f0 630 my ($treeish) = @_;
44320b9e 631 # $treeish can be a symbolic ref, too:
aef4e921 632 my $type = command_oneline(qw/cat-file -t/, $treeish);
cf52b8f0
EW
633 my $expected;
634 while ($type eq 'tag') {
aef4e921 635 ($treeish, $type) = command(qw/cat-file tag/, $treeish);
cf52b8f0
EW
636 }
637 if ($type eq 'commit') {
aef4e921
EW
638 $expected = (grep /^tree /, command(qw/cat-file commit/,
639 $treeish))[0];
44320b9e 640 ($expected) = ($expected =~ /^tree ($sha1)$/o);
cf52b8f0
EW
641 die "Unable to get tree from $treeish\n" unless $expected;
642 } elsif ($type eq 'tree') {
643 $expected = $treeish;
644 } else {
645 die "$treeish is a $type, expected tree, tag or commit\n";
646 }
a5e0cedc
EW
647 return $expected;
648}
649
44320b9e
EW
650sub get_commit_entry {
651 my ($treeish) = shift;
652 my %log_entry = ( log => '', tree => get_tree_from_treeish($treeish) );
653 my $commit_editmsg = "$ENV{GIT_DIR}/COMMIT_EDITMSG";
654 my $commit_msg = "$ENV{GIT_DIR}/COMMIT_MSG";
655 open my $log_fh, '>', $commit_editmsg or croak $!;
3397f9df 656
44320b9e 657 my $type = command_oneline(qw/cat-file -t/, $treeish);
4ad4515d 658 if ($type eq 'commit' || $type eq 'tag') {
aef4e921 659 my ($msg_fh, $ctx) = command_output_pipe('cat-file',
44320b9e 660 $type, $treeish);
3397f9df
EW
661 my $in_msg = 0;
662 while (<$msg_fh>) {
663 if (!$in_msg) {
664 $in_msg = 1 if (/^\s*$/);
df746c5a 665 } elsif (/^git-svn-id: /) {
44320b9e
EW
666 # skip this for now, we regenerate the
667 # correct one on re-fetch anyways
668 # TODO: set *:merge properties or like...
3397f9df 669 } else {
44320b9e 670 print $log_fh $_ or croak $!;
3397f9df
EW
671 }
672 }
aef4e921 673 command_close_pipe($msg_fh, $ctx);
3397f9df 674 }
44320b9e 675 close $log_fh or croak $!;
3397f9df
EW
676
677 if ($_edit || ($type eq 'tree')) {
678 my $editor = $ENV{VISUAL} || $ENV{EDITOR} || 'vi';
44320b9e
EW
679 # TODO: strip out spaces, comments, like git-commit.sh
680 system($editor, $commit_editmsg);
3397f9df 681 }
44320b9e
EW
682 rename $commit_editmsg, $commit_msg or croak $!;
683 open $log_fh, '<', $commit_msg or croak $!;
684 { local $/; chomp($log_entry{log} = <$log_fh>); }
685 close $log_fh or croak $!;
686 unlink $commit_msg;
687 \%log_entry;
a5e0cedc
EW
688}
689
3397f9df
EW
690sub s_to_file {
691 my ($str, $file, $mode) = @_;
692 open my $fd,'>',$file or croak $!;
693 print $fd $str,"\n" or croak $!;
694 close $fd or croak $!;
695 chmod ($mode &~ umask, $file) if (defined $mode);
696}
697
698sub file_to_s {
699 my $file = shift;
700 open my $fd,'<',$file or croak "$!: file: $file\n";
701 local $/;
702 my $ret = <$fd>;
703 close $fd or croak $!;
704 $ret =~ s/\s*$//s;
705 return $ret;
706}
707
eeb0abe0
EW
708# '<svn username> = real-name <email address>' mapping based on git-svnimport:
709sub load_authors {
710 open my $authors, '<', $_authors or die "Can't open $_authors $!\n";
f8c9d1d2 711 my $log = $cmd eq 'log';
eeb0abe0
EW
712 while (<$authors>) {
713 chomp;
8815788e 714 next unless /^(\S+?|\(no author\))\s*=\s*(.+?)\s*<(.+)>\s*$/;
eeb0abe0 715 my ($user, $name, $email) = ($1, $2, $3);
f8c9d1d2
EW
716 if ($log) {
717 $Git::SVN::Log::rusers{"$name <$email>"} = $user;
718 } else {
719 $users{$user} = [$name, $email];
720 }
79bb8d88
EW
721 }
722 close $authors or croak $!;
723}
724
e0d10e1c 725# convert GetOpt::Long specs for use by git-config
b8c92cad 726sub read_repo_config {
706587fc 727 return unless -d $ENV{GIT_DIR};
b8c92cad 728 my $opts = shift;
97ae0911 729 my @config_only;
b8c92cad 730 foreach my $o (keys %$opts) {
97ae0911
EW
731 # if we have mixedCase and a long option-only, then
732 # it's a config-only variable that we don't need for
733 # the command-line.
734 push @config_only, $o if ($o =~ /[A-Z]/ && $o =~ /^[a-z]+$/i);
b8c92cad 735 my $v = $opts->{$o};
97ae0911 736 my ($key) = ($o =~ /^([a-zA-Z\-]+)/);
b8c92cad 737 $key =~ s/-//g;
e0d10e1c 738 my $arg = 'git-config';
b8c92cad
EW
739 $arg .= ' --int' if ($o =~ /[:=]i$/);
740 $arg .= ' --bool' if ($o !~ /[:=][sfi]$/);
741 if (ref $v eq 'ARRAY') {
742 chomp(my @tmp = `$arg --get-all svn.$key`);
743 @$v = @tmp if @tmp;
744 } else {
745 chomp(my $tmp = `$arg --get svn.$key`);
7774284a 746 if ($tmp && !($arg =~ / --bool/ && $tmp eq 'false')) {
b8c92cad
EW
747 $$v = $tmp;
748 }
749 }
750 }
97ae0911 751 delete @$opts{@config_only} if @config_only;
b8c92cad
EW
752}
753
79bb8d88 754sub extract_metadata {
c1927a85 755 my $id = shift or return (undef, undef, undef);
79bb8d88
EW
756 my ($url, $rev, $uuid) = ($id =~ /^git-svn-id:\s(\S+?)\@(\d+)
757 \s([a-f\d\-]+)$/x);
e70dc780 758 if (!defined $rev || !$uuid || !$url) {
79bb8d88 759 # some of the original repositories I made had
82e5a82f 760 # identifiers like this:
79bb8d88
EW
761 ($rev, $uuid) = ($id =~/^git-svn-id:\s(\d+)\@([a-f\d\-]+)/);
762 }
763 return ($url, $rev, $uuid);
764}
765
c1927a85
EW
766sub cmt_metadata {
767 return extract_metadata((grep(/^git-svn-id: /,
aef4e921 768 command(qw/cat-file commit/, shift)))[-1]);
c1927a85
EW
769}
770
905f8b7d
EW
771sub working_head_info {
772 my ($head, $refs) = @_;
905f8b7d 773 my ($fh, $ctx) = command_output_pipe('rev-list', $head);
b03c7a63
AR
774 while (my $hash = <$fh>) {
775 chomp($hash);
776 my ($url, $rev, $uuid) = cmt_metadata($hash);
13c823fb
EW
777 if (defined $url && defined $rev) {
778 if (my $gs = Git::SVN->find_by_url($url)) {
779 my $c = $gs->rev_db_get($rev);
b03c7a63 780 if ($c && $c eq $hash) {
13c823fb
EW
781 close $fh; # break the pipe
782 return ($url, $rev, $uuid, $gs);
783 }
784 }
785 }
b03c7a63 786 unshift @$refs, $hash if $refs;
905f8b7d 787 }
13c823fb
EW
788 command_close_pipe($fh, $ctx);
789 (undef, undef, undef, undef);
905f8b7d
EW
790}
791
9b981fc6
EW
792package Git::SVN;
793use strict;
794use warnings;
ecc712dd 795use vars qw/$default_repo_id $default_ref_id $_no_metadata $_follow_parent
62e349d2 796 $_repack $_repack_flags $_use_svm_props $_head
befc9adc 797 $_use_svnsync_props $no_reuse_existing/;
9b981fc6
EW
798use Carp qw/croak/;
799use File::Path qw/mkpath/;
373274f9 800use File::Copy qw/copy/;
9b981fc6
EW
801use IPC::Open3;
802
ecc712dd 803my $_repack_nr;
9b981fc6
EW
804# properties that we do not log:
805my %SKIP_PROP;
806BEGIN {
807 %SKIP_PROP = map { $_ => 1 } qw/svn:wc:ra_dav:version-url
808 svn:special svn:executable
809 svn:entry:committed-rev
810 svn:entry:last-author
811 svn:entry:uuid
812 svn:entry:committed-date/;
91b03282
EW
813
814 # some options are read globally, but can be overridden locally
815 # per [svn-remote "..."] section. Command-line options will *NOT*
816 # override options set in an [svn-remote "..."] section
817 my $e;
62e349d2
EW
818 foreach (qw/follow_parent no_metadata use_svm_props
819 use_svnsync_props/) {
91b03282
EW
820 my $key = $_;
821 $key =~ tr/_//d;
822 $e .= "sub $_ {
823 my (\$self) = \@_;
824 return \$self->{-$_} if exists \$self->{-$_};
825 my \$k = \"svn-remote.\$self->{repo_id}\.$key\";
826 eval { command_oneline(qw/config --get/, \$k) };
827 if (\$@) {
828 \$self->{-$_} = \$Git::SVN::_$_;
829 } else {
830 my \$v = command_oneline(qw/config --bool/,\$k);
831 \$self->{-$_} = \$v eq 'false' ? 0 : 1;
832 }
833 return \$self->{-$_} }\n";
834 }
835 $e .= "1;\n";
836 eval $e or die $@;
9b981fc6
EW
837}
838
373274f9
EW
839my %LOCKFILES;
840END { unlink keys %LOCKFILES if %LOCKFILES }
841
4bb9ed04
EW
842sub resolve_local_globs {
843 my ($url, $fetch, $glob_spec) = @_;
844 return unless defined $glob_spec;
845 my $ref = $glob_spec->{ref};
846 my $path = $glob_spec->{path};
847 foreach (command(qw#for-each-ref --format=%(refname) refs/remotes#)) {
848 next unless m#^refs/remotes/$ref->{regex}$#;
849 my $p = $1;
850 my $pathname = $path->full_path($p);
851 my $refname = $ref->full_path($p);
852 if (my $existing = $fetch->{$pathname}) {
853 if ($existing ne $refname) {
854 die "Refspec conflict:\n",
855 "existing: refs/remotes/$existing\n",
856 " globbed: refs/remotes/$refname\n";
857 }
858 my $u = (::cmt_metadata("refs/remotes/$refname"))[0];
4e9f6cc7 859 $u =~ s!^\Q$url\E(/|$)!! or die
4bb9ed04
EW
860 "refs/remotes/$refname: '$url' not found in '$u'\n";
861 if ($pathname ne $u) {
862 warn "W: Refspec glob conflict ",
863 "(ref: refs/remotes/$refname):\n",
864 "expected path: $pathname\n",
865 " real path: $u\n",
866 "Continuing ahead with $u\n";
867 next;
868 }
869 } else {
4bb9ed04
EW
870 $fetch->{$pathname} = $refname;
871 }
872 }
873}
874
e98671e5
EW
875sub parse_revision_argument {
876 my ($base, $head) = @_;
877 if (!defined $::_revision || $::_revision eq 'BASE:HEAD') {
878 return ($base, $head);
879 }
880 return ($1, $2) if ($::_revision =~ /^(\d+):(\d+)$/);
881 return ($::_revision, $::_revision) if ($::_revision =~ /^\d+$/);
882 return ($head, $head) if ($::_revision eq 'HEAD');
883 return ($base, $1) if ($::_revision =~ /^BASE:(\d+)$/);
884 return ($1, $head) if ($::_revision =~ /^(\d+):HEAD$/);
885 die "revision argument: $::_revision not understood by git-svn\n";
886}
887
0af9c9f9 888sub fetch_all {
4bb9ed04 889 my ($repo_id, $remotes) = @_;
905f8b7d
EW
890 if (ref $repo_id) {
891 my $gs = $repo_id;
892 $repo_id = undef;
893 $repo_id = $gs->{repo_id};
894 }
895 $remotes ||= read_all_remotes();
7447b4bc
EW
896 my $remote = $remotes->{$repo_id} or
897 die "[svn-remote \"$repo_id\"] unknown\n";
e518192f 898 my $fetch = $remote->{fetch};
7447b4bc 899 my $url = $remote->{url} or die "svn-remote.$repo_id.url not defined\n";
e518192f 900 my (@gs, @globs);
0af9c9f9 901 my $ra = Git::SVN::Ra->new($url);
26a62d57 902 my $uuid = $ra->get_uuid;
0af9c9f9 903 my $head = $ra->get_latest_revnum;
28710f74 904 my $base = defined $fetch ? $head : 0;
e518192f
EW
905
906 # read the max revs for wildcard expansion (branches/*, tags/*)
907 foreach my $t (qw/branches tags/) {
908 defined $remote->{$t} or next;
909 push @globs, $remote->{$t};
93f2689c
EW
910 my $max_rev = eval { tmp_config(qw/--int --get/,
911 "svn-remote.$repo_id.${t}-maxRev") };
912 if (defined $max_rev && ($max_rev < $base)) {
913 $base = $max_rev;
d6d3346b
EW
914 } elsif (!defined $max_rev) {
915 $base = 0;
e518192f
EW
916 }
917 }
918
db03cd24
EW
919 if ($fetch) {
920 foreach my $p (sort keys %$fetch) {
921 my $gs = Git::SVN->new($fetch->{$p}, $repo_id, $p);
922 my $lr = $gs->rev_db_max;
923 if (defined $lr) {
924 $base = $lr if ($lr < $base);
925 }
926 push @gs, $gs;
0af9c9f9 927 }
0af9c9f9 928 }
e98671e5
EW
929
930 ($base, $head) = parse_revision_argument($base, $head);
e518192f 931 $ra->gs_fetch_loop_common($base, $head, \@gs, \@globs);
0af9c9f9
EW
932}
933
47e39c55
EW
934sub read_all_remotes {
935 my $r = {};
8b8fc068 936 foreach (grep { s/^svn-remote\.// } command(qw/config -l/)) {
47e39c55
EW
937 if (m!^(.+)\.fetch=\s*(.*)\s*:\s*refs/remotes/(.+)\s*$!) {
938 $r->{$1}->{fetch}->{$2} = $3;
939 } elsif (m!^(.+)\.url=\s*(.*)\s*$!) {
940 $r->{$1}->{url} = $2;
4bb9ed04
EW
941 } elsif (m!^(.+)\.(branches|tags)=
942 (.*):refs/remotes/(.+)\s*$/!x) {
943 my ($p, $g) = ($3, $4);
944 my $rs = $r->{$1}->{$2} = {
e518192f 945 t => $2,
93f2689c 946 remote => $1,
4bb9ed04
EW
947 path => Git::SVN::GlobSpec->new($p),
948 ref => Git::SVN::GlobSpec->new($g) };
949 if (length($rs->{ref}->{right}) != 0) {
950 die "The '*' glob character must be the last ",
951 "character of '$g'\n";
952 }
47e39c55
EW
953 }
954 }
955 $r;
956}
957
ecc712dd
EW
958sub init_vars {
959 if (defined $_repack) {
960 $_repack = 1000 if ($_repack <= 0);
961 $_repack_nr = $_repack;
962 $_repack_flags ||= '-d';
963 }
964}
965
b805b44a 966sub verify_remotes_sanity {
536c4b09 967 return unless -d $ENV{GIT_DIR};
b805b44a
EW
968 my %seen;
969 foreach (command(qw/config -l/)) {
970 if (m!^svn-remote\.(?:.+)\.fetch=.*:refs/remotes/(\S+)\s*$!) {
971 if ($seen{$1}) {
972 die "Remote ref refs/remote/$1 is tracked by",
973 "\n \"$_\"\nand\n \"$seen{$1}\"\n",
974 "Please resolve this ambiguity in ",
975 "your git configuration file before ",
976 "continuing\n";
977 }
978 $seen{$1} = $_;
979 }
980 }
981}
982
47e39c55 983# we allow more chars than remotes2config.sh...
706587fc
EW
984sub sanitize_remote_name {
985 my ($name) = @_;
47e39c55 986 $name =~ tr{A-Za-z0-9:,/+-}{.}c;
706587fc
EW
987 $name;
988}
989
e6434f87
EW
990sub find_existing_remote {
991 my ($url, $remotes) = @_;
befc9adc 992 return undef if $no_reuse_existing;
e6434f87
EW
993 my $existing;
994 foreach my $repo_id (keys %$remotes) {
995 my $u = $remotes->{$repo_id}->{url} or next;
996 next if $u ne $url;
997 $existing = $repo_id;
998 last;
999 }
1000 $existing;
1001}
b805b44a 1002
e6434f87 1003sub init_remote_config {
d8115c51 1004 my ($self, $url, $no_write) = @_;
e6434f87
EW
1005 $url =~ s!/+$!!; # strip trailing slash
1006 my $r = read_all_remotes();
1007 my $existing = find_existing_remote($url, $r);
1008 if ($existing) {
e518192f
EW
1009 unless ($no_write) {
1010 print STDERR "Using existing ",
1011 "[svn-remote \"$existing\"]\n";
1012 }
e6434f87
EW
1013 $self->{repo_id} = $existing;
1014 } else {
1015 my $min_url = Git::SVN::Ra->new($url)->minimize_url;
1016 $existing = find_existing_remote($min_url, $r);
1017 if ($existing) {
e518192f
EW
1018 unless ($no_write) {
1019 print STDERR "Using existing ",
1020 "[svn-remote \"$existing\"]\n";
1021 }
e6434f87
EW
1022 $self->{repo_id} = $existing;
1023 }
1024 if ($min_url ne $url) {
e518192f
EW
1025 unless ($no_write) {
1026 print STDERR "Using higher level of URL: ",
1027 "$url => $min_url\n";
1028 }
e6434f87
EW
1029 my $old_path = $self->{path};
1030 $self->{path} = $url;
4e9f6cc7 1031 $self->{path} =~ s!^\Q$min_url\E(/|$)!!;
e6434f87
EW
1032 if (length $old_path) {
1033 $self->{path} .= "/$old_path";
1034 }
1035 $url = $min_url;
1036 }
1037 }
1038 my $orig_url;
1039 if (!$existing) {
b805b44a 1040 # verify that we aren't overwriting anything:
e6434f87 1041 $orig_url = eval {
706587fc 1042 command_oneline('config', '--get',
e6434f87 1043 "svn-remote.$self->{repo_id}.url")
706587fc 1044 };
b805b44a 1045 if ($orig_url && ($orig_url ne $url)) {
e6434f87 1046 die "svn-remote.$self->{repo_id}.url already set: ",
b805b44a
EW
1047 "$orig_url\nwanted to set to: $url\n";
1048 }
9b981fc6 1049 }
e6434f87
EW
1050 my ($xrepo_id, $xpath) = find_ref($self->refname);
1051 if (defined $xpath) {
1052 die "svn-remote.$xrepo_id.fetch already set to track ",
1053 "$xpath:refs/remotes/", $self->refname, "\n";
1054 }
d8115c51
EW
1055 unless ($no_write) {
1056 command_noisy('config',
1057 "svn-remote.$self->{repo_id}.url", $url);
1058 command_noisy('config', '--add',
1059 "svn-remote.$self->{repo_id}.fetch",
1060 "$self->{path}:".$self->refname);
1061 }
9b981fc6 1062 $self->{url} = $url;
e6434f87
EW
1063}
1064
a8ae2623
EW
1065sub find_by_url { # repos_root and, path are optional
1066 my ($class, $full_url, $repos_root, $path) = @_;
56973d20 1067
1a97a506 1068 return undef unless defined $full_url;
56973d20
AR
1069 remove_username($full_url);
1070 remove_username($repos_root) if defined $repos_root;
a8ae2623
EW
1071 my $remotes = read_all_remotes();
1072 if (defined $full_url && defined $repos_root && !defined $path) {
1073 $path = $full_url;
1074 $path =~ s#^\Q$repos_root\E(?:/|$)##;
1075 }
1076 foreach my $repo_id (keys %$remotes) {
1077 my $u = $remotes->{$repo_id}->{url} or next;
56973d20 1078 remove_username($u);
a8ae2623
EW
1079 next if defined $repos_root && $repos_root ne $u;
1080
1081 my $fetch = $remotes->{$repo_id}->{fetch} || {};
1082 foreach (qw/branches tags/) {
1083 resolve_local_globs($u, $fetch,
1084 $remotes->{$repo_id}->{$_});
1085 }
1086 my $p = $path;
1087 unless (defined $p) {
1088 $p = $full_url;
1089 $p =~ s#^\Q$u\E(?:/|$)## or next;
1090 }
1091 foreach my $f (keys %$fetch) {
1092 next if $f ne $p;
1093 return Git::SVN->new($fetch->{$f}, $repo_id, $f);
1094 }
1095 }
1096 undef;
1097}
1098
e6434f87 1099sub init {
d8115c51 1100 my ($class, $url, $path, $repo_id, $ref_id, $no_write) = @_;
e6434f87
EW
1101 my $self = _new($class, $repo_id, $ref_id, $path);
1102 if (defined $url) {
d8115c51 1103 $self->init_remote_config($url, $no_write);
e6434f87 1104 }
9b981fc6
EW
1105 $self;
1106}
1107
706587fc
EW
1108sub find_ref {
1109 my ($ref_id) = @_;
1110 foreach (command(qw/config -l/)) {
1111 next unless m!^svn-remote\.(.+)\.fetch=
1112 \s*(.*)\s*:\s*refs/remotes/(.+)\s*$!x;
1113 my ($repo_id, $path, $ref) = ($1, $2, $3);
1114 if ($ref eq $ref_id) {
1115 $path = '' if ($path =~ m#^\./?#);
1116 return ($repo_id, $path);
1117 }
1118 }
1119 (undef, undef, undef);
1120}
1121
9b981fc6 1122sub new {
706587fc
EW
1123 my ($class, $ref_id, $repo_id, $path) = @_;
1124 if (defined $ref_id && !defined $repo_id && !defined $path) {
1125 ($repo_id, $path) = find_ref($ref_id);
1126 if (!defined $repo_id) {
1127 die "Could not find a \"svn-remote.*.fetch\" key ",
1128 "in the repository configuration matching: ",
1129 "refs/remotes/$ref_id\n";
1130 }
1131 }
1132 my $self = _new($class, $repo_id, $ref_id, $path);
8b8fc068
EW
1133 if (!defined $self->{path} || !length $self->{path}) {
1134 my $fetch = command_oneline('config', '--get',
1135 "svn-remote.$repo_id.fetch",
1136 ":refs/remotes/$ref_id\$") or
1137 die "Failed to read \"svn-remote.$repo_id.fetch\" ",
1138 "\":refs/remotes/$ref_id\$\" in config\n";
1139 ($self->{path}, undef) = split(/\s*:\s*/, $fetch);
1140 }
706587fc
EW
1141 $self->{url} = command_oneline('config', '--get',
1142 "svn-remote.$repo_id.url") or
1143 die "Failed to read \"svn-remote.$repo_id.url\" in config\n";
d6d3346b 1144 $self->rebuild;
9b981fc6
EW
1145 $self;
1146}
1147
706587fc 1148sub refname { "refs/remotes/$_[0]->{ref_id}" }
9b981fc6 1149
26a62d57
EW
1150sub svm_uuid {
1151 my ($self) = @_;
1152 return $self->{svm}->{uuid} if $self->svm;
1153 $self->ra;
1154 unless ($self->{svm}) {
1155 die "SVM UUID not cached, and reading remotely failed\n";
1156 }
1157 $self->{svm}->{uuid};
1158}
8a49ee97 1159
26a62d57
EW
1160sub svm {
1161 my ($self) = @_;
1162 return $self->{svm} if $self->{svm};
1163 my $svm;
8a49ee97
EW
1164 # see if we have it in our config, first:
1165 eval {
26a62d57
EW
1166 my $section = "svn-remote.$self->{repo_id}";
1167 $svm = {
93f2689c
EW
1168 source => tmp_config('--get', "$section.svm-source"),
1169 uuid => tmp_config('--get', "$section.svm-uuid"),
befc9adc 1170 replace => tmp_config('--get', "$section.svm-replace"),
8a49ee97
EW
1171 }
1172 };
befc9adc
EW
1173 if ($svm && $svm->{source} && $svm->{uuid} && $svm->{replace}) {
1174 $self->{svm} = $svm;
1175 }
26a62d57
EW
1176 $self->{svm};
1177}
1178
1179sub _set_svm_vars {
1180 my ($self, $ra) = @_;
db03cd24
EW
1181 return $ra if $self->svm;
1182
1183 my @err = ( "useSvmProps set, but failed to read SVM properties\n",
befc9adc 1184 "(svm:source, svm:uuid) ",
db03cd24
EW
1185 "from the following URLs:\n" );
1186 sub read_svm_props {
befc9adc
EW
1187 my ($self, $ra, $path, $r) = @_;
1188 my $props = ($ra->get_dir($path, $r))[2];
db03cd24 1189 my $src = $props->{'svm:source'};
db03cd24 1190 my $uuid = $props->{'svm:uuid'};
befc9adc 1191 return undef if (!$src || !$uuid);
26a62d57 1192
befc9adc 1193 chomp($src, $uuid);
26a62d57 1194
db03cd24
EW
1195 $uuid =~ m{^[0-9a-f\-]{30,}$}
1196 or die "doesn't look right - svm:uuid is '$uuid'\n";
befc9adc
EW
1197
1198 # the '!' is used to mark the repos_root!/relative/path
1199 $src =~ s{/?!/?}{/};
db03cd24 1200 $src =~ s{/+$}{}; # no trailing slashes please
befc9adc 1201 # username is of no interest
8a49ee97 1202 $src =~ s{(^[a-z\+]*://)[^/@]*@}{$1};
8a49ee97 1203
befc9adc
EW
1204 my $replace = $ra->{url};
1205 $replace .= "/$path" if length $path;
1206
db03cd24 1207 my $section = "svn-remote.$self->{repo_id}";
befc9adc
EW
1208 tmp_config("$section.svm-source", $src);
1209 tmp_config("$section.svm-replace", $replace);
1210 tmp_config("$section.svm-uuid", $uuid);
1211 $self->{svm} = {
1212 source => $src,
1213 uuid => $uuid,
1214 replace => $replace
1215 };
db03cd24
EW
1216 }
1217
1218 my $r = $ra->get_latest_revnum;
1219 my $path = $self->{path};
befc9adc 1220 my %tried;
db03cd24 1221 while (length $path) {
befc9adc
EW
1222 unless ($tried{"$self->{url}/$path"}) {
1223 return $ra if $self->read_svm_props($ra, $path, $r);
1224 $tried{"$self->{url}/$path"} = 1;
db03cd24 1225 }
befc9adc 1226 $path =~ s#/?[^/]+$##;
8a49ee97 1227 }
befc9adc
EW
1228 die "Path: '$path' should be ''\n" if $path ne '';
1229 return $ra if $self->read_svm_props($ra, $path, $r);
1230 $tried{"$self->{url}/$path"} = 1;
db03cd24
EW
1231
1232 if ($ra->{repos_root} eq $self->{url}) {
befc9adc 1233 die @err, (map { " $_\n" } keys %tried), "\n";
db03cd24
EW
1234 }
1235
1236 # nope, make sure we're connected to the repository root:
1237 my $ok;
1238 my @tried_b;
1239 $path = $ra->{svn_path};
db03cd24
EW
1240 $ra = Git::SVN::Ra->new($ra->{repos_root});
1241 while (length $path) {
befc9adc
EW
1242 unless ($tried{"$ra->{url}/$path"}) {
1243 $ok = $self->read_svm_props($ra, $path, $r);
1244 last if $ok;
1245 $tried{"$ra->{url}/$path"} = 1;
1246 }
1247 $path =~ s#/?[^/]+$##;
db03cd24 1248 }
befc9adc
EW
1249 die "Path: '$path' should be ''\n" if $path ne '';
1250 $ok ||= $self->read_svm_props($ra, $path, $r);
1251 $tried{"$ra->{url}/$path"} = 1;
db03cd24 1252 if (!$ok) {
befc9adc 1253 die @err, (map { " $_\n" } keys %tried), "\n";
db03cd24
EW
1254 }
1255 Git::SVN::Ra->new($self->{url});
8a49ee97
EW
1256}
1257
62e349d2
EW
1258sub svnsync {
1259 my ($self) = @_;
1260 return $self->{svnsync} if $self->{svnsync};
1261
1262 if ($self->no_metadata) {
1263 die "Can't have both 'noMetadata' and ",
1264 "'useSvnsyncProps' options set!\n";
1265 }
1266 if ($self->rewrite_root) {
1267 die "Can't have both 'useSvnsyncProps' and 'rewriteRoot' ",
1268 "options set!\n";
1269 }
1270
1271 my $svnsync;
1272 # see if we have it in our config, first:
1273 eval {
1274 my $section = "svn-remote.$self->{repo_id}";
1275 $svnsync = {
1276 url => tmp_config('--get', "$section.svnsync-url"),
1277 uuid => tmp_config('--get', "$section.svnsync-uuid"),
1278 }
1279 };
1280 if ($svnsync && $svnsync->{url} && $svnsync->{uuid}) {
1281 return $self->{svnsync} = $svnsync;
1282 }
1283
1284 my $err = "useSvnsyncProps set, but failed to read " .
1285 "svnsync property: svn:sync-from-";
1286 my $rp = $self->ra->rev_proplist(0);
1287
1288 my $url = $rp->{'svn:sync-from-url'} or die $err . "url\n";
1289 $url =~ m{^[a-z\+]+://} or
1290 die "doesn't look right - svn:sync-from-url is '$url'\n";
1291
1292 my $uuid = $rp->{'svn:sync-from-uuid'} or die $err . "uuid\n";
1293 $uuid =~ m{^[0-9a-f\-]{30,}$} or
1294 die "doesn't look right - svn:sync-from-uuid is '$uuid'\n";
1295
1296 my $section = "svn-remote.$self->{repo_id}";
1297 tmp_config('--add', "$section.svnsync-uuid", $uuid);
1298 tmp_config('--add', "$section.svnsync-url", $url);
1299 return $self->{svnsync} = { url => $url, uuid => $uuid };
1300}
1301
26a62d57
EW
1302# this allows us to memoize our SVN::Ra UUID locally and avoid a
1303# remote lookup (useful for 'git svn log').
1304sub ra_uuid {
1305 my ($self) = @_;
1306 unless ($self->{ra_uuid}) {
1307 my $key = "svn-remote.$self->{repo_id}.uuid";
1308 my $uuid = eval { tmp_config('--get', $key) };
1309 if (!$@ && $uuid && $uuid =~ /^([a-f\d\-]{30,})$/) {
1310 $self->{ra_uuid} = $uuid;
1311 } else {
1312 die "ra_uuid called without URL\n" unless $self->{url};
1313 $self->{ra_uuid} = $self->ra->get_uuid;
1314 tmp_config('--add', $key, $self->{ra_uuid});
1315 }
1316 }
1317 $self->{ra_uuid};
1318}
1319
9b981fc6
EW
1320sub ra {
1321 my ($self) = shift;
8a49ee97 1322 my $ra = Git::SVN::Ra->new($self->{url});
91b03282
EW
1323 if ($self->use_svm_props && !$self->{svm}) {
1324 if ($self->no_metadata) {
97ae0911
EW
1325 die "Can't have both 'noMetadata' and ",
1326 "'useSvmProps' options set!\n";
62e349d2
EW
1327 } elsif ($self->use_svnsync_props) {
1328 die "Can't have both 'useSvnsyncProps' and ",
1329 "'useSvmProps' options set!\n";
91b03282 1330 }
26a62d57 1331 $ra = $self->_set_svm_vars($ra);
8a49ee97
EW
1332 $self->{-want_revprops} = 1;
1333 }
1334 $ra;
9b981fc6
EW
1335}
1336
15710b6f
EW
1337sub rel_path {
1338 my ($self) = @_;
1339 my $repos_root = $self->ra->{repos_root};
1340 return $self->{path} if ($self->{url} eq $repos_root);
0b59451c
EW
1341 my $url = $self->{url} .
1342 (length $self->{path} ? "/$self->{path}" : $self->{path});
1343 $url =~ s!^\Q$repos_root\E(?:/+|$)!!g;
1344 $url;
15710b6f
EW
1345}
1346
9b981fc6
EW
1347sub traverse_ignore {
1348 my ($self, $fh, $path, $r) = @_;
1349 $path =~ s#^/+##g;
5d3b7cd5
EW
1350 my $ra = $self->ra;
1351 my ($dirent, undef, $props) = $ra->get_dir($path, $r);
9b981fc6 1352 my $p = $path;
102a0a2d 1353 $p =~ s#^\Q$self->{path}\E(/|$)##;
9b981fc6
EW
1354 print $fh length $p ? "\n# $p\n" : "\n# /\n";
1355 if (my $s = $props->{'svn:ignore'}) {
1356 $s =~ s/[\r\n]+/\n/g;
1357 chomp $s;
1358 if (length $p == 0) {
1359 $s =~ s#\n#\n/$p#g;
1360 print $fh "/$s\n";
1361 } else {
1362 $s =~ s#\n#\n/$p/#g;
1363 print $fh "/$p/$s\n";
1364 }
1365 }
1366 foreach (sort keys %$dirent) {
1367 next if $dirent->{$_}->kind != $SVN::Node::dir;
1368 $self->traverse_ignore($fh, "$path/$_", $r);
1369 }
1370}
1371
3ebe8df7
EW
1372sub last_rev { ($_[0]->last_rev_commit)[0] }
1373sub last_commit { ($_[0]->last_rev_commit)[1] }
1374
9b981fc6
EW
1375# returns the newest SVN revision number and newest commit SHA1
1376sub last_rev_commit {
1377 my ($self) = @_;
1378 if (defined $self->{last_rev} && defined $self->{last_commit}) {
1379 return ($self->{last_rev}, $self->{last_commit});
1380 }
d2866f9e 1381 my $c = ::verify_ref($self->refname.'^0');
91b03282 1382 if ($c && !$self->use_svm_props && !$self->no_metadata) {
d2866f9e 1383 my $rev = (::cmt_metadata($c))[1];
9b981fc6
EW
1384 if (defined $rev) {
1385 ($self->{last_rev}, $self->{last_commit}) = ($rev, $c);
1386 return ($rev, $c);
1387 }
1388 }
26a62d57
EW
1389 my $db_path = $self->db_path;
1390 unless (-e $db_path) {
1391 ($self->{last_rev}, $self->{last_commit}) = (undef, undef);
1392 return (undef, undef);
1393 }
9b981fc6
EW
1394 my $offset = -41; # from tail
1395 my $rl;
26a62d57 1396 open my $fh, '<', $db_path or croak "$db_path not readable: $!\n";
ce4b4af7
EW
1397 sysseek($fh, $offset, 2); # don't care for errors
1398 sysread($fh, $rl, 41) == 41 or return (undef, undef);
9b981fc6 1399 chomp $rl;
ce4b4af7 1400 while (('0' x40) eq $rl && sysseek($fh, 0, 1) != 0) {
9b981fc6 1401 $offset -= 41;
ce4b4af7
EW
1402 sysseek($fh, $offset, 2); # don't care for errors
1403 sysread($fh, $rl, 41) == 41 or return (undef, undef);
9b981fc6
EW
1404 chomp $rl;
1405 }
91b03282 1406 if ($c && $c ne $rl) {
26a62d57 1407 die "$db_path and ", $self->refname,
9c93fee5
EW
1408 " inconsistent!:\n$c != $rl\n";
1409 }
ce4b4af7 1410 my $rev = sysseek($fh, 0, 1) or croak $!;
9b981fc6
EW
1411 $rev = ($rev - 41) / 41;
1412 close $fh or croak $!;
1413 ($self->{last_rev}, $self->{last_commit}) = ($rev, $c);
1414 return ($rev, $c);
1415}
1416
3ebe8df7
EW
1417sub get_fetch_range {
1418 my ($self, $min, $max) = @_;
1419 $max ||= $self->ra->get_latest_revnum;
9c93fee5 1420 $min ||= $self->rev_db_max;
3ebe8df7 1421 (++$min, $max);
9b981fc6
EW
1422}
1423
8a49ee97 1424sub tmp_config {
93f2689c 1425 my (@args) = @_;
b7e5348c
EW
1426 my $old_def_config = "$ENV{GIT_DIR}/svn/config";
1427 my $config = "$ENV{GIT_DIR}/svn/.metadata";
1428 if (-e $old_def_config && ! -e $config) {
1429 rename $old_def_config, $config or
1430 die "Failed rename $old_def_config => $config: $!\n";
1431 }
8a49ee97 1432 my $old_config = $ENV{GIT_CONFIG};
93f2689c 1433 $ENV{GIT_CONFIG} = $config;
8a49ee97 1434 $@ = undef;
b4d57e5e
EW
1435 my @ret = eval {
1436 unless (-f $config) {
1437 mkfile($config);
1438 open my $fh, '>', $config or
1439 die "Can't open $config: $!\n";
1440 print $fh "; This file is used internally by ",
1441 "git-svn\n" or die
1442 "Couldn't write to $config: $!\n";
1443 print $fh "; You should not have to edit it\n" or
1444 die "Couldn't write to $config: $!\n";
1445 close $fh or die "Couldn't close $config: $!\n";
1446 }
1447 command('config', @args);
1448 };
8a49ee97
EW
1449 my $err = $@;
1450 if (defined $old_config) {
1451 $ENV{GIT_CONFIG} = $old_config;
1452 } else {
1453 delete $ENV{GIT_CONFIG};
1454 }
1455 die $err if $err;
1456 wantarray ? @ret : $ret[0];
1457}
1458
9b981fc6
EW
1459sub tmp_index_do {
1460 my ($self, $sub) = @_;
1461 my $old_index = $ENV{GIT_INDEX_FILE};
1462 $ENV{GIT_INDEX_FILE} = $self->{index};
8a49ee97 1463 $@ = undef;
b4d57e5e
EW
1464 my @ret = eval {
1465 my ($dir, $base) = ($self->{index} =~ m#^(.*?)/?([^/]+)$#);
1466 mkpath([$dir]) unless -d $dir;
1467 &$sub;
1468 };
8a49ee97
EW
1469 my $err = $@;
1470 if (defined $old_index) {
9b981fc6
EW
1471 $ENV{GIT_INDEX_FILE} = $old_index;
1472 } else {
1473 delete $ENV{GIT_INDEX_FILE};
1474 }
8a49ee97 1475 die $err if $err;
9b981fc6
EW
1476 wantarray ? @ret : $ret[0];
1477}
1478
1479sub assert_index_clean {
1480 my ($self, $treeish) = @_;
1481
1482 $self->tmp_index_do(sub {
1483 command_noisy('read-tree', $treeish) unless -e $self->{index};
1484 my $x = command_oneline('write-tree');
1485 my ($y) = (command(qw/cat-file commit/, $treeish) =~
1486 /^tree ($::sha1)/mo);
e8d120bd
EW
1487 return if $y eq $x;
1488
1489 warn "Index mismatch: $y != $x\nrereading $treeish\n";
1490 unlink $self->{index} or die "unlink $self->{index}: $!\n";
1491 command_noisy('read-tree', $treeish);
9b981fc6
EW
1492 $x = command_oneline('write-tree');
1493 if ($y ne $x) {
1494 ::fatal "trees ($treeish) $y != $x\n",
1495 "Something is seriously wrong...\n";
1496 }
1497 });
1498}
1499
1500sub get_commit_parents {
0af9c9f9 1501 my ($self, $log_entry) = @_;
9b981fc6 1502 my (%seen, @ret, @tmp);
0af9c9f9
EW
1503 # legacy support for 'set-tree'; this is only used by set_tree_cb:
1504 if (my $ip = $self->{inject_parents}) {
1505 if (my $commit = delete $ip->{$log_entry->{revision}}) {
1506 push @tmp, $commit;
9b981fc6
EW
1507 }
1508 }
d2866f9e 1509 if (my $cur = ::verify_ref($self->refname.'^0')) {
9b981fc6
EW
1510 push @tmp, $cur;
1511 }
44320b9e 1512 push @tmp, $_ foreach (@{$log_entry->{parents}}, @tmp);
9b981fc6
EW
1513 while (my $p = shift @tmp) {
1514 next if $seen{$p};
1515 $seen{$p} = 1;
1516 push @ret, $p;
1517 # MAXPARENT is defined to 16 in commit-tree.c:
1518 last if @ret >= 16;
1519 }
1520 if (@tmp) {
44320b9e 1521 die "r$log_entry->{revision}: No room for parents:\n\t",
9b981fc6
EW
1522 join("\n\t", @tmp), "\n";
1523 }
1524 @ret;
1525}
1526
aea736cc
EW
1527sub rewrite_root {
1528 my ($self) = @_;
1529 return $self->{-rewrite_root} if exists $self->{-rewrite_root};
1530 my $k = "svn-remote.$self->{repo_id}.rewriteRoot";
1531 my $rwr = eval { command_oneline(qw/config --get/, $k) };
1532 if ($rwr) {
1533 $rwr =~ s#/+$##;
1534 if ($rwr !~ m#^[a-z\+]+://#) {
1535 die "$rwr is not a valid URL (key: $k)\n";
1536 }
1537 }
1538 $self->{-rewrite_root} = $rwr;
1539}
1540
1541sub metadata_url {
1542 my ($self) = @_;
1543 ($self->rewrite_root || $self->{url}) .
1544 (length $self->{path} ? '/' . $self->{path} : '');
1545}
1546
706587fc 1547sub full_url {
9b981fc6 1548 my ($self) = @_;
5d3b7cd5 1549 $self->{url} . (length $self->{path} ? '/' . $self->{path} : '');
9b981fc6
EW
1550}
1551
1552sub do_git_commit {
0af9c9f9 1553 my ($self, $log_entry) = @_;
8a603774
EW
1554 my $lr = $self->last_rev;
1555 if (defined $lr && $lr >= $log_entry->{revision}) {
1556 die "Last fetched revision of ", $self->refname,
1557 " was r$lr, but we are about to fetch: ",
1558 "r$log_entry->{revision}!\n";
1559 }
44320b9e
EW
1560 if (my $c = $self->rev_db_get($log_entry->{revision})) {
1561 croak "$log_entry->{revision} = $c already exists! ",
9b981fc6
EW
1562 "Why are we refetching it?\n";
1563 }
db03cd24
EW
1564 $ENV{GIT_AUTHOR_NAME} = $ENV{GIT_COMMITTER_NAME} = $log_entry->{name};
1565 $ENV{GIT_AUTHOR_EMAIL} = $ENV{GIT_COMMITTER_EMAIL} =
1566 $log_entry->{email};
44320b9e 1567 $ENV{GIT_AUTHOR_DATE} = $ENV{GIT_COMMITTER_DATE} = $log_entry->{date};
9b981fc6 1568
44320b9e 1569 my $tree = $log_entry->{tree};
9b981fc6
EW
1570 if (!defined $tree) {
1571 $tree = $self->tmp_index_do(sub {
1572 command_oneline('write-tree') });
1573 }
1574 die "Tree is not a valid sha1: $tree\n" if $tree !~ /^$::sha1$/o;
1575
1576 my @exec = ('git-commit-tree', $tree);
0af9c9f9 1577 foreach ($self->get_commit_parents($log_entry)) {
9b981fc6
EW
1578 push @exec, '-p', $_;
1579 }
1580 defined(my $pid = open3(my $msg_fh, my $out_fh, '>&STDERR', @exec))
1581 or croak $!;
44320b9e 1582 print $msg_fh $log_entry->{log} or croak $!;
91b03282 1583 unless ($self->no_metadata) {
8a49ee97
EW
1584 print $msg_fh "\ngit-svn-id: $log_entry->{metadata}\n"
1585 or croak $!;
9760adcc 1586 }
9b981fc6
EW
1587 $msg_fh->flush == 0 or croak $!;
1588 close $msg_fh or croak $!;
1589 chomp(my $commit = do { local $/; <$out_fh> });
1590 close $out_fh or croak $!;
1591 waitpid $pid, 0;
1592 croak $? if $?;
1593 if ($commit !~ /^$::sha1$/o) {
1594 die "Failed to commit, invalid sha1: $commit\n";
1595 }
1596
373274f9 1597 $self->rev_db_set($log_entry->{revision}, $commit, 1);
9b981fc6 1598
44320b9e 1599 $self->{last_rev} = $log_entry->{revision};
9b981fc6 1600 $self->{last_commit} = $commit;
8a49ee97
EW
1601 print "r$log_entry->{revision}";
1602 if (defined $log_entry->{svm_revision}) {
1603 print " (\@$log_entry->{svm_revision})";
26a62d57
EW
1604 $self->rev_db_set($log_entry->{svm_revision}, $commit,
1605 0, $self->svm_uuid);
8a49ee97
EW
1606 }
1607 print " = $commit ($self->{ref_id})\n";
ecc712dd
EW
1608 if (defined $_repack && (--$_repack_nr == 0)) {
1609 $_repack_nr = $_repack;
1610 # repack doesn't use any arguments with spaces in them, does it?
1611 print "Running git repack $_repack_flags ...\n";
1612 command_noisy('repack', split(/\s+/, $_repack_flags));
1613 print "Done repacking\n";
1614 }
9b981fc6
EW
1615 return $commit;
1616}
1617
fbcc1737
EW
1618sub match_paths {
1619 my ($self, $paths, $r) = @_;
4e9f6cc7 1620 return 1 if $self->{path} eq '';
d542aedb
EW
1621 if (my $path = $paths->{"/$self->{path}"}) {
1622 return ($path->{action} eq 'D') ? 0 : 1;
1623 }
4e9f6cc7 1624 $self->{path_regex} ||= qr/^\/\Q$self->{path}\E\//;
fbcc1737
EW
1625 if (grep /$self->{path_regex}/, keys %$paths) {
1626 return 1;
1627 }
1628 my $c = '';
1629 foreach (split m#/#, $self->{path}) {
1630 $c .= "/$_";
74a81227
EW
1631 next unless ($paths->{$c} &&
1632 ($paths->{$c}->{action} =~ /^[AR]$/));
e518192f
EW
1633 if ($self->ra->check_path($self->{path}, $r) ==
1634 $SVN::Node::dir) {
fbcc1737
EW
1635 return 1;
1636 }
1637 }
1638 return 0;
1639}
1640
15710b6f
EW
1641sub find_parent_branch {
1642 my ($self, $paths, $rev) = @_;
91b03282 1643 return undef unless $self->follow_parent;
e5a0b240 1644 unless (defined $paths) {
c7eba716
EW
1645 my $err_handler = $SVN::Error::handler;
1646 $SVN::Error::handler = \&Git::SVN::Ra::skip_unknown_revs;
d4eff2bd
EW
1647 $self->ra->get_log([$self->{path}], $rev, $rev, 0, 1, 1, sub {
1648 $paths =
1649 Git::SVN::Ra::dup_changed_paths($_[0]) });
c7eba716 1650 $SVN::Error::handler = $err_handler;
e5a0b240
EW
1651 }
1652 return undef unless defined $paths;
15710b6f
EW
1653
1654 # look for a parent from another branch:
7f578c55
EW
1655 my @b_path_components = split m#/#, $self->rel_path;
1656 my @a_path_components;
1657 my $i;
1658 while (@b_path_components) {
1659 $i = $paths->{'/'.join('/', @b_path_components)};
74a81227 1660 last if $i && defined $i->{copyfrom_path};
7f578c55
EW
1661 unshift(@a_path_components, pop(@b_path_components));
1662 }
74a81227
EW
1663 return undef unless defined $i && defined $i->{copyfrom_path};
1664 my $branch_from = $i->{copyfrom_path};
7f578c55
EW
1665 if (@a_path_components) {
1666 print STDERR "branch_from: $branch_from => ";
1667 $branch_from .= '/'.join('/', @a_path_components);
1668 print STDERR $branch_from, "\n";
1669 }
3ebe8df7 1670 my $r = $i->{copyfrom_rev};
15710b6f
EW
1671 my $repos_root = $self->ra->{repos_root};
1672 my $url = $self->ra->{url};
1673 my $new_url = $repos_root . $branch_from;
1674 print STDERR "Found possible branch point: ",
1675 "$new_url => ", $self->full_url, ", $r\n";
1676 $branch_from =~ s#^/##;
a8ae2623 1677 my $gs = Git::SVN->find_by_url($new_url, $repos_root, $branch_from);
15710b6f 1678 unless ($gs) {
ce2a0f2f
EW
1679 my $ref_id = $self->{ref_id};
1680 $ref_id =~ s/\@\d+$//;
1681 $ref_id .= "\@$r";
15710b6f
EW
1682 # just grow a tail if we're not unique enough :x
1683 $ref_id .= '-' while find_ref($ref_id);
ce2a0f2f 1684 print STDERR "Initializing parent: $ref_id\n";
d8115c51 1685 $gs = Git::SVN->init($new_url, '', $ref_id, $ref_id, 1);
15710b6f
EW
1686 }
1687 my ($r0, $parent) = $gs->find_rev_before($r, 1);
91b03282 1688 if (!defined $r0 || !defined $parent) {
d627de6b
EW
1689 my ($base, $head) = parse_revision_argument(0, $r);
1690 if ($base <= $r) {
1691 $gs->fetch($base, $r);
1692 }
15710b6f
EW
1693 ($r0, $parent) = $gs->last_rev_commit;
1694 }
ef70de96 1695 if (defined $r0 && defined $parent) {
15710b6f 1696 print STDERR "Found branch parent: ($self->{ref_id}) $parent\n";
15710b6f
EW
1697 my $ed;
1698 if ($self->ra->can_do_switch) {
2e5e2480 1699 $self->assert_index_clean($parent);
8b8fc068 1700 print STDERR "Following parent with do_switch\n";
15710b6f 1701 # do_switch works with svn/trunk >= r22312, but that
2b27f6c8 1702 # is not included with SVN 1.4.3 (the latest version
15710b6f
EW
1703 # at the moment), so we can't rely on it
1704 $self->{last_commit} = $parent;
1705 $ed = SVN::Git::Fetcher->new($self);
8a603774 1706 $gs->ra->gs_do_switch($r0, $rev, $gs,
15710b6f
EW
1707 $self->full_url, $ed)
1708 or die "SVN connection failed somewhere...\n";
1709 } else {
8b8fc068 1710 print STDERR "Following parent with do_update\n";
15710b6f 1711 $ed = SVN::Git::Fetcher->new($self);
8a603774 1712 $self->ra->gs_do_update($rev, $rev, $self, $ed)
15710b6f
EW
1713 or die "SVN connection failed somewhere...\n";
1714 }
f7c3fc4a 1715 print STDERR "Successfully followed parent\n";
15710b6f
EW
1716 return $self->make_log_entry($rev, [$parent], $ed);
1717 }
15710b6f
EW
1718 return undef;
1719}
1720
9b981fc6 1721sub do_fetch {
706587fc 1722 my ($self, $paths, $rev) = @_;
15710b6f 1723 my $ed;
9b981fc6 1724 my ($last_rev, @parents);
b9dffd8c
EW
1725 if (my $lc = $self->last_commit) {
1726 # we can have a branch that was deleted, then re-added
1727 # under the same name but copied from another path, in
1728 # which case we'll have multiple parents (we don't
1729 # want to break the original ref, nor lose copypath info):
1730 if (my $log_entry = $self->find_parent_branch($paths, $rev)) {
1731 push @{$log_entry->{parents}}, $lc;
1732 return $log_entry;
1733 }
15710b6f 1734 $ed = SVN::Git::Fetcher->new($self);
9b981fc6 1735 $last_rev = $self->{last_rev};
b9dffd8c
EW
1736 $ed->{c} = $lc;
1737 @parents = ($lc);
9b981fc6
EW
1738 } else {
1739 $last_rev = $rev;
15710b6f
EW
1740 if (my $log_entry = $self->find_parent_branch($paths, $rev)) {
1741 return $log_entry;
1742 }
1743 $ed = SVN::Git::Fetcher->new($self);
9b981fc6 1744 }
8a603774 1745 unless ($self->ra->gs_do_update($last_rev, $rev, $self, $ed)) {
9b981fc6
EW
1746 die "SVN connection failed somewhere...\n";
1747 }
1748 $self->make_log_entry($rev, \@parents, $ed);
1749}
1750
97f6987a
EW
1751sub get_untracked {
1752 my ($self, $ed) = @_;
1753 my @out;
1754 my $h = $ed->{empty};
9b981fc6
EW
1755 foreach (sort keys %$h) {
1756 my $act = $h->{$_} ? '+empty_dir' : '-empty_dir';
97f6987a 1757 push @out, " $act: " . uri_encode($_);
9b981fc6
EW
1758 warn "W: $act: $_\n";
1759 }
1760 foreach my $t (qw/dir_prop file_prop/) {
97f6987a 1761 $h = $ed->{$t} or next;
9b981fc6
EW
1762 foreach my $path (sort keys %$h) {
1763 my $ppath = $path eq '' ? '.' : $path;
1764 foreach my $prop (sort keys %{$h->{$path}}) {
1ce255dc 1765 next if $SKIP_PROP{$prop};
9b981fc6 1766 my $v = $h->{$path}->{$prop};
97f6987a
EW
1767 my $t_ppath_prop = "$t: " .
1768 uri_encode($ppath) . ' ' .
1769 uri_encode($prop);
9b981fc6 1770 if (defined $v) {
97f6987a
EW
1771 push @out, " +$t_ppath_prop " .
1772 uri_encode($v);
9b981fc6 1773 } else {
97f6987a 1774 push @out, " -$t_ppath_prop";
9b981fc6
EW
1775 }
1776 }
1777 }
1778 }
1779 foreach my $t (qw/absent_file absent_directory/) {
97f6987a 1780 $h = $ed->{$t} or next;
9b981fc6
EW
1781 foreach my $parent (sort keys %$h) {
1782 foreach my $path (sort @{$h->{$parent}}) {
97f6987a
EW
1783 push @out, " $t: " .
1784 uri_encode("$parent/$path");
9b981fc6
EW
1785 warn "W: $t: $parent/$path ",
1786 "Insufficient permissions?\n";
1787 }
1788 }
1789 }
97f6987a 1790 \@out;
9b981fc6
EW
1791}
1792
1c8443b0
EW
1793sub parse_svn_date {
1794 my $date = shift || return '+0000 1970-01-01 00:00:00';
1795 my ($Y,$m,$d,$H,$M,$S) = ($date =~ /^(\d{4})\-(\d\d)\-(\d\d)T
1796 (\d\d)\:(\d\d)\:(\d\d).\d+Z$/x) or
1797 croak "Unable to parse date: $date\n";
1798 "+0000 $Y-$m-$d $H:$M:$S";
1799}
1800
1801sub check_author {
1802 my ($author) = @_;
1803 if (!defined $author || length $author == 0) {
1804 $author = '(no author)';
1805 }
1806 if (defined $::_authors && ! defined $::users{$author}) {
1807 die "Author: $author not defined in $::_authors file\n";
1808 }
1809 $author;
1810}
1811
9b981fc6 1812sub make_log_entry {
97f6987a
EW
1813 my ($self, $rev, $parents, $ed) = @_;
1814 my $untracked = $self->get_untracked($ed);
1815
9b981fc6 1816 open my $un, '>>', "$self->{dir}/unhandled.log" or croak $!;
97f6987a
EW
1817 print $un "r$rev\n" or croak $!;
1818 print $un $_, "\n" foreach @$untracked;
1819 my %log_entry = ( parents => $parents || [], revision => $rev,
1820 log => '');
fbcc1737 1821
8a49ee97 1822 my $headrev;
fbcc1737 1823 my $logged = delete $self->{logged_rev_props};
8a49ee97 1824 if (!$logged || $self->{-want_revprops}) {
fbcc1737
EW
1825 my $rp = $self->ra->rev_proplist($rev);
1826 foreach (sort keys %$rp) {
1827 my $v = $rp->{$_};
1828 if (/^svn:(author|date|log)$/) {
1829 $log_entry{$1} = $v;
8a49ee97
EW
1830 } elsif ($_ eq 'svm:headrev') {
1831 $headrev = $v;
fbcc1737
EW
1832 } else {
1833 print $un " rev_prop: ", uri_encode($_), ' ',
1834 uri_encode($v), "\n";
1835 }
9b981fc6 1836 }
fbcc1737
EW
1837 } else {
1838 map { $log_entry{$_} = $logged->{$_} } keys %$logged;
9b981fc6
EW
1839 }
1840 close $un or croak $!;
97f6987a 1841
9b981fc6 1842 $log_entry{date} = parse_svn_date($log_entry{date});
9b981fc6 1843 $log_entry{log} .= "\n";
db03cd24
EW
1844 my $author = $log_entry{author} = check_author($log_entry{author});
1845 my ($name, $email) = defined $::users{$author} ? @{$::users{$author}}
1846 : ($author, undef);
91b03282 1847 if (defined $headrev && $self->use_svm_props) {
aea736cc
EW
1848 if ($self->rewrite_root) {
1849 die "Can't have both 'useSvmProps' and 'rewriteRoot' ",
1850 "options set!\n";
1851 }
8a49ee97 1852 my ($uuid, $r) = $headrev =~ m{^([a-f\d\-]{30,}):(\d+)$};
befc9adc
EW
1853 # we don't want "SVM: initializing mirror for junk" ...
1854 return undef if $r == 0;
1855 my $svm = $self->svm;
1856 if ($uuid ne $svm->{uuid}) {
8a49ee97 1857 die "UUID mismatch on SVM path:\n",
befc9adc 1858 "expected: $svm->{uuid}\n",
8a49ee97
EW
1859 " got: $uuid\n";
1860 }
befc9adc
EW
1861 my $full_url = $self->full_url;
1862 $full_url =~ s#^\Q$svm->{replace}\E(/|$)#$svm->{source}$1# or
1863 die "Failed to replace '$svm->{replace}' with ",
1864 "'$svm->{source}' in $full_url\n";
18ea92bd
SV
1865 # throw away username for storing in records
1866 remove_username($full_url);
8a49ee97
EW
1867 $log_entry{metadata} = "$full_url\@$r $uuid";
1868 $log_entry{svm_revision} = $r;
db03cd24 1869 $email ||= "$author\@$uuid"
62e349d2
EW
1870 } elsif ($self->use_svnsync_props) {
1871 my $full_url = $self->svnsync->{url};
1872 $full_url .= "/$self->{path}" if length $self->{path};
ce118739 1873 remove_username($full_url);
62e349d2
EW
1874 my $uuid = $self->svnsync->{uuid};
1875 $log_entry{metadata} = "$full_url\@$rev $uuid";
1876 $email ||= "$author\@$uuid"
8a49ee97 1877 } else {
ce118739
AR
1878 my $url = $self->metadata_url;
1879 remove_username($url);
1880 $log_entry{metadata} = "$url\@$rev " .
26a62d57 1881 $self->ra->get_uuid;
db03cd24 1882 $email ||= "$author\@" . $self->ra->get_uuid;
8a49ee97 1883 }
db03cd24
EW
1884 $log_entry{name} = $name;
1885 $log_entry{email} = $email;
9b981fc6
EW
1886 \%log_entry;
1887}
1888
1889sub fetch {
3ebe8df7 1890 my ($self, $min_rev, $max_rev, @parents) = @_;
9b981fc6 1891 my ($last_rev, $last_commit) = $self->last_rev_commit;
3ebe8df7 1892 my ($base, $head) = $self->get_fetch_range($min_rev, $max_rev);
e518192f 1893 $self->ra->gs_fetch_loop_common($base, $head, [$self]);
9b981fc6
EW
1894}
1895
1896sub set_tree_cb {
1897 my ($self, $log_entry, $tree, $rev, $date, $author) = @_;
490f49ea
EW
1898 $self->{inject_parents} = { $rev => $tree };
1899 $self->fetch(undef, undef);
9b981fc6
EW
1900}
1901
1902sub set_tree {
1903 my ($self, $tree) = (shift, shift);
1ce255dc 1904 my $log_entry = ::get_commit_entry($tree);
9b981fc6
EW
1905 unless ($self->{last_rev}) {
1906 fatal("Must have an existing revision to commit\n");
1907 }
61395354
EW
1908 my %ed_opts = ( r => $self->{last_rev},
1909 log => $log_entry->{log},
1910 ra => $self->ra,
1911 tree_a => $self->{last_commit},
1912 tree_b => $tree,
1913 editor_cb => sub {
1914 $self->set_tree_cb($log_entry, $tree, @_) },
1915 svn_path => $self->{path} );
1916 if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) {
9b981fc6
EW
1917 print "No changes\nr$self->{last_rev} = $tree\n";
1918 }
9b981fc6
EW
1919}
1920
f0ecca10
EW
1921sub rebuild {
1922 my ($self) = @_;
26a62d57 1923 my $db_path = $self->db_path;
d6d3346b
EW
1924 return if (-e $db_path && ! -z $db_path);
1925 return unless ::verify_ref($self->refname.'^0');
26a62d57
EW
1926 if (-f $self->{db_root}) {
1927 rename $self->{db_root}, $db_path or die
1928 "rename $self->{db_root} => $db_path failed: $!\n";
1929 my ($dir, $base) = ($db_path =~ m#^(.*?)/?([^/]+)$#);
1930 symlink $base, $self->{db_root} or die
1931 "symlink $base => $self->{db_root} failed: $!\n";
1932 return;
1933 }
1934 print "Rebuilding $db_path ...\n";
f0ecca10
EW
1935 my ($rev_list, $ctx) = command_output_pipe("rev-list", $self->refname);
1936 my $latest;
1937 my $full_url = $self->full_url;
18ea92bd 1938 remove_username($full_url);
f0ecca10
EW
1939 my $svn_uuid;
1940 while (<$rev_list>) {
1941 chomp;
1942 my $c = $_;
1943 die "Non-SHA1: $c\n" unless $c =~ /^$::sha1$/o;
1944 my ($url, $rev, $uuid) = ::cmt_metadata($c);
18ea92bd 1945 remove_username($url);
f0ecca10
EW
1946
1947 # ignore merges (from set-tree)
1948 next if (!defined $rev || !$uuid);
1949
1950 # if we merged or otherwise started elsewhere, this is
1951 # how we break out of it
1952 if ((defined $svn_uuid && ($uuid ne $svn_uuid)) ||
1953 ($full_url && $url && ($url ne $full_url))) {
1954 next;
1955 }
1956 $latest ||= $rev;
1957 $svn_uuid ||= $uuid;
1958
1959 $self->rev_db_set($rev, $c);
1960 print "r$rev = $c\n";
1961 }
1962 command_close_pipe($rev_list, $ctx);
26a62d57 1963 print "Done rebuilding $db_path\n";
f0ecca10
EW
1964}
1965
9b981fc6
EW
1966# rev_db:
1967# Tie::File seems to be prone to offset errors if revisions get sparse,
1968# it's not that fast, either. Tie::File is also not in Perl 5.6. So
1969# one of my favorite modules is out :< Next up would be one of the DBM
1970# modules, but I'm not sure which is most portable... So I'll just
1971# go with something that's plain-text, but still capable of
1972# being randomly accessed. So here's my ultra-simple fixed-width
1973# database. All records are 40 characters + "\n", so it's easy to seek
1974# to a revision: (41 * rev) is the byte offset.
1975# A record of 40 0s denotes an empty revision.
1976# And yes, it's still pretty fast (faster than Tie::File).
97ae0911 1977# These files are disposable unless noMetadata or useSvmProps is set
9b981fc6 1978
26a62d57
EW
1979sub _rev_db_set {
1980 my ($fh, $rev, $commit) = @_;
1981 my $offset = $rev * 41;
1982 # assume that append is the common case:
1983 seek $fh, 0, 2 or croak $!;
1984 my $pos = tell $fh;
1985 if ($pos < $offset) {
1986 for (1 .. (($offset - $pos) / 41)) {
1987 print $fh (('0' x 40),"\n") or croak $!;
1988 }
1989 }
1990 seek $fh, $offset, 0 or croak $!;
1991 print $fh $commit,"\n" or croak $!;
1992}
1993
1994sub mkfile {
1995 my ($path) = @_;
1996 unless (-e $path) {
1997 my ($dir, $base) = ($path =~ m#^(.*?)/?([^/]+)$#);
1998 mkpath([$dir]) unless -d $dir;
1999 open my $fh, '>>', $path or die "Couldn't create $path: $!\n";
2000 close $fh or die "Couldn't close (create) $path: $!\n";
2001 }
2002}
2003
9b981fc6 2004sub rev_db_set {
26a62d57
EW
2005 my ($self, $rev, $commit, $update_ref, $uuid) = @_;
2006 length $commit == 40 or die "arg3 must be a full SHA1 hexsum\n";
2007 my $db = $self->db_path($uuid);
2008 my $db_lock = "$db.lock";
373274f9
EW
2009 my $sig;
2010 if ($update_ref) {
2011 $SIG{INT} = $SIG{HUP} = $SIG{TERM} = $SIG{ALRM} = $SIG{PIPE} =
2012 $SIG{USR1} = $SIG{USR2} = sub { $sig = $_[0] };
2013 }
26a62d57
EW
2014 mkfile($db);
2015
373274f9 2016 $LOCKFILES{$db_lock} = 1;
97ae0911 2017 my $sync;
97ae0911
EW
2018 # both of these options make our .rev_db file very, very important
2019 # and we can't afford to lose it because rebuild() won't work
2020 if ($self->use_svm_props || $self->no_metadata) {
2021 $sync = 1;
373274f9 2022 copy($db, $db_lock) or die "rev_db_set(@_): ",
26a62d57 2023 "Failed to copy: ",
373274f9
EW
2024 "$db => $db_lock ($!)\n";
2025 } else {
2026 rename $db, $db_lock or die "rev_db_set(@_): ",
26a62d57 2027 "Failed to rename: ",
373274f9
EW
2028 "$db => $db_lock ($!)\n";
2029 }
26a62d57
EW
2030 open my $fh, '+<', $db_lock or die "Couldn't open $db_lock: $!\n";
2031 _rev_db_set($fh, $rev, $commit);
97ae0911
EW
2032 if ($sync) {
2033 $fh->flush or die "Couldn't flush $db_lock: $!\n";
2034 $fh->sync or die "Couldn't sync $db_lock: $!\n";
2035 }
9b981fc6 2036 close $fh or croak $!;
373274f9 2037 if ($update_ref) {
1e889ef3 2038 $_head = $self;
373274f9
EW
2039 command_noisy('update-ref', '-m', "r$rev",
2040 $self->refname, $commit);
2041 }
2042 rename $db_lock, $db or die "rev_db_set(@_): ", "Failed to rename: ",
2043 "$db_lock => $db ($!)\n";
2044 delete $LOCKFILES{$db_lock};
2045 if ($update_ref) {
2046 $SIG{INT} = $SIG{HUP} = $SIG{TERM} = $SIG{ALRM} = $SIG{PIPE} =
2047 $SIG{USR1} = $SIG{USR2} = 'DEFAULT';
2048 kill $sig, $$ if defined $sig;
2049 }
9b981fc6
EW
2050}
2051
9c93fee5
EW
2052sub rev_db_max {
2053 my ($self) = @_;
d6d3346b 2054 $self->rebuild;
26a62d57
EW
2055 my $db_path = $self->db_path;
2056 my @stat = stat $db_path or return 0;
2057 ($stat[7] % 41) == 0 or die "$db_path inconsistent size: $stat[7]\n";
9c93fee5
EW
2058 my $max = $stat[7] / 41;
2059 (($max > 0) ? $max - 1 : 0);
2060}
2061
9b981fc6 2062sub rev_db_get {
26a62d57 2063 my ($self, $rev, $uuid) = @_;
9b981fc6
EW
2064 my $ret;
2065 my $offset = $rev * 41;
26a62d57
EW
2066 my $db_path = $self->db_path($uuid);
2067 return undef unless -e $db_path;
2068 open my $fh, '<', $db_path or croak $!;
ce4b4af7
EW
2069 if (sysseek($fh, $offset, 0) == $offset) {
2070 my $read = sysread($fh, $ret, 40);
2071 $ret = undef if ($read != 40 || $ret eq ('0'x40));
9b981fc6
EW
2072 }
2073 close $fh or croak $!;
2074 $ret;
2075}
2076
15710b6f
EW
2077sub find_rev_before {
2078 my ($self, $rev, $eq_ok) = @_;
2079 --$rev unless $eq_ok;
2080 while ($rev > 0) {
2081 if (my $c = $self->rev_db_get($rev)) {
2082 return ($rev, $c);
2083 }
2084 --$rev;
2085 }
2086 return (undef, undef);
2087}
2088
9b981fc6 2089sub _new {
706587fc
EW
2090 my ($class, $repo_id, $ref_id, $path) = @_;
2091 unless (defined $repo_id && length $repo_id) {
2092 $repo_id = $Git::SVN::default_repo_id;
2093 }
2094 unless (defined $ref_id && length $ref_id) {
8b8fc068 2095 $_[2] = $ref_id = $Git::SVN::default_ref_id;
706587fc
EW
2096 }
2097 $_[1] = $repo_id = sanitize_remote_name($repo_id);
2098 my $dir = "$ENV{GIT_DIR}/svn/$ref_id";
2099 $_[3] = $path = '' unless (defined $path);
b4d57e5e 2100 mkpath(["$ENV{GIT_DIR}/svn"]);
26a62d57
EW
2101 bless {
2102 ref_id => $ref_id, dir => $dir, index => "$dir/index",
8a49ee97 2103 path => $path, config => "$ENV{GIT_DIR}/svn/config",
26a62d57
EW
2104 db_root => "$dir/.rev_db", repo_id => $repo_id }, $class;
2105}
2106
2107sub db_path {
2108 my ($self, $uuid) = @_;
2109 $uuid ||= $self->ra_uuid;
2110 "$self->{db_root}.$uuid";
9b981fc6
EW
2111}
2112
1c8443b0
EW
2113sub uri_encode {
2114 my ($f) = @_;
2115 $f =~ s#([^a-zA-Z0-9\*!\:_\./\-])#uc sprintf("%%%02x",ord($1))#eg;
2116 $f
2117}
9b981fc6 2118
18ea92bd
SV
2119sub remove_username {
2120 $_[0] =~ s{^([^:]*://)[^@]+@}{$1};
2121}
2122
d976acfd
EW
2123package Git::SVN::Prompt;
2124use strict;
2125use warnings;
2126require SVN::Core;
2127use vars qw/$_no_auth_cache $_username/;
2128
2129sub simple {
30d055aa
EW
2130 my ($cred, $realm, $default_username, $may_save, $pool) = @_;
2131 $may_save = undef if $_no_auth_cache;
2132 $default_username = $_username if defined $_username;
2133 if (defined $default_username && length $default_username) {
2134 if (defined $realm && length $realm) {
6f729591
EW
2135 print STDERR "Authentication realm: $realm\n";
2136 STDERR->flush;
30d055aa
EW
2137 }
2138 $cred->username($default_username);
2139 } else {
d976acfd 2140 username($cred, $realm, $may_save, $pool);
30d055aa
EW
2141 }
2142 $cred->password(_read_password("Password for '" .
2143 $cred->username . "': ", $realm));
2144 $cred->may_save($may_save);
2145 $SVN::_Core::SVN_NO_ERROR;
2146}
2147
d976acfd 2148sub ssl_server_trust {
30d055aa
EW
2149 my ($cred, $realm, $failures, $cert_info, $may_save, $pool) = @_;
2150 $may_save = undef if $_no_auth_cache;
6f729591 2151 print STDERR "Error validating server certificate for '$realm':\n";
30d055aa 2152 if ($failures & $SVN::Auth::SSL::UNKNOWNCA) {
6f729591 2153 print STDERR " - The certificate is not issued by a trusted ",
30d055aa
EW
2154 "authority. Use the\n",
2155 " fingerprint to validate the certificate manually!\n";
2156 }
2157 if ($failures & $SVN::Auth::SSL::CNMISMATCH) {
6f729591 2158 print STDERR " - The certificate hostname does not match.\n";
30d055aa
EW
2159 }
2160 if ($failures & $SVN::Auth::SSL::NOTYETVALID) {
6f729591 2161 print STDERR " - The certificate is not yet valid.\n";
30d055aa
EW
2162 }
2163 if ($failures & $SVN::Auth::SSL::EXPIRED) {
6f729591 2164 print STDERR " - The certificate has expired.\n";
30d055aa
EW
2165 }
2166 if ($failures & $SVN::Auth::SSL::OTHER) {
6f729591 2167 print STDERR " - The certificate has an unknown error.\n";
30d055aa 2168 }
6f729591
EW
2169 printf STDERR
2170 "Certificate information:\n".
30d055aa
EW
2171 " - Hostname: %s\n".
2172 " - Valid: from %s until %s\n".
2173 " - Issuer: %s\n".
2174 " - Fingerprint: %s\n",
2175 map $cert_info->$_, qw(hostname valid_from valid_until
6f729591 2176 issuer_dname fingerprint);
30d055aa
EW
2177 my $choice;
2178prompt:
6f729591 2179 print STDERR $may_save ?
30d055aa
EW
2180 "(R)eject, accept (t)emporarily or accept (p)ermanently? " :
2181 "(R)eject or accept (t)emporarily? ";
6f729591 2182 STDERR->flush;
30d055aa
EW
2183 $choice = lc(substr(<STDIN> || 'R', 0, 1));
2184 if ($choice =~ /^t$/i) {
2185 $cred->may_save(undef);
2186 } elsif ($choice =~ /^r$/i) {
2187 return -1;
2188 } elsif ($may_save && $choice =~ /^p$/i) {
2189 $cred->may_save($may_save);
2190 } else {
2191 goto prompt;
2192 }
2193 $cred->accepted_failures($failures);
2194 $SVN::_Core::SVN_NO_ERROR;
2195}
2196
d976acfd 2197sub ssl_client_cert {
30d055aa
EW
2198 my ($cred, $realm, $may_save, $pool) = @_;
2199 $may_save = undef if $_no_auth_cache;
6f729591
EW
2200 print STDERR "Client certificate filename: ";
2201 STDERR->flush;
30d055aa
EW
2202 chomp(my $filename = <STDIN>);
2203 $cred->cert_file($filename);
2204 $cred->may_save($may_save);
2205 $SVN::_Core::SVN_NO_ERROR;
2206}
2207
d976acfd 2208sub ssl_client_cert_pw {
30d055aa
EW
2209 my ($cred, $realm, $may_save, $pool) = @_;
2210 $may_save = undef if $_no_auth_cache;
2211 $cred->password(_read_password("Password: ", $realm));
2212 $cred->may_save($may_save);
2213 $SVN::_Core::SVN_NO_ERROR;
2214}
2215
d976acfd 2216sub username {
30d055aa
EW
2217 my ($cred, $realm, $may_save, $pool) = @_;
2218 $may_save = undef if $_no_auth_cache;
2219 if (defined $realm && length $realm) {
6f729591 2220 print STDERR "Authentication realm: $realm\n";
30d055aa
EW
2221 }
2222 my $username;
2223 if (defined $_username) {
2224 $username = $_username;
2225 } else {
6f729591
EW
2226 print STDERR "Username: ";
2227 STDERR->flush;
30d055aa
EW
2228 chomp($username = <STDIN>);
2229 }
2230 $cred->username($username);
2231 $cred->may_save($may_save);
2232 $SVN::_Core::SVN_NO_ERROR;
2233}
2234
2235sub _read_password {
2236 my ($prompt, $realm) = @_;
6f729591
EW
2237 print STDERR $prompt;
2238 STDERR->flush;
30d055aa
EW
2239 require Term::ReadKey;
2240 Term::ReadKey::ReadMode('noecho');
2241 my $password = '';
2242 while (defined(my $key = Term::ReadKey::ReadKey(0))) {
2243 last if $key =~ /[\012\015]/; # \n\r
2244 $password .= $key;
2245 }
2246 Term::ReadKey::ReadMode('restore');
6f729591
EW
2247 print STDERR "\n";
2248 STDERR->flush;
30d055aa
EW
2249 $password;
2250}
2251
d976acfd
EW
2252package main;
2253
b9c85187
EW
2254{
2255 my $kill_stupid_warnings = $SVN::Node::none.$SVN::Node::file.
2256 $SVN::Node::dir.$SVN::Node::unknown.
2257 $SVN::Node::none.$SVN::Node::file.
2258 $SVN::Node::dir.$SVN::Node::unknown.
2259 $SVN::Auth::SSL::CNMISMATCH.
2260 $SVN::Auth::SSL::NOTYETVALID.
2261 $SVN::Auth::SSL::EXPIRED.
2262 $SVN::Auth::SSL::UNKNOWNCA.
2263 $SVN::Auth::SSL::OTHER;
2264}
2265
27a1a801
EW
2266package SVN::Git::Fetcher;
2267use vars qw/@ISA/;
2268use strict;
2269use warnings;
2270use Carp qw/croak/;
2271use IO::File qw//;
90c1b15d 2272use Digest::MD5;
27a1a801
EW
2273
2274# file baton members: path, mode_a, mode_b, pool, fh, blob, base
2275sub new {
2276 my ($class, $git_svn) = @_;
2277 my $self = SVN::Delta::Editor->new;
2278 bless $self, $class;
1c8443b0 2279 $self->{c} = $git_svn->{last_commit} if exists $git_svn->{last_commit};
d2a9a87b
EW
2280 $self->{empty} = {};
2281 $self->{dir_prop} = {};
2282 $self->{file_prop} = {};
2283 $self->{absent_dir} = {};
2284 $self->{absent_file} = {};
ef3cfaad 2285 $self->{gii} = $git_svn->tmp_index_do(sub { Git::IndexInfo->new });
27a1a801
EW
2286 $self;
2287}
2288
8b8fc068
EW
2289sub set_path_strip {
2290 my ($self, $path) = @_;
4e9f6cc7 2291 $self->{path_strip} = qr/^\Q$path\E(\/|$)/ if length $path;
8b8fc068
EW
2292}
2293
d2a9a87b
EW
2294sub open_root {
2295 { path => '' };
2296}
2297
2298sub open_directory {
2299 my ($self, $path, $pb, $rev) = @_;
2300 { path => $path };
2301}
2302
706587fc
EW
2303sub git_path {
2304 my ($self, $path) = @_;
2b27f6c8
EW
2305 if ($self->{path_strip}) {
2306 $path =~ s!$self->{path_strip}!! or
2307 die "Failed to strip path '$path' ($self->{path_strip})\n";
2308 }
706587fc
EW
2309 $path;
2310}
2311
27a1a801
EW
2312sub delete_entry {
2313 my ($self, $path, $rev, $pb) = @_;
4a87db0e 2314
706587fc 2315 my $gpath = $self->git_path($path);
8a603774
EW
2316 return undef if ($gpath eq '');
2317
4a87db0e 2318 # remove entire directories.
706587fc 2319 if (command('ls-tree', $self->{c}, '--', $gpath) =~ /^040000 tree/) {
4a87db0e
EW
2320 my ($ls, $ctx) = command_output_pipe(qw/ls-tree
2321 -r --name-only -z/,
706587fc 2322 $self->{c}, '--', $gpath);
4a87db0e
EW
2323 local $/ = "\0";
2324 while (<$ls>) {
ef3cfaad
EW
2325 chomp;
2326 $self->{gii}->remove($_);
9e3cdbd4 2327 print "\tD\t$_\n" unless $::_q;
4a87db0e 2328 }
9e3cdbd4 2329 print "\tD\t$gpath/\n" unless $::_q;
4a87db0e
EW
2330 command_close_pipe($ls, $ctx);
2331 $self->{empty}->{$path} = 0
2332 } else {
ef3cfaad 2333 $self->{gii}->remove($gpath);
9e3cdbd4 2334 print "\tD\t$gpath\n" unless $::_q;
4a87db0e 2335 }
27a1a801
EW
2336 undef;
2337}
2338
2339sub open_file {
2340 my ($self, $path, $pb, $rev) = @_;
706587fc
EW
2341 my $gpath = $self->git_path($path);
2342 my ($mode, $blob) = (command('ls-tree', $self->{c}, '--', $gpath)
27a1a801 2343 =~ /^(\d{6}) blob ([a-f\d]{40})\t/);
006ede5e
EW
2344 unless (defined $mode && defined $blob) {
2345 die "$path was not found in commit $self->{c} (r$rev)\n";
2346 }
27a1a801 2347 { path => $path, mode_a => $mode, mode_b => $mode, blob => $blob,
0864e3ba 2348 pool => SVN::Pool->new, action => 'M' };
27a1a801
EW
2349}
2350
2351sub add_file {
2352 my ($self, $path, $pb, $cp_path, $cp_rev) = @_;
d2a9a87b
EW
2353 my ($dir, $file) = ($path =~ m#^(.*?)/?([^/]+)$#);
2354 delete $self->{empty}->{$dir};
27a1a801 2355 { path => $path, mode_a => 100644, mode_b => 100644,
0864e3ba 2356 pool => SVN::Pool->new, action => 'A' };
27a1a801
EW
2357}
2358
d2a9a87b
EW
2359sub add_directory {
2360 my ($self, $path, $cp_path, $cp_rev) = @_;
2361 my ($dir, $file) = ($path =~ m#^(.*?)/?([^/]+)$#);
2362 delete $self->{empty}->{$dir};
2363 $self->{empty}->{$path} = 1;
2364 { path => $path };
2365}
2366
2367sub change_dir_prop {
2368 my ($self, $db, $prop, $value) = @_;
2369 $self->{dir_prop}->{$db->{path}} ||= {};
2370 $self->{dir_prop}->{$db->{path}}->{$prop} = $value;
2371 undef;
2372}
2373
2374sub absent_directory {
2375 my ($self, $path, $pb) = @_;
2376 $self->{absent_dir}->{$pb->{path}} ||= [];
2377 push @{$self->{absent_dir}->{$pb->{path}}}, $path;
2378 undef;
2379}
2380
2381sub absent_file {
2382 my ($self, $path, $pb) = @_;
2383 $self->{absent_file}->{$pb->{path}} ||= [];
2384 push @{$self->{absent_file}->{$pb->{path}}}, $path;
2385 undef;
2386}
2387
27a1a801
EW
2388sub change_file_prop {
2389 my ($self, $fb, $prop, $value) = @_;
2390 if ($prop eq 'svn:executable') {
2391 if ($fb->{mode_b} != 120000) {
2392 $fb->{mode_b} = defined $value ? 100755 : 100644;
2393 }
2394 } elsif ($prop eq 'svn:special') {
2395 $fb->{mode_b} = defined $value ? 120000 : 100644;
d2a9a87b
EW
2396 } else {
2397 $self->{file_prop}->{$fb->{path}} ||= {};
2398 $self->{file_prop}->{$fb->{path}}->{$prop} = $value;
27a1a801
EW
2399 }
2400 undef;
2401}
2402
2403sub apply_textdelta {
2404 my ($self, $fb, $exp) = @_;
2405 my $fh = IO::File->new_tmpfile;
2406 $fh->autoflush(1);
2407 # $fh gets auto-closed() by SVN::TxDelta::apply(),
2408 # (but $base does not,) so dup() it for reading in close_file
2409 open my $dup, '<&', $fh or croak $!;
2410 my $base = IO::File->new_tmpfile;
2411 $base->autoflush(1);
2412 if ($fb->{blob}) {
2413 defined (my $pid = fork) or croak $!;
2414 if (!$pid) {
2415 open STDOUT, '>&', $base or croak $!;
2416 print STDOUT 'link ' if ($fb->{mode_a} == 120000);
2417 exec qw/git-cat-file blob/, $fb->{blob} or croak $!;
2418 }
2419 waitpid $pid, 0;
2420 croak $? if $?;
2421
2422 if (defined $exp) {
2423 seek $base, 0, 0 or croak $!;
2424 my $md5 = Digest::MD5->new;
2425 $md5->addfile($base);
2426 my $got = $md5->hexdigest;
2427 die "Checksum mismatch: $fb->{path} $fb->{blob}\n",
2428 "expected: $exp\n",
2429 " got: $got\n" if ($got ne $exp);
2430 }
2431 }
2432 seek $base, 0, 0 or croak $!;
2433 $fb->{fh} = $dup;
2434 $fb->{base} = $base;
2435 [ SVN::TxDelta::apply($base, $fh, undef, $fb->{path}, $fb->{pool}) ];
2436}
2437
2438sub close_file {
2439 my ($self, $fb, $exp) = @_;
2440 my $hash;
706587fc 2441 my $path = $self->git_path($fb->{path});
27a1a801
EW
2442 if (my $fh = $fb->{fh}) {
2443 seek($fh, 0, 0) or croak $!;
2444 my $md5 = Digest::MD5->new;
2445 $md5->addfile($fh);
2446 my $got = $md5->hexdigest;
2447 die "Checksum mismatch: $path\n",
2448 "expected: $exp\n got: $got\n" if ($got ne $exp);
2449 seek($fh, 0, 0) or croak $!;
2450 if ($fb->{mode_b} == 120000) {
2451 read($fh, my $buf, 5) == 5 or croak $!;
2452 $buf eq 'link ' or die "$path has mode 120000",
2453 "but is not a link\n";
2454 }
2455 defined(my $pid = open my $out,'-|') or die "Can't fork: $!\n";
2456 if (!$pid) {
2457 open STDIN, '<&', $fh or croak $!;
2458 exec qw/git-hash-object -w --stdin/ or croak $!;
2459 }
2460 chomp($hash = do { local $/; <$out> });
2461 close $out or croak $!;
2462 close $fh or croak $!;
2463 $hash =~ /^[a-f\d]{40}$/ or die "not a sha1: $hash\n";
2464 close $fb->{base} or croak $!;
2465 } else {
2466 $hash = $fb->{blob} or die "no blob information\n";
2467 }
2468 $fb->{pool}->clear;
ef3cfaad 2469 $self->{gii}->update($fb->{mode_b}, $hash, $path) or croak $!;
9e3cdbd4 2470 print "\t$fb->{action}\t$path\n" if $fb->{action} && ! $::_q;
27a1a801
EW
2471 undef;
2472}
2473
2474sub abort_edit {
2475 my $self = shift;
ef3cfaad
EW
2476 $self->{nr} = $self->{gii}->{nr};
2477 delete $self->{gii};
27a1a801
EW
2478 $self->SUPER::abort_edit(@_);
2479}
2480
2481sub close_edit {
2482 my $self = shift;
dad73c0b 2483 $self->{git_commit_ok} = 1;
ef3cfaad
EW
2484 $self->{nr} = $self->{gii}->{nr};
2485 delete $self->{gii};
27a1a801
EW
2486 $self->SUPER::close_edit(@_);
2487}
1a82e793 2488
a5e0cedc 2489package SVN::Git::Editor;
24e22aa8 2490use vars qw/@ISA $_rmdir $_cp_similarity $_find_copies_harder $_rename_limit/;
a5e0cedc
EW
2491use strict;
2492use warnings;
2493use Carp qw/croak/;
2494use IO::File;
90c1b15d 2495use Digest::MD5;
a5e0cedc
EW
2496
2497sub new {
61395354
EW
2498 my ($class, $opts) = @_;
2499 foreach (qw/svn_path r ra tree_a tree_b log editor_cb/) {
2500 die "$_ required!\n" unless (defined $opts->{$_});
2501 }
2502
2503 my $pool = SVN::Pool->new;
2504 my $mods = generate_diff($opts->{tree_a}, $opts->{tree_b});
2505 my $types = check_diff_paths($opts->{ra}, $opts->{svn_path},
2506 $opts->{r}, $mods);
2507
2508 # $opts->{ra} functions should not be used after this:
2509 my @ce = $opts->{ra}->get_commit_editor($opts->{log},
2510 $opts->{editor_cb}, $pool);
2511 my $self = SVN::Delta::Editor->new(@ce, $pool);
a5e0cedc 2512 bless $self, $class;
61395354
EW
2513 foreach (qw/svn_path r tree_a tree_b/) {
2514 $self->{$_} = $opts->{$_};
a5e0cedc 2515 }
61395354
EW
2516 $self->{url} = $opts->{ra}->{url};
2517 $self->{mods} = $mods;
2518 $self->{types} = $types;
2519 $self->{pool} = $pool;
a5e0cedc
EW
2520 $self->{bat} = { '' => $self->open_root($self->{r}, $self->{pool}) };
2521 $self->{rm} = { };
d3a840dc
EW
2522 $self->{path_prefix} = length $self->{svn_path} ?
2523 "$self->{svn_path}/" : '';
a5e0cedc
EW
2524 return $self;
2525}
2526
61395354
EW
2527sub generate_diff {
2528 my ($tree_a, $tree_b) = @_;
2529 my @diff_tree = qw(diff-tree -z -r);
24e22aa8
EW
2530 if ($_cp_similarity) {
2531 push @diff_tree, "-C$_cp_similarity";
61395354
EW
2532 } else {
2533 push @diff_tree, '-C';
2534 }
24e22aa8
EW
2535 push @diff_tree, '--find-copies-harder' if $_find_copies_harder;
2536 push @diff_tree, "-l$_rename_limit" if defined $_rename_limit;
61395354
EW
2537 push @diff_tree, $tree_a, $tree_b;
2538 my ($diff_fh, $ctx) = command_output_pipe(@diff_tree);
2539 local $/ = "\0";
2540 my $state = 'meta';
2541 my @mods;
2542 while (<$diff_fh>) {
2543 chomp $_; # this gets rid of the trailing "\0"
2544 if ($state eq 'meta' && /^:(\d{6})\s(\d{6})\s
2545 $::sha1\s($::sha1)\s
2546 ([MTCRAD])\d*$/xo) {
2547 push @mods, { mode_a => $1, mode_b => $2,
2548 sha1_b => $3, chg => $4 };
2549 if ($4 =~ /^(?:C|R)$/) {
2550 $state = 'file_a';
2551 } else {
2552 $state = 'file_b';
2553 }
2554 } elsif ($state eq 'file_a') {
2555 my $x = $mods[$#mods] or croak "Empty array\n";
2556 if ($x->{chg} !~ /^(?:C|R)$/) {
2557 croak "Error parsing $_, $x->{chg}\n";
2558 }
2559 $x->{file_a} = $_;
2560 $state = 'file_b';
2561 } elsif ($state eq 'file_b') {
2562 my $x = $mods[$#mods] or croak "Empty array\n";
2563 if (exists $x->{file_a} && $x->{chg} !~ /^(?:C|R)$/) {
2564 croak "Error parsing $_, $x->{chg}\n";
2565 }
2566 if (!exists $x->{file_a} && $x->{chg} =~ /^(?:C|R)$/) {
2567 croak "Error parsing $_, $x->{chg}\n";
2568 }
2569 $x->{file_b} = $_;
2570 $state = 'meta';
2571 } else {
2572 croak "Error parsing $_\n";
2573 }
2574 }
2575 command_close_pipe($diff_fh, $ctx);
2576 \@mods;
2577}
2578
2579sub check_diff_paths {
2580 my ($ra, $pfx, $rev, $mods) = @_;
2581 my %types;
2582 $pfx .= '/' if length $pfx;
2583
2584 sub type_diff_paths {
2585 my ($ra, $types, $path, $rev) = @_;
2586 my @p = split m#/+#, $path;
2587 my $c = shift @p;
2588 unless (defined $types->{$c}) {
2589 $types->{$c} = $ra->check_path($c, $rev);
2590 }
2591 while (@p) {
2592 $c .= '/' . shift @p;
2593 next if defined $types->{$c};
2594 $types->{$c} = $ra->check_path($c, $rev);
2595 }
2596 }
2597
2598 foreach my $m (@$mods) {
2599 foreach my $f (qw/file_a file_b/) {
2600 next unless defined $m->{$f};
2601 my ($dir) = ($m->{$f} =~ m#^(.*?)/?(?:[^/]+)$#);
2602 if (length $pfx.$dir && ! defined $types{$dir}) {
2603 type_diff_paths($ra, \%types, $pfx.$dir, $rev);
2604 }
2605 }
2606 }
2607 \%types;
2608}
2609
a5e0cedc
EW
2610sub split_path {
2611 return ($_[0] =~ m#^(.*?)/?([^/]+)$#);
2612}
2613
2614sub repo_path {
d3a840dc
EW
2615 my ($self, $path) = @_;
2616 $self->{path_prefix}.(defined $path ? $path : '');
a5e0cedc
EW
2617}
2618
2619sub url_path {
2620 my ($self, $path) = @_;
6e8548cc 2621 $self->{url} . '/' . $self->repo_path($path);
a5e0cedc
EW
2622}
2623
2624sub rmdirs {
61395354 2625 my ($self) = @_;
a5e0cedc
EW
2626 my $rm = $self->{rm};
2627 delete $rm->{''}; # we never delete the url we're tracking
2628 return unless %$rm;
2629
2630 foreach (keys %$rm) {
2631 my @d = split m#/#, $_;
2632 my $c = shift @d;
2633 $rm->{$c} = 1;
2634 while (@d) {
2635 $c .= '/' . shift @d;
2636 $rm->{$c} = 1;
2637 }
2638 }
2639 delete $rm->{$self->{svn_path}};
2640 delete $rm->{''}; # we never delete the url we're tracking
2641 return unless %$rm;
2642
61395354
EW
2643 my ($fh, $ctx) = command_output_pipe(qw/ls-tree --name-only -r -z/,
2644 $self->{tree_b});
a5e0cedc
EW
2645 local $/ = "\0";
2646 while (<$fh>) {
2647 chomp;
747fa12c 2648 my @dn = split m#/#, $_;
c07eee1f
EW
2649 while (pop @dn) {
2650 delete $rm->{join '/', @dn};
2651 }
2652 unless (%$rm) {
22600a25 2653 close $fh;
c07eee1f
EW
2654 return;
2655 }
a5e0cedc 2656 }
aef4e921 2657 command_close_pipe($fh, $ctx);
c07eee1f 2658
a5e0cedc
EW
2659 my ($r, $p, $bat) = ($self->{r}, $self->{pool}, $self->{bat});
2660 foreach my $d (sort { $b =~ tr#/#/# <=> $a =~ tr#/#/# } keys %$rm) {
2661 $self->close_directory($bat->{$d}, $p);
2662 my ($dn) = ($d =~ m#^(.*?)/?(?:[^/]+)$#);
44320b9e 2663 print "\tD+\t$d/\n" unless $::_q;
a5e0cedc
EW
2664 $self->SUPER::delete_entry($d, $r, $bat->{$dn}, $p);
2665 delete $bat->{$d};
2666 }
2667}
2668
2669sub open_or_add_dir {
2670 my ($self, $full_path, $baton) = @_;
6e8548cc
EW
2671 my $t = $self->{types}->{$full_path};
2672 if (!defined $t) {
2673 die "$full_path not known in r$self->{r} or we have a bug!\n";
2674 }
a5e0cedc
EW
2675 if ($t == $SVN::Node::none) {
2676 return $self->add_directory($full_path, $baton,
2677 undef, -1, $self->{pool});
2678 } elsif ($t == $SVN::Node::dir) {
2679 return $self->open_directory($full_path, $baton,
2680 $self->{r}, $self->{pool});
2681 }
2682 print STDERR "$full_path already exists in repository at ",
2683 "r$self->{r} and it is not a directory (",
2684 ($t == $SVN::Node::file ? 'file' : 'unknown'),"/$t)\n";
2685 exit 1;
2686}
2687
2688sub ensure_path {
2689 my ($self, $path) = @_;
2690 my $bat = $self->{bat};
6e8548cc
EW
2691 my $repo_path = $self->repo_path($path);
2692 return $bat->{''} unless (length $repo_path);
2693 my @p = split m#/+#, $repo_path;
a5e0cedc
EW
2694 my $c = shift @p;
2695 $bat->{$c} ||= $self->open_or_add_dir($c, $bat->{''});
2696 while (@p) {
2697 my $c0 = $c;
2698 $c .= '/' . shift @p;
2699 $bat->{$c} ||= $self->open_or_add_dir($c, $bat->{$c0});
2700 }
2701 return $bat->{$c};
2702}
2703
2704sub A {
44320b9e 2705 my ($self, $m) = @_;
a5e0cedc
EW
2706 my ($dir, $file) = split_path($m->{file_b});
2707 my $pbat = $self->ensure_path($dir);
2708 my $fbat = $self->add_file($self->repo_path($m->{file_b}), $pbat,
2709 undef, -1);
44320b9e 2710 print "\tA\t$m->{file_b}\n" unless $::_q;
a5e0cedc
EW
2711 $self->chg_file($fbat, $m);
2712 $self->close_file($fbat,undef,$self->{pool});
2713}
2714
2715sub C {
44320b9e 2716 my ($self, $m) = @_;
a5e0cedc
EW
2717 my ($dir, $file) = split_path($m->{file_b});
2718 my $pbat = $self->ensure_path($dir);
2719 my $fbat = $self->add_file($self->repo_path($m->{file_b}), $pbat,
2720 $self->url_path($m->{file_a}), $self->{r});
44320b9e 2721 print "\tC\t$m->{file_a} => $m->{file_b}\n" unless $::_q;
a5e0cedc
EW
2722 $self->chg_file($fbat, $m);
2723 $self->close_file($fbat,undef,$self->{pool});
2724}
2725
2726sub delete_entry {
2727 my ($self, $path, $pbat) = @_;
2728 my $rpath = $self->repo_path($path);
2729 my ($dir, $file) = split_path($rpath);
2730 $self->{rm}->{$dir} = 1;
2731 $self->SUPER::delete_entry($rpath, $self->{r}, $pbat, $self->{pool});
2732}
2733
2734sub R {
44320b9e 2735 my ($self, $m) = @_;
a5e0cedc
EW
2736 my ($dir, $file) = split_path($m->{file_b});
2737 my $pbat = $self->ensure_path($dir);
2738 my $fbat = $self->add_file($self->repo_path($m->{file_b}), $pbat,
2739 $self->url_path($m->{file_a}), $self->{r});
44320b9e 2740 print "\tR\t$m->{file_a} => $m->{file_b}\n" unless $::_q;
a5e0cedc
EW
2741 $self->chg_file($fbat, $m);
2742 $self->close_file($fbat,undef,$self->{pool});
2743
2744 ($dir, $file) = split_path($m->{file_a});
2745 $pbat = $self->ensure_path($dir);
2746 $self->delete_entry($m->{file_a}, $pbat);
2747}
2748
2749sub M {
44320b9e 2750 my ($self, $m) = @_;
a5e0cedc
EW
2751 my ($dir, $file) = split_path($m->{file_b});
2752 my $pbat = $self->ensure_path($dir);
2753 my $fbat = $self->open_file($self->repo_path($m->{file_b}),
2754 $pbat,$self->{r},$self->{pool});
44320b9e 2755 print "\t$m->{chg}\t$m->{file_b}\n" unless $::_q;
a5e0cedc
EW
2756 $self->chg_file($fbat, $m);
2757 $self->close_file($fbat,undef,$self->{pool});
2758}
2759
2760sub T { shift->M(@_) }
2761
2762sub change_file_prop {
2763 my ($self, $fbat, $pname, $pval) = @_;
2764 $self->SUPER::change_file_prop($fbat, $pname, $pval, $self->{pool});
2765}
2766
2767sub chg_file {
2768 my ($self, $fbat, $m) = @_;
2769 if ($m->{mode_b} =~ /755$/ && $m->{mode_a} !~ /755$/) {
2770 $self->change_file_prop($fbat,'svn:executable','*');
2771 } elsif ($m->{mode_b} !~ /755$/ && $m->{mode_a} =~ /755$/) {
2772 $self->change_file_prop($fbat,'svn:executable',undef);
2773 }
2774 my $fh = IO::File->new_tmpfile or croak $!;
2775 if ($m->{mode_b} =~ /^120/) {
2776 print $fh 'link ' or croak $!;
2777 $self->change_file_prop($fbat,'svn:special','*');
2778 } elsif ($m->{mode_a} =~ /^120/ && $m->{mode_b} !~ /^120/) {
2779 $self->change_file_prop($fbat,'svn:special',undef);
2780 }
2781 defined(my $pid = fork) or croak $!;
2782 if (!$pid) {
2783 open STDOUT, '>&', $fh or croak $!;
2784 exec qw/git-cat-file blob/, $m->{sha1_b} or croak $!;
2785 }
2786 waitpid $pid, 0;
2787 croak $? if $?;
2788 $fh->flush == 0 or croak $!;
2789 seek $fh, 0, 0 or croak $!;
2790
2791 my $md5 = Digest::MD5->new;
2792 $md5->addfile($fh) or croak $!;
2793 seek $fh, 0, 0 or croak $!;
2794
2795 my $exp = $md5->hexdigest;
f7197dff
EW
2796 my $pool = SVN::Pool->new;
2797 my $atd = $self->apply_textdelta($fbat, undef, $pool);
2798 my $got = SVN::TxDelta::send_stream($fh, @$atd, $pool);
a5e0cedc 2799 die "Checksum mismatch\nexpected: $exp\ngot: $got\n" if ($got ne $exp);
f7197dff 2800 $pool->clear;
a5e0cedc
EW
2801
2802 close $fh or croak $!;
2803}
2804
2805sub D {
44320b9e 2806 my ($self, $m) = @_;
a5e0cedc
EW
2807 my ($dir, $file) = split_path($m->{file_b});
2808 my $pbat = $self->ensure_path($dir);
44320b9e 2809 print "\tD\t$m->{file_b}\n" unless $::_q;
a5e0cedc
EW
2810 $self->delete_entry($m->{file_b}, $pbat);
2811}
2812
2813sub close_edit {
2814 my ($self) = @_;
2815 my ($p,$bat) = ($self->{pool}, $self->{bat});
2816 foreach (sort { $b =~ tr#/#/# <=> $a =~ tr#/#/# } keys %$bat) {
2817 $self->close_directory($bat->{$_}, $p);
2818 }
2819 $self->SUPER::close_edit($p);
2820 $p->clear;
2821}
2822
2823sub abort_edit {
2824 my ($self) = @_;
2825 $self->SUPER::abort_edit($self->{pool});
61395354
EW
2826}
2827
2828sub DESTROY {
2829 my $self = shift;
2830 $self->SUPER::DESTROY(@_);
a5e0cedc
EW
2831 $self->{pool}->clear;
2832}
2833
44320b9e
EW
2834# this drives the editor
2835sub apply_diff {
61395354
EW
2836 my ($self) = @_;
2837 my $mods = $self->{mods};
44320b9e 2838 my %o = ( D => 1, R => 0, C => -1, A => 3, M => 3, T => 3 );
6e8548cc 2839 foreach my $m (sort { $o{$a->{chg}} <=> $o{$b->{chg}} } @$mods) {
44320b9e
EW
2840 my $f = $m->{chg};
2841 if (defined $o{$f}) {
2842 $self->$f($m);
2843 } else {
2844 fatal("Invalid change type: $f\n");
2845 }
2846 }
24e22aa8 2847 $self->rmdirs if $_rmdir;
6e8548cc 2848 if (@$mods == 0) {
44320b9e
EW
2849 $self->abort_edit;
2850 } else {
2851 $self->close_edit;
2852 }
6e8548cc 2853 return scalar @$mods;
44320b9e
EW
2854}
2855
d81bf827 2856package Git::SVN::Ra;
6af1db44 2857use vars qw/@ISA $config_dir $_log_window_size/;
d81bf827
EW
2858use strict;
2859use warnings;
a6a15a99 2860my ($can_do_switch, %ignored_err, $RA);
d81bf827
EW
2861
2862BEGIN {
2863 # enforce temporary pool usage for some simple functions
2864 my $e;
74a81227 2865 foreach (qw/get_latest_revnum get_uuid get_repos_root/) {
d81bf827
EW
2866 $e .= "sub $_ {
2867 my \$self = shift;
2868 my \$pool = SVN::Pool->new;
2869 my \@ret = \$self->SUPER::$_(\@_,\$pool);
2870 \$pool->clear;
2871 wantarray ? \@ret : \$ret[0]; }\n";
2872 }
74a81227
EW
2873
2874 # get_dir needs $pool held in cache for dirents to work,
2875 # check_path is cacheable and rev_proplist is close enough
2876 # for our purposes.
2877 foreach (qw/check_path get_dir rev_proplist/) {
2878 $e .= "my \%${_}_cache; my \$${_}_rev = 0; sub $_ {
2879 my \$self = shift;
2880 my \$r = pop;
2881 my \$k = join(\"\\0\", \@_);
2882 if (my \$x = \$${_}_cache{\$r}->{\$k}) {
2883 return wantarray ? \@\$x : \$x->[0];
2884 }
2885 my \$pool = SVN::Pool->new;
2886 my \@ret = \$self->SUPER::$_(\@_, \$r, \$pool);
2887 if (\$r != \$${_}_rev) {
2888 \%${_}_cache = ( pool => [] );
2889 \$${_}_rev = \$r;
2890 }
2891 \$${_}_cache{\$r}->{\$k} = \\\@ret;
2892 push \@{\$${_}_cache{pool}}, \$pool;
2893 wantarray ? \@ret : \$ret[0]; }\n";
2894 }
2895 $e .= "\n1;";
2896 eval $e or die $@;
d81bf827
EW
2897}
2898
2899sub new {
2900 my ($class, $url) = @_;
f6f09876 2901 $url =~ s!/+$!!;
5d3b7cd5 2902 return $RA if ($RA && $RA->{url} eq $url);
e2c475d9 2903 $RA->{pool}->clear if $RA;
f6f09876 2904
d81bf827
EW
2905 SVN::_Core::svn_config_ensure($config_dir, undef);
2906 my ($baton, $callbacks) = SVN::Core::auth_open_helper([
2907 SVN::Client::get_simple_provider(),
2908 SVN::Client::get_ssl_server_trust_file_provider(),
2909 SVN::Client::get_simple_prompt_provider(
2910 \&Git::SVN::Prompt::simple, 2),
2911 SVN::Client::get_ssl_client_cert_prompt_provider(
2912 \&Git::SVN::Prompt::ssl_client_cert, 2),
2913 SVN::Client::get_ssl_client_cert_pw_prompt_provider(
2914 \&Git::SVN::Prompt::ssl_client_cert_pw, 2),
2915 SVN::Client::get_username_provider(),
2916 SVN::Client::get_ssl_server_trust_prompt_provider(
2917 \&Git::SVN::Prompt::ssl_server_trust),
2918 SVN::Client::get_username_prompt_provider(
2919 \&Git::SVN::Prompt::username, 2),
2920 ]);
2921 my $config = SVN::Core::config_get_config($config_dir);
2922 my $self = SVN::Ra->new(url => $url, auth => $baton,
2923 config => $config,
2924 pool => SVN::Pool->new,
2925 auth_provider_callbacks => $callbacks);
2926 $self->{svn_path} = $url;
2927 $self->{repos_root} = $self->get_repos_root;
4e9f6cc7 2928 $self->{svn_path} =~ s#^\Q$self->{repos_root}\E(/|$)##;
5d3b7cd5 2929 $RA = bless $self, $class;
d81bf827
EW
2930}
2931
2932sub DESTROY {
5d3b7cd5 2933 # do not call the real DESTROY since we store ourselves in $RA
d81bf827
EW
2934}
2935
d81bf827
EW
2936sub get_log {
2937 my ($self, @args) = @_;
2938 my $pool = SVN::Pool->new;
d81bf827
EW
2939 splice(@args, 3, 1) if ($SVN::Core::VERSION le '1.2.0');
2940 my $ret = $self->SUPER::get_log(@args, $pool);
2941 $pool->clear;
2942 $ret;
2943}
2944
2945sub get_commit_editor {
44320b9e 2946 my ($self, $log, $cb, $pool) = @_;
d81bf827 2947 my @lock = $SVN::Core::VERSION ge '1.2.0' ? (undef, 0) : ();
44320b9e 2948 $self->SUPER::get_commit_editor($log, $cb, @lock, $pool);
d81bf827
EW
2949}
2950
d81bf827 2951sub gs_do_update {
8a603774
EW
2952 my ($self, $rev_a, $rev_b, $gs, $editor) = @_;
2953 my $new = ($rev_a == $rev_b);
2954 my $path = $gs->{path};
2955
2e5e2480
EW
2956 if ($new && -e $gs->{index}) {
2957 unlink $gs->{index} or die
2958 "Couldn't unlink index: $gs->{index}: $!\n";
2959 }
d81bf827 2960 my $pool = SVN::Pool->new;
8b8fc068 2961 $editor->set_path_strip($path);
2b27f6c8
EW
2962 my (@pc) = split m#/#, $path;
2963 my $reporter = $self->do_update($rev_b, (@pc ? shift @pc : ''),
8a603774 2964 1, $editor, $pool);
d81bf827 2965 my @lock = $SVN::Core::VERSION ge '1.2.0' ? (undef) : ();
2b27f6c8
EW
2966
2967 # Since we can't rely on svn_ra_reparent being available, we'll
2968 # just have to do some magic with set_path to make it so
2969 # we only want a partial path.
2970 my $sp = '';
2971 my $final = join('/', @pc);
2972 while (@pc) {
2973 $reporter->set_path($sp, $rev_b, 0, @lock, $pool);
2974 $sp .= '/' if length $sp;
2975 $sp .= shift @pc;
2976 }
2977 die "BUG: '$sp' != '$final'\n" if ($sp ne $final);
2978
2b27f6c8
EW
2979 $reporter->set_path($sp, $rev_a, $new, @lock, $pool);
2980
d81bf827
EW
2981 $reporter->finish_report($pool);
2982 $pool->clear;
2983 $editor->{git_commit_ok};
2984}
2985
2b27f6c8
EW
2986# this requires SVN 1.4.3 or later (do_switch didn't work before 1.4.3, and
2987# svn_ra_reparent didn't work before 1.4)
d81bf827 2988sub gs_do_switch {
8a603774
EW
2989 my ($self, $rev_a, $rev_b, $gs, $url_b, $editor) = @_;
2990 my $path = $gs->{path};
d81bf827 2991 my $pool = SVN::Pool->new;
2b27f6c8
EW
2992
2993 my $full_url = $self->{url};
2994 my $old_url = $full_url;
2995 $full_url .= "/$path" if length $path;
5d3b7cd5
EW
2996 my ($ra, $reparented);
2997 if ($old_url ne $full_url) {
2998 if ($old_url !~ m#^svn(\+ssh)?://#) {
2999 SVN::_Ra::svn_ra_reparent($self->{session}, $full_url,
3000 $pool);
3001 $self->{url} = $full_url;
3002 $reparented = 1;
3003 } else {
3004 $ra = Git::SVN::Ra->new($full_url);
3005 }
3006 }
3007 $ra ||= $self;
8a603774 3008 my $reporter = $ra->do_switch($rev_b, '', 1, $url_b, $editor, $pool);
d81bf827 3009 my @lock = $SVN::Core::VERSION ge '1.2.0' ? (undef) : ();
8b8fc068 3010 $reporter->set_path('', $rev_a, 0, @lock, $pool);
d81bf827 3011 $reporter->finish_report($pool);
2b27f6c8 3012
5d3b7cd5
EW
3013 if ($reparented) {
3014 SVN::_Ra::svn_ra_reparent($self->{session}, $old_url, $pool);
3015 $self->{url} = $old_url;
3016 }
2b27f6c8 3017
d81bf827
EW
3018 $pool->clear;
3019 $editor->{git_commit_ok};
3020}
3021
0af9c9f9 3022sub gs_fetch_loop_common {
e518192f
EW
3023 my ($self, $base, $head, $gsv, $globs) = @_;
3024 return if ($base > $head);
6af1db44 3025 my $inc = $_log_window_size;
0af9c9f9 3026 my ($min, $max) = ($base, $head < $base + $inc ? $head : $base + $inc);
d2ae1434 3027 my %common;
e518192f
EW
3028 my $common_max = scalar @$gsv;
3029
3030 foreach my $gs (@$gsv) {
d2ae1434
EW
3031 my @tmp = split m#/#, $gs->{path};
3032 my $p = '';
3033 foreach (@tmp) {
3034 $p .= length($p) ? "/$_" : $_;
3035 $common{$p} ||= 0;
3036 $common{$p}++;
3037 }
3038 }
e518192f
EW
3039 $globs ||= [];
3040 $common_max += scalar @$globs;
3041 foreach my $glob (@$globs) {
3042 my @tmp = split m#/#, $glob->{path}->{left};
3043 my $p = '';
3044 foreach (@tmp) {
3045 $p .= length($p) ? "/$_" : $_;
3046 $common{$p} ||= 0;
3047 $common{$p}++;
3048 }
3049 }
3050
d2ae1434
EW
3051 my $longest_path = '';
3052 foreach (sort {length $b <=> length $a} keys %common) {
e518192f 3053 if ($common{$_} == $common_max) {
d2ae1434
EW
3054 $longest_path = $_;
3055 last;
3056 }
0af9c9f9
EW
3057 }
3058 while (1) {
d4eff2bd 3059 my %revs;
d2ae1434 3060 my $err;
f7c3fc4a 3061 my $err_handler = $SVN::Error::handler;
d2ae1434
EW
3062 $SVN::Error::handler = sub {
3063 ($err) = @_;
3064 skip_unknown_revs($err);
3065 };
3066 sub _cb {
3067 my ($paths, $r, $author, $date, $log) = @_;
3068 [ dup_changed_paths($paths),
3069 { author => $author, date => $date, log => $log } ];
3070 }
3071 $self->get_log([$longest_path], $min, $max, 0, 1, 1,
3072 sub { $revs{$_[1]} = _cb(@_) });
3073 if ($err && $max >= $head) {
3074 print STDERR "Path '$longest_path' ",
3075 "was probably deleted:\n",
3076 $err->expanded_message,
3077 "\nWill attempt to follow ",
3078 "revisions r$min .. r$max ",
3079 "committed before the deletion\n";
3080 my $hi = $max;
3081 while (--$hi >= $min) {
3082 my $ok;
3083 $self->get_log([$longest_path], $min, $hi,
3084 0, 1, 1, sub {
3085 $ok ||= $_[1];
3086 $revs{$_[1]} = _cb(@_) });
3087 if ($ok) {
3088 print STDERR "r$min .. r$ok OK\n";
3089 last;
3090 }
3091 }
3092 }
d4eff2bd 3093 $SVN::Error::handler = $err_handler;
fbcc1737 3094
e518192f 3095 my %exists = map { $_->{path} => $_ } @$gsv;
d4eff2bd 3096 foreach my $r (sort {$a <=> $b} keys %revs) {
fbcc1737 3097 my ($paths, $logged) = @{$revs{$r}};
e518192f
EW
3098
3099 foreach my $gs ($self->match_globs(\%exists, $paths,
3100 $globs, $r)) {
fbcc1737
EW
3101 if ($gs->rev_db_max >= $r) {
3102 next;
3103 }
3104 next unless $gs->match_paths($paths, $r);
3105 $gs->{logged_rev_props} = $logged;
e8d120bd
EW
3106 if (my $last_commit = $gs->last_commit) {
3107 $gs->assert_index_clean($last_commit);
3108 }
fbcc1737
EW
3109 my $log_entry = $gs->do_fetch($paths, $r);
3110 if ($log_entry) {
0af9c9f9
EW
3111 $gs->do_git_commit($log_entry);
3112 }
3113 }
e518192f 3114 foreach my $g (@$globs) {
93f2689c
EW
3115 my $k = "svn-remote.$g->{remote}." .
3116 "$g->{t}-maxRev";
3117 Git::SVN::tmp_config($k, $r);
e518192f 3118 }
0af9c9f9 3119 }
9c93fee5
EW
3120 # pre-fill the .rev_db since it'll eventually get filled in
3121 # with '0' x40 if something new gets committed
e518192f 3122 foreach my $gs (@$gsv) {
9c93fee5
EW
3123 next if defined $gs->rev_db_get($max);
3124 $gs->rev_db_set($max, 0 x40);
3125 }
c3560e53
EW
3126 foreach my $g (@$globs) {
3127 my $k = "svn-remote.$g->{remote}.$g->{t}-maxRev";
3128 Git::SVN::tmp_config($k, $max);
3129 }
0af9c9f9
EW
3130 last if $max >= $head;
3131 $min = $max + 1;
3132 $max += $inc;
3133 $max = $head if ($max > $head);
3134 }
0af9c9f9
EW
3135}
3136
e518192f
EW
3137sub match_globs {
3138 my ($self, $exists, $paths, $globs, $r) = @_;
74a81227
EW
3139
3140 sub get_dir_check {
3141 my ($self, $exists, $g, $r) = @_;
3142 my @x = eval { $self->get_dir($g->{path}->{left}, $r) };
3143 return unless scalar @x == 3;
3144 my $dirents = $x[0];
3145 foreach my $de (keys %$dirents) {
3146 next if $dirents->{$de}->kind != $SVN::Node::dir;
3147 my $p = $g->{path}->full_path($de);
3148 next if $exists->{$p};
3149 next if (length $g->{path}->{right} &&
3150 ($self->check_path($p, $r) !=
3151 $SVN::Node::dir));
3152 $exists->{$p} = Git::SVN->init($self->{url}, $p, undef,
3153 $g->{ref}->full_path($de), 1);
3154 }
3155 }
e518192f 3156 foreach my $g (@$globs) {
74a81227
EW
3157 if (my $path = $paths->{"/$g->{path}->{left}"}) {
3158 if ($path->{action} =~ /^[AR]$/) {
3159 get_dir_check($self, $exists, $g, $r);
3160 }
3161 }
e518192f 3162 foreach (keys %$paths) {
28710f74
EW
3163 if (/$g->{path}->{left_regex}/ &&
3164 !/$g->{path}->{regex}/) {
74a81227
EW
3165 next if $paths->{$_}->{action} !~ /^[AR]$/;
3166 get_dir_check($self, $exists, $g, $r);
3167 }
e518192f
EW
3168 next unless /$g->{path}->{regex}/;
3169 my $p = $1;
3170 my $pathname = $g->{path}->full_path($p);
3171 next if $exists->{$pathname};
0c1ec5a1
EW
3172 next if ($self->check_path($pathname, $r) !=
3173 $SVN::Node::dir);
e518192f
EW
3174 $exists->{$pathname} = Git::SVN->init(
3175 $self->{url}, $pathname, undef,
3176 $g->{ref}->full_path($p), 1);
3177 }
3178 my $c = '';
3179 foreach (split m#/#, $g->{path}->{left}) {
3180 $c .= "/$_";
3181 next unless ($paths->{$c} &&
74a81227
EW
3182 ($paths->{$c}->{action} =~ /^[AR]$/));
3183 get_dir_check($self, $exists, $g, $r);
e518192f
EW
3184 }
3185 }
3186 values %$exists;
3187}
3188
e6434f87
EW
3189sub minimize_url {
3190 my ($self) = @_;
3191 return $self->{url} if ($self->{url} eq $self->{repos_root});
3192 my $url = $self->{repos_root};
3193 my @components = split(m!/!, $self->{svn_path});
3194 my $c = '';
3195 do {
3196 $url .= "/$c" if length $c;
3197 eval { (ref $self)->new($url)->get_latest_revnum };
3198 } while ($@ && ($c = shift @components));
3199 $url;
3200}
3201
d81bf827
EW
3202sub can_do_switch {
3203 my $self = shift;
3204 unless (defined $can_do_switch) {
3205 my $pool = SVN::Pool->new;
3206 my $rep = eval {
3207 $self->do_switch(1, '', 0, $self->{url},
3208 SVN::Delta::Editor->new, $pool);
3209 };
3210 if ($@) {
3211 $can_do_switch = 0;
3212 } else {
3213 $rep->abort_report($pool);
3214 $can_do_switch = 1;
3215 }
3216 $pool->clear;
3217 }
3218 $can_do_switch;
3219}
3220
0af9c9f9
EW
3221sub skip_unknown_revs {
3222 my ($err) = @_;
3223 my $errno = $err->apr_err();
3224 # Maybe the branch we're tracking didn't
3225 # exist when the repo started, so it's
3226 # not an error if it doesn't, just continue
3227 #
3228 # Wonderfully consistent library, eh?
3229 # 160013 - svn:// and file://
3230 # 175002 - http(s)://
3231 # 175007 - http(s):// (this repo required authorization, too...)
3232 # More codes may be discovered later...
3233 if ($errno == 175007 || $errno == 175002 || $errno == 160013) {
a6a15a99
EW
3234 my $err_key = $err->expanded_message;
3235 # revision numbers change every time, filter them out
3236 $err_key =~ s/\d+/\0/g;
3237 $err_key = "$errno\0$err_key";
3238 unless ($ignored_err{$err_key}) {
3239 warn "W: Ignoring error from SVN, path probably ",
3240 "does not exist: ($errno): ",
3241 $err->expanded_message,"\n";
3242 $ignored_err{$err_key} = 1;
3243 }
0af9c9f9
EW
3244 return;
3245 }
3246 die "Error from SVN, ($errno): ", $err->expanded_message,"\n";
3247}
3248
3249# svn_log_changed_path_t objects passed to get_log are likely to be
3250# overwritten even if only the refs are copied to an external variable,
3251# so we should dup the structures in their entirety. Using an externally
3252# passed pool (instead of our temporary and quickly cleared pool in
3253# Git::SVN::Ra) does not help matters at all...
3254sub dup_changed_paths {
3255 my ($paths) = @_;
3256 return undef unless $paths;
3257 my %ret;
3258 foreach my $p (keys %$paths) {
3259 my $i = $paths->{$p};
3260 my %s = map { $_ => $i->$_ }
3261 qw/copyfrom_path copyfrom_rev action/;
3262 $ret{$p} = \%s;
3263 }
3264 \%ret;
3265}
3266
f8c9d1d2
EW
3267package Git::SVN::Log;
3268use strict;
3269use warnings;
3270use POSIX qw/strftime/;
3271use vars qw/$TZ $limit $color $pager $non_recursive $verbose $oneline
3272 %rusers $show_commit $incremental/;
3273my $l_fmt;
3274
3275sub cmt_showable {
3276 my ($c) = @_;
3277 return 1 if defined $c->{r};
c16d0871
EW
3278
3279 # big commit message got truncated by the 16k pretty buffer in rev-list
f8c9d1d2
EW
3280 if ($c->{l} && $c->{l}->[-1] eq "...\n" &&
3281 $c->{a_raw} =~ /\@([a-f\d\-]+)>$/) {
c16d0871 3282 @{$c->{l}} = ();
44320b9e 3283 my @log = command(qw/cat-file commit/, $c->{c});
c16d0871
EW
3284
3285 # shift off the headers
3286 shift @log while ($log[0] ne '');
44320b9e 3287 shift @log;
c16d0871
EW
3288
3289 # TODO: make $c->{l} not have a trailing newline in the future
3290 @{$c->{l}} = map { "$_\n" } grep !/^git-svn-id: /, @log;
f8c9d1d2
EW
3291
3292 (undef, $c->{r}, undef) = ::extract_metadata(
44320b9e 3293 (grep(/^git-svn-id: /, @log))[-1]);
f8c9d1d2
EW
3294 }
3295 return defined $c->{r};
3296}
3297
3298sub log_use_color {
3299 return 1 if $color;
3300 my ($dc, $dcvar);
3301 $dcvar = 'color.diff';
3302 $dc = `git-config --get $dcvar`;
3303 if ($dc eq '') {
3304 # nothing at all; fallback to "diff.color"
3305 $dcvar = 'diff.color';
3306 $dc = `git-config --get $dcvar`;
3307 }
3308 chomp($dc);
3309 if ($dc eq 'auto') {
3310 my $pc;
3311 $pc = `git-config --get color.pager`;
3312 if ($pc eq '') {
3313 # does not have it -- fallback to pager.color
3314 $pc = `git-config --bool --get pager.color`;
3315 }
3316 else {
3317 $pc = `git-config --bool --get color.pager`;
3318 if ($?) {
3319 $pc = 'false';
3320 }
3321 }
3322 chomp($pc);
3323 if (-t *STDOUT || (defined $pager && $pc eq 'true')) {
3324 return ($ENV{TERM} && $ENV{TERM} ne 'dumb');
3325 }
3326 return 0;
3327 }
3328 return 0 if $dc eq 'never';
3329 return 1 if $dc eq 'always';
3330 chomp($dc = `git-config --bool --get $dcvar`);
3331 return ($dc eq 'true');
3332}
3333
3334sub git_svn_log_cmd {
3bc718ba
EW
3335 my ($r_min, $r_max, @args) = @_;
3336 my $head = 'HEAD';
3337 foreach my $x (@args) {
3338 last if $x eq '--';
3339 next unless ::verify_ref("$x^0");
3340 $head = $x;
3341 last;
3342 }
3343
13c823fb
EW
3344 my ($url, $rev, $uuid, $gs) = ::working_head_info($head);
3345 $gs ||= Git::SVN->_new;
f8c9d1d2
EW
3346 my @cmd = (qw/log --abbrev-commit --pretty=raw --default/,
3347 $gs->refname);
3348 push @cmd, '-r' unless $non_recursive;
3349 push @cmd, qw/--raw --name-status/ if $verbose;
3350 push @cmd, '--color' if log_use_color();
3351 return @cmd unless defined $r_max;
3352 if ($r_max == $r_min) {
3353 push @cmd, '--max-count=1';
3354 if (my $c = $gs->rev_db_get($r_max)) {
3355 push @cmd, $c;
3356 }
3357 } else {
3358 my ($c_min, $c_max);
3359 $c_max = $gs->rev_db_get($r_max);
3360 $c_min = $gs->rev_db_get($r_min);
3361 if (defined $c_min && defined $c_max) {
3362 if ($r_max > $r_max) {
3363 push @cmd, "$c_min..$c_max";
3364 } else {
3365 push @cmd, "$c_max..$c_min";
3366 }
3367 } elsif ($r_max > $r_min) {
3368 push @cmd, $c_max;
3369 } else {
3370 push @cmd, $c_min;
3371 }
3372 }
3373 return @cmd;
3374}
3375
3376# adapted from pager.c
3377sub config_pager {
3378 $pager ||= $ENV{GIT_PAGER} || $ENV{PAGER};
3379 if (!defined $pager) {
3380 $pager = 'less';
3381 } elsif (length $pager == 0 || $pager eq 'cat') {
3382 $pager = undef;
3383 }
3384}
3385
3386sub run_pager {
3387 return unless -t *STDOUT;
3388 pipe my $rfd, my $wfd or return;
3389 defined(my $pid = fork) or ::fatal "Can't fork: $!\n";
3390 if (!$pid) {
3391 open STDOUT, '>&', $wfd or
3392 ::fatal "Can't redirect to stdout: $!\n";
3393 return;
3394 }
3395 open STDIN, '<&', $rfd or ::fatal "Can't redirect stdin: $!\n";
3396 $ENV{LESS} ||= 'FRSX';
3397 exec $pager or ::fatal "Can't run pager: $! ($pager)\n";
3398}
3399
21819a37
EW
3400sub tz_to_s_offset {
3401 my ($tz) = @_;
3402 $tz =~ s/(\d\d)$//;
3403 return ($1 * 60) + ($tz * 3600);
3404}
3405
f8c9d1d2
EW
3406sub get_author_info {
3407 my ($dest, $author, $t, $tz) = @_;
3408 $author =~ s/(?:^\s*|\s*$)//g;
3409 $dest->{a_raw} = $author;
3410 my $au;
1c8443b0 3411 if ($::_authors) {
f8c9d1d2
EW
3412 $au = $rusers{$author} || undef;
3413 }
3414 if (!$au) {
3415 ($au) = ($author =~ /<([^>]+)\@[^>]+>$/);
3416 }
3417 $dest->{t} = $t;
3418 $dest->{tz} = $tz;
3419 $dest->{a} = $au;
3420 # Date::Parse isn't in the standard Perl distro :(
3421 if ($tz =~ s/^\+//) {
21819a37 3422 $t += tz_to_s_offset($tz);
f8c9d1d2 3423 } elsif ($tz =~ s/^\-//) {
21819a37 3424 $t -= tz_to_s_offset($tz);
f8c9d1d2
EW
3425 }
3426 $dest->{t_utc} = $t;
3427}
3428
3429sub process_commit {
3430 my ($c, $r_min, $r_max, $defer) = @_;
3431 if (defined $r_min && defined $r_max) {
3432 if ($r_min == $c->{r} && $r_min == $r_max) {
3433 show_commit($c);
3434 return 0;
3435 }
3436 return 1 if $r_min == $r_max;
3437 if ($r_min < $r_max) {
3438 # we need to reverse the print order
3439 return 0 if (defined $limit && --$limit < 0);
3440 push @$defer, $c;
3441 return 1;
3442 }
3443 if ($r_min != $r_max) {
3444 return 1 if ($r_min < $c->{r});
3445 return 1 if ($r_max > $c->{r});
3446 }
3447 }
3448 return 0 if (defined $limit && --$limit < 0);
3449 show_commit($c);
3450 return 1;
3451}
3452
3453sub show_commit {
3454 my $c = shift;
3455 if ($oneline) {
3456 my $x = "\n";
3457 if (my $l = $c->{l}) {
3458 while ($l->[0] =~ /^\s*$/) { shift @$l }
3459 $x = $l->[0];
3460 }
3461 $l_fmt ||= 'A' . length($c->{r});
3462 print 'r',pack($l_fmt, $c->{r}),' | ';
3463 print "$c->{c} | " if $show_commit;
3464 print $x;
3465 } else {
3466 show_commit_normal($c);
3467 }
3468}
3469
3470sub show_commit_changed_paths {
3471 my ($c) = @_;
3472 return unless $c->{changed};
3473 print "Changed paths:\n", @{$c->{changed}};
3474}
3475
3476sub show_commit_normal {
3477 my ($c) = @_;
3478 print '-' x72, "\nr$c->{r} | ";
3479 print "$c->{c} | " if $show_commit;
3480 print "$c->{a} | ", strftime("%Y-%m-%d %H:%M:%S %z (%a, %d %b %Y)",
3481 localtime($c->{t_utc})), ' | ';
3482 my $nr_line = 0;
3483
3484 if (my $l = $c->{l}) {
3485 while ($l->[$#$l] eq "\n" && $#$l > 0
3486 && $l->[($#$l - 1)] eq "\n") {
3487 pop @$l;
3488 }
3489 $nr_line = scalar @$l;
3490 if (!$nr_line) {
3491 print "1 line\n\n\n";
3492 } else {
3493 if ($nr_line == 1) {
3494 $nr_line = '1 line';
3495 } else {
3496 $nr_line .= ' lines';
3497 }
3498 print $nr_line, "\n";
3499 show_commit_changed_paths($c);
3500 print "\n";
3501 print $_ foreach @$l;
3502 }
3503 } else {
3504 print "1 line\n";
3505 show_commit_changed_paths($c);
3506 print "\n";
3507
3508 }
488a63ec 3509 foreach my $x (qw/raw stat diff/) {
f8c9d1d2
EW
3510 if ($c->{$x}) {
3511 print "\n";
3512 print $_ foreach @{$c->{$x}}
3513 }
3514 }
3515}
3516
3517sub cmd_show_log {
3518 my (@args) = @_;
3519 my ($r_min, $r_max);
3520 my $r_last = -1; # prevent dupes
3521 if (defined $TZ) {
3522 $ENV{TZ} = $TZ;
3523 } else {
3524 delete $ENV{TZ};
3525 }
3526 if (defined $::_revision) {
3527 if ($::_revision =~ /^(\d+):(\d+)$/) {
3528 ($r_min, $r_max) = ($1, $2);
3529 } elsif ($::_revision =~ /^\d+$/) {
3530 $r_min = $r_max = $::_revision;
3531 } else {
3532 ::fatal "-r$::_revision is not supported, use ",
3533 "standard \'git log\' arguments instead\n";
3534 }
3535 }
3536
3537 config_pager();
3bc718ba 3538 @args = (git_svn_log_cmd($r_min, $r_max, @args), @args);
f8c9d1d2
EW
3539 my $log = command_output_pipe(@args);
3540 run_pager();
488a63ec 3541 my (@k, $c, $d, $stat);
f8c9d1d2
EW
3542 my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/;
3543 while (<$log>) {
3544 if (/^${esc_color}commit ($::sha1_short)/o) {
3545 my $cmt = $1;
3546 if ($c && cmt_showable($c) && $c->{r} != $r_last) {
3547 $r_last = $c->{r};
3548 process_commit($c, $r_min, $r_max, \@k) or
3549 goto out;
3550 }
3551 $d = undef;
3552 $c = { c => $cmt };
3553 } elsif (/^${esc_color}author (.+) (\d+) ([\-\+]?\d+)$/o) {
3554 get_author_info($c, $1, $2, $3);
3555 } elsif (/^${esc_color}(?:tree|parent|committer) /o) {
3556 # ignore
3557 } elsif (/^${esc_color}:\d{6} \d{6} $::sha1_short/o) {
3558 push @{$c->{raw}}, $_;
3559 } elsif (/^${esc_color}[ACRMDT]\t/) {
3560 # we could add $SVN->{svn_path} here, but that requires
3561 # remote access at the moment (repo_path_split)...
3562 s#^(${esc_color})([ACRMDT])\t#$1 $2 #o;
3563 push @{$c->{changed}}, $_;
3564 } elsif (/^${esc_color}diff /o) {
3565 $d = 1;
3566 push @{$c->{diff}}, $_;
3567 } elsif ($d) {
3568 push @{$c->{diff}}, $_;
488a63ec
EW
3569 } elsif (/^\ .+\ \|\s*\d+\ $esc_color[\+\-]*
3570 $esc_color*[\+\-]*$esc_color$/x) {
3571 $stat = 1;
3572 push @{$c->{stat}}, $_;
3573 } elsif ($stat && /^ \d+ files changed, \d+ insertions/) {
3574 push @{$c->{stat}}, $_;
3575 $stat = undef;
f8c9d1d2
EW
3576 } elsif (/^${esc_color} (git-svn-id:.+)$/o) {
3577 ($c->{url}, $c->{r}, undef) = ::extract_metadata($1);
3578 } elsif (s/^${esc_color} //o) {
3579 push @{$c->{l}}, $_;
3580 }
3581 }
3582 if ($c && defined $c->{r} && $c->{r} != $r_last) {
3583 $r_last = $c->{r};
3584 process_commit($c, $r_min, $r_max, \@k);
3585 }
3586 if (@k) {
3587 my $swap = $r_max;
3588 $r_max = $r_min;
3589 $r_min = $swap;
3590 process_commit($_, $r_min, $r_max) foreach reverse @k;
3591 }
3592out:
c843c464 3593 close $log;
f8c9d1d2
EW
3594 print '-' x72,"\n" unless $incremental || $oneline;
3595}
3596
706587fc
EW
3597package Git::SVN::Migration;
3598# these version numbers do NOT correspond to actual version numbers
3599# of git nor git-svn. They are just relative.
3600#
3601# v0 layout: .git/$id/info/url, refs/heads/$id-HEAD
3602#
3603# v1 layout: .git/$id/info/url, refs/remotes/$id
3604#