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