2 # Copyright (C) 2006, Eric Wong <normalperson@yhbt.net>
3 # License: GPL v2 or later
6 use vars qw
/ $AUTHOR $VERSION
7 $SVN_URL $SVN_INFO $SVN_WC $SVN_UUID
8 $GIT_SVN_INDEX $GIT_SVN
10 $AUTHOR = 'Eric Wong <normalperson@yhbt.net>';
14 $GIT_DIR = abs_path
($ENV{GIT_DIR
} || '.git');
15 $ENV{GIT_DIR
} = $GIT_DIR;
17 # make sure the svn binary gives consistent output between locales and TZs:
21 # If SVN:: library support is added, please make the dependencies
22 # optional and preserve the capability to use the command-line client.
23 # use eval { require SVN::... } to make it lazy load
24 # We don't use any modules not in the standard Perl distribution:
27 use File
::Basename qw
/dirname basename/;
28 use File
::Path qw
/mkpath/;
29 use Getopt
::Long qw
/:config gnu_getopt no_ignore_case auto_abbrev/;
31 use POSIX qw
/strftime/;
32 my $sha1 = qr/[a-f\d]{40}/;
33 my $sha1_short = qr/[a-f\d]{4,40}/;
34 my ($_revision,$_stdin,$_no_ignore_ext,$_no_stop_copy,$_help,$_rmdir,$_edit,
35 $_find_copies_harder, $_l, $_version, $_upgrade, $_authors);
36 my (@_branch_from, %tree_map, %users);
39 my %fc_opts = ( 'no-ignore-externals' => \
$_no_ignore_ext,
40 'branch|b=s' => \
@_branch_from,
41 'authors-file|A=s' => \
$_authors );
43 fetch
=> [ \
&fetch
, "Download new revisions from SVN",
44 { 'revision|r=s' => \
$_revision, %fc_opts } ],
45 init
=> [ \
&init
, "Initialize and fetch (import)", { } ],
46 commit
=> [ \
&commit
, "Commit git revisions to SVN",
47 { 'stdin|' => \
$_stdin,
50 'find-copies-harder' => \
$_find_copies_harder,
54 'show-ignore' => [ \
&show_ignore
, "Show svn:ignore listings", { } ],
55 rebuild
=> [ \
&rebuild
, "Rebuild git-svn metadata (after git clone)",
56 { 'no-ignore-externals' => \
$_no_ignore_ext,
57 'upgrade' => \
$_upgrade } ],
60 for (my $i = 0; $i < @ARGV; $i++) {
61 if (defined $cmd{$ARGV[$i]}) {
68 my %opts = %{$cmd{$cmd}->[2]} if (defined $cmd);
70 # convert GetOpt::Long specs for use by git-repo-config
71 foreach my $o (keys %opts) {
73 my ($key) = ($o =~ /^([a-z\-]+)/);
75 my $arg = 'git-repo-config';
76 $arg .= ' --int' if ($o =~ /=i$/);
77 $arg .= ' --bool' if ($o !~ /=[sfi]$/);
78 if (ref $v eq 'ARRAY') {
79 chomp(my @tmp = `$arg --get-all svn.$key`);
82 chomp(my $tmp = `$arg --get svn.$key`);
83 if ($tmp && !($arg =~ / --bool / && $tmp eq 'false')) {
89 GetOptions
(%opts, 'help|H|h' => \
$_help,
90 'version|V' => \
$_version,
91 'id|i=s' => \
$GIT_SVN) or exit 1;
93 $GIT_SVN ||= $ENV{GIT_SVN_ID
} || 'git-svn';
94 $GIT_SVN_INDEX = "$GIT_DIR/$GIT_SVN/index";
96 $REV_DIR = "$GIT_DIR/$GIT_SVN/revs";
97 $SVN_WC = "$GIT_DIR/$GIT_SVN/tree";
100 version
() if $_version;
101 usage
(1) unless defined $cmd;
102 load_authors
() if $_authors;
104 $cmd{$cmd}->[0]->(@ARGV);
107 ####################### primary functions ######################
109 my $exit = shift || 0;
110 my $fd = $exit ? \
*STDERR
: \
*STDOUT
;
112 git
-svn
- bidirectional operations between a single Subversion tree
and git
113 Usage
: $0 <command
> [options
] [arguments
]\n
115 print $fd "Available commands:\n" unless $cmd;
117 foreach (sort keys %cmd) {
118 next if $cmd && $cmd ne $_;
119 print $fd ' ',pack('A13',$_),$cmd{$_}->[1],"\n";
120 foreach (keys %{$cmd{$_}->[2]}) {
121 # prints out arguments as they should be passed:
122 my $x = s
#=s$## ? '<arg>' : s#=i$## ? '<num>' : '';
123 print $fd ' ' x
17, join(', ', map { length $_ > 1 ?
125 split /\|/,$_)," $x\n";
129 \nGIT_SVN_ID may be set
in the environment
or via the
--id
/-i switch to an
130 arbitrary identifier
if you
're tracking multiple SVN branches/repositories in
131 one git repository and want to keep them separate. See git-svn(1) for more
138 print "git-svn version $VERSION\n";
143 $SVN_URL = shift or undef;
146 sys('git
-update
-ref',"refs/remotes/$GIT_SVN","$GIT_SVN-HEAD");
148 check_upgrade_needed();
151 my $pid = open(my $rev_list,'-|');
152 defined $pid or croak $!;
154 exec("git-rev-list","refs/remotes/$GIT_SVN") or croak $!;
157 while (<$rev_list>) {
160 croak "Non-SHA1: $c\n" unless $c =~ /^$sha1$/o;
161 my @commit = grep(/^git-svn-id: /,`git-cat-file commit $c`);
162 next if (!@commit); # skip merges
163 my $id = $commit[$#commit];
164 my ($url, $rev, $uuid) = ($id =~ /^git-svn-id:\s(\S+?)\@(\d+)
166 if (!$rev || !$uuid || !$url) {
167 # some of the original repositories I made had
168 # indentifiers like this:
169 ($rev, $uuid) = ($id =~/^git-svn-id:\s(\d+)
171 if (!$rev || !$uuid) {
172 croak "Unable to extract revision or UUID from ",
177 # if we merged or otherwise started elsewhere, this is
178 # how we break out of it
179 next if (defined $SVN_UUID && ($uuid ne $SVN_UUID));
180 next if (defined $SVN_URL && defined $url && ($url ne $SVN_URL));
182 print "r$rev = $c\n";
183 unless (defined $latest) {
184 if (!$SVN_URL && !$url) {
185 croak "SVN repository location required: $url\n";
192 assert_revision_eq_or_unknown($rev, $c);
193 sys('git
-update
-ref',"$GIT_SVN/revs/$rev",$c);
194 $newest_rev = $rev if ($rev > $newest_rev);
196 close $rev_list or croak $?;
197 if (!chdir $SVN_WC) {
198 svn_cmd_checkout($SVN_URL, $latest, $SVN_WC);
199 chdir $SVN_WC or croak $!;
203 defined $pid or croak $!;
205 my @svn_up = qw(svn up);
206 push @svn_up, '--ignore-externals' unless $_no_ignore_ext;
207 sys
(@svn_up,"-r$newest_rev");
208 $ENV{GIT_INDEX_FILE
} = $GIT_SVN_INDEX;
210 exec('git-write-tree');
216 Keeping deprecated refs
/head/$GIT_SVN-HEAD
for now
. Please remove it
217 when you have upgraded your tools
and habits to
use refs
/remotes/$GIT_SVN
223 $SVN_URL = shift or croak
"SVN repository location required\n";
224 unless (-d
$GIT_DIR) {
232 check_upgrade_needed
();
233 $SVN_URL ||= file_to_s
("$GIT_DIR/$GIT_SVN/info/url");
234 my @log_args = -d
$SVN_WC ?
($SVN_WC) : ($SVN_URL);
235 unless ($_revision) {
236 $_revision = -d
$SVN_WC ?
'BASE:HEAD' : '0:HEAD';
238 push @log_args, "-r$_revision";
239 push @log_args, '--stop-on-copy' unless $_no_stop_copy;
241 my $svn_log = svn_log_raw
(@log_args);
243 my $base = next_log_entry
($svn_log) or croak
"No base revision!\n";
244 my $last_commit = undef;
245 unless (-d
$SVN_WC) {
246 svn_cmd_checkout
($SVN_URL,$base->{revision
},$SVN_WC);
247 chdir $SVN_WC or croak
$!;
249 $last_commit = git_commit
($base, @parents);
250 assert_svn_wc_clean
($base->{revision
}, $last_commit);
252 chdir $SVN_WC or croak
$!;
254 $last_commit = file_to_s
("$REV_DIR/$base->{revision}");
256 my @svn_up = qw(svn up);
257 push @svn_up, '--ignore-externals' unless $_no_ignore_ext;
259 while (my $log_msg = next_log_entry
($svn_log)) {
260 assert_svn_wc_clean
($last->{revision
}, $last_commit);
261 if ($last->{revision
} >= $log_msg->{revision
}) {
262 croak
"Out of order: last >= current: ",
263 "$last->{revision} >= $log_msg->{revision}\n";
265 sys
(@svn_up,"-r$log_msg->{revision}");
266 $last_commit = git_commit
($log_msg, $last_commit, @parents);
269 assert_svn_wc_clean
($last->{revision
}, $last_commit);
270 unless (-e
"$GIT_DIR/refs/heads/master") {
271 sys
(qw(git-update-ref refs/heads/master),$last_commit);
278 check_upgrade_needed
();
279 if ($_stdin || !@commits) {
280 print "Reading from stdin...\n";
283 if (/\b($sha1_short)\b/o) {
284 unshift @commits, $1;
289 foreach my $c (@commits) {
290 chomp(my @tmp = safe_qx
('git-rev-parse',$c));
291 if (scalar @tmp == 1) {
293 } elsif (scalar @tmp > 1) {
294 push @revs, reverse (safe_qx
('git-rev-list',@tmp));
296 die "Failed to rev-parse $c\n";
302 chdir $SVN_WC or croak
$!;
303 my $info = svn_info
('.');
305 my $svn_current_rev = $info->{'Last Changed Rev'};
306 foreach my $c (@revs) {
307 my $mods = svn_checkout_tree
($svn_current_rev, $c);
308 if (scalar @
$mods == 0) {
309 print "Skipping, no changes detected\n";
312 $svn_current_rev = svn_commit_tree
($svn_current_rev, $c);
314 print "Done committing ",scalar @revs," revisions to SVN\n";
319 require File
::Find
or die $!;
320 my $exclude_file = "$GIT_DIR/info/exclude";
321 open my $fh, '<', $exclude_file or croak
$!;
322 chomp(my @excludes = (<$fh>));
323 close $fh or croak
$!;
325 $SVN_URL ||= file_to_s
("$GIT_DIR/$GIT_SVN/info/url");
326 chdir $SVN_WC or croak
$!;
328 File
::Find
::find
({wanted
=>sub{if(lstat $_ && -d _
&& -d
"$_/.svn"){
330 @
{$ign{$_}} = safe_qx
(qw(svn propget svn:ignore),$_);
331 }}, no_chdir
=>1},'.');
334 foreach (@
{$ign{'.'}}) { print '/',$_ if /\S
/ }
336 foreach my $i (sort keys %ign) {
337 print "\n# ",$i,"\n";
338 foreach (@
{$ign{$i}}) { print '/',$i,'/',$_ if /\S/ }
342 ########################### utility functions #########################
346 my $info = shift || svn_info
('.');
347 $SVN_UUID = $info->{'Repository UUID'} or
348 croak
"Repository UUID unreadable\n";
349 s_to_file
($SVN_UUID,"$GIT_DIR/$GIT_SVN/info/uuid");
353 defined $SVN_URL or croak
"SVN repository location required\n";
354 unless (-d
$GIT_DIR) {
355 croak
"GIT_DIR=$GIT_DIR does not exist!\n";
357 mkpath
(["$GIT_DIR/$GIT_SVN"]);
358 mkpath
(["$GIT_DIR/$GIT_SVN/info"]);
360 s_to_file
($SVN_URL,"$GIT_DIR/$GIT_SVN/info/url");
362 open my $fd, '>>', "$GIT_DIR/$GIT_SVN/info/exclude" or croak
$!;
363 print $fd '.svn',"\n";
364 close $fd or croak
$!;
367 sub assert_svn_wc_clean
{
368 my ($svn_rev, $treeish) = @_;
369 croak
"$svn_rev is not an integer!\n" unless ($svn_rev =~ /^\d+$/);
370 croak
"$treeish is not a sha1!\n" unless ($treeish =~ /^$sha1$/o);
371 my $lcr = svn_info
('.')->{'Last Changed Rev'};
372 if ($svn_rev != $lcr) {
373 print STDERR
"Checking for copy-tree ... ";
375 my @diff = grep(/^Index: /,(safe_qx
(qw(svn diff),
376 "-r$lcr:$svn_rev")));
378 croak
"Nope! Expected r$svn_rev, got r$lcr\n";
380 print STDERR
"OK!\n";
383 my @status = grep(!/^Performing status on external/,(`svn status`));
384 @status = grep(!/^\s*$/,@status);
385 if (scalar @status) {
386 print STDERR
"Tree ($SVN_WC) is not clean:\n";
387 print STDERR
$_ foreach @status;
390 assert_tree
($treeish);
395 croak
"Not a sha1: $treeish\n" unless $treeish =~ /^$sha1$/o;
396 chomp(my $type = `git-cat-file -t $treeish`);
398 while ($type eq 'tag') {
399 chomp(($treeish, $type) = `git-cat-file tag $treeish`);
401 if ($type eq 'commit') {
402 $expected = (grep /^tree /,`git-cat-file commit $treeish`)[0];
403 ($expected) = ($expected =~ /^tree ($sha1)$/);
404 die "Unable to get tree from $treeish\n" unless $expected;
405 } elsif ($type eq 'tree') {
406 $expected = $treeish;
408 die "$treeish is a $type, expected tree, tag or commit\n";
411 my $old_index = $ENV{GIT_INDEX_FILE
};
412 my $tmpindex = $GIT_SVN_INDEX.'.assert-tmp';
414 unlink $tmpindex or croak
$!;
416 $ENV{GIT_INDEX_FILE
} = $tmpindex;
418 chomp(my $tree = `git-write-tree`);
420 $ENV{GIT_INDEX_FILE
} = $old_index;
422 delete $ENV{GIT_INDEX_FILE
};
424 if ($tree ne $expected) {
425 croak
"Tree mismatch, Got: $tree, Expected: $expected\n";
429 sub parse_diff_tree
{
435 chomp $_; # this gets rid of the trailing "\0"
436 if ($state eq 'meta' && /^:(\d
{6})\s
(\d
{6})\s
437 $sha1\s
($sha1)\s
([MTCRAD
])\d
*$/xo
) {
438 push @mods, { mode_a
=> $1, mode_b
=> $2,
439 sha1_b
=> $3, chg
=> $4 };
440 if ($4 =~ /^(?:C|R)$/) {
445 } elsif ($state eq 'file_a') {
446 my $x = $mods[$#mods] or croak
"Empty array\n";
447 if ($x->{chg
} !~ /^(?:C|R)$/) {
448 croak
"Error parsing $_, $x->{chg}\n";
452 } elsif ($state eq 'file_b') {
453 my $x = $mods[$#mods] or croak
"Empty array\n";
454 if (exists $x->{file_a
} && $x->{chg
} !~ /^(?:C|R)$/) {
455 croak
"Error parsing $_, $x->{chg}\n";
457 if (!exists $x->{file_a
} && $x->{chg
} =~ /^(?:C|R)$/) {
458 croak
"Error parsing $_, $x->{chg}\n";
463 croak
"Error parsing $_\n";
466 close $diff_fh or croak
$!;
471 sub svn_check_prop_executable
{
473 return if -l
$m->{file_b
};
474 if ($m->{mode_b
} =~ /755$/) {
475 chmod((0755 &~ umask),$m->{file_b
}) or croak
$!;
476 if ($m->{mode_a
} !~ /755$/) {
477 sys
(qw(svn propset svn:executable 1), $m->{file_b
});
479 -x
$m->{file_b
} or croak
"$m->{file_b} is not executable!\n";
480 } elsif ($m->{mode_b
} !~ /755$/ && $m->{mode_a
} =~ /755$/) {
481 sys
(qw(svn propdel svn:executable), $m->{file_b
});
482 chmod((0644 &~ umask),$m->{file_b
}) or croak
$!;
483 -x
$m->{file_b
} and croak
"$m->{file_b} is executable!\n";
487 sub svn_ensure_parent_path
{
488 my $dir_b = dirname
(shift);
489 svn_ensure_parent_path
($dir_b) if ($dir_b ne File
::Spec
->curdir);
490 mkpath
([$dir_b]) unless (-d
$dir_b);
491 sys
(qw(svn add -N), $dir_b) unless (-d
"$dir_b/.svn");
494 sub precommit_check
{
496 my (%rm_file, %rmdir_check, %added_check);
498 my %o = ( D
=> 0, R
=> 1, C
=> 2, A
=> 3, M
=> 3, T
=> 3 );
499 foreach my $m (sort { $o{$a->{chg
}} <=> $o{$b->{chg
}} } @
$mods) {
500 if ($m->{chg
} eq 'R') {
501 if (-d
$m->{file_b
}) {
502 err_dir_to_file
("$m->{file_a} => $m->{file_b}");
504 # dir/$file => dir/file/$file
505 my $dirname = dirname
($m->{file_b
});
506 while ($dirname ne File
::Spec
->curdir) {
507 if ($dirname ne $m->{file_a
}) {
508 $dirname = dirname
($dirname);
511 err_file_to_dir
("$m->{file_a} => $m->{file_b}");
513 # baz/zzz => baz (baz is a file)
514 $dirname = dirname
($m->{file_a
});
515 while ($dirname ne File
::Spec
->curdir) {
516 if ($dirname ne $m->{file_b
}) {
517 $dirname = dirname
($dirname);
520 err_dir_to_file
("$m->{file_a} => $m->{file_b}");
523 if ($m->{chg
} =~ /^(D|R)$/) {
524 my $t = $1 eq 'D' ?
'file_b' : 'file_a';
525 $rm_file{ $m->{$t} } = 1;
526 my $dirname = dirname
( $m->{$t} );
527 my $basename = basename
( $m->{$t} );
528 $rmdir_check{$dirname}->{$basename} = 1;
529 } elsif ($m->{chg
} =~ /^(?:A|C)$/) {
530 if (-d
$m->{file_b
}) {
531 err_dir_to_file
($m->{file_b
});
533 my $dirname = dirname
( $m->{file_b
} );
534 my $basename = basename
( $m->{file_b
} );
535 $added_check{$dirname}->{$basename} = 1;
536 while ($dirname ne File
::Spec
->curdir) {
537 if ($rm_file{$dirname}) {
538 err_file_to_dir
($m->{file_b
});
540 $dirname = dirname
$dirname;
544 return (\
%rmdir_check, \
%added_check);
546 sub err_dir_to_file
{
548 print STDERR
"Node change from directory to file ",
549 "is not supported by Subversion: ",$file,"\n";
552 sub err_file_to_dir
{
554 print STDERR
"Node change from file to directory ",
555 "is not supported by Subversion: ",$file,"\n";
560 sub svn_checkout_tree
{
561 my ($svn_rev, $treeish) = @_;
562 my $from = file_to_s
("$REV_DIR/$svn_rev");
563 assert_svn_wc_clean
($svn_rev,$from);
564 print "diff-tree $from $treeish\n";
565 my $pid = open my $diff_fh, '-|';
566 defined $pid or croak
$!;
568 my @diff_tree = qw(git-diff-tree -z -r -C);
569 push @diff_tree, '--find-copies-harder' if $_find_copies_harder;
570 push @diff_tree, "-l$_l" if defined $_l;
571 exec(@diff_tree, $from, $treeish) or croak
$!;
573 my $mods = parse_diff_tree
($diff_fh);
575 # git can do empty commits, but SVN doesn't allow it...
578 my ($rm, $add) = precommit_check
($mods);
580 my %o = ( D
=> 1, R
=> 0, C
=> -1, A
=> 3, M
=> 3, T
=> 3 );
581 foreach my $m (sort { $o{$a->{chg
}} <=> $o{$b->{chg
}} } @
$mods) {
582 if ($m->{chg
} eq 'C') {
583 svn_ensure_parent_path
( $m->{file_b
} );
584 sys
(qw(svn cp), $m->{file_a
}, $m->{file_b
});
585 apply_mod_line_blob
($m);
586 svn_check_prop_executable
($m);
587 } elsif ($m->{chg
} eq 'D') {
588 sys
(qw(svn rm --force), $m->{file_b
});
589 } elsif ($m->{chg
} eq 'R') {
590 svn_ensure_parent_path
( $m->{file_b
} );
591 sys
(qw(svn mv --force), $m->{file_a
}, $m->{file_b
});
592 apply_mod_line_blob
($m);
593 svn_check_prop_executable
($m);
594 } elsif ($m->{chg
} eq 'M') {
595 apply_mod_line_blob
($m);
596 svn_check_prop_executable
($m);
597 } elsif ($m->{chg
} eq 'T') {
598 sys
(qw(svn rm --force),$m->{file_b
});
599 apply_mod_line_blob
($m);
600 sys
(qw(svn add --force), $m->{file_b
});
601 svn_check_prop_executable
($m);
602 } elsif ($m->{chg
} eq 'A') {
603 svn_ensure_parent_path
( $m->{file_b
} );
604 apply_mod_line_blob
($m);
605 sys
(qw(svn add --force), $m->{file_b
});
606 svn_check_prop_executable
($m);
608 croak
"Invalid chg: $m->{chg}\n";
612 assert_tree
($treeish);
613 if ($_rmdir) { # remove empty directories
614 handle_rmdir
($rm, $add);
616 assert_tree
($treeish);
620 # svn ls doesn't work with respect to the current working tree, but what's
621 # in the repository. There's not even an option for it... *sigh*
622 # (added files don't show up and removed files remain in the ls listing)
624 my ($dir, $rm, $add) = @_;
625 chomp(my @ls = safe_qx
('svn','ls',$dir));
628 s
#/$##; # trailing slashes are evil
629 push @ret, $_ unless $rm->{$dir}->{$_};
631 if (exists $add->{$dir}) {
632 push @ret, keys %{$add->{$dir}};
640 foreach my $dir (sort {length $b <=> length $a} keys %$rm) {
641 my $ls = svn_ls_current
($dir, $rm, $add);
642 next if (scalar @
$ls);
643 sys
(qw(svn rm --force),$dir);
645 my $dn = dirname
$dir;
646 $rm->{ $dn }->{ basename
$dir } = 1;
647 $ls = svn_ls_current
($dn, $rm, $add);
648 while (scalar @
$ls == 0 && $dn ne File
::Spec
->curdir) {
649 sys
(qw(svn rm --force),$dn);
652 $rm->{ $dn }->{ $dir } = 1;
653 $ls = svn_ls_current
($dn, $rm, $add);
658 sub svn_commit_tree
{
659 my ($svn_rev, $commit) = @_;
660 my $commit_msg = "$GIT_DIR/$GIT_SVN/.svn-commit.tmp.$$";
661 my %log_msg = ( msg
=> '' );
662 open my $msg, '>', $commit_msg or croak
$!;
664 chomp(my $type = `git-cat-file -t $commit`);
665 if ($type eq 'commit') {
666 my $pid = open my $msg_fh, '-|';
667 defined $pid or croak
$!;
670 exec(qw(git-cat-file commit), $commit) or croak
$!;
675 $in_msg = 1 if (/^\s*$/);
676 } elsif (/^git-svn-id: /) {
677 # skip this, we regenerate the correct one
678 # on re-fetch anyways
680 print $msg $_ or croak
$!;
683 close $msg_fh or croak
$!;
685 close $msg or croak
$!;
687 if ($_edit || ($type eq 'tree')) {
688 my $editor = $ENV{VISUAL
} || $ENV{EDITOR
} || 'vi';
689 system($editor, $commit_msg);
692 # file_to_s removes all trailing newlines, so just use chomp() here:
693 open $msg, '<', $commit_msg or croak
$!;
694 { local $/; chomp($log_msg{msg
} = <$msg>); }
695 close $msg or croak
$!;
697 my ($oneline) = ($log_msg{msg
} =~ /([^\n\r]+)/);
698 print "Committing $commit: $oneline\n";
700 my @ci_output = safe_qx
(qw(svn commit -F),$commit_msg);
701 my ($committed) = grep(/^Committed revision \d+\./,@ci_output);
703 defined $committed or croak
704 "Commit output failed to parse committed revision!\n",
705 join("\n",@ci_output),"\n";
706 my ($rev_committed) = ($committed =~ /^Committed revision (\d+)\./);
708 my @svn_up = qw(svn up);
709 push @svn_up, '--ignore-externals' unless $_no_ignore_ext;
710 if ($rev_committed == ($svn_rev + 1)) {
711 push @svn_up, "-r$rev_committed";
713 my $info = svn_info
('.');
714 my $date = $info->{'Last Changed Date'} or die "Missing date\n";
715 if ($info->{'Last Changed Rev'} != $rev_committed) {
716 croak
"$info->{'Last Changed Rev'} != $rev_committed\n"
718 my ($Y,$m,$d,$H,$M,$S,$tz) = ($date =~
719 /(\d
{4})\
-(\d\d
)\
-(\d\d
)\s
720 (\d\d
)\
:(\d\d
)\
:(\d\d
)\s
([\
-\
+]\d
+)/x
)
721 or croak
"Failed to parse date: $date\n";
722 $log_msg{date
} = "$tz $Y-$m-$d $H:$M:$S";
723 $log_msg{author
} = $info->{'Last Changed Author'};
724 $log_msg{revision
} = $rev_committed;
725 $log_msg{msg
} .= "\n";
726 my $parent = file_to_s
("$REV_DIR/$svn_rev");
727 git_commit
(\
%log_msg, $parent, $commit);
728 return $rev_committed;
731 push @svn_up, "-r$svn_rev";
733 return fetch
("$rev_committed=$commit")->{revision
};
736 # read the entire log into a temporary file (which is removed ASAP)
737 # and store the file handle + parser state
740 my $log_fh = IO
::File
->new_tmpfile or croak
$!;
742 defined $pid or croak
$!;
744 open STDOUT
, '>&', $log_fh or croak
$!;
745 exec (qw(svn log), @log_args) or croak
$!
749 seek $log_fh, 0, 0 or croak
$!;
750 return { state => 'sep', fh
=> $log_fh };
754 my $log = shift; # retval of svn_log_raw()
761 if ($log->{state} eq 'msg') {
763 $ret->{msg
} .= $_."\n";
764 unless(--$ret->{lines
}) {
765 $log->{state} = 'sep';
768 croak
"Log parse error at: $_\n",
774 if ($log->{state} ne 'sep') {
775 croak
"Log parse error at: $_\n",
776 "state: $log->{state}\n",
780 $log->{state} = 'rev';
782 # if we have an empty log message, put something there:
784 $ret->{msg
} ||= "\n";
785 delete $ret->{lines
};
790 if ($log->{state} eq 'rev' && s/^r(\d+)\s*\|\s*//) {
792 my ($author, $date, $lines) = split(/\s*\|\s*/, $_, 3);
793 ($lines) = ($lines =~ /(\d+)/);
794 my ($Y,$m,$d,$H,$M,$S,$tz) = ($date =~
795 /(\d
{4})\
-(\d\d
)\
-(\d\d
)\s
796 (\d\d
)\
:(\d\d
)\
:(\d\d
)\s
([\
-\
+]\d
+)/x
)
797 or croak
"Failed to parse date: $date\n";
798 $ret = { revision
=> $rev,
799 date
=> "$tz $Y-$m-$d $H:$M:$S",
803 if (defined $_authors && ! defined $users{$author}) {
804 die "Author: $author not defined in ",
807 $log->{state} = 'msg_start';
810 # skip the first blank line of the message:
811 if ($log->{state} eq 'msg_start' && /^$/) {
812 $log->{state} = 'msg';
813 } elsif ($log->{state} eq 'msg') {
815 $ret->{msg
} .= $_."\n";
816 unless (--$ret->{lines
}) {
817 $log->{state} = 'sep';
820 croak
"Log parse error at: $_\n",
821 $ret->{revision
},"\n";
829 my $url = shift || $SVN_URL;
831 my $pid = open my $info_fh, '-|';
832 defined $pid or croak
$!;
835 exec(qw(svn info),$url) or croak
$!;
839 # only single-lines seem to exist in svn info output
842 if (m
#^([^:]+)\s*:\s*(\S.*)$#) {
844 push @
{$ret->{-order
}}, $1;
847 close $info_fh or croak
$!;
851 sub sys
{ system(@_) == 0 or croak
$?
}
854 system( "git-diff-files --name-only -z ".
855 " | git-update-index --remove -z --stdin && ".
856 "git-ls-files -z --others ".
857 "'--exclude-from=$GIT_DIR/$GIT_SVN/info/exclude'".
858 " | git-update-index --add -z --stdin"
863 my ($str, $file, $mode) = @_;
864 open my $fd,'>',$file or croak
$!;
865 print $fd $str,"\n" or croak
$!;
866 close $fd or croak
$!;
867 chmod ($mode &~ umask, $file) if (defined $mode);
872 open my $fd,'<',$file or croak
"$!: file: $file\n";
875 close $fd or croak
$!;
880 sub assert_revision_unknown
{
882 if (-f
"$REV_DIR/$revno") {
883 croak
"$REV_DIR/$revno already exists! ",
884 "Why are we refetching it?";
890 my @x = safe_qx
('git-cat-file','commit',$x);
891 my @y = safe_qx
('git-cat-file','commit',$y);
892 if (($y[0] ne $x[0]) || $x[0] !~ /^tree $sha1\n$/
893 || $y[0] !~ /^tree $sha1\n$/) {
894 print STDERR
"Trees not equal: $y[0] != $x[0]\n";
900 sub assert_revision_eq_or_unknown
{
901 my ($revno, $commit) = @_;
902 if (-f
"$REV_DIR/$revno") {
903 my $current = file_to_s
("$REV_DIR/$revno");
904 if (($commit ne $current) && !trees_eq
($commit, $current)) {
905 croak
"$REV_DIR/$revno already exists!\n",
906 "current: $current\nexpected: $commit\n";
913 my ($log_msg, @parents) = @_;
914 assert_revision_unknown
($log_msg->{revision
});
915 my $out_fh = IO
::File
->new_tmpfile or croak
$!;
917 map_tree_joins
() if (@_branch_from && !%tree_map);
919 # commit parents can be conditionally bound to a particular
920 # svn revision via: "svn_revno=commit_sha1", filter them out here:
922 foreach my $p (@parents) {
923 next unless defined $p;
924 if ($p =~ /^(\d+)=($sha1_short)$/o) {
925 if ($1 == $log_msg->{revision
}) {
926 push @exec_parents, $2;
929 push @exec_parents, $p if $p =~ /$sha1_short/o;
934 defined $pid or croak
$!;
936 $ENV{GIT_INDEX_FILE
} = $GIT_SVN_INDEX;
938 chomp(my $tree = `git-write-tree`);
940 if (exists $tree_map{$tree}) {
941 my %seen_parent = map { $_ => 1 } @exec_parents;
942 foreach (@
{$tree_map{$tree}}) {
943 # MAXPARENT is defined to 16 in commit-tree.c:
944 if ($seen_parent{$_} || @exec_parents > 16) {
947 push @exec_parents, $_;
948 $seen_parent{$_} = 1;
951 my $msg_fh = IO
::File
->new_tmpfile or croak
$!;
952 print $msg_fh $log_msg->{msg
}, "\ngit-svn-id: ",
953 "$SVN_URL\@$log_msg->{revision}",
954 " $SVN_UUID\n" or croak
$!;
955 $msg_fh->flush == 0 or croak
$!;
956 seek $msg_fh, 0, 0 or croak
$!;
958 set_commit_env
($log_msg);
960 my @exec = ('git-commit-tree',$tree);
961 push @exec, '-p', $_ foreach @exec_parents;
962 open STDIN
, '<&', $msg_fh or croak
$!;
963 open STDOUT
, '>&', $out_fh or croak
$!;
964 exec @exec or croak
$!;
969 $out_fh->flush == 0 or croak
$!;
970 seek $out_fh, 0, 0 or croak
$!;
971 chomp(my $commit = do { local $/; <$out_fh> });
972 if ($commit !~ /^$sha1$/o) {
973 croak
"Failed to commit, invalid sha1: $commit\n";
975 my @update_ref = ('git-update-ref',"refs/remotes/$GIT_SVN",$commit);
976 if (my $primary_parent = shift @exec_parents) {
978 defined $pid or croak
$!;
982 exec 'git-rev-parse','--verify',
983 "refs/remotes/$GIT_SVN^0";
986 push @update_ref, $primary_parent unless $?
;
989 sys
('git-update-ref',"$GIT_SVN/revs/$log_msg->{revision}",$commit);
990 print "r$log_msg->{revision} = $commit\n";
996 my $author = $log_msg->{author
};
997 my ($name,$email) = defined $users{$author} ? @
{$users{$author}}
998 : ($author,"$author\@$SVN_UUID");
999 $ENV{GIT_AUTHOR_NAME
} = $ENV{GIT_COMMITTER_NAME
} = $name;
1000 $ENV{GIT_AUTHOR_EMAIL
} = $ENV{GIT_COMMITTER_EMAIL
} = $email;
1001 $ENV{GIT_AUTHOR_DATE
} = $ENV{GIT_COMMITTER_DATE
} = $log_msg->{date
};
1004 sub apply_mod_line_blob
{
1006 if ($m->{mode_b
} =~ /^120/) {
1007 blob_to_symlink
($m->{sha1_b
}, $m->{file_b
});
1009 blob_to_file
($m->{sha1_b
}, $m->{file_b
});
1013 sub blob_to_symlink
{
1014 my ($blob, $link) = @_;
1015 defined $link or croak
"\$link not defined!\n";
1016 croak
"Not a sha1: $blob\n" unless $blob =~ /^$sha1$/o;
1017 if (-l
$link || -f _
) {
1018 unlink $link or croak
$!;
1021 my $dest = `git-cat-file blob $blob`; # no newline, so no chomp
1022 symlink $dest, $link or croak
$!;
1026 my ($blob, $file) = @_;
1027 defined $file or croak
"\$file not defined!\n";
1028 croak
"Not a sha1: $blob\n" unless $blob =~ /^$sha1$/o;
1029 if (-l
$file || -f _
) {
1030 unlink $file or croak
$!;
1033 open my $blob_fh, '>', $file or croak
"$!: $file\n";
1035 defined $pid or croak
$!;
1038 open STDOUT
, '>&', $blob_fh or croak
$!;
1039 exec('git-cat-file','blob',$blob);
1044 close $blob_fh or croak
$!;
1048 my $pid = open my $child, '-|';
1049 defined $pid or croak
$!;
1051 exec(@_) or croak
$?
;
1053 my @ret = (<$child>);
1054 close $child or croak
$?
;
1055 die $?
if $?
; # just in case close didn't error out
1056 return wantarray ?
@ret : join('',@ret);
1059 sub svn_compat_check
{
1060 my @co_help = safe_qx
(qw(svn co -h));
1061 unless (grep /ignore-externals/,@co_help) {
1062 print STDERR
"W: Installed svn version does not support ",
1063 "--ignore-externals\n";
1064 $_no_ignore_ext = 1;
1066 if (grep /usage: checkout URL\[\@REV\]/,@co_help) {
1067 $_svn_co_url_revs = 1;
1070 # I really, really hope nobody hits this...
1071 unless (grep /stop-on-copy/, (safe_qx
(qw(svn log -h)))) {
1073 W
: The installed svn version does
not support the
--stop
-on
-copy flag
in
1075 Lets hope the directory you
're tracking is not a branch or tag
1076 and was never moved within the repository...
1082 # *sigh*, new versions of svn won't honor
-r
<rev
> without URL@
<rev
>,
1083 # (and they won't honor URL@<rev> without -r<rev>, too!)
1084 sub svn_cmd_checkout
{
1085 my ($url, $rev, $dir) = @_;
1086 my @cmd = ('svn','co', "-r$rev");
1087 push @cmd, '--ignore-externals' unless $_no_ignore_ext;
1088 $url .= "\@$rev" if $_svn_co_url_revs;
1089 sys
(@cmd, $url, $dir);
1092 sub check_upgrade_needed
{
1094 my $pid = open my $child, '-|';
1095 defined $pid or croak
$!;
1098 exec('git-rev-parse',"$GIT_SVN-HEAD") or croak
$?
;
1100 my @ret = (<$child>);
1101 close $child or croak
$?
;
1102 die $?
if $?
; # just in case close didn't error out
1103 return wantarray ?
@ret : join('',@ret);
1106 my $head = eval { safe_qx
('git-rev-parse',"refs/remotes/$GIT_SVN") };
1108 print STDERR
"Please run: $0 rebuild --upgrade\n";
1113 # fills %tree_map with a reverse mapping of trees to commits. Useful
1114 # for finding parents to commit on.
1115 sub map_tree_joins
{
1116 foreach my $br (@_branch_from) {
1117 my $pid = open my $pipe, '-|';
1118 defined $pid or croak
$!;
1120 exec(qw(git-rev-list --pretty=raw), $br) or croak
$?
;
1123 if (/^commit ($sha1)$/o) {
1125 my ($tree) = (<$pipe> =~ /^tree ($sha1)$/o);
1126 unless (defined $tree) {
1127 die "Failed to parse commit $commit\n";
1129 push @
{$tree_map{$tree}}, $commit;
1132 close $pipe or croak
$?
;
1136 # '<svn username> = real-name <email address>' mapping based on git-svnimport:
1138 open my $authors, '<', $_authors or die "Can't open $_authors $!\n";
1139 while (<$authors>) {
1141 next unless /^(\S+?)\s*=\s*(.+?)\s*<(.+)>\s*$/;
1142 my ($user, $name, $email) = ($1, $2, $3);
1143 $users{$user} = [$name, $email];
1145 close $authors or croak
$!;
1152 $svn_log hashref
(as returned by svn_log_raw
)
1154 fh
=> file handle of the
log file
,
1155 state => state of the
log file parser
(sep
/msg/rev
/msg_start
...)
1158 $log_msg hashref as returned by next_log_entry
($svn_log)
1160 msg
=> 'whitespace-formatted log entry
1161 ', # trailing newline is preserved
1162 revision
=> '8', # integer
1163 date
=> '2004-02-24T17:01:44.108345Z', # commit date
1164 author
=> 'committer name'
1168 @mods = array of diff
-index line hashes
, each element represents one line
1169 of diff
-index output
1171 diff
-index line
($m hash
)
1173 mode_a
=> first column of diff
-index output
, no leading
':',
1174 mode_b
=> second column of diff
-index output
,
1175 sha1_b
=> sha1sum of the final blob
,
1176 chg
=> change type
[MCRADT
],
1177 file_a
=> original file name of a file
(iff chg is
'C' or 'R')
1178 file_b
=> new
/current file name of a file
(any chg
)