Merge branch 'maint'
[git/git.git] / git-svn.perl
CommitLineData
3397f9df 1#!/usr/bin/env perl
551ce28f
EW
2# Copyright (C) 2006, Eric Wong <normalperson@yhbt.net>
3# License: GPL v2 or later
3397f9df
EW
4use warnings;
5use strict;
6use vars qw/ $AUTHOR $VERSION
ffe256f9 7 $sha1 $sha1_short $_revision $_repository
36db1edd 8 $_q $_authors $_authors_prog %users/;
3397f9df 9$AUTHOR = 'Eric Wong <normalperson@yhbt.net>';
60d02ccc 10$VERSION = '@@GIT_VERSION@@';
13ccd6d4 11
15153451
BS
12# From which subdir have we been invoked?
13my $cmd_dir_prefix = eval {
14 command_oneline([qw/rev-parse --show-prefix/], STDERR => 0)
15} || '';
16
5253dc33 17my $git_dir_user_set = 1 if defined $ENV{GIT_DIR};
706587fc 18$ENV{GIT_DIR} ||= '.git';
9fa00b65 19$Git::SVN::default_repo_id = 'svn';
8b8fc068 20$Git::SVN::default_ref_id = $ENV{GIT_SVN_ID} || 'git-svn';
6af1db44 21$Git::SVN::Ra::_log_window_size = 100;
13ccd6d4 22
f8c9d1d2 23$Git::SVN::Log::TZ = $ENV{TZ};
3397f9df 24$ENV{TZ} = 'UTC';
a00439ac 25$| = 1; # unbuffer STDOUT
3397f9df 26
207f1a75 27sub fatal (@) { print STDERR "@_\n"; exit 1 }
b9c85187
EW
28require SVN::Core; # use()-ing this causes segfaults for me... *shrug*
29require SVN::Ra;
30require SVN::Delta;
31if ($SVN::Core::VERSION lt '1.1.0') {
207f1a75 32 fatal "Need SVN::Core 1.1.0 or better (got $SVN::Core::VERSION)";
b9c85187 33}
d81bf827 34push @Git::SVN::Ra::ISA, 'SVN::Ra';
b9c85187
EW
35push @SVN::Git::Editor::ISA, 'SVN::Delta::Editor';
36push @SVN::Git::Fetcher::ISA, 'SVN::Delta::Editor';
3397f9df 37use Carp qw/croak/;
8d7c4fad 38use Digest::MD5;
3397f9df
EW
39use IO::File qw//;
40use File::Basename qw/dirname basename/;
41use File::Path qw/mkpath/;
36db1edd 42use File::Spec;
512b620b 43use Getopt::Long qw/:config gnu_getopt no_ignore_case auto_abbrev/;
968bdf1f 44use IPC::Open3;
336f1714 45use Git;
a5e0cedc 46
336f1714 47BEGIN {
c5f71ad0
SV
48 # import functions from Git into our packages, en masse
49 no strict 'refs';
336f1714 50 foreach (qw/command command_oneline command_noisy command_output_pipe
6ea42032
BB
51 command_input_pipe command_close_pipe
52 command_bidi_pipe command_close_bidi_pipe/) {
c5f71ad0 53 for my $package ( qw(SVN::Git::Editor SVN::Git::Fetcher
8d7c4fad 54 Git::SVN::Migration Git::SVN::Log Git::SVN),
c5f71ad0
SV
55 __PACKAGE__) {
56 *{"${package}::$_"} = \&{"Git::$_"};
57 }
336f1714 58 }
336f1714
EW
59}
60
b9c85187 61my ($SVN);
83e9940a 62
f8c9d1d2
EW
63$sha1 = qr/[a-f\d]{40}/;
64$sha1_short = qr/[a-f\d]{4,40}/;
44320b9e 65my ($_stdin, $_help, $_edit,
62244069 66 $_message, $_file, $_branch_dest,
d05d72e0 67 $_template, $_shared,
c2abd83f 68 $_version, $_fetch_all, $_no_rebase, $_fetch_parent,
dee41f3e 69 $_merge, $_strategy, $_dry_run, $_local,
4be40381 70 $_prefix, $_no_checkout, $_url, $_verbose,
5de70efb 71 $_git_format, $_commit_url, $_tag);
0bed5eaa 72$Git::SVN::_follow_parent = 1;
49750f30 73$_q ||= 0;
706587fc
EW
74my %remote_opts = ( 'username=s' => \$Git::SVN::Prompt::_username,
75 'config-dir=s' => \$Git::SVN::Ra::config_dir,
edc662f9
VS
76 'no-auth-cache' => \$Git::SVN::Prompt::_no_auth_cache,
77 'ignore-paths=s' => \$SVN::Git::Fetcher::_ignore_regex );
0bed5eaa 78my %fc_opts = ( 'follow-parent|follow!' => \$Git::SVN::_follow_parent,
dc5869c0 79 'authors-file|A=s' => \$_authors,
36db1edd 80 'authors-prog=s' => \$_authors_prog,
ecc712dd 81 'repack:i' => \$Git::SVN::_repack,
97ae0911
EW
82 'noMetadata' => \$Git::SVN::_no_metadata,
83 'useSvmProps' => \$Git::SVN::_use_svm_props,
62e349d2 84 'useSvnsyncProps' => \$Git::SVN::_use_svnsync_props,
6af1db44 85 'log-window-size=i' => \$Git::SVN::Ra::_log_window_size,
1e889ef3 86 'no-checkout' => \$_no_checkout,
49750f30 87 'quiet|q+' => \$_q,
ecc712dd
EW
88 'repack-flags|repack-args|repack-opts=s' =>
89 \$Git::SVN::_repack_flags,
70ae04e4 90 'use-log-author' => \$Git::SVN::_use_log_author,
6aa9ba14 91 'add-author-from' => \$Git::SVN::_add_author_from,
e82f0d73 92 'localtime' => \$Git::SVN::_localtime,
706587fc 93 %remote_opts );
36f5b1f0 94
62244069 95my ($_trunk, @_tags, @_branches, $_stdlayout);
0dfaf0a4 96my %icv;
dadc6d2a 97my %init_opts = ( 'template=s' => \$_template, 'shared:s' => \$_shared,
62244069
MB
98 'trunk|T=s' => \$_trunk, 'tags|t=s@' => \@_tags,
99 'branches|b=s@' => \@_branches, 'prefix=s' => \$_prefix,
8f728fb9 100 'stdlayout|s' => \$_stdlayout,
4a1bb4c3 101 'minimize-url|m' => \$Git::SVN::_minimize_url,
0dfaf0a4
EW
102 'no-metadata' => sub { $icv{noMetadata} = 1 },
103 'use-svm-props' => sub { $icv{useSvmProps} = 1 },
104 'use-svnsync-props' => sub { $icv{useSvnsyncProps} = 1 },
105 'rewrite-root=s' => sub { $icv{rewriteRoot} = $_[1] },
dadc6d2a 106 %remote_opts );
27e9fb8d 107my %cmt_opts = ( 'edit|e' => \$_edit,
24e22aa8
EW
108 'rmdir' => \$SVN::Git::Editor::_rmdir,
109 'find-copies-harder' => \$SVN::Git::Editor::_find_copies_harder,
110 'l=i' => \$SVN::Git::Editor::_rename_limit,
111 'copy-similarity|C=i'=> \$SVN::Git::Editor::_cp_similarity
27e9fb8d 112);
9d55b41a 113
3397f9df 114my %cmd = (
2a3240be 115 fetch => [ \&cmd_fetch, "Download new revisions from SVN",
e98671e5 116 { 'revision|r=s' => \$_revision,
905f8b7d 117 'fetch-all|all' => \$_fetch_all,
c2abd83f 118 'parent|p' => \$_fetch_parent,
e98671e5 119 %fc_opts } ],
0425ea90
EW
120 clone => [ \&cmd_clone, "Initialize and fetch revisions",
121 { 'revision|r=s' => \$_revision,
122 %fc_opts, %init_opts } ],
d2866f9e 123 init => [ \&cmd_init, "Initialize a repo for tracking" .
f8ab6b73 124 " (requires URL argument)",
9d55b41a 125 \%init_opts ],
dadc6d2a
EW
126 'multi-init' => [ \&cmd_multi_init,
127 "Deprecated alias for ".
128 "'$0 init -T<trunk> -b<branches> -t<tags>'",
129 \%init_opts ],
d7ad3bed
EW
130 dcommit => [ \&cmd_dcommit,
131 'Commit several diffs to merge with upstream',
3289e86e
EW
132 { 'merge|m|M' => \$_merge,
133 'strategy|s=s' => \$_strategy,
905f8b7d 134 'verbose|v' => \$_verbose,
3289e86e 135 'dry-run|n' => \$_dry_run,
905f8b7d 136 'fetch-all|all' => \$_fetch_all,
ba24e745
EW
137 'commit-url=s' => \$_commit_url,
138 'revision|r=i' => \$_revision,
171af110 139 'no-rebase' => \$_no_rebase,
4b155223 140 %cmt_opts, %fc_opts } ],
5de70efb
FR
141 branch => [ \&cmd_branch,
142 'Create a branch in the SVN repository',
143 { 'message|m=s' => \$_message,
62244069 144 'destination|d=s' => \$_branch_dest,
5de70efb
FR
145 'dry-run|n' => \$_dry_run,
146 'tag|t' => \$_tag } ],
147 tag => [ sub { $_tag = 1; cmd_branch(@_) },
148 'Create a tag in the SVN repository',
149 { 'message|m=s' => \$_message,
62244069 150 'destination|d=s' => \$_branch_dest,
5de70efb 151 'dry-run|n' => \$_dry_run } ],
1ce255dc
EW
152 'set-tree' => [ \&cmd_set_tree,
153 "Set an SVN repository to a git tree-ish",
e84dc6df 154 { 'stdin' => \$_stdin, %cmt_opts, %fc_opts, } ],
d05ddec5
BS
155 'create-ignore' => [ \&cmd_create_ignore,
156 'Create a .gitignore per svn:ignore',
157 { 'revision|r=i' => \$_revision
158 } ],
15153451
BS
159 'propget' => [ \&cmd_propget,
160 'Print the value of a property on a file or directory',
161 { 'revision|r=i' => \$_revision } ],
51e057cf
BS
162 'proplist' => [ \&cmd_proplist,
163 'List all properties of a file or directory',
164 { 'revision|r=i' => \$_revision } ],
5969cbe1 165 'show-ignore' => [ \&cmd_show_ignore, "Show svn:ignore listings",
4dbfe2e9 166 { 'revision|r=i' => \$_revision
05b4df31 167 } ],
2d879792
VK
168 'show-externals' => [ \&cmd_show_externals, "Show svn:externals listings",
169 { 'revision|r=i' => \$_revision
170 } ],
1c8443b0 171 'multi-fetch' => [ \&cmd_multi_fetch,
e98671e5
EW
172 "Deprecated alias for $0 fetch --all",
173 { 'revision|r=s' => \$_revision, %fc_opts } ],
706587fc
EW
174 'migrate' => [ sub { },
175 # no-op, we automatically run this anyways,
706587fc
EW
176 'Migrate configuration/metadata/layout from
177 previous versions of git-svn',
a836a0e1
EW
178 { 'minimize' => \$Git::SVN::Migration::_minimize,
179 %remote_opts } ],
f8c9d1d2
EW
180 'log' => [ \&Git::SVN::Log::cmd_show_log, 'Show commit logs',
181 { 'limit=i' => \$Git::SVN::Log::limit,
79bb8d88 182 'revision|r=s' => \$_revision,
f8c9d1d2
EW
183 'verbose|v' => \$Git::SVN::Log::verbose,
184 'incremental' => \$Git::SVN::Log::incremental,
185 'oneline' => \$Git::SVN::Log::oneline,
186 'show-commit' => \$Git::SVN::Log::show_commit,
187 'non-recursive' => \$Git::SVN::Log::non_recursive,
79bb8d88 188 'authors-file|A=s' => \$_authors,
f8c9d1d2 189 'color' => \$Git::SVN::Log::color,
4dbfe2e9 190 'pager=s' => \$Git::SVN::Log::pager
79bb8d88 191 } ],
222566e4
EW
192 'find-rev' => [ \&cmd_find_rev,
193 "Translate between SVN revision numbers and tree-ish",
4dbfe2e9 194 {} ],
905f8b7d
EW
195 'rebase' => [ \&cmd_rebase, "Fetch and rebase your working directory",
196 { 'merge|m|M' => \$_merge,
197 'verbose|v' => \$_verbose,
198 'strategy|s=s' => \$_strategy,
dee41f3e 199 'local|l' => \$_local,
905f8b7d 200 'fetch-all|all' => \$_fetch_all,
7d45e146 201 'dry-run|n' => \$_dry_run,
905f8b7d 202 %fc_opts } ],
44320b9e
EW
203 'commit-diff' => [ \&cmd_commit_diff,
204 'Commit a diff between two trees',
27e9fb8d
EW
205 { 'message|m=s' => \$_message,
206 'file|F=s' => \$_file,
45bf473a 207 'revision|r=s' => \$_revision,
27e9fb8d 208 %cmt_opts } ],
e6fefa92
DK
209 'info' => [ \&cmd_info,
210 "Show info about the latest SVN revision
211 on the current branch",
8b014d71 212 { 'url' => \$_url, } ],
6fb5375e
TS
213 'blame' => [ \&Git::SVN::Log::cmd_blame,
214 "Show what revision and author last modified each line of a file",
4be40381 215 { 'git-format' => \$_git_format } ],
195643f2
BJ
216 'reset' => [ \&cmd_reset,
217 "Undo fetches back to the specified SVN revision",
218 { 'revision|r=s' => \$_revision,
219 'parent|p' => \$_fetch_parent } ],
3397f9df 220);
9d55b41a 221
3397f9df
EW
222my $cmd;
223for (my $i = 0; $i < @ARGV; $i++) {
224 if (defined $cmd{$ARGV[$i]}) {
225 $cmd = $ARGV[$i];
226 splice @ARGV, $i, 1;
227 last;
9a8c92ac
BJ
228 } elsif ($ARGV[$i] eq 'help') {
229 $cmd = $ARGV[$i+1];
230 usage(0);
3397f9df
EW
231 }
232};
233
540424b2
EW
234# make sure we're always running at the top-level working directory
235unless ($cmd && $cmd =~ /(?:clone|init|multi-init)$/) {
5253dc33
EW
236 unless (-d $ENV{GIT_DIR}) {
237 if ($git_dir_user_set) {
238 die "GIT_DIR=$ENV{GIT_DIR} explicitly set, ",
239 "but it is not a directory\n";
240 }
241 my $git_dir = delete $ENV{GIT_DIR};
fe4003f6
DM
242 my $cdup = undef;
243 git_cmd_try {
244 $cdup = command_oneline(qw/rev-parse --show-cdup/);
245 $git_dir = '.' unless ($cdup);
246 chomp $cdup if ($cdup);
247 $cdup = "." unless ($cdup && length $cdup);
248 } "Already at toplevel, but $git_dir not found\n";
5253dc33
EW
249 chdir $cdup or die "Unable to chdir up to '$cdup'\n";
250 unless (-d $git_dir) {
251 die "$git_dir still not found after going to ",
252 "'$cdup'\n";
253 }
254 $ENV{GIT_DIR} = $git_dir;
255 }
ffe256f9 256 $_repository = Git->repository(Repository => $ENV{GIT_DIR});
5253dc33 257}
f4dd334b
GH
258
259my %opts = %{$cmd{$cmd}->[2]} if (defined $cmd);
260
261read_repo_config(\%opts);
222566e4
EW
262if ($cmd && ($cmd eq 'log' || $cmd eq 'blame')) {
263 Getopt::Long::Configure('pass_through');
264}
f4dd334b
GH
265my $rv = GetOptions(%opts, 'help|H|h' => \$_help, 'version|V' => \$_version,
266 'minimize-connections' => \$Git::SVN::Migration::_minimize,
267 'id|i=s' => \$Git::SVN::default_ref_id,
268 'svn-remote|remote|R=s' => sub {
269 $Git::SVN::no_reuse_existing = 1;
270 $Git::SVN::default_repo_id = $_[1] });
271exit 1 if (!$rv && $cmd && $cmd ne 'log');
272
273usage(0) if $_help;
274version() if $_version;
275usage(1) unless defined $cmd;
276load_authors() if $_authors;
36db1edd
ML
277if (defined $_authors_prog) {
278 $_authors_prog = "'" . File::Spec->rel2abs($_authors_prog) . "'";
279}
f4dd334b 280
0425ea90 281unless ($cmd =~ /^(?:clone|init|multi-init|commit-diff)$/) {
706587fc
EW
282 Git::SVN::Migration::migration_check();
283}
ecc712dd 284Git::SVN::init_vars();
b805b44a
EW
285eval {
286 Git::SVN::verify_remotes_sanity();
287 $cmd{$cmd}->[0]->(@ARGV);
288};
289fatal $@ if $@;
1e889ef3 290post_fetch_checkout();
3397f9df
EW
291exit 0;
292
293####################### primary functions ######################
294sub usage {
295 my $exit = shift || 0;
296 my $fd = $exit ? \*STDERR : \*STDOUT;
297 print $fd <<"";
298git-svn - bidirectional operations between a single Subversion tree and git
1b1dd23f 299Usage: git svn <command> [options] [arguments]\n
448c81b4
EW
300
301 print $fd "Available commands:\n" unless $cmd;
3397f9df
EW
302
303 foreach (sort keys %cmd) {
448c81b4 304 next if $cmd && $cmd ne $_;
a836a0e1 305 next if /^multi-/; # don't show deprecated commands
b203b769 306 print $fd ' ',pack('A17',$_),$cmd{$_}->[1],"\n";
aa807bc2 307 foreach (sort keys %{$cmd{$_}->[2]}) {
512b620b
EW
308 # mixed-case options are for .git/config only
309 next if /[A-Z]/ && /^[a-z]+$/i;
448c81b4 310 # prints out arguments as they should be passed:
b8c92cad 311 my $x = s#[:=]s$## ? '<arg>' : s#[:=]i$## ? '<num>' : '';
b203b769 312 print $fd ' ' x 21, join(', ', map { length $_ > 1 ?
448c81b4
EW
313 "--$_" : "-$_" }
314 split /\|/,$_)," $x\n";
315 }
3397f9df
EW
316 }
317 print $fd <<"";
448c81b4
EW
318\nGIT_SVN_ID may be set in the environment or via the --id/-i switch to an
319arbitrary identifier if you're tracking multiple SVN branches/repositories in
320one git repository and want to keep them separate. See git-svn(1) for more
321information.
3397f9df
EW
322
323 exit $exit;
324}
325
551ce28f 326sub version {
7d60ab2c 327 print "git-svn version $VERSION (svn $SVN::Core::VERSION)\n";
551ce28f
EW
328 exit 0;
329}
330
8164b652
EW
331sub do_git_init_db {
332 unless (-d $ENV{GIT_DIR}) {
333 my @init_db = ('init');
334 push @init_db, "--template=$_template" if defined $_template;
dadc6d2a
EW
335 if (defined $_shared) {
336 if ($_shared =~ /[a-z]/) {
337 push @init_db, "--shared=$_shared";
338 } else {
339 push @init_db, "--shared";
340 }
341 }
8164b652 342 command_noisy(@init_db);
ffe256f9 343 $_repository = Git->repository(Repository => ".git");
8164b652 344 }
d3c9634e 345 command_noisy('config', 'core.autocrlf', 'false');
0dfaf0a4
EW
346 my $set;
347 my $pfx = "svn-remote.$Git::SVN::default_repo_id";
348 foreach my $i (keys %icv) {
349 die "'$set' and '$i' cannot both be set\n" if $set;
350 next unless defined $icv{$i};
351 command_noisy('config', "$pfx.$i", $icv{$i});
352 $set = $i;
353 }
88ec2054
BJ
354 my $ignore_regex = \$SVN::Git::Fetcher::_ignore_regex;
355 command_noisy('config', "$pfx.ignore-paths", $$ignore_regex)
356 if defined $$ignore_regex;
8164b652
EW
357}
358
dadc6d2a
EW
359sub init_subdir {
360 my $repo_path = shift or return;
361 mkpath([$repo_path]) unless -d $repo_path;
362 chdir $repo_path or die "Couldn't chdir to $repo_path: $!\n";
f30603fc 363 $ENV{GIT_DIR} = '.git';
ffe256f9 364 $_repository = Git->repository(Repository => $ENV{GIT_DIR});
dadc6d2a
EW
365}
366
0425ea90
EW
367sub cmd_clone {
368 my ($url, $path) = @_;
369 if (!defined $path &&
62244069 370 (defined $_trunk || @_branches || @_tags ||
8f728fb9 371 defined $_stdlayout) &&
0425ea90
EW
372 $url !~ m#^[a-z\+]+://#) {
373 $path = $url;
374 }
0425ea90 375 $path = basename($url) if !defined $path || !length $path;
f30603fc 376 cmd_init($url, $path);
0425ea90 377 Git::SVN::fetch_all($Git::SVN::default_repo_id);
42a5da18 378 command_oneline('config', 'svn.authorsfile', $_authors) if $_authors;
0425ea90
EW
379}
380
d2866f9e 381sub cmd_init {
8f728fb9 382 if (defined $_stdlayout) {
383 $_trunk = 'trunk' if (!defined $_trunk);
62244069
MB
384 @_tags = 'tags' if (! @_tags);
385 @_branches = 'branches' if (! @_branches);
8f728fb9 386 }
62244069 387 if (defined $_trunk || @_branches || @_tags) {
dadc6d2a 388 return cmd_multi_init(@_);
03e0ea87 389 }
dadc6d2a
EW
390 my $url = shift or die "SVN repository location required ",
391 "as a command-line argument\n";
50ff2366 392 $url = canonicalize_url($url);
dadc6d2a 393 init_subdir(@_);
8164b652 394 do_git_init_db();
03e0ea87 395
706587fc 396 Git::SVN->init($url);
3397f9df
EW
397}
398
2a3240be 399sub cmd_fetch {
e98671e5
EW
400 if (grep /^\d+=./, @_) {
401 die "'<rev>=<commit>' fetch arguments are ",
402 "no longer supported.\n";
07a1c950 403 }
e98671e5
EW
404 my ($remote) = @_;
405 if (@_ > 1) {
c2abd83f 406 die "Usage: $0 fetch [--all] [--parent] [svn-remote]\n";
e98671e5 407 }
c2abd83f
JM
408 if ($_fetch_parent) {
409 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
410 unless ($gs) {
411 die "Unable to determine upstream SVN information from ",
412 "working tree history\n";
413 }
414 # just fetch, don't checkout.
415 $_no_checkout = 'true';
416 $_fetch_all ? $gs->fetch_all : $gs->fetch;
417 } elsif ($_fetch_all) {
e98671e5
EW
418 cmd_multi_fetch();
419 } else {
c2abd83f 420 $remote ||= $Git::SVN::default_repo_id;
e98671e5 421 Git::SVN::fetch_all($remote, Git::SVN::read_all_remotes());
1c8443b0 422 }
2a3240be
EW
423}
424
1ce255dc 425sub cmd_set_tree {
3397f9df
EW
426 my (@commits) = @_;
427 if ($_stdin || !@commits) {
428 print "Reading from stdin...\n";
429 @commits = ();
430 while (<STDIN>) {
1ca72aef 431 if (/\b($sha1_short)\b/o) {
3397f9df
EW
432 unshift @commits, $1;
433 }
434 }
435 }
436 my @revs;
8de010ad 437 foreach my $c (@commits) {
aef4e921 438 my @tmp = command('rev-parse',$c);
8de010ad
EW
439 if (scalar @tmp == 1) {
440 push @revs, $tmp[0];
441 } elsif (scalar @tmp > 1) {
aef4e921 442 push @revs, reverse(command('rev-list',@tmp));
8de010ad 443 } else {
207f1a75 444 fatal "Failed to rev-parse $c";
8de010ad 445 }
3397f9df 446 }
1ce255dc
EW
447 my $gs = Git::SVN->new;
448 my ($r_last, $cmt_last) = $gs->last_rev_commit;
449 $gs->fetch;
97f6987a 450 if (defined $gs->{last_rev} && $r_last != $gs->{last_rev}) {
1ce255dc
EW
451 fatal "There are new revisions that were fetched ",
452 "and need to be merged (or acknowledged) ",
453 "before committing.\nlast rev: $r_last\n",
207f1a75 454 " current: $gs->{last_rev}";
a5e0cedc 455 }
1ce255dc
EW
456 $gs->set_tree($_) foreach @revs;
457 print "Done committing ",scalar @revs," revisions to SVN\n";
3157dd9e 458 unlink $gs->{index};
a5e0cedc 459}
8f22562c 460
d7ad3bed
EW
461sub cmd_dcommit {
462 my $head = shift;
c8cfa3e4 463 git_cmd_try { command_oneline(qw/diff-index --quiet HEAD/) }
826a9339 464 'Cannot dcommit with a dirty index. Commit your changes first, '
c8cfa3e4 465 . "or stash them with `git stash'.\n";
d7ad3bed 466 $head ||= 'HEAD';
5eec27e3
TR
467
468 my $old_head;
469 if ($head ne 'HEAD') {
470 $old_head = eval {
471 command_oneline([qw/symbolic-ref -q HEAD/])
472 };
473 if ($old_head) {
474 $old_head =~ s{^refs/heads/}{};
475 } else {
476 $old_head = eval { command_oneline(qw/rev-parse HEAD/) };
477 }
478 command(['checkout', $head], STDERR => 0);
479 }
480
a8ae2623 481 my @refs;
5eec27e3 482 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD', \@refs);
2cb61105
TR
483 unless ($gs) {
484 die "Unable to determine upstream SVN information from ",
485 "$head history.\nPerhaps the repository is empty.";
486 }
0df84059
PO
487
488 if (defined $_commit_url) {
489 $url = $_commit_url;
490 } else {
491 $url = eval { command_oneline('config', '--get',
492 "svn-remote.$gs->{repo_id}.commiturl") };
493 if (!$url) {
494 $url = $gs->full_url
495 }
496 }
497
ba24e745 498 my $last_rev = $_revision if defined $_revision;
59b0c24d
MM
499 if ($url) {
500 print "Committing to $url ...\n";
501 }
733a65aa 502 my ($linear_refs, $parents) = linearize_history($gs, \@refs);
751eb395
EW
503 if ($_no_rebase && scalar(@$linear_refs) > 1) {
504 warn "Attempting to commit more than one change while ",
505 "--no-rebase is enabled.\n",
506 "If these changes depend on each other, re-running ",
7dfa16b9 507 "without --no-rebase may be required."
751eb395 508 }
711521e2
EW
509 my $expect_url = $url;
510 Git::SVN::remove_username($expect_url);
c74d9acf
EW
511 while (1) {
512 my $d = shift @$linear_refs or last;
45bf473a
EW
513 unless (defined $last_rev) {
514 (undef, $last_rev, undef) = cmt_metadata("$d~1");
515 unless (defined $last_rev) {
d7ad3bed 516 fatal "Unable to extract revision information ",
207f1a75 517 "from commit $d~1";
45bf473a
EW
518 }
519 }
b22d4497
EW
520 if ($_dry_run) {
521 print "diff-tree $d~1 $d\n";
522 } else {
751eb395 523 my $cmt_rev;
d7ad3bed 524 my %ed_opts = ( r => $last_rev,
61395354 525 log => get_commit_entry($d)->{log},
ba24e745 526 ra => Git::SVN::Ra->new($url),
3caf320b
KA
527 config => SVN::Core::config_get_config(
528 $Git::SVN::Ra::config_dir
529 ),
61395354
EW
530 tree_a => "$d~1",
531 tree_b => $d,
532 editor_cb => sub {
533 print "Committed r$_[0]\n";
751eb395
EW
534 $cmt_rev = $_[0];
535 },
a8ae2623 536 svn_path => '');
61395354 537 if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) {
d7ad3bed 538 print "No changes\n$d~1 == $d\n";
733a65aa 539 } elsif ($parents->{$d} && @{$parents->{$d}}) {
751eb395 540 $gs->{inject_parents_dcommit}->{$cmt_rev} =
733a65aa 541 $parents->{$d};
d7ad3bed 542 }
751eb395 543 $_fetch_all ? $gs->fetch_all : $gs->fetch;
7dfa16b9 544 $last_rev = $cmt_rev;
751eb395
EW
545 next if $_no_rebase;
546
547 # we always want to rebase against the current HEAD,
548 # not any head that was passed to us
c74d9acf 549 my @diff = command('diff-tree', $d,
751eb395
EW
550 $gs->refname, '--');
551 my @finish;
552 if (@diff) {
553 @finish = rebase_cmd();
c74d9acf 554 print STDERR "W: $d and ", $gs->refname,
751eb395 555 " differ, using @finish:\n",
c74d9acf 556 join("\n", @diff), "\n";
751eb395
EW
557 } else {
558 print "No changes between current HEAD and ",
559 $gs->refname,
560 "\nResetting to the latest ",
561 $gs->refname, "\n";
562 @finish = qw/reset --mixed/;
563 }
564 command_noisy(@finish, $gs->refname);
c74d9acf
EW
565 if (@diff) {
566 @refs = ();
567 my ($url_, $rev_, $uuid_, $gs_) =
5eec27e3 568 working_head_info('HEAD', \@refs);
c74d9acf
EW
569 my ($linear_refs_, $parents_) =
570 linearize_history($gs_, \@refs);
571 if (scalar(@$linear_refs) !=
572 scalar(@$linear_refs_)) {
573 fatal "# of revisions changed ",
574 "\nbefore:\n",
575 join("\n", @$linear_refs),
576 "\n\nafter:\n",
577 join("\n", @$linear_refs_), "\n",
578 'If you are attempting to commit ',
579 "merges, try running:\n\t",
580 'git rebase --interactive',
581 '--preserve-merges ',
582 $gs->refname,
583 "\nBefore dcommitting";
584 }
711521e2 585 if ($url_ ne $expect_url) {
c74d9acf 586 fatal "URL mismatch after rebase: ",
711521e2 587 "$url_ != $expect_url";
c74d9acf
EW
588 }
589 if ($uuid_ ne $uuid) {
590 fatal "uuid mismatch after rebase: ",
591 "$uuid_ != $uuid";
592 }
593 # remap parents
594 my (%p, @l, $i);
595 for ($i = 0; $i < scalar @$linear_refs; $i++) {
596 my $new = $linear_refs_->[$i] or next;
597 $p{$new} =
598 $parents->{$linear_refs->[$i]};
599 push @l, $new;
600 }
601 $parents = \%p;
602 $linear_refs = \@l;
603 }
b22d4497
EW
604 }
605 }
5eec27e3
TR
606
607 if ($old_head) {
608 my $new_head = command_oneline(qw/rev-parse HEAD/);
609 my $new_is_symbolic = eval {
610 command_oneline(qw/symbolic-ref -q HEAD/);
611 };
612 if ($new_is_symbolic) {
613 print "dcommitted the branch ", $head, "\n";
614 } else {
615 print "dcommitted on a detached HEAD because you gave ",
616 "a revision argument.\n",
617 "The rewritten commit is: ", $new_head, "\n";
618 }
619 command(['checkout', $old_head], STDERR => 0);
620 }
621
3157dd9e 622 unlink $gs->{index};
b22d4497
EW
623}
624
5de70efb
FR
625sub cmd_branch {
626 my ($branch_name, $head) = @_;
627
628 unless (defined $branch_name && length $branch_name) {
629 die(($_tag ? "tag" : "branch") . " name required\n");
630 }
631 $head ||= 'HEAD';
632
633 my ($src, $rev, undef, $gs) = working_head_info($head);
634
a0fbc87c 635 my $remote = Git::SVN::read_all_remotes()->{$gs->{repo_id}};
62244069
MB
636 my $allglobs = $remote->{ $_tag ? 'tags' : 'branches' };
637 my $glob;
638 if ($#{$allglobs} == 0) {
639 $glob = $allglobs->[0];
640 } else {
641 unless(defined $_branch_dest) {
642 die "Multiple ",
643 $_tag ? "tag" : "branch",
644 " paths defined for Subversion repository.\n",
645 "You must specify where you want to create the ",
646 $_tag ? "tag" : "branch",
647 " with the --destination argument.\n";
648 }
649 foreach my $g (@{$allglobs}) {
f7050599
EW
650 # SVN::Git::Editor could probably be moved to Git.pm..
651 my $re = SVN::Git::Editor::glob2pat($g->{path}->{left});
652 if ($_branch_dest =~ /$re/) {
62244069
MB
653 $glob = $g;
654 last;
655 }
656 }
657 unless (defined $glob) {
658 die "Unknown ",
659 $_tag ? "tag" : "branch",
660 " destination $_branch_dest\n";
661 }
662 }
5de70efb
FR
663 my ($lft, $rgt) = @{ $glob->{path} }{qw/left right/};
664 my $dst = join '/', $remote->{url}, $lft, $branch_name, ($rgt || ());
665
666 my $ctx = SVN::Client->new(
667 auth => Git::SVN::Ra::_auth_providers(),
668 log_msg => sub {
669 ${ $_[0] } = defined $_message
670 ? $_message
671 : 'Create ' . ($_tag ? 'tag ' : 'branch ' )
672 . $branch_name;
673 },
674 );
675
676 eval {
677 $ctx->ls($dst, 'HEAD', 0);
678 } and die "branch ${branch_name} already exists\n";
679
680 print "Copying ${src} at r${rev} to ${dst}...\n";
681 $ctx->copy($src, $rev, $dst)
682 unless $_dry_run;
683
684 $gs->fetch_all;
685}
686
26e60160 687sub cmd_find_rev {
ea14e6c5
MAL
688 my $revision_or_hash = shift or die "SVN or git revision required ",
689 "as a command-line argument\n";
26e60160
AR
690 my $result;
691 if ($revision_or_hash =~ /^r\d+$/) {
b3cb7e45
AR
692 my $head = shift;
693 $head ||= 'HEAD';
694 my @refs;
63c56022 695 my (undef, undef, $uuid, $gs) = working_head_info($head, \@refs);
b3cb7e45
AR
696 unless ($gs) {
697 die "Unable to determine upstream SVN information from ",
698 "$head history\n";
26e60160 699 }
b3cb7e45 700 my $desired_revision = substr($revision_or_hash, 1);
63c56022 701 $result = $gs->rev_map_get($desired_revision, $uuid);
26e60160
AR
702 } else {
703 my (undef, $rev, undef) = cmt_metadata($revision_or_hash);
704 $result = $rev;
705 }
706 print "$result\n" if $result;
707}
708
905f8b7d
EW
709sub cmd_rebase {
710 command_noisy(qw/update-index --refresh/);
13c823fb
EW
711 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
712 unless ($gs) {
905f8b7d
EW
713 die "Unable to determine upstream SVN information from ",
714 "working tree history\n";
715 }
7d45e146
SF
716 if ($_dry_run) {
717 print "Remote Branch: " . $gs->refname . "\n";
718 print "SVN URL: " . $url . "\n";
719 return;
720 }
905f8b7d
EW
721 if (command(qw/diff-index HEAD --/)) {
722 print STDERR "Cannot rebase with uncommited changes:\n";
723 command_noisy('status');
724 exit 1;
725 }
dee41f3e 726 unless ($_local) {
cec0d5a3
SG
727 # rebase will checkout for us, so no need to do it explicitly
728 $_no_checkout = 'true';
dee41f3e
EW
729 $_fetch_all ? $gs->fetch_all : $gs->fetch;
730 }
905f8b7d
EW
731 command_noisy(rebase_cmd(), $gs->refname);
732}
733
5969cbe1 734sub cmd_show_ignore {
13c823fb
EW
735 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
736 $gs ||= Git::SVN->new;
5969cbe1 737 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
01bdab84
BS
738 $gs->prop_walk($gs->{path}, $r, sub {
739 my ($gs, $path, $props) = @_;
740 print STDOUT "\n# $path\n";
741 my $s = $props->{'svn:ignore'} or return;
742 $s =~ s/[\r\n]+/\n/g;
743 chomp $s;
744 $s =~ s#^#$path#gm;
745 print STDOUT "$s\n";
746 });
a5e0cedc
EW
747}
748
2d879792
VK
749sub cmd_show_externals {
750 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
751 $gs ||= Git::SVN->new;
752 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
753 $gs->prop_walk($gs->{path}, $r, sub {
754 my ($gs, $path, $props) = @_;
755 print STDOUT "\n# $path\n";
756 my $s = $props->{'svn:externals'} or return;
757 $s =~ s/[\r\n]+/\n/g;
758 chomp $s;
759 $s =~ s#^#$path#gm;
760 print STDOUT "$s\n";
761 });
762}
763
d05ddec5
BS
764sub cmd_create_ignore {
765 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
766 $gs ||= Git::SVN->new;
767 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
768 $gs->prop_walk($gs->{path}, $r, sub {
769 my ($gs, $path, $props) = @_;
770 # $path is of the form /path/to/dir/
7d9fd459
BG
771 $path = '.' . $path;
772 # SVN can have attributes on empty directories,
773 # which git won't track
774 mkpath([$path]) unless -d $path;
775 my $ignore = $path . '.gitignore';
d05ddec5
BS
776 my $s = $props->{'svn:ignore'} or return;
777 open(GITIGNORE, '>', $ignore)
207f1a75 778 or fatal("Failed to open `$ignore' for writing: $!");
d05ddec5
BS
779 $s =~ s/[\r\n]+/\n/g;
780 chomp $s;
781 # Prefix all patterns so that the ignore doesn't apply
782 # to sub-directories.
783 $s =~ s#^#/#gm;
784 print GITIGNORE "$s\n";
785 close(GITIGNORE)
207f1a75 786 or fatal("Failed to close `$ignore': $!");
c4c66b26 787 command_noisy('add', '-f', $ignore);
d05ddec5
BS
788 });
789}
790
b2b3ada7
DK
791sub canonicalize_path {
792 my ($path) = @_;
e6fefa92
DK
793 my $dot_slash_added = 0;
794 if (substr($path, 0, 1) ne "/") {
795 $path = "./" . $path;
796 $dot_slash_added = 1;
797 }
b2b3ada7
DK
798 # File::Spec->canonpath doesn't collapse x/../y into y (for a
799 # good reason), so let's do this manually.
800 $path =~ s#/+#/#g;
801 $path =~ s#/\.(?:/|$)#/#g;
802 $path =~ s#/[^/]+/\.\.##g;
803 $path =~ s#/$##g;
e6fefa92 804 $path =~ s#^\./## if $dot_slash_added;
2fe403e7
GP
805 $path =~ s#^/##;
806 $path =~ s#^\.$##;
b2b3ada7
DK
807 return $path;
808}
809
50ff2366
UD
810sub canonicalize_url {
811 my ($url) = @_;
812 $url =~ s#^([^:]+://[^/]*/)(.*)$#$1 . canonicalize_path($2)#e;
813 return $url;
814}
815
15153451
BS
816# get_svnprops(PATH)
817# ------------------
51e057cf 818# Helper for cmd_propget and cmd_proplist below.
15153451
BS
819sub get_svnprops {
820 my $path = shift;
821 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
822 $gs ||= Git::SVN->new;
823
824 # prefix THE PATH by the sub-directory from which the user
825 # invoked us.
826 $path = $cmd_dir_prefix . $path;
207f1a75 827 fatal("No such file or directory: $path") unless -e $path;
15153451
BS
828 my $is_dir = -d $path ? 1 : 0;
829 $path = $gs->{path} . '/' . $path;
830
831 # canonicalize the path (otherwise libsvn will abort or fail to
832 # find the file)
b2b3ada7 833 $path = canonicalize_path($path);
15153451
BS
834
835 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
836 my $props;
837 if ($is_dir) {
838 (undef, undef, $props) = $gs->ra->get_dir($path, $r);
839 }
840 else {
841 (undef, $props) = $gs->ra->get_file($path, $r, undef);
842 }
843 return $props;
844}
845
846# cmd_propget (PROP, PATH)
847# ------------------------
848# Print the SVN property PROP for PATH.
849sub cmd_propget {
850 my ($prop, $path) = @_;
851 $path = '.' if not defined $path;
852 usage(1) if not defined $prop;
853 my $props = get_svnprops($path);
854 if (not defined $props->{$prop}) {
207f1a75 855 fatal("`$path' does not have a `$prop' SVN property.");
15153451
BS
856 }
857 print $props->{$prop} . "\n";
858}
859
51e057cf
BS
860# cmd_proplist (PATH)
861# -------------------
862# Print the list of SVN properties for PATH.
863sub cmd_proplist {
864 my $path = shift;
865 $path = '.' if not defined $path;
866 my $props = get_svnprops($path);
867 print "Properties on '$path':\n";
868 foreach (sort keys %{$props}) {
869 print " $_\n";
870 }
871}
872
8164b652 873sub cmd_multi_init {
9d55b41a 874 my $url = shift;
62244069 875 unless (defined $_trunk || @_branches || @_tags) {
98327e58 876 usage(1);
9d55b41a 877 }
dc431666 878
8164b652 879 $_prefix = '' unless defined $_prefix;
dadc6d2a 880 if (defined $url) {
50ff2366 881 $url = canonicalize_url($url);
dadc6d2a
EW
882 init_subdir(@_);
883 }
f30603fc 884 do_git_init_db();
98327e58 885 if (defined $_trunk) {
706587fc
EW
886 my $trunk_ref = $_prefix . 'trunk';
887 # try both old-style and new-style lookups:
888 my $gs_trunk = eval { Git::SVN->new($trunk_ref) };
8164b652 889 unless ($gs_trunk) {
706587fc
EW
890 my ($trunk_url, $trunk_path) =
891 complete_svn_url($url, $_trunk);
892 $gs_trunk = Git::SVN->init($trunk_url, $trunk_path,
893 undef, $trunk_ref);
98327e58 894 }
c35b96e7 895 }
62244069 896 return unless @_branches || @_tags;
e7db67e6 897 my $ra = $url ? Git::SVN::Ra->new($url) : undef;
62244069
MB
898 foreach my $path (@_branches) {
899 complete_url_ls_init($ra, $path, '--branches/-b', $_prefix);
900 }
901 foreach my $path (@_tags) {
902 complete_url_ls_init($ra, $path, '--tags/-t', $_prefix.'tags/');
903 }
9d55b41a
EW
904}
905
1c8443b0 906sub cmd_multi_fetch {
0af9c9f9
EW
907 my $remotes = Git::SVN::read_all_remotes();
908 foreach my $repo_id (sort keys %$remotes) {
db03cd24 909 if ($remotes->{$repo_id}->{url}) {
4bb9ed04
EW
910 Git::SVN::fetch_all($repo_id, $remotes);
911 }
9d55b41a 912 }
9d55b41a
EW
913}
914
44320b9e
EW
915# this command is special because it requires no metadata
916sub cmd_commit_diff {
917 my ($ta, $tb, $url) = @_;
918 my $usage = "Usage: $0 commit-diff -r<revision> ".
207f1a75 919 "<tree-ish> <tree-ish> [<URL>]";
44320b9e 920 fatal($usage) if (!defined $ta || !defined $tb);
d72ab8c8 921 my $svn_path = '';
44320b9e
EW
922 if (!defined $url) {
923 my $gs = eval { Git::SVN->new };
924 if (!$gs) {
925 fatal("Needed URL or usable git-svn --id in ",
926 "the command-line\n", $usage);
927 }
928 $url = $gs->{url};
d3a840dc 929 $svn_path = $gs->{path};
44320b9e
EW
930 }
931 unless (defined $_revision) {
932 fatal("-r|--revision is a required argument\n", $usage);
933 }
934 if (defined $_message && defined $_file) {
935 fatal("Both --message/-m and --file/-F specified ",
936 "for the commit message.\n",
207f1a75 937 "I have no idea what you mean");
44320b9e
EW
938 }
939 if (defined $_file) {
940 $_message = file_to_s($_file);
941 } else {
942 $_message ||= get_commit_entry($tb)->{log};
943 }
944 my $ra ||= Git::SVN::Ra->new($url);
945 my $r = $_revision;
946 if ($r eq 'HEAD') {
947 $r = $ra->get_latest_revnum;
948 } elsif ($r !~ /^\d+$/) {
949 die "revision argument: $r not understood by git-svn\n";
950 }
61395354
EW
951 my %ed_opts = ( r => $r,
952 log => $_message,
953 ra => $ra,
954 tree_a => $ta,
955 tree_b => $tb,
956 editor_cb => sub { print "Committed r$_[0]\n" },
957 svn_path => $svn_path );
958 if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) {
44320b9e
EW
959 print "No changes\n$ta == $tb\n";
960 }
44320b9e
EW
961}
962
05427b91
TR
963sub escape_uri_only {
964 my ($uri) = @_;
965 my @tmp;
966 foreach (split m{/}, $uri) {
6a004d3f 967 s/([^~\w.%+-]|%(?![a-fA-F0-9]{2}))/sprintf("%%%02X",ord($1))/eg;
05427b91
TR
968 push @tmp, $_;
969 }
970 join('/', @tmp);
971}
972
973sub escape_url {
974 my ($url) = @_;
975 if ($url =~ m#^([^:]+)://([^/]*)(.*)$#) {
976 my ($scheme, $domain, $uri) = ($1, $2, escape_uri_only($3));
977 $url = "$scheme://$domain$uri";
978 }
979 $url;
980}
981
e6fefa92 982sub cmd_info {
bd2d4f96 983 my $path = canonicalize_path(defined($_[0]) ? $_[0] : ".");
edde9112 984 my $fullpath = canonicalize_path($cmd_dir_prefix . $path);
bd2d4f96 985 if (exists $_[1]) {
e6fefa92
DK
986 die "Too many arguments specified\n";
987 }
988
989 my ($file_type, $diff_status) = find_file_type_and_diff_status($path);
990
991 if (!$file_type && !$diff_status) {
2cf3e3ac
TR
992 print STDERR "svn: '$path' is not under version control\n";
993 exit 1;
e6fefa92
DK
994 }
995
996 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
997 unless ($gs) {
998 die "Unable to determine upstream SVN information from ",
999 "working tree history\n";
1000 }
bd2d4f96
EW
1001
1002 # canonicalize_path() will return "" to make libsvn 1.5.x happy,
1003 $path = "." if $path eq "";
1004
edde9112 1005 my $full_url = $url . ($fullpath eq "" ? "" : "/$fullpath");
e6fefa92 1006
8b014d71 1007 if ($_url) {
05427b91 1008 print escape_url($full_url), "\n";
8b014d71
DK
1009 return;
1010 }
1011
e6fefa92
DK
1012 my $result = "Path: $path\n";
1013 $result .= "Name: " . basename($path) . "\n" if $file_type ne "dir";
05427b91 1014 $result .= "URL: " . escape_url($full_url) . "\n";
e6fefa92 1015
a5460eb7
EW
1016 eval {
1017 my $repos_root = $gs->repos_root;
1018 Git::SVN::remove_username($repos_root);
05427b91 1019 $result .= "Repository Root: " . escape_url($repos_root) . "\n";
a5460eb7
EW
1020 };
1021 if ($@) {
1022 $result .= "Repository Root: (offline)\n";
1023 }
22ba47f5
MK
1024 $result .= "Repository UUID: $uuid\n" unless $diff_status eq "A" &&
1025 ($SVN::Core::VERSION le '1.5.4' || $file_type ne "dir");
e6fefa92
DK
1026 $result .= "Revision: " . ($diff_status eq "A" ? 0 : $rev) . "\n";
1027
1028 $result .= "Node Kind: " .
1029 ($file_type eq "dir" ? "directory" : "file") . "\n";
1030
1031 my $schedule = $diff_status eq "A"
1032 ? "add"
1033 : ($diff_status eq "D" ? "delete" : "normal");
1034 $result .= "Schedule: $schedule\n";
1035
1036 if ($diff_status eq "A") {
1037 print $result, "\n";
1038 return;
1039 }
1040
1041 my ($lc_author, $lc_rev, $lc_date_utc);
edde9112 1042 my @args = Git::SVN::Log::git_svn_log_cmd($rev, $rev, "--", $fullpath);
e6fefa92
DK
1043 my $log = command_output_pipe(@args);
1044 my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/;
1045 while (<$log>) {
1046 if (/^${esc_color}author (.+) <[^>]+> (\d+) ([\-\+]?\d+)$/o) {
1047 $lc_author = $1;
1048 $lc_date_utc = Git::SVN::Log::parse_git_date($2, $3);
1049 } elsif (/^${esc_color} (git-svn-id:.+)$/o) {
1050 (undef, $lc_rev, undef) = ::extract_metadata($1);
1051 }
1052 }
1053 close $log;
1054
1055 Git::SVN::Log::set_local_timezone();
1056
1057 $result .= "Last Changed Author: $lc_author\n";
1058 $result .= "Last Changed Rev: $lc_rev\n";
1059 $result .= "Last Changed Date: " .
1060 Git::SVN::Log::format_svn_date($lc_date_utc) . "\n";
1061
1062 if ($file_type ne "dir") {
1063 my $text_last_updated_date =
1064 ($diff_status eq "D" ? $lc_date_utc : (stat $path)[9]);
1065 $result .=
1066 "Text Last Updated: " .
1067 Git::SVN::Log::format_svn_date($text_last_updated_date) .
1068 "\n";
1069 my $checksum;
1070 if ($diff_status eq "D") {
1071 my ($fh, $ctx) =
1072 command_output_pipe(qw(cat-file blob), "HEAD:$path");
1073 if ($file_type eq "link") {
1074 my $file_name = <$fh>;
8d7c4fad 1075 $checksum = md5sum("link $file_name");
e6fefa92 1076 } else {
8d7c4fad 1077 $checksum = md5sum($fh);
e6fefa92
DK
1078 }
1079 command_close_pipe($fh, $ctx);
1080 } elsif ($file_type eq "link") {
1081 my $file_name =
1082 command(qw(cat-file blob), "HEAD:$path");
1083 $checksum =
8d7c4fad 1084 md5sum("link " . $file_name);
e6fefa92
DK
1085 } else {
1086 open FILE, "<", $path or die $!;
8d7c4fad 1087 $checksum = md5sum(\*FILE);
e6fefa92
DK
1088 close FILE or die $!;
1089 }
1090 $result .= "Checksum: " . $checksum . "\n";
1091 }
1092
1093 print $result, "\n";
1094}
1095
195643f2
BJ
1096sub cmd_reset {
1097 my $target = shift || $_revision or die "SVN revision required\n";
1098 $target = $1 if $target =~ /^r(\d+)$/;
1099 $target =~ /^\d+$/ or die "Numeric SVN revision expected\n";
1100 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
1101 unless ($gs) {
1102 die "Unable to determine upstream SVN information from ".
1103 "history\n";
1104 }
1105 my ($r, $c) = $gs->find_rev_before($target, not $_fetch_parent);
1106 $gs->rev_map_set($r, $c, 'reset', $uuid);
1107 print "r$r = $c ($gs->{ref_id})\n";
1108}
1109
3397f9df
EW
1110########################### utility functions #########################
1111
905f8b7d
EW
1112sub rebase_cmd {
1113 my @cmd = qw/rebase/;
1114 push @cmd, '-v' if $_verbose;
1115 push @cmd, qw/--merge/ if $_merge;
1116 push @cmd, "--strategy=$_strategy" if $_strategy;
1117 @cmd;
1118}
1119
1e889ef3
EW
1120sub post_fetch_checkout {
1121 return if $_no_checkout;
1122 my $gs = $Git::SVN::_head or return;
1123 return if verify_ref('refs/heads/master^0');
1124
1125 my $valid_head = verify_ref('HEAD^0');
1126 command_noisy(qw(update-ref refs/heads/master), $gs->refname);
1127 return if ($valid_head || !verify_ref('HEAD^0'));
1128
1129 return if $ENV{GIT_DIR} !~ m#^(?:.*/)?\.git$#;
1130 my $index = $ENV{GIT_INDEX_FILE} || "$ENV{GIT_DIR}/index";
1131 return if -f $index;
1132
7ae3df8c 1133 return if command_oneline(qw/rev-parse --is-inside-work-tree/) eq 'false';
1e889ef3
EW
1134 return if command_oneline(qw/rev-parse --is-inside-git-dir/) eq 'true';
1135 command_noisy(qw/read-tree -m -u -v HEAD HEAD/);
1136 print STDERR "Checked out HEAD:\n ",
1137 $gs->full_url, " r", $gs->last_rev, "\n";
1138}
1139
98327e58
EW
1140sub complete_svn_url {
1141 my ($url, $path) = @_;
1142 $path =~ s#/+$##;
98327e58 1143 if ($path !~ m#^[a-z\+]+://#) {
98327e58
EW
1144 if (!defined $url || $url !~ m#^[a-z\+]+://#) {
1145 fatal("E: '$path' is not a complete URL ",
207f1a75 1146 "and a separate URL is not specified");
98327e58 1147 }
706587fc 1148 return ($url, $path);
98327e58 1149 }
706587fc 1150 return ($path, '');
98327e58
EW
1151}
1152
9d55b41a 1153sub complete_url_ls_init {
706587fc
EW
1154 my ($ra, $repo_path, $switch, $pfx) = @_;
1155 unless ($repo_path) {
9d55b41a
EW
1156 print STDERR "W: $switch not specified\n";
1157 return;
1158 }
706587fc
EW
1159 $repo_path =~ s#/+$##;
1160 if ($repo_path =~ m#^[a-z\+]+://#) {
1161 $ra = Git::SVN::Ra->new($repo_path);
1162 $repo_path = '';
e7db67e6 1163 } else {
706587fc 1164 $repo_path =~ s#^/+##;
e7db67e6 1165 unless ($ra) {
706587fc 1166 fatal("E: '$repo_path' is not a complete URL ",
207f1a75 1167 "and a separate URL is not specified");
8164b652 1168 }
e7db67e6 1169 }
706587fc 1170 my $url = $ra->{url};
b4d57e5e
EW
1171 my $gs = Git::SVN->init($url, undef, undef, undef, 1);
1172 my $k = "svn-remote.$gs->{repo_id}.url";
1173 my $orig_url = eval { command_oneline(qw/config --get/, $k) };
1174 if ($orig_url && ($orig_url ne $gs->{url})) {
1175 die "$k already set: $orig_url\n",
1176 "wanted to set to: $gs->{url}\n";
88cf4107 1177 }
b4d57e5e 1178 command_oneline('config', $k, $gs->{url}) unless $orig_url;
0b2af457 1179 my $remote_path = "$gs->{path}/$repo_path";
b4d57e5e
EW
1180 $remote_path =~ s#/+#/#g;
1181 $remote_path =~ s#^/##g;
ed0b9d43 1182 $remote_path .= "/*" if $remote_path !~ /\*/;
b4d57e5e
EW
1183 my ($n) = ($switch =~ /^--(\w+)/);
1184 if (length $pfx && $pfx !~ m#/$#) {
1185 die "--prefix='$pfx' must have a trailing slash '/'\n";
9d55b41a 1186 }
570d35c2 1187 command_noisy('config',
62244069 1188 '--add',
570d35c2
MG
1189 "svn-remote.$gs->{repo_id}.$n",
1190 "$remote_path:refs/remotes/$pfx*" .
1191 ('/*' x (($remote_path =~ tr/*/*/) - 1)) );
9d55b41a
EW
1192}
1193
aef4e921
EW
1194sub verify_ref {
1195 my ($ref) = @_;
2c5c1d53
EW
1196 eval { command_oneline([ 'rev-parse', '--verify', $ref ],
1197 { STDERR => 0 }); };
aef4e921
EW
1198}
1199
a5e0cedc 1200sub get_tree_from_treeish {
cf52b8f0 1201 my ($treeish) = @_;
44320b9e 1202 # $treeish can be a symbolic ref, too:
aef4e921 1203 my $type = command_oneline(qw/cat-file -t/, $treeish);
cf52b8f0
EW
1204 my $expected;
1205 while ($type eq 'tag') {
aef4e921 1206 ($treeish, $type) = command(qw/cat-file tag/, $treeish);
cf52b8f0
EW
1207 }
1208 if ($type eq 'commit') {
aef4e921
EW
1209 $expected = (grep /^tree /, command(qw/cat-file commit/,
1210 $treeish))[0];
44320b9e 1211 ($expected) = ($expected =~ /^tree ($sha1)$/o);
cf52b8f0
EW
1212 die "Unable to get tree from $treeish\n" unless $expected;
1213 } elsif ($type eq 'tree') {
1214 $expected = $treeish;
1215 } else {
1216 die "$treeish is a $type, expected tree, tag or commit\n";
1217 }
a5e0cedc
EW
1218 return $expected;
1219}
1220
44320b9e
EW
1221sub get_commit_entry {
1222 my ($treeish) = shift;
1223 my %log_entry = ( log => '', tree => get_tree_from_treeish($treeish) );
1224 my $commit_editmsg = "$ENV{GIT_DIR}/COMMIT_EDITMSG";
1225 my $commit_msg = "$ENV{GIT_DIR}/COMMIT_MSG";
1226 open my $log_fh, '>', $commit_editmsg or croak $!;
3397f9df 1227
44320b9e 1228 my $type = command_oneline(qw/cat-file -t/, $treeish);
4ad4515d 1229 if ($type eq 'commit' || $type eq 'tag') {
aef4e921 1230 my ($msg_fh, $ctx) = command_output_pipe('cat-file',
44320b9e 1231 $type, $treeish);
3397f9df 1232 my $in_msg = 0;
6aa9ba14
AP
1233 my $author;
1234 my $saw_from = 0;
328eb9b3 1235 my $msgbuf = "";
3397f9df
EW
1236 while (<$msg_fh>) {
1237 if (!$in_msg) {
1238 $in_msg = 1 if (/^\s*$/);
6aa9ba14 1239 $author = $1 if (/^author (.*>)/);
df746c5a 1240 } elsif (/^git-svn-id: /) {
44320b9e
EW
1241 # skip this for now, we regenerate the
1242 # correct one on re-fetch anyways
1243 # TODO: set *:merge properties or like...
3397f9df 1244 } else {
6aa9ba14
AP
1245 if (/^From:/ || /^Signed-off-by:/) {
1246 $saw_from = 1;
1247 }
328eb9b3 1248 $msgbuf .= $_;
3397f9df
EW
1249 }
1250 }
328eb9b3 1251 $msgbuf =~ s/\s+$//s;
6aa9ba14
AP
1252 if ($Git::SVN::_add_author_from && defined($author)
1253 && !$saw_from) {
328eb9b3 1254 $msgbuf .= "\n\nFrom: $author";
6aa9ba14 1255 }
328eb9b3 1256 print $log_fh $msgbuf or croak $!;
aef4e921 1257 command_close_pipe($msg_fh, $ctx);
3397f9df 1258 }
44320b9e 1259 close $log_fh or croak $!;
3397f9df
EW
1260
1261 if ($_edit || ($type eq 'tree')) {
1262 my $editor = $ENV{VISUAL} || $ENV{EDITOR} || 'vi';
44320b9e
EW
1263 # TODO: strip out spaces, comments, like git-commit.sh
1264 system($editor, $commit_editmsg);
3397f9df 1265 }
44320b9e 1266 rename $commit_editmsg, $commit_msg or croak $!;
16fc08e2 1267 {
b510df8a 1268 require Encode;
16fc08e2
EW
1269 # SVN requires messages to be UTF-8 when entering the repo
1270 local $/;
1271 open $log_fh, '<', $commit_msg or croak $!;
1272 binmode $log_fh;
1273 chomp($log_entry{log} = <$log_fh>);
1274
b510df8a
EW
1275 my $enc = Git::config('i18n.commitencoding') || 'UTF-8';
1276 my $msg = $log_entry{log};
1277
1278 eval { $msg = Encode::decode($enc, $msg, 1) };
1279 if ($@) {
1280 die "Could not decode as $enc:\n", $msg,
1281 "\nPerhaps you need to set i18n.commitencoding\n";
16fc08e2 1282 }
b510df8a
EW
1283
1284 eval { $msg = Encode::encode('UTF-8', $msg, 1) };
1285 die "Could not encode as UTF-8:\n$msg\n" if $@;
1286
1287 $log_entry{log} = $msg;
1288
16fc08e2
EW
1289 close $log_fh or croak $!;
1290 }
44320b9e
EW
1291 unlink $commit_msg;
1292 \%log_entry;
a5e0cedc
EW
1293}
1294
3397f9df
EW
1295sub s_to_file {
1296 my ($str, $file, $mode) = @_;
1297 open my $fd,'>',$file or croak $!;
1298 print $fd $str,"\n" or croak $!;
1299 close $fd or croak $!;
1300 chmod ($mode &~ umask, $file) if (defined $mode);
1301}
1302
1303sub file_to_s {
1304 my $file = shift;
1305 open my $fd,'<',$file or croak "$!: file: $file\n";
1306 local $/;
1307 my $ret = <$fd>;
1308 close $fd or croak $!;
1309 $ret =~ s/\s*$//s;
1310 return $ret;
1311}
1312
eeb0abe0
EW
1313# '<svn username> = real-name <email address>' mapping based on git-svnimport:
1314sub load_authors {
1315 open my $authors, '<', $_authors or die "Can't open $_authors $!\n";
f8c9d1d2 1316 my $log = $cmd eq 'log';
eeb0abe0
EW
1317 while (<$authors>) {
1318 chomp;
575d025c 1319 next unless /^(.+?|\(no author\))\s*=\s*(.+?)\s*<(.+)>\s*$/;
eeb0abe0 1320 my ($user, $name, $email) = ($1, $2, $3);
f8c9d1d2
EW
1321 if ($log) {
1322 $Git::SVN::Log::rusers{"$name <$email>"} = $user;
1323 } else {
1324 $users{$user} = [$name, $email];
1325 }
79bb8d88
EW
1326 }
1327 close $authors or croak $!;
1328}
1329
e0d10e1c 1330# convert GetOpt::Long specs for use by git-config
b8c92cad 1331sub read_repo_config {
706587fc 1332 return unless -d $ENV{GIT_DIR};
b8c92cad 1333 my $opts = shift;
97ae0911 1334 my @config_only;
b8c92cad 1335 foreach my $o (keys %$opts) {
97ae0911
EW
1336 # if we have mixedCase and a long option-only, then
1337 # it's a config-only variable that we don't need for
1338 # the command-line.
1339 push @config_only, $o if ($o =~ /[A-Z]/ && $o =~ /^[a-z]+$/i);
b8c92cad 1340 my $v = $opts->{$o};
97ae0911 1341 my ($key) = ($o =~ /^([a-zA-Z\-]+)/);
b8c92cad 1342 $key =~ s/-//g;
225f1d0c 1343 my $arg = 'git config';
b8c92cad
EW
1344 $arg .= ' --int' if ($o =~ /[:=]i$/);
1345 $arg .= ' --bool' if ($o !~ /[:=][sfi]$/);
1346 if (ref $v eq 'ARRAY') {
1347 chomp(my @tmp = `$arg --get-all svn.$key`);
1348 @$v = @tmp if @tmp;
1349 } else {
1350 chomp(my $tmp = `$arg --get svn.$key`);
7774284a 1351 if ($tmp && !($arg =~ / --bool/ && $tmp eq 'false')) {
b8c92cad
EW
1352 $$v = $tmp;
1353 }
1354 }
1355 }
97ae0911 1356 delete @$opts{@config_only} if @config_only;
b8c92cad
EW
1357}
1358
79bb8d88 1359sub extract_metadata {
c1927a85 1360 my $id = shift or return (undef, undef, undef);
3dfab993 1361 my ($url, $rev, $uuid) = ($id =~ /^\s*git-svn-id:\s+(.*)\@(\d+)
b3e95936 1362 \s([a-f\d\-]+)$/ix);
e70dc780 1363 if (!defined $rev || !$uuid || !$url) {
79bb8d88 1364 # some of the original repositories I made had
82e5a82f 1365 # identifiers like this:
b3e95936 1366 ($rev, $uuid) = ($id =~/^\s*git-svn-id:\s(\d+)\@([a-f\d\-]+)/i);
79bb8d88
EW
1367 }
1368 return ($url, $rev, $uuid);
1369}
1370
c1927a85
EW
1371sub cmt_metadata {
1372 return extract_metadata((grep(/^git-svn-id: /,
aef4e921 1373 command(qw/cat-file commit/, shift)))[-1]);
c1927a85
EW
1374}
1375
6ea42032
BB
1376sub cmt_sha2rev_batch {
1377 my %s2r;
1378 my ($pid, $in, $out, $ctx) = command_bidi_pipe(qw/cat-file --batch/);
1379 my $list = shift;
1380
1381 foreach my $sha (@{$list}) {
1382 my $first = 1;
1383 my $size = 0;
1384 print $out $sha, "\n";
1385
1386 while (my $line = <$in>) {
1387 if ($first && $line =~ /^[[:xdigit:]]{40}\smissing$/) {
1388 last;
1389 } elsif ($first &&
1390 $line =~ /^[[:xdigit:]]{40}\scommit\s(\d+)$/) {
1391 $first = 0;
1392 $size = $1;
1393 next;
1394 } elsif ($line =~ /^(git-svn-id: )/) {
1395 my (undef, $rev, undef) =
1396 extract_metadata($line);
1397 $s2r{$sha} = $rev;
1398 }
1399
1400 $size -= length($line);
1401 last if ($size == 0);
1402 }
1403 }
1404
1405 command_close_bidi_pipe($pid, $in, $out, $ctx);
1406
1407 return \%s2r;
1408}
1409
905f8b7d
EW
1410sub working_head_info {
1411 my ($head, $refs) = @_;
b6309ac2 1412 my @args = ('log', '--no-color', '--first-parent', '--pretty=medium');
05b4df31 1413 my ($fh, $ctx) = command_output_pipe(@args, $head);
3dfab993 1414 my $hash;
40cb8f8f 1415 my %max;
3dfab993
SV
1416 while (<$fh>) {
1417 if ( m{^commit ($::sha1)$} ) {
1418 unshift @$refs, $hash if $hash and $refs;
1419 $hash = $1;
1420 next;
1421 }
1422 next unless s{^\s*(git-svn-id:)}{$1};
1423 my ($url, $rev, $uuid) = extract_metadata($_);
13c823fb 1424 if (defined $url && defined $rev) {
40cb8f8f 1425 next if $max{$url} and $max{$url} < $rev;
13c823fb 1426 if (my $gs = Git::SVN->find_by_url($url)) {
63c56022 1427 my $c = $gs->rev_map_get($rev, $uuid);
b03c7a63 1428 if ($c && $c eq $hash) {
13c823fb
EW
1429 close $fh; # break the pipe
1430 return ($url, $rev, $uuid, $gs);
40cb8f8f 1431 } else {
060610c5 1432 $max{$url} ||= $gs->rev_map_max;
13c823fb
EW
1433 }
1434 }
1435 }
905f8b7d 1436 }
13c823fb
EW
1437 command_close_pipe($fh, $ctx);
1438 (undef, undef, undef, undef);
905f8b7d
EW
1439}
1440
733a65aa
EW
1441sub read_commit_parents {
1442 my ($parents, $c) = @_;
7b02b85a
EW
1443 chomp(my $p = command_oneline(qw/rev-list --parents -1/, $c));
1444 $p =~ s/^($c)\s*// or die "rev-list --parents -1 $c failed!\n";
1445 @{$parents->{$c}} = split(/ /, $p);
733a65aa
EW
1446}
1447
1448sub linearize_history {
1449 my ($gs, $refs) = @_;
1450 my %parents;
1451 foreach my $c (@$refs) {
1452 read_commit_parents(\%parents, $c);
1453 }
1454
1455 my @linear_refs;
1456 my %skip = ();
1457 my $last_svn_commit = $gs->last_commit;
1458 foreach my $c (reverse @$refs) {
1459 next if $c eq $last_svn_commit;
1460 last if $skip{$c};
1461
1462 unshift @linear_refs, $c;
1463 $skip{$c} = 1;
1464
1465 # we only want the first parent to diff against for linear
1466 # history, we save the rest to inject when we finalize the
1467 # svn commit
1468 my $fp_a = verify_ref("$c~1");
1469 my $fp_b = shift @{$parents{$c}} if $parents{$c};
1470 if (!$fp_a || !$fp_b) {
1471 die "Commit $c\n",
1472 "has no parent commit, and therefore ",
1473 "nothing to diff against.\n",
1474 "You should be working from a repository ",
1475 "originally created by git-svn\n";
1476 }
1477 if ($fp_a ne $fp_b) {
1478 die "$c~1 = $fp_a, however parsing commit $c ",
1479 "revealed that:\n$c~1 = $fp_b\nBUG!\n";
1480 }
1481
1482 foreach my $p (@{$parents{$c}}) {
1483 $skip{$p} = 1;
1484 }
1485 }
1486 (\@linear_refs, \%parents);
1487}
1488
e6fefa92
DK
1489sub find_file_type_and_diff_status {
1490 my ($path) = @_;
107cee50 1491 return ('dir', '') if $path eq '';
e6fefa92
DK
1492
1493 my $diff_output =
1494 command_oneline(qw(diff --cached --name-status --), $path) || "";
1495 my $diff_status = (split(' ', $diff_output))[0] || "";
1496
1497 my $ls_tree = command_oneline(qw(ls-tree HEAD), $path) || "";
1498
1499 return (undef, undef) if !$diff_status && !$ls_tree;
1500
1501 if ($diff_status eq "A") {
1502 return ("link", $diff_status) if -l $path;
1503 return ("dir", $diff_status) if -d $path;
1504 return ("file", $diff_status);
1505 }
1506
1507 my $mode = (split(' ', $ls_tree))[0] || "";
1508
1509 return ("link", $diff_status) if $mode eq "120000";
1510 return ("dir", $diff_status) if $mode eq "040000";
1511 return ("file", $diff_status);
1512}
1513
b2b3ada7
DK
1514sub md5sum {
1515 my $arg = shift;
1516 my $ref = ref $arg;
1517 my $md5 = Digest::MD5->new();
0b19138b 1518 if ($ref eq 'GLOB' || $ref eq 'IO::File' || $ref eq 'File::Temp') {
b2b3ada7
DK
1519 $md5->addfile($arg) or croak $!;
1520 } elsif ($ref eq 'SCALAR') {
1521 $md5->add($$arg) or croak $!;
1522 } elsif (!$ref) {
1523 $md5->add($arg) or croak $!;
1524 } else {
1525 ::fatal "Can't provide MD5 hash for unknown ref type: '", $ref, "'";
1526 }
1527 return $md5->hexdigest();
1528}
1529
9b981fc6
EW
1530package Git::SVN;
1531use strict;
1532use warnings;
060610c5
EW
1533use Fcntl qw/:DEFAULT :seek/;
1534use constant rev_map_fmt => 'NH40';
ecc712dd 1535use vars qw/$default_repo_id $default_ref_id $_no_metadata $_follow_parent
62e349d2 1536 $_repack $_repack_flags $_use_svm_props $_head
70ae04e4 1537 $_use_svnsync_props $no_reuse_existing $_minimize_url
e82f0d73 1538 $_use_log_author $_add_author_from $_localtime/;
9b981fc6
EW
1539use Carp qw/croak/;
1540use File::Path qw/mkpath/;
373274f9 1541use File::Copy qw/copy/;
9b981fc6
EW
1542use IPC::Open3;
1543
94bc914c
KW
1544my ($_gc_nr, $_gc_period);
1545
9b981fc6
EW
1546# properties that we do not log:
1547my %SKIP_PROP;
1548BEGIN {
1549 %SKIP_PROP = map { $_ => 1 } qw/svn:wc:ra_dav:version-url
1550 svn:special svn:executable
1551 svn:entry:committed-rev
1552 svn:entry:last-author
1553 svn:entry:uuid
1554 svn:entry:committed-date/;
91b03282
EW
1555
1556 # some options are read globally, but can be overridden locally
1557 # per [svn-remote "..."] section. Command-line options will *NOT*
1558 # override options set in an [svn-remote "..."] section
c5f71ad0
SV
1559 no strict 'refs';
1560 for my $option (qw/follow_parent no_metadata use_svm_props
1561 use_svnsync_props/) {
1562 my $key = $option;
91b03282 1563 $key =~ tr/_//d;
c5f71ad0
SV
1564 my $prop = "-$option";
1565 *$option = sub {
1566 my ($self) = @_;
1567 return $self->{$prop} if exists $self->{$prop};
1568 my $k = "svn-remote.$self->{repo_id}.$key";
1569 eval { command_oneline(qw/config --get/, $k) };
1570 if ($@) {
1571 $self->{$prop} = ${"Git::SVN::_$option"};
91b03282 1572 } else {
c5f71ad0
SV
1573 my $v = command_oneline(qw/config --bool/,$k);
1574 $self->{$prop} = $v eq 'false' ? 0 : 1;
91b03282 1575 }
c5f71ad0
SV
1576 return $self->{$prop};
1577 }
91b03282 1578 }
9b981fc6
EW
1579}
1580
0b19138b 1581
321b1842
EW
1582my (%LOCKFILES, %INDEX_FILES);
1583END {
1584 unlink keys %LOCKFILES if %LOCKFILES;
1585 unlink keys %INDEX_FILES if %INDEX_FILES;
1586}
373274f9 1587
4bb9ed04
EW
1588sub resolve_local_globs {
1589 my ($url, $fetch, $glob_spec) = @_;
1590 return unless defined $glob_spec;
1591 my $ref = $glob_spec->{ref};
1592 my $path = $glob_spec->{path};
1593 foreach (command(qw#for-each-ref --format=%(refname) refs/remotes#)) {
1594 next unless m#^refs/remotes/$ref->{regex}$#;
1595 my $p = $1;
bf655fd7
RE
1596 my $pathname = desanitize_refname($path->full_path($p));
1597 my $refname = desanitize_refname($ref->full_path($p));
4bb9ed04
EW
1598 if (my $existing = $fetch->{$pathname}) {
1599 if ($existing ne $refname) {
1600 die "Refspec conflict:\n",
1601 "existing: refs/remotes/$existing\n",
1602 " globbed: refs/remotes/$refname\n";
1603 }
1604 my $u = (::cmt_metadata("refs/remotes/$refname"))[0];
4e9f6cc7 1605 $u =~ s!^\Q$url\E(/|$)!! or die
4bb9ed04
EW
1606 "refs/remotes/$refname: '$url' not found in '$u'\n";
1607 if ($pathname ne $u) {
1608 warn "W: Refspec glob conflict ",
1609 "(ref: refs/remotes/$refname):\n",
1610 "expected path: $pathname\n",
1611 " real path: $u\n",
1612 "Continuing ahead with $u\n";
1613 next;
1614 }
1615 } else {
4bb9ed04
EW
1616 $fetch->{$pathname} = $refname;
1617 }
1618 }
1619}
1620
e98671e5
EW
1621sub parse_revision_argument {
1622 my ($base, $head) = @_;
1623 if (!defined $::_revision || $::_revision eq 'BASE:HEAD') {
1624 return ($base, $head);
1625 }
1626 return ($1, $2) if ($::_revision =~ /^(\d+):(\d+)$/);
1627 return ($::_revision, $::_revision) if ($::_revision =~ /^\d+$/);
1628 return ($head, $head) if ($::_revision eq 'HEAD');
1629 return ($base, $1) if ($::_revision =~ /^BASE:(\d+)$/);
1630 return ($1, $head) if ($::_revision =~ /^(\d+):HEAD$/);
1631 die "revision argument: $::_revision not understood by git-svn\n";
1632}
1633
0af9c9f9 1634sub fetch_all {
4bb9ed04 1635 my ($repo_id, $remotes) = @_;
905f8b7d
EW
1636 if (ref $repo_id) {
1637 my $gs = $repo_id;
1638 $repo_id = undef;
1639 $repo_id = $gs->{repo_id};
1640 }
1641 $remotes ||= read_all_remotes();
7447b4bc
EW
1642 my $remote = $remotes->{$repo_id} or
1643 die "[svn-remote \"$repo_id\"] unknown\n";
e518192f 1644 my $fetch = $remote->{fetch};
7447b4bc 1645 my $url = $remote->{url} or die "svn-remote.$repo_id.url not defined\n";
e518192f 1646 my (@gs, @globs);
0af9c9f9 1647 my $ra = Git::SVN::Ra->new($url);
26a62d57 1648 my $uuid = $ra->get_uuid;
0af9c9f9 1649 my $head = $ra->get_latest_revnum;
4aacaeb3 1650 $ra->get_log("", $head, 0, 1, 0, 1, sub { $head = $_[1] });
28710f74 1651 my $base = defined $fetch ? $head : 0;
e518192f
EW
1652
1653 # read the max revs for wildcard expansion (branches/*, tags/*)
1654 foreach my $t (qw/branches tags/) {
1655 defined $remote->{$t} or next;
62244069
MB
1656 push @globs, @{$remote->{$t}};
1657
93f2689c
EW
1658 my $max_rev = eval { tmp_config(qw/--int --get/,
1659 "svn-remote.$repo_id.${t}-maxRev") };
1660 if (defined $max_rev && ($max_rev < $base)) {
1661 $base = $max_rev;
d6d3346b
EW
1662 } elsif (!defined $max_rev) {
1663 $base = 0;
e518192f
EW
1664 }
1665 }
1666
db03cd24
EW
1667 if ($fetch) {
1668 foreach my $p (sort keys %$fetch) {
1669 my $gs = Git::SVN->new($fetch->{$p}, $repo_id, $p);
060610c5 1670 my $lr = $gs->rev_map_max;
db03cd24
EW
1671 if (defined $lr) {
1672 $base = $lr if ($lr < $base);
1673 }
1674 push @gs, $gs;
0af9c9f9 1675 }
0af9c9f9 1676 }
e98671e5
EW
1677
1678 ($base, $head) = parse_revision_argument($base, $head);
e518192f 1679 $ra->gs_fetch_loop_common($base, $head, \@gs, \@globs);
0af9c9f9
EW
1680}
1681
47e39c55
EW
1682sub read_all_remotes {
1683 my $r = {};
63c56022
JA
1684 my $use_svm_props = eval { command_oneline(qw/config --bool
1685 svn.useSvmProps/) };
1686 $use_svm_props = $use_svm_props eq 'true' if $use_svm_props;
8b8fc068 1687 foreach (grep { s/^svn-remote\.// } command(qw/config -l/)) {
61192165
AP
1688 if (m!^(.+)\.fetch=\s*(.*)\s*:\s*(.+)\s*$!) {
1689 my ($remote, $local_ref, $_remote_ref) = ($1, $2, $3);
1690 die("svn-remote.$remote: remote ref '$_remote_ref' "
1691 . "must start with 'refs/remotes/'\n")
1692 unless $_remote_ref =~ m{^refs/remotes/(.+)};
1693 my $remote_ref = $1;
46cf98ba
EW
1694 $local_ref =~ s{^/}{};
1695 $r->{$remote}->{fetch}->{$local_ref} = $remote_ref;
63c56022
JA
1696 $r->{$remote}->{svm} = {} if $use_svm_props;
1697 } elsif (m!^(.+)\.usesvmprops=\s*(.*)\s*$!) {
1698 $r->{$1}->{svm} = {};
47e39c55
EW
1699 } elsif (m!^(.+)\.url=\s*(.*)\s*$!) {
1700 $r->{$1}->{url} = $2;
4bb9ed04
EW
1701 } elsif (m!^(.+)\.(branches|tags)=
1702 (.*):refs/remotes/(.+)\s*$/!x) {
1703 my ($p, $g) = ($3, $4);
62244069
MB
1704 my $rs = {
1705 t => $2,
1706 remote => $1,
1707 path => Git::SVN::GlobSpec->new($p),
1708 ref => Git::SVN::GlobSpec->new($g) };
4bb9ed04
EW
1709 if (length($rs->{ref}->{right}) != 0) {
1710 die "The '*' glob character must be the last ",
1711 "character of '$g'\n";
1712 }
62244069 1713 push @{ $r->{$1}->{$2} }, $rs;
47e39c55
EW
1714 }
1715 }
63c56022
JA
1716
1717 map {
1718 if (defined $r->{$_}->{svm}) {
1719 my $svm;
1720 eval {
1721 my $section = "svn-remote.$_";
1722 $svm = {
1723 source => tmp_config('--get',
1724 "$section.svm-source"),
1725 replace => tmp_config('--get',
1726 "$section.svm-replace"),
1727 }
1728 };
1729 $r->{$_}->{svm} = $svm;
1730 }
1731 } keys %$r;
1732
47e39c55
EW
1733 $r;
1734}
1735
ecc712dd 1736sub init_vars {
94bc914c 1737 $_gc_nr = $_gc_period = 1000;
af788a6e
KW
1738 if (defined $_repack || defined $_repack_flags) {
1739 warn "Repack options are obsolete; they have no effect.\n";
1740 }
ecc712dd
EW
1741}
1742
b805b44a 1743sub verify_remotes_sanity {
536c4b09 1744 return unless -d $ENV{GIT_DIR};
b805b44a
EW
1745 my %seen;
1746 foreach (command(qw/config -l/)) {
1747 if (m!^svn-remote\.(?:.+)\.fetch=.*:refs/remotes/(\S+)\s*$!) {
1748 if ($seen{$1}) {
1749 die "Remote ref refs/remote/$1 is tracked by",
1750 "\n \"$_\"\nand\n \"$seen{$1}\"\n",
1751 "Please resolve this ambiguity in ",
1752 "your git configuration file before ",
1753 "continuing\n";
1754 }
1755 $seen{$1} = $_;
1756 }
1757 }
1758}
1759
e6434f87
EW
1760sub find_existing_remote {
1761 my ($url, $remotes) = @_;
befc9adc 1762 return undef if $no_reuse_existing;
e6434f87
EW
1763 my $existing;
1764 foreach my $repo_id (keys %$remotes) {
1765 my $u = $remotes->{$repo_id}->{url} or next;
1766 next if $u ne $url;
1767 $existing = $repo_id;
1768 last;
1769 }
1770 $existing;
1771}
b805b44a 1772
e6434f87 1773sub init_remote_config {
d8115c51 1774 my ($self, $url, $no_write) = @_;
e6434f87
EW
1775 $url =~ s!/+$!!; # strip trailing slash
1776 my $r = read_all_remotes();
1777 my $existing = find_existing_remote($url, $r);
1778 if ($existing) {
e518192f
EW
1779 unless ($no_write) {
1780 print STDERR "Using existing ",
1781 "[svn-remote \"$existing\"]\n";
1782 }
e6434f87 1783 $self->{repo_id} = $existing;
4a1bb4c3 1784 } elsif ($_minimize_url) {
e6434f87
EW
1785 my $min_url = Git::SVN::Ra->new($url)->minimize_url;
1786 $existing = find_existing_remote($min_url, $r);
1787 if ($existing) {
e518192f
EW
1788 unless ($no_write) {
1789 print STDERR "Using existing ",
1790 "[svn-remote \"$existing\"]\n";
1791 }
e6434f87
EW
1792 $self->{repo_id} = $existing;
1793 }
1794 if ($min_url ne $url) {
e518192f
EW
1795 unless ($no_write) {
1796 print STDERR "Using higher level of URL: ",
1797 "$url => $min_url\n";
1798 }
e6434f87
EW
1799 my $old_path = $self->{path};
1800 $self->{path} = $url;
4e9f6cc7 1801 $self->{path} =~ s!^\Q$min_url\E(/|$)!!;
e6434f87
EW
1802 if (length $old_path) {
1803 $self->{path} .= "/$old_path";
1804 }
1805 $url = $min_url;
1806 }
1807 }
1808 my $orig_url;
1809 if (!$existing) {
b805b44a 1810 # verify that we aren't overwriting anything:
e6434f87 1811 $orig_url = eval {
706587fc 1812 command_oneline('config', '--get',
e6434f87 1813 "svn-remote.$self->{repo_id}.url")
706587fc 1814 };
b805b44a 1815 if ($orig_url && ($orig_url ne $url)) {
e6434f87 1816 die "svn-remote.$self->{repo_id}.url already set: ",
b805b44a
EW
1817 "$orig_url\nwanted to set to: $url\n";
1818 }
9b981fc6 1819 }
e6434f87
EW
1820 my ($xrepo_id, $xpath) = find_ref($self->refname);
1821 if (defined $xpath) {
1822 die "svn-remote.$xrepo_id.fetch already set to track ",
1823 "$xpath:refs/remotes/", $self->refname, "\n";
1824 }
d8115c51
EW
1825 unless ($no_write) {
1826 command_noisy('config',
1827 "svn-remote.$self->{repo_id}.url", $url);
46cf98ba 1828 $self->{path} =~ s{^/}{};
d8115c51
EW
1829 command_noisy('config', '--add',
1830 "svn-remote.$self->{repo_id}.fetch",
1831 "$self->{path}:".$self->refname);
1832 }
9b981fc6 1833 $self->{url} = $url;
e6434f87
EW
1834}
1835
a8ae2623
EW
1836sub find_by_url { # repos_root and, path are optional
1837 my ($class, $full_url, $repos_root, $path) = @_;
56973d20 1838
1a97a506 1839 return undef unless defined $full_url;
56973d20
AR
1840 remove_username($full_url);
1841 remove_username($repos_root) if defined $repos_root;
a8ae2623
EW
1842 my $remotes = read_all_remotes();
1843 if (defined $full_url && defined $repos_root && !defined $path) {
1844 $path = $full_url;
1845 $path =~ s#^\Q$repos_root\E(?:/|$)##;
1846 }
1847 foreach my $repo_id (keys %$remotes) {
1848 my $u = $remotes->{$repo_id}->{url} or next;
56973d20 1849 remove_username($u);
a8ae2623
EW
1850 next if defined $repos_root && $repos_root ne $u;
1851
1852 my $fetch = $remotes->{$repo_id}->{fetch} || {};
62244069
MB
1853 foreach my $t (qw/branches tags/) {
1854 foreach my $globspec (@{$remotes->{$repo_id}->{$t}}) {
1855 resolve_local_globs($u, $fetch, $globspec);
1856 }
a8ae2623
EW
1857 }
1858 my $p = $path;
0bb91d9a 1859 my $rwr = rewrite_root({repo_id => $repo_id});
63c56022
JA
1860 my $svm = $remotes->{$repo_id}->{svm}
1861 if defined $remotes->{$repo_id}->{svm};
a8ae2623
EW
1862 unless (defined $p) {
1863 $p = $full_url;
0bb91d9a 1864 my $z = $u;
63c56022 1865 my $prefix = '';
0bb91d9a
JG
1866 if ($rwr) {
1867 $z = $rwr;
1b7e543a 1868 remove_username($z);
63c56022
JA
1869 } elsif (defined $svm) {
1870 $z = $svm->{source};
1871 $prefix = $svm->{replace};
1872 $prefix =~ s#^\Q$u\E(?:/|$)##;
1873 $prefix =~ s#/$##;
0bb91d9a 1874 }
63c56022 1875 $p =~ s#^\Q$z\E(?:/|$)#$prefix# or next;
a8ae2623
EW
1876 }
1877 foreach my $f (keys %$fetch) {
1878 next if $f ne $p;
1879 return Git::SVN->new($fetch->{$f}, $repo_id, $f);
1880 }
1881 }
1882 undef;
1883}
1884
e6434f87 1885sub init {
d8115c51 1886 my ($class, $url, $path, $repo_id, $ref_id, $no_write) = @_;
e6434f87
EW
1887 my $self = _new($class, $repo_id, $ref_id, $path);
1888 if (defined $url) {
d8115c51 1889 $self->init_remote_config($url, $no_write);
e6434f87 1890 }
9b981fc6
EW
1891 $self;
1892}
1893
706587fc
EW
1894sub find_ref {
1895 my ($ref_id) = @_;
1896 foreach (command(qw/config -l/)) {
1897 next unless m!^svn-remote\.(.+)\.fetch=
1898 \s*(.*)\s*:\s*refs/remotes/(.+)\s*$!x;
1899 my ($repo_id, $path, $ref) = ($1, $2, $3);
1900 if ($ref eq $ref_id) {
1901 $path = '' if ($path =~ m#^\./?#);
1902 return ($repo_id, $path);
1903 }
1904 }
1905 (undef, undef, undef);
1906}
1907
9b981fc6 1908sub new {
706587fc
EW
1909 my ($class, $ref_id, $repo_id, $path) = @_;
1910 if (defined $ref_id && !defined $repo_id && !defined $path) {
1911 ($repo_id, $path) = find_ref($ref_id);
1912 if (!defined $repo_id) {
1913 die "Could not find a \"svn-remote.*.fetch\" key ",
1914 "in the repository configuration matching: ",
1915 "refs/remotes/$ref_id\n";
1916 }
1917 }
1918 my $self = _new($class, $repo_id, $ref_id, $path);
8b8fc068
EW
1919 if (!defined $self->{path} || !length $self->{path}) {
1920 my $fetch = command_oneline('config', '--get',
1921 "svn-remote.$repo_id.fetch",
1922 ":refs/remotes/$ref_id\$") or
1923 die "Failed to read \"svn-remote.$repo_id.fetch\" ",
1924 "\":refs/remotes/$ref_id\$\" in config\n";
1925 ($self->{path}, undef) = split(/\s*:\s*/, $fetch);
1926 }
706587fc
EW
1927 $self->{url} = command_oneline('config', '--get',
1928 "svn-remote.$repo_id.url") or
1929 die "Failed to read \"svn-remote.$repo_id.url\" in config\n";
d6d3346b 1930 $self->rebuild;
9b981fc6
EW
1931 $self;
1932}
1933
bf655fd7
RE
1934sub refname {
1935 my ($refname) = "refs/remotes/$_[0]->{ref_id}" ;
1936
1937 # It cannot end with a slash /, we'll throw up on this because
1938 # SVN can't have directories with a slash in their name, either:
1939 if ($refname =~ m{/$}) {
1940 die "ref: '$refname' ends with a trailing slash, this is ",
1941 "not permitted by git nor Subversion\n";
1942 }
1943
1944 # It cannot have ASCII control character space, tilde ~, caret ^,
1945 # colon :, question-mark ?, asterisk *, space, or open bracket [
1946 # anywhere.
1947 #
1948 # Additionally, % must be escaped because it is used for escaping
1949 # and we want our escaped refname to be reversible
1950 $refname =~ s{([ \%~\^:\?\*\[\t])}{uc sprintf('%%%02x',ord($1))}eg;
1951
1952 # no slash-separated component can begin with a dot .
1953 # /.* becomes /%2E*
1954 $refname =~ s{/\.}{/%2E}g;
1955
1956 # It cannot have two consecutive dots .. anywhere
1957 # .. becomes %2E%2E
1958 $refname =~ s{\.\.}{%2E%2E}g;
1959
1960 return $refname;
1961}
1962
1963sub desanitize_refname {
1964 my ($refname) = @_;
1965 $refname =~ s{%(?:([0-9A-F]{2}))}{chr hex($1)}eg;
1966 return $refname;
1967}
9b981fc6 1968
26a62d57
EW
1969sub svm_uuid {
1970 my ($self) = @_;
1971 return $self->{svm}->{uuid} if $self->svm;
1972 $self->ra;
1973 unless ($self->{svm}) {
1974 die "SVM UUID not cached, and reading remotely failed\n";
1975 }
1976 $self->{svm}->{uuid};
1977}
8a49ee97 1978
26a62d57
EW
1979sub svm {
1980 my ($self) = @_;
1981 return $self->{svm} if $self->{svm};
1982 my $svm;
8a49ee97
EW
1983 # see if we have it in our config, first:
1984 eval {
26a62d57
EW
1985 my $section = "svn-remote.$self->{repo_id}";
1986 $svm = {
93f2689c
EW
1987 source => tmp_config('--get', "$section.svm-source"),
1988 uuid => tmp_config('--get', "$section.svm-uuid"),
befc9adc 1989 replace => tmp_config('--get', "$section.svm-replace"),
8a49ee97
EW
1990 }
1991 };
befc9adc
EW
1992 if ($svm && $svm->{source} && $svm->{uuid} && $svm->{replace}) {
1993 $self->{svm} = $svm;
1994 }
26a62d57
EW
1995 $self->{svm};
1996}
1997
1998sub _set_svm_vars {
1999 my ($self, $ra) = @_;
db03cd24
EW
2000 return $ra if $self->svm;
2001
2002 my @err = ( "useSvmProps set, but failed to read SVM properties\n",
befc9adc 2003 "(svm:source, svm:uuid) ",
db03cd24
EW
2004 "from the following URLs:\n" );
2005 sub read_svm_props {
befc9adc
EW
2006 my ($self, $ra, $path, $r) = @_;
2007 my $props = ($ra->get_dir($path, $r))[2];
db03cd24 2008 my $src = $props->{'svm:source'};
db03cd24 2009 my $uuid = $props->{'svm:uuid'};
befc9adc 2010 return undef if (!$src || !$uuid);
26a62d57 2011
befc9adc 2012 chomp($src, $uuid);
26a62d57 2013
b3e95936 2014 $uuid =~ m{^[0-9a-f\-]{30,}$}i
db03cd24 2015 or die "doesn't look right - svm:uuid is '$uuid'\n";
befc9adc
EW
2016
2017 # the '!' is used to mark the repos_root!/relative/path
2018 $src =~ s{/?!/?}{/};
db03cd24 2019 $src =~ s{/+$}{}; # no trailing slashes please
befc9adc 2020 # username is of no interest
8a49ee97 2021 $src =~ s{(^[a-z\+]*://)[^/@]*@}{$1};
8a49ee97 2022
befc9adc
EW
2023 my $replace = $ra->{url};
2024 $replace .= "/$path" if length $path;
2025
db03cd24 2026 my $section = "svn-remote.$self->{repo_id}";
befc9adc
EW
2027 tmp_config("$section.svm-source", $src);
2028 tmp_config("$section.svm-replace", $replace);
2029 tmp_config("$section.svm-uuid", $uuid);
2030 $self->{svm} = {
2031 source => $src,
2032 uuid => $uuid,
2033 replace => $replace
2034 };
db03cd24
EW
2035 }
2036
2037 my $r = $ra->get_latest_revnum;
2038 my $path = $self->{path};
befc9adc 2039 my %tried;
db03cd24 2040 while (length $path) {
befc9adc
EW
2041 unless ($tried{"$self->{url}/$path"}) {
2042 return $ra if $self->read_svm_props($ra, $path, $r);
2043 $tried{"$self->{url}/$path"} = 1;
db03cd24 2044 }
befc9adc 2045 $path =~ s#/?[^/]+$##;
8a49ee97 2046 }
befc9adc
EW
2047 die "Path: '$path' should be ''\n" if $path ne '';
2048 return $ra if $self->read_svm_props($ra, $path, $r);
2049 $tried{"$self->{url}/$path"} = 1;
db03cd24
EW
2050
2051 if ($ra->{repos_root} eq $self->{url}) {
befc9adc 2052 die @err, (map { " $_\n" } keys %tried), "\n";
db03cd24
EW
2053 }
2054
2055 # nope, make sure we're connected to the repository root:
2056 my $ok;
2057 my @tried_b;
2058 $path = $ra->{svn_path};
db03cd24
EW
2059 $ra = Git::SVN::Ra->new($ra->{repos_root});
2060 while (length $path) {
befc9adc
EW
2061 unless ($tried{"$ra->{url}/$path"}) {
2062 $ok = $self->read_svm_props($ra, $path, $r);
2063 last if $ok;
2064 $tried{"$ra->{url}/$path"} = 1;
2065 }
2066 $path =~ s#/?[^/]+$##;
db03cd24 2067 }
befc9adc
EW
2068 die "Path: '$path' should be ''\n" if $path ne '';
2069 $ok ||= $self->read_svm_props($ra, $path, $r);
2070 $tried{"$ra->{url}/$path"} = 1;
db03cd24 2071 if (!$ok) {
befc9adc 2072 die @err, (map { " $_\n" } keys %tried), "\n";
db03cd24
EW
2073 }
2074 Git::SVN::Ra->new($self->{url});
8a49ee97
EW
2075}
2076
62e349d2
EW
2077sub svnsync {
2078 my ($self) = @_;
2079 return $self->{svnsync} if $self->{svnsync};
2080
2081 if ($self->no_metadata) {
2082 die "Can't have both 'noMetadata' and ",
2083 "'useSvnsyncProps' options set!\n";
2084 }
2085 if ($self->rewrite_root) {
2086 die "Can't have both 'useSvnsyncProps' and 'rewriteRoot' ",
2087 "options set!\n";
2088 }
2089
2090 my $svnsync;
2091 # see if we have it in our config, first:
2092 eval {
2093 my $section = "svn-remote.$self->{repo_id}";
98fa5b68
EW
2094
2095 my $url = tmp_config('--get', "$section.svnsync-url");
2096 ($url) = ($url =~ m{^([a-z\+]+://\S+)$}) or
2097 die "doesn't look right - svn:sync-from-url is '$url'\n";
2098
2099 my $uuid = tmp_config('--get', "$section.svnsync-uuid");
b3e95936 2100 ($uuid) = ($uuid =~ m{^([0-9a-f\-]{30,})$}i) or
98fa5b68
EW
2101 die "doesn't look right - svn:sync-from-uuid is '$uuid'\n";
2102
2103 $svnsync = { url => $url, uuid => $uuid }
62e349d2
EW
2104 };
2105 if ($svnsync && $svnsync->{url} && $svnsync->{uuid}) {
2106 return $self->{svnsync} = $svnsync;
2107 }
2108
2109 my $err = "useSvnsyncProps set, but failed to read " .
2110 "svnsync property: svn:sync-from-";
2111 my $rp = $self->ra->rev_proplist(0);
2112
2113 my $url = $rp->{'svn:sync-from-url'} or die $err . "url\n";
98fa5b68 2114 ($url) = ($url =~ m{^([a-z\+]+://\S+)$}) or
62e349d2
EW
2115 die "doesn't look right - svn:sync-from-url is '$url'\n";
2116
2117 my $uuid = $rp->{'svn:sync-from-uuid'} or die $err . "uuid\n";
b3e95936 2118 ($uuid) = ($uuid =~ m{^([0-9a-f\-]{30,})$}i) or
62e349d2
EW
2119 die "doesn't look right - svn:sync-from-uuid is '$uuid'\n";
2120
2121 my $section = "svn-remote.$self->{repo_id}";
2122 tmp_config('--add', "$section.svnsync-uuid", $uuid);
2123 tmp_config('--add', "$section.svnsync-url", $url);
2124 return $self->{svnsync} = { url => $url, uuid => $uuid };
2125}
2126
26a62d57
EW
2127# this allows us to memoize our SVN::Ra UUID locally and avoid a
2128# remote lookup (useful for 'git svn log').
2129sub ra_uuid {
2130 my ($self) = @_;
2131 unless ($self->{ra_uuid}) {
2132 my $key = "svn-remote.$self->{repo_id}.uuid";
2133 my $uuid = eval { tmp_config('--get', $key) };
b3e95936 2134 if (!$@ && $uuid && $uuid =~ /^([a-f\d\-]{30,})$/i) {
26a62d57
EW
2135 $self->{ra_uuid} = $uuid;
2136 } else {
2137 die "ra_uuid called without URL\n" unless $self->{url};
2138 $self->{ra_uuid} = $self->ra->get_uuid;
2139 tmp_config('--add', $key, $self->{ra_uuid});
2140 }
2141 }
2142 $self->{ra_uuid};
2143}
2144
a5460eb7
EW
2145sub _set_repos_root {
2146 my ($self, $repos_root) = @_;
2147 my $k = "svn-remote.$self->{repo_id}.reposRoot";
2148 $repos_root ||= $self->ra->{repos_root};
2149 tmp_config($k, $repos_root);
2150 $repos_root;
2151}
2152
2153sub repos_root {
2154 my ($self) = @_;
2155 my $k = "svn-remote.$self->{repo_id}.reposRoot";
2156 eval { tmp_config('--get', $k) } || $self->_set_repos_root;
2157}
2158
9b981fc6
EW
2159sub ra {
2160 my ($self) = shift;
8a49ee97 2161 my $ra = Git::SVN::Ra->new($self->{url});
a5460eb7 2162 $self->_set_repos_root($ra->{repos_root});
91b03282
EW
2163 if ($self->use_svm_props && !$self->{svm}) {
2164 if ($self->no_metadata) {
97ae0911
EW
2165 die "Can't have both 'noMetadata' and ",
2166 "'useSvmProps' options set!\n";
62e349d2
EW
2167 } elsif ($self->use_svnsync_props) {
2168 die "Can't have both 'useSvnsyncProps' and ",
2169 "'useSvmProps' options set!\n";
91b03282 2170 }
26a62d57 2171 $ra = $self->_set_svm_vars($ra);
8a49ee97
EW
2172 $self->{-want_revprops} = 1;
2173 }
2174 $ra;
9b981fc6
EW
2175}
2176
01bdab84
BS
2177# prop_walk(PATH, REV, SUB)
2178# -------------------------
2179# Recursively traverse PATH at revision REV and invoke SUB for each
2180# directory that contains a SVN property. SUB will be invoked as
2181# follows: &SUB(gs, path, props); where `gs' is this instance of
2182# Git::SVN, `path' the path to the directory where the properties
2183# `props' were found. The `path' will be relative to point of checkout,
2184# that is, if url://repo/trunk is the current Git branch, and that
2185# directory contains a sub-directory `d', SUB will be invoked with `/d/'
2186# as `path' (note the trailing `/').
2187sub prop_walk {
2188 my ($self, $path, $rev, $sub) = @_;
2189
35cda061 2190 $path =~ s#^/##;
01bdab84
BS
2191 my ($dirent, undef, $props) = $self->ra->get_dir($path, $rev);
2192 $path =~ s#^/*#/#g;
9b981fc6 2193 my $p = $path;
01bdab84
BS
2194 # Strip the irrelevant part of the path.
2195 $p =~ s#^/+\Q$self->{path}\E(/|$)#/#;
2196 # Ensure the path is terminated by a `/'.
2197 $p =~ s#/*$#/#;
2198
2199 # The properties contain all the internal SVN stuff nobody
2200 # (usually) cares about.
2201 my $interesting_props = 0;
2202 foreach (keys %{$props}) {
2203 # If it doesn't start with `svn:', it must be a
2204 # user-defined property.
2205 ++$interesting_props and next if $_ !~ /^svn:/;
2206 # FIXME: Fragile, if SVN adds new public properties,
2207 # this needs to be updated.
2208 ++$interesting_props if /^svn:(?:ignore|keywords|executable
2209 |eol-style|mime-type
2210 |externals|needs-lock)$/x;
2211 }
2212 &$sub($self, $p, $props) if $interesting_props;
2213
9b981fc6 2214 foreach (sort keys %$dirent) {
0dc03d6a 2215 next if $dirent->{$_}->{kind} != $SVN::Node::dir;
b7166cce 2216 $self->prop_walk($self->{path} . $p . $_, $rev, $sub);
9b981fc6
EW
2217 }
2218}
2219
3ebe8df7
EW
2220sub last_rev { ($_[0]->last_rev_commit)[0] }
2221sub last_commit { ($_[0]->last_rev_commit)[1] }
2222
9b981fc6
EW
2223# returns the newest SVN revision number and newest commit SHA1
2224sub last_rev_commit {
2225 my ($self) = @_;
2226 if (defined $self->{last_rev} && defined $self->{last_commit}) {
2227 return ($self->{last_rev}, $self->{last_commit});
2228 }
d2866f9e 2229 my $c = ::verify_ref($self->refname.'^0');
91b03282 2230 if ($c && !$self->use_svm_props && !$self->no_metadata) {
d2866f9e 2231 my $rev = (::cmt_metadata($c))[1];
9b981fc6
EW
2232 if (defined $rev) {
2233 ($self->{last_rev}, $self->{last_commit}) = ($rev, $c);
2234 return ($rev, $c);
2235 }
2236 }
060610c5
EW
2237 my $map_path = $self->map_path;
2238 unless (-e $map_path) {
26a62d57
EW
2239 ($self->{last_rev}, $self->{last_commit}) = (undef, undef);
2240 return (undef, undef);
2241 }
66ab84b9 2242 my ($rev, $commit) = $self->rev_map_max(1);
060610c5
EW
2243 ($self->{last_rev}, $self->{last_commit}) = ($rev, $commit);
2244 return ($rev, $commit);
9b981fc6
EW
2245}
2246
3ebe8df7
EW
2247sub get_fetch_range {
2248 my ($self, $min, $max) = @_;
2249 $max ||= $self->ra->get_latest_revnum;
060610c5 2250 $min ||= $self->rev_map_max;
3ebe8df7 2251 (++$min, $max);
9b981fc6
EW
2252}
2253
8a49ee97 2254sub tmp_config {
93f2689c 2255 my (@args) = @_;
b7e5348c
EW
2256 my $old_def_config = "$ENV{GIT_DIR}/svn/config";
2257 my $config = "$ENV{GIT_DIR}/svn/.metadata";
38570a47 2258 if (! -f $config && -f $old_def_config) {
b7e5348c
EW
2259 rename $old_def_config, $config or
2260 die "Failed rename $old_def_config => $config: $!\n";
2261 }
8a49ee97 2262 my $old_config = $ENV{GIT_CONFIG};
93f2689c 2263 $ENV{GIT_CONFIG} = $config;
8a49ee97 2264 $@ = undef;
b4d57e5e
EW
2265 my @ret = eval {
2266 unless (-f $config) {
2267 mkfile($config);
2268 open my $fh, '>', $config or
2269 die "Can't open $config: $!\n";
2270 print $fh "; This file is used internally by ",
2271 "git-svn\n" or die
2272 "Couldn't write to $config: $!\n";
2273 print $fh "; You should not have to edit it\n" or
2274 die "Couldn't write to $config: $!\n";
2275 close $fh or die "Couldn't close $config: $!\n";
2276 }
2277 command('config', @args);
2278 };
8a49ee97
EW
2279 my $err = $@;
2280 if (defined $old_config) {
2281 $ENV{GIT_CONFIG} = $old_config;
2282 } else {
2283 delete $ENV{GIT_CONFIG};
2284 }
2285 die $err if $err;
2286 wantarray ? @ret : $ret[0];
2287}
2288
9b981fc6
EW
2289sub tmp_index_do {
2290 my ($self, $sub) = @_;
2291 my $old_index = $ENV{GIT_INDEX_FILE};
2292 $ENV{GIT_INDEX_FILE} = $self->{index};
8a49ee97 2293 $@ = undef;
b4d57e5e
EW
2294 my @ret = eval {
2295 my ($dir, $base) = ($self->{index} =~ m#^(.*?)/?([^/]+)$#);
2296 mkpath([$dir]) unless -d $dir;
2297 &$sub;
2298 };
8a49ee97
EW
2299 my $err = $@;
2300 if (defined $old_index) {
9b981fc6
EW
2301 $ENV{GIT_INDEX_FILE} = $old_index;
2302 } else {
2303 delete $ENV{GIT_INDEX_FILE};
2304 }
8a49ee97 2305 die $err if $err;
9b981fc6
EW
2306 wantarray ? @ret : $ret[0];
2307}
2308
2309sub assert_index_clean {
2310 my ($self, $treeish) = @_;
2311
2312 $self->tmp_index_do(sub {
2313 command_noisy('read-tree', $treeish) unless -e $self->{index};
2314 my $x = command_oneline('write-tree');
2315 my ($y) = (command(qw/cat-file commit/, $treeish) =~
2316 /^tree ($::sha1)/mo);
e8d120bd
EW
2317 return if $y eq $x;
2318
2319 warn "Index mismatch: $y != $x\nrereading $treeish\n";
2320 unlink $self->{index} or die "unlink $self->{index}: $!\n";
2321 command_noisy('read-tree', $treeish);
9b981fc6
EW
2322 $x = command_oneline('write-tree');
2323 if ($y ne $x) {
2324 ::fatal "trees ($treeish) $y != $x\n",
207f1a75 2325 "Something is seriously wrong...";
9b981fc6
EW
2326 }
2327 });
2328}
2329
2330sub get_commit_parents {
0af9c9f9 2331 my ($self, $log_entry) = @_;
9b981fc6 2332 my (%seen, @ret, @tmp);
0af9c9f9
EW
2333 # legacy support for 'set-tree'; this is only used by set_tree_cb:
2334 if (my $ip = $self->{inject_parents}) {
2335 if (my $commit = delete $ip->{$log_entry->{revision}}) {
2336 push @tmp, $commit;
9b981fc6
EW
2337 }
2338 }
d2866f9e 2339 if (my $cur = ::verify_ref($self->refname.'^0')) {
9b981fc6
EW
2340 push @tmp, $cur;
2341 }
733a65aa
EW
2342 if (my $ipd = $self->{inject_parents_dcommit}) {
2343 if (my $commit = delete $ipd->{$log_entry->{revision}}) {
2344 push @tmp, @$commit;
2345 }
2346 }
44320b9e 2347 push @tmp, $_ foreach (@{$log_entry->{parents}}, @tmp);
9b981fc6
EW
2348 while (my $p = shift @tmp) {
2349 next if $seen{$p};
2350 $seen{$p} = 1;
2351 push @ret, $p;
2352 # MAXPARENT is defined to 16 in commit-tree.c:
2353 last if @ret >= 16;
2354 }
2355 if (@tmp) {
44320b9e 2356 die "r$log_entry->{revision}: No room for parents:\n\t",
9b981fc6
EW
2357 join("\n\t", @tmp), "\n";
2358 }
2359 @ret;
2360}
2361
aea736cc
EW
2362sub rewrite_root {
2363 my ($self) = @_;
2364 return $self->{-rewrite_root} if exists $self->{-rewrite_root};
2365 my $k = "svn-remote.$self->{repo_id}.rewriteRoot";
2366 my $rwr = eval { command_oneline(qw/config --get/, $k) };
2367 if ($rwr) {
2368 $rwr =~ s#/+$##;
2369 if ($rwr !~ m#^[a-z\+]+://#) {
2370 die "$rwr is not a valid URL (key: $k)\n";
2371 }
2372 }
2373 $self->{-rewrite_root} = $rwr;
2374}
2375
2376sub metadata_url {
2377 my ($self) = @_;
2378 ($self->rewrite_root || $self->{url}) .
2379 (length $self->{path} ? '/' . $self->{path} : '');
2380}
2381
706587fc 2382sub full_url {
9b981fc6 2383 my ($self) = @_;
5d3b7cd5 2384 $self->{url} . (length $self->{path} ? '/' . $self->{path} : '');
9b981fc6
EW
2385}
2386
ad94802a
EW
2387
2388sub set_commit_header_env {
2389 my ($log_entry) = @_;
2390 my %env;
2391 foreach my $ned (qw/NAME EMAIL DATE/) {
2392 foreach my $ac (qw/AUTHOR COMMITTER/) {
2393 $env{"GIT_${ac}_${ned}"} = $ENV{"GIT_${ac}_${ned}"};
2394 }
9b981fc6 2395 }
ad94802a 2396
70ae04e4
AW
2397 $ENV{GIT_AUTHOR_NAME} = $log_entry->{name};
2398 $ENV{GIT_AUTHOR_EMAIL} = $log_entry->{email};
44320b9e 2399 $ENV{GIT_AUTHOR_DATE} = $ENV{GIT_COMMITTER_DATE} = $log_entry->{date};
9b981fc6 2400
70ae04e4
AW
2401 $ENV{GIT_COMMITTER_NAME} = (defined $log_entry->{commit_name})
2402 ? $log_entry->{commit_name}
2403 : $log_entry->{name};
2404 $ENV{GIT_COMMITTER_EMAIL} = (defined $log_entry->{commit_email})
2405 ? $log_entry->{commit_email}
2406 : $log_entry->{email};
ad94802a
EW
2407 \%env;
2408}
70ae04e4 2409
ad94802a
EW
2410sub restore_commit_header_env {
2411 my ($env) = @_;
2412 foreach my $ned (qw/NAME EMAIL DATE/) {
2413 foreach my $ac (qw/AUTHOR COMMITTER/) {
2414 my $k = "GIT_${ac}_${ned}";
2415 if (defined $env->{$k}) {
2416 $ENV{$k} = $env->{$k};
2417 } else {
2418 delete $ENV{$k};
2419 }
2420 }
2421 }
2422}
2423
94bc914c
KW
2424sub gc {
2425 command_noisy('gc', '--auto');
2426};
2427
ad94802a
EW
2428sub do_git_commit {
2429 my ($self, $log_entry) = @_;
2430 my $lr = $self->last_rev;
2431 if (defined $lr && $lr >= $log_entry->{revision}) {
2432 die "Last fetched revision of ", $self->refname,
2433 " was r$lr, but we are about to fetch: ",
2434 "r$log_entry->{revision}!\n";
2435 }
2436 if (my $c = $self->rev_map_get($log_entry->{revision})) {
2437 croak "$log_entry->{revision} = $c already exists! ",
2438 "Why are we refetching it?\n";
2439 }
2440 my $old_env = set_commit_header_env($log_entry);
44320b9e 2441 my $tree = $log_entry->{tree};
9b981fc6
EW
2442 if (!defined $tree) {
2443 $tree = $self->tmp_index_do(sub {
2444 command_oneline('write-tree') });
2445 }
2446 die "Tree is not a valid sha1: $tree\n" if $tree !~ /^$::sha1$/o;
2447
e855bfc0 2448 my @exec = ('git', 'commit-tree', $tree);
0af9c9f9 2449 foreach ($self->get_commit_parents($log_entry)) {
9b981fc6
EW
2450 push @exec, '-p', $_;
2451 }
2452 defined(my $pid = open3(my $msg_fh, my $out_fh, '>&STDERR', @exec))
2453 or croak $!;
16fc08e2
EW
2454 binmode $msg_fh;
2455
2456 # we always get UTF-8 from SVN, but we may want our commits in
2457 # a different encoding.
2458 if (my $enc = Git::config('i18n.commitencoding')) {
2459 require Encode;
2460 Encode::from_to($log_entry->{log}, 'UTF-8', $enc);
2461 }
44320b9e 2462 print $msg_fh $log_entry->{log} or croak $!;
ad94802a 2463 restore_commit_header_env($old_env);
91b03282 2464 unless ($self->no_metadata) {
8a49ee97
EW
2465 print $msg_fh "\ngit-svn-id: $log_entry->{metadata}\n"
2466 or croak $!;
9760adcc 2467 }
9b981fc6
EW
2468 $msg_fh->flush == 0 or croak $!;
2469 close $msg_fh or croak $!;
2470 chomp(my $commit = do { local $/; <$out_fh> });
2471 close $out_fh or croak $!;
2472 waitpid $pid, 0;
2473 croak $? if $?;
2474 if ($commit !~ /^$::sha1$/o) {
2475 die "Failed to commit, invalid sha1: $commit\n";
2476 }
2477
060610c5 2478 $self->rev_map_set($log_entry->{revision}, $commit, 1);
9b981fc6 2479
44320b9e 2480 $self->{last_rev} = $log_entry->{revision};
9b981fc6 2481 $self->{last_commit} = $commit;
49750f30 2482 print "r$log_entry->{revision}" unless $::_q > 1;
8a49ee97 2483 if (defined $log_entry->{svm_revision}) {
49750f30 2484 print " (\@$log_entry->{svm_revision})" unless $::_q > 1;
060610c5 2485 $self->rev_map_set($log_entry->{svm_revision}, $commit,
26a62d57 2486 0, $self->svm_uuid);
8a49ee97 2487 }
49750f30 2488 print " = $commit ($self->{ref_id})\n" unless $::_q > 1;
94bc914c
KW
2489 if (--$_gc_nr == 0) {
2490 $_gc_nr = $_gc_period;
2491 gc();
2492 }
9b981fc6
EW
2493 return $commit;
2494}
2495
fbcc1737
EW
2496sub match_paths {
2497 my ($self, $paths, $r) = @_;
4e9f6cc7 2498 return 1 if $self->{path} eq '';
d542aedb
EW
2499 if (my $path = $paths->{"/$self->{path}"}) {
2500 return ($path->{action} eq 'D') ? 0 : 1;
2501 }
0b2af457 2502 $self->{path_regex} ||= qr/^\/\Q$self->{path}\E\//;
fbcc1737
EW
2503 if (grep /$self->{path_regex}/, keys %$paths) {
2504 return 1;
2505 }
2506 my $c = '';
2507 foreach (split m#/#, $self->{path}) {
2508 $c .= "/$_";
74a81227
EW
2509 next unless ($paths->{$c} &&
2510 ($paths->{$c}->{action} =~ /^[AR]$/));
e518192f
EW
2511 if ($self->ra->check_path($self->{path}, $r) ==
2512 $SVN::Node::dir) {
fbcc1737
EW
2513 return 1;
2514 }
2515 }
2516 return 0;
2517}
2518
15710b6f
EW
2519sub find_parent_branch {
2520 my ($self, $paths, $rev) = @_;
91b03282 2521 return undef unless $self->follow_parent;
e5a0b240 2522 unless (defined $paths) {
c7eba716
EW
2523 my $err_handler = $SVN::Error::handler;
2524 $SVN::Error::handler = \&Git::SVN::Ra::skip_unknown_revs;
3c49a035
MN
2525 $self->ra->get_log([$self->{path}], $rev, $rev, 0, 1, 1,
2526 sub { $paths = $_[0] });
c7eba716 2527 $SVN::Error::handler = $err_handler;
e5a0b240
EW
2528 }
2529 return undef unless defined $paths;
15710b6f
EW
2530
2531 # look for a parent from another branch:
0b2af457 2532 my @b_path_components = split m#/#, $self->{path};
7f578c55
EW
2533 my @a_path_components;
2534 my $i;
2535 while (@b_path_components) {
2536 $i = $paths->{'/'.join('/', @b_path_components)};
74a81227 2537 last if $i && defined $i->{copyfrom_path};
7f578c55
EW
2538 unshift(@a_path_components, pop(@b_path_components));
2539 }
74a81227
EW
2540 return undef unless defined $i && defined $i->{copyfrom_path};
2541 my $branch_from = $i->{copyfrom_path};
7f578c55
EW
2542 if (@a_path_components) {
2543 print STDERR "branch_from: $branch_from => ";
2544 $branch_from .= '/'.join('/', @a_path_components);
2545 print STDERR $branch_from, "\n";
2546 }
3ebe8df7 2547 my $r = $i->{copyfrom_rev};
15710b6f
EW
2548 my $repos_root = $self->ra->{repos_root};
2549 my $url = $self->ra->{url};
0b2af457 2550 my $new_url = $url . $branch_from;
15710b6f
EW
2551 print STDERR "Found possible branch point: ",
2552 "$new_url => ", $self->full_url, ", $r\n";
2553 $branch_from =~ s#^/##;
0b2af457 2554 my $gs = $self->other_gs($new_url, $url,
8e3f9b17 2555 $branch_from, $r, $self->{ref_id});
15710b6f 2556 my ($r0, $parent) = $gs->find_rev_before($r, 1);
553589f7
DM
2557 {
2558 my ($base, $head);
2559 if (!defined $r0 || !defined $parent) {
2560 ($base, $head) = parse_revision_argument(0, $r);
2561 } else {
2562 if ($r0 < $r) {
2563 $gs->ra->get_log([$gs->{path}], $r0 + 1, $r, 1,
2564 0, 1, sub { $base = $_[1] - 1 });
2565 }
2566 }
2567 if (defined $base && $base <= $r) {
d627de6b
EW
2568 $gs->fetch($base, $r);
2569 }
553589f7 2570 ($r0, $parent) = $gs->find_rev_before($r, 1);
15710b6f 2571 }
ef70de96 2572 if (defined $r0 && defined $parent) {
15710b6f 2573 print STDERR "Found branch parent: ($self->{ref_id}) $parent\n";
15710b6f
EW
2574 my $ed;
2575 if ($self->ra->can_do_switch) {
2e5e2480 2576 $self->assert_index_clean($parent);
8b8fc068 2577 print STDERR "Following parent with do_switch\n";
15710b6f 2578 # do_switch works with svn/trunk >= r22312, but that
2b27f6c8 2579 # is not included with SVN 1.4.3 (the latest version
15710b6f 2580 # at the moment), so we can't rely on it
83c2fcff 2581 $self->{last_rev} = $r0;
15710b6f 2582 $self->{last_commit} = $parent;
8841b37f 2583 $ed = SVN::Git::Fetcher->new($self, $gs->{path});
8a603774 2584 $gs->ra->gs_do_switch($r0, $rev, $gs,
15710b6f
EW
2585 $self->full_url, $ed)
2586 or die "SVN connection failed somewhere...\n";
9ff74e95
SW
2587 } elsif ($self->ra->trees_match($new_url, $r0,
2588 $self->full_url, $rev)) {
2589 print STDERR "Trees match:\n",
2590 " $new_url\@$r0\n",
2591 " ${\$self->full_url}\@$rev\n",
2592 "Following parent with no changes\n";
2593 $self->tmp_index_do(sub {
2594 command_noisy('read-tree', $parent);
2595 });
2596 $self->{last_commit} = $parent;
15710b6f 2597 } else {
8b8fc068 2598 print STDERR "Following parent with do_update\n";
15710b6f 2599 $ed = SVN::Git::Fetcher->new($self);
8a603774 2600 $self->ra->gs_do_update($rev, $rev, $self, $ed)
15710b6f
EW
2601 or die "SVN connection failed somewhere...\n";
2602 }
f7c3fc4a 2603 print STDERR "Successfully followed parent\n";
15710b6f
EW
2604 return $self->make_log_entry($rev, [$parent], $ed);
2605 }
15710b6f
EW
2606 return undef;
2607}
2608
9b981fc6 2609sub do_fetch {
706587fc 2610 my ($self, $paths, $rev) = @_;
15710b6f 2611 my $ed;
9b981fc6 2612 my ($last_rev, @parents);
b9dffd8c
EW
2613 if (my $lc = $self->last_commit) {
2614 # we can have a branch that was deleted, then re-added
2615 # under the same name but copied from another path, in
2616 # which case we'll have multiple parents (we don't
2617 # want to break the original ref, nor lose copypath info):
2618 if (my $log_entry = $self->find_parent_branch($paths, $rev)) {
2619 push @{$log_entry->{parents}}, $lc;
2620 return $log_entry;
2621 }
15710b6f 2622 $ed = SVN::Git::Fetcher->new($self);
9b981fc6 2623 $last_rev = $self->{last_rev};
b9dffd8c
EW
2624 $ed->{c} = $lc;
2625 @parents = ($lc);
9b981fc6
EW
2626 } else {
2627 $last_rev = $rev;
15710b6f
EW
2628 if (my $log_entry = $self->find_parent_branch($paths, $rev)) {
2629 return $log_entry;
2630 }
2631 $ed = SVN::Git::Fetcher->new($self);
9b981fc6 2632 }
8a603774 2633 unless ($self->ra->gs_do_update($last_rev, $rev, $self, $ed)) {
9b981fc6
EW
2634 die "SVN connection failed somewhere...\n";
2635 }
2636 $self->make_log_entry($rev, \@parents, $ed);
2637}
2638
97f6987a
EW
2639sub get_untracked {
2640 my ($self, $ed) = @_;
2641 my @out;
2642 my $h = $ed->{empty};
9b981fc6
EW
2643 foreach (sort keys %$h) {
2644 my $act = $h->{$_} ? '+empty_dir' : '-empty_dir';
97f6987a 2645 push @out, " $act: " . uri_encode($_);
9b981fc6
EW
2646 warn "W: $act: $_\n";
2647 }
2648 foreach my $t (qw/dir_prop file_prop/) {
97f6987a 2649 $h = $ed->{$t} or next;
9b981fc6
EW
2650 foreach my $path (sort keys %$h) {
2651 my $ppath = $path eq '' ? '.' : $path;
2652 foreach my $prop (sort keys %{$h->{$path}}) {
1ce255dc 2653 next if $SKIP_PROP{$prop};
9b981fc6 2654 my $v = $h->{$path}->{$prop};
97f6987a
EW
2655 my $t_ppath_prop = "$t: " .
2656 uri_encode($ppath) . ' ' .
2657 uri_encode($prop);
9b981fc6 2658 if (defined $v) {
97f6987a
EW
2659 push @out, " +$t_ppath_prop " .
2660 uri_encode($v);
9b981fc6 2661 } else {
97f6987a 2662 push @out, " -$t_ppath_prop";
9b981fc6
EW
2663 }
2664 }
2665 }
2666 }
2667 foreach my $t (qw/absent_file absent_directory/) {
97f6987a 2668 $h = $ed->{$t} or next;
9b981fc6
EW
2669 foreach my $parent (sort keys %$h) {
2670 foreach my $path (sort @{$h->{$parent}}) {
97f6987a
EW
2671 push @out, " $t: " .
2672 uri_encode("$parent/$path");
9b981fc6
EW
2673 warn "W: $t: $parent/$path ",
2674 "Insufficient permissions?\n";
2675 }
2676 }
2677 }
97f6987a 2678 \@out;
9b981fc6
EW
2679}
2680
e82f0d73
PH
2681# parse_svn_date(DATE)
2682# --------------------
2683# Given a date (in UTC) from Subversion, return a string in the format
2684# "<TZ Offset> <local date/time>" that Git will use.
2685#
2686# By default the parsed date will be in UTC; if $Git::SVN::_localtime
2687# is true we'll convert it to the local timezone instead.
1c8443b0
EW
2688sub parse_svn_date {
2689 my $date = shift || return '+0000 1970-01-01 00:00:00';
2690 my ($Y,$m,$d,$H,$M,$S) = ($date =~ /^(\d{4})\-(\d\d)\-(\d\d)T
b94ead75 2691 (\d\d)\:(\d\d)\:(\d\d)\.\d*Z$/x) or
1c8443b0 2692 croak "Unable to parse date: $date\n";
e82f0d73
PH
2693 my $parsed_date; # Set next.
2694
2695 if ($Git::SVN::_localtime) {
2696 # Translate the Subversion datetime to an epoch time.
2697 # Begin by switching ourselves to $date's timezone, UTC.
2698 my $old_env_TZ = $ENV{TZ};
2699 $ENV{TZ} = 'UTC';
2700
2701 my $epoch_in_UTC =
2702 POSIX::strftime('%s', $S, $M, $H, $d, $m - 1, $Y - 1900);
2703
2704 # Determine our local timezone (including DST) at the
2705 # time of $epoch_in_UTC. $Git::SVN::Log::TZ stored the
2706 # value of TZ, if any, at the time we were run.
2707 if (defined $Git::SVN::Log::TZ) {
2708 $ENV{TZ} = $Git::SVN::Log::TZ;
2709 } else {
2710 delete $ENV{TZ};
2711 }
2712
2713 my $our_TZ =
2714 POSIX::strftime('%Z', $S, $M, $H, $d, $m - 1, $Y - 1900);
2715
2716 # This converts $epoch_in_UTC into our local timezone.
2717 my ($sec, $min, $hour, $mday, $mon, $year,
2718 $wday, $yday, $isdst) = localtime($epoch_in_UTC);
2719
2720 $parsed_date = sprintf('%s %04d-%02d-%02d %02d:%02d:%02d',
2721 $our_TZ, $year + 1900, $mon + 1,
2722 $mday, $hour, $min, $sec);
2723
2724 # Reset us to the timezone in effect when we entered
2725 # this routine.
2726 if (defined $old_env_TZ) {
2727 $ENV{TZ} = $old_env_TZ;
2728 } else {
2729 delete $ENV{TZ};
2730 }
2731 } else {
2732 $parsed_date = "+0000 $Y-$m-$d $H:$M:$S";
2733 }
2734
2735 return $parsed_date;
1c8443b0
EW
2736}
2737
8e3f9b17 2738sub other_gs {
0b2af457 2739 my ($self, $new_url, $url,
8e3f9b17 2740 $branch_from, $r, $old_ref_id) = @_;
0b2af457 2741 my $gs = Git::SVN->find_by_url($new_url, $url, $branch_from);
8e3f9b17
SV
2742 unless ($gs) {
2743 my $ref_id = $old_ref_id;
2744 $ref_id =~ s/\@\d+$//;
2745 $ref_id .= "\@$r";
2746 # just grow a tail if we're not unique enough :x
2747 $ref_id .= '-' while find_ref($ref_id);
2748 print STDERR "Initializing parent: $ref_id\n";
2749 my ($u, $p, $repo_id) = ($new_url, '', $ref_id);
2750 if ($u =~ s#^\Q$url\E(/|$)##) {
2751 $p = $u;
2752 $u = $url;
2753 $repo_id = $self->{repo_id};
2754 }
2755 $gs = Git::SVN->init($u, $p, $repo_id, $ref_id, 1);
2756 }
2757 $gs
2758}
2759
36db1edd
ML
2760sub call_authors_prog {
2761 my ($orig_author) = @_;
2762 my $author = `$::_authors_prog $orig_author`;
2763 if ($? != 0) {
2764 die "$::_authors_prog failed with exit code $?\n"
2765 }
2766 if ($author =~ /^\s*(.+?)\s*<(.*)>\s*$/) {
2767 my ($name, $email) = ($1, $2);
2768 $email = undef if length $2 == 0;
2769 return [$name, $email];
2770 } else {
2771 die "Author: $orig_author: $::_authors_prog returned "
2772 . "invalid author format: $author\n";
2773 }
2774}
2775
1c8443b0
EW
2776sub check_author {
2777 my ($author) = @_;
2778 if (!defined $author || length $author == 0) {
2779 $author = '(no author)';
36db1edd
ML
2780 }
2781 if (!defined $::users{$author}) {
2782 if (defined $::_authors_prog) {
2783 $::users{$author} = call_authors_prog($author);
2784 } elsif (defined $::_authors) {
2785 die "Author: $author not defined in $::_authors file\n";
2786 }
1c8443b0
EW
2787 }
2788 $author;
2789}
2790
9b981fc6 2791sub make_log_entry {
97f6987a
EW
2792 my ($self, $rev, $parents, $ed) = @_;
2793 my $untracked = $self->get_untracked($ed);
2794
9b981fc6 2795 open my $un, '>>', "$self->{dir}/unhandled.log" or croak $!;
97f6987a
EW
2796 print $un "r$rev\n" or croak $!;
2797 print $un $_, "\n" foreach @$untracked;
2798 my %log_entry = ( parents => $parents || [], revision => $rev,
2799 log => '');
fbcc1737 2800
8a49ee97 2801 my $headrev;
fbcc1737 2802 my $logged = delete $self->{logged_rev_props};
8a49ee97 2803 if (!$logged || $self->{-want_revprops}) {
fbcc1737
EW
2804 my $rp = $self->ra->rev_proplist($rev);
2805 foreach (sort keys %$rp) {
2806 my $v = $rp->{$_};
2807 if (/^svn:(author|date|log)$/) {
2808 $log_entry{$1} = $v;
8a49ee97
EW
2809 } elsif ($_ eq 'svm:headrev') {
2810 $headrev = $v;
fbcc1737
EW
2811 } else {
2812 print $un " rev_prop: ", uri_encode($_), ' ',
2813 uri_encode($v), "\n";
2814 }
9b981fc6 2815 }
fbcc1737
EW
2816 } else {
2817 map { $log_entry{$_} = $logged->{$_} } keys %$logged;
9b981fc6
EW
2818 }
2819 close $un or croak $!;
97f6987a 2820
9b981fc6 2821 $log_entry{date} = parse_svn_date($log_entry{date});
9b981fc6 2822 $log_entry{log} .= "\n";
db03cd24
EW
2823 my $author = $log_entry{author} = check_author($log_entry{author});
2824 my ($name, $email) = defined $::users{$author} ? @{$::users{$author}}
70ae04e4
AW
2825 : ($author, undef);
2826
2827 my ($commit_name, $commit_email) = ($name, $email);
2828 if ($_use_log_author) {
5ff6aae8
AW
2829 my $name_field;
2830 if ($log_entry{log} =~ /From:\s+(.*\S)\s*\n/i) {
2831 $name_field = $1;
2832 } elsif ($log_entry{log} =~ /Signed-off-by:\s+(.*\S)\s*\n/i) {
2833 $name_field = $1;
2834 }
2835 if (!defined $name_field) {
abfa533d
SB
2836 if (!defined $email) {
2837 $email = $name;
2838 }
5ff6aae8 2839 } elsif ($name_field =~ /(.*?)\s+<(.*)>/) {
70ae04e4 2840 ($name, $email) = ($1, $2);
5ff6aae8
AW
2841 } elsif ($name_field =~ /(.*)@/) {
2842 ($name, $email) = ($1, $name_field);
2843 } else {
abfa533d 2844 ($name, $email) = ($name_field, $name_field);
70ae04e4
AW
2845 }
2846 }
91b03282 2847 if (defined $headrev && $self->use_svm_props) {
aea736cc
EW
2848 if ($self->rewrite_root) {
2849 die "Can't have both 'useSvmProps' and 'rewriteRoot' ",
2850 "options set!\n";
2851 }
b3e95936 2852 my ($uuid, $r) = $headrev =~ m{^([a-f\d\-]{30,}):(\d+)$}i;
befc9adc
EW
2853 # we don't want "SVM: initializing mirror for junk" ...
2854 return undef if $r == 0;
2855 my $svm = $self->svm;
2856 if ($uuid ne $svm->{uuid}) {
8a49ee97 2857 die "UUID mismatch on SVM path:\n",
befc9adc 2858 "expected: $svm->{uuid}\n",
8a49ee97
EW
2859 " got: $uuid\n";
2860 }
befc9adc
EW
2861 my $full_url = $self->full_url;
2862 $full_url =~ s#^\Q$svm->{replace}\E(/|$)#$svm->{source}$1# or
2863 die "Failed to replace '$svm->{replace}' with ",
2864 "'$svm->{source}' in $full_url\n";
18ea92bd
SV
2865 # throw away username for storing in records
2866 remove_username($full_url);
8a49ee97
EW
2867 $log_entry{metadata} = "$full_url\@$r $uuid";
2868 $log_entry{svm_revision} = $r;
70ae04e4
AW
2869 $email ||= "$author\@$uuid";
2870 $commit_email ||= "$author\@$uuid";
62e349d2
EW
2871 } elsif ($self->use_svnsync_props) {
2872 my $full_url = $self->svnsync->{url};
2873 $full_url .= "/$self->{path}" if length $self->{path};
ce118739 2874 remove_username($full_url);
62e349d2
EW
2875 my $uuid = $self->svnsync->{uuid};
2876 $log_entry{metadata} = "$full_url\@$rev $uuid";
70ae04e4
AW
2877 $email ||= "$author\@$uuid";
2878 $commit_email ||= "$author\@$uuid";
8a49ee97 2879 } else {
ce118739
AR
2880 my $url = $self->metadata_url;
2881 remove_username($url);
2882 $log_entry{metadata} = "$url\@$rev " .
26a62d57 2883 $self->ra->get_uuid;
db03cd24 2884 $email ||= "$author\@" . $self->ra->get_uuid;
70ae04e4 2885 $commit_email ||= "$author\@" . $self->ra->get_uuid;
8a49ee97 2886 }
db03cd24
EW
2887 $log_entry{name} = $name;
2888 $log_entry{email} = $email;
70ae04e4
AW
2889 $log_entry{commit_name} = $commit_name;
2890 $log_entry{commit_email} = $commit_email;
9b981fc6
EW
2891 \%log_entry;
2892}
2893
2894sub fetch {
3ebe8df7 2895 my ($self, $min_rev, $max_rev, @parents) = @_;
9b981fc6 2896 my ($last_rev, $last_commit) = $self->last_rev_commit;
3ebe8df7 2897 my ($base, $head) = $self->get_fetch_range($min_rev, $max_rev);
e518192f 2898 $self->ra->gs_fetch_loop_common($base, $head, [$self]);
9b981fc6
EW
2899}
2900
2901sub set_tree_cb {
2902 my ($self, $log_entry, $tree, $rev, $date, $author) = @_;
490f49ea
EW
2903 $self->{inject_parents} = { $rev => $tree };
2904 $self->fetch(undef, undef);
9b981fc6
EW
2905}
2906
2907sub set_tree {
2908 my ($self, $tree) = (shift, shift);
1ce255dc 2909 my $log_entry = ::get_commit_entry($tree);
9b981fc6 2910 unless ($self->{last_rev}) {
0a1a1c86 2911 ::fatal("Must have an existing revision to commit");
9b981fc6 2912 }
61395354
EW
2913 my %ed_opts = ( r => $self->{last_rev},
2914 log => $log_entry->{log},
2915 ra => $self->ra,
2916 tree_a => $self->{last_commit},
2917 tree_b => $tree,
2918 editor_cb => sub {
2919 $self->set_tree_cb($log_entry, $tree, @_) },
2920 svn_path => $self->{path} );
2921 if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) {
9b981fc6
EW
2922 print "No changes\nr$self->{last_rev} = $tree\n";
2923 }
9b981fc6
EW
2924}
2925
060610c5
EW
2926sub rebuild_from_rev_db {
2927 my ($self, $path) = @_;
2928 my $r = -1;
2929 open my $fh, '<', $path or croak "open: $!";
4f7ec797 2930 binmode $fh or croak "binmode: $!";
060610c5
EW
2931 while (<$fh>) {
2932 length($_) == 41 or croak "inconsistent size in ($_) != 41";
2933 chomp($_);
2934 ++$r;
2935 next if $_ eq ('0' x 40);
2936 $self->rev_map_set($r, $_);
2937 print "r$r = $_\n";
2938 }
2939 close $fh or croak "close: $!";
2940 unlink $path or croak "unlink: $!";
2941}
2942
f0ecca10
EW
2943sub rebuild {
2944 my ($self) = @_;
060610c5 2945 my $map_path = $self->map_path;
2beec897 2946 my $partial = (-e $map_path && ! -z $map_path);
d6d3346b 2947 return unless ::verify_ref($self->refname.'^0');
2beec897 2948 if (!$partial && ($self->use_svm_props || $self->no_metadata)) {
060610c5
EW
2949 my $rev_db = $self->rev_db_path;
2950 $self->rebuild_from_rev_db($rev_db);
2951 if ($self->use_svm_props) {
2952 my $svm_rev_db = $self->rev_db_path($self->svm_uuid);
2953 $self->rebuild_from_rev_db($svm_rev_db);
2954 }
2955 $self->unlink_rev_db_symlink;
26a62d57
EW
2956 return;
2957 }
2beec897
DM
2958 print "Rebuilding $map_path ...\n" if (!$partial);
2959 my ($base_rev, $head) = ($partial ? $self->rev_map_max_norebuild(1) :
2960 (undef, undef));
060610c5
EW
2961 my ($log, $ctx) =
2962 command_output_pipe(qw/rev-list --pretty=raw --no-color --reverse/,
2beec897
DM
2963 ($head ? "$head.." : "") . $self->refname,
2964 '--');
74b1e123
JK
2965 my $metadata_url = $self->metadata_url;
2966 remove_username($metadata_url);
060610c5 2967 my $svn_uuid = $self->ra_uuid;
3dfab993
SV
2968 my $c;
2969 while (<$log>) {
2970 if ( m{^commit ($::sha1)$} ) {
2971 $c = $1;
2972 next;
2973 }
2974 next unless s{^\s*(git-svn-id:)}{$1};
2975 my ($url, $rev, $uuid) = ::extract_metadata($_);
18ea92bd 2976 remove_username($url);
f0ecca10
EW
2977
2978 # ignore merges (from set-tree)
2979 next if (!defined $rev || !$uuid);
2980
2981 # if we merged or otherwise started elsewhere, this is
2982 # how we break out of it
060610c5 2983 if (($uuid ne $svn_uuid) ||
74b1e123 2984 ($metadata_url && $url && ($url ne $metadata_url))) {
f0ecca10
EW
2985 next;
2986 }
2beec897
DM
2987 if ($partial && $head) {
2988 print "Partial-rebuilding $map_path ...\n";
2989 print "Currently at $base_rev = $head\n";
2990 $head = undef;
2991 }
f0ecca10 2992
060610c5 2993 $self->rev_map_set($rev, $c);
f0ecca10
EW
2994 print "r$rev = $c\n";
2995 }
3dfab993 2996 command_close_pipe($log, $ctx);
2beec897 2997 print "Done rebuilding $map_path\n" if (!$partial || !$head);
060610c5
EW
2998 my $rev_db_path = $self->rev_db_path;
2999 if (-f $self->rev_db_path) {
3000 unlink $self->rev_db_path or croak "unlink: $!";
3001 }
3002 $self->unlink_rev_db_symlink;
f0ecca10
EW
3003}
3004
060610c5 3005# rev_map:
9b981fc6
EW
3006# Tie::File seems to be prone to offset errors if revisions get sparse,
3007# it's not that fast, either. Tie::File is also not in Perl 5.6. So
3008# one of my favorite modules is out :< Next up would be one of the DBM
060610c5
EW
3009# modules, but I'm not sure which is most portable...
3010#
3011# This is the replacement for the rev_db format, which was too big
3012# and inefficient for large repositories with a lot of sparse history
3013# (mainly tags)
3014#
3015# The format is this:
3016# - 24 bytes for every record,
3017# * 4 bytes for the integer representing an SVN revision number
3018# * 20 bytes representing the sha1 of a git commit
3019# - No empty padding records like the old format
66ab84b9 3020# (except the last record, which can be overwritten)
060610c5
EW
3021# - new records are written append-only since SVN revision numbers
3022# increase monotonically
3023# - lookups on SVN revision number are done via a binary search
66ab84b9
EW
3024# - Piping the file to xxd -c24 is a good way of dumping it for
3025# viewing or editing (piped back through xxd -r), should the need
3026# ever arise.
3027# - The last record can be padding revision with an all-zero sha1
3028# This is used to optimize fetch performance when using multiple
3029# "fetch" directives in .git/config
060610c5 3030#
97ae0911 3031# These files are disposable unless noMetadata or useSvmProps is set
9b981fc6 3032
060610c5 3033sub _rev_map_set {
26a62d57 3034 my ($fh, $rev, $commit) = @_;
060610c5 3035
4f7ec797 3036 binmode $fh or croak "binmode: $!";
060610c5
EW
3037 my $size = (stat($fh))[7];
3038 ($size % 24) == 0 or croak "inconsistent size: $size";
3039
66ab84b9 3040 my $wr_offset = 0;
060610c5
EW
3041 if ($size > 0) {
3042 sysseek($fh, -24, SEEK_END) or croak "seek: $!";
3043 my $read = sysread($fh, my $buf, 24) or croak "read: $!";
3044 $read == 24 or croak "read only $read bytes (!= 24)";
3045 my ($last_rev, $last_commit) = unpack(rev_map_fmt, $buf);
66ab84b9
EW
3046 if ($last_commit eq ('0' x40)) {
3047 if ($size >= 48) {
3048 sysseek($fh, -48, SEEK_END) or croak "seek: $!";
3049 $read = sysread($fh, $buf, 24) or
3050 croak "read: $!";
3051 $read == 24 or
3052 croak "read only $read bytes (!= 24)";
3053 ($last_rev, $last_commit) =
3054 unpack(rev_map_fmt, $buf);
3055 if ($last_commit eq ('0' x40)) {
3056 croak "inconsistent .rev_map\n";
3057 }
3058 }
3059 if ($last_rev >= $rev) {
3060 croak "last_rev is higher!: $last_rev >= $rev";
3061 }
3062 $wr_offset = -24;
26a62d57
EW
3063 }
3064 }
66ab84b9 3065 sysseek($fh, $wr_offset, SEEK_END) or croak "seek: $!";
060610c5
EW
3066 syswrite($fh, pack(rev_map_fmt, $rev, $commit), 24) == 24 or
3067 croak "write: $!";
26a62d57
EW
3068}
3069
195643f2
BJ
3070sub _rev_map_reset {
3071 my ($fh, $rev, $commit) = @_;
3072 my $c = _rev_map_get($fh, $rev);
3073 $c eq $commit or die "_rev_map_reset(@_) commit $c does not match!\n";
3074 my $offset = sysseek($fh, 0, SEEK_CUR) or croak "seek: $!";
3075 truncate $fh, $offset or croak "truncate: $!";
3076}
3077
26a62d57
EW
3078sub mkfile {
3079 my ($path) = @_;
3080 unless (-e $path) {
3081 my ($dir, $base) = ($path =~ m#^(.*?)/?([^/]+)$#);
3082 mkpath([$dir]) unless -d $dir;
3083 open my $fh, '>>', $path or die "Couldn't create $path: $!\n";
3084 close $fh or die "Couldn't close (create) $path: $!\n";
3085 }
3086}
3087
060610c5 3088sub rev_map_set {
26a62d57
EW
3089 my ($self, $rev, $commit, $update_ref, $uuid) = @_;
3090 length $commit == 40 or die "arg3 must be a full SHA1 hexsum\n";
060610c5 3091 my $db = $self->map_path($uuid);
26a62d57 3092 my $db_lock = "$db.lock";
373274f9 3093 my $sig;
195643f2 3094 $update_ref ||= 0;
373274f9
EW
3095 if ($update_ref) {
3096 $SIG{INT} = $SIG{HUP} = $SIG{TERM} = $SIG{ALRM} = $SIG{PIPE} =
3097 $SIG{USR1} = $SIG{USR2} = sub { $sig = $_[0] };
3098 }
26a62d57
EW
3099 mkfile($db);
3100
373274f9 3101 $LOCKFILES{$db_lock} = 1;
97ae0911 3102 my $sync;
97ae0911
EW
3103 # both of these options make our .rev_db file very, very important
3104 # and we can't afford to lose it because rebuild() won't work
3105 if ($self->use_svm_props || $self->no_metadata) {
3106 $sync = 1;
060610c5 3107 copy($db, $db_lock) or die "rev_map_set(@_): ",
26a62d57 3108 "Failed to copy: ",
373274f9
EW
3109 "$db => $db_lock ($!)\n";
3110 } else {
060610c5 3111 rename $db, $db_lock or die "rev_map_set(@_): ",
26a62d57 3112 "Failed to rename: ",
373274f9
EW
3113 "$db => $db_lock ($!)\n";
3114 }
060610c5 3115
66ab84b9 3116 sysopen(my $fh, $db_lock, O_RDWR | O_CREAT)
060610c5 3117 or croak "Couldn't open $db_lock: $!\n";
195643f2
BJ
3118 $update_ref eq 'reset' ? _rev_map_reset($fh, $rev, $commit) :
3119 _rev_map_set($fh, $rev, $commit);
97ae0911
EW
3120 if ($sync) {
3121 $fh->flush or die "Couldn't flush $db_lock: $!\n";
3122 $fh->sync or die "Couldn't sync $db_lock: $!\n";
3123 }
9b981fc6 3124 close $fh or croak $!;
373274f9 3125 if ($update_ref) {
1e889ef3 3126 $_head = $self;
195643f2
BJ
3127 my $note = "";
3128 $note = " ($update_ref)" if ($update_ref !~ /^\d*$/);
3129 command_noisy('update-ref', '-m', "r$rev$note",
373274f9
EW
3130 $self->refname, $commit);
3131 }
060610c5 3132 rename $db_lock, $db or die "rev_map_set(@_): ", "Failed to rename: ",
373274f9
EW
3133 "$db_lock => $db ($!)\n";
3134 delete $LOCKFILES{$db_lock};
3135 if ($update_ref) {
3136 $SIG{INT} = $SIG{HUP} = $SIG{TERM} = $SIG{ALRM} = $SIG{PIPE} =
3137 $SIG{USR1} = $SIG{USR2} = 'DEFAULT';
3138 kill $sig, $$ if defined $sig;
3139 }
9b981fc6
EW
3140}
3141
66ab84b9
EW
3142# If want_commit, this will return an array of (rev, commit) where
3143# commit _must_ be a valid commit in the archive.
3144# Otherwise, it'll return the max revision (whether or not the
3145# commit is valid or just a 0x40 placeholder).
060610c5 3146sub rev_map_max {
66ab84b9 3147 my ($self, $want_commit) = @_;
d6d3346b 3148 $self->rebuild;
2beec897
DM
3149 my ($r, $c) = $self->rev_map_max_norebuild($want_commit);
3150 $want_commit ? ($r, $c) : $r;
3151}
3152
3153sub rev_map_max_norebuild {
3154 my ($self, $want_commit) = @_;
060610c5 3155 my $map_path = $self->map_path;
66ab84b9 3156 stat $map_path or return $want_commit ? (0, undef) : 0;
060610c5 3157 sysopen(my $fh, $map_path, O_RDONLY) or croak "open: $!";
4f7ec797 3158 binmode $fh or croak "binmode: $!";
060610c5
EW
3159 my $size = (stat($fh))[7];
3160 ($size % 24) == 0 or croak "inconsistent size: $size";
3161
3162 if ($size == 0) {
3163 close $fh or croak "close: $!";
66ab84b9 3164 return $want_commit ? (0, undef) : 0;
060610c5
EW
3165 }
3166
66ab84b9 3167 sysseek($fh, -24, SEEK_END) or croak "seek: $!";
060610c5 3168 sysread($fh, my $buf, 24) == 24 or croak "read: $!";
060610c5 3169 my ($r, $c) = unpack(rev_map_fmt, $buf);
66ab84b9
EW
3170 if ($want_commit && $c eq ('0' x40)) {
3171 if ($size < 48) {
3172 return $want_commit ? (0, undef) : 0;
3173 }
3174 sysseek($fh, -48, SEEK_END) or croak "seek: $!";
3175 sysread($fh, $buf, 24) == 24 or croak "read: $!";
3176 ($r, $c) = unpack(rev_map_fmt, $buf);
3177 if ($c eq ('0'x40)) {
3178 croak "Penultimate record is all-zeroes in $map_path";
3179 }
3180 }
3181 close $fh or croak "close: $!";
3182 $want_commit ? ($r, $c) : $r;
9c93fee5
EW
3183}
3184
060610c5 3185sub rev_map_get {
26a62d57 3186 my ($self, $rev, $uuid) = @_;
060610c5
EW
3187 my $map_path = $self->map_path($uuid);
3188 return undef unless -e $map_path;
3189
3190 sysopen(my $fh, $map_path, O_RDONLY) or croak "open: $!";
195643f2
BJ
3191 my $c = _rev_map_get($fh, $rev);
3192 close($fh) or croak "close: $!";
3193 $c
3194}
3195
3196sub _rev_map_get {
3197 my ($fh, $rev) = @_;
3198
4f7ec797 3199 binmode $fh or croak "binmode: $!";
060610c5
EW
3200 my $size = (stat($fh))[7];
3201 ($size % 24) == 0 or croak "inconsistent size: $size";
3202
3203 if ($size == 0) {
060610c5
EW
3204 return undef;
3205 }
3206
3207 my ($l, $u) = (0, $size - 24);
3208 my ($r, $c, $buf);
3209
3210 while ($l <= $u) {
3211 my $i = int(($l/24 + $u/24) / 2) * 24;
3212 sysseek($fh, $i, SEEK_SET) or croak "seek: $!";
3213 sysread($fh, my $buf, 24) == 24 or croak "read: $!";
3214 my ($r, $c) = unpack('NH40', $buf);
3215
3216 if ($r < $rev) {
3217 $l = $i + 24;
3218 } elsif ($r > $rev) {
3219 $u = $i - 24;
3220 } else { # $r == $rev
66ab84b9 3221 return $c eq ('0' x 40) ? undef : $c;
060610c5 3222 }
9b981fc6 3223 }
060610c5 3224 undef;
9b981fc6
EW
3225}
3226
111947ef
DK
3227# Finds the first svn revision that exists on (if $eq_ok is true) or
3228# before $rev for the current branch. It will not search any lower
3229# than $min_rev. Returns the git commit hash and svn revision number
3230# if found, else (undef, undef).
15710b6f 3231sub find_rev_before {
111947ef 3232 my ($self, $rev, $eq_ok, $min_rev) = @_;
15710b6f 3233 --$rev unless $eq_ok;
111947ef 3234 $min_rev ||= 1;
ca5e880e
BJ
3235 my $max_rev = $self->rev_map_max;
3236 $rev = $max_rev if ($rev > $max_rev);
111947ef 3237 while ($rev >= $min_rev) {
060610c5 3238 if (my $c = $self->rev_map_get($rev)) {
15710b6f
EW
3239 return ($rev, $c);
3240 }
3241 --$rev;
3242 }
3243 return (undef, undef);
3244}
3245
111947ef
DK
3246# Finds the first svn revision that exists on (if $eq_ok is true) or
3247# after $rev for the current branch. It will not search any higher
3248# than $max_rev. Returns the git commit hash and svn revision number
3249# if found, else (undef, undef).
3250sub find_rev_after {
3251 my ($self, $rev, $eq_ok, $max_rev) = @_;
3252 ++$rev unless $eq_ok;
060610c5 3253 $max_rev ||= $self->rev_map_max;
111947ef 3254 while ($rev <= $max_rev) {
060610c5 3255 if (my $c = $self->rev_map_get($rev)) {
111947ef
DK
3256 return ($rev, $c);
3257 }
3258 ++$rev;
3259 }
3260 return (undef, undef);
3261}
3262
9b981fc6 3263sub _new {
706587fc
EW
3264 my ($class, $repo_id, $ref_id, $path) = @_;
3265 unless (defined $repo_id && length $repo_id) {
3266 $repo_id = $Git::SVN::default_repo_id;
3267 }
3268 unless (defined $ref_id && length $ref_id) {
8b8fc068 3269 $_[2] = $ref_id = $Git::SVN::default_ref_id;
706587fc 3270 }
7829f20f 3271 $_[1] = $repo_id;
706587fc
EW
3272 my $dir = "$ENV{GIT_DIR}/svn/$ref_id";
3273 $_[3] = $path = '' unless (defined $path);
b4d57e5e 3274 mkpath(["$ENV{GIT_DIR}/svn"]);
26a62d57
EW
3275 bless {
3276 ref_id => $ref_id, dir => $dir, index => "$dir/index",
8a49ee97 3277 path => $path, config => "$ENV{GIT_DIR}/svn/config",
060610c5 3278 map_root => "$dir/.rev_map", repo_id => $repo_id }, $class;
26a62d57
EW
3279}
3280
060610c5
EW
3281# for read-only access of old .rev_db formats
3282sub unlink_rev_db_symlink {
3283 my ($self) = @_;
3284 my $link = $self->rev_db_path;
3285 $link =~ s/\.[\w-]+$// or croak "missing UUID at the end of $link";
3286 if (-l $link) {
3287 unlink $link or croak "unlink: $link failed!";
3288 }
3289}
3290
3291sub rev_db_path {
3292 my ($self, $uuid) = @_;
3293 my $db_path = $self->map_path($uuid);
3294 $db_path =~ s{/\.rev_map\.}{/\.rev_db\.}
3295 or croak "map_path: $db_path does not contain '/.rev_map.' !";
3296 $db_path;
3297}
3298
3299# the new replacement for .rev_db
3300sub map_path {
26a62d57
EW
3301 my ($self, $uuid) = @_;
3302 $uuid ||= $self->ra_uuid;
060610c5 3303 "$self->{map_root}.$uuid";
9b981fc6
EW
3304}
3305
1c8443b0
EW
3306sub uri_encode {
3307 my ($f) = @_;
3308 $f =~ s#([^a-zA-Z0-9\*!\:_\./\-])#uc sprintf("%%%02x",ord($1))#eg;
3309 $f
3310}
9b981fc6 3311
18ea92bd
SV
3312sub remove_username {
3313 $_[0] =~ s{^([^:]*://)[^@]+@}{$1};
3314}
3315
d976acfd
EW
3316package Git::SVN::Prompt;
3317use strict;
3318use warnings;
3319require SVN::Core;
3320use vars qw/$_no_auth_cache $_username/;
3321
3322sub simple {
30d055aa
EW
3323 my ($cred, $realm, $default_username, $may_save, $pool) = @_;
3324 $may_save = undef if $_no_auth_cache;
3325 $default_username = $_username if defined $_username;
3326 if (defined $default_username && length $default_username) {
3327 if (defined $realm && length $realm) {
6f729591
EW
3328 print STDERR "Authentication realm: $realm\n";
3329 STDERR->flush;
30d055aa
EW
3330 }
3331 $cred->username($default_username);
3332 } else {
d976acfd 3333 username($cred, $realm, $may_save, $pool);
30d055aa
EW
3334 }
3335 $cred->password(_read_password("Password for '" .
3336 $cred->username . "': ", $realm));
3337 $cred->may_save($may_save);
3338 $SVN::_Core::SVN_NO_ERROR;
3339}
3340
d976acfd 3341sub ssl_server_trust {
30d055aa
EW
3342 my ($cred, $realm, $failures, $cert_info, $may_save, $pool) = @_;
3343 $may_save = undef if $_no_auth_cache;
6f729591 3344 print STDERR "Error validating server certificate for '$realm':\n";
fd499bcc
ER
3345 {
3346 no warnings 'once';
3347 # All variables SVN::Auth::SSL::* are used only once,
3348 # so we're shutting up Perl warnings about this.
3349 if ($failures & $SVN::Auth::SSL::UNKNOWNCA) {
3350 print STDERR " - The certificate is not issued ",
3351 "by a trusted authority. Use the\n",
3352 " fingerprint to validate ",
3353 "the certificate manually!\n";
3354 }
3355 if ($failures & $SVN::Auth::SSL::CNMISMATCH) {
3356 print STDERR " - The certificate hostname ",
3357 "does not match.\n";
3358 }
3359 if ($failures & $SVN::Auth::SSL::NOTYETVALID) {
3360 print STDERR " - The certificate is not yet valid.\n";
3361 }
3362 if ($failures & $SVN::Auth::SSL::EXPIRED) {
3363 print STDERR " - The certificate has expired.\n";
3364 }
3365 if ($failures & $SVN::Auth::SSL::OTHER) {
3366 print STDERR " - The certificate has ",
3367 "an unknown error.\n";
3368 }
3369 } # no warnings 'once'
6f729591
EW
3370 printf STDERR
3371 "Certificate information:\n".
30d055aa
EW
3372 " - Hostname: %s\n".
3373 " - Valid: from %s until %s\n".
3374 " - Issuer: %s\n".
3375 " - Fingerprint: %s\n",
3376 map $cert_info->$_, qw(hostname valid_from valid_until
6f729591 3377 issuer_dname fingerprint);
30d055aa
EW
3378 my $choice;
3379prompt:
6f729591 3380 print STDERR $may_save ?
30d055aa
EW
3381 "(R)eject, accept (t)emporarily or accept (p)ermanently? " :
3382 "(R)eject or accept (t)emporarily? ";
6f729591 3383 STDERR->flush;
30d055aa
EW
3384 $choice = lc(substr(<STDIN> || 'R', 0, 1));
3385 if ($choice =~ /^t$/i) {
3386 $cred->may_save(undef);
3387 } elsif ($choice =~ /^r$/i) {
3388 return -1;
3389 } elsif ($may_save && $choice =~ /^p$/i) {
3390 $cred->may_save($may_save);
3391 } else {
3392 goto prompt;
3393 }
3394 $cred->accepted_failures($failures);
3395 $SVN::_Core::SVN_NO_ERROR;
3396}
3397
d976acfd 3398sub ssl_client_cert {
30d055aa
EW
3399 my ($cred, $realm, $may_save, $pool) = @_;
3400 $may_save = undef if $_no_auth_cache;
6f729591
EW
3401 print STDERR "Client certificate filename: ";
3402 STDERR->flush;
30d055aa
EW
3403 chomp(my $filename = <STDIN>);
3404 $cred->cert_file($filename);
3405 $cred->may_save($may_save);
3406 $SVN::_Core::SVN_NO_ERROR;
3407}
3408
d976acfd 3409sub ssl_client_cert_pw {
30d055aa
EW
3410 my ($cred, $realm, $may_save, $pool) = @_;
3411 $may_save = undef if $_no_auth_cache;
3412 $cred->password(_read_password("Password: ", $realm));
3413 $cred->may_save($may_save);
3414 $SVN::_Core::SVN_NO_ERROR;
3415}
3416
d976acfd 3417sub username {
30d055aa
EW
3418 my ($cred, $realm, $may_save, $pool) = @_;
3419 $may_save = undef if $_no_auth_cache;
3420 if (defined $realm && length $realm) {
6f729591 3421 print STDERR "Authentication realm: $realm\n";
30d055aa
EW
3422 }
3423 my $username;
3424 if (defined $_username) {
3425 $username = $_username;
3426 } else {
6f729591
EW
3427 print STDERR "Username: ";
3428 STDERR->flush;
30d055aa
EW
3429 chomp($username = <STDIN>);
3430 }
3431 $cred->username($username);
3432 $cred->may_save($may_save);
3433 $SVN::_Core::SVN_NO_ERROR;
3434}
3435
3436sub _read_password {
3437 my ($prompt, $realm) = @_;
6f729591
EW
3438 print STDERR $prompt;
3439 STDERR->flush;
30d055aa
EW
3440 require Term::ReadKey;
3441 Term::ReadKey::ReadMode('noecho');
3442 my $password = '';
3443 while (defined(my $key = Term::ReadKey::ReadKey(0))) {
3444 last if $key =~ /[\012\015]/; # \n\r
3445 $password .= $key;
3446 }
3447 Term::ReadKey::ReadMode('restore');
6f729591
EW
3448 print STDERR "\n";
3449 STDERR->flush;
30d055aa
EW
3450 $password;
3451}
3452
27a1a801
EW
3453package SVN::Git::Fetcher;
3454use vars qw/@ISA/;
3455use strict;
3456use warnings;
3457use Carp qw/croak/;
ffe256f9 3458use File::Temp qw/tempfile/;
27a1a801 3459use IO::File qw//;
edc662f9 3460use vars qw/$_ignore_regex/;
27a1a801
EW
3461
3462# file baton members: path, mode_a, mode_b, pool, fh, blob, base
3463sub new {
8841b37f 3464 my ($class, $git_svn, $switch_path) = @_;
27a1a801
EW
3465 my $self = SVN::Delta::Editor->new;
3466 bless $self, $class;
dbc6c74d
EW
3467 if (exists $git_svn->{last_commit}) {
3468 $self->{c} = $git_svn->{last_commit};
8841b37f
EW
3469 $self->{empty_symlinks} =
3470 _mark_empty_symlinks($git_svn, $switch_path);
dbc6c74d 3471 }
0d8bee71
BJ
3472 $self->{ignore_regex} = eval { command_oneline('config', '--get',
3473 "svn-remote.$git_svn->{repo_id}.ignore-paths") };
d2a9a87b
EW
3474 $self->{empty} = {};
3475 $self->{dir_prop} = {};
3476 $self->{file_prop} = {};
3477 $self->{absent_dir} = {};
3478 $self->{absent_file} = {};
ef3cfaad 3479 $self->{gii} = $git_svn->tmp_index_do(sub { Git::IndexInfo->new });
27a1a801
EW
3480 $self;
3481}
3482
dbc6c74d
EW
3483# this uses the Ra object, so it must be called before do_{switch,update},
3484# not inside them (when the Git::SVN::Fetcher object is passed) to
3485# do_{switch,update}
3486sub _mark_empty_symlinks {
8841b37f 3487 my ($git_svn, $switch_path) = @_;
4c58a711 3488 my $bool = Git::config_bool('svn.brokenSymlinkWorkaround');
48679e5c 3489 return {} if (!defined($bool)) || (defined($bool) && ! $bool);
4c58a711 3490
dbc6c74d
EW
3491 my %ret;
3492 my ($rev, $cmt) = $git_svn->last_rev_commit;
3493 return {} unless ($rev && $c