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