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