git-svn: correctly track diff-less copies with do_switch
[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
d81bf827 7 $SVN_URL
3397f9df 8 $GIT_SVN_INDEX $GIT_SVN
f8c9d1d2 9 $GIT_DIR $GIT_SVN_DIR $REVDB
e7f023c8 10 $_follow_parent $sha1 $sha1_short $_revision
44320b9e 11 $_cp_remote $_upgrade $_rmdir $_q $_cp_similarity
1c8443b0 12 $_find_copies_harder $_l $_authors %users/;
3397f9df 13$AUTHOR = 'Eric Wong <normalperson@yhbt.net>';
60d02ccc 14$VERSION = '@@GIT_VERSION@@';
13ccd6d4 15
706587fc 16$ENV{GIT_DIR} ||= '.git';
8b8fc068
EW
17$Git::SVN::default_repo_id = 'git-svn';
18$Git::SVN::default_ref_id = $ENV{GIT_SVN_ID} || 'git-svn';
13ccd6d4 19
ce475dfc 20my $LC_ALL = $ENV{LC_ALL};
f8c9d1d2 21$Git::SVN::Log::TZ = $ENV{TZ};
3397f9df
EW
22# make sure the svn binary gives consistent output between locales and TZs:
23$ENV{TZ} = 'UTC';
24$ENV{LC_ALL} = 'C';
a00439ac 25$| = 1; # unbuffer STDOUT
3397f9df 26
6fda05ae 27sub fatal (@) { print STDERR @_; 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') {
32 fatal "Need SVN::Core 1.1.0 or better (got $SVN::Core::VERSION)\n";
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/;
79bb8d88 41use Getopt::Long qw/:config gnu_getopt no_ignore_case auto_abbrev pass_through/;
968bdf1f 42use IPC::Open3;
336f1714 43use Git;
a5e0cedc 44
336f1714
EW
45BEGIN {
46 my $s;
47 foreach (qw/command command_oneline command_noisy command_output_pipe
48 command_input_pipe command_close_pipe/) {
49 $s .= "*SVN::Git::Editor::$_ = *SVN::Git::Fetcher::$_ = ".
706587fc 50 "*Git::SVN::Migration::$_ = ".
f8c9d1d2 51 "*Git::SVN::Log::$_ = *Git::SVN::$_ = *$_ = *Git::$_; ";
336f1714
EW
52 }
53 eval $s;
54}
55
b9c85187 56my ($SVN);
83e9940a 57
42d32870 58my $_optimize_commits = 1 unless $ENV{GIT_SVN_NO_OPTIMIZE_COMMITS};
f8c9d1d2
EW
59$sha1 = qr/[a-f\d]{40}/;
60$sha1_short = qr/[a-f\d]{4,40}/;
44320b9e
EW
61my ($_stdin, $_help, $_edit,
62 $_repack, $_repack_nr, $_repack_flags,
d81bf827 63 $_message, $_file, $_no_metadata,
d05d72e0
EW
64 $_template, $_shared,
65 $_version, $_upgrade,
f8c9d1d2
EW
66 $_merge, $_strategy, $_dry_run,
67 $_prefix);
3397f9df 68
706587fc
EW
69my %remote_opts = ( 'username=s' => \$Git::SVN::Prompt::_username,
70 'config-dir=s' => \$Git::SVN::Ra::config_dir,
71 'no-auth-cache' => \$Git::SVN::Prompt::_no_auth_cache );
d05d72e0 72my %fc_opts = ( 'follow-parent|follow' => \$_follow_parent,
dc5869c0
EW
73 'authors-file|A=s' => \$_authors,
74 'repack:i' => \$_repack,
a00439ac 75 'no-metadata' => \$_no_metadata,
80f50749 76 'quiet|q' => \$_q,
706587fc
EW
77 'repack-flags|repack-args|repack-opts=s' => \$_repack_flags,
78 %remote_opts );
36f5b1f0 79
9d55b41a
EW
80my ($_trunk, $_tags, $_branches);
81my %multi_opts = ( 'trunk|T=s' => \$_trunk,
82 'tags|t=s' => \$_tags,
83 'branches|b=s' => \$_branches );
84my %init_opts = ( 'template=s' => \$_template, 'shared' => \$_shared );
27e9fb8d
EW
85my %cmt_opts = ( 'edit|e' => \$_edit,
86 'rmdir' => \$_rmdir,
87 'find-copies-harder' => \$_find_copies_harder,
88 'l=i' => \$_l,
89 'copy-similarity|C=i'=> \$_cp_similarity
90);
9d55b41a 91
3397f9df 92my %cmd = (
2a3240be 93 fetch => [ \&cmd_fetch, "Download new revisions from SVN",
eeb0abe0 94 { 'revision|r=s' => \$_revision, %fc_opts } ],
d2866f9e 95 init => [ \&cmd_init, "Initialize a repo for tracking" .
f8ab6b73 96 " (requires URL argument)",
9d55b41a 97 \%init_opts ],
d7ad3bed
EW
98 dcommit => [ \&cmd_dcommit,
99 'Commit several diffs to merge with upstream',
3289e86e
EW
100 { 'merge|m|M' => \$_merge,
101 'strategy|s=s' => \$_strategy,
102 'dry-run|n' => \$_dry_run,
4b155223 103 %cmt_opts, %fc_opts } ],
1ce255dc
EW
104 'set-tree' => [ \&cmd_set_tree,
105 "Set an SVN repository to a git tree-ish",
106 { 'stdin|' => \$_stdin, %cmt_opts, %fc_opts, } ],
5969cbe1 107 'show-ignore' => [ \&cmd_show_ignore, "Show svn:ignore listings",
a5e0cedc 108 { 'revision|r=i' => \$_revision } ],
e7f023c8 109 rebuild => [ \&cmd_rebuild, "Rebuild git-svn metadata (after git clone)",
336f1714 110 { 'copy-remote|remote=s' => \$_cp_remote,
eeb0abe0 111 'upgrade' => \$_upgrade } ],
8164b652 112 'multi-init' => [ \&cmd_multi_init,
9d55b41a 113 'Initialize multiple trees (like git-svnimport)',
706587fc 114 { %multi_opts, %init_opts, %remote_opts,
1ca7558d 115 'revision|r=i' => \$_revision,
ae410987 116 'prefix=s' => \$_prefix,
1ca7558d 117 } ],
1c8443b0 118 'multi-fetch' => [ \&cmd_multi_fetch,
9d55b41a
EW
119 'Fetch multiple trees (like git-svnimport)',
120 \%fc_opts ],
706587fc
EW
121 'migrate' => [ sub { },
122 # no-op, we automatically run this anyways,
706587fc
EW
123 'Migrate configuration/metadata/layout from
124 previous versions of git-svn',
125 \%remote_opts ],
f8c9d1d2
EW
126 'log' => [ \&Git::SVN::Log::cmd_show_log, 'Show commit logs',
127 { 'limit=i' => \$Git::SVN::Log::limit,
79bb8d88 128 'revision|r=s' => \$_revision,
f8c9d1d2
EW
129 'verbose|v' => \$Git::SVN::Log::verbose,
130 'incremental' => \$Git::SVN::Log::incremental,
131 'oneline' => \$Git::SVN::Log::oneline,
132 'show-commit' => \$Git::SVN::Log::show_commit,
133 'non-recursive' => \$Git::SVN::Log::non_recursive,
79bb8d88 134 'authors-file|A=s' => \$_authors,
f8c9d1d2
EW
135 'color' => \$Git::SVN::Log::color,
136 'pager=s' => \$Git::SVN::Log::pager,
79bb8d88 137 } ],
44320b9e
EW
138 'commit-diff' => [ \&cmd_commit_diff,
139 'Commit a diff between two trees',
27e9fb8d
EW
140 { 'message|m=s' => \$_message,
141 'file|F=s' => \$_file,
45bf473a 142 'revision|r=s' => \$_revision,
27e9fb8d 143 %cmt_opts } ],
3397f9df 144);
9d55b41a 145
3397f9df
EW
146my $cmd;
147for (my $i = 0; $i < @ARGV; $i++) {
148 if (defined $cmd{$ARGV[$i]}) {
149 $cmd = $ARGV[$i];
150 splice @ARGV, $i, 1;
151 last;
152 }
153};
154
448c81b4 155my %opts = %{$cmd{$cmd}->[2]} if (defined $cmd);
a9612be2 156
b8c92cad 157read_repo_config(\%opts);
79bb8d88
EW
158my $rv = GetOptions(%opts, 'help|H|h' => \$_help,
159 'version|V' => \$_version,
47e39c55
EW
160 'minimize-connections' =>
161 \$Git::SVN::Migration::_minimize,
8b8fc068 162 'id|i=s' => \$Git::SVN::default_ref_id);
79bb8d88 163exit 1 if (!$rv && $cmd ne 'log');
6f0783cf 164
3397f9df 165usage(0) if $_help;
551ce28f 166version() if $_version;
eeb0abe0
EW
167usage(1) unless defined $cmd;
168load_authors() if $_authors;
706587fc
EW
169unless ($cmd =~ /^(?:init|rebuild|multi-init|commit-diff)$/) {
170 Git::SVN::Migration::migration_check();
171}
b805b44a
EW
172eval {
173 Git::SVN::verify_remotes_sanity();
174 $cmd{$cmd}->[0]->(@ARGV);
175};
176fatal $@ if $@;
3397f9df
EW
177exit 0;
178
179####################### primary functions ######################
180sub usage {
181 my $exit = shift || 0;
182 my $fd = $exit ? \*STDERR : \*STDOUT;
183 print $fd <<"";
184git-svn - bidirectional operations between a single Subversion tree and git
185Usage: $0 <command> [options] [arguments]\n
448c81b4
EW
186
187 print $fd "Available commands:\n" unless $cmd;
3397f9df
EW
188
189 foreach (sort keys %cmd) {
448c81b4 190 next if $cmd && $cmd ne $_;
b203b769 191 print $fd ' ',pack('A17',$_),$cmd{$_}->[1],"\n";
448c81b4
EW
192 foreach (keys %{$cmd{$_}->[2]}) {
193 # prints out arguments as they should be passed:
b8c92cad 194 my $x = s#[:=]s$## ? '<arg>' : s#[:=]i$## ? '<num>' : '';
b203b769 195 print $fd ' ' x 21, join(', ', map { length $_ > 1 ?
448c81b4
EW
196 "--$_" : "-$_" }
197 split /\|/,$_)," $x\n";
198 }
3397f9df
EW
199 }
200 print $fd <<"";
448c81b4
EW
201\nGIT_SVN_ID may be set in the environment or via the --id/-i switch to an
202arbitrary identifier if you're tracking multiple SVN branches/repositories in
203one git repository and want to keep them separate. See git-svn(1) for more
204information.
3397f9df
EW
205
206 exit $exit;
207}
208
551ce28f 209sub version {
7d60ab2c 210 print "git-svn version $VERSION (svn $SVN::Core::VERSION)\n";
551ce28f
EW
211 exit 0;
212}
213
e7f023c8
EW
214sub cmd_rebuild {
215 my $url = shift;
706587fc 216 my $gs = $url ? Git::SVN->init($url)
e7f023c8
EW
217 : eval { Git::SVN->new };
218 $gs ||= Git::SVN->_new;
219 if (!verify_ref($gs->refname.'^0')) {
220 $gs->copy_remote_ref;
1a82e793 221 }
3397f9df 222
e7f023c8 223 my ($rev_list, $ctx) = command_output_pipe("rev-list", $gs->refname);
2beb3cdd 224 my $latest;
d81bf827 225 my $svn_uuid;
3397f9df
EW
226 while (<$rev_list>) {
227 chomp;
228 my $c = $_;
e7f023c8
EW
229 fatal "Non-SHA1: $c\n" unless $c =~ /^$sha1$/o;
230 my ($url, $rev, $uuid) = cmt_metadata($c);
231
232 # ignore merges (from set-tree)
233 next if (!defined $rev || !$uuid);
2beb3cdd
EW
234
235 # if we merged or otherwise started elsewhere, this is
236 # how we break out of it
e7f023c8
EW
237 if ((defined $svn_uuid && ($uuid ne $svn_uuid)) ||
238 ($gs->{url} && $url && ($url ne $gs->{url}))) {
239 next;
240 }
2beb3cdd 241
2beb3cdd 242 unless (defined $latest) {
e7f023c8
EW
243 if (!$gs->{url} && !$url) {
244 fatal "SVN repository location required\n";
3397f9df 245 }
706587fc 246 $gs = Git::SVN->init($url);
2beb3cdd 247 $latest = $rev;
3397f9df 248 }
e7f023c8 249 $gs->rev_db_set($rev, $c);
42d32870 250 print "r$rev = $c\n";
3397f9df 251 }
aef4e921 252 command_close_pipe($rev_list, $ctx);
3397f9df
EW
253}
254
8164b652
EW
255sub do_git_init_db {
256 unless (-d $ENV{GIT_DIR}) {
257 my @init_db = ('init');
258 push @init_db, "--template=$_template" if defined $_template;
259 push @init_db, "--shared" if defined $_shared;
260 command_noisy(@init_db);
261 }
262}
263
d2866f9e 264sub cmd_init {
03e0ea87 265 my $url = shift or die "SVN repository location required " .
81c5a0e6 266 "as a command-line argument\n";
03e0ea87
EW
267 if (my $repo_path = shift) {
268 unless (-d $repo_path) {
269 mkpath([$repo_path]);
270 }
d2866f9e
EW
271 chdir $repo_path or croak $!;
272 $ENV{GIT_DIR} = $repo_path . "/.git";
03e0ea87 273 }
8164b652 274 do_git_init_db();
03e0ea87 275
706587fc 276 Git::SVN->init($url);
3397f9df
EW
277}
278
2a3240be 279sub cmd_fetch {
07a1c950
EW
280 if (@_) {
281 die "Additional fetch arguments are no longer supported.\n",
282 "Use --follow-parent if you have moved/copied directories
283 instead.\n";
284 }
1c8443b0 285 my $gs = Git::SVN->new;
3ebe8df7 286 $gs->fetch(parse_revision_argument());
1c8443b0
EW
287 if ($gs->{last_commit} && !verify_ref('refs/heads/master^0')) {
288 command_noisy(qw(update-ref refs/heads/master),
289 $gs->{last_commit});
290 }
2a3240be
EW
291}
292
1ce255dc 293sub cmd_set_tree {
3397f9df
EW
294 my (@commits) = @_;
295 if ($_stdin || !@commits) {
296 print "Reading from stdin...\n";
297 @commits = ();
298 while (<STDIN>) {
1ca72aef 299 if (/\b($sha1_short)\b/o) {
3397f9df
EW
300 unshift @commits, $1;
301 }
302 }
303 }
304 my @revs;
8de010ad 305 foreach my $c (@commits) {
aef4e921 306 my @tmp = command('rev-parse',$c);
8de010ad
EW
307 if (scalar @tmp == 1) {
308 push @revs, $tmp[0];
309 } elsif (scalar @tmp > 1) {
aef4e921 310 push @revs, reverse(command('rev-list',@tmp));
8de010ad 311 } else {
1ce255dc 312 fatal "Failed to rev-parse $c\n";
8de010ad 313 }
3397f9df 314 }
1ce255dc
EW
315 my $gs = Git::SVN->new;
316 my ($r_last, $cmt_last) = $gs->last_rev_commit;
317 $gs->fetch;
97f6987a 318 if (defined $gs->{last_rev} && $r_last != $gs->{last_rev}) {
1ce255dc
EW
319 fatal "There are new revisions that were fetched ",
320 "and need to be merged (or acknowledged) ",
321 "before committing.\nlast rev: $r_last\n",
322 " current: $gs->{last_rev}\n";
a5e0cedc 323 }
1ce255dc
EW
324 $gs->set_tree($_) foreach @revs;
325 print "Done committing ",scalar @revs," revisions to SVN\n";
a5e0cedc 326}
8f22562c 327
d7ad3bed
EW
328sub cmd_dcommit {
329 my $head = shift;
330 my $gs = Git::SVN->new;
331 $head ||= 'HEAD';
332 my @refs = command(qw/rev-list --no-merges/, $gs->refname."..$head");
45bf473a 333 my $last_rev;
b22d4497 334 foreach my $d (reverse @refs) {
aef4e921 335 if (!verify_ref("$d~1")) {
d7ad3bed
EW
336 fatal "Commit $d\n",
337 "has no parent commit, and therefore ",
338 "nothing to diff against.\n",
339 "You should be working from a repository ",
340 "originally created by git-svn\n";
48d044b5 341 }
45bf473a
EW
342 unless (defined $last_rev) {
343 (undef, $last_rev, undef) = cmt_metadata("$d~1");
344 unless (defined $last_rev) {
d7ad3bed
EW
345 fatal "Unable to extract revision information ",
346 "from commit $d~1\n";
45bf473a
EW
347 }
348 }
b22d4497
EW
349 if ($_dry_run) {
350 print "diff-tree $d~1 $d\n";
351 } else {
d7ad3bed 352 my %ed_opts = ( r => $last_rev,
61395354
EW
353 log => get_commit_entry($d)->{log},
354 ra => $gs->ra,
355 tree_a => "$d~1",
356 tree_b => $d,
357 editor_cb => sub {
358 print "Committed r$_[0]\n";
359 $last_rev = $_[0]; },
d3a840dc 360 svn_path => $gs->{path} );
61395354 361 if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) {
d7ad3bed
EW
362 print "No changes\n$d~1 == $d\n";
363 }
b22d4497
EW
364 }
365 }
366 return if $_dry_run;
d7ad3bed
EW
367 $gs->fetch;
368 # we always want to rebase against the current HEAD, not any
369 # head that was passed to us
370 my @diff = command('diff-tree', 'HEAD', $gs->refname, '--');
b22d4497
EW
371 my @finish;
372 if (@diff) {
373 @finish = qw/rebase/;
374 push @finish, qw/--merge/ if $_merge;
375 push @finish, "--strategy=$_strategy" if $_strategy;
d7ad3bed
EW
376 print STDERR "W: HEAD and ", $gs->refname, " differ, ",
377 "using @finish:\n", "@diff";
b22d4497 378 } else {
d7ad3bed
EW
379 print "No changes between current HEAD and ",
380 $gs->refname, "\nResetting to the latest ",
381 $gs->refname, "\n";
4769489a 382 @finish = qw/reset --mixed/;
b22d4497 383 }
d7ad3bed 384 command_noisy(@finish, $gs->refname);
b22d4497
EW
385}
386
5969cbe1
EW
387sub cmd_show_ignore {
388 my $gs = Git::SVN->new;
389 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
390 $gs->traverse_ignore(\*STDOUT, '', $r);
a5e0cedc
EW
391}
392
8164b652 393sub cmd_multi_init {
9d55b41a 394 my $url = shift;
98327e58
EW
395 unless (defined $_trunk || defined $_branches || defined $_tags) {
396 usage(1);
9d55b41a 397 }
8164b652
EW
398 do_git_init_db();
399 $_prefix = '' unless defined $_prefix;
706587fc 400 $url =~ s#/+$## if defined $url;
98327e58 401 if (defined $_trunk) {
706587fc
EW
402 my $trunk_ref = $_prefix . 'trunk';
403 # try both old-style and new-style lookups:
404 my $gs_trunk = eval { Git::SVN->new($trunk_ref) };
8164b652 405 unless ($gs_trunk) {
706587fc
EW
406 my ($trunk_url, $trunk_path) =
407 complete_svn_url($url, $_trunk);
408 $gs_trunk = Git::SVN->init($trunk_url, $trunk_path,
409 undef, $trunk_ref);
98327e58 410 }
c35b96e7 411 }
706587fc 412 return unless defined $_branches || defined $_tags;
e7db67e6
EW
413 my $ra = $url ? Git::SVN::Ra->new($url) : undef;
414 complete_url_ls_init($ra, $_branches, '--branches/-b', $_prefix);
415 complete_url_ls_init($ra, $_tags, '--tags/-t', $_prefix . 'tags/');
9d55b41a
EW
416}
417
1c8443b0 418sub cmd_multi_fetch {
0af9c9f9
EW
419 my $remotes = Git::SVN::read_all_remotes();
420 foreach my $repo_id (sort keys %$remotes) {
421 my $url = $remotes->{$repo_id}->{url} or next;
422 my $fetch = $remotes->{$repo_id}->{fetch} or next;
423 Git::SVN::fetch_all($repo_id, $url, $fetch);
9d55b41a 424 }
9d55b41a
EW
425}
426
44320b9e
EW
427# this command is special because it requires no metadata
428sub cmd_commit_diff {
429 my ($ta, $tb, $url) = @_;
430 my $usage = "Usage: $0 commit-diff -r<revision> ".
431 "<tree-ish> <tree-ish> [<URL>]\n";
432 fatal($usage) if (!defined $ta || !defined $tb);
d3a840dc 433 my $svn_path;
44320b9e
EW
434 if (!defined $url) {
435 my $gs = eval { Git::SVN->new };
436 if (!$gs) {
437 fatal("Needed URL or usable git-svn --id in ",
438 "the command-line\n", $usage);
439 }
440 $url = $gs->{url};
d3a840dc 441 $svn_path = $gs->{path};
44320b9e
EW
442 }
443 unless (defined $_revision) {
444 fatal("-r|--revision is a required argument\n", $usage);
445 }
446 if (defined $_message && defined $_file) {
447 fatal("Both --message/-m and --file/-F specified ",
448 "for the commit message.\n",
449 "I have no idea what you mean\n");
450 }
451 if (defined $_file) {
452 $_message = file_to_s($_file);
453 } else {
454 $_message ||= get_commit_entry($tb)->{log};
455 }
456 my $ra ||= Git::SVN::Ra->new($url);
d3a840dc 457 $svn_path ||= $ra->{svn_path};
44320b9e
EW
458 my $r = $_revision;
459 if ($r eq 'HEAD') {
460 $r = $ra->get_latest_revnum;
461 } elsif ($r !~ /^\d+$/) {
462 die "revision argument: $r not understood by git-svn\n";
463 }
61395354
EW
464 my %ed_opts = ( r => $r,
465 log => $_message,
466 ra => $ra,
467 tree_a => $ta,
468 tree_b => $tb,
469 editor_cb => sub { print "Committed r$_[0]\n" },
470 svn_path => $svn_path );
471 if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) {
44320b9e
EW
472 print "No changes\n$ta == $tb\n";
473 }
44320b9e
EW
474}
475
3397f9df
EW
476########################### utility functions #########################
477
3ebe8df7
EW
478sub parse_revision_argument {
479 if (!defined $_revision || $_revision eq 'BASE:HEAD') {
480 return (undef, undef);
481 }
482 return ($1, $2) if ($_revision =~ /^(\d+):(\d+)$/);
483 return ($_revision, $_revision) if ($_revision =~ /^\d+$/);
484 return (undef, $1) if ($_revision =~ /^BASE:(\d+)$/);
485 return ($1, undef) if ($_revision =~ /^(\d+):HEAD$/);
486 die "revision argument: $_revision not understood by git-svn\n",
487 "Try using the command-line svn client instead\n";
488}
489
98327e58
EW
490sub complete_svn_url {
491 my ($url, $path) = @_;
492 $path =~ s#/+$##;
98327e58 493 if ($path !~ m#^[a-z\+]+://#) {
98327e58
EW
494 if (!defined $url || $url !~ m#^[a-z\+]+://#) {
495 fatal("E: '$path' is not a complete URL ",
496 "and a separate URL is not specified\n");
497 }
706587fc 498 return ($url, $path);
98327e58 499 }
706587fc 500 return ($path, '');
98327e58
EW
501}
502
9d55b41a 503sub complete_url_ls_init {
706587fc
EW
504 my ($ra, $repo_path, $switch, $pfx) = @_;
505 unless ($repo_path) {
9d55b41a
EW
506 print STDERR "W: $switch not specified\n";
507 return;
508 }
706587fc
EW
509 $repo_path =~ s#/+$##;
510 if ($repo_path =~ m#^[a-z\+]+://#) {
511 $ra = Git::SVN::Ra->new($repo_path);
512 $repo_path = '';
e7db67e6 513 } else {
706587fc 514 $repo_path =~ s#^/+##;
e7db67e6 515 unless ($ra) {
706587fc 516 fatal("E: '$repo_path' is not a complete URL ",
e7db67e6 517 "and a separate URL is not specified\n");
8164b652 518 }
e7db67e6
EW
519 }
520 my $r = defined $_revision ? $_revision : $ra->get_latest_revnum;
706587fc
EW
521 my ($dirent, undef, undef) = $ra->get_dir($repo_path, $r);
522 my $url = $ra->{url};
e7db67e6
EW
523 foreach my $d (sort keys %$dirent) {
524 next if ($dirent->{$d}->kind != $SVN::Node::dir);
706587fc
EW
525 my $path = "$repo_path/$d";
526 my $ref = "$pfx$d";
527 my $gs = eval { Git::SVN->new($ref) };
e7db67e6 528 # don't try to init already existing refs
8164b652 529 unless ($gs) {
706587fc
EW
530 print "init $url/$path => $ref\n";
531 Git::SVN->init($url, $path, undef, $ref);
9d55b41a 532 }
9d55b41a 533 }
9d55b41a
EW
534}
535
aef4e921
EW
536sub verify_ref {
537 my ($ref) = @_;
2c5c1d53
EW
538 eval { command_oneline([ 'rev-parse', '--verify', $ref ],
539 { STDERR => 0 }); };
aef4e921
EW
540}
541
a5e0cedc 542sub get_tree_from_treeish {
cf52b8f0 543 my ($treeish) = @_;
44320b9e 544 # $treeish can be a symbolic ref, too:
aef4e921 545 my $type = command_oneline(qw/cat-file -t/, $treeish);
cf52b8f0
EW
546 my $expected;
547 while ($type eq 'tag') {
aef4e921 548 ($treeish, $type) = command(qw/cat-file tag/, $treeish);
cf52b8f0
EW
549 }
550 if ($type eq 'commit') {
aef4e921
EW
551 $expected = (grep /^tree /, command(qw/cat-file commit/,
552 $treeish))[0];
44320b9e 553 ($expected) = ($expected =~ /^tree ($sha1)$/o);
cf52b8f0
EW
554 die "Unable to get tree from $treeish\n" unless $expected;
555 } elsif ($type eq 'tree') {
556 $expected = $treeish;
557 } else {
558 die "$treeish is a $type, expected tree, tag or commit\n";
559 }
a5e0cedc
EW
560 return $expected;
561}
562
44320b9e
EW
563sub get_commit_entry {
564 my ($treeish) = shift;
565 my %log_entry = ( log => '', tree => get_tree_from_treeish($treeish) );
566 my $commit_editmsg = "$ENV{GIT_DIR}/COMMIT_EDITMSG";
567 my $commit_msg = "$ENV{GIT_DIR}/COMMIT_MSG";
568 open my $log_fh, '>', $commit_editmsg or croak $!;
3397f9df 569
44320b9e 570 my $type = command_oneline(qw/cat-file -t/, $treeish);
4ad4515d 571 if ($type eq 'commit' || $type eq 'tag') {
aef4e921 572 my ($msg_fh, $ctx) = command_output_pipe('cat-file',
44320b9e 573 $type, $treeish);
3397f9df
EW
574 my $in_msg = 0;
575 while (<$msg_fh>) {
576 if (!$in_msg) {
577 $in_msg = 1 if (/^\s*$/);
df746c5a 578 } elsif (/^git-svn-id: /) {
44320b9e
EW
579 # skip this for now, we regenerate the
580 # correct one on re-fetch anyways
581 # TODO: set *:merge properties or like...
3397f9df 582 } else {
44320b9e 583 print $log_fh $_ or croak $!;
3397f9df
EW
584 }
585 }
aef4e921 586 command_close_pipe($msg_fh, $ctx);
3397f9df 587 }
44320b9e 588 close $log_fh or croak $!;
3397f9df
EW
589
590 if ($_edit || ($type eq 'tree')) {
591 my $editor = $ENV{VISUAL} || $ENV{EDITOR} || 'vi';
44320b9e
EW
592 # TODO: strip out spaces, comments, like git-commit.sh
593 system($editor, $commit_editmsg);
3397f9df 594 }
44320b9e
EW
595 rename $commit_editmsg, $commit_msg or croak $!;
596 open $log_fh, '<', $commit_msg or croak $!;
597 { local $/; chomp($log_entry{log} = <$log_fh>); }
598 close $log_fh or croak $!;
599 unlink $commit_msg;
600 \%log_entry;
a5e0cedc
EW
601}
602
3397f9df
EW
603sub s_to_file {
604 my ($str, $file, $mode) = @_;
605 open my $fd,'>',$file or croak $!;
606 print $fd $str,"\n" or croak $!;
607 close $fd or croak $!;
608 chmod ($mode &~ umask, $file) if (defined $mode);
609}
610
611sub file_to_s {
612 my $file = shift;
613 open my $fd,'<',$file or croak "$!: file: $file\n";
614 local $/;
615 my $ret = <$fd>;
616 close $fd or croak $!;
617 $ret =~ s/\s*$//s;
618 return $ret;
619}
620
eeb0abe0
EW
621# '<svn username> = real-name <email address>' mapping based on git-svnimport:
622sub load_authors {
623 open my $authors, '<', $_authors or die "Can't open $_authors $!\n";
f8c9d1d2 624 my $log = $cmd eq 'log';
eeb0abe0
EW
625 while (<$authors>) {
626 chomp;
8815788e 627 next unless /^(\S+?|\(no author\))\s*=\s*(.+?)\s*<(.+)>\s*$/;
eeb0abe0 628 my ($user, $name, $email) = ($1, $2, $3);
f8c9d1d2
EW
629 if ($log) {
630 $Git::SVN::Log::rusers{"$name <$email>"} = $user;
631 } else {
632 $users{$user} = [$name, $email];
633 }
79bb8d88
EW
634 }
635 close $authors or croak $!;
636}
637
e0d10e1c 638# convert GetOpt::Long specs for use by git-config
b8c92cad 639sub read_repo_config {
706587fc 640 return unless -d $ENV{GIT_DIR};
b8c92cad
EW
641 my $opts = shift;
642 foreach my $o (keys %$opts) {
643 my $v = $opts->{$o};
644 my ($key) = ($o =~ /^([a-z\-]+)/);
645 $key =~ s/-//g;
e0d10e1c 646 my $arg = 'git-config';
b8c92cad
EW
647 $arg .= ' --int' if ($o =~ /[:=]i$/);
648 $arg .= ' --bool' if ($o !~ /[:=][sfi]$/);
649 if (ref $v eq 'ARRAY') {
650 chomp(my @tmp = `$arg --get-all svn.$key`);
651 @$v = @tmp if @tmp;
652 } else {
653 chomp(my $tmp = `$arg --get svn.$key`);
7774284a 654 if ($tmp && !($arg =~ / --bool/ && $tmp eq 'false')) {
b8c92cad
EW
655 $$v = $tmp;
656 }
657 }
658 }
659}
660
79bb8d88 661sub extract_metadata {
c1927a85 662 my $id = shift or return (undef, undef, undef);
79bb8d88
EW
663 my ($url, $rev, $uuid) = ($id =~ /^git-svn-id:\s(\S+?)\@(\d+)
664 \s([a-f\d\-]+)$/x);
e70dc780 665 if (!defined $rev || !$uuid || !$url) {
79bb8d88 666 # some of the original repositories I made had
82e5a82f 667 # identifiers like this:
79bb8d88
EW
668 ($rev, $uuid) = ($id =~/^git-svn-id:\s(\d+)\@([a-f\d\-]+)/);
669 }
670 return ($url, $rev, $uuid);
671}
672
c1927a85
EW
673sub cmt_metadata {
674 return extract_metadata((grep(/^git-svn-id: /,
aef4e921 675 command(qw/cat-file commit/, shift)))[-1]);
c1927a85
EW
676}
677
9b981fc6
EW
678package Git::SVN;
679use strict;
680use warnings;
8b8fc068 681use vars qw/$default_repo_id $default_ref_id/;
9b981fc6
EW
682use Carp qw/croak/;
683use File::Path qw/mkpath/;
684use IPC::Open3;
685
686# properties that we do not log:
687my %SKIP_PROP;
688BEGIN {
689 %SKIP_PROP = map { $_ => 1 } qw/svn:wc:ra_dav:version-url
690 svn:special svn:executable
691 svn:entry:committed-rev
692 svn:entry:last-author
693 svn:entry:uuid
694 svn:entry:committed-date/;
695}
696
0af9c9f9
EW
697sub fetch_all {
698 my ($repo_id, $url, $fetch) = @_;
699 my @gs;
700 my $ra = Git::SVN::Ra->new($url);
701 my $head = $ra->get_latest_revnum;
702 my $base = $head;
703 my $new_remote;
704 foreach my $p (sort keys %$fetch) {
705 my $gs = Git::SVN->new($fetch->{$p}, $repo_id, $p);
706 my $lr = $gs->last_rev;
707 if (defined $lr) {
708 $base = $lr if ($lr < $base);
709 } else {
710 $new_remote = 1;
711 }
712 push @gs, $gs;
713 }
714 $base = 0 if $new_remote;
715 return if (++$base > $head);
716 $ra->gs_fetch_loop_common($base, $head, @gs);
717}
718
47e39c55
EW
719sub read_all_remotes {
720 my $r = {};
8b8fc068 721 foreach (grep { s/^svn-remote\.// } command(qw/config -l/)) {
47e39c55
EW
722 if (m!^(.+)\.fetch=\s*(.*)\s*:\s*refs/remotes/(.+)\s*$!) {
723 $r->{$1}->{fetch}->{$2} = $3;
724 } elsif (m!^(.+)\.url=\s*(.*)\s*$!) {
725 $r->{$1}->{url} = $2;
726 }
727 }
728 $r;
729}
730
b805b44a 731sub verify_remotes_sanity {
536c4b09 732 return unless -d $ENV{GIT_DIR};
b805b44a
EW
733 my %seen;
734 foreach (command(qw/config -l/)) {
735 if (m!^svn-remote\.(?:.+)\.fetch=.*:refs/remotes/(\S+)\s*$!) {
736 if ($seen{$1}) {
737 die "Remote ref refs/remote/$1 is tracked by",
738 "\n \"$_\"\nand\n \"$seen{$1}\"\n",
739 "Please resolve this ambiguity in ",
740 "your git configuration file before ",
741 "continuing\n";
742 }
743 $seen{$1} = $_;
744 }
745 }
746}
747
47e39c55 748# we allow more chars than remotes2config.sh...
706587fc
EW
749sub sanitize_remote_name {
750 my ($name) = @_;
47e39c55 751 $name =~ tr{A-Za-z0-9:,/+-}{.}c;
706587fc
EW
752 $name;
753}
754
e6434f87
EW
755sub find_existing_remote {
756 my ($url, $remotes) = @_;
757 my $existing;
758 foreach my $repo_id (keys %$remotes) {
759 my $u = $remotes->{$repo_id}->{url} or next;
760 next if $u ne $url;
761 $existing = $repo_id;
762 last;
763 }
764 $existing;
765}
b805b44a 766
e6434f87
EW
767sub init_remote_config {
768 my ($self, $url) = @_;
769 $url =~ s!/+$!!; # strip trailing slash
770 my $r = read_all_remotes();
771 my $existing = find_existing_remote($url, $r);
772 if ($existing) {
773 print STDERR "Using existing ",
774 "[svn-remote \"$existing\"]\n";
775 $self->{repo_id} = $existing;
776 } else {
777 my $min_url = Git::SVN::Ra->new($url)->minimize_url;
778 $existing = find_existing_remote($min_url, $r);
779 if ($existing) {
780 print STDERR "Using existing ",
781 "[svn-remote \"$existing\"]\n";
782 $self->{repo_id} = $existing;
783 }
784 if ($min_url ne $url) {
785 print STDERR "Using higher level of URL: ",
786 "$url => $min_url\n";
787 my $old_path = $self->{path};
788 $self->{path} = $url;
789 $self->{path} =~ s!^\Q$min_url\E/*!!;
790 if (length $old_path) {
791 $self->{path} .= "/$old_path";
792 }
793 $url = $min_url;
794 }
795 }
796 my $orig_url;
797 if (!$existing) {
b805b44a 798 # verify that we aren't overwriting anything:
e6434f87 799 $orig_url = eval {
706587fc 800 command_oneline('config', '--get',
e6434f87 801 "svn-remote.$self->{repo_id}.url")
706587fc 802 };
b805b44a 803 if ($orig_url && ($orig_url ne $url)) {
e6434f87 804 die "svn-remote.$self->{repo_id}.url already set: ",
b805b44a
EW
805 "$orig_url\nwanted to set to: $url\n";
806 }
9b981fc6 807 }
e6434f87
EW
808 my ($xrepo_id, $xpath) = find_ref($self->refname);
809 if (defined $xpath) {
810 die "svn-remote.$xrepo_id.fetch already set to track ",
811 "$xpath:refs/remotes/", $self->refname, "\n";
812 }
813 command_noisy('config',
814 "svn-remote.$self->{repo_id}.url", $url);
815 command_noisy('config', '--add',
816 "svn-remote.$self->{repo_id}.fetch",
817 "$self->{path}:".$self->refname);
9b981fc6 818 $self->{url} = $url;
e6434f87
EW
819}
820
821sub init {
822 my ($class, $url, $path, $repo_id, $ref_id) = @_;
823 my $self = _new($class, $repo_id, $ref_id, $path);
824 if (defined $url) {
825 $self->init_remote_config($url);
826 }
9b981fc6
EW
827 $self;
828}
829
706587fc
EW
830sub find_ref {
831 my ($ref_id) = @_;
832 foreach (command(qw/config -l/)) {
833 next unless m!^svn-remote\.(.+)\.fetch=
834 \s*(.*)\s*:\s*refs/remotes/(.+)\s*$!x;
835 my ($repo_id, $path, $ref) = ($1, $2, $3);
836 if ($ref eq $ref_id) {
837 $path = '' if ($path =~ m#^\./?#);
838 return ($repo_id, $path);
839 }
840 }
841 (undef, undef, undef);
842}
843
9b981fc6 844sub new {
706587fc
EW
845 my ($class, $ref_id, $repo_id, $path) = @_;
846 if (defined $ref_id && !defined $repo_id && !defined $path) {
847 ($repo_id, $path) = find_ref($ref_id);
848 if (!defined $repo_id) {
849 die "Could not find a \"svn-remote.*.fetch\" key ",
850 "in the repository configuration matching: ",
851 "refs/remotes/$ref_id\n";
852 }
853 }
854 my $self = _new($class, $repo_id, $ref_id, $path);
8b8fc068
EW
855 if (!defined $self->{path} || !length $self->{path}) {
856 my $fetch = command_oneline('config', '--get',
857 "svn-remote.$repo_id.fetch",
858 ":refs/remotes/$ref_id\$") or
859 die "Failed to read \"svn-remote.$repo_id.fetch\" ",
860 "\":refs/remotes/$ref_id\$\" in config\n";
861 ($self->{path}, undef) = split(/\s*:\s*/, $fetch);
862 }
706587fc
EW
863 $self->{url} = command_oneline('config', '--get',
864 "svn-remote.$repo_id.url") or
865 die "Failed to read \"svn-remote.$repo_id.url\" in config\n";
9b981fc6
EW
866 $self;
867}
868
706587fc 869sub refname { "refs/remotes/$_[0]->{ref_id}" }
9b981fc6
EW
870
871sub ra {
872 my ($self) = shift;
873 $self->{ra} ||= Git::SVN::Ra->new($self->{url});
874}
875
15710b6f
EW
876sub rel_path {
877 my ($self) = @_;
878 my $repos_root = $self->ra->{repos_root};
879 return $self->{path} if ($self->{url} eq $repos_root);
880 my $url = $self->{url} .
881 (length $self->{path} ? "/$self->{path}" : $self->{path});
882 $url =~ s!^\Q$repos_root\E/*!!g;
883 $url;
884}
885
9b981fc6
EW
886sub copy_remote_ref {
887 my ($self) = @_;
888 my $origin = $::_cp_remote ? $::_cp_remote : 'origin';
889 my $ref = $self->refname;
890 if (command('ls-remote', $origin, $ref)) {
891 command_noisy('fetch', $origin, "$ref:$ref");
892 } elsif ($::_cp_remote && !$::_upgrade) {
893 die "Unable to find remote reference: $ref on $origin\n";
894 }
895}
896
897sub traverse_ignore {
898 my ($self, $fh, $path, $r) = @_;
899 $path =~ s#^/+##g;
900 my ($dirent, undef, $props) = $self->ra->get_dir($path, $r);
901 my $p = $path;
902 $p =~ s#^\Q$self->{ra}->{svn_path}\E/##;
903 print $fh length $p ? "\n# $p\n" : "\n# /\n";
904 if (my $s = $props->{'svn:ignore'}) {
905 $s =~ s/[\r\n]+/\n/g;
906 chomp $s;
907 if (length $p == 0) {
908 $s =~ s#\n#\n/$p#g;
909 print $fh "/$s\n";
910 } else {
911 $s =~ s#\n#\n/$p/#g;
912 print $fh "/$p/$s\n";
913 }
914 }
915 foreach (sort keys %$dirent) {
916 next if $dirent->{$_}->kind != $SVN::Node::dir;
917 $self->traverse_ignore($fh, "$path/$_", $r);
918 }
919}
920
3ebe8df7
EW
921sub last_rev { ($_[0]->last_rev_commit)[0] }
922sub last_commit { ($_[0]->last_rev_commit)[1] }
923
9b981fc6
EW
924# returns the newest SVN revision number and newest commit SHA1
925sub last_rev_commit {
926 my ($self) = @_;
927 if (defined $self->{last_rev} && defined $self->{last_commit}) {
928 return ($self->{last_rev}, $self->{last_commit});
929 }
d2866f9e 930 my $c = ::verify_ref($self->refname.'^0');
706587fc 931 if ($c) {
d2866f9e 932 my $rev = (::cmt_metadata($c))[1];
9b981fc6
EW
933 if (defined $rev) {
934 ($self->{last_rev}, $self->{last_commit}) = ($rev, $c);
935 return ($rev, $c);
936 }
937 }
938 my $offset = -41; # from tail
939 my $rl;
940 open my $fh, '<', $self->{db_path} or
941 croak "$self->{db_path} not readable: $!\n";
942 seek $fh, $offset, 2;
943 $rl = readline $fh;
944 defined $rl or return (undef, undef);
945 chomp $rl;
946 while ($c ne $rl && tell $fh != 0) {
947 $offset -= 41;
948 seek $fh, $offset, 2;
949 $rl = readline $fh;
950 defined $rl or return (undef, undef);
951 chomp $rl;
952 }
953 my $rev = tell $fh;
954 croak $! if ($rev < 0);
955 $rev = ($rev - 41) / 41;
956 close $fh or croak $!;
957 ($self->{last_rev}, $self->{last_commit}) = ($rev, $c);
958 return ($rev, $c);
959}
960
3ebe8df7
EW
961sub get_fetch_range {
962 my ($self, $min, $max) = @_;
963 $max ||= $self->ra->get_latest_revnum;
964 $min ||= $self->last_rev || 0;
965 (++$min, $max);
9b981fc6
EW
966}
967
968sub tmp_index_do {
969 my ($self, $sub) = @_;
970 my $old_index = $ENV{GIT_INDEX_FILE};
971 $ENV{GIT_INDEX_FILE} = $self->{index};
972 my @ret = &$sub;
973 if ($old_index) {
974 $ENV{GIT_INDEX_FILE} = $old_index;
975 } else {
976 delete $ENV{GIT_INDEX_FILE};
977 }
978 wantarray ? @ret : $ret[0];
979}
980
981sub assert_index_clean {
982 my ($self, $treeish) = @_;
983
984 $self->tmp_index_do(sub {
985 command_noisy('read-tree', $treeish) unless -e $self->{index};
986 my $x = command_oneline('write-tree');
987 my ($y) = (command(qw/cat-file commit/, $treeish) =~
988 /^tree ($::sha1)/mo);
989 if ($y ne $x) {
990 unlink $self->{index} or croak $!;
991 command_noisy('read-tree', $treeish);
992 }
993 $x = command_oneline('write-tree');
994 if ($y ne $x) {
995 ::fatal "trees ($treeish) $y != $x\n",
996 "Something is seriously wrong...\n";
997 }
998 });
999}
1000
1001sub get_commit_parents {
0af9c9f9 1002 my ($self, $log_entry) = @_;
9b981fc6 1003 my (%seen, @ret, @tmp);
0af9c9f9
EW
1004 # legacy support for 'set-tree'; this is only used by set_tree_cb:
1005 if (my $ip = $self->{inject_parents}) {
1006 if (my $commit = delete $ip->{$log_entry->{revision}}) {
1007 push @tmp, $commit;
9b981fc6
EW
1008 }
1009 }
d2866f9e 1010 if (my $cur = ::verify_ref($self->refname.'^0')) {
9b981fc6
EW
1011 push @tmp, $cur;
1012 }
44320b9e 1013 push @tmp, $_ foreach (@{$log_entry->{parents}}, @tmp);
9b981fc6
EW
1014 while (my $p = shift @tmp) {
1015 next if $seen{$p};
1016 $seen{$p} = 1;
1017 push @ret, $p;
1018 # MAXPARENT is defined to 16 in commit-tree.c:
1019 last if @ret >= 16;
1020 }
1021 if (@tmp) {
44320b9e 1022 die "r$log_entry->{revision}: No room for parents:\n\t",
9b981fc6
EW
1023 join("\n\t", @tmp), "\n";
1024 }
1025 @ret;
1026}
1027
706587fc 1028sub full_url {
9b981fc6 1029 my ($self) = @_;
706587fc 1030 $self->ra->{url} . (length $self->{path} ? '/' . $self->{path} : '');
9b981fc6
EW
1031}
1032
1033sub do_git_commit {
0af9c9f9 1034 my ($self, $log_entry) = @_;
44320b9e
EW
1035 if (my $c = $self->rev_db_get($log_entry->{revision})) {
1036 croak "$log_entry->{revision} = $c already exists! ",
9b981fc6
EW
1037 "Why are we refetching it?\n";
1038 }
1c8443b0
EW
1039 my $author = $log_entry->{author};
1040 my ($name, $email) = (defined $::users{$author} ? @{$::users{$author}}
1041 : ($author, "$author\@".$self->ra->uuid));
9b981fc6
EW
1042 $ENV{GIT_AUTHOR_NAME} = $ENV{GIT_COMMITTER_NAME} = $name;
1043 $ENV{GIT_AUTHOR_EMAIL} = $ENV{GIT_COMMITTER_EMAIL} = $email;
44320b9e 1044 $ENV{GIT_AUTHOR_DATE} = $ENV{GIT_COMMITTER_DATE} = $log_entry->{date};
9b981fc6 1045
44320b9e 1046 my $tree = $log_entry->{tree};
9b981fc6
EW
1047 if (!defined $tree) {
1048 $tree = $self->tmp_index_do(sub {
1049 command_oneline('write-tree') });
1050 }
1051 die "Tree is not a valid sha1: $tree\n" if $tree !~ /^$::sha1$/o;
1052
1053 my @exec = ('git-commit-tree', $tree);
0af9c9f9 1054 foreach ($self->get_commit_parents($log_entry)) {
9b981fc6
EW
1055 push @exec, '-p', $_;
1056 }
1057 defined(my $pid = open3(my $msg_fh, my $out_fh, '>&STDERR', @exec))
1058 or croak $!;
44320b9e 1059 print $msg_fh $log_entry->{log} or croak $!;
706587fc 1060 print $msg_fh "\ngit-svn-id: ", $self->full_url, '@',
44320b9e
EW
1061 $log_entry->{revision}, ' ',
1062 $self->ra->uuid, "\n" or croak $!;
9b981fc6
EW
1063 $msg_fh->flush == 0 or croak $!;
1064 close $msg_fh or croak $!;
1065 chomp(my $commit = do { local $/; <$out_fh> });
1066 close $out_fh or croak $!;
1067 waitpid $pid, 0;
1068 croak $? if $?;
1069 if ($commit !~ /^$::sha1$/o) {
1070 die "Failed to commit, invalid sha1: $commit\n";
1071 }
1072
1073 command_noisy('update-ref',$self->refname, $commit);
44320b9e 1074 $self->rev_db_set($log_entry->{revision}, $commit);
9b981fc6 1075
44320b9e 1076 $self->{last_rev} = $log_entry->{revision};
9b981fc6 1077 $self->{last_commit} = $commit;
44320b9e 1078 print "r$log_entry->{revision} = $commit\n";
9b981fc6
EW
1079 return $commit;
1080}
1081
15710b6f
EW
1082sub revisions_eq {
1083 my ($self, $r0, $r1) = @_;
1084 return 1 if $r0 == $r1;
1085 my $nr = 0;
1086 $self->ra->get_log([$self->{path}], $r0, $r1,
1087 0, 0, 1, sub { $nr++ });
1088 return 0 if ($nr > 1);
1089 return 1;
1090}
1091
1092sub find_parent_branch {
1093 my ($self, $paths, $rev) = @_;
9bf04637 1094 return undef unless $::_follow_parent;
e5a0b240 1095 unless (defined $paths) {
3ebe8df7
EW
1096 $self->ra->get_log([$self->{path}], $rev, $rev, 0, 1, 1,
1097 sub { $paths = dup_changed_paths($_[0]) });
e5a0b240
EW
1098 }
1099 return undef unless defined $paths;
15710b6f
EW
1100
1101 # look for a parent from another branch:
7f578c55
EW
1102 my @b_path_components = split m#/#, $self->rel_path;
1103 my @a_path_components;
1104 my $i;
1105 while (@b_path_components) {
1106 $i = $paths->{'/'.join('/', @b_path_components)};
1107 last if $i;
1108 unshift(@a_path_components, pop(@b_path_components));
1109 }
1110 goto not_found unless defined $i;
3ebe8df7 1111 my $branch_from = $i->{copyfrom_path} or goto not_found;
7f578c55
EW
1112 if (@a_path_components) {
1113 print STDERR "branch_from: $branch_from => ";
1114 $branch_from .= '/'.join('/', @a_path_components);
1115 print STDERR $branch_from, "\n";
1116 }
3ebe8df7 1117 my $r = $i->{copyfrom_rev};
15710b6f
EW
1118 my $repos_root = $self->ra->{repos_root};
1119 my $url = $self->ra->{url};
1120 my $new_url = $repos_root . $branch_from;
1121 print STDERR "Found possible branch point: ",
1122 "$new_url => ", $self->full_url, ", $r\n";
1123 $branch_from =~ s#^/##;
1124 my $remotes = read_all_remotes();
1125 my $gs;
1126 foreach my $repo_id (keys %$remotes) {
1127 my $u = $remotes->{$repo_id}->{url} or next;
1128 next if $url ne $u;
1129 my $fetch = $remotes->{$repo_id}->{fetch};
1130 foreach my $f (keys %$fetch) {
1131 next if $f ne $branch_from;
1132 $gs = Git::SVN->new($fetch->{$f}, $repo_id, $f);
1133 last;
1134 }
1135 last if $gs;
1136 }
1137 unless ($gs) {
1138 my $ref_id = $branch_from;
1139 $ref_id .= "\@$r" if find_ref($ref_id);
1140 # just grow a tail if we're not unique enough :x
1141 $ref_id .= '-' while find_ref($ref_id);
1142 $gs = Git::SVN->init($new_url, '', $ref_id, $ref_id);
1143 }
1144 my ($r0, $parent) = $gs->find_rev_before($r, 1);
1145 if ($::_follow_parent && (!defined $r0 || !defined $parent)) {
3ebe8df7 1146 $gs->fetch(0, $r);
15710b6f
EW
1147 ($r0, $parent) = $gs->last_rev_commit;
1148 }
1149 if (defined $r0 && defined $parent && $gs->revisions_eq($r0, $r)) {
1150 print STDERR "Found branch parent: ($self->{ref_id}) $parent\n";
a2003abc 1151 $self->assert_index_clean($parent);
15710b6f
EW
1152 my $ed;
1153 if ($self->ra->can_do_switch) {
8b8fc068 1154 print STDERR "Following parent with do_switch\n";
15710b6f
EW
1155 # do_switch works with svn/trunk >= r22312, but that
1156 # is not included with SVN 1.4.2 (the latest version
1157 # at the moment), so we can't rely on it
1158 $self->{last_commit} = $parent;
1159 $ed = SVN::Git::Fetcher->new($self);
1160 $gs->ra->gs_do_switch($r0, $rev, $gs->{path}, 1,
1161 $self->full_url, $ed)
1162 or die "SVN connection failed somewhere...\n";
1163 } else {
8b8fc068 1164 print STDERR "Following parent with do_update\n";
15710b6f
EW
1165 $ed = SVN::Git::Fetcher->new($self);
1166 $self->ra->gs_do_update($rev, $rev, $self->{path},
1167 1, $ed)
1168 or die "SVN connection failed somewhere...\n";
1169 }
2fa6a23e 1170 $ed->{new_fetch} = 1;
15710b6f
EW
1171 return $self->make_log_entry($rev, [$parent], $ed);
1172 }
9bf04637 1173not_found:
7f578c55 1174 print STDERR "Branch parent for path: '/",
3ebe8df7
EW
1175 $self->rel_path, "' @ r$rev not found:\n";
1176 return undef unless $paths;
1177 print STDERR "Changed paths:\n";
1178 foreach my $x (sort keys %$paths) {
1179 my $p = $paths->{$x};
1180 print STDERR "\t$p->{action}\t$x";
1181 if ($p->{copyfrom_path}) {
1182 print STDERR "(from $p->{copyfrom_path}: ",
1183 "$p->{copyfrom_rev})";
1184 }
1185 print STDERR "\n";
1186 }
1187 print STDERR '-'x72, "\n";
15710b6f
EW
1188 return undef;
1189}
1190
9b981fc6 1191sub do_fetch {
706587fc 1192 my ($self, $paths, $rev) = @_;
15710b6f 1193 my $ed;
9b981fc6
EW
1194 my ($last_rev, @parents);
1195 if ($self->{last_commit}) {
15710b6f 1196 $ed = SVN::Git::Fetcher->new($self);
9b981fc6
EW
1197 $last_rev = $self->{last_rev};
1198 $ed->{c} = $self->{last_commit};
1199 @parents = ($self->{last_commit});
1200 } else {
1201 $last_rev = $rev;
15710b6f
EW
1202 if (my $log_entry = $self->find_parent_branch($paths, $rev)) {
1203 return $log_entry;
1204 }
1205 $ed = SVN::Git::Fetcher->new($self);
2fa6a23e 1206 $ed->{new_fetch} = 1;
9b981fc6 1207 }
706587fc
EW
1208 unless ($self->ra->gs_do_update($last_rev, $rev,
1209 $self->{path}, 1, $ed)) {
9b981fc6
EW
1210 die "SVN connection failed somewhere...\n";
1211 }
1212 $self->make_log_entry($rev, \@parents, $ed);
1213}
1214
97f6987a
EW
1215sub get_untracked {
1216 my ($self, $ed) = @_;
1217 my @out;
1218 my $h = $ed->{empty};
9b981fc6
EW
1219 foreach (sort keys %$h) {
1220 my $act = $h->{$_} ? '+empty_dir' : '-empty_dir';
97f6987a 1221 push @out, " $act: " . uri_encode($_);
9b981fc6
EW
1222 warn "W: $act: $_\n";
1223 }
1224 foreach my $t (qw/dir_prop file_prop/) {
97f6987a 1225 $h = $ed->{$t} or next;
9b981fc6
EW
1226 foreach my $path (sort keys %$h) {
1227 my $ppath = $path eq '' ? '.' : $path;
1228 foreach my $prop (sort keys %{$h->{$path}}) {
1ce255dc 1229 next if $SKIP_PROP{$prop};
9b981fc6 1230 my $v = $h->{$path}->{$prop};
97f6987a
EW
1231 my $t_ppath_prop = "$t: " .
1232 uri_encode($ppath) . ' ' .
1233 uri_encode($prop);
9b981fc6 1234 if (defined $v) {
97f6987a
EW
1235 push @out, " +$t_ppath_prop " .
1236 uri_encode($v);
9b981fc6 1237 } else {
97f6987a 1238 push @out, " -$t_ppath_prop";
9b981fc6
EW
1239 }
1240 }
1241 }
1242 }
1243 foreach my $t (qw/absent_file absent_directory/) {
97f6987a 1244 $h = $ed->{$t} or next;
9b981fc6
EW
1245 foreach my $parent (sort keys %$h) {
1246 foreach my $path (sort @{$h->{$parent}}) {
97f6987a
EW
1247 push @out, " $t: " .
1248 uri_encode("$parent/$path");
9b981fc6
EW
1249 warn "W: $t: $parent/$path ",
1250 "Insufficient permissions?\n";
1251 }
1252 }
1253 }
97f6987a 1254 \@out;
9b981fc6
EW
1255}
1256
1c8443b0
EW
1257sub parse_svn_date {
1258 my $date = shift || return '+0000 1970-01-01 00:00:00';
1259 my ($Y,$m,$d,$H,$M,$S) = ($date =~ /^(\d{4})\-(\d\d)\-(\d\d)T
1260 (\d\d)\:(\d\d)\:(\d\d).\d+Z$/x) or
1261 croak "Unable to parse date: $date\n";
1262 "+0000 $Y-$m-$d $H:$M:$S";
1263}
1264
1265sub check_author {
1266 my ($author) = @_;
1267 if (!defined $author || length $author == 0) {
1268 $author = '(no author)';
1269 }
1270 if (defined $::_authors && ! defined $::users{$author}) {
1271 die "Author: $author not defined in $::_authors file\n";
1272 }
1273 $author;
1274}
1275
9b981fc6 1276sub make_log_entry {
97f6987a
EW
1277 my ($self, $rev, $parents, $ed) = @_;
1278 my $untracked = $self->get_untracked($ed);
1279
2fa6a23e 1280 return undef if (! $ed->{new_fetch} && ! $ed->{nr} && ! @$untracked);
e5a0b240 1281
9b981fc6 1282 open my $un, '>>', "$self->{dir}/unhandled.log" or croak $!;
97f6987a
EW
1283 print $un "r$rev\n" or croak $!;
1284 print $un $_, "\n" foreach @$untracked;
1285 my %log_entry = ( parents => $parents || [], revision => $rev,
1286 log => '');
1287 my $rp = $self->ra->rev_proplist($rev);
9b981fc6
EW
1288 foreach (sort keys %$rp) {
1289 my $v = $rp->{$_};
1290 if (/^svn:(author|date|log)$/) {
1291 $log_entry{$1} = $v;
1292 } else {
1293 print $un " rev_prop: ", uri_encode($_), ' ',
1294 uri_encode($v), "\n";
1295 }
1296 }
1297 close $un or croak $!;
97f6987a 1298
9b981fc6
EW
1299 $log_entry{date} = parse_svn_date($log_entry{date});
1300 $log_entry{author} = check_author($log_entry{author});
1301 $log_entry{log} .= "\n";
1302 \%log_entry;
1303}
1304
1305sub fetch {
3ebe8df7 1306 my ($self, $min_rev, $max_rev, @parents) = @_;
9b981fc6 1307 my ($last_rev, $last_commit) = $self->last_rev_commit;
3ebe8df7 1308 my ($base, $head) = $self->get_fetch_range($min_rev, $max_rev);
9b981fc6 1309 return if ($base > $head);
0af9c9f9 1310 $self->ra->gs_fetch_loop_common($base, $head, $self);
9b981fc6
EW
1311}
1312
1313sub set_tree_cb {
1314 my ($self, $log_entry, $tree, $rev, $date, $author) = @_;
1315 # TODO: enable and test optimized commits:
1316 if (0 && $rev == ($self->{last_rev} + 1)) {
1317 $log_entry->{revision} = $rev;
1318 $log_entry->{author} = $author;
1319 $self->do_git_commit($log_entry, "$rev=$tree");
1320 } else {
0af9c9f9
EW
1321 $self->{inject_parents} = { $rev => $tree };
1322 $self->fetch(undef, undef);
9b981fc6
EW
1323 }
1324}
1325
1326sub set_tree {
1327 my ($self, $tree) = (shift, shift);
1ce255dc 1328 my $log_entry = ::get_commit_entry($tree);
9b981fc6
EW
1329 unless ($self->{last_rev}) {
1330 fatal("Must have an existing revision to commit\n");
1331 }
61395354
EW
1332 my %ed_opts = ( r => $self->{last_rev},
1333 log => $log_entry->{log},
1334 ra => $self->ra,
1335 tree_a => $self->{last_commit},
1336 tree_b => $tree,
1337 editor_cb => sub {
1338 $self->set_tree_cb($log_entry, $tree, @_) },
1339 svn_path => $self->{path} );
1340 if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) {
9b981fc6
EW
1341 print "No changes\nr$self->{last_rev} = $tree\n";
1342 }
9b981fc6
EW
1343}
1344
9b981fc6
EW
1345# rev_db:
1346# Tie::File seems to be prone to offset errors if revisions get sparse,
1347# it's not that fast, either. Tie::File is also not in Perl 5.6. So
1348# one of my favorite modules is out :< Next up would be one of the DBM
1349# modules, but I'm not sure which is most portable... So I'll just
1350# go with something that's plain-text, but still capable of
1351# being randomly accessed. So here's my ultra-simple fixed-width
1352# database. All records are 40 characters + "\n", so it's easy to seek
1353# to a revision: (41 * rev) is the byte offset.
1354# A record of 40 0s denotes an empty revision.
1355# And yes, it's still pretty fast (faster than Tie::File).
1356
1357sub rev_db_set {
1358 my ($self, $rev, $commit) = @_;
1359 length $commit == 40 or croak "arg3 must be a full SHA1 hexsum\n";
1360 open my $fh, '+<', $self->{db_path} or croak $!;
1361 my $offset = $rev * 41;
1362 # assume that append is the common case:
1363 seek $fh, 0, 2 or croak $!;
1364 my $pos = tell $fh;
1365 if ($pos < $offset) {
1366 print $fh (('0' x 40),"\n") x (($offset - $pos) / 41)
1367 or croak $!;
1368 }
1369 seek $fh, $offset, 0 or croak $!;
1370 print $fh $commit,"\n" or croak $!;
1371 close $fh or croak $!;
1372}
1373
1374sub rev_db_get {
1375 my ($self, $rev) = @_;
1376 my $ret;
1377 my $offset = $rev * 41;
1378 open my $fh, '<', $self->{db_path} or croak $!;
1379 if (seek $fh, $offset, 0) {
1380 $ret = readline $fh;
1381 if (defined $ret) {
1382 chomp $ret;
1383 $ret = undef if ($ret =~ /^0{40}$/);
1384 }
1385 }
1386 close $fh or croak $!;
1387 $ret;
1388}
1389
15710b6f
EW
1390sub find_rev_before {
1391 my ($self, $rev, $eq_ok) = @_;
1392 --$rev unless $eq_ok;
1393 while ($rev > 0) {
1394 if (my $c = $self->rev_db_get($rev)) {
1395 return ($rev, $c);
1396 }
1397 --$rev;
1398 }
1399 return (undef, undef);
1400}
1401
9b981fc6 1402sub _new {
706587fc
EW
1403 my ($class, $repo_id, $ref_id, $path) = @_;
1404 unless (defined $repo_id && length $repo_id) {
1405 $repo_id = $Git::SVN::default_repo_id;
1406 }
1407 unless (defined $ref_id && length $ref_id) {
8b8fc068 1408 $_[2] = $ref_id = $Git::SVN::default_ref_id;
706587fc
EW
1409 }
1410 $_[1] = $repo_id = sanitize_remote_name($repo_id);
1411 my $dir = "$ENV{GIT_DIR}/svn/$ref_id";
1412 $_[3] = $path = '' unless (defined $path);
8b8fc068
EW
1413 mkpath([$dir]);
1414 unless (-f "$dir/.rev_db") {
1415 open my $fh, '>>', "$dir/.rev_db" or croak $!;
1416 close $fh or croak $!;
1417 }
706587fc
EW
1418 bless { ref_id => $ref_id, dir => $dir, index => "$dir/index",
1419 path => $path,
1420 db_path => "$dir/.rev_db", repo_id => $repo_id }, $class;
9b981fc6
EW
1421}
1422
1c8443b0
EW
1423sub uri_encode {
1424 my ($f) = @_;
1425 $f =~ s#([^a-zA-Z0-9\*!\:_\./\-])#uc sprintf("%%%02x",ord($1))#eg;
1426 $f
1427}
9b981fc6 1428
d976acfd
EW
1429package Git::SVN::Prompt;
1430use strict;
1431use warnings;
1432require SVN::Core;
1433use vars qw/$_no_auth_cache $_username/;
1434
1435sub simple {
30d055aa
EW
1436 my ($cred, $realm, $default_username, $may_save, $pool) = @_;
1437 $may_save = undef if $_no_auth_cache;
1438 $default_username = $_username if defined $_username;
1439 if (defined $default_username && length $default_username) {
1440 if (defined $realm && length $realm) {
6f729591
EW
1441 print STDERR "Authentication realm: $realm\n";
1442 STDERR->flush;
30d055aa
EW
1443 }
1444 $cred->username($default_username);
1445 } else {
d976acfd 1446 username($cred, $realm, $may_save, $pool);
30d055aa
EW
1447 }
1448 $cred->password(_read_password("Password for '" .
1449 $cred->username . "': ", $realm));
1450 $cred->may_save($may_save);
1451 $SVN::_Core::SVN_NO_ERROR;
1452}
1453
d976acfd 1454sub ssl_server_trust {
30d055aa
EW
1455 my ($cred, $realm, $failures, $cert_info, $may_save, $pool) = @_;
1456 $may_save = undef if $_no_auth_cache;
6f729591 1457 print STDERR "Error validating server certificate for '$realm':\n";
30d055aa 1458 if ($failures & $SVN::Auth::SSL::UNKNOWNCA) {
6f729591 1459 print STDERR " - The certificate is not issued by a trusted ",
30d055aa
EW
1460 "authority. Use the\n",
1461 " fingerprint to validate the certificate manually!\n";
1462 }
1463 if ($failures & $SVN::Auth::SSL::CNMISMATCH) {
6f729591 1464 print STDERR " - The certificate hostname does not match.\n";
30d055aa
EW
1465 }
1466 if ($failures & $SVN::Auth::SSL::NOTYETVALID) {
6f729591 1467 print STDERR " - The certificate is not yet valid.\n";
30d055aa
EW
1468 }
1469 if ($failures & $SVN::Auth::SSL::EXPIRED) {
6f729591 1470 print STDERR " - The certificate has expired.\n";
30d055aa
EW
1471 }
1472 if ($failures & $SVN::Auth::SSL::OTHER) {
6f729591 1473 print STDERR " - The certificate has an unknown error.\n";
30d055aa 1474 }
6f729591
EW
1475 printf STDERR
1476 "Certificate information:\n".
30d055aa
EW
1477 " - Hostname: %s\n".
1478 " - Valid: from %s until %s\n".
1479 " - Issuer: %s\n".
1480 " - Fingerprint: %s\n",
1481 map $cert_info->$_, qw(hostname valid_from valid_until
6f729591 1482 issuer_dname fingerprint);
30d055aa
EW
1483 my $choice;
1484prompt:
6f729591 1485 print STDERR $may_save ?
30d055aa
EW
1486 "(R)eject, accept (t)emporarily or accept (p)ermanently? " :
1487 "(R)eject or accept (t)emporarily? ";
6f729591 1488 STDERR->flush;
30d055aa
EW
1489 $choice = lc(substr(<STDIN> || 'R', 0, 1));
1490 if ($choice =~ /^t$/i) {
1491 $cred->may_save(undef);
1492 } elsif ($choice =~ /^r$/i) {
1493 return -1;
1494 } elsif ($may_save && $choice =~ /^p$/i) {
1495 $cred->may_save($may_save);
1496 } else {
1497 goto prompt;
1498 }
1499 $cred->accepted_failures($failures);
1500 $SVN::_Core::SVN_NO_ERROR;
1501}
1502
d976acfd 1503sub ssl_client_cert {
30d055aa
EW
1504 my ($cred, $realm, $may_save, $pool) = @_;
1505 $may_save = undef if $_no_auth_cache;
6f729591
EW
1506 print STDERR "Client certificate filename: ";
1507 STDERR->flush;
30d055aa
EW
1508 chomp(my $filename = <STDIN>);
1509 $cred->cert_file($filename);
1510 $cred->may_save($may_save);
1511 $SVN::_Core::SVN_NO_ERROR;
1512}
1513
d976acfd 1514sub ssl_client_cert_pw {
30d055aa
EW
1515 my ($cred, $realm, $may_save, $pool) = @_;
1516 $may_save = undef if $_no_auth_cache;
1517 $cred->password(_read_password("Password: ", $realm));
1518 $cred->may_save($may_save);
1519 $SVN::_Core::SVN_NO_ERROR;
1520}
1521
d976acfd 1522sub username {
30d055aa
EW
1523 my ($cred, $realm, $may_save, $pool) = @_;
1524 $may_save = undef if $_no_auth_cache;
1525 if (defined $realm && length $realm) {
6f729591 1526 print STDERR "Authentication realm: $realm\n";
30d055aa
EW
1527 }
1528 my $username;
1529 if (defined $_username) {
1530 $username = $_username;
1531 } else {
6f729591
EW
1532 print STDERR "Username: ";
1533 STDERR->flush;
30d055aa
EW
1534 chomp($username = <STDIN>);
1535 }
1536 $cred->username($username);
1537 $cred->may_save($may_save);
1538 $SVN::_Core::SVN_NO_ERROR;
1539}
1540
1541sub _read_password {
1542 my ($prompt, $realm) = @_;
6f729591
EW
1543 print STDERR $prompt;
1544 STDERR->flush;
30d055aa
EW
1545 require Term::ReadKey;
1546 Term::ReadKey::ReadMode('noecho');
1547 my $password = '';
1548 while (defined(my $key = Term::ReadKey::ReadKey(0))) {
1549 last if $key =~ /[\012\015]/; # \n\r
1550 $password .= $key;
1551 }
1552 Term::ReadKey::ReadMode('restore');
6f729591
EW
1553 print STDERR "\n";
1554 STDERR->flush;
30d055aa
EW
1555 $password;
1556}
1557
d976acfd
EW
1558package main;
1559
d2a9a87b
EW
1560sub uri_encode {
1561 my ($f) = @_;
1562 $f =~ s#([^a-zA-Z0-9\*!\:_\./\-])#uc sprintf("%%%02x",ord($1))#eg;
1563 $f
1564}
1565
1566sub uri_decode {
1567 my ($f) = @_;
1568 $f =~ tr/+/ /;
1569 $f =~ s/%([A-F0-9]{2})/chr hex($1)/ge;
1570 $f
1571}
1572
b9c85187
EW
1573{
1574 my $kill_stupid_warnings = $SVN::Node::none.$SVN::Node::file.
1575 $SVN::Node::dir.$SVN::Node::unknown.
1576 $SVN::Node::none.$SVN::Node::file.
1577 $SVN::Node::dir.$SVN::Node::unknown.
1578 $SVN::Auth::SSL::CNMISMATCH.
1579 $SVN::Auth::SSL::NOTYETVALID.
1580 $SVN::Auth::SSL::EXPIRED.
1581 $SVN::Auth::SSL::UNKNOWNCA.
1582 $SVN::Auth::SSL::OTHER;
1583}
1584
27a1a801
EW
1585package SVN::Git::Fetcher;
1586use vars qw/@ISA/;
1587use strict;
1588use warnings;
1589use Carp qw/croak/;
1590use IO::File qw//;
1591
1592# file baton members: path, mode_a, mode_b, pool, fh, blob, base
1593sub new {
1594 my ($class, $git_svn) = @_;
1595 my $self = SVN::Delta::Editor->new;
1596 bless $self, $class;
1c8443b0 1597 $self->{c} = $git_svn->{last_commit} if exists $git_svn->{last_commit};
d2a9a87b
EW
1598 $self->{empty} = {};
1599 $self->{dir_prop} = {};
1600 $self->{file_prop} = {};
1601 $self->{absent_dir} = {};
1602 $self->{absent_file} = {};
ef3cfaad 1603 $self->{gii} = $git_svn->tmp_index_do(sub { Git::IndexInfo->new });
27a1a801
EW
1604 require Digest::MD5;
1605 $self;
1606}
1607
8b8fc068
EW
1608sub set_path_strip {
1609 my ($self, $path) = @_;
1610 $self->{path_strip} = qr/^\Q$path\E\/?/;
1611}
1612
d2a9a87b
EW
1613sub open_root {
1614 { path => '' };
1615}
1616
1617sub open_directory {
1618 my ($self, $path, $pb, $rev) = @_;
1619 { path => $path };
1620}
1621
706587fc
EW
1622sub git_path {
1623 my ($self, $path) = @_;
1624 $path =~ s!$self->{path_strip}!! if $self->{path_strip};
1625 $path;
1626}
1627
27a1a801
EW
1628sub delete_entry {
1629 my ($self, $path, $rev, $pb) = @_;
4a87db0e 1630
706587fc 1631 my $gpath = $self->git_path($path);
4a87db0e 1632 # remove entire directories.
706587fc 1633 if (command('ls-tree', $self->{c}, '--', $gpath) =~ /^040000 tree/) {
4a87db0e
EW
1634 my ($ls, $ctx) = command_output_pipe(qw/ls-tree
1635 -r --name-only -z/,
706587fc 1636 $self->{c}, '--', $gpath);
4a87db0e
EW
1637 local $/ = "\0";
1638 while (<$ls>) {
ef3cfaad
EW
1639 chomp;
1640 $self->{gii}->remove($_);
4a87db0e
EW
1641 print "\tD\t$_\n" unless $self->{q};
1642 }
706587fc 1643 print "\tD\t$gpath/\n" unless $self->{q};
4a87db0e
EW
1644 command_close_pipe($ls, $ctx);
1645 $self->{empty}->{$path} = 0
1646 } else {
ef3cfaad 1647 $self->{gii}->remove($gpath);
706587fc 1648 print "\tD\t$gpath\n" unless $self->{q};
4a87db0e 1649 }
27a1a801
EW
1650 undef;
1651}
1652
1653sub open_file {
1654 my ($self, $path, $pb, $rev) = @_;
706587fc
EW
1655 my $gpath = $self->git_path($path);
1656 my ($mode, $blob) = (command('ls-tree', $self->{c}, '--', $gpath)
27a1a801 1657 =~ /^(\d{6}) blob ([a-f\d]{40})\t/);
006ede5e
EW
1658 unless (defined $mode && defined $blob) {
1659 die "$path was not found in commit $self->{c} (r$rev)\n";
1660 }
27a1a801 1661 { path => $path, mode_a => $mode, mode_b => $mode, blob => $blob,
0864e3ba 1662 pool => SVN::Pool->new, action => 'M' };
27a1a801
EW
1663}
1664
1665sub add_file {
1666 my ($self, $path, $pb, $cp_path, $cp_rev) = @_;
d2a9a87b
EW
1667 my ($dir, $file) = ($path =~ m#^(.*?)/?([^/]+)$#);
1668 delete $self->{empty}->{$dir};
27a1a801 1669 { path => $path, mode_a => 100644, mode_b => 100644,
0864e3ba 1670 pool => SVN::Pool->new, action => 'A' };
27a1a801
EW
1671}
1672
d2a9a87b
EW
1673sub add_directory {
1674 my ($self, $path, $cp_path, $cp_rev) = @_;
1675 my ($dir, $file) = ($path =~ m#^(.*?)/?([^/]+)$#);
1676 delete $self->{empty}->{$dir};
1677 $self->{empty}->{$path} = 1;
1678 { path => $path };
1679}
1680
1681sub change_dir_prop {
1682 my ($self, $db, $prop, $value) = @_;
1683 $self->{dir_prop}->{$db->{path}} ||= {};
1684 $self->{dir_prop}->{$db->{path}}->{$prop} = $value;
1685 undef;
1686}
1687
1688sub absent_directory {
1689 my ($self, $path, $pb) = @_;
1690 $self->{absent_dir}->{$pb->{path}} ||= [];
1691 push @{$self->{absent_dir}->{$pb->{path}}}, $path;
1692 undef;
1693}
1694
1695sub absent_file {
1696 my ($self, $path, $pb) = @_;
1697 $self->{absent_file}->{$pb->{path}} ||= [];
1698 push @{$self->{absent_file}->{$pb->{path}}}, $path;
1699 undef;
1700}
1701
27a1a801
EW
1702sub change_file_prop {
1703 my ($self, $fb, $prop, $value) = @_;
1704 if ($prop eq 'svn:executable') {
1705 if ($fb->{mode_b} != 120000) {
1706 $fb->{mode_b} = defined $value ? 100755 : 100644;
1707 }
1708 } elsif ($prop eq 'svn:special') {
1709 $fb->{mode_b} = defined $value ? 120000 : 100644;
d2a9a87b
EW
1710 } else {
1711 $self->{file_prop}->{$fb->{path}} ||= {};
1712 $self->{file_prop}->{$fb->{path}}->{$prop} = $value;
27a1a801
EW
1713 }
1714 undef;
1715}
1716
1717sub apply_textdelta {
1718 my ($self, $fb, $exp) = @_;
1719 my $fh = IO::File->new_tmpfile;
1720 $fh->autoflush(1);
1721 # $fh gets auto-closed() by SVN::TxDelta::apply(),
1722 # (but $base does not,) so dup() it for reading in close_file
1723 open my $dup, '<&', $fh or croak $!;
1724 my $base = IO::File->new_tmpfile;
1725 $base->autoflush(1);
1726 if ($fb->{blob}) {
1727 defined (my $pid = fork) or croak $!;
1728 if (!$pid) {
1729 open STDOUT, '>&', $base or croak $!;
1730 print STDOUT 'link ' if ($fb->{mode_a} == 120000);
1731 exec qw/git-cat-file blob/, $fb->{blob} or croak $!;
1732 }
1733 waitpid $pid, 0;
1734 croak $? if $?;
1735
1736 if (defined $exp) {
1737 seek $base, 0, 0 or croak $!;
1738 my $md5 = Digest::MD5->new;
1739 $md5->addfile($base);
1740 my $got = $md5->hexdigest;
1741 die "Checksum mismatch: $fb->{path} $fb->{blob}\n",
1742 "expected: $exp\n",
1743 " got: $got\n" if ($got ne $exp);
1744 }
1745 }
1746 seek $base, 0, 0 or croak $!;
1747 $fb->{fh} = $dup;
1748 $fb->{base} = $base;
1749 [ SVN::TxDelta::apply($base, $fh, undef, $fb->{path}, $fb->{pool}) ];
1750}
1751
1752sub close_file {
1753 my ($self, $fb, $exp) = @_;
1754 my $hash;
706587fc 1755 my $path = $self->git_path($fb->{path});
27a1a801
EW
1756 if (my $fh = $fb->{fh}) {
1757 seek($fh, 0, 0) or croak $!;
1758 my $md5 = Digest::MD5->new;
1759 $md5->addfile($fh);
1760 my $got = $md5->hexdigest;
1761 die "Checksum mismatch: $path\n",
1762 "expected: $exp\n got: $got\n" if ($got ne $exp);
1763 seek($fh, 0, 0) or croak $!;
1764 if ($fb->{mode_b} == 120000) {
1765 read($fh, my $buf, 5) == 5 or croak $!;
1766 $buf eq 'link ' or die "$path has mode 120000",
1767 "but is not a link\n";
1768 }
1769 defined(my $pid = open my $out,'-|') or die "Can't fork: $!\n";
1770 if (!$pid) {
1771 open STDIN, '<&', $fh or croak $!;
1772 exec qw/git-hash-object -w --stdin/ or croak $!;
1773 }
1774 chomp($hash = do { local $/; <$out> });
1775 close $out or croak $!;
1776 close $fh or croak $!;
1777 $hash =~ /^[a-f\d]{40}$/ or die "not a sha1: $hash\n";
1778 close $fb->{base} or croak $!;
1779 } else {
1780 $hash = $fb->{blob} or die "no blob information\n";
1781 }
1782 $fb->{pool}->clear;
ef3cfaad 1783 $self->{gii}->update($fb->{mode_b}, $hash, $path) or croak $!;
0864e3ba 1784 print "\t$fb->{action}\t$path\n" if $fb->{action} && ! $self->{q};
27a1a801
EW
1785 undef;
1786}
1787
1788sub abort_edit {
1789 my $self = shift;
ef3cfaad
EW
1790 $self->{nr} = $self->{gii}->{nr};
1791 delete $self->{gii};
27a1a801
EW
1792 $self->SUPER::abort_edit(@_);
1793}
1794
1795sub close_edit {
1796 my $self = shift;
dad73c0b 1797 $self->{git_commit_ok} = 1;
ef3cfaad
EW
1798 $self->{nr} = $self->{gii}->{nr};
1799 delete $self->{gii};
27a1a801
EW
1800 $self->SUPER::close_edit(@_);
1801}
1a82e793 1802
a5e0cedc
EW
1803package SVN::Git::Editor;
1804use vars qw/@ISA/;
1805use strict;
1806use warnings;
1807use Carp qw/croak/;
1808use IO::File;
1809
1810sub new {
61395354
EW
1811 my ($class, $opts) = @_;
1812 foreach (qw/svn_path r ra tree_a tree_b log editor_cb/) {
1813 die "$_ required!\n" unless (defined $opts->{$_});
1814 }
1815
1816 my $pool = SVN::Pool->new;
1817 my $mods = generate_diff($opts->{tree_a}, $opts->{tree_b});
1818 my $types = check_diff_paths($opts->{ra}, $opts->{svn_path},
1819 $opts->{r}, $mods);
1820
1821 # $opts->{ra} functions should not be used after this:
1822 my @ce = $opts->{ra}->get_commit_editor($opts->{log},
1823 $opts->{editor_cb}, $pool);
1824 my $self = SVN::Delta::Editor->new(@ce, $pool);
a5e0cedc 1825 bless $self, $class;
61395354
EW
1826 foreach (qw/svn_path r tree_a tree_b/) {
1827 $self->{$_} = $opts->{$_};
a5e0cedc 1828 }
61395354
EW
1829 $self->{url} = $opts->{ra}->{url};
1830 $self->{mods} = $mods;
1831 $self->{types} = $types;
1832 $self->{pool} = $pool;
a5e0cedc
EW
1833 $self->{bat} = { '' => $self->open_root($self->{r}, $self->{pool}) };
1834 $self->{rm} = { };
d3a840dc
EW
1835 $self->{path_prefix} = length $self->{svn_path} ?
1836 "$self->{svn_path}/" : '';
a5e0cedc
EW
1837 require Digest::MD5;
1838 return $self;
1839}
1840
61395354
EW
1841sub generate_diff {
1842 my ($tree_a, $tree_b) = @_;
1843 my @diff_tree = qw(diff-tree -z -r);
1844 if ($::_cp_similarity) {
1845 push @diff_tree, "-C$::_cp_similarity";
1846 } else {
1847 push @diff_tree, '-C';
1848 }
1849 push @diff_tree, '--find-copies-harder' if $::_find_copies_harder;
1850 push @diff_tree, "-l$::_l" if defined $::_l;
1851 push @diff_tree, $tree_a, $tree_b;
1852 my ($diff_fh, $ctx) = command_output_pipe(@diff_tree);
1853 local $/ = "\0";
1854 my $state = 'meta';
1855 my @mods;
1856 while (<$diff_fh>) {
1857 chomp $_; # this gets rid of the trailing "\0"
1858 if ($state eq 'meta' && /^:(\d{6})\s(\d{6})\s
1859 $::sha1\s($::sha1)\s
1860 ([MTCRAD])\d*$/xo) {
1861 push @mods, { mode_a => $1, mode_b => $2,
1862 sha1_b => $3, chg => $4 };
1863 if ($4 =~ /^(?:C|R)$/) {
1864 $state = 'file_a';
1865 } else {
1866 $state = 'file_b';
1867 }
1868 } elsif ($state eq 'file_a') {
1869 my $x = $mods[$#mods] or croak "Empty array\n";
1870 if ($x->{chg} !~ /^(?:C|R)$/) {
1871 croak "Error parsing $_, $x->{chg}\n";
1872 }
1873 $x->{file_a} = $_;
1874 $state = 'file_b';
1875 } elsif ($state eq 'file_b') {
1876 my $x = $mods[$#mods] or croak "Empty array\n";
1877 if (exists $x->{file_a} && $x->{chg} !~ /^(?:C|R)$/) {
1878 croak "Error parsing $_, $x->{chg}\n";
1879 }
1880 if (!exists $x->{file_a} && $x->{chg} =~ /^(?:C|R)$/) {
1881 croak "Error parsing $_, $x->{chg}\n";
1882 }
1883 $x->{file_b} = $_;
1884 $state = 'meta';
1885 } else {
1886 croak "Error parsing $_\n";
1887 }
1888 }
1889 command_close_pipe($diff_fh, $ctx);
1890 \@mods;
1891}
1892
1893sub check_diff_paths {
1894 my ($ra, $pfx, $rev, $mods) = @_;
1895 my %types;
1896 $pfx .= '/' if length $pfx;
1897
1898 sub type_diff_paths {
1899 my ($ra, $types, $path, $rev) = @_;
1900 my @p = split m#/+#, $path;
1901 my $c = shift @p;
1902 unless (defined $types->{$c}) {
1903 $types->{$c} = $ra->check_path($c, $rev);
1904 }
1905 while (@p) {
1906 $c .= '/' . shift @p;
1907 next if defined $types->{$c};
1908 $types->{$c} = $ra->check_path($c, $rev);
1909 }
1910 }
1911
1912 foreach my $m (@$mods) {
1913 foreach my $f (qw/file_a file_b/) {
1914 next unless defined $m->{$f};
1915 my ($dir) = ($m->{$f} =~ m#^(.*?)/?(?:[^/]+)$#);
1916 if (length $pfx.$dir && ! defined $types{$dir}) {
1917 type_diff_paths($ra, \%types, $pfx.$dir, $rev);
1918 }
1919 }
1920 }
1921 \%types;
1922}
1923
a5e0cedc
EW
1924sub split_path {
1925 return ($_[0] =~ m#^(.*?)/?([^/]+)$#);
1926}
1927
1928sub repo_path {
d3a840dc
EW
1929 my ($self, $path) = @_;
1930 $self->{path_prefix}.(defined $path ? $path : '');
a5e0cedc
EW
1931}
1932
1933sub url_path {
1934 my ($self, $path) = @_;
6e8548cc 1935 $self->{url} . '/' . $self->repo_path($path);
a5e0cedc
EW
1936}
1937
1938sub rmdirs {
61395354 1939 my ($self) = @_;
a5e0cedc
EW
1940 my $rm = $self->{rm};
1941 delete $rm->{''}; # we never delete the url we're tracking
1942 return unless %$rm;
1943
1944 foreach (keys %$rm) {
1945 my @d = split m#/#, $_;
1946 my $c = shift @d;
1947 $rm->{$c} = 1;
1948 while (@d) {
1949 $c .= '/' . shift @d;
1950 $rm->{$c} = 1;
1951 }
1952 }
1953 delete $rm->{$self->{svn_path}};
1954 delete $rm->{''}; # we never delete the url we're tracking
1955 return unless %$rm;
1956
61395354
EW
1957 my ($fh, $ctx) = command_output_pipe(qw/ls-tree --name-only -r -z/,
1958 $self->{tree_b});
a5e0cedc
EW
1959 local $/ = "\0";
1960 while (<$fh>) {
1961 chomp;
747fa12c 1962 my @dn = split m#/#, $_;
c07eee1f
EW
1963 while (pop @dn) {
1964 delete $rm->{join '/', @dn};
1965 }
1966 unless (%$rm) {
22600a25 1967 close $fh;
c07eee1f
EW
1968 return;
1969 }
a5e0cedc 1970 }
aef4e921 1971 command_close_pipe($fh, $ctx);
c07eee1f 1972
a5e0cedc
EW
1973 my ($r, $p, $bat) = ($self->{r}, $self->{pool}, $self->{bat});
1974 foreach my $d (sort { $b =~ tr#/#/# <=> $a =~ tr#/#/# } keys %$rm) {
1975 $self->close_directory($bat->{$d}, $p);
1976 my ($dn) = ($d =~ m#^(.*?)/?(?:[^/]+)$#);
44320b9e 1977 print "\tD+\t$d/\n" unless $::_q;
a5e0cedc
EW
1978 $self->SUPER::delete_entry($d, $r, $bat->{$dn}, $p);
1979 delete $bat->{$d};
1980 }
1981}
1982
1983sub open_or_add_dir {
1984 my ($self, $full_path, $baton) = @_;
6e8548cc
EW
1985 my $t = $self->{types}->{$full_path};
1986 if (!defined $t) {
1987 die "$full_path not known in r$self->{r} or we have a bug!\n";
1988 }
a5e0cedc
EW
1989 if ($t == $SVN::Node::none) {
1990 return $self->add_directory($full_path, $baton,
1991 undef, -1, $self->{pool});
1992 } elsif ($t == $SVN::Node::dir) {
1993 return $self->open_directory($full_path, $baton,
1994 $self->{r}, $self->{pool});
1995 }
1996 print STDERR "$full_path already exists in repository at ",
1997 "r$self->{r} and it is not a directory (",
1998 ($t == $SVN::Node::file ? 'file' : 'unknown'),"/$t)\n";
1999 exit 1;
2000}
2001
2002sub ensure_path {
2003 my ($self, $path) = @_;
2004 my $bat = $self->{bat};
6e8548cc
EW
2005 my $repo_path = $self->repo_path($path);
2006 return $bat->{''} unless (length $repo_path);
2007 my @p = split m#/+#, $repo_path;
a5e0cedc
EW
2008 my $c = shift @p;
2009 $bat->{$c} ||= $self->open_or_add_dir($c, $bat->{''});
2010 while (@p) {
2011 my $c0 = $c;
2012 $c .= '/' . shift @p;
2013 $bat->{$c} ||= $self->open_or_add_dir($c, $bat->{$c0});
2014 }
2015 return $bat->{$c};
2016}
2017
2018sub A {
44320b9e 2019 my ($self, $m) = @_;
a5e0cedc
EW
2020 my ($dir, $file) = split_path($m->{file_b});
2021 my $pbat = $self->ensure_path($dir);
2022 my $fbat = $self->add_file($self->repo_path($m->{file_b}), $pbat,
2023 undef, -1);
44320b9e 2024 print "\tA\t$m->{file_b}\n" unless $::_q;
a5e0cedc
EW
2025 $self->chg_file($fbat, $m);
2026 $self->close_file($fbat,undef,$self->{pool});
2027}
2028
2029sub C {
44320b9e 2030 my ($self, $m) = @_;
a5e0cedc
EW
2031 my ($dir, $file) = split_path($m->{file_b});
2032 my $pbat = $self->ensure_path($dir);
2033 my $fbat = $self->add_file($self->repo_path($m->{file_b}), $pbat,
2034 $self->url_path($m->{file_a}), $self->{r});
44320b9e 2035 print "\tC\t$m->{file_a} => $m->{file_b}\n" unless $::_q;
a5e0cedc
EW
2036 $self->chg_file($fbat, $m);
2037 $self->close_file($fbat,undef,$self->{pool});
2038}
2039
2040sub delete_entry {
2041 my ($self, $path, $pbat) = @_;
2042 my $rpath = $self->repo_path($path);
2043 my ($dir, $file) = split_path($rpath);
2044 $self->{rm}->{$dir} = 1;
2045 $self->SUPER::delete_entry($rpath, $self->{r}, $pbat, $self->{pool});
2046}
2047
2048sub R {
44320b9e 2049 my ($self, $m) = @_;
a5e0cedc
EW
2050 my ($dir, $file) = split_path($m->{file_b});
2051 my $pbat = $self->ensure_path($dir);
2052 my $fbat = $self->add_file($self->repo_path($m->{file_b}), $pbat,
2053 $self->url_path($m->{file_a}), $self->{r});
44320b9e 2054 print "\tR\t$m->{file_a} => $m->{file_b}\n" unless $::_q;
a5e0cedc
EW
2055 $self->chg_file($fbat, $m);
2056 $self->close_file($fbat,undef,$self->{pool});
2057
2058 ($dir, $file) = split_path($m->{file_a});
2059 $pbat = $self->ensure_path($dir);
2060 $self->delete_entry($m->{file_a}, $pbat);
2061}
2062
2063sub M {
44320b9e 2064 my ($self, $m) = @_;
a5e0cedc
EW
2065 my ($dir, $file) = split_path($m->{file_b});
2066 my $pbat = $self->ensure_path($dir);
2067 my $fbat = $self->open_file($self->repo_path($m->{file_b}),
2068 $pbat,$self->{r},$self->{pool});
44320b9e 2069 print "\t$m->{chg}\t$m->{file_b}\n" unless $::_q;
a5e0cedc
EW
2070 $self->chg_file($fbat, $m);
2071 $self->close_file($fbat,undef,$self->{pool});
2072}
2073
2074sub T { shift->M(@_) }
2075
2076sub change_file_prop {
2077 my ($self, $fbat, $pname, $pval) = @_;
2078 $self->SUPER::change_file_prop($fbat, $pname, $pval, $self->{pool});
2079}
2080
2081sub chg_file {
2082 my ($self, $fbat, $m) = @_;
2083 if ($m->{mode_b} =~ /755$/ && $m->{mode_a} !~ /755$/) {
2084 $self->change_file_prop($fbat,'svn:executable','*');
2085 } elsif ($m->{mode_b} !~ /755$/ && $m->{mode_a} =~ /755$/) {
2086 $self->change_file_prop($fbat,'svn:executable',undef);
2087 }
2088 my $fh = IO::File->new_tmpfile or croak $!;
2089 if ($m->{mode_b} =~ /^120/) {
2090 print $fh 'link ' or croak $!;
2091 $self->change_file_prop($fbat,'svn:special','*');
2092 } elsif ($m->{mode_a} =~ /^120/ && $m->{mode_b} !~ /^120/) {
2093 $self->change_file_prop($fbat,'svn:special',undef);
2094 }
2095 defined(my $pid = fork) or croak $!;
2096 if (!$pid) {
2097 open STDOUT, '>&', $fh or croak $!;
2098 exec qw/git-cat-file blob/, $m->{sha1_b} or croak $!;
2099 }
2100 waitpid $pid, 0;
2101 croak $? if $?;
2102 $fh->flush == 0 or croak $!;
2103 seek $fh, 0, 0 or croak $!;
2104
2105 my $md5 = Digest::MD5->new;
2106 $md5->addfile($fh) or croak $!;
2107 seek $fh, 0, 0 or croak $!;
2108
2109 my $exp = $md5->hexdigest;
f7197dff
EW
2110 my $pool = SVN::Pool->new;
2111 my $atd = $self->apply_textdelta($fbat, undef, $pool);
2112 my $got = SVN::TxDelta::send_stream($fh, @$atd, $pool);
a5e0cedc 2113 die "Checksum mismatch\nexpected: $exp\ngot: $got\n" if ($got ne $exp);
f7197dff 2114 $pool->clear;
a5e0cedc
EW
2115
2116 close $fh or croak $!;
2117}
2118
2119sub D {
44320b9e 2120 my ($self, $m) = @_;
a5e0cedc
EW
2121 my ($dir, $file) = split_path($m->{file_b});
2122 my $pbat = $self->ensure_path($dir);
44320b9e 2123 print "\tD\t$m->{file_b}\n" unless $::_q;
a5e0cedc
EW
2124 $self->delete_entry($m->{file_b}, $pbat);
2125}
2126
2127sub close_edit {
2128 my ($self) = @_;
2129 my ($p,$bat) = ($self->{pool}, $self->{bat});
2130 foreach (sort { $b =~ tr#/#/# <=> $a =~ tr#/#/# } keys %$bat) {
2131 $self->close_directory($bat->{$_}, $p);
2132 }
2133 $self->SUPER::close_edit($p);
2134 $p->clear;
2135}
2136
2137sub abort_edit {
2138 my ($self) = @_;
2139 $self->SUPER::abort_edit($self->{pool});
61395354
EW
2140}
2141
2142sub DESTROY {
2143 my $self = shift;
2144 $self->SUPER::DESTROY(@_);
a5e0cedc
EW
2145 $self->{pool}->clear;
2146}
2147
44320b9e
EW
2148# this drives the editor
2149sub apply_diff {
61395354
EW
2150 my ($self) = @_;
2151 my $mods = $self->{mods};
44320b9e 2152 my %o = ( D => 1, R => 0, C => -1, A => 3, M => 3, T => 3 );
6e8548cc 2153 foreach my $m (sort { $o{$a->{chg}} <=> $o{$b->{chg}} } @$mods) {
44320b9e
EW
2154 my $f = $m->{chg};
2155 if (defined $o{$f}) {
2156 $self->$f($m);
2157 } else {
2158 fatal("Invalid change type: $f\n");
2159 }
2160 }
61395354 2161 $self->rmdirs if $::_rmdir;
6e8548cc 2162 if (@$mods == 0) {
44320b9e
EW
2163 $self->abort_edit;
2164 } else {
2165 $self->close_edit;
2166 }
6e8548cc 2167 return scalar @$mods;
44320b9e
EW
2168}
2169
d81bf827
EW
2170package Git::SVN::Ra;
2171use vars qw/@ISA $config_dir/;
2172use strict;
2173use warnings;
2174my ($can_do_switch);
f6f09876 2175my %RA;
d81bf827
EW
2176
2177BEGIN {
2178 # enforce temporary pool usage for some simple functions
2179 my $e;
2180 foreach (qw/get_latest_revnum rev_proplist get_file
2181 check_path get_dir get_uuid get_repos_root/) {
2182 $e .= "sub $_ {
2183 my \$self = shift;
2184 my \$pool = SVN::Pool->new;
2185 my \@ret = \$self->SUPER::$_(\@_,\$pool);
2186 \$pool->clear;
2187 wantarray ? \@ret : \$ret[0]; }\n";
2188 }
2189 eval $e;
2190}
2191
2192sub new {
2193 my ($class, $url) = @_;
f6f09876
EW
2194 $url =~ s!/+$!!;
2195 return $RA{$url} if $RA{$url};
2196
d81bf827
EW
2197 SVN::_Core::svn_config_ensure($config_dir, undef);
2198 my ($baton, $callbacks) = SVN::Core::auth_open_helper([
2199 SVN::Client::get_simple_provider(),
2200 SVN::Client::get_ssl_server_trust_file_provider(),
2201 SVN::Client::get_simple_prompt_provider(
2202 \&Git::SVN::Prompt::simple, 2),
2203 SVN::Client::get_ssl_client_cert_prompt_provider(
2204 \&Git::SVN::Prompt::ssl_client_cert, 2),
2205 SVN::Client::get_ssl_client_cert_pw_prompt_provider(
2206 \&Git::SVN::Prompt::ssl_client_cert_pw, 2),
2207 SVN::Client::get_username_provider(),
2208 SVN::Client::get_ssl_server_trust_prompt_provider(
2209 \&Git::SVN::Prompt::ssl_server_trust),
2210 SVN::Client::get_username_prompt_provider(
2211 \&Git::SVN::Prompt::username, 2),
2212 ]);
2213 my $config = SVN::Core::config_get_config($config_dir);
2214 my $self = SVN::Ra->new(url => $url, auth => $baton,
2215 config => $config,
2216 pool => SVN::Pool->new,
2217 auth_provider_callbacks => $callbacks);
2218 $self->{svn_path} = $url;
2219 $self->{repos_root} = $self->get_repos_root;
2220 $self->{svn_path} =~ s#^\Q$self->{repos_root}\E/*##;
f6f09876 2221 $RA{$url} = bless $self, $class;
d81bf827
EW
2222}
2223
2224sub DESTROY {
f6f09876 2225 # do not call the real DESTROY since we store ourselves in %RA
d81bf827
EW
2226}
2227
d81bf827
EW
2228sub get_log {
2229 my ($self, @args) = @_;
2230 my $pool = SVN::Pool->new;
d81bf827
EW
2231 splice(@args, 3, 1) if ($SVN::Core::VERSION le '1.2.0');
2232 my $ret = $self->SUPER::get_log(@args, $pool);
2233 $pool->clear;
2234 $ret;
2235}
2236
2237sub get_commit_editor {
44320b9e 2238 my ($self, $log, $cb, $pool) = @_;
d81bf827 2239 my @lock = $SVN::Core::VERSION ge '1.2.0' ? (undef, 0) : ();
44320b9e 2240 $self->SUPER::get_commit_editor($log, $cb, @lock, $pool);
d81bf827
EW
2241}
2242
2243sub uuid {
2244 my ($self) = @_;
2245 $self->{uuid} ||= $self->get_uuid;
2246}
2247
2248sub gs_do_update {
2249 my ($self, $rev_a, $rev_b, $path, $recurse, $editor) = @_;
2250 my $pool = SVN::Pool->new;
8b8fc068 2251 $editor->set_path_strip($path);
d81bf827
EW
2252 my $reporter = $self->do_update($rev_b, $path, $recurse,
2253 $editor, $pool);
2254 my @lock = $SVN::Core::VERSION ge '1.2.0' ? (undef) : ();
2255 my $new = ($rev_a == $rev_b);
706587fc 2256 $reporter->set_path('', $rev_a, $new, @lock, $pool);
d81bf827
EW
2257 $reporter->finish_report($pool);
2258 $pool->clear;
2259 $editor->{git_commit_ok};
2260}
2261
2262sub gs_do_switch {
2263 my ($self, $rev_a, $rev_b, $path, $recurse, $url_b, $editor) = @_;
2264 my $pool = SVN::Pool->new;
8b8fc068 2265 $editor->set_path_strip($path);
d81bf827
EW
2266 my $reporter = $self->do_switch($rev_b, $path, $recurse,
2267 $url_b, $editor, $pool);
2268 my @lock = $SVN::Core::VERSION ge '1.2.0' ? (undef) : ();
8b8fc068 2269 $reporter->set_path('', $rev_a, 0, @lock, $pool);
d81bf827
EW
2270 $reporter->finish_report($pool);
2271 $pool->clear;
2272 $editor->{git_commit_ok};
2273}
2274
0af9c9f9
EW
2275sub gs_fetch_loop_common {
2276 my ($self, $base, $head, @gs) = @_;
2277 my $inc = 1000;
2278 my ($min, $max) = ($base, $head < $base + $inc ? $head : $base + $inc);
2279 my $err_handler = $SVN::Error::handler;
2280 my $err;
2281 $SVN::Error::handler = sub { ($err) = @_; skip_unknown_revs($err); };
2282 my @paths = @gs == 1 ? ($gs[0]->{path}) : ('');
2283 foreach my $gs (@gs) {
2284 if (my $last_commit = $gs->last_commit) {
2285 $gs->assert_index_clean($last_commit);
2286 }
2287 $gs->{path_regex} = qr/^\/\Q$gs->{path}\E\/?/;
2288 }
2289 while (1) {
2290 my @revs;
2291 $self->get_log(\@paths, $min, $max, 0, 1, 1,
2292 sub { push @revs, [ dup_changed_paths($_[0]), $_[1] ]; });
2293 if (! @revs && $err && $max >= $head) {
2294 print STDERR "Branch probably deleted:\n ",
2295 $err->expanded_message,
2296 "\nWill attempt to follow revisions ",
2297 "r$min .. r$max ",
2298 "committed before the deletion\n";
2299 @revs = map { [ undef, $_ ] } ($min .. $max);
2300 }
2301 foreach (@revs) {
2302 my ($paths, $r) = @$_;
2303 foreach my $gs (@gs) {
2304 if ($paths) {
2305 grep /$gs->{path_regex}/, keys %$paths
2306 or next;
2307 }
2308 next if defined $gs->rev_db_get($r);
2309 if (my $log_entry = $gs->do_fetch($paths, $r)) {
2310 $gs->do_git_commit($log_entry);
2311 }
2312 }
2313 }
2314 last if $max >= $head;
2315 $min = $max + 1;
2316 $max += $inc;
2317 $max = $head if ($max > $head);
2318 }
2319 $SVN::Error::handler = $err_handler;
2320}
2321
e6434f87
EW
2322sub minimize_url {
2323 my ($self) = @_;
2324 return $self->{url} if ($self->{url} eq $self->{repos_root});
2325 my $url = $self->{repos_root};
2326 my @components = split(m!/!, $self->{svn_path});
2327 my $c = '';
2328 do {
2329 $url .= "/$c" if length $c;
2330 eval { (ref $self)->new($url)->get_latest_revnum };
2331 } while ($@ && ($c = shift @components));
2332 $url;
2333}
2334
d81bf827
EW
2335sub can_do_switch {
2336 my $self = shift;
2337 unless (defined $can_do_switch) {
2338 my $pool = SVN::Pool->new;
2339 my $rep = eval {
2340 $self->do_switch(1, '', 0, $self->{url},
2341 SVN::Delta::Editor->new, $pool);
2342 };
2343 if ($@) {
2344 $can_do_switch = 0;
2345 } else {
2346 $rep->abort_report($pool);
2347 $can_do_switch = 1;
2348 }
2349 $pool->clear;
2350 }
2351 $can_do_switch;
2352}
2353
0af9c9f9
EW
2354sub skip_unknown_revs {
2355 my ($err) = @_;
2356 my $errno = $err->apr_err();
2357 # Maybe the branch we're tracking didn't
2358 # exist when the repo started, so it's
2359 # not an error if it doesn't, just continue
2360 #
2361 # Wonderfully consistent library, eh?
2362 # 160013 - svn:// and file://
2363 # 175002 - http(s)://
2364 # 175007 - http(s):// (this repo required authorization, too...)
2365 # More codes may be discovered later...
2366 if ($errno == 175007 || $errno == 175002 || $errno == 160013) {
2367 return;
2368 }
2369 die "Error from SVN, ($errno): ", $err->expanded_message,"\n";
2370}
2371
2372# svn_log_changed_path_t objects passed to get_log are likely to be
2373# overwritten even if only the refs are copied to an external variable,
2374# so we should dup the structures in their entirety. Using an externally
2375# passed pool (instead of our temporary and quickly cleared pool in
2376# Git::SVN::Ra) does not help matters at all...
2377sub dup_changed_paths {
2378 my ($paths) = @_;
2379 return undef unless $paths;
2380 my %ret;
2381 foreach my $p (keys %$paths) {
2382 my $i = $paths->{$p};
2383 my %s = map { $_ => $i->$_ }
2384 qw/copyfrom_path copyfrom_rev action/;
2385 $ret{$p} = \%s;
2386 }
2387 \%ret;
2388}
2389
f8c9d1d2
EW
2390package Git::SVN::Log;
2391use strict;
2392use warnings;
2393use POSIX qw/strftime/;
2394use vars qw/$TZ $limit $color $pager $non_recursive $verbose $oneline
2395 %rusers $show_commit $incremental/;
2396my $l_fmt;
2397
2398sub cmt_showable {
2399 my ($c) = @_;
2400 return 1 if defined $c->{r};
2401 if ($c->{l} && $c->{l}->[-1] eq "...\n" &&
2402 $c->{a_raw} =~ /\@([a-f\d\-]+)>$/) {
44320b9e
EW
2403 my @log = command(qw/cat-file commit/, $c->{c});
2404 shift @log while ($log[0] ne "\n");
2405 shift @log;
2406 @{$c->{l}} = grep !/^git-svn-id: /, @log;
f8c9d1d2
EW
2407
2408 (undef, $c->{r}, undef) = ::extract_metadata(
44320b9e 2409 (grep(/^git-svn-id: /, @log))[-1]);
f8c9d1d2
EW
2410 }
2411 return defined $c->{r};
2412}
2413
2414sub log_use_color {
2415 return 1 if $color;
2416 my ($dc, $dcvar);
2417 $dcvar = 'color.diff';
2418 $dc = `git-config --get $dcvar`;
2419 if ($dc eq '') {
2420 # nothing at all; fallback to "diff.color"
2421 $dcvar = 'diff.color';
2422 $dc = `git-config --get $dcvar`;
2423 }
2424 chomp($dc);
2425 if ($dc eq 'auto') {
2426 my $pc;
2427 $pc = `git-config --get color.pager`;
2428 if ($pc eq '') {
2429 # does not have it -- fallback to pager.color
2430 $pc = `git-config --bool --get pager.color`;
2431 }
2432 else {
2433 $pc = `git-config --bool --get color.pager`;
2434 if ($?) {
2435 $pc = 'false';
2436 }
2437 }
2438 chomp($pc);
2439 if (-t *STDOUT || (defined $pager && $pc eq 'true')) {
2440 return ($ENV{TERM} && $ENV{TERM} ne 'dumb');
2441 }
2442 return 0;
2443 }
2444 return 0 if $dc eq 'never';
2445 return 1 if $dc eq 'always';
2446 chomp($dc = `git-config --bool --get $dcvar`);
2447 return ($dc eq 'true');
2448}
2449
2450sub git_svn_log_cmd {
2451 my ($r_min, $r_max) = @_;
2452 my $gs = Git::SVN->_new;
2453 my @cmd = (qw/log --abbrev-commit --pretty=raw --default/,
2454 $gs->refname);
2455 push @cmd, '-r' unless $non_recursive;
2456 push @cmd, qw/--raw --name-status/ if $verbose;
2457 push @cmd, '--color' if log_use_color();
2458 return @cmd unless defined $r_max;
2459 if ($r_max == $r_min) {
2460 push @cmd, '--max-count=1';
2461 if (my $c = $gs->rev_db_get($r_max)) {
2462 push @cmd, $c;
2463 }
2464 } else {
2465 my ($c_min, $c_max);
2466 $c_max = $gs->rev_db_get($r_max);
2467 $c_min = $gs->rev_db_get($r_min);
2468 if (defined $c_min && defined $c_max) {
2469 if ($r_max > $r_max) {
2470 push @cmd, "$c_min..$c_max";
2471 } else {
2472 push @cmd, "$c_max..$c_min";
2473 }
2474 } elsif ($r_max > $r_min) {
2475 push @cmd, $c_max;
2476 } else {
2477 push @cmd, $c_min;
2478 }
2479 }
2480 return @cmd;
2481}
2482
2483# adapted from pager.c
2484sub config_pager {
2485 $pager ||= $ENV{GIT_PAGER} || $ENV{PAGER};
2486 if (!defined $pager) {
2487 $pager = 'less';
2488 } elsif (length $pager == 0 || $pager eq 'cat') {
2489 $pager = undef;
2490 }
2491}
2492
2493sub run_pager {
2494 return unless -t *STDOUT;
2495 pipe my $rfd, my $wfd or return;
2496 defined(my $pid = fork) or ::fatal "Can't fork: $!\n";
2497 if (!$pid) {
2498 open STDOUT, '>&', $wfd or
2499 ::fatal "Can't redirect to stdout: $!\n";
2500 return;
2501 }
2502 open STDIN, '<&', $rfd or ::fatal "Can't redirect stdin: $!\n";
2503 $ENV{LESS} ||= 'FRSX';
2504 exec $pager or ::fatal "Can't run pager: $! ($pager)\n";
2505}
2506
21819a37
EW
2507sub tz_to_s_offset {
2508 my ($tz) = @_;
2509 $tz =~ s/(\d\d)$//;
2510 return ($1 * 60) + ($tz * 3600);
2511}
2512
f8c9d1d2
EW
2513sub get_author_info {
2514 my ($dest, $author, $t, $tz) = @_;
2515 $author =~ s/(?:^\s*|\s*$)//g;
2516 $dest->{a_raw} = $author;
2517 my $au;
1c8443b0 2518 if ($::_authors) {
f8c9d1d2
EW
2519 $au = $rusers{$author} || undef;
2520 }
2521 if (!$au) {
2522 ($au) = ($author =~ /<([^>]+)\@[^>]+>$/);
2523 }
2524 $dest->{t} = $t;
2525 $dest->{tz} = $tz;
2526 $dest->{a} = $au;
2527 # Date::Parse isn't in the standard Perl distro :(
2528 if ($tz =~ s/^\+//) {
21819a37 2529 $t += tz_to_s_offset($tz);
f8c9d1d2 2530 } elsif ($tz =~ s/^\-//) {
21819a37 2531 $t -= tz_to_s_offset($tz);
f8c9d1d2
EW
2532 }
2533 $dest->{t_utc} = $t;
2534}
2535
2536sub process_commit {
2537 my ($c, $r_min, $r_max, $defer) = @_;
2538 if (defined $r_min && defined $r_max) {
2539 if ($r_min == $c->{r} && $r_min == $r_max) {
2540 show_commit($c);
2541 return 0;
2542 }
2543 return 1 if $r_min == $r_max;
2544 if ($r_min < $r_max) {
2545 # we need to reverse the print order
2546 return 0 if (defined $limit && --$limit < 0);
2547 push @$defer, $c;
2548 return 1;
2549 }
2550 if ($r_min != $r_max) {
2551 return 1 if ($r_min < $c->{r});
2552 return 1 if ($r_max > $c->{r});
2553 }
2554 }
2555 return 0 if (defined $limit && --$limit < 0);
2556 show_commit($c);
2557 return 1;
2558}
2559
2560sub show_commit {
2561 my $c = shift;
2562 if ($oneline) {
2563 my $x = "\n";
2564 if (my $l = $c->{l}) {
2565 while ($l->[0] =~ /^\s*$/) { shift @$l }
2566 $x = $l->[0];
2567 }
2568 $l_fmt ||= 'A' . length($c->{r});
2569 print 'r',pack($l_fmt, $c->{r}),' | ';
2570 print "$c->{c} | " if $show_commit;
2571 print $x;
2572 } else {
2573 show_commit_normal($c);
2574 }
2575}
2576
2577sub show_commit_changed_paths {
2578 my ($c) = @_;
2579 return unless $c->{changed};
2580 print "Changed paths:\n", @{$c->{changed}};
2581}
2582
2583sub show_commit_normal {
2584 my ($c) = @_;
2585 print '-' x72, "\nr$c->{r} | ";
2586 print "$c->{c} | " if $show_commit;
2587 print "$c->{a} | ", strftime("%Y-%m-%d %H:%M:%S %z (%a, %d %b %Y)",
2588 localtime($c->{t_utc})), ' | ';
2589 my $nr_line = 0;
2590
2591 if (my $l = $c->{l}) {
2592 while ($l->[$#$l] eq "\n" && $#$l > 0
2593 && $l->[($#$l - 1)] eq "\n") {
2594 pop @$l;
2595 }
2596 $nr_line = scalar @$l;
2597 if (!$nr_line) {
2598 print "1 line\n\n\n";
2599 } else {
2600 if ($nr_line == 1) {
2601 $nr_line = '1 line';
2602 } else {
2603 $nr_line .= ' lines';
2604 }
2605 print $nr_line, "\n";
2606 show_commit_changed_paths($c);
2607 print "\n";
2608 print $_ foreach @$l;
2609 }
2610 } else {
2611 print "1 line\n";
2612 show_commit_changed_paths($c);
2613 print "\n";
2614
2615 }
2616 foreach my $x (qw/raw diff/) {
2617 if ($c->{$x}) {
2618 print "\n";
2619 print $_ foreach @{$c->{$x}}
2620 }
2621 }
2622}
2623
2624sub cmd_show_log {
2625 my (@args) = @_;
2626 my ($r_min, $r_max);
2627 my $r_last = -1; # prevent dupes
2628 if (defined $TZ) {
2629 $ENV{TZ} = $TZ;
2630 } else {
2631 delete $ENV{TZ};
2632 }
2633 if (defined $::_revision) {
2634 if ($::_revision =~ /^(\d+):(\d+)$/) {
2635 ($r_min, $r_max) = ($1, $2);
2636 } elsif ($::_revision =~ /^\d+$/) {
2637 $r_min = $r_max = $::_revision;
2638 } else {
2639 ::fatal "-r$::_revision is not supported, use ",
2640 "standard \'git log\' arguments instead\n";
2641 }
2642 }
2643
2644 config_pager();
2645 @args = (git_svn_log_cmd($r_min, $r_max), @args);
2646 my $log = command_output_pipe(@args);
2647 run_pager();
2648 my (@k, $c, $d);
2649 my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/;
2650 while (<$log>) {
2651 if (/^${esc_color}commit ($::sha1_short)/o) {
2652 my $cmt = $1;
2653 if ($c && cmt_showable($c) && $c->{r} != $r_last) {
2654 $r_last = $c->{r};
2655 process_commit($c, $r_min, $r_max, \@k) or
2656 goto out;
2657 }
2658 $d = undef;
2659 $c = { c => $cmt };
2660 } elsif (/^${esc_color}author (.+) (\d+) ([\-\+]?\d+)$/o) {
2661 get_author_info($c, $1, $2, $3);
2662 } elsif (/^${esc_color}(?:tree|parent|committer) /o) {
2663 # ignore
2664 } elsif (/^${esc_color}:\d{6} \d{6} $::sha1_short/o) {
2665 push @{$c->{raw}}, $_;
2666 } elsif (/^${esc_color}[ACRMDT]\t/) {
2667 # we could add $SVN->{svn_path} here, but that requires
2668 # remote access at the moment (repo_path_split)...
2669 s#^(${esc_color})([ACRMDT])\t#$1 $2 #o;
2670 push @{$c->{changed}}, $_;
2671 } elsif (/^${esc_color}diff /o) {
2672 $d = 1;
2673 push @{$c->{diff}}, $_;
2674 } elsif ($d) {
2675 push @{$c->{diff}}, $_;
2676 } elsif (/^${esc_color} (git-svn-id:.+)$/o) {
2677 ($c->{url}, $c->{r}, undef) = ::extract_metadata($1);
2678 } elsif (s/^${esc_color} //o) {
2679 push @{$c->{l}}, $_;
2680 }
2681 }
2682 if ($c && defined $c->{r} && $c->{r} != $r_last) {
2683 $r_last = $c->{r};
2684 process_commit($c, $r_min, $r_max, \@k);
2685 }
2686 if (@k) {
2687 my $swap = $r_max;
2688 $r_max = $r_min;
2689 $r_min = $swap;
2690 process_commit($_, $r_min, $r_max) foreach reverse @k;
2691 }
2692out:
c843c464 2693 close $log;
f8c9d1d2
EW
2694 print '-' x72,"\n" unless $incremental || $oneline;
2695}
2696
706587fc
EW
2697package Git::SVN::Migration;
2698# these version numbers do NOT correspond to actual version numbers
2699# of git nor git-svn. They are just relative.
2700#
2701# v0 layout: .git/$id/info/url, refs/heads/$id-HEAD
2702#
2703# v1 layout: .git/$id/info/url, refs/remotes/$id
2704#
2705# v2 layout: .git/svn/$id/info/url, refs/remotes/$id
2706#
2707# v3 layout: .git/svn/$id, refs/remotes/$id
2708# - info/url may remain for backwards compatibility
2709# - this is what we migrate up to this layout automatically,
2710# - this will be used by git svn init on single branches
2711#
2712# v4 layout: .git/svn/$repo_id/$id, refs/remotes/$repo_id/$id
2713# - this is only created for newly multi-init-ed
2714# repositories. Similar in spirit to the
2715# --use-separate-remotes option in git-clone (now default)
2716# - we do not automatically migrate to this (following
2717# the example set by core git)
2718use strict;
2719use warnings;
2720use Carp qw/croak/;
2721use File::Path qw/mkpath/;
47e39c55
EW
2722use File::Basename qw/dirname basename/;
2723use vars qw/$_minimize/;
706587fc
EW
2724
2725sub migrate_from_v0 {
2726 my $git_dir = $ENV{GIT_DIR};
2727 return undef unless -d $git_dir;
2728 my ($fh, $ctx) = command_output_pipe(qw/rev-parse --symbolic --all/);
2729 my $migrated = 0;
2730 while (<$fh>) {
2731 chomp;
2732 my ($id, $orig_ref) = ($_, $_);
2733 next unless $id =~ s#^refs/heads/(.+)-HEAD$#$1#;
2734 next unless -f "$git_dir/$id/info/url";
2735 my $new_ref = "refs/remotes/$id";
2736 if (::verify_ref("$new_ref^0")) {
2737 print STDERR "W: $orig_ref is probably an old ",
2738 "branch used by an ancient version of ",
2739 "git-svn.\n",
2740 "However, $new_ref also exists.\n",
2741 "We will not be able ",
2742 "to use this branch until this ",
2743 "ambiguity is resolved.\n";
2744 next;
2745 }
2746 print STDERR "Migrating from v0 layout...\n" if !$migrated;
2747 print STDERR "Renaming ref: $orig_ref => $new_ref\n";
2748 command_noisy('update-ref', $new_ref, $orig_ref);
2749 command_noisy('update-ref', '-d', $orig_ref, $orig_ref);
2750 $migrated++;
2751 }
2752 command_close_pipe($fh, $ctx);
2753 print STDERR "Done migrating from v0 layout...\n" if $migrated;
2754 $migrated;
2755}
2756
2757sub migrate_from_v1 {
2758 my $git_dir = $ENV{GIT_DIR};
2759 my $migrated = 0;
2760 return $migrated unless -d $git_dir;
2761 my $svn_dir = "$git_dir/svn";
2762
2763 # just in case somebody used 'svn' as their $id at some point...
2764 return $migrated if -d $svn_dir && ! -f "$svn_dir/info/url";
2765
2766 print STDERR "Migrating from a git-svn v1 layout...\n";
2767 mkpath([$svn_dir]);
2768 print STDERR "Data from a previous version of git-svn exists, but\n\t",
2769 "$svn_dir\n\t(required for this version ",
2770 "($::VERSION) of git-svn) does not. exist\n";
2771 my ($fh, $ctx) = command_output_pipe(qw/rev-parse --symbolic --all/);
2772 while (<$fh>) {
2773 my $x = $_;
2774 next unless $x =~ s#^refs/remotes/##;
2775 chomp $x;
2776 next unless -f "$git_dir/$x/info/url";
2777 my $u = eval { ::file_to_s("$git_dir/$x/info/url") };
2778 next unless $u;
2779 my $dn = dirname("$git_dir/svn/$x");
2780 mkpath([$dn]) unless -d $dn;
2781 if ($x eq 'svn') { # they used 'svn' as GIT_SVN_ID:
2782 mkpath(["$git_dir/svn/svn"]);
2783 print STDERR " - $git_dir/$x/info => ",
2784 "$git_dir/svn/$x/info\n";
2785 rename "$git_dir/$x/info", "$git_dir/svn/$x/info" or
2786 croak "$!: $x";
2787 # don't worry too much about these, they probably
2788 # don't exist with repos this old (save for index,
2789 # and we can easily regenerate that)
2790 foreach my $f (qw/unhandled.log index .rev_db/) {
2791 rename "$git_dir/$x/$f", "$git_dir/svn/$x/$f";
2792 }
2793 } else {
2794 print STDERR " - $git_dir/$x => $git_dir/svn/$x\n";
2795 rename "$git_dir/$x", "$git_dir/svn/$x" or
2796 croak "$!: $x";
2797 }
2798 $migrated++;
2799 }
2800 command_close_pipe($fh, $ctx);
2801 print STDERR "Done migrating from a git-svn v1 layout\n";
2802 $migrated;
2803}
2804
2805sub read_old_urls {
2806 my ($l_map, $pfx, $path) = @_;
2807 my @dir;
2808 foreach (<$path/*>) {
2809 if (-r "$_/info/url") {
2810 $pfx .= '/' if $pfx && $pfx !~ m!/$!;
2811 my $ref_id = $pfx . basename $_;
2812 my $url = ::file_to_s("$_/info/url");
2813 $l_map->{$ref_id} = $url;
2814 } elsif (-d $_) {
2815 push @dir, $_;
2816 }
2817 }
2818 foreach (@dir) {
2819 my $x = $_;
2820 $x =~ s!^\Q$ENV{GIT_DIR}\E/svn/!!o;
2821 read_old_urls($l_map, $x, $_);
2822 }
2823}
2824
2825sub migrate_from_v2 {
2826 my @cfg = command(qw/config -l/);
2827 return if grep /^svn-remote\..+\.url=/, @cfg;
2828 my %l_map;
2829 read_old_urls(\%l_map, '', "$ENV{GIT_DIR}/svn");
2830 my $migrated = 0;
2831
2832 foreach my $ref_id (sort keys %l_map) {
47e39c55 2833 Git::SVN->init($l_map{$ref_id}, '', $ref_id, $ref_id);
706587fc
EW
2834 $migrated++;
2835 }
2836 $migrated;
2837}
2838
47e39c55
EW
2839sub minimize_connections {
2840 my $r = Git::SVN::read_all_remotes();
2841 my $new_urls = {};
2842 my $root_repos = {};
2843 foreach my $repo_id (keys %$r) {
2844 my $url = $r->{$repo_id}->{url} or next;
2845 my $fetch = $r->{$repo_id}->{fetch} or next;
2846 my $ra = Git::SVN::Ra->new($url);
2847
2848 # skip existing cases where we already connect to the root
2849 if (($ra->{url} eq $ra->{repos_root}) ||
2850 (Git::SVN::sanitize_remote_name($ra->{repos_root}) eq
2851 $repo_id)) {
2852 $root_repos->{$ra->{url}} = $repo_id;
2853 next;
2854 }
2855
2856 my $root_ra = Git::SVN::Ra->new($ra->{repos_root});
2857 my $root_path = $ra->{url};
2858 $root_path =~ s#^\Q$ra->{repos_root}\E/*##;
2859 foreach my $path (keys %$fetch) {
2860 my $ref_id = $fetch->{$path};
2861 my $gs = Git::SVN->new($ref_id, $repo_id, $path);
2862
2863 # make sure we can read when connecting to
2864 # a higher level of a repository
2865 my ($last_rev, undef) = $gs->last_rev_commit;
2866 if (!defined $last_rev) {
2867 $last_rev = eval {
2868 $root_ra->get_latest_revnum;
2869 };
2870 next if $@;
2871 }
2872 my $new = $root_path;
2873 $new .= length $path ? "/$path" : '';
2874 eval {
2875 $root_ra->get_log([$new], $last_rev, $last_rev,
2876 0, 0, 1, sub { });
2877 };
2878 next if $@;
2879 $new_urls->{$ra->{repos_root}}->{$new} =
2880 { ref_id => $ref_id,
2881 old_repo_id => $repo_id,
2882 old_path => $path };
2883 }
2884 }
2885
2886 my @emptied;
2887 foreach my $url (keys %$new_urls) {
2888 # see if we can re-use an existing [svn-remote "repo_id"]
2889 # instead of creating a(n ugly) new section:
2890 my $repo_id = $root_repos->{$url} ||
2891 Git::SVN::sanitize_remote_name($url);
2892
2893 my $fetch = $new_urls->{$url};
2894 foreach my $path (keys %$fetch) {
2895 my $x = $fetch->{$path};
2896 Git::SVN->init($url, $path, $repo_id, $x->{ref_id});
2897 my $pfx = "svn-remote.$x->{old_repo_id}";
2898
2899 my $old_fetch = quotemeta("$x->{old_path}:".
2900 "refs/remotes/$x->{ref_id}");
8b8fc068 2901 command_noisy(qw/config --unset/,
47e39c55
EW
2902 "$pfx.fetch", '^'. $old_fetch . '$');
2903 delete $r->{$x->{old_repo_id}}->
2904 {fetch}->{$x->{old_path}};
2905 if (!keys %{$r->{$x->{old_repo_id}}->{fetch}}) {
8b8fc068 2906 command_noisy(qw/config --unset/,
47e39c55
EW
2907 "$pfx.url");
2908 push @emptied, $x->{old_repo_id}
2909 }
2910 }
2911 }
2912 if (@emptied) {
2913 my $file = $ENV{GIT_CONFIG} || $ENV{GIT_CONFIG_LOCAL} ||
2914 "$ENV{GIT_DIR}/config";
2915 print STDERR <<EOF;
2916The following [svn-remote] sections in your config file ($file) are empty
2917and can be safely removed:
2918EOF
2919 print STDERR "[svn-remote \"$_\"]\n" foreach @emptied;
2920 }
2921}
2922
706587fc
EW
2923sub migration_check {
2924 migrate_from_v0();
2925 migrate_from_v1();
2926 migrate_from_v2();
47e39c55 2927 minimize_connections() if $_minimize;
706587fc
EW
2928}
2929
ef3cfaad
EW
2930package Git::IndexInfo;
2931use strict;
2932use warnings;
2933use Git qw/command_input_pipe command_close_pipe/;
2934
2935sub new {
2936 my ($class) = @_;
2937 my ($gui, $ctx) = command_input_pipe(qw/update-index -z --index-info/);
2938 bless { gui => $gui, ctx => $ctx, nr => 0}, $class;
2939}
2940
2941sub remove {
2942 my ($self, $path) = @_;
2943 if (print { $self->{gui} } '0 ', 0 x 40, "\t", $path, "\0") {
2944 return ++$self->{nr};
2945 }
2946 undef;
2947}
2948
2949sub update {
2950 my ($self, $mode, $hash, $path) = @_;
2951 if (print { $self->{gui} } $mode, ' ', $hash, "\t", $path, "\0") {
2952 return ++$self->{nr};
2953 }
2954 undef;
2955}
2956
2957sub DESTROY {
2958 my ($self) = @_;
2959 command_close_pipe($self->{gui}, $self->{ctx});
2960}
2961
3397f9df
EW
2962__END__
2963
2964Data structures:
2965
44320b9e 2966$log_entry hashref as returned by libsvn_log_entry()
3397f9df 2967{
44320b9e 2968 log => 'whitespace-formatted log entry
3397f9df
EW
2969', # trailing newline is preserved
2970 revision => '8', # integer
2971 date => '2004-02-24T17:01:44.108345Z', # commit date
2972 author => 'committer name'
2973};
2974
6e8548cc
EW
2975
2976# this is generated by generate_diff();
3397f9df
EW
2977@mods = array of diff-index line hashes, each element represents one line
2978 of diff-index output
2979
2980diff-index line ($m hash)
2981{
2982 mode_a => first column of diff-index output, no leading ':',
2983 mode_b => second column of diff-index output,
2984 sha1_b => sha1sum of the final blob,
ac8e0b91 2985 chg => change type [MCRADT],
3397f9df
EW
2986 file_a => original file name of a file (iff chg is 'C' or 'R')
2987 file_b => new/current file name of a file (any chg)
2988}
2989;
a5e0cedc 2990
a00439ac
EW
2991# retval of read_url_paths{,_all}();
2992$l_map = {
2993 # repository root url
2994 'https://svn.musicpd.org' => {
2995 # repository path # GIT_SVN_ID
2996 'mpd/trunk' => 'trunk',
2997 'mpd/tags/0.11.5' => 'tags/0.11.5',
2998 },
2999}
3000
a5e0cedc
EW
3001Notes:
3002 I don't trust the each() function on unless I created %hash myself
3003 because the internal iterator may not have started at base.