shortlog: fix segfault on empty authorname
[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
1ca72aef 7 $SVN_URL $SVN_INFO $SVN_WC $SVN_UUID
3397f9df 8 $GIT_SVN_INDEX $GIT_SVN
42d32870 9 $GIT_DIR $GIT_SVN_DIR $REVDB/;
3397f9df 10$AUTHOR = 'Eric Wong <normalperson@yhbt.net>';
60d02ccc 11$VERSION = '@@GIT_VERSION@@';
13ccd6d4
EW
12
13use Cwd qw/abs_path/;
14$GIT_DIR = abs_path($ENV{GIT_DIR} || '.git');
15$ENV{GIT_DIR} = $GIT_DIR;
16
ce475dfc 17my $LC_ALL = $ENV{LC_ALL};
79bb8d88 18my $TZ = $ENV{TZ};
3397f9df
EW
19# make sure the svn binary gives consistent output between locales and TZs:
20$ENV{TZ} = 'UTC';
21$ENV{LC_ALL} = 'C';
a00439ac 22$| = 1; # unbuffer STDOUT
3397f9df 23
d25c26e7 24sub fatal (@) { print STDERR $@; exit 1 }
3397f9df
EW
25# If SVN:: library support is added, please make the dependencies
26# optional and preserve the capability to use the command-line client.
ce6f3519 27# use eval { require SVN::... } to make it lazy load
eeb0abe0 28# We don't use any modules not in the standard Perl distribution:
3397f9df
EW
29use Carp qw/croak/;
30use IO::File qw//;
31use File::Basename qw/dirname basename/;
32use File::Path qw/mkpath/;
79bb8d88 33use Getopt::Long qw/:config gnu_getopt no_ignore_case auto_abbrev pass_through/;
3397f9df 34use File::Spec qw//;
17a10f37 35use File::Copy qw/copy/;
e17512f3 36use POSIX qw/strftime/;
968bdf1f 37use IPC::Open3;
42d32870
EW
38use Memoize;
39memoize('revisions_eq');
c1927a85
EW
40memoize('cmt_metadata');
41memoize('get_commit_time');
a5e0cedc 42
747fa12c 43my ($SVN, $_use_lib);
83e9940a
EW
44
45sub nag_lib {
46 print STDERR <<EOF;
47! Please consider installing the SVN Perl libraries (version 1.1.0 or
48! newer). You will generally get better performance and fewer bugs,
49! especially if you:
50! 1) have a case-insensitive filesystem
51! 2) replace symlinks with files (and vice-versa) in commits
52
53EOF
54}
55
a5e0cedc
EW
56$_use_lib = 1 unless $ENV{GIT_SVN_NO_LIB};
57libsvn_load();
83e9940a
EW
58nag_lib() unless $_use_lib;
59
42d32870 60my $_optimize_commits = 1 unless $ENV{GIT_SVN_NO_OPTIMIZE_COMMITS};
3397f9df 61my $sha1 = qr/[a-f\d]{40}/;
ac8e0b91 62my $sha1_short = qr/[a-f\d]{4,40}/;
9aca0258 63my $_esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/;
72942938 64my ($_revision,$_stdin,$_no_ignore_ext,$_no_stop_copy,$_help,$_rmdir,$_edit,
1a82e793 65 $_find_copies_harder, $_l, $_cp_similarity, $_cp_remote,
80f50749 66 $_repack, $_repack_nr, $_repack_flags, $_q,
a00439ac 67 $_message, $_file, $_follow_parent, $_no_metadata,
9d55b41a 68 $_template, $_shared, $_no_default_regex, $_no_graft_copy,
79bb8d88 69 $_limit, $_verbose, $_incremental, $_oneline, $_l_fmt, $_show_commit,
b22d4497 70 $_version, $_upgrade, $_authors, $_branch_all_refs, @_opt_m,
30d055aa 71 $_merge, $_strategy, $_dry_run, $_ignore_nodate, $_non_recursive,
9aca0258
EW
72 $_username, $_config_dir, $_no_auth_cache, $_xfer_delta,
73 $_pager, $_color);
42d32870 74my (@_branch_from, %tree_map, %users, %rusers, %equiv);
a552db3a 75my ($_svn_co_url_revs, $_svn_pg_peg_revs, $_svn_can_do_switch);
883d0a78 76my @repo_path_split_cache;
3397f9df 77
eeb0abe0 78my %fc_opts = ( 'no-ignore-externals' => \$_no_ignore_ext,
69f0d91e 79 'branch|b=s' => \@_branch_from,
a00439ac 80 'follow-parent|follow' => \$_follow_parent,
bf78b1d8 81 'branch-all-refs|B' => \$_branch_all_refs,
dc5869c0
EW
82 'authors-file|A=s' => \$_authors,
83 'repack:i' => \$_repack,
a00439ac 84 'no-metadata' => \$_no_metadata,
80f50749 85 'quiet|q' => \$_q,
30d055aa
EW
86 'username=s' => \$_username,
87 'config-dir=s' => \$_config_dir,
88 'no-auth-cache' => \$_no_auth_cache,
f7bae37f 89 'ignore-nodate' => \$_ignore_nodate,
dc5869c0 90 'repack-flags|repack-args|repack-opts=s' => \$_repack_flags);
36f5b1f0 91
9d55b41a
EW
92my ($_trunk, $_tags, $_branches);
93my %multi_opts = ( 'trunk|T=s' => \$_trunk,
94 'tags|t=s' => \$_tags,
95 'branches|b=s' => \$_branches );
96my %init_opts = ( 'template=s' => \$_template, 'shared' => \$_shared );
27e9fb8d
EW
97my %cmt_opts = ( 'edit|e' => \$_edit,
98 'rmdir' => \$_rmdir,
99 'find-copies-harder' => \$_find_copies_harder,
100 'l=i' => \$_l,
101 'copy-similarity|C=i'=> \$_cp_similarity
102);
9d55b41a 103
3397f9df 104my %cmd = (
eeb0abe0
EW
105 fetch => [ \&fetch, "Download new revisions from SVN",
106 { 'revision|r=s' => \$_revision, %fc_opts } ],
81c5a0e6 107 init => [ \&init, "Initialize a repo for tracking" .
f8ab6b73 108 " (requires URL argument)",
9d55b41a 109 \%init_opts ],
eeb0abe0 110 commit => [ \&commit, "Commit git revisions to SVN",
27e9fb8d 111 { 'stdin|' => \$_stdin, %cmt_opts, %fc_opts, } ],
a5e0cedc
EW
112 'show-ignore' => [ \&show_ignore, "Show svn:ignore listings",
113 { 'revision|r=i' => \$_revision } ],
eeb0abe0
EW
114 rebuild => [ \&rebuild, "Rebuild git-svn metadata (after git clone)",
115 { 'no-ignore-externals' => \$_no_ignore_ext,
1a82e793 116 'copy-remote|remote=s' => \$_cp_remote,
eeb0abe0 117 'upgrade' => \$_upgrade } ],
9d55b41a
EW
118 'graft-branches' => [ \&graft_branches,
119 'Detect merges/branches from already imported history',
120 { 'merge-rx|m' => \@_opt_m,
c1927a85
EW
121 'branch|b=s' => \@_branch_from,
122 'branch-all-refs|B' => \$_branch_all_refs,
9d55b41a
EW
123 'no-default-regex' => \$_no_default_regex,
124 'no-graft-copy' => \$_no_graft_copy } ],
125 'multi-init' => [ \&multi_init,
126 'Initialize multiple trees (like git-svnimport)',
1ca7558d
EW
127 { %multi_opts, %init_opts,
128 'revision|r=i' => \$_revision,
129 'username=s' => \$_username,
130 'config-dir=s' => \$_config_dir,
131 'no-auth-cache' => \$_no_auth_cache,
132 } ],
9d55b41a
EW
133 'multi-fetch' => [ \&multi_fetch,
134 'Fetch multiple trees (like git-svnimport)',
135 \%fc_opts ],
79bb8d88
EW
136 'log' => [ \&show_log, 'Show commit logs',
137 { 'limit=i' => \$_limit,
138 'revision|r=s' => \$_revision,
139 'verbose|v' => \$_verbose,
140 'incremental' => \$_incremental,
141 'oneline' => \$_oneline,
142 'show-commit' => \$_show_commit,
74a31a10 143 'non-recursive' => \$_non_recursive,
79bb8d88 144 'authors-file|A=s' => \$_authors,
9aca0258
EW
145 'color' => \$_color,
146 'pager=s' => \$_pager,
79bb8d88 147 } ],
27e9fb8d
EW
148 'commit-diff' => [ \&commit_diff, 'Commit a diff between two trees',
149 { 'message|m=s' => \$_message,
150 'file|F=s' => \$_file,
45bf473a 151 'revision|r=s' => \$_revision,
27e9fb8d 152 %cmt_opts } ],
b22d4497
EW
153 dcommit => [ \&dcommit, 'Commit several diffs to merge with upstream',
154 { 'merge|m|M' => \$_merge,
155 'strategy|s=s' => \$_strategy,
156 'dry-run|n' => \$_dry_run,
157 %cmt_opts } ],
3397f9df 158);
9d55b41a 159
3397f9df
EW
160my $cmd;
161for (my $i = 0; $i < @ARGV; $i++) {
162 if (defined $cmd{$ARGV[$i]}) {
163 $cmd = $ARGV[$i];
164 splice @ARGV, $i, 1;
165 last;
166 }
167};
168
448c81b4 169my %opts = %{$cmd{$cmd}->[2]} if (defined $cmd);
a9612be2 170
b8c92cad 171read_repo_config(\%opts);
79bb8d88
EW
172my $rv = GetOptions(%opts, 'help|H|h' => \$_help,
173 'version|V' => \$_version,
174 'id|i=s' => \$GIT_SVN);
175exit 1 if (!$rv && $cmd ne 'log');
6f0783cf 176
dc5869c0 177set_default_vals();
3397f9df 178usage(0) if $_help;
551ce28f 179version() if $_version;
eeb0abe0 180usage(1) unless defined $cmd;
b8c92cad 181init_vars();
eeb0abe0 182load_authors() if $_authors;
bf78b1d8 183load_all_refs() if $_branch_all_refs;
dc62e25c 184svn_compat_check() unless $_use_lib;
7b520e62 185migration_check() unless $cmd =~ /^(?:init|rebuild|multi-init|commit-diff)$/;
3397f9df
EW
186$cmd{$cmd}->[0]->(@ARGV);
187exit 0;
188
189####################### primary functions ######################
190sub usage {
191 my $exit = shift || 0;
192 my $fd = $exit ? \*STDERR : \*STDOUT;
193 print $fd <<"";
194git-svn - bidirectional operations between a single Subversion tree and git
195Usage: $0 <command> [options] [arguments]\n
448c81b4
EW
196
197 print $fd "Available commands:\n" unless $cmd;
3397f9df
EW
198
199 foreach (sort keys %cmd) {
448c81b4 200 next if $cmd && $cmd ne $_;
b203b769 201 print $fd ' ',pack('A17',$_),$cmd{$_}->[1],"\n";
448c81b4
EW
202 foreach (keys %{$cmd{$_}->[2]}) {
203 # prints out arguments as they should be passed:
b8c92cad 204 my $x = s#[:=]s$## ? '<arg>' : s#[:=]i$## ? '<num>' : '';
b203b769 205 print $fd ' ' x 21, join(', ', map { length $_ > 1 ?
448c81b4
EW
206 "--$_" : "-$_" }
207 split /\|/,$_)," $x\n";
208 }
3397f9df
EW
209 }
210 print $fd <<"";
448c81b4
EW
211\nGIT_SVN_ID may be set in the environment or via the --id/-i switch to an
212arbitrary identifier if you're tracking multiple SVN branches/repositories in
213one git repository and want to keep them separate. See git-svn(1) for more
214information.
3397f9df
EW
215
216 exit $exit;
217}
218
551ce28f
EW
219sub version {
220 print "git-svn version $VERSION\n";
221 exit 0;
222}
223
3397f9df 224sub rebuild {
1a82e793
EW
225 if (quiet_run(qw/git-rev-parse --verify/,"refs/remotes/$GIT_SVN^0")) {
226 copy_remote_ref();
227 }
3397f9df 228 $SVN_URL = shift or undef;
3397f9df 229 my $newest_rev = 0;
2beb3cdd
EW
230 if ($_upgrade) {
231 sys('git-update-ref',"refs/remotes/$GIT_SVN","$GIT_SVN-HEAD");
232 } else {
233 check_upgrade_needed();
234 }
3397f9df
EW
235
236 my $pid = open(my $rev_list,'-|');
237 defined $pid or croak $!;
238 if ($pid == 0) {
2beb3cdd 239 exec("git-rev-list","refs/remotes/$GIT_SVN") or croak $!;
3397f9df 240 }
2beb3cdd 241 my $latest;
3397f9df
EW
242 while (<$rev_list>) {
243 chomp;
244 my $c = $_;
245 croak "Non-SHA1: $c\n" unless $c =~ /^$sha1$/o;
246 my @commit = grep(/^git-svn-id: /,`git-cat-file commit $c`);
247 next if (!@commit); # skip merges
79bb8d88 248 my ($url, $rev, $uuid) = extract_metadata($commit[$#commit]);
e70dc780 249 if (!defined $rev || !$uuid) {
79bb8d88
EW
250 croak "Unable to extract revision or UUID from ",
251 "$c, $commit[$#commit]\n";
3397f9df 252 }
2beb3cdd
EW
253
254 # if we merged or otherwise started elsewhere, this is
255 # how we break out of it
1ca72aef 256 next if (defined $SVN_UUID && ($uuid ne $SVN_UUID));
779b1446 257 next if (defined $SVN_URL && defined $url && ($url ne $SVN_URL));
2beb3cdd 258
2beb3cdd 259 unless (defined $latest) {
3397f9df
EW
260 if (!$SVN_URL && !$url) {
261 croak "SVN repository location required: $url\n";
262 }
263 $SVN_URL ||= $url;
1d52aba8
EW
264 $SVN_UUID ||= $uuid;
265 setup_git_svn();
2beb3cdd 266 $latest = $rev;
3397f9df 267 }
42d32870
EW
268 revdb_set($REVDB, $rev, $c);
269 print "r$rev = $c\n";
3397f9df
EW
270 $newest_rev = $rev if ($rev > $newest_rev);
271 }
272 close $rev_list or croak $?;
a5e0cedc
EW
273
274 goto out if $_use_lib;
3397f9df 275 if (!chdir $SVN_WC) {
1d52aba8 276 svn_cmd_checkout($SVN_URL, $latest, $SVN_WC);
3397f9df
EW
277 chdir $SVN_WC or croak $!;
278 }
279
280 $pid = fork;
281 defined $pid or croak $!;
282 if ($pid == 0) {
283 my @svn_up = qw(svn up);
284 push @svn_up, '--ignore-externals' unless $_no_ignore_ext;
285 sys(@svn_up,"-r$newest_rev");
286 $ENV{GIT_INDEX_FILE} = $GIT_SVN_INDEX;
36f5b1f0 287 index_changes();
b8c92cad 288 exec('git-write-tree') or croak $!;
3397f9df
EW
289 }
290 waitpid $pid, 0;
b8c92cad 291 croak $? if $?;
a5e0cedc 292out:
2beb3cdd
EW
293 if ($_upgrade) {
294 print STDERR <<"";
295Keeping deprecated refs/head/$GIT_SVN-HEAD for now. Please remove it
296when you have upgraded your tools and habits to use refs/remotes/$GIT_SVN
297
298 }
3397f9df
EW
299}
300
301sub init {
03e0ea87 302 my $url = shift or die "SVN repository location required " .
81c5a0e6 303 "as a command-line argument\n";
03e0ea87
EW
304 $url =~ s!/+$!!; # strip trailing slash
305
306 if (my $repo_path = shift) {
307 unless (-d $repo_path) {
308 mkpath([$repo_path]);
309 }
310 $GIT_DIR = $ENV{GIT_DIR} = $repo_path . "/.git";
311 init_vars();
312 }
313
314 $SVN_URL = $url;
3397f9df 315 unless (-d $GIT_DIR) {
f8ab6b73
EW
316 my @init_db = ('git-init-db');
317 push @init_db, "--template=$_template" if defined $_template;
318 push @init_db, "--shared" if defined $_shared;
319 sys(@init_db);
3397f9df
EW
320 }
321 setup_git_svn();
322}
323
324sub fetch {
2beb3cdd 325 check_upgrade_needed();
883d0a78 326 $SVN_URL ||= file_to_s("$GIT_SVN_DIR/info/url");
a5e0cedc
EW
327 my $ret = $_use_lib ? fetch_lib(@_) : fetch_cmd(@_);
328 if ($ret->{commit} && quiet_run(qw(git-rev-parse --verify
329 refs/heads/master^0))) {
330 sys(qw(git-update-ref refs/heads/master),$ret->{commit});
331 }
332 return $ret;
333}
334
335sub fetch_cmd {
336 my (@parents) = @_;
3397f9df 337 my @log_args = -d $SVN_WC ? ($SVN_WC) : ($SVN_URL);
defc6492
EW
338 unless ($_revision) {
339 $_revision = -d $SVN_WC ? 'BASE:HEAD' : '0:HEAD';
3397f9df 340 }
defc6492 341 push @log_args, "-r$_revision";
3397f9df
EW
342 push @log_args, '--stop-on-copy' unless $_no_stop_copy;
343
ce6f3519 344 my $svn_log = svn_log_raw(@log_args);
3397f9df 345
03823184 346 my $base = next_log_entry($svn_log) or croak "No base revision!\n";
42d32870
EW
347 # don't need last_revision from grab_base_rev() because
348 # user could've specified a different revision to skip (they
349 # didn't want to import certain revisions into git for whatever
350 # reason, so trust $base->{revision} instead.
351 my (undef, $last_commit) = svn_grab_base_rev();
3397f9df 352 unless (-d $SVN_WC) {
1d52aba8 353 svn_cmd_checkout($SVN_URL,$base->{revision},$SVN_WC);
3397f9df 354 chdir $SVN_WC or croak $!;
1d52aba8 355 read_uuid();
3397f9df 356 $last_commit = git_commit($base, @parents);
36f5b1f0 357 assert_tree($last_commit);
3397f9df
EW
358 } else {
359 chdir $SVN_WC or croak $!;
1d52aba8 360 read_uuid();
6dfbe516
EW
361 # looks like a user manually cp'd and svn switch'ed
362 unless ($last_commit) {
363 sys(qw/svn revert -R ./);
364 assert_svn_wc_clean($base->{revision});
365 $last_commit = git_commit($base, @parents);
366 assert_tree($last_commit);
367 }
3397f9df
EW
368 }
369 my @svn_up = qw(svn up);
370 push @svn_up, '--ignore-externals' unless $_no_ignore_ext;
03823184
EW
371 my $last = $base;
372 while (my $log_msg = next_log_entry($svn_log)) {
03823184
EW
373 if ($last->{revision} >= $log_msg->{revision}) {
374 croak "Out of order: last >= current: ",
375 "$last->{revision} >= $log_msg->{revision}\n";
376 }
36f5b1f0
EW
377 # Revert is needed for cases like:
378 # https://svn.musicpd.org/Jamming/trunk (r166:167), but
379 # I can't seem to reproduce something like that on a test...
380 sys(qw/svn revert -R ./);
381 assert_svn_wc_clean($last->{revision});
03823184 382 sys(@svn_up,"-r$log_msg->{revision}");
3397f9df 383 $last_commit = git_commit($log_msg, $last_commit, @parents);
03823184 384 $last = $log_msg;
3397f9df 385 }
b8c92cad 386 close $svn_log->{fh};
a5e0cedc 387 $last->{commit} = $last_commit;
03823184 388 return $last;
3397f9df
EW
389}
390
a5e0cedc
EW
391sub fetch_lib {
392 my (@parents) = @_;
393 $SVN_URL ||= file_to_s("$GIT_SVN_DIR/info/url");
747fa12c 394 $SVN ||= libsvn_connect($SVN_URL);
a5e0cedc
EW
395 my ($last_rev, $last_commit) = svn_grab_base_rev();
396 my ($base, $head) = libsvn_parse_revision($last_rev);
397 if ($base > $head) {
398 return { revision => $last_rev, commit => $last_commit }
399 }
400 my $index = set_index($GIT_SVN_INDEX);
401
402 # limit ourselves and also fork() since get_log won't release memory
403 # after processing a revision and SVN stuff seems to leak
404 my $inc = 1000;
405 my ($min, $max) = ($base, $head < $base+$inc ? $head : $base+$inc);
406 read_uuid();
407 if (defined $last_commit) {
408 unless (-e $GIT_SVN_INDEX) {
409 sys(qw/git-read-tree/, $last_commit);
410 }
411 chomp (my $x = `git-write-tree`);
412 my ($y) = (`git-cat-file commit $last_commit`
413 =~ /^tree ($sha1)/m);
414 if ($y ne $x) {
415 unlink $GIT_SVN_INDEX or croak $!;
416 sys(qw/git-read-tree/, $last_commit);
417 }
418 chomp ($x = `git-write-tree`);
419 if ($y ne $x) {
420 print STDERR "trees ($last_commit) $y != $x\n",
421 "Something is seriously wrong...\n";
422 }
423 }
424 while (1) {
425 # fork, because using SVN::Pool with get_log() still doesn't
426 # seem to help enough to keep memory usage down.
427 defined(my $pid = fork) or croak $!;
428 if (!$pid) {
429 $SVN::Error::handler = \&libsvn_skip_unknown_revs;
a5e0cedc
EW
430
431 # Yes I'm perfectly aware that the fourth argument
432 # below is the limit revisions number. Unfortunately
433 # performance sucks with it enabled, so it's much
434 # faster to fetch revision ranges instead of relying
435 # on the limiter.
747fa12c 436 libsvn_get_log(libsvn_dup_ra($SVN), [''],
dc62e25c 437 $min, $max, 0, 1, 1,
a5e0cedc
EW
438 sub {
439 my $log_msg;
440 if ($last_commit) {
441 $log_msg = libsvn_fetch(
442 $last_commit, @_);
443 $last_commit = git_commit(
444 $log_msg,
445 $last_commit,
446 @parents);
447 } else {
448 $log_msg = libsvn_new_tree(@_);
449 $last_commit = git_commit(
450 $log_msg, @parents);
451 }
452 });
a5e0cedc
EW
453 exit 0;
454 }
455 waitpid $pid, 0;
456 croak $? if $?;
457 ($last_rev, $last_commit) = svn_grab_base_rev();
458 last if ($max >= $head);
459 $min = $max + 1;
460 $max += $inc;
461 $max = $head if ($max > $head);
ebdf7b95 462 $SVN = libsvn_connect($SVN_URL);
a5e0cedc
EW
463 }
464 restore_index($index);
465 return { revision => $last_rev, commit => $last_commit };
466}
467
3397f9df
EW
468sub commit {
469 my (@commits) = @_;
2beb3cdd 470 check_upgrade_needed();
3397f9df
EW
471 if ($_stdin || !@commits) {
472 print "Reading from stdin...\n";
473 @commits = ();
474 while (<STDIN>) {
1ca72aef 475 if (/\b($sha1_short)\b/o) {
3397f9df
EW
476 unshift @commits, $1;
477 }
478 }
479 }
480 my @revs;
8de010ad
EW
481 foreach my $c (@commits) {
482 chomp(my @tmp = safe_qx('git-rev-parse',$c));
483 if (scalar @tmp == 1) {
484 push @revs, $tmp[0];
485 } elsif (scalar @tmp > 1) {
486 push @revs, reverse (safe_qx('git-rev-list',@tmp));
487 } else {
488 die "Failed to rev-parse $c\n";
489 }
3397f9df
EW
490 }
491 chomp @revs;
a5e0cedc
EW
492 $_use_lib ? commit_lib(@revs) : commit_cmd(@revs);
493 print "Done committing ",scalar @revs," revisions to SVN\n";
494}
495
496sub commit_cmd {
497 my (@revs) = @_;
3397f9df 498
b63af9b3 499 chdir $SVN_WC or croak "Unable to chdir $SVN_WC: $!\n";
1d52aba8 500 my $info = svn_info('.');
b63af9b3
EW
501 my $fetched = fetch();
502 if ($info->{Revision} != $fetched->{revision}) {
503 print STDERR "There are new revisions that were fetched ",
504 "and need to be merged (or acknowledged) ",
505 "before committing.\n";
506 exit 1;
507 }
508 $info = svn_info('.');
1d52aba8 509 read_uuid($info);
42d32870 510 my $last = $fetched;
3397f9df 511 foreach my $c (@revs) {
42d32870 512 my $mods = svn_checkout_tree($last, $c);
cf52b8f0
EW
513 if (scalar @$mods == 0) {
514 print "Skipping, no changes detected\n";
515 next;
516 }
42d32870 517 $last = svn_commit_tree($last, $c);
3397f9df 518 }
3397f9df
EW
519}
520
a5e0cedc
EW
521sub commit_lib {
522 my (@revs) = @_;
523 my ($r_last, $cmt_last) = svn_grab_base_rev();
524 defined $r_last or die "Must have an existing revision to commit\n";
cf7424b0 525 my $fetched = fetch();
a5e0cedc
EW
526 if ($r_last != $fetched->{revision}) {
527 print STDERR "There are new revisions that were fetched ",
528 "and need to be merged (or acknowledged) ",
529 "before committing.\n",
530 "last rev: $r_last\n",
531 " current: $fetched->{revision}\n";
532 exit 1;
533 }
534 read_uuid();
535 my @lock = $SVN::Core::VERSION ge '1.2.0' ? (undef, 0) : ();
536 my $commit_msg = "$GIT_SVN_DIR/.svn-commit.tmp.$$";
537
5a990e45 538 my $repo;
27e9fb8d 539 set_svn_commit_env();
a5e0cedc 540 foreach my $c (@revs) {
ec9d00d0
EW
541 my $log_msg = get_commit_message($c, $commit_msg);
542
a5e0cedc
EW
543 # fork for each commit because there's a memory leak I
544 # can't track down... (it's probably in the SVN code)
545 defined(my $pid = open my $fh, '-|') or croak $!;
546 if (!$pid) {
a5e0cedc
EW
547 my $ed = SVN::Git::Editor->new(
548 { r => $r_last,
747fa12c 549 ra => libsvn_dup_ra($SVN),
a5e0cedc 550 c => $c,
747fa12c 551 svn_path => $SVN->{svn_path},
a5e0cedc
EW
552 },
553 $SVN->get_commit_editor(
554 $log_msg->{msg},
555 sub {
556 libsvn_commit_cb(
557 @_, $c,
558 $log_msg->{msg},
559 $r_last,
560 $cmt_last)
561 },
562 @lock)
563 );
42d32870 564 my $mods = libsvn_checkout_tree($cmt_last, $c, $ed);
a5e0cedc
EW
565 if (@$mods == 0) {
566 print "No changes\nr$r_last = $cmt_last\n";
567 $ed->abort_edit;
568 } else {
569 $ed->close_edit;
570 }
571 exit 0;
572 }
573 my ($r_new, $cmt_new, $no);
574 while (<$fh>) {
575 print $_;
576 chomp;
577 if (/^r(\d+) = ($sha1)$/o) {
578 ($r_new, $cmt_new) = ($1, $2);
579 } elsif ($_ eq 'No changes') {
580 $no = 1;
581 }
582 }
d25c26e7 583 close $fh or exit 1;
a5e0cedc
EW
584 if (! defined $r_new && ! defined $cmt_new) {
585 unless ($no) {
586 die "Failed to parse revision information\n";
587 }
588 } else {
589 ($r_last, $cmt_last) = ($r_new, $cmt_new);
590 }
591 }
ec9d00d0 592 $ENV{LC_ALL} = 'C';
a5e0cedc
EW
593 unlink $commit_msg;
594}
8f22562c 595
b22d4497
EW
596sub dcommit {
597 my $gs = "refs/remotes/$GIT_SVN";
598 chomp(my @refs = safe_qx(qw/git-rev-list --no-merges/, "$gs..HEAD"));
45bf473a 599 my $last_rev;
b22d4497 600 foreach my $d (reverse @refs) {
48d044b5
EW
601 if (quiet_run('git-rev-parse','--verify',"$d~1") != 0) {
602 die "Commit $d\n",
603 "has no parent commit, and therefore ",
604 "nothing to diff against.\n",
605 "You should be working from a repository ",
606 "originally created by git-svn\n";
607 }
45bf473a
EW
608 unless (defined $last_rev) {
609 (undef, $last_rev, undef) = cmt_metadata("$d~1");
610 unless (defined $last_rev) {
611 die "Unable to extract revision information ",
612 "from commit $d~1\n";
613 }
614 }
b22d4497
EW
615 if ($_dry_run) {
616 print "diff-tree $d~1 $d\n";
617 } else {
45bf473a
EW
618 if (my $r = commit_diff("$d~1", $d, undef, $last_rev)) {
619 $last_rev = $r;
620 } # else: no changes, same $last_rev
b22d4497
EW
621 }
622 }
623 return if $_dry_run;
624 fetch();
625 my @diff = safe_qx(qw/git-diff-tree HEAD/, $gs);
626 my @finish;
627 if (@diff) {
628 @finish = qw/rebase/;
629 push @finish, qw/--merge/ if $_merge;
630 push @finish, "--strategy=$_strategy" if $_strategy;
631 print STDERR "W: HEAD and $gs differ, using @finish:\n", @diff;
632 } else {
633 print "No changes between current HEAD and $gs\n",
634 "Hard resetting to the latest $gs\n";
4769489a 635 @finish = qw/reset --mixed/;
b22d4497
EW
636 }
637 sys('git', @finish, $gs);
638}
639
a5e0cedc 640sub show_ignore {
883d0a78 641 $SVN_URL ||= file_to_s("$GIT_SVN_DIR/info/url");
a5e0cedc
EW
642 $_use_lib ? show_ignore_lib() : show_ignore_cmd();
643}
644
645sub show_ignore_cmd {
646 require File::Find or die $!;
647 if (defined $_revision) {
648 die "-r/--revision option doesn't work unless the Perl SVN ",
649 "libraries are used\n";
650 }
8f22562c
EW
651 chdir $SVN_WC or croak $!;
652 my %ign;
653 File::Find::find({wanted=>sub{if(lstat $_ && -d _ && -d "$_/.svn"){
654 s#^\./##;
8a97e368 655 @{$ign{$_}} = svn_propget_base('svn:ignore', $_);
8f22562c
EW
656 }}, no_chdir=>1},'.');
657
658 print "\n# /\n";
659 foreach (@{$ign{'.'}}) { print '/',$_ if /\S/ }
660 delete $ign{'.'};
661 foreach my $i (sort keys %ign) {
662 print "\n# ",$i,"\n";
663 foreach (@{$ign{$i}}) { print '/',$i,'/',$_ if /\S/ }
664 }
665}
666
a5e0cedc
EW
667sub show_ignore_lib {
668 my $repo;
747fa12c 669 $SVN ||= libsvn_connect($SVN_URL);
a5e0cedc 670 my $r = defined $_revision ? $_revision : $SVN->get_latest_revnum;
747fa12c 671 libsvn_traverse_ignore(\*STDOUT, $SVN->{svn_path}, $r);
a5e0cedc
EW
672}
673
9d55b41a
EW
674sub graft_branches {
675 my $gr_file = "$GIT_DIR/info/grafts";
676 my ($grafts, $comments) = read_grafts($gr_file);
677 my $gr_sha1;
678
679 if (%$grafts) {
680 # temporarily disable our grafts file to make this idempotent
681 chomp($gr_sha1 = safe_qx(qw/git-hash-object -w/,$gr_file));
682 rename $gr_file, "$gr_file~$gr_sha1" or croak $!;
683 }
684
685 my $l_map = read_url_paths();
686 my @re = map { qr/$_/is } @_opt_m if @_opt_m;
687 unless ($_no_default_regex) {
c1927a85
EW
688 push @re, (qr/\b(?:merge|merging|merged)\s+with\s+([\w\.\-]+)/i,
689 qr/\b(?:merge|merging|merged)\s+([\w\.\-]+)/i,
690 qr/\b(?:from|of)\s+([\w\.\-]+)/i );
9d55b41a
EW
691 }
692 foreach my $u (keys %$l_map) {
693 if (@re) {
694 foreach my $p (keys %{$l_map->{$u}}) {
c1927a85 695 graft_merge_msg($grafts,$l_map,$u,$p,@re);
9d55b41a
EW
696 }
697 }
a5e0cedc
EW
698 unless ($_no_graft_copy) {
699 if ($_use_lib) {
700 graft_file_copy_lib($grafts,$l_map,$u);
701 } else {
702 graft_file_copy_cmd($grafts,$l_map,$u);
703 }
704 }
9d55b41a 705 }
c1927a85 706 graft_tree_joins($grafts);
9d55b41a
EW
707
708 write_grafts($grafts, $comments, $gr_file);
709 unlink "$gr_file~$gr_sha1" if $gr_sha1;
710}
711
712sub multi_init {
713 my $url = shift;
714 $_trunk ||= 'trunk';
715 $_trunk =~ s#/+$##;
716 $url =~ s#/+$## if $url;
717 if ($_trunk !~ m#^[a-z\+]+://#) {
718 $_trunk = '/' . $_trunk if ($_trunk !~ m#^/#);
719 unless ($url) {
720 print STDERR "E: '$_trunk' is not a complete URL ",
721 "and a separate URL is not specified\n";
722 exit 1;
723 }
724 $_trunk = $url . $_trunk;
725 }
c35b96e7 726 my $ch_id;
9d55b41a 727 if ($GIT_SVN eq 'git-svn') {
c35b96e7 728 $ch_id = 1;
9d55b41a
EW
729 $GIT_SVN = $ENV{GIT_SVN_ID} = 'trunk';
730 }
731 init_vars();
c35b96e7
EW
732 unless (-d $GIT_SVN_DIR) {
733 print "GIT_SVN_ID set to 'trunk' for $_trunk\n" if $ch_id;
734 init($_trunk);
735 sys('git-repo-config', 'svn.trunk', $_trunk);
736 }
9d55b41a
EW
737 complete_url_ls_init($url, $_branches, '--branches/-b', '');
738 complete_url_ls_init($url, $_tags, '--tags/-t', 'tags/');
739}
740
741sub multi_fetch {
742 # try to do trunk first, since branches/tags
743 # may be descended from it.
cf7424b0
EW
744 if (-e "$GIT_DIR/svn/trunk/info/url") {
745 fetch_child_id('trunk', @_);
9d55b41a
EW
746 }
747 rec_fetch('', "$GIT_DIR/svn", @_);
748}
749
79bb8d88
EW
750sub show_log {
751 my (@args) = @_;
752 my ($r_min, $r_max);
753 my $r_last = -1; # prevent dupes
754 rload_authors() if $_authors;
755 if (defined $TZ) {
756 $ENV{TZ} = $TZ;
757 } else {
758 delete $ENV{TZ};
759 }
760 if (defined $_revision) {
761 if ($_revision =~ /^(\d+):(\d+)$/) {
762 ($r_min, $r_max) = ($1, $2);
763 } elsif ($_revision =~ /^\d+$/) {
764 $r_min = $r_max = $_revision;
765 } else {
766 print STDERR "-r$_revision is not supported, use ",
767 "standard \'git log\' arguments instead\n";
768 exit 1;
769 }
770 }
771
9aca0258 772 config_pager();
79bb8d88
EW
773 my $pid = open(my $log,'-|');
774 defined $pid or croak $!;
775 if (!$pid) {
c0d48222 776 exec(git_svn_log_cmd($r_min,$r_max), @args) or croak $!;
79bb8d88 777 }
9aca0258 778 run_pager();
79bb8d88 779 my (@k, $c, $d);
c0d48222 780
79bb8d88 781 while (<$log>) {
9aca0258 782 if (/^${_esc_color}commit ($sha1_short)/o) {
79bb8d88 783 my $cmt = $1;
c0d48222 784 if ($c && cmt_showable($c) && $c->{r} != $r_last) {
79bb8d88
EW
785 $r_last = $c->{r};
786 process_commit($c, $r_min, $r_max, \@k) or
787 goto out;
788 }
789 $d = undef;
790 $c = { c => $cmt };
9aca0258 791 } elsif (/^${_esc_color}author (.+) (\d+) ([\-\+]?\d+)$/) {
79bb8d88 792 get_author_info($c, $1, $2, $3);
9aca0258 793 } elsif (/^${_esc_color}(?:tree|parent|committer) /) {
79bb8d88 794 # ignore
9aca0258 795 } elsif (/^${_esc_color}:\d{6} \d{6} $sha1_short/o) {
79bb8d88 796 push @{$c->{raw}}, $_;
9aca0258 797 } elsif (/^${_esc_color}[ACRMDT]\t/) {
747fa12c 798 # we could add $SVN->{svn_path} here, but that requires
74a31a10 799 # remote access at the moment (repo_path_split)...
9aca0258 800 s#^(${_esc_color})([ACRMDT])\t#$1 $2 #;
74a31a10 801 push @{$c->{changed}}, $_;
9aca0258 802 } elsif (/^${_esc_color}diff /) {
79bb8d88
EW
803 $d = 1;
804 push @{$c->{diff}}, $_;
805 } elsif ($d) {
806 push @{$c->{diff}}, $_;
9aca0258 807 } elsif (/^${_esc_color} (git-svn-id:.+)$/) {
74a31a10 808 ($c->{url}, $c->{r}, undef) = extract_metadata($1);
9aca0258 809 } elsif (s/^${_esc_color} //) {
79bb8d88
EW
810 push @{$c->{l}}, $_;
811 }
812 }
813 if ($c && defined $c->{r} && $c->{r} != $r_last) {
814 $r_last = $c->{r};
815 process_commit($c, $r_min, $r_max, \@k);
816 }
817 if (@k) {
818 my $swap = $r_max;
819 $r_max = $r_min;
820 $r_min = $swap;
821 process_commit($_, $r_min, $r_max) foreach reverse @k;
822 }
823out:
824 close $log;
825 print '-' x72,"\n" unless $_incremental || $_oneline;
826}
827
27e9fb8d
EW
828sub commit_diff_usage {
829 print STDERR "Usage: $0 commit-diff <tree-ish> <tree-ish> [<URL>]\n";
830 exit 1
831}
832
833sub commit_diff {
834 if (!$_use_lib) {
835 print STDERR "commit-diff must be used with SVN libraries\n";
836 exit 1;
837 }
838 my $ta = shift or commit_diff_usage();
839 my $tb = shift or commit_diff_usage();
840 if (!eval { $SVN_URL = shift || file_to_s("$GIT_SVN_DIR/info/url") }) {
841 print STDERR "Needed URL or usable git-svn id command-line\n";
842 commit_diff_usage();
843 }
e70dc780
EW
844 my $r = shift;
845 unless (defined $r) {
846 if (defined $_revision) {
847 $r = $_revision
848 } else {
849 die "-r|--revision is a required argument\n";
850 }
851 }
27e9fb8d
EW
852 if (defined $_message && defined $_file) {
853 print STDERR "Both --message/-m and --file/-F specified ",
854 "for the commit message.\n",
855 "I have no idea what you mean\n";
856 exit 1;
857 }
858 if (defined $_file) {
4ad4515d 859 $_message = file_to_s($_file);
27e9fb8d
EW
860 } else {
861 $_message ||= get_commit_message($tb,
862 "$GIT_DIR/.svn-commit.tmp.$$")->{msg};
863 }
747fa12c 864 $SVN ||= libsvn_connect($SVN_URL);
45bf473a
EW
865 if ($r eq 'HEAD') {
866 $r = $SVN->get_latest_revnum;
867 } elsif ($r !~ /^\d+$/) {
868 die "revision argument: $r not understood by git-svn\n";
869 }
27e9fb8d 870 my @lock = $SVN::Core::VERSION ge '1.2.0' ? (undef, 0) : ();
45bf473a
EW
871 my $rev_committed;
872 my $ed = SVN::Git::Editor->new({ r => $r,
747fa12c
EW
873 ra => libsvn_dup_ra($SVN),
874 c => $tb,
875 svn_path => $SVN->{svn_path}
27e9fb8d
EW
876 },
877 $SVN->get_commit_editor($_message,
45bf473a
EW
878 sub {
879 $rev_committed = $_[0];
880 print "Committed $_[0]\n";
881 }, @lock)
27e9fb8d 882 );
d25c26e7
EW
883 eval {
884 my $mods = libsvn_checkout_tree($ta, $tb, $ed);
885 if (@$mods == 0) {
886 print "No changes\n$ta == $tb\n";
887 $ed->abort_edit;
888 } else {
889 $ed->close_edit;
890 }
891 };
892 fatal "$@\n" if $@;
5f641ccc 893 $_message = $_file = undef;
45bf473a 894 return $rev_committed;
27e9fb8d
EW
895}
896
3397f9df
EW
897########################### utility functions #########################
898
c0d48222
EW
899sub cmt_showable {
900 my ($c) = @_;
901 return 1 if defined $c->{r};
902 if ($c->{l} && $c->{l}->[-1] eq "...\n" &&
903 $c->{a_raw} =~ /\@([a-f\d\-]+)>$/) {
904 my @msg = safe_qx(qw/git-cat-file commit/, $c->{c});
905 shift @msg while ($msg[0] ne "\n");
906 shift @msg;
907 @{$c->{l}} = grep !/^git-svn-id: /, @msg;
908
909 (undef, $c->{r}, undef) = extract_metadata(
910 (grep(/^git-svn-id: /, @msg))[-1]);
911 }
912 return defined $c->{r};
913}
914
9aca0258
EW
915sub log_use_color {
916 return 1 if $_color;
917 my $dc;
918 chomp($dc = `git-repo-config --get diff.color`);
919 if ($dc eq 'auto') {
920 if (-t *STDOUT || (defined $_pager &&
921 `git-repo-config --bool --get pager.color` !~ /^false/)) {
922 return ($ENV{TERM} && $ENV{TERM} ne 'dumb');
923 }
924 return 0;
925 }
926 return 0 if $dc eq 'never';
927 return 1 if $dc eq 'always';
928 chomp($dc = `git-repo-config --bool --get diff.color`);
929 $dc eq 'true';
930}
931
c0d48222
EW
932sub git_svn_log_cmd {
933 my ($r_min, $r_max) = @_;
934 my @cmd = (qw/git-log --abbrev-commit --pretty=raw
935 --default/, "refs/remotes/$GIT_SVN");
74a31a10
EW
936 push @cmd, '-r' unless $_non_recursive;
937 push @cmd, qw/--raw --name-status/ if $_verbose;
9aca0258 938 push @cmd, '--color' if log_use_color();
c0d48222
EW
939 return @cmd unless defined $r_max;
940 if ($r_max == $r_min) {
941 push @cmd, '--max-count=1';
942 if (my $c = revdb_get($REVDB, $r_max)) {
943 push @cmd, $c;
944 }
945 } else {
946 my ($c_min, $c_max);
947 $c_max = revdb_get($REVDB, $r_max);
948 $c_min = revdb_get($REVDB, $r_min);
74a31a10 949 if (defined $c_min && defined $c_max) {
c0d48222
EW
950 if ($r_max > $r_max) {
951 push @cmd, "$c_min..$c_max";
952 } else {
953 push @cmd, "$c_max..$c_min";
954 }
955 } elsif ($r_max > $r_min) {
956 push @cmd, $c_max;
957 } else {
958 push @cmd, $c_min;
959 }
960 }
961 return @cmd;
962}
963
cf7424b0
EW
964sub fetch_child_id {
965 my $id = shift;
966 print "Fetching $id\n";
967 my $ref = "$GIT_DIR/refs/remotes/$id";
a00439ac 968 defined(my $pid = open my $fh, '-|') or croak $!;
cf7424b0 969 if (!$pid) {
a00439ac 970 $_repack = undef;
cf7424b0
EW
971 $GIT_SVN = $ENV{GIT_SVN_ID} = $id;
972 init_vars();
973 fetch(@_);
974 exit 0;
975 }
cf7424b0 976 while (<$fh>) {
a00439ac
EW
977 print $_;
978 check_repack() if (/^r\d+ = $sha1/);
cf7424b0 979 }
a00439ac 980 close $fh or croak $?;
cf7424b0
EW
981}
982
9d55b41a
EW
983sub rec_fetch {
984 my ($pfx, $p, @args) = @_;
985 my @dir;
986 foreach (sort <$p/*>) {
987 if (-r "$_/info/url") {
988 $pfx .= '/' if $pfx && $pfx !~ m!/$!;
989 my $id = $pfx . basename $_;
990 next if $id eq 'trunk';
cf7424b0 991 fetch_child_id($id, @args);
9d55b41a
EW
992 } elsif (-d $_) {
993 push @dir, $_;
994 }
995 }
996 foreach (@dir) {
997 my $x = $_;
998 $x =~ s!^\Q$GIT_DIR\E/svn/!!;
999 rec_fetch($x, $_);
1000 }
1001}
1002
1003sub complete_url_ls_init {
1004 my ($url, $var, $switch, $pfx) = @_;
1005 unless ($var) {
1006 print STDERR "W: $switch not specified\n";
1007 return;
1008 }
1009 $var =~ s#/+$##;
1010 if ($var !~ m#^[a-z\+]+://#) {
1011 $var = '/' . $var if ($var !~ m#^/#);
1012 unless ($url) {
1013 print STDERR "E: '$var' is not a complete URL ",
1014 "and a separate URL is not specified\n";
1015 exit 1;
1016 }
1017 $var = $url . $var;
1018 }
a5e0cedc
EW
1019 chomp(my @ls = $_use_lib ? libsvn_ls_fullurl($var)
1020 : safe_qx(qw/svn ls --non-interactive/, $var));
9d55b41a
EW
1021 my $old = $GIT_SVN;
1022 defined(my $pid = fork) or croak $!;
1023 if (!$pid) {
1024 foreach my $u (map { "$var/$_" } (grep m!/$!, @ls)) {
1025 $u =~ s#/+$##;
1026 if ($u !~ m!\Q$var\E/(.+)$!) {
1027 print STDERR "W: Unrecognized URL: $u\n";
1028 die "This should never happen\n";
1029 }
c35b96e7 1030 # don't try to init already existing refs
9d55b41a 1031 my $id = $pfx.$1;
9d55b41a
EW
1032 $GIT_SVN = $ENV{GIT_SVN_ID} = $id;
1033 init_vars();
c35b96e7
EW
1034 unless (-d $GIT_SVN_DIR) {
1035 print "init $u => $id\n";
1036 init($u);
1037 }
9d55b41a
EW
1038 }
1039 exit 0;
1040 }
1041 waitpid $pid, 0;
1042 croak $? if $?;
c35b96e7
EW
1043 my ($n) = ($switch =~ /^--(\w+)/);
1044 sys('git-repo-config', "svn.$n", $var);
9d55b41a
EW
1045}
1046
1047sub common_prefix {
1048 my $paths = shift;
1049 my %common;
1050 foreach (@$paths) {
1051 my @tmp = split m#/#, $_;
1052 my $p = '';
1053 while (my $x = shift @tmp) {
1054 $p .= "/$x";
1055 $common{$p} ||= 0;
1056 $common{$p}++;
1057 }
1058 }
1059 foreach (sort {length $b <=> length $a} keys %common) {
1060 if ($common{$_} == @$paths) {
1061 return $_;
1062 }
1063 }
1064 return '';
1065}
1066
c1927a85
EW
1067# grafts set here are 'stronger' in that they're based on actual tree
1068# matches, and won't be deleted from merge-base checking in write_grafts()
1069sub graft_tree_joins {
1070 my $grafts = shift;
1071 map_tree_joins() if (@_branch_from && !%tree_map);
1072 return unless %tree_map;
1073
1074 git_svn_each(sub {
1075 my $i = shift;
1076 defined(my $pid = open my $fh, '-|') or croak $!;
1077 if (!$pid) {
1078 exec qw/git-rev-list --pretty=raw/,
1079 "refs/remotes/$i" or croak $!;
1080 }
1081 while (<$fh>) {
1082 next unless /^commit ($sha1)$/o;
1083 my $c = $1;
1084 my ($t) = (<$fh> =~ /^tree ($sha1)$/o);
1085 next unless $tree_map{$t};
1086
1087 my $l;
1088 do {
1089 $l = readline $fh;
1090 } until ($l =~ /^committer (?:.+) (\d+) ([\-\+]?\d+)$/);
1091
1092 my ($s, $tz) = ($1, $2);
1093 if ($tz =~ s/^\+//) {
1094 $s += tz_to_s_offset($tz);
1095 } elsif ($tz =~ s/^\-//) {
1096 $s -= tz_to_s_offset($tz);
1097 }
1098
1099 my ($url_a, $r_a, $uuid_a) = cmt_metadata($c);
1100
1101 foreach my $p (@{$tree_map{$t}}) {
1102 next if $p eq $c;
1103 my $mb = eval {
1104 safe_qx('git-merge-base', $c, $p)
1105 };
1106 next unless ($@ || $?);
1107 if (defined $r_a) {
1108 # see if SVN says it's a relative
1109 my ($url_b, $r_b, $uuid_b) =
1110 cmt_metadata($p);
1111 next if (defined $url_b &&
1112 defined $url_a &&
1113 ($url_a eq $url_b) &&
1114 ($uuid_a eq $uuid_b));
1115 if ($uuid_a eq $uuid_b) {
1116 if ($r_b < $r_a) {
1117 $grafts->{$c}->{$p} = 2;
1118 next;
1119 } elsif ($r_b > $r_a) {
1120 $grafts->{$p}->{$c} = 2;
1121 next;
1122 }
1123 }
1124 }
1125 my $ct = get_commit_time($p);
1126 if ($ct < $s) {
1127 $grafts->{$c}->{$p} = 2;
1128 } elsif ($ct > $s) {
1129 $grafts->{$p}->{$c} = 2;
1130 }
1131 # what should we do when $ct == $s ?
1132 }
1133 }
1134 close $fh or croak $?;
1135 });
1136}
1137
9d55b41a 1138# this isn't funky-filename safe, but good enough for now...
a5e0cedc 1139sub graft_file_copy_cmd {
9d55b41a
EW
1140 my ($grafts, $l_map, $u) = @_;
1141 my $paths = $l_map->{$u};
1142 my $pfx = common_prefix([keys %$paths]);
42d32870 1143 $SVN_URL ||= $u.$pfx;
9d55b41a
EW
1144 my $pid = open my $fh, '-|';
1145 defined $pid or croak $!;
1146 unless ($pid) {
a5e0cedc
EW
1147 my @exec = qw/svn log -v/;
1148 push @exec, "-r$_revision" if defined $_revision;
1149 exec @exec, $u.$pfx or croak $!;
9d55b41a
EW
1150 }
1151 my ($r, $mp) = (undef, undef);
1152 while (<$fh>) {
1153 chomp;
1154 if (/^\-{72}$/) {
1155 $mp = $r = undef;
1156 } elsif (/^r(\d+) \| /) {
1157 $r = $1 unless defined $r;
1158 } elsif (/^Changed paths:/) {
1159 $mp = 1;
1160 } elsif ($mp && m#^ [AR] /(\S.*?) \(from /(\S+?):(\d+)\)$#) {
9d55b41a 1161 my ($p1, $p0, $r0) = ($1, $2, $3);
a5e0cedc 1162 my $c = find_graft_path_commit($paths, $p1, $r);
9d55b41a 1163 next unless $c;
a5e0cedc 1164 find_graft_path_parents($grafts, $paths, $c, $p0, $r0);
9d55b41a
EW
1165 }
1166 }
1167}
1168
a5e0cedc
EW
1169sub graft_file_copy_lib {
1170 my ($grafts, $l_map, $u) = @_;
1171 my $tree_paths = $l_map->{$u};
1172 my $pfx = common_prefix([keys %$tree_paths]);
1173 my ($repo, $path) = repo_path_split($u.$pfx);
747fa12c 1174 $SVN = libsvn_connect($repo);
a5e0cedc
EW
1175
1176 my ($base, $head) = libsvn_parse_revision();
1177 my $inc = 1000;
1178 my ($min, $max) = ($base, $head < $base+$inc ? $head : $base+$inc);
42d32870
EW
1179 my $eh = $SVN::Error::handler;
1180 $SVN::Error::handler = \&libsvn_skip_unknown_revs;
a5e0cedc
EW
1181 while (1) {
1182 my $pool = SVN::Pool->new;
747fa12c 1183 libsvn_get_log(libsvn_dup_ra($SVN), [$path],
0864e3ba 1184 $min, $max, 0, 2, 1,
a5e0cedc
EW
1185 sub {
1186 libsvn_graft_file_copies($grafts, $tree_paths,
1187 $path, @_);
1188 }, $pool);
1189 $pool->clear;
1190 last if ($max >= $head);
1191 $min = $max + 1;
1192 $max += $inc;
1193 $max = $head if ($max > $head);
1194 }
42d32870 1195 $SVN::Error::handler = $eh;
a5e0cedc
EW
1196}
1197
9d55b41a
EW
1198sub process_merge_msg_matches {
1199 my ($grafts, $l_map, $u, $p, $c, @matches) = @_;
1200 my (@strong, @weak);
1201 foreach (@matches) {
1202 # merging with ourselves is not interesting
1203 next if $_ eq $p;
1204 if ($l_map->{$u}->{$_}) {
1205 push @strong, $_;
1206 } else {
1207 push @weak, $_;
1208 }
1209 }
1210 foreach my $w (@weak) {
1211 last if @strong;
1212 # no exact match, use branch name as regexp.
1213 my $re = qr/\Q$w\E/i;
1214 foreach (keys %{$l_map->{$u}}) {
1215 if (/$re/) {
c1927a85 1216 push @strong, $l_map->{$u}->{$_};
9d55b41a
EW
1217 last;
1218 }
1219 }
1220 last if @strong;
1221 $w = basename($w);
1222 $re = qr/\Q$w\E/i;
1223 foreach (keys %{$l_map->{$u}}) {
1224 if (/$re/) {
c1927a85 1225 push @strong, $l_map->{$u}->{$_};
9d55b41a
EW
1226 last;
1227 }
1228 }
1229 }
1230 my ($rev) = ($c->{m} =~ /^git-svn-id:\s(?:\S+?)\@(\d+)
1231 \s(?:[a-f\d\-]+)$/xsm);
1232 unless (defined $rev) {
1233 ($rev) = ($c->{m} =~/^git-svn-id:\s(\d+)
1234 \@(?:[a-f\d\-]+)/xsm);
1235 return unless defined $rev;
1236 }
1237 foreach my $m (@strong) {
c1927a85 1238 my ($r0, $s0) = find_rev_before($rev, $m, 1);
9d55b41a
EW
1239 $grafts->{$c->{c}}->{$s0} = 1 if defined $s0;
1240 }
1241}
1242
1243sub graft_merge_msg {
1244 my ($grafts, $l_map, $u, $p, @re) = @_;
1245
1246 my $x = $l_map->{$u}->{$p};
1247 my $rl = rev_list_raw($x);
1248 while (my $c = next_rev_list_entry($rl)) {
1249 foreach my $re (@re) {
1250 my (@br) = ($c->{m} =~ /$re/g);
1251 next unless @br;
1252 process_merge_msg_matches($grafts,$l_map,$u,$p,$c,@br);
1253 }
1254 }
1255}
1256
1d52aba8
EW
1257sub read_uuid {
1258 return if $SVN_UUID;
a5e0cedc
EW
1259 if ($_use_lib) {
1260 my $pool = SVN::Pool->new;
1261 $SVN_UUID = $SVN->get_uuid($pool);
1262 $pool->clear;
1263 } else {
1264 my $info = shift || svn_info('.');
1265 $SVN_UUID = $info->{'Repository UUID'} or
1d52aba8 1266 croak "Repository UUID unreadable\n";
a5e0cedc 1267 }
883d0a78
EW
1268}
1269
1270sub quiet_run {
1271 my $pid = fork;
1272 defined $pid or croak $!;
1273 if (!$pid) {
1274 open my $null, '>', '/dev/null' or croak $!;
1275 open STDERR, '>&', $null or croak $!;
1276 open STDOUT, '>&', $null or croak $!;
1277 exec @_ or croak $!;
1278 }
1279 waitpid $pid, 0;
1280 return $?;
1281}
1282
1283sub repo_path_split {
1284 my $full_url = shift;
1285 $full_url =~ s#/+$##;
1286
1287 foreach (@repo_path_split_cache) {
1288 if ($full_url =~ s#$_##) {
1289 my $u = $1;
1290 $full_url =~ s#^/+##;
1291 return ($u, $full_url);
1292 }
1293 }
a5e0cedc 1294 if ($_use_lib) {
a69a165f 1295 my $tmp = libsvn_connect($full_url);
747fa12c 1296 return ($tmp->{repos_root}, $tmp->{svn_path});
a5e0cedc 1297 } else {
a69a165f
EW
1298 my ($url, $path) = ($full_url =~ m!^([a-z\+]+://[^/]*)(.*)$!i);
1299 $path =~ s#^/+##;
1300 my @paths = split(m#/+#, $path);
a5e0cedc
EW
1301 while (quiet_run(qw/svn ls --non-interactive/, $url)) {
1302 my $n = shift @paths || last;
1303 $url .= "/$n";
1304 }
a69a165f
EW
1305 push @repo_path_split_cache, qr/^(\Q$url\E)/;
1306 $path = join('/',@paths);
1307 return ($url, $path);
883d0a78 1308 }
1d52aba8
EW
1309}
1310
3397f9df
EW
1311sub setup_git_svn {
1312 defined $SVN_URL or croak "SVN repository location required\n";
1313 unless (-d $GIT_DIR) {
1314 croak "GIT_DIR=$GIT_DIR does not exist!\n";
1315 }
883d0a78
EW
1316 mkpath([$GIT_SVN_DIR]);
1317 mkpath(["$GIT_SVN_DIR/info"]);
42d32870
EW
1318 open my $fh, '>>',$REVDB or croak $!;
1319 close $fh;
883d0a78 1320 s_to_file($SVN_URL,"$GIT_SVN_DIR/info/url");
3397f9df 1321
3397f9df
EW
1322}
1323
1324sub assert_svn_wc_clean {
a5e0cedc 1325 return if $_use_lib;
36f5b1f0 1326 my ($svn_rev) = @_;
3397f9df 1327 croak "$svn_rev is not an integer!\n" unless ($svn_rev =~ /^\d+$/);
ce4c8b24
EW
1328 my $lcr = svn_info('.')->{'Last Changed Rev'};
1329 if ($svn_rev != $lcr) {
1330 print STDERR "Checking for copy-tree ... ";
ce4c8b24
EW
1331 my @diff = grep(/^Index: /,(safe_qx(qw(svn diff),
1332 "-r$lcr:$svn_rev")));
1333 if (@diff) {
1334 croak "Nope! Expected r$svn_rev, got r$lcr\n";
1335 } else {
1336 print STDERR "OK!\n";
1337 }
3397f9df
EW
1338 }
1339 my @status = grep(!/^Performing status on external/,(`svn status`));
1340 @status = grep(!/^\s*$/,@status);
191414c0 1341 @status = grep(!/^X/,@status) if $_no_ignore_ext;
3397f9df
EW
1342 if (scalar @status) {
1343 print STDERR "Tree ($SVN_WC) is not clean:\n";
1344 print STDERR $_ foreach @status;
1345 croak;
1346 }
cf52b8f0
EW
1347}
1348
a5e0cedc 1349sub get_tree_from_treeish {
cf52b8f0
EW
1350 my ($treeish) = @_;
1351 croak "Not a sha1: $treeish\n" unless $treeish =~ /^$sha1$/o;
1352 chomp(my $type = `git-cat-file -t $treeish`);
1353 my $expected;
1354 while ($type eq 'tag') {
1355 chomp(($treeish, $type) = `git-cat-file tag $treeish`);
1356 }
1357 if ($type eq 'commit') {
1358 $expected = (grep /^tree /,`git-cat-file commit $treeish`)[0];
1359 ($expected) = ($expected =~ /^tree ($sha1)$/);
1360 die "Unable to get tree from $treeish\n" unless $expected;
1361 } elsif ($type eq 'tree') {
1362 $expected = $treeish;
1363 } else {
1364 die "$treeish is a $type, expected tree, tag or commit\n";
1365 }
a5e0cedc
EW
1366 return $expected;
1367}
1368
1369sub assert_tree {
1370 return if $_use_lib;
1371 my ($treeish) = @_;
1372 my $expected = get_tree_from_treeish($treeish);
cf52b8f0 1373
cf52b8f0
EW
1374 my $tmpindex = $GIT_SVN_INDEX.'.assert-tmp';
1375 if (-e $tmpindex) {
1376 unlink $tmpindex or croak $!;
1377 }
a5e0cedc 1378 my $old_index = set_index($tmpindex);
36f5b1f0 1379 index_changes(1);
cf52b8f0 1380 chomp(my $tree = `git-write-tree`);
a5e0cedc 1381 restore_index($old_index);
cf52b8f0
EW
1382 if ($tree ne $expected) {
1383 croak "Tree mismatch, Got: $tree, Expected: $expected\n";
3397f9df 1384 }
36f5b1f0 1385 unlink $tmpindex;
3397f9df
EW
1386}
1387
1388sub parse_diff_tree {
1389 my $diff_fh = shift;
1390 local $/ = "\0";
1391 my $state = 'meta';
1392 my @mods;
1393 while (<$diff_fh>) {
1394 chomp $_; # this gets rid of the trailing "\0"
3397f9df
EW
1395 if ($state eq 'meta' && /^:(\d{6})\s(\d{6})\s
1396 $sha1\s($sha1)\s([MTCRAD])\d*$/xo) {
1397 push @mods, { mode_a => $1, mode_b => $2,
1398 sha1_b => $3, chg => $4 };
1399 if ($4 =~ /^(?:C|R)$/) {
1400 $state = 'file_a';
1401 } else {
1402 $state = 'file_b';
1403 }
1404 } elsif ($state eq 'file_a') {
cf52b8f0 1405 my $x = $mods[$#mods] or croak "Empty array\n";
3397f9df 1406 if ($x->{chg} !~ /^(?:C|R)$/) {
cf52b8f0 1407 croak "Error parsing $_, $x->{chg}\n";
3397f9df
EW
1408 }
1409 $x->{file_a} = $_;
1410 $state = 'file_b';
1411 } elsif ($state eq 'file_b') {
cf52b8f0 1412 my $x = $mods[$#mods] or croak "Empty array\n";
3397f9df 1413 if (exists $x->{file_a} && $x->{chg} !~ /^(?:C|R)$/) {
cf52b8f0 1414 croak "Error parsing $_, $x->{chg}\n";
3397f9df
EW
1415 }
1416 if (!exists $x->{file_a} && $x->{chg} =~ /^(?:C|R)$/) {
cf52b8f0 1417 croak "Error parsing $_, $x->{chg}\n";
3397f9df
EW
1418 }
1419 $x->{file_b} = $_;
1420 $state = 'meta';
1421 } else {
cf52b8f0 1422 croak "Error parsing $_\n";
3397f9df
EW
1423 }
1424 }
cf7424b0 1425 close $diff_fh or croak $?;
cf52b8f0 1426
3397f9df
EW
1427 return \@mods;
1428}
1429
1430sub svn_check_prop_executable {
1431 my $m = shift;
cf52b8f0
EW
1432 return if -l $m->{file_b};
1433 if ($m->{mode_b} =~ /755$/) {
1434 chmod((0755 &~ umask),$m->{file_b}) or croak $!;
1435 if ($m->{mode_a} !~ /755$/) {
1436 sys(qw(svn propset svn:executable 1), $m->{file_b});
1437 }
1438 -x $m->{file_b} or croak "$m->{file_b} is not executable!\n";
3397f9df
EW
1439 } elsif ($m->{mode_b} !~ /755$/ && $m->{mode_a} =~ /755$/) {
1440 sys(qw(svn propdel svn:executable), $m->{file_b});
cf52b8f0
EW
1441 chmod((0644 &~ umask),$m->{file_b}) or croak $!;
1442 -x $m->{file_b} and croak "$m->{file_b} is executable!\n";
3397f9df
EW
1443 }
1444}
1445
1446sub svn_ensure_parent_path {
1447 my $dir_b = dirname(shift);
1448 svn_ensure_parent_path($dir_b) if ($dir_b ne File::Spec->curdir);
1449 mkpath([$dir_b]) unless (-d $dir_b);
1450 sys(qw(svn add -N), $dir_b) unless (-d "$dir_b/.svn");
1451}
1452
cf52b8f0
EW
1453sub precommit_check {
1454 my $mods = shift;
1455 my (%rm_file, %rmdir_check, %added_check);
1456
1457 my %o = ( D => 0, R => 1, C => 2, A => 3, M => 3, T => 3 );
1458 foreach my $m (sort { $o{$a->{chg}} <=> $o{$b->{chg}} } @$mods) {
1459 if ($m->{chg} eq 'R') {
1460 if (-d $m->{file_b}) {
1461 err_dir_to_file("$m->{file_a} => $m->{file_b}");
1462 }
1463 # dir/$file => dir/file/$file
1464 my $dirname = dirname($m->{file_b});
1465 while ($dirname ne File::Spec->curdir) {
1466 if ($dirname ne $m->{file_a}) {
1467 $dirname = dirname($dirname);
1468 next;
1469 }
1470 err_file_to_dir("$m->{file_a} => $m->{file_b}");
1471 }
1472 # baz/zzz => baz (baz is a file)
1473 $dirname = dirname($m->{file_a});
1474 while ($dirname ne File::Spec->curdir) {
1475 if ($dirname ne $m->{file_b}) {
1476 $dirname = dirname($dirname);
1477 next;
1478 }
1479 err_dir_to_file("$m->{file_a} => $m->{file_b}");
1480 }
1481 }
1482 if ($m->{chg} =~ /^(D|R)$/) {
1483 my $t = $1 eq 'D' ? 'file_b' : 'file_a';
1484 $rm_file{ $m->{$t} } = 1;
1485 my $dirname = dirname( $m->{$t} );
1486 my $basename = basename( $m->{$t} );
1487 $rmdir_check{$dirname}->{$basename} = 1;
1488 } elsif ($m->{chg} =~ /^(?:A|C)$/) {
1489 if (-d $m->{file_b}) {
1490 err_dir_to_file($m->{file_b});
1491 }
1492 my $dirname = dirname( $m->{file_b} );
1493 my $basename = basename( $m->{file_b} );
1494 $added_check{$dirname}->{$basename} = 1;
1495 while ($dirname ne File::Spec->curdir) {
1496 if ($rm_file{$dirname}) {
1497 err_file_to_dir($m->{file_b});
1498 }
1499 $dirname = dirname $dirname;
1500 }
1501 }
1502 }
1503 return (\%rmdir_check, \%added_check);
1504
1505 sub err_dir_to_file {
1506 my $file = shift;
1507 print STDERR "Node change from directory to file ",
1508 "is not supported by Subversion: ",$file,"\n";
1509 exit 1;
1510 }
1511 sub err_file_to_dir {
1512 my $file = shift;
1513 print STDERR "Node change from file to directory ",
1514 "is not supported by Subversion: ",$file,"\n";
1515 exit 1;
1516 }
1517}
1518
a5e0cedc
EW
1519
1520sub get_diff {
42d32870 1521 my ($from, $treeish) = @_;
36f5b1f0 1522 assert_tree($from);
ac8e0b91 1523 print "diff-tree $from $treeish\n";
3397f9df
EW
1524 my $pid = open my $diff_fh, '-|';
1525 defined $pid or croak $!;
1526 if ($pid == 0) {
162f4129
EW
1527 my @diff_tree = qw(git-diff-tree -z -r);
1528 if ($_cp_similarity) {
1529 push @diff_tree, "-C$_cp_similarity";
1530 } else {
1531 push @diff_tree, '-C';
1532 }
72942938
EW
1533 push @diff_tree, '--find-copies-harder' if $_find_copies_harder;
1534 push @diff_tree, "-l$_l" if defined $_l;
cf52b8f0 1535 exec(@diff_tree, $from, $treeish) or croak $!;
3397f9df 1536 }
a5e0cedc
EW
1537 return parse_diff_tree($diff_fh);
1538}
1539
1540sub svn_checkout_tree {
42d32870
EW
1541 my ($from, $treeish) = @_;
1542 my $mods = get_diff($from->{commit}, $treeish);
a5e0cedc 1543 return $mods unless (scalar @$mods);
cf52b8f0
EW
1544 my ($rm, $add) = precommit_check($mods);
1545
1546 my %o = ( D => 1, R => 0, C => -1, A => 3, M => 3, T => 3 );
1547 foreach my $m (sort { $o{$a->{chg}} <=> $o{$b->{chg}} } @$mods) {
3397f9df
EW
1548 if ($m->{chg} eq 'C') {
1549 svn_ensure_parent_path( $m->{file_b} );
1550 sys(qw(svn cp), $m->{file_a}, $m->{file_b});
cf52b8f0 1551 apply_mod_line_blob($m);
3397f9df
EW
1552 svn_check_prop_executable($m);
1553 } elsif ($m->{chg} eq 'D') {
3397f9df
EW
1554 sys(qw(svn rm --force), $m->{file_b});
1555 } elsif ($m->{chg} eq 'R') {
1556 svn_ensure_parent_path( $m->{file_b} );
1557 sys(qw(svn mv --force), $m->{file_a}, $m->{file_b});
cf52b8f0 1558 apply_mod_line_blob($m);
3397f9df 1559 svn_check_prop_executable($m);
3397f9df 1560 } elsif ($m->{chg} eq 'M') {
cf52b8f0 1561 apply_mod_line_blob($m);
3397f9df
EW
1562 svn_check_prop_executable($m);
1563 } elsif ($m->{chg} eq 'T') {
cf52b8f0 1564 svn_check_prop_executable($m);
9ffd652a
EW
1565 apply_mod_line_blob($m);
1566 if ($m->{mode_a} =~ /^120/ && $m->{mode_b} !~ /^120/) {
1567 sys(qw(svn propdel svn:special), $m->{file_b});
1568 } else {
1569 sys(qw(svn propset svn:special *),$m->{file_b});
1570 }
3397f9df
EW
1571 } elsif ($m->{chg} eq 'A') {
1572 svn_ensure_parent_path( $m->{file_b} );
cf52b8f0 1573 apply_mod_line_blob($m);
0e8a002c 1574 sys(qw(svn add), $m->{file_b});
cf52b8f0 1575 svn_check_prop_executable($m);
3397f9df
EW
1576 } else {
1577 croak "Invalid chg: $m->{chg}\n";
1578 }
1579 }
cf52b8f0
EW
1580
1581 assert_tree($treeish);
1582 if ($_rmdir) { # remove empty directories
1583 handle_rmdir($rm, $add);
1584 }
1585 assert_tree($treeish);
1586 return $mods;
1587}
1588
a5e0cedc 1589sub libsvn_checkout_tree {
42d32870
EW
1590 my ($from, $treeish, $ed) = @_;
1591 my $mods = get_diff($from, $treeish);
a5e0cedc
EW
1592 return $mods unless (scalar @$mods);
1593 my %o = ( D => 1, R => 0, C => -1, A => 3, M => 3, T => 3 );
1594 foreach my $m (sort { $o{$a->{chg}} <=> $o{$b->{chg}} } @$mods) {
1595 my $f = $m->{chg};
1596 if (defined $o{$f}) {
80f50749 1597 $ed->$f($m, $_q);
a5e0cedc
EW
1598 } else {
1599 croak "Invalid change type: $f\n";
1600 }
1601 }
80f50749 1602 $ed->rmdirs($_q) if $_rmdir;
a5e0cedc
EW
1603 return $mods;
1604}
1605
cf52b8f0
EW
1606# svn ls doesn't work with respect to the current working tree, but what's
1607# in the repository. There's not even an option for it... *sigh*
1608# (added files don't show up and removed files remain in the ls listing)
1609sub svn_ls_current {
1610 my ($dir, $rm, $add) = @_;
1611 chomp(my @ls = safe_qx('svn','ls',$dir));
1612 my @ret = ();
1613 foreach (@ls) {
1614 s#/$##; # trailing slashes are evil
1615 push @ret, $_ unless $rm->{$dir}->{$_};
1616 }
1617 if (exists $add->{$dir}) {
1618 push @ret, keys %{$add->{$dir}};
1619 }
1620 return \@ret;
1621}
1622
1623sub handle_rmdir {
1624 my ($rm, $add) = @_;
1625
1626 foreach my $dir (sort {length $b <=> length $a} keys %$rm) {
1627 my $ls = svn_ls_current($dir, $rm, $add);
1628 next if (scalar @$ls);
1629 sys(qw(svn rm --force),$dir);
1630
1631 my $dn = dirname $dir;
1632 $rm->{ $dn }->{ basename $dir } = 1;
1633 $ls = svn_ls_current($dn, $rm, $add);
1634 while (scalar @$ls == 0 && $dn ne File::Spec->curdir) {
1635 sys(qw(svn rm --force),$dn);
1636 $dir = basename $dn;
1637 $dn = dirname $dn;
1638 $rm->{ $dn }->{ $dir } = 1;
1639 $ls = svn_ls_current($dn, $rm, $add);
3397f9df
EW
1640 }
1641 }
1642}
1643
a5e0cedc
EW
1644sub get_commit_message {
1645 my ($commit, $commit_msg) = (@_);
e17512f3 1646 my %log_msg = ( msg => '' );
ac8e0b91 1647 open my $msg, '>', $commit_msg or croak $!;
3397f9df
EW
1648
1649 chomp(my $type = `git-cat-file -t $commit`);
4ad4515d 1650 if ($type eq 'commit' || $type eq 'tag') {
3397f9df
EW
1651 my $pid = open my $msg_fh, '-|';
1652 defined $pid or croak $!;
1653
1654 if ($pid == 0) {
4ad4515d 1655 exec('git-cat-file', $type, $commit) or croak $!;
3397f9df
EW
1656 }
1657 my $in_msg = 0;
1658 while (<$msg_fh>) {
1659 if (!$in_msg) {
1660 $in_msg = 1 if (/^\s*$/);
df746c5a
EW
1661 } elsif (/^git-svn-id: /) {
1662 # skip this, we regenerate the correct one
1663 # on re-fetch anyways
3397f9df
EW
1664 } else {
1665 print $msg $_ or croak $!;
1666 }
1667 }
cf7424b0 1668 close $msg_fh or croak $?;
3397f9df
EW
1669 }
1670 close $msg or croak $!;
1671
1672 if ($_edit || ($type eq 'tree')) {
1673 my $editor = $ENV{VISUAL} || $ENV{EDITOR} || 'vi';
1674 system($editor, $commit_msg);
1675 }
ac8e0b91
EW
1676
1677 # file_to_s removes all trailing newlines, so just use chomp() here:
1678 open $msg, '<', $commit_msg or croak $!;
1679 { local $/; chomp($log_msg{msg} = <$msg>); }
1680 close $msg or croak $!;
1681
a5e0cedc
EW
1682 return \%log_msg;
1683}
1684
27e9fb8d
EW
1685sub set_svn_commit_env {
1686 if (defined $LC_ALL) {
1687 $ENV{LC_ALL} = $LC_ALL;
1688 } else {
1689 delete $ENV{LC_ALL};
1690 }
1691}
1692
a5e0cedc 1693sub svn_commit_tree {
42d32870 1694 my ($last, $commit) = @_;
a5e0cedc
EW
1695 my $commit_msg = "$GIT_SVN_DIR/.svn-commit.tmp.$$";
1696 my $log_msg = get_commit_message($commit, $commit_msg);
1697 my ($oneline) = ($log_msg->{msg} =~ /([^\n\r]+)/);
ac8e0b91
EW
1698 print "Committing $commit: $oneline\n";
1699
27e9fb8d 1700 set_svn_commit_env();
3397f9df 1701 my @ci_output = safe_qx(qw(svn commit -F),$commit_msg);
ce475dfc 1702 $ENV{LC_ALL} = 'C';
3397f9df 1703 unlink $commit_msg;
ce475dfc
EW
1704 my ($committed) = ($ci_output[$#ci_output] =~ /(\d+)/);
1705 if (!defined $committed) {
1706 my $out = join("\n",@ci_output);
1707 print STDERR "W: Trouble parsing \`svn commit' output:\n\n",
1708 $out, "\n\nAssuming English locale...";
1709 ($committed) = ($out =~ /^Committed revision \d+\./sm);
1710 defined $committed or die " FAILED!\n",
3397f9df 1711 "Commit output failed to parse committed revision!\n",
ce475dfc
EW
1712 print STDERR " OK\n";
1713 }
3397f9df 1714
e17512f3 1715 my @svn_up = qw(svn up);
3397f9df 1716 push @svn_up, '--ignore-externals' unless $_no_ignore_ext;
42d32870 1717 if ($_optimize_commits && ($committed == ($last->{revision} + 1))) {
ce475dfc 1718 push @svn_up, "-r$committed";
e17512f3
EW
1719 sys(@svn_up);
1720 my $info = svn_info('.');
1721 my $date = $info->{'Last Changed Date'} or die "Missing date\n";
ce475dfc
EW
1722 if ($info->{'Last Changed Rev'} != $committed) {
1723 croak "$info->{'Last Changed Rev'} != $committed\n"
e17512f3
EW
1724 }
1725 my ($Y,$m,$d,$H,$M,$S,$tz) = ($date =~
1726 /(\d{4})\-(\d\d)\-(\d\d)\s
1727 (\d\d)\:(\d\d)\:(\d\d)\s([\-\+]\d+)/x)
1728 or croak "Failed to parse date: $date\n";
a5e0cedc
EW
1729 $log_msg->{date} = "$tz $Y-$m-$d $H:$M:$S";
1730 $log_msg->{author} = $info->{'Last Changed Author'};
1731 $log_msg->{revision} = $committed;
1732 $log_msg->{msg} .= "\n";
42d32870
EW
1733 $log_msg->{parents} = [ $last->{commit} ];
1734 $log_msg->{commit} = git_commit($log_msg, $commit);
1735 return $log_msg;
e17512f3
EW
1736 }
1737 # resync immediately
42d32870 1738 push @svn_up, "-r$last->{revision}";
3397f9df 1739 sys(@svn_up);
42d32870 1740 return fetch("$committed=$commit");
3397f9df
EW
1741}
1742
9d55b41a
EW
1743sub rev_list_raw {
1744 my (@args) = @_;
1745 my $pid = open my $fh, '-|';
1746 defined $pid or croak $!;
1747 if (!$pid) {
1748 exec(qw/git-rev-list --pretty=raw/, @args) or croak $!;
1749 }
1750 return { fh => $fh, t => { } };
1751}
1752
1753sub next_rev_list_entry {
1754 my $rl = shift;
1755 my $fh = $rl->{fh};
1756 my $x = $rl->{t};
1757 while (<$fh>) {
1758 if (/^commit ($sha1)$/o) {
1759 if ($x->{c}) {
1760 $rl->{t} = { c => $1 };
1761 return $x;
1762 } else {
1763 $x->{c} = $1;
1764 }
1765 } elsif (/^parent ($sha1)$/o) {
1766 $x->{p}->{$1} = 1;
1767 } elsif (s/^ //) {
1768 $x->{m} ||= '';
1769 $x->{m} .= $_;
1770 }
1771 }
1772 return ($x != $rl->{t}) ? $x : undef;
1773}
1774
03823184
EW
1775# read the entire log into a temporary file (which is removed ASAP)
1776# and store the file handle + parser state
3397f9df
EW
1777sub svn_log_raw {
1778 my (@log_args) = @_;
03823184
EW
1779 my $log_fh = IO::File->new_tmpfile or croak $!;
1780 my $pid = fork;
3397f9df 1781 defined $pid or croak $!;
03823184
EW
1782 if (!$pid) {
1783 open STDOUT, '>&', $log_fh or croak $!;
3397f9df
EW
1784 exec (qw(svn log), @log_args) or croak $!
1785 }
03823184 1786 waitpid $pid, 0;
b8c92cad 1787 croak $? if $?;
03823184
EW
1788 seek $log_fh, 0, 0 or croak $!;
1789 return { state => 'sep', fh => $log_fh };
1790}
1791
1792sub next_log_entry {
1793 my $log = shift; # retval of svn_log_raw()
1794 my $ret = undef;
1795 my $fh = $log->{fh};
3397f9df 1796
03823184 1797 while (<$fh>) {
3397f9df
EW
1798 chomp;
1799 if (/^\-{72}$/) {
03823184
EW
1800 if ($log->{state} eq 'msg') {
1801 if ($ret->{lines}) {
1802 $ret->{msg} .= $_."\n";
1803 unless(--$ret->{lines}) {
1804 $log->{state} = 'sep';
ce6f3519
EW
1805 }
1806 } else {
1807 croak "Log parse error at: $_\n",
03823184 1808 $ret->{revision},
ce6f3519
EW
1809 "\n";
1810 }
1811 next;
1812 }
03823184 1813 if ($log->{state} ne 'sep') {
ce6f3519 1814 croak "Log parse error at: $_\n",
03823184
EW
1815 "state: $log->{state}\n",
1816 $ret->{revision},
ce6f3519
EW
1817 "\n";
1818 }
03823184 1819 $log->{state} = 'rev';
3397f9df
EW
1820
1821 # if we have an empty log message, put something there:
03823184
EW
1822 if ($ret) {
1823 $ret->{msg} ||= "\n";
1824 delete $ret->{lines};
1825 return $ret;
3397f9df
EW
1826 }
1827 next;
1828 }
03823184 1829 if ($log->{state} eq 'rev' && s/^r(\d+)\s*\|\s*//) {
3397f9df 1830 my $rev = $1;
ce6f3519
EW
1831 my ($author, $date, $lines) = split(/\s*\|\s*/, $_, 3);
1832 ($lines) = ($lines =~ /(\d+)/);
f7bae37f
SP
1833 $date = '1970-01-01 00:00:00 +0000'
1834 if ($_ignore_nodate && $date eq '(no date)');
3397f9df
EW
1835 my ($Y,$m,$d,$H,$M,$S,$tz) = ($date =~
1836 /(\d{4})\-(\d\d)\-(\d\d)\s
1837 (\d\d)\:(\d\d)\:(\d\d)\s([\-\+]\d+)/x)
1838 or croak "Failed to parse date: $date\n";
03823184 1839 $ret = { revision => $rev,
3397f9df
EW
1840 date => "$tz $Y-$m-$d $H:$M:$S",
1841 author => $author,
ce6f3519 1842 lines => $lines,
03823184 1843 msg => '' };
a9612be2
EW
1844 if (defined $_authors && ! defined $users{$author}) {
1845 die "Author: $author not defined in ",
1846 "$_authors file\n";
1847 }
03823184 1848 $log->{state} = 'msg_start';
3397f9df
EW
1849 next;
1850 }
1851 # skip the first blank line of the message:
03823184
EW
1852 if ($log->{state} eq 'msg_start' && /^$/) {
1853 $log->{state} = 'msg';
1854 } elsif ($log->{state} eq 'msg') {
1855 if ($ret->{lines}) {
1856 $ret->{msg} .= $_."\n";
1857 unless (--$ret->{lines}) {
1858 $log->{state} = 'sep';
ce6f3519
EW
1859 }
1860 } else {
1861 croak "Log parse error at: $_\n",
03823184 1862 $ret->{revision},"\n";
ce6f3519 1863 }
3397f9df
EW
1864 }
1865 }
03823184 1866 return $ret;
3397f9df
EW
1867}
1868
1869sub svn_info {
1870 my $url = shift || $SVN_URL;
1871
1872 my $pid = open my $info_fh, '-|';
1873 defined $pid or croak $!;
1874
1875 if ($pid == 0) {
1876 exec(qw(svn info),$url) or croak $!;
1877 }
1878
1879 my $ret = {};
1880 # only single-lines seem to exist in svn info output
1881 while (<$info_fh>) {
1882 chomp $_;
e17512f3 1883 if (m#^([^:]+)\s*:\s*(\S.*)$#) {
3397f9df
EW
1884 $ret->{$1} = $2;
1885 push @{$ret->{-order}}, $1;
1886 }
1887 }
cf7424b0 1888 close $info_fh or croak $?;
3397f9df
EW
1889 return $ret;
1890}
1891
1892sub sys { system(@_) == 0 or croak $? }
1893
36f5b1f0
EW
1894sub do_update_index {
1895 my ($z_cmd, $cmd, $no_text_base) = @_;
1896
1897 my $z = open my $p, '-|';
1898 defined $z or croak $!;
1899 unless ($z) { exec @$z_cmd or croak $! }
1900
1901 my $pid = open my $ui, '|-';
1902 defined $pid or croak $!;
1903 unless ($pid) {
1904 exec('git-update-index',"--$cmd",'-z','--stdin') or croak $!;
1905 }
1906 local $/ = "\0";
1907 while (my $x = <$p>) {
1908 chomp $x;
1909 if (!$no_text_base && lstat $x && ! -l _ &&
8a97e368 1910 svn_propget_base('svn:keywords', $x)) {
36f5b1f0
EW
1911 my $mode = -x _ ? 0755 : 0644;
1912 my ($v,$d,$f) = File::Spec->splitpath($x);
1913 my $tb = File::Spec->catfile($d, '.svn', 'tmp',
1914 'text-base',"$f.svn-base");
1915 $tb =~ s#^/##;
1916 unless (-f $tb) {
1917 $tb = File::Spec->catfile($d, '.svn',
1918 'text-base',"$f.svn-base");
1919 $tb =~ s#^/##;
1920 }
17a10f37 1921 my @s = stat($x);
36f5b1f0 1922 unlink $x or croak $!;
17a10f37 1923 copy($tb, $x);
36f5b1f0 1924 chmod(($mode &~ umask), $x) or croak $!;
17a10f37 1925 utime $s[8], $s[9], $x;
36f5b1f0
EW
1926 }
1927 print $ui $x,"\0";
1928 }
cf7424b0 1929 close $ui or croak $?;
36f5b1f0
EW
1930}
1931
1932sub index_changes {
a5e0cedc 1933 return if $_use_lib;
6c5cda89
EW
1934
1935 if (!-f "$GIT_SVN_DIR/info/exclude") {
1936 open my $fd, '>>', "$GIT_SVN_DIR/info/exclude" or croak $!;
1937 print $fd '.svn',"\n";
1938 close $fd or croak $!;
1939 }
36f5b1f0
EW
1940 my $no_text_base = shift;
1941 do_update_index([qw/git-diff-files --name-only -z/],
1942 'remove',
1943 $no_text_base);
1944 do_update_index([qw/git-ls-files -z --others/,
883d0a78 1945 "--exclude-from=$GIT_SVN_DIR/info/exclude"],
36f5b1f0
EW
1946 'add',
1947 $no_text_base);
3397f9df
EW
1948}
1949
1950sub s_to_file {
1951 my ($str, $file, $mode) = @_;
1952 open my $fd,'>',$file or croak $!;
1953 print $fd $str,"\n" or croak $!;
1954 close $fd or croak $!;
1955 chmod ($mode &~ umask, $file) if (defined $mode);
1956}
1957
1958sub file_to_s {
1959 my $file = shift;
1960 open my $fd,'<',$file or croak "$!: file: $file\n";
1961 local $/;
1962 my $ret = <$fd>;
1963 close $fd or croak $!;
1964 $ret =~ s/\s*$//s;
1965 return $ret;
1966}
1967
1968sub assert_revision_unknown {
42d32870
EW
1969 my $r = shift;
1970 if (my $c = revdb_get($REVDB, $r)) {
1971 croak "$r = $c already exists! Why are we refetching it?";
3397f9df
EW
1972 }
1973}
1974
ac749050
EW
1975sub trees_eq {
1976 my ($x, $y) = @_;
1977 my @x = safe_qx('git-cat-file','commit',$x);
1978 my @y = safe_qx('git-cat-file','commit',$y);
1979 if (($y[0] ne $x[0]) || $x[0] !~ /^tree $sha1\n$/
1980 || $y[0] !~ /^tree $sha1\n$/) {
1981 print STDERR "Trees not equal: $y[0] != $x[0]\n";
1982 return 0
1983 }
1984 return 1;
1985}
1986
3397f9df
EW
1987sub git_commit {
1988 my ($log_msg, @parents) = @_;
1989 assert_revision_unknown($log_msg->{revision});
69f0d91e
EW
1990 map_tree_joins() if (@_branch_from && !%tree_map);
1991
a5e0cedc
EW
1992 my (@tmp_parents, @exec_parents, %seen_parent);
1993 if (my $lparents = $log_msg->{parents}) {
1994 @tmp_parents = @$lparents
1995 }
3397f9df
EW
1996 # commit parents can be conditionally bound to a particular
1997 # svn revision via: "svn_revno=commit_sha1", filter them out here:
3397f9df
EW
1998 foreach my $p (@parents) {
1999 next unless defined $p;
2000 if ($p =~ /^(\d+)=($sha1_short)$/o) {
2001 if ($1 == $log_msg->{revision}) {
a5e0cedc 2002 push @tmp_parents, $2;
3397f9df
EW
2003 }
2004 } else {
a5e0cedc 2005 push @tmp_parents, $p if $p =~ /$sha1_short/o;
3397f9df
EW
2006 }
2007 }
a5e0cedc
EW
2008 my $tree = $log_msg->{tree};
2009 if (!defined $tree) {
2010 my $index = set_index($GIT_SVN_INDEX);
36f5b1f0 2011 index_changes();
a5e0cedc 2012 chomp($tree = `git-write-tree`);
b8c92cad 2013 croak $? if $?;
a5e0cedc
EW
2014 restore_index($index);
2015 }
a00439ac
EW
2016
2017 # just in case we clobber the existing ref, we still want that ref
2018 # as our parent:
2019 if (my $cur = eval { file_to_s("$GIT_DIR/refs/remotes/$GIT_SVN") }) {
2020 push @tmp_parents, $cur;
2021 }
2022
a5e0cedc 2023 if (exists $tree_map{$tree}) {
c1927a85
EW
2024 foreach my $p (@{$tree_map{$tree}}) {
2025 my $skip;
2026 foreach (@tmp_parents) {
2027 # see if a common parent is found
2028 my $mb = eval {
2029 safe_qx('git-merge-base', $_, $p)
2030 };
2031 next if ($@ || $?);
2032 $skip = 1;
2033 last;
2034 }
2035 next if $skip;
2036 my ($url_p, $r_p, $uuid_p) = cmt_metadata($p);
2037 next if (($SVN_UUID eq $uuid_p) &&
2038 ($log_msg->{revision} > $r_p));
2039 next if (defined $url_p && defined $SVN_URL &&
2040 ($SVN_UUID eq $uuid_p) &&
2041 ($url_p eq $SVN_URL));
2042 push @tmp_parents, $p;
2043 }
a5e0cedc
EW
2044 }
2045 foreach (@tmp_parents) {
2046 next if $seen_parent{$_};
2047 $seen_parent{$_} = 1;
2048 push @exec_parents, $_;
2049 # MAXPARENT is defined to 16 in commit-tree.c:
2050 last if @exec_parents > 16;
2051 }
2052
a00439ac
EW
2053 set_commit_env($log_msg);
2054 my @exec = ('git-commit-tree', $tree);
2055 push @exec, '-p', $_ foreach @exec_parents;
2056 defined(my $pid = open3(my $msg_fh, my $out_fh, '>&STDERR', @exec))
2057 or croak $!;
2058 print $msg_fh $log_msg->{msg} or croak $!;
2059 unless ($_no_metadata) {
2060 print $msg_fh "\ngit-svn-id: $SVN_URL\@$log_msg->{revision}",
1ca72aef 2061 " $SVN_UUID\n" or croak $!;
3397f9df 2062 }
a00439ac
EW
2063 $msg_fh->flush == 0 or croak $!;
2064 close $msg_fh or croak $!;
3397f9df 2065 chomp(my $commit = do { local $/; <$out_fh> });
a00439ac
EW
2066 close $out_fh or croak $!;
2067 waitpid $pid, 0;
2068 croak $? if $?;
3397f9df 2069 if ($commit !~ /^$sha1$/o) {
a00439ac 2070 die "Failed to commit, invalid sha1: $commit\n";
3397f9df 2071 }
a00439ac 2072 sys('git-update-ref',"refs/remotes/$GIT_SVN",$commit);
42d32870
EW
2073 revdb_set($REVDB, $log_msg->{revision}, $commit);
2074
a5e0cedc 2075 # this output is read via pipe, do not change:
3397f9df 2076 print "r$log_msg->{revision} = $commit\n";
cf7424b0
EW
2077 check_repack();
2078 return $commit;
2079}
2080
2081sub check_repack {
dc5869c0
EW
2082 if ($_repack && (--$_repack_nr == 0)) {
2083 $_repack_nr = $_repack;
2084 sys("git repack $_repack_flags");
2085 }
3397f9df
EW
2086}
2087
a9612be2 2088sub set_commit_env {
1ca72aef 2089 my ($log_msg) = @_;
a9612be2 2090 my $author = $log_msg->{author};
a5e0cedc
EW
2091 if (!defined $author || length $author == 0) {
2092 $author = '(no author)';
2093 }
a9612be2 2094 my ($name,$email) = defined $users{$author} ? @{$users{$author}}
1ca72aef 2095 : ($author,"$author\@$SVN_UUID");
a9612be2
EW
2096 $ENV{GIT_AUTHOR_NAME} = $ENV{GIT_COMMITTER_NAME} = $name;
2097 $ENV{GIT_AUTHOR_EMAIL} = $ENV{GIT_COMMITTER_EMAIL} = $email;
2098 $ENV{GIT_AUTHOR_DATE} = $ENV{GIT_COMMITTER_DATE} = $log_msg->{date};
2099}
2100
cf52b8f0
EW
2101sub apply_mod_line_blob {
2102 my $m = shift;
2103 if ($m->{mode_b} =~ /^120/) {
2104 blob_to_symlink($m->{sha1_b}, $m->{file_b});
2105 } else {
2106 blob_to_file($m->{sha1_b}, $m->{file_b});
2107 }
2108}
2109
3397f9df
EW
2110sub blob_to_symlink {
2111 my ($blob, $link) = @_;
2112 defined $link or croak "\$link not defined!\n";
2113 croak "Not a sha1: $blob\n" unless $blob =~ /^$sha1$/o;
cf52b8f0
EW
2114 if (-l $link || -f _) {
2115 unlink $link or croak $!;
2116 }
2117
3397f9df
EW
2118 my $dest = `git-cat-file blob $blob`; # no newline, so no chomp
2119 symlink $dest, $link or croak $!;
2120}
2121
2122sub blob_to_file {
2123 my ($blob, $file) = @_;
2124 defined $file or croak "\$file not defined!\n";
2125 croak "Not a sha1: $blob\n" unless $blob =~ /^$sha1$/o;
cf52b8f0
EW
2126 if (-l $file || -f _) {
2127 unlink $file or croak $!;
2128 }
2129
3397f9df
EW
2130 open my $blob_fh, '>', $file or croak "$!: $file\n";
2131 my $pid = fork;
2132 defined $pid or croak $!;
2133
2134 if ($pid == 0) {
2135 open STDOUT, '>&', $blob_fh or croak $!;
b8c92cad 2136 exec('git-cat-file','blob',$blob) or croak $!;
3397f9df
EW
2137 }
2138 waitpid $pid, 0;
2139 croak $? if $?;
2140
2141 close $blob_fh or croak $!;
2142}
2143
2144sub safe_qx {
2145 my $pid = open my $child, '-|';
2146 defined $pid or croak $!;
2147 if ($pid == 0) {
b8c92cad 2148 exec(@_) or croak $!;
3397f9df
EW
2149 }
2150 my @ret = (<$child>);
2151 close $child or croak $?;
2152 die $? if $?; # just in case close didn't error out
2153 return wantarray ? @ret : join('',@ret);
2154}
2155
1d52aba8 2156sub svn_compat_check {
a00439ac
EW
2157 if ($_follow_parent) {
2158 print STDERR 'E: --follow-parent functionality is only ',
2159 "available when SVN libraries are used\n";
2160 exit 1;
2161 }
1d52aba8
EW
2162 my @co_help = safe_qx(qw(svn co -h));
2163 unless (grep /ignore-externals/,@co_help) {
3397f9df
EW
2164 print STDERR "W: Installed svn version does not support ",
2165 "--ignore-externals\n";
2166 $_no_ignore_ext = 1;
2167 }
1d52aba8
EW
2168 if (grep /usage: checkout URL\[\@REV\]/,@co_help) {
2169 $_svn_co_url_revs = 1;
2170 }
8a97e368
EW
2171 if (grep /\[TARGET\[\@REV\]\.\.\.\]/, `svn propget -h`) {
2172 $_svn_pg_peg_revs = 1;
2173 }
7317ed90
EW
2174
2175 # I really, really hope nobody hits this...
2176 unless (grep /stop-on-copy/, (safe_qx(qw(svn log -h)))) {
2177 print STDERR <<'';
2178W: The installed svn version does not support the --stop-on-copy flag in
2179 the log command.
2180 Lets hope the directory you're tracking is not a branch or tag
2181 and was never moved within the repository...
2182
2183 $_no_stop_copy = 1;
2184 }
1d52aba8
EW
2185}
2186
2187# *sigh*, new versions of svn won't honor -r<rev> without URL@<rev>,
2188# (and they won't honor URL@<rev> without -r<rev>, too!)
2189sub svn_cmd_checkout {
2190 my ($url, $rev, $dir) = @_;
2191 my @cmd = ('svn','co', "-r$rev");
2192 push @cmd, '--ignore-externals' unless $_no_ignore_ext;
2193 $url .= "\@$rev" if $_svn_co_url_revs;
2194 sys(@cmd, $url, $dir);
3397f9df 2195}
2beb3cdd
EW
2196
2197sub check_upgrade_needed {
cf7424b0 2198 if (!-r $REVDB) {
1a82e793 2199 -d $GIT_SVN_DIR or mkpath([$GIT_SVN_DIR]);
cf7424b0
EW
2200 open my $fh, '>>',$REVDB or croak $!;
2201 close $fh;
2202 }
2beb3cdd
EW
2203 my $old = eval {
2204 my $pid = open my $child, '-|';
2205 defined $pid or croak $!;
2206 if ($pid == 0) {
2207 close STDERR;
b8c92cad 2208 exec('git-rev-parse',"$GIT_SVN-HEAD") or croak $!;
2beb3cdd
EW
2209 }
2210 my @ret = (<$child>);
2211 close $child or croak $?;
2212 die $? if $?; # just in case close didn't error out
2213 return wantarray ? @ret : join('',@ret);
2214 };
2215 return unless $old;
2216 my $head = eval { safe_qx('git-rev-parse',"refs/remotes/$GIT_SVN") };
2217 if ($@ || !$head) {
2218 print STDERR "Please run: $0 rebuild --upgrade\n";
2219 exit 1;
2220 }
2221}
2222
69f0d91e
EW
2223# fills %tree_map with a reverse mapping of trees to commits. Useful
2224# for finding parents to commit on.
2225sub map_tree_joins {
098749d9 2226 my %seen;
69f0d91e
EW
2227 foreach my $br (@_branch_from) {
2228 my $pid = open my $pipe, '-|';
2229 defined $pid or croak $!;
2230 if ($pid == 0) {
098749d9 2231 exec(qw(git-rev-list --topo-order --pretty=raw), $br)
b8c92cad 2232 or croak $!;
69f0d91e
EW
2233 }
2234 while (<$pipe>) {
2235 if (/^commit ($sha1)$/o) {
2236 my $commit = $1;
098749d9
EW
2237
2238 # if we've seen a commit,
2239 # we've seen its parents
2240 last if $seen{$commit};
69f0d91e
EW
2241 my ($tree) = (<$pipe> =~ /^tree ($sha1)$/o);
2242 unless (defined $tree) {
2243 die "Failed to parse commit $commit\n";
2244 }
2245 push @{$tree_map{$tree}}, $commit;
098749d9 2246 $seen{$commit} = 1;
69f0d91e
EW
2247 }
2248 }
098749d9 2249 close $pipe; # we could be breaking the pipe early
69f0d91e
EW
2250 }
2251}
2252
bf78b1d8
EW
2253sub load_all_refs {
2254 if (@_branch_from) {
2255 print STDERR '--branch|-b parameters are ignored when ',
2256 "--branch-all-refs|-B is passed\n";
2257 }
2258
2259 # don't worry about rev-list on non-commit objects/tags,
2260 # it shouldn't blow up if a ref is a blob or tree...
2261 chomp(@_branch_from = `git-rev-parse --symbolic --all`);
2262}
2263
eeb0abe0
EW
2264# '<svn username> = real-name <email address>' mapping based on git-svnimport:
2265sub load_authors {
2266 open my $authors, '<', $_authors or die "Can't open $_authors $!\n";
2267 while (<$authors>) {
2268 chomp;
8815788e 2269 next unless /^(\S+?|\(no author\))\s*=\s*(.+?)\s*<(.+)>\s*$/;
eeb0abe0
EW
2270 my ($user, $name, $email) = ($1, $2, $3);
2271 $users{$user} = [$name, $email];
2272 }
2273 close $authors or croak $!;
2274}
2275
79bb8d88
EW
2276sub rload_authors {
2277 open my $authors, '<', $_authors or die "Can't open $_authors $!\n";
2278 while (<$authors>) {
2279 chomp;
2280 next unless /^(\S+?)\s*=\s*(.+?)\s*<(.+)>\s*$/;
2281 my ($user, $name, $email) = ($1, $2, $3);
2282 $rusers{"$name <$email>"} = $user;
2283 }
2284 close $authors or croak $!;
2285}
2286
8a97e368
EW
2287sub svn_propget_base {
2288 my ($p, $f) = @_;
2289 $f .= '@BASE' if $_svn_pg_peg_revs;
2290 return safe_qx(qw/svn propget/, $p, $f);
2291}
2292
9d55b41a
EW
2293sub git_svn_each {
2294 my $sub = shift;
2295 foreach (`git-rev-parse --symbolic --all`) {
2296 next unless s#^refs/remotes/##;
2297 chomp $_;
2298 next unless -f "$GIT_DIR/svn/$_/info/url";
2299 &$sub($_);
2300 }
2301}
2302
42d32870
EW
2303sub migrate_revdb {
2304 git_svn_each(sub {
2305 my $id = shift;
2306 defined(my $pid = fork) or croak $!;
2307 if (!$pid) {
2308 $GIT_SVN = $ENV{GIT_SVN_ID} = $id;
2309 init_vars();
2310 exit 0 if -r $REVDB;
2311 print "Upgrading svn => git mapping...\n";
1a82e793 2312 -d $GIT_SVN_DIR or mkpath([$GIT_SVN_DIR]);
42d32870
EW
2313 open my $fh, '>>',$REVDB or croak $!;
2314 close $fh;
2315 rebuild();
2316 print "Done upgrading. You may now delete the ",
2317 "deprecated $GIT_SVN_DIR/revs directory\n";
2318 exit 0;
2319 }
2320 waitpid $pid, 0;
2321 croak $? if $?;
2322 });
2323}
2324
883d0a78 2325sub migration_check {
42d32870 2326 migrate_revdb() unless (-e $REVDB);
883d0a78
EW
2327 return if (-d "$GIT_DIR/svn" || !-d $GIT_DIR);
2328 print "Upgrading repository...\n";
2329 unless (-d "$GIT_DIR/svn") {
2330 mkdir "$GIT_DIR/svn" or croak $!;
2331 }
2332 print "Data from a previous version of git-svn exists, but\n\t",
2333 "$GIT_SVN_DIR\n\t(required for this version ",
2334 "($VERSION) of git-svn) does not.\n";
2335
2336 foreach my $x (`git-rev-parse --symbolic --all`) {
2337 next unless $x =~ s#^refs/remotes/##;
2338 chomp $x;
2339 next unless -f "$GIT_DIR/$x/info/url";
2340 my $u = eval { file_to_s("$GIT_DIR/$x/info/url") };
2341 next unless $u;
2342 my $dn = dirname("$GIT_DIR/svn/$x");
2343 mkpath([$dn]) unless -d $dn;
2344 rename "$GIT_DIR/$x", "$GIT_DIR/svn/$x" or croak "$!: $x";
883d0a78 2345 }
42d32870 2346 migrate_revdb() if (-d $GIT_SVN_DIR && !-w $REVDB);
883d0a78
EW
2347 print "Done upgrading.\n";
2348}
2349
9d55b41a 2350sub find_rev_before {
42d32870
EW
2351 my ($r, $id, $eq_ok) = @_;
2352 my $f = "$GIT_DIR/svn/$id/.rev_db";
cf7424b0
EW
2353 return (undef,undef) unless -r $f;
2354 --$r unless $eq_ok;
42d32870
EW
2355 while ($r > 0) {
2356 if (my $c = revdb_get($f, $r)) {
2357 return ($r, $c);
2358 }
2359 --$r;
9d55b41a
EW
2360 }
2361 return (undef, undef);
2362}
2363
b8c92cad
EW
2364sub init_vars {
2365 $GIT_SVN ||= $ENV{GIT_SVN_ID} || 'git-svn';
2366 $GIT_SVN_DIR = "$GIT_DIR/svn/$GIT_SVN";
42d32870 2367 $REVDB = "$GIT_SVN_DIR/.rev_db";
b8c92cad
EW
2368 $GIT_SVN_INDEX = "$GIT_SVN_DIR/index";
2369 $SVN_URL = undef;
b8c92cad 2370 $SVN_WC = "$GIT_SVN_DIR/tree";
c1927a85 2371 %tree_map = ();
b8c92cad
EW
2372}
2373
2374# convert GetOpt::Long specs for use by git-repo-config
2375sub read_repo_config {
2376 return unless -d $GIT_DIR;
2377 my $opts = shift;
2378 foreach my $o (keys %$opts) {
2379 my $v = $opts->{$o};
2380 my ($key) = ($o =~ /^([a-z\-]+)/);
2381 $key =~ s/-//g;
2382 my $arg = 'git-repo-config';
2383 $arg .= ' --int' if ($o =~ /[:=]i$/);
2384 $arg .= ' --bool' if ($o !~ /[:=][sfi]$/);
2385 if (ref $v eq 'ARRAY') {
2386 chomp(my @tmp = `$arg --get-all svn.$key`);
2387 @$v = @tmp if @tmp;
2388 } else {
2389 chomp(my $tmp = `$arg --get svn.$key`);
2390 if ($tmp && !($arg =~ / --bool / && $tmp eq 'false')) {
2391 $$v = $tmp;
2392 }
2393 }
2394 }
2395}
2396
dc5869c0
EW
2397sub set_default_vals {
2398 if (defined $_repack) {
2399 $_repack = 1000 if ($_repack <= 0);
2400 $_repack_nr = $_repack;
cf7424b0 2401 $_repack_flags ||= '-d';
dc5869c0
EW
2402 }
2403}
2404
9d55b41a
EW
2405sub read_grafts {
2406 my $gr_file = shift;
2407 my ($grafts, $comments) = ({}, {});
2408 if (open my $fh, '<', $gr_file) {
2409 my @tmp;
2410 while (<$fh>) {
2411 if (/^($sha1)\s+/) {
2412 my $c = $1;
2413 if (@tmp) {
2414 @{$comments->{$c}} = @tmp;
2415 @tmp = ();
2416 }
2417 foreach my $p (split /\s+/, $_) {
2418 $grafts->{$c}->{$p} = 1;
2419 }
2420 } else {
2421 push @tmp, $_;
2422 }
2423 }
2424 close $fh or croak $!;
2425 @{$comments->{'END'}} = @tmp if @tmp;
2426 }
2427 return ($grafts, $comments);
2428}
2429
2430sub write_grafts {
2431 my ($grafts, $comments, $gr_file) = @_;
2432
2433 open my $fh, '>', $gr_file or croak $!;
2434 foreach my $c (sort keys %$grafts) {
2435 if ($comments->{$c}) {
2436 print $fh $_ foreach @{$comments->{$c}};
2437 }
2438 my $p = $grafts->{$c};
c1927a85 2439 my %x; # real parents
9d55b41a
EW
2440 delete $p->{$c}; # commits are not self-reproducing...
2441 my $pid = open my $ch, '-|';
2442 defined $pid or croak $!;
2443 if (!$pid) {
2444 exec(qw/git-cat-file commit/, $c) or croak $!;
2445 }
2446 while (<$ch>) {
c1927a85
EW
2447 if (/^parent ($sha1)/) {
2448 $x{$1} = $p->{$1} = 1;
9d55b41a 2449 } else {
c1927a85 2450 last unless /^\S/;
9d55b41a
EW
2451 }
2452 }
2453 close $ch; # breaking the pipe
c1927a85
EW
2454
2455 # if real parents are the only ones in the grafts, drop it
2456 next if join(' ',sort keys %$p) eq join(' ',sort keys %x);
2457
2458 my (@ip, @jp, $mb);
2459 my %del = %x;
2460 @ip = @jp = keys %$p;
2461 foreach my $i (@ip) {
2462 next if $del{$i} || $p->{$i} == 2;
2463 foreach my $j (@jp) {
2464 next if $i eq $j || $del{$j} || $p->{$j} == 2;
2465 $mb = eval { safe_qx('git-merge-base',$i,$j) };
2466 next unless $mb;
2467 chomp $mb;
2468 next if $x{$mb};
2469 if ($mb eq $j) {
2470 delete $p->{$i};
2471 $del{$i} = 1;
2472 } elsif ($mb eq $i) {
2473 delete $p->{$j};
2474 $del{$j} = 1;
2475 }
2476 }
2477 }
2478
2479 # if real parents are the only ones in the grafts, drop it
2480 next if join(' ',sort keys %$p) eq join(' ',sort keys %x);
2481
9d55b41a
EW
2482 print $fh $c, ' ', join(' ', sort keys %$p),"\n";
2483 }
2484 if ($comments->{'END'}) {
2485 print $fh $_ foreach @{$comments->{'END'}};
2486 }
2487 close $fh or croak $!;
2488}
2489
a00439ac
EW
2490sub read_url_paths_all {
2491 my ($l_map, $pfx, $p) = @_;
2492 my @dir;
2493 foreach (<$p/*>) {
2494 if (-r "$_/info/url") {
2495 $pfx .= '/' if $pfx && $pfx !~ m!/$!;
2496 my $id = $pfx . basename $_;
2497 my $url = file_to_s("$_/info/url");
2498 my ($u, $p) = repo_path_split($url);
2499 $l_map->{$u}->{$p} = $id;
2500 } elsif (-d $_) {
2501 push @dir, $_;
2502 }
2503 }
2504 foreach (@dir) {
2505 my $x = $_;
2506 $x =~ s!^\Q$GIT_DIR\E/svn/!!o;
2507 read_url_paths_all($l_map, $x, $_);
2508 }
2509}
2510
2511# this one only gets ids that have been imported, not new ones
9d55b41a
EW
2512sub read_url_paths {
2513 my $l_map = {};
2514 git_svn_each(sub { my $x = shift;
6c5cda89
EW
2515 my $url = file_to_s("$GIT_DIR/svn/$x/info/url");
2516 my ($u, $p) = repo_path_split($url);
9d55b41a
EW
2517 $l_map->{$u}->{$p} = $x;
2518 });
2519 return $l_map;
2520}
2521
79bb8d88 2522sub extract_metadata {
c1927a85 2523 my $id = shift or return (undef, undef, undef);
79bb8d88
EW
2524 my ($url, $rev, $uuid) = ($id =~ /^git-svn-id:\s(\S+?)\@(\d+)
2525 \s([a-f\d\-]+)$/x);
e70dc780 2526 if (!defined $rev || !$uuid || !$url) {
79bb8d88 2527 # some of the original repositories I made had
82e5a82f 2528 # identifiers like this:
79bb8d88
EW
2529 ($rev, $uuid) = ($id =~/^git-svn-id:\s(\d+)\@([a-f\d\-]+)/);
2530 }
2531 return ($url, $rev, $uuid);
2532}
2533
c1927a85
EW
2534sub cmt_metadata {
2535 return extract_metadata((grep(/^git-svn-id: /,
2536 safe_qx(qw/git-cat-file commit/, shift)))[-1]);
2537}
2538
2539sub get_commit_time {
2540 my $cmt = shift;
2541 defined(my $pid = open my $fh, '-|') or croak $!;
2542 if (!$pid) {
2543 exec qw/git-rev-list --pretty=raw -n1/, $cmt or croak $!;
2544 }
2545 while (<$fh>) {
2546 /^committer\s(?:.+) (\d+) ([\-\+]?\d+)$/ or next;
2547 my ($s, $tz) = ($1, $2);
2548 if ($tz =~ s/^\+//) {
2549 $s += tz_to_s_offset($tz);
2550 } elsif ($tz =~ s/^\-//) {
2551 $s -= tz_to_s_offset($tz);
2552 }
2553 close $fh;
2554 return $s;
2555 }
2556 die "Can't get commit time for commit: $cmt\n";
2557}
2558
79bb8d88
EW
2559sub tz_to_s_offset {
2560 my ($tz) = @_;
2561 $tz =~ s/(\d\d)$//;
2562 return ($1 * 60) + ($tz * 3600);
2563}
2564
9aca0258
EW
2565# adapted from pager.c
2566sub config_pager {
2567 $_pager ||= $ENV{GIT_PAGER} || $ENV{PAGER};
2568 if (!defined $_pager) {
2569 $_pager = 'less';
2570 } elsif (length $_pager == 0 || $_pager eq 'cat') {
2571 $_pager = undef;
79bb8d88 2572 }
9aca0258
EW
2573}
2574
2575sub run_pager {
2576 return unless -t *STDOUT;
79bb8d88
EW
2577 pipe my $rfd, my $wfd or return;
2578 defined(my $pid = fork) or croak $!;
2579 if (!$pid) {
2580 open STDOUT, '>&', $wfd or croak $!;
2581 return;
2582 }
2583 open STDIN, '<&', $rfd or croak $!;
9aca0258
EW
2584 $ENV{LESS} ||= 'FRSX';
2585 exec $_pager or croak "Can't run pager: $! ($_pager)\n";
79bb8d88
EW
2586}
2587
2588sub get_author_info {
2589 my ($dest, $author, $t, $tz) = @_;
2590 $author =~ s/(?:^\s*|\s*$)//g;
c0d48222 2591 $dest->{a_raw} = $author;
79bb8d88
EW
2592 my $_a;
2593 if ($_authors) {
2594 $_a = $rusers{$author} || undef;
2595 }
2596 if (!$_a) {
2597 ($_a) = ($author =~ /<([^>]+)\@[^>]+>$/);
2598 }
2599 $dest->{t} = $t;
2600 $dest->{tz} = $tz;
2601 $dest->{a} = $_a;
2602 # Date::Parse isn't in the standard Perl distro :(
2603 if ($tz =~ s/^\+//) {
2604 $t += tz_to_s_offset($tz);
2605 } elsif ($tz =~ s/^\-//) {
2606 $t -= tz_to_s_offset($tz);
2607 }
2608 $dest->{t_utc} = $t;
2609}
2610
2611sub process_commit {
2612 my ($c, $r_min, $r_max, $defer) = @_;
2613 if (defined $r_min && defined $r_max) {
2614 if ($r_min == $c->{r} && $r_min == $r_max) {
2615 show_commit($c);
2616 return 0;
2617 }
2618 return 1 if $r_min == $r_max;
2619 if ($r_min < $r_max) {
2620 # we need to reverse the print order
2621 return 0 if (defined $_limit && --$_limit < 0);
2622 push @$defer, $c;
2623 return 1;
2624 }
2625 if ($r_min != $r_max) {
2626 return 1 if ($r_min < $c->{r});
2627 return 1 if ($r_max > $c->{r});
2628 }
2629 }
2630 return 0 if (defined $_limit && --$_limit < 0);
2631 show_commit($c);
2632 return 1;
2633}
2634
2635sub show_commit {
2636 my $c = shift;
2637 if ($_oneline) {
2638 my $x = "\n";
2639 if (my $l = $c->{l}) {
2640 while ($l->[0] =~ /^\s*$/) { shift @$l }
2641 $x = $l->[0];
2642 }
2643 $_l_fmt ||= 'A' . length($c->{r});
2644 print 'r',pack($_l_fmt, $c->{r}),' | ';
2645 print "$c->{c} | " if $_show_commit;
2646 print $x;
2647 } else {
2648 show_commit_normal($c);
2649 }
2650}
2651
74a31a10
EW
2652sub show_commit_changed_paths {
2653 my ($c) = @_;
2654 return unless $c->{changed};
2655 print "Changed paths:\n", @{$c->{changed}};
2656}
2657
79bb8d88
EW
2658sub show_commit_normal {
2659 my ($c) = @_;
2660 print '-' x72, "\nr$c->{r} | ";
2661 print "$c->{c} | " if $_show_commit;
2662 print "$c->{a} | ", strftime("%Y-%m-%d %H:%M:%S %z (%a, %d %b %Y)",
2663 localtime($c->{t_utc})), ' | ';
2664 my $nr_line = 0;
2665
2666 if (my $l = $c->{l}) {
74a31a10
EW
2667 while ($l->[$#$l] eq "\n" && $#$l > 0
2668 && $l->[($#$l - 1)] eq "\n") {
79bb8d88
EW
2669 pop @$l;
2670 }
2671 $nr_line = scalar @$l;
2672 if (!$nr_line) {
2673 print "1 line\n\n\n";
2674 } else {
2675 if ($nr_line == 1) {
2676 $nr_line = '1 line';
2677 } else {
2678 $nr_line .= ' lines';
2679 }
74a31a10
EW
2680 print $nr_line, "\n";
2681 show_commit_changed_paths($c);
2682 print "\n";
79bb8d88
EW
2683 print $_ foreach @$l;
2684 }
2685 } else {
74a31a10
EW
2686 print "1 line\n";
2687 show_commit_changed_paths($c);
2688 print "\n";
79bb8d88
EW
2689
2690 }
2691 foreach my $x (qw/raw diff/) {
2692 if ($c->{$x}) {
2693 print "\n";
2694 print $_ foreach @{$c->{$x}}
2695 }
2696 }
2697}
2698
a5e0cedc
EW
2699sub libsvn_load {
2700 return unless $_use_lib;
2701 $_use_lib = eval {
2702 require SVN::Core;
dc62e25c
EW
2703 if ($SVN::Core::VERSION lt '1.1.0') {
2704 die "Need SVN::Core 1.1.0 or better ",
a5e0cedc
EW
2705 "(got $SVN::Core::VERSION) ",
2706 "Falling back to command-line svn\n";
2707 }
2708 require SVN::Ra;
2709 require SVN::Delta;
2710 push @SVN::Git::Editor::ISA, 'SVN::Delta::Editor';
27a1a801
EW
2711 push @SVN::Git::Fetcher::ISA, 'SVN::Delta::Editor';
2712 *SVN::Git::Fetcher::process_rm = *process_rm;
2713 *SVN::Git::Fetcher::safe_qx = *safe_qx;
a5e0cedc
EW
2714 my $kill_stupid_warnings = $SVN::Node::none.$SVN::Node::file.
2715 $SVN::Node::dir.$SVN::Node::unknown.
2716 $SVN::Node::none.$SVN::Node::file.
30d055aa
EW
2717 $SVN::Node::dir.$SVN::Node::unknown.
2718 $SVN::Auth::SSL::CNMISMATCH.
2719 $SVN::Auth::SSL::NOTYETVALID.
2720 $SVN::Auth::SSL::EXPIRED.
2721 $SVN::Auth::SSL::UNKNOWNCA.
2722 $SVN::Auth::SSL::OTHER;
a5e0cedc
EW
2723 1;
2724 };
2725}
2726
30d055aa
EW
2727sub _simple_prompt {
2728 my ($cred, $realm, $default_username, $may_save, $pool) = @_;
2729 $may_save = undef if $_no_auth_cache;
2730 $default_username = $_username if defined $_username;
2731 if (defined $default_username && length $default_username) {
2732 if (defined $realm && length $realm) {
2733 print "Authentication realm: $realm\n";
2734 }
2735 $cred->username($default_username);
2736 } else {
2737 _username_prompt($cred, $realm, $may_save, $pool);
2738 }
2739 $cred->password(_read_password("Password for '" .
2740 $cred->username . "': ", $realm));
2741 $cred->may_save($may_save);
2742 $SVN::_Core::SVN_NO_ERROR;
2743}
2744
2745sub _ssl_server_trust_prompt {
2746 my ($cred, $realm, $failures, $cert_info, $may_save, $pool) = @_;
2747 $may_save = undef if $_no_auth_cache;
2748 print "Error validating server certificate for '$realm':\n";
2749 if ($failures & $SVN::Auth::SSL::UNKNOWNCA) {
2750 print " - The certificate is not issued by a trusted ",
2751 "authority. Use the\n",
2752 " fingerprint to validate the certificate manually!\n";
2753 }
2754 if ($failures & $SVN::Auth::SSL::CNMISMATCH) {
2755 print " - The certificate hostname does not match.\n";
2756 }
2757 if ($failures & $SVN::Auth::SSL::NOTYETVALID) {
2758 print " - The certificate is not yet valid.\n";
2759 }
2760 if ($failures & $SVN::Auth::SSL::EXPIRED) {
2761 print " - The certificate has expired.\n";
2762 }
2763 if ($failures & $SVN::Auth::SSL::OTHER) {
2764 print " - The certificate has an unknown error.\n";
2765 }
2766 printf( "Certificate information:\n".
2767 " - Hostname: %s\n".
2768 " - Valid: from %s until %s\n".
2769 " - Issuer: %s\n".
2770 " - Fingerprint: %s\n",
2771 map $cert_info->$_, qw(hostname valid_from valid_until
2772 issuer_dname fingerprint) );
2773 my $choice;
2774prompt:
2775 print $may_save ?
2776 "(R)eject, accept (t)emporarily or accept (p)ermanently? " :
2777 "(R)eject or accept (t)emporarily? ";
2778 $choice = lc(substr(<STDIN> || 'R', 0, 1));
2779 if ($choice =~ /^t$/i) {
2780 $cred->may_save(undef);
2781 } elsif ($choice =~ /^r$/i) {
2782 return -1;
2783 } elsif ($may_save && $choice =~ /^p$/i) {
2784 $cred->may_save($may_save);
2785 } else {
2786 goto prompt;
2787 }
2788 $cred->accepted_failures($failures);
2789 $SVN::_Core::SVN_NO_ERROR;
2790}
2791
2792sub _ssl_client_cert_prompt {
2793 my ($cred, $realm, $may_save, $pool) = @_;
2794 $may_save = undef if $_no_auth_cache;
2795 print "Client certificate filename: ";
2796 chomp(my $filename = <STDIN>);
2797 $cred->cert_file($filename);
2798 $cred->may_save($may_save);
2799 $SVN::_Core::SVN_NO_ERROR;
2800}
2801
2802sub _ssl_client_cert_pw_prompt {
2803 my ($cred, $realm, $may_save, $pool) = @_;
2804 $may_save = undef if $_no_auth_cache;
2805 $cred->password(_read_password("Password: ", $realm));
2806 $cred->may_save($may_save);
2807 $SVN::_Core::SVN_NO_ERROR;
2808}
2809
2810sub _username_prompt {
2811 my ($cred, $realm, $may_save, $pool) = @_;
2812 $may_save = undef if $_no_auth_cache;
2813 if (defined $realm && length $realm) {
2814 print "Authentication realm: $realm\n";
2815 }
2816 my $username;
2817 if (defined $_username) {
2818 $username = $_username;
2819 } else {
2820 print "Username: ";
2821 chomp($username = <STDIN>);
2822 }
2823 $cred->username($username);
2824 $cred->may_save($may_save);
2825 $SVN::_Core::SVN_NO_ERROR;
2826}
2827
2828sub _read_password {
2829 my ($prompt, $realm) = @_;
2830 print $prompt;
2831 require Term::ReadKey;
2832 Term::ReadKey::ReadMode('noecho');
2833 my $password = '';
2834 while (defined(my $key = Term::ReadKey::ReadKey(0))) {
2835 last if $key =~ /[\012\015]/; # \n\r
2836 $password .= $key;
2837 }
2838 Term::ReadKey::ReadMode('restore');
2839 print "\n";
2840 $password;
2841}
2842
a5e0cedc
EW
2843sub libsvn_connect {
2844 my ($url) = @_;
747fa12c
EW
2845 SVN::_Core::svn_config_ensure($_config_dir, undef);
2846 my ($baton, $callbacks) = SVN::Core::auth_open_helper([
2847 SVN::Client::get_simple_provider(),
2848 SVN::Client::get_ssl_server_trust_file_provider(),
2849 SVN::Client::get_simple_prompt_provider(
2850 \&_simple_prompt, 2),
2851 SVN::Client::get_ssl_client_cert_prompt_provider(
2852 \&_ssl_client_cert_prompt, 2),
2853 SVN::Client::get_ssl_client_cert_pw_prompt_provider(
2854 \&_ssl_client_cert_pw_prompt, 2),
2855 SVN::Client::get_username_provider(),
2856 SVN::Client::get_ssl_server_trust_prompt_provider(
2857 \&_ssl_server_trust_prompt),
2858 SVN::Client::get_username_prompt_provider(
2859 \&_username_prompt, 2),
2860 ]);
6f23ebf6 2861 my $config = SVN::Core::config_get_config($_config_dir);
747fa12c 2862 my $ra = SVN::Ra->new(url => $url, auth => $baton,
6f23ebf6 2863 config => $config,
747fa12c
EW
2864 pool => SVN::Pool->new,
2865 auth_provider_callbacks => $callbacks);
27a1a801
EW
2866
2867 my $df = $ENV{GIT_SVN_DELTA_FETCH};
2868 if (defined $df) {
2869 $_xfer_delta = $df;
2870 } else {
2871 $_xfer_delta = ($url =~ m#^file://#) ? undef : 1;
2872 }
747fa12c
EW
2873 $ra->{svn_path} = $url;
2874 $ra->{repos_root} = $ra->get_repos_root;
2875 $ra->{svn_path} =~ s#^\Q$ra->{repos_root}\E/*##;
2876 push @repo_path_split_cache, qr/^(\Q$ra->{repos_root}\E)/;
2877 return $ra;
2878}
2879
a552db3a
EW
2880sub libsvn_can_do_switch {
2881 unless (defined $_svn_can_do_switch) {
2882 my $pool = SVN::Pool->new;
2883 my $rep = eval {
2884 $SVN->do_switch(1, '', 0, $SVN->{url},
2885 SVN::Delta::Editor->new, $pool);
2886 };
2887 if ($@) {
2888 $_svn_can_do_switch = 0;
2889 } else {
2890 $rep->abort_report($pool);
2891 $_svn_can_do_switch = 1;
2892 }
2893 $pool->clear;
2894 }
2895 $_svn_can_do_switch;
2896}
2897
747fa12c
EW
2898sub libsvn_dup_ra {
2899 my ($ra) = @_;
6f23ebf6
EW
2900 SVN::Ra->new(map { $_ => $ra->{$_} } qw/config url
2901 auth auth_provider_callbacks repos_root svn_path/);
a5e0cedc
EW
2902}
2903
2904sub libsvn_get_file {
75bd7e37 2905 my ($gui, $f, $rev, $chg) = @_;
747fa12c 2906 $f =~ s#^/##;
75bd7e37 2907 print "\t$chg\t$f\n" unless $_q;
a5e0cedc 2908
968bdf1f 2909 my ($hash, $pid, $in, $out);
a5e0cedc 2910 my $pool = SVN::Pool->new;
968bdf1f
EW
2911 defined($pid = open3($in, $out, '>&STDERR',
2912 qw/git-hash-object -w --stdin/)) or croak $!;
dc62e25c
EW
2913 # redirect STDOUT for SVN 1.1.x compatibility
2914 open my $stdout, '>&', \*STDOUT or croak $!;
2915 open STDOUT, '>&', $in or croak $!;
dc62e25c 2916 my ($r, $props) = $SVN->get_file($f, $rev, \*STDOUT, $pool);
968bdf1f 2917 $in->flush == 0 or croak $!;
dc62e25c 2918 open STDOUT, '>&', $stdout or croak $!;
968bdf1f 2919 close $in or croak $!;
dc62e25c 2920 close $stdout or croak $!;
a5e0cedc 2921 $pool->clear;
968bdf1f
EW
2922 chomp($hash = do { local $/; <$out> });
2923 close $out or croak $!;
2924 waitpid $pid, 0;
2925 $hash =~ /^$sha1$/o or die "not a sha1: $hash\n";
2926
2927 my $mode = exists $props->{'svn:executable'} ? '100755' : '100644';
a5e0cedc
EW
2928 if (exists $props->{'svn:special'}) {
2929 $mode = '120000';
968bdf1f 2930 my $link = `git-cat-file blob $hash`;
a5e0cedc
EW
2931 $link =~ s/^link // or die "svn:special file with contents: <",
2932 $link, "> is not understood\n";
968bdf1f
EW
2933 defined($pid = open3($in, $out, '>&STDERR',
2934 qw/git-hash-object -w --stdin/)) or croak $!;
2935 print $in $link;
2936 $in->flush == 0 or croak $!;
2937 close $in or croak $!;
2938 chomp($hash = do { local $/; <$out> });
2939 close $out or croak $!;
2940 waitpid $pid, 0;
2941 $hash =~ /^$sha1$/o or die "not a sha1: $hash\n";
a5e0cedc 2942 }
747fa12c 2943 print $gui $mode,' ',$hash,"\t",$f,"\0" or croak $!;
a5e0cedc
EW
2944}
2945
2946sub libsvn_log_entry {
2947 my ($rev, $author, $date, $msg, $parents) = @_;
2948 my ($Y,$m,$d,$H,$M,$S) = ($date =~ /^(\d{4})\-(\d\d)\-(\d\d)T
2949 (\d\d)\:(\d\d)\:(\d\d).\d+Z$/x)
2950 or die "Unable to parse date: $date\n";
2951 if (defined $_authors && ! defined $users{$author}) {
2952 die "Author: $author not defined in $_authors file\n";
2953 }
308906fa 2954 $msg = '' if ($rev == 0 && !defined $msg);
a5e0cedc
EW
2955 return { revision => $rev, date => "+0000 $Y-$m-$d $H:$M:$S",
2956 author => $author, msg => $msg."\n", parents => $parents || [] }
2957}
2958
2959sub process_rm {
0864e3ba 2960 my ($gui, $last_commit, $f, $q) = @_;
a5e0cedc
EW
2961 # remove entire directories.
2962 if (safe_qx('git-ls-tree',$last_commit,'--',$f) =~ /^040000 tree/) {
2963 defined(my $pid = open my $ls, '-|') or croak $!;
2964 if (!$pid) {
2965 exec(qw/git-ls-tree -r --name-only -z/,
2966 $last_commit,'--',$f) or croak $!;
2967 }
2968 local $/ = "\0";
2969 while (<$ls>) {
2970 print $gui '0 ',0 x 40,"\t",$_ or croak $!;
0864e3ba 2971 print "\tD\t$_\n" unless $q;
a5e0cedc 2972 }
0864e3ba 2973 print "\tD\t$f/\n" unless $q;
cf7424b0 2974 close $ls or croak $?;
a5e0cedc
EW
2975 } else {
2976 print $gui '0 ',0 x 40,"\t",$f,"\0" or croak $!;
0864e3ba 2977 print "\tD\t$f\n" unless $q;
a5e0cedc
EW
2978 }
2979}
2980
2981sub libsvn_fetch {
27a1a801
EW
2982 $_xfer_delta ? libsvn_fetch_delta(@_) : libsvn_fetch_full(@_);
2983}
2984
2985sub libsvn_fetch_delta {
2986 my ($last_commit, $paths, $rev, $author, $date, $msg) = @_;
2987 my $pool = SVN::Pool->new;
0864e3ba 2988 my $ed = SVN::Git::Fetcher->new({ c => $last_commit, q => $_q });
27a1a801
EW
2989 my $reporter = $SVN->do_update($rev, '', 1, $ed, $pool);
2990 my @lock = $SVN::Core::VERSION ge '1.2.0' ? (undef) : ();
2991 my (undef, $last_rev, undef) = cmt_metadata($last_commit);
2992 $reporter->set_path('', $last_rev, 0, @lock, $pool);
2993 $reporter->finish_report($pool);
2994 $pool->clear;
dad73c0b
EW
2995 unless ($ed->{git_commit_ok}) {
2996 die "SVN connection failed somewhere...\n";
2997 }
27a1a801
EW
2998 libsvn_log_entry($rev, $author, $date, $msg, [$last_commit]);
2999}
3000
3001sub libsvn_fetch_full {
a5e0cedc
EW
3002 my ($last_commit, $paths, $rev, $author, $date, $msg) = @_;
3003 open my $gui, '| git-update-index -z --index-info' or croak $!;
6173c197 3004 my %amr;
747fa12c 3005 my $p = $SVN->{svn_path};
a5e0cedc
EW
3006 foreach my $f (keys %$paths) {
3007 my $m = $paths->{$f}->action();
efe4631d
EW
3008 if (length $p) {
3009 $f =~ s#^/\Q$p\E/##;
3010 next if $f =~ m#^/#;
3011 } else {
3012 $f =~ s#^/##;
3013 }
a5e0cedc 3014 if ($m =~ /^[DR]$/) {
0864e3ba 3015 process_rm($gui, $last_commit, $f, $_q);
a5e0cedc
EW
3016 next if $m eq 'D';
3017 # 'R' can be file replacements, too, right?
3018 }
3019 my $pool = SVN::Pool->new;
3020 my $t = $SVN->check_path($f, $rev, $pool);
3021 if ($t == $SVN::Node::file) {
3022 if ($m =~ /^[AMR]$/) {
6173c197 3023 $amr{$f} = $m;
a5e0cedc
EW
3024 } else {
3025 die "Unrecognized action: $m, ($f r$rev)\n";
3026 }
d0d8f7dc
EW
3027 } elsif ($t == $SVN::Node::dir && $m =~ /^[AR]$/) {
3028 my @traversed = ();
3029 libsvn_traverse($gui, '', $f, $rev, \@traversed);
3030 foreach (@traversed) {
6173c197 3031 $amr{$_} = $m;
d0d8f7dc 3032 }
a5e0cedc
EW
3033 }
3034 $pool->clear;
3035 }
6173c197
EW
3036 foreach (keys %amr) {
3037 libsvn_get_file($gui, $_, $rev, $amr{$_});
80f50749 3038 }
cf7424b0 3039 close $gui or croak $?;
a5e0cedc
EW
3040 return libsvn_log_entry($rev, $author, $date, $msg, [$last_commit]);
3041}
3042
3043sub svn_grab_base_rev {
3044 defined(my $pid = open my $fh, '-|') or croak $!;
3045 if (!$pid) {
3046 open my $null, '>', '/dev/null' or croak $!;
3047 open STDERR, '>&', $null or croak $!;
3048 exec qw/git-rev-parse --verify/,"refs/remotes/$GIT_SVN^0"
3049 or croak $!;
3050 }
3051 chomp(my $c = do { local $/; <$fh> });
3052 close $fh;
3053 if (defined $c && length $c) {
c1927a85 3054 my ($url, $rev, $uuid) = cmt_metadata($c);
a00439ac
EW
3055 return ($rev, $c) if defined $rev;
3056 }
3057 if ($_no_metadata) {
3058 my $offset = -41; # from tail
3059 my $rl;
3060 open my $fh, '<', $REVDB or
3061 die "--no-metadata specified and $REVDB not readable\n";
3062 seek $fh, $offset, 2;
3063 $rl = readline $fh;
3064 defined $rl or return (undef, undef);
3065 chomp $rl;
3066 while ($c ne $rl && tell $fh != 0) {
3067 $offset -= 41;
3068 seek $fh, $offset, 2;
3069 $rl = readline $fh;
3070 defined $rl or return (undef, undef);
3071 chomp $rl;
3072 }
3073 my $rev = tell $fh;
3074 croak $! if ($rev < -1);
3075 $rev = ($rev - 41) / 41;
3076 close $fh or croak $!;
a5e0cedc
EW
3077 return ($rev, $c);
3078 }
3079 return (undef, undef);
3080}
3081
3082sub libsvn_parse_revision {
3083 my $base = shift;
3084 my $head = $SVN->get_latest_revnum();
3085 if (!defined $_revision || $_revision eq 'BASE:HEAD') {
3086 return ($base + 1, $head) if (defined $base);
3087 return (0, $head);
3088 }
3089 return ($1, $2) if ($_revision =~ /^(\d+):(\d+)$/);
3090 return ($_revision, $_revision) if ($_revision =~ /^\d+$/);
3091 if ($_revision =~ /^BASE:(\d+)$/) {
3092 return ($base + 1, $1) if (defined $base);
3093 return (0, $head);
3094 }
3095 return ($1, $head) if ($_revision =~ /^(\d+):HEAD$/);
3096 die "revision argument: $_revision not understood by git-svn\n",
3097 "Try using the command-line svn client instead\n";
3098}
3099
3100sub libsvn_traverse {
d0d8f7dc 3101 my ($gui, $pfx, $path, $rev, $files) = @_;
747fa12c 3102 my $cwd = length $pfx ? "$pfx/$path" : $path;
a5e0cedc 3103 my $pool = SVN::Pool->new;
747fa12c 3104 $cwd =~ s#^\Q$SVN->{svn_path}\E##;
a5e0cedc
EW
3105 my ($dirent, $r, $props) = $SVN->get_dir($cwd, $rev, $pool);
3106 foreach my $d (keys %$dirent) {
3107 my $t = $dirent->{$d}->kind;
3108 if ($t == $SVN::Node::dir) {
d0d8f7dc 3109 libsvn_traverse($gui, $cwd, $d, $rev, $files);
a5e0cedc 3110 } elsif ($t == $SVN::Node::file) {
d0d8f7dc
EW
3111 my $file = "$cwd/$d";
3112 if (defined $files) {
3113 push @$files, $file;
3114 } else {
75bd7e37 3115 libsvn_get_file($gui, $file, $rev, 'A');
d0d8f7dc 3116 }
a5e0cedc
EW
3117 }
3118 }
3119 $pool->clear;
3120}
3121
3122sub libsvn_traverse_ignore {
3123 my ($fh, $path, $r) = @_;
3124 $path =~ s#^/+##g;
3125 my $pool = SVN::Pool->new;
3126 my ($dirent, undef, $props) = $SVN->get_dir($path, $r, $pool);
3127 my $p = $path;
747fa12c 3128 $p =~ s#^\Q$SVN->{svn_path}\E/##;
a5e0cedc
EW
3129 print $fh length $p ? "\n# $p\n" : "\n# /\n";
3130 if (my $s = $props->{'svn:ignore'}) {
3131 $s =~ s/[\r\n]+/\n/g;
3132 chomp $s;
3133 if (length $p == 0) {
3134 $s =~ s#\n#\n/$p#g;
3135 print $fh "/$s\n";
3136 } else {
3137 $s =~ s#\n#\n/$p/#g;
3138 print $fh "/$p/$s\n";
3139 }
3140 }
3141 foreach (sort keys %$dirent) {
3142 next if $dirent->{$_}->kind != $SVN::Node::dir;
3143 libsvn_traverse_ignore($fh, "$path/$_", $r);
3144 }
3145 $pool->clear;
3146}
3147
42d32870
EW
3148sub revisions_eq {
3149 my ($path, $r0, $r1) = @_;
3150 return 1 if $r0 == $r1;
3151 my $nr = 0;
3152 if ($_use_lib) {
3153 # should be OK to use Pool here (r1 - r0) should be small
3154 my $pool = SVN::Pool->new;
747fa12c 3155 libsvn_get_log($SVN, [$path], $r0, $r1,
0864e3ba 3156 0, 0, 1, sub {$nr++}, $pool);
42d32870
EW
3157 $pool->clear;
3158 } else {
3159 my ($url, undef) = repo_path_split($SVN_URL);
3160 my $svn_log = svn_log_raw("$url/$path","-r$r0:$r1");
3161 while (next_log_entry($svn_log)) { $nr++ }
3162 close $svn_log->{fh};
3163 }
3164 return 0 if ($nr > 1);
3165 return 1;
3166}
3167
3168sub libsvn_find_parent_branch {
a5e0cedc 3169 my ($paths, $rev, $author, $date, $msg) = @_;
747fa12c 3170 my $svn_path = '/'.$SVN->{svn_path};
a5e0cedc
EW
3171
3172 # look for a parent from another branch:
cf7424b0
EW
3173 my $i = $paths->{$svn_path} or return;
3174 my $branch_from = $i->copyfrom_path or return;
3175 my $r = $i->copyfrom_rev;
3176 print STDERR "Found possible branch point: ",
3177 "$branch_from => $svn_path, $r\n";
3178 $branch_from =~ s#^/##;
a00439ac
EW
3179 my $l_map = {};
3180 read_url_paths_all($l_map, '', "$GIT_DIR/svn");
747fa12c 3181 my $url = $SVN->{repos_root};
cf7424b0 3182 defined $l_map->{$url} or return;
a00439ac
EW
3183 my $id = $l_map->{$url}->{$branch_from};
3184 if (!defined $id && $_follow_parent) {
3185 print STDERR "Following parent: $branch_from\@$r\n";
3186 # auto create a new branch and follow it
3187 $id = basename($branch_from);
3188 $id .= '@'.$r if -r "$GIT_DIR/svn/$id";
3189 while (-r "$GIT_DIR/svn/$id") {
3190 # just grow a tail if we're not unique enough :x
3191 $id .= '-';
3192 }
3193 }
3194 return unless defined $id;
3195
cf7424b0 3196 my ($r0, $parent) = find_rev_before($r,$id,1);
a00439ac
EW
3197 if ($_follow_parent && (!defined $r0 || !defined $parent)) {
3198 defined(my $pid = fork) or croak $!;
3199 if (!$pid) {
3200 $GIT_SVN = $ENV{GIT_SVN_ID} = $id;
3201 init_vars();
3202 $SVN_URL = "$url/$branch_from";
747fa12c 3203 $SVN = undef;
a00439ac
EW
3204 setup_git_svn();
3205 # we can't assume SVN_URL exists at r+1:
3206 $_revision = "0:$r";
3207 fetch_lib();
3208 exit 0;
3209 }
3210 waitpid $pid, 0;
3211 croak $? if $?;
3212 ($r0, $parent) = find_rev_before($r,$id,1);
3213 }
cf7424b0
EW
3214 return unless (defined $r0 && defined $parent);
3215 if (revisions_eq($branch_from, $r0, $r)) {
3216 unlink $GIT_SVN_INDEX;
a00439ac 3217 print STDERR "Found branch parent: ($GIT_SVN) $parent\n";
cf7424b0 3218 sys(qw/git-read-tree/, $parent);
a552db3a
EW
3219 unless (libsvn_can_do_switch()) {
3220 return libsvn_fetch_full($parent, $paths, $rev,
3221 $author, $date, $msg);
3222 }
3223 # do_switch works with svn/trunk >= r22312, but that is not
3224 # included with SVN 1.4.2 (the latest version at the moment),
3225 # so we can't rely on it.
3226 my $ra = libsvn_connect("$url/$branch_from");
3227 my $ed = SVN::Git::Fetcher->new({c => $parent, q => $_q});
3228 my $pool = SVN::Pool->new;
3229 my $reporter = $ra->do_switch($rev, '', 1, $SVN->{url},
3230 $ed, $pool);
3231 my @lock = $SVN::Core::VERSION ge '1.2.0' ? (undef) : ();
3232 $reporter->set_path('', $r0, 0, @lock, $pool);
3233 $reporter->finish_report($pool);
3234 $pool->clear;
3235 unless ($ed->{git_commit_ok}) {
3236 die "SVN connection failed somewhere...\n";
3237 }
3238 return libsvn_log_entry($rev, $author, $date, $msg, [$parent]);
cf7424b0
EW
3239 }
3240 print STDERR "Nope, branch point not imported or unknown\n";
42d32870
EW
3241 return undef;
3242}
3243
dc62e25c
EW
3244sub libsvn_get_log {
3245 my ($ra, @args) = @_;
0864e3ba 3246 $args[4]-- if $args[4] && $_xfer_delta && ! $_follow_parent;
dc62e25c
EW
3247 if ($SVN::Core::VERSION le '1.2.0') {
3248 splice(@args, 3, 1);
3249 }
3250 $ra->get_log(@args);
3251}
3252
42d32870
EW
3253sub libsvn_new_tree {
3254 if (my $log_entry = libsvn_find_parent_branch(@_)) {
3255 return $log_entry;
3256 }
3257 my ($paths, $rev, $author, $date, $msg) = @_;
27a1a801
EW
3258 if ($_xfer_delta) {
3259 my $pool = SVN::Pool->new;
0864e3ba 3260 my $ed = SVN::Git::Fetcher->new({q => $_q});
27a1a801
EW
3261 my $reporter = $SVN->do_update($rev, '', 1, $ed, $pool);
3262 my @lock = $SVN::Core::VERSION ge '1.2.0' ? (undef) : ();
3263 $reporter->set_path('', $rev, 1, @lock, $pool);
3264 $reporter->finish_report($pool);
3265 $pool->clear;
dad73c0b
EW
3266 unless ($ed->{git_commit_ok}) {
3267 die "SVN connection failed somewhere...\n";
3268 }
27a1a801
EW
3269 } else {
3270 open my $gui, '| git-update-index -z --index-info' or croak $!;
3271 libsvn_traverse($gui, '', $SVN->{svn_path}, $rev);
3272 close $gui or croak $?;
3273 }
a5e0cedc
EW
3274 return libsvn_log_entry($rev, $author, $date, $msg);
3275}
3276
3277sub find_graft_path_commit {
3278 my ($tree_paths, $p1, $r1) = @_;
3279 foreach my $x (keys %$tree_paths) {
3280 next unless ($p1 =~ /^\Q$x\E/);
3281 my $i = $tree_paths->{$x};
42d32870
EW
3282 my ($r0, $parent) = find_rev_before($r1,$i,1);
3283 return $parent if (defined $r0 && $r0 == $r1);
a5e0cedc
EW
3284 print STDERR "r$r1 of $i not imported\n";
3285 next;
3286 }
3287 return undef;
3288}
3289
3290sub find_graft_path_parents {
3291 my ($grafts, $tree_paths, $c, $p0, $r0) = @_;
3292 foreach my $x (keys %$tree_paths) {
3293 next unless ($p0 =~ /^\Q$x\E/);
3294 my $i = $tree_paths->{$x};
42d32870
EW
3295 my ($r, $parent) = find_rev_before($r0, $i, 1);
3296 if (defined $r && defined $parent && revisions_eq($x,$r,$r0)) {
c1927a85
EW
3297 my ($url_b, undef, $uuid_b) = cmt_metadata($c);
3298 my ($url_a, undef, $uuid_a) = cmt_metadata($parent);
3299 next if ($url_a && $url_b && $url_a eq $url_b &&
3300 $uuid_b eq $uuid_a);
42d32870 3301 $grafts->{$c}->{$parent} = 1;
a5e0cedc 3302 }
a5e0cedc
EW
3303 }
3304}
3305
3306sub libsvn_graft_file_copies {
3307 my ($grafts, $tree_paths, $path, $paths, $rev) = @_;
3308 foreach (keys %$paths) {
3309 my $i = $paths->{$_};
3310 my ($m, $p0, $r0) = ($i->action, $i->copyfrom_path,
3311 $i->copyfrom_rev);
3312 next unless (defined $p0 && defined $r0);
3313
3314 my $p1 = $_;
3315 $p1 =~ s#^/##;
3316 $p0 =~ s#^/##;
3317 my $c = find_graft_path_commit($tree_paths, $p1, $rev);
3318 next unless $c;
3319 find_graft_path_parents($grafts, $tree_paths, $c, $p0, $r0);
3320 }
3321}
3322
3323sub set_index {
3324 my $old = $ENV{GIT_INDEX_FILE};
3325 $ENV{GIT_INDEX_FILE} = shift;
3326 return $old;
3327}
3328
3329sub restore_index {
3330 my ($old) = @_;
3331 if (defined $old) {
3332 $ENV{GIT_INDEX_FILE} = $old;
3333 } else {
3334 delete $ENV{GIT_INDEX_FILE};
3335 }
3336}
3337
3338sub libsvn_commit_cb {
3339 my ($rev, $date, $committer, $c, $msg, $r_last, $cmt_last) = @_;
42d32870 3340 if ($_optimize_commits && $rev == ($r_last + 1)) {
a5e0cedc
EW
3341 my $log = libsvn_log_entry($rev,$committer,$date,$msg);
3342 $log->{tree} = get_tree_from_treeish($c);
3343 my $cmt = git_commit($log, $cmt_last, $c);
3344 my @diff = safe_qx('git-diff-tree', $cmt, $c);
3345 if (@diff) {
3346 print STDERR "Trees differ: $cmt $c\n",
3347 join('',@diff),"\n";
3348 exit 1;
3349 }
3350 } else {
cf7424b0 3351 fetch("$rev=$c");
a5e0cedc
EW
3352 }
3353}
3354
3355sub libsvn_ls_fullurl {
3356 my $fullurl = shift;
1ca7558d 3357 my $ra = libsvn_connect($fullurl);
a5e0cedc
EW
3358 my @ret;
3359 my $pool = SVN::Pool->new;
1ca7558d
EW
3360 my $r = defined $_revision ? $_revision : $ra->get_latest_revnum;
3361 my ($dirent, undef, undef) = $ra->get_dir('', $r, $pool);
a5e0cedc
EW
3362 foreach my $d (keys %$dirent) {
3363 if ($dirent->{$d}->kind == $SVN::Node::dir) {
3364 push @ret, "$d/"; # add '/' for compat with cli svn
3365 }
3366 }
3367 $pool->clear;
3368 return @ret;
3369}
3370
3371
3372sub libsvn_skip_unknown_revs {
3373 my $err = shift;
3374 my $errno = $err->apr_err();
3375 # Maybe the branch we're tracking didn't
3376 # exist when the repo started, so it's
3377 # not an error if it doesn't, just continue
3378 #
3379 # Wonderfully consistent library, eh?
3380 # 160013 - svn:// and file://
3381 # 175002 - http(s)://
747fa12c 3382 # 175007 - http(s):// (this repo required authorization, too...)
a5e0cedc 3383 # More codes may be discovered later...
747fa12c 3384 if ($errno == 175007 || $errno == 175002 || $errno == 160013) {
a5e0cedc
EW
3385 return;
3386 }
3387 croak "Error from SVN, ($errno): ", $err->expanded_message,"\n";
3388};
3389
42d32870
EW
3390# Tie::File seems to be prone to offset errors if revisions get sparse,
3391# it's not that fast, either. Tie::File is also not in Perl 5.6. So
3392# one of my favorite modules is out :< Next up would be one of the DBM
3393# modules, but I'm not sure which is most portable... So I'll just
3394# go with something that's plain-text, but still capable of
3395# being randomly accessed. So here's my ultra-simple fixed-width
3396# database. All records are 40 characters + "\n", so it's easy to seek
3397# to a revision: (41 * rev) is the byte offset.
3398# A record of 40 0s denotes an empty revision.
3399# And yes, it's still pretty fast (faster than Tie::File).
3400sub revdb_set {
3401 my ($file, $rev, $commit) = @_;
3402 length $commit == 40 or croak "arg3 must be a full SHA1 hexsum\n";
3403 open my $fh, '+<', $file or croak $!;
3404 my $offset = $rev * 41;
3405 # assume that append is the common case:
3406 seek $fh, 0, 2 or croak $!;
3407 my $pos = tell $fh;
3408 if ($pos < $offset) {
3409 print $fh (('0' x 40),"\n") x (($offset - $pos) / 41);
3410 }
3411 seek $fh, $offset, 0 or croak $!;
3412 print $fh $commit,"\n";
3413 close $fh or croak $!;
3414}
3415
3416sub revdb_get {
3417 my ($file, $rev) = @_;
3418 my $ret;
3419 my $offset = $rev * 41;
3420 open my $fh, '<', $file or croak $!;
3421 seek $fh, $offset, 0;
3422 if (tell $fh == $offset) {
3423 $ret = readline $fh;
3424 if (defined $ret) {
3425 chomp $ret;
3426 $ret = undef if ($ret =~ /^0{40}$/);
3427 }
3428 }
3429 close $fh or croak $!;
3430 return $ret;
3431}
3432
1a82e793
EW
3433sub copy_remote_ref {
3434 my $origin = $_cp_remote ? $_cp_remote : 'origin';
3435 my $ref = "refs/remotes/$GIT_SVN";
3436 if (safe_qx('git-ls-remote', $origin, $ref)) {
3437 sys(qw/git fetch/, $origin, "$ref:$ref");
a35a0458 3438 } elsif ($_cp_remote && !$_upgrade) {
1a82e793
EW
3439 die "Unable to find remote reference: ",
3440 "refs/remotes/$GIT_SVN on $origin\n";
3441 }
3442}
27a1a801
EW
3443package SVN::Git::Fetcher;
3444use vars qw/@ISA/;
3445use strict;
3446use warnings;
3447use Carp qw/croak/;
3448use IO::File qw//;
3449
3450# file baton members: path, mode_a, mode_b, pool, fh, blob, base
3451sub new {
3452 my ($class, $git_svn) = @_;
3453 my $self = SVN::Delta::Editor->new;
3454 bless $self, $class;
3455 open my $gui, '| git-update-index -z --index-info' or croak $!;
3456 $self->{gui} = $gui;
3457 $self->{c} = $git_svn->{c} if exists $git_svn->{c};
0864e3ba 3458 $self->{q} = $git_svn->{q};
27a1a801
EW
3459 require Digest::MD5;
3460 $self;
3461}
3462
3463sub delete_entry {
3464 my ($self, $path, $rev, $pb) = @_;
0864e3ba 3465 process_rm($self->{gui}, $self->{c}, $path, $self->{q});
27a1a801
EW
3466 undef;
3467}
3468
3469sub open_file {
3470 my ($self, $path, $pb, $rev) = @_;
3471 my ($mode, $blob) = (safe_qx('git-ls-tree',$self->{c},'--',$path)
3472 =~ /^(\d{6}) blob ([a-f\d]{40})\t/);
006ede5e
EW
3473 unless (defined $mode && defined $blob) {
3474 die "$path was not found in commit $self->{c} (r$rev)\n";
3475 }
27a1a801 3476 { path => $path, mode_a => $mode, mode_b => $mode, blob => $blob,
0864e3ba 3477 pool => SVN::Pool->new, action => 'M' };
27a1a801
EW
3478}
3479
3480sub add_file {
3481 my ($self, $path, $pb, $cp_path, $cp_rev) = @_;
3482 { path => $path, mode_a => 100644, mode_b => 100644,
0864e3ba 3483 pool => SVN::Pool->new, action => 'A' };
27a1a801
EW
3484}
3485
3486sub change_file_prop {
3487 my ($self, $fb, $prop, $value) = @_;
3488 if ($prop eq 'svn:executable') {
3489 if ($fb->{mode_b} != 120000) {
3490 $fb->{mode_b} = defined $value ? 100755 : 100644;
3491 }
3492 } elsif ($prop eq 'svn:special') {
3493 $fb->{mode_b} = defined $value ? 120000 : 100644;
3494 }
3495 undef;
3496}
3497
3498sub apply_textdelta {
3499 my ($self, $fb, $exp) = @_;
3500 my $fh = IO::File->new_tmpfile;
3501 $fh->autoflush(1);
3502 # $fh gets auto-closed() by SVN::TxDelta::apply(),
3503 # (but $base does not,) so dup() it for reading in close_file
3504 open my $dup, '<&', $fh or croak $!;
3505 my $base = IO::File->new_tmpfile;
3506 $base->autoflush(1);
3507 if ($fb->{blob}) {
3508 defined (my $pid = fork) or croak $!;
3509 if (!$pid) {
3510 open STDOUT, '>&', $base or croak $!;
3511 print STDOUT 'link ' if ($fb->{mode_a} == 120000);
3512 exec qw/git-cat-file blob/, $fb->{blob} or croak $!;
3513 }
3514 waitpid $pid, 0;
3515 croak $? if $?;
3516
3517 if (defined $exp) {
3518 seek $base, 0, 0 or croak $!;
3519 my $md5 = Digest::MD5->new;
3520 $md5->addfile($base);
3521 my $got = $md5->hexdigest;
3522 die "Checksum mismatch: $fb->{path} $fb->{blob}\n",
3523 "expected: $exp\n",
3524 " got: $got\n" if ($got ne $exp);
3525 }
3526 }
3527 seek $base, 0, 0 or croak $!;
3528 $fb->{fh} = $dup;
3529 $fb->{base} = $base;
3530 [ SVN::TxDelta::apply($base, $fh, undef, $fb->{path}, $fb->{pool}) ];
3531}
3532
3533sub close_file {
3534 my ($self, $fb, $exp) = @_;
3535 my $hash;
3536 my $path = $fb->{path};
3537 if (my $fh = $fb->{fh}) {
3538 seek($fh, 0, 0) or croak $!;
3539 my $md5 = Digest::MD5->new;
3540 $md5->addfile($fh);
3541 my $got = $md5->hexdigest;
3542 die "Checksum mismatch: $path\n",
3543 "expected: $exp\n got: $got\n" if ($got ne $exp);
3544 seek($fh, 0, 0) or croak $!;
3545 if ($fb->{mode_b} == 120000) {
3546 read($fh, my $buf, 5) == 5 or croak $!;
3547 $buf eq 'link ' or die "$path has mode 120000",
3548 "but is not a link\n";
3549 }
3550 defined(my $pid = open my $out,'-|') or die "Can't fork: $!\n";
3551 if (!$pid) {
3552 open STDIN, '<&', $fh or croak $!;
3553 exec qw/git-hash-object -w --stdin/ or croak $!;
3554 }
3555 chomp($hash = do { local $/; <$out> });
3556 close $out or croak $!;
3557 close $fh or croak $!;
3558 $hash =~ /^[a-f\d]{40}$/ or die "not a sha1: $hash\n";
3559 close $fb->{base} or croak $!;
3560 } else {
3561 $hash = $fb->{blob} or die "no blob information\n";
3562 }
3563 $fb->{pool}->clear;
3564 my $gui = $self->{gui};
3565 print $gui "$fb->{mode_b} $hash\t$path\0" or croak $!;
0864e3ba 3566 print "\t$fb->{action}\t$path\n" if $fb->{action} && ! $self->{q};
27a1a801
EW
3567 undef;
3568}
3569
3570sub abort_edit {
3571 my $self = shift;
3572 close $self->{gui};
3573 $self->SUPER::abort_edit(@_);
3574}
3575
3576sub close_edit {
3577 my $self = shift;
dad73c0b
EW
3578 close $self->{gui} or croak $!;
3579 $self->{git_commit_ok} = 1;
27a1a801
EW
3580 $self->SUPER::close_edit(@_);
3581}
1a82e793 3582
a5e0cedc
EW
3583package SVN::Git::Editor;
3584use vars qw/@ISA/;
3585use strict;
3586use warnings;
3587use Carp qw/croak/;
3588use IO::File;
3589
3590sub new {
3591 my $class = shift;
3592 my $git_svn = shift;
3593 my $self = SVN::Delta::Editor->new(@_);
3594 bless $self, $class;
3595 foreach (qw/svn_path c r ra /) {
3596 die "$_ required!\n" unless (defined $git_svn->{$_});
3597 $self->{$_} = $git_svn->{$_};
3598 }
3599 $self->{pool} = SVN::Pool->new;
3600 $self->{bat} = { '' => $self->open_root($self->{r}, $self->{pool}) };
3601 $self->{rm} = { };
3602 require Digest::MD5;
3603 return $self;
3604}
3605
3606sub split_path {
3607 return ($_[0] =~ m#^(.*?)/?([^/]+)$#);
3608}
3609
3610sub repo_path {
747fa12c 3611 (defined $_[1] && length $_[1]) ? $_[1] : ''
a5e0cedc
EW
3612}
3613
3614sub url_path {
3615 my ($self, $path) = @_;
3616 $self->{ra}->{url} . '/' . $self->repo_path($path);
3617}
3618
3619sub rmdirs {
80f50749 3620 my ($self, $q) = @_;
a5e0cedc
EW
3621 my $rm = $self->{rm};
3622 delete $rm->{''}; # we never delete the url we're tracking
3623 return unless %$rm;
3624
3625 foreach (keys %$rm) {
3626 my @d = split m#/#, $_;
3627 my $c = shift @d;
3628 $rm->{$c} = 1;
3629 while (@d) {
3630 $c .= '/' . shift @d;
3631 $rm->{$c} = 1;
3632 }
3633 }
3634 delete $rm->{$self->{svn_path}};