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