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