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 a repo for tracking" .
46 " (requires URL argument)", { } ],
47 commit
=> [ \
&commit
, "Commit git revisions to SVN",
48 { 'stdin|' => \
$_stdin,
51 'find-copies-harder' => \
$_find_copies_harder,
55 'show-ignore' => [ \
&show_ignore
, "Show svn:ignore listings", { } ],
56 rebuild
=> [ \
&rebuild
, "Rebuild git-svn metadata (after git clone)",
57 { 'no-ignore-externals' => \
$_no_ignore_ext,
58 'upgrade' => \
$_upgrade } ],
61 for (my $i = 0; $i < @ARGV; $i++) {
62 if (defined $cmd{$ARGV[$i]}) {
69 my %opts = %{$cmd{$cmd}->[2]} if (defined $cmd);
71 # convert GetOpt::Long specs for use by git-repo-config
72 foreach my $o (keys %opts) {
74 my ($key) = ($o =~ /^([a-z\-]+)/);
76 my $arg = 'git-repo-config';
77 $arg .= ' --int' if ($o =~ /=i$/);
78 $arg .= ' --bool' if ($o !~ /=[sfi]$/);
79 if (ref $v eq 'ARRAY') {
80 chomp(my @tmp = `$arg --get-all svn.$key`);
83 chomp(my $tmp = `$arg --get svn.$key`);
84 if ($tmp && !($arg =~ / --bool / && $tmp eq 'false')) {
90 GetOptions
(%opts, 'help|H|h' => \
$_help,
91 'version|V' => \
$_version,
92 'id|i=s' => \
$GIT_SVN) or exit 1;
94 $GIT_SVN ||= $ENV{GIT_SVN_ID
} || 'git-svn';
95 $GIT_SVN_INDEX = "$GIT_DIR/$GIT_SVN/index";
97 $REV_DIR = "$GIT_DIR/$GIT_SVN/revs";
98 $SVN_WC = "$GIT_DIR/$GIT_SVN/tree";
101 version
() if $_version;
102 usage
(1) unless defined $cmd;
103 load_authors
() if $_authors;
105 $cmd{$cmd}->[0]->(@ARGV);
108 ####################### primary functions ######################
110 my $exit = shift || 0;
111 my $fd = $exit ? \
*STDERR
: \
*STDOUT
;
113 git
-svn
- bidirectional operations between a single Subversion tree
and git
114 Usage
: $0 <command
> [options
] [arguments
]\n
116 print $fd "Available commands:\n" unless $cmd;
118 foreach (sort keys %cmd) {
119 next if $cmd && $cmd ne $_;
120 print $fd ' ',pack('A13',$_),$cmd{$_}->[1],"\n";
121 foreach (keys %{$cmd{$_}->[2]}) {
122 # prints out arguments as they should be passed:
123 my $x = s
#=s$## ? '<arg>' : s#=i$## ? '<num>' : '';
124 print $fd ' ' x
17, join(', ', map { length $_ > 1 ?
126 split /\|/,$_)," $x\n";
130 \nGIT_SVN_ID may be set
in the environment
or via the
--id
/-i switch to an
131 arbitrary identifier
if you
're tracking multiple SVN branches/repositories in
132 one git repository and want to keep them separate. See git-svn(1) for more
139 print "git-svn version $VERSION\n";
144 $SVN_URL = shift or undef;
147 sys('git
-update
-ref',"refs/remotes/$GIT_SVN","$GIT_SVN-HEAD");
149 check_upgrade_needed();
152 my $pid = open(my $rev_list,'-|');
153 defined $pid or croak $!;
155 exec("git-rev-list","refs/remotes/$GIT_SVN") or croak $!;
158 while (<$rev_list>) {
161 croak "Non-SHA1: $c\n" unless $c =~ /^$sha1$/o;
162 my @commit = grep(/^git-svn-id: /,`git-cat-file commit $c`);
163 next if (!@commit); # skip merges
164 my $id = $commit[$#commit];
165 my ($url, $rev, $uuid) = ($id =~ /^git-svn-id:\s(\S+?)\@(\d+)
167 if (!$rev || !$uuid || !$url) {
168 # some of the original repositories I made had
169 # indentifiers like this:
170 ($rev, $uuid) = ($id =~/^git-svn-id:\s(\d+)
172 if (!$rev || !$uuid) {
173 croak "Unable to extract revision or UUID from ",
178 # if we merged or otherwise started elsewhere, this is
179 # how we break out of it
180 next if (defined $SVN_UUID && ($uuid ne $SVN_UUID));
181 next if (defined $SVN_URL && defined $url && ($url ne $SVN_URL));
183 print "r$rev = $c\n";
184 unless (defined $latest) {
185 if (!$SVN_URL && !$url) {
186 croak "SVN repository location required: $url\n";
193 assert_revision_eq_or_unknown($rev, $c);
194 sys('git
-update
-ref',"$GIT_SVN/revs/$rev",$c);
195 $newest_rev = $rev if ($rev > $newest_rev);
197 close $rev_list or croak $?;
198 if (!chdir $SVN_WC) {
199 svn_cmd_checkout($SVN_URL, $latest, $SVN_WC);
200 chdir $SVN_WC or croak $!;
204 defined $pid or croak $!;
206 my @svn_up = qw(svn up);
207 push @svn_up, '--ignore-externals' unless $_no_ignore_ext;
208 sys
(@svn_up,"-r$newest_rev");
209 $ENV{GIT_INDEX_FILE
} = $GIT_SVN_INDEX;
211 exec('git-write-tree');
217 Keeping deprecated refs
/head/$GIT_SVN-HEAD
for now
. Please remove it
218 when you have upgraded your tools
and habits to
use refs
/remotes/$GIT_SVN
224 $SVN_URL = shift or die "SVN repository location required " .
225 "as a command-line argument\n";
226 unless (-d
$GIT_DIR) {
234 check_upgrade_needed
();
235 $SVN_URL ||= file_to_s
("$GIT_DIR/$GIT_SVN/info/url");
236 my @log_args = -d
$SVN_WC ?
($SVN_WC) : ($SVN_URL);
237 unless ($_revision) {
238 $_revision = -d
$SVN_WC ?
'BASE:HEAD' : '0:HEAD';
240 push @log_args, "-r$_revision";
241 push @log_args, '--stop-on-copy' unless $_no_stop_copy;
243 my $svn_log = svn_log_raw
(@log_args);
245 my $base = next_log_entry
($svn_log) or croak
"No base revision!\n";
246 my $last_commit = undef;
247 unless (-d
$SVN_WC) {
248 svn_cmd_checkout
($SVN_URL,$base->{revision
},$SVN_WC);
249 chdir $SVN_WC or croak
$!;
251 $last_commit = git_commit
($base, @parents);
252 assert_svn_wc_clean
($base->{revision
}, $last_commit);
254 chdir $SVN_WC or croak
$!;
256 $last_commit = file_to_s
("$REV_DIR/$base->{revision}");
258 my @svn_up = qw(svn up);
259 push @svn_up, '--ignore-externals' unless $_no_ignore_ext;
261 while (my $log_msg = next_log_entry
($svn_log)) {
262 assert_svn_wc_clean
($last->{revision
}, $last_commit);
263 if ($last->{revision
} >= $log_msg->{revision
}) {
264 croak
"Out of order: last >= current: ",
265 "$last->{revision} >= $log_msg->{revision}\n";
267 sys
(@svn_up,"-r$log_msg->{revision}");
268 $last_commit = git_commit
($log_msg, $last_commit, @parents);
271 assert_svn_wc_clean
($last->{revision
}, $last_commit);
272 unless (-e
"$GIT_DIR/refs/heads/master") {
273 sys
(qw(git-update-ref refs/heads/master),$last_commit);
280 check_upgrade_needed
();
281 if ($_stdin || !@commits) {
282 print "Reading from stdin...\n";
285 if (/\b($sha1_short)\b/o) {
286 unshift @commits, $1;
291 foreach my $c (@commits) {
292 chomp(my @tmp = safe_qx
('git-rev-parse',$c));
293 if (scalar @tmp == 1) {
295 } elsif (scalar @tmp > 1) {
296 push @revs, reverse (safe_qx
('git-rev-list',@tmp));
298 die "Failed to rev-parse $c\n";
304 chdir $SVN_WC or croak
$!;
305 my $info = svn_info
('.');
307 my $svn_current_rev = $info->{'Last Changed Rev'};
308 foreach my $c (@revs) {
309 my $mods = svn_checkout_tree
($svn_current_rev, $c);
310 if (scalar @
$mods == 0) {
311 print "Skipping, no changes detected\n";
314 $svn_current_rev = svn_commit_tree
($svn_current_rev, $c);
316 print "Done committing ",scalar @revs," revisions to SVN\n";
321 require File
::Find
or die $!;
322 my $exclude_file = "$GIT_DIR/info/exclude";
323 open my $fh, '<', $exclude_file or croak
$!;
324 chomp(my @excludes = (<$fh>));
325 close $fh or croak
$!;
327 $SVN_URL ||= file_to_s
("$GIT_DIR/$GIT_SVN/info/url");
328 chdir $SVN_WC or croak
$!;
330 File
::Find
::find
({wanted
=>sub{if(lstat $_ && -d _
&& -d
"$_/.svn"){
332 @
{$ign{$_}} = safe_qx
(qw(svn propget svn:ignore),$_);
333 }}, no_chdir
=>1},'.');
336 foreach (@
{$ign{'.'}}) { print '/',$_ if /\S
/ }
338 foreach my $i (sort keys %ign) {
339 print "\n# ",$i,"\n";
340 foreach (@
{$ign{$i}}) { print '/',$i,'/',$_ if /\S/ }
344 ########################### utility functions #########################
348 my $info = shift || svn_info
('.');
349 $SVN_UUID = $info->{'Repository UUID'} or
350 croak
"Repository UUID unreadable\n";
351 s_to_file
($SVN_UUID,"$GIT_DIR/$GIT_SVN/info/uuid");
355 defined $SVN_URL or croak
"SVN repository location required\n";
356 unless (-d
$GIT_DIR) {
357 croak
"GIT_DIR=$GIT_DIR does not exist!\n";
359 mkpath
(["$GIT_DIR/$GIT_SVN"]);
360 mkpath
(["$GIT_DIR/$GIT_SVN/info"]);
362 s_to_file
($SVN_URL,"$GIT_DIR/$GIT_SVN/info/url");
364 open my $fd, '>>', "$GIT_DIR/$GIT_SVN/info/exclude" or croak
$!;
365 print $fd '.svn',"\n";
366 close $fd or croak
$!;
369 sub assert_svn_wc_clean
{
370 my ($svn_rev, $treeish) = @_;
371 croak
"$svn_rev is not an integer!\n" unless ($svn_rev =~ /^\d+$/);
372 croak
"$treeish is not a sha1!\n" unless ($treeish =~ /^$sha1$/o);
373 my $lcr = svn_info
('.')->{'Last Changed Rev'};
374 if ($svn_rev != $lcr) {
375 print STDERR
"Checking for copy-tree ... ";
377 my @diff = grep(/^Index: /,(safe_qx
(qw(svn diff),
378 "-r$lcr:$svn_rev")));
380 croak
"Nope! Expected r$svn_rev, got r$lcr\n";
382 print STDERR
"OK!\n";
385 my @status = grep(!/^Performing status on external/,(`svn status`));
386 @status = grep(!/^\s*$/,@status);
387 if (scalar @status) {
388 print STDERR
"Tree ($SVN_WC) is not clean:\n";
389 print STDERR
$_ foreach @status;
392 assert_tree
($treeish);
397 croak
"Not a sha1: $treeish\n" unless $treeish =~ /^$sha1$/o;
398 chomp(my $type = `git-cat-file -t $treeish`);
400 while ($type eq 'tag') {
401 chomp(($treeish, $type) = `git-cat-file tag $treeish`);
403 if ($type eq 'commit') {
404 $expected = (grep /^tree /,`git-cat-file commit $treeish`)[0];
405 ($expected) = ($expected =~ /^tree ($sha1)$/);
406 die "Unable to get tree from $treeish\n" unless $expected;
407 } elsif ($type eq 'tree') {
408 $expected = $treeish;
410 die "$treeish is a $type, expected tree, tag or commit\n";
413 my $old_index = $ENV{GIT_INDEX_FILE
};
414 my $tmpindex = $GIT_SVN_INDEX.'.assert-tmp';
416 unlink $tmpindex or croak
$!;
418 $ENV{GIT_INDEX_FILE
} = $tmpindex;
420 chomp(my $tree = `git-write-tree`);
422 $ENV{GIT_INDEX_FILE
} = $old_index;
424 delete $ENV{GIT_INDEX_FILE
};
426 if ($tree ne $expected) {
427 croak
"Tree mismatch, Got: $tree, Expected: $expected\n";
431 sub parse_diff_tree
{
437 chomp $_; # this gets rid of the trailing "\0"
438 if ($state eq 'meta' && /^:(\d
{6})\s
(\d
{6})\s
439 $sha1\s
($sha1)\s
([MTCRAD
])\d
*$/xo
) {
440 push @mods, { mode_a
=> $1, mode_b
=> $2,
441 sha1_b
=> $3, chg
=> $4 };
442 if ($4 =~ /^(?:C|R)$/) {
447 } elsif ($state eq 'file_a') {
448 my $x = $mods[$#mods] or croak
"Empty array\n";
449 if ($x->{chg
} !~ /^(?:C|R)$/) {
450 croak
"Error parsing $_, $x->{chg}\n";
454 } elsif ($state eq 'file_b') {
455 my $x = $mods[$#mods] or croak
"Empty array\n";
456 if (exists $x->{file_a
} && $x->{chg
} !~ /^(?:C|R)$/) {
457 croak
"Error parsing $_, $x->{chg}\n";
459 if (!exists $x->{file_a
} && $x->{chg
} =~ /^(?:C|R)$/) {
460 croak
"Error parsing $_, $x->{chg}\n";
465 croak
"Error parsing $_\n";
468 close $diff_fh or croak
$!;
473 sub svn_check_prop_executable
{
475 return if -l
$m->{file_b
};
476 if ($m->{mode_b
} =~ /755$/) {
477 chmod((0755 &~ umask),$m->{file_b
}) or croak
$!;
478 if ($m->{mode_a
} !~ /755$/) {
479 sys
(qw(svn propset svn:executable 1), $m->{file_b
});
481 -x
$m->{file_b
} or croak
"$m->{file_b} is not executable!\n";
482 } elsif ($m->{mode_b
} !~ /755$/ && $m->{mode_a
} =~ /755$/) {
483 sys
(qw(svn propdel svn:executable), $m->{file_b
});
484 chmod((0644 &~ umask),$m->{file_b
}) or croak
$!;
485 -x
$m->{file_b
} and croak
"$m->{file_b} is executable!\n";
489 sub svn_ensure_parent_path
{
490 my $dir_b = dirname
(shift);
491 svn_ensure_parent_path
($dir_b) if ($dir_b ne File
::Spec
->curdir);
492 mkpath
([$dir_b]) unless (-d
$dir_b);
493 sys
(qw(svn add -N), $dir_b) unless (-d
"$dir_b/.svn");
496 sub precommit_check
{
498 my (%rm_file, %rmdir_check, %added_check);
500 my %o = ( D
=> 0, R
=> 1, C
=> 2, A
=> 3, M
=> 3, T
=> 3 );
501 foreach my $m (sort { $o{$a->{chg
}} <=> $o{$b->{chg
}} } @
$mods) {
502 if ($m->{chg
} eq 'R') {
503 if (-d
$m->{file_b
}) {
504 err_dir_to_file
("$m->{file_a} => $m->{file_b}");
506 # dir/$file => dir/file/$file
507 my $dirname = dirname
($m->{file_b
});
508 while ($dirname ne File
::Spec
->curdir) {
509 if ($dirname ne $m->{file_a
}) {
510 $dirname = dirname
($dirname);
513 err_file_to_dir
("$m->{file_a} => $m->{file_b}");
515 # baz/zzz => baz (baz is a file)
516 $dirname = dirname
($m->{file_a
});
517 while ($dirname ne File
::Spec
->curdir) {
518 if ($dirname ne $m->{file_b
}) {
519 $dirname = dirname
($dirname);
522 err_dir_to_file
("$m->{file_a} => $m->{file_b}");
525 if ($m->{chg
} =~ /^(D|R)$/) {
526 my $t = $1 eq 'D' ?
'file_b' : 'file_a';
527 $rm_file{ $m->{$t} } = 1;
528 my $dirname = dirname
( $m->{$t} );
529 my $basename = basename
( $m->{$t} );
530 $rmdir_check{$dirname}->{$basename} = 1;
531 } elsif ($m->{chg
} =~ /^(?:A|C)$/) {
532 if (-d
$m->{file_b
}) {
533 err_dir_to_file
($m->{file_b
});
535 my $dirname = dirname
( $m->{file_b
} );
536 my $basename = basename
( $m->{file_b
} );
537 $added_check{$dirname}->{$basename} = 1;
538 while ($dirname ne File
::Spec
->curdir) {
539 if ($rm_file{$dirname}) {
540 err_file_to_dir
($m->{file_b
});
542 $dirname = dirname
$dirname;
546 return (\
%rmdir_check, \
%added_check);
548 sub err_dir_to_file
{
550 print STDERR
"Node change from directory to file ",
551 "is not supported by Subversion: ",$file,"\n";
554 sub err_file_to_dir
{
556 print STDERR
"Node change from file to directory ",
557 "is not supported by Subversion: ",$file,"\n";
562 sub svn_checkout_tree
{
563 my ($svn_rev, $treeish) = @_;
564 my $from = file_to_s
("$REV_DIR/$svn_rev");
565 assert_svn_wc_clean
($svn_rev,$from);
566 print "diff-tree $from $treeish\n";
567 my $pid = open my $diff_fh, '-|';
568 defined $pid or croak
$!;
570 my @diff_tree = qw(git-diff-tree -z -r -C);
571 push @diff_tree, '--find-copies-harder' if $_find_copies_harder;
572 push @diff_tree, "-l$_l" if defined $_l;
573 exec(@diff_tree, $from, $treeish) or croak
$!;
575 my $mods = parse_diff_tree
($diff_fh);
577 # git can do empty commits, but SVN doesn't allow it...
580 my ($rm, $add) = precommit_check
($mods);
582 my %o = ( D
=> 1, R
=> 0, C
=> -1, A
=> 3, M
=> 3, T
=> 3 );
583 foreach my $m (sort { $o{$a->{chg
}} <=> $o{$b->{chg
}} } @
$mods) {
584 if ($m->{chg
} eq 'C') {
585 svn_ensure_parent_path
( $m->{file_b
} );
586 sys
(qw(svn cp), $m->{file_a
}, $m->{file_b
});
587 apply_mod_line_blob
($m);
588 svn_check_prop_executable
($m);
589 } elsif ($m->{chg
} eq 'D') {
590 sys
(qw(svn rm --force), $m->{file_b
});
591 } elsif ($m->{chg
} eq 'R') {
592 svn_ensure_parent_path
( $m->{file_b
} );
593 sys
(qw(svn mv --force), $m->{file_a
}, $m->{file_b
});
594 apply_mod_line_blob
($m);
595 svn_check_prop_executable
($m);
596 } elsif ($m->{chg
} eq 'M') {
597 apply_mod_line_blob
($m);
598 svn_check_prop_executable
($m);
599 } elsif ($m->{chg
} eq 'T') {
600 sys
(qw(svn rm --force),$m->{file_b
});
601 apply_mod_line_blob
($m);
602 sys
(qw(svn add --force), $m->{file_b
});
603 svn_check_prop_executable
($m);
604 } elsif ($m->{chg
} eq 'A') {
605 svn_ensure_parent_path
( $m->{file_b
} );
606 apply_mod_line_blob
($m);
607 sys
(qw(svn add --force), $m->{file_b
});
608 svn_check_prop_executable
($m);
610 croak
"Invalid chg: $m->{chg}\n";
614 assert_tree
($treeish);
615 if ($_rmdir) { # remove empty directories
616 handle_rmdir
($rm, $add);
618 assert_tree
($treeish);
622 # svn ls doesn't work with respect to the current working tree, but what's
623 # in the repository. There's not even an option for it... *sigh*
624 # (added files don't show up and removed files remain in the ls listing)
626 my ($dir, $rm, $add) = @_;
627 chomp(my @ls = safe_qx
('svn','ls',$dir));
630 s
#/$##; # trailing slashes are evil
631 push @ret, $_ unless $rm->{$dir}->{$_};
633 if (exists $add->{$dir}) {
634 push @ret, keys %{$add->{$dir}};
642 foreach my $dir (sort {length $b <=> length $a} keys %$rm) {
643 my $ls = svn_ls_current
($dir, $rm, $add);
644 next if (scalar @
$ls);
645 sys
(qw(svn rm --force),$dir);
647 my $dn = dirname
$dir;
648 $rm->{ $dn }->{ basename
$dir } = 1;
649 $ls = svn_ls_current
($dn, $rm, $add);
650 while (scalar @
$ls == 0 && $dn ne File
::Spec
->curdir) {
651 sys
(qw(svn rm --force),$dn);
654 $rm->{ $dn }->{ $dir } = 1;
655 $ls = svn_ls_current
($dn, $rm, $add);
660 sub svn_commit_tree
{
661 my ($svn_rev, $commit) = @_;
662 my $commit_msg = "$GIT_DIR/$GIT_SVN/.svn-commit.tmp.$$";
663 my %log_msg = ( msg
=> '' );
664 open my $msg, '>', $commit_msg or croak
$!;
666 chomp(my $type = `git-cat-file -t $commit`);
667 if ($type eq 'commit') {
668 my $pid = open my $msg_fh, '-|';
669 defined $pid or croak
$!;
672 exec(qw(git-cat-file commit), $commit) or croak
$!;
677 $in_msg = 1 if (/^\s*$/);
678 } elsif (/^git-svn-id: /) {
679 # skip this, we regenerate the correct one
680 # on re-fetch anyways
682 print $msg $_ or croak
$!;
685 close $msg_fh or croak
$!;
687 close $msg or croak
$!;
689 if ($_edit || ($type eq 'tree')) {
690 my $editor = $ENV{VISUAL
} || $ENV{EDITOR
} || 'vi';
691 system($editor, $commit_msg);
694 # file_to_s removes all trailing newlines, so just use chomp() here:
695 open $msg, '<', $commit_msg or croak
$!;
696 { local $/; chomp($log_msg{msg
} = <$msg>); }
697 close $msg or croak
$!;
699 my ($oneline) = ($log_msg{msg
} =~ /([^\n\r]+)/);
700 print "Committing $commit: $oneline\n";
702 my @ci_output = safe_qx
(qw(svn commit -F),$commit_msg);
703 my ($committed) = grep(/^Committed revision \d+\./,@ci_output);
705 defined $committed or croak
706 "Commit output failed to parse committed revision!\n",
707 join("\n",@ci_output),"\n";
708 my ($rev_committed) = ($committed =~ /^Committed revision (\d+)\./);
710 my @svn_up = qw(svn up);
711 push @svn_up, '--ignore-externals' unless $_no_ignore_ext;
712 if ($rev_committed == ($svn_rev + 1)) {
713 push @svn_up, "-r$rev_committed";
715 my $info = svn_info
('.');
716 my $date = $info->{'Last Changed Date'} or die "Missing date\n";
717 if ($info->{'Last Changed Rev'} != $rev_committed) {
718 croak
"$info->{'Last Changed Rev'} != $rev_committed\n"
720 my ($Y,$m,$d,$H,$M,$S,$tz) = ($date =~
721 /(\d
{4})\
-(\d\d
)\
-(\d\d
)\s
722 (\d\d
)\
:(\d\d
)\
:(\d\d
)\s
([\
-\
+]\d
+)/x
)
723 or croak
"Failed to parse date: $date\n";
724 $log_msg{date
} = "$tz $Y-$m-$d $H:$M:$S";
725 $log_msg{author
} = $info->{'Last Changed Author'};
726 $log_msg{revision
} = $rev_committed;
727 $log_msg{msg
} .= "\n";
728 my $parent = file_to_s
("$REV_DIR/$svn_rev");
729 git_commit
(\
%log_msg, $parent, $commit);
730 return $rev_committed;
733 push @svn_up, "-r$svn_rev";
735 return fetch
("$rev_committed=$commit")->{revision
};
738 # read the entire log into a temporary file (which is removed ASAP)
739 # and store the file handle + parser state
742 my $log_fh = IO
::File
->new_tmpfile or croak
$!;
744 defined $pid or croak
$!;
746 open STDOUT
, '>&', $log_fh or croak
$!;
747 exec (qw(svn log), @log_args) or croak
$!
751 seek $log_fh, 0, 0 or croak
$!;
752 return { state => 'sep', fh
=> $log_fh };
756 my $log = shift; # retval of svn_log_raw()
763 if ($log->{state} eq 'msg') {
765 $ret->{msg
} .= $_."\n";
766 unless(--$ret->{lines
}) {
767 $log->{state} = 'sep';
770 croak
"Log parse error at: $_\n",
776 if ($log->{state} ne 'sep') {
777 croak
"Log parse error at: $_\n",
778 "state: $log->{state}\n",
782 $log->{state} = 'rev';
784 # if we have an empty log message, put something there:
786 $ret->{msg
} ||= "\n";
787 delete $ret->{lines
};
792 if ($log->{state} eq 'rev' && s/^r(\d+)\s*\|\s*//) {
794 my ($author, $date, $lines) = split(/\s*\|\s*/, $_, 3);
795 ($lines) = ($lines =~ /(\d+)/);
796 my ($Y,$m,$d,$H,$M,$S,$tz) = ($date =~
797 /(\d
{4})\
-(\d\d
)\
-(\d\d
)\s
798 (\d\d
)\
:(\d\d
)\
:(\d\d
)\s
([\
-\
+]\d
+)/x
)
799 or croak
"Failed to parse date: $date\n";
800 $ret = { revision
=> $rev,
801 date
=> "$tz $Y-$m-$d $H:$M:$S",
805 if (defined $_authors && ! defined $users{$author}) {
806 die "Author: $author not defined in ",
809 $log->{state} = 'msg_start';
812 # skip the first blank line of the message:
813 if ($log->{state} eq 'msg_start' && /^$/) {
814 $log->{state} = 'msg';
815 } elsif ($log->{state} eq 'msg') {
817 $ret->{msg
} .= $_."\n";
818 unless (--$ret->{lines
}) {
819 $log->{state} = 'sep';
822 croak
"Log parse error at: $_\n",
823 $ret->{revision
},"\n";
831 my $url = shift || $SVN_URL;
833 my $pid = open my $info_fh, '-|';
834 defined $pid or croak
$!;
837 exec(qw(svn info),$url) or croak
$!;
841 # only single-lines seem to exist in svn info output
844 if (m
#^([^:]+)\s*:\s*(\S.*)$#) {
846 push @
{$ret->{-order
}}, $1;
849 close $info_fh or croak
$!;
853 sub sys
{ system(@_) == 0 or croak
$?
}
856 system( "git-diff-files --name-only -z ".
857 " | git-update-index --remove -z --stdin && ".
858 "git-ls-files -z --others ".
859 "'--exclude-from=$GIT_DIR/$GIT_SVN/info/exclude'".
860 " | git-update-index --add -z --stdin"
865 my ($str, $file, $mode) = @_;
866 open my $fd,'>',$file or croak
$!;
867 print $fd $str,"\n" or croak
$!;
868 close $fd or croak
$!;
869 chmod ($mode &~ umask, $file) if (defined $mode);
874 open my $fd,'<',$file or croak
"$!: file: $file\n";
877 close $fd or croak
$!;
882 sub assert_revision_unknown
{
884 if (-f
"$REV_DIR/$revno") {
885 croak
"$REV_DIR/$revno already exists! ",
886 "Why are we refetching it?";
892 my @x = safe_qx
('git-cat-file','commit',$x);
893 my @y = safe_qx
('git-cat-file','commit',$y);
894 if (($y[0] ne $x[0]) || $x[0] !~ /^tree $sha1\n$/
895 || $y[0] !~ /^tree $sha1\n$/) {
896 print STDERR
"Trees not equal: $y[0] != $x[0]\n";
902 sub assert_revision_eq_or_unknown
{
903 my ($revno, $commit) = @_;
904 if (-f
"$REV_DIR/$revno") {
905 my $current = file_to_s
("$REV_DIR/$revno");
906 if (($commit ne $current) && !trees_eq
($commit, $current)) {
907 croak
"$REV_DIR/$revno already exists!\n",
908 "current: $current\nexpected: $commit\n";
915 my ($log_msg, @parents) = @_;
916 assert_revision_unknown
($log_msg->{revision
});
917 my $out_fh = IO
::File
->new_tmpfile or croak
$!;
919 map_tree_joins
() if (@_branch_from && !%tree_map);
921 # commit parents can be conditionally bound to a particular
922 # svn revision via: "svn_revno=commit_sha1", filter them out here:
924 foreach my $p (@parents) {
925 next unless defined $p;
926 if ($p =~ /^(\d+)=($sha1_short)$/o) {
927 if ($1 == $log_msg->{revision
}) {
928 push @exec_parents, $2;
931 push @exec_parents, $p if $p =~ /$sha1_short/o;
936 defined $pid or croak
$!;
938 $ENV{GIT_INDEX_FILE
} = $GIT_SVN_INDEX;
940 chomp(my $tree = `git-write-tree`);
942 if (exists $tree_map{$tree}) {
943 my %seen_parent = map { $_ => 1 } @exec_parents;
944 foreach (@
{$tree_map{$tree}}) {
945 # MAXPARENT is defined to 16 in commit-tree.c:
946 if ($seen_parent{$_} || @exec_parents > 16) {
949 push @exec_parents, $_;
950 $seen_parent{$_} = 1;
953 my $msg_fh = IO
::File
->new_tmpfile or croak
$!;
954 print $msg_fh $log_msg->{msg
}, "\ngit-svn-id: ",
955 "$SVN_URL\@$log_msg->{revision}",
956 " $SVN_UUID\n" or croak
$!;
957 $msg_fh->flush == 0 or croak
$!;
958 seek $msg_fh, 0, 0 or croak
$!;
960 set_commit_env
($log_msg);
962 my @exec = ('git-commit-tree',$tree);
963 push @exec, '-p', $_ foreach @exec_parents;
964 open STDIN
, '<&', $msg_fh or croak
$!;
965 open STDOUT
, '>&', $out_fh or croak
$!;
966 exec @exec or croak
$!;
971 $out_fh->flush == 0 or croak
$!;
972 seek $out_fh, 0, 0 or croak
$!;
973 chomp(my $commit = do { local $/; <$out_fh> });
974 if ($commit !~ /^$sha1$/o) {
975 croak
"Failed to commit, invalid sha1: $commit\n";
977 my @update_ref = ('git-update-ref',"refs/remotes/$GIT_SVN",$commit);
978 if (my $primary_parent = shift @exec_parents) {
980 defined $pid or croak
$!;
984 exec 'git-rev-parse','--verify',
985 "refs/remotes/$GIT_SVN^0";
988 push @update_ref, $primary_parent unless $?
;
991 sys
('git-update-ref',"$GIT_SVN/revs/$log_msg->{revision}",$commit);
992 print "r$log_msg->{revision} = $commit\n";
998 my $author = $log_msg->{author
};
999 my ($name,$email) = defined $users{$author} ? @
{$users{$author}}
1000 : ($author,"$author\@$SVN_UUID");
1001 $ENV{GIT_AUTHOR_NAME
} = $ENV{GIT_COMMITTER_NAME
} = $name;
1002 $ENV{GIT_AUTHOR_EMAIL
} = $ENV{GIT_COMMITTER_EMAIL
} = $email;
1003 $ENV{GIT_AUTHOR_DATE
} = $ENV{GIT_COMMITTER_DATE
} = $log_msg->{date
};
1006 sub apply_mod_line_blob
{
1008 if ($m->{mode_b
} =~ /^120/) {
1009 blob_to_symlink
($m->{sha1_b
}, $m->{file_b
});
1011 blob_to_file
($m->{sha1_b
}, $m->{file_b
});
1015 sub blob_to_symlink
{
1016 my ($blob, $link) = @_;
1017 defined $link or croak
"\$link not defined!\n";
1018 croak
"Not a sha1: $blob\n" unless $blob =~ /^$sha1$/o;
1019 if (-l
$link || -f _
) {
1020 unlink $link or croak
$!;
1023 my $dest = `git-cat-file blob $blob`; # no newline, so no chomp
1024 symlink $dest, $link or croak
$!;
1028 my ($blob, $file) = @_;
1029 defined $file or croak
"\$file not defined!\n";
1030 croak
"Not a sha1: $blob\n" unless $blob =~ /^$sha1$/o;
1031 if (-l
$file || -f _
) {
1032 unlink $file or croak
$!;
1035 open my $blob_fh, '>', $file or croak
"$!: $file\n";
1037 defined $pid or croak
$!;
1040 open STDOUT
, '>&', $blob_fh or croak
$!;
1041 exec('git-cat-file','blob',$blob);
1046 close $blob_fh or croak
$!;
1050 my $pid = open my $child, '-|';
1051 defined $pid or croak
$!;
1053 exec(@_) or croak
$?
;
1055 my @ret = (<$child>);
1056 close $child or croak
$?
;
1057 die $?
if $?
; # just in case close didn't error out
1058 return wantarray ?
@ret : join('',@ret);
1061 sub svn_compat_check
{
1062 my @co_help = safe_qx
(qw(svn co -h));
1063 unless (grep /ignore-externals/,@co_help) {
1064 print STDERR
"W: Installed svn version does not support ",
1065 "--ignore-externals\n";
1066 $_no_ignore_ext = 1;
1068 if (grep /usage: checkout URL\[\@REV\]/,@co_help) {
1069 $_svn_co_url_revs = 1;
1072 # I really, really hope nobody hits this...
1073 unless (grep /stop-on-copy/, (safe_qx
(qw(svn log -h)))) {
1075 W
: The installed svn version does
not support the
--stop
-on
-copy flag
in
1077 Lets hope the directory you
're tracking is not a branch or tag
1078 and was never moved within the repository...
1084 # *sigh*, new versions of svn won't honor
-r
<rev
> without URL@
<rev
>,
1085 # (and they won't honor URL@<rev> without -r<rev>, too!)
1086 sub svn_cmd_checkout
{
1087 my ($url, $rev, $dir) = @_;
1088 my @cmd = ('svn','co', "-r$rev");
1089 push @cmd, '--ignore-externals' unless $_no_ignore_ext;
1090 $url .= "\@$rev" if $_svn_co_url_revs;
1091 sys
(@cmd, $url, $dir);
1094 sub check_upgrade_needed
{
1096 my $pid = open my $child, '-|';
1097 defined $pid or croak
$!;
1100 exec('git-rev-parse',"$GIT_SVN-HEAD") or croak
$?
;
1102 my @ret = (<$child>);
1103 close $child or croak
$?
;
1104 die $?
if $?
; # just in case close didn't error out
1105 return wantarray ?
@ret : join('',@ret);
1108 my $head = eval { safe_qx
('git-rev-parse',"refs/remotes/$GIT_SVN") };
1110 print STDERR
"Please run: $0 rebuild --upgrade\n";
1115 # fills %tree_map with a reverse mapping of trees to commits. Useful
1116 # for finding parents to commit on.
1117 sub map_tree_joins
{
1118 foreach my $br (@_branch_from) {
1119 my $pid = open my $pipe, '-|';
1120 defined $pid or croak
$!;
1122 exec(qw(git-rev-list --pretty=raw), $br) or croak
$?
;
1125 if (/^commit ($sha1)$/o) {
1127 my ($tree) = (<$pipe> =~ /^tree ($sha1)$/o);
1128 unless (defined $tree) {
1129 die "Failed to parse commit $commit\n";
1131 push @
{$tree_map{$tree}}, $commit;
1134 close $pipe or croak
$?
;
1138 # '<svn username> = real-name <email address>' mapping based on git-svnimport:
1140 open my $authors, '<', $_authors or die "Can't open $_authors $!\n";
1141 while (<$authors>) {
1143 next unless /^(\S+?)\s*=\s*(.+?)\s*<(.+)>\s*$/;
1144 my ($user, $name, $email) = ($1, $2, $3);
1145 $users{$user} = [$name, $email];
1147 close $authors or croak
$!;
1154 $svn_log hashref
(as returned by svn_log_raw
)
1156 fh
=> file handle of the
log file
,
1157 state => state of the
log file parser
(sep
/msg/rev
/msg_start
...)
1160 $log_msg hashref as returned by next_log_entry
($svn_log)
1162 msg
=> 'whitespace-formatted log entry
1163 ', # trailing newline is preserved
1164 revision
=> '8', # integer
1165 date
=> '2004-02-24T17:01:44.108345Z', # commit date
1166 author
=> 'committer name'
1170 @mods = array of diff
-index line hashes
, each element represents one line
1171 of diff
-index output
1173 diff
-index line
($m hash
)
1175 mode_a
=> first column of diff
-index output
, no leading
':',
1176 mode_b
=> second column of diff
-index output
,
1177 sha1_b
=> sha1sum of the final blob
,
1178 chg
=> change type
[MCRADT
],
1179 file_a
=> original file name of a file
(iff chg is
'C' or 'R')
1180 file_b
=> new
/current file name of a file
(any chg
)