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