![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
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 $_authors_prog %users/;
9 $AUTHOR = 'Eric Wong <normalperson@yhbt.net>';
10 $VERSION = '@@GIT_VERSION@@';
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 } || '';
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 $Git::SVN::_minimize_url = 'unset';
24 if (! exists $ENV{SVN_SSH}) {
25 if (exists $ENV{GIT_SSH}) {
26 $ENV{SVN_SSH} = $ENV{GIT_SSH};
27 if ($^O eq 'msys') {
28 $ENV{SVN_SSH} =~ s/\\/\\\\/g;
29 $ENV{SVN_SSH} =~ s/(.*)/"$1"/;
30 }
31 }
32 }
34 $Git::SVN::Log::TZ = $ENV{TZ};
35 $ENV{TZ} = 'UTC';
36 $| = 1; # unbuffer STDOUT
38 sub fatal (@) { print STDERR "@_\n"; exit 1 }
39 sub _req_svn {
40 require SVN::Core; # use()-ing this causes segfaults for me... *shrug*
41 require SVN::Ra;
42 require SVN::Delta;
43 if ($SVN::Core::VERSION lt '1.1.0') {
44 fatal "Need SVN::Core 1.1.0 or better (got $SVN::Core::VERSION)";
45 }
46 }
47 my $can_compress = eval { require Compress::Zlib; 1};
48 push @Git::SVN::Ra::ISA, 'SVN::Ra';
49 push @SVN::Git::Editor::ISA, 'SVN::Delta::Editor';
50 push @SVN::Git::Fetcher::ISA, 'SVN::Delta::Editor';
51 use Carp qw/croak/;
52 use Digest::MD5;
53 use IO::File qw//;
54 use File::Basename qw/dirname basename/;
55 use File::Path qw/mkpath/;
56 use File::Spec;
57 use File::Find;
58 use Getopt::Long qw/:config gnu_getopt no_ignore_case auto_abbrev/;
59 use IPC::Open3;
60 use Git;
62 BEGIN {
63 # import functions from Git into our packages, en masse
64 no strict 'refs';
65 foreach (qw/command command_oneline command_noisy command_output_pipe
66 command_input_pipe command_close_pipe
67 command_bidi_pipe command_close_bidi_pipe/) {
68 for my $package ( qw(SVN::Git::Editor SVN::Git::Fetcher
69 Git::SVN::Migration Git::SVN::Log Git::SVN),
70 __PACKAGE__) {
71 *{"${package}::$_"} = \&{"Git::$_"};
72 }
73 }
74 }
76 my ($SVN);
78 $sha1 = qr/[a-f\d]{40}/;
79 $sha1_short = qr/[a-f\d]{4,40}/;
80 my ($_stdin, $_help, $_edit,
81 $_message, $_file, $_branch_dest,
82 $_template, $_shared,
83 $_version, $_fetch_all, $_no_rebase, $_fetch_parent,
84 $_merge, $_strategy, $_dry_run, $_local,
85 $_prefix, $_no_checkout, $_url, $_verbose,
86 $_git_format, $_commit_url, $_tag);
87 $Git::SVN::_follow_parent = 1;
88 $_q ||= 0;
89 my %remote_opts = ( 'username=s' => \$Git::SVN::Prompt::_username,
90 'config-dir=s' => \$Git::SVN::Ra::config_dir,
91 'no-auth-cache' => \$Git::SVN::Prompt::_no_auth_cache,
92 'ignore-paths=s' => \$SVN::Git::Fetcher::_ignore_regex );
93 my %fc_opts = ( 'follow-parent|follow!' => \$Git::SVN::_follow_parent,
94 'authors-file|A=s' => \$_authors,
95 'authors-prog=s' => \$_authors_prog,
96 'repack:i' => \$Git::SVN::_repack,
97 'noMetadata' => \$Git::SVN::_no_metadata,
98 'useSvmProps' => \$Git::SVN::_use_svm_props,
99 'useSvnsyncProps' => \$Git::SVN::_use_svnsync_props,
100 'log-window-size=i' => \$Git::SVN::Ra::_log_window_size,
101 'no-checkout' => \$_no_checkout,
102 'quiet|q+' => \$_q,
103 'repack-flags|repack-args|repack-opts=s' =>
104 \$Git::SVN::_repack_flags,
105 'use-log-author' => \$Git::SVN::_use_log_author,
106 'add-author-from' => \$Git::SVN::_add_author_from,
107 'localtime' => \$Git::SVN::_localtime,
108 %remote_opts );
110 my ($_trunk, @_tags, @_branches, $_stdlayout);
111 my %icv;
112 my %init_opts = ( 'template=s' => \$_template, 'shared:s' => \$_shared,
113 'trunk|T=s' => \$_trunk, 'tags|t=s@' => \@_tags,
114 'branches|b=s@' => \@_branches, 'prefix=s' => \$_prefix,
115 'stdlayout|s' => \$_stdlayout,
116 'minimize-url|m!' => \$Git::SVN::_minimize_url,
117 'no-metadata' => sub { $icv{noMetadata} = 1 },
118 'use-svm-props' => sub { $icv{useSvmProps} = 1 },
119 'use-svnsync-props' => sub { $icv{useSvnsyncProps} = 1 },
120 'rewrite-root=s' => sub { $icv{rewriteRoot} = $_[1] },
121 'rewrite-uuid=s' => sub { $icv{rewriteUUID} = $_[1] },
122 %remote_opts );
123 my %cmt_opts = ( 'edit|e' => \$_edit,
124 'rmdir' => \$SVN::Git::Editor::_rmdir,
125 'find-copies-harder' => \$SVN::Git::Editor::_find_copies_harder,
126 'l=i' => \$SVN::Git::Editor::_rename_limit,
127 'copy-similarity|C=i'=> \$SVN::Git::Editor::_cp_similarity
128 );
130 my %cmd = (
131 fetch => [ \&cmd_fetch, "Download new revisions from SVN",
132 { 'revision|r=s' => \$_revision,
133 'fetch-all|all' => \$_fetch_all,
134 'parent|p' => \$_fetch_parent,
135 %fc_opts } ],
136 clone => [ \&cmd_clone, "Initialize and fetch revisions",
137 { 'revision|r=s' => \$_revision,
138 %fc_opts, %init_opts } ],
139 init => [ \&cmd_init, "Initialize a repo for tracking" .
140 " (requires URL argument)",
141 \%init_opts ],
142 'multi-init' => [ \&cmd_multi_init,
143 "Deprecated alias for ".
144 "'$0 init -T<trunk> -b<branches> -t<tags>'",
145 \%init_opts ],
146 dcommit => [ \&cmd_dcommit,
147 'Commit several diffs to merge with upstream',
148 { 'merge|m|M' => \$_merge,
149 'strategy|s=s' => \$_strategy,
150 'verbose|v' => \$_verbose,
151 'dry-run|n' => \$_dry_run,
152 'fetch-all|all' => \$_fetch_all,
153 'commit-url=s' => \$_commit_url,
154 'revision|r=i' => \$_revision,
155 'no-rebase' => \$_no_rebase,
156 %cmt_opts, %fc_opts } ],
157 branch => [ \&cmd_branch,
158 'Create a branch in the SVN repository',
159 { 'message|m=s' => \$_message,
160 'destination|d=s' => \$_branch_dest,
161 'dry-run|n' => \$_dry_run,
162 'tag|t' => \$_tag,
163 'username=s' => \$Git::SVN::Prompt::_username,
164 'commit-url=s' => \$_commit_url } ],
165 tag => [ sub { $_tag = 1; cmd_branch(@_) },
166 'Create a tag in the SVN repository',
167 { 'message|m=s' => \$_message,
168 'destination|d=s' => \$_branch_dest,
169 'dry-run|n' => \$_dry_run,
170 'username=s' => \$Git::SVN::Prompt::_username,
171 'commit-url=s' => \$_commit_url } ],
172 'set-tree' => [ \&cmd_set_tree,
173 "Set an SVN repository to a git tree-ish",
174 { 'stdin' => \$_stdin, %cmt_opts, %fc_opts, } ],
175 'create-ignore' => [ \&cmd_create_ignore,
176 'Create a .gitignore per svn:ignore',
177 { 'revision|r=i' => \$_revision
178 } ],
179 'mkdirs' => [ \&cmd_mkdirs ,
180 "recreate empty directories after a checkout",
181 { 'revision|r=i' => \$_revision } ],
182 'propget' => [ \&cmd_propget,
183 'Print the value of a property on a file or directory',
184 { 'revision|r=i' => \$_revision } ],
185 'proplist' => [ \&cmd_proplist,
186 'List all properties of a file or directory',
187 { 'revision|r=i' => \$_revision } ],
188 'show-ignore' => [ \&cmd_show_ignore, "Show svn:ignore listings",
189 { 'revision|r=i' => \$_revision
190 } ],
191 'show-externals' => [ \&cmd_show_externals, "Show svn:externals listings",
192 { 'revision|r=i' => \$_revision
193 } ],
194 'multi-fetch' => [ \&cmd_multi_fetch,
195 "Deprecated alias for $0 fetch --all",
196 { 'revision|r=s' => \$_revision, %fc_opts } ],
197 'migrate' => [ sub { },
198 # no-op, we automatically run this anyways,
199 'Migrate configuration/metadata/layout from
200 previous versions of git-svn',
201 { 'minimize' => \$Git::SVN::Migration::_minimize,
202 %remote_opts } ],
203 'log' => [ \&Git::SVN::Log::cmd_show_log, 'Show commit logs',
204 { 'limit=i' => \$Git::SVN::Log::limit,
205 'revision|r=s' => \$_revision,
206 'verbose|v' => \$Git::SVN::Log::verbose,
207 'incremental' => \$Git::SVN::Log::incremental,
208 'oneline' => \$Git::SVN::Log::oneline,
209 'show-commit' => \$Git::SVN::Log::show_commit,
210 'non-recursive' => \$Git::SVN::Log::non_recursive,
211 'authors-file|A=s' => \$_authors,
212 'color' => \$Git::SVN::Log::color,
213 'pager=s' => \$Git::SVN::Log::pager
214 } ],
215 'find-rev' => [ \&cmd_find_rev,
216 "Translate between SVN revision numbers and tree-ish",
217 {} ],
218 'rebase' => [ \&cmd_rebase, "Fetch and rebase your working directory",
219 { 'merge|m|M' => \$_merge,
220 'verbose|v' => \$_verbose,
221 'strategy|s=s' => \$_strategy,
222 'local|l' => \$_local,
223 'fetch-all|all' => \$_fetch_all,
224 'dry-run|n' => \$_dry_run,
225 %fc_opts } ],
226 'commit-diff' => [ \&cmd_commit_diff,
227 'Commit a diff between two trees',
228 { 'message|m=s' => \$_message,
229 'file|F=s' => \$_file,
230 'revision|r=s' => \$_revision,
231 %cmt_opts } ],
232 'info' => [ \&cmd_info,
233 "Show info about the latest SVN revision
234 on the current branch",
235 { 'url' => \$_url, } ],
236 'blame' => [ \&Git::SVN::Log::cmd_blame,
237 "Show what revision and author last modified each line of a file",
238 { 'git-format' => \$_git_format } ],
239 'reset' => [ \&cmd_reset,
240 "Undo fetches back to the specified SVN revision",
241 { 'revision|r=s' => \$_revision,
242 'parent|p' => \$_fetch_parent } ],
243 'gc' => [ \&cmd_gc,
244 "Compress unhandled.log files in .git/svn and remove " .
245 "index files in .git/svn",
246 {} ],
247 );
249 my $cmd;
250 for (my $i = 0; $i < @ARGV; $i++) {
251 if (defined $cmd{$ARGV[$i]}) {
252 $cmd = $ARGV[$i];
253 splice @ARGV, $i, 1;
254 last;
255 } elsif ($ARGV[$i] eq 'help') {
256 $cmd = $ARGV[$i+1];
257 usage(0);
258 }
259 };
261 # make sure we're always running at the top-level working directory
262 unless ($cmd && $cmd =~ /(?:clone|init|multi-init)$/) {
263 unless (-d $ENV{GIT_DIR}) {
264 if ($git_dir_user_set) {
265 die "GIT_DIR=$ENV{GIT_DIR} explicitly set, ",
266 "but it is not a directory\n";
267 }
268 my $git_dir = delete $ENV{GIT_DIR};
269 my $cdup = undef;
270 git_cmd_try {
271 $cdup = command_oneline(qw/rev-parse --show-cdup/);
272 $git_dir = '.' unless ($cdup);
273 chomp $cdup if ($cdup);
274 $cdup = "." unless ($cdup && length $cdup);
275 } "Already at toplevel, but $git_dir not found\n";
276 chdir $cdup or die "Unable to chdir up to '$cdup'\n";
277 unless (-d $git_dir) {
278 die "$git_dir still not found after going to ",
279 "'$cdup'\n";
280 }
281 $ENV{GIT_DIR} = $git_dir;
282 }
283 $_repository = Git->repository(Repository => $ENV{GIT_DIR});
284 }
286 my %opts = %{$cmd{$cmd}->[2]} if (defined $cmd);
288 read_git_config(\%opts);
289 if ($cmd && ($cmd eq 'log' || $cmd eq 'blame')) {
290 Getopt::Long::Configure('pass_through');
291 }
292 my $rv = GetOptions(%opts, 'help|H|h' => \$_help, 'version|V' => \$_version,
293 'minimize-connections' => \$Git::SVN::Migration::_minimize,
294 'id|i=s' => \$Git::SVN::default_ref_id,
295 'svn-remote|remote|R=s' => sub {
296 $Git::SVN::no_reuse_existing = 1;
297 $Git::SVN::default_repo_id = $_[1] });
298 exit 1 if (!$rv && $cmd && $cmd ne 'log');
300 usage(0) if $_help;
301 version() if $_version;
302 usage(1) unless defined $cmd;
303 load_authors() if $_authors;
304 if (defined $_authors_prog) {
305 $_authors_prog = "'" . File::Spec->rel2abs($_authors_prog) . "'";
306 }
308 unless ($cmd =~ /^(?:clone|init|multi-init|commit-diff)$/) {
309 Git::SVN::Migration::migration_check();
310 }
311 Git::SVN::init_vars();
312 eval {
313 Git::SVN::verify_remotes_sanity();
314 $cmd{$cmd}->[0]->(@ARGV);
315 };
316 fatal $@ if $@;
317 post_fetch_checkout();
318 exit 0;
320 ####################### primary functions ######################
321 sub usage {
322 my $exit = shift || 0;
323 my $fd = $exit ? \*STDERR : \*STDOUT;
324 print $fd <<"";
325 git-svn - bidirectional operations between a single Subversion tree and git
326 Usage: git svn <command> [options] [arguments]\n
328 print $fd "Available commands:\n" unless $cmd;
330 foreach (sort keys %cmd) {
331 next if $cmd && $cmd ne $_;
332 next if /^multi-/; # don't show deprecated commands
333 print $fd ' ',pack('A17',$_),$cmd{$_}->[1],"\n";
334 foreach (sort keys %{$cmd{$_}->[2]}) {
335 # mixed-case options are for .git/config only
336 next if /[A-Z]/ && /^[a-z]+$/i;
337 # prints out arguments as they should be passed:
338 my $x = s#[:=]s$## ? '<arg>' : s#[:=]i$## ? '<num>' : '';
339 print $fd ' ' x 21, join(', ', map { length $_ > 1 ?
340 "--$_" : "-$_" }
341 split /\|/,$_)," $x\n";
342 }
343 }
344 print $fd <<"";
345 \nGIT_SVN_ID may be set in the environment or via the --id/-i switch to an
346 arbitrary identifier if you're tracking multiple SVN branches/repositories in
347 one git repository and want to keep them separate. See git-svn(1) for more
348 information.
350 exit $exit;
351 }
353 sub version {
354 ::_req_svn();
355 print "git-svn version $VERSION (svn $SVN::Core::VERSION)\n";
356 exit 0;
357 }
359 sub do_git_init_db {
360 unless (-d $ENV{GIT_DIR}) {
361 my @init_db = ('init');
362 push @init_db, "--template=$_template" if defined $_template;
363 if (defined $_shared) {
364 if ($_shared =~ /[a-z]/) {
365 push @init_db, "--shared=$_shared";
366 } else {
367 push @init_db, "--shared";
368 }
369 }
370 command_noisy(@init_db);
371 $_repository = Git->repository(Repository => ".git");
372 }
373 my $set;
374 my $pfx = "svn-remote.$Git::SVN::default_repo_id";
375 foreach my $i (keys %icv) {
376 die "'$set' and '$i' cannot both be set\n" if $set;
377 next unless defined $icv{$i};
378 command_noisy('config', "$pfx.$i", $icv{$i});
379 $set = $i;
380 }
381 my $ignore_regex = \$SVN::Git::Fetcher::_ignore_regex;
382 command_noisy('config', "$pfx.ignore-paths", $$ignore_regex)
383 if defined $$ignore_regex;
384 }
386 sub init_subdir {
387 my $repo_path = shift or return;
388 mkpath([$repo_path]) unless -d $repo_path;
389 chdir $repo_path or die "Couldn't chdir to $repo_path: $!\n";
390 $ENV{GIT_DIR} = '.git';
391 $_repository = Git->repository(Repository => $ENV{GIT_DIR});
392 }
394 sub cmd_clone {
395 my ($url, $path) = @_;
396 if (!defined $path &&
397 (defined $_trunk || @_branches || @_tags ||
398 defined $_stdlayout) &&
399 $url !~ m#^[a-z\+]+://#) {
400 $path = $url;
401 }
402 $path = basename($url) if !defined $path || !length $path;
403 my $authors_absolute = $_authors ? File::Spec->rel2abs($_authors) : "";
404 cmd_init($url, $path);
405 command_oneline('config', 'svn.authorsfile', $authors_absolute)
406 if $_authors;
407 Git::SVN::fetch_all($Git::SVN::default_repo_id);
408 }
410 sub cmd_init {
411 if (defined $_stdlayout) {
412 $_trunk = 'trunk' if (!defined $_trunk);
413 @_tags = 'tags' if (! @_tags);
414 @_branches = 'branches' if (! @_branches);
415 }
416 if (defined $_trunk || @_branches || @_tags) {
417 return cmd_multi_init(@_);
418 }
419 my $url = shift or die "SVN repository location required ",
420 "as a command-line argument\n";
421 $url = canonicalize_url($url);
422 init_subdir(@_);
423 do_git_init_db();
425 if ($Git::SVN::_minimize_url eq 'unset') {
426 $Git::SVN::_minimize_url = 0;
427 }
429 Git::SVN->init($url);
430 }
432 sub cmd_fetch {
433 if (grep /^\d+=./, @_) {
434 die "'<rev>=<commit>' fetch arguments are ",
435 "no longer supported.\n";
436 }
437 my ($remote) = @_;
438 if (@_ > 1) {
439 die "Usage: $0 fetch [--all] [--parent] [svn-remote]\n";
440 }
441 $Git::SVN::no_reuse_existing = undef;
442 if ($_fetch_parent) {
443 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
444 unless ($gs) {
445 die "Unable to determine upstream SVN information from ",
446 "working tree history\n";
447 }
448 # just fetch, don't checkout.
449 $_no_checkout = 'true';
450 $_fetch_all ? $gs->fetch_all : $gs->fetch;
451 } elsif ($_fetch_all) {
452 cmd_multi_fetch();
453 } else {
454 $remote ||= $Git::SVN::default_repo_id;
455 Git::SVN::fetch_all($remote, Git::SVN::read_all_remotes());
456 }
457 }
459 sub cmd_set_tree {
460 my (@commits) = @_;
461 if ($_stdin || !@commits) {
462 print "Reading from stdin...\n";
463 @commits = ();
464 while (<STDIN>) {
465 if (/\b($sha1_short)\b/o) {
466 unshift @commits, $1;
467 }
468 }
469 }
470 my @revs;
471 foreach my $c (@commits) {
472 my @tmp = command('rev-parse',$c);
473 if (scalar @tmp == 1) {
474 push @revs, $tmp[0];
475 } elsif (scalar @tmp > 1) {
476 push @revs, reverse(command('rev-list',@tmp));
477 } else {
478 fatal "Failed to rev-parse $c";
479 }
480 }
481 my $gs = Git::SVN->new;
482 my ($r_last, $cmt_last) = $gs->last_rev_commit;
483 $gs->fetch;
484 if (defined $gs->{last_rev} && $r_last != $gs->{last_rev}) {
485 fatal "There are new revisions that were fetched ",
486 "and need to be merged (or acknowledged) ",
487 "before committing.\nlast rev: $r_last\n",
488 " current: $gs->{last_rev}";
489 }
490 $gs->set_tree($_) foreach @revs;
491 print "Done committing ",scalar @revs," revisions to SVN\n";
492 unlink $gs->{index};
493 }
495 sub cmd_dcommit {
496 my $head = shift;
497 command_noisy(qw/update-index --refresh/);
498 git_cmd_try { command_oneline(qw/diff-index --quiet HEAD/) }
499 'Cannot dcommit with a dirty index. Commit your changes first, '
500 . "or stash them with `git stash'.\n";
501 $head ||= 'HEAD';
503 my $old_head;
504 if ($head ne 'HEAD') {
505 $old_head = eval {
506 command_oneline([qw/symbolic-ref -q HEAD/])
507 };
508 if ($old_head) {
509 $old_head =~ s{^refs/heads/}{};
510 } else {
511 $old_head = eval { command_oneline(qw/rev-parse HEAD/) };
512 }
513 command(['checkout', $head], STDERR => 0);
514 }
516 my @refs;
517 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD', \@refs);
518 unless ($gs) {
519 die "Unable to determine upstream SVN information from ",
520 "$head history.\nPerhaps the repository is empty.";
521 }
523 if (defined $_commit_url) {
524 $url = $_commit_url;
525 } else {
526 $url = eval { command_oneline('config', '--get',
527 "svn-remote.$gs->{repo_id}.commiturl") };
528 if (!$url) {
529 $url = $gs->full_url
530 }
531 }
533 my $last_rev = $_revision if defined $_revision;
534 if ($url) {
535 print "Committing to $url ...\n";
536 }
537 my ($linear_refs, $parents) = linearize_history($gs, \@refs);
538 if ($_no_rebase && scalar(@$linear_refs) > 1) {
539 warn "Attempting to commit more than one change while ",
540 "--no-rebase is enabled.\n",
541 "If these changes depend on each other, re-running ",
542 "without --no-rebase may be required."
543 }
544 my $expect_url = $url;
545 Git::SVN::remove_username($expect_url);
546 while (1) {
547 my $d = shift @$linear_refs or last;
548 unless (defined $last_rev) {
549 (undef, $last_rev, undef) = cmt_metadata("$d~1");
550 unless (defined $last_rev) {
551 fatal "Unable to extract revision information ",
552 "from commit $d~1";
553 }
554 }
555 if ($_dry_run) {
556 print "diff-tree $d~1 $d\n";
557 } else {
558 my $cmt_rev;
559 my %ed_opts = ( r => $last_rev,
560 log => get_commit_entry($d)->{log},
561 ra => Git::SVN::Ra->new($url),
562 config => SVN::Core::config_get_config(
563 $Git::SVN::Ra::config_dir
564 ),
565 tree_a => "$d~1",
566 tree_b => $d,
567 editor_cb => sub {
568 print "Committed r$_[0]\n";
569 $cmt_rev = $_[0];
570 },
571 svn_path => '');
572 if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) {
573 print "No changes\n$d~1 == $d\n";
574 } elsif ($parents->{$d} && @{$parents->{$d}}) {
575 $gs->{inject_parents_dcommit}->{$cmt_rev} =
576 $parents->{$d};
577 }
578 $_fetch_all ? $gs->fetch_all : $gs->fetch;
579 $last_rev = $cmt_rev;
580 next if $_no_rebase;
582 # we always want to rebase against the current HEAD,
583 # not any head that was passed to us
584 my @diff = command('diff-tree', $d,
585 $gs->refname, '--');
586 my @finish;
587 if (@diff) {
588 @finish = rebase_cmd();
589 print STDERR "W: $d and ", $gs->refname,
590 " differ, using @finish:\n",
591 join("\n", @diff), "\n";
592 } else {
593 print "No changes between current HEAD and ",
594 $gs->refname,
595 "\nResetting to the latest ",
596 $gs->refname, "\n";
597 @finish = qw/reset --mixed/;
598 }
599 command_noisy(@finish, $gs->refname);
600 if (@diff) {
601 @refs = ();
602 my ($url_, $rev_, $uuid_, $gs_) =
603 working_head_info('HEAD', \@refs);
604 my ($linear_refs_, $parents_) =
605 linearize_history($gs_, \@refs);
606 if (scalar(@$linear_refs) !=
607 scalar(@$linear_refs_)) {
608 fatal "# of revisions changed ",
609 "\nbefore:\n",
610 join("\n", @$linear_refs),
611 "\n\nafter:\n",
612 join("\n", @$linear_refs_), "\n",
613 'If you are attempting to commit ',
614 "merges, try running:\n\t",
615 'git rebase --interactive',
616 '--preserve-merges ',
617 $gs->refname,
618 "\nBefore dcommitting";
619 }
620 if ($url_ ne $expect_url) {
621 if ($url_ eq $gs->metadata_url) {
622 print
623 "Accepting rewritten URL:",
624 " $url_\n";
625 } else {
626 fatal
627 "URL mismatch after rebase:",
628 " $url_ != $expect_url";
629 }
630 }
631 if ($uuid_ ne $uuid) {
632 fatal "uuid mismatch after rebase: ",
633 "$uuid_ != $uuid";
634 }
635 # remap parents
636 my (%p, @l, $i);
637 for ($i = 0; $i < scalar @$linear_refs; $i++) {
638 my $new = $linear_refs_->[$i] or next;
639 $p{$new} =
640 $parents->{$linear_refs->[$i]};
641 push @l, $new;
642 }
643 $parents = \%p;
644 $linear_refs = \@l;
645 }
646 }
647 }
649 if ($old_head) {
650 my $new_head = command_oneline(qw/rev-parse HEAD/);
651 my $new_is_symbolic = eval {
652 command_oneline(qw/symbolic-ref -q HEAD/);
653 };
654 if ($new_is_symbolic) {
655 print "dcommitted the branch ", $head, "\n";
656 } else {
657 print "dcommitted on a detached HEAD because you gave ",
658 "a revision argument.\n",
659 "The rewritten commit is: ", $new_head, "\n";
660 }
661 command(['checkout', $old_head], STDERR => 0);
662 }
664 unlink $gs->{index};
665 }
667 sub cmd_branch {
668 my ($branch_name, $head) = @_;
670 unless (defined $branch_name && length $branch_name) {
671 die(($_tag ? "tag" : "branch") . " name required\n");
672 }
673 $head ||= 'HEAD';
675 my (undef, $rev, undef, $gs) = working_head_info($head);
676 my $src = $gs->full_url;
678 my $remote = Git::SVN::read_all_remotes()->{$gs->{repo_id}};
679 my $allglobs = $remote->{ $_tag ? 'tags' : 'branches' };
680 my $glob;
681 if ($#{$allglobs} == 0) {
682 $glob = $allglobs->[0];
683 } else {
684 unless(defined $_branch_dest) {
685 die "Multiple ",
686 $_tag ? "tag" : "branch",
687 " paths defined for Subversion repository.\n",
688 "You must specify where you want to create the ",
689 $_tag ? "tag" : "branch",
690 " with the --destination argument.\n";
691 }
692 foreach my $g (@{$allglobs}) {
693 # SVN::Git::Editor could probably be moved to Git.pm..
694 my $re = SVN::Git::Editor::glob2pat($g->{path}->{left});
695 if ($_branch_dest =~ /$re/) {
696 $glob = $g;
697 last;
698 }
699 }
700 unless (defined $glob) {
701 my $dest_re = qr/\b\Q$_branch_dest\E\b/;
702 foreach my $g (@{$allglobs}) {
703 $g->{path}->{left} =~ /$dest_re/ or next;
704 if (defined $glob) {
705 die "Ambiguous destination: ",
706 $_branch_dest, "\nmatches both '",
707 $glob->{path}->{left}, "' and '",
708 $g->{path}->{left}, "'\n";
709 }
710 $glob = $g;
711 }
712 unless (defined $glob) {
713 die "Unknown ",
714 $_tag ? "tag" : "branch",
715 " destination $_branch_dest\n";
716 }
717 }
718 }
719 my ($lft, $rgt) = @{ $glob->{path} }{qw/left right/};
720 my $url;
721 if (defined $_commit_url) {
722 $url = $_commit_url;
723 } else {
724 $url = eval { command_oneline('config', '--get',
725 "svn-remote.$gs->{repo_id}.commiturl") };
726 if (!$url) {
727 $url = $remote->{url};
728 }
729 }
730 my $dst = join '/', $url, $lft, $branch_name, ($rgt || ());
732 if ($dst =~ /^https:/ && $src =~ /^http:/) {
733 $src=~s/^http:/https:/;
734 }
736 ::_req_svn();
738 my $ctx = SVN::Client->new(
739 auth => Git::SVN::Ra::_auth_providers(),
740 log_msg => sub {
741 ${ $_[0] } = defined $_message
742 ? $_message
743 : 'Create ' . ($_tag ? 'tag ' : 'branch ' )
744 . $branch_name;
745 },
746 );
748 eval {
749 $ctx->ls($dst, 'HEAD', 0);
750 } and die "branch ${branch_name} already exists\n";
752 print "Copying ${src} at r${rev} to ${dst}...\n";
753 $ctx->copy($src, $rev, $dst)
754 unless $_dry_run;
756 $gs->fetch_all;
757 }
759 sub cmd_find_rev {
760 my $revision_or_hash = shift or die "SVN or git revision required ",
761 "as a command-line argument\n";
762 my $result;
763 if ($revision_or_hash =~ /^r\d+$/) {
764 my $head = shift;
765 $head ||= 'HEAD';
766 my @refs;
767 my (undef, undef, $uuid, $gs) = working_head_info($head, \@refs);
768 unless ($gs) {
769 die "Unable to determine upstream SVN information from ",
770 "$head history\n";
771 }
772 my $desired_revision = substr($revision_or_hash, 1);
773 $result = $gs->rev_map_get($desired_revision, $uuid);
774 } else {
775 my (undef, $rev, undef) = cmt_metadata($revision_or_hash);
776 $result = $rev;
777 }
778 print "$result\n" if $result;
779 }
781 sub cmd_rebase {
782 command_noisy(qw/update-index --refresh/);
783 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
784 unless ($gs) {
785 die "Unable to determine upstream SVN information from ",
786 "working tree history\n";
787 }
788 if ($_dry_run) {
789 print "Remote Branch: " . $gs->refname . "\n";
790 print "SVN URL: " . $url . "\n";
791 return;
792 }
793 if (command(qw/diff-index HEAD --/)) {
794 print STDERR "Cannot rebase with uncommited changes:\n";
795 command_noisy('status');
796 exit 1;
797 }
798 unless ($_local) {
799 # rebase will checkout for us, so no need to do it explicitly
800 $_no_checkout = 'true';
801 $_fetch_all ? $gs->fetch_all : $gs->fetch;
802 }
803 command_noisy(rebase_cmd(), $gs->refname);
804 $gs->mkemptydirs;
805 }
807 sub cmd_show_ignore {
808 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
809 $gs ||= Git::SVN->new;
810 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
811 $gs->prop_walk($gs->{path}, $r, sub {
812 my ($gs, $path, $props) = @_;
813 print STDOUT "\n# $path\n";
814 my $s = $props->{'svn:ignore'} or return;
815 $s =~ s/[\r\n]+/\n/g;
816 $s =~ s/^\n+//;
817 chomp $s;
818 $s =~ s#^#$path#gm;
819 print STDOUT "$s\n";
820 });
821 }
823 sub cmd_show_externals {
824 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
825 $gs ||= Git::SVN->new;
826 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
827 $gs->prop_walk($gs->{path}, $r, sub {
828 my ($gs, $path, $props) = @_;
829 print STDOUT "\n# $path\n";
830 my $s = $props->{'svn:externals'} or return;
831 $s =~ s/[\r\n]+/\n/g;
832 chomp $s;
833 $s =~ s#^#$path#gm;
834 print STDOUT "$s\n";
835 });
836 }
838 sub cmd_create_ignore {
839 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
840 $gs ||= Git::SVN->new;
841 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
842 $gs->prop_walk($gs->{path}, $r, sub {
843 my ($gs, $path, $props) = @_;
844 # $path is of the form /path/to/dir/
845 $path = '.' . $path;
846 # SVN can have attributes on empty directories,
847 # which git won't track
848 mkpath([$path]) unless -d $path;
849 my $ignore = $path . '.gitignore';
850 my $s = $props->{'svn:ignore'} or return;
851 open(GITIGNORE, '>', $ignore)
852 or fatal("Failed to open `$ignore' for writing: $!");
853 $s =~ s/[\r\n]+/\n/g;
854 $s =~ s/^\n+//;
855 chomp $s;
856 # Prefix all patterns so that the ignore doesn't apply
857 # to sub-directories.
858 $s =~ s#^#/#gm;
859 print GITIGNORE "$s\n";
860 close(GITIGNORE)
861 or fatal("Failed to close `$ignore': $!");
862 command_noisy('add', '-f', $ignore);
863 });
864 }
866 sub cmd_mkdirs {
867 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
868 $gs ||= Git::SVN->new;
869 $gs->mkemptydirs($_revision);
870 }
872 sub canonicalize_path {
873 my ($path) = @_;
874 my $dot_slash_added = 0;
875 if (substr($path, 0, 1) ne "/") {
876 $path = "./" . $path;
877 $dot_slash_added = 1;
878 }
879 # File::Spec->canonpath doesn't collapse x/../y into y (for a
880 # good reason), so let's do this manually.
881 $path =~ s#/+#/#g;
882 $path =~ s#/\.(?:/|$)#/#g;
883 $path =~ s#/[^/]+/\.\.##g;
884 $path =~ s#/$##g;
885 $path =~ s#^\./## if $dot_slash_added;
886 $path =~ s#^/##;
887 $path =~ s#^\.$##;
888 return $path;
889 }
891 sub canonicalize_url {
892 my ($url) = @_;
893 $url =~ s#^([^:]+://[^/]*/)(.*)$#$1 . canonicalize_path($2)#e;
894 return $url;
895 }
897 # get_svnprops(PATH)
898 # ------------------
899 # Helper for cmd_propget and cmd_proplist below.
900 sub get_svnprops {
901 my $path = shift;
902 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
903 $gs ||= Git::SVN->new;
905 # prefix THE PATH by the sub-directory from which the user
906 # invoked us.
907 $path = $cmd_dir_prefix . $path;
908 fatal("No such file or directory: $path") unless -e $path;
909 my $is_dir = -d $path ? 1 : 0;
910 $path = $gs->{path} . '/' . $path;
912 # canonicalize the path (otherwise libsvn will abort or fail to
913 # find the file)
914 $path = canonicalize_path($path);
916 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
917 my $props;
918 if ($is_dir) {
919 (undef, undef, $props) = $gs->ra->get_dir($path, $r);
920 }
921 else {
922 (undef, $props) = $gs->ra->get_file($path, $r, undef);
923 }
924 return $props;
925 }
927 # cmd_propget (PROP, PATH)
928 # ------------------------
929 # Print the SVN property PROP for PATH.
930 sub cmd_propget {
931 my ($prop, $path) = @_;
932 $path = '.' if not defined $path;
933 usage(1) if not defined $prop;
934 my $props = get_svnprops($path);
935 if (not defined $props->{$prop}) {
936 fatal("`$path' does not have a `$prop' SVN property.");
937 }
938 print $props->{$prop} . "\n";
939 }
941 # cmd_proplist (PATH)
942 # -------------------
943 # Print the list of SVN properties for PATH.
944 sub cmd_proplist {
945 my $path = shift;
946 $path = '.' if not defined $path;
947 my $props = get_svnprops($path);
948 print "Properties on '$path':\n";
949 foreach (sort keys %{$props}) {
950 print " $_\n";
951 }
952 }
954 sub cmd_multi_init {
955 my $url = shift;
956 unless (defined $_trunk || @_branches || @_tags) {
957 usage(1);
958 }
960 $_prefix = '' unless defined $_prefix;
961 if (defined $url) {
962 $url = canonicalize_url($url);
963 init_subdir(@_);
964 }
965 do_git_init_db();
966 if (defined $_trunk) {
967 $_trunk =~ s#^/+##;
968 my $trunk_ref = 'refs/remotes/' . $_prefix . 'trunk';
969 # try both old-style and new-style lookups:
970 my $gs_trunk = eval { Git::SVN->new($trunk_ref) };
971 unless ($gs_trunk) {
972 my ($trunk_url, $trunk_path) =
973 complete_svn_url($url, $_trunk);
974 $gs_trunk = Git::SVN->init($trunk_url, $trunk_path,
975 undef, $trunk_ref);
976 }
977 }
978 return unless @_branches || @_tags;
979 my $ra = $url ? Git::SVN::Ra->new($url) : undef;
980 foreach my $path (@_branches) {
981 complete_url_ls_init($ra, $path, '--branches/-b', $_prefix);
982 }
983 foreach my $path (@_tags) {
984 complete_url_ls_init($ra, $path, '--tags/-t', $_prefix.'tags/');
985 }
986 }
988 sub cmd_multi_fetch {
989 $Git::SVN::no_reuse_existing = undef;
990 my $remotes = Git::SVN::read_all_remotes();
991 foreach my $repo_id (sort keys %$remotes) {
992 if ($remotes->{$repo_id}->{url}) {
993 Git::SVN::fetch_all($repo_id, $remotes);
994 }
995 }
996 }
998 # this command is special because it requires no metadata
999 sub cmd_commit_diff {
1000 my ($ta, $tb, $url) = @_;
1001 my $usage = "Usage: $0 commit-diff -r<revision> ".
1002 "<tree-ish> <tree-ish> [<URL>]";
1003 fatal($usage) if (!defined $ta || !defined $tb);
1004 my $svn_path = '';
1005 if (!defined $url) {
1006 my $gs = eval { Git::SVN->new };
1007 if (!$gs) {
1008 fatal("Needed URL or usable git-svn --id in ",
1009 "the command-line\n", $usage);
1010 }
1011 $url = $gs->{url};
1012 $svn_path = $gs->{path};
1013 }
1014 unless (defined $_revision) {
1015 fatal("-r|--revision is a required argument\n", $usage);
1016 }
1017 if (defined $_message && defined $_file) {
1018 fatal("Both --message/-m and --file/-F specified ",
1019 "for the commit message.\n",
1020 "I have no idea what you mean");
1021 }
1022 if (defined $_file) {
1023 $_message = file_to_s($_file);
1024 } else {
1025 $_message ||= get_commit_entry($tb)->{log};
1026 }
1027 my $ra ||= Git::SVN::Ra->new($url);
1028 my $r = $_revision;
1029 if ($r eq 'HEAD') {
1030 $r = $ra->get_latest_revnum;
1031 } elsif ($r !~ /^\d+$/) {
1032 die "revision argument: $r not understood by git-svn\n";
1033 }
1034 my %ed_opts = ( r => $r,
1035 log => $_message,
1036 ra => $ra,
1037 tree_a => $ta,
1038 tree_b => $tb,
1039 editor_cb => sub { print "Committed r$_[0]\n" },
1040 svn_path => $svn_path );
1041 if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) {
1042 print "No changes\n$ta == $tb\n";
1043 }
1044 }
1046 sub escape_uri_only {
1047 my ($uri) = @_;
1048 my @tmp;
1049 foreach (split m{/}, $uri) {
1050 s/([^~\w.%+-]|%(?![a-fA-F0-9]{2}))/sprintf("%%%02X",ord($1))/eg;
1051 push @tmp, $_;
1052 }
1053 join('/', @tmp);
1054 }
1056 sub escape_url {
1057 my ($url) = @_;
1058 if ($url =~ m#^([^:]+)://([^/]*)(.*)$#) {
1059 my ($scheme, $domain, $uri) = ($1, $2, escape_uri_only($3));
1060 $url = "$scheme://$domain$uri";
1061 }
1062 $url;
1063 }
1065 sub cmd_info {
1066 my $path = canonicalize_path(defined($_[0]) ? $_[0] : ".");
1067 my $fullpath = canonicalize_path($cmd_dir_prefix . $path);
1068 if (exists $_[1]) {
1069 die "Too many arguments specified\n";
1070 }
1072 my ($file_type, $diff_status) = find_file_type_and_diff_status($path);
1074 if (!$file_type && !$diff_status) {
1075 print STDERR "svn: '$path' is not under version control\n";
1076 exit 1;
1077 }
1079 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
1080 unless ($gs) {
1081 die "Unable to determine upstream SVN information from ",
1082 "working tree history\n";
1083 }
1085 # canonicalize_path() will return "" to make libsvn 1.5.x happy,
1086 $path = "." if $path eq "";
1088 my $full_url = $url . ($fullpath eq "" ? "" : "/$fullpath");
1090 if ($_url) {
1091 print escape_url($full_url), "\n";
1092 return;
1093 }
1095 my $result = "Path: $path\n";
1096 $result .= "Name: " . basename($path) . "\n" if $file_type ne "dir";
1097 $result .= "URL: " . escape_url($full_url) . "\n";
1099 eval {
1100 my $repos_root = $gs->repos_root;
1101 Git::SVN::remove_username($repos_root);
1102 $result .= "Repository Root: " . escape_url($repos_root) . "\n";
1103 };
1104 if ($@) {
1105 $result .= "Repository Root: (offline)\n";
1106 }
1107 ::_req_svn();
1108 $result .= "Repository UUID: $uuid\n" unless $diff_status eq "A" &&
1109 ($SVN::Core::VERSION le '1.5.4' || $file_type ne "dir");
1110 $result .= "Revision: " . ($diff_status eq "A" ? 0 : $rev) . "\n";
1112 $result .= "Node Kind: " .
1113 ($file_type eq "dir" ? "directory" : "file") . "\n";
1115 my $schedule = $diff_status eq "A"
1116 ? "add"
1117 : ($diff_status eq "D" ? "delete" : "normal");
1118 $result .= "Schedule: $schedule\n";
1120 if ($diff_status eq "A") {
1121 print $result, "\n";
1122 return;
1123 }
1125 my ($lc_author, $lc_rev, $lc_date_utc);
1126 my @args = Git::SVN::Log::git_svn_log_cmd($rev, $rev, "--", $fullpath);
1127 my $log = command_output_pipe(@args);
1128 my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/;
1129 while (<$log>) {
1130 if (/^${esc_color}author (.+) <[^>]+> (\d+) ([\-\+]?\d+)$/o) {
1131 $lc_author = $1;
1132 $lc_date_utc = Git::SVN::Log::parse_git_date($2, $3);
1133 } elsif (/^${esc_color} (git-svn-id:.+)$/o) {
1134 (undef, $lc_rev, undef) = ::extract_metadata($1);
1135 }
1136 }
1137 close $log;
1139 Git::SVN::Log::set_local_timezone();
1141 $result .= "Last Changed Author: $lc_author\n";
1142 $result .= "Last Changed Rev: $lc_rev\n";
1143 $result .= "Last Changed Date: " .
1144 Git::SVN::Log::format_svn_date($lc_date_utc) . "\n";
1146 if ($file_type ne "dir") {
1147 my $text_last_updated_date =
1148 ($diff_status eq "D" ? $lc_date_utc : (stat $path)[9]);
1149 $result .=
1150 "Text Last Updated: " .
1151 Git::SVN::Log::format_svn_date($text_last_updated_date) .
1152 "\n";
1153 my $checksum;
1154 if ($diff_status eq "D") {
1155 my ($fh, $ctx) =
1156 command_output_pipe(qw(cat-file blob), "HEAD:$path");
1157 if ($file_type eq "link") {
1158 my $file_name = <$fh>;
1159 $checksum = md5sum("link $file_name");
1160 } else {
1161 $checksum = md5sum($fh);
1162 }
1163 command_close_pipe($fh, $ctx);
1164 } elsif ($file_type eq "link") {
1165 my $file_name =
1166 command(qw(cat-file blob), "HEAD:$path");
1167 $checksum =
1168 md5sum("link " . $file_name);
1169 } else {
1170 open FILE, "<", $path or die $!;
1171 $checksum = md5sum(\*FILE);
1172 close FILE or die $!;
1173 }
1174 $result .= "Checksum: " . $checksum . "\n";
1175 }
1177 print $result, "\n";
1178 }
1180 sub cmd_reset {
1181 my $target = shift || $_revision or die "SVN revision required\n";
1182 $target = $1 if $target =~ /^r(\d+)$/;
1183 $target =~ /^\d+$/ or die "Numeric SVN revision expected\n";
1184 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
1185 unless ($gs) {
1186 die "Unable to determine upstream SVN information from ".
1187 "history\n";
1188 }
1189 my ($r, $c) = $gs->find_rev_before($target, not $_fetch_parent);
1190 die "Cannot find SVN revision $target\n" unless defined($c);
1191 $gs->rev_map_set($r, $c, 'reset', $uuid);
1192 print "r$r = $c ($gs->{ref_id})\n";
1193 }
1195 sub cmd_gc {
1196 if (!$can_compress) {
1197 warn "Compress::Zlib could not be found; unhandled.log " .
1198 "files will not be compressed.\n";
1199 }
1200 find({ wanted => \&gc_directory, no_chdir => 1}, "$ENV{GIT_DIR}/svn");
1201 }
1203 ########################### utility functions #########################
1205 sub rebase_cmd {
1206 my @cmd = qw/rebase/;
1207 push @cmd, '-v' if $_verbose;
1208 push @cmd, qw/--merge/ if $_merge;
1209 push @cmd, "--strategy=$_strategy" if $_strategy;
1210 @cmd;
1211 }
1213 sub post_fetch_checkout {
1214 return if $_no_checkout;
1215 my $gs = $Git::SVN::_head or return;
1216 return if verify_ref('refs/heads/master^0');
1218 # look for "trunk" ref if it exists
1219 my $remote = Git::SVN::read_all_remotes()->{$gs->{repo_id}};
1220 my $fetch = $remote->{fetch};
1221 if ($fetch) {
1222 foreach my $p (keys %$fetch) {
1223 basename($fetch->{$p}) eq 'trunk' or next;
1224 $gs = Git::SVN->new($fetch->{$p}, $gs->{repo_id}, $p);
1225 last;
1226 }
1227 }
1229 my $valid_head = verify_ref('HEAD^0');
1230 command_noisy(qw(update-ref refs/heads/master), $gs->refname);
1231 return if ($valid_head || !verify_ref('HEAD^0'));
1233 return if $ENV{GIT_DIR} !~ m#^(?:.*/)?\.git$#;
1234 my $index = $ENV{GIT_INDEX_FILE} || "$ENV{GIT_DIR}/index";
1235 return if -f $index;
1237 return if command_oneline(qw/rev-parse --is-inside-work-tree/) eq 'false';
1238 return if command_oneline(qw/rev-parse --is-inside-git-dir/) eq 'true';
1239 command_noisy(qw/read-tree -m -u -v HEAD HEAD/);
1240 print STDERR "Checked out HEAD:\n ",
1241 $gs->full_url, " r", $gs->last_rev, "\n";
1242 $gs->mkemptydirs($gs->last_rev);
1243 }
1245 sub complete_svn_url {
1246 my ($url, $path) = @_;
1247 $path =~ s#/+$##;
1248 if ($path !~ m#^[a-z\+]+://#) {
1249 if (!defined $url || $url !~ m#^[a-z\+]+://#) {
1250 fatal("E: '$path' is not a complete URL ",
1251 "and a separate URL is not specified");
1252 }
1253 return ($url, $path);
1254 }
1255 return ($path, '');
1256 }
1258 sub complete_url_ls_init {
1259 my ($ra, $repo_path, $switch, $pfx) = @_;
1260 unless ($repo_path) {
1261 print STDERR "W: $switch not specified\n";
1262 return;
1263 }
1264 $repo_path =~ s#/+$##;
1265 if ($repo_path =~ m#^[a-z\+]+://#) {
1266 $ra = Git::SVN::Ra->new($repo_path);
1267 $repo_path = '';
1268 } else {
1269 $repo_path =~ s#^/+##;
1270 unless ($ra) {
1271 fatal("E: '$repo_path' is not a complete URL ",
1272 "and a separate URL is not specified");
1273 }
1274 }
1275 my $url = $ra->{url};
1276 my $gs = Git::SVN->init($url, undef, undef, undef, 1);
1277 my $k = "svn-remote.$gs->{repo_id}.url";
1278 my $orig_url = eval { command_oneline(qw/config --get/, $k) };
1279 if ($orig_url && ($orig_url ne $gs->{url})) {
1280 die "$k already set: $orig_url\n",
1281 "wanted to set to: $gs->{url}\n";
1282 }
1283 command_oneline('config', $k, $gs->{url}) unless $orig_url;
1284 my $remote_path = "$gs->{path}/$repo_path";
1285 $remote_path =~ s{%([0-9A-F]{2})}{chr hex($1)}ieg;
1286 $remote_path =~ s#/+#/#g;
1287 $remote_path =~ s#^/##g;
1288 $remote_path .= "/*" if $remote_path !~ /\*/;
1289 my ($n) = ($switch =~ /^--(\w+)/);
1290 if (length $pfx && $pfx !~ m#/$#) {
1291 die "--prefix='$pfx' must have a trailing slash '/'\n";
1292 }
1293 command_noisy('config',
1294 '--add',
1295 "svn-remote.$gs->{repo_id}.$n",
1296 "$remote_path:refs/remotes/$pfx*" .
1297 ('/*' x (($remote_path =~ tr/*/*/) - 1)) );
1298 }
1300 sub verify_ref {
1301 my ($ref) = @_;
1302 eval { command_oneline([ 'rev-parse', '--verify', $ref ],
1303 { STDERR => 0 }); };
1304 }
1306 sub get_tree_from_treeish {
1307 my ($treeish) = @_;
1308 # $treeish can be a symbolic ref, too:
1309 my $type = command_oneline(qw/cat-file -t/, $treeish);
1310 my $expected;
1311 while ($type eq 'tag') {
1312 ($treeish, $type) = command(qw/cat-file tag/, $treeish);
1313 }
1314 if ($type eq 'commit') {
1315 $expected = (grep /^tree /, command(qw/cat-file commit/,
1316 $treeish))[0];
1317 ($expected) = ($expected =~ /^tree ($sha1)$/o);
1318 die "Unable to get tree from $treeish\n" unless $expected;
1319 } elsif ($type eq 'tree') {
1320 $expected = $treeish;
1321 } else {
1322 die "$treeish is a $type, expected tree, tag or commit\n";
1323 }
1324 return $expected;
1325 }
1327 sub get_commit_entry {
1328 my ($treeish) = shift;
1329 my %log_entry = ( log => '', tree => get_tree_from_treeish($treeish) );
1330 my $commit_editmsg = "$ENV{GIT_DIR}/COMMIT_EDITMSG";
1331 my $commit_msg = "$ENV{GIT_DIR}/COMMIT_MSG";
1332 open my $log_fh, '>', $commit_editmsg or croak $!;
1334 my $type = command_oneline(qw/cat-file -t/, $treeish);
1335 if ($type eq 'commit' || $type eq 'tag') {
1336 my ($msg_fh, $ctx) = command_output_pipe('cat-file',
1337 $type, $treeish);
1338 my $in_msg = 0;
1339 my $author;
1340 my $saw_from = 0;
1341 my $msgbuf = "";
1342 while (<$msg_fh>) {
1343 if (!$in_msg) {
1344 $in_msg = 1 if (/^\s*$/);
1345 $author = $1 if (/^author (.*>)/);
1346 } elsif (/^git-svn-id: /) {
1347 # skip this for now, we regenerate the
1348 # correct one on re-fetch anyways
1349 # TODO: set *:merge properties or like...
1350 } else {
1351 if (/^From:/ || /^Signed-off-by:/) {
1352 $saw_from = 1;
1353 }
1354 $msgbuf .= $_;
1355 }
1356 }
1357 $msgbuf =~ s/\s+$//s;
1358 if ($Git::SVN::_add_author_from && defined($author)
1359 && !$saw_from) {
1360 $msgbuf .= "\n\nFrom: $author";
1361 }
1362 print $log_fh $msgbuf or croak $!;
1363 command_close_pipe($msg_fh, $ctx);
1364 }
1365 close $log_fh or croak $!;
1367 if ($_edit || ($type eq 'tree')) {
1368 chomp(my $editor = command_oneline(qw(var GIT_EDITOR)));
1369 system('sh', '-c', $editor.' "$@"', $editor, $commit_editmsg);
1370 }
1371 rename $commit_editmsg, $commit_msg or croak $!;
1372 {
1373 require Encode;
1374 # SVN requires messages to be UTF-8 when entering the repo
1375 local $/;
1376 open $log_fh, '<', $commit_msg or croak $!;
1377 binmode $log_fh;
1378 chomp($log_entry{log} = <$log_fh>);
1380 my $enc = Git::config('i18n.commitencoding') || 'UTF-8';
1381 my $msg = $log_entry{log};
1383 eval { $msg = Encode::decode($enc, $msg, 1) };
1384 if ($@) {
1385 die "Could not decode as $enc:\n", $msg,
1386 "\nPerhaps you need to set i18n.commitencoding\n";
1387 }
1389 eval { $msg = Encode::encode('UTF-8', $msg, 1) };
1390 die "Could not encode as UTF-8:\n$msg\n" if $@;
1392 $log_entry{log} = $msg;
1394 close $log_fh or croak $!;
1395 }
1396 unlink $commit_msg;
1397 \%log_entry;
1398 }
1400 sub s_to_file {
1401 my ($str, $file, $mode) = @_;
1402 open my $fd,'>',$file or croak $!;
1403 print $fd $str,"\n" or croak $!;
1404 close $fd or croak $!;
1405 chmod ($mode &~ umask, $file) if (defined $mode);
1406 }
1408 sub file_to_s {
1409 my $file = shift;
1410 open my $fd,'<',$file or croak "$!: file: $file\n";
1411 local $/;
1412 my $ret = <$fd>;
1413 close $fd or croak $!;
1414 $ret =~ s/\s*$//s;
1415 return $ret;
1416 }
1418 # '<svn username> = real-name <email address>' mapping based on git-svnimport:
1419 sub load_authors {
1420 open my $authors, '<', $_authors or die "Can't open $_authors $!\n";
1421 my $log = $cmd eq 'log';
1422 while (<$authors>) {
1423 chomp;
1424 next unless /^(.+?|\(no author\))\s*=\s*(.+?)\s*<(.+)>\s*$/;
1425 my ($user, $name, $email) = ($1, $2, $3);
1426 if ($log) {
1427 $Git::SVN::Log::rusers{"$name <$email>"} = $user;
1428 } else {
1429 $users{$user} = [$name, $email];
1430 }
1431 }
1432 close $authors or croak $!;
1433 }
1435 # convert GetOpt::Long specs for use by git-config
1436 sub read_git_config {
1437 my $opts = shift;
1438 my @config_only;
1439 foreach my $o (keys %$opts) {
1440 # if we have mixedCase and a long option-only, then
1441 # it's a config-only variable that we don't need for
1442 # the command-line.
1443 push @config_only, $o if ($o =~ /[A-Z]/ && $o =~ /^[a-z]+$/i);
1444 my $v = $opts->{$o};
1445 my ($key) = ($o =~ /^([a-zA-Z\-]+)/);
1446 $key =~ s/-//g;
1447 my $arg = 'git config';
1448 $arg .= ' --int' if ($o =~ /[:=]i$/);
1449 $arg .= ' --bool' if ($o !~ /[:=][sfi]$/);
1450 if (ref $v eq 'ARRAY') {
1451 chomp(my @tmp = `$arg --get-all svn.$key`);
1452 @$v = @tmp if @tmp;
1453 } else {
1454 chomp(my $tmp = `$arg --get svn.$key`);
1455 if ($tmp && !($arg =~ / --bool/ && $tmp eq 'false')) {
1456 $$v = $tmp;
1457 }
1458 }
1459 }
1460 delete @$opts{@config_only} if @config_only;
1461 }
1463 sub extract_metadata {
1464 my $id = shift or return (undef, undef, undef);
1465 my ($url, $rev, $uuid) = ($id =~ /^\s*git-svn-id:\s+(.*)\@(\d+)
1466 \s([a-f\d\-]+)$/ix);
1467 if (!defined $rev || !$uuid || !$url) {
1468 # some of the original repositories I made had
1469 # identifiers like this:
1470 ($rev, $uuid) = ($id =~/^\s*git-svn-id:\s(\d+)\@([a-f\d\-]+)/i);
1471 }
1472 return ($url, $rev, $uuid);
1473 }
1475 sub cmt_metadata {
1476 return extract_metadata((grep(/^git-svn-id: /,
1477 command(qw/cat-file commit/, shift)))[-1]);
1478 }
1480 sub cmt_sha2rev_batch {
1481 my %s2r;
1482 my ($pid, $in, $out, $ctx) = command_bidi_pipe(qw/cat-file --batch/);
1483 my $list = shift;
1485 foreach my $sha (@{$list}) {
1486 my $first = 1;
1487 my $size = 0;
1488 print $out $sha, "\n";
1490 while (my $line = <$in>) {
1491 if ($first && $line =~ /^[[:xdigit:]]{40}\smissing$/) {
1492 last;
1493 } elsif ($first &&
1494 $line =~ /^[[:xdigit:]]{40}\scommit\s(\d+)$/) {
1495 $first = 0;
1496 $size = $1;
1497 next;
1498 } elsif ($line =~ /^(git-svn-id: )/) {
1499 my (undef, $rev, undef) =
1500 extract_metadata($line);
1501 $s2r{$sha} = $rev;
1502 }
1504 $size -= length($line);
1505 last if ($size == 0);
1506 }
1507 }
1509 command_close_bidi_pipe($pid, $in, $out, $ctx);
1511 return \%s2r;
1512 }
1514 sub working_head_info {
1515 my ($head, $refs) = @_;
1516 my @args = ('log', '--no-color', '--first-parent', '--pretty=medium');
1517 my ($fh, $ctx) = command_output_pipe(@args, $head);
1518 my $hash;
1519 my %max;
1520 while (<$fh>) {
1521 if ( m{^commit ($::sha1)$} ) {
1522 unshift @$refs, $hash if $hash and $refs;
1523 $hash = $1;
1524 next;
1525 }
1526 next unless s{^\s*(git-svn-id:)}{$1};
1527 my ($url, $rev, $uuid) = extract_metadata($_);
1528 if (defined $url && defined $rev) {
1529 next if $max{$url} and $max{$url} < $rev;
1530 if (my $gs = Git::SVN->find_by_url($url)) {
1531 my $c = $gs->rev_map_get($rev, $uuid);
1532 if ($c && $c eq $hash) {
1533 close $fh; # break the pipe
1534 return ($url, $rev, $uuid, $gs);
1535 } else {
1536 $max{$url} ||= $gs->rev_map_max;
1537 }
1538 }
1539 }
1540 }
1541 command_close_pipe($fh, $ctx);
1542 (undef, undef, undef, undef);
1543 }
1545 sub read_commit_parents {
1546 my ($parents, $c) = @_;
1547 chomp(my $p = command_oneline(qw/rev-list --parents -1/, $c));
1548 $p =~ s/^($c)\s*// or die "rev-list --parents -1 $c failed!\n";
1549 @{$parents->{$c}} = split(/ /, $p);
1550 }
1552 sub linearize_history {
1553 my ($gs, $refs) = @_;
1554 my %parents;
1555 foreach my $c (@$refs) {
1556 read_commit_parents(\%parents, $c);
1557 }
1559 my @linear_refs;
1560 my %skip = ();
1561 my $last_svn_commit = $gs->last_commit;
1562 foreach my $c (reverse @$refs) {
1563 next if $c eq $last_svn_commit;
1564 last if $skip{$c};
1566 unshift @linear_refs, $c;
1567 $skip{$c} = 1;
1569 # we only want the first parent to diff against for linear
1570 # history, we save the rest to inject when we finalize the
1571 # svn commit
1572 my $fp_a = verify_ref("$c~1");
1573 my $fp_b = shift @{$parents{$c}} if $parents{$c};
1574 if (!$fp_a || !$fp_b) {
1575 die "Commit $c\n",
1576 "has no parent commit, and therefore ",
1577 "nothing to diff against.\n",
1578 "You should be working from a repository ",
1579 "originally created by git-svn\n";
1580 }
1581 if ($fp_a ne $fp_b) {
1582 die "$c~1 = $fp_a, however parsing commit $c ",
1583 "revealed that:\n$c~1 = $fp_b\nBUG!\n";
1584 }
1586 foreach my $p (@{$parents{$c}}) {
1587 $skip{$p} = 1;
1588 }
1589 }
1590 (\@linear_refs, \%parents);
1591 }
1593 sub find_file_type_and_diff_status {
1594 my ($path) = @_;
1595 return ('dir', '') if $path eq '';
1597 my $diff_output =
1598 command_oneline(qw(diff --cached --name-status --), $path) || "";
1599 my $diff_status = (split(' ', $diff_output))[0] || "";
1601 my $ls_tree = command_oneline(qw(ls-tree HEAD), $path) || "";
1603 return (undef, undef) if !$diff_status && !$ls_tree;
1605 if ($diff_status eq "A") {
1606 return ("link", $diff_status) if -l $path;
1607 return ("dir", $diff_status) if -d $path;
1608 return ("file", $diff_status);
1609 }
1611 my $mode = (split(' ', $ls_tree))[0] || "";
1613 return ("link", $diff_status) if $mode eq "120000";
1614 return ("dir", $diff_status) if $mode eq "040000";
1615 return ("file", $diff_status);
1616 }
1618 sub md5sum {
1619 my $arg = shift;
1620 my $ref = ref $arg;
1621 my $md5 = Digest::MD5->new();
1622 if ($ref eq 'GLOB' || $ref eq 'IO::File' || $ref eq 'File::Temp') {
1623 $md5->addfile($arg) or croak $!;
1624 } elsif ($ref eq 'SCALAR') {
1625 $md5->add($$arg) or croak $!;
1626 } elsif (!$ref) {
1627 $md5->add($arg) or croak $!;
1628 } else {
1629 ::fatal "Can't provide MD5 hash for unknown ref type: '", $ref, "'";
1630 }
1631 return $md5->hexdigest();
1632 }
1634 sub gc_directory {
1635 if ($can_compress && -f $_ && basename($_) eq "unhandled.log") {
1636 my $out_filename = $_ . ".gz";
1637 open my $in_fh, "<", $_ or die "Unable to open $_: $!\n";
1638 binmode $in_fh;
1639 my $gz = Compress::Zlib::gzopen($out_filename, "ab") or
1640 die "Unable to open $out_filename: $!\n";
1642 my $res;
1643 while ($res = sysread($in_fh, my $str, 1024)) {
1644 $gz->gzwrite($str) or
1645 die "Unable to write: ".$gz->gzerror()."!\n";
1646 }
1647 unlink $_ or die "unlink $File::Find::name: $!\n";
1648 } elsif (-f $_ && basename($_) eq "index") {
1649 unlink $_ or die "unlink $_: $!\n";
1650 }
1651 }
1653 package Git::SVN;
1654 use strict;
1655 use warnings;
1656 use Fcntl qw/:DEFAULT :seek/;
1657 use constant rev_map_fmt => 'NH40';
1658 use vars qw/$default_repo_id $default_ref_id $_no_metadata $_follow_parent
1659 $_repack $_repack_flags $_use_svm_props $_head
1660 $_use_svnsync_props $no_reuse_existing $_minimize_url
1661 $_use_log_author $_add_author_from $_localtime/;
1662 use Carp qw/croak/;
1663 use File::Path qw/mkpath/;
1664 use File::Copy qw/copy/;
1665 use IPC::Open3;
1666 use Memoize; # core since 5.8.0, Jul 2002
1667 use Memoize::Storable;
1669 my ($_gc_nr, $_gc_period);
1671 # properties that we do not log:
1672 my %SKIP_PROP;
1673 BEGIN {
1674 %SKIP_PROP = map { $_ => 1 } qw/svn:wc:ra_dav:version-url
1675 svn:special svn:executable
1676 svn:entry:committed-rev
1677 svn:entry:last-author
1678 svn:entry:uuid
1679 svn:entry:committed-date/;
1681 # some options are read globally, but can be overridden locally
1682 # per [svn-remote "..."] section. Command-line options will *NOT*
1683 # override options set in an [svn-remote "..."] section
1684 no strict 'refs';
1685 for my $option (qw/follow_parent no_metadata use_svm_props
1686 use_svnsync_props/) {
1687 my $key = $option;
1688 $key =~ tr/_//d;
1689 my $prop = "-$option";
1690 *$option = sub {
1691 my ($self) = @_;
1692 return $self->{$prop} if exists $self->{$prop};
1693 my $k = "svn-remote.$self->{repo_id}.$key";
1694 eval { command_oneline(qw/config --get/, $k) };
1695 if ($@) {
1696 $self->{$prop} = ${"Git::SVN::_$option"};
1697 } else {
1698 my $v = command_oneline(qw/config --bool/,$k);
1699 $self->{$prop} = $v eq 'false' ? 0 : 1;
1700 }
1701 return $self->{$prop};
1702 }
1703 }
1704 }
1707 my (%LOCKFILES, %INDEX_FILES);
1708 END {
1709 unlink keys %LOCKFILES if %LOCKFILES;
1710 unlink keys %INDEX_FILES if %INDEX_FILES;
1711 }
1713 sub resolve_local_globs {
1714 my ($url, $fetch, $glob_spec) = @_;
1715 return unless defined $glob_spec;
1716 my $ref = $glob_spec->{ref};
1717 my $path = $glob_spec->{path};
1718 foreach (command(qw#for-each-ref --format=%(refname) refs/#)) {
1719 next unless m#^$ref->{regex}$#;
1720 my $p = $1;
1721 my $pathname = desanitize_refname($path->full_path($p));
1722 my $refname = desanitize_refname($ref->full_path($p));
1723 if (my $existing = $fetch->{$pathname}) {
1724 if ($existing ne $refname) {
1725 die "Refspec conflict:\n",
1726 "existing: $existing\n",
1727 " globbed: $refname\n";
1728 }
1729 my $u = (::cmt_metadata("$refname"))[0];
1730 $u =~ s!^\Q$url\E(/|$)!! or die
1731 "$refname: '$url' not found in '$u'\n";
1732 if ($pathname ne $u) {
1733 warn "W: Refspec glob conflict ",
1734 "(ref: $refname):\n",
1735 "expected path: $pathname\n",
1736 " real path: $u\n",
1737 "Continuing ahead with $u\n";
1738 next;
1739 }
1740 } else {
1741 $fetch->{$pathname} = $refname;
1742 }
1743 }
1744 }
1746 sub parse_revision_argument {
1747 my ($base, $head) = @_;
1748 if (!defined $::_revision || $::_revision eq 'BASE:HEAD') {
1749 return ($base, $head);
1750 }
1751 return ($1, $2) if ($::_revision =~ /^(\d+):(\d+)$/);
1752 return ($::_revision, $::_revision) if ($::_revision =~ /^\d+$/);
1753 return ($head, $head) if ($::_revision eq 'HEAD');
1754 return ($base, $1) if ($::_revision =~ /^BASE:(\d+)$/);
1755 return ($1, $head) if ($::_revision =~ /^(\d+):HEAD$/);
1756 die "revision argument: $::_revision not understood by git-svn\n";
1757 }
1759 sub fetch_all {
1760 my ($repo_id, $remotes) = @_;
1761 if (ref $repo_id) {
1762 my $gs = $repo_id;
1763 $repo_id = undef;
1764 $repo_id = $gs->{repo_id};
1765 }
1766 $remotes ||= read_all_remotes();
1767 my $remote = $remotes->{$repo_id} or
1768 die "[svn-remote \"$repo_id\"] unknown\n";
1769 my $fetch = $remote->{fetch};
1770 my $url = $remote->{url} or die "svn-remote.$repo_id.url not defined\n";
1771 my (@gs, @globs);
1772 my $ra = Git::SVN::Ra->new($url);
1773 my $uuid = $ra->get_uuid;
1774 my $head = $ra->get_latest_revnum;
1776 # ignore errors, $head revision may not even exist anymore
1777 eval { $ra->get_log("", $head, 0, 1, 0, 1, sub { $head = $_[1] }) };
1778 warn "W: $@\n" if $@;
1780 my $base = defined $fetch ? $head : 0;
1782 # read the max revs for wildcard expansion (branches/*, tags/*)
1783 foreach my $t (qw/branches tags/) {
1784 defined $remote->{$t} or next;
1785 push @globs, @{$remote->{$t}};
1787 my $max_rev = eval { tmp_config(qw/--int --get/,
1788 "svn-remote.$repo_id.${t}-maxRev") };
1789 if (defined $max_rev && ($max_rev < $base)) {
1790 $base = $max_rev;
1791 } elsif (!defined $max_rev) {
1792 $base = 0;
1793 }
1794 }
1796 if ($fetch) {
1797 foreach my $p (sort keys %$fetch) {
1798 my $gs = Git::SVN->new($fetch->{$p}, $repo_id, $p);
1799 my $lr = $gs->rev_map_max;
1800 if (defined $lr) {
1801 $base = $lr if ($lr < $base);
1802 }
1803 push @gs, $gs;
1804 }
1805 }
1807 ($base, $head) = parse_revision_argument($base, $head);
1808 $ra->gs_fetch_loop_common($base, $head, \@gs, \@globs);
1809 }
1811 sub read_all_remotes {
1812 my $r = {};
1813 my $use_svm_props = eval { command_oneline(qw/config --bool
1814 svn.useSvmProps/) };
1815 $use_svm_props = $use_svm_props eq 'true' if $use_svm_props;
1816 my $svn_refspec = qr{\s*(.*?)\s*:\s*(.+?)\s*};
1817 foreach (grep { s/^svn-remote\.// } command(qw/config -l/)) {
1818 if (m!^(.+)\.fetch=$svn_refspec$!) {
1819 my ($remote, $local_ref, $remote_ref) = ($1, $2, $3);
1820 die("svn-remote.$remote: remote ref '$remote_ref' "
1821 . "must start with 'refs/'\n")
1822 unless $remote_ref =~ m{^refs/};
1823 $local_ref = uri_decode($local_ref);
1824 $r->{$remote}->{fetch}->{$local_ref} = $remote_ref;
1825 $r->{$remote}->{svm} = {} if $use_svm_props;
1826 } elsif (m!^(.+)\.usesvmprops=\s*(.*)\s*$!) {
1827 $r->{$1}->{svm} = {};
1828 } elsif (m!^(.+)\.url=\s*(.*)\s*$!) {
1829 $r->{$1}->{url} = $2;
1830 } elsif (m!^(.+)\.(branches|tags)=$svn_refspec$!) {
1831 my ($remote, $t, $local_ref, $remote_ref) =
1832 ($1, $2, $3, $4);
1833 die("svn-remote.$remote: remote ref '$remote_ref' ($t) "
1834 . "must start with 'refs/'\n")
1835 unless $remote_ref =~ m{^refs/};
1836 $local_ref = uri_decode($local_ref);
1837 my $rs = {
1838 t => $t,
1839 remote => $remote,
1840 path => Git::SVN::GlobSpec->new($local_ref, 1),
1841 ref => Git::SVN::GlobSpec->new($remote_ref, 0) };
1842 if (length($rs->{ref}->{right}) != 0) {
1843 die "The '*' glob character must be the last ",
1844 "character of '$remote_ref'\n";
1845 }
1846 push @{ $r->{$remote}->{$t} }, $rs;
1847 }
1848 }
1850 map {
1851 if (defined $r->{$_}->{svm}) {
1852 my $svm;
1853 eval {
1854 my $section = "svn-remote.$_";
1855 $svm = {
1856 source => tmp_config('--get',
1857 "$section.svm-source"),
1858 replace => tmp_config('--get',
1859 "$section.svm-replace"),
1860 }
1861 };
1862 $r->{$_}->{svm} = $svm;
1863 }
1864 } keys %$r;
1866 $r;
1867 }
1869 sub init_vars {
1870 $_gc_nr = $_gc_period = 1000;
1871 if (defined $_repack || defined $_repack_flags) {
1872 warn "Repack options are obsolete; they have no effect.\n";
1873 }
1874 }
1876 sub verify_remotes_sanity {
1877 return unless -d $ENV{GIT_DIR};
1878 my %seen;
1879 foreach (command(qw/config -l/)) {
1880 if (m!^svn-remote\.(?:.+)\.fetch=.*:refs/remotes/(\S+)\s*$!) {
1881 if ($seen{$1}) {
1882 die "Remote ref refs/remote/$1 is tracked by",
1883 "\n \"$_\"\nand\n \"$seen{$1}\"\n",
1884 "Please resolve this ambiguity in ",
1885 "your git configuration file before ",
1886 "continuing\n";
1887 }
1888 $seen{$1} = $_;
1889 }
1890 }
1891 }
1893 sub find_existing_remote {
1894 my ($url, $remotes) = @_;
1895 return undef if $no_reuse_existing;
1896 my $existing;
1897 foreach my $repo_id (keys %$remotes) {
1898 my $u = $remotes->{$repo_id}->{url} or next;
1899 next if $u ne $url;
1900 $existing = $repo_id;
1901 last;
1902 }
1903 $existing;
1904 }
1906 sub init_remote_config {
1907 my ($self, $url, $no_write) = @_;
1908 $url =~ s!/+$!!; # strip trailing slash
1909 my $r = read_all_remotes();
1910 my $existing = find_existing_remote($url, $r);
1911 if ($existing) {
1912 unless ($no_write) {
1913 print STDERR "Using existing ",
1914 "[svn-remote \"$existing\"]\n";
1915 }
1916 $self->{repo_id} = $existing;
1917 } elsif ($_minimize_url) {
1918 my $min_url = Git::SVN::Ra->new($url)->minimize_url;
1919 $existing = find_existing_remote($min_url, $r);
1920 if ($existing) {
1921 unless ($no_write) {
1922 print STDERR "Using existing ",
1923 "[svn-remote \"$existing\"]\n";
1924 }
1925 $self->{repo_id} = $existing;
1926 }
1927 if ($min_url ne $url) {
1928 unless ($no_write) {
1929 print STDERR "Using higher level of URL: ",
1930 "$url => $min_url\n";
1931 }
1932 my $old_path = $self->{path};
1933 $self->{path} = $url;
1934 $self->{path} =~ s!^\Q$min_url\E(/|$)!!;
1935 if (length $old_path) {
1936 $self->{path} .= "/$old_path";
1937 }
1938 $url = $min_url;
1939 }
1940 }
1941 my $orig_url;
1942 if (!$existing) {
1943 # verify that we aren't overwriting anything:
1944 $orig_url = eval {
1945 command_oneline('config', '--get',
1946 "svn-remote.$self->{repo_id}.url")
1947 };
1948 if ($orig_url && ($orig_url ne $url)) {
1949 die "svn-remote.$self->{repo_id}.url already set: ",
1950 "$orig_url\nwanted to set to: $url\n";
1951 }
1952 }
1953 my ($xrepo_id, $xpath) = find_ref($self->refname);
1954 if (!$no_write && defined $xpath) {
1955 die "svn-remote.$xrepo_id.fetch already set to track ",
1956 "$xpath:", $self->refname, "\n";
1957 }
1958 unless ($no_write) {
1959 command_noisy('config',
1960 "svn-remote.$self->{repo_id}.url", $url);
1961 $self->{path} =~ s{^/}{};
1962 $self->{path} =~ s{%([0-9A-F]{2})}{chr hex($1)}ieg;
1963 command_noisy('config', '--add',
1964 "svn-remote.$self->{repo_id}.fetch",
1965 "$self->{path}:".$self->refname);
1966 }
1967 $self->{url} = $url;
1968 }
1970 sub find_by_url { # repos_root and, path are optional
1971 my ($class, $full_url, $repos_root, $path) = @_;
1973 return undef unless defined $full_url;
1974 remove_username($full_url);
1975 remove_username($repos_root) if defined $repos_root;
1976 my $remotes = read_all_remotes();
1977 if (defined $full_url && defined $repos_root && !defined $path) {
1978 $path = $full_url;
1979 $path =~ s#^\Q$repos_root\E(?:/|$)##;
1980 }
1981 foreach my $repo_id (keys %$remotes) {
1982 my $u = $remotes->{$repo_id}->{url} or next;
1983 remove_username($u);
1984 next if defined $repos_root && $repos_root ne $u;
1986 my $fetch = $remotes->{$repo_id}->{fetch} || {};
1987 foreach my $t (qw/branches tags/) {
1988 foreach my $globspec (@{$remotes->{$repo_id}->{$t}}) {
1989 resolve_local_globs($u, $fetch, $globspec);
1990 }
1991 }
1992 my $p = $path;
1993 my $rwr = rewrite_root({repo_id => $repo_id});
1994 my $svm = $remotes->{$repo_id}->{svm}
1995 if defined $remotes->{$repo_id}->{svm};
1996 unless (defined $p) {
1997 $p = $full_url;
1998 my $z = $u;
1999 my $prefix = '';
2000 if ($rwr) {
2001 $z = $rwr;
2002 remove_username($z);
2003 } elsif (defined $svm) {
2004 $z = $svm->{source};
2005 $prefix = $svm->{replace};
2006 $prefix =~ s#^\Q$u\E(?:/|$)##;
2007 $prefix =~ s#/$##;
2008 }
2009 $p =~ s#^\Q$z\E(?:/|$)#$prefix# or next;
2010 }
2011 foreach my $f (keys %$fetch) {
2012 next if $f ne $p;
2013 return Git::SVN->new($fetch->{$f}, $repo_id, $f);
2014 }
2015 }
2016 undef;
2017 }
2019 sub init {
2020 my ($class, $url, $path, $repo_id, $ref_id, $no_write) = @_;
2021 my $self = _new($class, $repo_id, $ref_id, $path);
2022 if (defined $url) {
2023 $self->init_remote_config($url, $no_write);
2024 }
2025 $self;
2026 }
2028 sub find_ref {
2029 my ($ref_id) = @_;
2030 foreach (command(qw/config -l/)) {
2031 next unless m!^svn-remote\.(.+)\.fetch=
2032 \s*(.*?)\s*:\s*(.+?)\s*$!x;
2033 my ($repo_id, $path, $ref) = ($1, $2, $3);
2034 if ($ref eq $ref_id) {
2035 $path = '' if ($path =~ m#^\./?#);
2036 return ($repo_id, $path);
2037 }
2038 }
2039 (undef, undef, undef);
2040 }
2042 sub new {
2043 my ($class, $ref_id, $repo_id, $path) = @_;
2044 if (defined $ref_id && !defined $repo_id && !defined $path) {
2045 ($repo_id, $path) = find_ref($ref_id);
2046 if (!defined $repo_id) {
2047 die "Could not find a \"svn-remote.*.fetch\" key ",
2048 "in the repository configuration matching: ",
2049 "$ref_id\n";
2050 }
2051 }
2052 my $self = _new($class, $repo_id, $ref_id, $path);
2053 if (!defined $self->{path} || !length $self->{path}) {
2054 my $fetch = command_oneline('config', '--get',
2055 "svn-remote.$repo_id.fetch",
2056 ":$ref_id\$") or
2057 die "Failed to read \"svn-remote.$repo_id.fetch\" ",
2058 "\":$ref_id\$\" in config\n";
2059 ($self->{path}, undef) = split(/\s*:\s*/, $fetch);
2060 }
2061 $self->{path} =~ s{/+}{/}g;
2062 $self->{path} =~ s{\A/}{};
2063 $self->{path} =~ s{/\z}{};
2064 $self->{url} = command_oneline('config', '--get',
2065 "svn-remote.$repo_id.url") or
2066 die "Failed to read \"svn-remote.$repo_id.url\" in config\n";
2067 $self->rebuild;
2068 $self;
2069 }
2071 sub refname {
2072 my ($refname) = $_[0]->{ref_id} ;
2074 # It cannot end with a slash /, we'll throw up on this because
2075 # SVN can't have directories with a slash in their name, either:
2076 if ($refname =~ m{/$}) {
2077 die "ref: '$refname' ends with a trailing slash, this is ",
2078 "not permitted by git nor Subversion\n";
2079 }
2081 # It cannot have ASCII control character space, tilde ~, caret ^,
2082 # colon :, question-mark ?, asterisk *, space, or open bracket [
2083 # anywhere.
2084 #
2085 # Additionally, % must be escaped because it is used for escaping
2086 # and we want our escaped refname to be reversible
2087 $refname =~ s{([ \%~\^:\?\*\[\t])}{uc sprintf('%%%02x',ord($1))}eg;
2089 # no slash-separated component can begin with a dot .
2090 # /.* becomes /%2E*
2091 $refname =~ s{/\.}{/%2E}g;
2093 # It cannot have two consecutive dots .. anywhere
2094 # .. becomes %2E%2E
2095 $refname =~ s{\.\.}{%2E%2E}g;
2097 # trailing dots and .lock are not allowed
2098 # .$ becomes %2E and .lock becomes %2Elock
2099 $refname =~ s{\.(?=$|lock$)}{%2E};
2101 # the sequence @{ is used to access the reflog
2102 # @{ becomes %40{
2103 $refname =~ s{\@\{}{%40\{}g;
2105 return $refname;
2106 }
2108 sub desanitize_refname {
2109 my ($refname) = @_;
2110 $refname =~ s{%(?:([0-9A-F]{2}))}{chr hex($1)}eg;
2111 return $refname;
2112 }
2114 sub svm_uuid {
2115 my ($self) = @_;
2116 return $self->{svm}->{uuid} if $self->svm;
2117 $self->ra;
2118 unless ($self->{svm}) {
2119 die "SVM UUID not cached, and reading remotely failed\n";
2120 }
2121 $self->{svm}->{uuid};
2122 }
2124 sub svm {
2125 my ($self) = @_;
2126 return $self->{svm} if $self->{svm};
2127 my $svm;
2128 # see if we have it in our config, first:
2129 eval {
2130 my $section = "svn-remote.$self->{repo_id}";
2131 $svm = {
2132 source => tmp_config('--get', "$section.svm-source"),
2133 uuid => tmp_config('--get', "$section.svm-uuid"),
2134 replace => tmp_config('--get', "$section.svm-replace"),
2135 }
2136 };
2137 if ($svm && $svm->{source} && $svm->{uuid} && $svm->{replace}) {
2138 $self->{svm} = $svm;
2139 }
2140 $self->{svm};
2141 }
2143 sub _set_svm_vars {
2144 my ($self, $ra) = @_;
2145 return $ra if $self->svm;
2147 my @err = ( "useSvmProps set, but failed to read SVM properties\n",
2148 "(svm:source, svm:uuid) ",
2149 "from the following URLs:\n" );
2150 sub read_svm_props {
2151 my ($self, $ra, $path, $r) = @_;
2152 my $props = ($ra->get_dir($path, $r))[2];
2153 my $src = $props->{'svm:source'};
2154 my $uuid = $props->{'svm:uuid'};
2155 return undef if (!$src || !$uuid);
2157 chomp($src, $uuid);
2159 $uuid =~ m{^[0-9a-f\-]{30,}$}i
2160 or die "doesn't look right - svm:uuid is '$uuid'\n";
2162 # the '!' is used to mark the repos_root!/relative/path
2163 $src =~ s{/?!/?}{/};
2164 $src =~ s{/+$}{}; # no trailing slashes please
2165 # username is of no interest
2166 $src =~ s{(^[a-z\+]*://)[^/@]*@}{$1};
2168 my $replace = $ra->{url};
2169 $replace .= "/$path" if length $path;
2171 my $section = "svn-remote.$self->{repo_id}";
2172 tmp_config("$section.svm-source", $src);
2173 tmp_config("$section.svm-replace", $replace);
2174 tmp_config("$section.svm-uuid", $uuid);
2175 $self->{svm} = {
2176 source => $src,
2177 uuid => $uuid,
2178 replace => $replace
2179 };
2180 }
2182 my $r = $ra->get_latest_revnum;
2183 my $path = $self->{path};
2184 my %tried;
2185 while (length $path) {
2186 unless ($tried{"$self->{url}/$path"}) {
2187 return $ra if $self->read_svm_props($ra, $path, $r);
2188 $tried{"$self->{url}/$path"} = 1;
2189 }
2190 $path =~ s#/?[^/]+$##;
2191 }
2192 die "Path: '$path' should be ''\n" if $path ne '';
2193 return $ra if $self->read_svm_props($ra, $path, $r);
2194 $tried{"$self->{url}/$path"} = 1;
2196 if ($ra->{repos_root} eq $self->{url}) {
2197 die @err, (map { " $_\n" } keys %tried), "\n";
2198 }
2200 # nope, make sure we're connected to the repository root:
2201 my $ok;
2202 my @tried_b;
2203 $path = $ra->{svn_path};
2204 $ra = Git::SVN::Ra->new($ra->{repos_root});
2205 while (length $path) {
2206 unless ($tried{"$ra->{url}/$path"}) {
2207 $ok = $self->read_svm_props($ra, $path, $r);
2208 last if $ok;
2209 $tried{"$ra->{url}/$path"} = 1;
2210 }
2211 $path =~ s#/?[^/]+$##;
2212 }
2213 die "Path: '$path' should be ''\n" if $path ne '';
2214 $ok ||= $self->read_svm_props($ra, $path, $r);
2215 $tried{"$ra->{url}/$path"} = 1;
2216 if (!$ok) {
2217 die @err, (map { " $_\n" } keys %tried), "\n";
2218 }
2219 Git::SVN::Ra->new($self->{url});
2220 }
2222 sub svnsync {
2223 my ($self) = @_;
2224 return $self->{svnsync} if $self->{svnsync};
2226 if ($self->no_metadata) {
2227 die "Can't have both 'noMetadata' and ",
2228 "'useSvnsyncProps' options set!\n";
2229 }
2230 if ($self->rewrite_root) {
2231 die "Can't have both 'useSvnsyncProps' and 'rewriteRoot' ",
2232 "options set!\n";
2233 }
2234 if ($self->rewrite_uuid) {
2235 die "Can't have both 'useSvnsyncProps' and 'rewriteUUID' ",
2236 "options set!\n";
2237 }
2239 my $svnsync;
2240 # see if we have it in our config, first:
2241 eval {
2242 my $section = "svn-remote.$self->{repo_id}";
2244 my $url = tmp_config('--get', "$section.svnsync-url");
2245 ($url) = ($url =~ m{^([a-z\+]+://\S+)$}) or
2246 die "doesn't look right - svn:sync-from-url is '$url'\n";
2248 my $uuid = tmp_config('--get', "$section.svnsync-uuid");
2249 ($uuid) = ($uuid =~ m{^([0-9a-f\-]{30,})$}i) or
2250 die "doesn't look right - svn:sync-from-uuid is '$uuid'\n";
2252 $svnsync = { url => $url, uuid => $uuid }
2253 };
2254 if ($svnsync && $svnsync->{url} && $svnsync->{uuid}) {
2255 return $self->{svnsync} = $svnsync;
2256 }
2258 my $err = "useSvnsyncProps set, but failed to read " .
2259 "svnsync property: svn:sync-from-";
2260 my $rp = $self->ra->rev_proplist(0);
2262 my $url = $rp->{'svn:sync-from-url'} or die $err . "url\n";
2263 ($url) = ($url =~ m{^([a-z\+]+://\S+)$}) or
2264 die "doesn't look right - svn:sync-from-url is '$url'\n";
2266 my $uuid = $rp->{'svn:sync-from-uuid'} or die $err . "uuid\n";
2267 ($uuid) = ($uuid =~ m{^([0-9a-f\-]{30,})$}i) or
2268 die "doesn't look right - svn:sync-from-uuid is '$uuid'\n";
2270 my $section = "svn-remote.$self->{repo_id}";
2271 tmp_config('--add', "$section.svnsync-uuid", $uuid);
2272 tmp_config('--add', "$section.svnsync-url", $url);
2273 return $self->{svnsync} = { url => $url, uuid => $uuid };
2274 }
2276 # this allows us to memoize our SVN::Ra UUID locally and avoid a
2277 # remote lookup (useful for 'git svn log').
2278 sub ra_uuid {
2279 my ($self) = @_;
2280 unless ($self->{ra_uuid}) {
2281 my $key = "svn-remote.$self->{repo_id}.uuid";
2282 my $uuid = eval { tmp_config('--get', $key) };
2283 if (!$@ && $uuid && $uuid =~ /^([a-f\d\-]{30,})$/i) {
2284 $self->{ra_uuid} = $uuid;
2285 } else {
2286 die "ra_uuid called without URL\n" unless $self->{url};
2287 $self->{ra_uuid} = $self->ra->get_uuid;
2288 tmp_config('--add', $key, $self->{ra_uuid});
2289 }
2290 }
2291 $self->{ra_uuid};
2292 }
2294 sub _set_repos_root {
2295 my ($self, $repos_root) = @_;
2296 my $k = "svn-remote.$self->{repo_id}.reposRoot";
2297 $repos_root ||= $self->ra->{repos_root};
2298 tmp_config($k, $repos_root);
2299 $repos_root;
2300 }
2302 sub repos_root {
2303 my ($self) = @_;
2304 my $k = "svn-remote.$self->{repo_id}.reposRoot";
2305 eval { tmp_config('--get', $k) } || $self->_set_repos_root;
2306 }
2308 sub ra {
2309 my ($self) = shift;
2310 my $ra = Git::SVN::Ra->new($self->{url});
2311 $self->_set_repos_root($ra->{repos_root});
2312 if ($self->use_svm_props && !$self->{svm}) {
2313 if ($self->no_metadata) {
2314 die "Can't have both 'noMetadata' and ",
2315 "'useSvmProps' options set!\n";
2316 } elsif ($self->use_svnsync_props) {
2317 die "Can't have both 'useSvnsyncProps' and ",
2318 "'useSvmProps' options set!\n";
2319 }
2320 $ra = $self->_set_svm_vars($ra);
2321 $self->{-want_revprops} = 1;
2322 }
2323 $ra;
2324 }
2326 # prop_walk(PATH, REV, SUB)
2327 # -------------------------
2328 # Recursively traverse PATH at revision REV and invoke SUB for each
2329 # directory that contains a SVN property. SUB will be invoked as
2330 # follows: &SUB(gs, path, props); where `gs' is this instance of
2331 # Git::SVN, `path' the path to the directory where the properties
2332 # `props' were found. The `path' will be relative to point of checkout,
2333 # that is, if url://repo/trunk is the current Git branch, and that
2334 # directory contains a sub-directory `d', SUB will be invoked with `/d/'
2335 # as `path' (note the trailing `/').
2336 sub prop_walk {
2337 my ($self, $path, $rev, $sub) = @_;
2339 $path =~ s#^/##;
2340 my ($dirent, undef, $props) = $self->ra->get_dir($path, $rev);
2341 $path =~ s#^/*#/#g;
2342 my $p = $path;
2343 # Strip the irrelevant part of the path.
2344 $p =~ s#^/+\Q$self->{path}\E(/|$)#/#;
2345 # Ensure the path is terminated by a `/'.
2346 $p =~ s#/*$#/#;
2348 # The properties contain all the internal SVN stuff nobody
2349 # (usually) cares about.
2350 my $interesting_props = 0;
2351 foreach (keys %{$props}) {
2352 # If it doesn't start with `svn:', it must be a
2353 # user-defined property.
2354 ++$interesting_props and next if $_ !~ /^svn:/;
2355 # FIXME: Fragile, if SVN adds new public properties,
2356 # this needs to be updated.
2357 ++$interesting_props if /^svn:(?:ignore|keywords|executable
2358 |eol-style|mime-type
2359 |externals|needs-lock)$/x;
2360 }
2361 &$sub($self, $p, $props) if $interesting_props;
2363 foreach (sort keys %$dirent) {
2364 next if $dirent->{$_}->{kind} != $SVN::Node::dir;
2365 $self->prop_walk($self->{path} . $p . $_, $rev, $sub);
2366 }
2367 }
2369 sub last_rev { ($_[0]->last_rev_commit)[0] }
2370 sub last_commit { ($_[0]->last_rev_commit)[1] }
2372 # returns the newest SVN revision number and newest commit SHA1
2373 sub last_rev_commit {
2374 my ($self) = @_;
2375 if (defined $self->{last_rev} && defined $self->{last_commit}) {
2376 return ($self->{last_rev}, $self->{last_commit});
2377 }
2378 my $c = ::verify_ref($self->refname.'^0');
2379 if ($c && !$self->use_svm_props && !$self->no_metadata) {
2380 my $rev = (::cmt_metadata($c))[1];
2381 if (defined $rev) {
2382 ($self->{last_rev}, $self->{last_commit}) = ($rev, $c);
2383 return ($rev, $c);
2384 }
2385 }
2386 my $map_path = $self->map_path;
2387 unless (-e $map_path) {
2388 ($self->{last_rev}, $self->{last_commit}) = (undef, undef);
2389 return (undef, undef);
2390 }
2391 my ($rev, $commit) = $self->rev_map_max(1);
2392 ($self->{last_rev}, $self->{last_commit}) = ($rev, $commit);
2393 return ($rev, $commit);
2394 }
2396 sub get_fetch_range {
2397 my ($self, $min, $max) = @_;
2398 $max ||= $self->ra->get_latest_revnum;
2399 $min ||= $self->rev_map_max;
2400 (++$min, $max);
2401 }
2403 sub tmp_config {
2404 my (@args) = @_;
2405 my $old_def_config = "$ENV{GIT_DIR}/svn/config";
2406 my $config = "$ENV{GIT_DIR}/svn/.metadata";
2407 if (! -f $config && -f $old_def_config) {
2408 rename $old_def_config, $config or
2409 die "Failed rename $old_def_config => $config: $!\n";
2410 }
2411 my $old_config = $ENV{GIT_CONFIG};
2412 $ENV{GIT_CONFIG} = $config;
2413 $@ = undef;
2414 my @ret = eval {
2415 unless (-f $config) {
2416 mkfile($config);
2417 open my $fh, '>', $config or
2418 die "Can't open $config: $!\n";
2419 print $fh "; This file is used internally by ",
2420 "git-svn\n" or die
2421 "Couldn't write to $config: $!\n";
2422 print $fh "; You should not have to edit it\n" or
2423 die "Couldn't write to $config: $!\n";
2424 close $fh or die "Couldn't close $config: $!\n";
2425 }
2426 command('config', @args);
2427 };
2428 my $err = $@;
2429 if (defined $old_config) {
2430 $ENV{GIT_CONFIG} = $old_config;
2431 } else {
2432 delete $ENV{GIT_CONFIG};
2433 }
2434 die $err if $err;
2435 wantarray ? @ret : $ret[0];
2436 }
2438 sub tmp_index_do {
2439 my ($self, $sub) = @_;
2440 my $old_index = $ENV{GIT_INDEX_FILE};
2441 $ENV{GIT_INDEX_FILE} = $self->{index};
2442 $@ = undef;
2443 my @ret = eval {
2444 my ($dir, $base) = ($self->{index} =~ m#^(.*?)/?([^/]+)$#);
2445 mkpath([$dir]) unless -d $dir;
2446 &$sub;
2447 };
2448 my $err = $@;
2449 if (defined $old_index) {
2450 $ENV{GIT_INDEX_FILE} = $old_index;
2451 } else {
2452 delete $ENV{GIT_INDEX_FILE};
2453 }
2454 die $err if $err;
2455 wantarray ? @ret : $ret[0];
2456 }
2458 sub assert_index_clean {
2459 my ($self, $treeish) = @_;
2461 $self->tmp_index_do(sub {
2462 command_noisy('read-tree', $treeish) unless -e $self->{index};
2463 my $x = command_oneline('write-tree');
2464 my ($y) = (command(qw/cat-file commit/, $treeish) =~
2465 /^tree ($::sha1)/mo);
2466 return if $y eq $x;
2468 warn "Index mismatch: $y != $x\nrereading $treeish\n";
2469 unlink $self->{index} or die "unlink $self->{index}: $!\n";
2470 command_noisy('read-tree', $treeish);
2471 $x = command_oneline('write-tree');
2472 if ($y ne $x) {
2473 ::fatal "trees ($treeish) $y != $x\n",
2474 "Something is seriously wrong...";
2475 }
2476 });
2477 }
2479 sub get_commit_parents {
2480 my ($self, $log_entry) = @_;
2481 my (%seen, @ret, @tmp);
2482 # legacy support for 'set-tree'; this is only used by set_tree_cb:
2483 if (my $ip = $self->{inject_parents}) {
2484 if (my $commit = delete $ip->{$log_entry->{revision}}) {
2485 push @tmp, $commit;
2486 }
2487 }
2488 if (my $cur = ::verify_ref($self->refname.'^0')) {
2489 push @tmp, $cur;
2490 }
2491 if (my $ipd = $self->{inject_parents_dcommit}) {
2492 if (my $commit = delete $ipd->{$log_entry->{revision}}) {
2493 push @tmp, @$commit;
2494 }
2495 }
2496 push @tmp, $_ foreach (@{$log_entry->{parents}}, @tmp);
2497 while (my $p = shift @tmp) {
2498 next if $seen{$p};
2499 $seen{$p} = 1;
2500 push @ret, $p;
2501 }
2502 @ret;
2503 }
2505 sub rewrite_root {
2506 my ($self) = @_;
2507 return $self->{-rewrite_root} if exists $self->{-rewrite_root};
2508 my $k = "svn-remote.$self->{repo_id}.rewriteRoot";
2509 my $rwr = eval { command_oneline(qw/config --get/, $k) };
2510 if ($rwr) {
2511 $rwr =~ s#/+$##;
2512 if ($rwr !~ m#^[a-z\+]+://#) {
2513 die "$rwr is not a valid URL (key: $k)\n";
2514 }
2515 }
2516 $self->{-rewrite_root} = $rwr;
2517 }
2519 sub rewrite_uuid {
2520 my ($self) = @_;
2521 return $self->{-rewrite_uuid} if exists $self->{-rewrite_uuid};
2522 my $k = "svn-remote.$self->{repo_id}.rewriteUUID";
2523 my $rwid = eval { command_oneline(qw/config --get/, $k) };
2524 if ($rwid) {
2525 $rwid =~ s#/+$##;
2526 if ($rwid !~ m#^[a-f0-9]{8}-(?:[a-f0-9]{4}-){3}[a-f0-9]{12}$#) {
2527 die "$rwid is not a valid UUID (key: $k)\n";
2528 }
2529 }
2530 $self->{-rewrite_uuid} = $rwid;
2531 }
2533 sub metadata_url {
2534 my ($self) = @_;
2535 ($self->rewrite_root || $self->{url}) .
2536 (length $self->{path} ? '/' . $self->{path} : '');
2537 }
2539 sub full_url {
2540 my ($self) = @_;
2541 $self->{url} . (length $self->{path} ? '/' . $self->{path} : '');
2542 }
2545 sub set_commit_header_env {
2546 my ($log_entry) = @_;
2547 my %env;
2548 foreach my $ned (qw/NAME EMAIL DATE/) {
2549 foreach my $ac (qw/AUTHOR COMMITTER/) {
2550 $env{"GIT_${ac}_${ned}"} = $ENV{"GIT_${ac}_${ned}"};
2551 }
2552 }
2554 $ENV{GIT_AUTHOR_NAME} = $log_entry->{name};
2555 $ENV{GIT_AUTHOR_EMAIL} = $log_entry->{email};
2556 $ENV{GIT_AUTHOR_DATE} = $ENV{GIT_COMMITTER_DATE} = $log_entry->{date};
2558 $ENV{GIT_COMMITTER_NAME} = (defined $log_entry->{commit_name})
2559 ? $log_entry->{commit_name}
2560 : $log_entry->{name};
2561 $ENV{GIT_COMMITTER_EMAIL} = (defined $log_entry->{commit_email})
2562 ? $log_entry->{commit_email}
2563 : $log_entry->{email};
2564 \%env;
2565 }
2567 sub restore_commit_header_env {
2568 my ($env) = @_;
2569 foreach my $ned (qw/NAME EMAIL DATE/) {
2570 foreach my $ac (qw/AUTHOR COMMITTER/) {
2571 my $k = "GIT_${ac}_${ned}";
2572 if (defined $env->{$k}) {
2573 $ENV{$k} = $env->{$k};
2574 } else {
2575 delete $ENV{$k};
2576 }
2577 }
2578 }
2579 }
2581 sub gc {
2582 command_noisy('gc', '--auto');
2583 };
2585 sub do_git_commit {
2586 my ($self, $log_entry) = @_;
2587 my $lr = $self->last_rev;
2588 if (defined $lr && $lr >= $log_entry->{revision}) {
2589 die "Last fetched revision of ", $self->refname,
2590 " was r$lr, but we are about to fetch: ",
2591 "r$log_entry->{revision}!\n";
2592 }
2593 if (my $c = $self->rev_map_get($log_entry->{revision})) {
2594 croak "$log_entry->{revision} = $c already exists! ",
2595 "Why are we refetching it?\n";
2596 }
2597 my $old_env = set_commit_header_env($log_entry);
2598 my $tree = $log_entry->{tree};
2599 if (!defined $tree) {
2600 $tree = $self->tmp_index_do(sub {
2601 command_oneline('write-tree') });
2602 }
2603 die "Tree is not a valid sha1: $tree\n" if $tree !~ /^$::sha1$/o;
2605 my @exec = ('git', 'commit-tree', $tree);
2606 foreach ($self->get_commit_parents($log_entry)) {
2607 push @exec, '-p', $_;
2608 }
2609 defined(my $pid = open3(my $msg_fh, my $out_fh, '>&STDERR', @exec))
2610 or croak $!;
2611 binmode $msg_fh;
2613 # we always get UTF-8 from SVN, but we may want our commits in
2614 # a different encoding.
2615 if (my $enc = Git::config('i18n.commitencoding')) {
2616 require Encode;
2617 Encode::from_to($log_entry->{log}, 'UTF-8', $enc);
2618 }
2619 print $msg_fh $log_entry->{log} or croak $!;
2620 restore_commit_header_env($old_env);
2621 unless ($self->no_metadata) {
2622 print $msg_fh "\ngit-svn-id: $log_entry->{metadata}\n"
2623 or croak $!;
2624 }
2625 $msg_fh->flush == 0 or croak $!;
2626 close $msg_fh or croak $!;
2627 chomp(my $commit = do { local $/; <$out_fh> });
2628 close $out_fh or croak $!;
2629 waitpid $pid, 0;
2630 croak $? if $?;
2631 if ($commit !~ /^$::sha1$/o) {
2632 die "Failed to commit, invalid sha1: $commit\n";
2633 }
2635 $self->rev_map_set($log_entry->{revision}, $commit, 1);
2637 $self->{last_rev} = $log_entry->{revision};
2638 $self->{last_commit} = $commit;
2639 print "r$log_entry->{revision}" unless $::_q > 1;
2640 if (defined $log_entry->{svm_revision}) {
2641 print " (\@$log_entry->{svm_revision})" unless $::_q > 1;
2642 $self->rev_map_set($log_entry->{svm_revision}, $commit,
2643 0, $self->svm_uuid);
2644 }
2645 print " = $commit ($self->{ref_id})\n" unless $::_q > 1;
2646 if (--$_gc_nr == 0) {
2647 $_gc_nr = $_gc_period;
2648 gc();
2649 }
2650 return $commit;
2651 }
2653 sub match_paths {
2654 my ($self, $paths, $r) = @_;
2655 return 1 if $self->{path} eq '';
2656 if (my $path = $paths->{"/$self->{path}"}) {
2657 return ($path->{action} eq 'D') ? 0 : 1;
2658 }
2659 $self->{path_regex} ||= qr/^\/\Q$self->{path}\E\//;
2660 if (grep /$self->{path_regex}/, keys %$paths) {
2661 return 1;
2662 }
2663 my $c = '';
2664 foreach (split m#/#, $self->{path}) {
2665 $c .= "/$_";
2666 next unless ($paths->{$c} &&
2667 ($paths->{$c}->{action} =~ /^[AR]$/));
2668 if ($self->ra->check_path($self->{path}, $r) ==
2669 $SVN::Node::dir) {
2670 return 1;
2671 }
2672 }
2673 return 0;
2674 }
2676 sub find_parent_branch {
2677 my ($self, $paths, $rev) = @_;
2678 return undef unless $self->follow_parent;
2679 unless (defined $paths) {
2680 my $err_handler = $SVN::Error::handler;
2681 $SVN::Error::handler = \&Git::SVN::Ra::skip_unknown_revs;
2682 $self->ra->get_log([$self->{path}], $rev, $rev, 0, 1, 1,
2683 sub { $paths = $_[0] });
2684 $SVN::Error::handler = $err_handler;
2685 }
2686 return undef unless defined $paths;
2688 # look for a parent from another branch:
2689 my @b_path_components = split m#/#, $self->{path};
2690 my @a_path_components;
2691 my $i;
2692 while (@b_path_components) {
2693 $i = $paths->{'/'.join('/', @b_path_components)};
2694 last if $i && defined $i->{copyfrom_path};
2695 unshift(@a_path_components, pop(@b_path_components));
2696 }
2697 return undef unless defined $i && defined $i->{copyfrom_path};
2698 my $branch_from = $i->{copyfrom_path};
2699 if (@a_path_components) {
2700 print STDERR "branch_from: $branch_from => ";
2701 $branch_from .= '/'.join('/', @a_path_components);
2702 print STDERR $branch_from, "\n";
2703 }
2704 my $r = $i->{copyfrom_rev};
2705 my $repos_root = $self->ra->{repos_root};
2706 my $url = $self->ra->{url};
2707 my $new_url = $url . $branch_from;
2708 print STDERR "Found possible branch point: ",
2709 "$new_url => ", $self->full_url, ", $r\n"
2710 unless $::_q > 1;
2711 $branch_from =~ s#^/##;
2712 my $gs = $self->other_gs($new_url, $url,
2713 $branch_from, $r, $self->{ref_id});
2714 my ($r0, $parent) = $gs->find_rev_before($r, 1);
2715 {
2716 my ($base, $head);
2717 if (!defined $r0 || !defined $parent) {
2718 ($base, $head) = parse_revision_argument(0, $r);
2719 } else {
2720 if ($r0 < $r) {
2721 $gs->ra->get_log([$gs->{path}], $r0 + 1, $r, 1,
2722 0, 1, sub { $base = $_[1] - 1 });
2723 }
2724 }
2725 if (defined $base && $base <= $r) {
2726 $gs->fetch($base, $r);
2727 }
2728 ($r0, $parent) = $gs->find_rev_before($r, 1);
2729 }
2730 if (defined $r0 && defined $parent) {
2731 print STDERR "Found branch parent: ($self->{ref_id}) $parent\n"
2732 unless $::_q > 1;
2733 my $ed;
2734 if ($self->ra->can_do_switch) {
2735 $self->assert_index_clean($parent);
2736 print STDERR "Following parent with do_switch\n"
2737 unless $::_q > 1;
2738 # do_switch works with svn/trunk >= r22312, but that
2739 # is not included with SVN 1.4.3 (the latest version
2740 # at the moment), so we can't rely on it
2741 $self->{last_rev} = $r0;
2742 $self->{last_commit} = $parent;
2743 $ed = SVN::Git::Fetcher->new($self, $gs->{path});
2744 $gs->ra->gs_do_switch($r0, $rev, $gs,
2745 $self->full_url, $ed)
2746 or die "SVN connection failed somewhere...\n";
2747 } elsif ($self->ra->trees_match($new_url, $r0,
2748 $self->full_url, $rev)) {
2749 print STDERR "Trees match:\n",
2750 " $new_url\@$r0\n",
2751 " ${\$self->full_url}\@$rev\n",
2752 "Following parent with no changes\n"
2753 unless $::_q > 1;
2754 $self->tmp_index_do(sub {
2755 command_noisy('read-tree', $parent);
2756 });
2757 $self->{last_commit} = $parent;
2758 } else {
2759 print STDERR "Following parent with do_update\n"
2760 unless $::_q > 1;
2761 $ed = SVN::Git::Fetcher->new($self);
2762 $self->ra->gs_do_update($rev, $rev, $self, $ed)
2763 or die "SVN connection failed somewhere...\n";
2764 }
2765 print STDERR "Successfully followed parent\n" unless $::_q > 1;
2766 return $self->make_log_entry($rev, [$parent], $ed);
2767 }
2768 return undef;
2769 }
2771 sub do_fetch {
2772 my ($self, $paths, $rev) = @_;
2773 my $ed;
2774 my ($last_rev, @parents);
2775 if (my $lc = $self->last_commit) {
2776 # we can have a branch that was deleted, then re-added
2777 # under the same name but copied from another path, in
2778 # which case we'll have multiple parents (we don't
2779 # want to break the original ref, nor lose copypath info):
2780 if (my $log_entry = $self->find_parent_branch($paths, $rev)) {
2781 push @{$log_entry->{parents}}, $lc;
2782 return $log_entry;
2783 }
2784 $ed = SVN::Git::Fetcher->new($self);
2785 $last_rev = $self->{last_rev};
2786 $ed->{c} = $lc;
2787 @parents = ($lc);
2788 } else {
2789 $last_rev = $rev;
2790 if (my $log_entry = $self->find_parent_branch($paths, $rev)) {
2791 return $log_entry;
2792 }
2793 $ed = SVN::Git::Fetcher->new($self);
2794 }
2795 unless ($self->ra->gs_do_update($last_rev, $rev, $self, $ed)) {
2796 die "SVN connection failed somewhere...\n";
2797 }
2798 $self->make_log_entry($rev, \@parents, $ed);
2799 }
2801 sub mkemptydirs {
2802 my ($self, $r) = @_;
2804 sub scan {
2805 my ($r, $empty_dirs, $line) = @_;
2806 if (defined $r && $line =~ /^r(\d+)$/) {
2807 return 0 if $1 > $r;
2808 } elsif ($line =~ /^ \+empty_dir: (.+)$/) {
2809 $empty_dirs->{$1} = 1;
2810 } elsif ($line =~ /^ \-empty_dir: (.+)$/) {
2811 my @d = grep {m[^\Q$1\E(/|$)]} (keys %$empty_dirs);
2812 delete @$empty_dirs{@d};
2813 }
2814 1; # continue
2815 };
2817 my %empty_dirs = ();
2818 my $gz_file = "$self->{dir}/unhandled.log.gz";
2819 if (-f $gz_file) {
2820 if (!$can_compress) {
2821 warn "Compress::Zlib could not be found; ",
2822 "empty directories in $gz_file will not be read\n";
2823 } else {
2824 my $gz = Compress::Zlib::gzopen($gz_file, "rb") or
2825 die "Unable to open $gz_file: $!\n";
2826 my $line;
2827 while ($gz->gzreadline($line) > 0) {
2828 scan($r, \%empty_dirs, $line) or last;
2829 }
2830 $gz->gzclose;
2831 }
2832 }
2834 if (open my $fh, '<', "$self->{dir}/unhandled.log") {
2835 binmode $fh or croak "binmode: $!";
2836 while (<$fh>) {
2837 scan($r, \%empty_dirs, $_) or last;
2838 }
2839 close $fh;
2840 }
2842 my $strip = qr/\A\Q$self->{path}\E(?:\/|$)/;
2843 foreach my $d (sort keys %empty_dirs) {
2844 $d = uri_decode($d);
2845 $d =~ s/$strip//;
2846 next unless length($d);
2847 next if -d $d;
2848 if (-e $d) {
2849 warn "$d exists but is not a directory\n";
2850 } else {
2851 print "creating empty directory: $d\n";
2852 mkpath([$d]);
2853 }
2854 }
2855 }
2857 sub get_untracked {
2858 my ($self, $ed) = @_;
2859 my @out;
2860 my $h = $ed->{empty};
2861 foreach (sort keys %$h) {
2862 my $act = $h->{$_} ? '+empty_dir' : '-empty_dir';
2863 push @out, " $act: " . uri_encode($_);
2864 warn "W: $act: $_\n";
2865 }
2866 foreach my $t (qw/dir_prop file_prop/) {
2867 $h = $ed->{$t} or next;
2868 foreach my $path (sort keys %$h) {
2869 my $ppath = $path eq '' ? '.' : $path;
2870 foreach my $prop (sort keys %{$h->{$path}}) {
2871 next if $SKIP_PROP{$prop};
2872 my $v = $h->{$path}->{$prop};
2873 my $t_ppath_prop = "$t: " .
2874 uri_encode($ppath) . ' ' .
2875 uri_encode($prop);
2876 if (defined $v) {
2877 push @out, " +$t_ppath_prop " .
2878 uri_encode($v);
2879 } else {
2880 push @out, " -$t_ppath_prop";
2881 }
2882 }
2883 }
2884 }
2885 foreach my $t (qw/absent_file absent_directory/) {
2886 $h = $ed->{$t} or next;
2887 foreach my $parent (sort keys %$h) {
2888 foreach my $path (sort @{$h->{$parent}}) {
2889 push @out, " $t: " .
2890 uri_encode("$parent/$path");
2891 warn "W: $t: $parent/$path ",
2892 "Insufficient permissions?\n";
2893 }
2894 }
2895 }
2896 \@out;
2897 }
2899 # parse_svn_date(DATE)
2900 # --------------------
2901 # Given a date (in UTC) from Subversion, return a string in the format
2902 # "<TZ Offset> <local date/time>" that Git will use.
2903 #
2904 # By default the parsed date will be in UTC; if $Git::SVN::_localtime
2905 # is true we'll convert it to the local timezone instead.
2906 sub parse_svn_date {
2907 my $date = shift || return '+0000 1970-01-01 00:00:00';
2908 my ($Y,$m,$d,$H,$M,$S) = ($date =~ /^(\d{4})\-(\d\d)\-(\d\d)T
2909 (\d\d)\:(\d\d)\:(\d\d)\.\d*Z$/x) or
2910 croak "Unable to parse date: $date\n";
2911 my $parsed_date; # Set next.
2913 if ($Git::SVN::_localtime) {
2914 # Translate the Subversion datetime to an epoch time.
2915 # Begin by switching ourselves to $date's timezone, UTC.
2916 my $old_env_TZ = $ENV{TZ};
2917 $ENV{TZ} = 'UTC';
2919 my $epoch_in_UTC =
2920 POSIX::strftime('%s', $S, $M, $H, $d, $m - 1, $Y - 1900);
2922 # Determine our local timezone (including DST) at the
2923 # time of $epoch_in_UTC. $Git::SVN::Log::TZ stored the
2924 # value of TZ, if any, at the time we were run.
2925 if (defined $Git::SVN::Log::TZ) {
2926 $ENV{TZ} = $Git::SVN::Log::TZ;
2927 } else {
2928 delete $ENV{TZ};
2929 }
2931 my $our_TZ =
2932 POSIX::strftime('%Z', $S, $M, $H, $d, $m - 1, $Y - 1900);
2934 # This converts $epoch_in_UTC into our local timezone.
2935 my ($sec, $min, $hour, $mday, $mon, $year,
2936 $wday, $yday, $isdst) = localtime($epoch_in_UTC);
2938 $parsed_date = sprintf('%s %04d-%02d-%02d %02d:%02d:%02d',
2939 $our_TZ, $year + 1900, $mon + 1,
2940 $mday, $hour, $min, $sec);
2942 # Reset us to the timezone in effect when we entered
2943 # this routine.
2944 if (defined $old_env_TZ) {
2945 $ENV{TZ} = $old_env_TZ;
2946 } else {
2947 delete $ENV{TZ};
2948 }
2949 } else {
2950 $parsed_date = "+0000 $Y-$m-$d $H:$M:$S";
2951 }
2953 return $parsed_date;
2954 }
2956 sub other_gs {
2957 my ($self, $new_url, $url,
2958 $branch_from, $r, $old_ref_id) = @_;
2959 my $gs = Git::SVN->find_by_url($new_url, $url, $branch_from);
2960 unless ($gs) {
2961 my $ref_id = $old_ref_id;
2962 $ref_id =~ s/\@\d+$//;
2963 $ref_id .= "\@$r";
2964 # just grow a tail if we're not unique enough :x
2965 $ref_id .= '-' while find_ref($ref_id);
2966 print STDERR "Initializing parent: $ref_id\n" unless $::_q > 1;
2967 my ($u, $p, $repo_id) = ($new_url, '', $ref_id);
2968 if ($u =~ s#^\Q$url\E(/|$)##) {
2969 $p = $u;
2970 $u = $url;
2971 $repo_id = $self->{repo_id};
2972 }
2973 $gs = Git::SVN->init($u, $p, $repo_id, $ref_id, 1);
2974 }
2975 $gs
2976 }
2978 sub call_authors_prog {
2979 my ($orig_author) = @_;
2980 $orig_author = command_oneline('rev-parse', '--sq-quote', $orig_author);
2981 my $author = `$::_authors_prog $orig_author`;
2982 if ($? != 0) {
2983 die "$::_authors_prog failed with exit code $?\n"
2984 }
2985 if ($author =~ /^\s*(.+?)\s*<(.*)>\s*$/) {
2986 my ($name, $email) = ($1, $2);
2987 $email = undef if length $2 == 0;
2988 return [$name, $email];
2989 } else {
2990 die "Author: $orig_author: $::_authors_prog returned "
2991 . "invalid author format: $author\n";
2992 }
2993 }
2995 sub check_author {
2996 my ($author) = @_;
2997 if (!defined $author || length $author == 0) {
2998 $author = '(no author)';
2999 }
3000 if (!defined $::users{$author}) {
3001 if (defined $::_authors_prog) {
3002 $::users{$author} = call_authors_prog($author);
3003 } elsif (defined $::_authors) {
3004 die "Author: $author not defined in $::_authors file\n";
3005 }
3006 }
3007 $author;
3008 }
3010 sub find_extra_svk_parents {
3011 my ($self, $ed, $tickets, $parents) = @_;
3012 # aha! svk:merge property changed...
3013 my @tickets = split "\n", $tickets;
3014 my @known_parents;
3015 for my $ticket ( @tickets ) {
3016 my ($uuid, $path, $rev) = split /:/, $ticket;
3017 if ( $uuid eq $self->ra_uuid ) {
3018 my $url = $self->{url};
3019 my $repos_root = $url;
3020 my $branch_from = $path;
3021 $branch_from =~ s{^/}{};
3022 my $gs = $self->other_gs($repos_root."/".$branch_from,
3023 $url,
3024 $branch_from,
3025 $rev,
3026 $self->{ref_id});
3027 if ( my $commit = $gs->rev_map_get($rev, $uuid) ) {
3028 # wahey! we found it, but it might be
3029 # an old one (!)
3030 push @known_parents, [ $rev, $commit ];
3031 }
3032 }
3033 }
3034 # Ordering matters; highest-numbered commit merge tickets
3035 # first, as they may account for later merge ticket additions
3036 # or changes.
3037 @known_parents = map {$_->[1]} sort {$b->[0] <=> $a->[0]} @known_parents;
3038 for my $parent ( @known_parents ) {
3039 my @cmd = ('rev-list', $parent, map { "^$_" } @$parents );
3040 my ($msg_fh, $ctx) = command_output_pipe(@cmd);
3041 my $new;
3042 while ( <$msg_fh> ) {
3043 $new=1;last;
3044 }
3045 command_close_pipe($msg_fh, $ctx);
3046 if ( $new ) {
3047 print STDERR
3048 "Found merge parent (svk:merge ticket): $parent\n";
3049 push @$parents, $parent;
3050 }
3051 }
3052 }
3054 sub lookup_svn_merge {
3055 my $uuid = shift;
3056 my $url = shift;
3057 my $merge = shift;
3059 my ($source, $revs) = split ":", $merge;
3060 my $path = $source;
3061 $path =~ s{^/}{};
3062 my $gs = Git::SVN->find_by_url($url.$source, $url, $path);
3063 if ( !$gs ) {
3064 warn "Couldn't find revmap for $url$source\n";
3065 return;
3066 }
3067 my @ranges = split ",", $revs;
3068 my ($tip, $tip_commit);
3069 my @merged_commit_ranges;
3070 # find the tip
3071 for my $range ( @ranges ) {
3072 my ($bottom, $top) = split "-", $range;
3073 $top ||= $bottom;
3074 my $bottom_commit = $gs->find_rev_after( $bottom, 1, $top );
3075 my $top_commit = $gs->find_rev_before( $top, 1, $bottom );
3077 unless ($top_commit and $bottom_commit) {
3078 warn "W:unknown path/rev in svn:mergeinfo "
3079 ."dirprop: $source:$range\n";
3080 next;
3081 }
3083 push @merged_commit_ranges,
3084 "$bottom_commit^..$top_commit";
3086 if ( !defined $tip or $top > $tip ) {
3087 $tip = $top;
3088 $tip_commit = $top_commit;
3089 }
3090 }
3091 return ($tip_commit, @merged_commit_ranges);
3092 }
3094 sub _rev_list {
3095 my ($msg_fh, $ctx) = command_output_pipe(
3096 "rev-list", @_,
3097 );
3098 my @rv;
3099 while ( <$msg_fh> ) {
3100 chomp;
3101 push @rv, $_;
3102 }
3103 command_close_pipe($msg_fh, $ctx);
3104 @rv;
3105 }
3107 sub check_cherry_pick {
3108 my $base = shift;
3109 my $tip = shift;
3110 my @ranges = @_;
3111 my %commits = map { $_ => 1 }
3112 _rev_list("--no-merges", $tip, "--not", $base);
3113 for my $range ( @ranges ) {
3114 delete @commits{_rev_list($range)};
3115 }
3116 for my $commit (keys %commits) {
3117 if (has_no_changes($commit)) {
3118 delete $commits{$commit};
3119 }
3120 }
3121 return (keys %commits);
3122 }
3124 sub has_no_changes {
3125 my $commit = shift;
3127 my @revs = split / /, command_oneline(
3128 qw(rev-list --parents -1 -m), $commit);
3130 # Commits with no parents, e.g. the start of a partial branch,
3131 # have changes by definition.
3132 return 1 if (@revs < 2);
3134 # Commits with multiple parents, e.g a merge, have no changes
3135 # by definition.
3136 return 0 if (@revs > 2);
3138 return (command_oneline("rev-parse", "$commit^{tree}") eq
3139 command_oneline("rev-parse", "$commit~1^{tree}"));
3140 }
3142 # The GIT_DIR environment variable is not always set until after the command
3143 # line arguments are processed, so we can't memoize in a BEGIN block.
3144 {
3145 my $memoized = 0;
3147 sub memoize_svn_mergeinfo_functions {
3148 return if $memoized;
3149 $memoized = 1;
3151 my $cache_path = "$ENV{GIT_DIR}/svn/.caches/";
3152 mkpath([$cache_path]) unless -d $cache_path;
3154 tie my %lookup_svn_merge_cache => 'Memoize::Storable',
3155 "$cache_path/lookup_svn_merge.db", 'nstore';
3156 memoize 'lookup_svn_merge',
3157 SCALAR_CACHE => 'FAULT',
3158 LIST_CACHE => ['HASH' => \%lookup_svn_merge_cache],
3159 ;
3161 tie my %check_cherry_pick_cache => 'Memoize::Storable',
3162 "$cache_path/check_cherry_pick.db", 'nstore';
3163 memoize 'check_cherry_pick',
3164 SCALAR_CACHE => 'FAULT',
3165 LIST_CACHE => ['HASH' => \%check_cherry_pick_cache],
3166 ;
3168 tie my %has_no_changes_cache => 'Memoize::Storable',
3169 "$cache_path/has_no_changes.db", 'nstore';
3170 memoize 'has_no_changes',
3171 SCALAR_CACHE => ['HASH' => \%has_no_changes_cache],
3172 LIST_CACHE => 'FAULT',
3173 ;
3174 }
3176 sub unmemoize_svn_mergeinfo_functions {
3177 return if not $memoized;
3178 $memoized = 0;
3180 Memoize::unmemoize 'lookup_svn_merge';
3181 Memoize::unmemoize 'check_cherry_pick';
3182 Memoize::unmemoize 'has_no_changes';
3183 }
3184 }
3186 END {
3187 # Force cache writeout explicitly instead of waiting for
3188 # global destruction to avoid segfault in Storable:
3189 # http://rt.cpan.org/Public/Bug/Display.html?id=36087
3190 unmemoize_svn_mergeinfo_functions();
3191 }
3193 sub parents_exclude {
3194 my $parents = shift;
3195 my @commits = @_;
3196 return unless @commits;
3198 my @excluded;
3199 my $excluded;
3200 do {
3201 my @cmd = ('rev-list', "-1", @commits, "--not", @$parents );
3202 $excluded = command_oneline(@cmd);
3203 if ( $excluded ) {
3204 my @new;
3205 my $found;
3206 for my $commit ( @commits ) {
3207 if ( $commit eq $excluded ) {
3208 push @excluded, $commit;
3209 $found++;
3210 last;
3211 }
3212 else {
3213 push @new, $commit;
3214 }
3215 }
3216 die "saw commit '$excluded' in rev-list output, "
3217 ."but we didn't ask for that commit (wanted: @commits --not @$parents)"
3218 unless $found;
3219 @commits = @new;
3220 }
3221 }
3222 while ($excluded and @commits);
3224 return @excluded;
3225 }
3228 # note: this function should only be called if the various dirprops
3229 # have actually changed
3230 sub find_extra_svn_parents {
3231 my ($self, $ed, $mergeinfo, $parents) = @_;
3232 # aha! svk:merge property changed...
3234 memoize_svn_mergeinfo_functions();
3236 # We first search for merged tips which are not in our
3237 # history. Then, we figure out which git revisions are in
3238 # that tip, but not this revision. If all of those revisions
3239 # are now marked as merge, we can add the tip as a parent.
3240 my @merges = split "\n", $mergeinfo;
3241 my @merge_tips;
3242 my $url = $self->{url};
3243 my $uuid = $self->ra_uuid;
3244 my %ranges;
3245 for my $merge ( @merges ) {
3246 my ($tip_commit, @ranges) =
3247 lookup_svn_merge( $uuid, $url, $merge );
3248 unless (!$tip_commit or
3249 grep { $_ eq $tip_commit } @$parents ) {
3250 push @merge_tips, $tip_commit;
3251 $ranges{$tip_commit} = \@ranges;
3252 } else {
3253 push @merge_tips, undef;
3254 }
3255 }
3257 my %excluded = map { $_ => 1 }
3258 parents_exclude($parents, grep { defined } @merge_tips);
3260 # check merge tips for new parents
3261 my @new_parents;
3262 for my $merge_tip ( @merge_tips ) {
3263 my $spec = shift @merges;
3264 next unless $merge_tip and $excluded{$merge_tip};
3266 my $ranges = $ranges{$merge_tip};
3268 # check out 'new' tips
3269 my $merge_base;
3270 eval {
3271 $merge_base = command_oneline(
3272 "merge-base",
3273 @$parents, $merge_tip,
3274 );
3275 };
3276 if ($@) {
3277 die "An error occurred during merge-base"
3278 unless $@->isa("Git::Error::Command");
3280 warn "W: Cannot find common ancestor between ".
3281 "@$parents and $merge_tip. Ignoring merge info.\n";
3282 next;
3283 }
3285 # double check that there are no missing non-merge commits
3286 my (@incomplete) = check_cherry_pick(
3287 $merge_base, $merge_tip,
3288 @$ranges,
3289 );
3291 if ( @incomplete ) {
3292 warn "W:svn cherry-pick ignored ($spec) - missing "
3293 .@incomplete." commit(s) (eg $incomplete[0])\n";
3294 } else {
3295 warn
3296 "Found merge parent (svn:mergeinfo prop): ",
3297 $merge_tip, "\n";
3298 push @new_parents, $merge_tip;
3299 }
3300 }
3302 # cater for merges which merge commits from multiple branches
3303 if ( @new_parents > 1 ) {
3304 for ( my $i = 0; $i <= $#new_parents; $i++ ) {
3305 for ( my $j = 0; $j <= $#new_parents; $j++ ) {
3306 next if $i == $j;
3307 next unless $new_parents[$i];
3308 next unless $new_parents[$j];
3309 my $revs = command_oneline(
3310 "rev-list", "-1",
3311 "$new_parents[$i]..$new_parents[$j]",
3312 );
3313 if ( !$revs ) {
3314 undef($new_parents[$j]);
3315 }
3316 }
3317 }
3318 }
3319 push @$parents, grep { defined } @new_parents;
3320 }
3322 sub make_log_entry {
3323 my ($self, $rev, $parents, $ed) = @_;
3324 my $untracked = $self->get_untracked($ed);
3326 my @parents = @$parents;
3327 my $ps = $ed->{path_strip} || "";
3328 for my $path ( grep { m/$ps/ } %{$ed->{dir_prop}} ) {
3329 my $props = $ed->{dir_prop}{$path};
3330 if ( $props->{"svk:merge"} ) {
3331 $self->find_extra_svk_parents
3332 ($ed, $props->{"svk:merge"}, \@parents);
3333 }
3334 if ( $props->{"svn:mergeinfo"} ) {
3335 $self->find_extra_svn_parents
3336 ($ed,
3337 $props->{"svn:mergeinfo"},
3338 \@parents);
3339 }
3340 }
3342 open my $un, '>>', "$self->{dir}/unhandled.log" or croak $!;
3343 print $un "r$rev\n" or croak $!;
3344 print $un $_, "\n" foreach @$untracked;
3345 my %log_entry = ( parents => \@parents, revision => $rev,
3346 log => '');
3348 my $headrev;
3349 my $logged = delete $self->{logged_rev_props};
3350 if (!$logged || $self->{-want_revprops}) {
3351 my $rp = $self->ra->rev_proplist($rev);
3352 foreach (sort keys %$rp) {
3353 my $v = $rp->{$_};
3354 if (/^svn:(author|date|log)$/) {
3355 $log_entry{$1} = $v;
3356 } elsif ($_ eq 'svm:headrev') {
3357 $headrev = $v;
3358 } else {
3359 print $un " rev_prop: ", uri_encode($_), ' ',
3360 uri_encode($v), "\n";
3361 }
3362 }
3363 } else {
3364 map { $log_entry{$_} = $logged->{$_} } keys %$logged;
3365 }
3366 close $un or croak $!;
3368 $log_entry{date} = parse_svn_date($log_entry{date});
3369 $log_entry{log} .= "\n";
3370 my $author = $log_entry{author} = check_author($log_entry{author});
3371 my ($name, $email) = defined $::users{$author} ? @{$::users{$author}}
3372 : ($author, undef);
3374 my ($commit_name, $commit_email) = ($name, $email);
3375 if ($_use_log_author) {
3376 my $name_field;
3377 if ($log_entry{log} =~ /From:\s+(.*\S)\s*\n/i) {
3378 $name_field = $1;
3379 } elsif ($log_entry{log} =~ /Signed-off-by:\s+(.*\S)\s*\n/i) {
3380 $name_field = $1;
3381 }
3382 if (!defined $name_field) {
3383 if (!defined $email) {
3384 $email = $name;
3385 }
3386 } elsif ($name_field =~ /(.*?)\s+<(.*)>/) {
3387 ($name, $email) = ($1, $2);
3388 } elsif ($name_field =~ /(.*)@/) {
3389 ($name, $email) = ($1, $name_field);
3390 } else {
3391 ($name, $email) = ($name_field, $name_field);
3392 }
3393 }
3394 if (defined $headrev && $self->use_svm_props) {
3395 if ($self->rewrite_root) {
3396 die "Can't have both 'useSvmProps' and 'rewriteRoot' ",
3397 "options set!\n";
3398 }
3399 if ($self->rewrite_uuid) {
3400 die "Can't have both 'useSvmProps' and 'rewriteUUID' ",
3401 "options set!\n";
3402 }
3403 my ($uuid, $r) = $headrev =~ m{^([a-f\d\-]{30,}):(\d+)$}i;
3404 # we don't want "SVM: initializing mirror for junk" ...
3405 return undef if $r == 0;
3406 my $svm = $self->svm;
3407 if ($uuid ne $svm->{uuid}) {
3408 die "UUID mismatch on SVM path:\n",
3409 "expected: $svm->{uuid}\n",
3410 " got: $uuid\n";
3411 }
3412 my $full_url = $self->full_url;
3413 $full_url =~ s#^\Q$svm->{replace}\E(/|$)#$svm->{source}$1# or
3414 die "Failed to replace '$svm->{replace}' with ",
3415 "'$svm->{source}' in $full_url\n";
3416 # throw away username for storing in records
3417 remove_username($full_url);
3418 $log_entry{metadata} = "$full_url\@$r $uuid";
3419 $log_entry{svm_revision} = $r;
3420 $email ||= "$author\@$uuid";
3421 $commit_email ||= "$author\@$uuid";
3422 } elsif ($self->use_svnsync_props) {
3423 my $full_url = $self->svnsync->{url};
3424 $full_url .= "/$self->{path}" if length $self->{path};
3425 remove_username($full_url);
3426 my $uuid = $self->svnsync->{uuid};
3427 $log_entry{metadata} = "$full_url\@$rev $uuid";
3428 $email ||= "$author\@$uuid";
3429 $commit_email ||= "$author\@$uuid";
3430 } else {
3431 my $url = $self->metadata_url;
3432 remove_username($url);
3433 my $uuid = $self->rewrite_uuid || $self->ra->get_uuid;
3434 $log_entry{metadata} = "$url\@$rev " . $uuid;
3435 $email ||= "$author\@" . $uuid;
3436 $commit_email ||= "$author\@" . $uuid;
3437 }
3438 $log_entry{name} = $name;
3439 $log_entry{email} = $email;
3440 $log_entry{commit_name} = $commit_name;
3441 $log_entry{commit_email} = $commit_email;
3442 \%log_entry;
3443 }
3445 sub fetch {
3446 my ($self, $min_rev, $max_rev, @parents) = @_;
3447 my ($last_rev, $last_commit) = $self->last_rev_commit;
3448 my ($base, $head) = $self->get_fetch_range($min_rev, $max_rev);
3449 $self->ra->gs_fetch_loop_common($base, $head, [$self]);
3450 }
3452 sub set_tree_cb {
3453 my ($self, $log_entry, $tree, $rev, $date, $author) = @_;
3454 $self->{inject_parents} = { $rev => $tree };
3455 $self->fetch(undef, undef);
3456 }
3458 sub set_tree {
3459 my ($self, $tree) = (shift, shift);
3460 my $log_entry = ::get_commit_entry($tree);
3461 unless ($self->{last_rev}) {
3462 ::fatal("Must have an existing revision to commit");
3463 }
3464 my %ed_opts = ( r => $self->{last_rev},
3465 log => $log_entry->{log},
3466 ra => $self->ra,
3467 tree_a => $self->{last_commit},
3468 tree_b => $tree,
3469 editor_cb => sub {
3470 $self->set_tree_cb($log_entry, $tree, @_) },
3471 svn_path => $self->{path} );
3472 if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) {
3473 print "No changes\nr$self->{last_rev} = $tree\n";
3474 }
3475 }
3477 sub rebuild_from_rev_db {
3478 my ($self, $path) = @_;
3479 my $r = -1;
3480 open my $fh, '<', $path or croak "open: $!";
3481 binmode $fh or croak "binmode: $!";
3482 while (<$fh>) {
3483 length($_) == 41 or croak "inconsistent size in ($_) != 41";
3484 chomp($_);
3485 ++$r;
3486 next if $_ eq ('0' x 40);
3487 $self->rev_map_set($r, $_);
3488 print "r$r = $_\n";
3489 }
3490 close $fh or croak "close: $!";
3491 unlink $path or croak "unlink: $!";
3492 }
3494 sub rebuild {
3495 my ($self) = @_;
3496 my $map_path = $self->map_path;
3497 my $partial = (-e $map_path && ! -z $map_path);
3498 return unless ::verify_ref($self->refname.'^0');
3499 if (!$partial && ($self->use_svm_props || $self->no_metadata)) {
3500 my $rev_db = $self->rev_db_path;
3501 $self->rebuild_from_rev_db($rev_db);
3502 if ($self->use_svm_props) {
3503 my $svm_rev_db = $self->rev_db_path($self->svm_uuid);
3504 $self->rebuild_from_rev_db($svm_rev_db);
3505 }
3506 $self->unlink_rev_db_symlink;
3507 return;
3508 }
3509 print "Rebuilding $map_path ...\n" if (!$partial);
3510 my ($base_rev, $head) = ($partial ? $self->rev_map_max_norebuild(1) :
3511 (undef, undef));
3512 my ($log, $ctx) =
3513 command_output_pipe(qw/rev-list --pretty=raw --no-color --reverse/,
3514 ($head ? "$head.." : "") . $self->refname,
3515 '--');
3516 my $metadata_url = $self->metadata_url;
3517 remove_username($metadata_url);
3518 my $svn_uuid = $self->rewrite_uuid || $self->ra_uuid;
3519 my $c;
3520 while (<$log>) {
3521 if ( m{^commit ($::sha1)$} ) {
3522 $c = $1;
3523 next;
3524 }
3525 next unless s{^\s*(git-svn-id:)}{$1};
3526 my ($url, $rev, $uuid) = ::extract_metadata($_);
3527 remove_username($url);
3529 # ignore merges (from set-tree)
3530 next if (!defined $rev || !$uuid);
3532 # if we merged or otherwise started elsewhere, this is
3533 # how we break out of it
3534 if (($uuid ne $svn_uuid) ||
3535 ($metadata_url && $url && ($url ne $metadata_url))) {
3536 next;
3537 }
3538 if ($partial && $head) {
3539 print "Partial-rebuilding $map_path ...\n";
3540 print "Currently at $base_rev = $head\n";
3541 $head = undef;
3542 }
3544 $self->rev_map_set($rev, $c);
3545 print "r$rev = $c\n";
3546 }
3547 command_close_pipe($log, $ctx);
3548 print "Done rebuilding $map_path\n" if (!$partial || !$head);
3549 my $rev_db_path = $self->rev_db_path;
3550 if (-f $self->rev_db_path) {
3551 unlink $self->rev_db_path or croak "unlink: $!";
3552 }
3553 $self->unlink_rev_db_symlink;
3554 }
3556 # rev_map:
3557 # Tie::File seems to be prone to offset errors if revisions get sparse,
3558 # it's not that fast, either. Tie::File is also not in Perl 5.6. So
3559 # one of my favorite modules is out :< Next up would be one of the DBM
3560 # modules, but I'm not sure which is most portable...
3561 #
3562 # This is the replacement for the rev_db format, which was too big
3563 # and inefficient for large repositories with a lot of sparse history
3564 # (mainly tags)
3565 #
3566 # The format is this:
3567 # - 24 bytes for every record,
3568 # * 4 bytes for the integer representing an SVN revision number
3569 # * 20 bytes representing the sha1 of a git commit
3570 # - No empty padding records like the old format
3571 # (except the last record, which can be overwritten)
3572 # - new records are written append-only since SVN revision numbers
3573 # increase monotonically
3574 # - lookups on SVN revision number are done via a binary search
3575 # - Piping the file to xxd -c24 is a good way of dumping it for
3576 # viewing or editing (piped back through xxd -r), should the need
3577 # ever arise.
3578 # - The last record can be padding revision with an all-zero sha1
3579 # This is used to optimize fetch performance when using multiple
3580 # "fetch" directives in .git/config
3581 #
3582 # These files are disposable unless noMetadata or useSvmProps is set
3584 sub _rev_map_set {
3585 my ($fh, $rev, $commit) = @_;
3587 binmode $fh or croak "binmode: $!";
3588 my $size = (stat($fh))[7];
3589 ($size % 24) == 0 or croak "inconsistent size: $size";
3591 my $wr_offset = 0;
3592 if ($size > 0) {
3593 sysseek($fh, -24, SEEK_END) or croak "seek: $!";
3594 my $read = sysread($fh, my $buf, 24) or croak "read: $!";
3595 $read == 24 or croak "read only $read bytes (!= 24)";
3596 my ($last_rev, $last_commit) = unpack(rev_map_fmt, $buf);
3597 if ($last_commit eq ('0' x40)) {
3598 if ($size >= 48) {
3599 sysseek($fh, -48, SEEK_END) or croak "seek: $!";
3600 $read = sysread($fh, $buf, 24) or
3601 croak "read: $!";
3602 $read == 24 or
3603 croak "read only $read bytes (!= 24)";
3604 ($last_rev, $last_commit) =
3605 unpack(rev_map_fmt, $buf);
3606 if ($last_commit eq ('0' x40)) {
3607 croak "inconsistent .rev_map\n";
3608 }
3609 }
3610 if ($last_rev >= $rev) {
3611 croak "last_rev is higher!: $last_rev >= $rev";
3612 }
3613 $wr_offset = -24;
3614 }
3615 }
3616 sysseek($fh, $wr_offset, SEEK_END) or croak "seek: $!";
3617 syswrite($fh, pack(rev_map_fmt, $rev, $commit), 24) == 24 or
3618 croak "write: $!";
3619 }
3621 sub _rev_map_reset {
3622 my ($fh, $rev, $commit) = @_;
3623 my $c = _rev_map_get($fh, $rev);
3624 $c eq $commit or die "_rev_map_reset(@_) commit $c does not match!\n";
3625 my $offset = sysseek($fh, 0, SEEK_CUR) or croak "seek: $!";
3626 truncate $fh, $offset or croak "truncate: $!";
3627 }
3629 sub mkfile {
3630 my ($path) = @_;
3631 unless (-e $path) {
3632 my ($dir, $base) = ($path =~ m#^(.*?)/?([^/]+)$#);
3633 mkpath([$dir]) unless -d $dir;
3634 open my $fh, '>>', $path or die "Couldn't create $path: $!\n";
3635 close $fh or die "Couldn't close (create) $path: $!\n";
3636 }
3637 }
3639 sub rev_map_set {
3640 my ($self, $rev, $commit, $update_ref, $uuid) = @_;
3641 defined $commit or die "missing arg3\n";
3642 length $commit == 40 or die "arg3 must be a full SHA1 hexsum\n";
3643 my $db = $self->map_path($uuid);
3644 my $db_lock = "$db.lock";
3645 my $sig;
3646 $update_ref ||= 0;
3647 if ($update_ref) {
3648 $SIG{INT} = $SIG{HUP} = $SIG{TERM} = $SIG{ALRM} = $SIG{PIPE} =
3649 $SIG{USR1} = $SIG{USR2} = sub { $sig = $_[0] };
3650 }
3651 mkfile($db);
3653 $LOCKFILES{$db_lock} = 1;
3654 my $sync;
3655 # both of these options make our .rev_db file very, very important
3656 # and we can't afford to lose it because rebuild() won't work
3657 if ($self->use_svm_props || $self->no_metadata) {
3658 $sync = 1;
3659 copy($db, $db_lock) or die "rev_map_set(@_): ",
3660 "Failed to copy: ",
3661 "$db => $db_lock ($!)\n";
3662 } else {
3663 rename $db, $db_lock or die "rev_map_set(@_): ",
3664 "Failed to rename: ",
3665 "$db => $db_lock ($!)\n";
3666 }
3668 sysopen(my $fh, $db_lock, O_RDWR | O_CREAT)
3669 or croak "Couldn't open $db_lock: $!\n";
3670 $update_ref eq 'reset' ? _rev_map_reset($fh, $rev, $commit) :
3671 _rev_map_set($fh, $rev, $commit);
3672 if ($sync) {
3673 $fh->flush or die "Couldn't flush $db_lock: $!\n";
3674 $fh->sync or die "Couldn't sync $db_lock: $!\n";
3675 }
3676 close $fh or croak $!;
3677 if ($update_ref) {
3678 $_head = $self;
3679 my $note = "";
3680 $note = " ($update_ref)" if ($update_ref !~ /^\d*$/);
3681 command_noisy('update-ref', '-m', "r$rev$note",
3682 $self->refname, $commit);
3683 }
3684 rename $db_lock, $db or die "rev_map_set(@_): ", "Failed to rename: ",
3685 "$db_lock => $db ($!)\n";
3686 delete $LOCKFILES{$db_lock};
3687 if ($update_ref) {
3688 $SIG{INT} = $SIG{HUP} = $SIG{TERM} = $SIG{ALRM} = $SIG{PIPE} =
3689 $SIG{USR1} = $SIG{USR2} = 'DEFAULT';
3690 kill $sig, $$ if defined $sig;
3691 }
3692 }
3694 # If want_commit, this will return an array of (rev, commit) where
3695 # commit _must_ be a valid commit in the archive.
3696 # Otherwise, it'll return the max revision (whether or not the
3697 # commit is valid or just a 0x40 placeholder).
3698 sub rev_map_max {
3699 my ($self, $want_commit) = @_;
3700 $self->rebuild;
3701 my ($r, $c) = $self->rev_map_max_norebuild($want_commit);
3702 $want_commit ? ($r, $c) : $r;
3703 }
3705 sub rev_map_max_norebuild {
3706 my ($self, $want_commit) = @_;
3707 my $map_path = $self->map_path;
3708 stat $map_path or return $want_commit ? (0, undef) : 0;
3709 sysopen(my $fh, $map_path, O_RDONLY) or croak "open: $!";
3710 binmode $fh or croak "binmode: $!";
3711 my $size = (stat($fh))[7];
3712 ($size % 24) == 0 or croak "inconsistent size: $size";
3714 if ($size == 0) {
3715 close $fh or croak "close: $!";
3716 return $want_commit ? (0, undef) : 0;
3717 }
3719 sysseek($fh, -24, SEEK_END) or croak "seek: $!";
3720 sysread($fh, my $buf, 24) == 24 or croak "read: $!";
3721 my ($r, $c) = unpack(rev_map_fmt, $buf);
3722 if ($want_commit && $c eq ('0' x40)) {
3723 if ($size < 48) {
3724 return $want_commit ? (0, undef) : 0;
3725 }
3726 sysseek($fh, -48, SEEK_END) or croak "seek: $!";
3727 sysread($fh, $buf, 24) == 24 or croak "read: $!";
3728 ($r, $c) = unpack(rev_map_fmt, $buf);
3729 if ($c eq ('0'x40)) {
3730 croak "Penultimate record is all-zeroes in $map_path";
3731 }
3732 }
3733 close $fh or croak "close: $!";
3734 $want_commit ? ($r, $c) : $r;
3735 }
3737 sub rev_map_get {
3738 my ($self, $rev, $uuid) = @_;
3739 my $map_path = $self->map_path($uuid);
3740 return undef unless -e $map_path;
3742 sysopen(my $fh, $map_path, O_RDONLY) or croak "open: $!";
3743 my $c = _rev_map_get($fh, $rev);
3744 close($fh) or croak "close: $!";
3745 $c
3746 }
3748 sub _rev_map_get {
3749 my ($fh, $rev) = @_;
3751 binmode $fh or croak "binmode: $!";
3752 my $size = (stat($fh))[7];
3753 ($size % 24) == 0 or croak "inconsistent size: $size";
3755 if ($size == 0) {
3756 return undef;
3757 }
3759 my ($l, $u) = (0, $size - 24);
3760 my ($r, $c, $buf);
3762 while ($l <= $u) {
3763 my $i = int(($l/24 + $u/24) / 2) * 24;
3764 sysseek($fh, $i, SEEK_SET) or croak "seek: $!";
3765 sysread($fh, my $buf, 24) == 24 or croak "read: $!";
3766 my ($r, $c) = unpack(rev_map_fmt, $buf);
3768 if ($r < $rev) {
3769 $l = $i + 24;
3770 } elsif ($r > $rev) {
3771 $u = $i - 24;
3772 } else { # $r == $rev
3773 return $c eq ('0' x 40) ? undef : $c;
3774 }
3775 }
3776 undef;
3777 }
3779 # Finds the first svn revision that exists on (if $eq_ok is true) or
3780 # before $rev for the current branch. It will not search any lower
3781 # than $min_rev. Returns the git commit hash and svn revision number
3782 # if found, else (undef, undef).
3783 sub find_rev_before {
3784 my ($self, $rev, $eq_ok, $min_rev) = @_;
3785 --$rev unless $eq_ok;
3786 $min_rev ||= 1;
3787 my $max_rev = $self->rev_map_max;
3788 $rev = $max_rev if ($rev > $max_rev);
3789 while ($rev >= $min_rev) {
3790 if (my $c = $self->rev_map_get($rev)) {
3791 return ($rev, $c);
3792 }
3793 --$rev;
3794 }
3795 return (undef, undef);
3796 }
3798 # Finds the first svn revision that exists on (if $eq_ok is true) or
3799 # after $rev for the current branch. It will not search any higher
3800 # than $max_rev. Returns the git commit hash and svn revision number
3801 # if found, else (undef, undef).
3802 sub find_rev_after {
3803 my ($self, $rev, $eq_ok, $max_rev) = @_;
3804 ++$rev unless $eq_ok;
3805 $max_rev ||= $self->rev_map_max;
3806 while ($rev <= $max_rev) {
3807 if (my $c = $self->rev_map_get($rev)) {
3808 return ($rev, $c);
3809 }
3810 ++$rev;
3811 }
3812 return (undef, undef);
3813 }
3815 sub _new {
3816 my ($class, $repo_id, $ref_id, $path) = @_;
3817 unless (defined $repo_id && length $repo_id) {
3818 $repo_id = $Git::SVN::default_repo_id;
3819 }
3820 unless (defined $ref_id && length $ref_id) {
3821 $_prefix = '' unless defined($_prefix);
3822 $_[2] = $ref_id =
3823 "refs/remotes/$_prefix$Git::SVN::default_ref_id";
3824 }
3825 $_[1] = $repo_id;
3826 my $dir = "$ENV{GIT_DIR}/svn/$ref_id";
3828 # Older repos imported by us used $GIT_DIR/svn/foo instead of
3829 # $GIT_DIR/svn/refs/remotes/foo when tracking refs/remotes/foo
3830 if ($ref_id =~ m{^refs/remotes/(.*)}) {
3831 my $old_dir = "$ENV{GIT_DIR}/svn/$1";
3832 if (-d $old_dir && ! -d $dir) {
3833 $dir = $old_dir;
3834 }
3835 }
3837 $_[3] = $path = '' unless (defined $path);
3838 mkpath([$dir]);
3839 bless {
3840 ref_id => $ref_id, dir => $dir, index => "$dir/index",
3841 path => $path, config => "$ENV{GIT_DIR}/svn/config",
3842 map_root => "$dir/.rev_map", repo_id => $repo_id }, $class;
3843 }
3845 # for read-only access of old .rev_db formats
3846 sub unlink_rev_db_symlink {
3847 my ($self) = @_;
3848 my $link = $self->rev_db_path;
3849 $link =~ s/\.[\w-]+$// or croak "missing UUID at the end of $link";
3850 if (-l $link) {
3851 unlink $link or croak "unlink: $link failed!";
3852 }
3853 }
3855 sub rev_db_path {
3856 my ($self, $uuid) = @_;
3857 my $db_path = $self->map_path($uuid);
3858 $db_path =~ s{/\.rev_map\.}{/\.rev_db\.}
3859 or croak "map_path: $db_path does not contain '/.rev_map.' !";
3860 $db_path;
3861 }
3863 # the new replacement for .rev_db
3864 sub map_path {
3865 my ($self, $uuid) = @_;
3866 $uuid ||= $self->ra_uuid;
3867 "$self->{map_root}.$uuid";
3868 }
3870 sub uri_encode {
3871 my ($f) = @_;
3872 $f =~ s#([^a-zA-Z0-9\*!\:_\./\-])#uc sprintf("%%%02x",ord($1))#eg;
3873 $f
3874 }
3876 sub uri_decode {
3877 my ($f) = @_;
3878 $f =~ s#%([0-9a-fA-F]{2})#chr(hex($1))#eg;
3879 $f
3880 }
3882 sub remove_username {
3883 $_[0] =~ s{^([^:]*://)[^@]+@}{$1};
3884 }
3886 package Git::SVN::Prompt;
3887 use strict;
3888 use warnings;
3889 require SVN::Core;
3890 use vars qw/$_no_auth_cache $_username/;
3892 sub simple {
3893 my ($cred, $realm, $default_username, $may_save, $pool) = @_;
3894 $may_save = undef if $_no_auth_cache;
3895 $default_username = $_username if defined $_username;
3896 if (defined $default_username && length $default_username) {
3897 if (defined $realm && length $realm) {
3898 print STDERR "Authentication realm: $realm\n";
3899 STDERR->flush;
3900 }
3901 $cred->username($default_username);
3902 } else {
3903 username($cred, $realm, $may_save, $pool);
3904 }
3905 $cred->password(_read_password("Password for '" .
3906 $cred->username . "': ", $realm));
3907 $cred->may_save($may_save);
3908 $SVN::_Core::SVN_NO_ERROR;
3909 }
3911 sub ssl_server_trust {
3912 my ($cred, $realm, $failures, $cert_info, $may_save, $pool) = @_;
3913 $may_save = undef if $_no_auth_cache;
3914 print STDERR "Error validating server certificate for '$realm':\n";
3915 {
3916 no warnings 'once';
3917 # All variables SVN::Auth::SSL::* are used only once,
3918 # so we're shutting up Perl warnings about this.
3919 if ($failures & $SVN::Auth::SSL::UNKNOWNCA) {
3920 print STDERR " - The certificate is not issued ",
3921 "by a trusted authority. Use the\n",
3922 " fingerprint to validate ",
3923 "the certificate manually!\n";
3924 }
3925 if ($failures & $SVN::Auth::SSL::CNMISMATCH) {
3926 print STDERR " - The certificate hostname ",
3927 "does not match.\n";
3928 }
3929 if ($failures & $SVN::Auth::SSL::NOTYETVALID) {
3930 print STDERR " - The certificate is not yet valid.\n";
3931 }
3932 if ($failures & $SVN::Auth::SSL::EXPIRED) {
3933 print STDERR " - The certificate has expired.\n";
3934 }
3935 if ($failures & $SVN::Auth::SSL::OTHER) {
3936 print STDERR " - The certificate has ",
3937 "an unknown error.\n";
3938 }
3939 } # no warnings 'once'
3940 printf STDERR
3941 "Certificate information:\n".
3942 " - Hostname: %s\n".
3943 " - Valid: from %s until %s\n".
3944 " - Issuer: %s\n".
3945 " - Fingerprint: %s\n",
3946 map $cert_info->$_, qw(hostname valid_from valid_until
3947 issuer_dname fingerprint);
3948 my $choice;
3949 prompt:
3950 print STDERR $may_save ?
3951 "(R)eject, accept (t)emporarily or accept (p)ermanently? " :
3952 "(R)eject or accept (t)emporarily? ";
3953 STDERR->flush;
3954 $choice = lc(substr(<STDIN> || 'R', 0, 1));
3955 if ($choice =~ /^t$/i) {
3956 $cred->may_save(undef);
3957 } elsif ($choice =~ /^r$/i) {
3958 return -1;
3959 } elsif ($may_save && $choice =~ /^p$/i) {
3960 $cred->may_save($may_save);
3961 } else {
3962 goto prompt;
3963 }
3964 $cred->accepted_failures($failures);
3965 $SVN::_Core::SVN_NO_ERROR;
3966 }
3968 sub ssl_client_cert {
3969 my ($cred, $realm, $may_save, $pool) = @_;
3970 $may_save = undef if $_no_auth_cache;
3971 print STDERR "Client certificate filename: ";
3972 STDERR->flush;
3973 chomp(my $filename = <STDIN>);
3974 $cred->cert_file($filename);
3975 $cred->may_save($may_save);
3976 $SVN::_Core::SVN_NO_ERROR;
3977 }
3979 sub ssl_client_cert_pw {
3980 my ($cred, $realm, $may_save, $pool) = @_;
3981 $may_save = undef if $_no_auth_cache;
3982 $cred->password(_read_password("Password: ", $realm));
3983 $cred->may_save($may_save);
3984 $SVN::_Core::SVN_NO_ERROR;
3985 }
3987 sub username {
3988 my ($cred, $realm, $may_save, $pool) = @_;
3989 $may_save = undef if $_no_auth_cache;
3990 if (defined $realm && length $realm) {
3991 print STDERR "Authentication realm: $realm\n";
3992 }
3993 my $username;
3994 if (defined $_username) {
3995 $username = $_username;
3996 } else {
3997 print STDERR "Username: ";
3998 STDERR->flush;
3999 chomp($username = <STDIN>);
4000 }
4001 $cred->username($username);
4002 $cred->may_save($may_save);
4003 $SVN::_Core::SVN_NO_ERROR;
4004 }
4006 sub _read_password {
4007 my ($prompt, $realm) = @_;
4008 my $password = '';
4009 if (exists $ENV{GIT_ASKPASS}) {
4010 open(PH, "-|", $ENV{GIT_ASKPASS}, $prompt);
4011 $password = <PH>;
4012 $password =~ s/[\012\015]//; # \n\r
4013 close(PH);
4014 } else {
4015 print STDERR $prompt;
4016 STDERR->flush;
4017 require Term::ReadKey;
4018 Term::ReadKey::ReadMode('noecho');
4019 while (defined(my $key = Term::ReadKey::ReadKey(0))) {
4020 last if $key =~ /[\012\015]/; # \n\r
4021 $password .= $key;
4022 }
4023 Term::ReadKey::ReadMode('restore');
4024 print STDERR "\n";
4025 STDERR->flush;
4026 }
4027 $password;
4028 }
4030 package SVN::Git::Fetcher;
4031 use vars qw/@ISA/;
4032 use strict;
4033 use warnings;
4034 use Carp qw/croak/;
4035 use IO::File qw//;
4036 use vars qw/$_ignore_regex/;
4038 # file baton members: path, mode_a, mode_b, pool, fh, blob, base
4039 sub new {
4040 my ($class, $git_svn, $switch_path) = @_;
4041 my $self = SVN::Delta::Editor->new;
4042 bless $self, $class;
4043 if (exists $git_svn->{last_commit}) {
4044 $self->{c} = $git_svn->{last_commit};
4045 $self->{empty_symlinks} =
4046 _mark_empty_symlinks($git_svn, $switch_path);
4047 }
4048 $self->{ignore_regex} = eval { command_oneline('config', '--get',
4049 "svn-remote.$git_svn->{repo_id}.ignore-paths") };
4050 $self->{empty} = {};
4051 $self->{dir_prop} = {};
4052 $self->{file_prop} = {};
4053 $self->{absent_dir} = {};
4054 $self->{absent_file} = {};
4055 $self->{gii} = $git_svn->tmp_index_do(sub { Git::IndexInfo->new });
4056 $self->{pathnameencoding} = Git::config('svn.pathnameencoding');
4057 $self;
4058 }
4060 # this uses the Ra object, so it must be called before do_{switch,update},
4061 # not inside them (when the Git::SVN::Fetcher object is passed) to
4062 # do_{switch,update}
4063 sub _mark_empty_symlinks {
4064 my ($git_svn, $switch_path) = @_;
4065 my $bool = Git::config_bool('svn.brokenSymlinkWorkaround');
4066 return {} if (!defined($bool)) || (defined($bool) && ! $bool);
4068 my %ret;
4069 my ($rev, $cmt) = $git_svn->last_rev_commit;
4070 return {} unless ($rev && $cmt);
4072 # allow the warning to be printed for each revision we fetch to
4073 # ensure the user sees it. The user can also disable the workaround
4074 # on the repository even while git svn is running and the next
4075 # revision fetched will skip this expensive function.
4076 my $printed_warning;
4077 chomp(my $empty_blob = `git hash-object -t blob --stdin < /dev/null`);
4078 my ($ls, $ctx) = command_output_pipe(qw/ls-tree -r -z/, $cmt);
4079 local $/ = "\0";
4080 my $pfx = defined($switch_path) ? $switch_path : $git_svn->{path};
4081 $pfx .= '/' if length($pfx);
4082 while (<$ls>) {
4083 chomp;
4084 s/\A100644 blob $empty_blob\t//o or next;
4085 unless ($printed_warning) {
4086 print STDERR "Scanning for empty symlinks, ",
4087 "this may take a while if you have ",
4088 "many empty files\n",
4089 "You may disable this with `",
4090 "git config svn.brokenSymlinkWorkaround ",
4091 "false'.\n",
4092 "This may be done in a different ",
4093 "terminal without restarting ",
4094 "git svn\n";
4095 $printed_warning = 1;
4096 }
4097 my $path = $_;
4098 my (undef, $props) =
4099 $git_svn->ra->get_file($pfx.$path, $rev, undef);
4100 if ($props->{'svn:special'}) {
4101 $ret{$path} = 1;
4102 }
4103 }
4104 command_close_pipe($ls, $ctx);
4105 \%ret;
4106 }
4108 # returns true if a given path is inside a ".git" directory
4109 sub in_dot_git {
4110 $_[0] =~ m{(?:^|/)\.git(?:/|$)};
4111 }
4113 # return value: 0 -- don't ignore, 1 -- ignore
4114 sub is_path_ignored {
4115 my ($self, $path) = @_;
4116 return 1 if in_dot_git($path);
4117 return 1 if defined($self->{ignore_regex}) &&
4118 $path =~ m!$self->{ignore_regex}!;
4119 return 0 unless defined($_ignore_regex);
4120 return 1 if $path =~ m!$_ignore_regex!o;
4121 return 0;
4122 }
4124 sub set_path_strip {
4125 my ($self, $path) = @_;
4126 $self->{path_strip} = qr/^\Q$path\E(\/|$)/ if length $path;
4127 }
4129 sub open_root {
4130 { path => '' };
4131 }
4133 sub open_directory {
4134 my ($self, $path, $pb, $rev) = @_;
4135 { path => $path };
4136 }
4138 sub git_path {
4139 my ($self, $path) = @_;
4140 if (my $enc = $self->{pathnameencoding}) {
4141 require Encode;
4142 Encode::from_to($path, 'UTF-8', $enc);
4143 }
4144 if ($self->{path_strip}) {
4145 $path =~ s!$self->{path_strip}!! or
4146 die "Failed to strip path '$path' ($self->{path_strip})\n";
4147 }
4148 $path;
4149 }
4151 sub delete_entry {
4152 my ($self, $path, $rev, $pb) = @_;
4153 return undef if $self->is_path_ignored($path);
4155 my $gpath = $self->git_path($path);
4156 return undef if ($gpath eq '');
4158 # remove entire directories.
4159 my ($tree) = (command('ls-tree', '-z', $self->{c}, "./$gpath")
4160 =~ /\A040000 tree ([a-f\d]{40})\t\Q$gpath\E\0/);
4161 if ($tree) {
4162 my ($ls, $ctx) = command_output_pipe(qw/ls-tree
4163 -r --name-only -z/,
4164 $tree);
4165 local $/ = "\0";
4166 while (<$ls>) {
4167 chomp;
4168 my $rmpath = "$gpath/$_";
4169 $self->{gii}->remove($rmpath);
4170 print "\tD\t$rmpath\n" unless $::_q;
4171 }
4172 print "\tD\t$gpath/\n" unless $::_q;
4173 command_close_pipe($ls, $ctx);
4174 } else {
4175 $self->{gii}->remove($gpath);
4176 print "\tD\t$gpath\n" unless $::_q;
4177 }
4178 $self->{empty}->{$path} = 0;
4179 undef;
4180 }
4182 sub open_file {
4183 my ($self, $path, $pb, $rev) = @_;
4184 my ($mode, $blob);
4186 goto out if $self->is_path_ignored($path);
4188 my $gpath = $self->git_path($path);
4189 ($mode, $blob) = (command('ls-tree', '-z', $self->{c}, "./$gpath")
4190 =~ /\A(\d{6}) blob ([a-f\d]{40})\t\Q$gpath\E\0/);
4191 unless (defined $mode && defined $blob) {
4192 die "$path was not found in commit $self->{c} (r$rev)\n";
4193 }
4194 if ($mode eq '100644' && $self->{empty_symlinks}->{$path}) {
4195 $mode = '120000';
4196 }
4197 out:
4198 { path => $path, mode_a => $mode, mode_b => $mode, blob => $blob,
4199 pool => SVN::Pool->new, action => 'M' };
4200 }
4202 sub add_file {
4203 my ($self, $path, $pb, $cp_path, $cp_rev) = @_;
4204 my $mode;
4206 if (!$self->is_path_ignored($path)) {
4207 my ($dir, $file) = ($path =~ m#^(.*?)/?([^/]+)$#);
4208 delete $self->{empty}->{$dir};
4209 $mode = '100644';
4210 }
4211 { path => $path, mode_a => $mode, mode_b => $mode,
4212 pool => SVN::Pool->new, action => 'A' };
4213 }
4215 sub add_directory {
4216 my ($self, $path, $cp_path, $cp_rev) = @_;
4217 goto out if $self->is_path_ignored($path);
4218 my $gpath = $self->git_path($path);
4219 if ($gpath eq '') {
4220 my ($ls, $ctx) = command_output_pipe(qw/ls-tree
4221 -r --name-only -z/,
4222 $self->{c});
4223 local $/ = "\0";
4224 while (<$ls>) {
4225 chomp;
4226 $self->{gii}->remove($_);
4227 print "\tD\t$_\n" unless $::_q;
4228 }
4229 command_close_pipe($ls, $ctx);
4230 $self->{empty}->{$path} = 0;
4231 }
4232 my ($dir, $file) = ($path =~ m#^(.*?)/?([^/]+)$#);
4233 delete $self->{empty}->{$dir};
4234 $self->{empty}->{$path} = 1;
4235 out:
4236 { path => $path };
4237 }
4239 sub change_dir_prop {
4240 my ($self, $db, $prop, $value) = @_;
4241 return undef if $self->is_path_ignored($db->{path});
4242 $self->{dir_prop}->{$db->{path}} ||= {};
4243 $self->{dir_prop}->{$db->{path}}->{$prop} = $value;
4244 undef;
4245 }
4247 sub absent_directory {
4248 my ($self, $path, $pb) = @_;
4249 return undef if $self->is_path_ignored($path);
4250 $self->{absent_dir}->{$pb->{path}} ||= [];
4251 push @{$self->{absent_dir}->{$pb->{path}}}, $path;
4252 undef;
4253 }
4255 sub absent_file {
4256 my ($self, $path, $pb) = @_;
4257 return undef if $self->is_path_ignored($path);
4258 $self->{absent_file}->{$pb->{path}} ||= [];
4259 push @{$self->{absent_file}->{$pb->{path}}}, $path;
4260 undef;
4261 }
4263 sub change_file_prop {
4264 my ($self, $fb, $prop, $value) = @_;
4265 return undef if $self->is_path_ignored($fb->{path});
4266 if ($prop eq 'svn:executable') {
4267 if ($fb->{mode_b} != 120000) {
4268 $fb->{mode_b} = defined $value ? 100755 : 100644;
4269 }
4270 } elsif ($prop eq 'svn:special') {
4271 $fb->{mode_b} = defined $value ? 120000 : 100644;
4272 } else {
4273 $self->{file_prop}->{$fb->{path}} ||= {};
4274 $self->{file_prop}->{$fb->{path}}->{$prop} = $value;
4275 }
4276 undef;
4277 }
4279 sub apply_textdelta {
4280 my ($self, $fb, $exp) = @_;
4281 return undef if $self->is_path_ignored($fb->{path});
4282 my $fh = $::_repository->temp_acquire('svn_delta');
4283 # $fh gets auto-closed() by SVN::TxDelta::apply(),
4284 # (but $base does not,) so dup() it for reading in close_file
4285 open my $dup, '<&', $fh or croak $!;
4286 my $base = $::_repository->temp_acquire('git_blob');
4288 if ($fb->{blob}) {
4289 my ($base_is_link, $size);
4291 if ($fb->{mode_a} eq '120000' &&
4292 ! $self->{empty_symlinks}->{$fb->{path}}) {
4293 print $base 'link ' or die "print $!\n";
4294 $base_is_link = 1;
4295 }
4296 retry:
4297 $size = $::_repository->cat_blob($fb->{blob}, $base);
4298 die "Failed to read object $fb->{blob}" if ($size < 0);
4300 if (defined $exp) {
4301 seek $base, 0, 0 or croak $!;
4302 my $got = ::md5sum($base);
4303 if ($got ne $exp) {
4304 my $err = "Checksum mismatch: ".
4305 "$fb->{path} $fb->{blob}\n" .
4306 "expected: $exp\n" .
4307 " got: $got\n";
4308 if ($base_is_link) {
4309 warn $err,
4310 "Retrying... (possibly ",
4311 "a bad symlink from SVN)\n";
4312 $::_repository->temp_reset($base);
4313 $base_is_link = 0;
4314 goto retry;
4315 }
4316 die $err;
4317 }
4318 }
4319 }
4320 seek $base, 0, 0 or croak $!;
4321 $fb->{fh} = $fh;
4322 $fb->{base} = $base;
4323 [ SVN::TxDelta::apply($base, $dup, undef, $fb->{path}, $fb->{pool}) ];
4324 }
4326 sub close_file {
4327 my ($self, $fb, $exp) = @_;
4328 return undef if $self->is_path_ignored($fb->{path});
4330 my $hash;
4331 my $path = $self->git_path($fb->{path});
4332 if (my $fh = $fb->{fh}) {
4333 if (defined $exp) {
4334 seek($fh, 0, 0) or croak $!;
4335 my $got = ::md5sum($fh);
4336 if ($got ne $exp) {
4337 die "Checksum mismatch: $path\n",
4338 "expected: $exp\n got: $got\n";
4339 }
4340 }
4341 if ($fb->{mode_b} == 120000) {
4342 sysseek($fh, 0, 0) or croak $!;
4343 my $rd = sysread($fh, my $buf, 5);
4345 if (!defined $rd) {
4346 croak "sysread: $!\n";
4347 } elsif ($rd == 0) {
4348 warn "$path has mode 120000",
4349 " but it points to nothing\n",
4350 "converting to an empty file with mode",
4351 " 100644\n";
4352 $fb->{mode_b} = '100644';
4353 } elsif ($buf ne 'link ') {
4354 warn "$path has mode 120000",
4355 " but is not a link\n";
4356 } else {
4357 my $tmp_fh = $::_repository->temp_acquire(
4358 'svn_hash');
4359 my $res;
4360 while ($res = sysread($fh, my $str, 1024)) {
4361 my $out = syswrite($tmp_fh, $str, $res);
4362 defined($out) && $out == $res
4363 or croak("write ",
4364 Git::temp_path($tmp_fh),
4365 ": $!\n");
4366 }
4367 defined $res or croak $!;
4369 ($fh, $tmp_fh) = ($tmp_fh, $fh);
4370 Git::temp_release($tmp_fh, 1);
4371 }
4372 }
4374 $hash = $::_repository->hash_and_insert_object(
4375 Git::temp_path($fh));
4376 $hash =~ /^[a-f\d]{40}$/ or die "not a sha1: $hash\n";
4378 Git::temp_release($fb->{base}, 1);
4379 Git::temp_release($fh, 1);
4380 } else {
4381 $hash = $fb->{blob} or die "no blob information\n";
4382 }
4383 $fb->{pool}->clear;
4384 $self->{gii}->update($fb->{mode_b}, $hash, $path) or croak $!;
4385 print "\t$fb->{action}\t$path\n" if $fb->{action} && ! $::_q;
4386 undef;
4387 }
4389 sub abort_edit {
4390 my $self = shift;
4391 $self->{nr} = $self->{gii}->{nr};
4392 delete $self->{gii};
4393 $self->SUPER::abort_edit(@_);
4394 }
4396 sub close_edit {
4397 my $self = shift;
4398 $self->{git_commit_ok} = 1;
4399 $self->{nr} = $self->{gii}->{nr};
4400 delete $self->{gii};
4401 $self->SUPER::close_edit(@_);
4402 }
4404 package SVN::Git::Editor;
4405 use vars qw/@ISA $_rmdir $_cp_similarity $_find_copies_harder $_rename_limit/;
4406 use strict;
4407 use warnings;
4408 use Carp qw/croak/;
4409 use IO::File;
4411 sub new {
4412 my ($class, $opts) = @_;
4413 foreach (qw/svn_path r ra tree_a tree_b log editor_cb/) {
4414 die "$_ required!\n" unless (defined $opts->{$_});
4415 }
4417 my $pool = SVN::Pool->new;
4418 my $mods = generate_diff($opts->{tree_a}, $opts->{tree_b});
4419 my $types = check_diff_paths($opts->{ra}, $opts->{svn_path},
4420 $opts->{r}, $mods);
4422 # $opts->{ra} functions should not be used after this:
4423 my @ce = $opts->{ra}->get_commit_editor($opts->{log},
4424 $opts->{editor_cb}, $pool);
4425 my $self = SVN::Delta::Editor->new(@ce, $pool);
4426 bless $self, $class;
4427 foreach (qw/svn_path r tree_a tree_b/) {
4428 $self->{$_} = $opts->{$_};
4429 }
4430 $self->{url} = $opts->{ra}->{url};
4431 $self->{mods} = $mods;
4432 $self->{types} = $types;
4433 $self->{pool} = $pool;
4434 $self->{bat} = { '' => $self->open_root($self->{r}, $self->{pool}) };
4435 $self->{rm} = { };
4436 $self->{path_prefix} = length $self->{svn_path} ?
4437 "$self->{svn_path}/" : '';
4438 $self->{config} = $opts->{config};
4439 return $self;
4440 }
4442 sub generate_diff {
4443 my ($tree_a, $tree_b) = @_;
4444 my @diff_tree = qw(diff-tree -z -r);
4445 if ($_cp_similarity) {
4446 push @diff_tree, "-C$_cp_similarity";
4447 } else {
4448 push @diff_tree, '-C';
4449 }
4450 push @diff_tree, '--find-copies-harder' if $_find_copies_harder;
4451 push @diff_tree, "-l$_rename_limit" if defined $_rename_limit;
4452 push @diff_tree, $tree_a, $tree_b;
4453 my ($diff_fh, $ctx) = command_output_pipe(@diff_tree);
4454 local $/ = "\0";
4455 my $state = 'meta';
4456 my @mods;
4457 while (<$diff_fh>) {
4458 chomp $_; # this gets rid of the trailing "\0"
4459 if ($state eq 'meta' && /^:(\d{6})\s(\d{6})\s
4460 ($::sha1)\s($::sha1)\s
4461 ([MTCRAD])\d*$/xo) {
4462 push @mods, { mode_a => $1, mode_b => $2,
4463 sha1_a => $3, sha1_b => $4,
4464 chg => $5 };
4465 if ($5 =~ /^(?:C|R)$/) {
4466 $state = 'file_a';
4467 } else {
4468 $state = 'file_b';
4469 }
4470 } elsif ($state eq 'file_a') {
4471 my $x = $mods[$#mods] or croak "Empty array\n";
4472 if ($x->{chg} !~ /^(?:C|R)$/) {
4473 croak "Error parsing $_, $x->{chg}\n";
4474 }
4475 $x->{file_a} = $_;
4476 $state = 'file_b';
4477 } elsif ($state eq 'file_b') {
4478 my $x = $mods[$#mods] or croak "Empty array\n";
4479 if (exists $x->{file_a} && $x->{chg} !~ /^(?:C|R)$/) {
4480 croak "Error parsing $_, $x->{chg}\n";
4481 }
4482 if (!exists $x->{file_a} && $x->{chg} =~ /^(?:C|R)$/) {
4483 croak "Error parsing $_, $x->{chg}\n";
4484 }
4485 $x->{file_b} = $_;
4486 $state = 'meta';
4487 } else {
4488 croak "Error parsing $_\n";
4489 }
4490 }
4491 command_close_pipe($diff_fh, $ctx);
4492 \@mods;
4493 }
4495 sub check_diff_paths {
4496 my ($ra, $pfx, $rev, $mods) = @_;
4497 my %types;
4498 $pfx .= '/' if length $pfx;
4500 sub type_diff_paths {
4501 my ($ra, $types, $path, $rev) = @_;
4502 my @p = split m#/+#, $path;
4503 my $c = shift @p;
4504 unless (defined $types->{$c}) {
4505 $types->{$c} = $ra->check_path($c, $rev);
4506 }
4507 while (@p) {
4508 $c .= '/' . shift @p;
4509 next if defined $types->{$c};
4510 $types->{$c} = $ra->check_path($c, $rev);
4511 }
4512 }
4514 foreach my $m (@$mods) {
4515 foreach my $f (qw/file_a file_b/) {
4516 next unless defined $m->{$f};
4517 my ($dir) = ($m->{$f} =~ m#^(.*?)/?(?:[^/]+)$#);
4518 if (length $pfx.$dir && ! defined $types{$dir}) {
4519 type_diff_paths($ra, \%types, $pfx.$dir, $rev);
4520 }
4521 }
4522 }
4523 \%types;
4524 }
4526 sub split_path {
4527 return ($_[0] =~ m#^(.*?)/?([^/]+)$#);
4528 }
4530 sub repo_path {
4531 my ($self, $path) = @_;
4532 if (my $enc = $self->{pathnameencoding}) {
4533 require Encode;
4534 Encode::from_to($path, $enc, 'UTF-8');
4535 }
4536 $self->{path_prefix}.(defined $path ? $path : '');
4537 }
4539 sub url_path {
4540 my ($self, $path) = @_;
4541 if ($self->{url} =~ m#^https?://#) {
4542 $path =~ s!([^~a-zA-Z0-9_./-])!uc sprintf("%%%02x",ord($1))!eg;
4543 }
4544 $self->{url} . '/' . $self->repo_path($path);
4545 }
4547 sub rmdirs {
4548 my ($self) = @_;
4549 my $rm = $self->{rm};
4550 delete $rm->{''}; # we never delete the url we're tracking
4551 return unless %$rm;
4553 foreach (keys %$rm) {
4554 my @d = split m#/#, $_;
4555 my $c = shift @d;
4556 $rm->{$c} = 1;
4557 while (@d) {
4558 $c .= '/' . shift @d;
4559 $rm->{$c} = 1;
4560 }
4561 }
4562 delete $rm->{$self->{svn_path}};
4563 delete $rm->{''}; # we never delete the url we're tracking
4564 return unless %$rm;
4566 my ($fh, $ctx) = command_output_pipe(qw/ls-tree --name-only -r -z/,
4567 $self->{tree_b});
4568 local $/ = "\0";
4569 while (<$fh>) {
4570 chomp;
4571 my @dn = split m#/#, $_;
4572 while (pop @dn) {
4573 delete $rm->{join '/', @dn};
4574 }
4575 unless (%$rm) {
4576 close $fh;
4577 return;
4578 }
4579 }
4580 command_close_pipe($fh, $ctx);
4582 my ($r, $p, $bat) = ($self->{r}, $self->{pool}, $self->{bat});
4583 foreach my $d (sort { $b =~ tr#/#/# <=> $a =~ tr#/#/# } keys %$rm) {
4584 $self->close_directory($bat->{$d}, $p);
4585 my ($dn) = ($d =~ m#^(.*?)/?(?:[^/]+)$#);
4586 print "\tD+\t$d/\n" unless $::_q;
4587 $self->SUPER::delete_entry($d, $r, $bat->{$dn}, $p);
4588 delete $bat->{$d};
4589 }
4590 }
4592 sub open_or_add_dir {
4593 my ($self, $full_path, $baton) = @_;
4594 my $t = $self->{types}->{$full_path};
4595 if (!defined $t) {
4596 die "$full_path not known in r$self->{r} or we have a bug!\n";
4597 }
4598 {
4599 no warnings 'once';
4600 # SVN::Node::none and SVN::Node::file are used only once,
4601 # so we're shutting up Perl's warnings about them.
4602 if ($t == $SVN::Node::none) {
4603 return $self->add_directory($full_path, $baton,
4604 undef, -1, $self->{pool});
4605 } elsif ($t == $SVN::Node::dir) {
4606 return $self->open_directory($full_path, $baton,
4607 $self->{r}, $self->{pool});
4608 } # no warnings 'once'
4609 print STDERR "$full_path already exists in repository at ",
4610 "r$self->{r} and it is not a directory (",
4611 ($t == $SVN::Node::file ? 'file' : 'unknown'),"/$t)\n";
4612 } # no warnings 'once'
4613 exit 1;
4614 }
4616 sub ensure_path {
4617 my ($self, $path) = @_;
4618 my $bat = $self->{bat};
4619 my $repo_path = $self->repo_path($path);
4620 return $bat->{''} unless (length $repo_path);
4621 my @p = split m#/+#, $repo_path;
4622 my $c = shift @p;
4623 $bat->{$c} ||= $self->open_or_add_dir($c, $bat->{''});
4624 while (@p) {
4625 my $c0 = $c;
4626 $c .= '/' . shift @p;
4627 $bat->{$c} ||= $self->open_or_add_dir($c, $bat->{$c0});
4628 }
4629 return $bat->{$c};
4630 }
4632 # Subroutine to convert a globbing pattern to a regular expression.
4633 # From perl cookbook.
4634 sub glob2pat {
4635 my $globstr = shift;
4636 my %patmap = ('*' => '.*', '?' => '.', '[' => '[', ']' => ']');
4637 $globstr =~ s{(.)} { $patmap{$1} || "\Q$1" }ge;
4638 return '^' . $globstr . '$';
4639 }
4641 sub check_autoprop {
4642 my ($self, $pattern, $properties, $file, $fbat) = @_;
4643 # Convert the globbing pattern to a regular expression.
4644 my $regex = glob2pat($pattern);
4645 # Check if the pattern matches the file name.
4646 if($file =~ m/($regex)/) {
4647 # Parse the list of properties to set.
4648 my @props = split(/;/, $properties);
4649 foreach my $prop (@props) {
4650 # Parse 'name=value' syntax and set the property.
4651 if ($prop =~ /([^=]+)=(.*)/) {
4652 my ($n,$v) = ($1,$2);
4653 for ($n, $v) {
4654 s/^\s+//; s/\s+$//;
4655 }
4656 $self->change_file_prop($fbat, $n, $v);
4657 }
4658 }
4659 }
4660 }
4662 sub apply_autoprops {
4663 my ($self, $file, $fbat) = @_;
4664 my $conf_t = ${$self->{config}}{'config'};
4665 no warnings 'once';
4666 # Check [miscellany]/enable-auto-props in svn configuration.
4667 if (SVN::_Core::svn_config_get_bool(
4668 $conf_t,
4669 $SVN::_Core::SVN_CONFIG_SECTION_MISCELLANY,
4670 $SVN::_Core::SVN_CONFIG_OPTION_ENABLE_AUTO_PROPS,
4671 0)) {
4672 # Auto-props are enabled. Enumerate them to look for matches.
4673 my $callback = sub {
4674 $self->check_autoprop($_[0], $_[1], $file, $fbat);
4675 };
4676 SVN::_Core::svn_config_enumerate(
4677 $conf_t,
4678 $SVN::_Core::SVN_CONFIG_SECTION_AUTO_PROPS,
4679 $callback);
4680 }
4681 }
4683 sub A {
4684 my ($self, $m) = @_;
4685 my ($dir, $file) = split_path($m->{file_b});
4686 my $pbat = $self->ensure_path($dir);
4687 my $fbat = $self->add_file($self->repo_path($m->{file_b}), $pbat,
4688 undef, -1);
4689 print "\tA\t$m->{file_b}\n" unless $::_q;
4690 $self->apply_autoprops($file, $fbat);
4691 $self->chg_file($fbat, $m);
4692 $self->close_file($fbat,undef,$self->{pool});
4693 }
4695 sub C {
4696 my ($self, $m) = @_;
4697 my ($dir, $file) = split_path($m->{file_b});
4698 my $pbat = $self->ensure_path($dir);
4699 my $fbat = $self->add_file($self->repo_path($m->{file_b}), $pbat,
4700 $self->url_path($m->{file_a}), $self->{r});
4701 print "\tC\t$m->{file_a} => $m->{file_b}\n" unless $::_q;
4702 $self->chg_file($fbat, $m);
4703 $self->close_file($fbat,undef,$self->{pool});
4704 }
4706 sub delete_entry {
4707 my ($self, $path, $pbat) = @_;
4708 my $rpath = $self->repo_path($path);
4709 my ($dir, $file) = split_path($rpath);
4710 $self->{rm}->{$dir} = 1;
4711 $self->SUPER::delete_entry($rpath, $self->{r}, $pbat, $self->{pool});
4712 }
4714 sub R {
4715 my ($self, $m) = @_;
4716 my ($dir, $file) = split_path($m->{file_b});
4717 my $pbat = $self->ensure_path($dir);
4718 my $fbat = $self->add_file($self->repo_path($m->{file_b}), $pbat,
4719 $self->url_path($m->{file_a}), $self->{r});
4720 print "\tR\t$m->{file_a} => $m->{file_b}\n" unless $::_q;
4721 $self->apply_autoprops($file, $fbat);
4722 $self->chg_file($fbat, $m);
4723 $self->close_file($fbat,undef,$self->{pool});
4725 ($dir, $file) = split_path($m->{file_a});
4726 $pbat = $self->ensure_path($dir);
4727 $self->delete_entry($m->{file_a}, $pbat);
4728 }
4730 sub M {
4731 my ($self, $m) = @_;
4732 my ($dir, $file) = split_path($m->{file_b});
4733 my $pbat = $self->ensure_path($dir);
4734 my $fbat = $self->open_file($self->repo_path($m->{file_b}),
4735 $pbat,$self->{r},$self->{pool});
4736 print "\t$m->{chg}\t$m->{file_b}\n" unless $::_q;
4737 $self->chg_file($fbat, $m);
4738 $self->close_file($fbat,undef,$self->{pool});
4739 }
4741 sub T { shift->M(@_) }
4743 sub change_file_prop {
4744 my ($self, $fbat, $pname, $pval) = @_;
4745 $self->SUPER::change_file_prop($fbat, $pname, $pval, $self->{pool});
4746 }
4748 sub _chg_file_get_blob ($$$$) {
4749 my ($self, $fbat, $m, $which) = @_;
4750 my $fh = $::_repository->temp_acquire("git_blob_$which");
4751 if ($m->{"mode_$which"} =~ /^120/) {
4752 print $fh 'link ' or croak $!;
4753 $self->change_file_prop($fbat,'svn:special','*');
4754 } elsif ($m->{mode_a} =~ /^120/ && $m->{"mode_$which"} !~ /^120/) {
4755 $self->change_file_prop($fbat,'svn:special',undef);
4756 }
4757 my $blob = $m->{"sha1_$which"};
4758 return ($fh,) if ($blob =~ /^0{40}$/);
4759 my $size = $::_repository->cat_blob($blob, $fh);
4760 croak "Failed to read object $blob" if ($size < 0);
4761 $fh->flush == 0 or croak $!;
4762 seek $fh, 0, 0 or croak $!;
4764 my $exp = ::md5sum($fh);
4765 seek $fh, 0, 0 or croak $!;
4766 return ($fh, $exp);
4767 }
4769 sub chg_file {
4770 my ($self, $fbat, $m) = @_;
4771 if ($m->{mode_b} =~ /755$/ && $m->{mode_a} !~ /755$/) {
4772 $self->change_file_prop($fbat,'svn:executable','*');
4773 } elsif ($m->{mode_b} !~ /755$/ && $m->{mode_a} =~ /755$/) {
4774 $self->change_file_prop($fbat,'svn:executable',undef);
4775 }
4776 my ($fh_a, $exp_a) = _chg_file_get_blob $self, $fbat, $m, 'a';
4777 my ($fh_b, $exp_b) = _chg_file_get_blob $self, $fbat, $m, 'b';
4778 my $pool = SVN::Pool->new;
4779 my $atd = $self->apply_textdelta($fbat, $exp_a, $pool);
4780 if (-s $fh_a) {
4781 my $txstream = SVN::TxDelta::new ($fh_a, $fh_b, $pool);
4782 my $res = SVN::TxDelta::send_txstream($txstream, @$atd, $pool);
4783 if (defined $res) {
4784 die "Unexpected result from send_txstream: $res\n",
4785 "(SVN::Core::VERSION: $SVN::Core::VERSION)\n";
4786 }
4787 } else {
4788 my $got = SVN::TxDelta::send_stream($fh_b, @$atd, $pool);
4789 die "Checksum mismatch\nexpected: $exp_b\ngot: $got\n"
4790 if ($got ne $exp_b);
4791 }
4792 Git::temp_release($fh_b, 1);
4793 Git::temp_release($fh_a, 1);
4794 $pool->clear;
4795 }
4797 sub D {
4798 my ($self, $m) = @_;
4799 my ($dir, $file) = split_path($m->{file_b});
4800 my $pbat = $self->ensure_path($dir);
4801 print "\tD\t$m->{file_b}\n" unless $::_q;
4802 $self->delete_entry($m->{file_b}, $pbat);
4803 }
4805 sub close_edit {
4806 my ($self) = @_;
4807 my ($p,$bat) = ($self->{pool}, $self->{bat});
4808 foreach (sort { $b =~ tr#/#/# <=> $a =~ tr#/#/# } keys %$bat) {
4809 next if $_ eq '';
4810 $self->close_directory($bat->{$_}, $p);
4811 }
4812 $self->close_directory($bat->{''}, $p);
4813 $self->SUPER::close_edit($p);
4814 $p->clear;
4815 }
4817 sub abort_edit {
4818 my ($self) = @_;
4819 $self->SUPER::abort_edit($self->{pool});
4820 }
4822 sub DESTROY {
4823 my $self = shift;
4824 $self->SUPER::DESTROY(@_);
4825 $self->{pool}->clear;
4826 }
4828 # this drives the editor
4829 sub apply_diff {
4830 my ($self) = @_;
4831 my $mods = $self->{mods};
4832 my %o = ( D => 1, R => 0, C => -1, A => 3, M => 3, T => 3 );
4833 foreach my $m (sort { $o{$a->{chg}} <=> $o{$b->{chg}} } @$mods) {
4834 my $f = $m->{chg};
4835 if (defined $o{$f}) {
4836 $self->$f($m);
4837 } else {
4838 fatal("Invalid change type: $f");
4839 }
4840 }
4841 $self->rmdirs if $_rmdir;
4842 if (@$mods == 0) {
4843 $self->abort_edit;
4844 } else {
4845 $self->close_edit;
4846 }
4847 return scalar @$mods;
4848 }
4850 package Git::SVN::Ra;
4851 use vars qw/@ISA $config_dir $_log_window_size/;
4852 use strict;
4853 use warnings;
4854 my ($ra_invalid, $can_do_switch, %ignored_err, $RA);
4856 BEGIN {
4857 # enforce temporary pool usage for some simple functions
4858 no strict 'refs';
4859 for my $f (qw/rev_proplist get_latest_revnum get_uuid get_repos_root
4860 get_file/) {
4861 my $SUPER = "SUPER::$f";
4862 *$f = sub {
4863 my $self = shift;
4864 my $pool = SVN::Pool->new;
4865 my @ret = $self->$SUPER(@_,$pool);
4866 $pool->clear;
4867 wantarray ? @ret : $ret[0];
4868 };
4869 }
4870 }
4872 sub _auth_providers () {
4873 [
4874 SVN::Client::get_simple_provider(),
4875 SVN::Client::get_ssl_server_trust_file_provider(),
4876 SVN::Client::get_simple_prompt_provider(
4877 \&Git::SVN::Prompt::simple, 2),
4878 SVN::Client::get_ssl_client_cert_file_provider(),
4879 SVN::Client::get_ssl_client_cert_prompt_provider(
4880 \&Git::SVN::Prompt::ssl_client_cert, 2),
4881 SVN::Client::get_ssl_client_cert_pw_file_provider(),
4882 SVN::Client::get_ssl_client_cert_pw_prompt_provider(
4883 \&Git::SVN::Prompt::ssl_client_cert_pw, 2),
4884 SVN::Client::get_username_provider(),
4885 SVN::Client::get_ssl_server_trust_prompt_provider(
4886 \&Git::SVN::Prompt::ssl_server_trust),
4887 SVN::Client::get_username_prompt_provider(
4888 \&Git::SVN::Prompt::username, 2)
4889 ]
4890 }
4892 sub escape_uri_only {
4893 my ($uri) = @_;
4894 my @tmp;
4895 foreach (split m{/}, $uri) {
4896 s/([^~\w.%+-]|%(?![a-fA-F0-9]{2}))/sprintf("%%%02X",ord($1))/eg;
4897 push @tmp, $_;
4898 }
4899 join('/', @tmp);
4900 }
4902 sub escape_url {
4903 my ($url) = @_;
4904 if ($url =~ m#^(https?)://([^/]+)(.*)$#) {
4905 my ($scheme, $domain, $uri) = ($1, $2, escape_uri_only($3));
4906 $url = "$scheme://$domain$uri";
4907 }
4908 $url;
4909 }
4911 sub new {
4912 my ($class, $url) = @_;
4913 $url =~ s!/+$!!;
4914 return $RA if ($RA && $RA->{url} eq $url);
4916 ::_req_svn();
4918 SVN::_Core::svn_config_ensure($config_dir, undef);
4919 my ($baton, $callbacks) = SVN::Core::auth_open_helper(_auth_providers);
4920 my $config = SVN::Core::config_get_config($config_dir);
4921 $RA = undef;
4922 my $dont_store_passwords = 1;
4923 my $conf_t = ${$config}{'config'};
4924 {
4925 no warnings 'once';
4926 # The usage of $SVN::_Core::SVN_CONFIG_* variables
4927 # produces warnings that variables are used only once.
4928 # I had not found the better way to shut them up, so
4929 # the warnings of type 'once' are disabled in this block.
4930 if (SVN::_Core::svn_config_get_bool($conf_t,
4931 $SVN::_Core::SVN_CONFIG_SECTION_AUTH,
4932 $SVN::_Core::SVN_CONFIG_OPTION_STORE_PASSWORDS,
4933 1) == 0) {
4934 SVN::_Core::svn_auth_set_parameter($baton,
4935 $SVN::_Core::SVN_AUTH_PARAM_DONT_STORE_PASSWORDS,
4936 bless (\$dont_store_passwords, "_p_void"));
4937 }
4938 if (SVN::_Core::svn_config_get_bool($conf_t,
4939 $SVN::_Core::SVN_CONFIG_SECTION_AUTH,
4940 $SVN::_Core::SVN_CONFIG_OPTION_STORE_AUTH_CREDS,
4941 1) == 0) {
4942 $Git::SVN::Prompt::_no_auth_cache = 1;
4943 }
4944 } # no warnings 'once'
4945 my $self = SVN::Ra->new(url => escape_url($url), auth => $baton,
4946 config => $config,
4947 pool => SVN::Pool->new,
4948 auth_provider_callbacks => $callbacks);
4949 $self->{url} = $url;
4950 $self->{svn_path} = $url;
4951 $self->{repos_root} = $self->get_repos_root;
4952 $self->{svn_path} =~ s#^\Q$self->{repos_root}\E(/|$)##;
4953 $self->{cache} = { check_path => { r => 0, data => {} },
4954 get_dir => { r => 0, data => {} } };
4955 $RA = bless $self, $class;
4956 }
4958 sub check_path {
4959 my ($self, $path, $r) = @_;
4960 my $cache = $self->{cache}->{check_path};
4961 if ($r == $cache->{r} && exists $cache->{data}->{$path}) {
4962 return $cache->{data}->{$path};
4963 }
4964 my $pool = SVN::Pool->new;
4965 my $t = $self->SUPER::check_path($path, $r, $pool);
4966 $pool->clear;
4967 if ($r != $cache->{r}) {
4968 %{$cache->{data}} = ();
4969 $cache->{r} = $r;
4970 }
4971 $cache->{data}->{$path} = $t;
4972 }
4974 sub get_dir {
4975 my ($self, $dir, $r) = @_;
4976 my $cache = $self->{cache}->{get_dir};
4977 if ($r == $cache->{r}) {
4978 if (my $x = $cache->{data}->{$dir}) {
4979 return wantarray ? @$x : $x->[0];
4980 }
4981 }
4982 my $pool = SVN::Pool->new;
4983 my ($d, undef, $props) = $self->SUPER::get_dir($dir, $r, $pool);
4984 my %dirents = map { $_ => { kind => $d->{$_}->kind } } keys %$d;
4985 $pool->clear;
4986 if ($r != $cache->{r}) {
4987 %{$cache->{data}} = ();
4988 $cache->{r} = $r;
4989 }
4990 $cache->{data}->{$dir} = [ \%dirents, $r, $props ];
4991 wantarray ? (\%dirents, $r, $props) : \%dirents;
4992 }
4994 sub DESTROY {
4995 # do not call the real DESTROY since we store ourselves in $RA
4996 }
4998 # get_log(paths, start, end, limit,
4999 # discover_changed_paths, strict_node_history, receiver)
5000 sub get_log {
5001 my ($self, @args) = @_;
5002 my $pool = SVN::Pool->new;
5004 # svn_log_changed_path_t objects passed to get_log are likely to be
5005 # overwritten even if only the refs are copied to an external variable,
5006 # so we should dup the structures in their entirety. Using an
5007 # externally passed pool (instead of our temporary and quickly cleared
5008 # pool in Git::SVN::Ra) does not help matters at all...
5009 my $receiver = pop @args;
5010 my $prefix = "/".$self->{svn_path};
5011 $prefix =~ s#/+($)##;
5012 my $prefix_regex = qr#^\Q$prefix\E#;
5013 push(@args, sub {
5014 my ($paths) = $_[0];
5015 return &$receiver(@_) unless $paths;
5016 $_[0] = ();
5017 foreach my $p (keys %$paths) {
5018 my $i = $paths->{$p};
5019 # Make path relative to our url, not repos_root
5020 $p =~ s/$prefix_regex//;
5021 my %s = map { $_ => $i->$_; }
5022 qw/copyfrom_path copyfrom_rev action/;
5023 if ($s{'copyfrom_path'}) {
5024 $s{'copyfrom_path'} =~ s/$prefix_regex//;
5025 }
5026 $_[0]{$p} = \%s;
5027 }
5028 &$receiver(@_);
5029 });
5032 # the limit parameter was not supported in SVN 1.1.x, so we
5033 # drop it. Therefore, the receiver callback passed to it
5034 # is made aware of this limitation by being wrapped if
5035 # the limit passed to is being wrapped.
5036 if ($SVN::Core::VERSION le '1.2.0') {
5037 my $limit = splice(@args, 3, 1);
5038 if ($limit > 0) {
5039 my $receiver = pop @args;
5040 push(@args, sub { &$receiver(@_) if (--$limit >= 0) });
5041 }
5042 }
5043 my $ret = $self->SUPER::get_log(@args, $pool);
5044 $pool->clear;
5045 $ret;
5046 }
5048 sub trees_match {
5049 my ($self, $url1, $rev1, $url2, $rev2) = @_;
5050 my $ctx = SVN::Client->new(auth => _auth_providers);
5051 my $out = IO::File->new_tmpfile;
5053 # older SVN (1.1.x) doesn't take $pool as the last parameter for
5054 # $ctx->diff(), so we'll create a default one
5055 my $pool = SVN::Pool->new_default_sub;
5057 $ra_invalid = 1; # this will open a new SVN::Ra connection to $url1
5058 $ctx->diff([], $url1, $rev1, $url2, $rev2, 1, 1, 0, $out, $out);
5059 $out->flush;
5060 my $ret = (($out->stat)[7] == 0);
5061 close $out or croak $!;
5063 $ret;
5064 }
5066 sub get_commit_editor {
5067 my ($self, $log, $cb, $pool) = @_;
5068 my @lock = $SVN::Core::VERSION ge '1.2.0' ? (undef, 0) : ();
5069 $self->SUPER::get_commit_editor($log, $cb, @lock, $pool);
5070 }
5072 sub gs_do_update {
5073 my ($self, $rev_a, $rev_b, $gs, $editor) = @_;
5074 my $new = ($rev_a == $rev_b);
5075 my $path = $gs->{path};
5077 if ($new && -e $gs->{index}) {
5078 unlink $gs->{index} or die
5079 "Couldn't unlink index: $gs->{index}: $!\n";
5080 }
5081 my $pool = SVN::Pool->new;
5082 $editor->set_path_strip($path);
5083 my (@pc) = split m#/#, $path;
5084 my $reporter = $self->do_update($rev_b, (@pc ? shift @pc : ''),
5085 1, $editor, $pool);
5086 my @lock = $SVN::Core::VERSION ge '1.2.0' ? (undef) : ();
5088 # Since we can't rely on svn_ra_reparent being available, we'll
5089 # just have to do some magic with set_path to make it so
5090 # we only want a partial path.
5091 my $sp = '';
5092 my $final = join('/', @pc);
5093 while (@pc) {
5094 $reporter->set_path($sp, $rev_b, 0, @lock, $pool);
5095 $sp .= '/' if length $sp;
5096 $sp .= shift @pc;
5097 }
5098 die "BUG: '$sp' != '$final'\n" if ($sp ne $final);
5100 $reporter->set_path($sp, $rev_a, $new, @lock, $pool);
5102 $reporter->finish_report($pool);
5103 $pool->clear;
5104 $editor->{git_commit_ok};
5105 }
5107 # this requires SVN 1.4.3 or later (do_switch didn't work before 1.4.3, and
5108 # svn_ra_reparent didn't work before 1.4)
5109 sub gs_do_switch {
5110 my ($self, $rev_a, $rev_b, $gs, $url_b, $editor) = @_;
5111 my $path = $gs->{path};
5112 my $pool = SVN::Pool->new;
5114 my $full_url = $self->{url};
5115 my $old_url = $full_url;
5116 $full_url .= '/' . $path if length $path;
5117 my ($ra, $reparented);
5119 if ($old_url =~ m#^svn(\+ssh)?://# ||
5120 ($full_url =~ m#^https?://# &&
5121 escape_url($full_url) ne $full_url)) {
5122 $_[0] = undef;
5123 $self = undef;
5124 $RA = undef;
5125 $ra = Git::SVN::Ra->new($full_url);
5126 $ra_invalid = 1;
5127 } elsif ($old_url ne $full_url) {
5128 SVN::_Ra::svn_ra_reparent($self->{session}, $full_url, $pool);
5129 $self->{url} = $full_url;
5130 $reparented = 1;
5131 }
5133 $ra ||= $self;
5134 $url_b = escape_url($url_b);
5135 my $reporter = $ra->do_switch($rev_b, '', 1, $url_b, $editor, $pool);
5136 my @lock = $SVN::Core::VERSION ge '1.2.0' ? (undef) : ();
5137 $reporter->set_path('', $rev_a, 0, @lock, $pool);
5138 $reporter->finish_report($pool);
5140 if ($reparented) {
5141 SVN::_Ra::svn_ra_reparent($self->{session}, $old_url, $pool);
5142 $self->{url} = $old_url;
5143 }
5145 $pool->clear;
5146 $editor->{git_commit_ok};
5147 }
5149 sub longest_common_path {
5150 my ($gsv, $globs) = @_;
5151 my %common;
5152 my $common_max = scalar @$gsv;
5154 foreach my $gs (@$gsv) {
5155 my @tmp = split m#/#, $gs->{path};
5156 my $p = '';
5157 foreach (@tmp) {
5158 $p .= length($p) ? "/$_" : $_;
5159 $common{$p} ||= 0;
5160 $common{$p}++;
5161 }
5162 }
5163 $globs ||= [];
5164 $common_max += scalar @$globs;
5165 foreach my $glob (@$globs) {
5166 my @tmp = split m#/#, $glob->{path}->{left};
5167 my $p = '';
5168 foreach (@tmp) {
5169 $p .= length($p) ? "/$_" : $_;
5170 $common{$p} ||= 0;
5171 $common{$p}++;
5172 }
5173 }
5175 my $longest_path = '';
5176 foreach (sort {length $b <=> length $a} keys %common) {
5177 if ($common{$_} == $common_max) {
5178 $longest_path = $_;
5179 last;
5180 }
5181 }
5182 $longest_path;
5183 }
5185 sub gs_fetch_loop_common {
5186 my ($self, $base, $head, $gsv, $globs) = @_;
5187 return if ($base > $head);
5188 my $inc = $_log_window_size;
5189 my ($min, $max) = ($base, $head < $base + $inc ? $head : $base + $inc);
5190 my $longest_path = longest_common_path($gsv, $globs);
5191 my $ra_url = $self->{url};
5192 my $find_trailing_edge;
5193 while (1) {
5194 my %revs;
5195 my $err;
5196 my $err_handler = $SVN::Error::handler;
5197 $SVN::Error::handler = sub {
5198 ($err) = @_;
5199 skip_unknown_revs($err);
5200 };
5201 sub _cb {
5202 my ($paths, $r, $author, $date, $log) = @_;
5203 [ $paths,
5204 { author => $author, date => $date, log => $log } ];
5205 }
5206 $self->get_log([$longest_path], $min, $max, 0, 1, 1,
5207 sub { $revs{$_[1]} = _cb(@_) });
5208 if ($err) {
5209 print "Checked through r$max\r";
5210 } else {
5211 $find_trailing_edge = 1;
5212 }
5213 if ($err and $find_trailing_edge) {
5214 print STDERR "Path '$longest_path' ",
5215 "was probably deleted:\n",
5216 $err->expanded_message,
5217 "\nWill attempt to follow ",
5218 "revisions r$min .. r$max ",
5219 "committed before the deletion\n";
5220 my $hi = $max;
5221 while (--$hi >= $min) {
5222 my $ok;
5223 $self->get_log([$longest_path], $min, $hi,
5224 0, 1, 1, sub {
5225 $ok = $_[1];
5226 $revs{$_[1]} = _cb(@_) });
5227 if ($ok) {
5228 print STDERR "r$min .. r$ok OK\n";
5229 last;
5230 }
5231 }
5232 $find_trailing_edge = 0;
5233 }
5234 $SVN::Error::handler = $err_handler;
5236 my %exists = map { $_->{path} => $_ } @$gsv;
5237 foreach my $r (sort {$a <=> $b} keys %revs) {
5238 my ($paths, $logged) = @{$revs{$r}};
5240 foreach my $gs ($self->match_globs(\%exists, $paths,
5241 $globs, $r)) {
5242 if ($gs->rev_map_max >= $r) {
5243 next;
5244 }
5245 next unless $gs->match_paths($paths, $r);
5246 $gs->{logged_rev_props} = $logged;
5247 if (my $last_commit = $gs->last_commit) {
5248 $gs->assert_index_clean($last_commit);
5249 }
5250 my $log_entry = $gs->do_fetch($paths, $r);
5251 if ($log_entry) {
5252 $gs->do_git_commit($log_entry);
5253 }
5254 $INDEX_FILES{$gs->{index}} = 1;
5255 }
5256 foreach my $g (@$globs) {
5257 my $k = "svn-remote.$g->{remote}." .
5258 "$g->{t}-maxRev";
5259 Git::SVN::tmp_config($k, $r);
5260 }
5261 if ($ra_invalid) {
5262 $_[0] = undef;
5263 $self = undef;
5264 $RA = undef;
5265 $self = Git::SVN::Ra->new($ra_url);
5266 $ra_invalid = undef;
5267 }
5268 }
5269 # pre-fill the .rev_db since it'll eventually get filled in
5270 # with '0' x40 if something new gets committed
5271 foreach my $gs (@$gsv) {
5272 next if $gs->rev_map_max >= $max;
5273 next if defined $gs->rev_map_get($max);
5274 $gs->rev_map_set($max, 0 x40);
5275 }
5276 foreach my $g (@$globs) {
5277 my $k = "svn-remote.$g->{remote}.$g->{t}-maxRev";
5278 Git::SVN::tmp_config($k, $max);
5279 }
5280 last if $max >= $head;
5281 $min = $max + 1;
5282 $max += $inc;
5283 $max = $head if ($max > $head);
5284 }
5285 Git::SVN::gc();
5286 }
5288 sub get_dir_globbed {
5289 my ($self, $left, $depth, $r) = @_;
5291 my @x = eval { $self->get_dir($left, $r) };
5292 return unless scalar @x == 3;
5293 my $dirents = $x[0];
5294 my @finalents;
5295 foreach my $de (keys %$dirents) {
5296 next if $dirents->{$de}->{kind} != $SVN::Node::dir;
5297 if ($depth > 1) {
5298 my @args = ("$left/$de", $depth - 1, $r);
5299 foreach my $dir ($self->get_dir_globbed(@args)) {
5300 push @finalents, "$de/$dir";
5301 }
5302 } else {
5303 push @finalents, $de;
5304 }
5305 }
5306 @finalents;
5307 }
5309 sub match_globs {
5310 my ($self, $exists, $paths, $globs, $r) = @_;
5312 sub get_dir_check {
5313 my ($self, $exists, $g, $r) = @_;
5315 my @dirs = $self->get_dir_globbed($g->{path}->{left},
5316 $g->{path}->{depth},
5317 $r);
5319 foreach my $de (@dirs) {
5320 my $p = $g->{path}->full_path($de);
5321 next if $exists->{$p};
5322 next if (length $g->{path}->{right} &&
5323 ($self->check_path($p, $r) !=
5324 $SVN::Node::dir));
5325 next unless $p =~ /$g->{path}->{regex}/;
5326 $exists->{$p} = Git::SVN->init($self->{url}, $p, undef,
5327 $g->{ref}->full_path($de), 1);
5328 }
5329 }
5330 foreach my $g (@$globs) {
5331 if (my $path = $paths->{"/$g->{path}->{left}"}) {
5332 if ($path->{action} =~ /^[AR]$/) {
5333 get_dir_check($self, $exists, $g, $r);
5334 }
5335 }
5336 foreach (keys %$paths) {
5337 if (/$g->{path}->{left_regex}/ &&
5338 !/$g->{path}->{regex}/) {
5339 next if $paths->{$_}->{action} !~ /^[AR]$/;
5340 get_dir_check($self, $exists, $g, $r);
5341 }
5342 next unless /$g->{path}->{regex}/;
5343 my $p = $1;
5344 my $pathname = $g->{path}->full_path($p);
5345 next if $exists->{$pathname};
5346 next if ($self->check_path($pathname, $r) !=
5347 $SVN::Node::dir);
5348 $exists->{$pathname} = Git::SVN->init(
5349 $self->{url}, $pathname, undef,
5350 $g->{ref}->full_path($p), 1);
5351 }
5352 my $c = '';
5353 foreach (split m#/#, $g->{path}->{left}) {
5354 $c .= "/$_";
5355 next unless ($paths->{$c} &&
5356 ($paths->{$c}->{action} =~ /^[AR]$/));
5357 get_dir_check($self, $exists, $g, $r);
5358 }
5359 }
5360 values %$exists;
5361 }
5363 sub minimize_url {
5364 my ($self) = @_;
5365 return $self->{url} if ($self->{url} eq $self->{repos_root});
5366 my $url = $self->{repos_root};
5367 my @components = split(m!/!, $self->{svn_path});
5368 my $c = '';
5369 do {
5370 $url .= "/$c" if length $c;
5371 eval {
5372 my $ra = (ref $self)->new($url);
5373 my $latest = $ra->get_latest_revnum;
5374 $ra->get_log("", $latest, 0, 1, 0, 1, sub {});
5375 };
5376 } while ($@ && ($c = shift @components));
5377 $url;
5378 }
5380 sub can_do_switch {
5381 my $self = shift;
5382 unless (defined $can_do_switch) {
5383 my $pool = SVN::Pool->new;
5384 my $rep = eval {
5385 $self->do_switch(1, '', 0, $self->{url},
5386 SVN::Delta::Editor->new, $pool);
5387 };
5388 if ($@) {
5389 $can_do_switch = 0;
5390 } else {
5391 $rep->abort_report($pool);
5392 $can_do_switch = 1;
5393 }
5394 $pool->clear;
5395 }
5396 $can_do_switch;
5397 }
5399 sub skip_unknown_revs {
5400 my ($err) = @_;
5401 my $errno = $err->apr_err();
5402 # Maybe the branch we're tracking didn't
5403 # exist when the repo started, so it's
5404 # not an error if it doesn't, just continue
5405 #
5406 # Wonderfully consistent library, eh?
5407 # 160013 - svn:// and file://
5408 # 175002 - http(s)://
5409 # 175007 - http(s):// (this repo required authorization, too...)
5410 # More codes may be discovered later...
5411 if ($errno == 175007 || $errno == 175002 || $errno == 160013) {
5412 my $err_key = $err->expanded_message;
5413 # revision numbers change every time, filter them out
5414 $err_key =~ s/\d+/\0/g;
5415 $err_key = "$errno\0$err_key";
5416 unless ($ignored_err{$err_key}) {
5417 warn "W: Ignoring error from SVN, path probably ",
5418 "does not exist: ($errno): ",
5419 $err->expanded_message,"\n";
5420 warn "W: Do not be alarmed at the above message ",
5421 "git-svn is just searching aggressively for ",
5422 "old history.\n",
5423 "This may take a while on large repositories\n";
5424 $ignored_err{$err_key} = 1;
5425 }
5426 return;
5427 }
5428 die "Error from SVN, ($errno): ", $err->expanded_message,"\n";
5429 }
5431 package Git::SVN::Log;
5432 use strict;
5433 use warnings;
5434 use POSIX qw/strftime/;
5435 use Time::Local;
5436 use constant commit_log_separator => ('-' x 72) . "\n";
5437 use vars qw/$TZ $limit $color $pager $non_recursive $verbose $oneline
5438 %rusers $show_commit $incremental/;
5439 my $l_fmt;
5441 sub cmt_showable {
5442 my ($c) = @_;
5443 return 1 if defined $c->{r};
5445 # big commit message got truncated by the 16k pretty buffer in rev-list
5446 if ($c->{l} && $c->{l}->[-1] eq "...\n" &&
5447 $c->{a_raw} =~ /\@([a-f\d\-]+)>$/) {
5448 @{$c->{l}} = ();
5449 my @log = command(qw/cat-file commit/, $c->{c});
5451 # shift off the headers
5452 shift @log while ($log[0] ne '');
5453 shift @log;
5455 # TODO: make $c->{l} not have a trailing newline in the future
5456 @{$c->{l}} = map { "$_\n" } grep !/^git-svn-id: /, @log;
5458 (undef, $c->{r}, undef) = ::extract_metadata(
5459 (grep(/^git-svn-id: /, @log))[-1]);
5460 }
5461 return defined $c->{r};
5462 }
5464 sub log_use_color {
5465 return $color || Git->repository->get_colorbool('color.diff');
5466 }
5468 sub git_svn_log_cmd {
5469 my ($r_min, $r_max, @args) = @_;
5470 my $head = 'HEAD';
5471 my (@files, @log_opts);
5472 foreach my $x (@args) {
5473 if ($x eq '--' || @files) {
5474 push @files, $x;
5475 } else {
5476 if (::verify_ref("$x^0")) {
5477 $head = $x;
5478 } else {
5479 push @log_opts, $x;
5480 }
5481 }
5482 }
5484 my ($url, $rev, $uuid, $gs) = ::working_head_info($head);
5485 $gs ||= Git::SVN->_new;
5486 my @cmd = (qw/log --abbrev-commit --pretty=raw --default/,
5487 $gs->refname);
5488 push @cmd, '-r' unless $non_recursive;
5489 push @cmd, qw/--raw --name-status/ if $verbose;
5490 push @cmd, '--color' if log_use_color();
5491 push @cmd, @log_opts;
5492 if (defined $r_max && $r_max == $r_min) {
5493 push @cmd, '--max-count=1';
5494 if (my $c = $gs->rev_map_get($r_max)) {
5495 push @cmd, $c;
5496 }
5497 } elsif (defined $r_max) {
5498 if ($r_max < $r_min) {
5499 ($r_min, $r_max) = ($r_max, $r_min);
5500 }
5501 my (undef, $c_max) = $gs->find_rev_before($r_max, 1, $r_min);
5502 my (undef, $c_min) = $gs->find_rev_after($r_min, 1, $r_max);
5503 # If there are no commits in the range, both $c_max and $c_min
5504 # will be undefined. If there is at least 1 commit in the
5505 # range, both will be defined.
5506 return () if !defined $c_min || !defined $c_max;
5507 if ($c_min eq $c_max) {
5508 push @cmd, '--max-count=1', $c_min;
5509 } else {
5510 push @cmd, '--boundary', "$c_min..$c_max";
5511 }
5512 }
5513 return (@cmd, @files);
5514 }
5516 # adapted from pager.c
5517 sub config_pager {
5518 if (! -t *STDOUT) {
5519 $ENV{GIT_PAGER_IN_USE} = 'false';
5520 $pager = undef;
5521 return;
5522 }
5523 chomp($pager = command_oneline(qw(var GIT_PAGER)));
5524 if ($pager eq 'cat') {
5525 $pager = undef;
5526 }
5527 $ENV{GIT_PAGER_IN_USE} = defined($pager);
5528 }
5530 sub run_pager {
5531 return unless defined $pager;
5532 pipe my ($rfd, $wfd) or return;
5533 defined(my $pid = fork) or ::fatal "Can't fork: $!";
5534 if (!$pid) {
5535 open STDOUT, '>&', $wfd or
5536 ::fatal "Can't redirect to stdout: $!";
5537 return;
5538 }
5539 open STDIN, '<&', $rfd or ::fatal "Can't redirect stdin: $!";
5540 $ENV{LESS} ||= 'FRSX';
5541 exec $pager or ::fatal "Can't run pager: $! ($pager)";
5542 }
5544 sub format_svn_date {
5545 # some systmes don't handle or mishandle %z, so be creative.
5546 my $t = shift || time;
5547 my $gm = timelocal(gmtime($t));
5548 my $sign = qw( + + - )[ $t <=> $gm ];
5549 my $gmoff = sprintf("%s%02d%02d", $sign, (gmtime(abs($t - $gm)))[2,1]);
5550 return strftime("%Y-%m-%d %H:%M:%S $gmoff (%a, %d %b %Y)", localtime($t));
5551 }
5553 sub parse_git_date {
5554 my ($t, $tz) = @_;
5555 # Date::Parse isn't in the standard Perl distro :(
5556 if ($tz =~ s/^\+//) {
5557 $t += tz_to_s_offset($tz);
5558 } elsif ($tz =~ s/^\-//) {
5559 $t -= tz_to_s_offset($tz);
5560 }
5561 return $t;
5562 }
5564 sub set_local_timezone {
5565 if (defined $TZ) {
5566 $ENV{TZ} = $TZ;
5567 } else {
5568 delete $ENV{TZ};
5569 }
5570 }
5572 sub tz_to_s_offset {
5573 my ($tz) = @_;
5574 $tz =~ s/(\d\d)$//;
5575 return ($1 * 60) + ($tz * 3600);
5576 }
5578 sub get_author_info {
5579 my ($dest, $author, $t, $tz) = @_;
5580 $author =~ s/(?:^\s*|\s*$)//g;
5581 $dest->{a_raw} = $author;
5582 my $au;
5583 if ($::_authors) {
5584 $au = $rusers{$author} || undef;
5585 }
5586 if (!$au) {
5587 ($au) = ($author =~ /<([^>]+)\@[^>]+>$/);
5588 }
5589 $dest->{t} = $t;
5590 $dest->{tz} = $tz;
5591 $dest->{a} = $au;
5592 $dest->{t_utc} = parse_git_date($t, $tz);
5593 }
5595 sub process_commit {
5596 my ($c, $r_min, $r_max, $defer) = @_;
5597 if (defined $r_min && defined $r_max) {
5598 if ($r_min == $c->{r} && $r_min == $r_max) {
5599 show_commit($c);
5600 return 0;
5601 }
5602 return 1 if $r_min == $r_max;
5603 if ($r_min < $r_max) {
5604 # we need to reverse the print order
5605 return 0 if (defined $limit && --$limit < 0);
5606 push @$defer, $c;
5607 return 1;
5608 }
5609 if ($r_min != $r_max) {
5610 return 1 if ($r_min < $c->{r});
5611 return 1 if ($r_max > $c->{r});
5612 }
5613 }
5614 return 0 if (defined $limit && --$limit < 0);
5615 show_commit($c);
5616 return 1;
5617 }
5619 sub show_commit {
5620 my $c = shift;
5621 if ($oneline) {
5622 my $x = "\n";
5623 if (my $l = $c->{l}) {
5624 while ($l->[0] =~ /^\s*$/) { shift @$l }
5625 $x = $l->[0];
5626 }
5627 $l_fmt ||= 'A' . length($c->{r});
5628 print 'r',pack($l_fmt, $c->{r}),' | ';
5629 print "$c->{c} | " if $show_commit;
5630 print $x;
5631 } else {
5632 show_commit_normal($c);
5633 }
5634 }
5636 sub show_commit_changed_paths {
5637 my ($c) = @_;
5638 return unless $c->{changed};
5639 print "Changed paths:\n", @{$c->{changed}};
5640 }
5642 sub show_commit_normal {
5643 my ($c) = @_;
5644 print commit_log_separator, "r$c->{r} | ";
5645 print "$c->{c} | " if $show_commit;
5646 print "$c->{a} | ", format_svn_date($c->{t_utc}), ' | ';
5647 my $nr_line = 0;
5649 if (my $l = $c->{l}) {
5650 while ($l->[$#$l] eq "\n" && $#$l > 0
5651 && $l->[($#$l - 1)] eq "\n") {
5652 pop @$l;
5653 }
5654 $nr_line = scalar @$l;
5655 if (!$nr_line) {
5656 print "1 line\n\n\n";
5657 } else {
5658 if ($nr_line == 1) {
5659 $nr_line = '1 line';
5660 } else {
5661 $nr_line .= ' lines';
5662 }
5663 print $nr_line, "\n";
5664 show_commit_changed_paths($c);
5665 print "\n";
5666 print $_ foreach @$l;
5667 }
5668 } else {
5669 print "1 line\n";
5670 show_commit_changed_paths($c);
5671 print "\n";
5673 }
5674 foreach my $x (qw/raw stat diff/) {
5675 if ($c->{$x}) {
5676 print "\n";
5677 print $_ foreach @{$c->{$x}}
5678 }
5679 }
5680 }
5682 sub cmd_show_log {
5683 my (@args) = @_;
5684 my ($r_min, $r_max);
5685 my $r_last = -1; # prevent dupes
5686 set_local_timezone();
5687 if (defined $::_revision) {
5688 if ($::_revision =~ /^(\d+):(\d+)$/) {
5689 ($r_min, $r_max) = ($1, $2);
5690 } elsif ($::_revision =~ /^\d+$/) {
5691 $r_min = $r_max = $::_revision;
5692 } else {
5693 ::fatal "-r$::_revision is not supported, use ",
5694 "standard 'git log' arguments instead";
5695 }
5696 }
5698 config_pager();
5699 @args = git_svn_log_cmd($r_min, $r_max, @args);
5700 if (!@args) {
5701 print commit_log_separator unless $incremental || $oneline;
5702 return;
5703 }
5704 my $log = command_output_pipe(@args);
5705 run_pager();
5706 my (@k, $c, $d, $stat);
5707 my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/;
5708 while (<$log>) {
5709 if (/^${esc_color}commit -?($::sha1_short)/o) {
5710 my $cmt = $1;
5711 if ($c && cmt_showable($c) && $c->{r} != $r_last) {
5712 $r_last = $c->{r};
5713 process_commit($c, $r_min, $r_max, \@k) or
5714 goto out;
5715 }
5716 $d = undef;
5717 $c = { c => $cmt };
5718 } elsif (/^${esc_color}author (.+) (\d+) ([\-\+]?\d+)$/o) {
5719 get_author_info($c, $1, $2, $3);
5720 } elsif (/^${esc_color}(?:tree|parent|committer) /o) {
5721 # ignore
5722 } elsif (/^${esc_color}:\d{6} \d{6} $::sha1_short/o) {
5723 push @{$c->{raw}}, $_;
5724 } elsif (/^${esc_color}[ACRMDT]\t/) {
5725 # we could add $SVN->{svn_path} here, but that requires
5726 # remote access at the moment (repo_path_split)...
5727 s#^(${esc_color})([ACRMDT])\t#$1 $2 #o;
5728 push @{$c->{changed}}, $_;
5729 } elsif (/^${esc_color}diff /o) {
5730 $d = 1;
5731 push @{$c->{diff}}, $_;
5732 } elsif ($d) {
5733 push @{$c->{diff}}, $_;
5734 } elsif (/^\ .+\ \|\s*\d+\ $esc_color[\+\-]*
5735 $esc_color*[\+\-]*$esc_color$/x) {
5736 $stat = 1;
5737 push @{$c->{stat}}, $_;
5738 } elsif ($stat && /^ \d+ files changed, \d+ insertions/) {
5739 push @{$c->{stat}}, $_;
5740 $stat = undef;
5741 } elsif (/^${esc_color} (git-svn-id:.+)$/o) {
5742 ($c->{url}, $c->{r}, undef) = ::extract_metadata($1);
5743 } elsif (s/^${esc_color} //o) {
5744 push @{$c->{l}}, $_;
5745 }
5746 }
5747 if ($c && defined $c->{r} && $c->{r} != $r_last) {
5748 $r_last = $c->{r};
5749 process_commit($c, $r_min, $r_max, \@k);
5750 }
5751 if (@k) {
5752 ($r_min, $r_max) = ($r_max, $r_min);
5753 process_commit($_, $r_min, $r_max) foreach reverse @k;
5754 }
5755 out:
5756 close $log;
5757 print commit_log_separator unless $incremental || $oneline;
5758 }
5760 sub cmd_blame {
5761 my $path = pop;
5763 config_pager();
5764 run_pager();
5766 my ($fh, $ctx, $rev);
5768 if ($_git_format) {
5769 ($fh, $ctx) = command_output_pipe('blame', @_, $path);
5770 while (my $line = <$fh>) {
5771 if ($line =~ /^\^?([[:xdigit:]]+)\s/) {
5772 # Uncommitted edits show up as a rev ID of
5773 # all zeros, which we can't look up with
5774 # cmt_metadata
5775 if ($1 !~ /^0+$/) {
5776 (undef, $rev, undef) =
5777 ::cmt_metadata($1);
5778 $rev = '0' if (!$rev);
5779 } else {
5780 $rev = '0';
5781 }
5782 $rev = sprintf('%-10s', $rev);
5783 $line =~ s/^\^?[[:xdigit:]]+(\s)/$rev$1/;
5784 }
5785 print $line;
5786 }
5787 } else {
5788 ($fh, $ctx) = command_output_pipe('blame', '-p', @_, 'HEAD',
5789 '--', $path);
5790 my ($sha1);
5791 my %authors;
5792 my @buffer;
5793 my %dsha; #distinct sha keys
5795 while (my $line = <$fh>) {
5796 push @buffer, $line;
5797 if ($line =~ /^([[:xdigit:]]{40})\s\d+\s\d+/) {
5798 $dsha{$1} = 1;
5799 }
5800 }
5802 my $s2r = ::cmt_sha2rev_batch([keys %dsha]);
5804 foreach my $line (@buffer) {
5805 if ($line =~ /^([[:xdigit:]]{40})\s\d+\s\d+/) {
5806 $rev = $s2r->{$1};
5807 $rev = '0' if (!$rev)
5808 }
5809 elsif ($line =~ /^author (.*)/) {
5810 $authors{$rev} = $1;
5811 $authors{$rev} =~ s/\s/_/g;
5812 }
5813 elsif ($line =~ /^\t(.*)$/) {
5814 printf("%6s %10s %s\n", $rev, $authors{$rev}, $1);
5815 }
5816 }
5817 }
5818 command_close_pipe($fh, $ctx);
5819 }
5821 package Git::SVN::Migration;
5822 # these version numbers do NOT correspond to actual version numbers
5823 # of git nor git-svn. They are just relative.
5824 #
5825 # v0 layout: .git/$id/info/url, refs/heads/$id-HEAD
5826 #
5827 # v1 layout: .git/$id/info/url, refs/remotes/$id
5828 #
5829 # v2 layout: .git/svn/$id/info/url, refs/remotes/$id
5830 #
5831 # v3 layout: .git/svn/$id, refs/remotes/$id
5832 # - info/url may remain for backwards compatibility
5833 # - this is what we migrate up to this layout automatically,
5834 # - this will be used by git svn init on single branches
5835 # v3.1 layout (auto migrated):
5836 # - .rev_db => .rev_db.$UUID, .rev_db will remain as a symlink
5837 # for backwards compatibility
5838 #
5839 # v4 layout: .git/svn/$repo_id/$id, refs/remotes/$repo_id/$id
5840 # - this is only created for newly multi-init-ed
5841 # repositories. Similar in spirit to the
5842 # --use-separate-remotes option in git-clone (now default)
5843 # - we do not automatically migrate to this (following
5844 # the example set by core git)
5845 #
5846 # v5 layout: .rev_db.$UUID => .rev_map.$UUID
5847 # - newer, more-efficient format that uses 24-bytes per record
5848 # with no filler space.
5849 # - use xxd -c24 < .rev_map.$UUID to view and debug
5850 # - This is a one-way migration, repositories updated to the
5851 # new format will not be able to use old git-svn without
5852 # rebuilding the .rev_db. Rebuilding the rev_db is not
5853 # possible if noMetadata or useSvmProps are set; but should
5854 # be no problem for users that use the (sensible) defaults.
5855 use strict;
5856 use warnings;
5857 use Carp qw/croak/;
5858 use File::Path qw/mkpath/;
5859 use File::Basename qw/dirname basename/;
5860 use vars qw/$_minimize/;
5862 sub migrate_from_v0 {
5863 my $git_dir = $ENV{GIT_DIR};
5864 return undef unless -d $git_dir;
5865 my ($fh, $ctx) = command_output_pipe(qw/rev-parse --symbolic --all/);
5866 my $migrated = 0;
5867 while (<$fh>) {
5868 chomp;
5869 my ($id, $orig_ref) = ($_, $_);
5870 next unless $id =~ s#^refs/heads/(.+)-HEAD$#$1#;
5871 next unless -f "$git_dir/$id/info/url";
5872 my $new_ref = "refs/remotes/$id";
5873 if (::verify_ref("$new_ref^0")) {
5874 print STDERR "W: $orig_ref is probably an old ",
5875 "branch used by an ancient version of ",
5876 "git-svn.\n",
5877 "However, $new_ref also exists.\n",
5878 "We will not be able ",
5879 "to use this branch until this ",
5880 "ambiguity is resolved.\n";
5881 next;
5882 }
5883 print STDERR "Migrating from v0 layout...\n" if !$migrated;
5884 print STDERR "Renaming ref: $orig_ref => $new_ref\n";
5885 command_noisy('update-ref', $new_ref, $orig_ref);
5886 command_noisy('update-ref', '-d', $orig_ref, $orig_ref);
5887 $migrated++;
5888 }
5889 command_close_pipe($fh, $ctx);
5890 print STDERR "Done migrating from v0 layout...\n" if $migrated;
5891 $migrated;
5892 }
5894 sub migrate_from_v1 {
5895 my $git_dir = $ENV{GIT_DIR};
5896 my $migrated = 0;
5897 return $migrated unless -d $git_dir;
5898 my $svn_dir = "$git_dir/svn";
5900 # just in case somebody used 'svn' as their $id at some point...
5901 return $migrated if -d $svn_dir && ! -f "$svn_dir/info/url";
5903 print STDERR "Migrating from a git-svn v1 layout...\n";
5904 mkpath([$svn_dir]);
5905 print STDERR "Data from a previous version of git-svn exists, but\n\t",
5906 "$svn_dir\n\t(required for this version ",
5907 "($::VERSION) of git-svn) does not exist.\n";
5908 my ($fh, $ctx) = command_output_pipe(qw/rev-parse --symbolic --all/);
5909 while (<$fh>) {
5910 my $x = $_;
5911 next unless $x =~ s#^refs/remotes/##;
5912 chomp $x;
5913 next unless -f "$git_dir/$x/info/url";
5914 my $u = eval { ::file_to_s("$git_dir/$x/info/url") };
5915 next unless $u;
5916 my $dn = dirname("$git_dir/svn/$x");
5917 mkpath([$dn]) unless -d $dn;
5918 if ($x eq 'svn') { # they used 'svn' as GIT_SVN_ID:
5919 mkpath(["$git_dir/svn/svn"]);
5920 print STDERR " - $git_dir/$x/info => ",
5921 "$git_dir/svn/$x/info\n";
5922 rename "$git_dir/$x/info", "$git_dir/svn/$x/info" or
5923 croak "$!: $x";
5924 # don't worry too much about these, they probably
5925 # don't exist with repos this old (save for index,
5926 # and we can easily regenerate that)
5927 foreach my $f (qw/unhandled.log index .rev_db/) {
5928 rename "$git_dir/$x/$f", "$git_dir/svn/$x/$f";
5929 }
5930 } else {
5931 print STDERR " - $git_dir/$x => $git_dir/svn/$x\n";
5932 rename "$git_dir/$x", "$git_dir/svn/$x" or
5933 croak "$!: $x";
5934 }
5935 $migrated++;
5936 }
5937 command_close_pipe($fh, $ctx);
5938 print STDERR "Done migrating from a git-svn v1 layout\n";
5939 $migrated;
5940 }
5942 sub read_old_urls {
5943 my ($l_map, $pfx, $path) = @_;
5944 my @dir;
5945 foreach (<$path/*>) {
5946 if (-r "$_/info/url") {
5947 $pfx .= '/' if $pfx && $pfx !~ m!/$!;
5948 my $ref_id = $pfx . basename $_;
5949 my $url = ::file_to_s("$_/info/url");
5950 $l_map->{$ref_id} = $url;
5951 } elsif (-d $_) {
5952 push @dir, $_;
5953 }
5954 }
5955 foreach (@dir) {
5956 my $x = $_;
5957 $x =~ s!^\Q$ENV{GIT_DIR}\E/svn/!!o;
5958 read_old_urls($l_map, $x, $_);
5959 }
5960 }
5962 sub migrate_from_v2 {
5963 my @cfg = command(qw/config -l/);
5964 return if grep /^svn-remote\..+\.url=/, @cfg;
5965 my %l_map;
5966 read_old_urls(\%l_map, '', "$ENV{GIT_DIR}/svn");
5967 my $migrated = 0;
5969 foreach my $ref_id (sort keys %l_map) {
5970 eval { Git::SVN->init($l_map{$ref_id}, '', undef, $ref_id) };
5971 if ($@) {
5972 Git::SVN->init($l_map{$ref_id}, '', $ref_id, $ref_id);
5973 }
5974 $migrated++;
5975 }
5976 $migrated;
5977 }
5979 sub minimize_connections {
5980 my $r = Git::SVN::read_all_remotes();
5981 my $new_urls = {};
5982 my $root_repos = {};
5983 foreach my $repo_id (keys %$r) {
5984 my $url = $r->{$repo_id}->{url} or next;
5985 my $fetch = $r->{$repo_id}->{fetch} or next;
5986 my $ra = Git::SVN::Ra->new($url);
5988 # skip existing cases where we already connect to the root
5989 if (($ra->{url} eq $ra->{repos_root}) ||
5990 ($ra->{repos_root} eq $repo_id)) {
5991 $root_repos->{$ra->{url}} = $repo_id;
5992 next;
5993 }
5995 my $root_ra = Git::SVN::Ra->new($ra->{repos_root});
5996 my $root_path = $ra->{url};
5997 $root_path =~ s#^\Q$ra->{repos_root}\E(/|$)##;
5998 foreach my $path (keys %$fetch) {
5999 my $ref_id = $fetch->{$path};
6000 my $gs = Git::SVN->new($ref_id, $repo_id, $path);
6002 # make sure we can read when connecting to
6003 # a higher level of a repository
6004 my ($last_rev, undef) = $gs->last_rev_commit;
6005 if (!defined $last_rev) {
6006 $last_rev = eval {
6007 $root_ra->get_latest_revnum;
6008 };
6009 next if $@;
6010 }
6011 my $new = $root_path;
6012 $new .= length $path ? "/$path" : '';
6013 eval {
6014 $root_ra->get_log([$new], $last_rev, $last_rev,
6015 0, 0, 1, sub { });
6016 };
6017 next if $@;
6018 $new_urls->{$ra->{repos_root}}->{$new} =
6019 { ref_id => $ref_id,
6020 old_repo_id => $repo_id,
6021 old_path => $path };
6022 }
6023 }
6025 my @emptied;
6026 foreach my $url (keys %$new_urls) {
6027 # see if we can re-use an existing [svn-remote "repo_id"]
6028 # instead of creating a(n ugly) new section:
6029 my $repo_id = $root_repos->{$url} || $url;
6031 my $fetch = $new_urls->{$url};
6032 foreach my $path (keys %$fetch) {
6033 my $x = $fetch->{$path};
6034 Git::SVN->init($url, $path, $repo_id, $x->{ref_id});
6035 my $pfx = "svn-remote.$x->{old_repo_id}";
6037 my $old_fetch = quotemeta("$x->{old_path}:".
6038 "$x->{ref_id}");
6039 command_noisy(qw/config --unset/,
6040 "$pfx.fetch", '^'. $old_fetch . '$');
6041 delete $r->{$x->{old_repo_id}}->
6042 {fetch}->{$x->{old_path}};
6043 if (!keys %{$r->{$x->{old_repo_id}}->{fetch}}) {
6044 command_noisy(qw/config --unset/,
6045 "$pfx.url");
6046 push @emptied, $x->{old_repo_id}
6047 }
6048 }
6049 }
6050 if (@emptied) {
6051 my $file = $ENV{GIT_CONFIG} || "$ENV{GIT_DIR}/config";
6052 print STDERR <<EOF;
6053 The following [svn-remote] sections in your config file ($file) are empty
6054 and can be safely removed:
6055 EOF
6056 print STDERR "[svn-remote \"$_\"]\n" foreach @emptied;
6057 }
6058 }
6060 sub migration_check {
6061 migrate_from_v0();
6062 migrate_from_v1();
6063 migrate_from_v2();
6064 minimize_connections() if $_minimize;
6065 }
6067 package Git::IndexInfo;
6068 use strict;
6069 use warnings;
6070 use Git qw/command_input_pipe command_close_pipe/;
6072 sub new {
6073 my ($class) = @_;
6074 my ($gui, $ctx) = command_input_pipe(qw/update-index -z --index-info/);
6075 bless { gui => $gui, ctx => $ctx, nr => 0}, $class;
6076 }
6078 sub remove {
6079 my ($self, $path) = @_;
6080 if (print { $self->{gui} } '0 ', 0 x 40, "\t", $path, "\0") {
6081 return ++$self->{nr};
6082 }
6083 undef;
6084 }
6086 sub update {
6087 my ($self, $mode, $hash, $path) = @_;
6088 if (print { $self->{gui} } $mode, ' ', $hash, "\t", $path, "\0") {
6089 return ++$self->{nr};
6090 }
6091 undef;
6092 }
6094 sub DESTROY {
6095 my ($self) = @_;
6096 command_close_pipe($self->{gui}, $self->{ctx});
6097 }
6099 package Git::SVN::GlobSpec;
6100 use strict;
6101 use warnings;
6103 sub new {
6104 my ($class, $glob, $pattern_ok) = @_;
6105 my $re = $glob;
6106 $re =~ s!/+$!!g; # no need for trailing slashes
6107 my (@left, @right, @patterns);
6108 my $state = "left";
6109 my $die_msg = "Only one set of wildcard directories " .
6110 "(e.g. '*' or '*/*/*') is supported: '$glob'\n";
6111 for my $part (split(m|/|, $glob)) {
6112 if ($part =~ /\*/ && $part ne "*") {
6113 die "Invalid pattern in '$glob': $part\n";
6114 } elsif ($pattern_ok && $part =~ /[{}]/ &&
6115 $part !~ /^\{[^{}]+\}/) {
6116 die "Invalid pattern in '$glob': $part\n";
6117 }
6118 if ($part eq "*") {
6119 die $die_msg if $state eq "right";
6120 $state = "pattern";
6121 push(@patterns, "[^/]*");
6122 } elsif ($pattern_ok && $part =~ /^\{(.*)\}$/) {
6123 die $die_msg if $state eq "right";
6124 $state = "pattern";
6125 my $p = quotemeta($1);
6126 $p =~ s/\\,/|/g;
6127 push(@patterns, "(?:$p)");
6128 } else {
6129 if ($state eq "left") {
6130 push(@left, $part);
6131 } else {
6132 push(@right, $part);
6133 $state = "right";
6134 }
6135 }
6136 }
6137 my $depth = @patterns;
6138 if ($depth == 0) {
6139 die "One '*' is needed in glob: '$glob'\n";
6140 }
6141 my $left = join('/', @left);
6142 my $right = join('/', @right);
6143 $re = join('/', @patterns);
6144 $re = join('\/',
6145 grep(length, quotemeta($left), "($re)", quotemeta($right)));
6146 my $left_re = qr/^\/\Q$left\E(\/|$)/;
6147 bless { left => $left, right => $right, left_regex => $left_re,
6148 regex => qr/$re/, glob => $glob, depth => $depth }, $class;
6149 }
6151 sub full_path {
6152 my ($self, $path) = @_;
6153 return (length $self->{left} ? "$self->{left}/" : '') .
6154 $path . (length $self->{right} ? "/$self->{right}" : '');
6155 }
6157 __END__
6159 Data structures:
6162 $remotes = { # returned by read_all_remotes()
6163 'svn' => {
6164 # svn-remote.svn.url=https://svn.musicpd.org
6165 url => 'https://svn.musicpd.org',
6166 # svn-remote.svn.fetch=mpd/trunk:trunk
6167 fetch => {
6168 'mpd/trunk' => 'trunk',
6169 },
6170 # svn-remote.svn.tags=mpd/tags/*:tags/*
6171 tags => {
6172 path => {
6173 left => 'mpd/tags',
6174 right => '',
6175 regex => qr!mpd/tags/([^/]+)$!,
6176 glob => 'tags/*',
6177 },
6178 ref => {
6179 left => 'tags',
6180 right => '',
6181 regex => qr!tags/([^/]+)$!,
6182 glob => 'tags/*',
6183 },
6184 }
6185 }
6186 };
6188 $log_entry hashref as returned by libsvn_log_entry()
6189 {
6190 log => 'whitespace-formatted log entry
6191 ', # trailing newline is preserved
6192 revision => '8', # integer
6193 date => '2004-02-24T17:01:44.108345Z', # commit date
6194 author => 'committer name'
6195 };
6198 # this is generated by generate_diff();
6199 @mods = array of diff-index line hashes, each element represents one line
6200 of diff-index output
6202 diff-index line ($m hash)
6203 {
6204 mode_a => first column of diff-index output, no leading ':',
6205 mode_b => second column of diff-index output,
6206 sha1_b => sha1sum of the final blob,
6207 chg => change type [MCRADT],
6208 file_a => original file name of a file (iff chg is 'C' or 'R')
6209 file_b => new/current file name of a file (any chg)
6210 }
6211 ;
6213 # retval of read_url_paths{,_all}();
6214 $l_map = {
6215 # repository root url
6216 'https://svn.musicpd.org' => {
6217 # repository path # GIT_SVN_ID
6218 'mpd/trunk' => 'trunk',
6219 'mpd/tags/0.11.5' => 'tags/0.11.5',
6220 },
6221 }
6223 Notes:
6224 I don't trust the each() function on unless I created %hash myself
6225 because the internal iterator may not have started at base.