imap-send: support subjectAltName as well
[git/jnareb-git.git] / git-svn.perl
blob89f83fd27abe315804173a809b3c7ef00ead6527
1 #!/usr/bin/env perl
2 # Copyright (C) 2006, Eric Wong <normalperson@yhbt.net>
3 # License: GPL v2 or later
4 use 5.008;
5 use warnings;
6 use strict;
7 use vars qw/ $AUTHOR $VERSION
8 $sha1 $sha1_short $_revision $_repository
9 $_q $_authors $_authors_prog %users/;
10 $AUTHOR = 'Eric Wong <normalperson@yhbt.net>';
11 $VERSION = '@@GIT_VERSION@@';
13 # From which subdir have we been invoked?
14 my $cmd_dir_prefix = eval {
15 command_oneline([qw/rev-parse --show-prefix/], STDERR => 0)
16 } || '';
18 my $git_dir_user_set = 1 if defined $ENV{GIT_DIR};
19 $ENV{GIT_DIR} ||= '.git';
20 $Git::SVN::default_repo_id = 'svn';
21 $Git::SVN::default_ref_id = $ENV{GIT_SVN_ID} || 'git-svn';
22 $Git::SVN::Ra::_log_window_size = 100;
23 $Git::SVN::_minimize_url = 'unset';
25 if (! exists $ENV{SVN_SSH}) {
26 if (exists $ENV{GIT_SSH}) {
27 $ENV{SVN_SSH} = $ENV{GIT_SSH};
28 if ($^O eq 'msys') {
29 $ENV{SVN_SSH} =~ s/\\/\\\\/g;
30 $ENV{SVN_SSH} =~ s/(.*)/"$1"/;
35 $Git::SVN::Log::TZ = $ENV{TZ};
36 $ENV{TZ} = 'UTC';
37 $| = 1; # unbuffer STDOUT
39 sub fatal (@) { print STDERR "@_\n"; exit 1 }
40 sub _req_svn {
41 require SVN::Core; # use()-ing this causes segfaults for me... *shrug*
42 require SVN::Ra;
43 require SVN::Delta;
44 if ($SVN::Core::VERSION lt '1.1.0') {
45 fatal "Need SVN::Core 1.1.0 or better (got $SVN::Core::VERSION)";
48 my $can_compress = eval { require Compress::Zlib; 1};
49 push @Git::SVN::Ra::ISA, 'SVN::Ra';
50 push @SVN::Git::Editor::ISA, 'SVN::Delta::Editor';
51 push @SVN::Git::Fetcher::ISA, 'SVN::Delta::Editor';
52 use Carp qw/croak/;
53 use Digest::MD5;
54 use IO::File qw//;
55 use File::Basename qw/dirname basename/;
56 use File::Path qw/mkpath/;
57 use File::Spec;
58 use File::Find;
59 use Getopt::Long qw/:config gnu_getopt no_ignore_case auto_abbrev/;
60 use IPC::Open3;
61 use Git;
62 use Memoize; # core since 5.8.0, Jul 2002
64 BEGIN {
65 # import functions from Git into our packages, en masse
66 no strict 'refs';
67 foreach (qw/command command_oneline command_noisy command_output_pipe
68 command_input_pipe command_close_pipe
69 command_bidi_pipe command_close_bidi_pipe/) {
70 for my $package ( qw(SVN::Git::Editor SVN::Git::Fetcher
71 Git::SVN::Migration Git::SVN::Log Git::SVN),
72 __PACKAGE__) {
73 *{"${package}::$_"} = \&{"Git::$_"};
76 Memoize::memoize 'Git::config';
77 Memoize::memoize 'Git::config_bool';
80 my ($SVN);
82 $sha1 = qr/[a-f\d]{40}/;
83 $sha1_short = qr/[a-f\d]{4,40}/;
84 my ($_stdin, $_help, $_edit,
85 $_message, $_file, $_branch_dest,
86 $_template, $_shared,
87 $_version, $_fetch_all, $_no_rebase, $_fetch_parent,
88 $_merge, $_strategy, $_dry_run, $_local,
89 $_prefix, $_no_checkout, $_url, $_verbose,
90 $_git_format, $_commit_url, $_tag, $_merge_info);
91 $Git::SVN::_follow_parent = 1;
92 $_q ||= 0;
93 my %remote_opts = ( 'username=s' => \$Git::SVN::Prompt::_username,
94 'config-dir=s' => \$Git::SVN::Ra::config_dir,
95 'no-auth-cache' => \$Git::SVN::Prompt::_no_auth_cache,
96 'ignore-paths=s' => \$SVN::Git::Fetcher::_ignore_regex );
97 my %fc_opts = ( 'follow-parent|follow!' => \$Git::SVN::_follow_parent,
98 'authors-file|A=s' => \$_authors,
99 'authors-prog=s' => \$_authors_prog,
100 'repack:i' => \$Git::SVN::_repack,
101 'noMetadata' => \$Git::SVN::_no_metadata,
102 'useSvmProps' => \$Git::SVN::_use_svm_props,
103 'useSvnsyncProps' => \$Git::SVN::_use_svnsync_props,
104 'log-window-size=i' => \$Git::SVN::Ra::_log_window_size,
105 'no-checkout' => \$_no_checkout,
106 'quiet|q+' => \$_q,
107 'repack-flags|repack-args|repack-opts=s' =>
108 \$Git::SVN::_repack_flags,
109 'use-log-author' => \$Git::SVN::_use_log_author,
110 'add-author-from' => \$Git::SVN::_add_author_from,
111 'localtime' => \$Git::SVN::_localtime,
112 %remote_opts );
114 my ($_trunk, @_tags, @_branches, $_stdlayout);
115 my %icv;
116 my %init_opts = ( 'template=s' => \$_template, 'shared:s' => \$_shared,
117 'trunk|T=s' => \$_trunk, 'tags|t=s@' => \@_tags,
118 'branches|b=s@' => \@_branches, 'prefix=s' => \$_prefix,
119 'stdlayout|s' => \$_stdlayout,
120 'minimize-url|m!' => \$Git::SVN::_minimize_url,
121 'no-metadata' => sub { $icv{noMetadata} = 1 },
122 'use-svm-props' => sub { $icv{useSvmProps} = 1 },
123 'use-svnsync-props' => sub { $icv{useSvnsyncProps} = 1 },
124 'rewrite-root=s' => sub { $icv{rewriteRoot} = $_[1] },
125 'rewrite-uuid=s' => sub { $icv{rewriteUUID} = $_[1] },
126 %remote_opts );
127 my %cmt_opts = ( 'edit|e' => \$_edit,
128 'rmdir' => \$SVN::Git::Editor::_rmdir,
129 'find-copies-harder' => \$SVN::Git::Editor::_find_copies_harder,
130 'l=i' => \$SVN::Git::Editor::_rename_limit,
131 'copy-similarity|C=i'=> \$SVN::Git::Editor::_cp_similarity
134 my %cmd = (
135 fetch => [ \&cmd_fetch, "Download new revisions from SVN",
136 { 'revision|r=s' => \$_revision,
137 'fetch-all|all' => \$_fetch_all,
138 'parent|p' => \$_fetch_parent,
139 %fc_opts } ],
140 clone => [ \&cmd_clone, "Initialize and fetch revisions",
141 { 'revision|r=s' => \$_revision,
142 %fc_opts, %init_opts } ],
143 init => [ \&cmd_init, "Initialize a repo for tracking" .
144 " (requires URL argument)",
145 \%init_opts ],
146 'multi-init' => [ \&cmd_multi_init,
147 "Deprecated alias for ".
148 "'$0 init -T<trunk> -b<branches> -t<tags>'",
149 \%init_opts ],
150 dcommit => [ \&cmd_dcommit,
151 'Commit several diffs to merge with upstream',
152 { 'merge|m|M' => \$_merge,
153 'strategy|s=s' => \$_strategy,
154 'verbose|v' => \$_verbose,
155 'dry-run|n' => \$_dry_run,
156 'fetch-all|all' => \$_fetch_all,
157 'commit-url=s' => \$_commit_url,
158 'revision|r=i' => \$_revision,
159 'no-rebase' => \$_no_rebase,
160 'mergeinfo=s' => \$_merge_info,
161 %cmt_opts, %fc_opts } ],
162 branch => [ \&cmd_branch,
163 'Create a branch in the SVN repository',
164 { 'message|m=s' => \$_message,
165 'destination|d=s' => \$_branch_dest,
166 'dry-run|n' => \$_dry_run,
167 'tag|t' => \$_tag,
168 'username=s' => \$Git::SVN::Prompt::_username,
169 'commit-url=s' => \$_commit_url } ],
170 tag => [ sub { $_tag = 1; cmd_branch(@_) },
171 'Create a tag in the SVN repository',
172 { 'message|m=s' => \$_message,
173 'destination|d=s' => \$_branch_dest,
174 'dry-run|n' => \$_dry_run,
175 'username=s' => \$Git::SVN::Prompt::_username,
176 'commit-url=s' => \$_commit_url } ],
177 'set-tree' => [ \&cmd_set_tree,
178 "Set an SVN repository to a git tree-ish",
179 { 'stdin' => \$_stdin, %cmt_opts, %fc_opts, } ],
180 'create-ignore' => [ \&cmd_create_ignore,
181 'Create a .gitignore per svn:ignore',
182 { 'revision|r=i' => \$_revision
183 } ],
184 'mkdirs' => [ \&cmd_mkdirs ,
185 "recreate empty directories after a checkout",
186 { 'revision|r=i' => \$_revision } ],
187 'propget' => [ \&cmd_propget,
188 'Print the value of a property on a file or directory',
189 { 'revision|r=i' => \$_revision } ],
190 'proplist' => [ \&cmd_proplist,
191 'List all properties of a file or directory',
192 { 'revision|r=i' => \$_revision } ],
193 'show-ignore' => [ \&cmd_show_ignore, "Show svn:ignore listings",
194 { 'revision|r=i' => \$_revision
195 } ],
196 'show-externals' => [ \&cmd_show_externals, "Show svn:externals listings",
197 { 'revision|r=i' => \$_revision
198 } ],
199 'multi-fetch' => [ \&cmd_multi_fetch,
200 "Deprecated alias for $0 fetch --all",
201 { 'revision|r=s' => \$_revision, %fc_opts } ],
202 'migrate' => [ sub { },
203 # no-op, we automatically run this anyways,
204 'Migrate configuration/metadata/layout from
205 previous versions of git-svn',
206 { 'minimize' => \$Git::SVN::Migration::_minimize,
207 %remote_opts } ],
208 'log' => [ \&Git::SVN::Log::cmd_show_log, 'Show commit logs',
209 { 'limit=i' => \$Git::SVN::Log::limit,
210 'revision|r=s' => \$_revision,
211 'verbose|v' => \$Git::SVN::Log::verbose,
212 'incremental' => \$Git::SVN::Log::incremental,
213 'oneline' => \$Git::SVN::Log::oneline,
214 'show-commit' => \$Git::SVN::Log::show_commit,
215 'non-recursive' => \$Git::SVN::Log::non_recursive,
216 'authors-file|A=s' => \$_authors,
217 'color' => \$Git::SVN::Log::color,
218 'pager=s' => \$Git::SVN::Log::pager
219 } ],
220 'find-rev' => [ \&cmd_find_rev,
221 "Translate between SVN revision numbers and tree-ish",
222 {} ],
223 'rebase' => [ \&cmd_rebase, "Fetch and rebase your working directory",
224 { 'merge|m|M' => \$_merge,
225 'verbose|v' => \$_verbose,
226 'strategy|s=s' => \$_strategy,
227 'local|l' => \$_local,
228 'fetch-all|all' => \$_fetch_all,
229 'dry-run|n' => \$_dry_run,
230 %fc_opts } ],
231 'commit-diff' => [ \&cmd_commit_diff,
232 'Commit a diff between two trees',
233 { 'message|m=s' => \$_message,
234 'file|F=s' => \$_file,
235 'revision|r=s' => \$_revision,
236 %cmt_opts } ],
237 'info' => [ \&cmd_info,
238 "Show info about the latest SVN revision
239 on the current branch",
240 { 'url' => \$_url, } ],
241 'blame' => [ \&Git::SVN::Log::cmd_blame,
242 "Show what revision and author last modified each line of a file",
243 { 'git-format' => \$_git_format } ],
244 'reset' => [ \&cmd_reset,
245 "Undo fetches back to the specified SVN revision",
246 { 'revision|r=s' => \$_revision,
247 'parent|p' => \$_fetch_parent } ],
248 'gc' => [ \&cmd_gc,
249 "Compress unhandled.log files in .git/svn and remove " .
250 "index files in .git/svn",
251 {} ],
254 my $cmd;
255 for (my $i = 0; $i < @ARGV; $i++) {
256 if (defined $cmd{$ARGV[$i]}) {
257 $cmd = $ARGV[$i];
258 splice @ARGV, $i, 1;
259 last;
260 } elsif ($ARGV[$i] eq 'help') {
261 $cmd = $ARGV[$i+1];
262 usage(0);
266 # make sure we're always running at the top-level working directory
267 unless ($cmd && $cmd =~ /(?:clone|init|multi-init)$/) {
268 unless (-d $ENV{GIT_DIR}) {
269 if ($git_dir_user_set) {
270 die "GIT_DIR=$ENV{GIT_DIR} explicitly set, ",
271 "but it is not a directory\n";
273 my $git_dir = delete $ENV{GIT_DIR};
274 my $cdup = undef;
275 git_cmd_try {
276 $cdup = command_oneline(qw/rev-parse --show-cdup/);
277 $git_dir = '.' unless ($cdup);
278 chomp $cdup if ($cdup);
279 $cdup = "." unless ($cdup && length $cdup);
280 } "Already at toplevel, but $git_dir not found\n";
281 chdir $cdup or die "Unable to chdir up to '$cdup'\n";
282 unless (-d $git_dir) {
283 die "$git_dir still not found after going to ",
284 "'$cdup'\n";
286 $ENV{GIT_DIR} = $git_dir;
288 $_repository = Git->repository(Repository => $ENV{GIT_DIR});
291 my %opts = %{$cmd{$cmd}->[2]} if (defined $cmd);
293 read_git_config(\%opts);
294 if ($cmd && ($cmd eq 'log' || $cmd eq 'blame')) {
295 Getopt::Long::Configure('pass_through');
297 my $rv = GetOptions(%opts, 'help|H|h' => \$_help, 'version|V' => \$_version,
298 'minimize-connections' => \$Git::SVN::Migration::_minimize,
299 'id|i=s' => \$Git::SVN::default_ref_id,
300 'svn-remote|remote|R=s' => sub {
301 $Git::SVN::no_reuse_existing = 1;
302 $Git::SVN::default_repo_id = $_[1] });
303 exit 1 if (!$rv && $cmd && $cmd ne 'log');
305 usage(0) if $_help;
306 version() if $_version;
307 usage(1) unless defined $cmd;
308 load_authors() if $_authors;
309 if (defined $_authors_prog) {
310 $_authors_prog = "'" . File::Spec->rel2abs($_authors_prog) . "'";
313 unless ($cmd =~ /^(?:clone|init|multi-init|commit-diff)$/) {
314 Git::SVN::Migration::migration_check();
316 Git::SVN::init_vars();
317 eval {
318 Git::SVN::verify_remotes_sanity();
319 $cmd{$cmd}->[0]->(@ARGV);
321 fatal $@ if $@;
322 post_fetch_checkout();
323 exit 0;
325 ####################### primary functions ######################
326 sub usage {
327 my $exit = shift || 0;
328 my $fd = $exit ? \*STDERR : \*STDOUT;
329 print $fd <<"";
330 git-svn - bidirectional operations between a single Subversion tree and git
331 Usage: git svn <command> [options] [arguments]\n
333 print $fd "Available commands:\n" unless $cmd;
335 foreach (sort keys %cmd) {
336 next if $cmd && $cmd ne $_;
337 next if /^multi-/; # don't show deprecated commands
338 print $fd ' ',pack('A17',$_),$cmd{$_}->[1],"\n";
339 foreach (sort keys %{$cmd{$_}->[2]}) {
340 # mixed-case options are for .git/config only
341 next if /[A-Z]/ && /^[a-z]+$/i;
342 # prints out arguments as they should be passed:
343 my $x = s#[:=]s$## ? '<arg>' : s#[:=]i$## ? '<num>' : '';
344 print $fd ' ' x 21, join(', ', map { length $_ > 1 ?
345 "--$_" : "-$_" }
346 split /\|/,$_)," $x\n";
349 print $fd <<"";
350 \nGIT_SVN_ID may be set in the environment or via the --id/-i switch to an
351 arbitrary identifier if you're tracking multiple SVN branches/repositories in
352 one git repository and want to keep them separate. See git-svn(1) for more
353 information.
355 exit $exit;
358 sub version {
359 ::_req_svn();
360 print "git-svn version $VERSION (svn $SVN::Core::VERSION)\n";
361 exit 0;
364 sub do_git_init_db {
365 unless (-d $ENV{GIT_DIR}) {
366 my @init_db = ('init');
367 push @init_db, "--template=$_template" if defined $_template;
368 if (defined $_shared) {
369 if ($_shared =~ /[a-z]/) {
370 push @init_db, "--shared=$_shared";
371 } else {
372 push @init_db, "--shared";
375 command_noisy(@init_db);
376 $_repository = Git->repository(Repository => ".git");
378 my $set;
379 my $pfx = "svn-remote.$Git::SVN::default_repo_id";
380 foreach my $i (keys %icv) {
381 die "'$set' and '$i' cannot both be set\n" if $set;
382 next unless defined $icv{$i};
383 command_noisy('config', "$pfx.$i", $icv{$i});
384 $set = $i;
386 my $ignore_regex = \$SVN::Git::Fetcher::_ignore_regex;
387 command_noisy('config', "$pfx.ignore-paths", $$ignore_regex)
388 if defined $$ignore_regex;
391 sub init_subdir {
392 my $repo_path = shift or return;
393 mkpath([$repo_path]) unless -d $repo_path;
394 chdir $repo_path or die "Couldn't chdir to $repo_path: $!\n";
395 $ENV{GIT_DIR} = '.git';
396 $_repository = Git->repository(Repository => $ENV{GIT_DIR});
399 sub cmd_clone {
400 my ($url, $path) = @_;
401 if (!defined $path &&
402 (defined $_trunk || @_branches || @_tags ||
403 defined $_stdlayout) &&
404 $url !~ m#^[a-z\+]+://#) {
405 $path = $url;
407 $path = basename($url) if !defined $path || !length $path;
408 my $authors_absolute = $_authors ? File::Spec->rel2abs($_authors) : "";
409 cmd_init($url, $path);
410 command_oneline('config', 'svn.authorsfile', $authors_absolute)
411 if $_authors;
412 Git::SVN::fetch_all($Git::SVN::default_repo_id);
415 sub cmd_init {
416 if (defined $_stdlayout) {
417 $_trunk = 'trunk' if (!defined $_trunk);
418 @_tags = 'tags' if (! @_tags);
419 @_branches = 'branches' if (! @_branches);
421 if (defined $_trunk || @_branches || @_tags) {
422 return cmd_multi_init(@_);
424 my $url = shift or die "SVN repository location required ",
425 "as a command-line argument\n";
426 $url = canonicalize_url($url);
427 init_subdir(@_);
428 do_git_init_db();
430 if ($Git::SVN::_minimize_url eq 'unset') {
431 $Git::SVN::_minimize_url = 0;
434 Git::SVN->init($url);
437 sub cmd_fetch {
438 if (grep /^\d+=./, @_) {
439 die "'<rev>=<commit>' fetch arguments are ",
440 "no longer supported.\n";
442 my ($remote) = @_;
443 if (@_ > 1) {
444 die "Usage: $0 fetch [--all] [--parent] [svn-remote]\n";
446 $Git::SVN::no_reuse_existing = undef;
447 if ($_fetch_parent) {
448 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
449 unless ($gs) {
450 die "Unable to determine upstream SVN information from ",
451 "working tree history\n";
453 # just fetch, don't checkout.
454 $_no_checkout = 'true';
455 $_fetch_all ? $gs->fetch_all : $gs->fetch;
456 } elsif ($_fetch_all) {
457 cmd_multi_fetch();
458 } else {
459 $remote ||= $Git::SVN::default_repo_id;
460 Git::SVN::fetch_all($remote, Git::SVN::read_all_remotes());
464 sub cmd_set_tree {
465 my (@commits) = @_;
466 if ($_stdin || !@commits) {
467 print "Reading from stdin...\n";
468 @commits = ();
469 while (<STDIN>) {
470 if (/\b($sha1_short)\b/o) {
471 unshift @commits, $1;
475 my @revs;
476 foreach my $c (@commits) {
477 my @tmp = command('rev-parse',$c);
478 if (scalar @tmp == 1) {
479 push @revs, $tmp[0];
480 } elsif (scalar @tmp > 1) {
481 push @revs, reverse(command('rev-list',@tmp));
482 } else {
483 fatal "Failed to rev-parse $c";
486 my $gs = Git::SVN->new;
487 my ($r_last, $cmt_last) = $gs->last_rev_commit;
488 $gs->fetch;
489 if (defined $gs->{last_rev} && $r_last != $gs->{last_rev}) {
490 fatal "There are new revisions that were fetched ",
491 "and need to be merged (or acknowledged) ",
492 "before committing.\nlast rev: $r_last\n",
493 " current: $gs->{last_rev}";
495 $gs->set_tree($_) foreach @revs;
496 print "Done committing ",scalar @revs," revisions to SVN\n";
497 unlink $gs->{index};
500 sub cmd_dcommit {
501 my $head = shift;
502 command_noisy(qw/update-index --refresh/);
503 git_cmd_try { command_oneline(qw/diff-index --quiet HEAD/) }
504 'Cannot dcommit with a dirty index. Commit your changes first, '
505 . "or stash them with `git stash'.\n";
506 $head ||= 'HEAD';
508 my $old_head;
509 if ($head ne 'HEAD') {
510 $old_head = eval {
511 command_oneline([qw/symbolic-ref -q HEAD/])
513 if ($old_head) {
514 $old_head =~ s{^refs/heads/}{};
515 } else {
516 $old_head = eval { command_oneline(qw/rev-parse HEAD/) };
518 command(['checkout', $head], STDERR => 0);
521 my @refs;
522 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD', \@refs);
523 unless ($gs) {
524 die "Unable to determine upstream SVN information from ",
525 "$head history.\nPerhaps the repository is empty.";
528 if (defined $_commit_url) {
529 $url = $_commit_url;
530 } else {
531 $url = eval { command_oneline('config', '--get',
532 "svn-remote.$gs->{repo_id}.commiturl") };
533 if (!$url) {
534 $url = $gs->full_pushurl
538 my $last_rev = $_revision if defined $_revision;
539 if ($url) {
540 print "Committing to $url ...\n";
542 my ($linear_refs, $parents) = linearize_history($gs, \@refs);
543 if ($_no_rebase && scalar(@$linear_refs) > 1) {
544 warn "Attempting to commit more than one change while ",
545 "--no-rebase is enabled.\n",
546 "If these changes depend on each other, re-running ",
547 "without --no-rebase may be required."
549 my $expect_url = $url;
550 Git::SVN::remove_username($expect_url);
551 while (1) {
552 my $d = shift @$linear_refs or last;
553 unless (defined $last_rev) {
554 (undef, $last_rev, undef) = cmt_metadata("$d~1");
555 unless (defined $last_rev) {
556 fatal "Unable to extract revision information ",
557 "from commit $d~1";
560 if ($_dry_run) {
561 print "diff-tree $d~1 $d\n";
562 } else {
563 my $cmt_rev;
564 my %ed_opts = ( r => $last_rev,
565 log => get_commit_entry($d)->{log},
566 ra => Git::SVN::Ra->new($url),
567 config => SVN::Core::config_get_config(
568 $Git::SVN::Ra::config_dir
570 tree_a => "$d~1",
571 tree_b => $d,
572 editor_cb => sub {
573 print "Committed r$_[0]\n";
574 $cmt_rev = $_[0];
576 mergeinfo => $_merge_info,
577 svn_path => '');
578 if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) {
579 print "No changes\n$d~1 == $d\n";
580 } elsif ($parents->{$d} && @{$parents->{$d}}) {
581 $gs->{inject_parents_dcommit}->{$cmt_rev} =
582 $parents->{$d};
584 $_fetch_all ? $gs->fetch_all : $gs->fetch;
585 $last_rev = $cmt_rev;
586 next if $_no_rebase;
588 # we always want to rebase against the current HEAD,
589 # not any head that was passed to us
590 my @diff = command('diff-tree', $d,
591 $gs->refname, '--');
592 my @finish;
593 if (@diff) {
594 @finish = rebase_cmd();
595 print STDERR "W: $d and ", $gs->refname,
596 " differ, using @finish:\n",
597 join("\n", @diff), "\n";
598 } else {
599 print "No changes between current HEAD and ",
600 $gs->refname,
601 "\nResetting to the latest ",
602 $gs->refname, "\n";
603 @finish = qw/reset --mixed/;
605 command_noisy(@finish, $gs->refname);
606 if (@diff) {
607 @refs = ();
608 my ($url_, $rev_, $uuid_, $gs_) =
609 working_head_info('HEAD', \@refs);
610 my ($linear_refs_, $parents_) =
611 linearize_history($gs_, \@refs);
612 if (scalar(@$linear_refs) !=
613 scalar(@$linear_refs_)) {
614 fatal "# of revisions changed ",
615 "\nbefore:\n",
616 join("\n", @$linear_refs),
617 "\n\nafter:\n",
618 join("\n", @$linear_refs_), "\n",
619 'If you are attempting to commit ',
620 "merges, try running:\n\t",
621 'git rebase --interactive',
622 '--preserve-merges ',
623 $gs->refname,
624 "\nBefore dcommitting";
626 if ($url_ ne $expect_url) {
627 if ($url_ eq $gs->metadata_url) {
628 print
629 "Accepting rewritten URL:",
630 " $url_\n";
631 } else {
632 fatal
633 "URL mismatch after rebase:",
634 " $url_ != $expect_url";
637 if ($uuid_ ne $uuid) {
638 fatal "uuid mismatch after rebase: ",
639 "$uuid_ != $uuid";
641 # remap parents
642 my (%p, @l, $i);
643 for ($i = 0; $i < scalar @$linear_refs; $i++) {
644 my $new = $linear_refs_->[$i] or next;
645 $p{$new} =
646 $parents->{$linear_refs->[$i]};
647 push @l, $new;
649 $parents = \%p;
650 $linear_refs = \@l;
655 if ($old_head) {
656 my $new_head = command_oneline(qw/rev-parse HEAD/);
657 my $new_is_symbolic = eval {
658 command_oneline(qw/symbolic-ref -q HEAD/);
660 if ($new_is_symbolic) {
661 print "dcommitted the branch ", $head, "\n";
662 } else {
663 print "dcommitted on a detached HEAD because you gave ",
664 "a revision argument.\n",
665 "The rewritten commit is: ", $new_head, "\n";
667 command(['checkout', $old_head], STDERR => 0);
670 unlink $gs->{index};
673 sub cmd_branch {
674 my ($branch_name, $head) = @_;
676 unless (defined $branch_name && length $branch_name) {
677 die(($_tag ? "tag" : "branch") . " name required\n");
679 $head ||= 'HEAD';
681 my (undef, $rev, undef, $gs) = working_head_info($head);
682 my $src = $gs->full_pushurl;
684 my $remote = Git::SVN::read_all_remotes()->{$gs->{repo_id}};
685 my $allglobs = $remote->{ $_tag ? 'tags' : 'branches' };
686 my $glob;
687 if ($#{$allglobs} == 0) {
688 $glob = $allglobs->[0];
689 } else {
690 unless(defined $_branch_dest) {
691 die "Multiple ",
692 $_tag ? "tag" : "branch",
693 " paths defined for Subversion repository.\n",
694 "You must specify where you want to create the ",
695 $_tag ? "tag" : "branch",
696 " with the --destination argument.\n";
698 foreach my $g (@{$allglobs}) {
699 # SVN::Git::Editor could probably be moved to Git.pm..
700 my $re = SVN::Git::Editor::glob2pat($g->{path}->{left});
701 if ($_branch_dest =~ /$re/) {
702 $glob = $g;
703 last;
706 unless (defined $glob) {
707 my $dest_re = qr/\b\Q$_branch_dest\E\b/;
708 foreach my $g (@{$allglobs}) {
709 $g->{path}->{left} =~ /$dest_re/ or next;
710 if (defined $glob) {
711 die "Ambiguous destination: ",
712 $_branch_dest, "\nmatches both '",
713 $glob->{path}->{left}, "' and '",
714 $g->{path}->{left}, "'\n";
716 $glob = $g;
718 unless (defined $glob) {
719 die "Unknown ",
720 $_tag ? "tag" : "branch",
721 " destination $_branch_dest\n";
725 my ($lft, $rgt) = @{ $glob->{path} }{qw/left right/};
726 my $url;
727 if (defined $_commit_url) {
728 $url = $_commit_url;
729 } else {
730 $url = eval { command_oneline('config', '--get',
731 "svn-remote.$gs->{repo_id}.commiturl") };
732 if (!$url) {
733 $url = $remote->{pushurl} || $remote->{url};
736 my $dst = join '/', $url, $lft, $branch_name, ($rgt || ());
738 if ($dst =~ /^https:/ && $src =~ /^http:/) {
739 $src=~s/^http:/https:/;
742 ::_req_svn();
744 my $ctx = SVN::Client->new(
745 auth => Git::SVN::Ra::_auth_providers(),
746 log_msg => sub {
747 ${ $_[0] } = defined $_message
748 ? $_message
749 : 'Create ' . ($_tag ? 'tag ' : 'branch ' )
750 . $branch_name;
754 eval {
755 $ctx->ls($dst, 'HEAD', 0);
756 } and die "branch ${branch_name} already exists\n";
758 print "Copying ${src} at r${rev} to ${dst}...\n";
759 $ctx->copy($src, $rev, $dst)
760 unless $_dry_run;
762 $gs->fetch_all;
765 sub cmd_find_rev {
766 my $revision_or_hash = shift or die "SVN or git revision required ",
767 "as a command-line argument\n";
768 my $result;
769 if ($revision_or_hash =~ /^r\d+$/) {
770 my $head = shift;
771 $head ||= 'HEAD';
772 my @refs;
773 my (undef, undef, $uuid, $gs) = working_head_info($head, \@refs);
774 unless ($gs) {
775 die "Unable to determine upstream SVN information from ",
776 "$head history\n";
778 my $desired_revision = substr($revision_or_hash, 1);
779 $result = $gs->rev_map_get($desired_revision, $uuid);
780 } else {
781 my (undef, $rev, undef) = cmt_metadata($revision_or_hash);
782 $result = $rev;
784 print "$result\n" if $result;
787 sub auto_create_empty_directories {
788 my ($gs) = @_;
789 my $var = eval { command_oneline('config', '--get', '--bool',
790 "svn-remote.$gs->{repo_id}.automkdirs") };
791 # By default, create empty directories by consulting the unhandled log,
792 # but allow setting it to 'false' to skip it.
793 return !($var && $var eq 'false');
796 sub cmd_rebase {
797 command_noisy(qw/update-index --refresh/);
798 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
799 unless ($gs) {
800 die "Unable to determine upstream SVN information from ",
801 "working tree history\n";
803 if ($_dry_run) {
804 print "Remote Branch: " . $gs->refname . "\n";
805 print "SVN URL: " . $url . "\n";
806 return;
808 if (command(qw/diff-index HEAD --/)) {
809 print STDERR "Cannot rebase with uncommited changes:\n";
810 command_noisy('status');
811 exit 1;
813 unless ($_local) {
814 # rebase will checkout for us, so no need to do it explicitly
815 $_no_checkout = 'true';
816 $_fetch_all ? $gs->fetch_all : $gs->fetch;
818 command_noisy(rebase_cmd(), $gs->refname);
819 if (auto_create_empty_directories($gs)) {
820 $gs->mkemptydirs;
824 sub cmd_show_ignore {
825 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
826 $gs ||= Git::SVN->new;
827 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
828 $gs->prop_walk($gs->{path}, $r, sub {
829 my ($gs, $path, $props) = @_;
830 print STDOUT "\n# $path\n";
831 my $s = $props->{'svn:ignore'} or return;
832 $s =~ s/[\r\n]+/\n/g;
833 $s =~ s/^\n+//;
834 chomp $s;
835 $s =~ s#^#$path#gm;
836 print STDOUT "$s\n";
840 sub cmd_show_externals {
841 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
842 $gs ||= Git::SVN->new;
843 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
844 $gs->prop_walk($gs->{path}, $r, sub {
845 my ($gs, $path, $props) = @_;
846 print STDOUT "\n# $path\n";
847 my $s = $props->{'svn:externals'} or return;
848 $s =~ s/[\r\n]+/\n/g;
849 chomp $s;
850 $s =~ s#^#$path#gm;
851 print STDOUT "$s\n";
855 sub cmd_create_ignore {
856 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
857 $gs ||= Git::SVN->new;
858 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
859 $gs->prop_walk($gs->{path}, $r, sub {
860 my ($gs, $path, $props) = @_;
861 # $path is of the form /path/to/dir/
862 $path = '.' . $path;
863 # SVN can have attributes on empty directories,
864 # which git won't track
865 mkpath([$path]) unless -d $path;
866 my $ignore = $path . '.gitignore';
867 my $s = $props->{'svn:ignore'} or return;
868 open(GITIGNORE, '>', $ignore)
869 or fatal("Failed to open `$ignore' for writing: $!");
870 $s =~ s/[\r\n]+/\n/g;
871 $s =~ s/^\n+//;
872 chomp $s;
873 # Prefix all patterns so that the ignore doesn't apply
874 # to sub-directories.
875 $s =~ s#^#/#gm;
876 print GITIGNORE "$s\n";
877 close(GITIGNORE)
878 or fatal("Failed to close `$ignore': $!");
879 command_noisy('add', '-f', $ignore);
883 sub cmd_mkdirs {
884 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
885 $gs ||= Git::SVN->new;
886 $gs->mkemptydirs($_revision);
889 sub canonicalize_path {
890 my ($path) = @_;
891 my $dot_slash_added = 0;
892 if (substr($path, 0, 1) ne "/") {
893 $path = "./" . $path;
894 $dot_slash_added = 1;
896 # File::Spec->canonpath doesn't collapse x/../y into y (for a
897 # good reason), so let's do this manually.
898 $path =~ s#/+#/#g;
899 $path =~ s#/\.(?:/|$)#/#g;
900 $path =~ s#/[^/]+/\.\.##g;
901 $path =~ s#/$##g;
902 $path =~ s#^\./## if $dot_slash_added;
903 $path =~ s#^/##;
904 $path =~ s#^\.$##;
905 return $path;
908 sub canonicalize_url {
909 my ($url) = @_;
910 $url =~ s#^([^:]+://[^/]*/)(.*)$#$1 . canonicalize_path($2)#e;
911 return $url;
914 # get_svnprops(PATH)
915 # ------------------
916 # Helper for cmd_propget and cmd_proplist below.
917 sub get_svnprops {
918 my $path = shift;
919 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
920 $gs ||= Git::SVN->new;
922 # prefix THE PATH by the sub-directory from which the user
923 # invoked us.
924 $path = $cmd_dir_prefix . $path;
925 fatal("No such file or directory: $path") unless -e $path;
926 my $is_dir = -d $path ? 1 : 0;
927 $path = $gs->{path} . '/' . $path;
929 # canonicalize the path (otherwise libsvn will abort or fail to
930 # find the file)
931 $path = canonicalize_path($path);
933 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
934 my $props;
935 if ($is_dir) {
936 (undef, undef, $props) = $gs->ra->get_dir($path, $r);
938 else {
939 (undef, $props) = $gs->ra->get_file($path, $r, undef);
941 return $props;
944 # cmd_propget (PROP, PATH)
945 # ------------------------
946 # Print the SVN property PROP for PATH.
947 sub cmd_propget {
948 my ($prop, $path) = @_;
949 $path = '.' if not defined $path;
950 usage(1) if not defined $prop;
951 my $props = get_svnprops($path);
952 if (not defined $props->{$prop}) {
953 fatal("`$path' does not have a `$prop' SVN property.");
955 print $props->{$prop} . "\n";
958 # cmd_proplist (PATH)
959 # -------------------
960 # Print the list of SVN properties for PATH.
961 sub cmd_proplist {
962 my $path = shift;
963 $path = '.' if not defined $path;
964 my $props = get_svnprops($path);
965 print "Properties on '$path':\n";
966 foreach (sort keys %{$props}) {
967 print " $_\n";
971 sub cmd_multi_init {
972 my $url = shift;
973 unless (defined $_trunk || @_branches || @_tags) {
974 usage(1);
977 $_prefix = '' unless defined $_prefix;
978 if (defined $url) {
979 $url = canonicalize_url($url);
980 init_subdir(@_);
982 do_git_init_db();
983 if (defined $_trunk) {
984 $_trunk =~ s#^/+##;
985 my $trunk_ref = 'refs/remotes/' . $_prefix . 'trunk';
986 # try both old-style and new-style lookups:
987 my $gs_trunk = eval { Git::SVN->new($trunk_ref) };
988 unless ($gs_trunk) {
989 my ($trunk_url, $trunk_path) =
990 complete_svn_url($url, $_trunk);
991 $gs_trunk = Git::SVN->init($trunk_url, $trunk_path,
992 undef, $trunk_ref);
995 return unless @_branches || @_tags;
996 my $ra = $url ? Git::SVN::Ra->new($url) : undef;
997 foreach my $path (@_branches) {
998 complete_url_ls_init($ra, $path, '--branches/-b', $_prefix);
1000 foreach my $path (@_tags) {
1001 complete_url_ls_init($ra, $path, '--tags/-t', $_prefix.'tags/');
1005 sub cmd_multi_fetch {
1006 $Git::SVN::no_reuse_existing = undef;
1007 my $remotes = Git::SVN::read_all_remotes();
1008 foreach my $repo_id (sort keys %$remotes) {
1009 if ($remotes->{$repo_id}->{url}) {
1010 Git::SVN::fetch_all($repo_id, $remotes);
1015 # this command is special because it requires no metadata
1016 sub cmd_commit_diff {
1017 my ($ta, $tb, $url) = @_;
1018 my $usage = "Usage: $0 commit-diff -r<revision> ".
1019 "<tree-ish> <tree-ish> [<URL>]";
1020 fatal($usage) if (!defined $ta || !defined $tb);
1021 my $svn_path = '';
1022 if (!defined $url) {
1023 my $gs = eval { Git::SVN->new };
1024 if (!$gs) {
1025 fatal("Needed URL or usable git-svn --id in ",
1026 "the command-line\n", $usage);
1028 $url = $gs->{url};
1029 $svn_path = $gs->{path};
1031 unless (defined $_revision) {
1032 fatal("-r|--revision is a required argument\n", $usage);
1034 if (defined $_message && defined $_file) {
1035 fatal("Both --message/-m and --file/-F specified ",
1036 "for the commit message.\n",
1037 "I have no idea what you mean");
1039 if (defined $_file) {
1040 $_message = file_to_s($_file);
1041 } else {
1042 $_message ||= get_commit_entry($tb)->{log};
1044 my $ra ||= Git::SVN::Ra->new($url);
1045 my $r = $_revision;
1046 if ($r eq 'HEAD') {
1047 $r = $ra->get_latest_revnum;
1048 } elsif ($r !~ /^\d+$/) {
1049 die "revision argument: $r not understood by git-svn\n";
1051 my %ed_opts = ( r => $r,
1052 log => $_message,
1053 ra => $ra,
1054 tree_a => $ta,
1055 tree_b => $tb,
1056 editor_cb => sub { print "Committed r$_[0]\n" },
1057 svn_path => $svn_path );
1058 if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) {
1059 print "No changes\n$ta == $tb\n";
1063 sub escape_uri_only {
1064 my ($uri) = @_;
1065 my @tmp;
1066 foreach (split m{/}, $uri) {
1067 s/([^~\w.%+-]|%(?![a-fA-F0-9]{2}))/sprintf("%%%02X",ord($1))/eg;
1068 push @tmp, $_;
1070 join('/', @tmp);
1073 sub escape_url {
1074 my ($url) = @_;
1075 if ($url =~ m#^([^:]+)://([^/]*)(.*)$#) {
1076 my ($scheme, $domain, $uri) = ($1, $2, escape_uri_only($3));
1077 $url = "$scheme://$domain$uri";
1079 $url;
1082 sub cmd_info {
1083 my $path = canonicalize_path(defined($_[0]) ? $_[0] : ".");
1084 my $fullpath = canonicalize_path($cmd_dir_prefix . $path);
1085 if (exists $_[1]) {
1086 die "Too many arguments specified\n";
1089 my ($file_type, $diff_status) = find_file_type_and_diff_status($path);
1091 if (!$file_type && !$diff_status) {
1092 print STDERR "svn: '$path' is not under version control\n";
1093 exit 1;
1096 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
1097 unless ($gs) {
1098 die "Unable to determine upstream SVN information from ",
1099 "working tree history\n";
1102 # canonicalize_path() will return "" to make libsvn 1.5.x happy,
1103 $path = "." if $path eq "";
1105 my $full_url = $url . ($fullpath eq "" ? "" : "/$fullpath");
1107 if ($_url) {
1108 print escape_url($full_url), "\n";
1109 return;
1112 my $result = "Path: $path\n";
1113 $result .= "Name: " . basename($path) . "\n" if $file_type ne "dir";
1114 $result .= "URL: " . escape_url($full_url) . "\n";
1116 eval {
1117 my $repos_root = $gs->repos_root;
1118 Git::SVN::remove_username($repos_root);
1119 $result .= "Repository Root: " . escape_url($repos_root) . "\n";
1121 if ($@) {
1122 $result .= "Repository Root: (offline)\n";
1124 ::_req_svn();
1125 $result .= "Repository UUID: $uuid\n" unless $diff_status eq "A" &&
1126 ($SVN::Core::VERSION le '1.5.4' || $file_type ne "dir");
1127 $result .= "Revision: " . ($diff_status eq "A" ? 0 : $rev) . "\n";
1129 $result .= "Node Kind: " .
1130 ($file_type eq "dir" ? "directory" : "file") . "\n";
1132 my $schedule = $diff_status eq "A"
1133 ? "add"
1134 : ($diff_status eq "D" ? "delete" : "normal");
1135 $result .= "Schedule: $schedule\n";
1137 if ($diff_status eq "A") {
1138 print $result, "\n";
1139 return;
1142 my ($lc_author, $lc_rev, $lc_date_utc);
1143 my @args = Git::SVN::Log::git_svn_log_cmd($rev, $rev, "--", $fullpath);
1144 my $log = command_output_pipe(@args);
1145 my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/;
1146 while (<$log>) {
1147 if (/^${esc_color}author (.+) <[^>]+> (\d+) ([\-\+]?\d+)$/o) {
1148 $lc_author = $1;
1149 $lc_date_utc = Git::SVN::Log::parse_git_date($2, $3);
1150 } elsif (/^${esc_color} (git-svn-id:.+)$/o) {
1151 (undef, $lc_rev, undef) = ::extract_metadata($1);
1154 close $log;
1156 Git::SVN::Log::set_local_timezone();
1158 $result .= "Last Changed Author: $lc_author\n";
1159 $result .= "Last Changed Rev: $lc_rev\n";
1160 $result .= "Last Changed Date: " .
1161 Git::SVN::Log::format_svn_date($lc_date_utc) . "\n";
1163 if ($file_type ne "dir") {
1164 my $text_last_updated_date =
1165 ($diff_status eq "D" ? $lc_date_utc : (stat $path)[9]);
1166 $result .=
1167 "Text Last Updated: " .
1168 Git::SVN::Log::format_svn_date($text_last_updated_date) .
1169 "\n";
1170 my $checksum;
1171 if ($diff_status eq "D") {
1172 my ($fh, $ctx) =
1173 command_output_pipe(qw(cat-file blob), "HEAD:$path");
1174 if ($file_type eq "link") {
1175 my $file_name = <$fh>;
1176 $checksum = md5sum("link $file_name");
1177 } else {
1178 $checksum = md5sum($fh);
1180 command_close_pipe($fh, $ctx);
1181 } elsif ($file_type eq "link") {
1182 my $file_name =
1183 command(qw(cat-file blob), "HEAD:$path");
1184 $checksum =
1185 md5sum("link " . $file_name);
1186 } else {
1187 open FILE, "<", $path or die $!;
1188 $checksum = md5sum(\*FILE);
1189 close FILE or die $!;
1191 $result .= "Checksum: " . $checksum . "\n";
1194 print $result, "\n";
1197 sub cmd_reset {
1198 my $target = shift || $_revision or die "SVN revision required\n";
1199 $target = $1 if $target =~ /^r(\d+)$/;
1200 $target =~ /^\d+$/ or die "Numeric SVN revision expected\n";
1201 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
1202 unless ($gs) {
1203 die "Unable to determine upstream SVN information from ".
1204 "history\n";
1206 my ($r, $c) = $gs->find_rev_before($target, not $_fetch_parent);
1207 die "Cannot find SVN revision $target\n" unless defined($c);
1208 $gs->rev_map_set($r, $c, 'reset', $uuid);
1209 print "r$r = $c ($gs->{ref_id})\n";
1212 sub cmd_gc {
1213 if (!$can_compress) {
1214 warn "Compress::Zlib could not be found; unhandled.log " .
1215 "files will not be compressed.\n";
1217 find({ wanted => \&gc_directory, no_chdir => 1}, "$ENV{GIT_DIR}/svn");
1220 ########################### utility functions #########################
1222 sub rebase_cmd {
1223 my @cmd = qw/rebase/;
1224 push @cmd, '-v' if $_verbose;
1225 push @cmd, qw/--merge/ if $_merge;
1226 push @cmd, "--strategy=$_strategy" if $_strategy;
1227 @cmd;
1230 sub post_fetch_checkout {
1231 return if $_no_checkout;
1232 my $gs = $Git::SVN::_head or return;
1233 return if verify_ref('refs/heads/master^0');
1235 # look for "trunk" ref if it exists
1236 my $remote = Git::SVN::read_all_remotes()->{$gs->{repo_id}};
1237 my $fetch = $remote->{fetch};
1238 if ($fetch) {
1239 foreach my $p (keys %$fetch) {
1240 basename($fetch->{$p}) eq 'trunk' or next;
1241 $gs = Git::SVN->new($fetch->{$p}, $gs->{repo_id}, $p);
1242 last;
1246 my $valid_head = verify_ref('HEAD^0');
1247 command_noisy(qw(update-ref refs/heads/master), $gs->refname);
1248 return if ($valid_head || !verify_ref('HEAD^0'));
1250 return if $ENV{GIT_DIR} !~ m#^(?:.*/)?\.git$#;
1251 my $index = $ENV{GIT_INDEX_FILE} || "$ENV{GIT_DIR}/index";
1252 return if -f $index;
1254 return if command_oneline(qw/rev-parse --is-inside-work-tree/) eq 'false';
1255 return if command_oneline(qw/rev-parse --is-inside-git-dir/) eq 'true';
1256 command_noisy(qw/read-tree -m -u -v HEAD HEAD/);
1257 print STDERR "Checked out HEAD:\n ",
1258 $gs->full_url, " r", $gs->last_rev, "\n";
1259 if (auto_create_empty_directories($gs)) {
1260 $gs->mkemptydirs($gs->last_rev);
1264 sub complete_svn_url {
1265 my ($url, $path) = @_;
1266 $path =~ s#/+$##;
1267 if ($path !~ m#^[a-z\+]+://#) {
1268 if (!defined $url || $url !~ m#^[a-z\+]+://#) {
1269 fatal("E: '$path' is not a complete URL ",
1270 "and a separate URL is not specified");
1272 return ($url, $path);
1274 return ($path, '');
1277 sub complete_url_ls_init {
1278 my ($ra, $repo_path, $switch, $pfx) = @_;
1279 unless ($repo_path) {
1280 print STDERR "W: $switch not specified\n";
1281 return;
1283 $repo_path =~ s#/+$##;
1284 if ($repo_path =~ m#^[a-z\+]+://#) {
1285 $ra = Git::SVN::Ra->new($repo_path);
1286 $repo_path = '';
1287 } else {
1288 $repo_path =~ s#^/+##;
1289 unless ($ra) {
1290 fatal("E: '$repo_path' is not a complete URL ",
1291 "and a separate URL is not specified");
1294 my $url = $ra->{url};
1295 my $gs = Git::SVN->init($url, undef, undef, undef, 1);
1296 my $k = "svn-remote.$gs->{repo_id}.url";
1297 my $orig_url = eval { command_oneline(qw/config --get/, $k) };
1298 if ($orig_url && ($orig_url ne $gs->{url})) {
1299 die "$k already set: $orig_url\n",
1300 "wanted to set to: $gs->{url}\n";
1302 command_oneline('config', $k, $gs->{url}) unless $orig_url;
1303 my $remote_path = "$gs->{path}/$repo_path";
1304 $remote_path =~ s{%([0-9A-F]{2})}{chr hex($1)}ieg;
1305 $remote_path =~ s#/+#/#g;
1306 $remote_path =~ s#^/##g;
1307 $remote_path .= "/*" if $remote_path !~ /\*/;
1308 my ($n) = ($switch =~ /^--(\w+)/);
1309 if (length $pfx && $pfx !~ m#/$#) {
1310 die "--prefix='$pfx' must have a trailing slash '/'\n";
1312 command_noisy('config',
1313 '--add',
1314 "svn-remote.$gs->{repo_id}.$n",
1315 "$remote_path:refs/remotes/$pfx*" .
1316 ('/*' x (($remote_path =~ tr/*/*/) - 1)) );
1319 sub verify_ref {
1320 my ($ref) = @_;
1321 eval { command_oneline([ 'rev-parse', '--verify', $ref ],
1322 { STDERR => 0 }); };
1325 sub get_tree_from_treeish {
1326 my ($treeish) = @_;
1327 # $treeish can be a symbolic ref, too:
1328 my $type = command_oneline(qw/cat-file -t/, $treeish);
1329 my $expected;
1330 while ($type eq 'tag') {
1331 ($treeish, $type) = command(qw/cat-file tag/, $treeish);
1333 if ($type eq 'commit') {
1334 $expected = (grep /^tree /, command(qw/cat-file commit/,
1335 $treeish))[0];
1336 ($expected) = ($expected =~ /^tree ($sha1)$/o);
1337 die "Unable to get tree from $treeish\n" unless $expected;
1338 } elsif ($type eq 'tree') {
1339 $expected = $treeish;
1340 } else {
1341 die "$treeish is a $type, expected tree, tag or commit\n";
1343 return $expected;
1346 sub get_commit_entry {
1347 my ($treeish) = shift;
1348 my %log_entry = ( log => '', tree => get_tree_from_treeish($treeish) );
1349 my $commit_editmsg = "$ENV{GIT_DIR}/COMMIT_EDITMSG";
1350 my $commit_msg = "$ENV{GIT_DIR}/COMMIT_MSG";
1351 open my $log_fh, '>', $commit_editmsg or croak $!;
1353 my $type = command_oneline(qw/cat-file -t/, $treeish);
1354 if ($type eq 'commit' || $type eq 'tag') {
1355 my ($msg_fh, $ctx) = command_output_pipe('cat-file',
1356 $type, $treeish);
1357 my $in_msg = 0;
1358 my $author;
1359 my $saw_from = 0;
1360 my $msgbuf = "";
1361 while (<$msg_fh>) {
1362 if (!$in_msg) {
1363 $in_msg = 1 if (/^\s*$/);
1364 $author = $1 if (/^author (.*>)/);
1365 } elsif (/^git-svn-id: /) {
1366 # skip this for now, we regenerate the
1367 # correct one on re-fetch anyways
1368 # TODO: set *:merge properties or like...
1369 } else {
1370 if (/^From:/ || /^Signed-off-by:/) {
1371 $saw_from = 1;
1373 $msgbuf .= $_;
1376 $msgbuf =~ s/\s+$//s;
1377 if ($Git::SVN::_add_author_from && defined($author)
1378 && !$saw_from) {
1379 $msgbuf .= "\n\nFrom: $author";
1381 print $log_fh $msgbuf or croak $!;
1382 command_close_pipe($msg_fh, $ctx);
1384 close $log_fh or croak $!;
1386 if ($_edit || ($type eq 'tree')) {
1387 chomp(my $editor = command_oneline(qw(var GIT_EDITOR)));
1388 system('sh', '-c', $editor.' "$@"', $editor, $commit_editmsg);
1390 rename $commit_editmsg, $commit_msg or croak $!;
1392 require Encode;
1393 # SVN requires messages to be UTF-8 when entering the repo
1394 local $/;
1395 open $log_fh, '<', $commit_msg or croak $!;
1396 binmode $log_fh;
1397 chomp($log_entry{log} = <$log_fh>);
1399 my $enc = Git::config('i18n.commitencoding') || 'UTF-8';
1400 my $msg = $log_entry{log};
1402 eval { $msg = Encode::decode($enc, $msg, 1) };
1403 if ($@) {
1404 die "Could not decode as $enc:\n", $msg,
1405 "\nPerhaps you need to set i18n.commitencoding\n";
1408 eval { $msg = Encode::encode('UTF-8', $msg, 1) };
1409 die "Could not encode as UTF-8:\n$msg\n" if $@;
1411 $log_entry{log} = $msg;
1413 close $log_fh or croak $!;
1415 unlink $commit_msg;
1416 \%log_entry;
1419 sub s_to_file {
1420 my ($str, $file, $mode) = @_;
1421 open my $fd,'>',$file or croak $!;
1422 print $fd $str,"\n" or croak $!;
1423 close $fd or croak $!;
1424 chmod ($mode &~ umask, $file) if (defined $mode);
1427 sub file_to_s {
1428 my $file = shift;
1429 open my $fd,'<',$file or croak "$!: file: $file\n";
1430 local $/;
1431 my $ret = <$fd>;
1432 close $fd or croak $!;
1433 $ret =~ s/\s*$//s;
1434 return $ret;
1437 # '<svn username> = real-name <email address>' mapping based on git-svnimport:
1438 sub load_authors {
1439 open my $authors, '<', $_authors or die "Can't open $_authors $!\n";
1440 my $log = $cmd eq 'log';
1441 while (<$authors>) {
1442 chomp;
1443 next unless /^(.+?|\(no author\))\s*=\s*(.+?)\s*<(.+)>\s*$/;
1444 my ($user, $name, $email) = ($1, $2, $3);
1445 if ($log) {
1446 $Git::SVN::Log::rusers{"$name <$email>"} = $user;
1447 } else {
1448 $users{$user} = [$name, $email];
1451 close $authors or croak $!;
1454 # convert GetOpt::Long specs for use by git-config
1455 sub read_git_config {
1456 my $opts = shift;
1457 my @config_only;
1458 foreach my $o (keys %$opts) {
1459 # if we have mixedCase and a long option-only, then
1460 # it's a config-only variable that we don't need for
1461 # the command-line.
1462 push @config_only, $o if ($o =~ /[A-Z]/ && $o =~ /^[a-z]+$/i);
1463 my $v = $opts->{$o};
1464 my ($key) = ($o =~ /^([a-zA-Z\-]+)/);
1465 $key =~ s/-//g;
1466 my $arg = 'git config';
1467 $arg .= ' --int' if ($o =~ /[:=]i$/);
1468 $arg .= ' --bool' if ($o !~ /[:=][sfi]$/);
1469 if (ref $v eq 'ARRAY') {
1470 chomp(my @tmp = `$arg --get-all svn.$key`);
1471 @$v = @tmp if @tmp;
1472 } else {
1473 chomp(my $tmp = `$arg --get svn.$key`);
1474 if ($tmp && !($arg =~ / --bool/ && $tmp eq 'false')) {
1475 $$v = $tmp;
1479 delete @$opts{@config_only} if @config_only;
1482 sub extract_metadata {
1483 my $id = shift or return (undef, undef, undef);
1484 my ($url, $rev, $uuid) = ($id =~ /^\s*git-svn-id:\s+(.*)\@(\d+)
1485 \s([a-f\d\-]+)$/ix);
1486 if (!defined $rev || !$uuid || !$url) {
1487 # some of the original repositories I made had
1488 # identifiers like this:
1489 ($rev, $uuid) = ($id =~/^\s*git-svn-id:\s(\d+)\@([a-f\d\-]+)/i);
1491 return ($url, $rev, $uuid);
1494 sub cmt_metadata {
1495 return extract_metadata((grep(/^git-svn-id: /,
1496 command(qw/cat-file commit/, shift)))[-1]);
1499 sub cmt_sha2rev_batch {
1500 my %s2r;
1501 my ($pid, $in, $out, $ctx) = command_bidi_pipe(qw/cat-file --batch/);
1502 my $list = shift;
1504 foreach my $sha (@{$list}) {
1505 my $first = 1;
1506 my $size = 0;
1507 print $out $sha, "\n";
1509 while (my $line = <$in>) {
1510 if ($first && $line =~ /^[[:xdigit:]]{40}\smissing$/) {
1511 last;
1512 } elsif ($first &&
1513 $line =~ /^[[:xdigit:]]{40}\scommit\s(\d+)$/) {
1514 $first = 0;
1515 $size = $1;
1516 next;
1517 } elsif ($line =~ /^(git-svn-id: )/) {
1518 my (undef, $rev, undef) =
1519 extract_metadata($line);
1520 $s2r{$sha} = $rev;
1523 $size -= length($line);
1524 last if ($size == 0);
1528 command_close_bidi_pipe($pid, $in, $out, $ctx);
1530 return \%s2r;
1533 sub working_head_info {
1534 my ($head, $refs) = @_;
1535 my @args = qw/log --no-color --no-decorate --first-parent
1536 --pretty=medium/;
1537 my ($fh, $ctx) = command_output_pipe(@args, $head);
1538 my $hash;
1539 my %max;
1540 while (<$fh>) {
1541 if ( m{^commit ($::sha1)$} ) {
1542 unshift @$refs, $hash if $hash and $refs;
1543 $hash = $1;
1544 next;
1546 next unless s{^\s*(git-svn-id:)}{$1};
1547 my ($url, $rev, $uuid) = extract_metadata($_);
1548 if (defined $url && defined $rev) {
1549 next if $max{$url} and $max{$url} < $rev;
1550 if (my $gs = Git::SVN->find_by_url($url)) {
1551 my $c = $gs->rev_map_get($rev, $uuid);
1552 if ($c && $c eq $hash) {
1553 close $fh; # break the pipe
1554 return ($url, $rev, $uuid, $gs);
1555 } else {
1556 $max{$url} ||= $gs->rev_map_max;
1561 command_close_pipe($fh, $ctx);
1562 (undef, undef, undef, undef);
1565 sub read_commit_parents {
1566 my ($parents, $c) = @_;
1567 chomp(my $p = command_oneline(qw/rev-list --parents -1/, $c));
1568 $p =~ s/^($c)\s*// or die "rev-list --parents -1 $c failed!\n";
1569 @{$parents->{$c}} = split(/ /, $p);
1572 sub linearize_history {
1573 my ($gs, $refs) = @_;
1574 my %parents;
1575 foreach my $c (@$refs) {
1576 read_commit_parents(\%parents, $c);
1579 my @linear_refs;
1580 my %skip = ();
1581 my $last_svn_commit = $gs->last_commit;
1582 foreach my $c (reverse @$refs) {
1583 next if $c eq $last_svn_commit;
1584 last if $skip{$c};
1586 unshift @linear_refs, $c;
1587 $skip{$c} = 1;
1589 # we only want the first parent to diff against for linear
1590 # history, we save the rest to inject when we finalize the
1591 # svn commit
1592 my $fp_a = verify_ref("$c~1");
1593 my $fp_b = shift @{$parents{$c}} if $parents{$c};
1594 if (!$fp_a || !$fp_b) {
1595 die "Commit $c\n",
1596 "has no parent commit, and therefore ",
1597 "nothing to diff against.\n",
1598 "You should be working from a repository ",
1599 "originally created by git-svn\n";
1601 if ($fp_a ne $fp_b) {
1602 die "$c~1 = $fp_a, however parsing commit $c ",
1603 "revealed that:\n$c~1 = $fp_b\nBUG!\n";
1606 foreach my $p (@{$parents{$c}}) {
1607 $skip{$p} = 1;
1610 (\@linear_refs, \%parents);
1613 sub find_file_type_and_diff_status {
1614 my ($path) = @_;
1615 return ('dir', '') if $path eq '';
1617 my $diff_output =
1618 command_oneline(qw(diff --cached --name-status --), $path) || "";
1619 my $diff_status = (split(' ', $diff_output))[0] || "";
1621 my $ls_tree = command_oneline(qw(ls-tree HEAD), $path) || "";
1623 return (undef, undef) if !$diff_status && !$ls_tree;
1625 if ($diff_status eq "A") {
1626 return ("link", $diff_status) if -l $path;
1627 return ("dir", $diff_status) if -d $path;
1628 return ("file", $diff_status);
1631 my $mode = (split(' ', $ls_tree))[0] || "";
1633 return ("link", $diff_status) if $mode eq "120000";
1634 return ("dir", $diff_status) if $mode eq "040000";
1635 return ("file", $diff_status);
1638 sub md5sum {
1639 my $arg = shift;
1640 my $ref = ref $arg;
1641 my $md5 = Digest::MD5->new();
1642 if ($ref eq 'GLOB' || $ref eq 'IO::File' || $ref eq 'File::Temp') {
1643 $md5->addfile($arg) or croak $!;
1644 } elsif ($ref eq 'SCALAR') {
1645 $md5->add($$arg) or croak $!;
1646 } elsif (!$ref) {
1647 $md5->add($arg) or croak $!;
1648 } else {
1649 ::fatal "Can't provide MD5 hash for unknown ref type: '", $ref, "'";
1651 return $md5->hexdigest();
1654 sub gc_directory {
1655 if ($can_compress && -f $_ && basename($_) eq "unhandled.log") {
1656 my $out_filename = $_ . ".gz";
1657 open my $in_fh, "<", $_ or die "Unable to open $_: $!\n";
1658 binmode $in_fh;
1659 my $gz = Compress::Zlib::gzopen($out_filename, "ab") or
1660 die "Unable to open $out_filename: $!\n";
1662 my $res;
1663 while ($res = sysread($in_fh, my $str, 1024)) {
1664 $gz->gzwrite($str) or
1665 die "Unable to write: ".$gz->gzerror()."!\n";
1667 unlink $_ or die "unlink $File::Find::name: $!\n";
1668 } elsif (-f $_ && basename($_) eq "index") {
1669 unlink $_ or die "unlink $_: $!\n";
1673 package Git::SVN;
1674 use strict;
1675 use warnings;
1676 use Fcntl qw/:DEFAULT :seek/;
1677 use constant rev_map_fmt => 'NH40';
1678 use vars qw/$default_repo_id $default_ref_id $_no_metadata $_follow_parent
1679 $_repack $_repack_flags $_use_svm_props $_head
1680 $_use_svnsync_props $no_reuse_existing $_minimize_url
1681 $_use_log_author $_add_author_from $_localtime/;
1682 use Carp qw/croak/;
1683 use File::Path qw/mkpath/;
1684 use File::Copy qw/copy/;
1685 use IPC::Open3;
1686 use Memoize; # core since 5.8.0, Jul 2002
1687 use Memoize::Storable;
1689 my ($_gc_nr, $_gc_period);
1691 # properties that we do not log:
1692 my %SKIP_PROP;
1693 BEGIN {
1694 %SKIP_PROP = map { $_ => 1 } qw/svn:wc:ra_dav:version-url
1695 svn:special svn:executable
1696 svn:entry:committed-rev
1697 svn:entry:last-author
1698 svn:entry:uuid
1699 svn:entry:committed-date/;
1701 # some options are read globally, but can be overridden locally
1702 # per [svn-remote "..."] section. Command-line options will *NOT*
1703 # override options set in an [svn-remote "..."] section
1704 no strict 'refs';
1705 for my $option (qw/follow_parent no_metadata use_svm_props
1706 use_svnsync_props/) {
1707 my $key = $option;
1708 $key =~ tr/_//d;
1709 my $prop = "-$option";
1710 *$option = sub {
1711 my ($self) = @_;
1712 return $self->{$prop} if exists $self->{$prop};
1713 my $k = "svn-remote.$self->{repo_id}.$key";
1714 eval { command_oneline(qw/config --get/, $k) };
1715 if ($@) {
1716 $self->{$prop} = ${"Git::SVN::_$option"};
1717 } else {
1718 my $v = command_oneline(qw/config --bool/,$k);
1719 $self->{$prop} = $v eq 'false' ? 0 : 1;
1721 return $self->{$prop};
1727 my (%LOCKFILES, %INDEX_FILES);
1728 END {
1729 unlink keys %LOCKFILES if %LOCKFILES;
1730 unlink keys %INDEX_FILES if %INDEX_FILES;
1733 sub resolve_local_globs {
1734 my ($url, $fetch, $glob_spec) = @_;
1735 return unless defined $glob_spec;
1736 my $ref = $glob_spec->{ref};
1737 my $path = $glob_spec->{path};
1738 foreach (command(qw#for-each-ref --format=%(refname) refs/#)) {
1739 next unless m#^$ref->{regex}$#;
1740 my $p = $1;
1741 my $pathname = desanitize_refname($path->full_path($p));
1742 my $refname = desanitize_refname($ref->full_path($p));
1743 if (my $existing = $fetch->{$pathname}) {
1744 if ($existing ne $refname) {
1745 die "Refspec conflict:\n",
1746 "existing: $existing\n",
1747 " globbed: $refname\n";
1749 my $u = (::cmt_metadata("$refname"))[0];
1750 $u =~ s!^\Q$url\E(/|$)!! or die
1751 "$refname: '$url' not found in '$u'\n";
1752 if ($pathname ne $u) {
1753 warn "W: Refspec glob conflict ",
1754 "(ref: $refname):\n",
1755 "expected path: $pathname\n",
1756 " real path: $u\n",
1757 "Continuing ahead with $u\n";
1758 next;
1760 } else {
1761 $fetch->{$pathname} = $refname;
1766 sub parse_revision_argument {
1767 my ($base, $head) = @_;
1768 if (!defined $::_revision || $::_revision eq 'BASE:HEAD') {
1769 return ($base, $head);
1771 return ($1, $2) if ($::_revision =~ /^(\d+):(\d+)$/);
1772 return ($::_revision, $::_revision) if ($::_revision =~ /^\d+$/);
1773 return ($head, $head) if ($::_revision eq 'HEAD');
1774 return ($base, $1) if ($::_revision =~ /^BASE:(\d+)$/);
1775 return ($1, $head) if ($::_revision =~ /^(\d+):HEAD$/);
1776 die "revision argument: $::_revision not understood by git-svn\n";
1779 sub fetch_all {
1780 my ($repo_id, $remotes) = @_;
1781 if (ref $repo_id) {
1782 my $gs = $repo_id;
1783 $repo_id = undef;
1784 $repo_id = $gs->{repo_id};
1786 $remotes ||= read_all_remotes();
1787 my $remote = $remotes->{$repo_id} or
1788 die "[svn-remote \"$repo_id\"] unknown\n";
1789 my $fetch = $remote->{fetch};
1790 my $url = $remote->{url} or die "svn-remote.$repo_id.url not defined\n";
1791 my (@gs, @globs);
1792 my $ra = Git::SVN::Ra->new($url);
1793 my $uuid = $ra->get_uuid;
1794 my $head = $ra->get_latest_revnum;
1796 # ignore errors, $head revision may not even exist anymore
1797 eval { $ra->get_log("", $head, 0, 1, 0, 1, sub { $head = $_[1] }) };
1798 warn "W: $@\n" if $@;
1800 my $base = defined $fetch ? $head : 0;
1802 # read the max revs for wildcard expansion (branches/*, tags/*)
1803 foreach my $t (qw/branches tags/) {
1804 defined $remote->{$t} or next;
1805 push @globs, @{$remote->{$t}};
1807 my $max_rev = eval { tmp_config(qw/--int --get/,
1808 "svn-remote.$repo_id.${t}-maxRev") };
1809 if (defined $max_rev && ($max_rev < $base)) {
1810 $base = $max_rev;
1811 } elsif (!defined $max_rev) {
1812 $base = 0;
1816 if ($fetch) {
1817 foreach my $p (sort keys %$fetch) {
1818 my $gs = Git::SVN->new($fetch->{$p}, $repo_id, $p);
1819 my $lr = $gs->rev_map_max;
1820 if (defined $lr) {
1821 $base = $lr if ($lr < $base);
1823 push @gs, $gs;
1827 ($base, $head) = parse_revision_argument($base, $head);
1828 $ra->gs_fetch_loop_common($base, $head, \@gs, \@globs);
1831 sub read_all_remotes {
1832 my $r = {};
1833 my $use_svm_props = eval { command_oneline(qw/config --bool
1834 svn.useSvmProps/) };
1835 $use_svm_props = $use_svm_props eq 'true' if $use_svm_props;
1836 my $svn_refspec = qr{\s*(.*?)\s*:\s*(.+?)\s*};
1837 foreach (grep { s/^svn-remote\.// } command(qw/config -l/)) {
1838 if (m!^(.+)\.fetch=$svn_refspec$!) {
1839 my ($remote, $local_ref, $remote_ref) = ($1, $2, $3);
1840 die("svn-remote.$remote: remote ref '$remote_ref' "
1841 . "must start with 'refs/'\n")
1842 unless $remote_ref =~ m{^refs/};
1843 $local_ref = uri_decode($local_ref);
1844 $r->{$remote}->{fetch}->{$local_ref} = $remote_ref;
1845 $r->{$remote}->{svm} = {} if $use_svm_props;
1846 } elsif (m!^(.+)\.usesvmprops=\s*(.*)\s*$!) {
1847 $r->{$1}->{svm} = {};
1848 } elsif (m!^(.+)\.url=\s*(.*)\s*$!) {
1849 $r->{$1}->{url} = $2;
1850 } elsif (m!^(.+)\.pushurl=\s*(.*)\s*$!) {
1851 $r->{$1}->{pushurl} = $2;
1852 } elsif (m!^(.+)\.(branches|tags)=$svn_refspec$!) {
1853 my ($remote, $t, $local_ref, $remote_ref) =
1854 ($1, $2, $3, $4);
1855 die("svn-remote.$remote: remote ref '$remote_ref' ($t) "
1856 . "must start with 'refs/'\n")
1857 unless $remote_ref =~ m{^refs/};
1858 $local_ref = uri_decode($local_ref);
1859 my $rs = {
1860 t => $t,
1861 remote => $remote,
1862 path => Git::SVN::GlobSpec->new($local_ref, 1),
1863 ref => Git::SVN::GlobSpec->new($remote_ref, 0) };
1864 if (length($rs->{ref}->{right}) != 0) {
1865 die "The '*' glob character must be the last ",
1866 "character of '$remote_ref'\n";
1868 push @{ $r->{$remote}->{$t} }, $rs;
1872 map {
1873 if (defined $r->{$_}->{svm}) {
1874 my $svm;
1875 eval {
1876 my $section = "svn-remote.$_";
1877 $svm = {
1878 source => tmp_config('--get',
1879 "$section.svm-source"),
1880 replace => tmp_config('--get',
1881 "$section.svm-replace"),
1884 $r->{$_}->{svm} = $svm;
1886 } keys %$r;
1891 sub init_vars {
1892 $_gc_nr = $_gc_period = 1000;
1893 if (defined $_repack || defined $_repack_flags) {
1894 warn "Repack options are obsolete; they have no effect.\n";
1898 sub verify_remotes_sanity {
1899 return unless -d $ENV{GIT_DIR};
1900 my %seen;
1901 foreach (command(qw/config -l/)) {
1902 if (m!^svn-remote\.(?:.+)\.fetch=.*:refs/remotes/(\S+)\s*$!) {
1903 if ($seen{$1}) {
1904 die "Remote ref refs/remote/$1 is tracked by",
1905 "\n \"$_\"\nand\n \"$seen{$1}\"\n",
1906 "Please resolve this ambiguity in ",
1907 "your git configuration file before ",
1908 "continuing\n";
1910 $seen{$1} = $_;
1915 sub find_existing_remote {
1916 my ($url, $remotes) = @_;
1917 return undef if $no_reuse_existing;
1918 my $existing;
1919 foreach my $repo_id (keys %$remotes) {
1920 my $u = $remotes->{$repo_id}->{url} or next;
1921 next if $u ne $url;
1922 $existing = $repo_id;
1923 last;
1925 $existing;
1928 sub init_remote_config {
1929 my ($self, $url, $no_write) = @_;
1930 $url =~ s!/+$!!; # strip trailing slash
1931 my $r = read_all_remotes();
1932 my $existing = find_existing_remote($url, $r);
1933 if ($existing) {
1934 unless ($no_write) {
1935 print STDERR "Using existing ",
1936 "[svn-remote \"$existing\"]\n";
1938 $self->{repo_id} = $existing;
1939 } elsif ($_minimize_url) {
1940 my $min_url = Git::SVN::Ra->new($url)->minimize_url;
1941 $existing = find_existing_remote($min_url, $r);
1942 if ($existing) {
1943 unless ($no_write) {
1944 print STDERR "Using existing ",
1945 "[svn-remote \"$existing\"]\n";
1947 $self->{repo_id} = $existing;
1949 if ($min_url ne $url) {
1950 unless ($no_write) {
1951 print STDERR "Using higher level of URL: ",
1952 "$url => $min_url\n";
1954 my $old_path = $self->{path};
1955 $self->{path} = $url;
1956 $self->{path} =~ s!^\Q$min_url\E(/|$)!!;
1957 if (length $old_path) {
1958 $self->{path} .= "/$old_path";
1960 $url = $min_url;
1963 my $orig_url;
1964 if (!$existing) {
1965 # verify that we aren't overwriting anything:
1966 $orig_url = eval {
1967 command_oneline('config', '--get',
1968 "svn-remote.$self->{repo_id}.url")
1970 if ($orig_url && ($orig_url ne $url)) {
1971 die "svn-remote.$self->{repo_id}.url already set: ",
1972 "$orig_url\nwanted to set to: $url\n";
1975 my ($xrepo_id, $xpath) = find_ref($self->refname);
1976 if (!$no_write && defined $xpath) {
1977 die "svn-remote.$xrepo_id.fetch already set to track ",
1978 "$xpath:", $self->refname, "\n";
1980 unless ($no_write) {
1981 command_noisy('config',
1982 "svn-remote.$self->{repo_id}.url", $url);
1983 $self->{path} =~ s{^/}{};
1984 $self->{path} =~ s{%([0-9A-F]{2})}{chr hex($1)}ieg;
1985 command_noisy('config', '--add',
1986 "svn-remote.$self->{repo_id}.fetch",
1987 "$self->{path}:".$self->refname);
1989 $self->{url} = $url;
1992 sub find_by_url { # repos_root and, path are optional
1993 my ($class, $full_url, $repos_root, $path) = @_;
1995 return undef unless defined $full_url;
1996 remove_username($full_url);
1997 remove_username($repos_root) if defined $repos_root;
1998 my $remotes = read_all_remotes();
1999 if (defined $full_url && defined $repos_root && !defined $path) {
2000 $path = $full_url;
2001 $path =~ s#^\Q$repos_root\E(?:/|$)##;
2003 foreach my $repo_id (keys %$remotes) {
2004 my $u = $remotes->{$repo_id}->{url} or next;
2005 remove_username($u);
2006 next if defined $repos_root && $repos_root ne $u;
2008 my $fetch = $remotes->{$repo_id}->{fetch} || {};
2009 foreach my $t (qw/branches tags/) {
2010 foreach my $globspec (@{$remotes->{$repo_id}->{$t}}) {
2011 resolve_local_globs($u, $fetch, $globspec);
2014 my $p = $path;
2015 my $rwr = rewrite_root({repo_id => $repo_id});
2016 my $svm = $remotes->{$repo_id}->{svm}
2017 if defined $remotes->{$repo_id}->{svm};
2018 unless (defined $p) {
2019 $p = $full_url;
2020 my $z = $u;
2021 my $prefix = '';
2022 if ($rwr) {
2023 $z = $rwr;
2024 remove_username($z);
2025 } elsif (defined $svm) {
2026 $z = $svm->{source};
2027 $prefix = $svm->{replace};
2028 $prefix =~ s#^\Q$u\E(?:/|$)##;
2029 $prefix =~ s#/$##;
2031 $p =~ s#^\Q$z\E(?:/|$)#$prefix# or next;
2033 foreach my $f (keys %$fetch) {
2034 next if $f ne $p;
2035 return Git::SVN->new($fetch->{$f}, $repo_id, $f);
2038 undef;
2041 sub init {
2042 my ($class, $url, $path, $repo_id, $ref_id, $no_write) = @_;
2043 my $self = _new($class, $repo_id, $ref_id, $path);
2044 if (defined $url) {
2045 $self->init_remote_config($url, $no_write);
2047 $self;
2050 sub find_ref {
2051 my ($ref_id) = @_;
2052 foreach (command(qw/config -l/)) {
2053 next unless m!^svn-remote\.(.+)\.fetch=
2054 \s*(.*?)\s*:\s*(.+?)\s*$!x;
2055 my ($repo_id, $path, $ref) = ($1, $2, $3);
2056 if ($ref eq $ref_id) {
2057 $path = '' if ($path =~ m#^\./?#);
2058 return ($repo_id, $path);
2061 (undef, undef, undef);
2064 sub new {
2065 my ($class, $ref_id, $repo_id, $path) = @_;
2066 if (defined $ref_id && !defined $repo_id && !defined $path) {
2067 ($repo_id, $path) = find_ref($ref_id);
2068 if (!defined $repo_id) {
2069 die "Could not find a \"svn-remote.*.fetch\" key ",
2070 "in the repository configuration matching: ",
2071 "$ref_id\n";
2074 my $self = _new($class, $repo_id, $ref_id, $path);
2075 if (!defined $self->{path} || !length $self->{path}) {
2076 my $fetch = command_oneline('config', '--get',
2077 "svn-remote.$repo_id.fetch",
2078 ":$ref_id\$") or
2079 die "Failed to read \"svn-remote.$repo_id.fetch\" ",
2080 "\":$ref_id\$\" in config\n";
2081 ($self->{path}, undef) = split(/\s*:\s*/, $fetch);
2083 $self->{path} =~ s{/+}{/}g;
2084 $self->{path} =~ s{\A/}{};
2085 $self->{path} =~ s{/\z}{};
2086 $self->{url} = command_oneline('config', '--get',
2087 "svn-remote.$repo_id.url") or
2088 die "Failed to read \"svn-remote.$repo_id.url\" in config\n";
2089 $self->{pushurl} = eval { command_oneline('config', '--get',
2090 "svn-remote.$repo_id.pushurl") };
2091 $self->rebuild;
2092 $self;
2095 sub refname {
2096 my ($refname) = $_[0]->{ref_id} ;
2098 # It cannot end with a slash /, we'll throw up on this because
2099 # SVN can't have directories with a slash in their name, either:
2100 if ($refname =~ m{/$}) {
2101 die "ref: '$refname' ends with a trailing slash, this is ",
2102 "not permitted by git nor Subversion\n";
2105 # It cannot have ASCII control character space, tilde ~, caret ^,
2106 # colon :, question-mark ?, asterisk *, space, or open bracket [
2107 # anywhere.
2109 # Additionally, % must be escaped because it is used for escaping
2110 # and we want our escaped refname to be reversible
2111 $refname =~ s{([ \%~\^:\?\*\[\t])}{uc sprintf('%%%02x',ord($1))}eg;
2113 # no slash-separated component can begin with a dot .
2114 # /.* becomes /%2E*
2115 $refname =~ s{/\.}{/%2E}g;
2117 # It cannot have two consecutive dots .. anywhere
2118 # .. becomes %2E%2E
2119 $refname =~ s{\.\.}{%2E%2E}g;
2121 # trailing dots and .lock are not allowed
2122 # .$ becomes %2E and .lock becomes %2Elock
2123 $refname =~ s{\.(?=$|lock$)}{%2E};
2125 # the sequence @{ is used to access the reflog
2126 # @{ becomes %40{
2127 $refname =~ s{\@\{}{%40\{}g;
2129 return $refname;
2132 sub desanitize_refname {
2133 my ($refname) = @_;
2134 $refname =~ s{%(?:([0-9A-F]{2}))}{chr hex($1)}eg;
2135 return $refname;
2138 sub svm_uuid {
2139 my ($self) = @_;
2140 return $self->{svm}->{uuid} if $self->svm;
2141 $self->ra;
2142 unless ($self->{svm}) {
2143 die "SVM UUID not cached, and reading remotely failed\n";
2145 $self->{svm}->{uuid};
2148 sub svm {
2149 my ($self) = @_;
2150 return $self->{svm} if $self->{svm};
2151 my $svm;
2152 # see if we have it in our config, first:
2153 eval {
2154 my $section = "svn-remote.$self->{repo_id}";
2155 $svm = {
2156 source => tmp_config('--get', "$section.svm-source"),
2157 uuid => tmp_config('--get', "$section.svm-uuid"),
2158 replace => tmp_config('--get', "$section.svm-replace"),
2161 if ($svm && $svm->{source} && $svm->{uuid} && $svm->{replace}) {
2162 $self->{svm} = $svm;
2164 $self->{svm};
2167 sub _set_svm_vars {
2168 my ($self, $ra) = @_;
2169 return $ra if $self->svm;
2171 my @err = ( "useSvmProps set, but failed to read SVM properties\n",
2172 "(svm:source, svm:uuid) ",
2173 "from the following URLs:\n" );
2174 sub read_svm_props {
2175 my ($self, $ra, $path, $r) = @_;
2176 my $props = ($ra->get_dir($path, $r))[2];
2177 my $src = $props->{'svm:source'};
2178 my $uuid = $props->{'svm:uuid'};
2179 return undef if (!$src || !$uuid);
2181 chomp($src, $uuid);
2183 $uuid =~ m{^[0-9a-f\-]{30,}$}i
2184 or die "doesn't look right - svm:uuid is '$uuid'\n";
2186 # the '!' is used to mark the repos_root!/relative/path
2187 $src =~ s{/?!/?}{/};
2188 $src =~ s{/+$}{}; # no trailing slashes please
2189 # username is of no interest
2190 $src =~ s{(^[a-z\+]*://)[^/@]*@}{$1};
2192 my $replace = $ra->{url};
2193 $replace .= "/$path" if length $path;
2195 my $section = "svn-remote.$self->{repo_id}";
2196 tmp_config("$section.svm-source", $src);
2197 tmp_config("$section.svm-replace", $replace);
2198 tmp_config("$section.svm-uuid", $uuid);
2199 $self->{svm} = {
2200 source => $src,
2201 uuid => $uuid,
2202 replace => $replace
2206 my $r = $ra->get_latest_revnum;
2207 my $path = $self->{path};
2208 my %tried;
2209 while (length $path) {
2210 unless ($tried{"$self->{url}/$path"}) {
2211 return $ra if $self->read_svm_props($ra, $path, $r);
2212 $tried{"$self->{url}/$path"} = 1;
2214 $path =~ s#/?[^/]+$##;
2216 die "Path: '$path' should be ''\n" if $path ne '';
2217 return $ra if $self->read_svm_props($ra, $path, $r);
2218 $tried{"$self->{url}/$path"} = 1;
2220 if ($ra->{repos_root} eq $self->{url}) {
2221 die @err, (map { " $_\n" } keys %tried), "\n";
2224 # nope, make sure we're connected to the repository root:
2225 my $ok;
2226 my @tried_b;
2227 $path = $ra->{svn_path};
2228 $ra = Git::SVN::Ra->new($ra->{repos_root});
2229 while (length $path) {
2230 unless ($tried{"$ra->{url}/$path"}) {
2231 $ok = $self->read_svm_props($ra, $path, $r);
2232 last if $ok;
2233 $tried{"$ra->{url}/$path"} = 1;
2235 $path =~ s#/?[^/]+$##;
2237 die "Path: '$path' should be ''\n" if $path ne '';
2238 $ok ||= $self->read_svm_props($ra, $path, $r);
2239 $tried{"$ra->{url}/$path"} = 1;
2240 if (!$ok) {
2241 die @err, (map { " $_\n" } keys %tried), "\n";
2243 Git::SVN::Ra->new($self->{url});
2246 sub svnsync {
2247 my ($self) = @_;
2248 return $self->{svnsync} if $self->{svnsync};
2250 if ($self->no_metadata) {
2251 die "Can't have both 'noMetadata' and ",
2252 "'useSvnsyncProps' options set!\n";
2254 if ($self->rewrite_root) {
2255 die "Can't have both 'useSvnsyncProps' and 'rewriteRoot' ",
2256 "options set!\n";
2258 if ($self->rewrite_uuid) {
2259 die "Can't have both 'useSvnsyncProps' and 'rewriteUUID' ",
2260 "options set!\n";
2263 my $svnsync;
2264 # see if we have it in our config, first:
2265 eval {
2266 my $section = "svn-remote.$self->{repo_id}";
2268 my $url = tmp_config('--get', "$section.svnsync-url");
2269 ($url) = ($url =~ m{^([a-z\+]+://\S+)$}) or
2270 die "doesn't look right - svn:sync-from-url is '$url'\n";
2272 my $uuid = tmp_config('--get', "$section.svnsync-uuid");
2273 ($uuid) = ($uuid =~ m{^([0-9a-f\-]{30,})$}i) or
2274 die "doesn't look right - svn:sync-from-uuid is '$uuid'\n";
2276 $svnsync = { url => $url, uuid => $uuid }
2278 if ($svnsync && $svnsync->{url} && $svnsync->{uuid}) {
2279 return $self->{svnsync} = $svnsync;
2282 my $err = "useSvnsyncProps set, but failed to read " .
2283 "svnsync property: svn:sync-from-";
2284 my $rp = $self->ra->rev_proplist(0);
2286 my $url = $rp->{'svn:sync-from-url'} or die $err . "url\n";
2287 ($url) = ($url =~ m{^([a-z\+]+://\S+)$}) or
2288 die "doesn't look right - svn:sync-from-url is '$url'\n";
2290 my $uuid = $rp->{'svn:sync-from-uuid'} or die $err . "uuid\n";
2291 ($uuid) = ($uuid =~ m{^([0-9a-f\-]{30,})$}i) or
2292 die "doesn't look right - svn:sync-from-uuid is '$uuid'\n";
2294 my $section = "svn-remote.$self->{repo_id}";
2295 tmp_config('--add', "$section.svnsync-uuid", $uuid);
2296 tmp_config('--add', "$section.svnsync-url", $url);
2297 return $self->{svnsync} = { url => $url, uuid => $uuid };
2300 # this allows us to memoize our SVN::Ra UUID locally and avoid a
2301 # remote lookup (useful for 'git svn log').
2302 sub ra_uuid {
2303 my ($self) = @_;
2304 unless ($self->{ra_uuid}) {
2305 my $key = "svn-remote.$self->{repo_id}.uuid";
2306 my $uuid = eval { tmp_config('--get', $key) };
2307 if (!$@ && $uuid && $uuid =~ /^([a-f\d\-]{30,})$/i) {
2308 $self->{ra_uuid} = $uuid;
2309 } else {
2310 die "ra_uuid called without URL\n" unless $self->{url};
2311 $self->{ra_uuid} = $self->ra->get_uuid;
2312 tmp_config('--add', $key, $self->{ra_uuid});
2315 $self->{ra_uuid};
2318 sub _set_repos_root {
2319 my ($self, $repos_root) = @_;
2320 my $k = "svn-remote.$self->{repo_id}.reposRoot";
2321 $repos_root ||= $self->ra->{repos_root};
2322 tmp_config($k, $repos_root);
2323 $repos_root;
2326 sub repos_root {
2327 my ($self) = @_;
2328 my $k = "svn-remote.$self->{repo_id}.reposRoot";
2329 eval { tmp_config('--get', $k) } || $self->_set_repos_root;
2332 sub ra {
2333 my ($self) = shift;
2334 my $ra = Git::SVN::Ra->new($self->{url});
2335 $self->_set_repos_root($ra->{repos_root});
2336 if ($self->use_svm_props && !$self->{svm}) {
2337 if ($self->no_metadata) {
2338 die "Can't have both 'noMetadata' and ",
2339 "'useSvmProps' options set!\n";
2340 } elsif ($self->use_svnsync_props) {
2341 die "Can't have both 'useSvnsyncProps' and ",
2342 "'useSvmProps' options set!\n";
2344 $ra = $self->_set_svm_vars($ra);
2345 $self->{-want_revprops} = 1;
2347 $ra;
2350 # prop_walk(PATH, REV, SUB)
2351 # -------------------------
2352 # Recursively traverse PATH at revision REV and invoke SUB for each
2353 # directory that contains a SVN property. SUB will be invoked as
2354 # follows: &SUB(gs, path, props); where `gs' is this instance of
2355 # Git::SVN, `path' the path to the directory where the properties
2356 # `props' were found. The `path' will be relative to point of checkout,
2357 # that is, if url://repo/trunk is the current Git branch, and that
2358 # directory contains a sub-directory `d', SUB will be invoked with `/d/'
2359 # as `path' (note the trailing `/').
2360 sub prop_walk {
2361 my ($self, $path, $rev, $sub) = @_;
2363 $path =~ s#^/##;
2364 my ($dirent, undef, $props) = $self->ra->get_dir($path, $rev);
2365 $path =~ s#^/*#/#g;
2366 my $p = $path;
2367 # Strip the irrelevant part of the path.
2368 $p =~ s#^/+\Q$self->{path}\E(/|$)#/#;
2369 # Ensure the path is terminated by a `/'.
2370 $p =~ s#/*$#/#;
2372 # The properties contain all the internal SVN stuff nobody
2373 # (usually) cares about.
2374 my $interesting_props = 0;
2375 foreach (keys %{$props}) {
2376 # If it doesn't start with `svn:', it must be a
2377 # user-defined property.
2378 ++$interesting_props and next if $_ !~ /^svn:/;
2379 # FIXME: Fragile, if SVN adds new public properties,
2380 # this needs to be updated.
2381 ++$interesting_props if /^svn:(?:ignore|keywords|executable
2382 |eol-style|mime-type
2383 |externals|needs-lock)$/x;
2385 &$sub($self, $p, $props) if $interesting_props;
2387 foreach (sort keys %$dirent) {
2388 next if $dirent->{$_}->{kind} != $SVN::Node::dir;
2389 $self->prop_walk($self->{path} . $p . $_, $rev, $sub);
2393 sub last_rev { ($_[0]->last_rev_commit)[0] }
2394 sub last_commit { ($_[0]->last_rev_commit)[1] }
2396 # returns the newest SVN revision number and newest commit SHA1
2397 sub last_rev_commit {
2398 my ($self) = @_;
2399 if (defined $self->{last_rev} && defined $self->{last_commit}) {
2400 return ($self->{last_rev}, $self->{last_commit});
2402 my $c = ::verify_ref($self->refname.'^0');
2403 if ($c && !$self->use_svm_props && !$self->no_metadata) {
2404 my $rev = (::cmt_metadata($c))[1];
2405 if (defined $rev) {
2406 ($self->{last_rev}, $self->{last_commit}) = ($rev, $c);
2407 return ($rev, $c);
2410 my $map_path = $self->map_path;
2411 unless (-e $map_path) {
2412 ($self->{last_rev}, $self->{last_commit}) = (undef, undef);
2413 return (undef, undef);
2415 my ($rev, $commit) = $self->rev_map_max(1);
2416 ($self->{last_rev}, $self->{last_commit}) = ($rev, $commit);
2417 return ($rev, $commit);
2420 sub get_fetch_range {
2421 my ($self, $min, $max) = @_;
2422 $max ||= $self->ra->get_latest_revnum;
2423 $min ||= $self->rev_map_max;
2424 (++$min, $max);
2427 sub tmp_config {
2428 my (@args) = @_;
2429 my $old_def_config = "$ENV{GIT_DIR}/svn/config";
2430 my $config = "$ENV{GIT_DIR}/svn/.metadata";
2431 if (! -f $config && -f $old_def_config) {
2432 rename $old_def_config, $config or
2433 die "Failed rename $old_def_config => $config: $!\n";
2435 my $old_config = $ENV{GIT_CONFIG};
2436 $ENV{GIT_CONFIG} = $config;
2437 $@ = undef;
2438 my @ret = eval {
2439 unless (-f $config) {
2440 mkfile($config);
2441 open my $fh, '>', $config or
2442 die "Can't open $config: $!\n";
2443 print $fh "; This file is used internally by ",
2444 "git-svn\n" or die
2445 "Couldn't write to $config: $!\n";
2446 print $fh "; You should not have to edit it\n" or
2447 die "Couldn't write to $config: $!\n";
2448 close $fh or die "Couldn't close $config: $!\n";
2450 command('config', @args);
2452 my $err = $@;
2453 if (defined $old_config) {
2454 $ENV{GIT_CONFIG} = $old_config;
2455 } else {
2456 delete $ENV{GIT_CONFIG};
2458 die $err if $err;
2459 wantarray ? @ret : $ret[0];
2462 sub tmp_index_do {
2463 my ($self, $sub) = @_;
2464 my $old_index = $ENV{GIT_INDEX_FILE};
2465 $ENV{GIT_INDEX_FILE} = $self->{index};
2466 $@ = undef;
2467 my @ret = eval {
2468 my ($dir, $base) = ($self->{index} =~ m#^(.*?)/?([^/]+)$#);
2469 mkpath([$dir]) unless -d $dir;
2470 &$sub;
2472 my $err = $@;
2473 if (defined $old_index) {
2474 $ENV{GIT_INDEX_FILE} = $old_index;
2475 } else {
2476 delete $ENV{GIT_INDEX_FILE};
2478 die $err if $err;
2479 wantarray ? @ret : $ret[0];
2482 sub assert_index_clean {
2483 my ($self, $treeish) = @_;
2485 $self->tmp_index_do(sub {
2486 command_noisy('read-tree', $treeish) unless -e $self->{index};
2487 my $x = command_oneline('write-tree');
2488 my ($y) = (command(qw/cat-file commit/, $treeish) =~
2489 /^tree ($::sha1)/mo);
2490 return if $y eq $x;
2492 warn "Index mismatch: $y != $x\nrereading $treeish\n";
2493 unlink $self->{index} or die "unlink $self->{index}: $!\n";
2494 command_noisy('read-tree', $treeish);
2495 $x = command_oneline('write-tree');
2496 if ($y ne $x) {
2497 ::fatal "trees ($treeish) $y != $x\n",
2498 "Something is seriously wrong...";
2503 sub get_commit_parents {
2504 my ($self, $log_entry) = @_;
2505 my (%seen, @ret, @tmp);
2506 # legacy support for 'set-tree'; this is only used by set_tree_cb:
2507 if (my $ip = $self->{inject_parents}) {
2508 if (my $commit = delete $ip->{$log_entry->{revision}}) {
2509 push @tmp, $commit;
2512 if (my $cur = ::verify_ref($self->refname.'^0')) {
2513 push @tmp, $cur;
2515 if (my $ipd = $self->{inject_parents_dcommit}) {
2516 if (my $commit = delete $ipd->{$log_entry->{revision}}) {
2517 push @tmp, @$commit;
2520 push @tmp, $_ foreach (@{$log_entry->{parents}}, @tmp);
2521 while (my $p = shift @tmp) {
2522 next if $seen{$p};
2523 $seen{$p} = 1;
2524 push @ret, $p;
2526 @ret;
2529 sub rewrite_root {
2530 my ($self) = @_;
2531 return $self->{-rewrite_root} if exists $self->{-rewrite_root};
2532 my $k = "svn-remote.$self->{repo_id}.rewriteRoot";
2533 my $rwr = eval { command_oneline(qw/config --get/, $k) };
2534 if ($rwr) {
2535 $rwr =~ s#/+$##;
2536 if ($rwr !~ m#^[a-z\+]+://#) {
2537 die "$rwr is not a valid URL (key: $k)\n";
2540 $self->{-rewrite_root} = $rwr;
2543 sub rewrite_uuid {
2544 my ($self) = @_;
2545 return $self->{-rewrite_uuid} if exists $self->{-rewrite_uuid};
2546 my $k = "svn-remote.$self->{repo_id}.rewriteUUID";
2547 my $rwid = eval { command_oneline(qw/config --get/, $k) };
2548 if ($rwid) {
2549 $rwid =~ s#/+$##;
2550 if ($rwid !~ m#^[a-f0-9]{8}-(?:[a-f0-9]{4}-){3}[a-f0-9]{12}$#) {
2551 die "$rwid is not a valid UUID (key: $k)\n";
2554 $self->{-rewrite_uuid} = $rwid;
2557 sub metadata_url {
2558 my ($self) = @_;
2559 ($self->rewrite_root || $self->{url}) .
2560 (length $self->{path} ? '/' . $self->{path} : '');
2563 sub full_url {
2564 my ($self) = @_;
2565 $self->{url} . (length $self->{path} ? '/' . $self->{path} : '');
2568 sub full_pushurl {
2569 my ($self) = @_;
2570 if ($self->{pushurl}) {
2571 return $self->{pushurl} . (length $self->{path} ? '/' .
2572 $self->{path} : '');
2573 } else {
2574 return $self->full_url;
2578 sub set_commit_header_env {
2579 my ($log_entry) = @_;
2580 my %env;
2581 foreach my $ned (qw/NAME EMAIL DATE/) {
2582 foreach my $ac (qw/AUTHOR COMMITTER/) {
2583 $env{"GIT_${ac}_${ned}"} = $ENV{"GIT_${ac}_${ned}"};
2587 $ENV{GIT_AUTHOR_NAME} = $log_entry->{name};
2588 $ENV{GIT_AUTHOR_EMAIL} = $log_entry->{email};
2589 $ENV{GIT_AUTHOR_DATE} = $ENV{GIT_COMMITTER_DATE} = $log_entry->{date};
2591 $ENV{GIT_COMMITTER_NAME} = (defined $log_entry->{commit_name})
2592 ? $log_entry->{commit_name}
2593 : $log_entry->{name};
2594 $ENV{GIT_COMMITTER_EMAIL} = (defined $log_entry->{commit_email})
2595 ? $log_entry->{commit_email}
2596 : $log_entry->{email};
2597 \%env;
2600 sub restore_commit_header_env {
2601 my ($env) = @_;
2602 foreach my $ned (qw/NAME EMAIL DATE/) {
2603 foreach my $ac (qw/AUTHOR COMMITTER/) {
2604 my $k = "GIT_${ac}_${ned}";
2605 if (defined $env->{$k}) {
2606 $ENV{$k} = $env->{$k};
2607 } else {
2608 delete $ENV{$k};
2614 sub gc {
2615 command_noisy('gc', '--auto');
2618 sub do_git_commit {
2619 my ($self, $log_entry) = @_;
2620 my $lr = $self->last_rev;
2621 if (defined $lr && $lr >= $log_entry->{revision}) {
2622 die "Last fetched revision of ", $self->refname,
2623 " was r$lr, but we are about to fetch: ",
2624 "r$log_entry->{revision}!\n";
2626 if (my $c = $self->rev_map_get($log_entry->{revision})) {
2627 croak "$log_entry->{revision} = $c already exists! ",
2628 "Why are we refetching it?\n";
2630 my $old_env = set_commit_header_env($log_entry);
2631 my $tree = $log_entry->{tree};
2632 if (!defined $tree) {
2633 $tree = $self->tmp_index_do(sub {
2634 command_oneline('write-tree') });
2636 die "Tree is not a valid sha1: $tree\n" if $tree !~ /^$::sha1$/o;
2638 my @exec = ('git', 'commit-tree', $tree);
2639 foreach ($self->get_commit_parents($log_entry)) {
2640 push @exec, '-p', $_;
2642 defined(my $pid = open3(my $msg_fh, my $out_fh, '>&STDERR', @exec))
2643 or croak $!;
2644 binmode $msg_fh;
2646 # we always get UTF-8 from SVN, but we may want our commits in
2647 # a different encoding.
2648 if (my $enc = Git::config('i18n.commitencoding')) {
2649 require Encode;
2650 Encode::from_to($log_entry->{log}, 'UTF-8', $enc);
2652 print $msg_fh $log_entry->{log} or croak $!;
2653 restore_commit_header_env($old_env);
2654 unless ($self->no_metadata) {
2655 print $msg_fh "\ngit-svn-id: $log_entry->{metadata}\n"
2656 or croak $!;
2658 $msg_fh->flush == 0 or croak $!;
2659 close $msg_fh or croak $!;
2660 chomp(my $commit = do { local $/; <$out_fh> });
2661 close $out_fh or croak $!;
2662 waitpid $pid, 0;
2663 croak $? if $?;
2664 if ($commit !~ /^$::sha1$/o) {
2665 die "Failed to commit, invalid sha1: $commit\n";
2668 $self->rev_map_set($log_entry->{revision}, $commit, 1);
2670 $self->{last_rev} = $log_entry->{revision};
2671 $self->{last_commit} = $commit;
2672 print "r$log_entry->{revision}" unless $::_q > 1;
2673 if (defined $log_entry->{svm_revision}) {
2674 print " (\@$log_entry->{svm_revision})" unless $::_q > 1;
2675 $self->rev_map_set($log_entry->{svm_revision}, $commit,
2676 0, $self->svm_uuid);
2678 print " = $commit ($self->{ref_id})\n" unless $::_q > 1;
2679 if (--$_gc_nr == 0) {
2680 $_gc_nr = $_gc_period;
2681 gc();
2683 return $commit;
2686 sub match_paths {
2687 my ($self, $paths, $r) = @_;
2688 return 1 if $self->{path} eq '';
2689 if (my $path = $paths->{"/$self->{path}"}) {
2690 return ($path->{action} eq 'D') ? 0 : 1;
2692 $self->{path_regex} ||= qr/^\/\Q$self->{path}\E\//;
2693 if (grep /$self->{path_regex}/, keys %$paths) {
2694 return 1;
2696 my $c = '';
2697 foreach (split m#/#, $self->{path}) {
2698 $c .= "/$_";
2699 next unless ($paths->{$c} &&
2700 ($paths->{$c}->{action} =~ /^[AR]$/));
2701 if ($self->ra->check_path($self->{path}, $r) ==
2702 $SVN::Node::dir) {
2703 return 1;
2706 return 0;
2709 sub find_parent_branch {
2710 my ($self, $paths, $rev) = @_;
2711 return undef unless $self->follow_parent;
2712 unless (defined $paths) {
2713 my $err_handler = $SVN::Error::handler;
2714 $SVN::Error::handler = \&Git::SVN::Ra::skip_unknown_revs;
2715 $self->ra->get_log([$self->{path}], $rev, $rev, 0, 1, 1,
2716 sub { $paths = $_[0] });
2717 $SVN::Error::handler = $err_handler;
2719 return undef unless defined $paths;
2721 # look for a parent from another branch:
2722 my @b_path_components = split m#/#, $self->{path};
2723 my @a_path_components;
2724 my $i;
2725 while (@b_path_components) {
2726 $i = $paths->{'/'.join('/', @b_path_components)};
2727 last if $i && defined $i->{copyfrom_path};
2728 unshift(@a_path_components, pop(@b_path_components));
2730 return undef unless defined $i && defined $i->{copyfrom_path};
2731 my $branch_from = $i->{copyfrom_path};
2732 if (@a_path_components) {
2733 print STDERR "branch_from: $branch_from => ";
2734 $branch_from .= '/'.join('/', @a_path_components);
2735 print STDERR $branch_from, "\n";
2737 my $r = $i->{copyfrom_rev};
2738 my $repos_root = $self->ra->{repos_root};
2739 my $url = $self->ra->{url};
2740 my $new_url = $url . $branch_from;
2741 print STDERR "Found possible branch point: ",
2742 "$new_url => ", $self->full_url, ", $r\n"
2743 unless $::_q > 1;
2744 $branch_from =~ s#^/##;
2745 my $gs = $self->other_gs($new_url, $url,
2746 $branch_from, $r, $self->{ref_id});
2747 my ($r0, $parent) = $gs->find_rev_before($r, 1);
2749 my ($base, $head);
2750 if (!defined $r0 || !defined $parent) {
2751 ($base, $head) = parse_revision_argument(0, $r);
2752 } else {
2753 if ($r0 < $r) {
2754 $gs->ra->get_log([$gs->{path}], $r0 + 1, $r, 1,
2755 0, 1, sub { $base = $_[1] - 1 });
2758 if (defined $base && $base <= $r) {
2759 $gs->fetch($base, $r);
2761 ($r0, $parent) = $gs->find_rev_before($r, 1);
2763 if (defined $r0 && defined $parent) {
2764 print STDERR "Found branch parent: ($self->{ref_id}) $parent\n"
2765 unless $::_q > 1;
2766 my $ed;
2767 if ($self->ra->can_do_switch) {
2768 $self->assert_index_clean($parent);
2769 print STDERR "Following parent with do_switch\n"
2770 unless $::_q > 1;
2771 # do_switch works with svn/trunk >= r22312, but that
2772 # is not included with SVN 1.4.3 (the latest version
2773 # at the moment), so we can't rely on it
2774 $self->{last_rev} = $r0;
2775 $self->{last_commit} = $parent;
2776 $ed = SVN::Git::Fetcher->new($self, $gs->{path});
2777 $gs->ra->gs_do_switch($r0, $rev, $gs,
2778 $self->full_url, $ed)
2779 or die "SVN connection failed somewhere...\n";
2780 } elsif ($self->ra->trees_match($new_url, $r0,
2781 $self->full_url, $rev)) {
2782 print STDERR "Trees match:\n",
2783 " $new_url\@$r0\n",
2784 " ${\$self->full_url}\@$rev\n",
2785 "Following parent with no changes\n"
2786 unless $::_q > 1;
2787 $self->tmp_index_do(sub {
2788 command_noisy('read-tree', $parent);
2790 $self->{last_commit} = $parent;
2791 } else {
2792 print STDERR "Following parent with do_update\n"
2793 unless $::_q > 1;
2794 $ed = SVN::Git::Fetcher->new($self);
2795 $self->ra->gs_do_update($rev, $rev, $self, $ed)
2796 or die "SVN connection failed somewhere...\n";
2798 print STDERR "Successfully followed parent\n" unless $::_q > 1;
2799 return $self->make_log_entry($rev, [$parent], $ed);
2801 return undef;
2804 sub do_fetch {
2805 my ($self, $paths, $rev) = @_;
2806 my $ed;
2807 my ($last_rev, @parents);
2808 if (my $lc = $self->last_commit) {
2809 # we can have a branch that was deleted, then re-added
2810 # under the same name but copied from another path, in
2811 # which case we'll have multiple parents (we don't
2812 # want to break the original ref, nor lose copypath info):
2813 if (my $log_entry = $self->find_parent_branch($paths, $rev)) {
2814 push @{$log_entry->{parents}}, $lc;
2815 return $log_entry;
2817 $ed = SVN::Git::Fetcher->new($self);
2818 $last_rev = $self->{last_rev};
2819 $ed->{c} = $lc;
2820 @parents = ($lc);
2821 } else {
2822 $last_rev = $rev;
2823 if (my $log_entry = $self->find_parent_branch($paths, $rev)) {
2824 return $log_entry;
2826 $ed = SVN::Git::Fetcher->new($self);
2828 unless ($self->ra->gs_do_update($last_rev, $rev, $self, $ed)) {
2829 die "SVN connection failed somewhere...\n";
2831 $self->make_log_entry($rev, \@parents, $ed);
2834 sub mkemptydirs {
2835 my ($self, $r) = @_;
2837 sub scan {
2838 my ($r, $empty_dirs, $line) = @_;
2839 if (defined $r && $line =~ /^r(\d+)$/) {
2840 return 0 if $1 > $r;
2841 } elsif ($line =~ /^ \+empty_dir: (.+)$/) {
2842 $empty_dirs->{$1} = 1;
2843 } elsif ($line =~ /^ \-empty_dir: (.+)$/) {
2844 my @d = grep {m[^\Q$1\E(/|$)]} (keys %$empty_dirs);
2845 delete @$empty_dirs{@d};
2847 1; # continue
2850 my %empty_dirs = ();
2851 my $gz_file = "$self->{dir}/unhandled.log.gz";
2852 if (-f $gz_file) {
2853 if (!$can_compress) {
2854 warn "Compress::Zlib could not be found; ",
2855 "empty directories in $gz_file will not be read\n";
2856 } else {
2857 my $gz = Compress::Zlib::gzopen($gz_file, "rb") or
2858 die "Unable to open $gz_file: $!\n";
2859 my $line;
2860 while ($gz->gzreadline($line) > 0) {
2861 scan($r, \%empty_dirs, $line) or last;
2863 $gz->gzclose;
2867 if (open my $fh, '<', "$self->{dir}/unhandled.log") {
2868 binmode $fh or croak "binmode: $!";
2869 while (<$fh>) {
2870 scan($r, \%empty_dirs, $_) or last;
2872 close $fh;
2875 my $strip = qr/\A\Q$self->{path}\E(?:\/|$)/;
2876 foreach my $d (sort keys %empty_dirs) {
2877 $d = uri_decode($d);
2878 $d =~ s/$strip//;
2879 next unless length($d);
2880 next if -d $d;
2881 if (-e $d) {
2882 warn "$d exists but is not a directory\n";
2883 } else {
2884 print "creating empty directory: $d\n";
2885 mkpath([$d]);
2890 sub get_untracked {
2891 my ($self, $ed) = @_;
2892 my @out;
2893 my $h = $ed->{empty};
2894 foreach (sort keys %$h) {
2895 my $act = $h->{$_} ? '+empty_dir' : '-empty_dir';
2896 push @out, " $act: " . uri_encode($_);
2897 warn "W: $act: $_\n";
2899 foreach my $t (qw/dir_prop file_prop/) {
2900 $h = $ed->{$t} or next;
2901 foreach my $path (sort keys %$h) {
2902 my $ppath = $path eq '' ? '.' : $path;
2903 foreach my $prop (sort keys %{$h->{$path}}) {
2904 next if $SKIP_PROP{$prop};
2905 my $v = $h->{$path}->{$prop};
2906 my $t_ppath_prop = "$t: " .
2907 uri_encode($ppath) . ' ' .
2908 uri_encode($prop);
2909 if (defined $v) {
2910 push @out, " +$t_ppath_prop " .
2911 uri_encode($v);
2912 } else {
2913 push @out, " -$t_ppath_prop";
2918 foreach my $t (qw/absent_file absent_directory/) {
2919 $h = $ed->{$t} or next;
2920 foreach my $parent (sort keys %$h) {
2921 foreach my $path (sort @{$h->{$parent}}) {
2922 push @out, " $t: " .
2923 uri_encode("$parent/$path");
2924 warn "W: $t: $parent/$path ",
2925 "Insufficient permissions?\n";
2929 \@out;
2932 # parse_svn_date(DATE)
2933 # --------------------
2934 # Given a date (in UTC) from Subversion, return a string in the format
2935 # "<TZ Offset> <local date/time>" that Git will use.
2937 # By default the parsed date will be in UTC; if $Git::SVN::_localtime
2938 # is true we'll convert it to the local timezone instead.
2939 sub parse_svn_date {
2940 my $date = shift || return '+0000 1970-01-01 00:00:00';
2941 my ($Y,$m,$d,$H,$M,$S) = ($date =~ /^(\d{4})\-(\d\d)\-(\d\d)T
2942 (\d\d)\:(\d\d)\:(\d\d)\.\d*Z$/x) or
2943 croak "Unable to parse date: $date\n";
2944 my $parsed_date; # Set next.
2946 if ($Git::SVN::_localtime) {
2947 # Translate the Subversion datetime to an epoch time.
2948 # Begin by switching ourselves to $date's timezone, UTC.
2949 my $old_env_TZ = $ENV{TZ};
2950 $ENV{TZ} = 'UTC';
2952 my $epoch_in_UTC =
2953 POSIX::strftime('%s', $S, $M, $H, $d, $m - 1, $Y - 1900);
2955 # Determine our local timezone (including DST) at the
2956 # time of $epoch_in_UTC. $Git::SVN::Log::TZ stored the
2957 # value of TZ, if any, at the time we were run.
2958 if (defined $Git::SVN::Log::TZ) {
2959 $ENV{TZ} = $Git::SVN::Log::TZ;
2960 } else {
2961 delete $ENV{TZ};
2964 my $our_TZ =
2965 POSIX::strftime('%Z', $S, $M, $H, $d, $m - 1, $Y - 1900);
2967 # This converts $epoch_in_UTC into our local timezone.
2968 my ($sec, $min, $hour, $mday, $mon, $year,
2969 $wday, $yday, $isdst) = localtime($epoch_in_UTC);
2971 $parsed_date = sprintf('%s %04d-%02d-%02d %02d:%02d:%02d',
2972 $our_TZ, $year + 1900, $mon + 1,
2973 $mday, $hour, $min, $sec);
2975 # Reset us to the timezone in effect when we entered
2976 # this routine.
2977 if (defined $old_env_TZ) {
2978 $ENV{TZ} = $old_env_TZ;
2979 } else {
2980 delete $ENV{TZ};
2982 } else {
2983 $parsed_date = "+0000 $Y-$m-$d $H:$M:$S";
2986 return $parsed_date;
2989 sub other_gs {
2990 my ($self, $new_url, $url,
2991 $branch_from, $r, $old_ref_id) = @_;
2992 my $gs = Git::SVN->find_by_url($new_url, $url, $branch_from);
2993 unless ($gs) {
2994 my $ref_id = $old_ref_id;
2995 $ref_id =~ s/\@\d+-*$//;
2996 $ref_id .= "\@$r";
2997 # just grow a tail if we're not unique enough :x
2998 $ref_id .= '-' while find_ref($ref_id);
2999 my ($u, $p, $repo_id) = ($new_url, '', $ref_id);
3000 if ($u =~ s#^\Q$url\E(/|$)##) {
3001 $p = $u;
3002 $u = $url;
3003 $repo_id = $self->{repo_id};
3005 while (1) {
3006 # It is possible to tag two different subdirectories at
3007 # the same revision. If the url for an existing ref
3008 # does not match, we must either find a ref with a
3009 # matching url or create a new ref by growing a tail.
3010 $gs = Git::SVN->init($u, $p, $repo_id, $ref_id, 1);
3011 my (undef, $max_commit) = $gs->rev_map_max(1);
3012 last if (!$max_commit);
3013 my ($url) = ::cmt_metadata($max_commit);
3014 last if ($url eq $gs->full_url);
3015 $ref_id .= '-';
3017 print STDERR "Initializing parent: $ref_id\n" unless $::_q > 1;
3022 sub call_authors_prog {
3023 my ($orig_author) = @_;
3024 $orig_author = command_oneline('rev-parse', '--sq-quote', $orig_author);
3025 my $author = `$::_authors_prog $orig_author`;
3026 if ($? != 0) {
3027 die "$::_authors_prog failed with exit code $?\n"
3029 if ($author =~ /^\s*(.+?)\s*<(.*)>\s*$/) {
3030 my ($name, $email) = ($1, $2);
3031 $email = undef if length $2 == 0;
3032 return [$name, $email];
3033 } else {
3034 die "Author: $orig_author: $::_authors_prog returned "
3035 . "invalid author format: $author\n";
3039 sub check_author {
3040 my ($author) = @_;
3041 if (!defined $author || length $author == 0) {
3042 $author = '(no author)';
3044 if (!defined $::users{$author}) {
3045 if (defined $::_authors_prog) {
3046 $::users{$author} = call_authors_prog($author);
3047 } elsif (defined $::_authors) {
3048 die "Author: $author not defined in $::_authors file\n";
3051 $author;
3054 sub find_extra_svk_parents {
3055 my ($self, $ed, $tickets, $parents) = @_;
3056 # aha! svk:merge property changed...
3057 my @tickets = split "\n", $tickets;
3058 my @known_parents;
3059 for my $ticket ( @tickets ) {
3060 my ($uuid, $path, $rev) = split /:/, $ticket;
3061 if ( $uuid eq $self->ra_uuid ) {
3062 my $url = $self->{url};
3063 my $repos_root = $url;
3064 my $branch_from = $path;
3065 $branch_from =~ s{^/}{};
3066 my $gs = $self->other_gs($repos_root."/".$branch_from,
3067 $url,
3068 $branch_from,
3069 $rev,
3070 $self->{ref_id});
3071 if ( my $commit = $gs->rev_map_get($rev, $uuid) ) {
3072 # wahey! we found it, but it might be
3073 # an old one (!)
3074 push @known_parents, [ $rev, $commit ];
3078 # Ordering matters; highest-numbered commit merge tickets
3079 # first, as they may account for later merge ticket additions
3080 # or changes.
3081 @known_parents = map {$_->[1]} sort {$b->[0] <=> $a->[0]} @known_parents;
3082 for my $parent ( @known_parents ) {
3083 my @cmd = ('rev-list', $parent, map { "^$_" } @$parents );
3084 my ($msg_fh, $ctx) = command_output_pipe(@cmd);
3085 my $new;
3086 while ( <$msg_fh> ) {
3087 $new=1;last;
3089 command_close_pipe($msg_fh, $ctx);
3090 if ( $new ) {
3091 print STDERR
3092 "Found merge parent (svk:merge ticket): $parent\n";
3093 push @$parents, $parent;
3098 sub lookup_svn_merge {
3099 my $uuid = shift;
3100 my $url = shift;
3101 my $merge = shift;
3103 my ($source, $revs) = split ":", $merge;
3104 my $path = $source;
3105 $path =~ s{^/}{};
3106 my $gs = Git::SVN->find_by_url($url.$source, $url, $path);
3107 if ( !$gs ) {
3108 warn "Couldn't find revmap for $url$source\n";
3109 return;
3111 my @ranges = split ",", $revs;
3112 my ($tip, $tip_commit);
3113 my @merged_commit_ranges;
3114 # find the tip
3115 for my $range ( @ranges ) {
3116 my ($bottom, $top) = split "-", $range;
3117 $top ||= $bottom;
3118 my $bottom_commit = $gs->find_rev_after( $bottom, 1, $top );
3119 my $top_commit = $gs->find_rev_before( $top, 1, $bottom );
3121 unless ($top_commit and $bottom_commit) {
3122 warn "W:unknown path/rev in svn:mergeinfo "
3123 ."dirprop: $source:$range\n";
3124 next;
3127 if (scalar(command('rev-parse', "$bottom_commit^@"))) {
3128 push @merged_commit_ranges,
3129 "$bottom_commit^..$top_commit";
3130 } else {
3131 push @merged_commit_ranges, "$top_commit";
3134 if ( !defined $tip or $top > $tip ) {
3135 $tip = $top;
3136 $tip_commit = $top_commit;
3139 return ($tip_commit, @merged_commit_ranges);
3142 sub _rev_list {
3143 my ($msg_fh, $ctx) = command_output_pipe(
3144 "rev-list", @_,
3146 my @rv;
3147 while ( <$msg_fh> ) {
3148 chomp;
3149 push @rv, $_;
3151 command_close_pipe($msg_fh, $ctx);
3152 @rv;
3155 sub check_cherry_pick {
3156 my $base = shift;
3157 my $tip = shift;
3158 my $parents = shift;
3159 my @ranges = @_;
3160 my %commits = map { $_ => 1 }
3161 _rev_list("--no-merges", $tip, "--not", $base, @$parents, "--");
3162 for my $range ( @ranges ) {
3163 delete @commits{_rev_list($range, "--")};
3165 for my $commit (keys %commits) {
3166 if (has_no_changes($commit)) {
3167 delete $commits{$commit};
3170 return (keys %commits);
3173 sub has_no_changes {
3174 my $commit = shift;
3176 my @revs = split / /, command_oneline(
3177 qw(rev-list --parents -1 -m), $commit);
3179 # Commits with no parents, e.g. the start of a partial branch,
3180 # have changes by definition.
3181 return 1 if (@revs < 2);
3183 # Commits with multiple parents, e.g a merge, have no changes
3184 # by definition.
3185 return 0 if (@revs > 2);
3187 return (command_oneline("rev-parse", "$commit^{tree}") eq
3188 command_oneline("rev-parse", "$commit~1^{tree}"));
3191 # The GIT_DIR environment variable is not always set until after the command
3192 # line arguments are processed, so we can't memoize in a BEGIN block.
3194 my $memoized = 0;
3196 sub memoize_svn_mergeinfo_functions {
3197 return if $memoized;
3198 $memoized = 1;
3200 my $cache_path = "$ENV{GIT_DIR}/svn/.caches/";
3201 mkpath([$cache_path]) unless -d $cache_path;
3203 tie my %lookup_svn_merge_cache => 'Memoize::Storable',
3204 "$cache_path/lookup_svn_merge.db", 'nstore';
3205 memoize 'lookup_svn_merge',
3206 SCALAR_CACHE => 'FAULT',
3207 LIST_CACHE => ['HASH' => \%lookup_svn_merge_cache],
3210 tie my %check_cherry_pick_cache => 'Memoize::Storable',
3211 "$cache_path/check_cherry_pick.db", 'nstore';
3212 memoize 'check_cherry_pick',
3213 SCALAR_CACHE => 'FAULT',
3214 LIST_CACHE => ['HASH' => \%check_cherry_pick_cache],
3217 tie my %has_no_changes_cache => 'Memoize::Storable',
3218 "$cache_path/has_no_changes.db", 'nstore';
3219 memoize 'has_no_changes',
3220 SCALAR_CACHE => ['HASH' => \%has_no_changes_cache],
3221 LIST_CACHE => 'FAULT',
3225 sub unmemoize_svn_mergeinfo_functions {
3226 return if not $memoized;
3227 $memoized = 0;
3229 Memoize::unmemoize 'lookup_svn_merge';
3230 Memoize::unmemoize 'check_cherry_pick';
3231 Memoize::unmemoize 'has_no_changes';
3234 Memoize::memoize 'Git::SVN::repos_root';
3237 END {
3238 # Force cache writeout explicitly instead of waiting for
3239 # global destruction to avoid segfault in Storable:
3240 # http://rt.cpan.org/Public/Bug/Display.html?id=36087
3241 unmemoize_svn_mergeinfo_functions();
3244 sub parents_exclude {
3245 my $parents = shift;
3246 my @commits = @_;
3247 return unless @commits;
3249 my @excluded;
3250 my $excluded;
3251 do {
3252 my @cmd = ('rev-list', "-1", @commits, "--not", @$parents );
3253 $excluded = command_oneline(@cmd);
3254 if ( $excluded ) {
3255 my @new;
3256 my $found;
3257 for my $commit ( @commits ) {
3258 if ( $commit eq $excluded ) {
3259 push @excluded, $commit;
3260 $found++;
3261 last;
3263 else {
3264 push @new, $commit;
3267 die "saw commit '$excluded' in rev-list output, "
3268 ."but we didn't ask for that commit (wanted: @commits --not @$parents)"
3269 unless $found;
3270 @commits = @new;
3273 while ($excluded and @commits);
3275 return @excluded;
3279 # note: this function should only be called if the various dirprops
3280 # have actually changed
3281 sub find_extra_svn_parents {
3282 my ($self, $ed, $mergeinfo, $parents) = @_;
3283 # aha! svk:merge property changed...
3285 memoize_svn_mergeinfo_functions();
3287 # We first search for merged tips which are not in our
3288 # history. Then, we figure out which git revisions are in
3289 # that tip, but not this revision. If all of those revisions
3290 # are now marked as merge, we can add the tip as a parent.
3291 my @merges = split "\n", $mergeinfo;
3292 my @merge_tips;
3293 my $url = $self->{url};
3294 my $uuid = $self->ra_uuid;
3295 my %ranges;
3296 for my $merge ( @merges ) {
3297 my ($tip_commit, @ranges) =
3298 lookup_svn_merge( $uuid, $url, $merge );
3299 unless (!$tip_commit or
3300 grep { $_ eq $tip_commit } @$parents ) {
3301 push @merge_tips, $tip_commit;
3302 $ranges{$tip_commit} = \@ranges;
3303 } else {
3304 push @merge_tips, undef;
3308 my %excluded = map { $_ => 1 }
3309 parents_exclude($parents, grep { defined } @merge_tips);
3311 # check merge tips for new parents
3312 my @new_parents;
3313 for my $merge_tip ( @merge_tips ) {
3314 my $spec = shift @merges;
3315 next unless $merge_tip and $excluded{$merge_tip};
3317 my $ranges = $ranges{$merge_tip};
3319 # check out 'new' tips
3320 my $merge_base;
3321 eval {
3322 $merge_base = command_oneline(
3323 "merge-base",
3324 @$parents, $merge_tip,
3327 if ($@) {
3328 die "An error occurred during merge-base"
3329 unless $@->isa("Git::Error::Command");
3331 warn "W: Cannot find common ancestor between ".
3332 "@$parents and $merge_tip. Ignoring merge info.\n";
3333 next;
3336 # double check that there are no missing non-merge commits
3337 my (@incomplete) = check_cherry_pick(
3338 $merge_base, $merge_tip,
3339 $parents,
3340 @$ranges,
3343 if ( @incomplete ) {
3344 warn "W:svn cherry-pick ignored ($spec) - missing "
3345 .@incomplete." commit(s) (eg $incomplete[0])\n";
3346 } else {
3347 warn
3348 "Found merge parent (svn:mergeinfo prop): ",
3349 $merge_tip, "\n";
3350 push @new_parents, $merge_tip;
3354 # cater for merges which merge commits from multiple branches
3355 if ( @new_parents > 1 ) {
3356 for ( my $i = 0; $i <= $#new_parents; $i++ ) {
3357 for ( my $j = 0; $j <= $#new_parents; $j++ ) {
3358 next if $i == $j;
3359 next unless $new_parents[$i];
3360 next unless $new_parents[$j];
3361 my $revs = command_oneline(
3362 "rev-list", "-1",
3363 "$new_parents[$i]..$new_parents[$j]",
3365 if ( !$revs ) {
3366 undef($new_parents[$j]);
3371 push @$parents, grep { defined } @new_parents;
3374 sub make_log_entry {
3375 my ($self, $rev, $parents, $ed) = @_;
3376 my $untracked = $self->get_untracked($ed);
3378 my @parents = @$parents;
3379 my $ps = $ed->{path_strip} || "";
3380 for my $path ( grep { m/$ps/ } %{$ed->{dir_prop}} ) {
3381 my $props = $ed->{dir_prop}{$path};
3382 if ( $props->{"svk:merge"} ) {
3383 $self->find_extra_svk_parents
3384 ($ed, $props->{"svk:merge"}, \@parents);
3386 if ( $props->{"svn:mergeinfo"} ) {
3387 $self->find_extra_svn_parents
3388 ($ed,
3389 $props->{"svn:mergeinfo"},
3390 \@parents);
3394 open my $un, '>>', "$self->{dir}/unhandled.log" or croak $!;
3395 print $un "r$rev\n" or croak $!;
3396 print $un $_, "\n" foreach @$untracked;
3397 my %log_entry = ( parents => \@parents, revision => $rev,
3398 log => '');
3400 my $headrev;
3401 my $logged = delete $self->{logged_rev_props};
3402 if (!$logged || $self->{-want_revprops}) {
3403 my $rp = $self->ra->rev_proplist($rev);
3404 foreach (sort keys %$rp) {
3405 my $v = $rp->{$_};
3406 if (/^svn:(author|date|log)$/) {
3407 $log_entry{$1} = $v;
3408 } elsif ($_ eq 'svm:headrev') {
3409 $headrev = $v;
3410 } else {
3411 print $un " rev_prop: ", uri_encode($_), ' ',
3412 uri_encode($v), "\n";
3415 } else {
3416 map { $log_entry{$_} = $logged->{$_} } keys %$logged;
3418 close $un or croak $!;
3420 $log_entry{date} = parse_svn_date($log_entry{date});
3421 $log_entry{log} .= "\n";
3422 my $author = $log_entry{author} = check_author($log_entry{author});
3423 my ($name, $email) = defined $::users{$author} ? @{$::users{$author}}
3424 : ($author, undef);
3426 my ($commit_name, $commit_email) = ($name, $email);
3427 if ($_use_log_author) {
3428 my $name_field;
3429 if ($log_entry{log} =~ /From:\s+(.*\S)\s*\n/i) {
3430 $name_field = $1;
3431 } elsif ($log_entry{log} =~ /Signed-off-by:\s+(.*\S)\s*\n/i) {
3432 $name_field = $1;
3434 if (!defined $name_field) {
3435 if (!defined $email) {
3436 $email = $name;
3438 } elsif ($name_field =~ /(.*?)\s+<(.*)>/) {
3439 ($name, $email) = ($1, $2);
3440 } elsif ($name_field =~ /(.*)@/) {
3441 ($name, $email) = ($1, $name_field);
3442 } else {
3443 ($name, $email) = ($name_field, $name_field);
3446 if (defined $headrev && $self->use_svm_props) {
3447 if ($self->rewrite_root) {
3448 die "Can't have both 'useSvmProps' and 'rewriteRoot' ",
3449 "options set!\n";
3451 if ($self->rewrite_uuid) {
3452 die "Can't have both 'useSvmProps' and 'rewriteUUID' ",
3453 "options set!\n";
3455 my ($uuid, $r) = $headrev =~ m{^([a-f\d\-]{30,}):(\d+)$}i;
3456 # we don't want "SVM: initializing mirror for junk" ...
3457 return undef if $r == 0;
3458 my $svm = $self->svm;
3459 if ($uuid ne $svm->{uuid}) {
3460 die "UUID mismatch on SVM path:\n",
3461 "expected: $svm->{uuid}\n",
3462 " got: $uuid\n";
3464 my $full_url = $self->full_url;
3465 $full_url =~ s#^\Q$svm->{replace}\E(/|$)#$svm->{source}$1# or
3466 die "Failed to replace '$svm->{replace}' with ",
3467 "'$svm->{source}' in $full_url\n";
3468 # throw away username for storing in records
3469 remove_username($full_url);
3470 $log_entry{metadata} = "$full_url\@$r $uuid";
3471 $log_entry{svm_revision} = $r;
3472 $email ||= "$author\@$uuid";
3473 $commit_email ||= "$author\@$uuid";
3474 } elsif ($self->use_svnsync_props) {
3475 my $full_url = $self->svnsync->{url};
3476 $full_url .= "/$self->{path}" if length $self->{path};
3477 remove_username($full_url);
3478 my $uuid = $self->svnsync->{uuid};
3479 $log_entry{metadata} = "$full_url\@$rev $uuid";
3480 $email ||= "$author\@$uuid";
3481 $commit_email ||= "$author\@$uuid";
3482 } else {
3483 my $url = $self->metadata_url;
3484 remove_username($url);
3485 my $uuid = $self->rewrite_uuid || $self->ra->get_uuid;
3486 $log_entry{metadata} = "$url\@$rev " . $uuid;
3487 $email ||= "$author\@" . $uuid;
3488 $commit_email ||= "$author\@" . $uuid;
3490 $log_entry{name} = $name;
3491 $log_entry{email} = $email;
3492 $log_entry{commit_name} = $commit_name;
3493 $log_entry{commit_email} = $commit_email;
3494 \%log_entry;
3497 sub fetch {
3498 my ($self, $min_rev, $max_rev, @parents) = @_;
3499 my ($last_rev, $last_commit) = $self->last_rev_commit;
3500 my ($base, $head) = $self->get_fetch_range($min_rev, $max_rev);
3501 $self->ra->gs_fetch_loop_common($base, $head, [$self]);
3504 sub set_tree_cb {
3505 my ($self, $log_entry, $tree, $rev, $date, $author) = @_;
3506 $self->{inject_parents} = { $rev => $tree };
3507 $self->fetch(undef, undef);
3510 sub set_tree {
3511 my ($self, $tree) = (shift, shift);
3512 my $log_entry = ::get_commit_entry($tree);
3513 unless ($self->{last_rev}) {
3514 ::fatal("Must have an existing revision to commit");
3516 my %ed_opts = ( r => $self->{last_rev},
3517 log => $log_entry->{log},
3518 ra => $self->ra,
3519 tree_a => $self->{last_commit},
3520 tree_b => $tree,
3521 editor_cb => sub {
3522 $self->set_tree_cb($log_entry, $tree, @_) },
3523 svn_path => $self->{path} );
3524 if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) {
3525 print "No changes\nr$self->{last_rev} = $tree\n";
3529 sub rebuild_from_rev_db {
3530 my ($self, $path) = @_;
3531 my $r = -1;
3532 open my $fh, '<', $path or croak "open: $!";
3533 binmode $fh or croak "binmode: $!";
3534 while (<$fh>) {
3535 length($_) == 41 or croak "inconsistent size in ($_) != 41";
3536 chomp($_);
3537 ++$r;
3538 next if $_ eq ('0' x 40);
3539 $self->rev_map_set($r, $_);
3540 print "r$r = $_\n";
3542 close $fh or croak "close: $!";
3543 unlink $path or croak "unlink: $!";
3546 sub rebuild {
3547 my ($self) = @_;
3548 my $map_path = $self->map_path;
3549 my $partial = (-e $map_path && ! -z $map_path);
3550 return unless ::verify_ref($self->refname.'^0');
3551 if (!$partial && ($self->use_svm_props || $self->no_metadata)) {
3552 my $rev_db = $self->rev_db_path;
3553 $self->rebuild_from_rev_db($rev_db);
3554 if ($self->use_svm_props) {
3555 my $svm_rev_db = $self->rev_db_path($self->svm_uuid);
3556 $self->rebuild_from_rev_db($svm_rev_db);
3558 $self->unlink_rev_db_symlink;
3559 return;
3561 print "Rebuilding $map_path ...\n" if (!$partial);
3562 my ($base_rev, $head) = ($partial ? $self->rev_map_max_norebuild(1) :
3563 (undef, undef));
3564 my ($log, $ctx) =
3565 command_output_pipe(qw/rev-list --pretty=raw --no-color --reverse/,
3566 ($head ? "$head.." : "") . $self->refname,
3567 '--');
3568 my $metadata_url = $self->metadata_url;
3569 remove_username($metadata_url);
3570 my $svn_uuid = $self->rewrite_uuid || $self->ra_uuid;
3571 my $c;
3572 while (<$log>) {
3573 if ( m{^commit ($::sha1)$} ) {
3574 $c = $1;
3575 next;
3577 next unless s{^\s*(git-svn-id:)}{$1};
3578 my ($url, $rev, $uuid) = ::extract_metadata($_);
3579 remove_username($url);
3581 # ignore merges (from set-tree)
3582 next if (!defined $rev || !$uuid);
3584 # if we merged or otherwise started elsewhere, this is
3585 # how we break out of it
3586 if (($uuid ne $svn_uuid) ||
3587 ($metadata_url && $url && ($url ne $metadata_url))) {
3588 next;
3590 if ($partial && $head) {
3591 print "Partial-rebuilding $map_path ...\n";
3592 print "Currently at $base_rev = $head\n";
3593 $head = undef;
3596 $self->rev_map_set($rev, $c);
3597 print "r$rev = $c\n";
3599 command_close_pipe($log, $ctx);
3600 print "Done rebuilding $map_path\n" if (!$partial || !$head);
3601 my $rev_db_path = $self->rev_db_path;
3602 if (-f $self->rev_db_path) {
3603 unlink $self->rev_db_path or croak "unlink: $!";
3605 $self->unlink_rev_db_symlink;
3608 # rev_map:
3609 # Tie::File seems to be prone to offset errors if revisions get sparse,
3610 # it's not that fast, either. Tie::File is also not in Perl 5.6. So
3611 # one of my favorite modules is out :< Next up would be one of the DBM
3612 # modules, but I'm not sure which is most portable...
3614 # This is the replacement for the rev_db format, which was too big
3615 # and inefficient for large repositories with a lot of sparse history
3616 # (mainly tags)
3618 # The format is this:
3619 # - 24 bytes for every record,
3620 # * 4 bytes for the integer representing an SVN revision number
3621 # * 20 bytes representing the sha1 of a git commit
3622 # - No empty padding records like the old format
3623 # (except the last record, which can be overwritten)
3624 # - new records are written append-only since SVN revision numbers
3625 # increase monotonically
3626 # - lookups on SVN revision number are done via a binary search
3627 # - Piping the file to xxd -c24 is a good way of dumping it for
3628 # viewing or editing (piped back through xxd -r), should the need
3629 # ever arise.
3630 # - The last record can be padding revision with an all-zero sha1
3631 # This is used to optimize fetch performance when using multiple
3632 # "fetch" directives in .git/config
3634 # These files are disposable unless noMetadata or useSvmProps is set
3636 sub _rev_map_set {
3637 my ($fh, $rev, $commit) = @_;
3639 binmode $fh or croak "binmode: $!";
3640 my $size = (stat($fh))[7];