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