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