git-svn: add --shared and --template= options to pass to init-db
[git/git.git] / contrib / git-svn / 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
883d0a78 9 $GIT_DIR $REV_DIR $GIT_SVN_DIR/;
3397f9df 10$AUTHOR = 'Eric Wong <normalperson@yhbt.net>';
304dac15 11$VERSION = '1.1.0-pre';
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};
3397f9df
EW
18# make sure the svn binary gives consistent output between locales and TZs:
19$ENV{TZ} = 'UTC';
20$ENV{LC_ALL} = 'C';
21
22# If SVN:: library support is added, please make the dependencies
23# optional and preserve the capability to use the command-line client.
ce6f3519 24# use eval { require SVN::... } to make it lazy load
eeb0abe0 25# We don't use any modules not in the standard Perl distribution:
3397f9df
EW
26use Carp qw/croak/;
27use IO::File qw//;
28use File::Basename qw/dirname basename/;
29use File::Path qw/mkpath/;
30use Getopt::Long qw/:config gnu_getopt no_ignore_case auto_abbrev/;
31use File::Spec qw//;
e17512f3 32use POSIX qw/strftime/;
3397f9df 33my $sha1 = qr/[a-f\d]{40}/;
ac8e0b91 34my $sha1_short = qr/[a-f\d]{4,40}/;
72942938 35my ($_revision,$_stdin,$_no_ignore_ext,$_no_stop_copy,$_help,$_rmdir,$_edit,
162f4129 36 $_find_copies_harder, $_l, $_cp_similarity,
dc5869c0 37 $_repack, $_repack_nr, $_repack_flags,
f8ab6b73 38 $_template, $_shared,
bf78b1d8 39 $_version, $_upgrade, $_authors, $_branch_all_refs);
a9612be2 40my (@_branch_from, %tree_map, %users);
8a97e368 41my ($_svn_co_url_revs, $_svn_pg_peg_revs);
883d0a78 42my @repo_path_split_cache;
3397f9df 43
eeb0abe0 44my %fc_opts = ( 'no-ignore-externals' => \$_no_ignore_ext,
69f0d91e 45 'branch|b=s' => \@_branch_from,
bf78b1d8 46 'branch-all-refs|B' => \$_branch_all_refs,
dc5869c0
EW
47 'authors-file|A=s' => \$_authors,
48 'repack:i' => \$_repack,
49 'repack-flags|repack-args|repack-opts=s' => \$_repack_flags);
36f5b1f0
EW
50
51# yes, 'native' sets "\n". Patches to fix this for non-*nix systems welcome:
52my %EOL = ( CR => "\015", LF => "\012", CRLF => "\015\012", native => "\012" );
53
3397f9df 54my %cmd = (
eeb0abe0
EW
55 fetch => [ \&fetch, "Download new revisions from SVN",
56 { 'revision|r=s' => \$_revision, %fc_opts } ],
81c5a0e6 57 init => [ \&init, "Initialize a repo for tracking" .
f8ab6b73
EW
58 " (requires URL argument)",
59 { 'template=s' => \$_template,
60 'shared' => \$_shared } ],
eeb0abe0
EW
61 commit => [ \&commit, "Commit git revisions to SVN",
62 { 'stdin|' => \$_stdin,
63 'edit|e' => \$_edit,
64 'rmdir' => \$_rmdir,
65 'find-copies-harder' => \$_find_copies_harder,
66 'l=i' => \$_l,
162f4129 67 'copy-similarity|C=i'=> \$_cp_similarity,
eeb0abe0
EW
68 %fc_opts,
69 } ],
70 'show-ignore' => [ \&show_ignore, "Show svn:ignore listings", { } ],
71 rebuild => [ \&rebuild, "Rebuild git-svn metadata (after git clone)",
72 { 'no-ignore-externals' => \$_no_ignore_ext,
73 'upgrade' => \$_upgrade } ],
3397f9df
EW
74);
75my $cmd;
76for (my $i = 0; $i < @ARGV; $i++) {
77 if (defined $cmd{$ARGV[$i]}) {
78 $cmd = $ARGV[$i];
79 splice @ARGV, $i, 1;
80 last;
81 }
82};
83
448c81b4 84my %opts = %{$cmd{$cmd}->[2]} if (defined $cmd);
a9612be2 85
b8c92cad 86read_repo_config(\%opts);
6f0783cf
EW
87GetOptions(%opts, 'help|H|h' => \$_help,
88 'version|V' => \$_version,
89 'id|i=s' => \$GIT_SVN) or exit 1;
90
dc5869c0 91set_default_vals();
3397f9df 92usage(0) if $_help;
551ce28f 93version() if $_version;
eeb0abe0 94usage(1) unless defined $cmd;
b8c92cad 95init_vars();
eeb0abe0 96load_authors() if $_authors;
bf78b1d8 97load_all_refs() if $_branch_all_refs;
1d52aba8 98svn_compat_check();
883d0a78 99migration_check() unless $cmd eq 'init';
3397f9df
EW
100$cmd{$cmd}->[0]->(@ARGV);
101exit 0;
102
103####################### primary functions ######################
104sub usage {
105 my $exit = shift || 0;
106 my $fd = $exit ? \*STDERR : \*STDOUT;
107 print $fd <<"";
108git-svn - bidirectional operations between a single Subversion tree and git
109Usage: $0 <command> [options] [arguments]\n
448c81b4
EW
110
111 print $fd "Available commands:\n" unless $cmd;
3397f9df
EW
112
113 foreach (sort keys %cmd) {
448c81b4 114 next if $cmd && $cmd ne $_;
ac8e0b91 115 print $fd ' ',pack('A13',$_),$cmd{$_}->[1],"\n";
448c81b4
EW
116 foreach (keys %{$cmd{$_}->[2]}) {
117 # prints out arguments as they should be passed:
b8c92cad 118 my $x = s#[:=]s$## ? '<arg>' : s#[:=]i$## ? '<num>' : '';
448c81b4
EW
119 print $fd ' ' x 17, join(', ', map { length $_ > 1 ?
120 "--$_" : "-$_" }
121 split /\|/,$_)," $x\n";
122 }
3397f9df
EW
123 }
124 print $fd <<"";
448c81b4
EW
125\nGIT_SVN_ID may be set in the environment or via the --id/-i switch to an
126arbitrary identifier if you're tracking multiple SVN branches/repositories in
127one git repository and want to keep them separate. See git-svn(1) for more
128information.
3397f9df
EW
129
130 exit $exit;
131}
132
551ce28f
EW
133sub version {
134 print "git-svn version $VERSION\n";
135 exit 0;
136}
137
3397f9df
EW
138sub rebuild {
139 $SVN_URL = shift or undef;
3397f9df 140 my $newest_rev = 0;
2beb3cdd
EW
141 if ($_upgrade) {
142 sys('git-update-ref',"refs/remotes/$GIT_SVN","$GIT_SVN-HEAD");
143 } else {
144 check_upgrade_needed();
145 }
3397f9df
EW
146
147 my $pid = open(my $rev_list,'-|');
148 defined $pid or croak $!;
149 if ($pid == 0) {
2beb3cdd 150 exec("git-rev-list","refs/remotes/$GIT_SVN") or croak $!;
3397f9df 151 }
2beb3cdd 152 my $latest;
3397f9df
EW
153 while (<$rev_list>) {
154 chomp;
155 my $c = $_;
156 croak "Non-SHA1: $c\n" unless $c =~ /^$sha1$/o;
157 my @commit = grep(/^git-svn-id: /,`git-cat-file commit $c`);
158 next if (!@commit); # skip merges
159 my $id = $commit[$#commit];
160 my ($url, $rev, $uuid) = ($id =~ /^git-svn-id:\s(\S+?)\@(\d+)
161 \s([a-f\d\-]+)$/x);
162 if (!$rev || !$uuid || !$url) {
163 # some of the original repositories I made had
164 # indentifiers like this:
165 ($rev, $uuid) = ($id =~/^git-svn-id:\s(\d+)
166 \@([a-f\d\-]+)/x);
167 if (!$rev || !$uuid) {
168 croak "Unable to extract revision or UUID from ",
169 "$c, $id\n";
170 }
171 }
2beb3cdd
EW
172
173 # if we merged or otherwise started elsewhere, this is
174 # how we break out of it
1ca72aef 175 next if (defined $SVN_UUID && ($uuid ne $SVN_UUID));
779b1446 176 next if (defined $SVN_URL && defined $url && ($url ne $SVN_URL));
2beb3cdd 177
3397f9df 178 print "r$rev = $c\n";
2beb3cdd 179 unless (defined $latest) {
3397f9df
EW
180 if (!$SVN_URL && !$url) {
181 croak "SVN repository location required: $url\n";
182 }
183 $SVN_URL ||= $url;
1d52aba8
EW
184 $SVN_UUID ||= $uuid;
185 setup_git_svn();
2beb3cdd 186 $latest = $rev;
3397f9df
EW
187 }
188 assert_revision_eq_or_unknown($rev, $c);
883d0a78 189 sys('git-update-ref',"svn/$GIT_SVN/revs/$rev",$c);
3397f9df
EW
190 $newest_rev = $rev if ($rev > $newest_rev);
191 }
192 close $rev_list or croak $?;
193 if (!chdir $SVN_WC) {
1d52aba8 194 svn_cmd_checkout($SVN_URL, $latest, $SVN_WC);
3397f9df
EW
195 chdir $SVN_WC or croak $!;
196 }
197
198 $pid = fork;
199 defined $pid or croak $!;
200 if ($pid == 0) {
201 my @svn_up = qw(svn up);
202 push @svn_up, '--ignore-externals' unless $_no_ignore_ext;
203 sys(@svn_up,"-r$newest_rev");
204 $ENV{GIT_INDEX_FILE} = $GIT_SVN_INDEX;
36f5b1f0 205 index_changes();
b8c92cad 206 exec('git-write-tree') or croak $!;
3397f9df
EW
207 }
208 waitpid $pid, 0;
b8c92cad 209 croak $? if $?;
2beb3cdd
EW
210
211 if ($_upgrade) {
212 print STDERR <<"";
213Keeping deprecated refs/head/$GIT_SVN-HEAD for now. Please remove it
214when you have upgraded your tools and habits to use refs/remotes/$GIT_SVN
215
216 }
3397f9df
EW
217}
218
219sub init {
81c5a0e6
EW
220 $SVN_URL = shift or die "SVN repository location required " .
221 "as a command-line argument\n";
3397f9df 222 unless (-d $GIT_DIR) {
f8ab6b73
EW
223 my @init_db = ('git-init-db');
224 push @init_db, "--template=$_template" if defined $_template;
225 push @init_db, "--shared" if defined $_shared;
226 sys(@init_db);
3397f9df
EW
227 }
228 setup_git_svn();
229}
230
231sub fetch {
232 my (@parents) = @_;
2beb3cdd 233 check_upgrade_needed();
883d0a78 234 $SVN_URL ||= file_to_s("$GIT_SVN_DIR/info/url");
3397f9df 235 my @log_args = -d $SVN_WC ? ($SVN_WC) : ($SVN_URL);
defc6492
EW
236 unless ($_revision) {
237 $_revision = -d $SVN_WC ? 'BASE:HEAD' : '0:HEAD';
3397f9df 238 }
defc6492 239 push @log_args, "-r$_revision";
3397f9df
EW
240 push @log_args, '--stop-on-copy' unless $_no_stop_copy;
241
ce6f3519 242 my $svn_log = svn_log_raw(@log_args);
3397f9df 243
03823184 244 my $base = next_log_entry($svn_log) or croak "No base revision!\n";
3397f9df
EW
245 my $last_commit = undef;
246 unless (-d $SVN_WC) {
1d52aba8 247 svn_cmd_checkout($SVN_URL,$base->{revision},$SVN_WC);
3397f9df 248 chdir $SVN_WC or croak $!;
1d52aba8 249 read_uuid();
3397f9df 250 $last_commit = git_commit($base, @parents);
36f5b1f0 251 assert_tree($last_commit);
3397f9df
EW
252 } else {
253 chdir $SVN_WC or croak $!;
1d52aba8 254 read_uuid();
6dfbe516
EW
255 eval { $last_commit = file_to_s("$REV_DIR/$base->{revision}") };
256 # looks like a user manually cp'd and svn switch'ed
257 unless ($last_commit) {
258 sys(qw/svn revert -R ./);
259 assert_svn_wc_clean($base->{revision});
260 $last_commit = git_commit($base, @parents);
261 assert_tree($last_commit);
262 }
3397f9df
EW
263 }
264 my @svn_up = qw(svn up);
265 push @svn_up, '--ignore-externals' unless $_no_ignore_ext;
03823184
EW
266 my $last = $base;
267 while (my $log_msg = next_log_entry($svn_log)) {
36f5b1f0 268 assert_tree($last_commit);
03823184
EW
269 if ($last->{revision} >= $log_msg->{revision}) {
270 croak "Out of order: last >= current: ",
271 "$last->{revision} >= $log_msg->{revision}\n";
272 }
36f5b1f0
EW
273 # Revert is needed for cases like:
274 # https://svn.musicpd.org/Jamming/trunk (r166:167), but
275 # I can't seem to reproduce something like that on a test...
276 sys(qw/svn revert -R ./);
277 assert_svn_wc_clean($last->{revision});
03823184 278 sys(@svn_up,"-r$log_msg->{revision}");
3397f9df 279 $last_commit = git_commit($log_msg, $last_commit, @parents);
03823184 280 $last = $log_msg;
3397f9df 281 }
7f60b228
EW
282 unless (-e "$GIT_DIR/refs/heads/master") {
283 sys(qw(git-update-ref refs/heads/master),$last_commit);
284 }
b8c92cad 285 close $svn_log->{fh};
03823184 286 return $last;
3397f9df
EW
287}
288
289sub commit {
290 my (@commits) = @_;
2beb3cdd 291 check_upgrade_needed();
3397f9df
EW
292 if ($_stdin || !@commits) {
293 print "Reading from stdin...\n";
294 @commits = ();
295 while (<STDIN>) {
1ca72aef 296 if (/\b($sha1_short)\b/o) {
3397f9df
EW
297 unshift @commits, $1;
298 }
299 }
300 }
301 my @revs;
8de010ad
EW
302 foreach my $c (@commits) {
303 chomp(my @tmp = safe_qx('git-rev-parse',$c));
304 if (scalar @tmp == 1) {
305 push @revs, $tmp[0];
306 } elsif (scalar @tmp > 1) {
307 push @revs, reverse (safe_qx('git-rev-list',@tmp));
308 } else {
309 die "Failed to rev-parse $c\n";
310 }
3397f9df
EW
311 }
312 chomp @revs;
313
b63af9b3 314 chdir $SVN_WC or croak "Unable to chdir $SVN_WC: $!\n";
1d52aba8 315 my $info = svn_info('.');
b63af9b3
EW
316 my $fetched = fetch();
317 if ($info->{Revision} != $fetched->{revision}) {
318 print STDERR "There are new revisions that were fetched ",
319 "and need to be merged (or acknowledged) ",
320 "before committing.\n";
321 exit 1;
322 }
323 $info = svn_info('.');
1d52aba8
EW
324 read_uuid($info);
325 my $svn_current_rev = $info->{'Last Changed Rev'};
3397f9df 326 foreach my $c (@revs) {
cf52b8f0
EW
327 my $mods = svn_checkout_tree($svn_current_rev, $c);
328 if (scalar @$mods == 0) {
329 print "Skipping, no changes detected\n";
330 next;
331 }
3397f9df
EW
332 $svn_current_rev = svn_commit_tree($svn_current_rev, $c);
333 }
334 print "Done committing ",scalar @revs," revisions to SVN\n";
3397f9df
EW
335}
336
8f22562c
EW
337sub show_ignore {
338 require File::Find or die $!;
339 my $exclude_file = "$GIT_DIR/info/exclude";
340 open my $fh, '<', $exclude_file or croak $!;
341 chomp(my @excludes = (<$fh>));
342 close $fh or croak $!;
343
883d0a78 344 $SVN_URL ||= file_to_s("$GIT_SVN_DIR/info/url");
8f22562c
EW
345 chdir $SVN_WC or croak $!;
346 my %ign;
347 File::Find::find({wanted=>sub{if(lstat $_ && -d _ && -d "$_/.svn"){
348 s#^\./##;
8a97e368 349 @{$ign{$_}} = svn_propget_base('svn:ignore', $_);
8f22562c
EW
350 }}, no_chdir=>1},'.');
351
352 print "\n# /\n";
353 foreach (@{$ign{'.'}}) { print '/',$_ if /\S/ }
354 delete $ign{'.'};
355 foreach my $i (sort keys %ign) {
356 print "\n# ",$i,"\n";
357 foreach (@{$ign{$i}}) { print '/',$i,'/',$_ if /\S/ }
358 }
359}
360
3397f9df
EW
361########################### utility functions #########################
362
1d52aba8
EW
363sub read_uuid {
364 return if $SVN_UUID;
365 my $info = shift || svn_info('.');
366 $SVN_UUID = $info->{'Repository UUID'} or
367 croak "Repository UUID unreadable\n";
883d0a78
EW
368 s_to_file($SVN_UUID,"$GIT_SVN_DIR/info/uuid");
369}
370
371sub quiet_run {
372 my $pid = fork;
373 defined $pid or croak $!;
374 if (!$pid) {
375 open my $null, '>', '/dev/null' or croak $!;
376 open STDERR, '>&', $null or croak $!;
377 open STDOUT, '>&', $null or croak $!;
378 exec @_ or croak $!;
379 }
380 waitpid $pid, 0;
381 return $?;
382}
383
384sub repo_path_split {
385 my $full_url = shift;
386 $full_url =~ s#/+$##;
387
388 foreach (@repo_path_split_cache) {
389 if ($full_url =~ s#$_##) {
390 my $u = $1;
391 $full_url =~ s#^/+##;
392 return ($u, $full_url);
393 }
394 }
395
396 my ($url, $path) = ($full_url =~ m!^([a-z\+]+://[^/]*)(.*)$!i);
397 $path =~ s#^/+##;
398 my @paths = split(m#/+#, $path);
399
400 while (quiet_run(qw/svn ls --non-interactive/, $url)) {
401 my $n = shift @paths || last;
402 $url .= "/$n";
403 }
404 push @repo_path_split_cache, qr/^(\Q$url\E)/;
405 return ($url, $path);
1d52aba8
EW
406}
407
3397f9df
EW
408sub setup_git_svn {
409 defined $SVN_URL or croak "SVN repository location required\n";
410 unless (-d $GIT_DIR) {
411 croak "GIT_DIR=$GIT_DIR does not exist!\n";
412 }
883d0a78
EW
413 mkpath([$GIT_SVN_DIR]);
414 mkpath(["$GIT_SVN_DIR/info"]);
3397f9df 415 mkpath([$REV_DIR]);
883d0a78 416 s_to_file($SVN_URL,"$GIT_SVN_DIR/info/url");
3397f9df 417
883d0a78 418 open my $fd, '>>', "$GIT_SVN_DIR/info/exclude" or croak $!;
3397f9df
EW
419 print $fd '.svn',"\n";
420 close $fd or croak $!;
883d0a78
EW
421 my ($url, $path) = repo_path_split($SVN_URL);
422 s_to_file($url, "$GIT_SVN_DIR/info/repo_url");
423 s_to_file($path, "$GIT_SVN_DIR/info/repo_path");
3397f9df
EW
424}
425
426sub assert_svn_wc_clean {
36f5b1f0 427 my ($svn_rev) = @_;
3397f9df 428 croak "$svn_rev is not an integer!\n" unless ($svn_rev =~ /^\d+$/);
ce4c8b24
EW
429 my $lcr = svn_info('.')->{'Last Changed Rev'};
430 if ($svn_rev != $lcr) {
431 print STDERR "Checking for copy-tree ... ";
ce4c8b24
EW
432 my @diff = grep(/^Index: /,(safe_qx(qw(svn diff),
433 "-r$lcr:$svn_rev")));
434 if (@diff) {
435 croak "Nope! Expected r$svn_rev, got r$lcr\n";
436 } else {
437 print STDERR "OK!\n";
438 }
3397f9df
EW
439 }
440 my @status = grep(!/^Performing status on external/,(`svn status`));
441 @status = grep(!/^\s*$/,@status);
442 if (scalar @status) {
443 print STDERR "Tree ($SVN_WC) is not clean:\n";
444 print STDERR $_ foreach @status;
445 croak;
446 }
cf52b8f0
EW
447}
448
449sub assert_tree {
450 my ($treeish) = @_;
451 croak "Not a sha1: $treeish\n" unless $treeish =~ /^$sha1$/o;
452 chomp(my $type = `git-cat-file -t $treeish`);
453 my $expected;
454 while ($type eq 'tag') {
455 chomp(($treeish, $type) = `git-cat-file tag $treeish`);
456 }
457 if ($type eq 'commit') {
458 $expected = (grep /^tree /,`git-cat-file commit $treeish`)[0];
459 ($expected) = ($expected =~ /^tree ($sha1)$/);
460 die "Unable to get tree from $treeish\n" unless $expected;
461 } elsif ($type eq 'tree') {
462 $expected = $treeish;
463 } else {
464 die "$treeish is a $type, expected tree, tag or commit\n";
465 }
466
467 my $old_index = $ENV{GIT_INDEX_FILE};
468 my $tmpindex = $GIT_SVN_INDEX.'.assert-tmp';
469 if (-e $tmpindex) {
470 unlink $tmpindex or croak $!;
471 }
472 $ENV{GIT_INDEX_FILE} = $tmpindex;
36f5b1f0 473 index_changes(1);
cf52b8f0
EW
474 chomp(my $tree = `git-write-tree`);
475 if ($old_index) {
476 $ENV{GIT_INDEX_FILE} = $old_index;
477 } else {
478 delete $ENV{GIT_INDEX_FILE};
479 }
480 if ($tree ne $expected) {
481 croak "Tree mismatch, Got: $tree, Expected: $expected\n";
3397f9df 482 }
36f5b1f0 483 unlink $tmpindex;
3397f9df
EW
484}
485
486sub parse_diff_tree {
487 my $diff_fh = shift;
488 local $/ = "\0";
489 my $state = 'meta';
490 my @mods;
491 while (<$diff_fh>) {
492 chomp $_; # this gets rid of the trailing "\0"
3397f9df
EW
493 if ($state eq 'meta' && /^:(\d{6})\s(\d{6})\s
494 $sha1\s($sha1)\s([MTCRAD])\d*$/xo) {
495 push @mods, { mode_a => $1, mode_b => $2,
496 sha1_b => $3, chg => $4 };
497 if ($4 =~ /^(?:C|R)$/) {
498 $state = 'file_a';
499 } else {
500 $state = 'file_b';
501 }
502 } elsif ($state eq 'file_a') {
cf52b8f0 503 my $x = $mods[$#mods] or croak "Empty array\n";
3397f9df 504 if ($x->{chg} !~ /^(?:C|R)$/) {
cf52b8f0 505 croak "Error parsing $_, $x->{chg}\n";
3397f9df
EW
506 }
507 $x->{file_a} = $_;
508 $state = 'file_b';
509 } elsif ($state eq 'file_b') {
cf52b8f0 510 my $x = $mods[$#mods] or croak "Empty array\n";
3397f9df 511 if (exists $x->{file_a} && $x->{chg} !~ /^(?:C|R)$/) {
cf52b8f0 512 croak "Error parsing $_, $x->{chg}\n";
3397f9df
EW
513 }
514 if (!exists $x->{file_a} && $x->{chg} =~ /^(?:C|R)$/) {
cf52b8f0 515 croak "Error parsing $_, $x->{chg}\n";
3397f9df
EW
516 }
517 $x->{file_b} = $_;
518 $state = 'meta';
519 } else {
cf52b8f0 520 croak "Error parsing $_\n";
3397f9df
EW
521 }
522 }
523 close $diff_fh or croak $!;
cf52b8f0 524
3397f9df
EW
525 return \@mods;
526}
527
528sub svn_check_prop_executable {
529 my $m = shift;
cf52b8f0
EW
530 return if -l $m->{file_b};
531 if ($m->{mode_b} =~ /755$/) {
532 chmod((0755 &~ umask),$m->{file_b}) or croak $!;
533 if ($m->{mode_a} !~ /755$/) {
534 sys(qw(svn propset svn:executable 1), $m->{file_b});
535 }
536 -x $m->{file_b} or croak "$m->{file_b} is not executable!\n";
3397f9df
EW
537 } elsif ($m->{mode_b} !~ /755$/ && $m->{mode_a} =~ /755$/) {
538 sys(qw(svn propdel svn:executable), $m->{file_b});
cf52b8f0
EW
539 chmod((0644 &~ umask),$m->{file_b}) or croak $!;
540 -x $m->{file_b} and croak "$m->{file_b} is executable!\n";
3397f9df
EW
541 }
542}
543
544sub svn_ensure_parent_path {
545 my $dir_b = dirname(shift);
546 svn_ensure_parent_path($dir_b) if ($dir_b ne File::Spec->curdir);
547 mkpath([$dir_b]) unless (-d $dir_b);
548 sys(qw(svn add -N), $dir_b) unless (-d "$dir_b/.svn");
549}
550
cf52b8f0
EW
551sub precommit_check {
552 my $mods = shift;
553 my (%rm_file, %rmdir_check, %added_check);
554
555 my %o = ( D => 0, R => 1, C => 2, A => 3, M => 3, T => 3 );
556 foreach my $m (sort { $o{$a->{chg}} <=> $o{$b->{chg}} } @$mods) {
557 if ($m->{chg} eq 'R') {
558 if (-d $m->{file_b}) {
559 err_dir_to_file("$m->{file_a} => $m->{file_b}");
560 }
561 # dir/$file => dir/file/$file
562 my $dirname = dirname($m->{file_b});
563 while ($dirname ne File::Spec->curdir) {
564 if ($dirname ne $m->{file_a}) {
565 $dirname = dirname($dirname);
566 next;
567 }
568 err_file_to_dir("$m->{file_a} => $m->{file_b}");
569 }
570 # baz/zzz => baz (baz is a file)
571 $dirname = dirname($m->{file_a});
572 while ($dirname ne File::Spec->curdir) {
573 if ($dirname ne $m->{file_b}) {
574 $dirname = dirname($dirname);
575 next;
576 }
577 err_dir_to_file("$m->{file_a} => $m->{file_b}");
578 }
579 }
580 if ($m->{chg} =~ /^(D|R)$/) {
581 my $t = $1 eq 'D' ? 'file_b' : 'file_a';
582 $rm_file{ $m->{$t} } = 1;
583 my $dirname = dirname( $m->{$t} );
584 my $basename = basename( $m->{$t} );
585 $rmdir_check{$dirname}->{$basename} = 1;
586 } elsif ($m->{chg} =~ /^(?:A|C)$/) {
587 if (-d $m->{file_b}) {
588 err_dir_to_file($m->{file_b});
589 }
590 my $dirname = dirname( $m->{file_b} );
591 my $basename = basename( $m->{file_b} );
592 $added_check{$dirname}->{$basename} = 1;
593 while ($dirname ne File::Spec->curdir) {
594 if ($rm_file{$dirname}) {
595 err_file_to_dir($m->{file_b});
596 }
597 $dirname = dirname $dirname;
598 }
599 }
600 }
601 return (\%rmdir_check, \%added_check);
602
603 sub err_dir_to_file {
604 my $file = shift;
605 print STDERR "Node change from directory to file ",
606 "is not supported by Subversion: ",$file,"\n";
607 exit 1;
608 }
609 sub err_file_to_dir {
610 my $file = shift;
611 print STDERR "Node change from file to directory ",
612 "is not supported by Subversion: ",$file,"\n";
613 exit 1;
614 }
615}
616
3397f9df 617sub svn_checkout_tree {
cf52b8f0 618 my ($svn_rev, $treeish) = @_;
3397f9df 619 my $from = file_to_s("$REV_DIR/$svn_rev");
36f5b1f0 620 assert_tree($from);
ac8e0b91 621 print "diff-tree $from $treeish\n";
3397f9df
EW
622 my $pid = open my $diff_fh, '-|';
623 defined $pid or croak $!;
624 if ($pid == 0) {
162f4129
EW
625 my @diff_tree = qw(git-diff-tree -z -r);
626 if ($_cp_similarity) {
627 push @diff_tree, "-C$_cp_similarity";
628 } else {
629 push @diff_tree, '-C';
630 }
72942938
EW
631 push @diff_tree, '--find-copies-harder' if $_find_copies_harder;
632 push @diff_tree, "-l$_l" if defined $_l;
cf52b8f0 633 exec(@diff_tree, $from, $treeish) or croak $!;
3397f9df
EW
634 }
635 my $mods = parse_diff_tree($diff_fh);
636 unless (@$mods) {
ac8e0b91 637 # git can do empty commits, but SVN doesn't allow it...
cf52b8f0 638 return $mods;
3397f9df 639 }
cf52b8f0
EW
640 my ($rm, $add) = precommit_check($mods);
641
642 my %o = ( D => 1, R => 0, C => -1, A => 3, M => 3, T => 3 );
643 foreach my $m (sort { $o{$a->{chg}} <=> $o{$b->{chg}} } @$mods) {
3397f9df
EW
644 if ($m->{chg} eq 'C') {
645 svn_ensure_parent_path( $m->{file_b} );
646 sys(qw(svn cp), $m->{file_a}, $m->{file_b});
cf52b8f0 647 apply_mod_line_blob($m);
3397f9df
EW
648 svn_check_prop_executable($m);
649 } elsif ($m->{chg} eq 'D') {
3397f9df
EW
650 sys(qw(svn rm --force), $m->{file_b});
651 } elsif ($m->{chg} eq 'R') {
652 svn_ensure_parent_path( $m->{file_b} );
653 sys(qw(svn mv --force), $m->{file_a}, $m->{file_b});
cf52b8f0 654 apply_mod_line_blob($m);
3397f9df 655 svn_check_prop_executable($m);
3397f9df 656 } elsif ($m->{chg} eq 'M') {
cf52b8f0 657 apply_mod_line_blob($m);
3397f9df
EW
658 svn_check_prop_executable($m);
659 } elsif ($m->{chg} eq 'T') {
660 sys(qw(svn rm --force),$m->{file_b});
cf52b8f0 661 apply_mod_line_blob($m);
3397f9df 662 sys(qw(svn add --force), $m->{file_b});
cf52b8f0 663 svn_check_prop_executable($m);
3397f9df
EW
664 } elsif ($m->{chg} eq 'A') {
665 svn_ensure_parent_path( $m->{file_b} );
cf52b8f0 666 apply_mod_line_blob($m);
3397f9df 667 sys(qw(svn add --force), $m->{file_b});
cf52b8f0 668 svn_check_prop_executable($m);
3397f9df
EW
669 } else {
670 croak "Invalid chg: $m->{chg}\n";
671 }
672 }
cf52b8f0
EW
673
674 assert_tree($treeish);
675 if ($_rmdir) { # remove empty directories
676 handle_rmdir($rm, $add);
677 }
678 assert_tree($treeish);
679 return $mods;
680}
681
682# svn ls doesn't work with respect to the current working tree, but what's
683# in the repository. There's not even an option for it... *sigh*
684# (added files don't show up and removed files remain in the ls listing)
685sub svn_ls_current {
686 my ($dir, $rm, $add) = @_;
687 chomp(my @ls = safe_qx('svn','ls',$dir));
688 my @ret = ();
689 foreach (@ls) {
690 s#/$##; # trailing slashes are evil
691 push @ret, $_ unless $rm->{$dir}->{$_};
692 }
693 if (exists $add->{$dir}) {
694 push @ret, keys %{$add->{$dir}};
695 }
696 return \@ret;
697}
698
699sub handle_rmdir {
700 my ($rm, $add) = @_;
701
702 foreach my $dir (sort {length $b <=> length $a} keys %$rm) {
703 my $ls = svn_ls_current($dir, $rm, $add);
704 next if (scalar @$ls);
705 sys(qw(svn rm --force),$dir);
706
707 my $dn = dirname $dir;
708 $rm->{ $dn }->{ basename $dir } = 1;
709 $ls = svn_ls_current($dn, $rm, $add);
710 while (scalar @$ls == 0 && $dn ne File::Spec->curdir) {
711 sys(qw(svn rm --force),$dn);
712 $dir = basename $dn;
713 $dn = dirname $dn;
714 $rm->{ $dn }->{ $dir } = 1;
715 $ls = svn_ls_current($dn, $rm, $add);
3397f9df
EW
716 }
717 }
718}
719
720sub svn_commit_tree {
721 my ($svn_rev, $commit) = @_;
883d0a78 722 my $commit_msg = "$GIT_SVN_DIR/.svn-commit.tmp.$$";
e17512f3 723 my %log_msg = ( msg => '' );
ac8e0b91 724 open my $msg, '>', $commit_msg or croak $!;
3397f9df
EW
725
726 chomp(my $type = `git-cat-file -t $commit`);
727 if ($type eq 'commit') {
728 my $pid = open my $msg_fh, '-|';
729 defined $pid or croak $!;
730
731 if ($pid == 0) {
732 exec(qw(git-cat-file commit), $commit) or croak $!;
733 }
734 my $in_msg = 0;
735 while (<$msg_fh>) {
736 if (!$in_msg) {
737 $in_msg = 1 if (/^\s*$/);
df746c5a
EW
738 } elsif (/^git-svn-id: /) {
739 # skip this, we regenerate the correct one
740 # on re-fetch anyways
3397f9df
EW
741 } else {
742 print $msg $_ or croak $!;
743 }
744 }
745 close $msg_fh or croak $!;
746 }
747 close $msg or croak $!;
748
749 if ($_edit || ($type eq 'tree')) {
750 my $editor = $ENV{VISUAL} || $ENV{EDITOR} || 'vi';
751 system($editor, $commit_msg);
752 }
ac8e0b91
EW
753
754 # file_to_s removes all trailing newlines, so just use chomp() here:
755 open $msg, '<', $commit_msg or croak $!;
756 { local $/; chomp($log_msg{msg} = <$msg>); }
757 close $msg or croak $!;
758
759 my ($oneline) = ($log_msg{msg} =~ /([^\n\r]+)/);
760 print "Committing $commit: $oneline\n";
761
ce475dfc
EW
762 if (defined $LC_ALL) {
763 $ENV{LC_ALL} = $LC_ALL;
764 } else {
765 delete $ENV{LC_ALL};
766 }
3397f9df 767 my @ci_output = safe_qx(qw(svn commit -F),$commit_msg);
ce475dfc 768 $ENV{LC_ALL} = 'C';
3397f9df 769 unlink $commit_msg;
ce475dfc
EW
770 my ($committed) = ($ci_output[$#ci_output] =~ /(\d+)/);
771 if (!defined $committed) {
772 my $out = join("\n",@ci_output);
773 print STDERR "W: Trouble parsing \`svn commit' output:\n\n",
774 $out, "\n\nAssuming English locale...";
775 ($committed) = ($out =~ /^Committed revision \d+\./sm);
776 defined $committed or die " FAILED!\n",
3397f9df 777 "Commit output failed to parse committed revision!\n",
ce475dfc
EW
778 print STDERR " OK\n";
779 }
3397f9df 780
e17512f3 781 my @svn_up = qw(svn up);
3397f9df 782 push @svn_up, '--ignore-externals' unless $_no_ignore_ext;
ce475dfc
EW
783 if ($committed == ($svn_rev + 1)) {
784 push @svn_up, "-r$committed";
e17512f3
EW
785 sys(@svn_up);
786 my $info = svn_info('.');
787 my $date = $info->{'Last Changed Date'} or die "Missing date\n";
ce475dfc
EW
788 if ($info->{'Last Changed Rev'} != $committed) {
789 croak "$info->{'Last Changed Rev'} != $committed\n"
e17512f3
EW
790 }
791 my ($Y,$m,$d,$H,$M,$S,$tz) = ($date =~
792 /(\d{4})\-(\d\d)\-(\d\d)\s
793 (\d\d)\:(\d\d)\:(\d\d)\s([\-\+]\d+)/x)
794 or croak "Failed to parse date: $date\n";
795 $log_msg{date} = "$tz $Y-$m-$d $H:$M:$S";
796 $log_msg{author} = $info->{'Last Changed Author'};
ce475dfc 797 $log_msg{revision} = $committed;
e17512f3
EW
798 $log_msg{msg} .= "\n";
799 my $parent = file_to_s("$REV_DIR/$svn_rev");
800 git_commit(\%log_msg, $parent, $commit);
ce475dfc 801 return $committed;
e17512f3
EW
802 }
803 # resync immediately
804 push @svn_up, "-r$svn_rev";
3397f9df 805 sys(@svn_up);
ce475dfc 806 return fetch("$committed=$commit")->{revision};
3397f9df
EW
807}
808
03823184
EW
809# read the entire log into a temporary file (which is removed ASAP)
810# and store the file handle + parser state
3397f9df
EW
811sub svn_log_raw {
812 my (@log_args) = @_;
03823184
EW
813 my $log_fh = IO::File->new_tmpfile or croak $!;
814 my $pid = fork;
3397f9df 815 defined $pid or croak $!;
03823184
EW
816 if (!$pid) {
817 open STDOUT, '>&', $log_fh or croak $!;
3397f9df
EW
818 exec (qw(svn log), @log_args) or croak $!
819 }
03823184 820 waitpid $pid, 0;
b8c92cad 821 croak $? if $?;
03823184
EW
822 seek $log_fh, 0, 0 or croak $!;
823 return { state => 'sep', fh => $log_fh };
824}
825
826sub next_log_entry {
827 my $log = shift; # retval of svn_log_raw()
828 my $ret = undef;
829 my $fh = $log->{fh};
3397f9df 830
03823184 831 while (<$fh>) {
3397f9df
EW
832 chomp;
833 if (/^\-{72}$/) {
03823184
EW
834 if ($log->{state} eq 'msg') {
835 if ($ret->{lines}) {
836 $ret->{msg} .= $_."\n";
837 unless(--$ret->{lines}) {
838 $log->{state} = 'sep';
ce6f3519
EW
839 }
840 } else {
841 croak "Log parse error at: $_\n",
03823184 842 $ret->{revision},
ce6f3519
EW
843 "\n";
844 }
845 next;
846 }
03823184 847 if ($log->{state} ne 'sep') {
ce6f3519 848 croak "Log parse error at: $_\n",
03823184
EW
849 "state: $log->{state}\n",
850 $ret->{revision},
ce6f3519
EW
851 "\n";
852 }
03823184 853 $log->{state} = 'rev';
3397f9df
EW
854
855 # if we have an empty log message, put something there:
03823184
EW
856 if ($ret) {
857 $ret->{msg} ||= "\n";
858 delete $ret->{lines};
859 return $ret;
3397f9df
EW
860 }
861 next;
862 }
03823184 863 if ($log->{state} eq 'rev' && s/^r(\d+)\s*\|\s*//) {
3397f9df 864 my $rev = $1;
ce6f3519
EW
865 my ($author, $date, $lines) = split(/\s*\|\s*/, $_, 3);
866 ($lines) = ($lines =~ /(\d+)/);
3397f9df
EW
867 my ($Y,$m,$d,$H,$M,$S,$tz) = ($date =~
868 /(\d{4})\-(\d\d)\-(\d\d)\s
869 (\d\d)\:(\d\d)\:(\d\d)\s([\-\+]\d+)/x)
870 or croak "Failed to parse date: $date\n";
03823184 871 $ret = { revision => $rev,
3397f9df
EW
872 date => "$tz $Y-$m-$d $H:$M:$S",
873 author => $author,
ce6f3519 874 lines => $lines,
03823184 875 msg => '' };
a9612be2
EW
876 if (defined $_authors && ! defined $users{$author}) {
877 die "Author: $author not defined in ",
878 "$_authors file\n";
879 }
03823184 880 $log->{state} = 'msg_start';
3397f9df
EW
881 next;
882 }
883 # skip the first blank line of the message:
03823184
EW
884 if ($log->{state} eq 'msg_start' && /^$/) {
885 $log->{state} = 'msg';
886 } elsif ($log->{state} eq 'msg') {
887 if ($ret->{lines}) {
888 $ret->{msg} .= $_."\n";
889 unless (--$ret->{lines}) {
890 $log->{state} = 'sep';
ce6f3519
EW
891 }
892 } else {
893 croak "Log parse error at: $_\n",
03823184 894 $ret->{revision},"\n";
ce6f3519 895 }
3397f9df
EW
896 }
897 }
03823184 898 return $ret;
3397f9df
EW
899}
900
901sub svn_info {
902 my $url = shift || $SVN_URL;
903
904 my $pid = open my $info_fh, '-|';
905 defined $pid or croak $!;
906
907 if ($pid == 0) {
908 exec(qw(svn info),$url) or croak $!;
909 }
910
911 my $ret = {};
912 # only single-lines seem to exist in svn info output
913 while (<$info_fh>) {
914 chomp $_;
e17512f3 915 if (m#^([^:]+)\s*:\s*(\S.*)$#) {
3397f9df
EW
916 $ret->{$1} = $2;
917 push @{$ret->{-order}}, $1;
918 }
919 }
920 close $info_fh or croak $!;
921 return $ret;
922}
923
924sub sys { system(@_) == 0 or croak $? }
925
36f5b1f0
EW
926sub eol_cp {
927 my ($from, $to) = @_;
8a97e368 928 my $es = svn_propget_base('svn:eol-style', $to);
36f5b1f0
EW
929 open my $rfd, '<', $from or croak $!;
930 binmode $rfd or croak $!;
931 open my $wfd, '>', $to or croak $!;
932 binmode $wfd or croak $!;
933
934 my $eol = $EOL{$es} or undef;
36f5b1f0 935 my $buf;
4a393f2b 936 use bytes;
36f5b1f0
EW
937 while (1) {
938 my ($r, $w, $t);
939 defined($r = sysread($rfd, $buf, 4096)) or croak $!;
940 return unless $r;
4a393f2b
EW
941 if ($eol) {
942 if ($buf =~ /\015$/) {
943 my $c;
944 defined($r = sysread($rfd,$c,1)) or croak $!;
945 $buf .= $c if $r > 0;
946 }
947 $buf =~ s/(?:\015\012|\015|\012)/$eol/gs;
948 $r = length($buf);
949 }
36f5b1f0
EW
950 for ($w = 0; $w < $r; $w += $t) {
951 $t = syswrite($wfd, $buf, $r - $w, $w) or croak $!;
952 }
953 }
4a393f2b 954 no bytes;
36f5b1f0
EW
955}
956
957sub do_update_index {
958 my ($z_cmd, $cmd, $no_text_base) = @_;
959
960 my $z = open my $p, '-|';
961 defined $z or croak $!;
962 unless ($z) { exec @$z_cmd or croak $! }
963
964 my $pid = open my $ui, '|-';
965 defined $pid or croak $!;
966 unless ($pid) {
967 exec('git-update-index',"--$cmd",'-z','--stdin') or croak $!;
968 }
969 local $/ = "\0";
970 while (my $x = <$p>) {
971 chomp $x;
972 if (!$no_text_base && lstat $x && ! -l _ &&
8a97e368 973 svn_propget_base('svn:keywords', $x)) {
36f5b1f0
EW
974 my $mode = -x _ ? 0755 : 0644;
975 my ($v,$d,$f) = File::Spec->splitpath($x);
976 my $tb = File::Spec->catfile($d, '.svn', 'tmp',
977 'text-base',"$f.svn-base");
978 $tb =~ s#^/##;
979 unless (-f $tb) {
980 $tb = File::Spec->catfile($d, '.svn',
981 'text-base',"$f.svn-base");
982 $tb =~ s#^/##;
983 }
984 unlink $x or croak $!;
985 eol_cp($tb, $x);
986 chmod(($mode &~ umask), $x) or croak $!;
987 }
988 print $ui $x,"\0";
989 }
990 close $ui or croak $!;
991}
992
993sub index_changes {
994 my $no_text_base = shift;
995 do_update_index([qw/git-diff-files --name-only -z/],
996 'remove',
997 $no_text_base);
998 do_update_index([qw/git-ls-files -z --others/,
883d0a78 999 "--exclude-from=$GIT_SVN_DIR/info/exclude"],
36f5b1f0
EW
1000 'add',
1001 $no_text_base);
3397f9df
EW
1002}
1003
1004sub s_to_file {
1005 my ($str, $file, $mode) = @_;
1006 open my $fd,'>',$file or croak $!;
1007 print $fd $str,"\n" or croak $!;
1008 close $fd or croak $!;
1009 chmod ($mode &~ umask, $file) if (defined $mode);
1010}
1011
1012sub file_to_s {
1013 my $file = shift;
1014 open my $fd,'<',$file or croak "$!: file: $file\n";
1015 local $/;
1016 my $ret = <$fd>;
1017 close $fd or croak $!;
1018 $ret =~ s/\s*$//s;
1019 return $ret;
1020}
1021
1022sub assert_revision_unknown {
1023 my $revno = shift;
1024 if (-f "$REV_DIR/$revno") {
1025 croak "$REV_DIR/$revno already exists! ",
1026 "Why are we refetching it?";
1027 }
1028}
1029
ac749050
EW
1030sub trees_eq {
1031 my ($x, $y) = @_;
1032 my @x = safe_qx('git-cat-file','commit',$x);
1033 my @y = safe_qx('git-cat-file','commit',$y);
1034 if (($y[0] ne $x[0]) || $x[0] !~ /^tree $sha1\n$/
1035 || $y[0] !~ /^tree $sha1\n$/) {
1036 print STDERR "Trees not equal: $y[0] != $x[0]\n";
1037 return 0
1038 }
1039 return 1;
1040}
1041
3397f9df
EW
1042sub assert_revision_eq_or_unknown {
1043 my ($revno, $commit) = @_;
1044 if (-f "$REV_DIR/$revno") {
1045 my $current = file_to_s("$REV_DIR/$revno");
ac749050 1046 if (($commit ne $current) && !trees_eq($commit, $current)) {
3397f9df
EW
1047 croak "$REV_DIR/$revno already exists!\n",
1048 "current: $current\nexpected: $commit\n";
1049 }
1050 return;
1051 }
1052}
1053
1054sub git_commit {
1055 my ($log_msg, @parents) = @_;
1056 assert_revision_unknown($log_msg->{revision});
1057 my $out_fh = IO::File->new_tmpfile or croak $!;
3397f9df 1058
69f0d91e
EW
1059 map_tree_joins() if (@_branch_from && !%tree_map);
1060
3397f9df
EW
1061 # commit parents can be conditionally bound to a particular
1062 # svn revision via: "svn_revno=commit_sha1", filter them out here:
1063 my @exec_parents;
1064 foreach my $p (@parents) {
1065 next unless defined $p;
1066 if ($p =~ /^(\d+)=($sha1_short)$/o) {
1067 if ($1 == $log_msg->{revision}) {
1068 push @exec_parents, $2;
1069 }
1070 } else {
1071 push @exec_parents, $p if $p =~ /$sha1_short/o;
1072 }
1073 }
1074
1075 my $pid = fork;
1076 defined $pid or croak $!;
1077 if ($pid == 0) {
1078 $ENV{GIT_INDEX_FILE} = $GIT_SVN_INDEX;
36f5b1f0 1079 index_changes();
3397f9df 1080 chomp(my $tree = `git-write-tree`);
b8c92cad 1081 croak $? if $?;
69f0d91e
EW
1082 if (exists $tree_map{$tree}) {
1083 my %seen_parent = map { $_ => 1 } @exec_parents;
1084 foreach (@{$tree_map{$tree}}) {
1085 # MAXPARENT is defined to 16 in commit-tree.c:
1086 if ($seen_parent{$_} || @exec_parents > 16) {
1087 next;
1088 }
1089 push @exec_parents, $_;
1090 $seen_parent{$_} = 1;
1091 }
1092 }
3397f9df
EW
1093 my $msg_fh = IO::File->new_tmpfile or croak $!;
1094 print $msg_fh $log_msg->{msg}, "\ngit-svn-id: ",
1095 "$SVN_URL\@$log_msg->{revision}",
1ca72aef 1096 " $SVN_UUID\n" or croak $!;
3397f9df
EW
1097 $msg_fh->flush == 0 or croak $!;
1098 seek $msg_fh, 0, 0 or croak $!;
1099
1ca72aef 1100 set_commit_env($log_msg);
a9612be2 1101
3397f9df
EW
1102 my @exec = ('git-commit-tree',$tree);
1103 push @exec, '-p', $_ foreach @exec_parents;
1104 open STDIN, '<&', $msg_fh or croak $!;
1105 open STDOUT, '>&', $out_fh or croak $!;
1106 exec @exec or croak $!;
1107 }
1108 waitpid($pid,0);
b8c92cad 1109 croak $? if $?;
3397f9df
EW
1110
1111 $out_fh->flush == 0 or croak $!;
1112 seek $out_fh, 0, 0 or croak $!;
1113 chomp(my $commit = do { local $/; <$out_fh> });
1114 if ($commit !~ /^$sha1$/o) {
1115 croak "Failed to commit, invalid sha1: $commit\n";
1116 }
2beb3cdd 1117 my @update_ref = ('git-update-ref',"refs/remotes/$GIT_SVN",$commit);
3397f9df 1118 if (my $primary_parent = shift @exec_parents) {
1d52aba8
EW
1119 $pid = fork;
1120 defined $pid or croak $!;
1121 if (!$pid) {
1122 close STDERR;
1123 close STDOUT;
1124 exec 'git-rev-parse','--verify',
b8c92cad 1125 "refs/remotes/$GIT_SVN^0" or croak $!;
1d52aba8
EW
1126 }
1127 waitpid $pid, 0;
1128 push @update_ref, $primary_parent unless $?;
3397f9df
EW
1129 }
1130 sys(@update_ref);
883d0a78 1131 sys('git-update-ref',"svn/$GIT_SVN/revs/$log_msg->{revision}",$commit);
3397f9df 1132 print "r$log_msg->{revision} = $commit\n";
dc5869c0
EW
1133 if ($_repack && (--$_repack_nr == 0)) {
1134 $_repack_nr = $_repack;
1135 sys("git repack $_repack_flags");
1136 }
3397f9df
EW
1137 return $commit;
1138}
1139
a9612be2 1140sub set_commit_env {
1ca72aef 1141 my ($log_msg) = @_;
a9612be2
EW
1142 my $author = $log_msg->{author};
1143 my ($name,$email) = defined $users{$author} ? @{$users{$author}}
1ca72aef 1144 : ($author,"$author\@$SVN_UUID");
a9612be2
EW
1145 $ENV{GIT_AUTHOR_NAME} = $ENV{GIT_COMMITTER_NAME} = $name;
1146 $ENV{GIT_AUTHOR_EMAIL} = $ENV{GIT_COMMITTER_EMAIL} = $email;
1147 $ENV{GIT_AUTHOR_DATE} = $ENV{GIT_COMMITTER_DATE} = $log_msg->{date};
1148}
1149
cf52b8f0
EW
1150sub apply_mod_line_blob {
1151 my $m = shift;
1152 if ($m->{mode_b} =~ /^120/) {
1153 blob_to_symlink($m->{sha1_b}, $m->{file_b});
1154 } else {
1155 blob_to_file($m->{sha1_b}, $m->{file_b});
1156 }
1157}
1158
3397f9df
EW
1159sub blob_to_symlink {
1160 my ($blob, $link) = @_;
1161 defined $link or croak "\$link not defined!\n";
1162 croak "Not a sha1: $blob\n" unless $blob =~ /^$sha1$/o;
cf52b8f0
EW
1163 if (-l $link || -f _) {
1164 unlink $link or croak $!;
1165 }
1166
3397f9df
EW
1167 my $dest = `git-cat-file blob $blob`; # no newline, so no chomp
1168 symlink $dest, $link or croak $!;
1169}
1170
1171sub blob_to_file {
1172 my ($blob, $file) = @_;
1173 defined $file or croak "\$file not defined!\n";
1174 croak "Not a sha1: $blob\n" unless $blob =~ /^$sha1$/o;
cf52b8f0
EW
1175 if (-l $file || -f _) {
1176 unlink $file or croak $!;
1177 }
1178
3397f9df
EW
1179 open my $blob_fh, '>', $file or croak "$!: $file\n";
1180 my $pid = fork;
1181 defined $pid or croak $!;
1182
1183 if ($pid == 0) {
1184 open STDOUT, '>&', $blob_fh or croak $!;
b8c92cad 1185 exec('git-cat-file','blob',$blob) or croak $!;
3397f9df
EW
1186 }
1187 waitpid $pid, 0;
1188 croak $? if $?;
1189
1190 close $blob_fh or croak $!;
1191}
1192
1193sub safe_qx {
1194 my $pid = open my $child, '-|';
1195 defined $pid or croak $!;
1196 if ($pid == 0) {
b8c92cad 1197 exec(@_) or croak $!;
3397f9df
EW
1198 }
1199 my @ret = (<$child>);
1200 close $child or croak $?;
1201 die $? if $?; # just in case close didn't error out
1202 return wantarray ? @ret : join('',@ret);
1203}
1204
1d52aba8
EW
1205sub svn_compat_check {
1206 my @co_help = safe_qx(qw(svn co -h));
1207 unless (grep /ignore-externals/,@co_help) {
3397f9df
EW
1208 print STDERR "W: Installed svn version does not support ",
1209 "--ignore-externals\n";
1210 $_no_ignore_ext = 1;
1211 }
1d52aba8
EW
1212 if (grep /usage: checkout URL\[\@REV\]/,@co_help) {
1213 $_svn_co_url_revs = 1;
1214 }
8a97e368
EW
1215 if (grep /\[TARGET\[\@REV\]\.\.\.\]/, `svn propget -h`) {
1216 $_svn_pg_peg_revs = 1;
1217 }
7317ed90
EW
1218
1219 # I really, really hope nobody hits this...
1220 unless (grep /stop-on-copy/, (safe_qx(qw(svn log -h)))) {
1221 print STDERR <<'';
1222W: The installed svn version does not support the --stop-on-copy flag in
1223 the log command.
1224 Lets hope the directory you're tracking is not a branch or tag
1225 and was never moved within the repository...
1226
1227 $_no_stop_copy = 1;
1228 }
1d52aba8
EW
1229}
1230
1231# *sigh*, new versions of svn won't honor -r<rev> without URL@<rev>,
1232# (and they won't honor URL@<rev> without -r<rev>, too!)
1233sub svn_cmd_checkout {
1234 my ($url, $rev, $dir) = @_;
1235 my @cmd = ('svn','co', "-r$rev");
1236 push @cmd, '--ignore-externals' unless $_no_ignore_ext;
1237 $url .= "\@$rev" if $_svn_co_url_revs;
1238 sys(@cmd, $url, $dir);
3397f9df 1239}
2beb3cdd
EW
1240
1241sub check_upgrade_needed {
1242 my $old = eval {
1243 my $pid = open my $child, '-|';
1244 defined $pid or croak $!;
1245 if ($pid == 0) {
1246 close STDERR;
b8c92cad 1247 exec('git-rev-parse',"$GIT_SVN-HEAD") or croak $!;
2beb3cdd
EW
1248 }
1249 my @ret = (<$child>);
1250 close $child or croak $?;
1251 die $? if $?; # just in case close didn't error out
1252 return wantarray ? @ret : join('',@ret);
1253 };
1254 return unless $old;
1255 my $head = eval { safe_qx('git-rev-parse',"refs/remotes/$GIT_SVN") };
1256 if ($@ || !$head) {
1257 print STDERR "Please run: $0 rebuild --upgrade\n";
1258 exit 1;
1259 }
1260}
1261
69f0d91e
EW
1262# fills %tree_map with a reverse mapping of trees to commits. Useful
1263# for finding parents to commit on.
1264sub map_tree_joins {
098749d9 1265 my %seen;
69f0d91e
EW
1266 foreach my $br (@_branch_from) {
1267 my $pid = open my $pipe, '-|';
1268 defined $pid or croak $!;
1269 if ($pid == 0) {
098749d9 1270 exec(qw(git-rev-list --topo-order --pretty=raw), $br)
b8c92cad 1271 or croak $!;
69f0d91e
EW
1272 }
1273 while (<$pipe>) {
1274 if (/^commit ($sha1)$/o) {
1275 my $commit = $1;
098749d9
EW
1276
1277 # if we've seen a commit,
1278 # we've seen its parents
1279 last if $seen{$commit};
69f0d91e
EW
1280 my ($tree) = (<$pipe> =~ /^tree ($sha1)$/o);
1281 unless (defined $tree) {
1282 die "Failed to parse commit $commit\n";
1283 }
1284 push @{$tree_map{$tree}}, $commit;
098749d9 1285 $seen{$commit} = 1;
69f0d91e
EW
1286 }
1287 }
098749d9 1288 close $pipe; # we could be breaking the pipe early
69f0d91e
EW
1289 }
1290}
1291
bf78b1d8
EW
1292sub load_all_refs {
1293 if (@_branch_from) {
1294 print STDERR '--branch|-b parameters are ignored when ',
1295 "--branch-all-refs|-B is passed\n";
1296 }
1297
1298 # don't worry about rev-list on non-commit objects/tags,
1299 # it shouldn't blow up if a ref is a blob or tree...
1300 chomp(@_branch_from = `git-rev-parse --symbolic --all`);
1301}
1302
eeb0abe0
EW
1303# '<svn username> = real-name <email address>' mapping based on git-svnimport:
1304sub load_authors {
1305 open my $authors, '<', $_authors or die "Can't open $_authors $!\n";
1306 while (<$authors>) {
1307 chomp;
1308 next unless /^(\S+?)\s*=\s*(.+?)\s*<(.+)>\s*$/;
1309 my ($user, $name, $email) = ($1, $2, $3);
1310 $users{$user} = [$name, $email];
1311 }
1312 close $authors or croak $!;
1313}
1314
8a97e368
EW
1315sub svn_propget_base {
1316 my ($p, $f) = @_;
1317 $f .= '@BASE' if $_svn_pg_peg_revs;
1318 return safe_qx(qw/svn propget/, $p, $f);
1319}
1320
883d0a78
EW
1321sub migration_check {
1322 return if (-d "$GIT_DIR/svn" || !-d $GIT_DIR);
1323 print "Upgrading repository...\n";
1324 unless (-d "$GIT_DIR/svn") {
1325 mkdir "$GIT_DIR/svn" or croak $!;
1326 }
1327 print "Data from a previous version of git-svn exists, but\n\t",
1328 "$GIT_SVN_DIR\n\t(required for this version ",
1329 "($VERSION) of git-svn) does not.\n";
1330
1331 foreach my $x (`git-rev-parse --symbolic --all`) {
1332 next unless $x =~ s#^refs/remotes/##;
1333 chomp $x;
1334 next unless -f "$GIT_DIR/$x/info/url";
1335 my $u = eval { file_to_s("$GIT_DIR/$x/info/url") };
1336 next unless $u;
1337 my $dn = dirname("$GIT_DIR/svn/$x");
1338 mkpath([$dn]) unless -d $dn;
1339 rename "$GIT_DIR/$x", "$GIT_DIR/svn/$x" or croak "$!: $x";
1340 my ($url, $path) = repo_path_split($u);
1341 s_to_file($url, "$GIT_DIR/svn/$x/info/repo_url");
1342 s_to_file($path, "$GIT_DIR/svn/$x/info/repo_path");
1343 }
1344 print "Done upgrading.\n";
1345}
1346
b8c92cad
EW
1347sub init_vars {
1348 $GIT_SVN ||= $ENV{GIT_SVN_ID} || 'git-svn';
1349 $GIT_SVN_DIR = "$GIT_DIR/svn/$GIT_SVN";
1350 $GIT_SVN_INDEX = "$GIT_SVN_DIR/index";
1351 $SVN_URL = undef;
1352 $REV_DIR = "$GIT_SVN_DIR/revs";
1353 $SVN_WC = "$GIT_SVN_DIR/tree";
1354}
1355
1356# convert GetOpt::Long specs for use by git-repo-config
1357sub read_repo_config {
1358 return unless -d $GIT_DIR;
1359 my $opts = shift;
1360 foreach my $o (keys %$opts) {
1361 my $v = $opts->{$o};
1362 my ($key) = ($o =~ /^([a-z\-]+)/);
1363 $key =~ s/-//g;
1364 my $arg = 'git-repo-config';
1365 $arg .= ' --int' if ($o =~ /[:=]i$/);
1366 $arg .= ' --bool' if ($o !~ /[:=][sfi]$/);
1367 if (ref $v eq 'ARRAY') {
1368 chomp(my @tmp = `$arg --get-all svn.$key`);
1369 @$v = @tmp if @tmp;
1370 } else {
1371 chomp(my $tmp = `$arg --get svn.$key`);
1372 if ($tmp && !($arg =~ / --bool / && $tmp eq 'false')) {
1373 $$v = $tmp;
1374 }
1375 }
1376 }
1377}
1378
dc5869c0
EW
1379sub set_default_vals {
1380 if (defined $_repack) {
1381 $_repack = 1000 if ($_repack <= 0);
1382 $_repack_nr = $_repack;
1383 $_repack_flags ||= '';
1384 }
1385}
1386
3397f9df
EW
1387__END__
1388
1389Data structures:
1390
03823184
EW
1391$svn_log hashref (as returned by svn_log_raw)
1392{
1393 fh => file handle of the log file,
1394 state => state of the log file parser (sep/msg/rev/msg_start...)
1395}
3397f9df 1396
03823184 1397$log_msg hashref as returned by next_log_entry($svn_log)
3397f9df
EW
1398{
1399 msg => 'whitespace-formatted log entry
1400', # trailing newline is preserved
1401 revision => '8', # integer
1402 date => '2004-02-24T17:01:44.108345Z', # commit date
1403 author => 'committer name'
1404};
1405
1406
1407@mods = array of diff-index line hashes, each element represents one line
1408 of diff-index output
1409
1410diff-index line ($m hash)
1411{
1412 mode_a => first column of diff-index output, no leading ':',
1413 mode_b => second column of diff-index output,
1414 sha1_b => sha1sum of the final blob,
ac8e0b91 1415 chg => change type [MCRADT],
3397f9df
EW
1416 file_a => original file name of a file (iff chg is 'C' or 'R')
1417 file_b => new/current file name of a file (any chg)
1418}
1419;