2 # Copyright (C) 2006, Eric Wong <normalperson@yhbt.net>
3 # License: GPL v2 or later
6 use vars qw
/ $AUTHOR $VERSION
7 $sha1 $sha1_short $_revision
9 $AUTHOR = 'Eric Wong <normalperson@yhbt.net>';
10 $VERSION = '@@GIT_VERSION@@';
12 $ENV{GIT_DIR
} ||= '.git';
13 $Git::SVN
::default_repo_id
= 'svn';
14 $Git::SVN
::default_ref_id
= $ENV{GIT_SVN_ID
} || 'git-svn';
15 $Git::SVN
::Ra
::_log_window_size
= 100;
17 $Git::SVN
::Log
::TZ
= $ENV{TZ
};
19 $| = 1; # unbuffer STDOUT
21 sub fatal
(@
) { print STDERR
@_; exit 1 }
22 require SVN
::Core
; # use()-ing this causes segfaults for me... *shrug*
25 if ($SVN::Core
::VERSION
lt '1.1.0') {
26 fatal
"Need SVN::Core 1.1.0 or better (got $SVN::Core::VERSION)\n";
28 push @Git::SVN
::Ra
::ISA
, 'SVN::Ra';
29 push @SVN::Git
::Editor
::ISA
, 'SVN::Delta::Editor';
30 push @SVN::Git
::Fetcher
::ISA
, 'SVN::Delta::Editor';
33 use File
::Basename qw
/dirname basename/;
34 use File
::Path qw
/mkpath/;
35 use Getopt
::Long qw
/:config gnu_getopt no_ignore_case auto_abbrev pass_through/;
41 foreach (qw
/command command_oneline command_noisy command_output_pipe
42 command_input_pipe command_close_pipe
/) {
43 $s .= "*SVN::Git::Editor::$_ = *SVN::Git::Fetcher::$_ = ".
44 "*Git::SVN::Migration::$_ = ".
45 "*Git::SVN::Log::$_ = *Git::SVN::$_ = *$_ = *Git::$_; ";
52 $sha1 = qr/[a-f\d]{40}/;
53 $sha1_short = qr/[a-f\d]{4,40}/;
54 my ($_stdin, $_help, $_edit,
57 $_version, $_fetch_all,
58 $_merge, $_strategy, $_dry_run,
60 $Git::SVN
::_follow_parent
= 1;
61 my %remote_opts = ( 'username=s' => \
$Git::SVN
::Prompt
::_username
,
62 'config-dir=s' => \
$Git::SVN
::Ra
::config_dir
,
63 'no-auth-cache' => \
$Git::SVN
::Prompt
::_no_auth_cache
);
64 my %fc_opts = ( 'follow-parent|follow!' => \
$Git::SVN
::_follow_parent
,
65 'authors-file|A=s' => \
$_authors,
66 'repack:i' => \
$Git::SVN
::_repack
,
67 'noMetadata' => \
$Git::SVN
::_no_metadata
,
68 'useSvmProps' => \
$Git::SVN
::_use_svm_props
,
69 'log-window-size=i' => \
$Git::SVN
::Ra
::_log_window_size
,
71 'repack-flags|repack-args|repack-opts=s' =>
72 \
$Git::SVN
::_repack_flags
,
75 my ($_trunk, $_tags, $_branches);
76 my %init_opts = ( 'template=s' => \
$_template, 'shared:s' => \
$_shared,
77 'trunk|T=s' => \
$_trunk, 'tags|t=s' => \
$_tags,
78 'branches|b=s' => \
$_branches, 'prefix=s' => \
$_prefix,
80 my %cmt_opts = ( 'edit|e' => \
$_edit,
81 'rmdir' => \
$SVN::Git
::Editor
::_rmdir
,
82 'find-copies-harder' => \
$SVN::Git
::Editor
::_find_copies_harder
,
83 'l=i' => \
$SVN::Git
::Editor
::_rename_limit
,
84 'copy-similarity|C=i'=> \
$SVN::Git
::Editor
::_cp_similarity
88 fetch
=> [ \
&cmd_fetch
, "Download new revisions from SVN",
89 { 'revision|r=s' => \
$_revision,
90 'all|a' => \
$_fetch_all,
92 init
=> [ \
&cmd_init
, "Initialize a repo for tracking" .
93 " (requires URL argument)",
95 'multi-init' => [ \
&cmd_multi_init
,
96 "Deprecated alias for ".
97 "'$0 init -T<trunk> -b<branches> -t<tags>'",
99 dcommit
=> [ \
&cmd_dcommit
,
100 'Commit several diffs to merge with upstream',
101 { 'merge|m|M' => \
$_merge,
102 'strategy|s=s' => \
$_strategy,
103 'dry-run|n' => \
$_dry_run,
104 %cmt_opts, %fc_opts } ],
105 'set-tree' => [ \
&cmd_set_tree
,
106 "Set an SVN repository to a git tree-ish",
107 { 'stdin|' => \
$_stdin, %cmt_opts, %fc_opts, } ],
108 'show-ignore' => [ \
&cmd_show_ignore
, "Show svn:ignore listings",
109 { 'revision|r=i' => \
$_revision } ],
110 'multi-fetch' => [ \
&cmd_multi_fetch
,
111 "Deprecated alias for $0 fetch --all",
112 { 'revision|r=s' => \
$_revision, %fc_opts } ],
113 'migrate' => [ sub { },
114 # no-op, we automatically run this anyways,
115 'Migrate configuration/metadata/layout from
116 previous versions of git-svn',
118 'log' => [ \
&Git
::SVN
::Log
::cmd_show_log
, 'Show commit logs',
119 { 'limit=i' => \
$Git::SVN
::Log
::limit
,
120 'revision|r=s' => \
$_revision,
121 'verbose|v' => \
$Git::SVN
::Log
::verbose
,
122 'incremental' => \
$Git::SVN
::Log
::incremental
,
123 'oneline' => \
$Git::SVN
::Log
::oneline
,
124 'show-commit' => \
$Git::SVN
::Log
::show_commit
,
125 'non-recursive' => \
$Git::SVN
::Log
::non_recursive
,
126 'authors-file|A=s' => \
$_authors,
127 'color' => \
$Git::SVN
::Log
::color
,
128 'pager=s' => \
$Git::SVN
::Log
::pager
,
130 'commit-diff' => [ \
&cmd_commit_diff
,
131 'Commit a diff between two trees',
132 { 'message|m=s' => \
$_message,
133 'file|F=s' => \
$_file,
134 'revision|r=s' => \
$_revision,
139 for (my $i = 0; $i < @ARGV; $i++) {
140 if (defined $cmd{$ARGV[$i]}) {
147 my %opts = %{$cmd{$cmd}->[2]} if (defined $cmd);
149 read_repo_config
(\
%opts);
150 my $rv = GetOptions
(%opts, 'help|H|h' => \
$_help, 'version|V' => \
$_version,
151 'minimize-connections' => \
$Git::SVN
::Migration
::_minimize
,
152 'id|i=s' => \
$Git::SVN
::default_ref_id
,
153 'svn-remote|remote|R=s' => \
$Git::SVN
::default_repo_id
);
154 exit 1 if (!$rv && $cmd ne 'log');
157 version
() if $_version;
158 usage
(1) unless defined $cmd;
159 load_authors
() if $_authors;
160 unless ($cmd =~ /^(?:init|multi-init|commit-diff)$/) {
161 Git
::SVN
::Migration
::migration_check
();
163 Git
::SVN
::init_vars
();
165 Git
::SVN
::verify_remotes_sanity
();
166 $cmd{$cmd}->[0]->(@ARGV);
171 ####################### primary functions ######################
173 my $exit = shift || 0;
174 my $fd = $exit ? \
*STDERR
: \
*STDOUT
;
176 git
-svn
- bidirectional operations between a single Subversion tree
and git
177 Usage
: $0 <command
> [options
] [arguments
]\n
179 print $fd "Available commands:\n" unless $cmd;
181 foreach (sort keys %cmd) {
182 next if $cmd && $cmd ne $_;
183 print $fd ' ',pack('A17',$_),$cmd{$_}->[1],"\n";
184 foreach (keys %{$cmd{$_}->[2]}) {
185 next if /^multi-/; # don't show deprecated commands
186 # prints out arguments as they should be passed:
187 my $x = s
#[:=]s$## ? '<arg>' : s#[:=]i$## ? '<num>' : '';
188 print $fd ' ' x
21, join(', ', map { length $_ > 1 ?
190 split /\|/,$_)," $x\n";
194 \nGIT_SVN_ID may be set
in the environment
or via the
--id
/-i switch to an
195 arbitrary identifier
if you
're tracking multiple SVN branches/repositories in
196 one git repository and want to keep them separate. See git-svn(1) for more
203 print "git-svn version $VERSION (svn $SVN::Core::VERSION)\n";
208 unless (-d $ENV{GIT_DIR}) {
209 my @init_db = ('init
');
210 push @init_db, "--template=$_template" if defined $_template;
211 if (defined $_shared) {
212 if ($_shared =~ /[a-z]/) {
213 push @init_db, "--shared=$_shared";
215 push @init_db, "--shared";
218 command_noisy(@init_db);
223 my $repo_path = shift or return;
224 mkpath([$repo_path]) unless -d $repo_path;
225 chdir $repo_path or die "Couldn't
chdir to
$repo_path: $!\n";
226 $ENV{GIT_DIR} = $repo_path . "/.git
";
230 if (defined $_trunk || defined $_branches || defined $_tags) {
231 return cmd_multi_init(@_);
233 my $url = shift or die "SVN repository location required
",
234 "as a command
-line argument
\n";
238 Git::SVN->init($url);
242 if (grep /^\d+=./, @_) {
243 die "'<rev>=<commit>' fetch arguments are
",
244 "no longer supported
.\n";
248 die "Usage
: $0 fetch
[--all
|-a
] [svn
-remote
]\n";
250 $remote ||= $Git::SVN::default_repo_id;
254 Git::SVN::fetch_all($remote, Git::SVN::read_all_remotes());
260 if ($_stdin || !@commits) {
261 print "Reading from stdin
...\n";
264 if (/\b($sha1_short)\b/o) {
265 unshift @commits, $1;
270 foreach my $c (@commits) {
271 my @tmp = command('rev-parse',$c);
272 if (scalar @tmp == 1) {
274 } elsif (scalar @tmp > 1) {
275 push @revs, reverse(command('rev-list',@tmp));
277 fatal "Failed to rev
-parse
$c\n";
280 my $gs = Git::SVN->new;
281 my ($r_last, $cmt_last) = $gs->last_rev_commit;
283 if (defined $gs->{last_rev} && $r_last != $gs->{last_rev}) {
284 fatal "There are new revisions that were fetched
",
285 "and need to be merged
(or acknowledged
) ",
286 "before committing
.\nlast rev
: $r_last\n",
287 " current
: $gs->{last_rev
}\n";
289 $gs->set_tree($_) foreach @revs;
290 print "Done committing
",scalar @revs," revisions to SVN
\n";
296 my ($url, $rev, $uuid);
297 my ($fh, $ctx) = command_output_pipe('rev-list', $head);
303 ($url, $rev, $uuid) = cmt_metadata($c);
304 last if (defined $url && defined $rev && defined $uuid);
307 close $fh; # most likely breaking the pipe
308 unless (defined $url && defined $rev && defined $uuid) {
309 die "Unable to determine upstream SVN information from
",
310 "$head history
:\n $ctx\n";
312 my $gs = Git::SVN->find_by_url($url);
314 foreach my $d (@refs) {
315 if (!verify_ref("$d~1")) {
317 "has
no parent commit
, and therefore
",
318 "nothing to diff against
.\n",
319 "You should be working from a repository
",
320 "originally created by git
-svn
\n";
322 unless (defined $last_rev) {
323 (undef, $last_rev, undef) = cmt_metadata("$d~1");
324 unless (defined $last_rev) {
325 fatal "Unable to extract revision information
",
326 "from commit
$d~1\n";
330 print "diff
-tree
$d~1 $d\n";
332 my %ed_opts = ( r => $last_rev,
333 log => get_commit_entry($d)->{log},
334 ra => Git::SVN::Ra->new($url),
338 print "Committed r
$_[0]\n";
339 $last_rev = $_[0]; },
341 if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) {
342 print "No changes
\n$d~1 == $d\n";
348 warn "Could
not determine fetch information
for $url\n",
349 "Will
not attempt to fetch
and rebase commits
.\n",
350 "This probably means you have useSvmProps
and should
\n",
351 "now resync your SVN
::Mirror repository
.\n";
355 # we always want to rebase against the current HEAD, not any
356 # head that was passed to us
357 my @diff = command('diff-tree', 'HEAD', $gs->refname, '--');
360 @finish = qw/rebase/;
361 push @finish, qw/--merge/ if $_merge;
362 push @finish, "--strategy
=$_strategy" if $_strategy;
363 print STDERR "W
: HEAD
and ", $gs->refname, " differ
, ",
364 "using
@finish:\n", "@diff";
366 print "No changes between current HEAD
and ",
367 $gs->refname, "\nResetting to the latest
",
369 @finish = qw/reset --mixed/;
371 command_noisy(@finish, $gs->refname);
374 sub cmd_show_ignore {
375 my $gs = Git::SVN->new;
376 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
377 $gs->traverse_ignore(\*STDOUT, '', $r);
382 unless (defined $_trunk || defined $_branches || defined $_tags) {
386 $_prefix = '' unless defined $_prefix;
391 if (defined $_trunk) {
392 my $trunk_ref = $_prefix . 'trunk';
393 # try both old-style and new-style lookups:
394 my $gs_trunk = eval { Git::SVN->new($trunk_ref) };
396 my ($trunk_url, $trunk_path) =
397 complete_svn_url($url, $_trunk);
398 $gs_trunk = Git::SVN->init($trunk_url, $trunk_path,
402 return unless defined $_branches || defined $_tags;
403 my $ra = $url ? Git::SVN::Ra->new($url) : undef;
404 complete_url_ls_init($ra, $_branches, '--branches/-b', $_prefix);
405 complete_url_ls_init($ra, $_tags, '--tags/-t', $_prefix . 'tags/');
408 sub cmd_multi_fetch {
409 my $remotes = Git::SVN::read_all_remotes();
410 foreach my $repo_id (sort keys %$remotes) {
411 if ($remotes->{$repo_id}->{url}) {
412 Git::SVN::fetch_all($repo_id, $remotes);
417 # this command is special because it requires no metadata
418 sub cmd_commit_diff {
419 my ($ta, $tb, $url) = @_;
420 my $usage = "Usage
: $0 commit
-diff
-r
<revision
> ".
421 "<tree
-ish
> <tree
-ish
> [<URL
>]\n";
422 fatal($usage) if (!defined $ta || !defined $tb);
425 my $gs = eval { Git::SVN->new };
427 fatal("Needed URL
or usable git
-svn
--id
in ",
428 "the command
-line
\n", $usage);
431 $svn_path = $gs->{path};
433 unless (defined $_revision) {
434 fatal("-r
|--revision is a required argument
\n", $usage);
436 if (defined $_message && defined $_file) {
437 fatal("Both
--message
/-m and --file/-F specified
",
438 "for the commit message
.\n",
439 "I have
no idea what you mean
\n");
441 if (defined $_file) {
442 $_message = file_to_s($_file);
444 $_message ||= get_commit_entry($tb)->{log};
446 my $ra ||= Git::SVN::Ra->new($url);
447 $svn_path ||= $ra->{svn_path};
450 $r = $ra->get_latest_revnum;
451 } elsif ($r !~ /^\d+$/) {
452 die "revision argument
: $r not understood by git
-svn
\n";
454 my %ed_opts = ( r => $r,
459 editor_cb => sub { print "Committed r
$_[0]\n" },
460 svn_path => $svn_path );
461 if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) {
462 print "No changes
\n$ta == $tb\n";
466 ########################### utility functions #########################
468 sub complete_svn_url {
469 my ($url, $path) = @_;
471 if ($path !~ m#^[a-z\+]+://#) {
472 if (!defined $url || $url !~ m#^[a-z\+]+://#) {
473 fatal("E
: '$path' is
not a complete URL
",
474 "and a separate URL is
not specified
\n");
476 return ($url, $path);
481 sub complete_url_ls_init {
482 my ($ra, $repo_path, $switch, $pfx) = @_;
483 unless ($repo_path) {
484 print STDERR "W
: $switch not specified
\n";
487 $repo_path =~ s#/+$##;
488 if ($repo_path =~ m#^[a-z\+]+://#) {
489 $ra = Git::SVN::Ra->new($repo_path);
492 $repo_path =~ s#^/+##;
494 fatal("E
: '$repo_path' is
not a complete URL
",
495 "and a separate URL is
not specified
\n");
498 my $url = $ra->{url};
499 my $gs = Git::SVN->init($url, undef, undef, undef, 1);
500 my $k = "svn
-remote
.$gs->{repo_id
}.url
";
501 my $orig_url = eval { command_oneline(qw/config --get/, $k) };
502 if ($orig_url && ($orig_url ne $gs->{url})) {
503 die "$k already set
: $orig_url\n",
504 "wanted to set to
: $gs->{url
}\n";
506 command_oneline('config', $k, $gs->{url}) unless $orig_url;
507 my $remote_path = "$ra->{svn_path
}/$repo_path/*";
508 $remote_path =~ s#/+#/#g;
509 $remote_path =~ s#^/##g;
510 my ($n) = ($switch =~ /^--(\w+)/);
511 if (length $pfx && $pfx !~ m#/$#) {
512 die "--prefix
='$pfx' must have a trailing slash
'/'\n";
514 command_noisy('config', "svn
-remote
.$gs->{repo_id
}.$n",
515 "$remote_path:refs
/remotes/$pfx*");
520 eval { command_oneline([ 'rev-parse', '--verify', $ref ],
524 sub get_tree_from_treeish {
526 # $treeish can be a symbolic ref, too:
527 my $type = command_oneline(qw/cat-file -t/, $treeish);
529 while ($type eq 'tag') {
530 ($treeish, $type) = command(qw/cat-file tag/, $treeish);
532 if ($type eq 'commit') {
533 $expected = (grep /^tree /, command(qw/cat-file commit/,
535 ($expected) = ($expected =~ /^tree ($sha1)$/o);
536 die "Unable to get tree from
$treeish\n" unless $expected;
537 } elsif ($type eq 'tree') {
538 $expected = $treeish;
540 die "$treeish is a
$type, expected tree
, tag
or commit
\n";
545 sub get_commit_entry {
546 my ($treeish) = shift;
547 my %log_entry = ( log => '', tree => get_tree_from_treeish($treeish) );
548 my $commit_editmsg = "$ENV{GIT_DIR
}/COMMIT_EDITMSG
";
549 my $commit_msg = "$ENV{GIT_DIR
}/COMMIT_MSG
";
550 open my $log_fh, '>', $commit_editmsg or croak $!;
552 my $type = command_oneline(qw/cat-file -t/, $treeish);
553 if ($type eq 'commit' || $type eq 'tag') {
554 my ($msg_fh, $ctx) = command_output_pipe('cat-file',
559 $in_msg = 1 if (/^\s*$/);
560 } elsif (/^git-svn-id: /) {
561 # skip this for now, we regenerate the
562 # correct one on re-fetch anyways
563 # TODO: set *:merge properties or like...
565 print $log_fh $_ or croak $!;
568 command_close_pipe($msg_fh, $ctx);
570 close $log_fh or croak $!;
572 if ($_edit || ($type eq 'tree')) {
573 my $editor = $ENV{VISUAL} || $ENV{EDITOR} || 'vi';
574 # TODO: strip out spaces, comments, like git-commit.sh
575 system($editor, $commit_editmsg);
577 rename $commit_editmsg, $commit_msg or croak $!;
578 open $log_fh, '<', $commit_msg or croak $!;
579 { local $/; chomp($log_entry{log} = <$log_fh>); }
580 close $log_fh or croak $!;
586 my ($str, $file, $mode) = @_;
587 open my $fd,'>',$file or croak $!;
588 print $fd $str,"\n" or croak $!;
589 close $fd or croak $!;
590 chmod ($mode &~ umask, $file) if (defined $mode);
595 open my $fd,'<',$file or croak "$!: file
: $file\n";
598 close $fd or croak $!;
603 # '<svn username> = real-name <email address>' mapping based on git-svnimport:
605 open my $authors, '<', $_authors or die "Can
't open $_authors $!\n";
606 my $log = $cmd eq 'log';
609 next unless /^(\S+?|\(no author\))\s*=\s*(.+?)\s*<(.+)>\s*$/;
610 my ($user, $name, $email) = ($1, $2, $3);
612 $Git::SVN::Log::rusers{"$name <$email>"} = $user;
614 $users{$user} = [$name, $email];
617 close $authors or croak $!;
620 # convert GetOpt::Long specs for use by git-config
621 sub read_repo_config {
622 return unless -d $ENV{GIT_DIR};
625 foreach my $o (keys %$opts) {
626 # if we have mixedCase and a long option-only, then
627 # it's a config
-only variable that we don
't need for
629 push @config_only, $o if ($o =~ /[A-Z]/ && $o =~ /^[a-z]+$/i);
631 my ($key) = ($o =~ /^([a-zA-Z\-]+)/);
633 my $arg = 'git
-config
';
634 $arg .= ' --int' if ($o =~ /[:=]i$/);
635 $arg .= ' --bool
' if ($o !~ /[:=][sfi]$/);
636 if (ref $v eq 'ARRAY
') {
637 chomp(my @tmp = `$arg --get-all svn.$key`);
640 chomp(my $tmp = `$arg --get svn.$key`);
641 if ($tmp && !($arg =~ / --bool/ && $tmp eq 'false
')) {
646 delete @$opts{@config_only} if @config_only;
649 sub extract_metadata {
650 my $id = shift or return (undef, undef, undef);
651 my ($url, $rev, $uuid) = ($id =~ /^git-svn-id:\s(\S+?)\@(\d+)
653 if (!defined $rev || !$uuid || !$url) {
654 # some of the original repositories I made had
655 # identifiers like this:
656 ($rev, $uuid) = ($id =~/^git-svn-id:\s(\d+)\@([a-f\d\-]+)/);
658 return ($url, $rev, $uuid);
662 return extract_metadata((grep(/^git-svn-id: /,
663 command(qw/cat-file commit/, shift)))[-1]);
669 use vars qw/$default_repo_id $default_ref_id $_no_metadata $_follow_parent
670 $_repack $_repack_flags $_use_svm_props/;
672 use File::Path qw/mkpath/;
673 use File::Copy qw/copy/;
677 # properties that we do not log:
680 %SKIP_PROP = map { $_ => 1 } qw/svn:wc:ra_dav:version-url
681 svn:special svn:executable
682 svn:entry:committed-rev
683 svn:entry:last-author
685 svn:entry:committed-date/;
687 # some options are read globally, but can be overridden locally
688 # per [svn-remote "..."] section. Command-line options will *NOT*
689 # override options set in an [svn-remote "..."] section
691 foreach (qw/follow_parent no_metadata use_svm_props/) {
696 return \$self->{-$_} if exists \$self->{-$_};
697 my \$k = \"svn-remote.\$self->{repo_id}\.$key\";
698 eval { command_oneline(qw/config --get/, \$k) };
700 \$self->{-$_} = \$Git::SVN::_$_;
702 my \$v = command_oneline(qw/config --bool/,\$k);
703 \$self->{-$_} = \$v eq 'false
' ? 0 : 1;
705 return \$self->{-$_} }\n";
712 END { unlink keys %LOCKFILES if %LOCKFILES }
714 sub resolve_local_globs {
715 my ($url, $fetch, $glob_spec) = @_;
716 return unless defined $glob_spec;
717 my $ref = $glob_spec->{ref};
718 my $path = $glob_spec->{path};
719 foreach (command(qw#for-each-ref --format=%(refname) refs/remotes#)) {
720 next unless m#^refs/remotes/$ref->{regex}$#;
722 my $pathname = $path->full_path($p);
723 my $refname = $ref->full_path($p);
724 if (my $existing = $fetch->{$pathname}) {
725 if ($existing ne $refname) {
726 die "Refspec conflict:\n",
727 "existing: refs/remotes/$existing\n",
728 " globbed: refs/remotes/$refname\n";
730 my $u = (::cmt_metadata("refs/remotes/$refname"))[0];
731 $u =~ s!^\Q$url\E(/|$)!! or die
732 "refs/remotes/$refname: '$url' not found in '$u'\n";
733 if ($pathname ne $u) {
734 warn "W: Refspec glob conflict ",
735 "(ref: refs/remotes/$refname):\n",
736 "expected path: $pathname\n",
738 "Continuing ahead with $u\n";
742 $fetch->{$pathname} = $refname;
747 sub parse_revision_argument {
748 my ($base, $head) = @_;
749 if (!defined $::_revision || $::_revision eq 'BASE
:HEAD
') {
750 return ($base, $head);
752 return ($1, $2) if ($::_revision =~ /^(\d+):(\d+)$/);
753 return ($::_revision, $::_revision) if ($::_revision =~ /^\d+$/);
754 return ($head, $head) if ($::_revision eq 'HEAD
');
755 return ($base, $1) if ($::_revision =~ /^BASE:(\d+)$/);
756 return ($1, $head) if ($::_revision =~ /^(\d+):HEAD$/);
757 die "revision argument: $::_revision not understood by git-svn\n";
761 my ($repo_id, $remotes) = @_;
762 my $remote = $remotes->{$repo_id} or
763 die "[svn-remote \"$repo_id\"] unknown\n";
764 my $fetch = $remote->{fetch};
765 my $url = $remote->{url} or die "svn-remote.$repo_id.url not defined\n";
767 my $ra = Git::SVN::Ra->new($url);
768 my $uuid = $ra->get_uuid;
769 my $head = $ra->get_latest_revnum;
770 my $base = defined $fetch ? $head : 0;
772 # read the max revs for wildcard expansion (branches/*, tags/*)
773 foreach my $t (qw/branches tags/) {
774 defined $remote->{$t} or next;
775 push @globs, $remote->{$t};
776 my $max_rev = eval { tmp_config(qw/--int --get/,
777 "svn-remote.$repo_id.${t}-maxRev") };
778 if (defined $max_rev && ($max_rev < $base)) {
784 foreach my $p (sort keys %$fetch) {
785 my $gs = Git::SVN->new($fetch->{$p}, $repo_id, $p);
786 my $lr = $gs->rev_db_max;
788 $base = $lr if ($lr < $base);
794 ($base, $head) = parse_revision_argument($base, $head);
795 $ra->gs_fetch_loop_common($base, $head, \@gs, \@globs);
798 sub read_all_remotes {
800 foreach (grep { s/^svn-remote\.// } command(qw/config -l/)) {
801 if (m!^(.+)\.fetch=\s*(.*)\s*:\s*refs/remotes/(.+)\s*$!) {
802 $r->{$1}->{fetch}->{$2} = $3;
803 } elsif (m!^(.+)\.url=\s*(.*)\s*$!) {
804 $r->{$1}->{url} = $2;
805 } elsif (m!^(.+)\.(branches|tags)=
806 (.*):refs/remotes/(.+)\s*$/!x) {
807 my ($p, $g) = ($3, $4);
808 my $rs = $r->{$1}->{$2} = {
811 path => Git::SVN::GlobSpec->new($p),
812 ref => Git::SVN::GlobSpec->new($g) };
813 if (length($rs->{ref}->{right}) != 0) {
814 die "The '*' glob character must be the last ",
815 "character of '$g'\n";
823 if (defined $_repack) {
824 $_repack = 1000 if ($_repack <= 0);
825 $_repack_nr = $_repack;
826 $_repack_flags ||= '-d
';
830 sub verify_remotes_sanity {
831 return unless -d $ENV{GIT_DIR};
833 foreach (command(qw/config -l/)) {
834 if (m!^svn-remote\.(?:.+)\.fetch=.*:refs/remotes/(\S+)\s*$!) {
836 die "Remote ref refs/remote/$1 is tracked by",
837 "\n \"$_\"\nand\n \"$seen{$1}\"\n",
838 "Please resolve this ambiguity in ",
839 "your git configuration file before ",
847 # we allow more chars than remotes2config.sh...
848 sub sanitize_remote_name {
850 $name =~ tr{A-Za-z0-9:,/+-}{.}c;
854 sub find_existing_remote {
855 my ($url, $remotes) = @_;
857 foreach my $repo_id (keys %$remotes) {
858 my $u = $remotes->{$repo_id}->{url} or next;
860 $existing = $repo_id;
866 sub init_remote_config {
867 my ($self, $url, $no_write) = @_;
868 $url =~ s!/+$!!; # strip trailing slash
869 my $r = read_all_remotes();
870 my $existing = find_existing_remote($url, $r);
873 print STDERR "Using existing ",
874 "[svn-remote \"$existing\"]\n";
876 $self->{repo_id} = $existing;
878 my $min_url = Git::SVN::Ra->new($url)->minimize_url;
879 $existing = find_existing_remote($min_url, $r);
882 print STDERR "Using existing ",
883 "[svn-remote \"$existing\"]\n";
885 $self->{repo_id} = $existing;
887 if ($min_url ne $url) {
889 print STDERR "Using higher level of URL: ",
890 "$url => $min_url\n";
892 my $old_path = $self->{path};
893 $self->{path} = $url;
894 $self->{path} =~ s!^\Q$min_url\E(/|$)!!;
895 if (length $old_path) {
896 $self->{path} .= "/$old_path";
903 # verify that we aren't overwriting anything
:
905 command_oneline
('config', '--get',
906 "svn-remote.$self->{repo_id}.url")
908 if ($orig_url && ($orig_url ne $url)) {
909 die "svn-remote.$self->{repo_id}.url already set: ",
910 "$orig_url\nwanted to set to: $url\n";
913 my ($xrepo_id, $xpath) = find_ref
($self->refname);
914 if (defined $xpath) {
915 die "svn-remote.$xrepo_id.fetch already set to track ",
916 "$xpath:refs/remotes/", $self->refname, "\n";
919 command_noisy
('config',
920 "svn-remote.$self->{repo_id}.url", $url);
921 command_noisy
('config', '--add',
922 "svn-remote.$self->{repo_id}.fetch",
923 "$self->{path}:".$self->refname);
928 sub find_by_url
{ # repos_root and, path are optional
929 my ($class, $full_url, $repos_root, $path) = @_;
930 my $remotes = read_all_remotes
();
931 if (defined $full_url && defined $repos_root && !defined $path) {
933 $path =~ s
#^\Q$repos_root\E(?:/|$)##;
935 foreach my $repo_id (keys %$remotes) {
936 my $u = $remotes->{$repo_id}->{url
} or next;
937 next if defined $repos_root && $repos_root ne $u;
939 my $fetch = $remotes->{$repo_id}->{fetch
} || {};
940 foreach (qw
/branches tags/) {
941 resolve_local_globs
($u, $fetch,
942 $remotes->{$repo_id}->{$_});
945 unless (defined $p) {
947 $p =~ s
#^\Q$u\E(?:/|$)## or next;
949 foreach my $f (keys %$fetch) {
951 return Git
::SVN
->new($fetch->{$f}, $repo_id, $f);
958 my ($class, $url, $path, $repo_id, $ref_id, $no_write) = @_;
959 my $self = _new
($class, $repo_id, $ref_id, $path);
961 $self->init_remote_config($url, $no_write);
968 foreach (command
(qw
/config -l/)) {
969 next unless m
!^svn
-remote\
.(.+)\
.fetch
=
970 \s
*(.*)\s
*:\s
*refs
/remotes/(.+)\s
*$!x
;
971 my ($repo_id, $path, $ref) = ($1, $2, $3);
972 if ($ref eq $ref_id) {
973 $path = '' if ($path =~ m
#^\./?#);
974 return ($repo_id, $path);
977 (undef, undef, undef);
981 my ($class, $ref_id, $repo_id, $path) = @_;
982 if (defined $ref_id && !defined $repo_id && !defined $path) {
983 ($repo_id, $path) = find_ref
($ref_id);
984 if (!defined $repo_id) {
985 die "Could not find a \"svn-remote.*.fetch\" key ",
986 "in the repository configuration matching: ",
987 "refs/remotes/$ref_id\n";
990 my $self = _new
($class, $repo_id, $ref_id, $path);
991 if (!defined $self->{path
} || !length $self->{path
}) {
992 my $fetch = command_oneline
('config', '--get',
993 "svn-remote.$repo_id.fetch",
994 ":refs/remotes/$ref_id\$") or
995 die "Failed to read \"svn-remote.$repo_id.fetch\" ",
996 "\":refs/remotes/$ref_id\$\" in config\n";
997 ($self->{path
}, undef) = split(/\s*:\s*/, $fetch);
999 $self->{url
} = command_oneline
('config', '--get',
1000 "svn-remote.$repo_id.url") or
1001 die "Failed to read \"svn-remote.$repo_id.url\" in config\n";
1002 if ((-z
$self->db_path || ! -e
$self->db_path) &&
1003 ::verify_ref
($self->refname.'^0')) {
1009 sub refname
{ "refs/remotes/$_[0]->{ref_id}" }
1013 return $self->{svm
}->{uuid
} if $self->svm;
1015 unless ($self->{svm
}) {
1016 die "SVM UUID not cached, and reading remotely failed\n";
1018 $self->{svm
}->{uuid
};
1023 return $self->{svm
} if $self->{svm
};
1025 # see if we have it in our config, first:
1027 my $section = "svn-remote.$self->{repo_id}";
1029 source
=> tmp_config
('--get', "$section.svm-source"),
1030 uuid
=> tmp_config
('--get', "$section.svm-uuid"),
1033 $self->{svm
} = $svm if ($svm && $svm->{source
} && $svm->{uuid
});
1038 my ($self, $ra) = @_;
1039 return $ra if $self->svm;
1041 my @err = ( "useSvmProps set, but failed to read SVM properties\n",
1042 "(svm:source, svm:mirror, svm:mirror) ",
1043 "from the following URLs:\n" );
1044 sub read_svm_props
{
1045 my ($self, $props) = @_;
1046 my $src = $props->{'svm:source'};
1047 my $mirror = $props->{'svm:mirror'};
1048 my $uuid = $props->{'svm:uuid'};
1049 return undef if (!$src || !$mirror || !$uuid);
1051 chomp($src, $mirror, $uuid);
1053 $uuid =~ m{^[0-9a-f\-]{30,}$}
1054 or die "doesn't look right - svm:uuid is '$uuid'\n";
1055 # don't know what a '!' is there for, also the
1056 # username is of no interest
1057 $src =~ s{/?!$}{$mirror};
1058 $src =~ s{/+$}{}; # no trailing slashes please
1059 $src =~ s{(^[a-z\+]*://)[^/@]*@}{$1};
1061 my $section = "svn-remote.$self->{repo_id}";
1062 tmp_config
('--add', "$section.svm-source", $src);
1063 tmp_config
('--add', "$section.svm-uuid", $uuid);
1064 $self->{svm
} = { source
=> $src , uuid
=> $uuid };
1068 my $r = $ra->get_latest_revnum;
1069 my $path = $self->{path
};
1070 my @tried_a = ($path);
1071 while (length $path) {
1072 if ($self->read_svm_props(($ra->get_dir($path, $r))[2])) {
1075 $path =~ s
#/?[^/]+$## && push @tried_a, $path;
1077 if ($self->read_svm_props(($ra->get_dir('', $r))[2])) {
1081 if ($ra->{repos_root
} eq $self->{url
}) {
1082 die @err, map { " $self->{url}/$_\n" } @tried_a, "\n";
1085 # nope, make sure we're connected to the repository root:
1088 $path = $ra->{svn_path
};
1089 $path =~ s
#/?[^/]+$##; # we already tried this one above
1090 $ra = Git
::SVN
::Ra
->new($ra->{repos_root
});
1091 while (length $path) {
1092 $ok = $self->read_svm_props(($ra->get_dir($path, $r))[2]);
1094 $path =~ s
#/?[^/]+$## && push @tried_b, $path;
1096 $ok = $self->read_svm_props(($ra->get_dir('', $r))[2]) unless $ok;
1098 die @err, map { " $self->{url}/$_\n" } @tried_a, "\n",
1099 map { " $ra->{url}/$_\n" } @tried_b, "\n"
1101 Git
::SVN
::Ra
->new($self->{url
});
1104 # this allows us to memoize our SVN::Ra UUID locally and avoid a
1105 # remote lookup (useful for 'git svn log').
1108 unless ($self->{ra_uuid
}) {
1109 my $key = "svn-remote.$self->{repo_id}.uuid";
1110 my $uuid = eval { tmp_config
('--get', $key) };
1111 if (!$@
&& $uuid && $uuid =~ /^([a-f\d\-]{30,})$/) {
1112 $self->{ra_uuid
} = $uuid;
1114 die "ra_uuid called without URL\n" unless $self->{url
};
1115 $self->{ra_uuid
} = $self->ra->get_uuid;
1116 tmp_config
('--add', $key, $self->{ra_uuid
});
1124 my $ra = Git
::SVN
::Ra
->new($self->{url
});
1125 if ($self->use_svm_props && !$self->{svm
}) {
1126 if ($self->no_metadata) {
1127 die "Can't have both 'noMetadata' and ",
1128 "'useSvmProps' options set!\n";
1130 $ra = $self->_set_svm_vars($ra);
1131 $self->{-want_revprops
} = 1;
1138 my $repos_root = $self->ra->{repos_root
};
1139 return $self->{path
} if ($self->{url
} eq $repos_root);
1140 die "BUG: rel_path failed! repos_root: $repos_root, Ra URL: ",
1141 $self->ra->{url
}, " path: $self->{path}, URL: $self->{url}\n";
1144 sub traverse_ignore
{
1145 my ($self, $fh, $path, $r) = @_;
1148 my ($dirent, undef, $props) = $ra->get_dir($path, $r);
1150 $p =~ s
#^\Q$ra->{svn_path}\E/##;
1151 print $fh length $p ?
"\n# $p\n" : "\n# /\n";
1152 if (my $s = $props->{'svn:ignore'}) {
1153 $s =~ s/[\r\n]+/\n/g;
1155 if (length $p == 0) {
1159 $s =~ s
#\n#\n/$p/#g;
1160 print $fh "/$p/$s\n";
1163 foreach (sort keys %$dirent) {
1164 next if $dirent->{$_}->kind != $SVN::Node
::dir
;
1165 $self->traverse_ignore($fh, "$path/$_", $r);
1169 sub last_rev
{ ($_[0]->last_rev_commit)[0] }
1170 sub last_commit
{ ($_[0]->last_rev_commit)[1] }
1172 # returns the newest SVN revision number and newest commit SHA1
1173 sub last_rev_commit
{
1175 if (defined $self->{last_rev
} && defined $self->{last_commit
}) {
1176 return ($self->{last_rev
}, $self->{last_commit
});
1178 my $c = ::verify_ref
($self->refname.'^0');
1179 if ($c && !$self->use_svm_props && !$self->no_metadata) {
1180 my $rev = (::cmt_metadata
($c))[1];
1182 ($self->{last_rev
}, $self->{last_commit
}) = ($rev, $c);
1186 my $db_path = $self->db_path;
1187 unless (-e
$db_path) {
1188 ($self->{last_rev
}, $self->{last_commit
}) = (undef, undef);
1189 return (undef, undef);
1191 my $offset = -41; # from tail
1193 open my $fh, '<', $db_path or croak
"$db_path not readable: $!\n";
1194 sysseek($fh, $offset, 2); # don't care for errors
1195 sysread($fh, $rl, 41) == 41 or return (undef, undef);
1197 while (('0' x40
) eq $rl && sysseek($fh, 0, 1) != 0) {
1199 sysseek($fh, $offset, 2); # don't care for errors
1200 sysread($fh, $rl, 41) == 41 or return (undef, undef);
1203 if ($c && $c ne $rl) {
1204 die "$db_path and ", $self->refname,
1205 " inconsistent!:\n$c != $rl\n";
1207 my $rev = sysseek($fh, 0, 1) or croak
$!;
1208 $rev = ($rev - 41) / 41;
1209 close $fh or croak
$!;
1210 ($self->{last_rev
}, $self->{last_commit
}) = ($rev, $c);
1214 sub get_fetch_range
{
1215 my ($self, $min, $max) = @_;
1216 $max ||= $self->ra->get_latest_revnum;
1217 $min ||= $self->rev_db_max;
1223 my $config = "$ENV{GIT_DIR}/svn/config";
1224 my $old_config = $ENV{GIT_CONFIG
};
1225 $ENV{GIT_CONFIG
} = $config;
1228 unless (-f
$config) {
1230 open my $fh, '>', $config or
1231 die "Can't open $config: $!\n";
1232 print $fh "; This file is used internally by ",
1234 "Couldn't write to $config: $!\n";
1235 print $fh "; You should not have to edit it\n" or
1236 die "Couldn't write to $config: $!\n";
1237 close $fh or die "Couldn't close $config: $!\n";
1239 command
('config', @args);
1242 if (defined $old_config) {
1243 $ENV{GIT_CONFIG
} = $old_config;
1245 delete $ENV{GIT_CONFIG
};
1248 wantarray ?
@ret : $ret[0];
1252 my ($self, $sub) = @_;
1253 my $old_index = $ENV{GIT_INDEX_FILE
};
1254 $ENV{GIT_INDEX_FILE
} = $self->{index};
1257 my ($dir, $base) = ($self->{index} =~ m
#^(.*?)/?([^/]+)$#);
1258 mkpath
([$dir]) unless -d
$dir;
1262 if (defined $old_index) {
1263 $ENV{GIT_INDEX_FILE
} = $old_index;
1265 delete $ENV{GIT_INDEX_FILE
};
1268 wantarray ?
@ret : $ret[0];
1271 sub assert_index_clean
{
1272 my ($self, $treeish) = @_;
1274 $self->tmp_index_do(sub {
1275 command_noisy
('read-tree', $treeish) unless -e
$self->{index};
1276 my $x = command_oneline
('write-tree');
1277 my ($y) = (command
(qw
/cat-file commit/, $treeish) =~
1278 /^tree ($::sha1)/mo);
1281 warn "Index mismatch: $y != $x\nrereading $treeish\n";
1282 unlink $self->{index} or die "unlink $self->{index}: $!\n";
1283 command_noisy
('read-tree', $treeish);
1284 $x = command_oneline
('write-tree');
1286 ::fatal
"trees ($treeish) $y != $x\n",
1287 "Something is seriously wrong...\n";
1292 sub get_commit_parents
{
1293 my ($self, $log_entry) = @_;
1294 my (%seen, @ret, @tmp);
1295 # legacy support for 'set-tree'; this is only used by set_tree_cb:
1296 if (my $ip = $self->{inject_parents
}) {
1297 if (my $commit = delete $ip->{$log_entry->{revision
}}) {
1301 if (my $cur = ::verify_ref
($self->refname.'^0')) {
1304 push @tmp, $_ foreach (@
{$log_entry->{parents
}}, @tmp);
1305 while (my $p = shift @tmp) {
1309 # MAXPARENT is defined to 16 in commit-tree.c:
1313 die "r$log_entry->{revision}: No room for parents:\n\t",
1314 join("\n\t", @tmp), "\n";
1321 $self->{url
} . (length $self->{path
} ?
'/' . $self->{path
} : '');
1325 my ($self, $log_entry) = @_;
1326 my $lr = $self->last_rev;
1327 if (defined $lr && $lr >= $log_entry->{revision
}) {
1328 die "Last fetched revision of ", $self->refname,
1329 " was r$lr, but we are about to fetch: ",
1330 "r$log_entry->{revision}!\n";
1332 if (my $c = $self->rev_db_get($log_entry->{revision
})) {
1333 croak
"$log_entry->{revision} = $c already exists! ",
1334 "Why are we refetching it?\n";
1336 $ENV{GIT_AUTHOR_NAME
} = $ENV{GIT_COMMITTER_NAME
} = $log_entry->{name
};
1337 $ENV{GIT_AUTHOR_EMAIL
} = $ENV{GIT_COMMITTER_EMAIL
} =
1338 $log_entry->{email
};
1339 $ENV{GIT_AUTHOR_DATE
} = $ENV{GIT_COMMITTER_DATE
} = $log_entry->{date
};
1341 my $tree = $log_entry->{tree
};
1342 if (!defined $tree) {
1343 $tree = $self->tmp_index_do(sub {
1344 command_oneline
('write-tree') });
1346 die "Tree is not a valid sha1: $tree\n" if $tree !~ /^$::sha1$/o;
1348 my @exec = ('git-commit-tree', $tree);
1349 foreach ($self->get_commit_parents($log_entry)) {
1350 push @exec, '-p', $_;
1352 defined(my $pid = open3
(my $msg_fh, my $out_fh, '>&STDERR', @exec))
1354 print $msg_fh $log_entry->{log} or croak
$!;
1355 unless ($self->no_metadata) {
1356 print $msg_fh "\ngit-svn-id: $log_entry->{metadata}\n"
1359 $msg_fh->flush == 0 or croak
$!;
1360 close $msg_fh or croak
$!;
1361 chomp(my $commit = do { local $/; <$out_fh> });
1362 close $out_fh or croak
$!;
1365 if ($commit !~ /^$::sha1$/o) {
1366 die "Failed to commit, invalid sha1: $commit\n";
1369 $self->rev_db_set($log_entry->{revision
}, $commit, 1);
1371 $self->{last_rev
} = $log_entry->{revision
};
1372 $self->{last_commit
} = $commit;
1373 print "r$log_entry->{revision}";
1374 if (defined $log_entry->{svm_revision
}) {
1375 print " (\@$log_entry->{svm_revision})";
1376 $self->rev_db_set($log_entry->{svm_revision
}, $commit,
1377 0, $self->svm_uuid);
1379 print " = $commit ($self->{ref_id})\n";
1380 if (defined $_repack && (--$_repack_nr == 0)) {
1381 $_repack_nr = $_repack;
1382 # repack doesn't use any arguments with spaces in them, does it?
1383 print "Running git repack $_repack_flags ...\n";
1384 command_noisy
('repack', split(/\s+/, $_repack_flags));
1385 print "Done repacking\n";
1391 my ($self, $paths, $r) = @_;
1392 return 1 if $self->{path
} eq '';
1393 if (my $path = $paths->{"/$self->{path}"}) {
1394 return ($path->{action
} eq 'D') ?
0 : 1;
1396 $self->{path_regex
} ||= qr/^\/\Q
$self->{path
}\E\
//;
1397 if (grep /$self->{path_regex}/, keys %$paths) {
1401 foreach (split m
#/#, $self->{path}) {
1403 next unless ($paths->{$c} &&
1404 ($paths->{$c}->{action
} =~ /^[AR]$/));
1405 if ($self->ra->check_path($self->{path
}, $r) ==
1413 sub find_parent_branch
{
1414 my ($self, $paths, $rev) = @_;
1415 return undef unless $self->follow_parent;
1416 unless (defined $paths) {
1417 my $err_handler = $SVN::Error
::handler
;
1418 $SVN::Error
::handler
= \
&Git
::SVN
::Ra
::skip_unknown_revs
;
1419 $self->ra->get_log([$self->{path
}], $rev, $rev, 0, 1, 1, sub {
1421 Git
::SVN
::Ra
::dup_changed_paths
($_[0]) });
1422 $SVN::Error
::handler
= $err_handler;
1424 return undef unless defined $paths;
1426 # look for a parent from another branch:
1427 my @b_path_components = split m
#/#, $self->rel_path;
1428 my @a_path_components;
1430 while (@b_path_components) {
1431 $i = $paths->{'/'.join('/', @b_path_components)};
1432 last if $i && defined $i->{copyfrom_path
};
1433 unshift(@a_path_components, pop(@b_path_components));
1435 return undef unless defined $i && defined $i->{copyfrom_path
};
1436 my $branch_from = $i->{copyfrom_path
};
1437 if (@a_path_components) {
1438 print STDERR
"branch_from: $branch_from => ";
1439 $branch_from .= '/'.join('/', @a_path_components);
1440 print STDERR
$branch_from, "\n";
1442 my $r = $i->{copyfrom_rev
};
1443 my $repos_root = $self->ra->{repos_root
};
1444 my $url = $self->ra->{url
};
1445 my $new_url = $repos_root . $branch_from;
1446 print STDERR
"Found possible branch point: ",
1447 "$new_url => ", $self->full_url, ", $r\n";
1448 $branch_from =~ s
#^/##;
1449 my $gs = Git
::SVN
->find_by_url($new_url, $repos_root, $branch_from);
1451 my $ref_id = $self->{ref_id
};
1452 $ref_id =~ s/\@\d+$//;
1454 # just grow a tail if we're not unique enough :x
1455 $ref_id .= '-' while find_ref
($ref_id);
1456 print STDERR
"Initializing parent: $ref_id\n";
1457 $gs = Git
::SVN
->init($new_url, '', $ref_id, $ref_id, 1);
1459 my ($r0, $parent) = $gs->find_rev_before($r, 1);
1460 if (!defined $r0 || !defined $parent) {
1462 ($r0, $parent) = $gs->last_rev_commit;
1464 if (defined $r0 && defined $parent) {
1465 print STDERR
"Found branch parent: ($self->{ref_id}) $parent\n";
1466 $self->assert_index_clean($parent);
1468 if ($self->ra->can_do_switch) {
1469 print STDERR
"Following parent with do_switch\n";
1470 # do_switch works with svn/trunk >= r22312, but that
1471 # is not included with SVN 1.4.3 (the latest version
1472 # at the moment), so we can't rely on it
1473 $self->{last_commit
} = $parent;
1474 $ed = SVN
::Git
::Fetcher
->new($self);
1475 $gs->ra->gs_do_switch($r0, $rev, $gs,
1476 $self->full_url, $ed)
1477 or die "SVN connection failed somewhere...\n";
1479 print STDERR
"Following parent with do_update\n";
1480 $ed = SVN
::Git
::Fetcher
->new($self);
1481 $self->ra->gs_do_update($rev, $rev, $self, $ed)
1482 or die "SVN connection failed somewhere...\n";
1484 print STDERR
"Successfully followed parent\n";
1485 return $self->make_log_entry($rev, [$parent], $ed);
1491 my ($self, $paths, $rev) = @_;
1493 my ($last_rev, @parents);
1494 if (my $lc = $self->last_commit) {
1495 # we can have a branch that was deleted, then re-added
1496 # under the same name but copied from another path, in
1497 # which case we'll have multiple parents (we don't
1498 # want to break the original ref, nor lose copypath info):
1499 if (my $log_entry = $self->find_parent_branch($paths, $rev)) {
1500 push @
{$log_entry->{parents
}}, $lc;
1503 $ed = SVN
::Git
::Fetcher
->new($self);
1504 $last_rev = $self->{last_rev
};
1509 if (my $log_entry = $self->find_parent_branch($paths, $rev)) {
1512 $ed = SVN
::Git
::Fetcher
->new($self);
1514 unless ($self->ra->gs_do_update($last_rev, $rev, $self, $ed)) {
1515 die "SVN connection failed somewhere...\n";
1517 $self->make_log_entry($rev, \
@parents, $ed);
1521 my ($self, $ed) = @_;
1523 my $h = $ed->{empty
};
1524 foreach (sort keys %$h) {
1525 my $act = $h->{$_} ?
'+empty_dir' : '-empty_dir';
1526 push @out, " $act: " . uri_encode
($_);
1527 warn "W: $act: $_\n";
1529 foreach my $t (qw
/dir_prop file_prop/) {
1530 $h = $ed->{$t} or next;
1531 foreach my $path (sort keys %$h) {
1532 my $ppath = $path eq '' ?
'.' : $path;
1533 foreach my $prop (sort keys %{$h->{$path}}) {
1534 next if $SKIP_PROP{$prop};
1535 my $v = $h->{$path}->{$prop};
1536 my $t_ppath_prop = "$t: " .
1537 uri_encode
($ppath) . ' ' .
1540 push @out, " +$t_ppath_prop " .
1543 push @out, " -$t_ppath_prop";
1548 foreach my $t (qw
/absent_file absent_directory/) {
1549 $h = $ed->{$t} or next;
1550 foreach my $parent (sort keys %$h) {
1551 foreach my $path (sort @
{$h->{$parent}}) {
1552 push @out, " $t: " .
1553 uri_encode
("$parent/$path");
1554 warn "W: $t: $parent/$path ",
1555 "Insufficient permissions?\n";
1562 sub parse_svn_date
{
1563 my $date = shift || return '+0000 1970-01-01 00:00:00';
1564 my ($Y,$m,$d,$H,$M,$S) = ($date =~ /^(\d
{4})\
-(\d\d
)\
-(\d\d
)T
1565 (\d\d
)\
:(\d\d
)\
:(\d\d
).\d
+Z
$/x
) or
1566 croak
"Unable to parse date: $date\n";
1567 "+0000 $Y-$m-$d $H:$M:$S";
1572 if (!defined $author || length $author == 0) {
1573 $author = '(no author)';
1575 if (defined $::_authors
&& ! defined $::users
{$author}) {
1576 die "Author: $author not defined in $::_authors file\n";
1581 sub make_log_entry
{
1582 my ($self, $rev, $parents, $ed) = @_;
1583 my $untracked = $self->get_untracked($ed);
1585 open my $un, '>>', "$self->{dir}/unhandled.log" or croak
$!;
1586 print $un "r$rev\n" or croak
$!;
1587 print $un $_, "\n" foreach @
$untracked;
1588 my %log_entry = ( parents
=> $parents || [], revision
=> $rev,
1592 my $logged = delete $self->{logged_rev_props
};
1593 if (!$logged || $self->{-want_revprops
}) {
1594 my $rp = $self->ra->rev_proplist($rev);
1595 foreach (sort keys %$rp) {
1597 if (/^svn:(author|date|log)$/) {
1598 $log_entry{$1} = $v;
1599 } elsif ($_ eq 'svm:headrev') {
1602 print $un " rev_prop: ", uri_encode
($_), ' ',
1603 uri_encode
($v), "\n";
1607 map { $log_entry{$_} = $logged->{$_} } keys %$logged;
1609 close $un or croak
$!;
1611 $log_entry{date
} = parse_svn_date
($log_entry{date
});
1612 $log_entry{log} .= "\n";
1613 my $author = $log_entry{author
} = check_author
($log_entry{author
});
1614 my ($name, $email) = defined $::users
{$author} ? @
{$::users
{$author}}
1616 if (defined $headrev && $self->use_svm_props) {
1617 my ($uuid, $r) = $headrev =~ m{^([a-f\d\-]{30,}):(\d
+)$};
1618 if ($uuid ne $self->{svm
}->{uuid
}) {
1619 die "UUID mismatch on SVM path:\n",
1620 "expected: $self->{svm}->{uuid}\n",
1623 my $full_url = $self->{svm
}->{source
};
1624 $full_url .= "/$self->{path}" if length $self->{path
};
1625 $log_entry{metadata
} = "$full_url\@$r $uuid";
1626 $log_entry{svm_revision
} = $r;
1627 $email ||= "$author\@$uuid"
1629 $log_entry{metadata
} = $self->full_url . "\@$rev " .
1630 $self->ra->get_uuid;
1631 $email ||= "$author\@" . $self->ra->get_uuid;
1633 $log_entry{name
} = $name;
1634 $log_entry{email
} = $email;
1639 my ($self, $min_rev, $max_rev, @parents) = @_;
1640 my ($last_rev, $last_commit) = $self->last_rev_commit;
1641 my ($base, $head) = $self->get_fetch_range($min_rev, $max_rev);
1642 $self->ra->gs_fetch_loop_common($base, $head, [$self]);
1646 my ($self, $log_entry, $tree, $rev, $date, $author) = @_;
1647 $self->{inject_parents
} = { $rev => $tree };
1648 $self->fetch(undef, undef);
1652 my ($self, $tree) = (shift, shift);
1653 my $log_entry = ::get_commit_entry
($tree);
1654 unless ($self->{last_rev
}) {
1655 fatal
("Must have an existing revision to commit\n");
1657 my %ed_opts = ( r
=> $self->{last_rev
},
1658 log => $log_entry->{log},
1660 tree_a
=> $self->{last_commit
},
1663 $self->set_tree_cb($log_entry, $tree, @_) },
1664 svn_path
=> $self->{path
} );
1665 if (!SVN
::Git
::Editor
->new(\
%ed_opts)->apply_diff) {
1666 print "No changes\nr$self->{last_rev} = $tree\n";
1672 my $db_path = $self->db_path;
1673 if (-f
$self->{db_root
}) {
1674 rename $self->{db_root
}, $db_path or die
1675 "rename $self->{db_root} => $db_path failed: $!\n";
1676 my ($dir, $base) = ($db_path =~ m
#^(.*?)/?([^/]+)$#);
1677 symlink $base, $self->{db_root
} or die
1678 "symlink $base => $self->{db_root} failed: $!\n";
1681 print "Rebuilding $db_path ...\n";
1682 my ($rev_list, $ctx) = command_output_pipe
("rev-list", $self->refname);
1684 my $full_url = $self->full_url;
1686 while (<$rev_list>) {
1689 die "Non-SHA1: $c\n" unless $c =~ /^$::sha1$/o;
1690 my ($url, $rev, $uuid) = ::cmt_metadata
($c);
1692 # ignore merges (from set-tree)
1693 next if (!defined $rev || !$uuid);
1695 # if we merged or otherwise started elsewhere, this is
1696 # how we break out of it
1697 if ((defined $svn_uuid && ($uuid ne $svn_uuid)) ||
1698 ($full_url && $url && ($url ne $full_url))) {
1702 $svn_uuid ||= $uuid;
1704 $self->rev_db_set($rev, $c);
1705 print "r$rev = $c\n";
1707 command_close_pipe
($rev_list, $ctx);
1708 print "Done rebuilding $db_path\n";
1712 # Tie::File seems to be prone to offset errors if revisions get sparse,
1713 # it's not that fast, either. Tie::File is also not in Perl 5.6. So
1714 # one of my favorite modules is out :< Next up would be one of the DBM
1715 # modules, but I'm not sure which is most portable... So I'll just
1716 # go with something that's plain-text, but still capable of
1717 # being randomly accessed. So here's my ultra-simple fixed-width
1718 # database. All records are 40 characters + "\n", so it's easy to seek
1719 # to a revision: (41 * rev) is the byte offset.
1720 # A record of 40 0s denotes an empty revision.
1721 # And yes, it's still pretty fast (faster than Tie::File).
1722 # These files are disposable unless noMetadata or useSvmProps is set
1725 my ($fh, $rev, $commit) = @_;
1726 my $offset = $rev * 41;
1727 # assume that append is the common case:
1728 seek $fh, 0, 2 or croak
$!;
1730 if ($pos < $offset) {
1731 for (1 .. (($offset - $pos) / 41)) {
1732 print $fh (('0' x
40),"\n") or croak
$!;
1735 seek $fh, $offset, 0 or croak
$!;
1736 print $fh $commit,"\n" or croak
$!;
1742 my ($dir, $base) = ($path =~ m
#^(.*?)/?([^/]+)$#);
1743 mkpath
([$dir]) unless -d
$dir;
1744 open my $fh, '>>', $path or die "Couldn't create $path: $!\n";
1745 close $fh or die "Couldn't close (create) $path: $!\n";
1750 my ($self, $rev, $commit, $update_ref, $uuid) = @_;
1751 length $commit == 40 or die "arg3 must be a full SHA1 hexsum\n";
1752 my $db = $self->db_path($uuid);
1753 my $db_lock = "$db.lock";
1756 $SIG{INT
} = $SIG{HUP
} = $SIG{TERM
} = $SIG{ALRM
} = $SIG{PIPE
} =
1757 $SIG{USR1
} = $SIG{USR2
} = sub { $sig = $_[0] };
1761 $LOCKFILES{$db_lock} = 1;
1763 # both of these options make our .rev_db file very, very important
1764 # and we can't afford to lose it because rebuild() won't work
1765 if ($self->use_svm_props || $self->no_metadata) {
1767 copy
($db, $db_lock) or die "rev_db_set(@_): ",
1769 "$db => $db_lock ($!)\n";
1771 rename $db, $db_lock or die "rev_db_set(@_): ",
1772 "Failed to rename: ",
1773 "$db => $db_lock ($!)\n";
1775 open my $fh, '+<', $db_lock or die "Couldn't open $db_lock: $!\n";
1776 _rev_db_set
($fh, $rev, $commit);
1778 $fh->flush or die "Couldn't flush $db_lock: $!\n";
1779 $fh->sync or die "Couldn't sync $db_lock: $!\n";
1781 close $fh or croak
$!;
1783 command_noisy
('update-ref', '-m', "r$rev",
1784 $self->refname, $commit);
1786 rename $db_lock, $db or die "rev_db_set(@_): ", "Failed to rename: ",
1787 "$db_lock => $db ($!)\n";
1788 delete $LOCKFILES{$db_lock};
1790 $SIG{INT
} = $SIG{HUP
} = $SIG{TERM
} = $SIG{ALRM
} = $SIG{PIPE
} =
1791 $SIG{USR1
} = $SIG{USR2
} = 'DEFAULT';
1792 kill $sig, $$ if defined $sig;
1798 my $db_path = $self->db_path;
1799 my @stat = stat $db_path or return 0;
1800 ($stat[7] % 41) == 0 or die "$db_path inconsistent size: $stat[7]\n";
1801 my $max = $stat[7] / 41;
1802 (($max > 0) ?
$max - 1 : 0);
1806 my ($self, $rev, $uuid) = @_;
1808 my $offset = $rev * 41;
1809 my $db_path = $self->db_path($uuid);
1810 return undef unless -e
$db_path;
1811 open my $fh, '<', $db_path or croak
$!;
1812 if (sysseek($fh, $offset, 0) == $offset) {
1813 my $read = sysread($fh, $ret, 40);
1814 $ret = undef if ($read != 40 || $ret eq ('0'x40
));
1816 close $fh or croak
$!;
1820 sub find_rev_before
{
1821 my ($self, $rev, $eq_ok) = @_;
1822 --$rev unless $eq_ok;
1824 if (my $c = $self->rev_db_get($rev)) {
1829 return (undef, undef);
1833 my ($class, $repo_id, $ref_id, $path) = @_;
1834 unless (defined $repo_id && length $repo_id) {
1835 $repo_id = $Git::SVN
::default_repo_id
;
1837 unless (defined $ref_id && length $ref_id) {
1838 $_[2] = $ref_id = $Git::SVN
::default_ref_id
;
1840 $_[1] = $repo_id = sanitize_remote_name
($repo_id);
1841 my $dir = "$ENV{GIT_DIR}/svn/$ref_id";
1842 $_[3] = $path = '' unless (defined $path);
1843 mkpath
(["$ENV{GIT_DIR}/svn"]);
1845 ref_id
=> $ref_id, dir
=> $dir, index => "$dir/index",
1846 path
=> $path, config
=> "$ENV{GIT_DIR}/svn/config",
1847 db_root
=> "$dir/.rev_db", repo_id
=> $repo_id }, $class;
1851 my ($self, $uuid) = @_;
1852 $uuid ||= $self->ra_uuid;
1853 "$self->{db_root}.$uuid";
1858 $f =~ s
#([^a-zA-Z0-9\*!\:_\./\-])#uc sprintf("%%%02x",ord($1))#eg;
1862 package Git
::SVN
::Prompt
;
1866 use vars qw
/$_no_auth_cache $_username/;
1869 my ($cred, $realm, $default_username, $may_save, $pool) = @_;
1870 $may_save = undef if $_no_auth_cache;
1871 $default_username = $_username if defined $_username;
1872 if (defined $default_username && length $default_username) {
1873 if (defined $realm && length $realm) {
1874 print STDERR
"Authentication realm: $realm\n";
1877 $cred->username($default_username);
1879 username
($cred, $realm, $may_save, $pool);
1881 $cred->password(_read_password
("Password for '" .
1882 $cred->username . "': ", $realm));
1883 $cred->may_save($may_save);
1884 $SVN::_Core
::SVN_NO_ERROR
;
1887 sub ssl_server_trust
{
1888 my ($cred, $realm, $failures, $cert_info, $may_save, $pool) = @_;
1889 $may_save = undef if $_no_auth_cache;
1890 print STDERR
"Error validating server certificate for '$realm':\n";
1891 if ($failures & $SVN::Auth
::SSL
::UNKNOWNCA
) {
1892 print STDERR
" - The certificate is not issued by a trusted ",
1893 "authority. Use the\n",
1894 " fingerprint to validate the certificate manually!\n";
1896 if ($failures & $SVN::Auth
::SSL
::CNMISMATCH
) {
1897 print STDERR
" - The certificate hostname does not match.\n";
1899 if ($failures & $SVN::Auth
::SSL
::NOTYETVALID
) {
1900 print STDERR
" - The certificate is not yet valid.\n";
1902 if ($failures & $SVN::Auth
::SSL
::EXPIRED
) {
1903 print STDERR
" - The certificate has expired.\n";
1905 if ($failures & $SVN::Auth
::SSL
::OTHER
) {
1906 print STDERR
" - The certificate has an unknown error.\n";
1909 "Certificate information:\n".
1910 " - Hostname: %s\n".
1911 " - Valid: from %s until %s\n".
1913 " - Fingerprint: %s\n",
1914 map $cert_info->$_, qw(hostname valid_from valid_until
1915 issuer_dname fingerprint);
1918 print STDERR
$may_save ?
1919 "(R)eject, accept (t)emporarily or accept (p)ermanently? " :
1920 "(R)eject or accept (t)emporarily? ";
1922 $choice = lc(substr(<STDIN
> || 'R', 0, 1));
1923 if ($choice =~ /^t$/i) {
1924 $cred->may_save(undef);
1925 } elsif ($choice =~ /^r$/i) {
1927 } elsif ($may_save && $choice =~ /^p$/i) {
1928 $cred->may_save($may_save);
1932 $cred->accepted_failures($failures);
1933 $SVN::_Core
::SVN_NO_ERROR
;
1936 sub ssl_client_cert
{
1937 my ($cred, $realm, $may_save, $pool) = @_;
1938 $may_save = undef if $_no_auth_cache;
1939 print STDERR
"Client certificate filename: ";
1941 chomp(my $filename = <STDIN
>);
1942 $cred->cert_file($filename);
1943 $cred->may_save($may_save);
1944 $SVN::_Core
::SVN_NO_ERROR
;
1947 sub ssl_client_cert_pw
{
1948 my ($cred, $realm, $may_save, $pool) = @_;
1949 $may_save = undef if $_no_auth_cache;
1950 $cred->password(_read_password
("Password: ", $realm));
1951 $cred->may_save($may_save);
1952 $SVN::_Core
::SVN_NO_ERROR
;
1956 my ($cred, $realm, $may_save, $pool) = @_;
1957 $may_save = undef if $_no_auth_cache;
1958 if (defined $realm && length $realm) {
1959 print STDERR
"Authentication realm: $realm\n";
1962 if (defined $_username) {
1963 $username = $_username;
1965 print STDERR
"Username: ";
1967 chomp($username = <STDIN
>);
1969 $cred->username($username);
1970 $cred->may_save($may_save);
1971 $SVN::_Core
::SVN_NO_ERROR
;
1974 sub _read_password
{
1975 my ($prompt, $realm) = @_;
1976 print STDERR
$prompt;
1978 require Term
::ReadKey
;
1979 Term
::ReadKey
::ReadMode
('noecho');
1981 while (defined(my $key = Term
::ReadKey
::ReadKey
(0))) {
1982 last if $key =~ /[\012\015]/; # \n\r
1985 Term
::ReadKey
::ReadMode
('restore');
1994 my $kill_stupid_warnings = $SVN::Node
::none
.$SVN::Node
::file
.
1995 $SVN::Node
::dir
.$SVN::Node
::unknown
.
1996 $SVN::Node
::none
.$SVN::Node
::file
.
1997 $SVN::Node
::dir
.$SVN::Node
::unknown
.
1998 $SVN::Auth
::SSL
::CNMISMATCH
.
1999 $SVN::Auth
::SSL
::NOTYETVALID
.
2000 $SVN::Auth
::SSL
::EXPIRED
.
2001 $SVN::Auth
::SSL
::UNKNOWNCA
.
2002 $SVN::Auth
::SSL
::OTHER
;
2005 package SVN
::Git
::Fetcher
;
2013 # file baton members: path, mode_a, mode_b, pool, fh, blob, base
2015 my ($class, $git_svn) = @_;
2016 my $self = SVN
::Delta
::Editor
->new;
2017 bless $self, $class;
2018 $self->{c
} = $git_svn->{last_commit
} if exists $git_svn->{last_commit
};
2019 $self->{empty
} = {};
2020 $self->{dir_prop
} = {};
2021 $self->{file_prop
} = {};
2022 $self->{absent_dir
} = {};
2023 $self->{absent_file
} = {};
2024 $self->{gii
} = $git_svn->tmp_index_do(sub { Git
::IndexInfo
->new });
2028 sub set_path_strip
{
2029 my ($self, $path) = @_;
2030 $self->{path_strip
} = qr/^\Q$path\E(\/|$)/ if length $path;
2037 sub open_directory
{
2038 my ($self, $path, $pb, $rev) = @_;
2043 my ($self, $path) = @_;
2044 if ($self->{path_strip
}) {
2045 $path =~ s!$self->{path_strip}!! or
2046 die "Failed to strip path '$path' ($self->{path_strip})\n";
2052 my ($self, $path, $rev, $pb) = @_;
2054 my $gpath = $self->git_path($path);
2055 return undef if ($gpath eq '');
2057 # remove entire directories.
2058 if (command
('ls-tree', $self->{c
}, '--', $gpath) =~ /^040000 tree/) {
2059 my ($ls, $ctx) = command_output_pipe
(qw
/ls
-tree
2061 $self->{c
}, '--', $gpath);
2065 $self->{gii
}->remove($_);
2066 print "\tD\t$_\n" unless $::_q
;
2068 print "\tD\t$gpath/\n" unless $::_q
;
2069 command_close_pipe
($ls, $ctx);
2070 $self->{empty
}->{$path} = 0
2072 $self->{gii
}->remove($gpath);
2073 print "\tD\t$gpath\n" unless $::_q
;
2079 my ($self, $path, $pb, $rev) = @_;
2080 my $gpath = $self->git_path($path);
2081 my ($mode, $blob) = (command
('ls-tree', $self->{c
}, '--', $gpath)
2082 =~ /^(\d{6}) blob ([a-f\d]{40})\t/);
2083 unless (defined $mode && defined $blob) {
2084 die "$path was not found in commit $self->{c} (r$rev)\n";
2086 { path
=> $path, mode_a
=> $mode, mode_b
=> $mode, blob
=> $blob,
2087 pool
=> SVN
::Pool
->new, action
=> 'M' };
2091 my ($self, $path, $pb, $cp_path, $cp_rev) = @_;
2092 my ($dir, $file) = ($path =~ m
#^(.*?)/?([^/]+)$#);
2093 delete $self->{empty
}->{$dir};
2094 { path
=> $path, mode_a
=> 100644, mode_b
=> 100644,
2095 pool
=> SVN
::Pool
->new, action
=> 'A' };
2099 my ($self, $path, $cp_path, $cp_rev) = @_;
2100 my ($dir, $file) = ($path =~ m
#^(.*?)/?([^/]+)$#);
2101 delete $self->{empty
}->{$dir};
2102 $self->{empty
}->{$path} = 1;
2106 sub change_dir_prop
{
2107 my ($self, $db, $prop, $value) = @_;
2108 $self->{dir_prop
}->{$db->{path
}} ||= {};
2109 $self->{dir_prop
}->{$db->{path
}}->{$prop} = $value;
2113 sub absent_directory
{
2114 my ($self, $path, $pb) = @_;
2115 $self->{absent_dir
}->{$pb->{path
}} ||= [];
2116 push @
{$self->{absent_dir
}->{$pb->{path
}}}, $path;
2121 my ($self, $path, $pb) = @_;
2122 $self->{absent_file
}->{$pb->{path
}} ||= [];
2123 push @
{$self->{absent_file
}->{$pb->{path
}}}, $path;
2127 sub change_file_prop
{
2128 my ($self, $fb, $prop, $value) = @_;
2129 if ($prop eq 'svn:executable') {
2130 if ($fb->{mode_b
} != 120000) {
2131 $fb->{mode_b
} = defined $value ?
100755 : 100644;
2133 } elsif ($prop eq 'svn:special') {
2134 $fb->{mode_b
} = defined $value ?
120000 : 100644;
2136 $self->{file_prop
}->{$fb->{path
}} ||= {};
2137 $self->{file_prop
}->{$fb->{path
}}->{$prop} = $value;
2142 sub apply_textdelta
{
2143 my ($self, $fb, $exp) = @_;
2144 my $fh = IO
::File
->new_tmpfile;
2146 # $fh gets auto-closed() by SVN::TxDelta::apply(),
2147 # (but $base does not,) so dup() it for reading in close_file
2148 open my $dup, '<&', $fh or croak
$!;
2149 my $base = IO
::File
->new_tmpfile;
2150 $base->autoflush(1);
2152 defined (my $pid = fork) or croak
$!;
2154 open STDOUT
, '>&', $base or croak
$!;
2155 print STDOUT
'link ' if ($fb->{mode_a
} == 120000);
2156 exec qw
/git-cat-file blob/, $fb->{blob
} or croak
$!;
2162 seek $base, 0, 0 or croak
$!;
2163 my $md5 = Digest
::MD5
->new;
2164 $md5->addfile($base);
2165 my $got = $md5->hexdigest;
2166 die "Checksum mismatch: $fb->{path} $fb->{blob}\n",
2168 " got: $got\n" if ($got ne $exp);
2171 seek $base, 0, 0 or croak
$!;
2173 $fb->{base
} = $base;
2174 [ SVN
::TxDelta
::apply
($base, $fh, undef, $fb->{path
}, $fb->{pool
}) ];
2178 my ($self, $fb, $exp) = @_;
2180 my $path = $self->git_path($fb->{path
});
2181 if (my $fh = $fb->{fh
}) {
2182 seek($fh, 0, 0) or croak
$!;
2183 my $md5 = Digest
::MD5
->new;
2185 my $got = $md5->hexdigest;
2186 die "Checksum mismatch: $path\n",
2187 "expected: $exp\n got: $got\n" if ($got ne $exp);
2188 seek($fh, 0, 0) or croak
$!;
2189 if ($fb->{mode_b
} == 120000) {
2190 read($fh, my $buf, 5) == 5 or croak
$!;
2191 $buf eq 'link ' or die "$path has mode 120000",
2192 "but is not a link\n";
2194 defined(my $pid = open my $out,'-|') or die "Can't fork: $!\n";
2196 open STDIN
, '<&', $fh or croak
$!;
2197 exec qw
/git-hash-object -w --stdin/ or croak
$!;
2199 chomp($hash = do { local $/; <$out> });
2200 close $out or croak
$!;
2201 close $fh or croak
$!;
2202 $hash =~ /^[a-f\d]{40}$/ or die "not a sha1: $hash\n";
2203 close $fb->{base
} or croak
$!;
2205 $hash = $fb->{blob
} or die "no blob information\n";
2208 $self->{gii
}->update($fb->{mode_b
}, $hash, $path) or croak
$!;
2209 print "\t$fb->{action}\t$path\n" if $fb->{action
} && ! $::_q
;
2215 $self->{nr
} = $self->{gii
}->{nr
};
2216 delete $self->{gii
};
2217 $self->SUPER::abort_edit
(@_);
2222 $self->{git_commit_ok
} = 1;
2223 $self->{nr
} = $self->{gii
}->{nr
};
2224 delete $self->{gii
};
2225 $self->SUPER::close_edit
(@_);
2228 package SVN
::Git
::Editor
;
2229 use vars qw
/@ISA $_rmdir $_cp_similarity $_find_copies_harder $_rename_limit/;
2237 my ($class, $opts) = @_;
2238 foreach (qw
/svn_path r ra tree_a tree_b log editor_cb/) {
2239 die "$_ required!\n" unless (defined $opts->{$_});
2242 my $pool = SVN
::Pool
->new;
2243 my $mods = generate_diff
($opts->{tree_a
}, $opts->{tree_b
});
2244 my $types = check_diff_paths
($opts->{ra
}, $opts->{svn_path
},
2247 # $opts->{ra} functions should not be used after this:
2248 my @ce = $opts->{ra
}->get_commit_editor($opts->{log},
2249 $opts->{editor_cb
}, $pool);
2250 my $self = SVN
::Delta
::Editor
->new(@ce, $pool);
2251 bless $self, $class;
2252 foreach (qw
/svn_path r tree_a tree_b/) {
2253 $self->{$_} = $opts->{$_};
2255 $self->{url
} = $opts->{ra
}->{url
};
2256 $self->{mods
} = $mods;
2257 $self->{types
} = $types;
2258 $self->{pool
} = $pool;
2259 $self->{bat
} = { '' => $self->open_root($self->{r
}, $self->{pool
}) };
2261 $self->{path_prefix
} = length $self->{svn_path
} ?
2262 "$self->{svn_path}/" : '';
2267 my ($tree_a, $tree_b) = @_;
2268 my @diff_tree = qw(diff-tree -z -r);
2269 if ($_cp_similarity) {
2270 push @diff_tree, "-C$_cp_similarity";
2272 push @diff_tree, '-C';
2274 push @diff_tree, '--find-copies-harder' if $_find_copies_harder;
2275 push @diff_tree, "-l$_rename_limit" if defined $_rename_limit;
2276 push @diff_tree, $tree_a, $tree_b;
2277 my ($diff_fh, $ctx) = command_output_pipe
(@diff_tree);
2281 while (<$diff_fh>) {
2282 chomp $_; # this gets rid of the trailing "\0"
2283 if ($state eq 'meta' && /^:(\d
{6})\s
(\d
{6})\s
2284 $::sha1\s
($::sha1
)\s
2285 ([MTCRAD
])\d
*$/xo
) {
2286 push @mods, { mode_a
=> $1, mode_b
=> $2,
2287 sha1_b
=> $3, chg
=> $4 };
2288 if ($4 =~ /^(?:C|R)$/) {
2293 } elsif ($state eq 'file_a') {
2294 my $x = $mods[$#mods] or croak
"Empty array\n";
2295 if ($x->{chg
} !~ /^(?:C|R)$/) {
2296 croak
"Error parsing $_, $x->{chg}\n";
2300 } elsif ($state eq 'file_b') {
2301 my $x = $mods[$#mods] or croak
"Empty array\n";
2302 if (exists $x->{file_a
} && $x->{chg
} !~ /^(?:C|R)$/) {
2303 croak
"Error parsing $_, $x->{chg}\n";
2305 if (!exists $x->{file_a
} && $x->{chg
} =~ /^(?:C|R)$/) {
2306 croak
"Error parsing $_, $x->{chg}\n";
2311 croak
"Error parsing $_\n";
2314 command_close_pipe
($diff_fh, $ctx);
2318 sub check_diff_paths
{
2319 my ($ra, $pfx, $rev, $mods) = @_;
2321 $pfx .= '/' if length $pfx;
2323 sub type_diff_paths
{
2324 my ($ra, $types, $path, $rev) = @_;
2325 my @p = split m
#/+#, $path;
2327 unless (defined $types->{$c}) {
2328 $types->{$c} = $ra->check_path($c, $rev);
2331 $c .= '/' . shift @p;
2332 next if defined $types->{$c};
2333 $types->{$c} = $ra->check_path($c, $rev);
2337 foreach my $m (@
$mods) {
2338 foreach my $f (qw
/file_a file_b/) {
2339 next unless defined $m->{$f};
2340 my ($dir) = ($m->{$f} =~ m
#^(.*?)/?(?:[^/]+)$#);
2341 if (length $pfx.$dir && ! defined $types{$dir}) {
2342 type_diff_paths
($ra, \
%types, $pfx.$dir, $rev);
2350 return ($_[0] =~ m
#^(.*?)/?([^/]+)$#);
2354 my ($self, $path) = @_;
2355 $self->{path_prefix
}.(defined $path ?
$path : '');
2359 my ($self, $path) = @_;
2360 $self->{url
} . '/' . $self->repo_path($path);
2365 my $rm = $self->{rm
};
2366 delete $rm->{''}; # we never delete the url we're tracking
2369 foreach (keys %$rm) {
2370 my @d = split m
#/#, $_;
2374 $c .= '/' . shift @d;
2378 delete $rm->{$self->{svn_path
}};
2379 delete $rm->{''}; # we never delete the url we're tracking
2382 my ($fh, $ctx) = command_output_pipe
(qw
/ls-tree --name-only -r -z/,
2387 my @dn = split m
#/#, $_;
2389 delete $rm->{join '/', @dn};
2396 command_close_pipe
($fh, $ctx);
2398 my ($r, $p, $bat) = ($self->{r
}, $self->{pool
}, $self->{bat
});
2399 foreach my $d (sort { $b =~ tr
#/#/# <=> $a =~ tr#/#/# } keys %$rm) {
2400 $self->close_directory($bat->{$d}, $p);
2401 my ($dn) = ($d =~ m
#^(.*?)/?(?:[^/]+)$#);
2402 print "\tD+\t$d/\n" unless $::_q
;
2403 $self->SUPER::delete_entry
($d, $r, $bat->{$dn}, $p);
2408 sub open_or_add_dir
{
2409 my ($self, $full_path, $baton) = @_;
2410 my $t = $self->{types
}->{$full_path};
2412 die "$full_path not known in r$self->{r} or we have a bug!\n";
2414 if ($t == $SVN::Node
::none
) {
2415 return $self->add_directory($full_path, $baton,
2416 undef, -1, $self->{pool
});
2417 } elsif ($t == $SVN::Node
::dir
) {
2418 return $self->open_directory($full_path, $baton,
2419 $self->{r
}, $self->{pool
});
2421 print STDERR
"$full_path already exists in repository at ",
2422 "r$self->{r} and it is not a directory (",
2423 ($t == $SVN::Node
::file ?
'file' : 'unknown'),"/$t)\n";
2428 my ($self, $path) = @_;
2429 my $bat = $self->{bat
};
2430 my $repo_path = $self->repo_path($path);
2431 return $bat->{''} unless (length $repo_path);
2432 my @p = split m
#/+#, $repo_path;
2434 $bat->{$c} ||= $self->open_or_add_dir($c, $bat->{''});
2437 $c .= '/' . shift @p;
2438 $bat->{$c} ||= $self->open_or_add_dir($c, $bat->{$c0});
2444 my ($self, $m) = @_;
2445 my ($dir, $file) = split_path
($m->{file_b
});
2446 my $pbat = $self->ensure_path($dir);
2447 my $fbat = $self->add_file($self->repo_path($m->{file_b
}), $pbat,
2449 print "\tA\t$m->{file_b}\n" unless $::_q
;
2450 $self->chg_file($fbat, $m);
2451 $self->close_file($fbat,undef,$self->{pool
});
2455 my ($self, $m) = @_;
2456 my ($dir, $file) = split_path
($m->{file_b
});
2457 my $pbat = $self->ensure_path($dir);
2458 my $fbat = $self->add_file($self->repo_path($m->{file_b
}), $pbat,
2459 $self->url_path($m->{file_a
}), $self->{r
});
2460 print "\tC\t$m->{file_a} => $m->{file_b}\n" unless $::_q
;
2461 $self->chg_file($fbat, $m);
2462 $self->close_file($fbat,undef,$self->{pool
});
2466 my ($self, $path, $pbat) = @_;
2467 my $rpath = $self->repo_path($path);
2468 my ($dir, $file) = split_path
($rpath);
2469 $self->{rm
}->{$dir} = 1;
2470 $self->SUPER::delete_entry
($rpath, $self->{r
}, $pbat, $self->{pool
});
2474 my ($self, $m) = @_;
2475 my ($dir, $file) = split_path
($m->{file_b
});
2476 my $pbat = $self->ensure_path($dir);
2477 my $fbat = $self->add_file($self->repo_path($m->{file_b
}), $pbat,
2478 $self->url_path($m->{file_a
}), $self->{r
});
2479 print "\tR\t$m->{file_a} => $m->{file_b}\n" unless $::_q
;
2480 $self->chg_file($fbat, $m);
2481 $self->close_file($fbat,undef,$self->{pool
});
2483 ($dir, $file) = split_path
($m->{file_a
});
2484 $pbat = $self->ensure_path($dir);
2485 $self->delete_entry($m->{file_a
}, $pbat);
2489 my ($self, $m) = @_;
2490 my ($dir, $file) = split_path
($m->{file_b
});
2491 my $pbat = $self->ensure_path($dir);
2492 my $fbat = $self->open_file($self->repo_path($m->{file_b
}),
2493 $pbat,$self->{r
},$self->{pool
});
2494 print "\t$m->{chg}\t$m->{file_b}\n" unless $::_q
;
2495 $self->chg_file($fbat, $m);
2496 $self->close_file($fbat,undef,$self->{pool
});
2499 sub T
{ shift->M(@_) }
2501 sub change_file_prop
{
2502 my ($self, $fbat, $pname, $pval) = @_;
2503 $self->SUPER::change_file_prop
($fbat, $pname, $pval, $self->{pool
});
2507 my ($self, $fbat, $m) = @_;
2508 if ($m->{mode_b
} =~ /755$/ && $m->{mode_a
} !~ /755$/) {
2509 $self->change_file_prop($fbat,'svn:executable','*');
2510 } elsif ($m->{mode_b
} !~ /755$/ && $m->{mode_a
} =~ /755$/) {
2511 $self->change_file_prop($fbat,'svn:executable',undef);
2513 my $fh = IO
::File
->new_tmpfile or croak
$!;
2514 if ($m->{mode_b
} =~ /^120/) {
2515 print $fh 'link ' or croak
$!;
2516 $self->change_file_prop($fbat,'svn:special','*');
2517 } elsif ($m->{mode_a
} =~ /^120/ && $m->{mode_b
} !~ /^120/) {
2518 $self->change_file_prop($fbat,'svn:special',undef);
2520 defined(my $pid = fork) or croak
$!;
2522 open STDOUT
, '>&', $fh or croak
$!;
2523 exec qw
/git-cat-file blob/, $m->{sha1_b
} or croak
$!;
2527 $fh->flush == 0 or croak
$!;
2528 seek $fh, 0, 0 or croak
$!;
2530 my $md5 = Digest
::MD5
->new;
2531 $md5->addfile($fh) or croak
$!;
2532 seek $fh, 0, 0 or croak
$!;
2534 my $exp = $md5->hexdigest;
2535 my $pool = SVN
::Pool
->new;
2536 my $atd = $self->apply_textdelta($fbat, undef, $pool);
2537 my $got = SVN
::TxDelta
::send_stream
($fh, @
$atd, $pool);
2538 die "Checksum mismatch\nexpected: $exp\ngot: $got\n" if ($got ne $exp);
2541 close $fh or croak
$!;
2545 my ($self, $m) = @_;
2546 my ($dir, $file) = split_path
($m->{file_b
});
2547 my $pbat = $self->ensure_path($dir);
2548 print "\tD\t$m->{file_b}\n" unless $::_q
;
2549 $self->delete_entry($m->{file_b
}, $pbat);
2554 my ($p,$bat) = ($self->{pool
}, $self->{bat
});
2555 foreach (sort { $b =~ tr
#/#/# <=> $a =~ tr#/#/# } keys %$bat) {
2556 $self->close_directory($bat->{$_}, $p);
2558 $self->SUPER::close_edit
($p);
2564 $self->SUPER::abort_edit
($self->{pool
});
2569 $self->SUPER::DESTROY
(@_);
2570 $self->{pool
}->clear;
2573 # this drives the editor
2576 my $mods = $self->{mods
};
2577 my %o = ( D
=> 1, R
=> 0, C
=> -1, A
=> 3, M
=> 3, T
=> 3 );
2578 foreach my $m (sort { $o{$a->{chg
}} <=> $o{$b->{chg
}} } @
$mods) {
2580 if (defined $o{$f}) {
2583 fatal
("Invalid change type: $f\n");
2586 $self->rmdirs if $_rmdir;
2592 return scalar @
$mods;
2595 package Git
::SVN
::Ra
;
2596 use vars qw
/@ISA $config_dir $_log_window_size/;
2599 my ($can_do_switch);
2603 # enforce temporary pool usage for some simple functions
2605 foreach (qw
/get_latest_revnum get_uuid get_repos_root/) {
2608 my \$pool = SVN::Pool->new;
2609 my \@ret = \$self->SUPER::$_(\@_,\$pool);
2611 wantarray ? \@ret : \$ret[0]; }\n";
2614 # get_dir needs $pool held in cache for dirents to work,
2615 # check_path is cacheable and rev_proplist is close enough
2617 foreach (qw
/check_path get_dir rev_proplist/) {
2618 $e .= "my \%${_}_cache; my \$${_}_rev = 0; sub $_ {
2621 my \$k = join(\"\\0\", \@_);
2622 if (my \$x = \$${_}_cache{\$r}->{\$k}) {
2623 return wantarray ? \@\$x : \$x->[0];
2625 my \$pool = SVN::Pool->new;
2626 my \@ret = \$self->SUPER::$_(\@_, \$r, \$pool);
2627 if (\$r != \$${_}_rev) {
2628 \%${_}_cache = ( pool => [] );
2631 \$${_}_cache{\$r}->{\$k} = \\\@ret;
2632 push \@{\$${_}_cache{pool}}, \$pool;
2633 wantarray ? \@ret : \$ret[0]; }\n";
2640 my ($class, $url) = @_;
2642 return $RA if ($RA && $RA->{url
} eq $url);
2644 SVN
::_Core
::svn_config_ensure
($config_dir, undef);
2645 my ($baton, $callbacks) = SVN
::Core
::auth_open_helper
([
2646 SVN
::Client
::get_simple_provider
(),
2647 SVN
::Client
::get_ssl_server_trust_file_provider
(),
2648 SVN
::Client
::get_simple_prompt_provider
(
2649 \
&Git
::SVN
::Prompt
::simple
, 2),
2650 SVN
::Client
::get_ssl_client_cert_prompt_provider
(
2651 \
&Git
::SVN
::Prompt
::ssl_client_cert
, 2),
2652 SVN
::Client
::get_ssl_client_cert_pw_prompt_provider
(
2653 \
&Git
::SVN
::Prompt
::ssl_client_cert_pw
, 2),
2654 SVN
::Client
::get_username_provider
(),
2655 SVN
::Client
::get_ssl_server_trust_prompt_provider
(
2656 \
&Git
::SVN
::Prompt
::ssl_server_trust
),
2657 SVN
::Client
::get_username_prompt_provider
(
2658 \
&Git
::SVN
::Prompt
::username
, 2),
2660 my $config = SVN
::Core
::config_get_config
($config_dir);
2661 my $self = SVN
::Ra
->new(url
=> $url, auth
=> $baton,
2663 pool
=> SVN
::Pool
->new,
2664 auth_provider_callbacks
=> $callbacks);
2665 $self->{svn_path
} = $url;
2666 $self->{repos_root
} = $self->get_repos_root;
2667 $self->{svn_path
} =~ s
#^\Q$self->{repos_root}\E(/|$)##;
2668 $RA = bless $self, $class;
2672 # do not call the real DESTROY since we store ourselves in $RA
2676 my ($self, @args) = @_;
2677 my $pool = SVN
::Pool
->new;
2678 splice(@args, 3, 1) if ($SVN::Core
::VERSION
le '1.2.0');
2679 my $ret = $self->SUPER::get_log
(@args, $pool);
2684 sub get_commit_editor
{
2685 my ($self, $log, $cb, $pool) = @_;
2686 my @lock = $SVN::Core
::VERSION
ge '1.2.0' ?
(undef, 0) : ();
2687 $self->SUPER::get_commit_editor
($log, $cb, @lock, $pool);
2691 my ($self, $rev_a, $rev_b, $gs, $editor) = @_;
2692 my $new = ($rev_a == $rev_b);
2693 my $path = $gs->{path
};
2695 my $pool = SVN
::Pool
->new;
2696 $editor->set_path_strip($path);
2697 my (@pc) = split m
#/#, $path;
2698 my $reporter = $self->do_update($rev_b, (@pc ?
shift @pc : ''),
2700 my @lock = $SVN::Core
::VERSION
ge '1.2.0' ?
(undef) : ();
2702 # Since we can't rely on svn_ra_reparent being available, we'll
2703 # just have to do some magic with set_path to make it so
2704 # we only want a partial path.
2706 my $final = join('/', @pc);
2708 $reporter->set_path($sp, $rev_b, 0, @lock, $pool);
2709 $sp .= '/' if length $sp;
2712 die "BUG: '$sp' != '$final'\n" if ($sp ne $final);
2714 $reporter->set_path($sp, $rev_a, $new, @lock, $pool);
2716 $reporter->finish_report($pool);
2718 $editor->{git_commit_ok
};
2721 # this requires SVN 1.4.3 or later (do_switch didn't work before 1.4.3, and
2722 # svn_ra_reparent didn't work before 1.4)
2724 my ($self, $rev_a, $rev_b, $gs, $url_b, $editor) = @_;
2725 my $path = $gs->{path
};
2726 my $pool = SVN
::Pool
->new;
2728 my $full_url = $self->{url
};
2729 my $old_url = $full_url;
2730 $full_url .= "/$path" if length $path;
2731 my ($ra, $reparented);
2732 if ($old_url ne $full_url) {
2733 if ($old_url !~ m
#^svn(\+ssh)?://#) {
2734 SVN
::_Ra
::svn_ra_reparent
($self->{session
}, $full_url,
2736 $self->{url
} = $full_url;
2739 $ra = Git
::SVN
::Ra
->new($full_url);
2743 my $reporter = $ra->do_switch($rev_b, '', 1, $url_b, $editor, $pool);
2744 my @lock = $SVN::Core
::VERSION
ge '1.2.0' ?
(undef) : ();
2745 $reporter->set_path('', $rev_a, 0, @lock, $pool);
2746 $reporter->finish_report($pool);
2749 SVN
::_Ra
::svn_ra_reparent
($self->{session
}, $old_url, $pool);
2750 $self->{url
} = $old_url;
2754 $editor->{git_commit_ok
};
2757 sub gs_fetch_loop_common
{
2758 my ($self, $base, $head, $gsv, $globs) = @_;
2759 return if ($base > $head);
2760 my $inc = $_log_window_size;
2761 my ($min, $max) = ($base, $head < $base + $inc ?
$head : $base + $inc);
2763 my $common_max = scalar @
$gsv;
2765 foreach my $gs (@
$gsv) {
2766 my @tmp = split m
#/#, $gs->{path};
2769 $p .= length($p) ?
"/$_" : $_;
2775 $common_max += scalar @
$globs;
2776 foreach my $glob (@
$globs) {
2777 my @tmp = split m
#/#, $glob->{path}->{left};
2780 $p .= length($p) ?
"/$_" : $_;
2786 my $longest_path = '';
2787 foreach (sort {length $b <=> length $a} keys %common) {
2788 if ($common{$_} == $common_max) {
2796 my $err_handler = $SVN::Error
::handler
;
2797 $SVN::Error
::handler
= sub {
2799 skip_unknown_revs
($err);
2802 my ($paths, $r, $author, $date, $log) = @_;
2803 [ dup_changed_paths
($paths),
2804 { author
=> $author, date
=> $date, log => $log } ];
2806 $self->get_log([$longest_path], $min, $max, 0, 1, 1,
2807 sub { $revs{$_[1]} = _cb
(@_) });
2808 if ($err && $max >= $head) {
2809 print STDERR
"Path '$longest_path' ",
2810 "was probably deleted:\n",
2811 $err->expanded_message,
2812 "\nWill attempt to follow ",
2813 "revisions r$min .. r$max ",
2814 "committed before the deletion\n";
2816 while (--$hi >= $min) {
2818 $self->get_log([$longest_path], $min, $hi,
2821 $revs{$_[1]} = _cb
(@_) });
2823 print STDERR
"r$min .. r$ok OK\n";
2828 $SVN::Error
::handler
= $err_handler;
2830 my %exists = map { $_->{path
} => $_ } @
$gsv;
2831 foreach my $r (sort {$a <=> $b} keys %revs) {
2832 my ($paths, $logged) = @
{$revs{$r}};
2834 foreach my $gs ($self->match_globs(\
%exists, $paths,
2836 if ($gs->rev_db_max >= $r) {
2839 next unless $gs->match_paths($paths, $r);
2840 $gs->{logged_rev_props
} = $logged;
2841 if (my $last_commit = $gs->last_commit) {
2842 $gs->assert_index_clean($last_commit);
2844 my $log_entry = $gs->do_fetch($paths, $r);
2846 $gs->do_git_commit($log_entry);
2849 foreach my $g (@
$globs) {
2850 my $k = "svn-remote.$g->{remote}." .
2852 Git
::SVN
::tmp_config
($k, $r);
2855 # pre-fill the .rev_db since it'll eventually get filled in
2856 # with '0' x40 if something new gets committed
2857 foreach my $gs (@
$gsv) {
2858 next if defined $gs->rev_db_get($max);
2859 $gs->rev_db_set($max, 0 x40
);
2861 foreach my $g (@
$globs) {
2862 my $k = "svn-remote.$g->{remote}.$g->{t}-maxRev";
2863 Git
::SVN
::tmp_config
($k, $max);
2865 last if $max >= $head;
2868 $max = $head if ($max > $head);
2873 my ($self, $exists, $paths, $globs, $r) = @_;
2876 my ($self, $exists, $g, $r) = @_;
2877 my @x = eval { $self->get_dir($g->{path
}->{left
}, $r) };
2878 return unless scalar @x == 3;
2879 my $dirents = $x[0];
2880 foreach my $de (keys %$dirents) {
2881 next if $dirents->{$de}->kind != $SVN::Node
::dir
;
2882 my $p = $g->{path
}->full_path($de);
2883 next if $exists->{$p};
2884 next if (length $g->{path
}->{right
} &&
2885 ($self->check_path($p, $r) !=
2887 $exists->{$p} = Git
::SVN
->init($self->{url
}, $p, undef,
2888 $g->{ref}->full_path($de), 1);
2891 foreach my $g (@
$globs) {
2892 if (my $path = $paths->{"/$g->{path}->{left}"}) {
2893 if ($path->{action
} =~ /^[AR]$/) {
2894 get_dir_check
($self, $exists, $g, $r);
2897 foreach (keys %$paths) {
2898 if (/$g->{path}->{left_regex}/ &&
2899 !/$g->{path}->{regex}/) {
2900 next if $paths->{$_}->{action
} !~ /^[AR]$/;
2901 get_dir_check
($self, $exists, $g, $r);
2903 next unless /$g->{path}->{regex}/;
2905 my $pathname = $g->{path
}->full_path($p);
2906 next if $exists->{$pathname};
2907 $exists->{$pathname} = Git
::SVN
->init(
2908 $self->{url
}, $pathname, undef,
2909 $g->{ref}->full_path($p), 1);
2912 foreach (split m
#/#, $g->{path}->{left}) {
2914 next unless ($paths->{$c} &&
2915 ($paths->{$c}->{action
} =~ /^[AR]$/));
2916 get_dir_check
($self, $exists, $g, $r);
2924 return $self->{url
} if ($self->{url
} eq $self->{repos_root
});
2925 my $url = $self->{repos_root
};
2926 my @components = split(m!/!, $self->{svn_path
});
2929 $url .= "/$c" if length $c;
2930 eval { (ref $self)->new($url)->get_latest_revnum };
2931 } while ($@
&& ($c = shift @components));
2937 unless (defined $can_do_switch) {
2938 my $pool = SVN
::Pool
->new;
2940 $self->do_switch(1, '', 0, $self->{url
},
2941 SVN
::Delta
::Editor
->new, $pool);
2946 $rep->abort_report($pool);
2954 sub skip_unknown_revs
{
2956 my $errno = $err->apr_err();
2957 # Maybe the branch we're tracking didn't
2958 # exist when the repo started, so it's
2959 # not an error if it doesn't, just continue
2961 # Wonderfully consistent library, eh?
2962 # 160013 - svn:// and file://
2963 # 175002 - http(s)://
2964 # 175007 - http(s):// (this repo required authorization, too...)
2965 # More codes may be discovered later...
2966 if ($errno == 175007 || $errno == 175002 || $errno == 160013) {
2967 warn "W: Ignoring error from SVN, path probably ",
2968 "does not exist: ($errno): ",
2969 $err->expanded_message,"\n";
2972 die "Error from SVN, ($errno): ", $err->expanded_message,"\n";
2975 # svn_log_changed_path_t objects passed to get_log are likely to be
2976 # overwritten even if only the refs are copied to an external variable,
2977 # so we should dup the structures in their entirety. Using an externally
2978 # passed pool (instead of our temporary and quickly cleared pool in
2979 # Git::SVN::Ra) does not help matters at all...
2980 sub dup_changed_paths
{
2982 return undef unless $paths;
2984 foreach my $p (keys %$paths) {
2985 my $i = $paths->{$p};
2986 my %s = map { $_ => $i->$_ }
2987 qw
/copyfrom_path copyfrom_rev action/;
2993 package Git
::SVN
::Log
;
2996 use POSIX qw
/strftime/;
2997 use vars qw
/$TZ $limit $color $pager $non_recursive $verbose $oneline
2998 %rusers $show_commit $incremental/;
3003 return 1 if defined $c->{r
};
3004 if ($c->{l
} && $c->{l
}->[-1] eq "...\n" &&
3005 $c->{a_raw
} =~ /\@([a-f\d\-]+)>$/) {
3006 my @log = command
(qw
/cat-file commit/, $c->{c
});
3007 shift @log while ($log[0] ne "\n");
3009 @
{$c->{l
}} = grep !/^git-svn-id: /, @log;
3011 (undef, $c->{r
}, undef) = ::extract_metadata
(
3012 (grep(/^git-svn-id: /, @log))[-1]);
3014 return defined $c->{r
};
3020 $dcvar = 'color.diff';
3021 $dc = `git-config --get $dcvar`;
3023 # nothing at all; fallback to "diff.color"
3024 $dcvar = 'diff.color';
3025 $dc = `git-config --get $dcvar`;
3028 if ($dc eq 'auto') {
3030 $pc = `git-config --get color.pager`;
3032 # does not have it -- fallback to pager.color
3033 $pc = `git-config --bool --get pager.color`;
3036 $pc = `git-config --bool --get color.pager`;
3042 if (-t
*STDOUT
|| (defined $pager && $pc eq 'true')) {
3043 return ($ENV{TERM
} && $ENV{TERM
} ne 'dumb');
3047 return 0 if $dc eq 'never';
3048 return 1 if $dc eq 'always';
3049 chomp($dc = `git-config --bool --get $dcvar`);
3050 return ($dc eq 'true');
3053 sub git_svn_log_cmd
{
3054 my ($r_min, $r_max, @args) = @_;
3056 foreach my $x (@args) {
3058 next unless ::verify_ref
("$x^0");
3064 my ($fh, $ctx) = command_output_pipe
('rev-list', $head);
3067 $url = (::cmt_metadata
($_))[0];
3068 last if defined $url;
3070 close $fh; # break the pipe
3072 my $gs = Git
::SVN
->find_by_url($url) || Git
::SVN
->_new;
3073 my @cmd = (qw
/log --abbrev-commit --pretty=raw --default/,
3075 push @cmd, '-r' unless $non_recursive;
3076 push @cmd, qw
/--raw --name-status/ if $verbose;
3077 push @cmd, '--color' if log_use_color
();
3078 return @cmd unless defined $r_max;
3079 if ($r_max == $r_min) {
3080 push @cmd, '--max-count=1';
3081 if (my $c = $gs->rev_db_get($r_max)) {
3085 my ($c_min, $c_max);
3086 $c_max = $gs->rev_db_get($r_max);
3087 $c_min = $gs->rev_db_get($r_min);
3088 if (defined $c_min && defined $c_max) {
3089 if ($r_max > $r_max) {
3090 push @cmd, "$c_min..$c_max";
3092 push @cmd, "$c_max..$c_min";
3094 } elsif ($r_max > $r_min) {
3103 # adapted from pager.c
3105 $pager ||= $ENV{GIT_PAGER
} || $ENV{PAGER
};
3106 if (!defined $pager) {
3108 } elsif (length $pager == 0 || $pager eq 'cat') {
3114 return unless -t
*STDOUT
;
3115 pipe my $rfd, my $wfd or return;
3116 defined(my $pid = fork) or ::fatal
"Can't fork: $!\n";
3118 open STDOUT
, '>&', $wfd or
3119 ::fatal
"Can't redirect to stdout: $!\n";
3122 open STDIN
, '<&', $rfd or ::fatal
"Can't redirect stdin: $!\n";
3123 $ENV{LESS
} ||= 'FRSX';
3124 exec $pager or ::fatal
"Can't run pager: $! ($pager)\n";
3127 sub tz_to_s_offset
{
3130 return ($1 * 60) + ($tz * 3600);
3133 sub get_author_info
{
3134 my ($dest, $author, $t, $tz) = @_;
3135 $author =~ s/(?:^\s*|\s*$)//g;
3136 $dest->{a_raw
} = $author;
3139 $au = $rusers{$author} || undef;
3142 ($au) = ($author =~ /<([^>]+)\@[^>]+>$/);
3147 # Date::Parse isn't in the standard Perl distro :(
3148 if ($tz =~ s/^\+//) {
3149 $t += tz_to_s_offset
($tz);
3150 } elsif ($tz =~ s/^\-//) {
3151 $t -= tz_to_s_offset
($tz);
3153 $dest->{t_utc
} = $t;
3156 sub process_commit
{
3157 my ($c, $r_min, $r_max, $defer) = @_;
3158 if (defined $r_min && defined $r_max) {
3159 if ($r_min == $c->{r
} && $r_min == $r_max) {
3163 return 1 if $r_min == $r_max;
3164 if ($r_min < $r_max) {
3165 # we need to reverse the print order
3166 return 0 if (defined $limit && --$limit < 0);
3170 if ($r_min != $r_max) {
3171 return 1 if ($r_min < $c->{r
});
3172 return 1 if ($r_max > $c->{r
});
3175 return 0 if (defined $limit && --$limit < 0);
3184 if (my $l = $c->{l
}) {
3185 while ($l->[0] =~ /^\s*$/) { shift @
$l }
3188 $l_fmt ||= 'A' . length($c->{r
});
3189 print 'r',pack($l_fmt, $c->{r
}),' | ';
3190 print "$c->{c} | " if $show_commit;
3193 show_commit_normal
($c);
3197 sub show_commit_changed_paths
{
3199 return unless $c->{changed
};
3200 print "Changed paths:\n", @
{$c->{changed
}};
3203 sub show_commit_normal
{
3205 print '-' x72
, "\nr$c->{r} | ";
3206 print "$c->{c} | " if $show_commit;
3207 print "$c->{a} | ", strftime
("%Y-%m-%d %H:%M:%S %z (%a, %d %b %Y)",
3208 localtime($c->{t_utc
})), ' | ';
3211 if (my $l = $c->{l
}) {
3212 while ($l->[$#$l] eq "\n" && $#$l > 0
3213 && $l->[($#$l - 1)] eq "\n") {
3216 $nr_line = scalar @
$l;
3218 print "1 line\n\n\n";
3220 if ($nr_line == 1) {
3221 $nr_line = '1 line';
3223 $nr_line .= ' lines';
3225 print $nr_line, "\n";
3226 show_commit_changed_paths
($c);
3228 print $_ foreach @
$l;
3232 show_commit_changed_paths
($c);
3236 foreach my $x (qw
/raw diff/) {
3239 print $_ foreach @
{$c->{$x}}
3246 my ($r_min, $r_max);
3247 my $r_last = -1; # prevent dupes
3253 if (defined $::_revision
) {
3254 if ($::_revision
=~ /^(\d+):(\d+)$/) {
3255 ($r_min, $r_max) = ($1, $2);
3256 } elsif ($::_revision
=~ /^\d+$/) {
3257 $r_min = $r_max = $::_revision
;
3259 ::fatal
"-r$::_revision is not supported, use ",
3260 "standard \'git log\' arguments instead\n";
3265 @args = (git_svn_log_cmd
($r_min, $r_max, @args), @args);
3266 my $log = command_output_pipe
(@args);
3269 my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/;
3271 if (/^${esc_color}commit ($::sha1_short)/o) {
3273 if ($c && cmt_showable
($c) && $c->{r
} != $r_last) {
3275 process_commit
($c, $r_min, $r_max, \
@k) or
3280 } elsif (/^${esc_color}author (.+) (\d+) ([\-\+]?\d+)$/o) {
3281 get_author_info
($c, $1, $2, $3);
3282 } elsif (/^${esc_color}(?:tree|parent|committer) /o) {
3284 } elsif (/^${esc_color}:\d{6} \d{6} $::sha1_short/o) {
3285 push @
{$c->{raw
}}, $_;
3286 } elsif (/^${esc_color}[ACRMDT]\t/) {
3287 # we could add $SVN->{svn_path} here, but that requires
3288 # remote access at the moment (repo_path_split)...
3289 s
#^(${esc_color})([ACRMDT])\t#$1 $2 #o;
3290 push @
{$c->{changed
}}, $_;
3291 } elsif (/^${esc_color}diff /o) {
3293 push @
{$c->{diff
}}, $_;
3295 push @
{$c->{diff
}}, $_;
3296 } elsif (/^${esc_color} (git-svn-id:.+)$/o) {
3297 ($c->{url
}, $c->{r
}, undef) = ::extract_metadata
($1);
3298 } elsif (s/^${esc_color} //o) {
3299 push @
{$c->{l
}}, $_;
3302 if ($c && defined $c->{r
} && $c->{r
} != $r_last) {
3304 process_commit
($c, $r_min, $r_max, \
@k);
3310 process_commit
($_, $r_min, $r_max) foreach reverse @k;
3314 print '-' x72
,"\n" unless $incremental || $oneline;
3317 package Git
::SVN
::Migration
;
3318 # these version numbers do NOT correspond to actual version numbers
3319 # of git nor git-svn. They are just relative.
3321 # v0 layout: .git/$id/info/url, refs/heads/$id-HEAD
3323 # v1 layout: .git/$id/info/url, refs/remotes/$id
3325 # v2 layout: .git/svn/$id/info/url, refs/remotes/$id
3327 # v3 layout: .git/svn/$id, refs/remotes/$id
3328 # - info/url may remain for backwards compatibility
3329 # - this is what we migrate up to this layout automatically,
3330 # - this will be used by git svn init on single branches
3331 # v3.1 layout (auto migrated):
3332 # - .rev_db => .rev_db.$UUID, .rev_db will remain as a symlink
3333 # for backwards compatibility
3335 # v4 layout: .git/svn/$repo_id/$id, refs/remotes/$repo_id/$id
3336 # - this is only created for newly multi-init-ed
3337 # repositories. Similar in spirit to the
3338 # --use-separate-remotes option in git-clone (now default)
3339 # - we do not automatically migrate to this (following
3340 # the example set by core git)
3344 use File
::Path qw
/mkpath/;
3345 use File
::Basename qw
/dirname basename/;
3346 use vars qw
/$_minimize/;
3348 sub migrate_from_v0
{
3349 my $git_dir = $ENV{GIT_DIR
};
3350 return undef unless -d
$git_dir;
3351 my ($fh, $ctx) = command_output_pipe
(qw
/rev-parse --symbolic --all/);
3355 my ($id, $orig_ref) = ($_, $_);
3356 next unless $id =~ s
#^refs/heads/(.+)-HEAD$#$1#;
3357 next unless -f
"$git_dir/$id/info/url";
3358 my $new_ref = "refs/remotes/$id";
3359 if (::verify_ref
("$new_ref^0")) {
3360 print STDERR
"W: $orig_ref is probably an old ",
3361 "branch used by an ancient version of ",
3363 "However, $new_ref also exists.\n",
3364 "We will not be able ",
3365 "to use this branch until this ",
3366 "ambiguity is resolved.\n";
3369 print STDERR
"Migrating from v0 layout...\n" if !$migrated;
3370 print STDERR
"Renaming ref: $orig_ref => $new_ref\n";
3371 command_noisy
('update-ref', $new_ref, $orig_ref);
3372 command_noisy
('update-ref', '-d', $orig_ref, $orig_ref);
3375 command_close_pipe
($fh, $ctx);
3376 print STDERR
"Done migrating from v0 layout...\n" if $migrated;
3380 sub migrate_from_v1
{
3381 my $git_dir = $ENV{GIT_DIR
};
3383 return $migrated unless -d
$git_dir;
3384 my $svn_dir = "$git_dir/svn";
3386 # just in case somebody used 'svn' as their $id at some point...
3387 return $migrated if -d
$svn_dir && ! -f
"$svn_dir/info/url";
3389 print STDERR
"Migrating from a git-svn v1 layout...\n";
3391 print STDERR
"Data from a previous version of git-svn exists, but\n\t",
3392 "$svn_dir\n\t(required for this version ",
3393 "($::VERSION) of git-svn) does not. exist\n";
3394 my ($fh, $ctx) = command_output_pipe
(qw
/rev-parse --symbolic --all/);
3397 next unless $x =~ s
#^refs/remotes/##;
3399 next unless -f
"$git_dir/$x/info/url";
3400 my $u = eval { ::file_to_s
("$git_dir/$x/info/url") };
3402 my $dn = dirname
("$git_dir/svn/$x");
3403 mkpath
([$dn]) unless -d
$dn;
3404 if ($x eq 'svn') { # they used 'svn' as GIT_SVN_ID:
3405 mkpath
(["$git_dir/svn/svn"]);
3406 print STDERR
" - $git_dir/$x/info => ",
3407 "$git_dir/svn/$x/info\n";
3408 rename "$git_dir/$x/info", "$git_dir/svn/$x/info" or
3410 # don't worry too much about these, they probably
3411 # don't exist with repos this old (save for index,
3412 # and we can easily regenerate that)
3413 foreach my $f (qw
/unhandled.log index .rev_db/) {
3414 rename "$git_dir/$x/$f", "$git_dir/svn/$x/$f";
3417 print STDERR
" - $git_dir/$x => $git_dir/svn/$x\n";
3418 rename "$git_dir/$x", "$git_dir/svn/$x" or
3423 command_close_pipe
($fh, $ctx);
3424 print STDERR
"Done migrating from a git-svn v1 layout\n";
3429 my ($l_map, $pfx, $path) = @_;
3431 foreach (<$path/*>) {
3432 if (-r
"$_/info/url") {
3433 $pfx .= '/' if $pfx && $pfx !~ m
!/$!;
3434 my $ref_id = $pfx . basename
$_;
3435 my $url = ::file_to_s
("$_/info/url");
3436 $l_map->{$ref_id} = $url;
3443 $x =~ s!^\Q$ENV{GIT_DIR}\E/svn/!!o;
3444 read_old_urls
($l_map, $x, $_);
3448 sub migrate_from_v2
{
3449 my @cfg = command
(qw
/config -l/);
3450 return if grep /^svn-remote\..+\.url=/, @cfg;
3452 read_old_urls
(\
%l_map, '', "$ENV{GIT_DIR}/svn");
3455 foreach my $ref_id (sort keys %l_map) {
3456 eval { Git
::SVN
->init($l_map{$ref_id}, '', undef, $ref_id) };
3458 Git
::SVN
->init($l_map{$ref_id}, '', $ref_id, $ref_id);
3465 sub minimize_connections
{
3466 my $r = Git
::SVN
::read_all_remotes
();
3468 my $root_repos = {};
3469 foreach my $repo_id (keys %$r) {
3470 my $url = $r->{$repo_id}->{url
} or next;
3471 my $fetch = $r->{$repo_id}->{fetch
} or next;
3472 my $ra = Git
::SVN
::Ra
->new($url);
3474 # skip existing cases where we already connect to the root
3475 if (($ra->{url
} eq $ra->{repos_root
}) ||
3476 (Git
::SVN
::sanitize_remote_name
($ra->{repos_root
}) eq
3478 $root_repos->{$ra->{url
}} = $repo_id;
3482 my $root_ra = Git
::SVN
::Ra
->new($ra->{repos_root
});
3483 my $root_path = $ra->{url
};
3484 $root_path =~ s
#^\Q$ra->{repos_root}\E(/|$)##;
3485 foreach my $path (keys %$fetch) {
3486 my $ref_id = $fetch->{$path};
3487 my $gs = Git
::SVN
->new($ref_id, $repo_id, $path);
3489 # make sure we can read when connecting to
3490 # a higher level of a repository
3491 my ($last_rev, undef) = $gs->last_rev_commit;
3492 if (!defined $last_rev) {
3494 $root_ra->get_latest_revnum;
3498 my $new = $root_path;
3499 $new .= length $path ?
"/$path" : '';
3501 $root_ra->get_log([$new], $last_rev, $last_rev,
3505 $new_urls->{$ra->{repos_root
}}->{$new} =
3506 { ref_id
=> $ref_id,
3507 old_repo_id
=> $repo_id,
3508 old_path
=> $path };
3513 foreach my $url (keys %$new_urls) {
3514 # see if we can re-use an existing [svn-remote "repo_id"]
3515 # instead of creating a(n ugly) new section:
3516 my $repo_id = $root_repos->{$url} ||
3517 Git
::SVN
::sanitize_remote_name
($url);
3519 my $fetch = $new_urls->{$url};
3520 foreach my $path (keys %$fetch) {
3521 my $x = $fetch->{$path};
3522 Git
::SVN
->init($url, $path, $repo_id, $x->{ref_id
});
3523 my $pfx = "svn-remote.$x->{old_repo_id}";
3525 my $old_fetch = quotemeta("$x->{old_path}:".
3526 "refs/remotes/$x->{ref_id}");
3527 command_noisy
(qw
/config --unset/,
3528 "$pfx.fetch", '^'. $old_fetch . '$');
3529 delete $r->{$x->{old_repo_id
}}->
3530 {fetch
}->{$x->{old_path
}};
3531 if (!keys %{$r->{$x->{old_repo_id
}}->{fetch
}}) {
3532 command_noisy
(qw
/config --unset/,
3534 push @emptied, $x->{old_repo_id
}
3539 my $file = $ENV{GIT_CONFIG
} || $ENV{GIT_CONFIG_LOCAL
} ||
3540 "$ENV{GIT_DIR}/config";
3542 The following [svn-remote] sections in your config file ($file) are empty
3543 and can be safely removed:
3545 print STDERR
"[svn-remote \"$_\"]\n" foreach @emptied;
3549 sub migration_check
{
3553 minimize_connections
() if $_minimize;
3556 package Git
::IndexInfo
;
3559 use Git qw
/command_input_pipe command_close_pipe/;
3563 my ($gui, $ctx) = command_input_pipe
(qw
/update-index -z --index-info/);
3564 bless { gui
=> $gui, ctx
=> $ctx, nr
=> 0}, $class;
3568 my ($self, $path) = @_;
3569 if (print { $self->{gui
} } '0 ', 0 x
40, "\t", $path, "\0") {
3570 return ++$self->{nr
};
3576 my ($self, $mode, $hash, $path) = @_;
3577 if (print { $self->{gui
} } $mode, ' ', $hash, "\t", $path, "\0") {
3578 return ++$self->{nr
};
3585 command_close_pipe
($self->{gui
}, $self->{ctx
});
3588 package Git
::SVN
::GlobSpec
;
3593 my ($class, $glob) = @_;
3595 $re =~ s!/+$!!g; # no need for trailing slashes
3596 my $nr = ($re =~ s!^(.*)\*(.*)$!\(\[^/\]+\)!g);
3597 my ($left, $right) = ($1, $2);
3599 die "Only one '*' wildcard expansion ",
3600 "is supported (got $nr): '$glob'\n";
3601 } elsif ($nr == 0) {
3602 die "One '*' is needed for glob: '$glob'\n";
3604 $re = quotemeta($left) . $re . quotemeta($right);
3605 if (length $left && !($left =~ s!/+$!!g)) {
3606 die "Missing trailing '/' on left side of: '$glob' ($left)\n";
3608 if (length $right && !($right =~ s!^/+!!g)) {
3609 die "Missing leading '/' on right side of: '$glob' ($right)\n";
3611 my $left_re = qr/^\/\Q
$left\E
(\
/|$)/;
3612 bless { left
=> $left, right
=> $right, left_regex
=> $left_re,
3613 regex
=> qr/$re/, glob => $glob }, $class;
3617 my ($self, $path) = @_;
3618 return (length $self->{left
} ?
"$self->{left}/" : '') .
3619 $path . (length $self->{right
} ?
"/$self->{right}" : '');
3627 $remotes = { # returned by read_all_remotes()
3629 # svn-remote.svn.url=https://svn.musicpd.org
3630 url
=> 'https://svn.musicpd.org',
3631 # svn-remote.svn.fetch=mpd/trunk:trunk
3633 'mpd/trunk' => 'trunk',
3635 # svn-remote.svn.tags=mpd/tags/*:tags/*
3640 regex
=> qr!mpd/tags/([^/]+)$!,
3646 regex
=> qr!tags/([^/]+)$!,
3653 $log_entry hashref as returned by libsvn_log_entry
()
3655 log => 'whitespace-formatted log entry
3656 ', # trailing newline is preserved
3657 revision
=> '8', # integer
3658 date
=> '2004-02-24T17:01:44.108345Z', # commit date
3659 author
=> 'committer name'
3663 # this is generated by generate_diff();
3664 @mods = array of diff
-index line hashes
, each element represents one line
3665 of diff
-index output
3667 diff
-index line
($m hash
)
3669 mode_a
=> first column of diff
-index output
, no leading
':',
3670 mode_b
=> second column of diff
-index output
,
3671 sha1_b
=> sha1sum of the final blob
,
3672 chg
=> change type
[MCRADT
],
3673 file_a
=> original file name of a file
(iff chg is
'C' or 'R')
3674 file_b
=> new
/current file name of a file
(any chg
)
3678 # retval of read_url_paths{,_all}();
3680 # repository root url
3681 'https://svn.musicpd.org' => {
3682 # repository path # GIT_SVN_ID
3683 'mpd/trunk' => 'trunk',
3684 'mpd/tags/0.11.5' => 'tags/0.11.5',
3689 I don
't trust the each() function on unless I created %hash myself
3690 because the internal iterator may not have started at base.