1#!/usr/bin/env perl
2# Copyright (C) 2006, Eric Wong <normalperson@yhbt.net>
3# License: GPL v2 or later
4use warnings;
5use strict;
6use vars qw/ $AUTHOR $VERSION
7 $sha1 $sha1_short $_revision
8 $_q $_authors %users/;
9$AUTHOR = 'Eric Wong <normalperson@yhbt.net>';
10$VERSION = '@@GIT_VERSION@@';
11# From which subdir have we been invoked?
13my $cmd_dir_prefix = eval {
14 command_oneline([qw/rev-parse --show-prefix/], STDERR => 0)
15} || '';
16my $git_dir_user_set = 1 if defined $ENV{GIT_DIR};
18$ENV{GIT_DIR} ||= '.git';
19$Git::SVN::default_repo_id = 'svn';
20$Git::SVN::default_ref_id = $ENV{GIT_SVN_ID} || 'git-svn';
21$Git::SVN::Ra::_log_window_size = 100;
22$Git::SVN::Log::TZ = $ENV{TZ};
24$ENV{TZ} = 'UTC';
25$| = 1; # unbuffer STDOUT
26sub fatal (@) { print STDERR "@_\n"; exit 1 }
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)";
33}
34push @Git::SVN::Ra::ISA, 'SVN::Ra';
35push @SVN::Git::Editor::ISA, 'SVN::Delta::Editor';
36push @SVN::Git::Fetcher::ISA, 'SVN::Delta::Editor';
37use Carp qw/croak/;
38use Digest::MD5;
39use IO::File qw//;
40use File::Basename qw/dirname basename/;
41use File::Path qw/mkpath/;
42use Getopt::Long qw/:config gnu_getopt no_ignore_case auto_abbrev/;
43use IPC::Open3;
44use Git;
45BEGIN {
47 # import functions from Git into our packages, en masse
48 no strict 'refs';
49 foreach (qw/command command_oneline command_noisy command_output_pipe
50 command_input_pipe command_close_pipe/) {
51 for my $package ( qw(SVN::Git::Editor SVN::Git::Fetcher
52 Git::SVN::Migration Git::SVN::Log Git::SVN),
53 __PACKAGE__) {
54 *{"${package}::$_"} = \&{"Git::$_"};
55 }
56 }
57}
58my ($SVN);
60$sha1 = qr/[a-f\d]{40}/;
62$sha1_short = qr/[a-f\d]{4,40}/;
63my ($_stdin, $_help, $_edit,
64 $_message, $_file,
65 $_template, $_shared,
66 $_version, $_fetch_all, $_no_rebase,
67 $_merge, $_strategy, $_dry_run, $_local,
68 $_prefix, $_no_checkout, $_url, $_verbose);
69$Git::SVN::_follow_parent = 1;
70my %remote_opts = ( 'username=s' => \$Git::SVN::Prompt::_username,
71 'config-dir=s' => \$Git::SVN::Ra::config_dir,
72 'no-auth-cache' => \$Git::SVN::Prompt::_no_auth_cache );
73my %fc_opts = ( 'follow-parent|follow!' => \$Git::SVN::_follow_parent,
74 'authors-file|A=s' => \$_authors,
75 'repack:i' => \$Git::SVN::_repack,
76 'noMetadata' => \$Git::SVN::_no_metadata,
77 'useSvmProps' => \$Git::SVN::_use_svm_props,
78 'useSvnsyncProps' => \$Git::SVN::_use_svnsync_props,
79 'log-window-size=i' => \$Git::SVN::Ra::_log_window_size,
80 'no-checkout' => \$_no_checkout,
81 'quiet|q' => \$_q,
82 'repack-flags|repack-args|repack-opts=s' =>
83 \$Git::SVN::_repack_flags,
84 'use-log-author' => \$Git::SVN::_use_log_author,
85 %remote_opts );
86my ($_trunk, $_tags, $_branches, $_stdlayout);
88my %icv;
89my %init_opts = ( 'template=s' => \$_template, 'shared:s' => \$_shared,
90 'trunk|T=s' => \$_trunk, 'tags|t=s' => \$_tags,
91 'branches|b=s' => \$_branches, 'prefix=s' => \$_prefix,
92 'stdlayout|s' => \$_stdlayout,
93 'minimize-url|m' => \$Git::SVN::_minimize_url,
94 'no-metadata' => sub { $icv{noMetadata} = 1 },
95 'use-svm-props' => sub { $icv{useSvmProps} = 1 },
96 'use-svnsync-props' => sub { $icv{useSvnsyncProps} = 1 },
97 'rewrite-root=s' => sub { $icv{rewriteRoot} = $_[1] },
98 %remote_opts );
99my %cmt_opts = ( 'edit|e' => \$_edit,
100 'rmdir' => \$SVN::Git::Editor::_rmdir,
101 'find-copies-harder' => \$SVN::Git::Editor::_find_copies_harder,
102 'l=i' => \$SVN::Git::Editor::_rename_limit,
103 'copy-similarity|C=i'=> \$SVN::Git::Editor::_cp_similarity
104);
105my %cmd = (
107 fetch => [ \&cmd_fetch, "Download new revisions from SVN",
108 { 'revision|r=s' => \$_revision,
109 'fetch-all|all' => \$_fetch_all,
110 %fc_opts } ],
111 clone => [ \&cmd_clone, "Initialize and fetch revisions",
112 { 'revision|r=s' => \$_revision,
113 %fc_opts, %init_opts } ],
114 init => [ \&cmd_init, "Initialize a repo for tracking" .
115 " (requires URL argument)",
116 \%init_opts ],
117 'multi-init' => [ \&cmd_multi_init,
118 "Deprecated alias for ".
119 "'$0 init -T<trunk> -b<branches> -t<tags>'",
120 \%init_opts ],
121 dcommit => [ \&cmd_dcommit,
122 'Commit several diffs to merge with upstream',
123 { 'merge|m|M' => \$_merge,
124 'strategy|s=s' => \$_strategy,
125 'verbose|v' => \$_verbose,
126 'dry-run|n' => \$_dry_run,
127 'fetch-all|all' => \$_fetch_all,
128 'no-rebase' => \$_no_rebase,
129 %cmt_opts, %fc_opts } ],
130 'set-tree' => [ \&cmd_set_tree,
131 "Set an SVN repository to a git tree-ish",
132 { 'stdin|' => \$_stdin, %cmt_opts, %fc_opts, } ],
133 'create-ignore' => [ \&cmd_create_ignore,
134 'Create a .gitignore per svn:ignore',
135 { 'revision|r=i' => \$_revision
136 } ],
137 'propget' => [ \&cmd_propget,
138 'Print the value of a property on a file or directory',
139 { 'revision|r=i' => \$_revision } ],
140 'proplist' => [ \&cmd_proplist,
141 'List all properties of a file or directory',
142 { 'revision|r=i' => \$_revision } ],
143 'show-ignore' => [ \&cmd_show_ignore, "Show svn:ignore listings",
144 { 'revision|r=i' => \$_revision
145 } ],
146 'show-externals' => [ \&cmd_show_externals, "Show svn:externals listings",
147 { 'revision|r=i' => \$_revision
148 } ],
149 'multi-fetch' => [ \&cmd_multi_fetch,
150 "Deprecated alias for $0 fetch --all",
151 { 'revision|r=s' => \$_revision, %fc_opts } ],
152 'migrate' => [ sub { },
153 # no-op, we automatically run this anyways,
154 'Migrate configuration/metadata/layout from
155 previous versions of git-svn',
156 { 'minimize' => \$Git::SVN::Migration::_minimize,
157 %remote_opts } ],
158 'log' => [ \&Git::SVN::Log::cmd_show_log, 'Show commit logs',
159 { 'limit=i' => \$Git::SVN::Log::limit,
160 'revision|r=s' => \$_revision,
161 'verbose|v' => \$Git::SVN::Log::verbose,
162 'incremental' => \$Git::SVN::Log::incremental,
163 'oneline' => \$Git::SVN::Log::oneline,
164 'show-commit' => \$Git::SVN::Log::show_commit,
165 'non-recursive' => \$Git::SVN::Log::non_recursive,
166 'authors-file|A=s' => \$_authors,
167 'color' => \$Git::SVN::Log::color,
168 'pager=s' => \$Git::SVN::Log::pager
169 } ],
170 'find-rev' => [ \&cmd_find_rev, "Translate between SVN revision numbers and tree-ish",
171 {} ],
172 'rebase' => [ \&cmd_rebase, "Fetch and rebase your working directory",
173 { 'merge|m|M' => \$_merge,
174 'verbose|v' => \$_verbose,
175 'strategy|s=s' => \$_strategy,
176 'local|l' => \$_local,
177 'fetch-all|all' => \$_fetch_all,
178 %fc_opts } ],
179 'commit-diff' => [ \&cmd_commit_diff,
180 'Commit a diff between two trees',
181 { 'message|m=s' => \$_message,
182 'file|F=s' => \$_file,
183 'revision|r=s' => \$_revision,
184 %cmt_opts } ],
185 'info' => [ \&cmd_info,
186 "Show info about the latest SVN revision
187 on the current branch",
188 { 'url' => \$_url, } ],
189);
190my $cmd;
192for (my $i = 0; $i < @ARGV; $i++) {
193 if (defined $cmd{$ARGV[$i]}) {
194 $cmd = $ARGV[$i];
195 splice @ARGV, $i, 1;
196 last;
197 }
198};
199# make sure we're always running at the top-level working directory
201unless ($cmd && $cmd =~ /(?:clone|init|multi-init)$/) {
202 unless (-d $ENV{GIT_DIR}) {
203 if ($git_dir_user_set) {
204 die "GIT_DIR=$ENV{GIT_DIR} explicitly set, ",
205 "but it is not a directory\n";
206 }
207 my $git_dir = delete $ENV{GIT_DIR};
208 chomp(my $cdup = command_oneline(qw/rev-parse --show-cdup/));
209 unless (length $cdup) {
210 die "Already at toplevel, but $git_dir ",
211 "not found '$cdup'\n";
212 }
213 chdir $cdup or die "Unable to chdir up to '$cdup'\n";
214 unless (-d $git_dir) {
215 die "$git_dir still not found after going to ",
216 "'$cdup'\n";
217 }
218 $ENV{GIT_DIR} = $git_dir;
219 }
220}
221my %opts = %{$cmd{$cmd}->[2]} if (defined $cmd);
223read_repo_config(\%opts);
225Getopt::Long::Configure('pass_through') if ($cmd && $cmd eq 'log');
226my $rv = GetOptions(%opts, 'help|H|h' => \$_help, 'version|V' => \$_version,
227 'minimize-connections' => \$Git::SVN::Migration::_minimize,
228 'id|i=s' => \$Git::SVN::default_ref_id,
229 'svn-remote|remote|R=s' => sub {
230 $Git::SVN::no_reuse_existing = 1;
231 $Git::SVN::default_repo_id = $_[1] });
232exit 1 if (!$rv && $cmd && $cmd ne 'log');
233usage(0) if $_help;
235version() if $_version;
236usage(1) unless defined $cmd;
237load_authors() if $_authors;
238unless ($cmd =~ /^(?:clone|init|multi-init|commit-diff)$/) {
240 Git::SVN::Migration::migration_check();
241}
242Git::SVN::init_vars();
243eval {
244 Git::SVN::verify_remotes_sanity();
245 $cmd{$cmd}->[0]->(@ARGV);
246};
247fatal $@ if $@;
248post_fetch_checkout();
249exit 0;
250####################### primary functions ######################
252sub usage {
253 my $exit = shift || 0;
254 my $fd = $exit ? \*STDERR : \*STDOUT;
255 print $fd <<"";
256git-svn - bidirectional operations between a single Subversion tree and git
257Usage: $0 <command> [options] [arguments]\n
258 print $fd "Available commands:\n" unless $cmd;
260 foreach (sort keys %cmd) {
262 next if $cmd && $cmd ne $_;
263 next if /^multi-/; # don't show deprecated commands
264 print $fd ' ',pack('A17',$_),$cmd{$_}->[1],"\n";
265 foreach (sort keys %{$cmd{$_}->[2]}) {
266 # mixed-case options are for .git/config only
267 next if /[A-Z]/ && /^[a-z]+$/i;
268 # prints out arguments as they should be passed:
269 my $x = s#[:=]s$## ? '<arg>' : s#[:=]i$## ? '<num>' : '';
270 print $fd ' ' x 21, join(', ', map { length $_ > 1 ?
271 "--$_" : "-$_" }
272 split /\|/,$_)," $x\n";
273 }
274 }
275 print $fd <<"";
276\nGIT_SVN_ID may be set in the environment or via the --id/-i switch to an
277arbitrary identifier if you're tracking multiple SVN branches/repositories in
278one git repository and want to keep them separate. See git-svn(1) for more
279information.
280 exit $exit;
282}
283sub version {
285 print "git-svn version $VERSION (svn $SVN::Core::VERSION)\n";
286 exit 0;
287}
288sub do_git_init_db {
290 unless (-d $ENV{GIT_DIR}) {
291 my @init_db = ('init');
292 push @init_db, "--template=$_template" if defined $_template;
293 if (defined $_shared) {
294 if ($_shared =~ /[a-z]/) {
295 push @init_db, "--shared=$_shared";
296 } else {
297 push @init_db, "--shared";
298 }
299 }
300 command_noisy(@init_db);
301 }
302 my $set;
303 my $pfx = "svn-remote.$Git::SVN::default_repo_id";
304 foreach my $i (keys %icv) {
305 die "'$set' and '$i' cannot both be set\n" if $set;
306 next unless defined $icv{$i};
307 command_noisy('config', "$pfx.$i", $icv{$i});
308 $set = $i;
309 }
310}
311sub init_subdir {
313 my $repo_path = shift or return;
314 mkpath([$repo_path]) unless -d $repo_path;
315 chdir $repo_path or die "Couldn't chdir to $repo_path: $!\n";
316 $ENV{GIT_DIR} = '.git';
317}
318sub cmd_clone {
320 my ($url, $path) = @_;
321 if (!defined $path &&
322 (defined $_trunk || defined $_branches || defined $_tags ||
323 defined $_stdlayout) &&
324 $url !~ m#^[a-z\+]+://#) {
325 $path = $url;
326 }
327 $path = basename($url) if !defined $path || !length $path;
328 cmd_init($url, $path);
329 Git::SVN::fetch_all($Git::SVN::default_repo_id);
330}
331sub cmd_init {
333 if (defined $_stdlayout) {
334 $_trunk = 'trunk' if (!defined $_trunk);
335 $_tags = 'tags' if (!defined $_tags);
336 $_branches = 'branches' if (!defined $_branches);
337 }
338 if (defined $_trunk || defined $_branches || defined $_tags) {
339 return cmd_multi_init(@_);
340 }
341 my $url = shift or die "SVN repository location required ",
342 "as a command-line argument\n";
343 init_subdir(@_);
344 do_git_init_db();
345 Git::SVN->init($url);
347}
348sub cmd_fetch {
350 if (grep /^\d+=./, @_) {
351 die "'<rev>=<commit>' fetch arguments are ",
352 "no longer supported.\n";
353 }
354 my ($remote) = @_;
355 if (@_ > 1) {
356 die "Usage: $0 fetch [--all] [svn-remote]\n";
357 }
358 $remote ||= $Git::SVN::default_repo_id;
359 if ($_fetch_all) {
360 cmd_multi_fetch();
361 } else {
362 Git::SVN::fetch_all($remote, Git::SVN::read_all_remotes());
363 }
364}
365sub cmd_set_tree {
367 my (@commits) = @_;
368 if ($_stdin || !@commits) {
369 print "Reading from stdin...\n";
370 @commits = ();
371 while (<STDIN>) {
372 if (/\b($sha1_short)\b/o) {
373 unshift @commits, $1;
374 }
375 }
376 }
377 my @revs;
378 foreach my $c (@commits) {
379 my @tmp = command('rev-parse',$c);
380 if (scalar @tmp == 1) {
381 push @revs, $tmp[0];
382 } elsif (scalar @tmp > 1) {
383 push @revs, reverse(command('rev-list',@tmp));
384 } else {
385 fatal "Failed to rev-parse $c";
386 }
387 }
388 my $gs = Git::SVN->new;
389 my ($r_last, $cmt_last) = $gs->last_rev_commit;
390 $gs->fetch;
391 if (defined $gs->{last_rev} && $r_last != $gs->{last_rev}) {
392 fatal "There are new revisions that were fetched ",
393 "and need to be merged (or acknowledged) ",
394 "before committing.\nlast rev: $r_last\n",
395 " current: $gs->{last_rev}";
396 }
397 $gs->set_tree($_) foreach @revs;
398 print "Done committing ",scalar @revs," revisions to SVN\n";
399 unlink $gs->{index};
400}
401sub cmd_dcommit {
403 my $head = shift;
404 git_cmd_try { command_oneline(qw/diff-index --quiet HEAD/) }
405 'Cannot dcommit with a dirty index. Commit your changes first, '
406 . "or stash them with `git stash'.\n";
407 $head ||= 'HEAD';
408 my @refs;
409 my ($url, $rev, $uuid, $gs) = working_head_info($head, \@refs);
410 print "Committing to $url ...\n";
411 unless ($gs) {
412 die "Unable to determine upstream SVN information from ",
413 "$head history\n";
414 }
415 my $last_rev;
416 my ($linear_refs, $parents) = linearize_history($gs, \@refs);
417 if ($_no_rebase && scalar(@$linear_refs) > 1) {
418 warn "Attempting to commit more than one change while ",
419 "--no-rebase is enabled.\n",
420 "If these changes depend on each other, re-running ",
421 "without --no-rebase may be required."
422 }
423 while (1) {
424 my $d = shift @$linear_refs or last;
425 unless (defined $last_rev) {
426 (undef, $last_rev, undef) = cmt_metadata("$d~1");
427 unless (defined $last_rev) {
428 fatal "Unable to extract revision information ",
429 "from commit $d~1";
430 }
431 }
432 if ($_dry_run) {
433 print "diff-tree $d~1 $d\n";
434 } else {
435 my $cmt_rev;
436 my %ed_opts = ( r => $last_rev,
437 log => get_commit_entry($d)->{log},
438 ra => Git::SVN::Ra->new($gs->full_url),
439 config => SVN::Core::config_get_config(
440 $Git::SVN::Ra::config_dir
441 ),
442 tree_a => "$d~1",
443 tree_b => $d,
444 editor_cb => sub {
445 print "Committed r$_[0]\n";
446 $cmt_rev = $_[0];
447 },
448 svn_path => '');
449 if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) {
450 print "No changes\n$d~1 == $d\n";
451 } elsif ($parents->{$d} && @{$parents->{$d}}) {
452 $gs->{inject_parents_dcommit}->{$cmt_rev} =
453 $parents->{$d};
454 }
455 $_fetch_all ? $gs->fetch_all : $gs->fetch;
456 $last_rev = $cmt_rev;
457 next if $_no_rebase;
458 # we always want to rebase against the current HEAD,
460 # not any head that was passed to us
461 my @diff = command('diff-tree', $d,
462 $gs->refname, '--');
463 my @finish;
464 if (@diff) {
465 @finish = rebase_cmd();
466 print STDERR "W: $d and ", $gs->refname,
467 " differ, using @finish:\n",
468 join("\n", @diff), "\n";
469 } else {
470 print "No changes between current HEAD and ",
471 $gs->refname,
472 "\nResetting to the latest ",
473 $gs->refname, "\n";
474 @finish = qw/reset --mixed/;
475 }
476 command_noisy(@finish, $gs->refname);
477 if (@diff) {
478 @refs = ();
479 my ($url_, $rev_, $uuid_, $gs_) =
480 working_head_info($head, \@refs);
481 my ($linear_refs_, $parents_) =
482 linearize_history($gs_, \@refs);
483 if (scalar(@$linear_refs) !=
484 scalar(@$linear_refs_)) {
485 fatal "# of revisions changed ",
486 "\nbefore:\n",
487 join("\n", @$linear_refs),
488 "\n\nafter:\n",
489 join("\n", @$linear_refs_), "\n",
490 'If you are attempting to commit ',
491 "merges, try running:\n\t",
492 'git rebase --interactive',
493 '--preserve-merges ',
494 $gs->refname,
495 "\nBefore dcommitting";
496 }
497 if ($url_ ne $url) {
498 fatal "URL mismatch after rebase: ",
499 "$url_ != $url";
500 }
501 if ($uuid_ ne $uuid) {
502 fatal "uuid mismatch after rebase: ",
503 "$uuid_ != $uuid";
504 }
505 # remap parents
506 my (%p, @l, $i);
507 for ($i = 0; $i < scalar @$linear_refs; $i++) {
508 my $new = $linear_refs_->[$i] or next;
509 $p{$new} =
510 $parents->{$linear_refs->[$i]};
511 push @l, $new;
512 }
513 $parents = \%p;
514 $linear_refs = \@l;
515 }
516 }
517 }
518 unlink $gs->{index};
519}
520sub cmd_find_rev {
522 my $revision_or_hash = shift;
523 my $result;
524 if ($revision_or_hash =~ /^r\d+$/) {
525 my $head = shift;
526 $head ||= 'HEAD';
527 my @refs;
528 my (undef, undef, undef, $gs) = working_head_info($head, \@refs);
529 unless ($gs) {
530 die "Unable to determine upstream SVN information from ",
531 "$head history\n";
532 }
533 my $desired_revision = substr($revision_or_hash, 1);
534 $result = $gs->rev_map_get($desired_revision);
535 } else {
536 my (undef, $rev, undef) = cmt_metadata($revision_or_hash);
537 $result = $rev;
538 }
539 print "$result\n" if $result;
540}
541sub cmd_rebase {
543 command_noisy(qw/update-index --refresh/);
544 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
545 unless ($gs) {
546 die "Unable to determine upstream SVN information from ",
547 "working tree history\n";
548 }
549 if (command(qw/diff-index HEAD --/)) {
550 print STDERR "Cannot rebase with uncommited changes:\n";
551 command_noisy('status');
552 exit 1;
553 }
554 unless ($_local) {
555 # rebase will checkout for us, so no need to do it explicitly
556 $_no_checkout = 'true';
557 $_fetch_all ? $gs->fetch_all : $gs->fetch;
558 }
559 command_noisy(rebase_cmd(), $gs->refname);
560}
561sub cmd_show_ignore {
563 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
564 $gs ||= Git::SVN->new;
565 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
566 $gs->prop_walk($gs->{path}, $r, sub {
567 my ($gs, $path, $props) = @_;
568 print STDOUT "\n# $path\n";
569 my $s = $props->{'svn:ignore'} or return;
570 $s =~ s/[\r\n]+/\n/g;
571 chomp $s;
572 $s =~ s#^#$path#gm;
573 print STDOUT "$s\n";
574 });
575}
576sub cmd_show_externals {
578 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
579 $gs ||= Git::SVN->new;
580 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
581 $gs->prop_walk($gs->{path}, $r, sub {
582 my ($gs, $path, $props) = @_;
583 print STDOUT "\n# $path\n";
584 my $s = $props->{'svn:externals'} or return;
585 $s =~ s/[\r\n]+/\n/g;
586 chomp $s;
587 $s =~ s#^#$path#gm;
588 print STDOUT "$s\n";
589 });
590}
591sub cmd_create_ignore {
593 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
594 $gs ||= Git::SVN->new;
595 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
596 $gs->prop_walk($gs->{path}, $r, sub {
597 my ($gs, $path, $props) = @_;
598 # $path is of the form /path/to/dir/
599 my $ignore = '.' . $path . '.gitignore';
600 my $s = $props->{'svn:ignore'} or return;
601 open(GITIGNORE, '>', $ignore)
602 or fatal("Failed to open `$ignore' for writing: $!");
603 $s =~ s/[\r\n]+/\n/g;
604 chomp $s;
605 # Prefix all patterns so that the ignore doesn't apply
606 # to sub-directories.
607 $s =~ s#^#/#gm;
608 print GITIGNORE "$s\n";
609 close(GITIGNORE)
610 or fatal("Failed to close `$ignore': $!");
611 command_noisy('add', $ignore);
612 });
613}
614sub canonicalize_path {
616 my ($path) = @_;
617 my $dot_slash_added = 0;
618 if (substr($path, 0, 1) ne "/") {
619 $path = "./" . $path;
620 $dot_slash_added = 1;
621 }
622 # File::Spec->canonpath doesn't collapse x/../y into y (for a
623 # good reason), so let's do this manually.
624 $path =~ s#/+#/#g;
625 $path =~ s#/\.(?:/|$)#/#g;
626 $path =~ s#/[^/]+/\.\.##g;
627 $path =~ s#/$##g;
628 $path =~ s#^\./## if $dot_slash_added;
629 return $path;
630}
631# get_svnprops(PATH)
633# ------------------
634# Helper for cmd_propget and cmd_proplist below.
635sub get_svnprops {
636 my $path = shift;
637 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
638 $gs ||= Git::SVN->new;
639 # prefix THE PATH by the sub-directory from which the user
641 # invoked us.
642 $path = $cmd_dir_prefix . $path;
643 fatal("No such file or directory: $path") unless -e $path;
644 my $is_dir = -d $path ? 1 : 0;
645 $path = $gs->{path} . '/' . $path;
646 # canonicalize the path (otherwise libsvn will abort or fail to
648 # find the file)
649 $path = canonicalize_path($path);
650 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
652 my $props;
653 if ($is_dir) {
654 (undef, undef, $props) = $gs->ra->get_dir($path, $r);
655 }
656 else {
657 (undef, $props) = $gs->ra->get_file($path, $r, undef);
658 }
659 return $props;
660}
661# cmd_propget (PROP, PATH)
663# ------------------------
664# Print the SVN property PROP for PATH.
665sub cmd_propget {
666 my ($prop, $path) = @_;
667 $path = '.' if not defined $path;
668 usage(1) if not defined $prop;
669 my $props = get_svnprops($path);
670 if (not defined $props->{$prop}) {
671 fatal("`$path' does not have a `$prop' SVN property.");
672 }
673 print $props->{$prop} . "\n";
674}
675# cmd_proplist (PATH)
677# -------------------
678# Print the list of SVN properties for PATH.
679sub cmd_proplist {
680 my $path = shift;
681 $path = '.' if not defined $path;
682 my $props = get_svnprops($path);
683 print "Properties on '$path':\n";
684 foreach (sort keys %{$props}) {
685 print " $_\n";
686 }
687}
688sub cmd_multi_init {
690 my $url = shift;
691 unless (defined $_trunk || defined $_branches || defined $_tags) {
692 usage(1);
693 }
694 # there are currently some bugs that prevent multi-init/multi-fetch
696 # setups from working well without this.
697 $Git::SVN::_minimize_url = 1;
698 $_prefix = '' unless defined $_prefix;
700 if (defined $url) {
701 $url =~ s#/+$##;
702 init_subdir(@_);
703 }
704 do_git_init_db();
705 if (defined $_trunk) {
706 my $trunk_ref = $_prefix . 'trunk';
707 # try both old-style and new-style lookups:
708 my $gs_trunk = eval { Git::SVN->new($trunk_ref) };
709 unless ($gs_trunk) {
710 my ($trunk_url, $trunk_path) =
711 complete_svn_url($url, $_trunk);
712 $gs_trunk = Git::SVN->init($trunk_url, $trunk_path,
713 undef, $trunk_ref);
714 }
715 }
716 return unless defined $_branches || defined $_tags;
717 my $ra = $url ? Git::SVN::Ra->new($url) : undef;
718 complete_url_ls_init($ra, $_branches, '--branches/-b', $_prefix);
719 complete_url_ls_init($ra, $_tags, '--tags/-t', $_prefix . 'tags/');
720}
721sub cmd_multi_fetch {
723 my $remotes = Git::SVN::read_all_remotes();
724 foreach my $repo_id (sort keys %$remotes) {
725 if ($remotes->{$repo_id}->{url}) {
726 Git::SVN::fetch_all($repo_id, $remotes);
727 }
728 }
729}
730# this command is special because it requires no metadata
732sub cmd_commit_diff {
733 my ($ta, $tb, $url) = @_;
734 my $usage = "Usage: $0 commit-diff -r<revision> ".
735 "<tree-ish> <tree-ish> [<URL>]";
736 fatal($usage) if (!defined $ta || !defined $tb);
737 my $svn_path;
738 if (!defined $url) {
739 my $gs = eval { Git::SVN->new };
740 if (!$gs) {
741 fatal("Needed URL or usable git-svn --id in ",
742 "the command-line\n", $usage);
743 }
744 $url = $gs->{url};
745 $svn_path = $gs->{path};
746 }
747 unless (defined $_revision) {
748 fatal("-r|--revision is a required argument\n", $usage);
749 }
750 if (defined $_message && defined $_file) {
751 fatal("Both --message/-m and --file/-F specified ",
752 "for the commit message.\n",
753 "I have no idea what you mean");
754 }
755 if (defined $_file) {
756 $_message = file_to_s($_file);
757 } else {
758 $_message ||= get_commit_entry($tb)->{log};
759 }
760 my $ra ||= Git::SVN::Ra->new($url);
761 $svn_path ||= $ra->{svn_path};
762 my $r = $_revision;
763 if ($r eq 'HEAD') {
764 $r = $ra->get_latest_revnum;
765 } elsif ($r !~ /^\d+$/) {
766 die "revision argument: $r not understood by git-svn\n";
767 }
768 my %ed_opts = ( r => $r,
769 log => $_message,
770 ra => $ra,
771 tree_a => $ta,
772 tree_b => $tb,
773 editor_cb => sub { print "Committed r$_[0]\n" },
774 svn_path => $svn_path );
775 if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) {
776 print "No changes\n$ta == $tb\n";
777 }
778}
779sub cmd_info {
781 my $path = canonicalize_path(shift or ".");
782 unless (scalar(@_) == 0) {
783 die "Too many arguments specified\n";
784 }
785 my ($file_type, $diff_status) = find_file_type_and_diff_status($path);
787 if (!$file_type && !$diff_status) {
789 print STDERR "$path: (Not a versioned resource)\n\n";
790 return;
791 }
792 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
794 unless ($gs) {
795 die "Unable to determine upstream SVN information from ",
796 "working tree history\n";
797 }
798 my $full_url = $url . ($path eq "." ? "" : "/$path");
799 if ($_url) {
801 print $full_url, "\n";
802 return;
803 }
804 my $result = "Path: $path\n";
806 $result .= "Name: " . basename($path) . "\n" if $file_type ne "dir";
807 $result .= "URL: " . $full_url . "\n";
808 eval {
810 my $repos_root = $gs->repos_root;
811 Git::SVN::remove_username($repos_root);
812 $result .= "Repository Root: $repos_root\n";
813 };
814 if ($@) {
815 $result .= "Repository Root: (offline)\n";
816 }
817 $result .= "Repository UUID: $uuid\n" unless $diff_status eq "A";
818 $result .= "Revision: " . ($diff_status eq "A" ? 0 : $rev) . "\n";
819 $result .= "Node Kind: " .
821 ($file_type eq "dir" ? "directory" : "file") . "\n";
822 my $schedule = $diff_status eq "A"
824 ? "add"
825 : ($diff_status eq "D" ? "delete" : "normal");
826 $result .= "Schedule: $schedule\n";
827 if ($diff_status eq "A") {
829 print $result, "\n";
830 return;
831 }
832 my ($lc_author, $lc_rev, $lc_date_utc);
834 my @args = Git::SVN::Log::git_svn_log_cmd($rev, $rev, "--", $path);
835 my $log = command_output_pipe(@args);
836 my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/;
837 while (<$log>) {
838 if (/^${esc_color}author (.+) <[^>]+> (\d+) ([\-\+]?\d+)$/o) {
839 $lc_author = $1;
840 $lc_date_utc = Git::SVN::Log::parse_git_date($2, $3);
841 } elsif (/^${esc_color} (git-svn-id:.+)$/o) {
842 (undef, $lc_rev, undef) = ::extract_metadata($1);
843 }
844 }
845 close $log;
846 Git::SVN::Log::set_local_timezone();
848 $result .= "Last Changed Author: $lc_author\n";
850 $result .= "Last Changed Rev: $lc_rev\n";
851 $result .= "Last Changed Date: " .
852 Git::SVN::Log::format_svn_date($lc_date_utc) . "\n";
853 if ($file_type ne "dir") {
855 my $text_last_updated_date =
856 ($diff_status eq "D" ? $lc_date_utc : (stat $path)[9]);
857 $result .=
858 "Text Last Updated: " .
859 Git::SVN::Log::format_svn_date($text_last_updated_date) .
860 "\n";
861 my $checksum;
862 if ($diff_status eq "D") {
863 my ($fh, $ctx) =
864 command_output_pipe(qw(cat-file blob), "HEAD:$path");
865 if ($file_type eq "link") {
866 my $file_name = <$fh>;
867 $checksum = md5sum("link $file_name");
868 } else {
869 $checksum = md5sum($fh);
870 }
871 command_close_pipe($fh, $ctx);
872 } elsif ($file_type eq "link") {
873 my $file_name =
874 command(qw(cat-file blob), "HEAD:$path");
875 $checksum =
876 md5sum("link " . $file_name);
877 } else {
878 open FILE, "<", $path or die $!;
879 $checksum = md5sum(\*FILE);
880 close FILE or die $!;
881 }
882 $result .= "Checksum: " . $checksum . "\n";
883 }
884 print $result, "\n";
886}
887########################### utility functions #########################
889sub rebase_cmd {
891 my @cmd = qw/rebase/;
892 push @cmd, '-v' if $_verbose;
893 push @cmd, qw/--merge/ if $_merge;
894 push @cmd, "--strategy=$_strategy" if $_strategy;
895 @cmd;
896}
897sub post_fetch_checkout {
899 return if $_no_checkout;
900 my $gs = $Git::SVN::_head or return;
901 return if verify_ref('refs/heads/master^0');
902 my $valid_head = verify_ref('HEAD^0');
904 command_noisy(qw(update-ref refs/heads/master), $gs->refname);
905 return if ($valid_head || !verify_ref('HEAD^0'));
906 return if $ENV{GIT_DIR} !~ m#^(?:.*/)?\.git$#;
908 my $index = $ENV{GIT_INDEX_FILE} || "$ENV{GIT_DIR}/index";
909 return if -f $index;
910 return if command_oneline(qw/rev-parse --is-inside-work-tree/) eq 'false';
912 return if command_oneline(qw/rev-parse --is-inside-git-dir/) eq 'true';
913 command_noisy(qw/read-tree -m -u -v HEAD HEAD/);
914 print STDERR "Checked out HEAD:\n ",
915 $gs->full_url, " r", $gs->last_rev, "\n";
916}
917sub complete_svn_url {
919 my ($url, $path) = @_;
920 $path =~ s#/+$##;
921 if ($path !~ m#^[a-z\+]+://#) {
922 if (!defined $url || $url !~ m#^[a-z\+]+://#) {
923 fatal("E: '$path' is not a complete URL ",
924 "and a separate URL is not specified");
925 }
926 return ($url, $path);
927 }
928 return ($path, '');
929}
930sub complete_url_ls_init {
932 my ($ra, $repo_path, $switch, $pfx) = @_;
933 unless ($repo_path) {
934 print STDERR "W: $switch not specified\n";
935 return;
936 }
937 $repo_path =~ s#/+$##;
938 if ($repo_path =~ m#^[a-z\+]+://#) {
939 $ra = Git::SVN::Ra->new($repo_path);
940 $repo_path = '';
941 } else {
942 $repo_path =~ s#^/+##;
943 unless ($ra) {
944 fatal("E: '$repo_path' is not a complete URL ",
945 "and a separate URL is not specified");
946 }
947 }
948 my $url = $ra->{url};
949 my $gs = Git::SVN->init($url, undef, undef, undef, 1);
950 my $k = "svn-remote.$gs->{repo_id}.url";
951 my $orig_url = eval { command_oneline(qw/config --get/, $k) };
952 if ($orig_url && ($orig_url ne $gs->{url})) {
953 die "$k already set: $orig_url\n",
954 "wanted to set to: $gs->{url}\n";
955 }
956 command_oneline('config', $k, $gs->{url}) unless $orig_url;
957 my $remote_path = "$ra->{svn_path}/$repo_path/*";
958 $remote_path =~ s#/+#/#g;
959 $remote_path =~ s#^/##g;
960 my ($n) = ($switch =~ /^--(\w+)/);
961 if (length $pfx && $pfx !~ m#/$#) {
962 die "--prefix='$pfx' must have a trailing slash '/'\n";
963 }
964 command_noisy('config', "svn-remote.$gs->{repo_id}.$n",
965 "$remote_path:refs/remotes/$pfx*");
966}
967sub verify_ref {
969 my ($ref) = @_;
970 eval { command_oneline([ 'rev-parse', '--verify', $ref ],
971 { STDERR => 0 }); };
972}
973sub get_tree_from_treeish {
975 my ($treeish) = @_;
976 # $treeish can be a symbolic ref, too:
977 my $type = command_oneline(qw/cat-file -t/, $treeish);
978 my $expected;
979 while ($type eq 'tag') {
980 ($treeish, $type) = command(qw/cat-file tag/, $treeish);
981 }
982 if ($type eq 'commit') {
983 $expected = (grep /^tree /, command(qw/cat-file commit/,
984 $treeish))[0];
985 ($expected) = ($expected =~ /^tree ($sha1)$/o);
986 die "Unable to get tree from $treeish\n" unless $expected;
987 } elsif ($type eq 'tree') {
988 $expected = $treeish;
989 } else {
990 die "$treeish is a $type, expected tree, tag or commit\n";
991 }
992 return $expected;
993}
994sub get_commit_entry {
996 my ($treeish) = shift;
997 my %log_entry = ( log => '', tree => get_tree_from_treeish($treeish) );
998 my $commit_editmsg = "$ENV{GIT_DIR}/COMMIT_EDITMSG";
999 my $commit_msg = "$ENV{GIT_DIR}/COMMIT_MSG";
1000 open my $log_fh, '>', $commit_editmsg or croak $!;
1001 my $type = command_oneline(qw/cat-file -t/, $treeish);
1003 if ($type eq 'commit' || $type eq 'tag') {
1004 my ($msg_fh, $ctx) = command_output_pipe('cat-file',
1005 $type, $treeish);
1006 my $in_msg = 0;
1007 while (<$msg_fh>) {
1008 if (!$in_msg) {
1009 $in_msg = 1 if (/^\s*$/);
1010 } elsif (/^git-svn-id: /) {
1011 # skip this for now, we regenerate the
1012 # correct one on re-fetch anyways
1013 # TODO: set *:merge properties or like...
1014 } else {
1015 print $log_fh $_ or croak $!;
1016 }
1017 }
1018 command_close_pipe($msg_fh, $ctx);
1019 }
1020 close $log_fh or croak $!;
1021 if ($_edit || ($type eq 'tree')) {
1023 my $editor = $ENV{VISUAL} || $ENV{EDITOR} || 'vi';
1024 # TODO: strip out spaces, comments, like git-commit.sh
1025 system($editor, $commit_editmsg);
1026 }
1027 rename $commit_editmsg, $commit_msg or croak $!;
1028 open $log_fh, '<', $commit_msg or croak $!;
1029 { local $/; chomp($log_entry{log} = <$log_fh>); }
1030 close $log_fh or croak $!;
1031 unlink $commit_msg;
1032 \%log_entry;
1033}
1034sub s_to_file {
1036 my ($str, $file, $mode) = @_;
1037 open my $fd,'>',$file or croak $!;
1038 print $fd $str,"\n" or croak $!;
1039 close $fd or croak $!;
1040 chmod ($mode &~ umask, $file) if (defined $mode);
1041}
1042sub file_to_s {
1044 my $file = shift;
1045 open my $fd,'<',$file or croak "$!: file: $file\n";
1046 local $/;
1047 my $ret = <$fd>;
1048 close $fd or croak $!;
1049 $ret =~ s/\s*$//s;
1050 return $ret;
1051}
1052# '<svn username> = real-name <email address>' mapping based on git-svnimport:
1054sub load_authors {
1055 open my $authors, '<', $_authors or die "Can't open $_authors $!\n";
1056 my $log = $cmd eq 'log';
1057 while (<$authors>) {
1058 chomp;
1059 next unless /^(.+?|\(no author\))\s*=\s*(.+?)\s*<(.+)>\s*$/;
1060 my ($user, $name, $email) = ($1, $2, $3);
1061 if ($log) {
1062 $Git::SVN::Log::rusers{"$name <$email>"} = $user;
1063 } else {
1064 $users{$user} = [$name, $email];
1065 }
1066 }
1067 close $authors or croak $!;
1068}
1069# convert GetOpt::Long specs for use by git-config
1071sub read_repo_config {
1072 return unless -d $ENV{GIT_DIR};
1073 my $opts = shift;
1074 my @config_only;
1075 foreach my $o (keys %$opts) {
1076 # if we have mixedCase and a long option-only, then
1077 # it's a config-only variable that we don't need for
1078 # the command-line.
1079 push @config_only, $o if ($o =~ /[A-Z]/ && $o =~ /^[a-z]+$/i);
1080 my $v = $opts->{$o};
1081 my ($key) = ($o =~ /^([a-zA-Z\-]+)/);
1082 $key =~ s/-//g;
1083 my $arg = 'git-config';
1084 $arg .= ' --int' if ($o =~ /[:=]i$/);
1085 $arg .= ' --bool' if ($o !~ /[:=][sfi]$/);
1086 if (ref $v eq 'ARRAY') {
1087 chomp(my @tmp = `$arg --get-all svn.$key`);
1088 @$v = @tmp if @tmp;
1089 } else {
1090 chomp(my $tmp = `$arg --get svn.$key`);
1091 if ($tmp && !($arg =~ / --bool/ && $tmp eq 'false')) {
1092 $$v = $tmp;
1093 }
1094 }
1095 }
1096 delete @$opts{@config_only} if @config_only;
1097}
1098sub extract_metadata {
1100 my $id = shift or return (undef, undef, undef);
1101 my ($url, $rev, $uuid) = ($id =~ /^\s*git-svn-id:\s+(.*)\@(\d+)
1102 \s([a-f\d\-]+)$/x);
1103 if (!defined $rev || !$uuid || !$url) {
1104 # some of the original repositories I made had
1105 # identifiers like this:
1106 ($rev, $uuid) = ($id =~/^\s*git-svn-id:\s(\d+)\@([a-f\d\-]+)/);
1107 }
1108 return ($url, $rev, $uuid);
1109}
1110sub cmt_metadata {
1112 return extract_metadata((grep(/^git-svn-id: /,
1113 command(qw/cat-file commit/, shift)))[-1]);
1114}
1115sub working_head_info {
1117 my ($head, $refs) = @_;
1118 my @args = ('log', '--no-color', '--first-parent');
1119 my ($fh, $ctx) = command_output_pipe(@args, $head);
1120 my $hash;
1121 my %max;
1122 while (<$fh>) {
1123 if ( m{^commit ($::sha1)$} ) {
1124 unshift @$refs, $hash if $hash and $refs;
1125 $hash = $1;
1126 next;
1127 }
1128 next unless s{^\s*(git-svn-id:)}{$1};
1129 my ($url, $rev, $uuid) = extract_metadata($_);
1130 if (defined $url && defined $rev) {
1131 next if $max{$url} and $max{$url} < $rev;
1132 if (my $gs = Git::SVN->find_by_url($url)) {
1133 my $c = $gs->rev_map_get($rev);
1134 if ($c && $c eq $hash) {
1135 close $fh; # break the pipe
1136 return ($url, $rev, $uuid, $gs);
1137 } else {
1138 $max{$url} ||= $gs->rev_map_max;
1139 }
1140 }
1141 }
1142 }
1143 command_close_pipe($fh, $ctx);
1144 (undef, undef, undef, undef);
1145}
1146sub read_commit_parents {
1148 my ($parents, $c) = @_;
1149 chomp(my $p = command_oneline(qw/rev-list --parents -1/, $c));
1150 $p =~ s/^($c)\s*// or die "rev-list --parents -1 $c failed!\n";
1151 @{$parents->{$c}} = split(/ /, $p);
1152}
1153sub linearize_history {
1155 my ($gs, $refs) = @_;
1156 my %parents;
1157 foreach my $c (@$refs) {
1158 read_commit_parents(\%parents, $c);
1159 }
1160 my @linear_refs;
1162 my %skip = ();
1163 my $last_svn_commit = $gs->last_commit;
1164 foreach my $c (reverse @$refs) {
1165 next if $c eq $last_svn_commit;
1166 last if $skip{$c};
1167 unshift @linear_refs, $c;
1169 $skip{$c} = 1;
1170 # we only want the first parent to diff against for linear
1172 # history, we save the rest to inject when we finalize the
1173 # svn commit
1174 my $fp_a = verify_ref("$c~1");
1175 my $fp_b = shift @{$parents{$c}} if $parents{$c};
1176 if (!$fp_a || !$fp_b) {
1177 die "Commit $c\n",
1178 "has no parent commit, and therefore ",
1179 "nothing to diff against.\n",
1180 "You should be working from a repository ",
1181 "originally created by git-svn\n";
1182 }
1183 if ($fp_a ne $fp_b) {
1184 die "$c~1 = $fp_a, however parsing commit $c ",
1185 "revealed that:\n$c~1 = $fp_b\nBUG!\n";
1186 }
1187 foreach my $p (@{$parents{$c}}) {
1189 $skip{$p} = 1;
1190 }
1191 }
1192 (\@linear_refs, \%parents);
1193}
1194sub find_file_type_and_diff_status {
1196 my ($path) = @_;
1197 return ('dir', '') if $path eq '.';
1198 my $diff_output =
1200 command_oneline(qw(diff --cached --name-status --), $path) || "";
1201 my $diff_status = (split(' ', $diff_output))[0] || "";
1202 my $ls_tree = command_oneline(qw(ls-tree HEAD), $path) || "";
1204 return (undef, undef) if !$diff_status && !$ls_tree;
1206 if ($diff_status eq "A") {
1208 return ("link", $diff_status) if -l $path;
1209 return ("dir", $diff_status) if -d $path;
1210 return ("file", $diff_status);
1211 }
1212 my $mode = (split(' ', $ls_tree))[0] || "";
1214 return ("link", $diff_status) if $mode eq "120000";
1216 return ("dir", $diff_status) if $mode eq "040000";
1217 return ("file", $diff_status);
1218}
1219sub md5sum {
1221 my $arg = shift;
1222 my $ref = ref $arg;
1223 my $md5 = Digest::MD5->new();
1224 if ($ref eq 'GLOB' || $ref eq 'IO::File') {
1225 $md5->addfile($arg) or croak $!;
1226 } elsif ($ref eq 'SCALAR') {
1227 $md5->add($$arg) or croak $!;
1228 } elsif (!$ref) {
1229 $md5->add($arg) or croak $!;
1230 } else {
1231 ::fatal "Can't provide MD5 hash for unknown ref type: '", $ref, "'";
1232 }
1233 return $md5->hexdigest();
1234}
1235package Git::SVN;
1237use strict;
1238use warnings;
1239use Fcntl qw/:DEFAULT :seek/;
1240use constant rev_map_fmt => 'NH40';
1241use vars qw/$default_repo_id $default_ref_id $_no_metadata $_follow_parent
1242 $_repack $_repack_flags $_use_svm_props $_head
1243 $_use_svnsync_props $no_reuse_existing $_minimize_url
1244 $_use_log_author/;
1245use Carp qw/croak/;
1246use File::Path qw/mkpath/;
1247use File::Copy qw/copy/;
1248use IPC::Open3;
1249# properties that we do not log:
1251my %SKIP_PROP;
1252BEGIN {
1253 %SKIP_PROP = map { $_ => 1 } qw/svn:wc:ra_dav:version-url
1254 svn:special svn:executable
1255 svn:entry:committed-rev
1256 svn:entry:last-author
1257 svn:entry:uuid
1258 svn:entry:committed-date/;
1259 # some options are read globally, but can be overridden locally
1261 # per [svn-remote "..."] section. Command-line options will *NOT*
1262 # override options set in an [svn-remote "..."] section
1263 no strict 'refs';
1264 for my $option (qw/follow_parent no_metadata use_svm_props
1265 use_svnsync_props/) {
1266 my $key = $option;
1267 $key =~ tr/_//d;
1268 my $prop = "-$option";
1269 *$option = sub {
1270 my ($self) = @_;
1271 return $self->{$prop} if exists $self->{$prop};
1272 my $k = "svn-remote.$self->{repo_id}.$key";
1273 eval { command_oneline(qw/config --get/, $k) };
1274 if ($@) {
1275 $self->{$prop} = ${"Git::SVN::_$option"};
1276 } else {
1277 my $v = command_oneline(qw/config --bool/,$k);
1278 $self->{$prop} = $v eq 'false' ? 0 : 1;
1279 }
1280 return $self->{$prop};
1281 }
1282 }
1283}
1284my (%LOCKFILES, %INDEX_FILES);
1286END {
1287 unlink keys %LOCKFILES if %LOCKFILES;
1288 unlink keys %INDEX_FILES if %INDEX_FILES;
1289}
1290sub resolve_local_globs {
1292 my ($url, $fetch, $glob_spec) = @_;
1293 return unless defined $glob_spec;
1294 my $ref = $glob_spec->{ref};
1295 my $path = $glob_spec->{path};
1296 foreach (command(qw#for-each-ref --format=%(refname) refs/remotes#)) {
1297 next unless m#^refs/remotes/$ref->{regex}$#;
1298 my $p = $1;
1299 my $pathname = desanitize_refname($path->full_path($p));
1300 my $refname = desanitize_refname($ref->full_path($p));
1301 if (my $existing = $fetch->{$pathname}) {
1302 if ($existing ne $refname) {
1303 die "Refspec conflict:\n",
1304 "existing: refs/remotes/$existing\n",
1305 " globbed: refs/remotes/$refname\n";
1306 }
1307 my $u = (::cmt_metadata("refs/remotes/$refname"))[0];
1308 $u =~ s!^\Q$url\E(/|$)!! or die
1309 "refs/remotes/$refname: '$url' not found in '$u'\n";
1310 if ($pathname ne $u) {
1311 warn "W: Refspec glob conflict ",
1312 "(ref: refs/remotes/$refname):\n",
1313 "expected path: $pathname\n",
1314 " real path: $u\n",
1315 "Continuing ahead with $u\n";
1316 next;
1317 }
1318 } else {
1319 $fetch->{$pathname} = $refname;
1320 }
1321 }
1322}
1323sub parse_revision_argument {
1325 my ($base, $head) = @_;
1326 if (!defined $::_revision || $::_revision eq 'BASE:HEAD') {
1327 return ($base, $head);
1328 }
1329 return ($1, $2) if ($::_revision =~ /^(\d+):(\d+)$/);
1330 return ($::_revision, $::_revision) if ($::_revision =~ /^\d+$/);
1331 return ($head, $head) if ($::_revision eq 'HEAD');
1332 return ($base, $1) if ($::_revision =~ /^BASE:(\d+)$/);
1333 return ($1, $head) if ($::_revision =~ /^(\d+):HEAD$/);
1334 die "revision argument: $::_revision not understood by git-svn\n";
1335}
1336sub fetch_all {
1338 my ($repo_id, $remotes) = @_;
1339 if (ref $repo_id) {
1340 my $gs = $repo_id;
1341 $repo_id = undef;
1342 $repo_id = $gs->{repo_id};
1343 }
1344 $remotes ||= read_all_remotes();
1345 my $remote = $remotes->{$repo_id} or
1346 die "[svn-remote \"$repo_id\"] unknown\n";
1347 my $fetch = $remote->{fetch};
1348 my $url = $remote->{url} or die "svn-remote.$repo_id.url not defined\n";
1349 my (@gs, @globs);
1350 my $ra = Git::SVN::Ra->new($url);
1351 my $uuid = $ra->get_uuid;
1352 my $head = $ra->get_latest_revnum;
1353 my $base = defined $fetch ? $head : 0;
1354 # read the max revs for wildcard expansion (branches/*, tags/*)
1356 foreach my $t (qw/branches tags/) {
1357 defined $remote->{$t} or next;
1358 push @globs, $remote->{$t};
1359 my $max_rev = eval { tmp_config(qw/--int --get/,
1360 "svn-remote.$repo_id.${t}-maxRev") };
1361 if (defined $max_rev && ($max_rev < $base)) {
1362 $base = $max_rev;
1363 } elsif (!defined $max_rev) {
1364 $base = 0;
1365 }
1366 }
1367 if ($fetch) {
1369 foreach my $p (sort keys %$fetch) {
1370 my $gs = Git::SVN->new($fetch->{$p}, $repo_id, $p);
1371 my $lr = $gs->rev_map_max;
1372 if (defined $lr) {
1373 $base = $lr if ($lr < $base);
1374 }
1375 push @gs, $gs;
1376 }
1377 }
1378 ($base, $head) = parse_revision_argument($base, $head);
1380 $ra->gs_fetch_loop_common($base, $head, \@gs, \@globs);
1381}
1382sub read_all_remotes {
1384 my $r = {};
1385 foreach (grep { s/^svn-remote\.// } command(qw/config -l/)) {
1386 if (m!^(.+)\.fetch=\s*(.*)\s*:\s*refs/remotes/(.+)\s*$!) {
1387 my ($remote, $local_ref, $remote_ref) = ($1, $2, $3);
1388 $local_ref =~ s{^/}{};
1389 $r->{$remote}->{fetch}->{$local_ref} = $remote_ref;
1390 } elsif (m!^(.+)\.url=\s*(.*)\s*$!) {
1391 $r->{$1}->{url} = $2;
1392 } elsif (m!^(.+)\.(branches|tags)=
1393 (.*):refs/remotes/(.+)\s*$/!x) {
1394 my ($p, $g) = ($3, $4);
1395 my $rs = $r->{$1}->{$2} = {
1396 t => $2,
1397 remote => $1,
1398 path => Git::SVN::GlobSpec->new($p),
1399 ref => Git::SVN::GlobSpec->new($g) };
1400 if (length($rs->{ref}->{right}) != 0) {
1401 die "The '*' glob character must be the last ",
1402 "character of '$g'\n";
1403 }
1404 }
1405 }
1406 $r;
1407}
1408sub init_vars {
1410 if (defined $_repack || defined $_repack_flags) {
1411 warn "Repack options are obsolete; they have no effect.\n";
1412 }
1413}
1414sub verify_remotes_sanity {
1416 return unless -d $ENV{GIT_DIR};
1417 my %seen;
1418 foreach (command(qw/config -l/)) {
1419 if (m!^svn-remote\.(?:.+)\.fetch=.*:refs/remotes/(\S+)\s*$!) {
1420 if ($seen{$1}) {
1421 die "Remote ref refs/remote/$1 is tracked by",
1422 "\n \"$_\"\nand\n \"$seen{$1}\"\n",
1423 "Please resolve this ambiguity in ",
1424 "your git configuration file before ",
1425 "continuing\n";
1426 }
1427 $seen{$1} = $_;
1428 }
1429 }
1430}
1431# we allow more chars than remotes2config.sh...
1433sub sanitize_remote_name {
1434 my ($name) = @_;
1435 $name =~ tr{A-Za-z0-9:,/+-}{.}c;
1436 $name;
1437}
1438sub find_existing_remote {
1440 my ($url, $remotes) = @_;
1441 return undef if $no_reuse_existing;
1442 my $existing;
1443 foreach my $repo_id (keys %$remotes) {
1444 my $u = $remotes->{$repo_id}->{url} or next;
1445 next if $u ne $url;
1446 $existing = $repo_id;
1447 last;
1448 }
1449 $existing;
1450}
1451sub init_remote_config {
1453 my ($self, $url, $no_write) = @_;
1454 $url =~ s!/+$!!; # strip trailing slash
1455 my $r = read_all_remotes();
1456 my $existing = find_existing_remote($url, $r);
1457 if ($existing) {
1458 unless ($no_write) {
1459 print STDERR "Using existing ",
1460 "[svn-remote \"$existing\"]\n";
1461 }
1462 $self->{repo_id} = $existing;
1463 } elsif ($_minimize_url) {
1464 my $min_url = Git::SVN::Ra->new($url)->minimize_url;
1465 $existing = find_existing_remote($min_url, $r);
1466 if ($existing) {
1467 unless ($no_write) {
1468 print STDERR "Using existing ",
1469 "[svn-remote \"$existing\"]\n";
1470 }
1471 $self->{repo_id} = $existing;
1472 }
1473 if ($min_url ne $url) {
1474 unless ($no_write) {
1475 print STDERR "Using higher level of URL: ",
1476 "$url => $min_url\n";
1477 }
1478 my $old_path = $self->{path};
1479 $self->{path} = $url;
1480 $self->{path} =~ s!^\Q$min_url\E(/|$)!!;
1481 if (length $old_path) {
1482 $self->{path} .= "/$old_path";
1483 }
1484 $url = $min_url;
1485 }
1486 }
1487 my $orig_url;
1488 if (!$existing) {
1489 # verify that we aren't overwriting anything:
1490 $orig_url = eval {
1491 command_oneline('config', '--get',
1492 "svn-remote.$self->{repo_id}.url")
1493 };
1494 if ($orig_url && ($orig_url ne $url)) {
1495 die "svn-remote.$self->{repo_id}.url already set: ",
1496 "$orig_url\nwanted to set to: $url\n";
1497 }
1498 }
1499 my ($xrepo_id, $xpath) = find_ref($self->refname);
1500 if (defined $xpath) {
1501 die "svn-remote.$xrepo_id.fetch already set to track ",
1502 "$xpath:refs/remotes/", $self->refname, "\n";
1503 }
1504 unless ($no_write) {
1505 command_noisy('config',
1506 "svn-remote.$self->{repo_id}.url", $url);
1507 $self->{path} =~ s{^/}{};
1508 command_noisy('config', '--add',
1509 "svn-remote.$self->{repo_id}.fetch",
1510 "$self->{path}:".$self->refname);
1511 }
1512 $self->{url} = $url;
1513}
1514sub find_by_url { # repos_root and, path are optional
1516 my ($class, $full_url, $repos_root, $path) = @_;
1517 return undef unless defined $full_url;
1519 remove_username($full_url);
1520 remove_username($repos_root) if defined $repos_root;
1521 my $remotes = read_all_remotes();
1522 if (defined $full_url && defined $repos_root && !defined $path) {
1523 $path = $full_url;
1524 $path =~ s#^\Q$repos_root\E(?:/|$)##;
1525 }
1526 foreach my $repo_id (keys %$remotes) {
1527 my $u = $remotes->{$repo_id}->{url} or next;
1528 remove_username($u);
1529 next if defined $repos_root && $repos_root ne $u;
1530 my $fetch = $remotes->{$repo_id}->{fetch} || {};
1532 foreach (qw/branches tags/) {
1533 resolve_local_globs($u, $fetch,
1534 $remotes->{$repo_id}->{$_});
1535 }
1536 my $p = $path;
1537 unless (defined $p) {
1538 $p = $full_url;
1539 $p =~ s#^\Q$u\E(?:/|$)## or next;
1540 }
1541 foreach my $f (keys %$fetch) {
1542 next if $f ne $p;
1543 return Git::SVN->new($fetch->{$f}, $repo_id, $f);
1544 }
1545 }
1546 undef;
1547}
1548sub init {
1550 my ($class, $url, $path, $repo_id, $ref_id, $no_write) = @_;
1551 my $self = _new($class, $repo_id, $ref_id, $path);
1552 if (defined $url) {
1553 $self->init_remote_config($url, $no_write);
1554 }
1555 $self;
1556}
1557sub find_ref {
1559 my ($ref_id) = @_;
1560 foreach (command(qw/config -l/)) {
1561 next unless m!^svn-remote\.(.+)\.fetch=
1562 \s*(.*)\s*:\s*refs/remotes/(.+)\s*$!x;
1563 my ($repo_id, $path, $ref) = ($1, $2, $3);
1564 if ($ref eq $ref_id) {
1565 $path = '' if ($path =~ m#^\./?#);
1566 return ($repo_id, $path);
1567 }
1568 }
1569 (undef, undef, undef);
1570}
1571sub new {
1573 my ($class, $ref_id, $repo_id, $path) = @_;
1574 if (defined $ref_id && !defined $repo_id && !defined $path) {
1575 ($repo_id, $path) = find_ref($ref_id);
1576 if (!defined $repo_id) {
1577 die "Could not find a \"svn-remote.*.fetch\" key ",
1578 "in the repository configuration matching: ",
1579 "refs/remotes/$ref_id\n";
1580 }
1581 }
1582 my $self = _new($class, $repo_id, $ref_id, $path);
1583 if (!defined $self->{path} || !length $self->{path}) {
1584 my $fetch = command_oneline('config', '--get',
1585 "svn-remote.$repo_id.fetch",
1586 ":refs/remotes/$ref_id\$") or
1587 die "Failed to read \"svn-remote.$repo_id.fetch\" ",
1588 "\":refs/remotes/$ref_id\$\" in config\n";
1589 ($self->{path}, undef) = split(/\s*:\s*/, $fetch);
1590 }
1591 $self->{url} = command_oneline('config', '--get',
1592 "svn-remote.$repo_id.url") or
1593 die "Failed to read \"svn-remote.$repo_id.url\" in config\n";
1594 $self->rebuild;
1595 $self;
1596}
1597sub refname {
1599 my ($refname) = "refs/remotes/$_[0]->{ref_id}" ;
1600 # It cannot end with a slash /, we'll throw up on this because
1602 # SVN can't have directories with a slash in their name, either:
1603 if ($refname =~ m{/$}) {
1604 die "ref: '$refname' ends with a trailing slash, this is ",
1605 "not permitted by git nor Subversion\n";
1606 }
1607 # It cannot have ASCII control character space, tilde ~, caret ^,
1609 # colon :, question-mark ?, asterisk *, space, or open bracket [
1610 # anywhere.
1611 #
1612 # Additionally, % must be escaped because it is used for escaping
1613 # and we want our escaped refname to be reversible
1614 $refname =~ s{([ \%~\^:\?\*\[\t])}{uc sprintf('%%%02x',ord($1))}eg;
1615 # no slash-separated component can begin with a dot .
1617 # /.* becomes /%2E*
1618 $refname =~ s{/\.}{/%2E}g;
1619 # It cannot have two consecutive dots .. anywhere
1621 # .. becomes %2E%2E
1622 $refname =~ s{\.\.}{%2E%2E}g;
1623 return $refname;
1625}
1626sub desanitize_refname {
1628 my ($refname) = @_;
1629 $refname =~ s{%(?:([0-9A-F]{2}))}{chr hex($1)}eg;
1630 return $refname;
1631}
1632sub svm_uuid {
1634 my ($self) = @_;
1635 return $self->{svm}->{uuid} if $self->svm;
1636 $self->ra;
1637 unless ($self->{svm}) {
1638 die "SVM UUID not cached, and reading remotely failed\n";
1639 }
1640 $self->{svm}->{uuid};
1641}
1642sub svm {
1644 my ($self) = @_;
1645 return $self->{svm} if $self->{svm};
1646 my $svm;
1647 # see if we have it in our config, first:
1648 eval {
1649 my $section = "svn-remote.$self->{repo_id}";
1650 $svm = {
1651 source => tmp_config('--get', "$section.svm-source"),
1652 uuid => tmp_config('--get', "$section.svm-uuid"),
1653 replace => tmp_config('--get', "$section.svm-replace"),
1654 }
1655 };
1656 if ($svm && $svm->{source} && $svm->{uuid} && $svm->{replace}) {
1657 $self->{svm} = $svm;
1658 }
1659 $self->{svm};
1660}
1661sub _set_svm_vars {
1663 my ($self, $ra) = @_;
1664 return $ra if $self->svm;
1665 my @err = ( "useSvmProps set, but failed to read SVM properties\n",
1667 "(svm:source, svm:uuid) ",
1668 "from the following URLs:\n" );
1669 sub read_svm_props {
1670 my ($self, $ra, $path, $r) = @_;
1671 my $props = ($ra->get_dir($path, $r))[2];
1672 my $src = $props->{'svm:source'};
1673 my $uuid = $props->{'svm:uuid'};
1674 return undef if (!$src || !$uuid);
1675 chomp($src, $uuid);
1677 $uuid =~ m{^[0-9a-f\-]{30,}$}
1679 or die "doesn't look right - svm:uuid is '$uuid'\n";
1680 # the '!' is used to mark the repos_root!/relative/path
1682 $src =~ s{/?!/?}{/};
1683 $src =~ s{/+$}{}; # no trailing slashes please
1684 # username is of no interest
1685 $src =~ s{(^[a-z\+]*://)[^/@]*@}{$1};
1686 my $replace = $ra->{url};
1688 $replace .= "/$path" if length $path;
1689 my $section = "svn-remote.$self->{repo_id}";
1691 tmp_config("$section.svm-source", $src);
1692 tmp_config("$section.svm-replace", $replace);
1693 tmp_config("$section.svm-uuid", $uuid);
1694 $self->{svm} = {
1695 source => $src,
1696 uuid => $uuid,
1697 replace => $replace
1698 };
1699 }
1700 my $r = $ra->get_latest_revnum;
1702 my $path = $self->{path};
1703 my %tried;
1704 while (length $path) {
1705 unless ($tried{"$self->{url}/$path"}) {
1706 return $ra if $self->read_svm_props($ra, $path, $r);
1707 $tried{"$self->{url}/$path"} = 1;
1708 }
1709 $path =~ s#/?[^/]+$##;
1710 }
1711 die "Path: '$path' should be ''\n" if $path ne '';
1712 return $ra if $self->read_svm_props($ra, $path, $r);
1713 $tried{"$self->{url}/$path"} = 1;
1714 if ($ra->{repos_root} eq $self->{url}) {
1716 die @err, (map { " $_\n" } keys %tried), "\n";
1717 }
1718 # nope, make sure we're connected to the repository root:
1720 my $ok;
1721 my @tried_b;
1722 $path = $ra->{svn_path};
1723 $ra = Git::SVN::Ra->new($ra->{repos_root});
1724 while (length $path) {
1725 unless ($tried{"$ra->{url}/$path"}) {
1726 $ok = $self->read_svm_props($ra, $path, $r);
1727 last if $ok;
1728 $tried{"$ra->{url}/$path"} = 1;
1729 }
1730 $path =~ s#/?[^/]+$##;
1731 }
1732 die "Path: '$path' should be ''\n" if $path ne '';
1733 $ok ||= $self->read_svm_props($ra, $path, $r);
1734 $tried{"$ra->{url}/$path"} = 1;
1735 if (!$ok) {
1736 die @err, (map { " $_\n" } keys %tried), "\n";
1737 }
1738 Git::SVN::Ra->new($self->{url});
1739}
1740sub svnsync {
1742 my ($self) = @_;
1743 return $self->{svnsync} if $self->{svnsync};
1744 if ($self->no_metadata) {
1746 die "Can't have both 'noMetadata' and ",
1747 "'useSvnsyncProps' options set!\n";
1748 }
1749 if ($self->rewrite_root) {
1750 die "Can't have both 'useSvnsyncProps' and 'rewriteRoot' ",
1751 "options set!\n";
1752 }
1753 my $svnsync;
1755 # see if we have it in our config, first:
1756 eval {
1757 my $section = "svn-remote.$self->{repo_id}";
1758 my $url = tmp_config('--get', "$section.svnsync-url");
1760 ($url) = ($url =~ m{^([a-z\+]+://\S+)$}) or
1761 die "doesn't look right - svn:sync-from-url is '$url'\n";
1762 my $uuid = tmp_config('--get', "$section.svnsync-uuid");
1764 ($uuid) = ($uuid =~ m{^([0-9a-f\-]{30,})$}) or
1765 die "doesn't look right - svn:sync-from-uuid is '$uuid'\n";
1766 $svnsync = { url => $url, uuid => $uuid }
1768 };
1769 if ($svnsync && $svnsync->{url} && $svnsync->{uuid}) {
1770 return $self->{svnsync} = $svnsync;
1771 }
1772 my $err = "useSvnsyncProps set, but failed to read " .
1774 "svnsync property: svn:sync-from-";
1775 my $rp = $self->ra->rev_proplist(0);
1776 my $url = $rp->{'svn:sync-from-url'} or die $err . "url\n";
1778 ($url) = ($url =~ m{^([a-z\+]+://\S+)$}) or
1779 die "doesn't look right - svn:sync-from-url is '$url'\n";
1780 my $uuid = $rp->{'svn:sync-from-uuid'} or die $err . "uuid\n";
1782 ($uuid) = ($uuid =~ m{^([0-9a-f\-]{30,})$}) or
1783 die "doesn't look right - svn:sync-from-uuid is '$uuid'\n";
1784 my $section = "svn-remote.$self->{repo_id}";
1786 tmp_config('--add', "$section.svnsync-uuid", $uuid);
1787 tmp_config('--add', "$section.svnsync-url", $url);
1788 return $self->{svnsync} = { url => $url, uuid => $uuid };
1789}
1790# this allows us to memoize our SVN::Ra UUID locally and avoid a
1792# remote lookup (useful for 'git svn log').
1793sub ra_uuid {
1794 my ($self) = @_;
1795 unless ($self->{ra_uuid}) {
1796 my $key = "svn-remote.$self->{repo_id}.uuid";
1797 my $uuid = eval { tmp_config('--get', $key) };
1798 if (!$@ && $uuid && $uuid =~ /^([a-f\d\-]{30,})$/) {
1799 $self->{ra_uuid} = $uuid;
1800 } else {
1801 die "ra_uuid called without URL\n" unless $self->{url};
1802 $self->{ra_uuid} = $self->ra->get_uuid;
1803 tmp_config('--add', $key, $self->{ra_uuid});
1804 }
1805 }
1806 $self->{ra_uuid};
1807}
1808sub _set_repos_root {
1810 my ($self, $repos_root) = @_;
1811 my $k = "svn-remote.$self->{repo_id}.reposRoot";
1812 $repos_root ||= $self->ra->{repos_root};
1813 tmp_config($k, $repos_root);
1814 $repos_root;
1815}
1816sub repos_root {
1818 my ($self) = @_;
1819 my $k = "svn-remote.$self->{repo_id}.reposRoot";
1820 eval { tmp_config('--get', $k) } || $self->_set_repos_root;
1821}
1822sub ra {
1824 my ($self) = shift;
1825 my $ra = Git::SVN::Ra->new($self->{url});
1826 $self->_set_repos_root($ra->{repos_root});
1827 if ($self->use_svm_props && !$self->{svm}) {
1828 if ($self->no_metadata) {
1829 die "Can't have both 'noMetadata' and ",
1830 "'useSvmProps' options set!\n";
1831 } elsif ($self->use_svnsync_props) {
1832 die "Can't have both 'useSvnsyncProps' and ",
1833 "'useSvmProps' options set!\n";
1834 }
1835 $ra = $self->_set_svm_vars($ra);
1836 $self->{-want_revprops} = 1;
1837 }
1838 $ra;
1839}
1840sub rel_path {
1842 my ($self) = @_;
1843 my $repos_root = $self->ra->{repos_root};
1844 return $self->{path} if ($self->{url} eq $repos_root);
1845 my $url = $self->{url} .
1846 (length $self->{path} ? "/$self->{path}" : $self->{path});
1847 $url =~ s!^\Q$repos_root\E(?:/+|$)!!g;
1848 $url;
1849}
1850# prop_walk(PATH, REV, SUB)
1852# -------------------------
1853# Recursively traverse PATH at revision REV and invoke SUB for each
1854# directory that contains a SVN property. SUB will be invoked as
1855# follows: &SUB(gs, path, props); where `gs' is this instance of
1856# Git::SVN, `path' the path to the directory where the properties
1857# `props' were found. The `path' will be relative to point of checkout,
1858# that is, if url://repo/trunk is the current Git branch, and that
1859# directory contains a sub-directory `d', SUB will be invoked with `/d/'
1860# as `path' (note the trailing `/').
1861sub prop_walk {
1862 my ($self, $path, $rev, $sub) = @_;
1863 $path =~ s#^/##;
1865 my ($dirent, undef, $props) = $self->ra->get_dir($path, $rev);
1866 $path =~ s#^/*#/#g;
1867 my $p = $path;
1868 # Strip the irrelevant part of the path.
1869 $p =~ s#^/+\Q$self->{path}\E(/|$)#/#;
1870 # Ensure the path is terminated by a `/'.
1871 $p =~ s#/*$#/#;
1872 # The properties contain all the internal SVN stuff nobody
1874 # (usually) cares about.
1875 my $interesting_props = 0;
1876 foreach (keys %{$props}) {
1877 # If it doesn't start with `svn:', it must be a
1878 # user-defined property.
1879 ++$interesting_props and next if $_ !~ /^svn:/;
1880 # FIXME: Fragile, if SVN adds new public properties,
1881 # this needs to be updated.
1882 ++$interesting_props if /^svn:(?:ignore|keywords|executable
1883 |eol-style|mime-type
1884 |externals|needs-lock)$/x;
1885 }
1886 &$sub($self, $p, $props) if $interesting_props;
1887 foreach (sort keys %$dirent) {
1889 next if $dirent->{$_}->{kind} != $SVN::Node::dir;
1890 $self->prop_walk($path . '/' . $_, $rev, $sub);
1891 }
1892}
1893sub last_rev { ($_[0]->last_rev_commit)[0] }
1895sub last_commit { ($_[0]->last_rev_commit)[1] }
1896# returns the newest SVN revision number and newest commit SHA1
1898sub last_rev_commit {
1899 my ($self) = @_;
1900 if (defined $self->{last_rev} && defined $self->{last_commit}) {
1901 return ($self->{last_rev}, $self->{last_commit});
1902 }
1903 my $c = ::verify_ref($self->refname.'^0');
1904 if ($c && !$self->use_svm_props && !$self->no_metadata) {
1905 my $rev = (::cmt_metadata($c))[1];
1906 if (defined $rev) {
1907 ($self->{last_rev}, $self->{last_commit}) = ($rev, $c);
1908 return ($rev, $c);
1909 }
1910 }
1911 my $map_path = $self->map_path;
1912 unless (-e $map_path) {
1913 ($self->{last_rev}, $self->{last_commit}) = (undef, undef);
1914 return (undef, undef);
1915 }
1916 my ($rev, $commit) = $self->rev_map_max(1);
1917 ($self->{last_rev}, $self->{last_commit}) = ($rev, $commit);
1918 return ($rev, $commit);
1919}
1920sub get_fetch_range {
1922 my ($self, $min, $max) = @_;
1923 $max ||= $self->ra->get_latest_revnum;
1924 $min ||= $self->rev_map_max;
1925 (++$min, $max);
1926}
1927sub tmp_config {
1929 my (@args) = @_;
1930 my $old_def_config = "$ENV{GIT_DIR}/svn/config";
1931 my $config = "$ENV{GIT_DIR}/svn/.metadata";
1932 if (! -f $config && -f $old_def_config) {
1933 rename $old_def_config, $config or
1934 die "Failed rename $old_def_config => $config: $!\n";
1935 }
1936 my $old_config = $ENV{GIT_CONFIG};
1937 $ENV{GIT_CONFIG} = $config;
1938 $@ = undef;
1939 my @ret = eval {
1940 unless (-f $config) {
1941 mkfile($config);
1942 open my $fh, '>', $config or
1943 die "Can't open $config: $!\n";
1944 print $fh "; This file is used internally by ",
1945 "git-svn\n" or die
1946 "Couldn't write to $config: $!\n";
1947 print $fh "; You should not have to edit it\n" or
1948 die "Couldn't write to $config: $!\n";
1949 close $fh or die "Couldn't close $config: $!\n";
1950 }
1951 command('config', @args);
1952 };
1953 my $err = $@;
1954 if (defined $old_config) {
1955 $ENV{GIT_CONFIG} = $old_config;
1956 } else {
1957 delete $ENV{GIT_CONFIG};
1958 }
1959 die $err if $err;
1960 wantarray ? @ret : $ret[0];
1961}
1962sub tmp_index_do {
1964 my ($self, $sub) = @_;
1965 my $old_index = $ENV{GIT_INDEX_FILE};
1966 $ENV{GIT_INDEX_FILE} = $self->{index};
1967 $@ = undef;
1968 my @ret = eval {
1969 my ($dir, $base) = ($self->{index} =~ m#^(.*?)/?([^/]+)$#);
1970 mkpath([$dir]) unless -d $dir;
1971 &$sub;
1972 };
1973 my $err = $@;
1974 if (defined $old_index) {
1975 $ENV{GIT_INDEX_FILE} = $old_index;
1976 } else {
1977 delete $ENV{GIT_INDEX_FILE};
1978 }
1979 die $err if $err;
1980 wantarray ? @ret : $ret[0];
1981}
1982sub assert_index_clean {
1984 my ($self, $treeish) = @_;
1985 $self->tmp_index_do(sub {
1987 command_noisy('read-tree', $treeish) unless -e $self->{index};
1988 my $x = command_oneline('write-tree');
1989 my ($y) = (command(qw/cat-file commit/, $treeish) =~
1990 /^tree ($::sha1)/mo);
1991 return if $y eq $x;
1992 warn "Index mismatch: $y != $x\nrereading $treeish\n";
1994 unlink $self->{index} or die "unlink $self->{index}: $!\n";
1995 command_noisy('read-tree', $treeish);
1996 $x = command_oneline('write-tree');
1997 if ($y ne $x) {
1998 ::fatal "trees ($treeish) $y != $x\n",
1999 "Something is seriously wrong...";
2000 }
2001 });
2002}
2003sub get_commit_parents {
2005 my ($self, $log_entry) = @_;
2006 my (%seen, @ret, @tmp);
2007 # legacy support for 'set-tree'; this is only used by set_tree_cb:
2008 if (my $ip = $self->{inject_parents}) {
2009 if (my $commit = delete $ip->{$log_entry->{revision}}) {
2010 push @tmp, $commit;
2011 }
2012 }
2013 if (my $cur = ::verify_ref($self->refname.'^0')) {
2014 push @tmp, $cur;
2015 }
2016 if (my $ipd = $self->{inject_parents_dcommit}) {
2017 if (my $commit = delete $ipd->{$log_entry->{revision}}) {
2018 push @tmp, @$commit;
2019 }
2020 }
2021 push @tmp, $_ foreach (@{$log_entry->{parents}}, @tmp);
2022 while (my $p = shift @tmp) {
2023 next if $seen{$p};
2024 $seen{$p} = 1;
2025 push @ret, $p;
2026 # MAXPARENT is defined to 16 in commit-tree.c:
2027 last if @ret >= 16;
2028 }
2029 if (@tmp) {
2030 die "r$log_entry->{revision}: No room for parents:\n\t",
2031 join("\n\t", @tmp), "\n";
2032 }
2033 @ret;
2034}
2035sub rewrite_root {
2037 my ($self) = @_;
2038 return $self->{-rewrite_root} if exists $self->{-rewrite_root};
2039 my $k = "svn-remote.$self->{repo_id}.rewriteRoot";
2040 my $rwr = eval { command_oneline(qw/config --get/, $k) };
2041 if ($rwr) {
2042 $rwr =~ s#/+$##;
2043 if ($rwr !~ m#^[a-z\+]+://#) {
2044 die "$rwr is not a valid URL (key: $k)\n";
2045 }
2046 }
2047 $self->{-rewrite_root} = $rwr;
2048}
2049sub metadata_url {
2051 my ($self) = @_;
2052 ($self->rewrite_root || $self->{url}) .
2053 (length $self->{path} ? '/' . $self->{path} : '');
2054}
2055sub full_url {
2057 my ($self) = @_;
2058 $self->{url} . (length $self->{path} ? '/' . $self->{path} : '');
2059}
2060sub set_commit_header_env {
2063 my ($log_entry) = @_;
2064 my %env;
2065 foreach my $ned (qw/NAME EMAIL DATE/) {
2066 foreach my $ac (qw/AUTHOR COMMITTER/) {
2067 $env{"GIT_${ac}_${ned}"} = $ENV{"GIT_${ac}_${ned}"};
2068 }
2069 }
2070 $ENV{GIT_AUTHOR_NAME} = $log_entry->{name};
2072 $ENV{GIT_AUTHOR_EMAIL} = $log_entry->{email};
2073 $ENV{GIT_AUTHOR_DATE} = $ENV{GIT_COMMITTER_DATE} = $log_entry->{date};
2074 $ENV{GIT_COMMITTER_NAME} = (defined $log_entry->{commit_name})
2076 ? $log_entry->{commit_name}
2077 : $log_entry->{name};
2078 $ENV{GIT_COMMITTER_EMAIL} = (defined $log_entry->{commit_email})
2079 ? $log_entry->{commit_email}
2080 : $log_entry->{email};
2081 \%env;
2082}
2083sub restore_commit_header_env {
2085 my ($env) = @_;
2086 foreach my $ned (qw/NAME EMAIL DATE/) {
2087 foreach my $ac (qw/AUTHOR COMMITTER/) {
2088 my $k = "GIT_${ac}_${ned}";
2089 if (defined $env->{$k}) {
2090 $ENV{$k} = $env->{$k};
2091 } else {
2092 delete $ENV{$k};
2093 }
2094 }
2095 }
2096}
2097sub do_git_commit {
2099 my ($self, $log_entry) = @_;
2100 my $lr = $self->last_rev;
2101 if (defined $lr && $lr >= $log_entry->{revision}) {
2102 die "Last fetched revision of ", $self->refname,
2103 " was r$lr, but we are about to fetch: ",
2104 "r$log_entry->{revision}!\n";
2105 }
2106 if (my $c = $self->rev_map_get($log_entry->{revision})) {
2107 croak "$log_entry->{revision} = $c already exists! ",
2108 "Why are we refetching it?\n";
2109 }
2110 my $old_env = set_commit_header_env($log_entry);
2111 my $tree = $log_entry->{tree};
2112 if (!defined $tree) {
2113 $tree = $self->tmp_index_do(sub {
2114 command_oneline('write-tree') });
2115 }
2116 die "Tree is not a valid sha1: $tree\n" if $tree !~ /^$::sha1$/o;
2117 my @exec = ('git-commit-tree', $tree);
2119 foreach ($self->get_commit_parents($log_entry)) {
2120 push @exec, '-p', $_;
2121 }
2122 defined(my $pid = open3(my $msg_fh, my $out_fh, '>&STDERR', @exec))
2123 or croak $!;
2124 print $msg_fh $log_entry->{log} or croak $!;
2125 restore_commit_header_env($old_env);
2126 unless ($self->no_metadata) {
2127 print $msg_fh "\ngit-svn-id: $log_entry->{metadata}\n"
2128 or croak $!;
2129 }
2130 $msg_fh->flush == 0 or croak $!;
2131 close $msg_fh or croak $!;
2132 chomp(my $commit = do { local $/; <$out_fh> });
2133 close $out_fh or croak $!;
2134 waitpid $pid, 0;
2135 croak $? if $?;
2136 if ($commit !~ /^$::sha1$/o) {
2137 die "Failed to commit, invalid sha1: $commit\n";
2138 }
2139 $self->rev_map_set($log_entry->{revision}, $commit, 1);
2141 $self->{last_rev} = $log_entry->{revision};
2143 $self->{last_commit} = $commit;
2144 print "r$log_entry->{revision}";
2145 if (defined $log_entry->{svm_revision}) {
2146 print " (\@$log_entry->{svm_revision})";
2147 $self->rev_map_set($log_entry->{svm_revision}, $commit,
2148 0, $self->svm_uuid);
2149 }
2150 print " = $commit ($self->{ref_id})\n";
2151 return $commit;
2152}
2153sub match_paths {
2155 my ($self, $paths, $r) = @_;
2156 return 1 if $self->{path} eq '';
2157 if (my $path = $paths->{"/$self->{path}"}) {
2158 return ($path->{action} eq 'D') ? 0 : 1;
2159 }
2160 $self->{path_regex} ||= qr/^\/\Q$self->{path}\E\//;
2161 if (grep /$self->{path_regex}/, keys %$paths) {
2162 return 1;
2163 }
2164 my $c = '';
2165 foreach (split m#/#, $self->{path}) {
2166 $c .= "/$_";
2167 next unless ($paths->{$c} &&
2168 ($paths->{$c}->{action} =~ /^[AR]$/));
2169 if ($self->ra->check_path($self->{path}, $r) ==
2170 $SVN::Node::dir) {
2171 return 1;
2172 }
2173 }
2174 return 0;
2175}
2176sub find_parent_branch {
2178 my ($self, $paths, $rev) = @_;
2179 return undef unless $self->follow_parent;
2180 unless (defined $paths) {
2181 my $err_handler = $SVN::Error::handler;
2182 $SVN::Error::handler = \&Git::SVN::Ra::skip_unknown_revs;
2183 $self->ra->get_log([$self->{path}], $rev, $rev, 0, 1, 1, sub {
2184 $paths =
2185 Git::SVN::Ra::dup_changed_paths($_[0]) });
2186 $SVN::Error::handler = $err_handler;
2187 }
2188 return undef unless defined $paths;
2189 # look for a parent from another branch:
2191 my @b_path_components = split m#/#, $self->rel_path;
2192 my @a_path_components;
2193 my $i;
2194 while (@b_path_components) {
2195 $i = $paths->{'/'.join('/', @b_path_components)};
2196 last if $i && defined $i->{copyfrom_path};
2197 unshift(@a_path_components, pop(@b_path_components));
2198 }
2199 return undef unless defined $i && defined $i->{copyfrom_path};
2200 my $branch_from = $i->{copyfrom_path};
2201 if (@a_path_components) {
2202 print STDERR "branch_from: $branch_from => ";
2203 $branch_from .= '/'.join('/', @a_path_components);
2204 print STDERR $branch_from, "\n";
2205 }
2206 my $r = $i->{copyfrom_rev};
2207 my $repos_root = $self->ra->{repos_root};
2208 my $url = $self->ra->{url};
2209 my $new_url = $repos_root . $branch_from;
2210 print STDERR "Found possible branch point: ",
2211 "$new_url => ", $self->full_url, ", $r\n";
2212 $branch_from =~ s#^/##;
2213 my $gs = Git::SVN->find_by_url($new_url, $repos_root, $branch_from);
2214 unless ($gs) {
2215 my $ref_id = $self->{ref_id};
2216 $ref_id =~ s/\@\d+$//;
2217 $ref_id .= "\@$r";
2218 # just grow a tail if we're not unique enough :x
2219 $ref_id .= '-' while find_ref($ref_id);
2220 print STDERR "Initializing parent: $ref_id\n";
2221 $gs = Git::SVN->init($new_url, '', $ref_id, $ref_id, 1);
2222 }
2223 my ($r0, $parent) = $gs->find_rev_before($r, 1);
2224 if (!defined $r0 || !defined $parent) {
2225 my ($base, $head) = parse_revision_argument(0, $r);
2226 if ($base <= $r) {
2227 $gs->fetch($base, $r);
2228 }
2229 ($r0, $parent) = $gs->last_rev_commit;
2230 }
2231 if (defined $r0 && defined $parent) {
2232 print STDERR "Found branch parent: ($self->{ref_id}) $parent\n";
2233 my $ed;
2234 if ($self->ra->can_do_switch) {
2235 $self->assert_index_clean($parent);
2236 print STDERR "Following parent with do_switch\n";
2237 # do_switch works with svn/trunk >= r22312, but that
2238 # is not included with SVN 1.4.3 (the latest version
2239 # at the moment), so we can't rely on it
2240 $self->{last_commit} = $parent;
2241 $ed = SVN::Git::Fetcher->new($self);
2242 $gs->ra->gs_do_switch($r0, $rev, $gs,
2243 $self->full_url, $ed)
2244 or die "SVN connection failed somewhere...\n";
2245 } elsif ($self->ra->trees_match($new_url, $r0,
2246 $self->full_url, $rev)) {
2247 print STDERR "Trees match:\n",
2248 " $new_url\@$r0\n",
2249 " ${\$self->full_url}\@$rev\n",
2250 "Following parent with no changes\n";
2251 $self->tmp_index_do(sub {
2252 command_noisy('read-tree', $parent);
2253 });
2254 $self->{last_commit} = $parent;
2255 } else {
2256 print STDERR "Following parent with do_update\n";
2257 $ed = SVN::Git::Fetcher->new($self);
2258 $self->ra->gs_do_update($rev, $rev, $self, $ed)
2259 or die "SVN connection failed somewhere...\n";
2260 }
2261 print STDERR "Successfully followed parent\n";
2262 return $self->make_log_entry($rev, [$parent], $ed);
2263 }
2264 return undef;
2265}
2266sub do_fetch {
2268 my ($self, $paths, $rev) = @_;
2269 my $ed;
2270 my ($last_rev, @parents);
2271 if (my $lc = $self->last_commit) {
2272 # we can have a branch that was deleted, then re-added
2273 # under the same name but copied from another path, in
2274 # which case we'll have multiple parents (we don't
2275 # want to break the original ref, nor lose copypath info):
2276 if (my $log_entry = $self->find_parent_branch($paths, $rev)) {
2277 push @{$log_entry->{parents}}, $lc;
2278 return $log_entry;
2279 }
2280 $ed = SVN::Git::Fetcher->new($self);
2281 $last_rev = $self->{last_rev};
2282 $ed->{c} = $lc;
2283 @parents = ($lc);
2284 } else {
2285 $last_rev = $rev;
2286 if (my $log_entry = $self->find_parent_branch($paths, $rev)) {
2287 return $log_entry;
2288 }
2289 $ed = SVN::Git::Fetcher->new($self);
2290 }
2291 unless ($self->ra->gs_do_update($last_rev, $rev, $self, $ed)) {
2292 die "SVN connection failed somewhere...\n";
2293 }
2294 $self->make_log_entry($rev, \@parents, $ed);
2295}
2296sub get_untracked {
2298 my ($self, $ed) = @_;
2299 my @out;
2300 my $h = $ed->{empty};
2301 foreach (sort keys %$h) {
2302 my $act = $h->{$_} ? '+empty_dir' : '-empty_dir';
2303 push @out, " $act: " . uri_encode($_);
2304 warn "W: $act: $_\n";
2305 }
2306 foreach my $t (qw/dir_prop file_prop/) {
2307 $h = $ed->{$t} or next;
2308 foreach my $path (sort keys %$h) {
2309 my $ppath = $path eq '' ? '.' : $path;
2310 foreach my $prop (sort keys %{$h->{$path}}) {
2311 next if $SKIP_PROP{$prop};
2312 my $v = $h->{$path}->{$prop};
2313 my $t_ppath_prop = "$t: " .
2314 uri_encode($ppath) . ' ' .
2315 uri_encode($prop);
2316 if (defined $v) {
2317 push @out, " +$t_ppath_prop " .
2318 uri_encode($v);
2319 } else {
2320 push @out, " -$t_ppath_prop";
2321 }
2322 }
2323 }
2324 }
2325 foreach my $t (qw/absent_file absent_directory/) {
2326 $h = $ed->{$t} or next;
2327 foreach my $parent (sort keys %$h) {
2328 foreach my $path (sort @{$h->{$parent}}) {
2329 push @out, " $t: " .
2330 uri_encode("$parent/$path");
2331 warn "W: $t: $parent/$path ",
2332 "Insufficient permissions?\n";
2333 }
2334 }
2335 }
2336 \@out;
2337}
2338sub parse_svn_date {
2340 my $date = shift || return '+0000 1970-01-01 00:00:00';
2341 my ($Y,$m,$d,$H,$M,$S) = ($date =~ /^(\d{4})\-(\d\d)\-(\d\d)T
2342 (\d\d)\:(\d\d)\:(\d\d).\d+Z$/x) or
2343 croak "Unable to parse date: $date\n";
2344 "+0000 $Y-$m-$d $H:$M:$S";
2345}
2346sub check_author {
2348 my ($author) = @_;
2349 if (!defined $author || length $author == 0) {
2350 $author = '(no author)';
2351 }
2352 if (defined $::_authors && ! defined $::users{$author}) {
2353 die "Author: $author not defined in $::_authors file\n";
2354 }
2355 $author;
2356}
2357sub make_log_entry {
2359 my ($self, $rev, $parents, $ed) = @_;
2360 my $untracked = $self->get_untracked($ed);
2361 open my $un, '>>', "$self->{dir}/unhandled.log" or croak $!;
2363 print $un "r$rev\n" or croak $!;
2364 print $un $_, "\n" foreach @$untracked;
2365 my %log_entry = ( parents => $parents || [], revision => $rev,
2366 log => '');
2367 my $headrev;
2369 my $logged = delete $self->{logged_rev_props};
2370 if (!$logged || $self->{-want_revprops}) {
2371 my $rp = $self->ra->rev_proplist($rev);
2372 foreach (sort keys %$rp) {
2373 my $v = $rp->{$_};
2374 if (/^svn:(author|date|log)$/) {
2375 $log_entry{$1} = $v;
2376 } elsif ($_ eq 'svm:headrev') {
2377 $headrev = $v;
2378 } else {
2379 print $un " rev_prop: ", uri_encode($_), ' ',
2380 uri_encode($v), "\n";
2381 }
2382 }
2383 } else {
2384 map { $log_entry{$_} = $logged->{$_} } keys %$logged;
2385 }
2386 close $un or croak $!;
2387 $log_entry{date} = parse_svn_date($log_entry{date});
2389 $log_entry{log} .= "\n";
2390 my $author = $log_entry{author} = check_author($log_entry{author});
2391 my ($name, $email) = defined $::users{$author} ? @{$::users{$author}}
2392 : ($author, undef);
2393 my ($commit_name, $commit_email) = ($name, $email);
2395 if ($_use_log_author) {
2396 my $name_field;
2397 if ($log_entry{log} =~ /From:\s+(.*\S)\s*\n/i) {
2398 $name_field = $1;
2399 } elsif ($log_entry{log} =~ /Signed-off-by:\s+(.*\S)\s*\n/i) {
2400 $name_field = $1;
2401 }
2402 if (!defined $name_field) {
2403 #
2404 } elsif ($name_field =~ /(.*?)\s+<(.*)>/) {
2405 ($name, $email) = ($1, $2);
2406 } elsif ($name_field =~ /(.*)@/) {
2407 ($name, $email) = ($1, $name_field);
2408 } else {
2409 ($name, $email) = ($name_field, 'unknown');
2410 }
2411 }
2412 if (defined $headrev && $self->use_svm_props) {
2413 if ($self->rewrite_root) {
2414 die "Can't have both 'useSvmProps' and 'rewriteRoot' ",
2415 "options set!\n";
2416 }
2417 my ($uuid, $r) = $headrev =~ m{^([a-f\d\-]{30,}):(\d+)$};
2418 # we don't want "SVM: initializing mirror for junk" ...
2419 return undef if $r == 0;
2420 my $svm = $self->svm;
2421 if ($uuid ne $svm->{uuid}) {
2422 die "UUID mismatch on SVM path:\n",
2423 "expected: $svm->{uuid}\n",
2424 " got: $uuid\n";
2425 }
2426 my $full_url = $self->full_url;
2427 $full_url =~ s#^\Q$svm->{replace}\E(/|$)#$svm->{source}$1# or
2428 die "Failed to replace '$svm->{replace}' with ",
2429 "'$svm->{source}' in $full_url\n";
2430 # throw away username for storing in records
2431 remove_username($full_url);
2432 $log_entry{metadata} = "$full_url\@$r $uuid";
2433 $log_entry{svm_revision} = $r;
2434 $email ||= "$author\@$uuid";
2435 $commit_email ||= "$author\@$uuid";
2436 } elsif ($self->use_svnsync_props) {
2437 my $full_url = $self->svnsync->{url};
2438 $full_url .= "/$self->{path}" if length $self->{path};
2439 remove_username($full_url);
2440 my $uuid = $self->svnsync->{uuid};
2441 $log_entry{metadata} = "$full_url\@$rev $uuid";
2442 $email ||= "$author\@$uuid";
2443 $commit_email ||= "$author\@$uuid";
2444 } else {
2445 my $url = $self->metadata_url;
2446 remove_username($url);
2447 $log_entry{metadata} = "$url\@$rev " .
2448 $self->ra->get_uuid;
2449 $email ||= "$author\@" . $self->ra->get_uuid;
2450 $commit_email ||= "$author\@" . $self->ra->get_uuid;
2451 }
2452 $log_entry{name} = $name;
2453 $log_entry{email} = $email;
2454 $log_entry{commit_name} = $commit_name;
2455 $log_entry{commit_email} = $commit_email;
2456 \%log_entry;
2457}
2458sub fetch {
2460 my ($self, $min_rev, $max_rev, @parents) = @_;
2461 my ($last_rev, $last_commit) = $self->last_rev_commit;
2462 my ($base, $head) = $self->get_fetch_range($min_rev, $max_rev);
2463 $self->ra->gs_fetch_loop_common($base, $head, [$self]);
2464}
2465sub set_tree_cb {
2467 my ($self, $log_entry, $tree, $rev, $date, $author) = @_;
2468 $self->{inject_parents} = { $rev => $tree };
2469 $self->fetch(undef, undef);
2470}
2471sub set_tree {
2473 my ($self, $tree) = (shift, shift);
2474 my $log_entry = ::get_commit_entry($tree);
2475 unless ($self->{last_rev}) {
2476 fatal("Must have an existing revision to commit");
2477 }
2478 my %ed_opts = ( r => $self->{last_rev},
2479 log => $log_entry->{log},
2480 ra => $self->ra,
2481 tree_a => $self->{last_commit},
2482 tree_b => $tree,
2483 editor_cb => sub {
2484 $self->set_tree_cb($log_entry, $tree, @_) },
2485 svn_path => $self->{path} );
2486 if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) {
2487 print "No changes\nr$self->{last_rev} = $tree\n";
2488 }
2489}
2490sub rebuild_from_rev_db {
2492 my ($self, $path) = @_;
2493 my $r = -1;
2494 open my $fh, '<', $path or croak "open: $!";
2495 while (<$fh>) {
2496 length($_) == 41 or croak "inconsistent size in ($_) != 41";
2497 chomp($_);
2498 ++$r;
2499 next if $_ eq ('0' x 40);
2500 $self->rev_map_set($r, $_);
2501 print "r$r = $_\n";
2502 }
2503 close $fh or croak "close: $!";
2504 unlink $path or croak "unlink: $!";
2505}
2506sub rebuild {
2508 my ($self) = @_;
2509 my $map_path = $self->map_path;
2510 return if (-e $map_path && ! -z $map_path);
2511 return unless ::verify_ref($self->refname.'^0');
2512 if ($self->use_svm_props || $self->no_metadata) {
2513 my $rev_db = $self->rev_db_path;
2514 $self->rebuild_from_rev_db($rev_db);
2515 if ($self->use_svm_props) {
2516 my $svm_rev_db = $self->rev_db_path($self->svm_uuid);
2517 $self->rebuild_from_rev_db($svm_rev_db);
2518 }
2519 $self->unlink_rev_db_symlink;
2520 return;
2521 }
2522 print "Rebuilding $map_path ...\n";
2523 my ($log, $ctx) =
2524 command_output_pipe(qw/rev-list --pretty=raw --no-color --reverse/,
2525 $self->refname, '--');
2526 my $full_url = $self->full_url;
2527 remove_username($full_url);
2528 my $svn_uuid = $self->ra_uuid;
2529 my $c;
2530 while (<$log>) {
2531 if ( m{^commit ($::sha1)$} ) {
2532 $c = $1;
2533 next;
2534 }
2535 next unless s{^\s*(git-svn-id:)}{$1};
2536 my ($url, $rev, $uuid) = ::extract_metadata($_);
2537 remove_username($url);
2538 # ignore merges (from set-tree)
2540 next if (!defined $rev || !$uuid);
2541 # if we merged or otherwise started elsewhere, this is
2543 # how we break out of it
2544 if (($uuid ne $svn_uuid) ||
2545 ($full_url && $url && ($url ne $full_url))) {
2546 next;
2547 }
2548 $self->rev_map_set($rev, $c);
2550 print "r$rev = $c\n";
2551 }
2552 command_close_pipe($log, $ctx);
2553 print "Done rebuilding $map_path\n";
2554 my $rev_db_path = $self->rev_db_path;
2555 if (-f $self->rev_db_path) {
2556 unlink $self->rev_db_path or croak "unlink: $!";
2557 }
2558 $self->unlink_rev_db_symlink;
2559}
2560# rev_map:
2562# Tie::File seems to be prone to offset errors if revisions get sparse,
2563# it's not that fast, either. Tie::File is also not in Perl 5.6. So
2564# one of my favorite modules is out :< Next up would be one of the DBM
2565# modules, but I'm not sure which is most portable...
2566#
2567# This is the replacement for the rev_db format, which was too big
2568# and inefficient for large repositories with a lot of sparse history
2569# (mainly tags)
2570#
2571# The format is this:
2572# - 24 bytes for every record,
2573# * 4 bytes for the integer representing an SVN revision number
2574# * 20 bytes representing the sha1 of a git commit
2575# - No empty padding records like the old format
2576# (except the last record, which can be overwritten)
2577# - new records are written append-only since SVN revision numbers
2578# increase monotonically
2579# - lookups on SVN revision number are done via a binary search
2580# - Piping the file to xxd -c24 is a good way of dumping it for
2581# viewing or editing (piped back through xxd -r), should the need
2582# ever arise.
2583# - The last record can be padding revision with an all-zero sha1
2584# This is used to optimize fetch performance when using multiple
2585# "fetch" directives in .git/config
2586#
2587# These files are disposable unless noMetadata or useSvmProps is set
2588sub _rev_map_set {
2590 my ($fh, $rev, $commit) = @_;
2591 my $size = (stat($fh))[7];
2593 ($size % 24) == 0 or croak "inconsistent size: $size";
2594 my $wr_offset = 0;
2596 if ($size > 0) {
2597 sysseek($fh, -24, SEEK_END) or croak "seek: $!";
2598 my $read = sysread($fh, my $buf, 24) or croak "read: $!";
2599 $read == 24 or croak "read only $read bytes (!= 24)";
2600 my ($last_rev, $last_commit) = unpack(rev_map_fmt, $buf);
2601 if ($last_commit eq ('0' x40)) {
2602 if ($size >= 48) {
2603 sysseek($fh, -48, SEEK_END) or croak "seek: $!";
2604 $read = sysread($fh, $buf, 24) or
2605 croak "read: $!";
2606 $read == 24 or
2607 croak "read only $read bytes (!= 24)";
2608 ($last_rev, $last_commit) =
2609 unpack(rev_map_fmt, $buf);
2610 if ($last_commit eq ('0' x40)) {
2611 croak "inconsistent .rev_map\n";
2612 }
2613 }
2614 if ($last_rev >= $rev) {
2615 croak "last_rev is higher!: $last_rev >= $rev";
2616 }
2617 $wr_offset = -24;
2618 }
2619 }
2620 sysseek($fh, $wr_offset, SEEK_END) or croak "seek: $!";
2621 syswrite($fh, pack(rev_map_fmt, $rev, $commit), 24) == 24 or
2622 croak "write: $!";
2623}
2624sub mkfile {
2626 my ($path) = @_;
2627 unless (-e $path) {
2628 my ($dir, $base) = ($path =~ m#^(.*?)/?([^/]+)$#);
2629 mkpath([$dir]) unless -d $dir;
2630 open my $fh, '>>', $path or die "Couldn't create $path: $!\n";
2631 close $fh or die "Couldn't close (create) $path: $!\n";
2632 }
2633}
2634sub rev_map_set {
2636 my ($self, $rev, $commit, $update_ref, $uuid) = @_;
2637 length $commit == 40 or die "arg3 must be a full SHA1 hexsum\n";
2638 my $db = $self->map_path($uuid);
2639 my $db_lock = "$db.lock";
2640 my $sig;
2641 if ($update_ref) {
2642 $SIG{INT} = $SIG{HUP} = $SIG{TERM} = $SIG{ALRM} = $SIG{PIPE} =
2643 $SIG{USR1} = $SIG{USR2} = sub { $sig = $_[0] };
2644 }
2645 mkfile($db);
2646 $LOCKFILES{$db_lock} = 1;
2648 my $sync;
2649 # both of these options make our .rev_db file very, very important
2650 # and we can't afford to lose it because rebuild() won't work
2651 if ($self->use_svm_props || $self->no_metadata) {
2652 $sync = 1;
2653 copy($db, $db_lock) or die "rev_map_set(@_): ",
2654 "Failed to copy: ",
2655 "$db => $db_lock ($!)\n";
2656 } else {
2657 rename $db, $db_lock or die "rev_map_set(@_): ",
2658 "Failed to rename: ",
2659 "$db => $db_lock ($!)\n";
2660 }
2661 sysopen(my $fh, $db_lock, O_RDWR | O_CREAT)
2663 or croak "Couldn't open $db_lock: $!\n";
2664 _rev_map_set($fh, $rev, $commit);
2665 if ($sync) {
2666 $fh->flush or die "Couldn't flush $db_lock: $!\n";
2667 $fh->sync or die "Couldn't sync $db_lock: $!\n";
2668 }
2669 close $fh or croak $!;
2670 if ($update_ref) {
2671 $_head = $self;
2672 command_noisy('update-ref', '-m', "r$rev",
2673 $self->refname, $commit);
2674 }
2675 rename $db_lock, $db or die "rev_map_set(@_): ", "Failed to rename: ",
2676 "$db_lock => $db ($!)\n";
2677 delete $LOCKFILES{$db_lock};
2678 if ($update_ref) {
2679 $SIG{INT} = $SIG{HUP} = $SIG{TERM} = $SIG{ALRM} = $SIG{PIPE} =
2680 $SIG{USR1} = $SIG{USR2} = 'DEFAULT';
2681 kill $sig, $$ if defined $sig;
2682 }
2683}
2684# If want_commit, this will return an array of (rev, commit) where
2686# commit _must_ be a valid commit in the archive.
2687# Otherwise, it'll return the max revision (whether or not the
2688# commit is valid or just a 0x40 placeholder).
2689sub rev_map_max {
2690 my ($self, $want_commit) = @_;
2691 $self->rebuild;
2692 my $map_path = $self->map_path;
2693 stat $map_path or return $want_commit ? (0, undef) : 0;
2694 sysopen(my $fh, $map_path, O_RDONLY) or croak "open: $!";
2695 my $size = (stat($fh))[7];
2696 ($size % 24) == 0 or croak "inconsistent size: $size";
2697 if ($size == 0) {
2699 close $fh or croak "close: $!";
2700 return $want_commit ? (0, undef) : 0;
2701 }
2702 sysseek($fh, -24, SEEK_END) or croak "seek: $!";
2704 sysread($fh, my $buf, 24) == 24 or croak "read: $!";
2705 my ($r, $c) = unpack(rev_map_fmt, $buf);
2706 if ($want_commit && $c eq ('0' x40)) {
2707 if ($size < 48) {
2708 return $want_commit ? (0, undef) : 0;
2709 }
2710 sysseek($fh, -48, SEEK_END) or croak "seek: $!";
2711 sysread($fh, $buf, 24) == 24 or croak "read: $!";
2712 ($r, $c) = unpack(rev_map_fmt, $buf);
2713 if ($c eq ('0'x40)) {
2714 croak "Penultimate record is all-zeroes in $map_path";
2715 }
2716 }
2717 close $fh or croak "close: $!";
2718 $want_commit ? ($r, $c) : $r;
2719}
2720sub rev_map_get {
2722 my ($self, $rev, $uuid) = @_;
2723 my $map_path = $self->map_path($uuid);
2724 return undef unless -e $map_path;
2725 sysopen(my $fh, $map_path, O_RDONLY) or croak "open: $!";
2727 my $size = (stat($fh))[7];
2728 ($size % 24) == 0 or croak "inconsistent size: $size";
2729 if ($size == 0) {
2731 close $fh or croak "close: $fh";
2732 return undef;
2733 }
2734 my ($l, $u) = (0, $size - 24);
2736 my ($r, $c, $buf);
2737 while ($l <= $u) {
2739 my $i = int(($l/24 + $u/24) / 2) * 24;
2740 sysseek($fh, $i, SEEK_SET) or croak "seek: $!";
2741 sysread($fh, my $buf, 24) == 24 or croak "read: $!";
2742 my ($r, $c) = unpack('NH40', $buf);
2743 if ($r < $rev) {
2745 $l = $i + 24;
2746 } elsif ($r > $rev) {
2747 $u = $i - 24;
2748 } else { # $r == $rev
2749 close($fh) or croak "close: $!";
2750 return $c eq ('0' x 40) ? undef : $c;
2751 }
2752 }
2753 close($fh) or croak "close: $!";
2754 undef;
2755}
2756# Finds the first svn revision that exists on (if $eq_ok is true) or
2758# before $rev for the current branch. It will not search any lower
2759# than $min_rev. Returns the git commit hash and svn revision number
2760# if found, else (undef, undef).
2761sub find_rev_before {
2762 my ($self, $rev, $eq_ok, $min_rev) = @_;
2763 --$rev unless $eq_ok;
2764 $min_rev ||= 1;
2765 while ($rev >= $min_rev) {
2766 if (my $c = $self->rev_map_get($rev)) {
2767 return ($rev, $c);
2768 }
2769 --$rev;
2770 }
2771 return (undef, undef);
2772}
2773# Finds the first svn revision that exists on (if $eq_ok is true) or
2775# after $rev for the current branch. It will not search any higher
2776# than $max_rev. Returns the git commit hash and svn revision number
2777# if found, else (undef, undef).
2778sub find_rev_after {
2779 my ($self, $rev, $eq_ok, $max_rev) = @_;
2780 ++$rev unless $eq_ok;
2781 $max_rev ||= $self->rev_map_max;
2782 while ($rev <= $max_rev) {
2783 if (my $c = $self->rev_map_get($rev)) {
2784 return ($rev, $c);
2785 }
2786 ++$rev;
2787 }
2788 return (undef, undef);
2789}
2790sub _new {
2792 my ($class, $repo_id, $ref_id, $path) = @_;
2793 unless (defined $repo_id && length $repo_id) {
2794 $repo_id = $Git::SVN::default_repo_id;
2795 }
2796 unless (defined $ref_id && length $ref_id) {
2797 $_[2] = $ref_id = $Git::SVN::default_ref_id;
2798 }
2799 $_[1] = $repo_id = sanitize_remote_name($repo_id);
2800 my $dir = "$ENV{GIT_DIR}/svn/$ref_id";
2801 $_[3] = $path = '' unless (defined $path);
2802 mkpath(["$ENV{GIT_DIR}/svn"]);
2803 bless {
2804 ref_id => $ref_id, dir => $dir, index => "$dir/index",
2805 path => $path, config => "$ENV{GIT_DIR}/svn/config",
2806 map_root => "$dir/.rev_map", repo_id => $repo_id }, $class;
2807}
2808# for read-only access of old .rev_db formats
2810sub unlink_rev_db_symlink {
2811 my ($self) = @_;
2812 my $link = $self->rev_db_path;
2813 $link =~ s/\.[\w-]+$// or croak "missing UUID at the end of $link";
2814 if (-l $link) {
2815 unlink $link or croak "unlink: $link failed!";
2816 }
2817}
2818sub rev_db_path {
2820 my ($self, $uuid) = @_;
2821 my $db_path = $self->map_path($uuid);
2822 $db_path =~ s{/\.rev_map\.}{/\.rev_db\.}
2823 or croak "map_path: $db_path does not contain '/.rev_map.' !";
2824 $db_path;
2825}
2826# the new replacement for .rev_db
2828sub map_path {
2829 my ($self, $uuid) = @_;
2830 $uuid ||= $self->ra_uuid;
2831 "$self->{map_root}.$uuid";
2832}
2833sub uri_encode {
2835 my ($f) = @_;
2836 $f =~ s#([^a-zA-Z0-9\*!\:_\./\-])#uc sprintf("%%%02x",ord($1))#eg;
2837 $f
2838}
2839sub remove_username {
2841 $_[0] =~ s{^([^:]*://)[^@]+@}{$1};
2842}
2843package Git::SVN::Prompt;
2845use strict;
2846use warnings;
2847require SVN::Core;
2848use vars qw/$_no_auth_cache $_username/;
2849sub simple {
2851 my ($cred, $realm, $default_username, $may_save, $pool) = @_;
2852 $may_save = undef if $_no_auth_cache;
2853 $default_username = $_username if defined $_username;
2854 if (defined $default_username && length $default_username) {
2855 if (defined $realm && length $realm) {
2856 print STDERR "Authentication realm: $realm\n";
2857 STDERR->flush;
2858 }
2859 $cred->username($default_username);
2860 } else {
2861 username($cred, $realm, $may_save, $pool);
2862 }
2863 $cred->password(_read_password("Password for '" .
2864 $cred->username . "': ", $realm));
2865 $cred->may_save($may_save);
2866 $SVN::_Core::SVN_NO_ERROR;
2867}
2868sub ssl_server_trust {
2870 my ($cred, $realm, $failures, $cert_info, $may_save, $pool) = @_;
2871 $may_save = undef if $_no_auth_cache;
2872 print STDERR "Error validating server certificate for '$realm':\n";
2873 {
2874 no warnings 'once';
2875 # All variables SVN::Auth::SSL::* are used only once,
2876 # so we're shutting up Perl warnings about this.
2877 if ($failures & $SVN::Auth::SSL::UNKNOWNCA) {
2878 print STDERR " - The certificate is not issued ",
2879 "by a trusted authority. Use the\n",
2880 " fingerprint to validate ",
2881 "the certificate manually!\n";
2882 }
2883 if ($failures & $SVN::Auth::SSL::CNMISMATCH) {
2884 print STDERR " - The certificate hostname ",
2885 "does not match.\n";
2886 }
2887 if ($failures & $SVN::Auth::SSL::NOTYETVALID) {
2888 print STDERR " - The certificate is not yet valid.\n";
2889 }
2890 if ($failures & $SVN::Auth::SSL::EXPIRED) {
2891 print STDERR " - The certificate has expired.\n";
2892 }
2893 if ($failures & $SVN::Auth::SSL::OTHER) {
2894 print STDERR " - The certificate has ",
2895 "an unknown error.\n";
2896 }
2897 } # no warnings 'once'
2898 printf STDERR
2899 "Certificate information:\n".
2900 " - Hostname: %s\n".
2901 " - Valid: from %s until %s\n".
2902 " - Issuer: %s\n".
2903 " - Fingerprint: %s\n",
2904 map $cert_info->$_, qw(hostname valid_from valid_until
2905 issuer_dname fingerprint);
2906 my $choice;
2907prompt:
2908 print STDERR $may_save ?
2909 "(R)eject, accept (t)emporarily or accept (p)ermanently? " :
2910 "(R)eject or accept (t)emporarily? ";
2911 STDERR->flush;
2912 $choice = lc(substr(<STDIN> || 'R', 0, 1));
2913 if ($choice =~ /^t$/i) {
2914 $cred->may_save(undef);
2915 } elsif ($choice =~ /^r$/i) {
2916 return -1;
2917 } elsif ($may_save && $choice =~ /^p$/i) {
2918 $cred->may_save($may_save);
2919 } else {
2920 goto prompt;
2921 }
2922 $cred->accepted_failures($failures);
2923 $SVN::_Core::SVN_NO_ERROR;
2924}
2925sub ssl_client_cert {
2927 my ($cred, $realm, $may_save, $pool) = @_;
2928 $may_save = undef if $_no_auth_cache;
2929 print STDERR "Client certificate filename: ";
2930 STDERR->flush;
2931 chomp(my $filename = <STDIN>);
2932 $cred->cert_file($filename);
2933 $cred->may_save($may_save);
2934 $SVN::_Core::SVN_NO_ERROR;
2935}
2936sub ssl_client_cert_pw {
2938 my ($cred, $realm, $may_save, $pool) = @_;
2939 $may_save = undef if $_no_auth_cache;
2940 $cred->password(_read_password("Password: ", $realm));
2941 $cred->may_save($may_save);
2942 $SVN::_Core::SVN_NO_ERROR;
2943}
2944sub username {
2946 my ($cred, $realm, $may_save, $pool) = @_;
2947 $may_save = undef if $_no_auth_cache;
2948 if (defined $realm && length $realm) {
2949 print STDERR "Authentication realm: $realm\n";
2950 }
2951 my $username;
2952 if (defined $_username) {
2953 $username = $_username;
2954 } else {
2955 print STDERR "Username: ";
2956 STDERR->flush;
2957 chomp($username = <STDIN>);
2958 }
2959 $cred->username($username);
2960 $cred->may_save($may_save);
2961 $SVN::_Core::SVN_NO_ERROR;
2962}
2963sub _read_password {
2965 my ($prompt, $realm) = @_;
2966 print STDERR $prompt;
2967 STDERR->flush;
2968 require Term::ReadKey;
2969 Term::ReadKey::ReadMode('noecho');
2970 my $password = '';
2971 while (defined(my $key = Term::ReadKey::ReadKey(0))) {
2972 last if $key =~ /[\012\015]/; # \n\r
2973 $password .= $key;
2974 }
2975 Term::ReadKey::ReadMode('restore');
2976 print STDERR "\n";
2977 STDERR->flush;
2978 $password;
2979}
2980package SVN::Git::Fetcher;
2982use vars qw/@ISA/;
2983use strict;
2984use warnings;
2985use Carp qw/croak/;
2986use IO::File qw//;
2987# file baton members: path, mode_a, mode_b, pool, fh, blob, base
2989sub new {
2990 my ($class, $git_svn) = @_;
2991 my $self = SVN::Delta::Editor->new;
2992 bless $self, $class;
2993 $self->{c} = $git_svn->{last_commit} if exists $git_svn->{last_commit};
2994 $self->{empty} = {};
2995 $self->{dir_prop} = {};
2996 $self->{file_prop} = {};
2997 $self->{absent_dir} = {};
2998 $self->{absent_file} = {};
2999 $self->{gii} = $git_svn->tmp_index_do(sub { Git::IndexInfo->new });
3000 $self;
3001}
3002sub set_path_strip {
3004 my ($self, $path) = @_;
3005 $self->{path_strip} = qr/^\Q$path\E(\/|$)/ if length $path;
3006}
3007sub open_root {
3009 { path => '' };
3010}
3011sub open_directory {
3013 my ($self, $path, $pb, $rev) = @_;
3014 { path => $path };
3015}
3016sub git_path {
3018 my ($self, $path) = @_;
3019 if ($self->{path_strip}) {
3020 $path =~ s!$self->{path_strip}!! or
3021 die "Failed to strip path '$path' ($self->{path_strip})\n";
3022 }
3023 $path;
3024}
3025sub delete_entry {
3027 my ($self, $path, $rev, $pb) = @_;
3028 my $gpath = $self->git_path($path);
3030 return undef if ($gpath eq '');
3031 # remove entire directories.
3033 if (command('ls-tree', $self->{c}, '--', $gpath) =~ /^040000 tree/) {
3034 my ($ls, $ctx) = command_output_pipe(qw/ls-tree
3035 -r --name-only -z/,
3036 $self->{c}, '--', $gpath);
3037 local $/ = "\0";
3038 while (<$ls>) {
3039 chomp;
3040 $self->{gii}->remove($_);
3041 print "\tD\t$_\n" unless $::_q;
3042 }
3043 print "\tD\t$gpath/\n" unless $::_q;
3044 command_close_pipe($ls, $ctx);
3045 $self->{empty}->{$path} = 0
3046 } else {
3047 $self->{gii}->remove($gpath);
3048 print "\tD\t$gpath\n" unless $::_q;
3049 }
3050 undef;
3051}
3052sub open_file {
3054 my ($self, $path, $pb, $rev) = @_;
3055 my $gpath = $self->git_path($path);
3056 my ($mode, $blob) = (command('ls-tree', $self->{c}, '--', $gpath)
3057 =~ /^(\d{6}) blob ([a-f\d]{40})\t/);
3058 unless (defined $mode && defined $blob) {
3059 die "$path was not found in commit $self->{c} (r$rev)\n";
3060 }
3061 { path => $path, mode_a => $mode, mode_b => $mode, blob => $blob,
3062 pool => SVN::Pool->new, action => 'M' };
3063}
3064sub add_file {
3066 my ($self, $path, $pb, $cp_path, $cp_rev) = @_;
3067 my ($dir, $file) = ($path =~ m#^(.*?)/?([^/]+)$#);
3068 delete $self->{empty}->{$dir};
3069 { path => $path, mode_a => 100644, mode_b => 100644,
3070 pool => SVN::Pool->new, action => 'A' };
3071}
3072sub add_directory {
3074 my ($self, $path, $cp_path, $cp_rev) = @_;
3075 my $gpath = $self->git_path($path);
3076 if ($gpath eq '') {
3077 my ($ls, $ctx) = command_output_pipe(qw/ls-tree
3078 -r --name-only -z/,
3079 $self->{c});
3080 local $/ = "\0";
3081 while (<$ls>) {
3082 chomp;
3083 $self->{gii}->remove($_);
3084 print "\tD\t$_\n" unless $::_q;
3085 }
3086 command_close_pipe($ls, $ctx);
3087 $self->{empty}->{$path} = 0;
3088 }
3089 my ($dir, $file) = ($path =~ m#^(.*?)/?([^/]+)$#);
3090 delete $self->{empty}->{$dir};
3091 $self->{empty}->{$path} = 1;
3092 { path => $path };
3093}
3094sub change_dir_prop {
3096 my ($self, $db, $prop, $value) = @_;
3097 $self->{dir_prop}->{$db->{path}} ||= {};
3098 $self->{dir_prop}->{$db->{path}}->{$prop} = $value;
3099 undef;
3100}
3101sub absent_directory {
3103 my ($self, $path, $pb) = @_;
3104 $self->{absent_dir}->{$pb->{path}} ||= [];
3105 push @{$self->{absent_dir}->{$pb->{path}}}, $path;
3106 undef;
3107}
3108sub absent_file {
3110 my ($self, $path, $pb) = @_;
3111 $self->{absent_file}->{$pb->{path}} ||= [];
3112 push @{$self->{absent_file}->{$pb->{path}}}, $path;
3113 undef;
3114}
3115sub change_file_prop {
3117 my ($self, $fb, $prop, $value) = @_;
3118 if ($prop eq 'svn:executable') {
3119 if ($fb->{mode_b} != 120000) {
3120 $fb->{mode_b} = defined $value ? 100755 : 100644;
3121 }
3122 } elsif ($prop eq 'svn:special') {
3123 $fb->{mode_b} = defined $value ? 120000 : 100644;
3124 } else {
3125 $self->{file_prop}->{$fb->{path}} ||= {};
3126 $self->{file_prop}->{$fb->{path}}->{$prop} = $value;
3127 }
3128 undef;
3129}
3130sub apply_textdelta {
3132 my ($self, $fb, $exp) = @_;
3133 my $fh = IO::File->new_tmpfile;
3134 $fh->autoflush(1);
3135 # $fh gets auto-closed() by SVN::TxDelta::apply(),
3136 # (but $base does not,) so dup() it for reading in close_file
3137 open my $dup, '<&', $fh or croak $!;
3138 my $base = IO::File->new_tmpfile;
3139 $base->autoflush(1);
3140 if ($fb->{blob}) {
3141 defined (my $pid = fork) or croak $!;
3142 if (!$pid) {
3143 open STDOUT, '>&', $base or croak $!;
3144 print STDOUT 'link ' if ($fb->{mode_a} == 120000);
3145 exec qw/git-cat-file blob/, $fb->{blob} or croak $!;
3146 }
3147 waitpid $pid, 0;
3148 croak $? if $?;
3149 if (defined $exp) {
3151 seek $base, 0, 0 or croak $!;
3152 my $got = ::md5sum($base);
3153 die "Checksum mismatch: $fb->{path} $fb->{blob}\n",
3154 "expected: $exp\n",
3155 " got: $got\n" if ($got ne $exp);
3156 }
3157 }
3158 seek $base, 0, 0 or croak $!;
3159 $fb->{fh} = $dup;
3160 $fb->{base} = $base;
3161 [ SVN::TxDelta::apply($base, $fh, undef, $fb->{path}, $fb->{pool}) ];
3162}
3163sub close_file {
3165 my ($self, $fb, $exp) = @_;
3166 my $hash;
3167 my $path = $self->git_path($fb->{path});
3168 if (my $fh = $fb->{fh}) {
3169 if (defined $exp) {
3170 seek($fh, 0, 0) or croak $!;
3171 my $got = ::md5sum($fh);
3172 if ($got ne $exp) {
3173 die "Checksum mismatch: $path\n",
3174 "expected: $exp\n got: $got\n";
3175 }
3176 }
3177 sysseek($fh, 0, 0) or croak $!;
3178 if ($fb->{mode_b} == 120000) {
3179 eval {
3180 sysread($fh, my $buf, 5) == 5 or croak $!;
3181 $buf eq 'link ' or die "$path has mode 120000",
3182 " but is not a link";
3183 };
3184 if ($@) {
3185 warn "$@\n";
3186 sysseek($fh, 0, 0) or croak $!;
3187 }
3188 }
3189 defined(my $pid = open my $out,'-|') or die "Can't fork: $!\n";
3190 if (!$pid) {
3191 open STDIN, '<&', $fh or croak $!;
3192 exec qw/git-hash-object -w --stdin/ or croak $!;
3193 }
3194 chomp($hash = do { local $/; <$out> });
3195 close $out or croak $!;
3196 close $fh or croak $!;
3197 $hash =~ /^[a-f\d]{40}$/ or die "not a sha1: $hash\n";
3198 close $fb->{base} or croak $!;
3199 } else {
3200 $hash = $fb->{blob} or die "no blob information\n";
3201 }
3202 $fb->{pool}->clear;
3203 $self->{gii}->update($fb->{mode_b}, $hash, $path) or croak $!;
3204 print "\t$fb->{action}\t$path\n" if $fb->{action} && ! $::_q;
3205 undef;
3206}
3207sub abort_edit {
3209 my $self = shift;
3210 $self->{nr} = $self->{gii}->{nr};
3211 delete $self->{gii};
3212 $self->SUPER::abort_edit(@_);
3213}
3214sub close_edit {
3216 my $self = shift;
3217 $self->{git_commit_ok} = 1;
3218 $self->{nr} = $self->{gii}->{nr};
3219 delete $self->{gii};
3220 $self->SUPER::close_edit(@_);
3221}
3222package SVN::Git::Editor;
3224use vars qw/@ISA $_rmdir $_cp_similarity $_find_copies_harder $_rename_limit/;
3225use strict;
3226use warnings;
3227use Carp qw/croak/;
3228use IO::File;
3229sub new {
3231 my ($class, $opts) = @_;
3232 foreach (qw/svn_path r ra tree_a tree_b log editor_cb/) {
3233 die "$_ required!\n" unless (defined $opts->{$_});
3234 }
3235 my $pool = SVN::Pool->new;
3237 my $mods = generate_diff($opts->{tree_a}, $opts->{tree_b});
3238 my $types = check_diff_paths($opts->{ra}, $opts->{svn_path},
3239 $opts->{r}, $mods);
3240 # $opts->{ra} functions should not be used after this:
3242 my @ce = $opts->{ra}->get_commit_editor($opts->{log},
3243 $opts->{editor_cb}, $pool);
3244 my $self = SVN::Delta::Editor->new(@ce, $pool);
3245 bless $self, $class;
3246 foreach (qw/svn_path r tree_a tree_b/) {
3247 $self->{$_} = $opts->{$_};
3248 }
3249 $self->{url} = $opts->{ra}->{url};
3250 $self->{mods} = $mods;
3251 $self->{types} = $types;
3252 $self->{pool} = $pool;
3253 $self->{bat} = { '' => $self->open_root($self->{r}, $self->{pool}) };
3254 $self->{rm} = { };
3255 $self->{path_prefix} = length $self->{svn_path} ?
3256 "$self->{svn_path}/" : '';
3257 return $self;
3258}
3259sub generate_diff {
3261 my ($tree_a, $tree_b) = @_;
3262 my @diff_tree = qw(diff-tree -z -r);
3263 if ($_cp_similarity) {
3264 push @diff_tree, "-C$_cp_similarity";
3265 } else {
3266 push @diff_tree, '-C';
3267 }
3268 push @diff_tree, '--find-copies-harder' if $_find_copies_harder;
3269 push @diff_tree, "-l$_rename_limit" if defined $_rename_limit;
3270 push @diff_tree, $tree_a, $tree_b;
3271 my ($diff_fh, $ctx) = command_output_pipe(@diff_tree);
3272 local $/ = "\0";
3273 my $state = 'meta';
3274 my @mods;
3275 while (<$diff_fh>) {
3276 chomp $_; # this gets rid of the trailing "\0"
3277 if ($state eq 'meta' && /^:(\d{6})\s(\d{6})\s
3278 $::sha1\s($::sha1)\s
3279 ([MTCRAD])\d*$/xo) {
3280 push @mods, { mode_a => $1, mode_b => $2,
3281 sha1_b => $3, chg => $4 };
3282 if ($4 =~ /^(?:C|R)$/) {
3283 $state = 'file_a';
3284 } else {
3285 $state = 'file_b';
3286 }
3287 } elsif ($state eq 'file_a') {
3288 my $x = $mods[$#mods] or croak "Empty array\n";
3289 if ($x->{chg} !~ /^(?:C|R)$/) {
3290 croak "Error parsing $_, $x->{chg}\n";
3291 }
3292 $x->{file_a} = $_;
3293 $state = 'file_b';
3294 } elsif ($state eq 'file_b') {
3295 my $x = $mods[$#mods] or croak "Empty array\n";
3296 if (exists $x->{file_a} && $x->{chg} !~ /^(?:C|R)$/) {
3297 croak "Error parsing $_, $x->{chg}\n";
3298 }
3299 if (!exists $x->{file_a} && $x->{chg} =~ /^(?:C|R)$/) {
3300 croak "Error parsing $_, $x->{chg}\n";
3301 }
3302 $x->{file_b} = $_;
3303 $state = 'meta';
3304 } else {
3305 croak "Error parsing $_\n";
3306 }
3307 }
3308 command_close_pipe($diff_fh, $ctx);
3309 \@mods;
3310}
3311sub check_diff_paths {
3313 my ($ra, $pfx, $rev, $mods) = @_;
3314 my %types;
3315 $pfx .= '/' if length $pfx;
3316 sub type_diff_paths {
3318 my ($ra, $types, $path, $rev) = @_;
3319 my @p = split m#/+#, $path;
3320 my $c = shift @p;
3321 unless (defined $types->{$c}) {
3322 $types->{$c} = $ra->check_path($c, $rev);
3323 }
3324 while (@p) {
3325 $c .= '/' . shift @p;
3326 next if defined $types->{$c};
3327 $types->{$c} = $ra->check_path($c, $rev);
3328 }
3329 }
3330 foreach my $m (@$mods) {
3332 foreach my $f (qw/file_a file_b/) {
3333 next unless defined $m->{$f};
3334 my ($dir) = ($m->{$f} =~ m#^(.*?)/?(?:[^/]+)$#);
3335 if (length $pfx.$dir && ! defined $types{$dir}) {
3336 type_diff_paths($ra, \%types, $pfx.$dir, $rev);
3337 }
3338 }
3339 }
3340 \%types;
3341}
3342sub split_path {
3344 return ($_[0] =~ m#^(.*?)/?([^/]+)$#);
3345}
3346sub repo_path {
3348 my ($self, $path) = @_;
3349 $self->{path_prefix}.(defined $path ? $path : '');
3350}
3351sub url_path {
3353 my ($self, $path) = @_;
3354 if ($self->{url} =~ m#^https?://#) {
3355 $path =~ s/([^a-zA-Z0-9_.-])/uc sprintf("%%%02x",ord($1))/eg;
3356 }
3357 $self->{url} . '/' . $self->repo_path($path);
3358}
3359sub rmdirs {
3361 my ($self) = @_;
3362 my $rm = $self->{rm};
3363 delete $rm->{''}; # we never delete the url we're tracking
3364 return unless %$rm;
3365 foreach (keys %$rm) {
3367 my @d = split m#/#, $_;
3368 my $c = shift @d;
3369 $rm->{$c} = 1;
3370 while (@d) {
3371 $c .= '/' . shift @d;
3372 $rm->{$c} = 1;
3373 }
3374 }
3375 delete $rm->{$self->{svn_path}};
3376 delete $rm->{''}; # we never delete the url we're tracking
3377 return unless %$rm;
3378 my ($fh, $ctx) = command_output_pipe(qw/ls-tree --name-only -r -z/,
3380 $self->{tree_b});
3381 local $/ = "\0";
3382 while (<$fh>) {
3383 chomp;
3384 my @dn = split m#/#, $_;
3385 while (pop @dn) {
3386 delete $rm->{join '/', @dn};
3387 }
3388 unless (%$rm) {
3389 close $fh;
3390 return;
3391 }
3392 }
3393 command_close_pipe($fh, $ctx);
3394 my ($r, $p, $bat) = ($self->{r}, $self->{pool}, $self->{bat});
3396 foreach my $d (sort { $b =~ tr#/#/# <=> $a =~ tr#/#/# } keys %$rm) {
3397 $self->close_directory($bat->{$d}, $p);
3398 my ($dn) = ($d =~ m#^(.*?)/?(?:[^/]+)$#);
3399 print "\tD+\t$d/\n" unless $::_q;
3400 $self->SUPER::delete_entry($d, $r, $bat->{$dn}, $p);
3401 delete $bat->{$d};
3402 }
3403}
3404sub open_or_add_dir {
3406 my ($self, $full_path, $baton) = @_;
3407 my $t = $self->{types}->{$full_path};
3408 if (!defined $t) {
3409 die "$full_path not known in r$self->{r} or we have a bug!\n";
3410 }
3411 {
3412 no warnings 'once';
3413 # SVN::Node::none and SVN::Node::file are used only once,
3414 # so we're shutting up Perl's warnings about them.
3415 if ($t == $SVN::Node::none) {
3416 return $self->add_directory($full_path, $baton,
3417 undef, -1, $self->{pool});
3418 } elsif ($t == $SVN::Node::dir) {
3419 return $self->open_directory($full_path, $baton,
3420 $self->{r}, $self->{pool});
3421 } # no warnings 'once'
3422 print STDERR "$full_path already exists in repository at ",
3423 "r$self->{r} and it is not a directory (",
3424 ($t == $SVN::Node::file ? 'file' : 'unknown'),"/$t)\n";
3425 } # no warnings 'once'
3426 exit 1;
3427}
3428sub ensure_path {
3430 my ($self, $path) = @_;
3431 my $bat = $self->{bat};
3432 my $repo_path = $self->repo_path($path);
3433 return $bat->{''} unless (length $repo_path);
3434 my @p = split m#/+#, $repo_path;
3435 my $c = shift @p;
3436 $bat->{$c} ||= $self->open_or_add_dir($c, $bat->{''});
3437 while (@p) {
3438 my $c0 = $c;
3439 $c .= '/' . shift @p;
3440 $bat->{$c} ||= $self->open_or_add_dir($c, $bat->{$c0});
3441 }
3442 return $bat->{$c};
3443}
3444sub A {
3446 my ($self, $m) = @_;
3447 my ($dir, $file) = split_path($m->{file_b});
3448 my $pbat = $self->ensure_path($dir);
3449 my $fbat = $self->add_file($self->repo_path($m->{file_b}), $pbat,
3450 undef, -1);
3451 print "\tA\t$m->{file_b}\n" unless $::_q;
3452 $self->chg_file($fbat, $m);
3453 $self->close_file($fbat,undef,$self->{pool});
3454}
3455sub C {
3457 my ($self, $m) = @_;
3458 my ($dir, $file) = split_path($m->{file_b});
3459 my $pbat = $self->ensure_path($dir);
3460 my $fbat = $self->add_file($self->repo_path($m->{file_b}), $pbat,
3461 $self->url_path($m->{file_a}), $self->{r});
3462 print "\tC\t$m->{file_a} => $m->{file_b}\n" unless $::_q;
3463 $self->chg_file($fbat, $m);
3464 $self->close_file($fbat,undef,$self->{pool});
3465}
3466sub delete_entry {
3468 my ($self, $path, $pbat) = @_;
3469 my $rpath = $self->repo_path($path);
3470 my ($dir, $file) = split_path($rpath);
3471 $self->{rm}->{$dir} = 1;
3472 $self->SUPER::delete_entry($rpath, $self->{r}, $pbat, $self->{pool});
3473}
3474sub R {
3476 my ($self, $m) = @_;
3477 my ($dir, $file) = split_path($m->{file_b});
3478 my $pbat = $self->ensure_path($dir);
3479 my $fbat = $self->add_file($self->repo_path($m->{file_b}), $pbat,
3480 $self->url_path($m->{file_a}), $self->{r});
3481 print "\tR\t$m->{file_a} => $m->{file_b}\n" unless $::_q;
3482 $self->chg_file($fbat, $m);
3483 $self->close_file($fbat,undef,$self->{pool});
3484 ($dir, $file) = split_path($m->{file_a});
3486 $pbat = $self->ensure_path($dir);
3487 $self->delete_entry($m->{file_a}, $pbat);
3488}
3489sub M {
3491 my ($self, $m) = @_;
3492 my ($dir, $file) = split_path($m->{file_b});
3493 my $pbat = $self->ensure_path($dir);
3494 my $fbat = $self->open_file($self->repo_path($m->{file_b}),
3495 $pbat,$self->{r},$self->{pool});
3496 print "\t$m->{chg}\t$m->{file_b}\n" unless $::_q;
3497 $self->chg_file($fbat, $m);
3498 $self->close_file($fbat,undef,$self->{pool});
3499}
3500sub T { shift->M(@_) }
3502sub change_file_prop {
3504 my ($self, $fbat, $pname, $pval) = @_;
3505 $self->SUPER::change_file_prop($fbat, $pname, $pval, $self->{pool});
3506}
3507sub chg_file {
3509 my ($self, $fbat, $m) = @_;
3510 if ($m->{mode_b} =~ /755$/ && $m->{mode_a} !~ /755$/) {
3511 $self->change_file_prop($fbat,'svn:executable','*');
3512 } elsif ($m->{mode_b} !~ /755$/ && $m->{mode_a} =~ /755$/) {
3513 $self->change_file_prop($fbat,'svn:executable',undef);
3514 }
3515 my $fh = IO::File->new_tmpfile or croak $!;
3516 if ($m->{mode_b} =~ /^120/) {
3517 print $fh 'link ' or croak $!;
3518 $self->change_file_prop($fbat,'svn:special','*');
3519 } elsif ($m->{mode_a} =~ /^120/ && $m->{mode_b} !~ /^120/) {
3520 $self->change_file_prop($fbat,'svn:special',undef);
3521 }
3522 defined(my $pid = fork) or croak $!;
3523 if (!$pid) {
3524 open STDOUT, '>&', $fh or croak $!;
3525 exec qw/git-cat-file blob/, $m->{sha1_b} or croak $!;
3526 }
3527 waitpid $pid, 0;
3528 croak $? if $?;
3529 $fh->flush == 0 or croak $!;
3530 seek $fh, 0, 0 or croak $!;
3531 my $exp = ::md5sum($fh);
3533 seek $fh, 0, 0 or croak $!;
3534 my $pool = SVN::Pool->new;
3536 my $atd = $self->apply_textdelta($fbat, undef, $pool);
3537 my $got = SVN::TxDelta::send_stream($fh, @$atd, $pool);
3538 die "Checksum mismatch\nexpected: $exp\ngot: $got\n" if ($got ne $exp);
3539 $pool->clear;
3540 close $fh or croak $!;
3542}
3543sub D {
3545 my ($self, $m) = @_;
3546 my ($dir, $file) = split_path($m->{file_b});
3547 my $pbat = $self->ensure_path($dir);
3548 print "\tD\t$m->{file_b}\n" unless $::_q;
3549 $self->delete_entry($m->{file_b}, $pbat);
3550}
3551sub close_edit {
3553 my ($self) = @_;
3554 my ($p,$bat) = ($self->{pool}, $self->{bat});
3555 foreach (sort { $b =~ tr#/#/# <=> $a =~ tr#/#/# } keys %$bat) {
3556 next if $_ eq '';
3557 $self->close_directory($bat->{$_}, $p);
3558 }
3559 $self->close_directory($bat->{''}, $p);
3560 $self->SUPER::close_edit($p);
3561 $p->clear;
3562}
3563sub abort_edit {
3565 my ($self) = @_;
3566 $self->SUPER::abort_edit($self->{pool});
3567}
3568sub DESTROY {
3570 my $self = shift;
3571 $self->SUPER::DESTROY(@_);
3572 $self->{pool}->clear;
3573}
3574# this drives the editor
3576sub apply_diff {
3577 my ($self) = @_;
3578 my $mods = $self->{mods};
3579 my %o = ( D => 1, R => 0, C => -1, A => 3, M => 3, T => 3 );
3580 foreach my $m (sort { $o{$a->{chg}} <=> $o{$b->{chg}} } @$mods) {
3581 my $f = $m->{chg};
3582 if (defined $o{$f}) {
3583 $self->$f($m);
3584 } else {
3585 fatal("Invalid change type: $f");
3586 }
3587 }
3588 $self->rmdirs if $_rmdir;
3589 if (@$mods == 0) {
3590 $self->abort_edit;
3591 } else {
3592 $self->close_edit;
3593 }
3594 return scalar @$mods;
3595}
3596package Git::SVN::Ra;
3598use vars qw/@ISA $config_dir $_log_window_size/;
3599use strict;
3600use warnings;
3601my ($ra_invalid, $can_do_switch, %ignored_err, $RA);
3602BEGIN {
3604 # enforce temporary pool usage for some simple functions
3605 no strict 'refs';
3606 for my $f (qw/rev_proplist get_latest_revnum get_uuid get_repos_root/) {
3607 my $SUPER = "SUPER::$f";
3608 *$f = sub {
3609 my $self = shift;
3610 my $pool = SVN::Pool->new;
3611 my @ret = $self->$SUPER(@_,$pool);
3612 $pool->clear;
3613 wantarray ? @ret : $ret[0];
3614 };
3615 }
3616}
3617sub _auth_providers () {
3619 [
3620 SVN::Client::get_simple_provider(),
3621 SVN::Client::get_ssl_server_trust_file_provider(),
3622 SVN::Client::get_simple_prompt_provider(
3623 \&Git::SVN::Prompt::simple, 2),
3624 SVN::Client::get_ssl_client_cert_file_provider(),
3625 SVN::Client::get_ssl_client_cert_prompt_provider(
3626 \&Git::SVN::Prompt::ssl_client_cert, 2),
3627 SVN::Client::get_ssl_client_cert_pw_prompt_provider(
3628 \&Git::SVN::Prompt::ssl_client_cert_pw, 2),
3629 SVN::Client::get_username_provider(),
3630 SVN::Client::get_ssl_server_trust_prompt_provider(
3631 \&Git::SVN::Prompt::ssl_server_trust),
3632 SVN::Client::get_username_prompt_provider(
3633 \&Git::SVN::Prompt::username, 2)
3634 ]
3635}
3636sub escape_uri_only {
3638 my ($uri) = @_;
3639 my @tmp;
3640 foreach (split m{/}, $uri) {
3641 s/([^\w.-])/sprintf("%%%02X",ord($1))/eg;
3642 push @tmp, $_;
3643 }
3644 join('/', @tmp);
3645}
3646sub escape_url {
3648 my ($url) = @_;
3649 if ($url =~ m#^(https?)://([^/]+)(.*)$#) {
3650 my ($scheme, $domain, $uri) = ($1, $2, escape_uri_only($3));
3651 $url = "$scheme://$domain$uri";
3652 }
3653 $url;
3654}
3655sub new {
3657 my ($class, $url) = @_;
3658 $url =~ s!/+$!!;
3659 return $RA if ($RA && $RA->{url} eq $url);
3660 SVN::_Core::svn_config_ensure($config_dir, undef);
3662 my ($baton, $callbacks) = SVN::Core::auth_open_helper(_auth_providers);
3663 my $config = SVN::Core::config_get_config($config_dir);
3664 $RA = undef;
3665 my $dont_store_passwords = 1;
3666 my $conf_t = ${$config}{'config'};
3667 {
3668 no warnings 'once';
3669 # The usage of $SVN::_Core::SVN_CONFIG_* variables
3670 # produces warnings that variables are used only once.
3671 # I had not found the better way to shut them up, so
3672 # the warnings of type 'once' are disabled in this block.
3673 if (SVN::_Core::svn_config_get_bool($conf_t,
3674 $SVN::_Core::SVN_CONFIG_SECTION_AUTH,
3675 $SVN::_Core::SVN_CONFIG_OPTION_STORE_PASSWORDS,
3676 1) == 0) {
3677 SVN::_Core::svn_auth_set_parameter($baton,
3678 $SVN::_Core::SVN_AUTH_PARAM_DONT_STORE_PASSWORDS,
3679 bless (\$dont_store_passwords, "_p_void"));
3680 }
3681 if (SVN::_Core::svn_config_get_bool($conf_t,
3682 $SVN::_Core::SVN_CONFIG_SECTION_AUTH,
3683 $SVN::_Core::SVN_CONFIG_OPTION_STORE_AUTH_CREDS,
3684 1) == 0) {
3685 $Git::SVN::Prompt::_no_auth_cache = 1;
3686 }
3687 } # no warnings 'once'
3688 my $self = SVN::Ra->new(url => escape_url($url), auth => $baton,
3689 config => $config,
3690 pool => SVN::Pool->new,
3691 auth_provider_callbacks => $callbacks);
3692 $self->{url} = $url;
3693 $self->{svn_path} = $url;
3694 $self->{repos_root} = $self->get_repos_root;
3695 $self->{svn_path} =~ s#^\Q$self->{repos_root}\E(/|$)##;
3696 $self->{cache} = { check_path => { r => 0, data => {} },
3697 get_dir => { r => 0, data => {} } };
3698 $RA = bless $self, $class;
3699}
3700sub check_path {
3702 my ($self, $path, $r) = @_;
3703 my $cache = $self->{cache}->{check_path};
3704 if ($r == $cache->{r} && exists $cache->{data}->{$path}) {
3705 return $cache->{data}->{$path};
3706 }
3707 my $pool = SVN::Pool->new;
3708 my $t = $self->SUPER::check_path($path, $r, $pool);
3709 $pool->clear;
3710 if ($r != $cache->{r}) {
3711 %{$cache->{data}} = ();
3712 $cache->{r} = $r;
3713 }
3714 $cache->{data}->{$path} = $t;
3715}
3716sub get_dir {
3718 my ($self, $dir, $r) = @_;
3719 my $cache = $self->{cache}->{get_dir};
3720 if ($r == $cache->{r}) {
3721 if (my $x = $cache->{data}->{$dir}) {
3722 return wantarray ? @$x : $x->[0];
3723 }
3724 }
3725 my $pool = SVN::Pool->new;
3726 my ($d, undef, $props) = $self->SUPER::get_dir($dir, $r, $pool);
3727 my %dirents = map { $_ => { kind => $d->{$_}->kind } } keys %$d;
3728 $pool->clear;
3729 if ($r != $cache->{r}) {
3730 %{$cache->{data}} = ();
3731 $cache->{r} = $r;
3732 }
3733 $cache->{data}->{$dir} = [ \%dirents, $r, $props ];
3734 wantarray ? (\%dirents, $r, $props) : \%dirents;
3735}
3736sub DESTROY {
3738 # do not call the real DESTROY since we store ourselves in $RA
3739}
3740sub get_log {
3742 my ($self, @args) = @_;
3743 my $pool = SVN::Pool->new;
3744 splice(@args, 3, 1) if ($SVN::Core::VERSION le '1.2.0');
3745 my $ret = $self->SUPER::get_log(@args, $pool);
3746 $pool->clear;
3747 $ret;
3748}
3749sub trees_match {
3751 my ($self, $url1, $rev1, $url2, $rev2) = @_;
3752 my $ctx = SVN::Client->new(auth => _auth_providers);
3753 my $out = IO::File->new_tmpfile;
3754 # older SVN (1.1.x) doesn't take $pool as the last parameter for
3756 # $ctx->diff(), so we'll create a default one
3757 my $pool = SVN::Pool->new_default_sub;
3758 $ra_invalid = 1; # this will open a new SVN::Ra connection to $url1
3760 $ctx->diff([], $url1, $rev1, $url2, $rev2, 1, 1, 0, $out, $out);
3761 $out->flush;
3762 my $ret = (($out->stat)[7] == 0);
3763 close $out or croak $!;
3764 $ret;
3766}
3767sub get_commit_editor {
3769 my ($self, $log, $cb, $pool) = @_;
3770 my @lock = $SVN::Core::VERSION ge '1.2.0' ? (undef, 0) : ();
3771 $self->SUPER::get_commit_editor($log, $cb, @lock, $pool);
3772}
3773sub gs_do_update {
3775 my ($self, $rev_a, $rev_b, $gs, $editor) = @_;
3776 my $new = ($rev_a == $rev_b);
3777 my $path = $gs->{path};
3778 if ($new && -e $gs->{index}) {
3780 unlink $gs->{index} or die
3781 "Couldn't unlink index: $gs->{index}: $!\n";
3782 }
3783 my $pool = SVN::Pool->new;
3784 $editor->set_path_strip($path);
3785 my (@pc) = split m#/#, $path;
3786 my $reporter = $self->do_update($rev_b, (@pc ? shift @pc : ''),
3787 1, $editor, $pool);
3788 my @lock = $SVN::Core::VERSION ge '1.2.0' ? (undef) : ();
3789 # Since we can't rely on svn_ra_reparent being available, we'll
3791 # just have to do some magic with set_path to make it so
3792 # we only want a partial path.
3793 my $sp = '';
3794 my $final = join('/', @pc);
3795 while (@pc) {
3796 $reporter->set_path($sp, $rev_b, 0, @lock, $pool);
3797 $sp .= '/' if length $sp;
3798 $sp .= shift @pc;
3799 }
3800 die "BUG: '$sp' != '$final'\n" if ($sp ne $final);
3801 $reporter->set_path($sp, $rev_a, $new, @lock, $pool);
3803 $reporter->finish_report($pool);
3805 $pool->clear;
3806 $editor->{git_commit_ok};
3807}
3808# this requires SVN 1.4.3 or later (do_switch didn't work before 1.4.3, and
3810# svn_ra_reparent didn't work before 1.4)
3811sub gs_do_switch {
3812 my ($self, $rev_a, $rev_b, $gs, $url_b, $editor) = @_;
3813 my $path = $gs->{path};
3814 my $pool = SVN::Pool->new;
3815 my $full_url = $self->{url};
3817 my $old_url = $full_url;
3818 $full_url .= '/' . escape_uri_only($path) if length $path;
3819 my ($ra, $reparented);
3820 if ($old_url ne $full_url) {
3821 if ($old_url !~ m#^svn(\+ssh)?://#) {
3822 SVN::_Ra::svn_ra_reparent($self->{session}, $full_url,
3823 $pool);
3824 $self->{url} = $full_url;
3825 $reparented = 1;
3826 } else {
3827 $_[0] = undef;
3828 $self = undef;
3829 $RA = undef;
3830 $ra = Git::SVN::Ra->new($full_url);
3831 $ra_invalid = 1;
3832 }
3833 }
3834 $ra ||= $self;
3835 my $reporter = $ra->do_switch($rev_b, '', 1, $url_b, $editor, $pool);
3836 my @lock = $SVN::Core::VERSION ge '1.2.0' ? (undef) : ();
3837 $reporter->set_path('', $rev_a, 0, @lock, $pool);
3838 $reporter->finish_report($pool);
3839 if ($reparented) {
3841 SVN::_Ra::svn_ra_reparent($self->{session}, $old_url, $pool);
3842 $self->{url} = $old_url;
3843 }
3844 $pool->clear;
3846 $editor->{git_commit_ok};
3847}
3848sub longest_common_path {
3850 my ($gsv, $globs) = @_;
3851 my %common;
3852 my $common_max = scalar @$gsv;
3853 foreach my $gs (@$gsv) {
3855 my @tmp = split m#/#, $gs->{path};
3856 my $p = '';
3857 foreach (@tmp) {
3858 $p .= length($p) ? "/$_" : $_;
3859 $common{$p} ||= 0;
3860 $common{$p}++;
3861 }
3862 }
3863 $globs ||= [];
3864 $common_max += scalar @$globs;
3865 foreach my $glob (@$globs) {
3866 my @tmp = split m#/#, $glob->{path}->{left};
3867 my $p = '';
3868 foreach (@tmp) {
3869 $p .= length($p) ? "/$_" : $_;
3870 $common{$p} ||= 0;
3871 $common{$p}++;
3872 }
3873 }
3874 my $longest_path = '';
3876 foreach (sort {length $b <=> length $a} keys %common) {
3877 if ($common{$_} == $common_max) {
3878 $longest_path = $_;
3879 last;
3880 }
3881 }
3882 $longest_path;
3883}
3884sub gs_fetch_loop_common {
3886 my ($self, $base, $head, $gsv, $globs) = @_;
3887 return if ($base > $head);
3888 my $inc = $_log_window_size;
3889 my ($min, $max) = ($base, $head < $base + $inc ? $head : $base + $inc);
3890 my $longest_path = longest_common_path($gsv, $globs);
3891 my $ra_url = $self->{url};
3892 while (1) {
3893 my %revs;
3894 my $err;
3895 my $err_handler = $SVN::Error::handler;
3896 $SVN::Error::handler = sub {
3897 ($err) = @_;
3898 skip_unknown_revs($err);
3899 };
3900 sub _cb {
3901 my ($paths, $r, $author, $date, $log) = @_;
3902 [ dup_changed_paths($paths),
3903 { author => $author, date => $date, log => $log } ];
3904 }
3905 $self->get_log([$longest_path], $min, $max, 0, 1, 1,
3906 sub { $revs{$_[1]} = _cb(@_) });
3907 if ($err && $max >= $head) {
3908 print STDERR "Path '$longest_path' ",
3909 "was probably deleted:\n",
3910 $err->expanded_message,
3911 "\nWill attempt to follow ",
3912 "revisions r$min .. r$max ",
3913 "committed before the deletion\n";
3914 my $hi = $max;
3915 while (--$hi >= $min) {
3916 my $ok;
3917 $self->get_log([$longest_path], $min, $hi,
3918 0, 1, 1, sub {
3919 $ok ||= $_[1];
3920 $revs{$_[1]} = _cb(@_) });
3921 if ($ok) {
3922 print STDERR "r$min .. r$ok OK\n";
3923 last;
3924 }
3925 }
3926 }
3927 $SVN::Error::handler = $err_handler;
3928 my %exists = map { $_->{path} => $_ } @$gsv;
3930 foreach my $r (sort {$a <=> $b} keys %revs) {
3931 my ($paths, $logged) = @{$revs{$r}};
3932 foreach my $gs ($self->match_globs(\%exists, $paths,
3934 $globs, $r)) {
3935 if ($gs->rev_map_max >= $r) {
3936 next;
3937 }
3938 next unless $gs->match_paths($paths, $r);
3939 $gs->{logged_rev_props} = $logged;
3940 if (my $last_commit = $gs->last_commit) {
3941 $gs->assert_index_clean($last_commit);
3942 }
3943 my $log_entry = $gs->do_fetch($paths, $r);
3944 if ($log_entry) {
3945 $gs->do_git_commit($log_entry);
3946 }
3947 $INDEX_FILES{$gs->{index}} = 1;
3948 }
3949 foreach my $g (@$globs) {
3950 my $k = "svn-remote.$g->{remote}." .
3951 "$g->{t}-maxRev";
3952 Git::SVN::tmp_config($k, $r);
3953 }
3954 if ($ra_invalid) {
3955 $_[0] = undef;
3956 $self = undef;
3957 $RA = undef;
3958 $self = Git::SVN::Ra->new($ra_url);
3959 $ra_invalid = undef;
3960 }
3961 }
3962 # pre-fill the .rev_db since it'll eventually get filled in
3963 # with '0' x40 if something new gets committed
3964 foreach my $gs (@$gsv) {
3965 next if $gs->rev_map_max >= $max;
3966 next if defined $gs->rev_map_get($max);
3967 $gs->rev_map_set($max, 0 x40);
3968 }
3969 foreach my $g (@$globs) {
3970 my $k = "svn-remote.$g->{remote}.$g->{t}-maxRev";
3971 Git::SVN::tmp_config($k, $max);
3972 }
3973 last if $max >= $head;
3974 $min = $max + 1;
3975 $max += $inc;
3976 $max = $head if ($max > $head);
3977 }
3978}
3979sub match_globs {
3981 my ($self, $exists, $paths, $globs, $r) = @_;
3982 sub get_dir_check {
3984 my ($self, $exists, $g, $r) = @_;
3985 my @x = eval { $self->get_dir($g->{path}->{left}, $r) };
3986 return unless scalar @x == 3;
3987 my $dirents = $x[0];
3988 foreach my $de (keys %$dirents) {
3989 next if $dirents->{$de}->{kind} != $SVN::Node::dir;
3990 my $p = $g->{path}->full_path($de);
3991 next if $exists->{$p};
3992 next if (length $g->{path}->{right} &&
3993 ($self->check_path($p, $r) !=
3994 $SVN::Node::dir));
3995 $exists->{$p} = Git::SVN->init($self->{url}, $p, undef,
3996 $g->{ref}->full_path($de), 1);
3997 }
3998 }
3999 foreach my $g (@$globs) {
4000 if (my $path = $paths->{"/$g->{path}->{left}"}) {
4001 if ($path->{action} =~ /^[AR]$/) {
4002 get_dir_check($self, $exists, $g, $r);
4003 }
4004 }
4005 foreach (keys %$paths) {
4006 if (/$g->{path}->{left_regex}/ &&
4007 !/$g->{path}->{regex}/) {
4008 next if $paths->{$_}->{action} !~ /^[AR]$/;
4009 get_dir_check($self, $exists, $g, $r);
4010 }
4011 next unless /$g->{path}->{regex}/;
4012 my $p = $1;
4013 my $pathname = $g->{path}->full_path($p);
4014 next if $exists->{$pathname};
4015 next if ($self->check_path($pathname, $r) !=
4016 $SVN::Node::dir);
4017 $exists->{$pathname} = Git::SVN->init(
4018 $self->{url}, $pathname, undef,
4019 $g->{ref}->full_path($p), 1);
4020 }
4021 my $c = '';
4022 foreach (split m#/#, $g->{path}->{left}) {
4023 $c .= "/$_";
4024 next unless ($paths->{$c} &&
4025 ($paths->{$c}->{action} =~ /^[AR]$/));
4026 get_dir_check($self, $exists, $g, $r);
4027 }
4028 }
4029 values %$exists;
4030}
4031sub minimize_url {
4033 my ($self) = @_;
4034 return $self->{url} if ($self->{url} eq $self->{repos_root});
4035 my $url = $self->{repos_root};
4036 my @components = split(m!/!, $self->{svn_path});
4037 my $c = '';
4038 do {
4039 $url .= "/$c" if length $c;
4040 eval { (ref $self)->new($url)->get_latest_revnum };
4041 } while ($@ && ($c = shift @components));
4042 $url;
4043}
4044sub can_do_switch {
4046 my $self = shift;
4047 unless (defined $can_do_switch) {
4048 my $pool = SVN::Pool->new;
4049 my $rep = eval {
4050 $self->do_switch(1, '', 0, $self->{url},
4051 SVN::Delta::Editor->new, $pool);
4052 };
4053 if ($@) {
4054 $can_do_switch = 0;
4055 } else {
4056 $rep->abort_report($pool);
4057 $can_do_switch = 1;
4058 }
4059 $pool->clear;
4060 }
4061 $can_do_switch;
4062}
4063sub skip_unknown_revs {
4065 my ($err) = @_;
4066 my $errno = $err->apr_err();
4067 # Maybe the branch we're tracking didn't
4068 # exist when the repo started, so it's
4069 # not an error if it doesn't, just continue
4070 #
4071 # Wonderfully consistent library, eh?
4072 # 160013 - svn:// and file://
4073 # 175002 - http(s)://
4074 # 175007 - http(s):// (this repo required authorization, too...)
4075 # More codes may be discovered later...
4076 if ($errno == 175007 || $errno == 175002 || $errno == 160013) {
4077 my $err_key = $err->expanded_message;
4078 # revision numbers change every time, filter them out
4079 $err_key =~ s/\d+/\0/g;
4080 $err_key = "$errno\0$err_key";
4081 unless ($ignored_err{$err_key}) {
4082 warn "W: Ignoring error from SVN, path probably ",
4083 "does not exist: ($errno): ",
4084 $err->expanded_message,"\n";
4085 warn "W: Do not be alarmed at the above message ",
4086 "git-svn is just searching aggressively for ",
4087 "old history.\n",
4088 "This may take a while on large repositories\n";
4089 $ignored_err{$err_key} = 1;
4090 }
4091 return;
4092 }
4093 die "Error from SVN, ($errno): ", $err->expanded_message,"\n";
4094}
4095# svn_log_changed_path_t objects passed to get_log are likely to be
4097# overwritten even if only the refs are copied to an external variable,
4098# so we should dup the structures in their entirety. Using an externally
4099# passed pool (instead of our temporary and quickly cleared pool in
4100# Git::SVN::Ra) does not help matters at all...
4101sub dup_changed_paths {
4102 my ($paths) = @_;
4103 return undef unless $paths;
4104 my %ret;
4105 foreach my $p (keys %$paths) {
4106 my $i = $paths->{$p};
4107 my %s = map { $_ => $i->$_ }
4108 qw/copyfrom_path copyfrom_rev action/;
4109 $ret{$p} = \%s;
4110 }
4111 \%ret;
4112}
4113package Git::SVN::Log;
4115use strict;
4116use warnings;
4117use POSIX qw/strftime/;
4118use constant commit_log_separator => ('-' x 72) . "\n";
4119use vars qw/$TZ $limit $color $pager $non_recursive $verbose $oneline
4120 %rusers $show_commit $incremental/;
4121my $l_fmt;
4122sub cmt_showable {
4124 my ($c) = @_;
4125 return 1 if defined $c->{r};
4126 # big commit message got truncated by the 16k pretty buffer in rev-list
4128 if ($c->{l} && $c->{l}->[-1] eq "...\n" &&
4129 $c->{a_raw} =~ /\@([a-f\d\-]+)>$/) {
4130 @{$c->{l}} = ();
4131 my @log = command(qw/cat-file commit/, $c->{c});
4132 # shift off the headers
4134 shift @log while ($log[0] ne '');
4135 shift @log;
4136 # TODO: make $c->{l} not have a trailing newline in the future
4138 @{$c->{l}} = map { "$_\n" } grep !/^git-svn-id: /, @log;
4139 (undef, $c->{r}, undef) = ::extract_metadata(
4141 (grep(/^git-svn-id: /, @log))[-1]);
4142 }
4143 return defined $c->{r};
4144}
4145sub log_use_color {
4147 return $color || Git->repository->get_colorbool('color.diff');
4148}
4149sub git_svn_log_cmd {
4151 my ($r_min, $r_max, @args) = @_;
4152 my $head = 'HEAD';
4153 my (@files, @log_opts);
4154 foreach my $x (@args) {
4155 if ($x eq '--' || @files) {
4156 push @files, $x;
4157 } else {
4158 if (::verify_ref("$x^0")) {
4159 $head = $x;
4160 } else {
4161 push @log_opts, $x;
4162 }
4163 }
4164 }
4165 my ($url, $rev, $uuid, $gs) = ::working_head_info($head);
4167 $gs ||= Git::SVN->_new;
4168 my @cmd = (qw/log --abbrev-commit --pretty=raw --default/,
4169 $gs->refname);
4170 push @cmd, '-r' unless $non_recursive;
4171 push @cmd, qw/--raw --name-status/ if $verbose;
4172 push @cmd, '--color' if log_use_color();
4173 push @cmd, @log_opts;
4174 if (defined $r_max && $r_max == $r_min) {
4175 push @cmd, '--max-count=1';
4176 if (my $c = $gs->rev_map_get($r_max)) {
4177 push @cmd, $c;
4178 }
4179 } elsif (defined $r_max) {
4180 if ($r_max < $r_min) {
4181 ($r_min, $r_max) = ($r_max, $r_min);
4182 }
4183 my (undef, $c_max) = $gs->find_rev_before($r_max, 1, $r_min);
4184 my (undef, $c_min) = $gs->find_rev_after($r_min, 1, $r_max);
4185 # If there are no commits in the range, both $c_max and $c_min
4186 # will be undefined. If there is at least 1 commit in the
4187 # range, both will be defined.
4188 return () if !defined $c_min || !defined $c_max;
4189 if ($c_min eq $c_max) {
4190 push @cmd, '--max-count=1', $c_min;
4191 } else {
4192 push @cmd, '--boundary', "$c_min..$c_max";
4193 }
4194 }
4195 return (@cmd, @files);
4196}
4197# adapted from pager.c
4199sub config_pager {
4200 $pager ||= $ENV{GIT_PAGER} || $ENV{PAGER};
4201 if (!defined $pager) {
4202 $pager = 'less';
4203 } elsif (length $pager == 0 || $pager eq 'cat') {
4204 $pager = undef;
4205 }
4206 $ENV{GIT_PAGER_IN_USE} = defined($pager);
4207}
4208sub run_pager {
4210 return unless -t *STDOUT && defined $pager;
4211 pipe my $rfd, my $wfd or return;
4212 defined(my $pid = fork) or ::fatal "Can't fork: $!";
4213 if (!$pid) {
4214 open STDOUT, '>&', $wfd or
4215 ::fatal "Can't redirect to stdout: $!";
4216 return;
4217 }
4218 open STDIN, '<&', $rfd or ::fatal "Can't redirect stdin: $!";
4219 $ENV{LESS} ||= 'FRSX';
4220 exec $pager or ::fatal "Can't run pager: $! ($pager)";
4221}
4222sub format_svn_date {
4224 return strftime("%Y-%m-%d %H:%M:%S %z (%a, %d %b %Y)", localtime(shift));
4225}
4226sub parse_git_date {
4228 my ($t, $tz) = @_;
4229 # Date::Parse isn't in the standard Perl distro :(
4230 if ($tz =~ s/^\+//) {
4231 $t += tz_to_s_offset($tz);
4232 } elsif ($tz =~ s/^\-//) {
4233 $t -= tz_to_s_offset($tz);
4234 }
4235 return $t;
4236}
4237sub set_local_timezone {
4239 if (defined $TZ) {
4240 $ENV{TZ} = $TZ;
4241 } else {
4242 delete $ENV{TZ};
4243 }
4244}
4245sub tz_to_s_offset {
4247 my ($tz) = @_;
4248 $tz =~ s/(\d\d)$//;
4249 return ($1 * 60) + ($tz * 3600);
4250}
4251sub get_author_info {
4253 my ($dest, $author, $t, $tz) = @_;
4254 $author =~ s/(?:^\s*|\s*$)//g;
4255 $dest->{a_raw} = $author;
4256 my $au;
4257 if ($::_authors) {
4258 $au = $rusers{$author} || undef;
4259 }
4260 if (!$au) {
4261 ($au) = ($author =~ /<([^>]+)\@[^>]+>$/);
4262 }
4263 $dest->{t} = $t;
4264 $dest->{tz} = $tz;
4265 $dest->{a} = $au;
4266 $dest->{t_utc} = parse_git_date($t, $tz);
4267}
4268sub process_commit {
4270 my ($c, $r_min, $r_max, $defer) = @_;
4271 if (defined $r_min && defined $r_max) {
4272 if ($r_min == $c->{r} && $r_min == $r_max) {
4273 show_commit($c);
4274 return 0;
4275 }
4276 return 1 if $r_min == $r_max;
4277 if ($r_min < $r_max) {
4278 # we need to reverse the print order
4279 return 0 if (defined $limit && --$limit < 0);
4280 push @$defer, $c;
4281 return 1;
4282 }
4283 if ($r_min != $r_max) {
4284 return 1 if ($r_min < $c->{r});
4285 return 1 if ($r_max > $c->{r});
4286 }
4287 }
4288 return 0 if (defined $limit && --$limit < 0);
4289 show_commit($c);
4290 return 1;
4291}
4292sub show_commit {
4294 my $c = shift;
4295 if ($oneline) {
4296 my $x = "\n";
4297 if (my $l = $c->{l}) {
4298 while ($l->[0] =~ /^\s*$/) { shift @$l }
4299 $x = $l->[0];
4300 }
4301 $l_fmt ||= 'A' . length($c->{r});
4302 print 'r',pack($l_fmt, $c->{r}),' | ';
4303 print "$c->{c} | " if $show_commit;
4304 print $x;
4305 } else {
4306 show_commit_normal($c);
4307 }
4308}
4309sub show_commit_changed_paths {
4311 my ($c) = @_;
4312 return unless $c->{changed};
4313 print "Changed paths:\n", @{$c->{changed}};
4314}
4315sub show_commit_normal {
4317 my ($c) = @_;
4318 print commit_log_separator, "r$c->{r} | ";
4319 print "$c->{c} | " if $show_commit;
4320 print "$c->{a} | ", format_svn_date($c->{t_utc}), ' | ';
4321 my $nr_line = 0;
4322 if (my $l = $c->{l}) {
4324 while ($l->[$#$l] eq "\n" && $#$l > 0
4325 && $l->[($#$l - 1)] eq "\n") {
4326 pop @$l;
4327 }
4328 $nr_line = scalar @$l;
4329 if (!$nr_line) {
4330 print "1 line\n\n\n";
4331 } else {
4332 if ($nr_line == 1) {
4333 $nr_line = '1 line';
4334 } else {
4335 $nr_line .= ' lines';
4336 }
4337 print $nr_line, "\n";
4338 show_commit_changed_paths($c);
4339 print "\n";
4340 print $_ foreach @$l;
4341 }
4342 } else {
4343 print "1 line\n";
4344 show_commit_changed_paths($c);
4345 print "\n";
4346 }
4348 foreach my $x (qw/raw stat diff/) {
4349 if ($c->{$x}) {
4350 print "\n";
4351 print $_ foreach @{$c->{$x}}
4352 }
4353 }
4354}
4355sub cmd_show_log {
4357 my (@args) = @_;
4358 my ($r_min, $r_max);
4359 my $r_last = -1; # prevent dupes
4360 set_local_timezone();
4361 if (defined $::_revision) {
4362 if ($::_revision =~ /^(\d+):(\d+)$/) {
4363 ($r_min, $r_max) = ($1, $2);
4364 } elsif ($::_revision =~ /^\d+$/) {
4365 $r_min = $r_max = $::_revision;
4366 } else {
4367 ::fatal "-r$::_revision is not supported, use ",
4368 "standard 'git log' arguments instead";
4369 }
4370 }
4371 config_pager();
4373 @args = git_svn_log_cmd($r_min, $r_max, @args);
4374 if (!@args) {
4375 print commit_log_separator unless $incremental || $oneline;
4376 return;
4377 }
4378 my $log = command_output_pipe(@args);
4379 run_pager();
4380 my (@k, $c, $d, $stat);
4381 my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/;
4382 while (<$log>) {
4383 if (/^${esc_color}commit -?($::sha1_short)/o) {
4384 my $cmt = $1;
4385 if ($c && cmt_showable($c) && $c->{r} != $r_last) {
4386 $r_last = $c->{r};
4387 process_commit($c, $r_min, $r_max, \@k) or
4388 goto out;
4389 }
4390 $d = undef;
4391 $c = { c => $cmt };
4392 } elsif (/^${esc_color}author (.+) (\d+) ([\-\+]?\d+)$/o) {
4393 get_author_info($c, $1, $2, $3);
4394 } elsif (/^${esc_color}(?:tree|parent|committer) /o) {
4395 # ignore
4396 } elsif (/^${esc_color}:\d{6} \d{6} $::sha1_short/o) {
4397 push @{$c->{raw}}, $_;
4398 } elsif (/^${esc_color}[ACRMDT]\t/) {
4399 # we could add $SVN->{svn_path} here, but that requires
4400 # remote access at the moment (repo_path_split)...
4401 s#^(${esc_color})([ACRMDT])\t#$1 $2 #o;
4402 push @{$c->{changed}}, $_;
4403 } elsif (/^${esc_color}diff /o) {
4404 $d = 1;
4405 push @{$c->{diff}}, $_;
4406 } elsif ($d) {
4407 push @{$c->{diff}}, $_;
4408 } elsif (/^\ .+\ \|\s*\d+\ $esc_color[\+\-]*
4409 $esc_color*[\+\-]*$esc_color$/x) {
4410 $stat = 1;
4411 push @{$c->{stat}}, $_;
4412 } elsif ($stat && /^ \d+ files changed, \d+ insertions/) {
4413 push @{$c->{stat}}, $_;
4414 $stat = undef;
4415 } elsif (/^${esc_color} (git-svn-id:.+)$/o) {
4416 ($c->{url}, $c->{r}, undef) = ::extract_metadata($1);
4417 } elsif (s/^${esc_color} //o) {
4418 push @{$c->{l}}, $_;
4419 }
4420 }
4421 if ($c && defined $c->{r} && $c->{r} != $r_last) {
4422 $r_last = $c->{r};
4423 process_commit($c, $r_min, $r_max, \@k);
4424 }
4425 if (@k) {
4426 ($r_min, $r_max) = ($r_max, $r_min);
4427 process_commit($_, $r_min, $r_max) foreach reverse @k;
4428 }
4429out:
4430 close $log;
4431 print commit_log_separator unless $incremental || $oneline;
4432}
4433package Git::SVN::Migration;
4435# these version numbers do NOT correspond to actual version numbers
4436# of git nor git-svn. They are just relative.
4437#
4438# v0 layout: .git/$id/info/url, refs/heads/$id-HEAD
4439#
4440# v1 layout: .git/$id/info/url, refs/remotes/$id
4441#
4442# v2 layout: .git/svn/$id/info/url, refs/remotes/$id
4443#
4444# v3 layout: .git/svn/$id, refs/remotes/$id
4445# - info/url may remain for backwards compatibility
4446# - this is what we migrate up to this layout automatically,
4447# - this will be used by git svn init on single branches
4448# v3.1 layout (auto migrated):
4449# - .rev_db => .rev_db.$UUID, .rev_db will remain as a symlink
4450# for backwards compatibility
4451#
4452# v4 layout: .git/svn/$repo_id/$id, refs/remotes/$repo_id/$id
4453# - this is only created for newly multi-init-ed
4454# repositories. Similar in spirit to the
4455# --use-separate-remotes option in git-clone (now default)
4456# - we do not automatically migrate to this (following
4457# the example set by core git)
4458#
4459# v5 layout: .rev_db.$UUID => .rev_map.$UUID
4460# - newer, more-efficient format that uses 24-bytes per record
4461# with no filler space.
4462# - use xxd -c24 < .rev_map.$UUID to view and debug
4463# - This is a one-way migration, repositories updated to the
4464# new format will not be able to use old git-svn without
4465# rebuilding the .rev_db. Rebuilding the rev_db is not
4466# possible if noMetadata or useSvmProps are set; but should
4467# be no problem for users that use the (sensible) defaults.
4468use strict;
4469use warnings;
4470use Carp qw/croak/;
4471use File::Path qw/mkpath/;
4472use File::Basename qw/dirname basename/;
4473use vars qw/$_minimize/;
4474sub migrate_from_v0 {
4476 my $git_dir = $ENV{GIT_DIR};
4477 return undef unless -d $git_dir;
4478 my ($fh, $ctx) = command_output_pipe(qw/rev-parse --symbolic --all/);
4479 my $migrated = 0;
4480 while (<$fh>) {
4481 chomp;
4482 my ($id, $orig_ref) = ($_, $_);
4483 next unless $id =~ s#^refs/heads/(.+)-HEAD$#$1#;
4484 next unless -f "$git_dir/$id/info/url";
4485 my $new_ref = "refs/remotes/$id";
4486 if (::verify_ref("$new_ref^0")) {
4487 print STDERR "W: $orig_ref is probably an old ",
4488 "branch used by an ancient version of ",
4489 "git-svn.\n",
4490 "However, $new_ref also exists.\n",
4491 "We will not be able ",
4492 "to use this branch until this ",
4493 "ambiguity is resolved.\n";
4494 next;
4495 }
4496 print STDERR "Migrating from v0 layout...\n" if !$migrated;
4497 print STDERR "Renaming ref: $orig_ref => $new_ref\n";
4498 command_noisy('update-ref', $new_ref, $orig_ref);
4499 command_noisy('update-ref', '-d', $orig_ref, $orig_ref);
4500 $migrated++;
4501 }
4502 command_close_pipe($fh, $ctx);
4503 print STDERR "Done migrating from v0 layout...\n" if $migrated;
4504 $migrated;
4505}
4506sub migrate_from_v1 {
4508 my $git_dir = $ENV{GIT_DIR};
4509 my $migrated = 0;
4510 return $migrated unless -d $git_dir;
4511 my $svn_dir = "$git_dir/svn";
4512 # just in case somebody used 'svn' as their $id at some point...
4514 return $migrated if -d $svn_dir && ! -f "$svn_dir/info/url";
4515 print STDERR "Migrating from a git-svn v1 layout...\n";
4517 mkpath([$svn_dir]);
4518 print STDERR "Data from a previous version of git-svn exists, but\n\t",
4519 "$svn_dir\n\t(required for this version ",
4520 "($::VERSION) of git-svn) does not. exist\n";
4521 my ($fh, $ctx) = command_output_pipe(qw/rev-parse --symbolic --all/);
4522 while (<$fh>) {
4523 my $x = $_;
4524 next unless $x =~ s#^refs/remotes/##;
4525 chomp $x;
4526 next unless -f "$git_dir/$x/info/url";
4527 my $u = eval { ::file_to_s("$git_dir/$x/info/url") };
4528 next unless $u;
4529 my $dn = dirname("$git_dir/svn/$x");
4530 mkpath([$dn]) unless -d $dn;
4531 if ($x eq 'svn') { # they used 'svn' as GIT_SVN_ID:
4532 mkpath(["$git_dir/svn/svn"]);
4533 print STDERR " - $git_dir/$x/info => ",
4534 "$git_dir/svn/$x/info\n";
4535 rename "$git_dir/$x/info", "$git_dir/svn/$x/info" or
4536 croak "$!: $x";
4537 # don't worry too much about these, they probably
4538 # don't exist with repos this old (save for index,
4539 # and we can easily regenerate that)
4540 foreach my $f (qw/unhandled.log index .rev_db/) {
4541 rename "$git_dir/$x/$f", "$git_dir/svn/$x/$f";
4542 }
4543 } else {
4544 print STDERR " - $git_dir/$x => $git_dir/svn/$x\n";
4545 rename "$git_dir/$x", "$git_dir/svn/$x" or
4546 croak "$!: $x";
4547 }
4548 $migrated++;
4549 }
4550 command_close_pipe($fh, $ctx);
4551 print STDERR "Done migrating from a git-svn v1 layout\n";
4552 $migrated;
4553}
4554sub read_old_urls {
4556 my ($l_map, $pfx, $path) = @_;
4557 my @dir;
4558 foreach (<$path/*>) {
4559 if (-r "$_/info/url") {
4560 $pfx .= '/' if $pfx && $pfx !~ m!/$!;
4561 my $ref_id = $pfx . basename $_;
4562 my $url = ::file_to_s("$_/info/url");
4563 $l_map->{$ref_id} = $url;
4564 } elsif (-d $_) {
4565 push @dir, $_;
4566 }
4567 }
4568 foreach (@dir) {
4569 my $x = $_;
4570 $x =~ s!^\Q$ENV{GIT_DIR}\E/svn/!!o;
4571 read_old_urls($l_map, $x, $_);
4572 }
4573}
4574sub migrate_from_v2 {
4576 my @cfg = command(qw/config -l/);
4577 return if grep /^svn-remote\..+\.url=/, @cfg;
4578 my %l_map;
4579 read_old_urls(\%l_map, '', "$ENV{GIT_DIR}/svn");
4580 my $migrated = 0;
4581 foreach my $ref_id (sort keys %l_map) {
4583 eval { Git::SVN->init($l_map{$ref_id}, '', undef, $ref_id) };
4584 if ($@) {
4585 Git::SVN->init($l_map{$ref_id}, '', $ref_id, $ref_id);
4586 }
4587 $migrated++;
4588 }
4589 $migrated;
4590}
4591sub minimize_connections {
4593 my $r = Git::SVN::read_all_remotes();
4594 my $new_urls = {};
4595 my $root_repos = {};
4596 foreach my $repo_id (keys %$r) {
4597 my $url = $r->{$repo_id}->{url} or next;
4598 my $fetch = $r->{$repo_id}->{fetch} or next;
4599 my $ra = Git::SVN::Ra->new($url);
4600 # skip existing cases where we already connect to the root
4602 if (($ra->{url} eq $ra->{repos_root}) ||
4603 (Git::SVN::sanitize_remote_name($ra->{repos_root}) eq
4604 $repo_id)) {
4605 $root_repos->{$ra->{url}} = $repo_id;
4606 next;
4607 }
4608 my $root_ra = Git::SVN::Ra->new($ra->{repos_root});
4610 my $root_path = $ra->{url};
4611 $root_path =~ s#^\Q$ra->{repos_root}\E(/|$)##;
4612 foreach my $path (keys %$fetch) {
4613 my $ref_id = $fetch->{$path};
4614 my $gs = Git::SVN->new($ref_id, $repo_id, $path);
4615 # make sure we can read when connecting to
4617 # a higher level of a repository
4618 my ($last_rev, undef) = $gs->last_rev_commit;
4619 if (!defined $last_rev) {
4620 $last_rev = eval {
4621 $root_ra->get_latest_revnum;
4622 };
4623 next if $@;
4624 }
4625 my $new = $root_path;
4626 $new .= length $path ? "/$path" : '';
4627 eval {
4628 $root_ra->get_log([$new], $last_rev, $last_rev,
4629 0, 0, 1, sub { });
4630 };
4631 next if $@;
4632 $new_urls->{$ra->{repos_root}}->{$new} =
4633 { ref_id => $ref_id,
4634 old_repo_id => $repo_id,
4635 old_path => $path };
4636 }
4637 }
4638 my @emptied;
4640 foreach my $url (keys %$new_urls) {
4641 # see if we can re-use an existing [svn-remote "repo_id"]
4642 # instead of creating a(n ugly) new section:
4643 my $repo_id = $root_repos->{$url} ||
4644 Git::SVN::sanitize_remote_name($url);
4645 my $fetch = $new_urls->{$url};
4647 foreach my $path (keys %$fetch) {
4648 my $x = $fetch->{$path};
4649 Git::SVN->init($url, $path, $repo_id, $x->{ref_id});
4650 my $pfx = "svn-remote.$x->{old_repo_id}";
4651 my $old_fetch = quotemeta("$x->{old_path}:".
4653 "refs/remotes/$x->{ref_id}");
4654 command_noisy(qw/config --unset/,
4655 "$pfx.fetch", '^'. $old_fetch . '$');
4656 delete $r->{$x->{old_repo_id}}->
4657 {fetch}->{$x->{old_path}};
4658 if (!keys %{$r->{$x->{old_repo_id}}->{fetch}}) {
4659 command_noisy(qw/config --unset/,
4660 "$pfx.url");
4661 push @emptied, $x->{old_repo_id}
4662 }
4663 }
4664 }
4665 if (@emptied) {
4666 my $file = $ENV{GIT_CONFIG} || $ENV{GIT_CONFIG_LOCAL} ||
4667 "$ENV{GIT_DIR}/config";
4668 print STDERR <<EOF;
4669The following [svn-remote] sections in your config file ($file) are empty
4670and can be safely removed:
4671EOF
4672 print STDERR "[svn-remote \"$_\"]\n" foreach @emptied;
4673 }
4674}
4675sub migration_check {
4677 migrate_from_v0();
4678 migrate_from_v1();
4679 migrate_from_v2();
4680 minimize_connections() if $_minimize;
4681}
4682package Git::IndexInfo;
4684use strict;
4685use warnings;
4686use Git qw/command_input_pipe command_close_pipe/;
4687sub new {
4689 my ($class) = @_;
4690 my ($gui, $ctx) = command_input_pipe(qw/update-index -z --index-info/);
4691 bless { gui => $gui, ctx => $ctx, nr => 0}, $class;
4692}
4693sub remove {
4695 my ($self, $path) = @_;
4696 if (print { $self->{gui} } '0 ', 0 x 40, "\t", $path, "\0") {
4697 return ++$self->{nr};
4698 }
4699 undef;
4700}
4701sub update {
4703 my ($self, $mode, $hash, $path) = @_;
4704 if (print { $self->{gui} } $mode, ' ', $hash, "\t", $path, "\0") {
4705 return ++$self->{nr};
4706 }
4707 undef;
4708}
4709sub DESTROY {
4711 my ($self) = @_;
4712 command_close_pipe($self->{gui}, $self->{ctx});
4713}
4714package Git::SVN::GlobSpec;
4716use strict;
4717use warnings;
4718sub new {
4720 my ($class, $glob) = @_;
4721 my $re = $glob;
4722 $re =~ s!/+$!!g; # no need for trailing slashes
4723 my $nr = ($re =~ s!^(.*)\*(.*)$!\(\[^/\]+\)!g);
4724 my ($left, $right) = ($1, $2);
4725 if ($nr > 1) {
4726 die "Only one '*' wildcard expansion ",
4727 "is supported (got $nr): '$glob'\n";
4728 } elsif ($nr == 0) {
4729 die "One '*' is needed for glob: '$glob'\n";
4730 }
4731 $re = quotemeta($left) . $re . quotemeta($right);
4732 if (length $left && !($left =~ s!/+$!!g)) {
4733 die "Missing trailing '/' on left side of: '$glob' ($left)\n";
4734 }
4735 if (length $right && !($right =~ s!^/+!!g)) {
4736 die "Missing leading '/' on right side of: '$glob' ($right)\n";
4737 }
4738 my $left_re = qr/^\/\Q$left\E(\/|$)/;
4739 bless { left => $left, right => $right, left_regex => $left_re,
4740 regex => qr/$re/, glob => $glob }, $class;
4741}
4742sub full_path {
4744 my ($self, $path) = @_;
4745 return (length $self->{left} ? "$self->{left}/" : '') .
4746 $path . (length $self->{right} ? "/$self->{right}" : '');
4747}
4748__END__
4750Data structures:
4752$remotes = { # returned by read_all_remotes()
4755 'svn' => {
4756 # svn-remote.svn.url=https://svn.musicpd.org
4757 url => 'https://svn.musicpd.org',
4758 # svn-remote.svn.fetch=mpd/trunk:trunk
4759 fetch => {
4760 'mpd/trunk' => 'trunk',
4761 },
4762 # svn-remote.svn.tags=mpd/tags/*:tags/*
4763 tags => {
4764 path => {
4765 left => 'mpd/tags',
4766 right => '',
4767 regex => qr!mpd/tags/([^/]+)$!,
4768 glob => 'tags/*',
4769 },
4770 ref => {
4771 left => 'tags',
4772 right => '',
4773 regex => qr!tags/([^/]+)$!,
4774 glob => 'tags/*',
4775 },
4776 }
4777 }
4778};
4779$log_entry hashref as returned by libsvn_log_entry()
4781{
4782 log => 'whitespace-formatted log entry
4783', # trailing newline is preserved
4784 revision => '8', # integer
4785 date => '2004-02-24T17:01:44.108345Z', # commit date
4786 author => 'committer name'
4787};
4788# this is generated by generate_diff();
4791@mods = array of diff-index line hashes, each element represents one line
4792 of diff-index output
4793diff-index line ($m hash)
4795{
4796 mode_a => first column of diff-index output, no leading ':',
4797 mode_b => second column of diff-index output,
4798 sha1_b => sha1sum of the final blob,
4799 chg => change type [MCRADT],
4800 file_a => original file name of a file (iff chg is 'C' or 'R')
4801 file_b => new/current file name of a file (any chg)
4802}
4803;
4804# retval of read_url_paths{,_all}();
4806$l_map = {
4807 # repository root url
4808 'https://svn.musicpd.org' => {
4809 # repository path # GIT_SVN_ID
4810 'mpd/trunk' => 'trunk',
4811 'mpd/tags/0.11.5' => 'tags/0.11.5',
4812 },
4813}
4814Notes:
4816 I don't trust the each() function on unless I created %hash myself
4817 because the internal iterator may not have started at base.