2 # Copyright (C) 2006, Eric Wong <normalperson@yhbt.net>
3 # License: GPL v2 or later
6 use vars qw
/ $AUTHOR $VERSION
8 $GIT_SVN_INDEX $GIT_SVN
9 $GIT_DIR $GIT_SVN_DIR $REVDB
10 $_follow_parent $sha1 $sha1_short $_revision
11 $_cp_remote $_upgrade $_rmdir $_q $_cp_similarity
12 $_find_copies_harder $_l $_authors %users/;
13 $AUTHOR = 'Eric Wong <normalperson@yhbt.net>';
14 $VERSION = '@@GIT_VERSION@@';
16 $ENV{GIT_DIR
} ||= '.git';
17 $Git::SVN
::default_repo_id
= 'git-svn';
18 $Git::SVN
::default_ref_id
= $ENV{GIT_SVN_ID
} || 'git-svn';
20 my $LC_ALL = $ENV{LC_ALL
};
21 $Git::SVN
::Log
::TZ
= $ENV{TZ
};
22 # make sure the svn binary gives consistent output between locales and TZs:
25 $| = 1; # unbuffer STDOUT
27 sub fatal
(@
) { print STDERR
@_; exit 1 }
28 require SVN
::Core
; # use()-ing this causes segfaults for me... *shrug*
31 if ($SVN::Core
::VERSION
lt '1.1.0') {
32 fatal
"Need SVN::Core 1.1.0 or better (got $SVN::Core::VERSION)\n";
34 push @Git::SVN
::Ra
::ISA
, 'SVN::Ra';
35 push @SVN::Git
::Editor
::ISA
, 'SVN::Delta::Editor';
36 push @SVN::Git
::Fetcher
::ISA
, 'SVN::Delta::Editor';
39 use File
::Basename qw
/dirname basename/;
40 use File
::Path qw
/mkpath/;
41 use Getopt
::Long qw
/:config gnu_getopt no_ignore_case auto_abbrev pass_through/;
47 foreach (qw
/command command_oneline command_noisy command_output_pipe
48 command_input_pipe command_close_pipe
/) {
49 $s .= "*SVN::Git::Editor::$_ = *SVN::Git::Fetcher::$_ = ".
50 "*Git::SVN::Migration::$_ = ".
51 "*Git::SVN::Log::$_ = *Git::SVN::$_ = *$_ = *Git::$_; ";
58 my $_optimize_commits = 1 unless $ENV{GIT_SVN_NO_OPTIMIZE_COMMITS
};
59 $sha1 = qr/[a-f\d]{40}/;
60 $sha1_short = qr/[a-f\d]{4,40}/;
61 my ($_stdin, $_help, $_edit,
62 $_repack, $_repack_nr, $_repack_flags,
63 $_message, $_file, $_no_metadata,
66 $_merge, $_strategy, $_dry_run,
69 my %remote_opts = ( 'username=s' => \
$Git::SVN
::Prompt
::_username
,
70 'config-dir=s' => \
$Git::SVN
::Ra
::config_dir
,
71 'no-auth-cache' => \
$Git::SVN
::Prompt
::_no_auth_cache
);
72 my %fc_opts = ( 'follow-parent|follow' => \
$_follow_parent,
73 'authors-file|A=s' => \
$_authors,
74 'repack:i' => \
$_repack,
75 'no-metadata' => \
$_no_metadata,
77 'repack-flags|repack-args|repack-opts=s' => \
$_repack_flags,
80 my ($_trunk, $_tags, $_branches);
81 my %multi_opts = ( 'trunk|T=s' => \
$_trunk,
82 'tags|t=s' => \
$_tags,
83 'branches|b=s' => \
$_branches );
84 my %init_opts = ( 'template=s' => \
$_template, 'shared' => \
$_shared );
85 my %cmt_opts = ( 'edit|e' => \
$_edit,
87 'find-copies-harder' => \
$_find_copies_harder,
89 'copy-similarity|C=i'=> \
$_cp_similarity
93 fetch
=> [ \
&cmd_fetch
, "Download new revisions from SVN",
94 { 'revision|r=s' => \
$_revision, %fc_opts } ],
95 init
=> [ \
&cmd_init
, "Initialize a repo for tracking" .
96 " (requires URL argument)",
98 dcommit
=> [ \
&cmd_dcommit
,
99 'Commit several diffs to merge with upstream',
100 { 'merge|m|M' => \
$_merge,
101 'strategy|s=s' => \
$_strategy,
102 'dry-run|n' => \
$_dry_run,
103 %cmt_opts, %fc_opts } ],
104 'set-tree' => [ \
&cmd_set_tree
,
105 "Set an SVN repository to a git tree-ish",
106 { 'stdin|' => \
$_stdin, %cmt_opts, %fc_opts, } ],
107 'show-ignore' => [ \
&cmd_show_ignore
, "Show svn:ignore listings",
108 { 'revision|r=i' => \
$_revision } ],
109 rebuild
=> [ \
&cmd_rebuild
, "Rebuild git-svn metadata (after git clone)",
110 { 'copy-remote|remote=s' => \
$_cp_remote,
111 'upgrade' => \
$_upgrade } ],
112 'multi-init' => [ \
&cmd_multi_init
,
113 'Initialize multiple trees (like git-svnimport)',
114 { %multi_opts, %init_opts, %remote_opts,
115 'revision|r=i' => \
$_revision,
116 'prefix=s' => \
$_prefix,
118 'multi-fetch' => [ \
&cmd_multi_fetch
,
119 'Fetch multiple trees (like git-svnimport)',
121 'migrate' => [ sub { },
122 # no-op, we automatically run this anyways,
123 'Migrate configuration/metadata/layout from
124 previous versions of git-svn',
126 'log' => [ \
&Git
::SVN
::Log
::cmd_show_log
, 'Show commit logs',
127 { 'limit=i' => \
$Git::SVN
::Log
::limit
,
128 'revision|r=s' => \
$_revision,
129 'verbose|v' => \
$Git::SVN
::Log
::verbose
,
130 'incremental' => \
$Git::SVN
::Log
::incremental
,
131 'oneline' => \
$Git::SVN
::Log
::oneline
,
132 'show-commit' => \
$Git::SVN
::Log
::show_commit
,
133 'non-recursive' => \
$Git::SVN
::Log
::non_recursive
,
134 'authors-file|A=s' => \
$_authors,
135 'color' => \
$Git::SVN
::Log
::color
,
136 'pager=s' => \
$Git::SVN
::Log
::pager
,
138 'commit-diff' => [ \
&cmd_commit_diff
,
139 'Commit a diff between two trees',
140 { 'message|m=s' => \
$_message,
141 'file|F=s' => \
$_file,
142 'revision|r=s' => \
$_revision,
147 for (my $i = 0; $i < @ARGV; $i++) {
148 if (defined $cmd{$ARGV[$i]}) {
155 my %opts = %{$cmd{$cmd}->[2]} if (defined $cmd);
157 read_repo_config
(\
%opts);
158 my $rv = GetOptions
(%opts, 'help|H|h' => \
$_help,
159 'version|V' => \
$_version,
160 'minimize-connections' =>
161 \
$Git::SVN
::Migration
::_minimize
,
162 'id|i=s' => \
$Git::SVN
::default_ref_id
);
163 exit 1 if (!$rv && $cmd ne 'log');
166 version
() if $_version;
167 usage
(1) unless defined $cmd;
168 load_authors
() if $_authors;
169 unless ($cmd =~ /^(?:init|rebuild|multi-init|commit-diff)$/) {
170 Git
::SVN
::Migration
::migration_check
();
173 Git
::SVN
::verify_remotes_sanity
();
174 $cmd{$cmd}->[0]->(@ARGV);
179 ####################### primary functions ######################
181 my $exit = shift || 0;
182 my $fd = $exit ? \
*STDERR
: \
*STDOUT
;
184 git
-svn
- bidirectional operations between a single Subversion tree
and git
185 Usage
: $0 <command
> [options
] [arguments
]\n
187 print $fd "Available commands:\n" unless $cmd;
189 foreach (sort keys %cmd) {
190 next if $cmd && $cmd ne $_;
191 print $fd ' ',pack('A17',$_),$cmd{$_}->[1],"\n";
192 foreach (keys %{$cmd{$_}->[2]}) {
193 # prints out arguments as they should be passed:
194 my $x = s
#[:=]s$## ? '<arg>' : s#[:=]i$## ? '<num>' : '';
195 print $fd ' ' x
21, join(', ', map { length $_ > 1 ?
197 split /\|/,$_)," $x\n";
201 \nGIT_SVN_ID may be set
in the environment
or via the
--id
/-i switch to an
202 arbitrary identifier
if you
're tracking multiple SVN branches/repositories in
203 one git repository and want to keep them separate. See git-svn(1) for more
210 print "git-svn version $VERSION (svn $SVN::Core::VERSION)\n";
216 my $gs = $url ? Git::SVN->init($url)
217 : eval { Git::SVN->new };
218 $gs ||= Git::SVN->_new;
219 if (!verify_ref($gs->refname.'^0')) {
220 $gs->copy_remote_ref;
223 my ($rev_list, $ctx) = command_output_pipe("rev-list", $gs->refname);
226 while (<$rev_list>) {
229 fatal "Non-SHA1: $c\n" unless $c =~ /^$sha1$/o;
230 my ($url, $rev, $uuid) = cmt_metadata($c);
232 # ignore merges (from set-tree)
233 next if (!defined $rev || !$uuid);
235 # if we merged or otherwise started elsewhere, this is
236 # how we break out of it
237 if ((defined $svn_uuid && ($uuid ne $svn_uuid)) ||
238 ($gs->{url} && $url && ($url ne $gs->{url}))) {
242 unless (defined $latest) {
243 if (!$gs->{url} && !$url) {
244 fatal "SVN repository location required\n";
246 $gs = Git::SVN->init($url);
249 $gs->rev_db_set($rev, $c);
250 print "r$rev = $c\n";
252 command_close_pipe($rev_list, $ctx);
256 unless (-d $ENV{GIT_DIR}) {
257 my @init_db = ('init
');
258 push @init_db, "--template=$_template" if defined $_template;
259 push @init_db, "--shared" if defined $_shared;
260 command_noisy(@init_db);
265 my $url = shift or die "SVN repository location required " .
266 "as a command-line argument\n";
267 if (my $repo_path = shift) {
268 unless (-d $repo_path) {
269 mkpath([$repo_path]);
271 chdir $repo_path or croak $!;
272 $ENV{GIT_DIR} = $repo_path . "/.git";
276 Git::SVN->init($url);
281 die "Additional fetch arguments are no longer supported.\n",
282 "Use --follow-parent if you have moved/copied directories
285 my $gs = Git::SVN->new;
286 $gs->fetch(parse_revision_argument());
287 if ($gs->{last_commit} && !verify_ref('refs
/heads/master
^0')) {
288 command_noisy(qw(update-ref refs/heads/master),
295 if ($_stdin || !@commits) {
296 print "Reading from stdin...\n";
299 if (/\b($sha1_short)\b/o) {
300 unshift @commits, $1;
305 foreach my $c (@commits) {
306 my @tmp = command
('rev-parse',$c);
307 if (scalar @tmp == 1) {
309 } elsif (scalar @tmp > 1) {
310 push @revs, reverse(command
('rev-list',@tmp));
312 fatal
"Failed to rev-parse $c\n";
315 my $gs = Git
::SVN
->new;
316 my ($r_last, $cmt_last) = $gs->last_rev_commit;
318 if (defined $gs->{last_rev
} && $r_last != $gs->{last_rev
}) {
319 fatal
"There are new revisions that were fetched ",
320 "and need to be merged (or acknowledged) ",
321 "before committing.\nlast rev: $r_last\n",
322 " current: $gs->{last_rev}\n";
324 $gs->set_tree($_) foreach @revs;
325 print "Done committing ",scalar @revs," revisions to SVN\n";
330 my $gs = Git
::SVN
->new;
332 my @refs = command
(qw
/rev-list --no-merges/, $gs->refname."..$head");
334 foreach my $d (reverse @refs) {
335 if (!verify_ref
("$d~1")) {
337 "has no parent commit, and therefore ",
338 "nothing to diff against.\n",
339 "You should be working from a repository ",
340 "originally created by git-svn\n";
342 unless (defined $last_rev) {
343 (undef, $last_rev, undef) = cmt_metadata
("$d~1");
344 unless (defined $last_rev) {
345 fatal
"Unable to extract revision information ",
346 "from commit $d~1\n";
350 print "diff-tree $d~1 $d\n";
352 my $log = get_commit_entry
($d)->{log};
354 my $pool = SVN
::Pool
->new;
355 my $mods = generate_diff
("$d~1", $d);
356 my $types = check_diff_paths
($ra,
360 my %ed_opts = ( r
=> $last_rev,
364 svn_path
=> $gs->{path
} );
365 my $ed = SVN
::Git
::Editor
->new(\
%ed_opts,
366 $ra->get_commit_editor($log,
367 sub { print "Committed r$_[0]\n";
368 $last_rev = $_[0]; }),
370 if (!$ed->apply_diff($mods, $d)) {
371 print "No changes\n$d~1 == $d\n";
377 # we always want to rebase against the current HEAD, not any
378 # head that was passed to us
379 my @diff = command
('diff-tree', 'HEAD', $gs->refname, '--');
382 @finish = qw
/rebase/;
383 push @finish, qw
/--merge/ if $_merge;
384 push @finish, "--strategy=$_strategy" if $_strategy;
385 print STDERR
"W: HEAD and ", $gs->refname, " differ, ",
386 "using @finish:\n", "@diff";
388 print "No changes between current HEAD and ",
389 $gs->refname, "\nResetting to the latest ",
391 @finish = qw
/reset --mixed/;
393 command_noisy
(@finish, $gs->refname);
396 sub cmd_show_ignore
{
397 my $gs = Git
::SVN
->new;
398 my $r = (defined $_revision ?
$_revision : $gs->ra->get_latest_revnum);
399 $gs->traverse_ignore(\
*STDOUT
, '', $r);
404 unless (defined $_trunk || defined $_branches || defined $_tags) {
408 $_prefix = '' unless defined $_prefix;
409 $url =~ s
#/+$## if defined $url;
410 if (defined $_trunk) {
411 my $trunk_ref = $_prefix . 'trunk';
412 # try both old-style and new-style lookups:
413 my $gs_trunk = eval { Git
::SVN
->new($trunk_ref) };
415 my ($trunk_url, $trunk_path) =
416 complete_svn_url
($url, $_trunk);
417 $gs_trunk = Git
::SVN
->init($trunk_url, $trunk_path,
421 return unless defined $_branches || defined $_tags;
422 my $ra = $url ? Git
::SVN
::Ra
->new($url) : undef;
423 complete_url_ls_init
($ra, $_branches, '--branches/-b', $_prefix);
424 complete_url_ls_init
($ra, $_tags, '--tags/-t', $_prefix . 'tags/');
427 sub cmd_multi_fetch
{
429 foreach (command
(qw
/config -l/)) {
430 next unless m
!^svn
-remote\
.(.+)\
.fetch
=
431 \s
*(.*)\s
*:\s
*refs
/remotes/(.+)\s
*$!x
;
432 my ($repo_id, $path, $ref_id) = ($1, $2, $3);
433 push @gs, Git
::SVN
->new($ref_id, $repo_id, $path);
440 # this command is special because it requires no metadata
441 sub cmd_commit_diff
{
442 my ($ta, $tb, $url) = @_;
443 my $usage = "Usage: $0 commit-diff -r<revision> ".
444 "<tree-ish> <tree-ish> [<URL>]\n";
445 fatal
($usage) if (!defined $ta || !defined $tb);
448 my $gs = eval { Git
::SVN
->new };
450 fatal
("Needed URL or usable git-svn --id in ",
451 "the command-line\n", $usage);
454 $svn_path = $gs->{path
};
456 unless (defined $_revision) {
457 fatal
("-r|--revision is a required argument\n", $usage);
459 if (defined $_message && defined $_file) {
460 fatal
("Both --message/-m and --file/-F specified ",
461 "for the commit message.\n",
462 "I have no idea what you mean\n");
464 if (defined $_file) {
465 $_message = file_to_s
($_file);
467 $_message ||= get_commit_entry
($tb)->{log};
469 my $ra ||= Git
::SVN
::Ra
->new($url);
470 $svn_path ||= $ra->{svn_path
};
473 $r = $ra->get_latest_revnum;
474 } elsif ($r !~ /^\d+$/) {
475 die "revision argument: $r not understood by git-svn\n";
477 my $pool = SVN
::Pool
->new;
478 my $mods = generate_diff
($ta, $tb);
479 my $types = check_diff_paths
($ra, $svn_path, $r, $mods);
480 my %ed_opts = ( r
=> $r, url
=> $ra->{url
}, svn_path
=> $svn_path,
481 mods
=> $mods, types
=> $types );
482 my $ed = SVN
::Git
::Editor
->new(\
%ed_opts,
483 $ra->get_commit_editor($_message,
484 sub { print "Committed r$_[0]\n" }),
486 if (!$ed->apply_diff($mods, $tb)) {
487 print "No changes\n$ta == $tb\n";
492 ########################### utility functions #########################
494 sub parse_revision_argument
{
495 if (!defined $_revision || $_revision eq 'BASE:HEAD') {
496 return (undef, undef);
498 return ($1, $2) if ($_revision =~ /^(\d+):(\d+)$/);
499 return ($_revision, $_revision) if ($_revision =~ /^\d+$/);
500 return (undef, $1) if ($_revision =~ /^BASE:(\d+)$/);
501 return ($1, undef) if ($_revision =~ /^(\d+):HEAD$/);
502 die "revision argument: $_revision not understood by git-svn\n",
503 "Try using the command-line svn client instead\n";
506 sub complete_svn_url
{
507 my ($url, $path) = @_;
509 if ($path !~ m
#^[a-z\+]+://#) {
510 if (!defined $url || $url !~ m
#^[a-z\+]+://#) {
511 fatal
("E: '$path' is not a complete URL ",
512 "and a separate URL is not specified\n");
514 return ($url, $path);
519 sub complete_url_ls_init
{
520 my ($ra, $repo_path, $switch, $pfx) = @_;
521 unless ($repo_path) {
522 print STDERR
"W: $switch not specified\n";
525 $repo_path =~ s
#/+$##;
526 if ($repo_path =~ m
#^[a-z\+]+://#) {
527 $ra = Git
::SVN
::Ra
->new($repo_path);
530 $repo_path =~ s
#^/+##;
532 fatal
("E: '$repo_path' is not a complete URL ",
533 "and a separate URL is not specified\n");
536 my $r = defined $_revision ?
$_revision : $ra->get_latest_revnum;
537 my ($dirent, undef, undef) = $ra->get_dir($repo_path, $r);
538 my $url = $ra->{url
};
539 foreach my $d (sort keys %$dirent) {
540 next if ($dirent->{$d}->kind != $SVN::Node
::dir
);
541 my $path = "$repo_path/$d";
543 my $gs = eval { Git
::SVN
->new($ref) };
544 # don't try to init already existing refs
546 print "init $url/$path => $ref\n";
547 Git
::SVN
->init($url, $path, undef, $ref);
554 eval { command_oneline
([ 'rev-parse', '--verify', $ref ],
558 sub get_tree_from_treeish
{
560 # $treeish can be a symbolic ref, too:
561 my $type = command_oneline
(qw
/cat-file -t/, $treeish);
563 while ($type eq 'tag') {
564 ($treeish, $type) = command
(qw
/cat-file tag/, $treeish);
566 if ($type eq 'commit') {
567 $expected = (grep /^tree /, command
(qw
/cat-file commit/,
569 ($expected) = ($expected =~ /^tree ($sha1)$/o);
570 die "Unable to get tree from $treeish\n" unless $expected;
571 } elsif ($type eq 'tree') {
572 $expected = $treeish;
574 die "$treeish is a $type, expected tree, tag or commit\n";
579 sub get_commit_entry
{
580 my ($treeish) = shift;
581 my %log_entry = ( log => '', tree
=> get_tree_from_treeish
($treeish) );
582 my $commit_editmsg = "$ENV{GIT_DIR}/COMMIT_EDITMSG";
583 my $commit_msg = "$ENV{GIT_DIR}/COMMIT_MSG";
584 open my $log_fh, '>', $commit_editmsg or croak
$!;
586 my $type = command_oneline
(qw
/cat-file -t/, $treeish);
587 if ($type eq 'commit' || $type eq 'tag') {
588 my ($msg_fh, $ctx) = command_output_pipe
('cat-file',
593 $in_msg = 1 if (/^\s*$/);
594 } elsif (/^git-svn-id: /) {
595 # skip this for now, we regenerate the
596 # correct one on re-fetch anyways
597 # TODO: set *:merge properties or like...
599 print $log_fh $_ or croak
$!;
602 command_close_pipe
($msg_fh, $ctx);
604 close $log_fh or croak
$!;
606 if ($_edit || ($type eq 'tree')) {
607 my $editor = $ENV{VISUAL
} || $ENV{EDITOR
} || 'vi';
608 # TODO: strip out spaces, comments, like git-commit.sh
609 system($editor, $commit_editmsg);
611 rename $commit_editmsg, $commit_msg or croak
$!;
612 open $log_fh, '<', $commit_msg or croak
$!;
613 { local $/; chomp($log_entry{log} = <$log_fh>); }
614 close $log_fh or croak
$!;
620 my ($str, $file, $mode) = @_;
621 open my $fd,'>',$file or croak
$!;
622 print $fd $str,"\n" or croak
$!;
623 close $fd or croak
$!;
624 chmod ($mode &~ umask, $file) if (defined $mode);
629 open my $fd,'<',$file or croak
"$!: file: $file\n";
632 close $fd or croak
$!;
637 # '<svn username> = real-name <email address>' mapping based on git-svnimport:
639 open my $authors, '<', $_authors or die "Can't open $_authors $!\n";
640 my $log = $cmd eq 'log';
643 next unless /^(\S+?|\(no author\))\s*=\s*(.+?)\s*<(.+)>\s*$/;
644 my ($user, $name, $email) = ($1, $2, $3);
646 $Git::SVN
::Log
::rusers
{"$name <$email>"} = $user;
648 $users{$user} = [$name, $email];
651 close $authors or croak
$!;
654 # convert GetOpt::Long specs for use by git-config
655 sub read_repo_config
{
656 return unless -d
$ENV{GIT_DIR
};
658 foreach my $o (keys %$opts) {
660 my ($key) = ($o =~ /^([a-z\-]+)/);
662 my $arg = 'git-config';
663 $arg .= ' --int' if ($o =~ /[:=]i$/);
664 $arg .= ' --bool' if ($o !~ /[:=][sfi]$/);
665 if (ref $v eq 'ARRAY') {
666 chomp(my @tmp = `$arg --get-all svn.$key`);
669 chomp(my $tmp = `$arg --get svn.$key`);
670 if ($tmp && !($arg =~ / --bool/ && $tmp eq 'false')) {
677 sub extract_metadata
{
678 my $id = shift or return (undef, undef, undef);
679 my ($url, $rev, $uuid) = ($id =~ /^git
-svn
-id
:\s
(\S
+?
)\@
(\d
+)
681 if (!defined $rev || !$uuid || !$url) {
682 # some of the original repositories I made had
683 # identifiers like this:
684 ($rev, $uuid) = ($id =~/^git-svn-id:\s(\d+)\@([a-f\d\-]+)/);
686 return ($url, $rev, $uuid);
690 return extract_metadata
((grep(/^git-svn-id: /,
691 command
(qw
/cat-file commit/, shift)))[-1]);
694 sub get_commit_time
{
696 my $fh = command_output_pipe
(qw
/rev-list --pretty=raw -n1/, $cmt);
698 /^committer\s(?:.+) (\d+) ([\-\+]?\d+)$/ or next;
699 my ($s, $tz) = ($1, $2);
700 if ($tz =~ s/^\+//) {
701 $s += tz_to_s_offset
($tz);
702 } elsif ($tz =~ s/^\-//) {
703 $s -= tz_to_s_offset
($tz);
708 die "Can't get commit time for commit: $cmt\n";
714 return ($1 * 60) + ($tz * 3600);
718 my ($tree_a, $tree_b) = @_;
719 my @diff_tree = qw(diff-tree -z -r);
720 if ($_cp_similarity) {
721 push @diff_tree, "-C$_cp_similarity";
723 push @diff_tree, '-C';
725 push @diff_tree, '--find-copies-harder' if $_find_copies_harder;
726 push @diff_tree, "-l$_l" if defined $_l;
727 push @diff_tree, $tree_a, $tree_b;
728 my ($diff_fh, $ctx) = command_output_pipe
(@diff_tree);
733 chomp $_; # this gets rid of the trailing "\0"
734 if ($state eq 'meta' && /^:(\d
{6})\s
(\d
{6})\s
737 push @mods, { mode_a
=> $1, mode_b
=> $2,
738 sha1_b
=> $3, chg
=> $4 };
739 if ($4 =~ /^(?:C|R)$/) {
744 } elsif ($state eq 'file_a') {
745 my $x = $mods[$#mods] or croak
"Empty array\n";
746 if ($x->{chg
} !~ /^(?:C|R)$/) {
747 croak
"Error parsing $_, $x->{chg}\n";
751 } elsif ($state eq 'file_b') {
752 my $x = $mods[$#mods] or croak
"Empty array\n";
753 if (exists $x->{file_a
} && $x->{chg
} !~ /^(?:C|R)$/) {
754 croak
"Error parsing $_, $x->{chg}\n";
756 if (!exists $x->{file_a
} && $x->{chg
} =~ /^(?:C|R)$/) {
757 croak
"Error parsing $_, $x->{chg}\n";
762 croak
"Error parsing $_\n";
765 command_close_pipe
($diff_fh, $ctx);
769 sub check_diff_paths
{
770 my ($ra, $pfx, $rev, $mods) = @_;
772 $pfx .= '/' if length $pfx;
774 sub type_diff_paths
{
775 my ($ra, $types, $path, $rev) = @_;
776 my @p = split m
#/+#, $path;
778 unless (defined $types->{$c}) {
779 $types->{$c} = $ra->check_path($c, $rev);
782 $c .= '/' . shift @p;
783 next if defined $types->{$c};
784 $types->{$c} = $ra->check_path($c, $rev);
788 foreach my $m (@
$mods) {
789 foreach my $f (qw
/file_a file_b/) {
790 next unless defined $m->{$f};
791 my ($dir) = ($m->{$f} =~ m
#^(.*?)/?(?:[^/]+)$#);
792 if (length $pfx.$dir && ! defined $types{$dir}) {
793 type_diff_paths
($ra, \
%types, $pfx.$dir, $rev);
806 use vars qw
/$default_repo_id $default_ref_id/;
808 use File
::Path qw
/mkpath/;
811 # properties that we do not log:
814 %SKIP_PROP = map { $_ => 1 } qw
/svn
:wc
:ra_dav
:version
-url
815 svn
:special svn
:executable
816 svn
:entry
:committed
-rev
817 svn
:entry
:last-author
819 svn
:entry
:committed
-date
/;
822 sub read_all_remotes
{
824 foreach (grep { s/^svn-remote\.// } command
(qw
/config -l/)) {
825 if (m!^(.+)\.fetch=\s*(.*)\s*:\s*refs/remotes/(.+)\s*$!) {
826 $r->{$1}->{fetch
}->{$2} = $3;
827 } elsif (m!^(.+)\.url=\s*(.*)\s*$!) {
828 $r->{$1}->{url
} = $2;
834 sub verify_remotes_sanity
{
835 return unless -d
$ENV{GIT_DIR
};
837 foreach (command
(qw
/config -l/)) {
838 if (m!^svn-remote\.(?:.+)\.fetch=.*:refs/remotes/(\S+)\s*$!) {
840 die "Remote ref refs/remote/$1 is tracked by",
841 "\n \"$_\"\nand\n \"$seen{$1}\"\n",
842 "Please resolve this ambiguity in ",
843 "your git configuration file before ",
851 # we allow more chars than remotes2config.sh...
852 sub sanitize_remote_name
{
854 $name =~ tr{A-Za-z0-9:,/+-}{.}c;
858 sub find_existing_remote
{
859 my ($url, $remotes) = @_;
861 foreach my $repo_id (keys %$remotes) {
862 my $u = $remotes->{$repo_id}->{url
} or next;
864 $existing = $repo_id;
870 sub init_remote_config
{
871 my ($self, $url) = @_;
872 $url =~ s!/+$!!; # strip trailing slash
873 my $r = read_all_remotes
();
874 my $existing = find_existing_remote
($url, $r);
876 print STDERR
"Using existing ",
877 "[svn-remote \"$existing\"]\n";
878 $self->{repo_id
} = $existing;
880 my $min_url = Git
::SVN
::Ra
->new($url)->minimize_url;
881 $existing = find_existing_remote
($min_url, $r);
883 print STDERR
"Using existing ",
884 "[svn-remote \"$existing\"]\n";
885 $self->{repo_id
} = $existing;
887 if ($min_url ne $url) {
888 print STDERR
"Using higher level of URL: ",
889 "$url => $min_url\n";
890 my $old_path = $self->{path
};
891 $self->{path
} = $url;
892 $self->{path
} =~ s!^\Q$min_url\E/*!!;
893 if (length $old_path) {
894 $self->{path
} .= "/$old_path";
901 # verify that we aren't overwriting anything:
903 command_oneline
('config', '--get',
904 "svn-remote.$self->{repo_id}.url")
906 if ($orig_url && ($orig_url ne $url)) {
907 die "svn-remote.$self->{repo_id}.url already set: ",
908 "$orig_url\nwanted to set to: $url\n";
911 my ($xrepo_id, $xpath) = find_ref
($self->refname);
912 if (defined $xpath) {
913 die "svn-remote.$xrepo_id.fetch already set to track ",
914 "$xpath:refs/remotes/", $self->refname, "\n";
916 command_noisy
('config',
917 "svn-remote.$self->{repo_id}.url", $url);
918 command_noisy
('config', '--add',
919 "svn-remote.$self->{repo_id}.fetch",
920 "$self->{path}:".$self->refname);
925 my ($class, $url, $path, $repo_id, $ref_id) = @_;
926 my $self = _new
($class, $repo_id, $ref_id, $path);
928 $self->init_remote_config($url);
935 foreach (command
(qw
/config -l/)) {
936 next unless m
!^svn
-remote\
.(.+)\
.fetch
=
937 \s
*(.*)\s
*:\s
*refs
/remotes/(.+)\s
*$!x
;
938 my ($repo_id, $path, $ref) = ($1, $2, $3);
939 if ($ref eq $ref_id) {
940 $path = '' if ($path =~ m
#^\./?#);
941 return ($repo_id, $path);
944 (undef, undef, undef);
948 my ($class, $ref_id, $repo_id, $path) = @_;
949 if (defined $ref_id && !defined $repo_id && !defined $path) {
950 ($repo_id, $path) = find_ref
($ref_id);
951 if (!defined $repo_id) {
952 die "Could not find a \"svn-remote.*.fetch\" key ",
953 "in the repository configuration matching: ",
954 "refs/remotes/$ref_id\n";
957 my $self = _new
($class, $repo_id, $ref_id, $path);
958 if (!defined $self->{path
} || !length $self->{path
}) {
959 my $fetch = command_oneline
('config', '--get',
960 "svn-remote.$repo_id.fetch",
961 ":refs/remotes/$ref_id\$") or
962 die "Failed to read \"svn-remote.$repo_id.fetch\" ",
963 "\":refs/remotes/$ref_id\$\" in config\n";
964 ($self->{path
}, undef) = split(/\s*:\s*/, $fetch);
966 $self->{url
} = command_oneline
('config', '--get',
967 "svn-remote.$repo_id.url") or
968 die "Failed to read \"svn-remote.$repo_id.url\" in config\n";
972 sub refname
{ "refs/remotes/$_[0]->{ref_id}" }
976 $self->{ra
} ||= Git
::SVN
::Ra
->new($self->{url
});
981 my $repos_root = $self->ra->{repos_root
};
982 return $self->{path
} if ($self->{url
} eq $repos_root);
983 my $url = $self->{url
} .
984 (length $self->{path
} ?
"/$self->{path}" : $self->{path
});
985 $url =~ s!^\Q$repos_root\E/*!!g;
989 sub copy_remote_ref
{
991 my $origin = $::_cp_remote ?
$::_cp_remote
: 'origin';
992 my $ref = $self->refname;
993 if (command
('ls-remote', $origin, $ref)) {
994 command_noisy
('fetch', $origin, "$ref:$ref");
995 } elsif ($::_cp_remote
&& !$::_upgrade
) {
996 die "Unable to find remote reference: $ref on $origin\n";
1000 sub traverse_ignore
{
1001 my ($self, $fh, $path, $r) = @_;
1003 my ($dirent, undef, $props) = $self->ra->get_dir($path, $r);
1005 $p =~ s
#^\Q$self->{ra}->{svn_path}\E/##;
1006 print $fh length $p ?
"\n# $p\n" : "\n# /\n";
1007 if (my $s = $props->{'svn:ignore'}) {
1008 $s =~ s/[\r\n]+/\n/g;
1010 if (length $p == 0) {
1014 $s =~ s
#\n#\n/$p/#g;
1015 print $fh "/$p/$s\n";
1018 foreach (sort keys %$dirent) {
1019 next if $dirent->{$_}->kind != $SVN::Node
::dir
;
1020 $self->traverse_ignore($fh, "$path/$_", $r);
1024 sub last_rev
{ ($_[0]->last_rev_commit)[0] }
1025 sub last_commit
{ ($_[0]->last_rev_commit)[1] }
1027 # returns the newest SVN revision number and newest commit SHA1
1028 sub last_rev_commit
{
1030 if (defined $self->{last_rev
} && defined $self->{last_commit
}) {
1031 return ($self->{last_rev
}, $self->{last_commit
});
1033 my $c = ::verify_ref
($self->refname.'^0');
1035 my $rev = (::cmt_metadata
($c))[1];
1037 ($self->{last_rev
}, $self->{last_commit
}) = ($rev, $c);
1041 my $offset = -41; # from tail
1043 open my $fh, '<', $self->{db_path
} or
1044 croak
"$self->{db_path} not readable: $!\n";
1045 seek $fh, $offset, 2;
1047 defined $rl or return (undef, undef);
1049 while ($c ne $rl && tell $fh != 0) {
1051 seek $fh, $offset, 2;
1053 defined $rl or return (undef, undef);
1057 croak
$! if ($rev < 0);
1058 $rev = ($rev - 41) / 41;
1059 close $fh or croak
$!;
1060 ($self->{last_rev
}, $self->{last_commit
}) = ($rev, $c);
1064 sub get_fetch_range
{
1065 my ($self, $min, $max) = @_;
1066 $max ||= $self->ra->get_latest_revnum;
1067 $min ||= $self->last_rev || 0;
1072 my ($self, $sub) = @_;
1073 my $old_index = $ENV{GIT_INDEX_FILE
};
1074 $ENV{GIT_INDEX_FILE
} = $self->{index};
1077 $ENV{GIT_INDEX_FILE
} = $old_index;
1079 delete $ENV{GIT_INDEX_FILE
};
1081 wantarray ?
@ret : $ret[0];
1084 sub assert_index_clean
{
1085 my ($self, $treeish) = @_;
1087 $self->tmp_index_do(sub {
1088 command_noisy
('read-tree', $treeish) unless -e
$self->{index};
1089 my $x = command_oneline
('write-tree');
1090 my ($y) = (command
(qw
/cat-file commit/, $treeish) =~
1091 /^tree ($::sha1)/mo);
1093 unlink $self->{index} or croak
$!;
1094 command_noisy
('read-tree', $treeish);
1096 $x = command_oneline
('write-tree');
1098 ::fatal
"trees ($treeish) $y != $x\n",
1099 "Something is seriously wrong...\n";
1104 sub get_commit_parents
{
1105 my ($self, $log_entry, @parents) = @_;
1106 my (%seen, @ret, @tmp);
1107 # commit parents can be conditionally bound to a particular
1108 # svn revision via: "svn_revno=commit_sha1", filter them out here:
1109 foreach my $p (@parents) {
1110 next unless defined $p;
1111 if ($p =~ /^(\d+)=($::sha1_short)$/o) {
1112 push @tmp, $2 if $1 == $log_entry->{revision
};
1114 push @tmp, $p if $p =~ /^$::sha1_short$/o;
1117 if (my $cur = ::verify_ref
($self->refname.'^0')) {
1120 push @tmp, $_ foreach (@
{$log_entry->{parents
}}, @tmp);
1121 while (my $p = shift @tmp) {
1125 # MAXPARENT is defined to 16 in commit-tree.c:
1129 die "r$log_entry->{revision}: No room for parents:\n\t",
1130 join("\n\t", @tmp), "\n";
1137 $self->ra->{url
} . (length $self->{path
} ?
'/' . $self->{path
} : '');
1141 my ($self, $log_entry, @parents) = @_;
1142 if (my $c = $self->rev_db_get($log_entry->{revision
})) {
1143 croak
"$log_entry->{revision} = $c already exists! ",
1144 "Why are we refetching it?\n";
1146 my $author = $log_entry->{author
};
1147 my ($name, $email) = (defined $::users
{$author} ? @
{$::users
{$author}}
1148 : ($author, "$author\@".$self->ra->uuid));
1149 $ENV{GIT_AUTHOR_NAME
} = $ENV{GIT_COMMITTER_NAME
} = $name;
1150 $ENV{GIT_AUTHOR_EMAIL
} = $ENV{GIT_COMMITTER_EMAIL
} = $email;
1151 $ENV{GIT_AUTHOR_DATE
} = $ENV{GIT_COMMITTER_DATE
} = $log_entry->{date
};
1153 my $tree = $log_entry->{tree
};
1154 if (!defined $tree) {
1155 $tree = $self->tmp_index_do(sub {
1156 command_oneline
('write-tree') });
1158 die "Tree is not a valid sha1: $tree\n" if $tree !~ /^$::sha1$/o;
1160 my @exec = ('git-commit-tree', $tree);
1161 foreach ($self->get_commit_parents($log_entry, @parents)) {
1162 push @exec, '-p', $_;
1164 defined(my $pid = open3
(my $msg_fh, my $out_fh, '>&STDERR', @exec))
1166 print $msg_fh $log_entry->{log} or croak
$!;
1167 print $msg_fh "\ngit-svn-id: ", $self->full_url, '@',
1168 $log_entry->{revision
}, ' ',
1169 $self->ra->uuid, "\n" or croak
$!;
1170 $msg_fh->flush == 0 or croak
$!;
1171 close $msg_fh or croak
$!;
1172 chomp(my $commit = do { local $/; <$out_fh> });
1173 close $out_fh or croak
$!;
1176 if ($commit !~ /^$::sha1$/o) {
1177 die "Failed to commit, invalid sha1: $commit\n";
1180 command_noisy
('update-ref',$self->refname, $commit);
1181 $self->rev_db_set($log_entry->{revision
}, $commit);
1183 $self->{last_rev
} = $log_entry->{revision
};
1184 $self->{last_commit
} = $commit;
1185 print "r$log_entry->{revision} = $commit\n";
1190 my ($self, $r0, $r1) = @_;
1191 return 1 if $r0 == $r1;
1193 $self->ra->get_log([$self->{path
}], $r0, $r1,
1194 0, 0, 1, sub { $nr++ });
1195 return 0 if ($nr > 1);
1199 sub find_parent_branch
{
1200 my ($self, $paths, $rev) = @_;
1201 return undef unless $::_follow_parent
;
1202 unless (defined $paths) {
1203 $self->ra->get_log([$self->{path
}], $rev, $rev, 0, 1, 1,
1204 sub { $paths = dup_changed_paths
($_[0]) });
1206 return undef unless defined $paths;
1208 # look for a parent from another branch:
1209 my @b_path_components = split m
#/#, $self->rel_path;
1210 my @a_path_components;
1212 while (@b_path_components) {
1213 $i = $paths->{'/'.join('/', @b_path_components)};
1215 unshift(@a_path_components, pop(@b_path_components));
1217 goto not_found
unless defined $i;
1218 my $branch_from = $i->{copyfrom_path
} or goto not_found
;
1219 if (@a_path_components) {
1220 print STDERR
"branch_from: $branch_from => ";
1221 $branch_from .= '/'.join('/', @a_path_components);
1222 print STDERR
$branch_from, "\n";
1224 my $r = $i->{copyfrom_rev
};
1225 my $repos_root = $self->ra->{repos_root
};
1226 my $url = $self->ra->{url
};
1227 my $new_url = $repos_root . $branch_from;
1228 print STDERR
"Found possible branch point: ",
1229 "$new_url => ", $self->full_url, ", $r\n";
1230 $branch_from =~ s
#^/##;
1231 my $remotes = read_all_remotes
();
1233 foreach my $repo_id (keys %$remotes) {
1234 my $u = $remotes->{$repo_id}->{url
} or next;
1236 my $fetch = $remotes->{$repo_id}->{fetch
};
1237 foreach my $f (keys %$fetch) {
1238 next if $f ne $branch_from;
1239 $gs = Git
::SVN
->new($fetch->{$f}, $repo_id, $f);
1245 my $ref_id = $branch_from;
1246 $ref_id .= "\@$r" if find_ref
($ref_id);
1247 # just grow a tail if we're not unique enough :x
1248 $ref_id .= '-' while find_ref
($ref_id);
1249 $gs = Git
::SVN
->init($new_url, '', $ref_id, $ref_id);
1251 my ($r0, $parent) = $gs->find_rev_before($r, 1);
1252 if ($::_follow_parent
&& (!defined $r0 || !defined $parent)) {
1254 ($r0, $parent) = $gs->last_rev_commit;
1256 if (defined $r0 && defined $parent && $gs->revisions_eq($r0, $r)) {
1257 print STDERR
"Found branch parent: ($self->{ref_id}) $parent\n";
1258 $self->assert_index_clean($parent);
1260 if ($self->ra->can_do_switch) {
1261 print STDERR
"Following parent with do_switch\n";
1262 # do_switch works with svn/trunk >= r22312, but that
1263 # is not included with SVN 1.4.2 (the latest version
1264 # at the moment), so we can't rely on it
1265 $self->{last_commit
} = $parent;
1266 $ed = SVN
::Git
::Fetcher
->new($self);
1267 $gs->ra->gs_do_switch($r0, $rev, $gs->{path
}, 1,
1268 $self->full_url, $ed)
1269 or die "SVN connection failed somewhere...\n";
1271 print STDERR
"Following parent with do_update\n";
1272 $ed = SVN
::Git
::Fetcher
->new($self);
1273 $self->ra->gs_do_update($rev, $rev, $self->{path
},
1275 or die "SVN connection failed somewhere...\n";
1277 return $self->make_log_entry($rev, [$parent], $ed);
1280 print STDERR
"Branch parent for path: '/",
1281 $self->rel_path, "' @ r$rev not found:\n";
1282 return undef unless $paths;
1283 print STDERR
"Changed paths:\n";
1284 foreach my $x (sort keys %$paths) {
1285 my $p = $paths->{$x};
1286 print STDERR
"\t$p->{action}\t$x";
1287 if ($p->{copyfrom_path
}) {
1288 print STDERR
"(from $p->{copyfrom_path}: ",
1289 "$p->{copyfrom_rev})";
1293 print STDERR
'-'x72
, "\n";
1298 my ($self, $paths, $rev) = @_;
1300 my ($last_rev, @parents);
1301 if ($self->{last_commit
}) {
1302 $ed = SVN
::Git
::Fetcher
->new($self);
1303 $last_rev = $self->{last_rev
};
1304 $ed->{c
} = $self->{last_commit
};
1305 @parents = ($self->{last_commit
});
1308 if (my $log_entry = $self->find_parent_branch($paths, $rev)) {
1311 $ed = SVN
::Git
::Fetcher
->new($self);
1313 unless ($self->ra->gs_do_update($last_rev, $rev,
1314 $self->{path
}, 1, $ed)) {
1315 die "SVN connection failed somewhere...\n";
1317 $self->make_log_entry($rev, \
@parents, $ed);
1321 my ($self, $ed) = @_;
1323 my $h = $ed->{empty
};
1324 foreach (sort keys %$h) {
1325 my $act = $h->{$_} ?
'+empty_dir' : '-empty_dir';
1326 push @out, " $act: " . uri_encode
($_);
1327 warn "W: $act: $_\n";
1329 foreach my $t (qw
/dir_prop file_prop/) {
1330 $h = $ed->{$t} or next;
1331 foreach my $path (sort keys %$h) {
1332 my $ppath = $path eq '' ?
'.' : $path;
1333 foreach my $prop (sort keys %{$h->{$path}}) {
1334 next if $SKIP_PROP{$prop};
1335 my $v = $h->{$path}->{$prop};
1336 my $t_ppath_prop = "$t: " .
1337 uri_encode
($ppath) . ' ' .
1340 push @out, " +$t_ppath_prop " .
1343 push @out, " -$t_ppath_prop";
1348 foreach my $t (qw
/absent_file absent_directory/) {
1349 $h = $ed->{$t} or next;
1350 foreach my $parent (sort keys %$h) {
1351 foreach my $path (sort @
{$h->{$parent}}) {
1352 push @out, " $t: " .
1353 uri_encode
("$parent/$path");
1354 warn "W: $t: $parent/$path ",
1355 "Insufficient permissions?\n";
1362 sub parse_svn_date
{
1363 my $date = shift || return '+0000 1970-01-01 00:00:00';
1364 my ($Y,$m,$d,$H,$M,$S) = ($date =~ /^(\d
{4})\
-(\d\d
)\
-(\d\d
)T
1365 (\d\d
)\
:(\d\d
)\
:(\d\d
).\d
+Z
$/x
) or
1366 croak
"Unable to parse date: $date\n";
1367 "+0000 $Y-$m-$d $H:$M:$S";
1372 if (!defined $author || length $author == 0) {
1373 $author = '(no author)';
1375 if (defined $::_authors
&& ! defined $::users
{$author}) {
1376 die "Author: $author not defined in $::_authors file\n";
1381 sub make_log_entry
{
1382 my ($self, $rev, $parents, $ed) = @_;
1383 my $untracked = $self->get_untracked($ed);
1385 return undef if ($ed->{nr
} == 0 && scalar @
$untracked == 0);
1387 open my $un, '>>', "$self->{dir}/unhandled.log" or croak
$!;
1388 print $un "r$rev\n" or croak
$!;
1389 print $un $_, "\n" foreach @
$untracked;
1390 my %log_entry = ( parents
=> $parents || [], revision
=> $rev,
1392 my $rp = $self->ra->rev_proplist($rev);
1393 foreach (sort keys %$rp) {
1395 if (/^svn:(author|date|log)$/) {
1396 $log_entry{$1} = $v;
1398 print $un " rev_prop: ", uri_encode
($_), ' ',
1399 uri_encode
($v), "\n";
1402 close $un or croak
$!;
1404 $log_entry{date
} = parse_svn_date
($log_entry{date
});
1405 $log_entry{author
} = check_author
($log_entry{author
});
1406 $log_entry{log} .= "\n";
1411 my ($self, $min_rev, $max_rev, @parents) = @_;
1412 my ($last_rev, $last_commit) = $self->last_rev_commit;
1413 my ($base, $head) = $self->get_fetch_range($min_rev, $max_rev);
1414 return if ($base > $head);
1415 if (defined $last_commit) {
1416 $self->assert_index_clean($last_commit);
1419 my ($min, $max) = ($base, $head < $base + $inc ?
$head : $base + $inc);
1420 my $err_handler = $SVN::Error
::handler
;
1422 $SVN::Error
::handler
= sub { ($err) = @_; skip_unknown_revs
($err); } ;
1425 $self->ra->get_log([$self->{path
}], $min, $max, 0, 1, 1,
1427 my ($paths, $rev) = @_;
1428 push @revs, [ dup_changed_paths
($paths), $rev ];
1430 if (! @revs && $err && $max >= $head) {
1431 print STDERR
"Branch probably deleted:\n ",
1432 $err->expanded_message,
1433 "\nWill attempt to follow revisions ",
1435 "committed before the deletion\n";
1436 @revs = map { [ undef, $_ ] } ($min .. $max);
1439 if (my $log_entry = $self->do_fetch(@
$_)) {
1440 $self->do_git_commit($log_entry, @parents);
1443 last if $max >= $head;
1446 $max = $head if ($max > $head);
1448 $SVN::Error
::handler
= $err_handler;
1452 my ($self, $log_entry, $tree, $rev, $date, $author) = @_;
1453 # TODO: enable and test optimized commits:
1454 if (0 && $rev == ($self->{last_rev
} + 1)) {
1455 $log_entry->{revision
} = $rev;
1456 $log_entry->{author
} = $author;
1457 $self->do_git_commit($log_entry, "$rev=$tree");
1459 $self->fetch(undef, undef, "$rev=$tree");
1464 my ($self, $tree) = (shift, shift);
1465 my $log_entry = ::get_commit_entry
($tree);
1466 unless ($self->{last_rev
}) {
1467 fatal
("Must have an existing revision to commit\n");
1469 my $pool = SVN
::Pool
->new;
1470 my $mods = ::generate_diff
($self->{last_commit
}, $tree);
1471 my $types = ::check_diff_paths
($self->ra, $self->{path
},
1472 $self->{last_rev
}, $mods);
1473 my %ed_opts = ( r
=> $self->{last_rev
}, url
=> $self->ra->{url
},
1474 svn_path
=> $self->{path
},
1475 mods
=> $mods, types
=> $types );
1476 my $ed = SVN
::Git
::Editor
->new(\
%ed_opts,
1477 $self->ra->get_commit_editor(
1478 $log_entry->{log}, sub {
1479 $self->set_tree_cb($log_entry,
1483 if (!$ed->apply_diff($mods, $tree)) {
1484 print "No changes\nr$self->{last_rev} = $tree\n";
1489 sub skip_unknown_revs
{
1491 my $errno = $err->apr_err();
1492 # Maybe the branch we're tracking didn't
1493 # exist when the repo started, so it's
1494 # not an error if it doesn't, just continue
1496 # Wonderfully consistent library, eh?
1497 # 160013 - svn:// and file://
1498 # 175002 - http(s)://
1499 # 175007 - http(s):// (this repo required authorization, too...)
1500 # More codes may be discovered later...
1501 if ($errno == 175007 || $errno == 175002 || $errno == 160013) {
1504 croak
"Error from SVN, ($errno): ", $err->expanded_message,"\n";
1507 # svn_log_changed_path_t objects passed to get_log are likely to be
1508 # overwritten even if only the refs are copied to an external variable,
1509 # so we should dup the structures in their entirety. Using an externally
1510 # passed pool (instead of our temporary and quickly cleared pool in
1511 # Git::SVN::Ra) does not help matters at all...
1512 sub dup_changed_paths
{
1514 return undef unless $paths;
1516 foreach my $p (keys %$paths) {
1517 my $i = $paths->{$p};
1518 my %s = map { $_ => $i->$_ }
1519 qw
/copyfrom_path copyfrom_rev action/;
1526 # Tie::File seems to be prone to offset errors if revisions get sparse,
1527 # it's not that fast, either. Tie::File is also not in Perl 5.6. So
1528 # one of my favorite modules is out :< Next up would be one of the DBM
1529 # modules, but I'm not sure which is most portable... So I'll just
1530 # go with something that's plain-text, but still capable of
1531 # being randomly accessed. So here's my ultra-simple fixed-width
1532 # database. All records are 40 characters + "\n", so it's easy to seek
1533 # to a revision: (41 * rev) is the byte offset.
1534 # A record of 40 0s denotes an empty revision.
1535 # And yes, it's still pretty fast (faster than Tie::File).
1538 my ($self, $rev, $commit) = @_;
1539 length $commit == 40 or croak
"arg3 must be a full SHA1 hexsum\n";
1540 open my $fh, '+<', $self->{db_path
} or croak
$!;
1541 my $offset = $rev * 41;
1542 # assume that append is the common case:
1543 seek $fh, 0, 2 or croak
$!;
1545 if ($pos < $offset) {
1546 print $fh (('0' x
40),"\n") x
(($offset - $pos) / 41)
1549 seek $fh, $offset, 0 or croak
$!;
1550 print $fh $commit,"\n" or croak
$!;
1551 close $fh or croak
$!;
1555 my ($self, $rev) = @_;
1557 my $offset = $rev * 41;
1558 open my $fh, '<', $self->{db_path
} or croak
$!;
1559 if (seek $fh, $offset, 0) {
1560 $ret = readline $fh;
1563 $ret = undef if ($ret =~ /^0{40}$/);
1566 close $fh or croak
$!;
1570 sub find_rev_before
{
1571 my ($self, $rev, $eq_ok) = @_;
1572 --$rev unless $eq_ok;
1574 if (my $c = $self->rev_db_get($rev)) {
1579 return (undef, undef);
1583 my ($class, $repo_id, $ref_id, $path) = @_;
1584 unless (defined $repo_id && length $repo_id) {
1585 $repo_id = $Git::SVN
::default_repo_id
;
1587 unless (defined $ref_id && length $ref_id) {
1588 $_[2] = $ref_id = $Git::SVN
::default_ref_id
;
1590 $_[1] = $repo_id = sanitize_remote_name
($repo_id);
1591 my $dir = "$ENV{GIT_DIR}/svn/$ref_id";
1592 $_[3] = $path = '' unless (defined $path);
1594 unless (-f
"$dir/.rev_db") {
1595 open my $fh, '>>', "$dir/.rev_db" or croak
$!;
1596 close $fh or croak
$!;
1598 bless { ref_id
=> $ref_id, dir
=> $dir, index => "$dir/index",
1600 db_path
=> "$dir/.rev_db", repo_id
=> $repo_id }, $class;
1605 $f =~ s
#([^a-zA-Z0-9\*!\:_\./\-])#uc sprintf("%%%02x",ord($1))#eg;
1609 package Git
::SVN
::Prompt
;
1613 use vars qw
/$_no_auth_cache $_username/;
1616 my ($cred, $realm, $default_username, $may_save, $pool) = @_;
1617 $may_save = undef if $_no_auth_cache;
1618 $default_username = $_username if defined $_username;
1619 if (defined $default_username && length $default_username) {
1620 if (defined $realm && length $realm) {
1621 print STDERR
"Authentication realm: $realm\n";
1624 $cred->username($default_username);
1626 username
($cred, $realm, $may_save, $pool);
1628 $cred->password(_read_password
("Password for '" .
1629 $cred->username . "': ", $realm));
1630 $cred->may_save($may_save);
1631 $SVN::_Core
::SVN_NO_ERROR
;
1634 sub ssl_server_trust
{
1635 my ($cred, $realm, $failures, $cert_info, $may_save, $pool) = @_;
1636 $may_save = undef if $_no_auth_cache;
1637 print STDERR
"Error validating server certificate for '$realm':\n";
1638 if ($failures & $SVN::Auth
::SSL
::UNKNOWNCA
) {
1639 print STDERR
" - The certificate is not issued by a trusted ",
1640 "authority. Use the\n",
1641 " fingerprint to validate the certificate manually!\n";
1643 if ($failures & $SVN::Auth
::SSL
::CNMISMATCH
) {
1644 print STDERR
" - The certificate hostname does not match.\n";
1646 if ($failures & $SVN::Auth
::SSL
::NOTYETVALID
) {
1647 print STDERR
" - The certificate is not yet valid.\n";
1649 if ($failures & $SVN::Auth
::SSL
::EXPIRED
) {
1650 print STDERR
" - The certificate has expired.\n";
1652 if ($failures & $SVN::Auth
::SSL
::OTHER
) {
1653 print STDERR
" - The certificate has an unknown error.\n";
1656 "Certificate information:\n".
1657 " - Hostname: %s\n".
1658 " - Valid: from %s until %s\n".
1660 " - Fingerprint: %s\n",
1661 map $cert_info->$_, qw(hostname valid_from valid_until
1662 issuer_dname fingerprint);
1665 print STDERR
$may_save ?
1666 "(R)eject, accept (t)emporarily or accept (p)ermanently? " :
1667 "(R)eject or accept (t)emporarily? ";
1669 $choice = lc(substr(<STDIN
> || 'R', 0, 1));
1670 if ($choice =~ /^t$/i) {
1671 $cred->may_save(undef);
1672 } elsif ($choice =~ /^r$/i) {
1674 } elsif ($may_save && $choice =~ /^p$/i) {
1675 $cred->may_save($may_save);
1679 $cred->accepted_failures($failures);
1680 $SVN::_Core
::SVN_NO_ERROR
;
1683 sub ssl_client_cert
{
1684 my ($cred, $realm, $may_save, $pool) = @_;
1685 $may_save = undef if $_no_auth_cache;
1686 print STDERR
"Client certificate filename: ";
1688 chomp(my $filename = <STDIN
>);
1689 $cred->cert_file($filename);
1690 $cred->may_save($may_save);
1691 $SVN::_Core
::SVN_NO_ERROR
;
1694 sub ssl_client_cert_pw
{
1695 my ($cred, $realm, $may_save, $pool) = @_;
1696 $may_save = undef if $_no_auth_cache;
1697 $cred->password(_read_password
("Password: ", $realm));
1698 $cred->may_save($may_save);
1699 $SVN::_Core
::SVN_NO_ERROR
;
1703 my ($cred, $realm, $may_save, $pool) = @_;
1704 $may_save = undef if $_no_auth_cache;
1705 if (defined $realm && length $realm) {
1706 print STDERR
"Authentication realm: $realm\n";
1709 if (defined $_username) {
1710 $username = $_username;
1712 print STDERR
"Username: ";
1714 chomp($username = <STDIN
>);
1716 $cred->username($username);
1717 $cred->may_save($may_save);
1718 $SVN::_Core
::SVN_NO_ERROR
;
1721 sub _read_password
{
1722 my ($prompt, $realm) = @_;
1723 print STDERR
$prompt;
1725 require Term
::ReadKey
;
1726 Term
::ReadKey
::ReadMode
('noecho');
1728 while (defined(my $key = Term
::ReadKey
::ReadKey
(0))) {
1729 last if $key =~ /[\012\015]/; # \n\r
1732 Term
::ReadKey
::ReadMode
('restore');
1742 $f =~ s
#([^a-zA-Z0-9\*!\:_\./\-])#uc sprintf("%%%02x",ord($1))#eg;
1749 $f =~ s/%([A-F0-9]{2})/chr hex($1)/ge;
1754 my $kill_stupid_warnings = $SVN::Node
::none
.$SVN::Node
::file
.
1755 $SVN::Node
::dir
.$SVN::Node
::unknown
.
1756 $SVN::Node
::none
.$SVN::Node
::file
.
1757 $SVN::Node
::dir
.$SVN::Node
::unknown
.
1758 $SVN::Auth
::SSL
::CNMISMATCH
.
1759 $SVN::Auth
::SSL
::NOTYETVALID
.
1760 $SVN::Auth
::SSL
::EXPIRED
.
1761 $SVN::Auth
::SSL
::UNKNOWNCA
.
1762 $SVN::Auth
::SSL
::OTHER
;
1765 package SVN
::Git
::Fetcher
;
1772 # file baton members: path, mode_a, mode_b, pool, fh, blob, base
1774 my ($class, $git_svn) = @_;
1775 my $self = SVN
::Delta
::Editor
->new;
1776 bless $self, $class;
1777 $self->{c
} = $git_svn->{last_commit
} if exists $git_svn->{last_commit
};
1778 $self->{empty
} = {};
1779 $self->{dir_prop
} = {};
1780 $self->{file_prop
} = {};
1781 $self->{absent_dir
} = {};
1782 $self->{absent_file
} = {};
1783 $self->{gii
} = $git_svn->tmp_index_do(sub { Git
::IndexInfo
->new });
1784 require Digest
::MD5
;
1788 sub set_path_strip
{
1789 my ($self, $path) = @_;
1790 $self->{path_strip
} = qr/^\Q$path\E\/?
/;
1797 sub open_directory
{
1798 my ($self, $path, $pb, $rev) = @_;
1803 my ($self, $path) = @_;
1804 $path =~ s!$self->{path_strip}!! if $self->{path_strip
};
1809 my ($self, $path, $rev, $pb) = @_;
1811 my $gpath = $self->git_path($path);
1812 # remove entire directories.
1813 if (command
('ls-tree', $self->{c
}, '--', $gpath) =~ /^040000 tree/) {
1814 my ($ls, $ctx) = command_output_pipe
(qw
/ls
-tree
1816 $self->{c
}, '--', $gpath);
1820 $self->{gii
}->remove($_);
1821 print "\tD\t$_\n" unless $self->{q
};
1823 print "\tD\t$gpath/\n" unless $self->{q
};
1824 command_close_pipe
($ls, $ctx);
1825 $self->{empty
}->{$path} = 0
1827 $self->{gii
}->remove($gpath);
1828 print "\tD\t$gpath\n" unless $self->{q
};
1834 my ($self, $path, $pb, $rev) = @_;
1835 my $gpath = $self->git_path($path);
1836 my ($mode, $blob) = (command
('ls-tree', $self->{c
}, '--', $gpath)
1837 =~ /^(\d{6}) blob ([a-f\d]{40})\t/);
1838 unless (defined $mode && defined $blob) {
1839 die "$path was not found in commit $self->{c} (r$rev)\n";
1841 { path
=> $path, mode_a
=> $mode, mode_b
=> $mode, blob
=> $blob,
1842 pool
=> SVN
::Pool
->new, action
=> 'M' };
1846 my ($self, $path, $pb, $cp_path, $cp_rev) = @_;
1847 my ($dir, $file) = ($path =~ m
#^(.*?)/?([^/]+)$#);
1848 delete $self->{empty
}->{$dir};
1849 { path
=> $path, mode_a
=> 100644, mode_b
=> 100644,
1850 pool
=> SVN
::Pool
->new, action
=> 'A' };
1854 my ($self, $path, $cp_path, $cp_rev) = @_;
1855 my ($dir, $file) = ($path =~ m
#^(.*?)/?([^/]+)$#);
1856 delete $self->{empty
}->{$dir};
1857 $self->{empty
}->{$path} = 1;
1861 sub change_dir_prop
{
1862 my ($self, $db, $prop, $value) = @_;
1863 $self->{dir_prop
}->{$db->{path
}} ||= {};
1864 $self->{dir_prop
}->{$db->{path
}}->{$prop} = $value;
1868 sub absent_directory
{
1869 my ($self, $path, $pb) = @_;
1870 $self->{absent_dir
}->{$pb->{path
}} ||= [];
1871 push @
{$self->{absent_dir
}->{$pb->{path
}}}, $path;
1876 my ($self, $path, $pb) = @_;
1877 $self->{absent_file
}->{$pb->{path
}} ||= [];
1878 push @
{$self->{absent_file
}->{$pb->{path
}}}, $path;
1882 sub change_file_prop
{
1883 my ($self, $fb, $prop, $value) = @_;
1884 if ($prop eq 'svn:executable') {
1885 if ($fb->{mode_b
} != 120000) {
1886 $fb->{mode_b
} = defined $value ?
100755 : 100644;
1888 } elsif ($prop eq 'svn:special') {
1889 $fb->{mode_b
} = defined $value ?
120000 : 100644;
1891 $self->{file_prop
}->{$fb->{path
}} ||= {};
1892 $self->{file_prop
}->{$fb->{path
}}->{$prop} = $value;
1897 sub apply_textdelta
{
1898 my ($self, $fb, $exp) = @_;
1899 my $fh = IO
::File
->new_tmpfile;
1901 # $fh gets auto-closed() by SVN::TxDelta::apply(),
1902 # (but $base does not,) so dup() it for reading in close_file
1903 open my $dup, '<&', $fh or croak
$!;
1904 my $base = IO
::File
->new_tmpfile;
1905 $base->autoflush(1);
1907 defined (my $pid = fork) or croak
$!;
1909 open STDOUT
, '>&', $base or croak
$!;
1910 print STDOUT
'link ' if ($fb->{mode_a
} == 120000);
1911 exec qw
/git-cat-file blob/, $fb->{blob
} or croak
$!;
1917 seek $base, 0, 0 or croak
$!;
1918 my $md5 = Digest
::MD5
->new;
1919 $md5->addfile($base);
1920 my $got = $md5->hexdigest;
1921 die "Checksum mismatch: $fb->{path} $fb->{blob}\n",
1923 " got: $got\n" if ($got ne $exp);
1926 seek $base, 0, 0 or croak
$!;
1928 $fb->{base
} = $base;
1929 [ SVN
::TxDelta
::apply
($base, $fh, undef, $fb->{path
}, $fb->{pool
}) ];
1933 my ($self, $fb, $exp) = @_;
1935 my $path = $self->git_path($fb->{path
});
1936 if (my $fh = $fb->{fh
}) {
1937 seek($fh, 0, 0) or croak
$!;
1938 my $md5 = Digest
::MD5
->new;
1940 my $got = $md5->hexdigest;
1941 die "Checksum mismatch: $path\n",
1942 "expected: $exp\n got: $got\n" if ($got ne $exp);
1943 seek($fh, 0, 0) or croak
$!;
1944 if ($fb->{mode_b
} == 120000) {
1945 read($fh, my $buf, 5) == 5 or croak
$!;
1946 $buf eq 'link ' or die "$path has mode 120000",
1947 "but is not a link\n";
1949 defined(my $pid = open my $out,'-|') or die "Can't fork: $!\n";
1951 open STDIN
, '<&', $fh or croak
$!;
1952 exec qw
/git-hash-object -w --stdin/ or croak
$!;
1954 chomp($hash = do { local $/; <$out> });
1955 close $out or croak
$!;
1956 close $fh or croak
$!;
1957 $hash =~ /^[a-f\d]{40}$/ or die "not a sha1: $hash\n";
1958 close $fb->{base
} or croak
$!;
1960 $hash = $fb->{blob
} or die "no blob information\n";
1963 $self->{gii
}->update($fb->{mode_b
}, $hash, $path) or croak
$!;
1964 print "\t$fb->{action}\t$path\n" if $fb->{action
} && ! $self->{q
};
1970 $self->{nr
} = $self->{gii
}->{nr
};
1971 delete $self->{gii
};
1972 $self->SUPER::abort_edit
(@_);
1977 $self->{git_commit_ok
} = 1;
1978 $self->{nr
} = $self->{gii
}->{nr
};
1979 delete $self->{gii
};
1980 $self->SUPER::close_edit
(@_);
1983 package SVN
::Git
::Editor
;
1992 my $git_svn = shift;
1993 my $self = SVN
::Delta
::Editor
->new(@_);
1994 bless $self, $class;
1995 foreach (qw
/svn_path mods url types r/) {
1996 die "$_ required!\n" unless (defined $git_svn->{$_});
1997 $self->{$_} = $git_svn->{$_};
1999 $self->{pool
} = SVN
::Pool
->new;
2000 $self->{bat
} = { '' => $self->open_root($self->{r
}, $self->{pool
}) };
2002 $self->{path_prefix
} = length $self->{svn_path
} ?
2003 "$self->{svn_path}/" : '';
2004 require Digest
::MD5
;
2009 return ($_[0] =~ m
#^(.*?)/?([^/]+)$#);
2013 my ($self, $path) = @_;
2014 $self->{path_prefix
}.(defined $path ?
$path : '');
2018 my ($self, $path) = @_;
2019 $self->{url
} . '/' . $self->repo_path($path);
2023 my ($self, $tree_b) = @_;
2024 my $rm = $self->{rm
};
2025 delete $rm->{''}; # we never delete the url we're tracking
2028 foreach (keys %$rm) {
2029 my @d = split m
#/#, $_;
2033 $c .= '/' . shift @d;
2037 delete $rm->{$self->{svn_path
}};
2038 delete $rm->{''}; # we never delete the url we're tracking
2041 my ($fh, $ctx) = command_output_pipe
(
2042 qw
/ls-tree --name-only -r -z/, $tree_b);
2046 my @dn = split m
#/#, $_;
2048 delete $rm->{join '/', @dn};
2055 command_close_pipe
($fh, $ctx);
2057 my ($r, $p, $bat) = ($self->{r
}, $self->{pool
}, $self->{bat
});
2058 foreach my $d (sort { $b =~ tr
#/#/# <=> $a =~ tr#/#/# } keys %$rm) {
2059 $self->close_directory($bat->{$d}, $p);
2060 my ($dn) = ($d =~ m
#^(.*?)/?(?:[^/]+)$#);
2061 print "\tD+\t$d/\n" unless $::_q
;
2062 $self->SUPER::delete_entry
($d, $r, $bat->{$dn}, $p);
2067 sub open_or_add_dir
{
2068 my ($self, $full_path, $baton) = @_;
2069 my $t = $self->{types
}->{$full_path};
2071 die "$full_path not known in r$self->{r} or we have a bug!\n";
2073 if ($t == $SVN::Node
::none
) {
2074 return $self->add_directory($full_path, $baton,
2075 undef, -1, $self->{pool
});
2076 } elsif ($t == $SVN::Node
::dir
) {
2077 return $self->open_directory($full_path, $baton,
2078 $self->{r
}, $self->{pool
});
2080 print STDERR
"$full_path already exists in repository at ",
2081 "r$self->{r} and it is not a directory (",
2082 ($t == $SVN::Node
::file ?
'file' : 'unknown'),"/$t)\n";
2087 my ($self, $path) = @_;
2088 my $bat = $self->{bat
};
2089 my $repo_path = $self->repo_path($path);
2090 return $bat->{''} unless (length $repo_path);
2091 my @p = split m
#/+#, $repo_path;
2093 $bat->{$c} ||= $self->open_or_add_dir($c, $bat->{''});
2096 $c .= '/' . shift @p;
2097 $bat->{$c} ||= $self->open_or_add_dir($c, $bat->{$c0});
2103 my ($self, $m) = @_;
2104 my ($dir, $file) = split_path
($m->{file_b
});
2105 my $pbat = $self->ensure_path($dir);
2106 my $fbat = $self->add_file($self->repo_path($m->{file_b
}), $pbat,
2108 print "\tA\t$m->{file_b}\n" unless $::_q
;
2109 $self->chg_file($fbat, $m);
2110 $self->close_file($fbat,undef,$self->{pool
});
2114 my ($self, $m) = @_;
2115 my ($dir, $file) = split_path
($m->{file_b
});
2116 my $pbat = $self->ensure_path($dir);
2117 my $fbat = $self->add_file($self->repo_path($m->{file_b
}), $pbat,
2118 $self->url_path($m->{file_a
}), $self->{r
});
2119 print "\tC\t$m->{file_a} => $m->{file_b}\n" unless $::_q
;
2120 $self->chg_file($fbat, $m);
2121 $self->close_file($fbat,undef,$self->{pool
});
2125 my ($self, $path, $pbat) = @_;
2126 my $rpath = $self->repo_path($path);
2127 my ($dir, $file) = split_path
($rpath);
2128 $self->{rm
}->{$dir} = 1;
2129 $self->SUPER::delete_entry
($rpath, $self->{r
}, $pbat, $self->{pool
});
2133 my ($self, $m) = @_;
2134 my ($dir, $file) = split_path
($m->{file_b
});
2135 my $pbat = $self->ensure_path($dir);
2136 my $fbat = $self->add_file($self->repo_path($m->{file_b
}), $pbat,
2137 $self->url_path($m->{file_a
}), $self->{r
});
2138 print "\tR\t$m->{file_a} => $m->{file_b}\n" unless $::_q
;
2139 $self->chg_file($fbat, $m);
2140 $self->close_file($fbat,undef,$self->{pool
});
2142 ($dir, $file) = split_path
($m->{file_a
});
2143 $pbat = $self->ensure_path($dir);
2144 $self->delete_entry($m->{file_a
}, $pbat);
2148 my ($self, $m) = @_;
2149 my ($dir, $file) = split_path
($m->{file_b
});
2150 my $pbat = $self->ensure_path($dir);
2151 my $fbat = $self->open_file($self->repo_path($m->{file_b
}),
2152 $pbat,$self->{r
},$self->{pool
});
2153 print "\t$m->{chg}\t$m->{file_b}\n" unless $::_q
;
2154 $self->chg_file($fbat, $m);
2155 $self->close_file($fbat,undef,$self->{pool
});
2158 sub T
{ shift->M(@_) }
2160 sub change_file_prop
{
2161 my ($self, $fbat, $pname, $pval) = @_;
2162 $self->SUPER::change_file_prop
($fbat, $pname, $pval, $self->{pool
});
2166 my ($self, $fbat, $m) = @_;
2167 if ($m->{mode_b
} =~ /755$/ && $m->{mode_a
} !~ /755$/) {
2168 $self->change_file_prop($fbat,'svn:executable','*');
2169 } elsif ($m->{mode_b
} !~ /755$/ && $m->{mode_a
} =~ /755$/) {
2170 $self->change_file_prop($fbat,'svn:executable',undef);
2172 my $fh = IO
::File
->new_tmpfile or croak
$!;
2173 if ($m->{mode_b
} =~ /^120/) {
2174 print $fh 'link ' or croak
$!;
2175 $self->change_file_prop($fbat,'svn:special','*');
2176 } elsif ($m->{mode_a
} =~ /^120/ && $m->{mode_b
} !~ /^120/) {
2177 $self->change_file_prop($fbat,'svn:special',undef);
2179 defined(my $pid = fork) or croak
$!;
2181 open STDOUT
, '>&', $fh or croak
$!;
2182 exec qw
/git-cat-file blob/, $m->{sha1_b
} or croak
$!;
2186 $fh->flush == 0 or croak
$!;
2187 seek $fh, 0, 0 or croak
$!;
2189 my $md5 = Digest
::MD5
->new;
2190 $md5->addfile($fh) or croak
$!;
2191 seek $fh, 0, 0 or croak
$!;
2193 my $exp = $md5->hexdigest;
2194 my $pool = SVN
::Pool
->new;
2195 my $atd = $self->apply_textdelta($fbat, undef, $pool);
2196 my $got = SVN
::TxDelta
::send_stream
($fh, @
$atd, $pool);
2197 die "Checksum mismatch\nexpected: $exp\ngot: $got\n" if ($got ne $exp);
2200 close $fh or croak
$!;
2204 my ($self, $m) = @_;
2205 my ($dir, $file) = split_path
($m->{file_b
});
2206 my $pbat = $self->ensure_path($dir);
2207 print "\tD\t$m->{file_b}\n" unless $::_q
;
2208 $self->delete_entry($m->{file_b
}, $pbat);
2213 my ($p,$bat) = ($self->{pool
}, $self->{bat
});
2214 foreach (sort { $b =~ tr
#/#/# <=> $a =~ tr#/#/# } keys %$bat) {
2215 $self->close_directory($bat->{$_}, $p);
2217 $self->SUPER::close_edit
($p);
2223 $self->SUPER::abort_edit
($self->{pool
});
2224 $self->{pool
}->clear;
2227 # this drives the editor
2229 my ($self, $mods, $tree_b) = @_;
2230 my %o = ( D
=> 1, R
=> 0, C
=> -1, A
=> 3, M
=> 3, T
=> 3 );
2231 foreach my $m (sort { $o{$a->{chg
}} <=> $o{$b->{chg
}} } @
$mods) {
2233 if (defined $o{$f}) {
2236 fatal
("Invalid change type: $f\n");
2239 $self->rmdirs($tree_b) if $::_rmdir
;
2245 return scalar @
$mods;
2248 package Git
::SVN
::Ra
;
2249 use vars qw
/@ISA $config_dir/;
2252 my ($can_do_switch);
2256 # enforce temporary pool usage for some simple functions
2258 foreach (qw
/get_latest_revnum rev_proplist get_file
2259 check_path get_dir get_uuid get_repos_root
/) {
2262 my \$pool = SVN::Pool->new;
2263 my \@ret = \$self->SUPER::$_(\@_,\$pool);
2265 wantarray ? \@ret : \$ret[0]; }\n";
2271 my ($class, $url) = @_;
2273 return $RA{$url} if $RA{$url};
2275 SVN
::_Core
::svn_config_ensure
($config_dir, undef);
2276 my ($baton, $callbacks) = SVN
::Core
::auth_open_helper
([
2277 SVN
::Client
::get_simple_provider
(),
2278 SVN
::Client
::get_ssl_server_trust_file_provider
(),
2279 SVN
::Client
::get_simple_prompt_provider
(
2280 \
&Git
::SVN
::Prompt
::simple
, 2),
2281 SVN
::Client
::get_ssl_client_cert_prompt_provider
(
2282 \
&Git
::SVN
::Prompt
::ssl_client_cert
, 2),
2283 SVN
::Client
::get_ssl_client_cert_pw_prompt_provider
(
2284 \
&Git
::SVN
::Prompt
::ssl_client_cert_pw
, 2),
2285 SVN
::Client
::get_username_provider
(),
2286 SVN
::Client
::get_ssl_server_trust_prompt_provider
(
2287 \
&Git
::SVN
::Prompt
::ssl_server_trust
),
2288 SVN
::Client
::get_username_prompt_provider
(
2289 \
&Git
::SVN
::Prompt
::username
, 2),
2291 my $config = SVN
::Core
::config_get_config
($config_dir);
2292 my $self = SVN
::Ra
->new(url
=> $url, auth
=> $baton,
2294 pool
=> SVN
::Pool
->new,
2295 auth_provider_callbacks
=> $callbacks);
2296 $self->{svn_path
} = $url;
2297 $self->{repos_root
} = $self->get_repos_root;
2298 $self->{svn_path
} =~ s
#^\Q$self->{repos_root}\E/*##;
2299 $RA{$url} = bless $self, $class;
2303 # do not call the real DESTROY since we store ourselves in %RA
2307 my ($self, @args) = @_;
2308 my $pool = SVN
::Pool
->new;
2309 splice(@args, 3, 1) if ($SVN::Core
::VERSION
le '1.2.0');
2310 my $ret = $self->SUPER::get_log
(@args, $pool);
2315 sub get_commit_editor
{
2316 my ($self, $log, $cb, $pool) = @_;
2317 my @lock = $SVN::Core
::VERSION
ge '1.2.0' ?
(undef, 0) : ();
2318 $self->SUPER::get_commit_editor
($log, $cb, @lock, $pool);
2323 $self->{uuid
} ||= $self->get_uuid;
2327 my ($self, $rev_a, $rev_b, $path, $recurse, $editor) = @_;
2328 my $pool = SVN
::Pool
->new;
2329 $editor->set_path_strip($path);
2330 my $reporter = $self->do_update($rev_b, $path, $recurse,
2332 my @lock = $SVN::Core
::VERSION
ge '1.2.0' ?
(undef) : ();
2333 my $new = ($rev_a == $rev_b);
2334 $reporter->set_path('', $rev_a, $new, @lock, $pool);
2335 $reporter->finish_report($pool);
2337 $editor->{git_commit_ok
};
2341 my ($self, $rev_a, $rev_b, $path, $recurse, $url_b, $editor) = @_;
2342 my $pool = SVN
::Pool
->new;
2343 $editor->set_path_strip($path);
2344 my $reporter = $self->do_switch($rev_b, $path, $recurse,
2345 $url_b, $editor, $pool);
2346 my @lock = $SVN::Core
::VERSION
ge '1.2.0' ?
(undef) : ();
2347 $reporter->set_path('', $rev_a, 0, @lock, $pool);
2348 $reporter->finish_report($pool);
2350 $editor->{git_commit_ok
};
2355 return $self->{url
} if ($self->{url
} eq $self->{repos_root
});
2356 my $url = $self->{repos_root
};
2357 my @components = split(m!/!, $self->{svn_path
});
2360 $url .= "/$c" if length $c;
2361 eval { (ref $self)->new($url)->get_latest_revnum };
2362 } while ($@
&& ($c = shift @components));
2368 unless (defined $can_do_switch) {
2369 my $pool = SVN
::Pool
->new;
2371 $self->do_switch(1, '', 0, $self->{url
},
2372 SVN
::Delta
::Editor
->new, $pool);
2377 $rep->abort_report($pool);
2385 package Git
::SVN
::Log
;
2388 use POSIX qw
/strftime/;
2389 use vars qw
/$TZ $limit $color $pager $non_recursive $verbose $oneline
2390 %rusers $show_commit $incremental/;
2395 return 1 if defined $c->{r
};
2396 if ($c->{l
} && $c->{l
}->[-1] eq "...\n" &&
2397 $c->{a_raw
} =~ /\@([a-f\d\-]+)>$/) {
2398 my @log = command
(qw
/cat-file commit/, $c->{c
});
2399 shift @log while ($log[0] ne "\n");
2401 @
{$c->{l
}} = grep !/^git-svn-id: /, @log;
2403 (undef, $c->{r
}, undef) = ::extract_metadata
(
2404 (grep(/^git-svn-id: /, @log))[-1]);
2406 return defined $c->{r
};
2412 $dcvar = 'color.diff';
2413 $dc = `git-config --get $dcvar`;
2415 # nothing at all; fallback to "diff.color"
2416 $dcvar = 'diff.color';
2417 $dc = `git-config --get $dcvar`;
2420 if ($dc eq 'auto') {
2422 $pc = `git-config --get color.pager`;
2424 # does not have it -- fallback to pager.color
2425 $pc = `git-config --bool --get pager.color`;
2428 $pc = `git-config --bool --get color.pager`;
2434 if (-t
*STDOUT
|| (defined $pager && $pc eq 'true')) {
2435 return ($ENV{TERM
} && $ENV{TERM
} ne 'dumb');
2439 return 0 if $dc eq 'never';
2440 return 1 if $dc eq 'always';
2441 chomp($dc = `git-config --bool --get $dcvar`);
2442 return ($dc eq 'true');
2445 sub git_svn_log_cmd
{
2446 my ($r_min, $r_max) = @_;
2447 my $gs = Git
::SVN
->_new;
2448 my @cmd = (qw
/log --abbrev-commit --pretty=raw --default/,
2450 push @cmd, '-r' unless $non_recursive;
2451 push @cmd, qw
/--raw --name-status/ if $verbose;
2452 push @cmd, '--color' if log_use_color
();
2453 return @cmd unless defined $r_max;
2454 if ($r_max == $r_min) {
2455 push @cmd, '--max-count=1';
2456 if (my $c = $gs->rev_db_get($r_max)) {
2460 my ($c_min, $c_max);
2461 $c_max = $gs->rev_db_get($r_max);
2462 $c_min = $gs->rev_db_get($r_min);
2463 if (defined $c_min && defined $c_max) {
2464 if ($r_max > $r_max) {
2465 push @cmd, "$c_min..$c_max";
2467 push @cmd, "$c_max..$c_min";
2469 } elsif ($r_max > $r_min) {
2478 # adapted from pager.c
2480 $pager ||= $ENV{GIT_PAGER
} || $ENV{PAGER
};
2481 if (!defined $pager) {
2483 } elsif (length $pager == 0 || $pager eq 'cat') {
2489 return unless -t
*STDOUT
;
2490 pipe my $rfd, my $wfd or return;
2491 defined(my $pid = fork) or ::fatal
"Can't fork: $!\n";
2493 open STDOUT
, '>&', $wfd or
2494 ::fatal
"Can't redirect to stdout: $!\n";
2497 open STDIN
, '<&', $rfd or ::fatal
"Can't redirect stdin: $!\n";
2498 $ENV{LESS
} ||= 'FRSX';
2499 exec $pager or ::fatal
"Can't run pager: $! ($pager)\n";
2502 sub get_author_info
{
2503 my ($dest, $author, $t, $tz) = @_;
2504 $author =~ s/(?:^\s*|\s*$)//g;
2505 $dest->{a_raw
} = $author;
2508 $au = $rusers{$author} || undef;
2511 ($au) = ($author =~ /<([^>]+)\@[^>]+>$/);
2516 # Date::Parse isn't in the standard Perl distro :(
2517 if ($tz =~ s/^\+//) {
2518 $t += ::tz_to_s_offset
($tz);
2519 } elsif ($tz =~ s/^\-//) {
2520 $t -= ::tz_to_s_offset
($tz);
2522 $dest->{t_utc
} = $t;
2525 sub process_commit
{
2526 my ($c, $r_min, $r_max, $defer) = @_;
2527 if (defined $r_min && defined $r_max) {
2528 if ($r_min == $c->{r
} && $r_min == $r_max) {
2532 return 1 if $r_min == $r_max;
2533 if ($r_min < $r_max) {
2534 # we need to reverse the print order
2535 return 0 if (defined $limit && --$limit < 0);
2539 if ($r_min != $r_max) {
2540 return 1 if ($r_min < $c->{r
});
2541 return 1 if ($r_max > $c->{r
});
2544 return 0 if (defined $limit && --$limit < 0);
2553 if (my $l = $c->{l
}) {
2554 while ($l->[0] =~ /^\s*$/) { shift @
$l }
2557 $l_fmt ||= 'A' . length($c->{r
});
2558 print 'r',pack($l_fmt, $c->{r
}),' | ';
2559 print "$c->{c} | " if $show_commit;
2562 show_commit_normal
($c);
2566 sub show_commit_changed_paths
{
2568 return unless $c->{changed
};
2569 print "Changed paths:\n", @
{$c->{changed
}};
2572 sub show_commit_normal
{
2574 print '-' x72
, "\nr$c->{r} | ";
2575 print "$c->{c} | " if $show_commit;
2576 print "$c->{a} | ", strftime
("%Y-%m-%d %H:%M:%S %z (%a, %d %b %Y)",
2577 localtime($c->{t_utc
})), ' | ';
2580 if (my $l = $c->{l
}) {
2581 while ($l->[$#$l] eq "\n" && $#$l > 0
2582 && $l->[($#$l - 1)] eq "\n") {
2585 $nr_line = scalar @
$l;
2587 print "1 line\n\n\n";
2589 if ($nr_line == 1) {
2590 $nr_line = '1 line';
2592 $nr_line .= ' lines';
2594 print $nr_line, "\n";
2595 show_commit_changed_paths
($c);
2597 print $_ foreach @
$l;
2601 show_commit_changed_paths
($c);
2605 foreach my $x (qw
/raw diff/) {
2608 print $_ foreach @
{$c->{$x}}
2615 my ($r_min, $r_max);
2616 my $r_last = -1; # prevent dupes
2622 if (defined $::_revision
) {
2623 if ($::_revision
=~ /^(\d+):(\d+)$/) {
2624 ($r_min, $r_max) = ($1, $2);
2625 } elsif ($::_revision
=~ /^\d+$/) {
2626 $r_min = $r_max = $::_revision
;
2628 ::fatal
"-r$::_revision is not supported, use ",
2629 "standard \'git log\' arguments instead\n";
2634 @args = (git_svn_log_cmd
($r_min, $r_max), @args);
2635 my $log = command_output_pipe
(@args);
2638 my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/;
2640 if (/^${esc_color}commit ($::sha1_short)/o) {
2642 if ($c && cmt_showable
($c) && $c->{r
} != $r_last) {
2644 process_commit
($c, $r_min, $r_max, \
@k) or
2649 } elsif (/^${esc_color}author (.+) (\d+) ([\-\+]?\d+)$/o) {
2650 get_author_info
($c, $1, $2, $3);
2651 } elsif (/^${esc_color}(?:tree|parent|committer) /o) {
2653 } elsif (/^${esc_color}:\d{6} \d{6} $::sha1_short/o) {
2654 push @
{$c->{raw
}}, $_;
2655 } elsif (/^${esc_color}[ACRMDT]\t/) {
2656 # we could add $SVN->{svn_path} here, but that requires
2657 # remote access at the moment (repo_path_split)...
2658 s
#^(${esc_color})([ACRMDT])\t#$1 $2 #o;
2659 push @
{$c->{changed
}}, $_;
2660 } elsif (/^${esc_color}diff /o) {
2662 push @
{$c->{diff
}}, $_;
2664 push @
{$c->{diff
}}, $_;
2665 } elsif (/^${esc_color} (git-svn-id:.+)$/o) {
2666 ($c->{url
}, $c->{r
}, undef) = ::extract_metadata
($1);
2667 } elsif (s/^${esc_color} //o) {
2668 push @
{$c->{l
}}, $_;
2671 if ($c && defined $c->{r
} && $c->{r
} != $r_last) {
2673 process_commit
($c, $r_min, $r_max, \
@k);
2679 process_commit
($_, $r_min, $r_max) foreach reverse @k;
2683 print '-' x72
,"\n" unless $incremental || $oneline;
2686 package Git
::SVN
::Migration
;
2687 # these version numbers do NOT correspond to actual version numbers
2688 # of git nor git-svn. They are just relative.
2690 # v0 layout: .git/$id/info/url, refs/heads/$id-HEAD
2692 # v1 layout: .git/$id/info/url, refs/remotes/$id
2694 # v2 layout: .git/svn/$id/info/url, refs/remotes/$id
2696 # v3 layout: .git/svn/$id, refs/remotes/$id
2697 # - info/url may remain for backwards compatibility
2698 # - this is what we migrate up to this layout automatically,
2699 # - this will be used by git svn init on single branches
2701 # v4 layout: .git/svn/$repo_id/$id, refs/remotes/$repo_id/$id
2702 # - this is only created for newly multi-init-ed
2703 # repositories. Similar in spirit to the
2704 # --use-separate-remotes option in git-clone (now default)
2705 # - we do not automatically migrate to this (following
2706 # the example set by core git)
2710 use File
::Path qw
/mkpath/;
2711 use File
::Basename qw
/dirname basename/;
2712 use vars qw
/$_minimize/;
2714 sub migrate_from_v0
{
2715 my $git_dir = $ENV{GIT_DIR
};
2716 return undef unless -d
$git_dir;
2717 my ($fh, $ctx) = command_output_pipe
(qw
/rev-parse --symbolic --all/);
2721 my ($id, $orig_ref) = ($_, $_);
2722 next unless $id =~ s
#^refs/heads/(.+)-HEAD$#$1#;
2723 next unless -f
"$git_dir/$id/info/url";
2724 my $new_ref = "refs/remotes/$id";
2725 if (::verify_ref
("$new_ref^0")) {
2726 print STDERR
"W: $orig_ref is probably an old ",
2727 "branch used by an ancient version of ",
2729 "However, $new_ref also exists.\n",
2730 "We will not be able ",
2731 "to use this branch until this ",
2732 "ambiguity is resolved.\n";
2735 print STDERR
"Migrating from v0 layout...\n" if !$migrated;
2736 print STDERR
"Renaming ref: $orig_ref => $new_ref\n";
2737 command_noisy
('update-ref', $new_ref, $orig_ref);
2738 command_noisy
('update-ref', '-d', $orig_ref, $orig_ref);
2741 command_close_pipe
($fh, $ctx);
2742 print STDERR
"Done migrating from v0 layout...\n" if $migrated;
2746 sub migrate_from_v1
{
2747 my $git_dir = $ENV{GIT_DIR
};
2749 return $migrated unless -d
$git_dir;
2750 my $svn_dir = "$git_dir/svn";
2752 # just in case somebody used 'svn' as their $id at some point...
2753 return $migrated if -d
$svn_dir && ! -f
"$svn_dir/info/url";
2755 print STDERR
"Migrating from a git-svn v1 layout...\n";
2757 print STDERR
"Data from a previous version of git-svn exists, but\n\t",
2758 "$svn_dir\n\t(required for this version ",
2759 "($::VERSION) of git-svn) does not. exist\n";
2760 my ($fh, $ctx) = command_output_pipe
(qw
/rev-parse --symbolic --all/);
2763 next unless $x =~ s
#^refs/remotes/##;
2765 next unless -f
"$git_dir/$x/info/url";
2766 my $u = eval { ::file_to_s
("$git_dir/$x/info/url") };
2768 my $dn = dirname
("$git_dir/svn/$x");
2769 mkpath
([$dn]) unless -d
$dn;
2770 if ($x eq 'svn') { # they used 'svn' as GIT_SVN_ID:
2771 mkpath
(["$git_dir/svn/svn"]);
2772 print STDERR
" - $git_dir/$x/info => ",
2773 "$git_dir/svn/$x/info\n";
2774 rename "$git_dir/$x/info", "$git_dir/svn/$x/info" or
2776 # don't worry too much about these, they probably
2777 # don't exist with repos this old (save for index,
2778 # and we can easily regenerate that)
2779 foreach my $f (qw
/unhandled.log index .rev_db/) {
2780 rename "$git_dir/$x/$f", "$git_dir/svn/$x/$f";
2783 print STDERR
" - $git_dir/$x => $git_dir/svn/$x\n";
2784 rename "$git_dir/$x", "$git_dir/svn/$x" or
2789 command_close_pipe
($fh, $ctx);
2790 print STDERR
"Done migrating from a git-svn v1 layout\n";
2795 my ($l_map, $pfx, $path) = @_;
2797 foreach (<$path/*>) {
2798 if (-r
"$_/info/url") {
2799 $pfx .= '/' if $pfx && $pfx !~ m
!/$!;
2800 my $ref_id = $pfx . basename
$_;
2801 my $url = ::file_to_s
("$_/info/url");
2802 $l_map->{$ref_id} = $url;
2809 $x =~ s!^\Q$ENV{GIT_DIR}\E/svn/!!o;
2810 read_old_urls
($l_map, $x, $_);
2814 sub migrate_from_v2
{
2815 my @cfg = command
(qw
/config -l/);
2816 return if grep /^svn-remote\..+\.url=/, @cfg;
2818 read_old_urls
(\
%l_map, '', "$ENV{GIT_DIR}/svn");
2821 foreach my $ref_id (sort keys %l_map) {
2822 Git
::SVN
->init($l_map{$ref_id}, '', $ref_id, $ref_id);
2828 sub minimize_connections
{
2829 my $r = Git
::SVN
::read_all_remotes
();
2831 my $root_repos = {};
2832 foreach my $repo_id (keys %$r) {
2833 my $url = $r->{$repo_id}->{url
} or next;
2834 my $fetch = $r->{$repo_id}->{fetch
} or next;
2835 my $ra = Git
::SVN
::Ra
->new($url);
2837 # skip existing cases where we already connect to the root
2838 if (($ra->{url
} eq $ra->{repos_root
}) ||
2839 (Git
::SVN
::sanitize_remote_name
($ra->{repos_root
}) eq
2841 $root_repos->{$ra->{url
}} = $repo_id;
2845 my $root_ra = Git
::SVN
::Ra
->new($ra->{repos_root
});
2846 my $root_path = $ra->{url
};
2847 $root_path =~ s
#^\Q$ra->{repos_root}\E/*##;
2848 foreach my $path (keys %$fetch) {
2849 my $ref_id = $fetch->{$path};
2850 my $gs = Git
::SVN
->new($ref_id, $repo_id, $path);
2852 # make sure we can read when connecting to
2853 # a higher level of a repository
2854 my ($last_rev, undef) = $gs->last_rev_commit;
2855 if (!defined $last_rev) {
2857 $root_ra->get_latest_revnum;
2861 my $new = $root_path;
2862 $new .= length $path ?
"/$path" : '';
2864 $root_ra->get_log([$new], $last_rev, $last_rev,
2868 $new_urls->{$ra->{repos_root
}}->{$new} =
2869 { ref_id
=> $ref_id,
2870 old_repo_id
=> $repo_id,
2871 old_path
=> $path };
2876 foreach my $url (keys %$new_urls) {
2877 # see if we can re-use an existing [svn-remote "repo_id"]
2878 # instead of creating a(n ugly) new section:
2879 my $repo_id = $root_repos->{$url} ||
2880 Git
::SVN
::sanitize_remote_name
($url);
2882 my $fetch = $new_urls->{$url};
2883 foreach my $path (keys %$fetch) {
2884 my $x = $fetch->{$path};
2885 Git
::SVN
->init($url, $path, $repo_id, $x->{ref_id
});
2886 my $pfx = "svn-remote.$x->{old_repo_id}";
2888 my $old_fetch = quotemeta("$x->{old_path}:".
2889 "refs/remotes/$x->{ref_id}");
2890 command_noisy
(qw
/config --unset/,
2891 "$pfx.fetch", '^'. $old_fetch . '$');
2892 delete $r->{$x->{old_repo_id
}}->
2893 {fetch
}->{$x->{old_path
}};
2894 if (!keys %{$r->{$x->{old_repo_id
}}->{fetch
}}) {
2895 command_noisy
(qw
/config --unset/,
2897 push @emptied, $x->{old_repo_id
}
2902 my $file = $ENV{GIT_CONFIG
} || $ENV{GIT_CONFIG_LOCAL
} ||
2903 "$ENV{GIT_DIR}/config";
2905 The following [svn-remote] sections in your config file ($file) are empty
2906 and can be safely removed:
2908 print STDERR
"[svn-remote \"$_\"]\n" foreach @emptied;
2912 sub migration_check
{
2916 minimize_connections
() if $_minimize;
2919 package Git
::IndexInfo
;
2922 use Git qw
/command_input_pipe command_close_pipe/;
2926 my ($gui, $ctx) = command_input_pipe
(qw
/update-index -z --index-info/);
2927 bless { gui
=> $gui, ctx
=> $ctx, nr
=> 0}, $class;
2931 my ($self, $path) = @_;
2932 if (print { $self->{gui
} } '0 ', 0 x
40, "\t", $path, "\0") {
2933 return ++$self->{nr
};
2939 my ($self, $mode, $hash, $path) = @_;
2940 if (print { $self->{gui
} } $mode, ' ', $hash, "\t", $path, "\0") {
2941 return ++$self->{nr
};
2948 command_close_pipe
($self->{gui
}, $self->{ctx
});
2955 $log_entry hashref as returned by libsvn_log_entry
()
2957 log => 'whitespace-formatted log entry
2958 ', # trailing newline is preserved
2959 revision
=> '8', # integer
2960 date
=> '2004-02-24T17:01:44.108345Z', # commit date
2961 author
=> 'committer name'
2965 # this is generated by generate_diff();
2966 @mods = array of diff
-index line hashes
, each element represents one line
2967 of diff
-index output
2969 diff
-index line
($m hash
)
2971 mode_a
=> first column of diff
-index output
, no leading
':',
2972 mode_b
=> second column of diff
-index output
,
2973 sha1_b
=> sha1sum of the final blob
,
2974 chg
=> change type
[MCRADT
],
2975 file_a
=> original file name of a file
(iff chg is
'C' or 'R')
2976 file_b
=> new
/current file name of a file
(any chg
)
2980 # retval of read_url_paths{,_all}();
2982 # repository root url
2983 'https://svn.musicpd.org' => {
2984 # repository path # GIT_SVN_ID
2985 'mpd/trunk' => 'trunk',
2986 'mpd/tags/0.11.5' => 'tags/0.11.5',
2991 I don
't trust the each() function on unless I created %hash myself
2992 because the internal iterator may not have started at base.