2 # Copyright (C) 2006, Eric Wong <normalperson@yhbt.net>
3 # License: GPL v2 or later
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)
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};
28 $ENV{SVN_SSH} =~ s/\\/\\\\/g;
33 $Git::SVN::Log::TZ = $ENV{TZ};
35 $| = 1; # unbuffer STDOUT
37 sub fatal (@) { print STDERR "@_\n"; exit 1 }
38 require SVN::Core; # use()-ing this causes segfaults for me... *shrug*
41 if ($SVN::Core::VERSION lt '1.1.0') {
42 fatal "Need SVN::Core 1.1.0 or better (got $SVN::Core::VERSION)";
44 my $can_compress = eval { require Compress::Zlib; 1};
45 push @Git::SVN::Ra::ISA, 'SVN::Ra';
46 push @SVN::Git::Editor::ISA, 'SVN::Delta::Editor';
47 push @SVN::Git::Fetcher::ISA, 'SVN::Delta::Editor';
51 use File::Basename qw/dirname basename/;
52 use File::Path qw/mkpath/;
55 use Getopt::Long qw/:config gnu_getopt no_ignore_case auto_abbrev/;
60 # import functions from Git into our packages, en masse
62 foreach (qw/command command_oneline command_noisy command_output_pipe
63 command_input_pipe command_close_pipe
64 command_bidi_pipe command_close_bidi_pipe/) {
65 for my $package ( qw(SVN::Git::Editor SVN::Git::Fetcher
66 Git::SVN::Migration Git::SVN::Log Git::SVN),
68 *{"${package}::$_"} = \&{"Git::$_"};
75 $sha1 = qr/[a-f\d]{40}/;
76 $sha1_short = qr/[a-f\d]{4,40}/;
77 my ($_stdin, $_help, $_edit,
78 $_message, $_file, $_branch_dest,
80 $_version, $_fetch_all, $_no_rebase, $_fetch_parent,
81 $_merge, $_strategy, $_dry_run, $_local,
82 $_prefix, $_no_checkout, $_url, $_verbose,
83 $_git_format, $_commit_url, $_tag);
84 $Git::SVN::_follow_parent = 1;
86 my %remote_opts = ( 'username=s' => \$Git::SVN::Prompt::_username,
87 'config-dir=s' => \$Git::SVN::Ra::config_dir,
88 'no-auth-cache' => \$Git::SVN::Prompt::_no_auth_cache,
89 'ignore-paths=s' => \$SVN::Git::Fetcher::_ignore_regex );
90 my %fc_opts = ( 'follow-parent|follow!' => \$Git::SVN::_follow_parent,
91 'authors-file|A=s' => \$_authors,
92 'authors-prog=s' => \$_authors_prog,
93 'repack:i' => \$Git::SVN::_repack,
94 'noMetadata' => \$Git::SVN::_no_metadata,
95 'useSvmProps' => \$Git::SVN::_use_svm_props,
96 'useSvnsyncProps' => \$Git::SVN::_use_svnsync_props,
97 'log-window-size=i' => \$Git::SVN::Ra::_log_window_size,
98 'no-checkout' => \$_no_checkout,
100 'repack-flags|repack-args|repack-opts=s' =>
101 \$Git::SVN::_repack_flags,
102 'use-log-author' => \$Git::SVN::_use_log_author,
103 'add-author-from' => \$Git::SVN::_add_author_from,
104 'localtime' => \$Git::SVN::_localtime,
107 my ($_trunk, @_tags, @_branches, $_stdlayout);
109 my %init_opts = ( 'template=s' => \$_template, 'shared:s' => \$_shared,
110 'trunk|T=s' => \$_trunk, 'tags|t=s@' => \@_tags,
111 'branches|b=s@' => \@_branches, 'prefix=s' => \$_prefix,
112 'stdlayout|s' => \$_stdlayout,
113 'minimize-url|m!' => \$Git::SVN::_minimize_url,
114 'no-metadata' => sub { $icv{noMetadata} = 1 },
115 'use-svm-props' => sub { $icv{useSvmProps} = 1 },
116 'use-svnsync-props' => sub { $icv{useSvnsyncProps} = 1 },
117 'rewrite-root=s' => sub { $icv{rewriteRoot} = $_[1] },
119 my %cmt_opts = ( 'edit|e' => \$_edit,
120 'rmdir' => \$SVN::Git::Editor::_rmdir,
121 'find-copies-harder' => \$SVN::Git::Editor::_find_copies_harder,
122 'l=i' => \$SVN::Git::Editor::_rename_limit,
123 'copy-similarity|C=i'=> \$SVN::Git::Editor::_cp_similarity
127 fetch => [ \&cmd_fetch, "Download new revisions from SVN",
128 { 'revision|r=s' => \$_revision,
129 'fetch-all|all' => \$_fetch_all,
130 'parent|p' => \$_fetch_parent,
132 clone => [ \&cmd_clone, "Initialize and fetch revisions",
133 { 'revision|r=s' => \$_revision,
134 %fc_opts, %init_opts } ],
135 init => [ \&cmd_init, "Initialize a repo for tracking" .
136 " (requires URL argument)",
138 'multi-init' => [ \&cmd_multi_init,
139 "Deprecated alias for ".
140 "'$0 init -T<trunk> -b<branches> -t<tags>'",
142 dcommit => [ \&cmd_dcommit,
143 'Commit several diffs to merge with upstream',
144 { 'merge|m|M' => \$_merge,
145 'strategy|s=s' => \$_strategy,
146 'verbose|v' => \$_verbose,
147 'dry-run|n' => \$_dry_run,
148 'fetch-all|all' => \$_fetch_all,
149 'commit-url=s' => \$_commit_url,
150 'revision|r=i' => \$_revision,
151 'no-rebase' => \$_no_rebase,
152 %cmt_opts, %fc_opts } ],
153 branch => [ \&cmd_branch,
154 'Create a branch in the SVN repository',
155 { 'message|m=s' => \$_message,
156 'destination|d=s' => \$_branch_dest,
157 'dry-run|n' => \$_dry_run,
158 'tag|t' => \$_tag } ],
159 tag => [ sub { $_tag = 1; cmd_branch(@_) },
160 'Create a tag in the SVN repository',
161 { 'message|m=s' => \$_message,
162 'destination|d=s' => \$_branch_dest,
163 'dry-run|n' => \$_dry_run } ],
164 'set-tree' => [ \&cmd_set_tree,
165 "Set an SVN repository to a git tree-ish",
166 { 'stdin' => \$_stdin, %cmt_opts, %fc_opts, } ],
167 'create-ignore' => [ \&cmd_create_ignore,
168 'Create a .gitignore per svn:ignore',
169 { 'revision|r=i' => \$_revision
171 'mkdirs' => [ \&cmd_mkdirs ,
172 "recreate empty directories after a checkout",
173 { 'revision|r=i' => \$_revision } ],
174 'propget' => [ \&cmd_propget,
175 'Print the value of a property on a file or directory',
176 { 'revision|r=i' => \$_revision } ],
177 'proplist' => [ \&cmd_proplist,
178 'List all properties of a file or directory',
179 { 'revision|r=i' => \$_revision } ],
180 'show-ignore' => [ \&cmd_show_ignore, "Show svn:ignore listings",
181 { 'revision|r=i' => \$_revision
183 'show-externals' => [ \&cmd_show_externals, "Show svn:externals listings",
184 { 'revision|r=i' => \$_revision
186 'multi-fetch' => [ \&cmd_multi_fetch,
187 "Deprecated alias for $0 fetch --all",
188 { 'revision|r=s' => \$_revision, %fc_opts } ],
189 'migrate' => [ sub { },
190 # no-op, we automatically run this anyways,
191 'Migrate configuration/metadata/layout from
192 previous versions of git-svn',
193 { 'minimize' => \$Git::SVN::Migration::_minimize,
195 'log' => [ \&Git::SVN::Log::cmd_show_log, 'Show commit logs',
196 { 'limit=i' => \$Git::SVN::Log::limit,
197 'revision|r=s' => \$_revision,
198 'verbose|v' => \$Git::SVN::Log::verbose,
199 'incremental' => \$Git::SVN::Log::incremental,
200 'oneline' => \$Git::SVN::Log::oneline,
201 'show-commit' => \$Git::SVN::Log::show_commit,
202 'non-recursive' => \$Git::SVN::Log::non_recursive,
203 'authors-file|A=s' => \$_authors,
204 'color' => \$Git::SVN::Log::color,
205 'pager=s' => \$Git::SVN::Log::pager
207 'find-rev' => [ \&cmd_find_rev,
208 "Translate between SVN revision numbers and tree-ish",
210 'rebase' => [ \&cmd_rebase, "Fetch and rebase your working directory",
211 { 'merge|m|M' => \$_merge,
212 'verbose|v' => \$_verbose,
213 'strategy|s=s' => \$_strategy,
214 'local|l' => \$_local,
215 'fetch-all|all' => \$_fetch_all,
216 'dry-run|n' => \$_dry_run,
218 'commit-diff' => [ \&cmd_commit_diff,
219 'Commit a diff between two trees',
220 { 'message|m=s' => \$_message,
221 'file|F=s' => \$_file,
222 'revision|r=s' => \$_revision,
224 'info' => [ \&cmd_info,
225 "Show info about the latest SVN revision
226 on the current branch",
227 { 'url' => \$_url, } ],
228 'blame' => [ \&Git::SVN::Log::cmd_blame,
229 "Show what revision and author last modified each line of a file",
230 { 'git-format' => \$_git_format } ],
231 'reset' => [ \&cmd_reset,
232 "Undo fetches back to the specified SVN revision",
233 { 'revision|r=s' => \$_revision,
234 'parent|p' => \$_fetch_parent } ],
236 "Compress unhandled.log files in .git/svn and remove " .
237 "index files in .git/svn",
242 for (my $i = 0; $i < @ARGV; $i++) {
243 if (defined $cmd{$ARGV[$i]}) {
247 } elsif ($ARGV[$i] eq 'help') {
253 # make sure we're always running at the top-level working directory
254 unless ($cmd && $cmd =~ /(?:clone|init|multi-init)$/) {
255 unless (-d $ENV{GIT_DIR}) {
256 if ($git_dir_user_set) {
257 die "GIT_DIR=$ENV{GIT_DIR} explicitly set, ",
258 "but it is not a directory\n";
260 my $git_dir = delete $ENV{GIT_DIR};
263 $cdup = command_oneline(qw/rev-parse --show-cdup/);
264 $git_dir = '.' unless ($cdup);
265 chomp $cdup if ($cdup);
266 $cdup = "." unless ($cdup && length $cdup);
267 } "Already at toplevel, but $git_dir not found\n";
268 chdir $cdup or die "Unable to chdir up to '$cdup'\n";
269 unless (-d $git_dir) {
270 die "$git_dir still not found after going to ",
273 $ENV{GIT_DIR} = $git_dir;
275 $_repository = Git->repository(Repository => $ENV{GIT_DIR});
278 my %opts = %{$cmd{$cmd}->[2]} if (defined $cmd);
280 read_git_config(\%opts);
281 if ($cmd && ($cmd eq 'log' || $cmd eq 'blame')) {
282 Getopt::Long::Configure('pass_through');
284 my $rv = GetOptions(%opts, 'help|H|h' => \$_help, 'version|V' => \$_version,
285 'minimize-connections' => \$Git::SVN::Migration::_minimize,
286 'id|i=s' => \$Git::SVN::default_ref_id,
287 'svn-remote|remote|R=s' => sub {
288 $Git::SVN::no_reuse_existing = 1;
289 $Git::SVN::default_repo_id = $_[1] });
290 exit 1 if (!$rv && $cmd && $cmd ne 'log');
293 version() if $_version;
294 usage(1) unless defined $cmd;
295 load_authors() if $_authors;
296 if (defined $_authors_prog) {
297 $_authors_prog = "'" . File::Spec->rel2abs($_authors_prog) . "'";
300 unless ($cmd =~ /^(?:clone|init|multi-init|commit-diff)$/) {
301 Git::SVN::Migration::migration_check();
303 Git::SVN::init_vars();
305 Git::SVN::verify_remotes_sanity();
306 $cmd{$cmd}->[0]->(@ARGV);
309 post_fetch_checkout();
312 ####################### primary functions ######################
314 my $exit = shift || 0;
315 my $fd = $exit ? \*STDERR : \*STDOUT;
317 git-svn - bidirectional operations between a single Subversion tree and git
318 Usage: git svn <command> [options] [arguments]\n
320 print $fd "Available commands:\n" unless $cmd;
322 foreach (sort keys %cmd) {
323 next if $cmd && $cmd ne $_;
324 next if /^multi-/; # don't show deprecated commands
325 print $fd ' ',pack('A17',$_),$cmd{$_}->[1],"\n";
326 foreach (sort keys %{$cmd{$_}->[2]}) {
327 # mixed-case options are for .git/config only
328 next if /[A-Z]/ && /^[a-z]+$/i;
329 # prints out arguments as they should be passed:
330 my $x = s#[:=]s$## ? '<arg>' : s#[:=]i$## ? '<num>' : '';
331 print $fd ' ' x 21, join(', ', map { length $_ > 1 ?
333 split /\|/,$_)," $x\n";
337 \nGIT_SVN_ID may be set in the environment or via the --id/-i switch to an
338 arbitrary identifier if you're tracking multiple SVN branches/repositories in
339 one git repository and want to keep them separate. See git-svn(1) for more
346 print "git-svn version $VERSION (svn $SVN::Core::VERSION)\n";
351 unless (-d $ENV{GIT_DIR}) {
352 my @init_db = ('init');
353 push @init_db, "--template=$_template" if defined $_template;
354 if (defined $_shared) {
355 if ($_shared =~ /[a-z]/) {
356 push @init_db, "--shared=$_shared";
358 push @init_db, "--shared";
361 command_noisy(@init_db);
362 $_repository = Git->repository(Repository => ".git");
364 command_noisy('config', 'core.autocrlf', 'false');
366 my $pfx = "svn-remote.$Git::SVN::default_repo_id";
367 foreach my $i (keys %icv) {
368 die "'$set' and '$i' cannot both be set\n" if $set;
369 next unless defined $icv{$i};
370 command_noisy('config', "$pfx.$i", $icv{$i});
373 my $ignore_regex = \$SVN::Git::Fetcher::_ignore_regex;
374 command_noisy('config', "$pfx.ignore-paths", $$ignore_regex)
375 if defined $$ignore_regex;
379 my $repo_path = shift or return;
380 mkpath([$repo_path]) unless -d $repo_path;
381 chdir $repo_path or die "Couldn't chdir to $repo_path: $!\n";
382 $ENV{GIT_DIR} = '.git';
383 $_repository = Git->repository(Repository => $ENV{GIT_DIR});
387 my ($url, $path) = @_;
388 if (!defined $path &&
389 (defined $_trunk || @_branches || @_tags ||
390 defined $_stdlayout) &&
391 $url !~ m#^[a-z\+]+://#) {
394 $path = basename($url) if !defined $path || !length $path;
395 my $authors_absolute = $_authors ? File::Spec->rel2abs($_authors) : "";
396 cmd_init($url, $path);
397 command_oneline('config', 'svn.authorsfile', $authors_absolute)
399 Git::SVN::fetch_all($Git::SVN::default_repo_id);
403 if (defined $_stdlayout) {
404 $_trunk = 'trunk' if (!defined $_trunk);
405 @_tags = 'tags' if (! @_tags);
406 @_branches = 'branches' if (! @_branches);
408 if (defined $_trunk || @_branches || @_tags) {
409 return cmd_multi_init(@_);
411 my $url = shift or die "SVN repository location required ",
412 "as a command-line argument\n";
413 $url = canonicalize_url($url);
417 if ($Git::SVN::_minimize_url eq 'unset') {
418 $Git::SVN::_minimize_url = 0;
421 Git::SVN->init($url);
425 if (grep /^\d+=./, @_) {
426 die "'<rev>=<commit>' fetch arguments are ",
427 "no longer supported.\n";
431 die "Usage: $0 fetch [--all] [--parent] [svn-remote]\n";
433 $Git::SVN::no_reuse_existing = undef;
434 if ($_fetch_parent) {
435 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
437 die "Unable to determine upstream SVN information from ",
438 "working tree history\n";
440 # just fetch, don't checkout.
441 $_no_checkout = 'true';
442 $_fetch_all ? $gs->fetch_all : $gs->fetch;
443 } elsif ($_fetch_all) {
446 $remote ||= $Git::SVN::default_repo_id;
447 Git::SVN::fetch_all($remote, Git::SVN::read_all_remotes());
453 if ($_stdin || !@commits) {
454 print "Reading from stdin...\n";
457 if (/\b($sha1_short)\b/o) {
458 unshift @commits, $1;
463 foreach my $c (@commits) {
464 my @tmp = command('rev-parse',$c);
465 if (scalar @tmp == 1) {
467 } elsif (scalar @tmp > 1) {
468 push @revs, reverse(command('rev-list',@tmp));
470 fatal "Failed to rev-parse $c";
473 my $gs = Git::SVN->new;
474 my ($r_last, $cmt_last) = $gs->last_rev_commit;
476 if (defined $gs->{last_rev} && $r_last != $gs->{last_rev}) {
477 fatal "There are new revisions that were fetched ",
478 "and need to be merged (or acknowledged) ",
479 "before committing.\nlast rev: $r_last\n",
480 " current: $gs->{last_rev}";
482 $gs->set_tree($_) foreach @revs;
483 print "Done committing ",scalar @revs," revisions to SVN\n";
489 git_cmd_try { command_oneline(qw/diff-index --quiet HEAD/) }
490 'Cannot dcommit with a dirty index. Commit your changes first, '
491 . "or stash them with `git stash'.\n";
495 if ($head ne 'HEAD') {
497 command_oneline([qw/symbolic-ref -q HEAD/])
500 $old_head =~ s{^refs/heads/}{};
502 $old_head = eval { command_oneline(qw/rev-parse HEAD/) };
504 command(['checkout', $head], STDERR => 0);
508 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD', \@refs);
510 die "Unable to determine upstream SVN information from ",
511 "$head history.\nPerhaps the repository is empty.";
514 if (defined $_commit_url) {
517 $url = eval { command_oneline('config', '--get',
518 "svn-remote.$gs->{repo_id}.commiturl") };
524 my $last_rev = $_revision if defined $_revision;
526 print "Committing to $url ...\n";
528 my ($linear_refs, $parents) = linearize_history($gs, \@refs);
529 if ($_no_rebase && scalar(@$linear_refs) > 1) {
530 warn "Attempting to commit more than one change while ",
531 "--no-rebase is enabled.\n",
532 "If these changes depend on each other, re-running ",
533 "without --no-rebase may be required."
535 my $expect_url = $url;
536 Git::SVN::remove_username($expect_url);
538 my $d = shift @$linear_refs or last;
539 unless (defined $last_rev) {
540 (undef, $last_rev, undef) = cmt_metadata("$d~1");
541 unless (defined $last_rev) {
542 fatal "Unable to extract revision information ",
547 print "diff-tree $d~1 $d\n";
550 my %ed_opts = ( r => $last_rev,
551 log => get_commit_entry($d)->{log},
552 ra => Git::SVN::Ra->new($url),
553 config => SVN::Core::config_get_config(
554 $Git::SVN::Ra::config_dir
559 print "Committed r$_[0]\n";
563 if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) {
564 print "No changes\n$d~1 == $d\n";
565 } elsif ($parents->{$d} && @{$parents->{$d}}) {
566 $gs->{inject_parents_dcommit}->{$cmt_rev} =
569 $_fetch_all ? $gs->fetch_all : $gs->fetch;
570 $last_rev = $cmt_rev;
573 # we always want to rebase against the current HEAD,
574 # not any head that was passed to us
575 my @diff = command('diff-tree', $d,
579 @finish = rebase_cmd();
580 print STDERR "W: $d and ", $gs->refname,
581 " differ, using @finish:\n",
582 join("\n", @diff), "\n";
584 print "No changes between current HEAD and ",
586 "\nResetting to the latest ",
588 @finish = qw/reset --mixed/;
590 command_noisy(@finish, $gs->refname);
593 my ($url_, $rev_, $uuid_, $gs_) =
594 working_head_info('HEAD', \@refs);
595 my ($linear_refs_, $parents_) =
596 linearize_history($gs_, \@refs);
597 if (scalar(@$linear_refs) !=
598 scalar(@$linear_refs_)) {
599 fatal "# of revisions changed ",
601 join("\n", @$linear_refs),
603 join("\n", @$linear_refs_), "\n",
604 'If you are attempting to commit ',
605 "merges, try running:\n\t",
606 'git rebase --interactive',
607 '--preserve-merges ',
609 "\nBefore dcommitting";
611 if ($url_ ne $expect_url) {
612 if ($url_ eq $gs->metadata_url) {
614 "Accepting rewritten URL:",
618 "URL mismatch after rebase:",
619 " $url_ != $expect_url";
622 if ($uuid_ ne $uuid) {
623 fatal "uuid mismatch after rebase: ",
628 for ($i = 0; $i < scalar @$linear_refs; $i++) {
629 my $new = $linear_refs_->[$i] or next;
631 $parents->{$linear_refs->[$i]};
641 my $new_head = command_oneline(qw/rev-parse HEAD/);
642 my $new_is_symbolic = eval {
643 command_oneline(qw/symbolic-ref -q HEAD/);
645 if ($new_is_symbolic) {
646 print "dcommitted the branch ", $head, "\n";
648 print "dcommitted on a detached HEAD because you gave ",
649 "a revision argument.\n",
650 "The rewritten commit is: ", $new_head, "\n";
652 command(['checkout', $old_head], STDERR => 0);
659 my ($branch_name, $head) = @_;
661 unless (defined $branch_name && length $branch_name) {
662 die(($_tag ? "tag" : "branch") . " name required\n");
666 my (undef, $rev, undef, $gs) = working_head_info($head);
667 my $src = $gs->full_url;
669 my $remote = Git::SVN::read_all_remotes()->{$gs->{repo_id}};
670 my $allglobs = $remote->{ $_tag ? 'tags' : 'branches' };
672 if ($#{$allglobs} == 0) {
673 $glob = $allglobs->[0];
675 unless(defined $_branch_dest) {
677 $_tag ? "tag" : "branch",
678 " paths defined for Subversion repository.\n",
679 "You must specify where you want to create the ",
680 $_tag ? "tag" : "branch",
681 " with the --destination argument.\n";
683 foreach my $g (@{$allglobs}) {
684 # SVN::Git::Editor could probably be moved to Git.pm..
685 my $re = SVN::Git::Editor::glob2pat($g->{path}->{left});
686 if ($_branch_dest =~ /$re/) {
691 unless (defined $glob) {
692 my $dest_re = qr/\b\Q$_branch_dest\E\b/;
693 foreach my $g (@{$allglobs}) {
694 $g->{path}->{left} =~ /$dest_re/ or next;
696 die "Ambiguous destination: ",
697 $_branch_dest, "\nmatches both '",
698 $glob->{path}->{left}, "' and '",
699 $g->{path}->{left}, "'\n";
703 unless (defined $glob) {
705 $_tag ? "tag" : "branch",
706 " destination $_branch_dest\n";
710 my ($lft, $rgt) = @{ $glob->{path} }{qw/left right/};
711 my $dst = join '/', $remote->{url}, $lft, $branch_name, ($rgt || ());
713 if ($dst =~ /^https:/ && $src =~ /^http:/) {
714 $src=~s/^http:/https:/;
717 my $ctx = SVN::Client->new(
718 auth => Git::SVN::Ra::_auth_providers(),
720 ${ $_[0] } = defined $_message
722 : 'Create ' . ($_tag ? 'tag ' : 'branch ' )
728 $ctx->ls($dst, 'HEAD', 0);
729 } and die "branch ${branch_name} already exists\n";
731 print "Copying ${src} at r${rev} to ${dst}...\n";
732 $ctx->copy($src, $rev, $dst)
739 my $revision_or_hash = shift or die "SVN or git revision required ",
740 "as a command-line argument\n";
742 if ($revision_or_hash =~ /^r\d+$/) {
746 my (undef, undef, $uuid, $gs) = working_head_info($head, \@refs);
748 die "Unable to determine upstream SVN information from ",
751 my $desired_revision = substr($revision_or_hash, 1);
752 $result = $gs->rev_map_get($desired_revision, $uuid);
754 my (undef, $rev, undef) = cmt_metadata($revision_or_hash);
757 print "$result\n" if $result;
761 command_noisy(qw/update-index --refresh/);
762 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
764 die "Unable to determine upstream SVN information from ",
765 "working tree history\n";
768 print "Remote Branch: " . $gs->refname . "\n";
769 print "SVN URL: " . $url . "\n";
772 if (command(qw/diff-index HEAD --/)) {
773 print STDERR "Cannot rebase with uncommited changes:\n";
774 command_noisy('status');
778 # rebase will checkout for us, so no need to do it explicitly
779 $_no_checkout = 'true';
780 $_fetch_all ? $gs->fetch_all : $gs->fetch;
782 command_noisy(rebase_cmd(), $gs->refname);
786 sub cmd_show_ignore {
787 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
788 $gs ||= Git::SVN->new;
789 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
790 $gs->prop_walk($gs->{path}, $r, sub {
791 my ($gs, $path, $props) = @_;
792 print STDOUT "\n# $path\n";
793 my $s = $props->{'svn:ignore'} or return;
794 $s =~ s/[\r\n]+/\n/g;
802 sub cmd_show_externals {
803 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
804 $gs ||= Git::SVN->new;
805 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
806 $gs->prop_walk($gs->{path}, $r, sub {
807 my ($gs, $path, $props) = @_;
808 print STDOUT "\n# $path\n";
809 my $s = $props->{'svn:externals'} or return;
810 $s =~ s/[\r\n]+/\n/g;
817 sub cmd_create_ignore {
818 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
819 $gs ||= Git::SVN->new;
820 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
821 $gs->prop_walk($gs->{path}, $r, sub {
822 my ($gs, $path, $props) = @_;
823 # $path is of the form /path/to/dir/
825 # SVN can have attributes on empty directories,
826 # which git won't track
827 mkpath([$path]) unless -d $path;
828 my $ignore = $path . '.gitignore';
829 my $s = $props->{'svn:ignore'} or return;
830 open(GITIGNORE, '>', $ignore)
831 or fatal("Failed to open `$ignore' for writing: $!");
832 $s =~ s/[\r\n]+/\n/g;
835 # Prefix all patterns so that the ignore doesn't apply
836 # to sub-directories.
838 print GITIGNORE "$s\n";
840 or fatal("Failed to close `$ignore': $!");
841 command_noisy('add', '-f', $ignore);
846 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
847 $gs ||= Git::SVN->new;
848 $gs->mkemptydirs($_revision);
851 sub canonicalize_path {
853 my $dot_slash_added = 0;
854 if (substr($path, 0, 1) ne "/") {
855 $path = "./" . $path;
856 $dot_slash_added = 1;
858 # File::Spec->canonpath doesn't collapse x/../y into y (for a
859 # good reason), so let's do this manually.
861 $path =~ s#/\.(?:/|$)#/#g;
862 $path =~ s#/[^/]+/\.\.##g;
864 $path =~ s#^\./## if $dot_slash_added;
870 sub canonicalize_url {
872 $url =~ s#^([^:]+://[^/]*/)(.*)$#$1 . canonicalize_path($2)#e;
878 # Helper for cmd_propget and cmd_proplist below.
881 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
882 $gs ||= Git::SVN->new;
884 # prefix THE PATH by the sub-directory from which the user
886 $path = $cmd_dir_prefix . $path;
887 fatal("No such file or directory: $path") unless -e $path;
888 my $is_dir = -d $path ? 1 : 0;
889 $path = $gs->{path} . '/' . $path;
891 # canonicalize the path (otherwise libsvn will abort or fail to
893 $path = canonicalize_path($path);
895 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
898 (undef, undef, $props) = $gs->ra->get_dir($path, $r);
901 (undef, $props) = $gs->ra->get_file($path, $r, undef);
906 # cmd_propget (PROP, PATH)
907 # ------------------------
908 # Print the SVN property PROP for PATH.
910 my ($prop, $path) = @_;
911 $path = '.' if not defined $path;
912 usage(1) if not defined $prop;
913 my $props = get_svnprops($path);
914 if (not defined $props->{$prop}) {
915 fatal("`$path' does not have a `$prop' SVN property.");
917 print $props->{$prop} . "\n";
920 # cmd_proplist (PATH)
921 # -------------------
922 # Print the list of SVN properties for PATH.
925 $path = '.' if not defined $path;
926 my $props = get_svnprops($path);
927 print "Properties on '$path':\n";
928 foreach (sort keys %{$props}) {
935 unless (defined $_trunk || @_branches || @_tags) {
939 $_prefix = '' unless defined $_prefix;
941 $url = canonicalize_url($url);
945 if (defined $_trunk) {
946 my $trunk_ref = 'refs/remotes/' . $_prefix . 'trunk';
947 # try both old-style and new-style lookups:
948 my $gs_trunk = eval { Git::SVN->new($trunk_ref) };
950 my ($trunk_url, $trunk_path) =
951 complete_svn_url($url, $_trunk);
952 $gs_trunk = Git::SVN->init($trunk_url, $trunk_path,
956 return unless @_branches || @_tags;
957 my $ra = $url ? Git::SVN::Ra->new($url) : undef;
958 foreach my $path (@_branches) {
959 complete_url_ls_init($ra, $path, '--branches/-b', $_prefix);
961 foreach my $path (@_tags) {
962 complete_url_ls_init($ra, $path, '--tags/-t', $_prefix.'tags/');
966 sub cmd_multi_fetch {
967 $Git::SVN::no_reuse_existing = undef;
968 my $remotes = Git::SVN::read_all_remotes();
969 foreach my $repo_id (sort keys %$remotes) {
970 if ($remotes->{$repo_id}->{url}) {
971 Git::SVN::fetch_all($repo_id, $remotes);
976 # this command is special because it requires no metadata
977 sub cmd_commit_diff {
978 my ($ta, $tb, $url) = @_;
979 my $usage = "Usage: $0 commit-diff -r<revision> ".
980 "<tree-ish> <tree-ish> [<URL>]";
981 fatal($usage) if (!defined $ta || !defined $tb);
984 my $gs = eval { Git::SVN->new };
986 fatal("Needed URL or usable git-svn --id in ",
987 "the command-line\n", $usage);
990 $svn_path = $gs->{path};
992 unless (defined $_revision) {
993 fatal("-r|--revision is a required argument\n", $usage);
995 if (defined $_message && defined $_file) {
996 fatal("Both --message/-m and --file/-F specified ",
997 "for the commit message.\n",
998 "I have no idea what you mean");
1000 if (defined $_file) {
1001 $_message = file_to_s($_file);
1003 $_message ||= get_commit_entry($tb)->{log};
1005 my $ra ||= Git::SVN::Ra->new($url);
1008 $r = $ra->get_latest_revnum;
1009 } elsif ($r !~ /^\d+$/) {
1010 die "revision argument: $r not understood by git-svn\n";
1012 my %ed_opts = ( r => $r,
1017 editor_cb => sub { print "Committed r$_[0]\n" },
1018 svn_path => $svn_path );
1019 if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) {
1020 print "No changes\n$ta == $tb\n";
1024 sub escape_uri_only {
1027 foreach (split m{/}, $uri) {
1028 s/([^~\w.%+-]|%(?![a-fA-F0-9]{2}))/sprintf("%%%02X",ord($1))/eg;
1036 if ($url =~ m#^([^:]+)://([^/]*)(.*)$#) {
1037 my ($scheme, $domain, $uri) = ($1, $2, escape_uri_only($3));
1038 $url = "$scheme://$domain$uri";
1044 my $path = canonicalize_path(defined($_[0]) ? $_[0] : ".");
1045 my $fullpath = canonicalize_path($cmd_dir_prefix . $path);
1047 die "Too many arguments specified\n";
1050 my ($file_type, $diff_status) = find_file_type_and_diff_status($path);
1052 if (!$file_type && !$diff_status) {
1053 print STDERR "svn: '$path' is not under version control\n";
1057 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
1059 die "Unable to determine upstream SVN information from ",
1060 "working tree history\n";
1063 # canonicalize_path() will return "" to make libsvn 1.5.x happy,
1064 $path = "." if $path eq "";
1066 my $full_url = $url . ($fullpath eq "" ? "" : "/$fullpath");
1069 print escape_url($full_url), "\n";
1073 my $result = "Path: $path\n";
1074 $result .= "Name: " . basename($path) . "\n" if $file_type ne "dir";
1075 $result .= "URL: " . escape_url($full_url) . "\n";
1078 my $repos_root = $gs->repos_root;
1079 Git::SVN::remove_username($repos_root);
1080 $result .= "Repository Root: " . escape_url($repos_root) . "\n";
1083 $result .= "Repository Root: (offline)\n";
1085 $result .= "Repository UUID: $uuid\n" unless $diff_status eq "A" &&
1086 ($SVN::Core::VERSION le '1.5.4' || $file_type ne "dir");
1087 $result .= "Revision: " . ($diff_status eq "A" ? 0 : $rev) . "\n";
1089 $result .= "Node Kind: " .
1090 ($file_type eq "dir" ? "directory" : "file") . "\n";
1092 my $schedule = $diff_status eq "A"
1094 : ($diff_status eq "D" ? "delete" : "normal");
1095 $result .= "Schedule: $schedule\n";
1097 if ($diff_status eq "A") {
1098 print $result, "\n";
1102 my ($lc_author, $lc_rev, $lc_date_utc);
1103 my @args = Git::SVN::Log::git_svn_log_cmd($rev, $rev, "--", $fullpath);
1104 my $log = command_output_pipe(@args);
1105 my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/;
1107 if (/^${esc_color}author (.+) <[^>]+> (\d+) ([\-\+]?\d+)$/o) {
1109 $lc_date_utc = Git::SVN::Log::parse_git_date($2, $3);
1110 } elsif (/^${esc_color} (git-svn-id:.+)$/o) {
1111 (undef, $lc_rev, undef) = ::extract_metadata($1);
1116 Git::SVN::Log::set_local_timezone();
1118 $result .= "Last Changed Author: $lc_author\n";
1119 $result .= "Last Changed Rev: $lc_rev\n";
1120 $result .= "Last Changed Date: " .
1121 Git::SVN::Log::format_svn_date($lc_date_utc) . "\n";
1123 if ($file_type ne "dir") {
1124 my $text_last_updated_date =
1125 ($diff_status eq "D" ? $lc_date_utc : (stat $path)[9]);
1127 "Text Last Updated: " .
1128 Git::SVN::Log::format_svn_date($text_last_updated_date) .
1131 if ($diff_status eq "D") {
1133 command_output_pipe(qw(cat-file blob), "HEAD:$path");
1134 if ($file_type eq "link") {
1135 my $file_name = <$fh>;
1136 $checksum = md5sum("link $file_name");
1138 $checksum = md5sum($fh);
1140 command_close_pipe($fh, $ctx);
1141 } elsif ($file_type eq "link") {
1143 command(qw(cat-file blob), "HEAD:$path");
1145 md5sum("link " . $file_name);
1147 open FILE, "<", $path or die $!;
1148 $checksum = md5sum(\*FILE);
1149 close FILE or die $!;
1151 $result .= "Checksum: " . $checksum . "\n";
1154 print $result, "\n";
1158 my $target = shift || $_revision or die "SVN revision required\n";
1159 $target = $1 if $target =~ /^r(\d+)$/;
1160 $target =~ /^\d+$/ or die "Numeric SVN revision expected\n";
1161 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
1163 die "Unable to determine upstream SVN information from ".
1166 my ($r, $c) = $gs->find_rev_before($target, not $_fetch_parent);
1167 $gs->rev_map_set($r, $c, 'reset', $uuid);
1168 print "r$r = $c ($gs->{ref_id})\n";
1172 if (!$can_compress) {
1173 warn "Compress::Zlib could not be found; unhandled.log " .
1174 "files will not be compressed.\n";
1176 find({ wanted => \&gc_directory, no_chdir => 1}, "$ENV{GIT_DIR}/svn");
1179 ########################### utility functions #########################
1182 my @cmd = qw/rebase/;
1183 push @cmd, '-v' if $_verbose;
1184 push @cmd, qw/--merge/ if $_merge;
1185 push @cmd, "--strategy=$_strategy" if $_strategy;
1189 sub post_fetch_checkout {
1190 return if $_no_checkout;
1191 my $gs = $Git::SVN::_head or return;
1192 return if verify_ref('refs/heads/master^0');
1194 # look for "trunk" ref if it exists
1195 my $remote = Git::SVN::read_all_remotes()->{$gs->{repo_id}};
1196 my $fetch = $remote->{fetch};
1198 foreach my $p (keys %$fetch) {
1199 basename($fetch->{$p}) eq 'trunk' or next;
1200 $gs = Git::SVN->new($fetch->{$p}, $gs->{repo_id}, $p);
1205 my $valid_head = verify_ref('HEAD^0');
1206 command_noisy(qw(update-ref refs/heads/master), $gs->refname);
1207 return if ($valid_head || !verify_ref('HEAD^0'));
1209 return if $ENV{GIT_DIR} !~ m#^(?:.*/)?\.git$#;
1210 my $index = $ENV{GIT_INDEX_FILE} || "$ENV{GIT_DIR}/index";
1211 return if -f $index;
1213 return if command_oneline(qw/rev-parse --is-inside-work-tree/) eq 'false';
1214 return if command_oneline(qw/rev-parse --is-inside-git-dir/) eq 'true';
1215 command_noisy(qw/read-tree -m -u -v HEAD HEAD/);
1216 print STDERR "Checked out HEAD:\n ",
1217 $gs->full_url, " r", $gs->last_rev, "\n";
1218 $gs->mkemptydirs($gs->last_rev);
1221 sub complete_svn_url {
1222 my ($url, $path) = @_;
1224 if ($path !~ m#^[a-z\+]+://#) {
1225 if (!defined $url || $url !~ m#^[a-z\+]+://#) {
1226 fatal("E: '$path' is not a complete URL ",
1227 "and a separate URL is not specified");
1229 return ($url, $path);
1234 sub complete_url_ls_init {
1235 my ($ra, $repo_path, $switch, $pfx) = @_;
1236 unless ($repo_path) {
1237 print STDERR "W: $switch not specified\n";
1240 $repo_path =~ s#/+$##;
1241 if ($repo_path =~ m#^[a-z\+]+://#) {
1242 $ra = Git::SVN::Ra->new($repo_path);
1245 $repo_path =~ s#^/+##;
1247 fatal("E: '$repo_path' is not a complete URL ",
1248 "and a separate URL is not specified");
1251 my $url = $ra->{url};
1252 my $gs = Git::SVN->init($url, undef, undef, undef, 1);
1253 my $k = "svn-remote.$gs->{repo_id}.url";
1254 my $orig_url = eval { command_oneline(qw/config --get/, $k) };
1255 if ($orig_url && ($orig_url ne $gs->{url})) {
1256 die "$k already set: $orig_url\n",
1257 "wanted to set to: $gs->{url}\n";
1259 command_oneline('config', $k, $gs->{url}) unless $orig_url;
1260 my $remote_path = "$gs->{path}/$repo_path";
1261 $remote_path =~ s{%([0-9A-F]{2})}{chr hex($1)}ieg;
1262 $remote_path =~ s#/+#/#g;
1263 $remote_path =~ s#^/##g;
1264 $remote_path .= "/*" if $remote_path !~ /\*/;
1265 my ($n) = ($switch =~ /^--(\w+)/);
1266 if (length $pfx && $pfx !~ m#/$#) {
1267 die "--prefix='$pfx' must have a trailing slash '/'\n";
1269 command_noisy('config',
1271 "svn-remote.$gs->{repo_id}.$n",
1272 "$remote_path:refs/remotes/$pfx*" .
1273 ('/*' x (($remote_path =~ tr/*/*/) - 1)) );
1278 eval { command_oneline([ 'rev-parse', '--verify', $ref ],
1279 { STDERR => 0 }); };
1282 sub get_tree_from_treeish {
1284 # $treeish can be a symbolic ref, too:
1285 my $type = command_oneline(qw/cat-file -t/, $treeish);
1287 while ($type eq 'tag') {
1288 ($treeish, $type) = command(qw/cat-file tag/, $treeish);
1290 if ($type eq 'commit') {
1291 $expected = (grep /^tree /, command(qw/cat-file commit/,
1293 ($expected) = ($expected =~ /^tree ($sha1)$/o);
1294 die "Unable to get tree from $treeish\n" unless $expected;
1295 } elsif ($type eq 'tree') {
1296 $expected = $treeish;
1298 die "$treeish is a $type, expected tree, tag or commit\n";
1303 sub get_commit_entry {
1304 my ($treeish) = shift;
1305 my %log_entry = ( log => '', tree => get_tree_from_treeish($treeish) );
1306 my $commit_editmsg = "$ENV{GIT_DIR}/COMMIT_EDITMSG";
1307 my $commit_msg = "$ENV{GIT_DIR}/COMMIT_MSG";
1308 open my $log_fh, '>', $commit_editmsg or croak $!;
1310 my $type = command_oneline(qw/cat-file -t/, $treeish);
1311 if ($type eq 'commit' || $type eq 'tag') {
1312 my ($msg_fh, $ctx) = command_output_pipe('cat-file',
1320 $in_msg = 1 if (/^\s*$/);
1321 $author = $1 if (/^author (.*>)/);
1322 } elsif (/^git-svn-id: /) {
1323 # skip this for now, we regenerate the
1324 # correct one on re-fetch anyways
1325 # TODO: set *:merge properties or like...
1327 if (/^From:/ || /^Signed-off-by:/) {
1333 $msgbuf =~ s/\s+$//s;
1334 if ($Git::SVN::_add_author_from && defined($author)
1336 $msgbuf .= "\n\nFrom: $author";
1338 print $log_fh $msgbuf or croak $!;
1339 command_close_pipe($msg_fh, $ctx);
1341 close $log_fh or croak $!;
1343 if ($_edit || ($type eq 'tree')) {
1344 chomp(my $editor = command_oneline(qw(var GIT_EDITOR)));
1345 system('sh', '-c', $editor.' "$@"', $editor, $commit_editmsg);
1347 rename $commit_editmsg, $commit_msg or croak $!;
1350 # SVN requires messages to be UTF-8 when entering the repo
1352 open $log_fh, '<', $commit_msg or croak $!;
1354 chomp($log_entry{log} = <$log_fh>);
1356 my $enc = Git::config('i18n.commitencoding') || 'UTF-8';
1357 my $msg = $log_entry{log};
1359 eval { $msg = Encode::decode($enc, $msg, 1) };
1361 die "Could not decode as $enc:\n", $msg,
1362 "\nPerhaps you need to set i18n.commitencoding\n";
1365 eval { $msg = Encode::encode('UTF-8', $msg, 1) };
1366 die "Could not encode as UTF-8:\n$msg\n" if $@;
1368 $log_entry{log} = $msg;
1370 close $log_fh or croak $!;
1377 my ($str, $file, $mode) = @_;
1378 open my $fd,'>',$file or croak $!;
1379 print $fd $str,"\n" or croak $!;
1380 close $fd or croak $!;
1381 chmod ($mode &~ umask, $file) if (defined $mode);
1386 open my $fd,'<',$file or croak "$!: file: $file\n";
1389 close $fd or croak $!;
1394 # '<svn username> = real-name <email address>' mapping based on git-svnimport:
1396 open my $authors, '<', $_authors or die "Can't open $_authors $!\n";
1397 my $log = $cmd eq 'log';
1398 while (<$authors>) {
1400 next unless /^(.+?|\(no author\))\s*=\s*(.+?)\s*<(.+)>\s*$/;
1401 my ($user, $name, $email) = ($1, $2, $3);
1403 $Git::SVN::Log::rusers{"$name <$email>"} = $user;
1405 $users{$user} = [$name, $email];
1408 close $authors or croak $!;
1411 # convert GetOpt::Long specs for use by git-config
1412 sub read_git_config {
1415 foreach my $o (keys %$opts) {
1416 # if we have mixedCase and a long option-only, then
1417 # it's a config-only variable that we don't need for
1419 push @config_only, $o if ($o =~ /[A-Z]/ && $o =~ /^[a-z]+$/i);
1420 my $v = $opts->{$o};
1421 my ($key) = ($o =~ /^([a-zA-Z\-]+)/);
1423 my $arg = 'git config';
1424 $arg .= ' --int' if ($o =~ /[:=]i$/);
1425 $arg .= ' --bool' if ($o !~ /[:=][sfi]$/);
1426 if (ref $v eq 'ARRAY') {
1427 chomp(my @tmp = `$arg --get-all svn.$key`);
1430 chomp(my $tmp = `$arg --get svn.$key`);
1431 if ($tmp && !($arg =~ / --bool/ && $tmp eq 'false')) {
1436 delete @$opts{@config_only} if @config_only;
1439 sub extract_metadata {
1440 my $id = shift or return (undef, undef, undef);
1441 my ($url, $rev, $uuid) = ($id =~ /^\s*git-svn-id:\s+(.*)\@(\d+)
1442 \s([a-f\d\-]+)$/ix);
1443 if (!defined $rev || !$uuid || !$url) {
1444 # some of the original repositories I made had
1445 # identifiers like this:
1446 ($rev, $uuid) = ($id =~/^\s*git-svn-id:\s(\d+)\@([a-f\d\-]+)/i);
1448 return ($url, $rev, $uuid);
1452 return extract_metadata((grep(/^git-svn-id: /,
1453 command(qw/cat-file commit/, shift)))[-1]);
1456 sub cmt_sha2rev_batch {
1458 my ($pid, $in, $out, $ctx) = command_bidi_pipe(qw/cat-file --batch/);
1461 foreach my $sha (@{$list}) {
1464 print $out $sha, "\n";
1466 while (my $line = <$in>) {
1467 if ($first && $line =~ /^[[:xdigit:]]{40}\smissing$/) {
1470 $line =~ /^[[:xdigit:]]{40}\scommit\s(\d+)$/) {
1474 } elsif ($line =~ /^(git-svn-id: )/) {
1475 my (undef, $rev, undef) =
1476 extract_metadata($line);
1480 $size -= length($line);
1481 last if ($size == 0);
1485 command_close_bidi_pipe($pid, $in, $out, $ctx);
1490 sub working_head_info {
1491 my ($head, $refs) = @_;
1492 my @args = ('log', '--no-color', '--first-parent', '--pretty=medium');
1493 my ($fh, $ctx) = command_output_pipe(@args, $head);
1497 if ( m{^commit ($::sha1)$} ) {
1498 unshift @$refs, $hash if $hash and $refs;
1502 next unless s{^\s*(git-svn-id:)}{$1};
1503 my ($url, $rev, $uuid) = extract_metadata($_);
1504 if (defined $url && defined $rev) {
1505 next if $max{$url} and $max{$url} < $rev;
1506 if (my $gs = Git::SVN->find_by_url($url)) {
1507 my $c = $gs->rev_map_get($rev, $uuid);
1508 if ($c && $c eq $hash) {
1509 close $fh; # break the pipe
1510 return ($url, $rev, $uuid, $gs);
1512 $max{$url} ||= $gs->rev_map_max;
1517 command_close_pipe($fh, $ctx);
1518 (undef, undef, undef, undef);
1521 sub read_commit_parents {
1522 my ($parents, $c) = @_;
1523 chomp(my $p = command_oneline(qw/rev-list --parents -1/, $c));
1524 $p =~ s/^($c)\s*// or die "rev-list --parents -1 $c failed!\n";
1525 @{$parents->{$c}} = split(/ /, $p);
1528 sub linearize_history {
1529 my ($gs, $refs) = @_;
1531 foreach my $c (@$refs) {
1532 read_commit_parents(\%parents, $c);
1537 my $last_svn_commit = $gs->last_commit;
1538 foreach my $c (reverse @$refs) {
1539 next if $c eq $last_svn_commit;
1542 unshift @linear_refs, $c;
1545 # we only want the first parent to diff against for linear
1546 # history, we save the rest to inject when we finalize the
1548 my $fp_a = verify_ref("$c~1");
1549 my $fp_b = shift @{$parents{$c}} if $parents{$c};
1550 if (!$fp_a || !$fp_b) {
1552 "has no parent commit, and therefore ",
1553 "nothing to diff against.\n",
1554 "You should be working from a repository ",
1555 "originally created by git-svn\n";
1557 if ($fp_a ne $fp_b) {
1558 die "$c~1 = $fp_a, however parsing commit $c ",
1559 "revealed that:\n$c~1 = $fp_b\nBUG!\n";
1562 foreach my $p (@{$parents{$c}}) {
1566 (\@linear_refs, \%parents);
1569 sub find_file_type_and_diff_status {
1571 return ('dir', '') if $path eq '';
1574 command_oneline(qw(diff --cached --name-status --), $path) || "";
1575 my $diff_status = (split(' ', $diff_output))[0] || "";
1577 my $ls_tree = command_oneline(qw(ls-tree HEAD), $path) || "";
1579 return (undef, undef) if !$diff_status && !$ls_tree;
1581 if ($diff_status eq "A") {
1582 return ("link", $diff_status) if -l $path;
1583 return ("dir", $diff_status) if -d $path;
1584 return ("file", $diff_status);
1587 my $mode = (split(' ', $ls_tree))[0] || "";
1589 return ("link", $diff_status) if $mode eq "120000";
1590 return ("dir", $diff_status) if $mode eq "040000";
1591 return ("file", $diff_status);
1597 my $md5 = Digest::MD5->new();
1598 if ($ref eq 'GLOB' || $ref eq 'IO::File' || $ref eq 'File::Temp') {
1599 $md5->addfile($arg) or croak $!;
1600 } elsif ($ref eq 'SCALAR') {
1601 $md5->add($$arg) or croak $!;
1603 $md5->add($arg) or croak $!;
1605 ::fatal "Can't provide MD5 hash for unknown ref type: '", $ref, "'";
1607 return $md5->hexdigest();
1611 if ($can_compress && -f $_ && basename($_) eq "unhandled.log") {
1612 my $out_filename = $_ . ".gz";
1613 open my $in_fh, "<", $_ or die "Unable to open $_: $!\n";
1615 my $gz = Compress::Zlib::gzopen($out_filename, "ab") or
1616 die "Unable to open $out_filename: $!\n";
1619 while ($res = sysread($in_fh, my $str, 1024)) {
1620 $gz->gzwrite($str) or
1621 die "Unable to write: ".$gz->gzerror()."!\n";
1623 unlink $_ or die "unlink $File::Find::name: $!\n";
1624 } elsif (-f $_ && basename($_) eq "index") {
1625 unlink $_ or die "unlink $_: $!\n";
1632 use Fcntl qw/:DEFAULT :seek/;
1633 use constant rev_map_fmt => 'NH40';
1634 use vars qw/$default_repo_id $default_ref_id $_no_metadata $_follow_parent
1635 $_repack $_repack_flags $_use_svm_props $_head
1636 $_use_svnsync_props $no_reuse_existing $_minimize_url
1637 $_use_log_author $_add_author_from $_localtime/;
1639 use File::Path qw/mkpath/;
1640 use File::Copy qw/copy/;
1642 use Memoize; # core since 5.8.0, Jul 2002
1644 my ($_gc_nr, $_gc_period);
1646 # properties that we do not log:
1649 %SKIP_PROP = map { $_ => 1 } qw/svn:wc:ra_dav:version-url
1650 svn:special svn:executable
1651 svn:entry:committed-rev
1652 svn:entry:last-author
1654 svn:entry:committed-date/;
1656 # some options are read globally, but can be overridden locally
1657 # per [svn-remote "..."] section. Command-line options will *NOT*
1658 # override options set in an [svn-remote "..."] section
1660 for my $option (qw/follow_parent no_metadata use_svm_props
1661 use_svnsync_props/) {
1664 my $prop = "-$option";
1667 return $self->{$prop} if exists $self->{$prop};
1668 my $k = "svn-remote.$self->{repo_id}.$key";
1669 eval { command_oneline(qw/config --get/, $k) };
1671 $self->{$prop} = ${"Git::SVN::_$option"};
1673 my $v = command_oneline(qw/config --bool/,$k);
1674 $self->{$prop} = $v eq 'false' ? 0 : 1;
1676 return $self->{$prop};
1682 my (%LOCKFILES, %INDEX_FILES);
1684 unlink keys %LOCKFILES if %LOCKFILES;
1685 unlink keys %INDEX_FILES if %INDEX_FILES;
1688 sub resolve_local_globs {
1689 my ($url, $fetch, $glob_spec) = @_;
1690 return unless defined $glob_spec;
1691 my $ref = $glob_spec->{ref};
1692 my $path = $glob_spec->{path};
1693 foreach (command(qw#for-each-ref --format=%(refname) refs/#)) {
1694 next unless m#^$ref->{regex}$#;
1696 my $pathname = desanitize_refname($path->full_path($p));
1697 my $refname = desanitize_refname($ref->full_path($p));
1698 if (my $existing = $fetch->{$pathname}) {
1699 if ($existing ne $refname) {
1700 die "Refspec conflict:\n",
1701 "existing: $existing\n",
1702 " globbed: $refname\n";
1704 my $u = (::cmt_metadata("$refname"))[0];
1705 $u =~ s!^\Q$url\E(/|$)!! or die
1706 "$refname: '$url' not found in '$u'\n";
1707 if ($pathname ne $u) {
1708 warn "W: Refspec glob conflict ",
1709 "(ref: $refname):\n",
1710 "expected path: $pathname\n",
1712 "Continuing ahead with $u\n";
1716 $fetch->{$pathname} = $refname;
1721 sub parse_revision_argument {
1722 my ($base, $head) = @_;
1723 if (!defined $::_revision || $::_revision eq 'BASE:HEAD') {
1724 return ($base, $head);
1726 return ($1, $2) if ($::_revision =~ /^(\d+):(\d+)$/);
1727 return ($::_revision, $::_revision) if ($::_revision =~ /^\d+$/);
1728 return ($head, $head) if ($::_revision eq 'HEAD');
1729 return ($base, $1) if ($::_revision =~ /^BASE:(\d+)$/);
1730 return ($1, $head) if ($::_revision =~ /^(\d+):HEAD$/);
1731 die "revision argument: $::_revision not understood by git-svn\n";
1735 my ($repo_id, $remotes) = @_;
1739 $repo_id = $gs->{repo_id};
1741 $remotes ||= read_all_remotes();
1742 my $remote = $remotes->{$repo_id} or
1743 die "[svn-remote \"$repo_id\"] unknown\n";
1744 my $fetch = $remote->{fetch};
1745 my $url = $remote->{url} or die "svn-remote.$repo_id.url not defined\n";
1747 my $ra = Git::SVN::Ra->new($url);
1748 my $uuid = $ra->get_uuid;
1749 my $head = $ra->get_latest_revnum;
1751 # ignore errors, $head revision may not even exist anymore
1752 eval { $ra->get_log("", $head, 0, 1, 0, 1, sub { $head = $_[1] }) };
1753 warn "W: $@\n" if $@;
1755 my $base = defined $fetch ? $head : 0;
1757 # read the max revs for wildcard expansion (branches/*, tags/*)
1758 foreach my $t (qw/branches tags/) {
1759 defined $remote->{$t} or next;
1760 push @globs, @{$remote->{$t}};
1762 my $max_rev = eval { tmp_config(qw/--int --get/,
1763 "svn-remote.$repo_id.${t}-maxRev") };
1764 if (defined $max_rev && ($max_rev < $base)) {
1766 } elsif (!defined $max_rev) {
1772 foreach my $p (sort keys %$fetch) {
1773 my $gs = Git::SVN->new($fetch->{$p}, $repo_id, $p);
1774 my $lr = $gs->rev_map_max;
1776 $base = $lr if ($lr < $base);
1782 ($base, $head) = parse_revision_argument($base, $head);
1783 $ra->gs_fetch_loop_common($base, $head, \@gs, \@globs);
1786 sub read_all_remotes {
1788 my $use_svm_props = eval { command_oneline(qw/config --bool
1789 svn.useSvmProps/) };
1790 $use_svm_props = $use_svm_props eq 'true' if $use_svm_props;
1791 my $svn_refspec = qr{\s*(.*?)\s*:\s*(.+?)\s*};
1792 foreach (grep { s/^svn-remote\.// } command(qw/config -l/)) {
1793 if (m!^(.+)\.fetch=$svn_refspec$!) {
1794 my ($remote, $local_ref, $remote_ref) = ($1, $2, $3);
1795 die("svn-remote.$remote: remote ref '$remote_ref' "
1796 . "must start with 'refs/'\n")
1797 unless $remote_ref =~ m{^refs/};
1798 $r->{$remote}->{fetch}->{$local_ref} = $remote_ref;
1799 $r->{$remote}->{svm} = {} if $use_svm_props;
1800 } elsif (m!^(.+)\.usesvmprops=\s*(.*)\s*$!) {
1801 $r->{$1}->{svm} = {};
1802 } elsif (m!^(.+)\.url=\s*(.*)\s*$!) {
1803 $r->{$1}->{url} = $2;
1804 } elsif (m!^(.+)\.(branches|tags)=$svn_refspec$!) {
1805 my ($remote, $t, $local_ref, $remote_ref) =
1807 die("svn-remote.$remote: remote ref '$remote_ref' ($t) "
1808 . "must start with 'refs/'\n")
1809 unless $remote_ref =~ m{^refs/};
1813 path => Git::SVN::GlobSpec->new($local_ref),
1814 ref => Git::SVN::GlobSpec->new($remote_ref) };
1815 if (length($rs->{ref}->{right}) != 0) {
1816 die "The '*' glob character must be the last ",
1817 "character of '$remote_ref'\n";
1819 push @{ $r->{$remote}->{$t} }, $rs;
1824 if (defined $r->{$_}->{svm}) {
1827 my $section = "svn-remote.$_";
1829 source => tmp_config('--get',
1830 "$section.svm-source"),
1831 replace => tmp_config('--get',
1832 "$section.svm-replace"),
1835 $r->{$_}->{svm} = $svm;
1843 $_gc_nr = $_gc_period = 1000;
1844 if (defined $_repack || defined $_repack_flags) {
1845 warn "Repack options are obsolete; they have no effect.\n";
1849 sub verify_remotes_sanity {
1850 return unless -d $ENV{GIT_DIR};
1852 foreach (command(qw/config -l/)) {
1853 if (m!^svn-remote\.(?:.+)\.fetch=.*:refs/remotes/(\S+)\s*$!) {
1855 die "Remote ref refs/remote/$1 is tracked by",
1856 "\n \"$_\"\nand\n \"$seen{$1}\"\n",
1857 "Please resolve this ambiguity in ",
1858 "your git configuration file before ",
1866 sub find_existing_remote {
1867 my ($url, $remotes) = @_;
1868 return undef if $no_reuse_existing;
1870 foreach my $repo_id (keys %$remotes) {
1871 my $u = $remotes->{$repo_id}->{url} or next;
1873 $existing = $repo_id;
1879 sub init_remote_config {
1880 my ($self, $url, $no_write) = @_;
1881 $url =~ s!/+$!!; # strip trailing slash
1882 my $r = read_all_remotes();
1883 my $existing = find_existing_remote($url, $r);
1885 unless ($no_write) {
1886 print STDERR "Using existing ",
1887 "[svn-remote \"$existing\"]\n";
1889 $self->{repo_id} = $existing;
1890 } elsif ($_minimize_url) {
1891 my $min_url = Git::SVN::Ra->new($url)->minimize_url;
1892 $existing = find_existing_remote($min_url, $r);
1894 unless ($no_write) {
1895 print STDERR "Using existing ",
1896 "[svn-remote \"$existing\"]\n";
1898 $self->{repo_id} = $existing;
1900 if ($min_url ne $url) {
1901 unless ($no_write) {
1902 print STDERR "Using higher level of URL: ",
1903 "$url => $min_url\n";
1905 my $old_path = $self->{path};
1906 $self->{path} = $url;
1907 $self->{path} =~ s!^\Q$min_url\E(/|$)!!;
1908 if (length $old_path) {
1909 $self->{path} .= "/$old_path";
1916 # verify that we aren't overwriting anything:
1918 command_oneline('config', '--get',
1919 "svn-remote.$self->{repo_id}.url")
1921 if ($orig_url && ($orig_url ne $url)) {
1922 die "svn-remote.$self->{repo_id}.url already set: ",
1923 "$orig_url\nwanted to set to: $url\n";
1926 my ($xrepo_id, $xpath) = find_ref($self->refname);
1927 if (!$no_write && defined $xpath) {
1928 die "svn-remote.$xrepo_id.fetch already set to track ",
1929 "$xpath:", $self->refname, "\n";
1931 unless ($no_write) {
1932 command_noisy('config',
1933 "svn-remote.$self->{repo_id}.url", $url);
1934 $self->{path} =~ s{^/}{};
1935 $self->{path} =~ s{%([0-9A-F]{2})}{chr hex($1)}ieg;
1936 command_noisy('config', '--add',
1937 "svn-remote.$self->{repo_id}.fetch",
1938 "$self->{path}:".$self->refname);
1940 $self->{url} = $url;
1943 sub find_by_url { # repos_root and, path are optional
1944 my ($class, $full_url, $repos_root, $path) = @_;
1946 return undef unless defined $full_url;
1947 remove_username($full_url);
1948 remove_username($repos_root) if defined $repos_root;
1949 my $remotes = read_all_remotes();
1950 if (defined $full_url && defined $repos_root && !defined $path) {
1952 $path =~ s#^\Q$repos_root\E(?:/|$)##;
1954 foreach my $repo_id (keys %$remotes) {
1955 my $u = $remotes->{$repo_id}->{url} or next;
1956 remove_username($u);
1957 next if defined $repos_root && $repos_root ne $u;
1959 my $fetch = $remotes->{$repo_id}->{fetch} || {};
1960 foreach my $t (qw/branches tags/) {
1961 foreach my $globspec (@{$remotes->{$repo_id}->{$t}}) {
1962 resolve_local_globs($u, $fetch, $globspec);
1966 my $rwr = rewrite_root({repo_id => $repo_id});
1967 my $svm = $remotes->{$repo_id}->{svm}
1968 if defined $remotes->{$repo_id}->{svm};
1969 unless (defined $p) {
1975 remove_username($z);
1976 } elsif (defined $svm) {
1977 $z = $svm->{source};
1978 $prefix = $svm->{replace};
1979 $prefix =~ s#^\Q$u\E(?:/|$)##;
1982 $p =~ s#^\Q$z\E(?:/|$)#$prefix# or next;
1984 foreach my $f (keys %$fetch) {
1986 return Git::SVN->new($fetch->{$f}, $repo_id, $f);
1993 my ($class, $url, $path, $repo_id, $ref_id, $no_write) = @_;
1994 my $self = _new($class, $repo_id, $ref_id, $path);
1996 $self->init_remote_config($url, $no_write);
2003 foreach (command(qw/config -l/)) {
2004 next unless m!^svn-remote\.(.+)\.fetch=
2005 \s*(.*?)\s*:\s*(.+?)\s*$!x;
2006 my ($repo_id, $path, $ref) = ($1, $2, $3);
2007 if ($ref eq $ref_id) {
2008 $path = '' if ($path =~ m#^\./?#);
2009 return ($repo_id, $path);
2012 (undef, undef, undef);
2016 my ($class, $ref_id, $repo_id, $path) = @_;
2017 if (defined $ref_id && !defined $repo_id && !defined $path) {
2018 ($repo_id, $path) = find_ref($ref_id);
2019 if (!defined $repo_id) {
2020 die "Could not find a \"svn-remote.*.fetch\" key ",
2021 "in the repository configuration matching: ",
2025 my $self = _new($class, $repo_id, $ref_id, $path);
2026 if (!defined $self->{path} || !length $self->{path}) {
2027 my $fetch = command_oneline('config', '--get',
2028 "svn-remote.$repo_id.fetch",
2030 die "Failed to read \"svn-remote.$repo_id.fetch\" ",
2031 "\":$ref_id\$\" in config\n";
2032 ($self->{path}, undef) = split(/\s*:\s*/, $fetch);
2034 $self->{url} = command_oneline('config', '--get',
2035 "svn-remote.$repo_id.url") or
2036 die "Failed to read \"svn-remote.$repo_id.url\" in config\n";
2042 my ($refname) = $_[0]->{ref_id} ;
2044 # It cannot end with a slash /, we'll throw up on this because
2045 # SVN can't have directories with a slash in their name, either:
2046 if ($refname =~ m{/$}) {
2047 die "ref: '$refname' ends with a trailing slash, this is ",
2048 "not permitted by git nor Subversion\n";
2051 # It cannot have ASCII control character space, tilde ~, caret ^,
2052 # colon :, question-mark ?, asterisk *, space, or open bracket [
2055 # Additionally, % must be escaped because it is used for escaping
2056 # and we want our escaped refname to be reversible
2057 $refname =~ s{([ \%~\^:\?\*\[\t])}{uc sprintf('%%%02x',ord($1))}eg;
2059 # no slash-separated component can begin with a dot .
2061 $refname =~ s{/\.}{/%2E}g;
2063 # It cannot have two consecutive dots .. anywhere
2065 $refname =~ s{\.\.}{%2E%2E}g;
2070 sub desanitize_refname {
2072 $refname =~ s{%(?:([0-9A-F]{2}))}{chr hex($1)}eg;
2078 return $self->{svm}->{uuid} if $self->svm;
2080 unless ($self->{svm}) {
2081 die "SVM UUID not cached, and reading remotely failed\n";
2083 $self->{svm}->{uuid};
2088 return $self->{svm} if $self->{svm};
2090 # see if we have it in our config, first:
2092 my $section = "svn-remote.$self->{repo_id}";
2094 source => tmp_config('--get', "$section.svm-source"),
2095 uuid => tmp_config('--get', "$section.svm-uuid"),
2096 replace => tmp_config('--get', "$section.svm-replace"),
2099 if ($svm && $svm->{source} && $svm->{uuid} && $svm->{replace}) {
2100 $self->{svm} = $svm;
2106 my ($self, $ra) = @_;
2107 return $ra if $self->svm;
2109 my @err = ( "useSvmProps set, but failed to read SVM properties\n",
2110 "(svm:source, svm:uuid) ",
2111 "from the following URLs:\n" );
2112 sub read_svm_props {
2113 my ($self, $ra, $path, $r) = @_;
2114 my $props = ($ra->get_dir($path, $r))[2];
2115 my $src = $props->{'svm:source'};
2116 my $uuid = $props->{'svm:uuid'};
2117 return undef if (!$src || !$uuid);
2121 $uuid =~ m{^[0-9a-f\-]{30,}$}i
2122 or die "doesn't look right - svm:uuid is '$uuid'\n";
2124 # the '!' is used to mark the repos_root!/relative/path
2125 $src =~ s{/?!/?}{/};
2126 $src =~ s{/+$}{}; # no trailing slashes please
2127 # username is of no interest
2128 $src =~ s{(^[a-z\+]*://)[^/@]*@}{$1};
2130 my $replace = $ra->{url};
2131 $replace .= "/$path" if length $path;
2133 my $section = "svn-remote.$self->{repo_id}";
2134 tmp_config("$section.svm-source", $src);
2135 tmp_config("$section.svm-replace", $replace);
2136 tmp_config("$section.svm-uuid", $uuid);
2144 my $r = $ra->get_latest_revnum;
2145 my $path = $self->{path};
2147 while (length $path) {
2148 unless ($tried{"$self->{url}/$path"}) {
2149 return $ra if $self->read_svm_props($ra, $path, $r);
2150 $tried{"$self->{url}/$path"} = 1;
2152 $path =~ s#/?[^/]+$##;
2154 die "Path: '$path' should be ''\n" if $path ne '';
2155 return $ra if $self->read_svm_props($ra, $path, $r);
2156 $tried{"$self->{url}/$path"} = 1;
2158 if ($ra->{repos_root} eq $self->{url}) {
2159 die @err, (map { " $_\n" } keys %tried), "\n";
2162 # nope, make sure we're connected to the repository root:
2165 $path = $ra->{svn_path};
2166 $ra = Git::SVN::Ra->new($ra->{repos_root});
2167 while (length $path) {
2168 unless ($tried{"$ra->{url}/$path"}) {
2169 $ok = $self->read_svm_props($ra, $path, $r);
2171 $tried{"$ra->{url}/$path"} = 1;
2173 $path =~ s#/?[^/]+$##;
2175 die "Path: '$path' should be ''\n" if $path ne '';
2176 $ok ||= $self->read_svm_props($ra, $path, $r);
2177 $tried{"$ra->{url}/$path"} = 1;
2179 die @err, (map { " $_\n" } keys %tried), "\n";
2181 Git::SVN::Ra->new($self->{url});
2186 return $self->{svnsync} if $self->{svnsync};
2188 if ($self->no_metadata) {
2189 die "Can't have both 'noMetadata' and ",
2190 "'useSvnsyncProps' options set!\n";
2192 if ($self->rewrite_root) {
2193 die "Can't have both 'useSvnsyncProps' and 'rewriteRoot' ",
2198 # see if we have it in our config, first:
2200 my $section = "svn-remote.$self->{repo_id}";
2202 my $url = tmp_config('--get', "$section.svnsync-url");
2203 ($url) = ($url =~ m{^([a-z\+]+://\S+)$}) or
2204 die "doesn't look right - svn:sync-from-url is '$url'\n";
2206 my $uuid = tmp_config('--get', "$section.svnsync-uuid");
2207 ($uuid) = ($uuid =~ m{^([0-9a-f\-]{30,})$}i) or
2208 die "doesn't look right - svn:sync-from-uuid is '$uuid'\n";
2210 $svnsync = { url => $url, uuid => $uuid }
2212 if ($svnsync && $svnsync->{url} && $svnsync->{uuid}) {
2213 return $self->{svnsync} = $svnsync;
2216 my $err = "useSvnsyncProps set, but failed to read " .
2217 "svnsync property: svn:sync-from-";
2218 my $rp = $self->ra->rev_proplist(0);
2220 my $url = $rp->{'svn:sync-from-url'} or die $err . "url\n";
2221 ($url) = ($url =~ m{^([a-z\+]+://\S+)$}) or
2222 die "doesn't look right - svn:sync-from-url is '$url'\n";
2224 my $uuid = $rp->{'svn:sync-from-uuid'} or die $err . "uuid\n";
2225 ($uuid) = ($uuid =~ m{^([0-9a-f\-]{30,})$}i) or
2226 die "doesn't look right - svn:sync-from-uuid is '$uuid'\n";
2228 my $section = "svn-remote.$self->{repo_id}";
2229 tmp_config('--add', "$section.svnsync-uuid", $uuid);
2230 tmp_config('--add', "$section.svnsync-url", $url);
2231 return $self->{svnsync} = { url => $url, uuid => $uuid };
2234 # this allows us to memoize our SVN::Ra UUID locally and avoid a
2235 # remote lookup (useful for 'git svn log').
2238 unless ($self->{ra_uuid}) {
2239 my $key = "svn-remote.$self->{repo_id}.uuid";
2240 my $uuid = eval { tmp_config('--get', $key) };
2241 if (!$@ && $uuid && $uuid =~ /^([a-f\d\-]{30,})$/i) {
2242 $self->{ra_uuid} = $uuid;
2244 die "ra_uuid called without URL\n" unless $self->{url};
2245 $self->{ra_uuid} = $self->ra->get_uuid;
2246 tmp_config('--add', $key, $self->{ra_uuid});
2252 sub _set_repos_root {
2253 my ($self, $repos_root) = @_;
2254 my $k = "svn-remote.$self->{repo_id}.reposRoot";
2255 $repos_root ||= $self->ra->{repos_root};
2256 tmp_config($k, $repos_root);
2262 my $k = "svn-remote.$self->{repo_id}.reposRoot";
2263 eval { tmp_config('--get', $k) } || $self->_set_repos_root;
2268 my $ra = Git::SVN::Ra->new($self->{url});
2269 $self->_set_repos_root($ra->{repos_root});
2270 if ($self->use_svm_props && !$self->{svm}) {
2271 if ($self->no_metadata) {
2272 die "Can't have both 'noMetadata' and ",
2273 "'useSvmProps' options set!\n";
2274 } elsif ($self->use_svnsync_props) {
2275 die "Can't have both 'useSvnsyncProps' and ",
2276 "'useSvmProps' options set!\n";
2278 $ra = $self->_set_svm_vars($ra);
2279 $self->{-want_revprops} = 1;
2284 # prop_walk(PATH, REV, SUB)
2285 # -------------------------
2286 # Recursively traverse PATH at revision REV and invoke SUB for each
2287 # directory that contains a SVN property. SUB will be invoked as
2288 # follows: &SUB(gs, path, props); where `gs' is this instance of
2289 # Git::SVN, `path' the path to the directory where the properties
2290 # `props' were found. The `path' will be relative to point of checkout,
2291 # that is, if url://repo/trunk is the current Git branch, and that
2292 # directory contains a sub-directory `d', SUB will be invoked with `/d/'
2293 # as `path' (note the trailing `/').
2295 my ($self, $path, $rev, $sub) = @_;
2298 my ($dirent, undef, $props) = $self->ra->get_dir($path, $rev);
2301 # Strip the irrelevant part of the path.
2302 $p =~ s#^/+\Q$self->{path}\E(/|$)#/#;
2303 # Ensure the path is terminated by a `/'.
2306 # The properties contain all the internal SVN stuff nobody
2307 # (usually) cares about.
2308 my $interesting_props = 0;
2309 foreach (keys %{$props}) {
2310 # If it doesn't start with `svn:', it must be a
2311 # user-defined property.
2312 ++$interesting_props and next if $_ !~ /^svn:/;
2313 # FIXME: Fragile, if SVN adds new public properties,
2314 # this needs to be updated.
2315 ++$interesting_props if /^svn:(?:ignore|keywords|executable
2316 |eol-style|mime-type
2317 |externals|needs-lock)$/x;
2319 &$sub($self, $p, $props) if $interesting_props;
2321 foreach (sort keys %$dirent) {
2322 next if $dirent->{$_}->{kind} != $SVN::Node::dir;
2323 $self->prop_walk($self->{path} . $p . $_, $rev, $sub);
2327 sub last_rev { ($_[0]->last_rev_commit)[0] }
2328 sub last_commit { ($_[0]->last_rev_commit)[1] }
2330 # returns the newest SVN revision number and newest commit SHA1
2331 sub last_rev_commit {
2333 if (defined $self->{last_rev} && defined $self->{last_commit}) {
2334 return ($self->{last_rev}, $self->{last_commit});
2336 my $c = ::verify_ref($self->refname.'^0');
2337 if ($c && !$self->use_svm_props && !$self->no_metadata) {
2338 my $rev = (::cmt_metadata($c))[1];
2340 ($self->{last_rev}, $self->{last_commit}) = ($rev, $c);
2344 my $map_path = $self->map_path;
2345 unless (-e $map_path) {
2346 ($self->{last_rev}, $self->{last_commit}) = (undef, undef);
2347 return (undef, undef);
2349 my ($rev, $commit) = $self->rev_map_max(1);
2350 ($self->{last_rev}, $self->{last_commit}) = ($rev, $commit);
2351 return ($rev, $commit);
2354 sub get_fetch_range {
2355 my ($self, $min, $max) = @_;
2356 $max ||= $self->ra->get_latest_revnum;
2357 $min ||= $self->rev_map_max;
2363 my $old_def_config = "$ENV{GIT_DIR}/svn/config";
2364 my $config = "$ENV{GIT_DIR}/svn/.metadata";
2365 if (! -f $config && -f $old_def_config) {
2366 rename $old_def_config, $config or
2367 die "Failed rename $old_def_config => $config: $!\n";
2369 my $old_config = $ENV{GIT_CONFIG};
2370 $ENV{GIT_CONFIG} = $config;
2373 unless (-f $config) {
2375 open my $fh, '>', $config or
2376 die "Can't open $config: $!\n";
2377 print $fh "; This file is used internally by ",
2379 "Couldn't write to $config: $!\n";
2380 print $fh "; You should not have to edit it\n" or
2381 die "Couldn't write to $config: $!\n";
2382 close $fh or die "Couldn't close $config: $!\n";
2384 command('config', @args);
2387 if (defined $old_config) {
2388 $ENV{GIT_CONFIG} = $old_config;
2390 delete $ENV{GIT_CONFIG};
2393 wantarray ? @ret : $ret[0];
2397 my ($self, $sub) = @_;
2398 my $old_index = $ENV{GIT_INDEX_FILE};
2399 $ENV{GIT_INDEX_FILE} = $self->{index};
2402 my ($dir, $base) = ($self->{index} =~ m#^(.*?)/?([^/]+)$#);
2403 mkpath([$dir]) unless -d $dir;
2407 if (defined $old_index) {
2408 $ENV{GIT_INDEX_FILE} = $old_index;
2410 delete $ENV{GIT_INDEX_FILE};
2413 wantarray ? @ret : $ret[0];
2416 sub assert_index_clean {
2417 my ($self, $treeish) = @_;
2419 $self->tmp_index_do(sub {
2420 command_noisy('read-tree', $treeish) unless -e $self->{index};
2421 my $x = command_oneline('write-tree');
2422 my ($y) = (command(qw/cat-file commit/, $treeish) =~
2423 /^tree ($::sha1)/mo);
2426 warn "Index mismatch: $y != $x\nrereading $treeish\n";
2427 unlink $self->{index} or die "unlink $self->{index}: $!\n";
2428 command_noisy('read-tree', $treeish);
2429 $x = command_oneline('write-tree');
2431 ::fatal "trees ($treeish) $y != $x\n",
2432 "Something is seriously wrong...";
2437 sub get_commit_parents {
2438 my ($self, $log_entry) = @_;
2439 my (%seen, @ret, @tmp);
2440 # legacy support for 'set-tree'; this is only used by set_tree_cb:
2441 if (my $ip = $self->{inject_parents}) {
2442 if (my $commit = delete $ip->{$log_entry->{revision}}) {
2446 if (my $cur = ::verify_ref($self->refname.'^0')) {
2449 if (my $ipd = $self->{inject_parents_dcommit}) {
2450 if (my $commit = delete $ipd->{$log_entry->{revision}}) {
2451 push @tmp, @$commit;
2454 push @tmp, $_ foreach (@{$log_entry->{parents}}, @tmp);
2455 while (my $p = shift @tmp) {
2465 return $self->{-rewrite_root} if exists $self->{-rewrite_root};
2466 my $k = "svn-remote.$self->{repo_id}.rewriteRoot";
2467 my $rwr = eval { command_oneline(qw/config --get/, $k) };
2470 if ($rwr !~ m#^[a-z\+]+://#) {
2471 die "$rwr is not a valid URL (key: $k)\n";
2474 $self->{-rewrite_root} = $rwr;
2479 ($self->rewrite_root || $self->{url}) .
2480 (length $self->{path} ? '/' . $self->{path} : '');
2485 $self->{url} . (length $self->{path} ? '/' . $self->{path} : '');
2489 sub set_commit_header_env {
2490 my ($log_entry) = @_;
2492 foreach my $ned (qw/NAME EMAIL DATE/) {
2493 foreach my $ac (qw/AUTHOR COMMITTER/) {
2494 $env{"GIT_${ac}_${ned}"} = $ENV{"GIT_${ac}_${ned}"};
2498 $ENV{GIT_AUTHOR_NAME} = $log_entry->{name};
2499 $ENV{GIT_AUTHOR_EMAIL} = $log_entry->{email};
2500 $ENV{GIT_AUTHOR_DATE} = $ENV{GIT_COMMITTER_DATE} = $log_entry->{date};
2502 $ENV{GIT_COMMITTER_NAME} = (defined $log_entry->{commit_name})
2503 ? $log_entry->{commit_name}
2504 : $log_entry->{name};
2505 $ENV{GIT_COMMITTER_EMAIL} = (defined $log_entry->{commit_email})
2506 ? $log_entry->{commit_email}
2507 : $log_entry->{email};
2511 sub restore_commit_header_env {
2513 foreach my $ned (qw/NAME EMAIL DATE/) {
2514 foreach my $ac (qw/AUTHOR COMMITTER/) {
2515 my $k = "GIT_${ac}_${ned}";
2516 if (defined $env->{$k}) {
2517 $ENV{$k} = $env->{$k};
2526 command_noisy('gc', '--auto');
2530 my ($self, $log_entry) = @_;
2531 my $lr = $self->last_rev;
2532 if (defined $lr && $lr >= $log_entry->{revision}) {
2533 die "Last fetched revision of ", $self->refname,
2534 " was r$lr, but we are about to fetch: ",
2535 "r$log_entry->{revision}!\n";
2537 if (my $c = $self->rev_map_get($log_entry->{revision})) {
2538 croak "$log_entry->{revision} = $c already exists! ",
2539 "Why are we refetching it?\n";
2541 my $old_env = set_commit_header_env($log_entry);
2542 my $tree = $log_entry->{tree};
2543 if (!defined $tree) {
2544 $tree = $self->tmp_index_do(sub {
2545 command_oneline('write-tree') });
2547 die "Tree is not a valid sha1: $tree\n" if $tree !~ /^$::sha1$/o;
2549 my @exec = ('git', 'commit-tree', $tree);
2550 foreach ($self->get_commit_parents($log_entry)) {
2551 push @exec, '-p', $_;
2553 defined(my $pid = open3(my $msg_fh, my $out_fh, '>&STDERR', @exec))
2557 # we always get UTF-8 from SVN, but we may want our commits in
2558 # a different encoding.
2559 if (my $enc = Git::config('i18n.commitencoding')) {
2561 Encode::from_to($log_entry->{log}, 'UTF-8', $enc);
2563 print $msg_fh $log_entry->{log} or croak $!;
2564 restore_commit_header_env($old_env);
2565 unless ($self->no_metadata) {
2566 print $msg_fh "\ngit-svn-id: $log_entry->{metadata}\n"
2569 $msg_fh->flush == 0 or croak $!;
2570 close $msg_fh or croak $!;
2571 chomp(my $commit = do { local $/; <$out_fh> });
2572 close $out_fh or croak $!;
2575 if ($commit !~ /^$::sha1$/o) {
2576 die "Failed to commit, invalid sha1: $commit\n";
2579 $self->rev_map_set($log_entry->{revision}, $commit, 1);
2581 $self->{last_rev} = $log_entry->{revision};
2582 $self->{last_commit} = $commit;
2583 print "r$log_entry->{revision}" unless $::_q > 1;
2584 if (defined $log_entry->{svm_revision}) {
2585 print " (\@$log_entry->{svm_revision})" unless $::_q > 1;
2586 $self->rev_map_set($log_entry->{svm_revision}, $commit,
2587 0, $self->svm_uuid);
2589 print " = $commit ($self->{ref_id})\n" unless $::_q > 1;
2590 if (--$_gc_nr == 0) {
2591 $_gc_nr = $_gc_period;
2598 my ($self, $paths, $r) = @_;
2599 return 1 if $self->{path} eq '';
2600 if (my $path = $paths->{"/$self->{path}"}) {
2601 return ($path->{action} eq 'D') ? 0 : 1;
2603 $self->{path_regex} ||= qr/^\/\Q$self->{path}\E\//;
2604 if (grep /$self->{path_regex}/, keys %$paths) {
2608 foreach (split m#/#, $self->{path}) {
2610 next unless ($paths->{$c} &&
2611 ($paths->{$c}->{action} =~ /^[AR]$/));
2612 if ($self->ra->check_path($self->{path}, $r) ==
2620 sub find_parent_branch {
2621 my ($self, $paths, $rev) = @_;
2622 return undef unless $self->follow_parent;
2623 unless (defined $paths) {
2624 my $err_handler = $SVN::Error::handler;
2625 $SVN::Error::handler = \&Git::SVN::Ra::skip_unknown_revs;
2626 $self->ra->get_log([$self->{path}], $rev, $rev, 0, 1, 1,
2627 sub { $paths = $_[0] });
2628 $SVN::Error::handler = $err_handler;
2630 return undef unless defined $paths;
2632 # look for a parent from another branch:
2633 my @b_path_components = split m#/#, $self->{path};
2634 my @a_path_components;
2636 while (@b_path_components) {
2637 $i = $paths->{'/'.join('/', @b_path_components)};
2638 last if $i && defined $i->{copyfrom_path};
2639 unshift(@a_path_components, pop(@b_path_components));
2641 return undef unless defined $i && defined $i->{copyfrom_path};
2642 my $branch_from = $i->{copyfrom_path};
2643 if (@a_path_components) {
2644 print STDERR "branch_from: $branch_from => ";
2645 $branch_from .= '/'.join('/', @a_path_components);
2646 print STDERR $branch_from, "\n";
2648 my $r = $i->{copyfrom_rev};
2649 my $repos_root = $self->ra->{repos_root};
2650 my $url = $self->ra->{url};
2651 my $new_url = $url . $branch_from;
2652 print STDERR "Found possible branch point: ",
2653 "$new_url => ", $self->full_url, ", $r\n"
2655 $branch_from =~ s#^/##;
2656 my $gs = $self->other_gs($new_url, $url,
2657 $branch_from, $r, $self->{ref_id});
2658 my ($r0, $parent) = $gs->find_rev_before($r, 1);
2661 if (!defined $r0 || !defined $parent) {
2662 ($base, $head) = parse_revision_argument(0, $r);
2665 $gs->ra->get_log([$gs->{path}], $r0 + 1, $r, 1,
2666 0, 1, sub { $base = $_[1] - 1 });
2669 if (defined $base && $base <= $r) {
2670 $gs->fetch($base, $r);
2672 ($r0, $parent) = $gs->find_rev_before($r, 1);
2674 if (defined $r0 && defined $parent) {
2675 print STDERR "Found branch parent: ($self->{ref_id}) $parent\n"
2678 if ($self->ra->can_do_switch) {
2679 $self->assert_index_clean($parent);
2680 print STDERR "Following parent with do_switch\n"
2682 # do_switch works with svn/trunk >= r22312, but that
2683 # is not included with SVN 1.4.3 (the latest version
2684 # at the moment), so we can't rely on it
2685 $self->{last_rev} = $r0;
2686 $self->{last_commit} = $parent;
2687 $ed = SVN::Git::Fetcher->new($self, $gs->{path});
2688 $gs->ra->gs_do_switch($r0, $rev, $gs,
2689 $self->full_url, $ed)
2690 or die "SVN connection failed somewhere...\n";
2691 } elsif ($self->ra->trees_match($new_url, $r0,
2692 $self->full_url, $rev)) {
2693 print STDERR "Trees match:\n",
2695 " ${\$self->full_url}\@$rev\n",
2696 "Following parent with no changes\n"
2698 $self->tmp_index_do(sub {
2699 command_noisy('read-tree', $parent);
2701 $self->{last_commit} = $parent;
2703 print STDERR "Following parent with do_update\n"
2705 $ed = SVN::Git::Fetcher->new($self);
2706 $self->ra->gs_do_update($rev, $rev, $self, $ed)
2707 or die "SVN connection failed somewhere...\n";
2709 print STDERR "Successfully followed parent\n" unless $::_q > 1;
2710 return $self->make_log_entry($rev, [$parent], $ed);
2716 my ($self, $paths, $rev) = @_;
2718 my ($last_rev, @parents);
2719 if (my $lc = $self->last_commit) {
2720 # we can have a branch that was deleted, then re-added
2721 # under the same name but copied from another path, in
2722 # which case we'll have multiple parents (we don't
2723 # want to break the original ref, nor lose copypath info):
2724 if (my $log_entry = $self->find_parent_branch($paths, $rev)) {
2725 push @{$log_entry->{parents}}, $lc;
2728 $ed = SVN::Git::Fetcher->new($self);
2729 $last_rev = $self->{last_rev};
2734 if (my $log_entry = $self->find_parent_branch($paths, $rev)) {
2737 $ed = SVN::Git::Fetcher->new($self);
2739 unless ($self->ra->gs_do_update($last_rev, $rev, $self, $ed)) {
2740 die "SVN connection failed somewhere...\n";
2742 $self->make_log_entry($rev, \@parents, $ed);
2746 my ($self, $r) = @_;
2749 my ($r, $empty_dirs, $line) = @_;
2750 if (defined $r && $line =~ /^r(\d+)$/) {
2751 return 0 if $1 > $r;
2752 } elsif ($line =~ /^ \+empty_dir: (.+)$/) {
2753 $empty_dirs->{$1} = 1;
2754 } elsif ($line =~ /^ \-empty_dir: (.+)$/) {
2755 my @d = grep {m[^\Q$1\E(/|$)]} (keys %$empty_dirs);
2756 delete @$empty_dirs{@d};
2761 my %empty_dirs = ();
2762 my $gz_file = "$self->{dir}/unhandled.log.gz";
2764 if (!$can_compress) {
2765 warn "Compress::Zlib could not be found; ",
2766 "empty directories in $gz_file will not be read\n";
2768 my $gz = Compress::Zlib::gzopen($gz_file, "rb") or
2769 die "Unable to open $gz_file: $!\n";
2771 while ($gz->gzreadline($line) > 0) {
2772 scan($r, \%empty_dirs, $line) or last;
2778 if (open my $fh, '<', "$self->{dir}/unhandled.log") {
2779 binmode $fh or croak "binmode: $!";
2781 scan($r, \%empty_dirs, $_) or last;
2786 my $strip = qr/\A\Q$self->{path}\E(?:\/|$)/;
2787 foreach my $d (sort keys %empty_dirs) {
2788 $d = uri_decode($d);
2792 warn "$d exists but is not a directory\n";
2794 print "creating empty directory: $d\n";
2801 my ($self, $ed) = @_;
2803 my $h = $ed->{empty};
2804 foreach (sort keys %$h) {
2805 my $act = $h->{$_} ? '+empty_dir' : '-empty_dir';
2806 push @out, " $act: " . uri_encode($_);
2807 warn "W: $act: $_\n";
2809 foreach my $t (qw/dir_prop file_prop/) {
2810 $h = $ed->{$t} or next;
2811 foreach my $path (sort keys %$h) {
2812 my $ppath = $path eq '' ? '.' : $path;
2813 foreach my $prop (sort keys %{$h->{$path}}) {
2814 next if $SKIP_PROP{$prop};
2815 my $v = $h->{$path}->{$prop};
2816 my $t_ppath_prop = "$t: " .
2817 uri_encode($ppath) . ' ' .
2820 push @out, " +$t_ppath_prop " .
2823 push @out, " -$t_ppath_prop";
2828 foreach my $t (qw/absent_file absent_directory/) {
2829 $h = $ed->{$t} or next;
2830 foreach my $parent (sort keys %$h) {
2831 foreach my $path (sort @{$h->{$parent}}) {
2832 push @out, " $t: " .
2833 uri_encode("$parent/$path");
2834 warn "W: $t: $parent/$path ",
2835 "Insufficient permissions?\n";
2842 # parse_svn_date(DATE)
2843 # --------------------
2844 # Given a date (in UTC) from Subversion, return a string in the format
2845 # "<TZ Offset> <local date/time>" that Git will use.
2847 # By default the parsed date will be in UTC; if $Git::SVN::_localtime
2848 # is true we'll convert it to the local timezone instead.
2849 sub parse_svn_date {
2850 my $date = shift || return '+0000 1970-01-01 00:00:00';
2851 my ($Y,$m,$d,$H,$M,$S) = ($date =~ /^(\d{4})\-(\d\d)\-(\d\d)T
2852 (\d\d)\:(\d\d)\:(\d\d)\.\d*Z$/x) or
2853 croak "Unable to parse date: $date\n";
2854 my $parsed_date; # Set next.
2856 if ($Git::SVN::_localtime) {
2857 # Translate the Subversion datetime to an epoch time.
2858 # Begin by switching ourselves to $date's timezone, UTC.
2859 my $old_env_TZ = $ENV{TZ};
2863 POSIX::strftime('%s', $S, $M, $H, $d, $m - 1, $Y - 1900);
2865 # Determine our local timezone (including DST) at the
2866 # time of $epoch_in_UTC. $Git::SVN::Log::TZ stored the
2867 # value of TZ, if any, at the time we were run.
2868 if (defined $Git::SVN::Log::TZ) {
2869 $ENV{TZ} = $Git::SVN::Log::TZ;
2875 POSIX::strftime('%Z', $S, $M, $H, $d, $m - 1, $Y - 1900);
2877 # This converts $epoch_in_UTC into our local timezone.
2878 my ($sec, $min, $hour, $mday, $mon, $year,
2879 $wday, $yday, $isdst) = localtime($epoch_in_UTC);
2881 $parsed_date = sprintf('%s %04d-%02d-%02d %02d:%02d:%02d',
2882 $our_TZ, $year + 1900, $mon + 1,
2883 $mday, $hour, $min, $sec);
2885 # Reset us to the timezone in effect when we entered
2887 if (defined $old_env_TZ) {
2888 $ENV{TZ} = $old_env_TZ;
2893 $parsed_date = "+0000 $Y-$m-$d $H:$M:$S";
2896 return $parsed_date;
2900 my ($self, $new_url, $url,
2901 $branch_from, $r, $old_ref_id) = @_;
2902 my $gs = Git::SVN->find_by_url($new_url, $url, $branch_from);
2904 my $ref_id = $old_ref_id;
2905 $ref_id =~ s/\@\d+$//;
2907 # just grow a tail if we're not unique enough :x
2908 $ref_id .= '-' while find_ref($ref_id);
2909 print STDERR "Initializing parent: $ref_id\n" unless $::_q > 1;
2910 my ($u, $p, $repo_id) = ($new_url, '', $ref_id);
2911 if ($u =~ s#^\Q$url\E(/|$)##) {
2914 $repo_id = $self->{repo_id};
2916 $gs = Git::SVN->init($u, $p, $repo_id, $ref_id, 1);
2921 sub call_authors_prog {
2922 my ($orig_author) = @_;
2923 $orig_author = command_oneline('rev-parse', '--sq-quote', $orig_author);
2924 my $author = `$::_authors_prog $orig_author`;
2926 die "$::_authors_prog failed with exit code $?\n"
2928 if ($author =~ /^\s*(.+?)\s*<(.*)>\s*$/) {
2929 my ($name, $email) = ($1, $2);
2930 $email = undef if length $2 == 0;
2931 return [$name, $email];
2933 die "Author: $orig_author: $::_authors_prog returned "
2934 . "invalid author format: $author\n";
2940 if (!defined $author || length $author == 0) {
2941 $author = '(no author)';
2943 if (!defined $::users{$author}) {
2944 if (defined $::_authors_prog) {
2945 $::users{$author} = call_authors_prog($author);
2946 } elsif (defined $::_authors) {
2947 die "Author: $author not defined in $::_authors file\n";
2953 sub find_extra_svk_parents {
2954 my ($self, $ed, $tickets, $parents) = @_;
2955 # aha! svk:merge property changed...
2956 my @tickets = split "\n", $tickets;
2958 for my $ticket ( @tickets ) {
2959 my ($uuid, $path, $rev) = split /:/, $ticket;
2960 if ( $uuid eq $self->ra_uuid ) {
2961 my $url = $self->rewrite_root || $self->{url};
2962 my $repos_root = $url;
2963 my $branch_from = $path;
2964 $branch_from =~ s{^/}{};
2965 my $gs = $self->other_gs($repos_root."/".$branch_from,
2970 if ( my $commit = $gs->rev_map_get($rev, $uuid) ) {
2971 # wahey! we found it, but it might be
2973 push @known_parents, [ $rev, $commit ];
2977 # Ordering matters; highest-numbered commit merge tickets
2978 # first, as they may account for later merge ticket additions
2980 @known_parents = map {$_->[1]} sort {$b->[0] <=> $a->[0]} @known_parents;
2981 for my $parent ( @known_parents ) {
2982 my @cmd = ('rev-list', $parent, map { "^$_" } @$parents );
2983 my ($msg_fh, $ctx) = command_output_pipe(@cmd);
2985 while ( <$msg_fh> ) {
2988 command_close_pipe($msg_fh, $ctx);
2991 "Found merge parent (svk:merge ticket): $parent\n";
2992 push @$parents, $parent;
2997 sub lookup_svn_merge {
3002 my ($source, $revs) = split ":", $merge;
3005 my $gs = Git::SVN->find_by_url($url.$source, $url, $path);
3007 warn "Couldn't find revmap for $url$source\n";
3010 my @ranges = split ",", $revs;
3011 my ($tip, $tip_commit);
3012 my @merged_commit_ranges;
3014 for my $range ( @ranges ) {
3015 my ($bottom, $top) = split "-", $range;
3017 my $bottom_commit = $gs->find_rev_after( $bottom, 1, $top );
3018 my $top_commit = $gs->find_rev_before( $top, 1, $bottom );
3020 unless ($top_commit and $bottom_commit) {
3021 warn "W:unknown path/rev in svn:mergeinfo "
3022 ."dirprop: $source:$range\n";
3026 push @merged_commit_ranges,
3027 "$bottom_commit^..$top_commit";
3029 if ( !defined $tip or $top > $tip ) {
3031 $tip_commit = $top_commit;
3034 return ($tip_commit, @merged_commit_ranges);
3038 my ($msg_fh, $ctx) = command_output_pipe(
3042 while ( <$msg_fh> ) {
3046 command_close_pipe($msg_fh, $ctx);
3050 sub check_cherry_pick {
3054 my %commits = map { $_ => 1 }
3055 _rev_list("--no-merges", $tip, "--not", $base);
3056 for my $range ( @ranges ) {
3057 delete @commits{_rev_list($range)};
3059 for my $commit (keys %commits) {
3060 if (has_no_changes($commit)) {
3061 delete $commits{$commit};
3064 return (keys %commits);
3067 sub has_no_changes {
3070 my @revs = split / /, command_oneline(
3071 qw(rev-list --parents -1 -m), $commit);
3073 # Commits with no parents, e.g. the start of a partial branch,
3074 # have changes by definition.
3075 return 1 if (@revs < 2);
3077 # Commits with multiple parents, e.g a merge, have no changes
3079 return 0 if (@revs > 2);
3081 return (command_oneline("rev-parse", "$commit^{tree}") eq
3082 command_oneline("rev-parse", "$commit~1^{tree}"));
3086 memoize 'lookup_svn_merge';
3087 memoize 'check_cherry_pick';
3088 memoize 'has_no_changes';
3091 sub parents_exclude {
3092 my $parents = shift;
3094 return unless @commits;
3099 my @cmd = ('rev-list', "-1", @commits, "--not", @$parents );
3100 $excluded = command_oneline(@cmd);
3104 for my $commit ( @commits ) {
3105 if ( $commit eq $excluded ) {
3106 push @excluded, $commit;
3114 die "saw commit '$excluded' in rev-list output, "
3115 ."but we didn't ask for that commit (wanted: @commits --not @$parents)"
3120 while ($excluded and @commits);
3126 # note: this function should only be called if the various dirprops
3127 # have actually changed
3128 sub find_extra_svn_parents {
3129 my ($self, $ed, $mergeinfo, $parents) = @_;
3130 # aha! svk:merge property changed...
3132 # We first search for merged tips which are not in our
3133 # history. Then, we figure out which git revisions are in
3134 # that tip, but not this revision. If all of those revisions
3135 # are now marked as merge, we can add the tip as a parent.
3136 my @merges = split "\n", $mergeinfo;
3138 my $url = $self->rewrite_root || $self->{url};
3139 my $uuid = $self->ra_uuid;
3141 for my $merge ( @merges ) {
3142 my ($tip_commit, @ranges) =
3143 lookup_svn_merge( $uuid, $url, $merge );
3144 unless (!$tip_commit or
3145 grep { $_ eq $tip_commit } @$parents ) {
3146 push @merge_tips, $tip_commit;
3147 $ranges{$tip_commit} = \@ranges;
3149 push @merge_tips, undef;
3153 my %excluded = map { $_ => 1 }
3154 parents_exclude($parents, grep { defined } @merge_tips);
3156 # check merge tips for new parents
3158 for my $merge_tip ( @merge_tips ) {
3159 my $spec = shift @merges;
3160 next unless $merge_tip and $excluded{$merge_tip};
3162 my $ranges = $ranges{$merge_tip};
3164 # check out 'new' tips
3167 $merge_base = command_oneline(
3169 @$parents, $merge_tip,
3173 die "An error occurred during merge-base"
3174 unless $@->isa("Git::Error::Command");
3176 warn "W: Cannot find common ancestor between ".
3177 "@$parents and $merge_tip. Ignoring merge info.\n";
3181 # double check that there are no missing non-merge commits
3182 my (@incomplete) = check_cherry_pick(
3183 $merge_base, $merge_tip,
3187 if ( @incomplete ) {
3188 warn "W:svn cherry-pick ignored ($spec) - missing "
3189 .@incomplete." commit(s) (eg $incomplete[0])\n";
3192 "Found merge parent (svn:mergeinfo prop): ",
3194 push @new_parents, $merge_tip;
3198 # cater for merges which merge commits from multiple branches
3199 if ( @new_parents > 1 ) {
3200 for ( my $i = 0; $i <= $#new_parents; $i++ ) {
3201 for ( my $j = 0; $j <= $#new_parents; $j++ ) {
3203 next unless $new_parents[$i];
3204 next unless $new_parents[$j];
3205 my $revs = command_oneline(
3207 "$new_parents[$i]..$new_parents[$j]",
3210 undef($new_parents[$i]);
3215 push @$parents, grep { defined } @new_parents;
3218 sub make_log_entry {
3219 my ($self, $rev, $parents, $ed) = @_;
3220 my $untracked = $self->get_untracked($ed);
3222 my @parents = @$parents;
3223 my $ps = $ed->{path_strip} || "";
3224 for my $path ( grep { m/$ps/ } %{$ed->{dir_prop}} ) {
3225 my $props = $ed->{dir_prop}{$path};
3226 if ( $props->{"svk:merge"} ) {
3227 $self->find_extra_svk_parents
3228 ($ed, $props->{"svk:merge"}, \@parents);
3230 if ( $props->{"svn:mergeinfo"} ) {
3231 $self->find_extra_svn_parents
3233 $props->{"svn:mergeinfo"},
3238 open my $un, '>>', "$self->{dir}/unhandled.log" or croak $!;
3239 print $un "r$rev\n" or croak $!;
3240 print $un $_, "\n" foreach @$untracked;
3241 my %log_entry = ( parents => \@parents, revision => $rev,
3245 my $logged = delete $self->{logged_rev_props};
3246 if (!$logged || $self->{-want_revprops}) {
3247 my $rp = $self->ra->rev_proplist($rev);
3248 foreach (sort keys %$rp) {
3250 if (/^svn:(author|date|log)$/) {
3251 $log_entry{$1} = $v;
3252 } elsif ($_ eq 'svm:headrev') {
3255 print $un " rev_prop: ", uri_encode($_), ' ',
3256 uri_encode($v), "\n";
3260 map { $log_entry{$_} = $logged->{$_} } keys %$logged;
3262 close $un or croak $!;
3264 $log_entry{date} = parse_svn_date($log_entry{date});
3265 $log_entry{log} .= "\n";
3266 my $author = $log_entry{author} = check_author($log_entry{author});
3267 my ($name, $email) = defined $::users{$author} ? @{$::users{$author}}
3270 my ($commit_name, $commit_email) = ($name, $email);
3271 if ($_use_log_author) {
3273 if ($log_entry{log} =~ /From:\s+(.*\S)\s*\n/i) {
3275 } elsif ($log_entry{log} =~ /Signed-off-by:\s+(.*\S)\s*\n/i) {
3278 if (!defined $name_field) {
3279 if (!defined $email) {
3282 } elsif ($name_field =~ /(.*?)\s+<(.*)>/) {
3283 ($name, $email) = ($1, $2);
3284 } elsif ($name_field =~ /(.*)@/) {
3285 ($name, $email) = ($1, $name_field);
3287 ($name, $email) = ($name_field, $name_field);
3290 if (defined $headrev && $self->use_svm_props) {
3291 if ($self->rewrite_root) {
3292 die "Can't have both 'useSvmProps' and 'rewriteRoot' ",
3295 my ($uuid, $r) = $headrev =~ m{^([a-f\d\-]{30,}):(\d+)$}i;
3296 # we don't want "SVM: initializing mirror for junk" ...
3297 return undef if $r == 0;
3298 my $svm = $self->svm;
3299 if ($uuid ne $svm->{uuid}) {
3300 die "UUID mismatch on SVM path:\n",
3301 "expected: $svm->{uuid}\n",
3304 my $full_url = $self->full_url;
3305 $full_url =~ s#^\Q$svm->{replace}\E(/|$)#$svm->{source}$1# or
3306 die "Failed to replace '$svm->{replace}' with ",
3307 "'$svm->{source}' in $full_url\n";
3308 # throw away username for storing in records
3309 remove_username($full_url);
3310 $log_entry{metadata} = "$full_url\@$r $uuid";
3311 $log_entry{svm_revision} = $r;
3312 $email ||= "$author\@$uuid";
3313 $commit_email ||= "$author\@$uuid";
3314 } elsif ($self->use_svnsync_props) {
3315 my $full_url = $self->svnsync->{url};
3316 $full_url .= "/$self->{path}" if length $self->{path};
3317 remove_username($full_url);
3318 my $uuid = $self->svnsync->{uuid};
3319 $log_entry{metadata} = "$full_url\@$rev $uuid";
3320 $email ||= "$author\@$uuid";
3321 $commit_email ||= "$author\@$uuid";
3323 my $url = $self->metadata_url;
3324 remove_username($url);
3325 $log_entry{metadata} = "$url\@$rev " .
3326 $self->ra->get_uuid;
3327 $email ||= "$author\@" . $self->ra->get_uuid;
3328 $commit_email ||= "$author\@" . $self->ra->get_uuid;
3330 $log_entry{name} = $name;
3331 $log_entry{email} = $email;
3332 $log_entry{commit_name} = $commit_name;
3333 $log_entry{commit_email} = $commit_email;
3338 my ($self, $min_rev, $max_rev, @parents) = @_;
3339 my ($last_rev, $last_commit) = $self->last_rev_commit;
3340 my ($base, $head) = $self->get_fetch_range($min_rev, $max_rev);
3341 $self->ra->gs_fetch_loop_common($base, $head, [$self]);
3345 my ($self, $log_entry, $tree, $rev, $date, $author) = @_;
3346 $self->{inject_parents} = { $rev => $tree };
3347 $self->fetch(undef, undef);
3351 my ($self, $tree) = (shift, shift);
3352 my $log_entry = ::get_commit_entry($tree);
3353 unless ($self->{last_rev}) {
3354 ::fatal("Must have an existing revision to commit");
3356 my %ed_opts = ( r => $self->{last_rev},
3357 log => $log_entry->{log},
3359 tree_a => $self->{last_commit},
3362 $self->set_tree_cb($log_entry, $tree, @_) },
3363 svn_path => $self->{path} );
3364 if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) {
3365 print "No changes\nr$self->{last_rev} = $tree\n";
3369 sub rebuild_from_rev_db {
3370 my ($self, $path) = @_;
3372 open my $fh, '<', $path or croak "open: $!";
3373 binmode $fh or croak "binmode: $!";
3375 length($_) == 41 or croak "inconsistent size in ($_) != 41";
3378 next if $_ eq ('0' x 40);
3379 $self->rev_map_set($r, $_);
3382 close $fh or croak "close: $!";
3383 unlink $path or croak "unlink: $!";
3388 my $map_path = $self->map_path;
3389 my $partial = (-e $map_path && ! -z $map_path);
3390 return unless ::verify_ref($self->refname.'^0');
3391 if (!$partial && ($self->use_svm_props || $self->no_metadata)) {
3392 my $rev_db = $self->rev_db_path;
3393 $self->rebuild_from_rev_db($rev_db);
3394 if ($self->use_svm_props) {
3395 my $svm_rev_db = $self->rev_db_path($self->svm_uuid);
3396 $self->rebuild_from_rev_db($svm_rev_db);
3398 $self->unlink_rev_db_symlink;
3401 print "Rebuilding $map_path ...\n" if (!$partial);
3402 my ($base_rev, $head) = ($partial ? $self->rev_map_max_norebuild(1) :
3405 command_output_pipe(qw/rev-list --pretty=raw --no-color --reverse/,
3406 ($head ? "$head.." : "") . $self->refname,
3408 my $metadata_url = $self->metadata_url;
3409 remove_username($metadata_url);
3410 my $svn_uuid = $self->ra_uuid;
3413 if ( m{^commit ($::sha1)$} ) {
3417 next unless s{^\s*(git-svn-id:)}{$1};
3418 my ($url, $rev, $uuid) = ::extract_metadata($_);
3419 remove_username($url);
3421 # ignore merges (from set-tree)
3422 next if (!defined $rev || !$uuid);
3424 # if we merged or otherwise started elsewhere, this is
3425 # how we break out of it
3426 if (($uuid ne $svn_uuid) ||
3427 ($metadata_url && $url && ($url ne $metadata_url))) {
3430 if ($partial && $head) {
3431 print "Partial-rebuilding $map_path ...\n";
3432 print "Currently at $base_rev = $head\n";
3436 $self->rev_map_set($rev, $c);
3437 print "r$rev = $c\n";
3439 command_close_pipe($log, $ctx);
3440 print "Done rebuilding $map_path\n" if (!$partial || !$head);
3441 my $rev_db_path = $self->rev_db_path;
3442 if (-f $self->rev_db_path) {
3443 unlink $self->rev_db_path or croak "unlink: $!";
3445 $self->unlink_rev_db_symlink;
3449 # Tie::File seems to be prone to offset errors if revisions get sparse,
3450 # it's not that fast, either. Tie::File is also not in Perl 5.6. So
3451 # one of my favorite modules is out :< Next up would be one of the DBM
3452 # modules, but I'm not sure which is most portable...
3454 # This is the replacement for the rev_db format, which was too big
3455 # and inefficient for large repositories with a lot of sparse history
3458 # The format is this:
3459 # - 24 bytes for every record,
3460 # * 4 bytes for the integer representing an SVN revision number
3461 # * 20 bytes representing the sha1 of a git commit
3462 # - No empty padding records like the old format
3463 # (except the last record, which can be overwritten)
3464 # - new records are written append-only since SVN revision numbers
3465 # increase monotonically
3466 # - lookups on SVN revision number are done via a binary search
3467 # - Piping the file to xxd -c24 is a good way of dumping it for
3468 # viewing or editing (piped back through xxd -r), should the need
3470 # - The last record can be padding revision with an all-zero sha1
3471 # This is used to optimize fetch performance when using multiple
3472 # "fetch" directives in .git/config
3474 # These files are disposable unless noMetadata or useSvmProps is set
3477 my ($fh, $rev, $commit) = @_;
3479 binmode $fh or croak "binmode: $!";
3480 my $size = (stat($fh))[7];
3481 ($size % 24) == 0 or croak "inconsistent size: $size";
3485 sysseek($fh, -24, SEEK_END) or croak "seek: $!";
3486 my $read = sysread($fh, my $buf, 24) or croak "read: $!";
3487 $read == 24 or croak "read only $read bytes (!= 24)";
3488 my ($last_rev, $last_commit) = unpack(rev_map_fmt, $buf);
3489 if ($last_commit eq ('0' x40)) {
3491 sysseek($fh, -48, SEEK_END) or croak "seek: $!";
3492 $read = sysread($fh, $buf, 24) or
3495 croak "read only $read bytes (!= 24)";
3496 ($last_rev, $last_commit) =
3497 unpack(rev_map_fmt, $buf);
3498 if ($last_commit eq ('0' x40)) {
3499 croak "inconsistent .rev_map\n";
3502 if ($last_rev >= $rev) {
3503 croak "last_rev is higher!: $last_rev >= $rev";
3508 sysseek($fh, $wr_offset, SEEK_END) or croak "seek: $!";
3509 syswrite($fh, pack(rev_map_fmt, $rev, $commit), 24) == 24 or
3513 sub _rev_map_reset {
3514 my ($fh, $rev, $commit) = @_;
3515 my $c = _rev_map_get($fh, $rev);
3516 $c eq $commit or die "_rev_map_reset(@_) commit $c does not match!\n";
3517 my $offset = sysseek($fh, 0, SEEK_CUR) or croak "seek: $!";
3518 truncate $fh, $offset or croak "truncate: $!";
3524 my ($dir, $base) = ($path =~ m#^(.*?)/?([^/]+)$#);
3525 mkpath([$dir]) unless -d $dir;
3526 open my $fh, '>>', $path or die "Couldn't create $path: $!\n";
3527 close $fh or die "Couldn't close (create) $path: $!\n";
3532 my ($self, $rev, $commit, $update_ref, $uuid) = @_;
3533 length $commit == 40 or die "arg3 must be a full SHA1 hexsum\n";
3534 my $db = $self->map_path($uuid);
3535 my $db_lock = "$db.lock";
3539 $SIG{INT} = $SIG{HUP} = $SIG{TERM} = $SIG{ALRM} = $SIG{PIPE} =
3540 $SIG{USR1} = $SIG{USR2} = sub { $sig = $_[0] };
3544 $LOCKFILES{$db_lock} = 1;
3546 # both of these options make our .rev_db file very, very important
3547 # and we can't afford to lose it because rebuild() won't work
3548 if ($self->use_svm_props || $self->no_metadata) {
3550 copy($db, $db_lock) or die "rev_map_set(@_): ",
3552 "$db => $db_lock ($!)\n";
3554 rename $db, $db_lock or die "rev_map_set(@_): ",
3555 "Failed to rename: ",
3556 "$db => $db_lock ($!)\n";
3559 sysopen(my $fh, $db_lock, O_RDWR | O_CREAT)
3560 or croak "Couldn't open $db_lock: $!\n";
3561 $update_ref eq 'reset' ? _rev_map_reset($fh, $rev, $commit) :
3562 _rev_map_set($fh, $rev, $commit);
3564 $fh->flush or die "Couldn't flush $db_lock: $!\n";
3565 $fh->sync or die "Couldn't sync $db_lock: $!\n";
3567 close $fh or croak $!;
3571 $note = " ($update_ref)" if ($update_ref !~ /^\d*$/);
3572 command_noisy('update-ref', '-m', "r$rev$note",
3573 $self->refname, $commit);
3575 rename $db_lock, $db or die "rev_map_set(@_): ", "Failed to rename: ",
3576 "$db_lock => $db ($!)\n";
3577 delete $LOCKFILES{$db_lock};
3579 $SIG{INT} = $SIG{HUP} = $SIG{TERM} = $SIG{ALRM} = $SIG{PIPE} =
3580 $SIG{USR1} = $SIG{USR2} = 'DEFAULT';
3581 kill $sig, $$ if defined $sig;
3585 # If want_commit, this will return an array of (rev, commit) where
3586 # commit _must_ be a valid commit in the archive.
3587 # Otherwise, it'll return the max revision (whether or not the
3588 # commit is valid or just a 0x40 placeholder).
3590 my ($self, $want_commit) = @_;
3592 my ($r, $c) = $self->rev_map_max_norebuild($want_commit);
3593 $want_commit ? ($r, $c) : $r;
3596 sub rev_map_max_norebuild {
3597 my ($self, $want_commit) = @_;
3598 my $map_path = $self->map_path;
3599 stat $map_path or return $want_commit ? (0, undef) : 0;
3600 sysopen(my $fh, $map_path, O_RDONLY) or croak "open: $!";
3601 binmode $fh or croak "binmode: $!";
3602 my $size = (stat($fh))[7];
3603 ($size % 24) == 0 or croak "inconsistent size: $size";
3606 close $fh or croak "close: $!";
3607 return $want_commit ? (0, undef) : 0;
3610 sysseek($fh, -24, SEEK_END) or croak "seek: $!";
3611 sysread($fh, my $buf, 24) == 24 or croak "read: $!";
3612 my ($r, $c) = unpack(rev_map_fmt, $buf);
3613 if ($want_commit && $c eq ('0' x40)) {
3615 return $want_commit ? (0, undef) : 0;
3617 sysseek($fh, -48, SEEK_END) or croak "seek: $!";
3618 sysread($fh, $buf, 24) == 24 or croak "read: $!";
3619 ($r, $c) = unpack(rev_map_fmt, $buf);
3620 if ($c eq ('0'x40)) {
3621 croak "Penultimate record is all-zeroes in $map_path";
3624 close $fh or croak "close: $!";
3625 $want_commit ? ($r, $c) : $r;
3629 my ($self, $rev, $uuid) = @_;
3630 my $map_path = $self->map_path($uuid);
3631 return undef unless -e $map_path;
3633 sysopen(my $fh, $map_path, O_RDONLY) or croak "open: $!";
3634 my $c = _rev_map_get($fh, $rev);
3635 close($fh) or croak "close: $!";
3640 my ($fh, $rev) = @_;
3642 binmode $fh or croak "binmode: $!";
3643 my $size = (stat($fh))[7];
3644 ($size % 24) == 0 or croak "inconsistent size: $size";
3650 my ($l, $u) = (0, $size - 24);
3654 my $i = int(($l/24 + $u/24) / 2) * 24;
3655 sysseek($fh, $i, SEEK_SET) or croak "seek: $!";
3656 sysread($fh, my $buf, 24) == 24 or croak "read: $!";
3657 my ($r, $c) = unpack(rev_map_fmt, $buf);
3661 } elsif ($r > $rev) {
3663 } else { # $r == $rev
3664 return $c eq ('0' x 40) ? undef : $c;
3670 # Finds the first svn revision that exists on (if $eq_ok is true) or
3671 # before $rev for the current branch. It will not search any lower
3672 # than $min_rev. Returns the git commit hash and svn revision number
3673 # if found, else (undef, undef).
3674 sub find_rev_before {
3675 my ($self, $rev, $eq_ok, $min_rev) = @_;
3676 --$rev unless $eq_ok;
3678 my $max_rev = $self->rev_map_max;
3679 $rev = $max_rev if ($rev > $max_rev);
3680 while ($rev >= $min_rev) {
3681 if (my $c = $self->rev_map_get($rev)) {
3686 return (undef, undef);
3689 # Finds the first svn revision that exists on (if $eq_ok is true) or
3690 # after $rev for the current branch. It will not search any higher
3691 # than $max_rev. Returns the git commit hash and svn revision number
3692 # if found, else (undef, undef).
3693 sub find_rev_after {
3694 my ($self, $rev, $eq_ok, $max_rev) = @_;
3695 ++$rev unless $eq_ok;
3696 $max_rev ||= $self->rev_map_max;
3697 while ($rev <= $max_rev) {
3698 if (my $c = $self->rev_map_get($rev)) {
3703 return (undef, undef);
3707 my ($class, $repo_id, $ref_id, $path) = @_;
3708 unless (defined $repo_id && length $repo_id) {
3709 $repo_id = $Git::SVN::default_repo_id;
3711 unless (defined $ref_id && length $ref_id) {
3712 $_prefix = '' unless defined($_prefix);
3714 "refs/remotes/$_prefix$Git::SVN::default_ref_id";
3717 my $dir = "$ENV{GIT_DIR}/svn/$ref_id";
3719 # Older repos imported by us used $GIT_DIR/svn/foo instead of
3720 # $GIT_DIR/svn/refs/remotes/foo when tracking refs/remotes/foo
3721 if ($ref_id =~ m{^refs/remotes/(.*)}) {
3722 my $old_dir = "$ENV{GIT_DIR}/svn/$1";
3723 if (-d $old_dir && ! -d $dir) {
3728 $_[3] = $path = '' unless (defined $path);
3731 ref_id => $ref_id, dir => $dir, index => "$dir/index",
3732 path => $path, config => "$ENV{GIT_DIR}/svn/config",
3733 map_root => "$dir/.rev_map", repo_id => $repo_id }, $class;
3736 # for read-only access of old .rev_db formats
3737 sub unlink_rev_db_symlink {
3739 my $link = $self->rev_db_path;
3740 $link =~ s/\.[\w-]+$// or croak "missing UUID at the end of $link";
3742 unlink $link or croak "unlink: $link failed!";
3747 my ($self, $uuid) = @_;
3748 my $db_path = $self->map_path($uuid);
3749 $db_path =~ s{/\.rev_map\.}{/\.rev_db\.}
3750 or croak "map_path: $db_path does not contain '/.rev_map.' !";
3754 # the new replacement for .rev_db
3756 my ($self, $uuid) = @_;
3757 $uuid ||= $self->ra_uuid;
3758 "$self->{map_root}.$uuid";
3763 $f =~ s#([^a-zA-Z0-9\*!\:_\./\-])#uc sprintf("%%%02x",ord($1))#eg;
3769 $f =~ s#%([0-9a-fA-F]{2})#chr(hex($1))#eg;
3773 sub remove_username {
3774 $_[0] =~ s{^([^:]*://)[^@]+@}{$1};
3777 package Git::SVN::Prompt;
3781 use vars qw/$_no_auth_cache $_username/;
3784 my ($cred, $realm, $default_username, $may_save, $pool) = @_;
3785 $may_save = undef if $_no_auth_cache;
3786 $default_username = $_username if defined $_username;
3787 if (defined $default_username && length $default_username) {
3788 if (defined $realm && length $realm) {
3789 print STDERR "Authentication realm: $realm\n";
3792 $cred->username($default_username);
3794 username($cred, $realm, $may_save, $pool);
3796 $cred->password(_read_password("Password for '" .
3797 $cred->username . "': ", $realm));
3798 $cred->may_save($may_save);
3799 $SVN::_Core::SVN_NO_ERROR;
3802 sub ssl_server_trust {
3803 my ($cred, $realm, $failures, $cert_info, $may_save, $pool) = @_;
3804 $may_save = undef if $_no_auth_cache;
3805 print STDERR "Error validating server certificate for '$realm':\n";
3808 # All variables SVN::Auth::SSL::* are used only once,
3809 # so we're shutting up Perl warnings about this.
3810 if ($failures & $SVN::Auth::SSL::UNKNOWNCA) {
3811 print STDERR " - The certificate is not issued ",
3812 "by a trusted authority. Use the\n",
3813 " fingerprint to validate ",
3814 "the certificate manually!\n";
3816 if ($failures & $SVN::Auth::SSL::CNMISMATCH) {
3817 print STDERR " - The certificate hostname ",
3818 "does not match.\n";
3820 if ($failures & $SVN::Auth::SSL::NOTYETVALID) {
3821 print STDERR " - The certificate is not yet valid.\n";
3823 if ($failures & $SVN::Auth::SSL::EXPIRED) {
3824 print STDERR " - The certificate has expired.\n";
3826 if ($failures & $SVN::Auth::SSL::OTHER) {
3827 print STDERR " - The certificate has ",
3828 "an unknown error.\n";
3830 } # no warnings 'once'
3832 "Certificate information:\n".
3833 " - Hostname: %s\n".
3834 " - Valid: from %s until %s\n".
3836 " - Fingerprint: %s\n",
3837 map $cert_info->$_, qw(hostname valid_from valid_until
3838 issuer_dname fingerprint);
3841 print STDERR $may_save ?
3842 "(R)eject, accept (t)emporarily or accept (p)ermanently? " :
3843 "(R)eject or accept (t)emporarily? ";
3845 $choice = lc(substr(<STDIN> || 'R', 0, 1));
3846 if ($choice =~ /^t$/i) {
3847 $cred->may_save(undef);
3848 } elsif ($choice =~ /^r$/i) {
3850 } elsif ($may_save && $choice =~ /^p$/i) {
3851 $cred->may_save($may_save);
3855 $cred->accepted_failures($failures);
3856 $SVN::_Core::SVN_NO_ERROR;
3859 sub ssl_client_cert {
3860 my ($cred, $realm, $may_save, $pool) = @_;
3861 $may_save = undef if $_no_auth_cache;
3862 print STDERR "Client certificate filename: ";
3864 chomp(my $filename = <STDIN>);
3865 $cred->cert_file($filename);
3866 $cred->may_save($may_save);
3867 $SVN::_Core::SVN_NO_ERROR;
3870 sub ssl_client_cert_pw {
3871 my ($cred, $realm, $may_save, $pool) = @_;
3872 $may_save = undef if $_no_auth_cache;
3873 $cred->password(_read_password("Password: ", $realm));
3874 $cred->may_save($may_save);
3875 $SVN::_Core::SVN_NO_ERROR;
3879 my ($cred, $realm, $may_save, $pool) = @_;
3880 $may_save = undef if $_no_auth_cache;
3881 if (defined $realm && length $realm) {
3882 print STDERR "Authentication realm: $realm\n";
3885 if (defined $_username) {
3886 $username = $_username;
3888 print STDERR "Username: ";
3890 chomp($username = <STDIN>);
3892 $cred->username($username);
3893 $cred->may_save($may_save);
3894 $SVN::_Core::SVN_NO_ERROR;
3897 sub _read_password {
3898 my ($prompt, $realm) = @_;
3899 print STDERR $prompt;
3901 require Term::ReadKey;
3902 Term::ReadKey::ReadMode('noecho');
3904 while (defined(my $key = Term::ReadKey::ReadKey(0))) {
3905 last if $key =~ /[\012\015]/; # \n\r
3908 Term::ReadKey::ReadMode('restore');
3914 package SVN::Git::Fetcher;
3919 use File::Temp qw/tempfile/;
3921 use vars qw/$_ignore_regex/;
3923 # file baton members: path, mode_a, mode_b, pool, fh, blob, base
3925 my ($class, $git_svn, $switch_path) = @_;
3926 my $self = SVN::Delta::Editor->new;
3927 bless $self, $class;
3928 if (exists $git_svn->{last_commit}) {
3929 $self->{c} = $git_svn->{last_commit};
3930 $self->{empty_symlinks} =
3931 _mark_empty_symlinks($git_svn, $switch_path);
3933 $self->{ignore_regex} = eval { command_oneline('config', '--get',
3934 "svn-remote.$git_svn->{repo_id}.ignore-paths") };
3935 $self->{empty} = {};
3936 $self->{dir_prop} = {};
3937 $self->{file_prop} = {};
3938 $self->{absent_dir} = {};
3939 $self->{absent_file} = {};
3940 $self->{gii} = $git_svn->tmp_index_do(sub { Git::IndexInfo->new });
3944 # this uses the Ra object, so it must be called before do_{switch,update},
3945 # not inside them (when the Git::SVN::Fetcher object is passed) to
3946 # do_{switch,update}
3947 sub _mark_empty_symlinks {
3948 my ($git_svn, $switch_path) = @_;
3949 my $bool = Git::config_bool('svn.brokenSymlinkWorkaround');
3950 return {} if (!defined($bool)) || (defined($bool) && ! $bool);
3953 my ($rev, $cmt) = $git_svn->last_rev_commit;
3954 return {} unless ($rev && $cmt);
3956 # allow the warning to be printed for each revision we fetch to
3957 # ensure the user sees it. The user can also disable the workaround
3958 # on the repository even while git svn is running and the next
3959 # revision fetched will skip this expensive function.
3960 my $printed_warning;
3961 chomp(my $empty_blob = `git hash-object -t blob --stdin < /dev/null`);
3962 my ($ls, $ctx) = command_output_pipe(qw/ls-tree -r -z/, $cmt);
3964 my $pfx = defined($switch_path) ? $switch_path : $git_svn->{path};
3965 $pfx .= '/' if length($pfx);
3968 s/\A100644 blob $empty_blob\t//o or next;
3969 unless ($printed_warning) {
3970 print STDERR "Scanning for empty symlinks, ",
3971 "this may take a while if you have ",
3972 "many empty files\n",
3973 "You may disable this with `",
3974 "git config svn.brokenSymlinkWorkaround ",
3976 "This may be done in a different ",
3977 "terminal without restarting ",
3979 $printed_warning = 1;
3982 my (undef, $props) =
3983 $git_svn->ra->get_file($pfx.$path, $rev, undef);
3984 if ($props->{'svn:special'}) {
3988 command_close_pipe($ls, $ctx);
3992 # returns true if a given path is inside a ".git" directory
3994 $_[0] =~ m{(?:^|/)\.git(?:/|$)};
3997 # return value: 0 -- don't ignore, 1 -- ignore
3998 sub is_path_ignored {
3999 my ($self, $path) = @_;
4000 return 1 if in_dot_git($path);
4001 return 1 if defined($self->{ignore_regex}) &&
4002 $path =~ m!$self->{ignore_regex}!;
4003 return 0 unless defined($_ignore_regex);
4004 return 1 if $path =~ m!$_ignore_regex!o;
4008 sub set_path_strip {
4009 my ($self, $path) = @_;
4010 $self->{path_strip} = qr/^\Q$path\E(\/|$)/ if length $path;
4017 sub open_directory {
4018 my ($self, $path, $pb, $rev) = @_;
4023 my ($self, $path) = @_;
4024 if ($self->{path_strip}) {
4025 $path =~ s!$self->{path_strip}!! or
4026 die "Failed to strip path '$path' ($self->{path_strip})\n";
4032 my ($self, $path, $rev, $pb) = @_;
4033 return undef if $self->is_path_ignored($path);
4035 my $gpath = $self->git_path($path);
4036 return undef if ($gpath eq '');
4038 # remove entire directories.
4039 my ($tree) = (command('ls-tree', '-z', $self->{c}, "./$gpath")
4040 =~ /\A040000 tree ([a-f\d]{40})\t\Q$gpath\E\0/);
4042 my ($ls, $ctx) = command_output_pipe(qw/ls-tree
4048 my $rmpath = "$gpath/$_";
4049 $self->{gii}->remove($rmpath);
4050 print "\tD\t$rmpath\n" unless $::_q;
4052 print "\tD\t$gpath/\n" unless $::_q;
4053 command_close_pipe($ls, $ctx);
4055 $self->{gii}->remove($gpath);
4056 print "\tD\t$gpath\n" unless $::_q;
4058 $self->{empty}->{$path} = 0;
4063 my ($self, $path, $pb, $rev) = @_;
4066 goto out if $self->is_path_ignored($path);
4068 my $gpath = $self->git_path($path);
4069 ($mode, $blob) = (command('ls-tree', '-z', $self->{c}, "./$gpath")
4070 =~ /\A(\d{6}) blob ([a-f\d]{40})\t\Q$gpath\E\0/);
4071 unless (defined $mode && defined $blob) {
4072 die "$path was not found in commit $self->{c} (r$rev)\n";
4074 if ($mode eq '100644' && $self->{empty_symlinks}->{$path}) {
4078 { path => $path, mode_a => $mode, mode_b => $mode, blob => $blob,
4079 pool => SVN::Pool->new, action => 'M' };
4083 my ($self, $path, $pb, $cp_path, $cp_rev) = @_;
4086 if (!$self->is_path_ignored($path)) {
4087 my ($dir, $file) = ($path =~ m#^(.*?)/?([^/]+)$#);
4088 delete $self->{empty}->{$dir};
4091 { path => $path, mode_a => $mode, mode_b => $mode,
4092 pool => SVN::Pool->new, action => 'A' };
4096 my ($self, $path, $cp_path, $cp_rev) = @_;
4097 goto out if $self->is_path_ignored($path);
4098 my $gpath = $self->git_path($path);
4100 my ($ls, $ctx) = command_output_pipe(qw/ls-tree
4106 $self->{gii}->remove($_);
4107 print "\tD\t$_\n" unless $::_q;
4109 command_close_pipe($ls, $ctx);
4110 $self->{empty}->{$path} = 0;
4112 my ($dir, $file) = ($path =~ m#^(.*?)/?([^/]+)$#);
4113 delete $self->{empty}->{$dir};
4114 $self->{empty}->{$path} = 1;
4119 sub change_dir_prop {
4120 my ($self, $db, $prop, $value) = @_;
4121 return undef if $self->is_path_ignored($db->{path});
4122 $self->{dir_prop}->{$db->{path}} ||= {};
4123 $self->{dir_prop}->{$db->{path}}->{$prop} = $value;
4127 sub absent_directory {
4128 my ($self, $path, $pb) = @_;
4129 return undef if $self->is_path_ignored($path);
4130 $self->{absent_dir}->{$pb->{path}} ||= [];
4131 push @{$self->{absent_dir}->{$pb->{path}}}, $path;
4136 my ($self, $path, $pb) = @_;
4137 return undef if $self->is_path_ignored($path);
4138 $self->{absent_file}->{$pb->{path}} ||= [];
4139 push @{$self->{absent_file}->{$pb->{path}}}, $path;
4143 sub change_file_prop {
4144 my ($self, $fb, $prop, $value) = @_;
4145 return undef if $self->is_path_ignored($fb->{path});
4146 if ($prop eq 'svn:executable') {
4147 if ($fb->{mode_b} != 120000) {
4148 $fb->{mode_b} = defined $value ? 100755 : 100644;
4150 } elsif ($prop eq 'svn:special') {
4151 $fb->{mode_b} = defined $value ? 120000 : 100644;
4153 $self->{file_prop}->{$fb->{path}} ||= {};
4154 $self->{file_prop}->{$fb->{path}}->{$prop} = $value;
4159 sub apply_textdelta {
4160 my ($self, $fb, $exp) = @_;
4161 return undef if $self->is_path_ignored($fb->{path});
4162 my $fh = $::_repository->temp_acquire('svn_delta');
4163 # $fh gets auto-closed() by SVN::TxDelta::apply(),
4164 # (but $base does not,) so dup() it for reading in close_file
4165 open my $dup, '<&', $fh or croak $!;
4166 my $base = $::_repository->temp_acquire('git_blob');
4169 my ($base_is_link, $size);
4171 if ($fb->{mode_a} eq '120000' &&
4172 ! $self->{empty_symlinks}->{$fb->{path}}) {
4173 print $base 'link ' or die "print $!\n";
4177 $size = $::_repository->cat_blob($fb->{blob}, $base);
4178 die "Failed to read object $fb->{blob}" if ($size < 0);
4181 seek $base, 0, 0 or croak $!;
4182 my $got = ::md5sum($base);
4184 my $err = "Checksum mismatch: ".
4185 "$fb->{path} $fb->{blob}\n" .
4186 "expected: $exp\n" .
4188 if ($base_is_link) {
4190 "Retrying... (possibly ",
4191 "a bad symlink from SVN)\n";
4192 $::_repository->temp_reset($base);
4200 seek $base, 0, 0 or croak $!;
4202 $fb->{base} = $base;
4203 [ SVN::TxDelta::apply($base, $dup, undef, $fb->{path}, $fb->{pool}) ];
4207 my ($self, $fb, $exp) = @_;
4208 return undef if $self->is_path_ignored($fb->{path});
4211 my $path = $self->git_path($fb->{path});
4212 if (my $fh = $fb->{fh}) {
4214 seek($fh, 0, 0) or croak $!;
4215 my $got = ::md5sum($fh);
4217 die "Checksum mismatch: $path\n",
4218 "expected: $exp\n got: $got\n";
4221 if ($fb->{mode_b} == 120000) {
4222 sysseek($fh, 0, 0) or croak $!;
4223 my $rd = sysread($fh, my $buf, 5);
4226 croak "sysread: $!\n";
4227 } elsif ($rd == 0) {
4228 warn "$path has mode 120000",
4229 " but it points to nothing\n",
4230 "converting to an empty file with mode",
4232 $fb->{mode_b} = '100644';
4233 } elsif ($buf ne 'link ') {
4234 warn "$path has mode 120000",
4235 " but is not a link\n";
4237 my $tmp_fh = $::_repository->temp_acquire(
4240 while ($res = sysread($fh, my $str, 1024)) {
4241 my $out = syswrite($tmp_fh, $str, $res);
4242 defined($out) && $out == $res
4244 Git::temp_path($tmp_fh),
4247 defined $res or croak $!;
4249 ($fh, $tmp_fh) = ($tmp_fh, $fh);
4250 Git::temp_release($tmp_fh, 1);
4254 $hash = $::_repository->hash_and_insert_object(
4255 Git::temp_path($fh));
4256 $hash =~ /^[a-f\d]{40}$/ or die "not a sha1: $hash\n";
4258 Git::temp_release($fb->{base}, 1);
4259 Git::temp_release($fh, 1);
4261 $hash = $fb->{blob} or die "no blob information\n";
4264 $self->{gii}->update($fb->{mode_b}, $hash, $path) or croak $!;
4265 print "\t$fb->{action}\t$path\n" if $fb->{action} && ! $::_q;
4271 $self->{nr} = $self->{gii}->{nr};
4272 delete $self->{gii};
4273 $self->SUPER::abort_edit(@_);
4278 $self->{git_commit_ok} = 1;
4279 $self->{nr} = $self->{gii}->{nr};
4280 delete $self->{gii};
4281 $self->SUPER::close_edit(@_);
4284 package SVN::Git::Editor;
4285 use vars qw/@ISA $_rmdir $_cp_similarity $_find_copies_harder $_rename_limit/;
4292 my ($class, $opts) = @_;
4293 foreach (qw/svn_path r ra tree_a tree_b log editor_cb/) {
4294 die "$_ required!\n" unless (defined $opts->{$_});
4297 my $pool = SVN::Pool->new;
4298 my $mods = generate_diff($opts->{tree_a}, $opts->{tree_b});
4299 my $types = check_diff_paths($opts->{ra}, $opts->{svn_path},
4302 # $opts->{ra} functions should not be used after this:
4303 my @ce = $opts->{ra}->get_commit_editor($opts->{log},
4304 $opts->{editor_cb}, $pool);
4305 my $self = SVN::Delta::Editor->new(@ce, $pool);
4306 bless $self, $class;
4307 foreach (qw/svn_path r tree_a tree_b/) {
4308 $self->{$_} = $opts->{$_};
4310 $self->{url} = $opts->{ra}->{url};
4311 $self->{mods} = $mods;
4312 $self->{types} = $types;
4313 $self->{pool} = $pool;
4314 $self->{bat} = { '' => $self->open_root($self->{r}, $self->{pool}) };
4316 $self->{path_prefix} = length $self->{svn_path} ?
4317 "$self->{svn_path}/" : '';
4318 $self->{config} = $opts->{config};
4323 my ($tree_a, $tree_b) = @_;
4324 my @diff_tree = qw(diff-tree -z -r);
4325 if ($_cp_similarity) {
4326 push @diff_tree, "-C$_cp_similarity";
4328 push @diff_tree, '-C';
4330 push @diff_tree, '--find-copies-harder' if $_find_copies_harder;
4331 push @diff_tree, "-l$_rename_limit" if defined $_rename_limit;
4332 push @diff_tree, $tree_a, $tree_b;
4333 my ($diff_fh, $ctx) = command_output_pipe(@diff_tree);
4337 while (<$diff_fh>) {
4338 chomp $_; # this gets rid of the trailing "\0"
4339 if ($state eq 'meta' && /^:(\d{6})\s(\d{6})\s
4340 ($::sha1)\s($::sha1)\s
4341 ([MTCRAD])\d*$/xo) {
4342 push @mods, { mode_a => $1, mode_b => $2,
4343 sha1_a => $3, sha1_b => $4,
4345 if ($5 =~ /^(?:C|R)$/) {
4350 } elsif ($state eq 'file_a') {
4351 my $x = $mods[$#mods] or croak "Empty array\n";
4352 if ($x->{chg} !~ /^(?:C|R)$/) {
4353 croak "Error parsing $_, $x->{chg}\n";
4357 } elsif ($state eq 'file_b') {
4358 my $x = $mods[$#mods] or croak "Empty array\n";
4359 if (exists $x->{file_a} && $x->{chg} !~ /^(?:C|R)$/) {
4360 croak "Error parsing $_, $x->{chg}\n";
4362 if (!exists $x->{file_a} && $x->{chg} =~ /^(?:C|R)$/) {
4363 croak "Error parsing $_, $x->{chg}\n";
4368 croak "Error parsing $_\n";
4371 command_close_pipe($diff_fh, $ctx);
4375 sub check_diff_paths {
4376 my ($ra, $pfx, $rev, $mods) = @_;
4378 $pfx .= '/' if length $pfx;
4380 sub type_diff_paths {
4381 my ($ra, $types, $path, $rev) = @_;
4382 my @p = split m#/+#, $path;
4384 unless (defined $types->{$c}) {
4385 $types->{$c} = $ra->check_path($c, $rev);
4388 $c .= '/' . shift @p;
4389 next if defined $types->{$c};
4390 $types->{$c} = $ra->check_path($c, $rev);
4394 foreach my $m (@$mods) {
4395 foreach my $f (qw/file_a file_b/) {
4396 next unless defined $m->{$f};
4397 my ($dir) = ($m->{$f} =~ m#^(.*?)/?(?:[^/]+)$#);
4398 if (length $pfx.$dir && ! defined $types{$dir}) {
4399 type_diff_paths($ra, \%types, $pfx.$dir, $rev);
4407 return ($_[0] =~ m#^(.*?)/?([^/]+)$#);
4411 my ($self, $path) = @_;
4412 $self->{path_prefix}.(defined $path ? $path : '');
4416 my ($self, $path) = @_;
4417 if ($self->{url} =~ m#^https?://#) {
4418 $path =~ s!([^~a-zA-Z0-9_./-])!uc sprintf("%%%02x",ord($1))!eg;
4420 $self->{url} . '/' . $self->repo_path($path);
4425 my $rm = $self->{rm};
4426 delete $rm->{''}; # we never delete the url we're tracking
4429 foreach (keys %$rm) {
4430 my @d = split m#/#, $_;
4434 $c .= '/' . shift @d;
4438 delete $rm->{$self->{svn_path}};
4439 delete $rm->{''}; # we never delete the url we're tracking
4442 my ($fh, $ctx) = command_output_pipe(qw/ls-tree --name-only -r -z/,
4447 my @dn = split m#/#, $_;
4449 delete $rm->{join '/', @dn};
4456 command_close_pipe($fh, $ctx);
4458 my ($r, $p, $bat) = ($self->{r}, $self->{pool}, $self->{bat});
4459 foreach my $d (sort { $b =~ tr#/#/# <=> $a =~ tr#/#/# } keys %$rm) {
4460 $self->close_directory($bat->{$d}, $p);
4461 my ($dn) = ($d =~ m#^(.*?)/?(?:[^/]+)$#);
4462 print "\tD+\t$d/\n" unless $::_q;
4463 $self->SUPER::delete_entry($d, $r, $bat->{$dn}, $p);
4468 sub open_or_add_dir {
4469 my ($self, $full_path, $baton) = @_;
4470 my $t = $self->{types}->{$full_path};
4472 die "$full_path not known in r$self->{r} or we have a bug!\n";
4476 # SVN::Node::none and SVN::Node::file are used only once,
4477 # so we're shutting up Perl's warnings about them.
4478 if ($t == $SVN::Node::none) {
4479 return $self->add_directory($full_path, $baton,
4480 undef, -1, $self->{pool});
4481 } elsif ($t == $SVN::Node::dir) {
4482 return $self->open_directory($full_path, $baton,
4483 $self->{r}, $self->{pool});
4484 } # no warnings 'once'
4485 print STDERR "$full_path already exists in repository at ",
4486 "r$self->{r} and it is not a directory (",
4487 ($t == $SVN::Node::file ? 'file' : 'unknown'),"/$t)\n";
4488 } # no warnings 'once'
4493 my ($self, $path) = @_;
4494 my $bat = $self->{bat};
4495 my $repo_path = $self->repo_path($path);
4496 return $bat->{''} unless (length $repo_path);
4497 my @p = split m#/+#, $repo_path;
4499 $bat->{$c} ||= $self->open_or_add_dir($c, $bat->{''});
4502 $c .= '/' . shift @p;
4503 $bat->{$c} ||= $self->open_or_add_dir($c, $bat->{$c0});
4508 # Subroutine to convert a globbing pattern to a regular expression.
4509 # From perl cookbook.
4511 my $globstr = shift;
4512 my %patmap = ('*' => '.*', '?' => '.', '[' => '[', ']' => ']');
4513 $globstr =~ s{(.)} { $patmap{$1} || "\Q$1" }ge;
4514 return '^' . $globstr . '$';
4517 sub check_autoprop {
4518 my ($self, $pattern, $properties, $file, $fbat) = @_;
4519 # Convert the globbing pattern to a regular expression.
4520 my $regex = glob2pat($pattern);
4521 # Check if the pattern matches the file name.
4522 if($file =~ m/($regex)/) {
4523 # Parse the list of properties to set.
4524 my @props = split(/;/, $properties);
4525 foreach my $prop (@props) {
4526 # Parse 'name=value' syntax and set the property.
4527 if ($prop =~ /([^=]+)=(.*)/) {
4528 my ($n,$v) = ($1,$2);
4532 $self->change_file_prop($fbat, $n, $v);
4538 sub apply_autoprops {
4539 my ($self, $file, $fbat) = @_;
4540 my $conf_t = ${$self->{config}}{'config'};
4542 # Check [miscellany]/enable-auto-props in svn configuration.
4543 if (SVN::_Core::svn_config_get_bool(
4545 $SVN::_Core::SVN_CONFIG_SECTION_MISCELLANY,
4546 $SVN::_Core::SVN_CONFIG_OPTION_ENABLE_AUTO_PROPS,
4548 # Auto-props are enabled. Enumerate them to look for matches.
4549 my $callback = sub {
4550 $self->check_autoprop($_[0], $_[1], $file, $fbat);
4552 SVN::_Core::svn_config_enumerate(
4554 $SVN::_Core::SVN_CONFIG_SECTION_AUTO_PROPS,
4560 my ($self, $m) = @_;
4561 my ($dir, $file) = split_path($m->{file_b});
4562 my $pbat = $self->ensure_path($dir);
4563 my $fbat = $self->add_file($self->repo_path($m->{file_b}), $pbat,
4565 print "\tA\t$m->{file_b}\n" unless $::_q;
4566 $self->apply_autoprops($file, $fbat);
4567 $self->chg_file($fbat, $m);
4568 $self->close_file($fbat,undef,$self->{pool});
4572 my ($self, $m) = @_;
4573 my ($dir, $file) = split_path($m->{file_b});
4574 my $pbat = $self->ensure_path($dir);
4575 my $fbat = $self->add_file($self->repo_path($m->{file_b}), $pbat,
4576 $self->url_path($m->{file_a}), $self->{r});
4577 print "\tC\t$m->{file_a} => $m->{file_b}\n" unless $::_q;
4578 $self->chg_file($fbat, $m);
4579 $self->close_file($fbat,undef,$self->{pool});
4583 my ($self, $path, $pbat) = @_;
4584 my $rpath = $self->repo_path($path);
4585 my ($dir, $file) = split_path($rpath);
4586 $self->{rm}->{$dir} = 1;
4587 $self->SUPER::delete_entry($rpath, $self->{r}, $pbat, $self->{pool});
4591 my ($self, $m) = @_;
4592 my ($dir, $file) = split_path($m->{file_b});
4593 my $pbat = $self->ensure_path($dir);
4594 my $fbat = $self->add_file($self->repo_path($m->{file_b}), $pbat,
4595 $self->url_path($m->{file_a}), $self->{r});
4596 print "\tR\t$m->{file_a} => $m->{file_b}\n" unless $::_q;
4597 $self->apply_autoprops($file, $fbat);
4598 $self->chg_file($fbat, $m);
4599 $self->close_file($fbat,undef,$self->{pool});
4601 ($dir, $file) = split_path($m->{file_a});
4602 $pbat = $self->ensure_path($dir);
4603 $self->delete_entry($m->{file_a}, $pbat);
4607 my ($self, $m) = @_;
4608 my ($dir, $file) = split_path($m->{file_b});
4609 my $pbat = $self->ensure_path($dir);
4610 my $fbat = $self->open_file($self->repo_path($m->{file_b}),
4611 $pbat,$self->{r},$self->{pool});
4612 print "\t$m->{chg}\t$m->{file_b}\n" unless $::_q;
4613 $self->chg_file($fbat, $m);
4614 $self->close_file($fbat,undef,$self->{pool});
4617 sub T { shift->M(@_) }
4619 sub change_file_prop {
4620 my ($self, $fbat, $pname, $pval) = @_;
4621 $self->SUPER::change_file_prop($fbat, $pname, $pval, $self->{pool});
4624 sub _chg_file_get_blob ($$$$) {
4625 my ($self, $fbat, $m, $which) = @_;
4626 my $fh = $::_repository->temp_acquire("git_blob_$which");
4627 if ($m->{"mode_$which"} =~ /^120/) {
4628 print $fh 'link ' or croak $!;
4629 $self->change_file_prop($fbat,'svn:special','*');
4630 } elsif ($m->{mode_a} =~ /^120/ && $m->{"mode_$which"} !~ /^120/) {
4631 $self->change_file_prop($fbat,'svn:special',undef);
4633 my $blob = $m->{"sha1_$which"};
4634 return ($fh,) if ($blob =~ /^0{40}$/);
4635 my $size = $::_repository->cat_blob($blob, $fh);
4636 croak "Failed to read object $blob" if ($size < 0);
4637 $fh->flush == 0 or croak $!;
4638 seek $fh, 0, 0 or croak $!;
4640 my $exp = ::md5sum($fh);
4641 seek $fh, 0, 0 or croak $!;
4646 my ($self, $fbat, $m) = @_;
4647 if ($m->{mode_b} =~ /755$/ && $m->{mode_a} !~ /755$/) {
4648 $self->change_file_prop($fbat,'svn:executable','*');
4649 } elsif ($m->{mode_b} !~ /755$/ && $m->{mode_a} =~ /755$/) {
4650 $self->change_file_prop($fbat,'svn:executable',undef);
4652 my ($fh_a, $exp_a) = _chg_file_get_blob $self, $fbat, $m, 'a';
4653 my ($fh_b, $exp_b) = _chg_file_get_blob $self, $fbat, $m, 'b';
4654 my $pool = SVN::Pool->new;
4655 my $atd = $self->apply_textdelta($fbat, $exp_a, $pool);
4657 my $txstream = SVN::TxDelta::new ($fh_a, $fh_b, $pool);
4658 my $res = SVN::TxDelta::send_txstream($txstream, @$atd, $pool);
4660 die "Unexpected result from send_txstream: $res\n",
4661 "(SVN::Core::VERSION: $SVN::Core::VERSION)\n";
4664 my $got = SVN::TxDelta::send_stream($fh_b, @$atd, $pool);
4665 die "Checksum mismatch\nexpected: $exp_b\ngot: $got\n"
4666 if ($got ne $exp_b);
4668 Git::temp_release($fh_b, 1);
4669 Git::temp_release($fh_a, 1);
4674 my ($self, $m) = @_;
4675 my ($dir, $file) = split_path($m->{file_b});
4676 my $pbat = $self->ensure_path($dir);
4677 print "\tD\t$m->{file_b}\n" unless $::_q;
4678 $self->delete_entry($m->{file_b}, $pbat);
4683 my ($p,$bat) = ($self->{pool}, $self->{bat});
4684 foreach (sort { $b =~ tr#/#/# <=> $a =~ tr#/#/# } keys %$bat) {
4686 $self->close_directory($bat->{$_}, $p);
4688 $self->close_directory($bat->{''}, $p);
4689 $self->SUPER::close_edit($p);
4695 $self->SUPER::abort_edit($self->{pool});
4700 $self->SUPER::DESTROY(@_);
4701 $self->{pool}->clear;
4704 # this drives the editor
4707 my $mods = $self->{mods};
4708 my %o = ( D => 1, R => 0, C => -1, A => 3, M => 3, T => 3 );
4709 foreach my $m (sort { $o{$a->{chg}} <=> $o{$b->{chg}} } @$mods) {
4711 if (defined $o{$f}) {
4714 fatal("Invalid change type: $f");
4717 $self->rmdirs if $_rmdir;
4723 return scalar @$mods;
4726 package Git::SVN::Ra;
4727 use vars qw/@ISA $config_dir $_log_window_size/;
4730 my ($ra_invalid, $can_do_switch, %ignored_err, $RA);
4733 # enforce temporary pool usage for some simple functions
4735 for my $f (qw/rev_proplist get_latest_revnum get_uuid get_repos_root
4737 my $SUPER = "SUPER::$f";
4740 my $pool = SVN::Pool->new;
4741 my @ret = $self->$SUPER(@_,$pool);
4743 wantarray ? @ret : $ret[0];
4748 sub _auth_providers () {
4750 SVN::Client::get_simple_provider(),
4751 SVN::Client::get_ssl_server_trust_file_provider(),
4752 SVN::Client::get_simple_prompt_provider(
4753 \&Git::SVN::Prompt::simple, 2),
4754 SVN::Client::get_ssl_client_cert_file_provider(),
4755 SVN::Client::get_ssl_client_cert_prompt_provider(
4756 \&Git::SVN::Prompt::ssl_client_cert, 2),
4757 SVN::Client::get_ssl_client_cert_pw_file_provider(),
4758 SVN::Client::get_ssl_client_cert_pw_prompt_provider(
4759 \&Git::SVN::Prompt::ssl_client_cert_pw, 2),
4760 SVN::Client::get_username_provider(),
4761 SVN::Client::get_ssl_server_trust_prompt_provider(
4762 \&Git::SVN::Prompt::ssl_server_trust),
4763 SVN::Client::get_username_prompt_provider(
4764 \&Git::SVN::Prompt::username, 2)
4768 sub escape_uri_only {
4771 foreach (split m{/}, $uri) {
4772 s/([^~\w.%+-]|%(?![a-fA-F0-9]{2}))/sprintf("%%%02X",ord($1))/eg;
4780 if ($url =~ m#^(https?)://([^/]+)(.*)$#) {
4781 my ($scheme, $domain, $uri) = ($1, $2, escape_uri_only($3));
4782 $url = "$scheme://$domain$uri";
4788 my ($class, $url) = @_;
4790 return $RA if ($RA && $RA->{url} eq $url);
4792 SVN::_Core::svn_config_ensure($config_dir, undef);
4793 my ($baton, $callbacks) = SVN::Core::auth_open_helper(_auth_providers);
4794 my $config = SVN::Core::config_get_config($config_dir);
4796 my $dont_store_passwords = 1;
4797 my $conf_t = ${$config}{'config'};
4800 # The usage of $SVN::_Core::SVN_CONFIG_* variables
4801 # produces warnings that variables are used only once.
4802 # I had not found the better way to shut them up, so
4803 # the warnings of type 'once' are disabled in this block.
4804 if (SVN::_Core::svn_config_get_bool($conf_t,
4805 $SVN::_Core::SVN_CONFIG_SECTION_AUTH,
4806 $SVN::_Core::SVN_CONFIG_OPTION_STORE_PASSWORDS,
4808 SVN::_Core::svn_auth_set_parameter($baton,
4809 $SVN::_Core::SVN_AUTH_PARAM_DONT_STORE_PASSWORDS,
4810 bless (\$dont_store_passwords, "_p_void"));
4812 if (SVN::_Core::svn_config_get_bool($conf_t,
4813 $SVN::_Core::SVN_CONFIG_SECTION_AUTH,
4814 $SVN::_Core::SVN_CONFIG_OPTION_STORE_AUTH_CREDS,
4816 $Git::SVN::Prompt::_no_auth_cache = 1;
4818 } # no warnings 'once'
4819 my $self = SVN::Ra->new(url => escape_url($url), auth => $baton,
4821 pool => SVN::Pool->new,
4822 auth_provider_callbacks => $callbacks);
4823 $self->{url} = $url;
4824 $self->{svn_path} = $url;
4825 $self->{repos_root} = $self->get_repos_root;
4826 $self->{svn_path} =~ s#^\Q$self->{repos_root}\E(/|$)##;
4827 $self->{cache} = { check_path => { r => 0, data => {} },
4828 get_dir => { r => 0, data => {} } };
4829 $RA = bless $self, $class;
4833 my ($self, $path, $r) = @_;
4834 my $cache = $self->{cache}->{check_path};
4835 if ($r == $cache->{r} && exists $cache->{data}->{$path}) {
4836 return $cache->{data}->{$path};
4838 my $pool = SVN::Pool->new;
4839 my $t = $self->SUPER::check_path($path, $r, $pool);
4841 if ($r != $cache->{r}) {
4842 %{$cache->{data}} = ();
4845 $cache->{data}->{$path} = $t;
4849 my ($self, $dir, $r) = @_;
4850 my $cache = $self->{cache}->{get_dir};
4851 if ($r == $cache->{r}) {
4852 if (my $x = $cache->{data}->{$dir}) {
4853 return wantarray ? @$x : $x->[0];
4856 my $pool = SVN::Pool->new;
4857 my ($d, undef, $props) = $self->SUPER::get_dir($dir, $r, $pool);
4858 my %dirents = map { $_ => { kind => $d->{$_}->kind } } keys %$d;
4860 if ($r != $cache->{r}) {
4861 %{$cache->{data}} = ();
4864 $cache->{data}->{$dir} = [ \%dirents, $r, $props ];
4865 wantarray ? (\%dirents, $r, $props) : \%dirents;
4869 # do not call the real DESTROY since we store ourselves in $RA
4872 # get_log(paths, start, end, limit,
4873 # discover_changed_paths, strict_node_history, receiver)
4875 my ($self, @args) = @_;
4876 my $pool = SVN::Pool->new;
4878 # svn_log_changed_path_t objects passed to get_log are likely to be
4879 # overwritten even if only the refs are copied to an external variable,
4880 # so we should dup the structures in their entirety. Using an
4881 # externally passed pool (instead of our temporary and quickly cleared
4882 # pool in Git::SVN::Ra) does not help matters at all...
4883 my $receiver = pop @args;
4884 my $prefix = "/".$self->{svn_path};
4885 $prefix =~ s#/+($)##;
4886 my $prefix_regex = qr#^\Q$prefix\E#;
4888 my ($paths) = $_[0];
4889 return &$receiver(@_) unless $paths;
4891 foreach my $p (keys %$paths) {
4892 my $i = $paths->{$p};
4893 # Make path relative to our url, not repos_root
4894 $p =~ s/$prefix_regex//;
4895 my %s = map { $_ => $i->$_; }
4896 qw/copyfrom_path copyfrom_rev action/;
4897 if ($s{'copyfrom_path'}) {
4898 $s{'copyfrom_path'} =~ s/$prefix_regex//;
4906 # the limit parameter was not supported in SVN 1.1.x, so we
4907 # drop it. Therefore, the receiver callback passed to it
4908 # is made aware of this limitation by being wrapped if
4909 # the limit passed to is being wrapped.
4910 if ($SVN::Core::VERSION le '1.2.0') {
4911 my $limit = splice(@args, 3, 1);
4913 my $receiver = pop @args;
4914 push(@args, sub { &$receiver(@_) if (--$limit >= 0) });
4917 my $ret = $self->SUPER::get_log(@args, $pool);
4923 my ($self, $url1, $rev1, $url2, $rev2) = @_;
4924 my $ctx = SVN::Client->new(auth => _auth_providers);
4925 my $out = IO::File->new_tmpfile;
4927 # older SVN (1.1.x) doesn't take $pool as the last parameter for
4928 # $ctx->diff(), so we'll create a default one
4929 my $pool = SVN::Pool->new_default_sub;
4931 $ra_invalid = 1; # this will open a new SVN::Ra connection to $url1
4932 $ctx->diff([], $url1, $rev1, $url2, $rev2, 1, 1, 0, $out, $out);
4934 my $ret = (($out->stat)[7] == 0);
4935 close $out or croak $!;
4940 sub get_commit_editor {
4941 my ($self, $log, $cb, $pool) = @_;
4942 my @lock = $SVN::Core::VERSION ge '1.2.0' ? (undef, 0) : ();
4943 $self->SUPER::get_commit_editor($log, $cb, @lock, $pool);
4947 my ($self, $rev_a, $rev_b, $gs, $editor) = @_;
4948 my $new = ($rev_a == $rev_b);
4949 my $path = $gs->{path};
4951 if ($new && -e $gs->{index}) {
4952 unlink $gs->{index} or die
4953 "Couldn't unlink index: $gs->{index}: $!\n";
4955 my $pool = SVN::Pool->new;
4956 $editor->set_path_strip($path);
4957 my (@pc) = split m#/#, $path;
4958 my $reporter = $self->do_update($rev_b, (@pc ? shift @pc : ''),
4960 my @lock = $SVN::Core::VERSION ge '1.2.0' ? (undef) : ();
4962 # Since we can't rely on svn_ra_reparent being available, we'll
4963 # just have to do some magic with set_path to make it so
4964 # we only want a partial path.
4966 my $final = join('/', @pc);
4968 $reporter->set_path($sp, $rev_b, 0, @lock, $pool);
4969 $sp .= '/' if length $sp;
4972 die "BUG: '$sp' != '$final'\n" if ($sp ne $final);
4974 $reporter->set_path($sp, $rev_a, $new, @lock, $pool);
4976 $reporter->finish_report($pool);
4978 $editor->{git_commit_ok};
4981 # this requires SVN 1.4.3 or later (do_switch didn't work before 1.4.3, and
4982 # svn_ra_reparent didn't work before 1.4)
4984 my ($self, $rev_a, $rev_b, $gs, $url_b, $editor) = @_;
4985 my $path = $gs->{path};
4986 my $pool = SVN::Pool->new;
4988 my $full_url = $self->{url};
4989 my $old_url = $full_url;
4990 $full_url .= '/' . $path if length $path;
4991 my ($ra, $reparented);
4993 if ($old_url =~ m#^svn(\+ssh)?://# ||
4994 ($full_url =~ m#^https?://# &&
4995 escape_url($full_url) ne $full_url)) {
4999 $ra = Git::SVN::Ra->new($full_url);
5001 } elsif ($old_url ne $full_url) {
5002 SVN::_Ra::svn_ra_reparent($self->{session}, $full_url, $pool);
5003 $self->{url} = $full_url;
5008 $url_b = escape_url($url_b);
5009 my $reporter = $ra->do_switch($rev_b, '', 1, $url_b, $editor, $pool);
5010 my @lock = $SVN::Core::VERSION ge '1.2.0' ? (undef) : ();
5011 $reporter->set_path('', $rev_a, 0, @lock, $pool);
5012 $reporter->finish_report($pool);
5015 SVN::_Ra::svn_ra_reparent($self->{session}, $old_url, $pool);
5016 $self->{url} = $old_url;
5020 $editor->{git_commit_ok};
5023 sub longest_common_path {
5024 my ($gsv, $globs) = @_;
5026 my $common_max = scalar @$gsv;
5028 foreach my $gs (@$gsv) {
5029 my @tmp = split m#/#, $gs->{path};
5032 $p .= length($p) ? "/$_" : $_;
5038 $common_max += scalar @$globs;
5039 foreach my $glob (@$globs) {
5040 my @tmp = split m#/#, $glob->{path}->{left};
5043 $p .= length($p) ? "/$_" : $_;
5049 my $longest_path = '';
5050 foreach (sort {length $b <=> length $a} keys %common) {
5051 if ($common{$_} == $common_max) {
5059 sub gs_fetch_loop_common {
5060 my ($self, $base, $head, $gsv, $globs) = @_;
5061 return if ($base > $head);
5062 my $inc = $_log_window_size;
5063 my ($min, $max) = ($base, $head < $base + $inc ? $head : $base + $inc);
5064 my $longest_path = longest_common_path($gsv, $globs);
5065 my $ra_url = $self->{url};
5066 my $find_trailing_edge;
5070 my $err_handler = $SVN::Error::handler;
5071 $SVN::Error::handler = sub {
5073 skip_unknown_revs($err);
5076 my ($paths, $r, $author, $date, $log) = @_;
5078 { author => $author, date => $date, log => $log } ];
5080 $self->get_log([$longest_path], $min, $max, 0, 1, 1,
5081 sub { $revs{$_[1]} = _cb(@_) });
5083 print "Checked through r$max\r";
5085 $find_trailing_edge = 1;
5087 if ($err and $find_trailing_edge) {
5088 print STDERR "Path '$longest_path' ",
5089 "was probably deleted:\n",
5090 $err->expanded_message,
5091 "\nWill attempt to follow ",
5092 "revisions r$min .. r$max ",
5093 "committed before the deletion\n";
5095 while (--$hi >= $min) {
5097 $self->get_log([$longest_path], $min, $hi,
5100 $revs{$_[1]} = _cb(@_) });
5102 print STDERR "r$min .. r$ok OK\n";
5106 $find_trailing_edge = 0;
5108 $SVN::Error::handler = $err_handler;
5110 my %exists = map { $_->{path} => $_ } @$gsv;
5111 foreach my $r (sort {$a <=> $b} keys %revs) {
5112 my ($paths, $logged) = @{$revs{$r}};
5114 foreach my $gs ($self->match_globs(\%exists, $paths,
5116 if ($gs->rev_map_max >= $r) {
5119 next unless $gs->match_paths($paths, $r);
5120 $gs->{logged_rev_props} = $logged;
5121 if (my $last_commit = $gs->last_commit) {
5122 $gs->assert_index_clean($last_commit);
5124 my $log_entry = $gs->do_fetch($paths, $r);
5126 $gs->do_git_commit($log_entry);
5128 $INDEX_FILES{$gs->{index}} = 1;
5130 foreach my $g (@$globs) {
5131 my $k = "svn-remote.$g->{remote}." .
5133 Git::SVN::tmp_config($k, $r);
5139 $self = Git::SVN::Ra->new($ra_url);
5140 $ra_invalid = undef;
5143 # pre-fill the .rev_db since it'll eventually get filled in
5144 # with '0' x40 if something new gets committed
5145 foreach my $gs (@$gsv) {
5146 next if $gs->rev_map_max >= $max;
5147 next if defined $gs->rev_map_get($max);
5148 $gs->rev_map_set($max, 0 x40);
5150 foreach my $g (@$globs) {
5151 my $k = "svn-remote.$g->{remote}.$g->{t}-maxRev";
5152 Git::SVN::tmp_config($k, $max);
5154 last if $max >= $head;
5157 $max = $head if ($max > $head);
5162 sub get_dir_globbed {
5163 my ($self, $left, $depth, $r) = @_;
5165 my @x = eval { $self->get_dir($left, $r) };
5166 return unless scalar @x == 3;
5167 my $dirents = $x[0];
5169 foreach my $de (keys %$dirents) {
5170 next if $dirents->{$de}->{kind} != $SVN::Node::dir;
5172 my @args = ("$left/$de", $depth - 1, $r);
5173 foreach my $dir ($self->get_dir_globbed(@args)) {
5174 push @finalents, "$de/$dir";
5177 push @finalents, $de;
5184 my ($self, $exists, $paths, $globs, $r) = @_;
5187 my ($self, $exists, $g, $r) = @_;
5189 my @dirs = $self->get_dir_globbed($g->{path}->{left},
5190 $g->{path}->{depth},
5193 foreach my $de (@dirs) {
5194 my $p = $g->{path}->full_path($de);
5195 next if $exists->{$p};
5196 next if (length $g->{path}->{right} &&
5197 ($self->check_path($p, $r) !=
5199 $exists->{$p} = Git::SVN->init($self->{url}, $p, undef,
5200 $g->{ref}->full_path($de), 1);
5203 foreach my $g (@$globs) {
5204 if (my $path = $paths->{"/$g->{path}->{left}"}) {
5205 if ($path->{action} =~ /^[AR]$/) {
5206 get_dir_check($self, $exists, $g, $r);
5209 foreach (keys %$paths) {
5210 if (/$g->{path}->{left_regex}/ &&
5211 !/$g->{path}->{regex}/) {
5212 next if $paths->{$_}->{action} !~ /^[AR]$/;
5213 get_dir_check($self, $exists, $g, $r);
5215 next unless /$g->{path}->{regex}/;
5217 my $pathname = $g->{path}->full_path($p);
5218 next if $exists->{$pathname};
5219 next if ($self->check_path($pathname, $r) !=
5221 $exists->{$pathname} = Git::SVN->init(
5222 $self->{url}, $pathname, undef,
5223 $g->{ref}->full_path($p), 1);
5226 foreach (split m#/#, $g->{path}->{left}) {
5228 next unless ($paths->{$c} &&
5229 ($paths->{$c}->{action} =~ /^[AR]$/));
5230 get_dir_check($self, $exists, $g, $r);
5238 return $self->{url} if ($self->{url} eq $self->{repos_root});
5239 my $url = $self->{repos_root};
5240 my @components = split(m!/!, $self->{svn_path});
5243 $url .= "/$c" if length $c;
5245 my $ra = (ref $self)->new($url);
5246 my $latest = $ra->get_latest_revnum;
5247 $ra->get_log("", $latest, 0, 1, 0, 1, sub {});
5249 } while ($@ && ($c = shift @components));
5255 unless (defined $can_do_switch) {
5256 my $pool = SVN::Pool->new;
5258 $self->do_switch(1, '', 0, $self->{url},
5259 SVN::Delta::Editor->new, $pool);
5264 $rep->abort_report($pool);
5272 sub skip_unknown_revs {
5274 my $errno = $err->apr_err();
5275 # Maybe the branch we're tracking didn't
5276 # exist when the repo started, so it's
5277 # not an error if it doesn't, just continue
5279 # Wonderfully consistent library, eh?
5280 # 160013 - svn:// and file://
5281 # 175002 - http(s)://
5282 # 175007 - http(s):// (this repo required authorization, too...)
5283 # More codes may be discovered later...
5284 if ($errno == 175007 || $errno == 175002 || $errno == 160013) {
5285 my $err_key = $err->expanded_message;
5286 # revision numbers change every time, filter them out
5287 $err_key =~ s/\d+/\0/g;
5288 $err_key = "$errno\0$err_key";
5289 unless ($ignored_err{$err_key}) {
5290 warn "W: Ignoring error from SVN, path probably ",
5291 "does not exist: ($errno): ",
5292 $err->expanded_message,"\n";
5293 warn "W: Do not be alarmed at the above message ",
5294 "git-svn is just searching aggressively for ",
5296 "This may take a while on large repositories\n";
5297 $ignored_err{$err_key} = 1;
5301 die "Error from SVN, ($errno): ", $err->expanded_message,"\n";
5304 package Git::SVN::Log;
5307 use POSIX qw/strftime/;
5309 use constant commit_log_separator => ('-' x 72) . "\n";
5310 use vars qw/$TZ $limit $color $pager $non_recursive $verbose $oneline
5311 %rusers $show_commit $incremental/;
5316 return 1 if defined $c->{r};
5318 # big commit message got truncated by the 16k pretty buffer in rev-list
5319 if ($c->{l} && $c->{l}->[-1] eq "...\n" &&
5320 $c->{a_raw} =~ /\@([a-f\d\-]+)>$/) {
5322 my @log = command(qw/cat-file commit/, $c->{c});
5324 # shift off the headers
5325 shift @log while ($log[0] ne '');
5328 # TODO: make $c->{l} not have a trailing newline in the future
5329 @{$c->{l}} = map { "$_\n" } grep !/^git-svn-id: /, @log;
5331 (undef, $c->{r}, undef) = ::extract_metadata(
5332 (grep(/^git-svn-id: /, @log))[-1]);
5334 return defined $c->{r};
5338 return $color || Git->repository->get_colorbool('color.diff');
5341 sub git_svn_log_cmd {
5342 my ($r_min, $r_max, @args) = @_;
5344 my (@files, @log_opts);
5345 foreach my $x (@args) {
5346 if ($x eq '--' || @files) {
5349 if (::verify_ref("$x^0")) {
5357 my ($url, $rev, $uuid, $gs) = ::working_head_info($head);
5358 $gs ||= Git::SVN->_new;
5359 my @cmd = (qw/log --abbrev-commit --pretty=raw --default/,
5361 push @cmd, '-r' unless $non_recursive;
5362 push @cmd, qw/--raw --name-status/ if $verbose;
5363 push @cmd, '--color' if log_use_color();
5364 push @cmd, @log_opts;
5365 if (defined $r_max && $r_max == $r_min) {
5366 push @cmd, '--max-count=1';
5367 if (my $c = $gs->rev_map_get($r_max)) {
5370 } elsif (defined $r_max) {
5371 if ($r_max < $r_min) {
5372 ($r_min, $r_max) = ($r_max, $r_min);
5374 my (undef, $c_max) = $gs->find_rev_before($r_max, 1, $r_min);
5375 my (undef, $c_min) = $gs->find_rev_after($r_min, 1, $r_max);
5376 # If there are no commits in the range, both $c_max and $c_min
5377 # will be undefined. If there is at least 1 commit in the
5378 # range, both will be defined.
5379 return () if !defined $c_min || !defined $c_max;
5380 if ($c_min eq $c_max) {
5381 push @cmd, '--max-count=1', $c_min;
5383 push @cmd, '--boundary', "$c_min..$c_max";
5386 return (@cmd, @files);
5389 # adapted from pager.c
5391 chomp(my $pager = command_oneline(qw(var GIT_PAGER)));
5392 if ($pager eq 'cat') {
5395 $ENV{GIT_PAGER_IN_USE} = defined($pager);
5399 return unless -t *STDOUT && defined $pager;
5400 pipe my ($rfd, $wfd) or return;
5401 defined(my $pid = fork) or ::fatal "Can't fork: $!";
5403 open STDOUT, '>&', $wfd or
5404 ::fatal "Can't redirect to stdout: $!";
5407 open STDIN, '<&', $rfd or ::fatal "Can't redirect stdin: $!";
5408 $ENV{LESS} ||= 'FRSX';
5409 exec $pager or ::fatal "Can't run pager: $! ($pager)";
5412 sub format_svn_date {
5413 # some systmes don't handle or mishandle %z, so be creative.
5414 my $t = shift || time;
5415 my $gm = timelocal(gmtime($t));
5416 my $sign = qw( + + - )[ $t <=> $gm ];
5417 my $gmoff = sprintf("%s%02d%02d", $sign, (gmtime(abs($t - $gm)))[2,1]);
5418 return strftime("%Y-%m-%d %H:%M:%S $gmoff (%a, %d %b %Y)", localtime($t));
5421 sub parse_git_date {
5423 # Date::Parse isn't in the standard Perl distro :(
5424 if ($tz =~ s/^\+//) {
5425 $t += tz_to_s_offset($tz);
5426 } elsif ($tz =~ s/^\-//) {
5427 $t -= tz_to_s_offset($tz);
5432 sub set_local_timezone {
5440 sub tz_to_s_offset {
5443 return ($1 * 60) + ($tz * 3600);
5446 sub get_author_info {
5447 my ($dest, $author, $t, $tz) = @_;
5448 $author =~ s/(?:^\s*|\s*$)//g;
5449 $dest->{a_raw} = $author;
5452 $au = $rusers{$author} || undef;
5455 ($au) = ($author =~ /<([^>]+)\@[^>]+>$/);
5460 $dest->{t_utc} = parse_git_date($t, $tz);
5463 sub process_commit {
5464 my ($c, $r_min, $r_max, $defer) = @_;
5465 if (defined $r_min && defined $r_max) {
5466 if ($r_min == $c->{r} && $r_min == $r_max) {
5470 return 1 if $r_min == $r_max;
5471 if ($r_min < $r_max) {
5472 # we need to reverse the print order
5473 return 0 if (defined $limit && --$limit < 0);
5477 if ($r_min != $r_max) {
5478 return 1 if ($r_min < $c->{r});
5479 return 1 if ($r_max > $c->{r});
5482 return 0 if (defined $limit && --$limit < 0);
5491 if (my $l = $c->{l}) {
5492 while ($l->[0] =~ /^\s*$/) { shift @$l }
5495 $l_fmt ||= 'A' . length($c->{r});
5496 print 'r',pack($l_fmt, $c->{r}),' | ';
5497 print "$c->{c} | " if $show_commit;
5500 show_commit_normal($c);
5504 sub show_commit_changed_paths {
5506 return unless $c->{changed};
5507 print "Changed paths:\n", @{$c->{changed}};
5510 sub show_commit_normal {
5512 print commit_log_separator, "r$c->{r} | ";
5513 print "$c->{c} | " if $show_commit;
5514 print "$c->{a} | ", format_svn_date($c->{t_utc}), ' | ';
5517 if (my $l = $c->{l}) {
5518 while ($l->[$#$l] eq "\n" && $#$l > 0
5519 && $l->[($#$l - 1)] eq "\n") {
5522 $nr_line = scalar @$l;
5524 print "1 line\n\n\n";
5526 if ($nr_line == 1) {
5527 $nr_line = '1 line';
5529 $nr_line .= ' lines';
5531 print $nr_line, "\n";
5532 show_commit_changed_paths($c);
5534 print $_ foreach @$l;
5538 show_commit_changed_paths($c);
5542 foreach my $x (qw/raw stat diff/) {
5545 print $_ foreach @{$c->{$x}}
5552 my ($r_min, $r_max);
5553 my $r_last = -1; # prevent dupes
5554 set_local_timezone();
5555 if (defined $::_revision) {
5556 if ($::_revision =~ /^(\d+):(\d+)$/) {
5557 ($r_min, $r_max) = ($1, $2);
5558 } elsif ($::_revision =~ /^\d+$/) {
5559 $r_min = $r_max = $::_revision;
5561 ::fatal "-r$::_revision is not supported, use ",
5562 "standard 'git log' arguments instead";
5567 @args = git_svn_log_cmd($r_min, $r_max, @args);
5569 print commit_log_separator unless $incremental || $oneline;
5572 my $log = command_output_pipe(@args);
5574 my (@k, $c, $d, $stat);
5575 my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/;
5577 if (/^${esc_color}commit -?($::sha1_short)/o) {
5579 if ($c && cmt_showable($c) && $c->{r} != $r_last) {
5581 process_commit($c, $r_min, $r_max, \@k) or
5586 } elsif (/^${esc_color}author (.+) (\d+) ([\-\+]?\d+)$/o) {
5587 get_author_info($c, $1, $2, $3);
5588 } elsif (/^${esc_color}(?:tree|parent|committer) /o) {
5590 } elsif (/^${esc_color}:\d{6} \d{6} $::sha1_short/o) {
5591 push @{$c->{raw}}, $_;
5592 } elsif (/^${esc_color}[ACRMDT]\t/) {
5593 # we could add $SVN->{svn_path} here, but that requires
5594 # remote access at the moment (repo_path_split)...
5595 s#^(${esc_color})([ACRMDT])\t#$1 $2 #o;
5596 push @{$c->{changed}}, $_;
5597 } elsif (/^${esc_color}diff /o) {
5599 push @{$c->{diff}}, $_;
5601 push @{$c->{diff}}, $_;
5602 } elsif (/^\ .+\ \|\s*\d+\ $esc_color[\+\-]*
5603 $esc_color*[\+\-]*$esc_color$/x) {
5605 push @{$c->{stat}}, $_;
5606 } elsif ($stat && /^ \d+ files changed, \d+ insertions/) {
5607 push @{$c->{stat}}, $_;
5609 } elsif (/^${esc_color} (git-svn-id:.+)$/o) {
5610 ($c->{url}, $c->{r}, undef) = ::extract_metadata($1);
5611 } elsif (s/^${esc_color} //o) {
5612 push @{$c->{l}}, $_;
5615 if ($c && defined $c->{r} && $c->{r} != $r_last) {
5617 process_commit($c, $r_min, $r_max, \@k);
5620 ($r_min, $r_max) = ($r_max, $r_min);
5621 process_commit($_, $r_min, $r_max) foreach reverse @k;
5625 print commit_log_separator unless $incremental || $oneline;
5634 my ($fh, $ctx, $rev);
5637 ($fh, $ctx) = command_output_pipe('blame', @_, $path);
5638 while (my $line = <$fh>) {
5639 if ($line =~ /^\^?([[:xdigit:]]+)\s/) {
5640 # Uncommitted edits show up as a rev ID of
5641 # all zeros, which we can't look up with
5644 (undef, $rev, undef) =
5646 $rev = '0' if (!$rev);
5650 $rev = sprintf('%-10s', $rev);
5651 $line =~ s/^\^?[[:xdigit:]]+(\s)/$rev$1/;
5656 ($fh, $ctx) = command_output_pipe('blame', '-p', @_, 'HEAD',
5661 my %dsha; #distinct sha keys
5663 while (my $line = <$fh>) {
5664 push @buffer, $line;
5665 if ($line =~ /^([[:xdigit:]]{40})\s\d+\s\d+/) {
5670 my $s2r = ::cmt_sha2rev_batch([keys %dsha]);
5672 foreach my $line (@buffer) {
5673 if ($line =~ /^([[:xdigit:]]{40})\s\d+\s\d+/) {
5675 $rev = '0' if (!$rev)
5677 elsif ($line =~ /^author (.*)/) {
5678 $authors{$rev} = $1;
5679 $authors{$rev} =~ s/\s/_/g;
5681 elsif ($line =~ /^\t(.*)$/) {
5682 printf("%6s %10s %s\n", $rev, $authors{$rev}, $1);
5686 command_close_pipe($fh, $ctx);
5689 package Git::SVN::Migration;
5690 # these version numbers do NOT correspond to actual version numbers
5691 # of git nor git-svn. They are just relative.
5693 # v0 layout: .git/$id/info/url, refs/heads/$id-HEAD
5695 # v1 layout: .git/$id/info/url, refs/remotes/$id
5697 # v2 layout: .git/svn/$id/info/url, refs/remotes/$id
5699 # v3 layout: .git/svn/$id, refs/remotes/$id
5700 # - info/url may remain for backwards compatibility
5701 # - this is what we migrate up to this layout automatically,
5702 # - this will be used by git svn init on single branches
5703 # v3.1 layout (auto migrated):
5704 # - .rev_db => .rev_db.$UUID, .rev_db will remain as a symlink
5705 # for backwards compatibility
5707 # v4 layout: .git/svn/$repo_id/$id, refs/remotes/$repo_id/$id
5708 # - this is only created for newly multi-init-ed
5709 # repositories. Similar in spirit to the
5710 # --use-separate-remotes option in git-clone (now default)
5711 # - we do not automatically migrate to this (following
5712 # the example set by core git)
5714 # v5 layout: .rev_db.$UUID => .rev_map.$UUID
5715 # - newer, more-efficient format that uses 24-bytes per record
5716 # with no filler space.
5717 # - use xxd -c24 < .rev_map.$UUID to view and debug
5718 # - This is a one-way migration, repositories updated to the
5719 # new format will not be able to use old git-svn without
5720 # rebuilding the .rev_db. Rebuilding the rev_db is not
5721 # possible if noMetadata or useSvmProps are set; but should
5722 # be no problem for users that use the (sensible) defaults.
5726 use File::Path qw/mkpath/;
5727 use File::Basename qw/dirname basename/;
5728 use vars qw/$_minimize/;
5730 sub migrate_from_v0 {
5731 my $git_dir = $ENV{GIT_DIR};
5732 return undef unless -d $git_dir;
5733 my ($fh, $ctx) = command_output_pipe(qw/rev-parse --symbolic --all/);
5737 my ($id, $orig_ref) = ($_, $_);
5738 next unless $id =~ s#^refs/heads/(.+)-HEAD$#$1#;
5739 next unless -f "$git_dir/$id/info/url";
5740 my $new_ref = "refs/remotes/$id";
5741 if (::verify_ref("$new_ref^0")) {
5742 print STDERR "W: $orig_ref is probably an old ",
5743 "branch used by an ancient version of ",
5745 "However, $new_ref also exists.\n",
5746 "We will not be able ",
5747 "to use this branch until this ",
5748 "ambiguity is resolved.\n";
5751 print STDERR "Migrating from v0 layout...\n" if !$migrated;
5752 print STDERR "Renaming ref: $orig_ref => $new_ref\n";
5753 command_noisy('update-ref', $new_ref, $orig_ref);
5754 command_noisy('update-ref', '-d', $orig_ref, $orig_ref);
5757 command_close_pipe($fh, $ctx);
5758 print STDERR "Done migrating from v0 layout...\n" if $migrated;
5762 sub migrate_from_v1 {
5763 my $git_dir = $ENV{GIT_DIR};
5765 return $migrated unless -d $git_dir;
5766 my $svn_dir = "$git_dir/svn";
5768 # just in case somebody used 'svn' as their $id at some point...
5769 return $migrated if -d $svn_dir && ! -f "$svn_dir/info/url";
5771 print STDERR "Migrating from a git-svn v1 layout...\n";
5773 print STDERR "Data from a previous version of git-svn exists, but\n\t",
5774 "$svn_dir\n\t(required for this version ",
5775 "($::VERSION) of git-svn) does not exist.\n";
5776 my ($fh, $ctx) = command_output_pipe(qw/rev-parse --symbolic --all/);
5779 next unless $x =~ s#^refs/remotes/##;
5781 next unless -f "$git_dir/$x/info/url";
5782 my $u = eval { ::file_to_s("$git_dir/$x/info/url") };
5784 my $dn = dirname("$git_dir/svn/$x");
5785 mkpath([$dn]) unless -d $dn;
5786 if ($x eq 'svn') { # they used 'svn' as GIT_SVN_ID:
5787 mkpath(["$git_dir/svn/svn"]);
5788 print STDERR " - $git_dir/$x/info => ",
5789 "$git_dir/svn/$x/info\n";
5790 rename "$git_dir/$x/info", "$git_dir/svn/$x/info" or
5792 # don't worry too much about these, they probably
5793 # don't exist with repos this old (save for index,
5794 # and we can easily regenerate that)
5795 foreach my $f (qw/unhandled.log index .rev_db/) {
5796 rename "$git_dir/$x/$f", "$git_dir/svn/$x/$f";
5799 print STDERR " - $git_dir/$x => $git_dir/svn/$x\n";
5800 rename "$git_dir/$x", "$git_dir/svn/$x" or
5805 command_close_pipe($fh, $ctx);
5806 print STDERR "Done migrating from a git-svn v1 layout\n";
5811 my ($l_map, $pfx, $path) = @_;
5813 foreach (<$path/*>) {
5814 if (-r "$_/info/url") {
5815 $pfx .= '/' if $pfx && $pfx !~ m!/$!;
5816 my $ref_id = $pfx . basename $_;
5817 my $url = ::file_to_s("$_/info/url");
5818 $l_map->{$ref_id} = $url;
5825 $x =~ s!^\Q$ENV{GIT_DIR}\E/svn/!!o;
5826 read_old_urls($l_map, $x, $_);
5830 sub migrate_from_v2 {
5831 my @cfg = command(qw/config -l/);
5832 return if grep /^svn-remote\..+\.url=/, @cfg;
5834 read_old_urls(\%l_map, '', "$ENV{GIT_DIR}/svn");
5837 foreach my $ref_id (sort keys %l_map) {
5838 eval { Git::SVN->init($l_map{$ref_id}, '', undef, $ref_id) };
5840 Git::SVN->init($l_map{$ref_id}, '', $ref_id, $ref_id);
5847 sub minimize_connections {
5848 my $r = Git::SVN::read_all_remotes();
5850 my $root_repos = {};
5851 foreach my $repo_id (keys %$r) {
5852 my $url = $r->{$repo_id}->{url} or next;
5853 my $fetch = $r->{$repo_id}->{fetch} or next;
5854 my $ra = Git::SVN::Ra->new($url);
5856 # skip existing cases where we already connect to the root
5857 if (($ra->{url} eq $ra->{repos_root}) ||
5858 ($ra->{repos_root} eq $repo_id)) {
5859 $root_repos->{$ra->{url}} = $repo_id;
5863 my $root_ra = Git::SVN::Ra->new($ra->{repos_root});
5864 my $root_path = $ra->{url};
5865 $root_path =~ s#^\Q$ra->{repos_root}\E(/|$)##;
5866 foreach my $path (keys %$fetch) {
5867 my $ref_id = $fetch->{$path};
5868 my $gs = Git::SVN->new($ref_id, $repo_id, $path);
5870 # make sure we can read when connecting to
5871 # a higher level of a repository
5872 my ($last_rev, undef) = $gs->last_rev_commit;
5873 if (!defined $last_rev) {
5875 $root_ra->get_latest_revnum;
5879 my $new = $root_path;
5880 $new .= length $path ? "/$path" : '';
5882 $root_ra->get_log([$new], $last_rev, $last_rev,
5886 $new_urls->{$ra->{repos_root}}->{$new} =
5887 { ref_id => $ref_id,
5888 old_repo_id => $repo_id,
5889 old_path => $path };
5894 foreach my $url (keys %$new_urls) {
5895 # see if we can re-use an existing [svn-remote "repo_id"]
5896 # instead of creating a(n ugly) new section:
5897 my $repo_id = $root_repos->{$url} || $url;
5899 my $fetch = $new_urls->{$url};
5900 foreach my $path (keys %$fetch) {
5901 my $x = $fetch->{$path};
5902 Git::SVN->init($url, $path, $repo_id, $x->{ref_id});
5903 my $pfx = "svn-remote.$x->{old_repo_id}";
5905 my $old_fetch = quotemeta("$x->{old_path}:".
5907 command_noisy(qw/config --unset/,
5908 "$pfx.fetch", '^'. $old_fetch . '$');
5909 delete $r->{$x->{old_repo_id}}->
5910 {fetch}->{$x->{old_path}};
5911 if (!keys %{$r->{$x->{old_repo_id}}->{fetch}}) {
5912 command_noisy(qw/config --unset/,
5914 push @emptied, $x->{old_repo_id}
5919 my $file = $ENV{GIT_CONFIG} || "$ENV{GIT_DIR}/config";
5921 The following [svn-remote] sections in your config file ($file) are empty
5922 and can be safely removed:
5924 print STDERR "[svn-remote \"$_\"]\n" foreach @emptied;
5928 sub migration_check {
5932 minimize_connections() if $_minimize;
5935 package Git::IndexInfo;
5938 use Git qw/command_input_pipe command_close_pipe/;
5942 my ($gui, $ctx) = command_input_pipe(qw/update-index -z --index-info/);
5943 bless { gui => $gui, ctx => $ctx, nr => 0}, $class;
5947 my ($self, $path) = @_;
5948 if (print { $self->{gui} } '0 ', 0 x 40, "\t", $path, "\0") {
5949 return ++$self->{nr};
5955 my ($self, $mode, $hash, $path) = @_;
5956 if (print { $self->{gui} } $mode, ' ', $hash, "\t", $path, "\0") {
5957 return ++$self->{nr};
5964 command_close_pipe($self->{gui}, $self->{ctx});
5967 package Git::SVN::GlobSpec;
5972 my ($class, $glob) = @_;
5974 $re =~ s!/+$!!g; # no need for trailing slashes
5975 $re =~ m!^([^*]*)(\*(?:/\*)*)(.*)$!;
5977 my ($left, $right) = ($1, $3);
5979 my $depth = $re =~ tr/*/*/;
5980 if ($depth != $temp =~ tr/*/*/) {
5981 die "Only one set of wildcard directories " .
5982 "(e.g. '*' or '*/*/*') is supported: '$glob'\n";
5985 die "One '*' is needed for glob: '$glob'\n";
5987 $re =~ s!\*!\[^/\]*!g;
5988 $re = quotemeta($left) . "($re)" . quotemeta($right);
5989 if (length $left && !($left =~ s!/+$!!g)) {
5990 die "Missing trailing '/' on left side of: '$glob' ($left)\n";
5992 if (length $right && !($right =~ s!^/+!!g)) {
5993 die "Missing leading '/' on right side of: '$glob' ($right)\n";
5995 my $left_re = qr/^\/\Q$left\E(\/|$)/;
5996 bless { left => $left, right => $right, left_regex => $left_re,
5997 regex => qr/$re/, glob => $glob, depth => $depth }, $class;
6001 my ($self, $path) = @_;
6002 return (length $self->{left} ? "$self->{left}/" : '') .
6003 $path . (length $self->{right} ? "/$self->{right}" : '');
6011 $remotes = { # returned by read_all_remotes()
6013 # svn-remote.svn.url=https://svn.musicpd.org
6014 url => 'https://svn.musicpd.org',
6015 # svn-remote.svn.fetch=mpd/trunk:trunk
6017 'mpd/trunk' => 'trunk',
6019 # svn-remote.svn.tags=mpd/tags/*:tags/*
6024 regex => qr!mpd/tags/([^/]+)$!,
6030 regex => qr!tags/([^/]+)$!,
6037 $log_entry hashref as returned by libsvn_log_entry()
6039 log => 'whitespace-formatted log entry
6040 ', # trailing newline is preserved
6041 revision => '8', # integer
6042 date => '2004-02-24T17:01:44.108345Z', # commit date
6043 author => 'committer name'
6047 # this is generated by generate_diff();
6048 @mods = array of diff-index line hashes, each element represents one line
6049 of diff-index output
6051 diff-index line ($m hash)
6053 mode_a => first column of diff-index output, no leading ':',
6054 mode_b => second column of diff-index output,
6055 sha1_b => sha1sum of the final blob,
6056 chg => change type [MCRADT],
6057 file_a => original file name of a file (iff chg is 'C' or 'R')
6058 file_b => new/current file name of a file (any chg)
6062 # retval of read_url_paths{,_all}();
6064 # repository root url
6065 'https://svn.musicpd.org' => {
6066 # repository path # GIT_SVN_ID
6067 'mpd/trunk' => 'trunk',
6068 'mpd/tags/0.11.5' => 'tags/0.11.5',
6073 I don't trust the each() function on unless I created %hash myself
6074 because the internal iterator may not have started at base.