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