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) or
313 die "Can
't determine fetch information for $url\n";
315 foreach my $d (@refs) {
316 if (!verify_ref("$d~1")) {
318 "has no parent commit, and therefore ",
319 "nothing to diff against.\n",
320 "You should be working from a repository ",
321 "originally created by git-svn\n";
323 unless (defined $last_rev) {
324 (undef, $last_rev, undef) = cmt_metadata("$d~1");
325 unless (defined $last_rev) {
326 fatal "Unable to extract revision information ",
327 "from commit $d~1\n";
331 print "diff-tree $d~1 $d\n";
333 my %ed_opts = ( r => $last_rev,
334 log => get_commit_entry($d)->{log},
335 ra => Git::SVN::Ra->new($url),
339 print "Committed r$_[0]\n";
340 $last_rev = $_[0]; },
342 if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) {
343 print "No changes\n$d~1 == $d\n";
349 # we always want to rebase against the current HEAD, not any
350 # head that was passed to us
351 my @diff = command('diff
-tree
', 'HEAD
', $gs->refname, '--');
354 @finish = qw/rebase/;
355 push @finish, qw/--merge/ if $_merge;
356 push @finish, "--strategy=$_strategy" if $_strategy;
357 print STDERR "W: HEAD and ", $gs->refname, " differ, ",
358 "using @finish:\n", "@diff";
360 print "No changes between current HEAD and ",
361 $gs->refname, "\nResetting to the latest ",
363 @finish = qw/reset --mixed/;
365 command_noisy(@finish, $gs->refname);
368 sub cmd_show_ignore {
369 my $gs = Git::SVN->new;
370 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
371 $gs->traverse_ignore(\*STDOUT, '', $r);
376 unless (defined $_trunk || defined $_branches || defined $_tags) {
380 $_prefix = '' unless defined $_prefix;
385 if (defined $_trunk) {
386 my $trunk_ref = $_prefix . 'trunk
';
387 # try both old-style and new-style lookups:
388 my $gs_trunk = eval { Git::SVN->new($trunk_ref) };
390 my ($trunk_url, $trunk_path) =
391 complete_svn_url($url, $_trunk);
392 $gs_trunk = Git::SVN->init($trunk_url, $trunk_path,
396 return unless defined $_branches || defined $_tags;
397 my $ra = $url ? Git::SVN::Ra->new($url) : undef;
398 complete_url_ls_init($ra, $_branches, '--branches
/-b
', $_prefix);
399 complete_url_ls_init($ra, $_tags, '--tags
/-t', $_prefix . 'tags/');
402 sub cmd_multi_fetch {
403 my $remotes = Git::SVN::read_all_remotes();
404 foreach my $repo_id (sort keys %$remotes) {
405 if ($remotes->{$repo_id}->{url}) {
406 Git::SVN::fetch_all($repo_id, $remotes);
411 # this command is special because it requires no metadata
412 sub cmd_commit_diff {
413 my ($ta, $tb, $url) = @_;
414 my $usage = "Usage: $0 commit-diff -r<revision> ".
415 "<tree-ish> <tree-ish> [<URL>]\n";
416 fatal($usage) if (!defined $ta || !defined $tb);
419 my $gs = eval { Git::SVN->new };
421 fatal("Needed URL or usable git-svn --id in ",
422 "the command-line\n", $usage);
425 $svn_path = $gs->{path};
427 unless (defined $_revision) {
428 fatal("-r|--revision is a required argument\n", $usage);
430 if (defined $_message && defined $_file) {
431 fatal("Both --message/-m and --file/-F specified ",
432 "for the commit message.\n",
433 "I have no idea what you mean\n");
435 if (defined $_file) {
436 $_message = file_to_s($_file);
438 $_message ||= get_commit_entry($tb)->{log};
440 my $ra ||= Git::SVN::Ra->new($url);
441 $svn_path ||= $ra->{svn_path};
444 $r = $ra->get_latest_revnum;
445 } elsif ($r !~ /^\d+$/) {
446 die "revision argument: $r not understood by git-svn\n";
448 my %ed_opts = ( r => $r,
453 editor_cb => sub { print "Committed r$_[0]\n" },
454 svn_path => $svn_path );
455 if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) {
456 print "No changes\n$ta == $tb\n";
460 ########################### utility functions #########################
462 sub complete_svn_url {
463 my ($url, $path) = @_;
465 if ($path !~ m#^[a-z\+]+://#) {
466 if (!defined $url || $url !~ m#^[a-z\+]+://#) {
467 fatal("E: '$path' is not a complete URL ",
468 "and a separate URL is not specified\n");
470 return ($url, $path);
475 sub complete_url_ls_init {
476 my ($ra, $repo_path, $switch, $pfx) = @_;
477 unless ($repo_path) {
478 print STDERR "W: $switch not specified\n";
481 $repo_path =~ s#/+$##;
482 if ($repo_path =~ m#^[a-z\+]+://#) {
483 $ra = Git::SVN::Ra->new($repo_path);
486 $repo_path =~ s#^/+##;
488 fatal("E: '$repo_path' is not a complete URL ",
489 "and a separate URL is not specified\n");
492 my $url = $ra->{url};
493 my $gs = Git::SVN->init($url, undef, undef, undef, 1);
494 my $k = "svn-remote.$gs->{repo_id}.url";
495 my $orig_url = eval { command_oneline(qw/config --get/, $k) };
496 if ($orig_url && ($orig_url ne $gs->{url})) {
497 die "$k already set: $orig_url\n",
498 "wanted to set to: $gs->{url}\n";
500 command_oneline('config
', $k, $gs->{url}) unless $orig_url;
501 my $remote_path = "$ra->{svn_path}/$repo_path/*";
502 $remote_path =~ s#/+#/#g;
503 $remote_path =~ s#^/##g;
504 my ($n) = ($switch =~ /^--(\w+)/);
505 if (length $pfx && $pfx !~ m#/$#) {
506 die "--prefix='$pfx' must have a trailing slash '/'\n";
508 command_noisy('config
', "svn-remote.$gs->{repo_id}.$n",
509 "$remote_path:refs/remotes/$pfx*");
514 eval { command_oneline([ 'rev
-parse
', '--verify
', $ref ],
518 sub get_tree_from_treeish {
520 # $treeish can be a symbolic ref, too:
521 my $type = command_oneline(qw/cat-file -t/, $treeish);
523 while ($type eq 'tag
') {
524 ($treeish, $type) = command(qw/cat-file tag/, $treeish);
526 if ($type eq 'commit
') {
527 $expected = (grep /^tree /, command(qw/cat-file commit/,
529 ($expected) = ($expected =~ /^tree ($sha1)$/o);
530 die "Unable to get tree from $treeish\n" unless $expected;
531 } elsif ($type eq 'tree
') {
532 $expected = $treeish;
534 die "$treeish is a $type, expected tree, tag or commit\n";
539 sub get_commit_entry {
540 my ($treeish) = shift;
541 my %log_entry = ( log => '', tree => get_tree_from_treeish($treeish) );
542 my $commit_editmsg = "$ENV{GIT_DIR}/COMMIT_EDITMSG";
543 my $commit_msg = "$ENV{GIT_DIR}/COMMIT_MSG";
544 open my $log_fh, '>', $commit_editmsg or croak $!;
546 my $type = command_oneline(qw/cat-file -t/, $treeish);
547 if ($type eq 'commit
' || $type eq 'tag
') {
548 my ($msg_fh, $ctx) = command_output_pipe('cat
-file
',
553 $in_msg = 1 if (/^\s*$/);
554 } elsif (/^git-svn-id: /) {
555 # skip this for now, we regenerate the
556 # correct one on re-fetch anyways
557 # TODO: set *:merge properties or like...
559 print $log_fh $_ or croak $!;
562 command_close_pipe($msg_fh, $ctx);
564 close $log_fh or croak $!;
566 if ($_edit || ($type eq 'tree
')) {
567 my $editor = $ENV{VISUAL} || $ENV{EDITOR} || 'vi
';
568 # TODO: strip out spaces, comments, like git-commit.sh
569 system($editor, $commit_editmsg);
571 rename $commit_editmsg, $commit_msg or croak $!;
572 open $log_fh, '<', $commit_msg or croak $!;
573 { local $/; chomp($log_entry{log} = <$log_fh>); }
574 close $log_fh or croak $!;
580 my ($str, $file, $mode) = @_;
581 open my $fd,'>',$file or croak $!;
582 print $fd $str,"\n" or croak $!;
583 close $fd or croak $!;
584 chmod ($mode &~ umask, $file) if (defined $mode);
589 open my $fd,'<',$file or croak "$!: file: $file\n";
592 close $fd or croak $!;
597 # '<svn username
> = real
-name
<email address
>' mapping based on git-svnimport:
599 open my $authors, '<', $_authors or die "Can't
open $_authors $!\n";
600 my $log = $cmd eq 'log';
603 next unless /^(\S+?|\(no author\))\s*=\s*(.+?)\s*<(.+)>\s*$/;
604 my ($user, $name, $email) = ($1, $2, $3);
606 $Git::SVN::Log::rusers{"$name <$email>"} = $user;
608 $users{$user} = [$name, $email];
611 close $authors or croak $!;
614 # convert GetOpt::Long specs for use by git-config
615 sub read_repo_config {
616 return unless -d $ENV{GIT_DIR};
619 foreach my $o (keys %$opts) {
620 # if we have mixedCase and a long option-only, then
621 # it's a config-only variable that we don't need for
623 push @config_only, $o if ($o =~ /[A-Z]/ && $o =~ /^[a-z]+$/i);
625 my ($key) = ($o =~ /^([a-zA-Z\-]+)/);
627 my $arg = 'git-config';
628 $arg .= ' --int' if ($o =~ /[:=]i$/);
629 $arg .= ' --bool' if ($o !~ /[:=][sfi]$/);
630 if (ref $v eq 'ARRAY') {
631 chomp(my @tmp = `$arg --get-all svn.$key`);
634 chomp(my $tmp = `$arg --get svn.$key`);
635 if ($tmp && !($arg =~ / --bool/ && $tmp eq 'false')) {
640 delete @$opts{@config_only} if @config_only;
643 sub extract_metadata {
644 my $id = shift or return (undef, undef, undef);
645 my ($url, $rev, $uuid) = ($id =~ /^git-svn-id:\s(\S+?)\@(\d+)
647 if (!defined $rev || !$uuid || !$url) {
648 # some of the original repositories I made had
649 # identifiers like this:
650 ($rev, $uuid) = ($id =~/^git-svn-id:\s(\d+)\@([a-f\d\-]+)/);
652 return ($url, $rev, $uuid);
656 return extract_metadata((grep(/^git-svn-id: /,
657 command(qw/cat-file commit/, shift)))[-1]);
663 use vars qw/$default_repo_id $default_ref_id $_no_metadata $_follow_parent
664 $_repack $_repack_flags $_use_svm_props/;
666 use File::Path qw/mkpath/;
667 use File::Copy qw/copy/;
671 # properties that we do not log:
674 %SKIP_PROP = map { $_ => 1 } qw/svn:wc:ra_dav:version-url
675 svn:special svn:executable
676 svn:entry:committed-rev
677 svn:entry:last-author
679 svn:entry:committed-date/;
681 # some options are read globally, but can be overridden locally
682 # per [svn-remote "..."] section. Command-line options will *NOT*
683 # override options set in an [svn-remote "..."] section
685 foreach (qw/follow_parent no_metadata use_svm_props/) {
690 return \
$self->{-$_} if exists \
$self->{-$_};
691 my \
$k = \"svn
-remote
.\
$self->{repo_id
}\
.$key\";
692 eval { command_oneline
(qw
/config --get/, \
$k) };
694 \
$self->{-$_} = \
$Git::SVN
::_
$_;
696 my \
$v = command_oneline
(qw
/config --bool/,\
$k);
697 \
$self->{-$_} = \
$v eq 'false' ?
0 : 1;
699 return \
$self->{-$_} }\n";
706 END { unlink keys %LOCKFILES if %LOCKFILES }
708 sub resolve_local_globs {
709 my ($url, $fetch, $glob_spec) = @_;
710 return unless defined $glob_spec;
711 my $ref = $glob_spec->{ref};
712 my $path = $glob_spec->{path};
713 foreach (command(qw#for-each-ref --format=%(refname) refs/remotes#)) {
714 next unless m#^refs/remotes/$ref->{regex}$#;
716 my $pathname = $path->full_path($p);
717 my $refname = $ref->full_path($p);
718 if (my $existing = $fetch->{$pathname}) {
719 if ($existing ne $refname) {
720 die "Refspec conflict
:\n",
721 "existing
: refs
/remotes/$existing\n",
722 " globbed
: refs
/remotes/$refname\n";
724 my $u = (::cmt_metadata("refs
/remotes/$refname"))[0];
725 $u =~ s!^\Q$url\E(/|$)!! or die
726 "refs
/remotes/$refname: '$url' not found
in '$u'\n";
727 if ($pathname ne $u) {
728 warn "W
: Refspec
glob conflict
",
729 "(ref: refs
/remotes/$refname):\n",
730 "expected path
: $pathname\n",
732 "Continuing ahead with
$u\n";
736 $fetch->{$pathname} = $refname;
741 sub parse_revision_argument {
742 my ($base, $head) = @_;
743 if (!defined $::_revision || $::_revision eq 'BASE:HEAD') {
744 return ($base, $head);
746 return ($1, $2) if ($::_revision =~ /^(\d+):(\d+)$/);
747 return ($::_revision, $::_revision) if ($::_revision =~ /^\d+$/);
748 return ($head, $head) if ($::_revision eq 'HEAD');
749 return ($base, $1) if ($::_revision =~ /^BASE:(\d+)$/);
750 return ($1, $head) if ($::_revision =~ /^(\d+):HEAD$/);
751 die "revision argument
: $::_revision
not understood by git
-svn
\n";
755 my ($repo_id, $remotes) = @_;
756 my $remote = $remotes->{$repo_id};
757 my $fetch = $remote->{fetch};
758 my $url = $remote->{url};
760 my $ra = Git::SVN::Ra->new($url);
761 my $uuid = $ra->get_uuid;
762 my $head = $ra->get_latest_revnum;
763 my $base = defined $fetch ? $head : 0;
765 # read the max revs for wildcard expansion (branches/*, tags/*)
766 foreach my $t (qw/branches tags/) {
767 defined $remote->{$t} or next;
768 push @globs, $remote->{$t};
769 my $max_rev = eval { tmp_config(qw/--int --get/,
770 "svn
-remote
.$repo_id.${t
}-maxRev
") };
771 if (defined $max_rev && ($max_rev < $base)) {
777 foreach my $p (sort keys %$fetch) {
778 my $gs = Git::SVN->new($fetch->{$p}, $repo_id, $p);
779 my $lr = $gs->rev_db_max;
781 $base = $lr if ($lr < $base);
787 ($base, $head) = parse_revision_argument($base, $head);
788 $ra->gs_fetch_loop_common($base, $head, \@gs, \@globs);
791 sub read_all_remotes {
793 foreach (grep { s/^svn-remote\.// } command(qw/config -l/)) {
794 if (m!^(.+)\.fetch=\s*(.*)\s*:\s*refs/remotes/(.+)\s*$!) {
795 $r->{$1}->{fetch}->{$2} = $3;
796 } elsif (m!^(.+)\.url=\s*(.*)\s*$!) {
797 $r->{$1}->{url} = $2;
798 } elsif (m!^(.+)\.(branches|tags)=
799 (.*):refs/remotes/(.+)\s*$/!x) {
800 my ($p, $g) = ($3, $4);
801 my $rs = $r->{$1}->{$2} = {
804 path => Git::SVN::GlobSpec->new($p),
805 ref => Git::SVN::GlobSpec->new($g) };
806 if (length($rs->{ref}->{right}) != 0) {
807 die "The
'*' glob character must be the
last ",
808 "character of
'$g'\n";
816 if (defined $_repack) {
817 $_repack = 1000 if ($_repack <= 0);
818 $_repack_nr = $_repack;
819 $_repack_flags ||= '-d';
823 sub verify_remotes_sanity {
824 return unless -d $ENV{GIT_DIR};
826 foreach (command(qw/config -l/)) {
827 if (m!^svn-remote\.(?:.+)\.fetch=.*:refs/remotes/(\S+)\s*$!) {
829 die "Remote
ref refs
/remote/$1 is tracked by
",
830 "\n \"$_\"\nand
\n \"$seen{$1}\"\n",
831 "Please resolve this ambiguity
in ",
832 "your git configuration file before
",
840 # we allow more chars than remotes2config.sh...
841 sub sanitize_remote_name {
843 $name =~ tr{A-Za-z0-9:,/+-}{.}c;
847 sub find_existing_remote {
848 my ($url, $remotes) = @_;
850 foreach my $repo_id (keys %$remotes) {
851 my $u = $remotes->{$repo_id}->{url} or next;
853 $existing = $repo_id;
859 sub init_remote_config {
860 my ($self, $url, $no_write) = @_;
861 $url =~ s!/+$!!; # strip trailing slash
862 my $r = read_all_remotes();
863 my $existing = find_existing_remote($url, $r);
866 print STDERR "Using existing
",
867 "[svn
-remote
\"$existing\"]\n";
869 $self->{repo_id} = $existing;
871 my $min_url = Git::SVN::Ra->new($url)->minimize_url;
872 $existing = find_existing_remote($min_url, $r);
875 print STDERR "Using existing
",
876 "[svn
-remote
\"$existing\"]\n";
878 $self->{repo_id} = $existing;
880 if ($min_url ne $url) {
882 print STDERR "Using higher level of URL
: ",
883 "$url => $min_url\n";
885 my $old_path = $self->{path};
886 $self->{path} = $url;
887 $self->{path} =~ s!^\Q$min_url\E(/|$)!!;
888 if (length $old_path) {
889 $self->{path} .= "/$old_path";
896 # verify that we aren't overwriting anything:
898 command_oneline('config', '--get',
899 "svn
-remote
.$self->{repo_id
}.url
")
901 if ($orig_url && ($orig_url ne $url)) {
902 die "svn
-remote
.$self->{repo_id
}.url already set
: ",
903 "$orig_url\nwanted to set to
: $url\n";
906 my ($xrepo_id, $xpath) = find_ref($self->refname);
907 if (defined $xpath) {
908 die "svn
-remote
.$xrepo_id.fetch already set to track
",
909 "$xpath:refs
/remotes/", $self->refname, "\n";
912 command_noisy('config',
913 "svn
-remote
.$self->{repo_id
}.url
", $url);
914 command_noisy('config', '--add',
915 "svn
-remote
.$self->{repo_id
}.fetch
",
916 "$self->{path
}:".$self->refname);
921 sub find_by_url { # repos_root and, path are optional
922 my ($class, $full_url, $repos_root, $path) = @_;
923 my $remotes = read_all_remotes();
924 if (defined $full_url && defined $repos_root && !defined $path) {
926 $path =~ s#^\Q$repos_root\E(?:/|$)##;
928 foreach my $repo_id (keys %$remotes) {
929 my $u = $remotes->{$repo_id}->{url} or next;
930 next if defined $repos_root && $repos_root ne $u;
932 my $fetch = $remotes->{$repo_id}->{fetch} || {};
933 foreach (qw/branches tags/) {
934 resolve_local_globs($u, $fetch,
935 $remotes->{$repo_id}->{$_});
938 unless (defined $p) {
940 $p =~ s#^\Q$u\E(?:/|$)## or next;
942 foreach my $f (keys %$fetch) {
944 return Git::SVN->new($fetch->{$f}, $repo_id, $f);
951 my ($class, $url, $path, $repo_id, $ref_id, $no_write) = @_;
952 my $self = _new($class, $repo_id, $ref_id, $path);
954 $self->init_remote_config($url, $no_write);
961 foreach (command(qw/config -l/)) {
962 next unless m!^svn-remote\.(.+)\.fetch=
963 \s*(.*)\s*:\s*refs/remotes/(.+)\s*$!x;
964 my ($repo_id, $path, $ref) = ($1, $2, $3);
965 if ($ref eq $ref_id) {
966 $path = '' if ($path =~ m#^\./?#);
967 return ($repo_id, $path);
970 (undef, undef, undef);
974 my ($class, $ref_id, $repo_id, $path) = @_;
975 if (defined $ref_id && !defined $repo_id && !defined $path) {
976 ($repo_id, $path) = find_ref($ref_id);
977 if (!defined $repo_id) {
978 die "Could
not find a
\"svn
-remote
.*.fetch
\" key
",
979 "in the repository configuration matching
: ",
980 "refs
/remotes/$ref_id\n";
983 my $self = _new($class, $repo_id, $ref_id, $path);
984 if (!defined $self->{path} || !length $self->{path}) {
985 my $fetch = command_oneline('config', '--get',
986 "svn
-remote
.$repo_id.fetch
",
987 ":refs
/remotes/$ref_id\
$") or
988 die "Failed to
read \"svn
-remote
.$repo_id.fetch
\" ",
989 "\":refs
/remotes/$ref_id\
$\" in config
\n";
990 ($self->{path}, undef) = split(/\s*:\s*/, $fetch);
992 $self->{url} = command_oneline('config', '--get',
993 "svn
-remote
.$repo_id.url
") or
994 die "Failed to
read \"svn
-remote
.$repo_id.url
\" in config
\n";
995 if ((-z $self->db_path || ! -e $self->db_path) &&
996 ::verify_ref($self->refname.'^0')) {
1002 sub refname { "refs
/remotes/$_[0]->{ref_id
}" }
1006 return $self->{svm}->{uuid} if $self->svm;
1008 unless ($self->{svm}) {
1009 die "SVM UUID
not cached
, and reading remotely failed
\n";
1011 $self->{svm}->{uuid};
1016 return $self->{svm} if $self->{svm};
1018 # see if we have it in our config, first:
1020 my $section = "svn
-remote
.$self->{repo_id
}";
1022 source => tmp_config('--get', "$section.svm
-source
"),
1023 uuid => tmp_config('--get', "$section.svm
-uuid
"),
1026 $self->{svm} = $svm if ($svm && $svm->{source} && $svm->{uuid});
1031 my ($self, $ra) = @_;
1032 return $ra if $self->svm;
1034 my @err = ( "useSvmProps set
, but failed to
read SVM properties
\n",
1035 "(svm
:source
, svm
:mirror
, svm
:mirror
) ",
1036 "from the following URLs
:\n" );
1037 sub read_svm_props {
1038 my ($self, $props) = @_;
1039 my $src = $props->{'svm:source'};
1040 my $mirror = $props->{'svm:mirror'};
1041 my $uuid = $props->{'svm:uuid'};
1042 return undef if (!$src || !$mirror || !$uuid);
1044 chomp($src, $mirror, $uuid);
1046 $uuid =~ m{^[0-9a-f\-]{30,}$}
1047 or die "doesn
't look right - svm:uuid is '$uuid'\n";
1048 # don't know what a
'!' is there
for, also the
1049 # username is of no interest
1050 $src =~ s{/?!$}{$mirror};
1051 $src =~ s{/+$}{}; # no trailing slashes please
1052 $src =~ s{(^[a-z\+]*://)[^/@]*@}{$1};
1054 my $section = "svn-remote.$self->{repo_id}";
1055 tmp_config
('--add', "$section.svm-source", $src);
1056 tmp_config
('--add', "$section.svm-uuid", $uuid);
1057 $self->{svm
} = { source
=> $src , uuid
=> $uuid };
1061 my $r = $ra->get_latest_revnum;
1062 my $path = $self->{path
};
1063 my @tried_a = ($path);
1064 while (length $path) {
1065 if ($self->read_svm_props(($ra->get_dir($path, $r))[2])) {
1068 $path =~ s
#/?[^/]+$## && push @tried_a, $path;
1070 if ($self->read_svm_props(($ra->get_dir('', $r))[2])) {
1074 if ($ra->{repos_root
} eq $self->{url
}) {
1075 die @err, map { " $self->{url}/$_\n" } @tried_a, "\n";
1078 # nope, make sure we're connected to the repository root:
1081 $path = $ra->{svn_path
};
1082 $path =~ s
#/?[^/]+$##; # we already tried this one above
1083 $ra = Git
::SVN
::Ra
->new($ra->{repos_root
});
1084 while (length $path) {
1085 $ok = $self->read_svm_props(($ra->get_dir($path, $r))[2]);
1087 $path =~ s
#/?[^/]+$## && push @tried_b, $path;
1089 $ok = $self->read_svm_props(($ra->get_dir('', $r))[2]) unless $ok;
1091 die @err, map { " $self->{url}/$_\n" } @tried_a, "\n",
1092 map { " $ra->{url}/$_\n" } @tried_b, "\n"
1094 Git
::SVN
::Ra
->new($self->{url
});
1097 # this allows us to memoize our SVN::Ra UUID locally and avoid a
1098 # remote lookup (useful for 'git svn log').
1101 unless ($self->{ra_uuid
}) {
1102 my $key = "svn-remote.$self->{repo_id}.uuid";
1103 my $uuid = eval { tmp_config
('--get', $key) };
1104 if (!$@
&& $uuid && $uuid =~ /^([a-f\d\-]{30,})$/) {
1105 $self->{ra_uuid
} = $uuid;
1107 die "ra_uuid called without URL\n" unless $self->{url
};
1108 $self->{ra_uuid
} = $self->ra->get_uuid;
1109 tmp_config
('--add', $key, $self->{ra_uuid
});
1117 my $ra = Git
::SVN
::Ra
->new($self->{url
});
1118 if ($self->use_svm_props && !$self->{svm
}) {
1119 if ($self->no_metadata) {
1120 die "Can't have both 'noMetadata' and ",
1121 "'useSvmProps' options set!\n";
1123 $ra = $self->_set_svm_vars($ra);
1124 $self->{-want_revprops
} = 1;
1131 my $repos_root = $self->ra->{repos_root
};
1132 return $self->{path
} if ($self->{url
} eq $repos_root);
1133 die "BUG: rel_path failed! repos_root: $repos_root, Ra URL: ",
1134 $self->ra->{url
}, " path: $self->{path}, URL: $self->{url}\n";
1137 sub traverse_ignore
{
1138 my ($self, $fh, $path, $r) = @_;
1141 my ($dirent, undef, $props) = $ra->get_dir($path, $r);
1143 $p =~ s
#^\Q$ra->{svn_path}\E/##;
1144 print $fh length $p ?
"\n# $p\n" : "\n# /\n";
1145 if (my $s = $props->{'svn:ignore'}) {
1146 $s =~ s/[\r\n]+/\n/g;
1148 if (length $p == 0) {
1152 $s =~ s
#\n#\n/$p/#g;
1153 print $fh "/$p/$s\n";
1156 foreach (sort keys %$dirent) {
1157 next if $dirent->{$_}->kind != $SVN::Node
::dir
;
1158 $self->traverse_ignore($fh, "$path/$_", $r);
1162 sub last_rev
{ ($_[0]->last_rev_commit)[0] }
1163 sub last_commit
{ ($_[0]->last_rev_commit)[1] }
1165 # returns the newest SVN revision number and newest commit SHA1
1166 sub last_rev_commit
{
1168 if (defined $self->{last_rev
} && defined $self->{last_commit
}) {
1169 return ($self->{last_rev
}, $self->{last_commit
});
1171 my $c = ::verify_ref
($self->refname.'^0');
1172 if ($c && !$self->use_svm_props && !$self->no_metadata) {
1173 my $rev = (::cmt_metadata
($c))[1];
1175 ($self->{last_rev
}, $self->{last_commit
}) = ($rev, $c);
1179 my $db_path = $self->db_path;
1180 unless (-e
$db_path) {
1181 ($self->{last_rev
}, $self->{last_commit
}) = (undef, undef);
1182 return (undef, undef);
1184 my $offset = -41; # from tail
1186 open my $fh, '<', $db_path or croak
"$db_path not readable: $!\n";
1187 sysseek($fh, $offset, 2); # don't care for errors
1188 sysread($fh, $rl, 41) == 41 or return (undef, undef);
1190 while (('0' x40
) eq $rl && sysseek($fh, 0, 1) != 0) {
1192 sysseek($fh, $offset, 2); # don't care for errors
1193 sysread($fh, $rl, 41) == 41 or return (undef, undef);
1196 if ($c && $c ne $rl) {
1197 die "$db_path and ", $self->refname,
1198 " inconsistent!:\n$c != $rl\n";
1200 my $rev = sysseek($fh, 0, 1) or croak
$!;
1201 $rev = ($rev - 41) / 41;
1202 close $fh or croak
$!;
1203 ($self->{last_rev
}, $self->{last_commit
}) = ($rev, $c);
1207 sub get_fetch_range
{
1208 my ($self, $min, $max) = @_;
1209 $max ||= $self->ra->get_latest_revnum;
1210 $min ||= $self->rev_db_max;
1216 my $config = "$ENV{GIT_DIR}/svn/config";
1217 my $old_config = $ENV{GIT_CONFIG
};
1218 $ENV{GIT_CONFIG
} = $config;
1221 unless (-f
$config) {
1223 open my $fh, '>', $config or
1224 die "Can't open $config: $!\n";
1225 print $fh "; This file is used internally by ",
1227 "Couldn't write to $config: $!\n";
1228 print $fh "; You should not have to edit it\n" or
1229 die "Couldn't write to $config: $!\n";
1230 close $fh or die "Couldn't close $config: $!\n";
1232 command
('config', @args);
1235 if (defined $old_config) {
1236 $ENV{GIT_CONFIG
} = $old_config;
1238 delete $ENV{GIT_CONFIG
};
1241 wantarray ?
@ret : $ret[0];
1245 my ($self, $sub) = @_;
1246 my $old_index = $ENV{GIT_INDEX_FILE
};
1247 $ENV{GIT_INDEX_FILE
} = $self->{index};
1250 my ($dir, $base) = ($self->{index} =~ m
#^(.*?)/?([^/]+)$#);
1251 mkpath
([$dir]) unless -d
$dir;
1255 if (defined $old_index) {
1256 $ENV{GIT_INDEX_FILE
} = $old_index;
1258 delete $ENV{GIT_INDEX_FILE
};
1261 wantarray ?
@ret : $ret[0];
1264 sub assert_index_clean
{
1265 my ($self, $treeish) = @_;
1267 $self->tmp_index_do(sub {
1268 command_noisy
('read-tree', $treeish) unless -e
$self->{index};
1269 my $x = command_oneline
('write-tree');
1270 my ($y) = (command
(qw
/cat-file commit/, $treeish) =~
1271 /^tree ($::sha1)/mo);
1274 warn "Index mismatch: $y != $x\nrereading $treeish\n";
1275 unlink $self->{index} or die "unlink $self->{index}: $!\n";
1276 command_noisy
('read-tree', $treeish);
1277 $x = command_oneline
('write-tree');
1279 ::fatal
"trees ($treeish) $y != $x\n",
1280 "Something is seriously wrong...\n";
1285 sub get_commit_parents
{
1286 my ($self, $log_entry) = @_;
1287 my (%seen, @ret, @tmp);
1288 # legacy support for 'set-tree'; this is only used by set_tree_cb:
1289 if (my $ip = $self->{inject_parents
}) {
1290 if (my $commit = delete $ip->{$log_entry->{revision
}}) {
1294 if (my $cur = ::verify_ref
($self->refname.'^0')) {
1297 push @tmp, $_ foreach (@
{$log_entry->{parents
}}, @tmp);
1298 while (my $p = shift @tmp) {
1302 # MAXPARENT is defined to 16 in commit-tree.c:
1306 die "r$log_entry->{revision}: No room for parents:\n\t",
1307 join("\n\t", @tmp), "\n";
1314 $self->{url
} . (length $self->{path
} ?
'/' . $self->{path
} : '');
1318 my ($self, $log_entry) = @_;
1319 my $lr = $self->last_rev;
1320 if (defined $lr && $lr >= $log_entry->{revision
}) {
1321 die "Last fetched revision of ", $self->refname,
1322 " was r$lr, but we are about to fetch: ",
1323 "r$log_entry->{revision}!\n";
1325 if (my $c = $self->rev_db_get($log_entry->{revision
})) {
1326 croak
"$log_entry->{revision} = $c already exists! ",
1327 "Why are we refetching it?\n";
1329 $ENV{GIT_AUTHOR_NAME
} = $ENV{GIT_COMMITTER_NAME
} = $log_entry->{name
};
1330 $ENV{GIT_AUTHOR_EMAIL
} = $ENV{GIT_COMMITTER_EMAIL
} =
1331 $log_entry->{email
};
1332 $ENV{GIT_AUTHOR_DATE
} = $ENV{GIT_COMMITTER_DATE
} = $log_entry->{date
};
1334 my $tree = $log_entry->{tree
};
1335 if (!defined $tree) {
1336 $tree = $self->tmp_index_do(sub {
1337 command_oneline
('write-tree') });
1339 die "Tree is not a valid sha1: $tree\n" if $tree !~ /^$::sha1$/o;
1341 my @exec = ('git-commit-tree', $tree);
1342 foreach ($self->get_commit_parents($log_entry)) {
1343 push @exec, '-p', $_;
1345 defined(my $pid = open3
(my $msg_fh, my $out_fh, '>&STDERR', @exec))
1347 print $msg_fh $log_entry->{log} or croak
$!;
1348 unless ($self->no_metadata) {
1349 print $msg_fh "\ngit-svn-id: $log_entry->{metadata}\n"
1352 $msg_fh->flush == 0 or croak
$!;
1353 close $msg_fh or croak
$!;
1354 chomp(my $commit = do { local $/; <$out_fh> });
1355 close $out_fh or croak
$!;
1358 if ($commit !~ /^$::sha1$/o) {
1359 die "Failed to commit, invalid sha1: $commit\n";
1362 $self->rev_db_set($log_entry->{revision
}, $commit, 1);
1364 $self->{last_rev
} = $log_entry->{revision
};
1365 $self->{last_commit
} = $commit;
1366 print "r$log_entry->{revision}";
1367 if (defined $log_entry->{svm_revision
}) {
1368 print " (\@$log_entry->{svm_revision})";
1369 $self->rev_db_set($log_entry->{svm_revision
}, $commit,
1370 0, $self->svm_uuid);
1372 print " = $commit ($self->{ref_id})\n";
1373 if (defined $_repack && (--$_repack_nr == 0)) {
1374 $_repack_nr = $_repack;
1375 # repack doesn't use any arguments with spaces in them, does it?
1376 print "Running git repack $_repack_flags ...\n";
1377 command_noisy
('repack', split(/\s+/, $_repack_flags));
1378 print "Done repacking\n";
1384 my ($self, $paths, $r) = @_;
1385 return 1 if $self->{path
} eq '';
1386 if (my $path = $paths->{"/$self->{path}"}) {
1387 return ($path->{action
} eq 'D') ?
0 : 1;
1389 $self->{path_regex
} ||= qr/^\/\Q
$self->{path
}\E\
//;
1390 if (grep /$self->{path_regex}/, keys %$paths) {
1394 foreach (split m
#/#, $self->{path}) {
1396 next unless ($paths->{$c} &&
1397 ($paths->{$c}->{action
} =~ /^[AR]$/));
1398 if ($self->ra->check_path($self->{path
}, $r) ==
1406 sub find_parent_branch
{
1407 my ($self, $paths, $rev) = @_;
1408 return undef unless $self->follow_parent;
1409 unless (defined $paths) {
1410 my $err_handler = $SVN::Error
::handler
;
1411 $SVN::Error
::handler
= \
&Git
::SVN
::Ra
::skip_unknown_revs
;
1412 $self->ra->get_log([$self->{path
}], $rev, $rev, 0, 1, 1, sub {
1414 Git
::SVN
::Ra
::dup_changed_paths
($_[0]) });
1415 $SVN::Error
::handler
= $err_handler;
1417 return undef unless defined $paths;
1419 # look for a parent from another branch:
1420 my @b_path_components = split m
#/#, $self->rel_path;
1421 my @a_path_components;
1423 while (@b_path_components) {
1424 $i = $paths->{'/'.join('/', @b_path_components)};
1425 last if $i && defined $i->{copyfrom_path
};
1426 unshift(@a_path_components, pop(@b_path_components));
1428 return undef unless defined $i && defined $i->{copyfrom_path
};
1429 my $branch_from = $i->{copyfrom_path
};
1430 if (@a_path_components) {
1431 print STDERR
"branch_from: $branch_from => ";
1432 $branch_from .= '/'.join('/', @a_path_components);
1433 print STDERR
$branch_from, "\n";
1435 my $r = $i->{copyfrom_rev
};
1436 my $repos_root = $self->ra->{repos_root
};
1437 my $url = $self->ra->{url
};
1438 my $new_url = $repos_root . $branch_from;
1439 print STDERR
"Found possible branch point: ",
1440 "$new_url => ", $self->full_url, ", $r\n";
1441 $branch_from =~ s
#^/##;
1442 my $gs = Git
::SVN
->find_by_url($new_url, $repos_root, $branch_from);
1444 my $ref_id = $self->{ref_id
};
1445 $ref_id =~ s/\@\d+$//;
1447 # just grow a tail if we're not unique enough :x
1448 $ref_id .= '-' while find_ref
($ref_id);
1449 print STDERR
"Initializing parent: $ref_id\n";
1450 $gs = Git
::SVN
->init($new_url, '', $ref_id, $ref_id, 1);
1452 my ($r0, $parent) = $gs->find_rev_before($r, 1);
1453 if (!defined $r0 || !defined $parent) {
1455 ($r0, $parent) = $gs->last_rev_commit;
1457 if (defined $r0 && defined $parent) {
1458 print STDERR
"Found branch parent: ($self->{ref_id}) $parent\n";
1459 $self->assert_index_clean($parent);
1461 if ($self->ra->can_do_switch) {
1462 print STDERR
"Following parent with do_switch\n";
1463 # do_switch works with svn/trunk >= r22312, but that
1464 # is not included with SVN 1.4.3 (the latest version
1465 # at the moment), so we can't rely on it
1466 $self->{last_commit
} = $parent;
1467 $ed = SVN
::Git
::Fetcher
->new($self);
1468 $gs->ra->gs_do_switch($r0, $rev, $gs,
1469 $self->full_url, $ed)
1470 or die "SVN connection failed somewhere...\n";
1472 print STDERR
"Following parent with do_update\n";
1473 $ed = SVN
::Git
::Fetcher
->new($self);
1474 $self->ra->gs_do_update($rev, $rev, $self, $ed)
1475 or die "SVN connection failed somewhere...\n";
1477 print STDERR
"Successfully followed parent\n";
1478 return $self->make_log_entry($rev, [$parent], $ed);
1484 my ($self, $paths, $rev) = @_;
1486 my ($last_rev, @parents);
1487 if (my $lc = $self->last_commit) {
1488 # we can have a branch that was deleted, then re-added
1489 # under the same name but copied from another path, in
1490 # which case we'll have multiple parents (we don't
1491 # want to break the original ref, nor lose copypath info):
1492 if (my $log_entry = $self->find_parent_branch($paths, $rev)) {
1493 push @
{$log_entry->{parents
}}, $lc;
1496 $ed = SVN
::Git
::Fetcher
->new($self);
1497 $last_rev = $self->{last_rev
};
1502 if (my $log_entry = $self->find_parent_branch($paths, $rev)) {
1505 $ed = SVN
::Git
::Fetcher
->new($self);
1507 unless ($self->ra->gs_do_update($last_rev, $rev, $self, $ed)) {
1508 die "SVN connection failed somewhere...\n";
1510 $self->make_log_entry($rev, \
@parents, $ed);
1514 my ($self, $ed) = @_;
1516 my $h = $ed->{empty
};
1517 foreach (sort keys %$h) {
1518 my $act = $h->{$_} ?
'+empty_dir' : '-empty_dir';
1519 push @out, " $act: " . uri_encode
($_);
1520 warn "W: $act: $_\n";
1522 foreach my $t (qw
/dir_prop file_prop/) {
1523 $h = $ed->{$t} or next;
1524 foreach my $path (sort keys %$h) {
1525 my $ppath = $path eq '' ?
'.' : $path;
1526 foreach my $prop (sort keys %{$h->{$path}}) {
1527 next if $SKIP_PROP{$prop};
1528 my $v = $h->{$path}->{$prop};
1529 my $t_ppath_prop = "$t: " .
1530 uri_encode
($ppath) . ' ' .
1533 push @out, " +$t_ppath_prop " .
1536 push @out, " -$t_ppath_prop";
1541 foreach my $t (qw
/absent_file absent_directory/) {
1542 $h = $ed->{$t} or next;
1543 foreach my $parent (sort keys %$h) {
1544 foreach my $path (sort @
{$h->{$parent}}) {
1545 push @out, " $t: " .
1546 uri_encode
("$parent/$path");
1547 warn "W: $t: $parent/$path ",
1548 "Insufficient permissions?\n";
1555 sub parse_svn_date
{
1556 my $date = shift || return '+0000 1970-01-01 00:00:00';
1557 my ($Y,$m,$d,$H,$M,$S) = ($date =~ /^(\d
{4})\
-(\d\d
)\
-(\d\d
)T
1558 (\d\d
)\
:(\d\d
)\
:(\d\d
).\d
+Z
$/x
) or
1559 croak
"Unable to parse date: $date\n";
1560 "+0000 $Y-$m-$d $H:$M:$S";
1565 if (!defined $author || length $author == 0) {
1566 $author = '(no author)';
1568 if (defined $::_authors
&& ! defined $::users
{$author}) {
1569 die "Author: $author not defined in $::_authors file\n";
1574 sub make_log_entry
{
1575 my ($self, $rev, $parents, $ed) = @_;
1576 my $untracked = $self->get_untracked($ed);
1578 open my $un, '>>', "$self->{dir}/unhandled.log" or croak
$!;
1579 print $un "r$rev\n" or croak
$!;
1580 print $un $_, "\n" foreach @
$untracked;
1581 my %log_entry = ( parents
=> $parents || [], revision
=> $rev,
1585 my $logged = delete $self->{logged_rev_props
};
1586 if (!$logged || $self->{-want_revprops
}) {
1587 my $rp = $self->ra->rev_proplist($rev);
1588 foreach (sort keys %$rp) {
1590 if (/^svn:(author|date|log)$/) {
1591 $log_entry{$1} = $v;
1592 } elsif ($_ eq 'svm:headrev') {
1595 print $un " rev_prop: ", uri_encode
($_), ' ',
1596 uri_encode
($v), "\n";
1600 map { $log_entry{$_} = $logged->{$_} } keys %$logged;
1602 close $un or croak
$!;
1604 $log_entry{date
} = parse_svn_date
($log_entry{date
});
1605 $log_entry{log} .= "\n";
1606 my $author = $log_entry{author
} = check_author
($log_entry{author
});
1607 my ($name, $email) = defined $::users
{$author} ? @
{$::users
{$author}}
1609 if (defined $headrev && $self->use_svm_props) {
1610 my ($uuid, $r) = $headrev =~ m{^([a-f\d\-]{30,}):(\d
+)$};
1611 if ($uuid ne $self->{svm
}->{uuid
}) {
1612 die "UUID mismatch on SVM path:\n",
1613 "expected: $self->{svm}->{uuid}\n",
1616 my $full_url = $self->{svm
}->{source
};
1617 $full_url .= "/$self->{path}" if length $self->{path
};
1618 $log_entry{metadata
} = "$full_url\@$r $uuid";
1619 $log_entry{svm_revision
} = $r;
1620 $email ||= "$author\@$uuid"
1622 $log_entry{metadata
} = $self->full_url . "\@$rev " .
1623 $self->ra->get_uuid;
1624 $email ||= "$author\@" . $self->ra->get_uuid;
1626 $log_entry{name
} = $name;
1627 $log_entry{email
} = $email;
1632 my ($self, $min_rev, $max_rev, @parents) = @_;
1633 my ($last_rev, $last_commit) = $self->last_rev_commit;
1634 my ($base, $head) = $self->get_fetch_range($min_rev, $max_rev);
1635 $self->ra->gs_fetch_loop_common($base, $head, [$self]);
1639 my ($self, $log_entry, $tree, $rev, $date, $author) = @_;
1640 $self->{inject_parents
} = { $rev => $tree };
1641 $self->fetch(undef, undef);
1645 my ($self, $tree) = (shift, shift);
1646 my $log_entry = ::get_commit_entry
($tree);
1647 unless ($self->{last_rev
}) {
1648 fatal
("Must have an existing revision to commit\n");
1650 my %ed_opts = ( r
=> $self->{last_rev
},
1651 log => $log_entry->{log},
1653 tree_a
=> $self->{last_commit
},
1656 $self->set_tree_cb($log_entry, $tree, @_) },
1657 svn_path
=> $self->{path
} );
1658 if (!SVN
::Git
::Editor
->new(\
%ed_opts)->apply_diff) {
1659 print "No changes\nr$self->{last_rev} = $tree\n";
1665 my $db_path = $self->db_path;
1666 if (-f
$self->{db_root
}) {
1667 rename $self->{db_root
}, $db_path or die
1668 "rename $self->{db_root} => $db_path failed: $!\n";
1669 my ($dir, $base) = ($db_path =~ m
#^(.*?)/?([^/]+)$#);
1670 symlink $base, $self->{db_root
} or die
1671 "symlink $base => $self->{db_root} failed: $!\n";
1674 print "Rebuilding $db_path ...\n";
1675 my ($rev_list, $ctx) = command_output_pipe
("rev-list", $self->refname);
1677 my $full_url = $self->full_url;
1679 while (<$rev_list>) {
1682 die "Non-SHA1: $c\n" unless $c =~ /^$::sha1$/o;
1683 my ($url, $rev, $uuid) = ::cmt_metadata
($c);
1685 # ignore merges (from set-tree)
1686 next if (!defined $rev || !$uuid);
1688 # if we merged or otherwise started elsewhere, this is
1689 # how we break out of it
1690 if ((defined $svn_uuid && ($uuid ne $svn_uuid)) ||
1691 ($full_url && $url && ($url ne $full_url))) {
1695 $svn_uuid ||= $uuid;
1697 $self->rev_db_set($rev, $c);
1698 print "r$rev = $c\n";
1700 command_close_pipe
($rev_list, $ctx);
1701 print "Done rebuilding $db_path\n";
1705 # Tie::File seems to be prone to offset errors if revisions get sparse,
1706 # it's not that fast, either. Tie::File is also not in Perl 5.6. So
1707 # one of my favorite modules is out :< Next up would be one of the DBM
1708 # modules, but I'm not sure which is most portable... So I'll just
1709 # go with something that's plain-text, but still capable of
1710 # being randomly accessed. So here's my ultra-simple fixed-width
1711 # database. All records are 40 characters + "\n", so it's easy to seek
1712 # to a revision: (41 * rev) is the byte offset.
1713 # A record of 40 0s denotes an empty revision.
1714 # And yes, it's still pretty fast (faster than Tie::File).
1715 # These files are disposable unless noMetadata or useSvmProps is set
1718 my ($fh, $rev, $commit) = @_;
1719 my $offset = $rev * 41;
1720 # assume that append is the common case:
1721 seek $fh, 0, 2 or croak
$!;
1723 if ($pos < $offset) {
1724 for (1 .. (($offset - $pos) / 41)) {
1725 print $fh (('0' x
40),"\n") or croak
$!;
1728 seek $fh, $offset, 0 or croak
$!;
1729 print $fh $commit,"\n" or croak
$!;
1735 my ($dir, $base) = ($path =~ m
#^(.*?)/?([^/]+)$#);
1736 mkpath
([$dir]) unless -d
$dir;
1737 open my $fh, '>>', $path or die "Couldn't create $path: $!\n";
1738 close $fh or die "Couldn't close (create) $path: $!\n";
1743 my ($self, $rev, $commit, $update_ref, $uuid) = @_;
1744 length $commit == 40 or die "arg3 must be a full SHA1 hexsum\n";
1745 my $db = $self->db_path($uuid);
1746 my $db_lock = "$db.lock";
1749 $SIG{INT
} = $SIG{HUP
} = $SIG{TERM
} = $SIG{ALRM
} = $SIG{PIPE
} =
1750 $SIG{USR1
} = $SIG{USR2
} = sub { $sig = $_[0] };
1754 $LOCKFILES{$db_lock} = 1;
1756 # both of these options make our .rev_db file very, very important
1757 # and we can't afford to lose it because rebuild() won't work
1758 if ($self->use_svm_props || $self->no_metadata) {
1760 copy
($db, $db_lock) or die "rev_db_set(@_): ",
1762 "$db => $db_lock ($!)\n";
1764 rename $db, $db_lock or die "rev_db_set(@_): ",
1765 "Failed to rename: ",
1766 "$db => $db_lock ($!)\n";
1768 open my $fh, '+<', $db_lock or die "Couldn't open $db_lock: $!\n";
1769 _rev_db_set
($fh, $rev, $commit);
1771 $fh->flush or die "Couldn't flush $db_lock: $!\n";
1772 $fh->sync or die "Couldn't sync $db_lock: $!\n";
1774 close $fh or croak
$!;
1776 command_noisy
('update-ref', '-m', "r$rev",
1777 $self->refname, $commit);
1779 rename $db_lock, $db or die "rev_db_set(@_): ", "Failed to rename: ",
1780 "$db_lock => $db ($!)\n";
1781 delete $LOCKFILES{$db_lock};
1783 $SIG{INT
} = $SIG{HUP
} = $SIG{TERM
} = $SIG{ALRM
} = $SIG{PIPE
} =
1784 $SIG{USR1
} = $SIG{USR2
} = 'DEFAULT';
1785 kill $sig, $$ if defined $sig;
1791 my $db_path = $self->db_path;
1792 my @stat = stat $db_path or return 0;
1793 ($stat[7] % 41) == 0 or die "$db_path inconsistent size: $stat[7]\n";
1794 my $max = $stat[7] / 41;
1795 (($max > 0) ?
$max - 1 : 0);
1799 my ($self, $rev, $uuid) = @_;
1801 my $offset = $rev * 41;
1802 my $db_path = $self->db_path($uuid);
1803 return undef unless -e
$db_path;
1804 open my $fh, '<', $db_path or croak
$!;
1805 if (sysseek($fh, $offset, 0) == $offset) {
1806 my $read = sysread($fh, $ret, 40);
1807 $ret = undef if ($read != 40 || $ret eq ('0'x40
));
1809 close $fh or croak
$!;
1813 sub find_rev_before
{
1814 my ($self, $rev, $eq_ok) = @_;
1815 --$rev unless $eq_ok;
1817 if (my $c = $self->rev_db_get($rev)) {
1822 return (undef, undef);
1826 my ($class, $repo_id, $ref_id, $path) = @_;
1827 unless (defined $repo_id && length $repo_id) {
1828 $repo_id = $Git::SVN
::default_repo_id
;
1830 unless (defined $ref_id && length $ref_id) {
1831 $_[2] = $ref_id = $Git::SVN
::default_ref_id
;
1833 $_[1] = $repo_id = sanitize_remote_name
($repo_id);
1834 my $dir = "$ENV{GIT_DIR}/svn/$ref_id";
1835 $_[3] = $path = '' unless (defined $path);
1836 mkpath
(["$ENV{GIT_DIR}/svn"]);
1838 ref_id
=> $ref_id, dir
=> $dir, index => "$dir/index",
1839 path
=> $path, config
=> "$ENV{GIT_DIR}/svn/config",
1840 db_root
=> "$dir/.rev_db", repo_id
=> $repo_id }, $class;
1844 my ($self, $uuid) = @_;
1845 $uuid ||= $self->ra_uuid;
1846 "$self->{db_root}.$uuid";
1851 $f =~ s
#([^a-zA-Z0-9\*!\:_\./\-])#uc sprintf("%%%02x",ord($1))#eg;
1855 package Git
::SVN
::Prompt
;
1859 use vars qw
/$_no_auth_cache $_username/;
1862 my ($cred, $realm, $default_username, $may_save, $pool) = @_;
1863 $may_save = undef if $_no_auth_cache;
1864 $default_username = $_username if defined $_username;
1865 if (defined $default_username && length $default_username) {
1866 if (defined $realm && length $realm) {
1867 print STDERR
"Authentication realm: $realm\n";
1870 $cred->username($default_username);
1872 username
($cred, $realm, $may_save, $pool);
1874 $cred->password(_read_password
("Password for '" .
1875 $cred->username . "': ", $realm));
1876 $cred->may_save($may_save);
1877 $SVN::_Core
::SVN_NO_ERROR
;
1880 sub ssl_server_trust
{
1881 my ($cred, $realm, $failures, $cert_info, $may_save, $pool) = @_;
1882 $may_save = undef if $_no_auth_cache;
1883 print STDERR
"Error validating server certificate for '$realm':\n";
1884 if ($failures & $SVN::Auth
::SSL
::UNKNOWNCA
) {
1885 print STDERR
" - The certificate is not issued by a trusted ",
1886 "authority. Use the\n",
1887 " fingerprint to validate the certificate manually!\n";
1889 if ($failures & $SVN::Auth
::SSL
::CNMISMATCH
) {
1890 print STDERR
" - The certificate hostname does not match.\n";
1892 if ($failures & $SVN::Auth
::SSL
::NOTYETVALID
) {
1893 print STDERR
" - The certificate is not yet valid.\n";
1895 if ($failures & $SVN::Auth
::SSL
::EXPIRED
) {
1896 print STDERR
" - The certificate has expired.\n";
1898 if ($failures & $SVN::Auth
::SSL
::OTHER
) {
1899 print STDERR
" - The certificate has an unknown error.\n";
1902 "Certificate information:\n".
1903 " - Hostname: %s\n".
1904 " - Valid: from %s until %s\n".
1906 " - Fingerprint: %s\n",
1907 map $cert_info->$_, qw(hostname valid_from valid_until
1908 issuer_dname fingerprint);
1911 print STDERR
$may_save ?
1912 "(R)eject, accept (t)emporarily or accept (p)ermanently? " :
1913 "(R)eject or accept (t)emporarily? ";
1915 $choice = lc(substr(<STDIN
> || 'R', 0, 1));
1916 if ($choice =~ /^t$/i) {
1917 $cred->may_save(undef);
1918 } elsif ($choice =~ /^r$/i) {
1920 } elsif ($may_save && $choice =~ /^p$/i) {
1921 $cred->may_save($may_save);
1925 $cred->accepted_failures($failures);
1926 $SVN::_Core
::SVN_NO_ERROR
;
1929 sub ssl_client_cert
{
1930 my ($cred, $realm, $may_save, $pool) = @_;
1931 $may_save = undef if $_no_auth_cache;
1932 print STDERR
"Client certificate filename: ";
1934 chomp(my $filename = <STDIN
>);
1935 $cred->cert_file($filename);
1936 $cred->may_save($may_save);
1937 $SVN::_Core
::SVN_NO_ERROR
;
1940 sub ssl_client_cert_pw
{
1941 my ($cred, $realm, $may_save, $pool) = @_;
1942 $may_save = undef if $_no_auth_cache;
1943 $cred->password(_read_password
("Password: ", $realm));
1944 $cred->may_save($may_save);
1945 $SVN::_Core
::SVN_NO_ERROR
;
1949 my ($cred, $realm, $may_save, $pool) = @_;
1950 $may_save = undef if $_no_auth_cache;
1951 if (defined $realm && length $realm) {
1952 print STDERR
"Authentication realm: $realm\n";
1955 if (defined $_username) {
1956 $username = $_username;
1958 print STDERR
"Username: ";
1960 chomp($username = <STDIN
>);
1962 $cred->username($username);
1963 $cred->may_save($may_save);
1964 $SVN::_Core
::SVN_NO_ERROR
;
1967 sub _read_password
{
1968 my ($prompt, $realm) = @_;
1969 print STDERR
$prompt;
1971 require Term
::ReadKey
;
1972 Term
::ReadKey
::ReadMode
('noecho');
1974 while (defined(my $key = Term
::ReadKey
::ReadKey
(0))) {
1975 last if $key =~ /[\012\015]/; # \n\r
1978 Term
::ReadKey
::ReadMode
('restore');
1987 my $kill_stupid_warnings = $SVN::Node
::none
.$SVN::Node
::file
.
1988 $SVN::Node
::dir
.$SVN::Node
::unknown
.
1989 $SVN::Node
::none
.$SVN::Node
::file
.
1990 $SVN::Node
::dir
.$SVN::Node
::unknown
.
1991 $SVN::Auth
::SSL
::CNMISMATCH
.
1992 $SVN::Auth
::SSL
::NOTYETVALID
.
1993 $SVN::Auth
::SSL
::EXPIRED
.
1994 $SVN::Auth
::SSL
::UNKNOWNCA
.
1995 $SVN::Auth
::SSL
::OTHER
;
1998 package SVN
::Git
::Fetcher
;
2006 # file baton members: path, mode_a, mode_b, pool, fh, blob, base
2008 my ($class, $git_svn) = @_;
2009 my $self = SVN
::Delta
::Editor
->new;
2010 bless $self, $class;
2011 $self->{c
} = $git_svn->{last_commit
} if exists $git_svn->{last_commit
};
2012 $self->{empty
} = {};
2013 $self->{dir_prop
} = {};
2014 $self->{file_prop
} = {};
2015 $self->{absent_dir
} = {};
2016 $self->{absent_file
} = {};
2017 $self->{gii
} = $git_svn->tmp_index_do(sub { Git
::IndexInfo
->new });
2021 sub set_path_strip
{
2022 my ($self, $path) = @_;
2023 $self->{path_strip
} = qr/^\Q$path\E(\/|$)/ if length $path;
2030 sub open_directory
{
2031 my ($self, $path, $pb, $rev) = @_;
2036 my ($self, $path) = @_;
2037 if ($self->{path_strip
}) {
2038 $path =~ s!$self->{path_strip}!! or
2039 die "Failed to strip path '$path' ($self->{path_strip})\n";
2045 my ($self, $path, $rev, $pb) = @_;
2047 my $gpath = $self->git_path($path);
2048 return undef if ($gpath eq '');
2050 # remove entire directories.
2051 if (command
('ls-tree', $self->{c
}, '--', $gpath) =~ /^040000 tree/) {
2052 my ($ls, $ctx) = command_output_pipe
(qw
/ls
-tree
2054 $self->{c
}, '--', $gpath);
2058 $self->{gii
}->remove($_);
2059 print "\tD\t$_\n" unless $::_q
;
2061 print "\tD\t$gpath/\n" unless $::_q
;
2062 command_close_pipe
($ls, $ctx);
2063 $self->{empty
}->{$path} = 0
2065 $self->{gii
}->remove($gpath);
2066 print "\tD\t$gpath\n" unless $::_q
;
2072 my ($self, $path, $pb, $rev) = @_;
2073 my $gpath = $self->git_path($path);
2074 my ($mode, $blob) = (command
('ls-tree', $self->{c
}, '--', $gpath)
2075 =~ /^(\d{6}) blob ([a-f\d]{40})\t/);
2076 unless (defined $mode && defined $blob) {
2077 die "$path was not found in commit $self->{c} (r$rev)\n";
2079 { path
=> $path, mode_a
=> $mode, mode_b
=> $mode, blob
=> $blob,
2080 pool
=> SVN
::Pool
->new, action
=> 'M' };
2084 my ($self, $path, $pb, $cp_path, $cp_rev) = @_;
2085 my ($dir, $file) = ($path =~ m
#^(.*?)/?([^/]+)$#);
2086 delete $self->{empty
}->{$dir};
2087 { path
=> $path, mode_a
=> 100644, mode_b
=> 100644,
2088 pool
=> SVN
::Pool
->new, action
=> 'A' };
2092 my ($self, $path, $cp_path, $cp_rev) = @_;
2093 my ($dir, $file) = ($path =~ m
#^(.*?)/?([^/]+)$#);
2094 delete $self->{empty
}->{$dir};
2095 $self->{empty
}->{$path} = 1;
2099 sub change_dir_prop
{
2100 my ($self, $db, $prop, $value) = @_;
2101 $self->{dir_prop
}->{$db->{path
}} ||= {};
2102 $self->{dir_prop
}->{$db->{path
}}->{$prop} = $value;
2106 sub absent_directory
{
2107 my ($self, $path, $pb) = @_;
2108 $self->{absent_dir
}->{$pb->{path
}} ||= [];
2109 push @
{$self->{absent_dir
}->{$pb->{path
}}}, $path;
2114 my ($self, $path, $pb) = @_;
2115 $self->{absent_file
}->{$pb->{path
}} ||= [];
2116 push @
{$self->{absent_file
}->{$pb->{path
}}}, $path;
2120 sub change_file_prop
{
2121 my ($self, $fb, $prop, $value) = @_;
2122 if ($prop eq 'svn:executable') {
2123 if ($fb->{mode_b
} != 120000) {
2124 $fb->{mode_b
} = defined $value ?
100755 : 100644;
2126 } elsif ($prop eq 'svn:special') {
2127 $fb->{mode_b
} = defined $value ?
120000 : 100644;
2129 $self->{file_prop
}->{$fb->{path
}} ||= {};
2130 $self->{file_prop
}->{$fb->{path
}}->{$prop} = $value;
2135 sub apply_textdelta
{
2136 my ($self, $fb, $exp) = @_;
2137 my $fh = IO
::File
->new_tmpfile;
2139 # $fh gets auto-closed() by SVN::TxDelta::apply(),
2140 # (but $base does not,) so dup() it for reading in close_file
2141 open my $dup, '<&', $fh or croak
$!;
2142 my $base = IO
::File
->new_tmpfile;
2143 $base->autoflush(1);
2145 defined (my $pid = fork) or croak
$!;
2147 open STDOUT
, '>&', $base or croak
$!;
2148 print STDOUT
'link ' if ($fb->{mode_a
} == 120000);
2149 exec qw
/git-cat-file blob/, $fb->{blob
} or croak
$!;
2155 seek $base, 0, 0 or croak
$!;
2156 my $md5 = Digest
::MD5
->new;
2157 $md5->addfile($base);
2158 my $got = $md5->hexdigest;
2159 die "Checksum mismatch: $fb->{path} $fb->{blob}\n",
2161 " got: $got\n" if ($got ne $exp);
2164 seek $base, 0, 0 or croak
$!;
2166 $fb->{base
} = $base;
2167 [ SVN
::TxDelta
::apply
($base, $fh, undef, $fb->{path
}, $fb->{pool
}) ];
2171 my ($self, $fb, $exp) = @_;
2173 my $path = $self->git_path($fb->{path
});
2174 if (my $fh = $fb->{fh
}) {
2175 seek($fh, 0, 0) or croak
$!;
2176 my $md5 = Digest
::MD5
->new;
2178 my $got = $md5->hexdigest;
2179 die "Checksum mismatch: $path\n",
2180 "expected: $exp\n got: $got\n" if ($got ne $exp);
2181 seek($fh, 0, 0) or croak
$!;
2182 if ($fb->{mode_b
} == 120000) {
2183 read($fh, my $buf, 5) == 5 or croak
$!;
2184 $buf eq 'link ' or die "$path has mode 120000",
2185 "but is not a link\n";
2187 defined(my $pid = open my $out,'-|') or die "Can't fork: $!\n";
2189 open STDIN
, '<&', $fh or croak
$!;
2190 exec qw
/git-hash-object -w --stdin/ or croak
$!;
2192 chomp($hash = do { local $/; <$out> });
2193 close $out or croak
$!;
2194 close $fh or croak
$!;
2195 $hash =~ /^[a-f\d]{40}$/ or die "not a sha1: $hash\n";
2196 close $fb->{base
} or croak
$!;
2198 $hash = $fb->{blob
} or die "no blob information\n";
2201 $self->{gii
}->update($fb->{mode_b
}, $hash, $path) or croak
$!;
2202 print "\t$fb->{action}\t$path\n" if $fb->{action
} && ! $::_q
;
2208 $self->{nr
} = $self->{gii
}->{nr
};
2209 delete $self->{gii
};
2210 $self->SUPER::abort_edit
(@_);
2215 $self->{git_commit_ok
} = 1;
2216 $self->{nr
} = $self->{gii
}->{nr
};
2217 delete $self->{gii
};
2218 $self->SUPER::close_edit
(@_);
2221 package SVN
::Git
::Editor
;
2222 use vars qw
/@ISA $_rmdir $_cp_similarity $_find_copies_harder $_rename_limit/;
2230 my ($class, $opts) = @_;
2231 foreach (qw
/svn_path r ra tree_a tree_b log editor_cb/) {
2232 die "$_ required!\n" unless (defined $opts->{$_});
2235 my $pool = SVN
::Pool
->new;
2236 my $mods = generate_diff
($opts->{tree_a
}, $opts->{tree_b
});
2237 my $types = check_diff_paths
($opts->{ra
}, $opts->{svn_path
},
2240 # $opts->{ra} functions should not be used after this:
2241 my @ce = $opts->{ra
}->get_commit_editor($opts->{log},
2242 $opts->{editor_cb
}, $pool);
2243 my $self = SVN
::Delta
::Editor
->new(@ce, $pool);
2244 bless $self, $class;
2245 foreach (qw
/svn_path r tree_a tree_b/) {
2246 $self->{$_} = $opts->{$_};
2248 $self->{url
} = $opts->{ra
}->{url
};
2249 $self->{mods
} = $mods;
2250 $self->{types
} = $types;
2251 $self->{pool
} = $pool;
2252 $self->{bat
} = { '' => $self->open_root($self->{r
}, $self->{pool
}) };
2254 $self->{path_prefix
} = length $self->{svn_path
} ?
2255 "$self->{svn_path}/" : '';
2260 my ($tree_a, $tree_b) = @_;
2261 my @diff_tree = qw(diff-tree -z -r);
2262 if ($_cp_similarity) {
2263 push @diff_tree, "-C$_cp_similarity";
2265 push @diff_tree, '-C';
2267 push @diff_tree, '--find-copies-harder' if $_find_copies_harder;
2268 push @diff_tree, "-l$_rename_limit" if defined $_rename_limit;
2269 push @diff_tree, $tree_a, $tree_b;
2270 my ($diff_fh, $ctx) = command_output_pipe
(@diff_tree);
2274 while (<$diff_fh>) {
2275 chomp $_; # this gets rid of the trailing "\0"
2276 if ($state eq 'meta' && /^:(\d
{6})\s
(\d
{6})\s
2277 $::sha1\s
($::sha1
)\s
2278 ([MTCRAD
])\d
*$/xo
) {
2279 push @mods, { mode_a
=> $1, mode_b
=> $2,
2280 sha1_b
=> $3, chg
=> $4 };
2281 if ($4 =~ /^(?:C|R)$/) {
2286 } elsif ($state eq 'file_a') {
2287 my $x = $mods[$#mods] or croak
"Empty array\n";
2288 if ($x->{chg
} !~ /^(?:C|R)$/) {
2289 croak
"Error parsing $_, $x->{chg}\n";
2293 } elsif ($state eq 'file_b') {
2294 my $x = $mods[$#mods] or croak
"Empty array\n";
2295 if (exists $x->{file_a
} && $x->{chg
} !~ /^(?:C|R)$/) {
2296 croak
"Error parsing $_, $x->{chg}\n";
2298 if (!exists $x->{file_a
} && $x->{chg
} =~ /^(?:C|R)$/) {
2299 croak
"Error parsing $_, $x->{chg}\n";
2304 croak
"Error parsing $_\n";
2307 command_close_pipe
($diff_fh, $ctx);
2311 sub check_diff_paths
{
2312 my ($ra, $pfx, $rev, $mods) = @_;
2314 $pfx .= '/' if length $pfx;
2316 sub type_diff_paths
{
2317 my ($ra, $types, $path, $rev) = @_;
2318 my @p = split m
#/+#, $path;
2320 unless (defined $types->{$c}) {
2321 $types->{$c} = $ra->check_path($c, $rev);
2324 $c .= '/' . shift @p;
2325 next if defined $types->{$c};
2326 $types->{$c} = $ra->check_path($c, $rev);
2330 foreach my $m (@
$mods) {
2331 foreach my $f (qw
/file_a file_b/) {
2332 next unless defined $m->{$f};
2333 my ($dir) = ($m->{$f} =~ m
#^(.*?)/?(?:[^/]+)$#);
2334 if (length $pfx.$dir && ! defined $types{$dir}) {
2335 type_diff_paths
($ra, \
%types, $pfx.$dir, $rev);
2343 return ($_[0] =~ m
#^(.*?)/?([^/]+)$#);
2347 my ($self, $path) = @_;
2348 $self->{path_prefix
}.(defined $path ?
$path : '');
2352 my ($self, $path) = @_;
2353 $self->{url
} . '/' . $self->repo_path($path);
2358 my $rm = $self->{rm
};
2359 delete $rm->{''}; # we never delete the url we're tracking
2362 foreach (keys %$rm) {
2363 my @d = split m
#/#, $_;
2367 $c .= '/' . shift @d;
2371 delete $rm->{$self->{svn_path
}};
2372 delete $rm->{''}; # we never delete the url we're tracking
2375 my ($fh, $ctx) = command_output_pipe
(qw
/ls-tree --name-only -r -z/,
2380 my @dn = split m
#/#, $_;
2382 delete $rm->{join '/', @dn};
2389 command_close_pipe
($fh, $ctx);
2391 my ($r, $p, $bat) = ($self->{r
}, $self->{pool
}, $self->{bat
});
2392 foreach my $d (sort { $b =~ tr
#/#/# <=> $a =~ tr#/#/# } keys %$rm) {
2393 $self->close_directory($bat->{$d}, $p);
2394 my ($dn) = ($d =~ m
#^(.*?)/?(?:[^/]+)$#);
2395 print "\tD+\t$d/\n" unless $::_q
;
2396 $self->SUPER::delete_entry
($d, $r, $bat->{$dn}, $p);
2401 sub open_or_add_dir
{
2402 my ($self, $full_path, $baton) = @_;
2403 my $t = $self->{types
}->{$full_path};
2405 die "$full_path not known in r$self->{r} or we have a bug!\n";
2407 if ($t == $SVN::Node
::none
) {
2408 return $self->add_directory($full_path, $baton,
2409 undef, -1, $self->{pool
});
2410 } elsif ($t == $SVN::Node
::dir
) {
2411 return $self->open_directory($full_path, $baton,
2412 $self->{r
}, $self->{pool
});
2414 print STDERR
"$full_path already exists in repository at ",
2415 "r$self->{r} and it is not a directory (",
2416 ($t == $SVN::Node
::file ?
'file' : 'unknown'),"/$t)\n";
2421 my ($self, $path) = @_;
2422 my $bat = $self->{bat
};
2423 my $repo_path = $self->repo_path($path);
2424 return $bat->{''} unless (length $repo_path);
2425 my @p = split m
#/+#, $repo_path;
2427 $bat->{$c} ||= $self->open_or_add_dir($c, $bat->{''});
2430 $c .= '/' . shift @p;
2431 $bat->{$c} ||= $self->open_or_add_dir($c, $bat->{$c0});
2437 my ($self, $m) = @_;
2438 my ($dir, $file) = split_path
($m->{file_b
});
2439 my $pbat = $self->ensure_path($dir);
2440 my $fbat = $self->add_file($self->repo_path($m->{file_b
}), $pbat,
2442 print "\tA\t$m->{file_b}\n" unless $::_q
;
2443 $self->chg_file($fbat, $m);
2444 $self->close_file($fbat,undef,$self->{pool
});
2448 my ($self, $m) = @_;
2449 my ($dir, $file) = split_path
($m->{file_b
});
2450 my $pbat = $self->ensure_path($dir);
2451 my $fbat = $self->add_file($self->repo_path($m->{file_b
}), $pbat,
2452 $self->url_path($m->{file_a
}), $self->{r
});
2453 print "\tC\t$m->{file_a} => $m->{file_b}\n" unless $::_q
;
2454 $self->chg_file($fbat, $m);
2455 $self->close_file($fbat,undef,$self->{pool
});
2459 my ($self, $path, $pbat) = @_;
2460 my $rpath = $self->repo_path($path);
2461 my ($dir, $file) = split_path
($rpath);
2462 $self->{rm
}->{$dir} = 1;
2463 $self->SUPER::delete_entry
($rpath, $self->{r
}, $pbat, $self->{pool
});
2467 my ($self, $m) = @_;
2468 my ($dir, $file) = split_path
($m->{file_b
});
2469 my $pbat = $self->ensure_path($dir);
2470 my $fbat = $self->add_file($self->repo_path($m->{file_b
}), $pbat,
2471 $self->url_path($m->{file_a
}), $self->{r
});
2472 print "\tR\t$m->{file_a} => $m->{file_b}\n" unless $::_q
;
2473 $self->chg_file($fbat, $m);
2474 $self->close_file($fbat,undef,$self->{pool
});
2476 ($dir, $file) = split_path
($m->{file_a
});
2477 $pbat = $self->ensure_path($dir);
2478 $self->delete_entry($m->{file_a
}, $pbat);
2482 my ($self, $m) = @_;
2483 my ($dir, $file) = split_path
($m->{file_b
});
2484 my $pbat = $self->ensure_path($dir);
2485 my $fbat = $self->open_file($self->repo_path($m->{file_b
}),
2486 $pbat,$self->{r
},$self->{pool
});
2487 print "\t$m->{chg}\t$m->{file_b}\n" unless $::_q
;
2488 $self->chg_file($fbat, $m);
2489 $self->close_file($fbat,undef,$self->{pool
});
2492 sub T
{ shift->M(@_) }
2494 sub change_file_prop
{
2495 my ($self, $fbat, $pname, $pval) = @_;
2496 $self->SUPER::change_file_prop
($fbat, $pname, $pval, $self->{pool
});
2500 my ($self, $fbat, $m) = @_;
2501 if ($m->{mode_b
} =~ /755$/ && $m->{mode_a
} !~ /755$/) {
2502 $self->change_file_prop($fbat,'svn:executable','*');
2503 } elsif ($m->{mode_b
} !~ /755$/ && $m->{mode_a
} =~ /755$/) {
2504 $self->change_file_prop($fbat,'svn:executable',undef);
2506 my $fh = IO
::File
->new_tmpfile or croak
$!;
2507 if ($m->{mode_b
} =~ /^120/) {
2508 print $fh 'link ' or croak
$!;
2509 $self->change_file_prop($fbat,'svn:special','*');
2510 } elsif ($m->{mode_a
} =~ /^120/ && $m->{mode_b
} !~ /^120/) {
2511 $self->change_file_prop($fbat,'svn:special',undef);
2513 defined(my $pid = fork) or croak
$!;
2515 open STDOUT
, '>&', $fh or croak
$!;
2516 exec qw
/git-cat-file blob/, $m->{sha1_b
} or croak
$!;
2520 $fh->flush == 0 or croak
$!;
2521 seek $fh, 0, 0 or croak
$!;
2523 my $md5 = Digest
::MD5
->new;
2524 $md5->addfile($fh) or croak
$!;
2525 seek $fh, 0, 0 or croak
$!;
2527 my $exp = $md5->hexdigest;
2528 my $pool = SVN
::Pool
->new;
2529 my $atd = $self->apply_textdelta($fbat, undef, $pool);
2530 my $got = SVN
::TxDelta
::send_stream
($fh, @
$atd, $pool);
2531 die "Checksum mismatch\nexpected: $exp\ngot: $got\n" if ($got ne $exp);
2534 close $fh or croak
$!;
2538 my ($self, $m) = @_;
2539 my ($dir, $file) = split_path
($m->{file_b
});
2540 my $pbat = $self->ensure_path($dir);
2541 print "\tD\t$m->{file_b}\n" unless $::_q
;
2542 $self->delete_entry($m->{file_b
}, $pbat);
2547 my ($p,$bat) = ($self->{pool
}, $self->{bat
});
2548 foreach (sort { $b =~ tr
#/#/# <=> $a =~ tr#/#/# } keys %$bat) {
2549 $self->close_directory($bat->{$_}, $p);
2551 $self->SUPER::close_edit
($p);
2557 $self->SUPER::abort_edit
($self->{pool
});
2562 $self->SUPER::DESTROY
(@_);
2563 $self->{pool
}->clear;
2566 # this drives the editor
2569 my $mods = $self->{mods
};
2570 my %o = ( D
=> 1, R
=> 0, C
=> -1, A
=> 3, M
=> 3, T
=> 3 );
2571 foreach my $m (sort { $o{$a->{chg
}} <=> $o{$b->{chg
}} } @
$mods) {
2573 if (defined $o{$f}) {
2576 fatal
("Invalid change type: $f\n");
2579 $self->rmdirs if $_rmdir;
2585 return scalar @
$mods;
2588 package Git
::SVN
::Ra
;
2589 use vars qw
/@ISA $config_dir $_log_window_size/;
2592 my ($can_do_switch);
2596 # enforce temporary pool usage for some simple functions
2598 foreach (qw
/get_latest_revnum get_uuid get_repos_root/) {
2601 my \$pool = SVN::Pool->new;
2602 my \@ret = \$self->SUPER::$_(\@_,\$pool);
2604 wantarray ? \@ret : \$ret[0]; }\n";
2607 # get_dir needs $pool held in cache for dirents to work,
2608 # check_path is cacheable and rev_proplist is close enough
2610 foreach (qw
/check_path get_dir rev_proplist/) {
2611 $e .= "my \%${_}_cache; my \$${_}_rev = 0; sub $_ {
2614 my \$k = join(\"\\0\", \@_);
2615 if (my \$x = \$${_}_cache{\$r}->{\$k}) {
2616 return wantarray ? \@\$x : \$x->[0];
2618 my \$pool = SVN::Pool->new;
2619 my \@ret = \$self->SUPER::$_(\@_, \$r, \$pool);
2620 if (\$r != \$${_}_rev) {
2621 \%${_}_cache = ( pool => [] );
2624 \$${_}_cache{\$r}->{\$k} = \\\@ret;
2625 push \@{\$${_}_cache{pool}}, \$pool;
2626 wantarray ? \@ret : \$ret[0]; }\n";
2633 my ($class, $url) = @_;
2635 return $RA if ($RA && $RA->{url
} eq $url);
2637 SVN
::_Core
::svn_config_ensure
($config_dir, undef);
2638 my ($baton, $callbacks) = SVN
::Core
::auth_open_helper
([
2639 SVN
::Client
::get_simple_provider
(),
2640 SVN
::Client
::get_ssl_server_trust_file_provider
(),
2641 SVN
::Client
::get_simple_prompt_provider
(
2642 \
&Git
::SVN
::Prompt
::simple
, 2),
2643 SVN
::Client
::get_ssl_client_cert_prompt_provider
(
2644 \
&Git
::SVN
::Prompt
::ssl_client_cert
, 2),
2645 SVN
::Client
::get_ssl_client_cert_pw_prompt_provider
(
2646 \
&Git
::SVN
::Prompt
::ssl_client_cert_pw
, 2),
2647 SVN
::Client
::get_username_provider
(),
2648 SVN
::Client
::get_ssl_server_trust_prompt_provider
(
2649 \
&Git
::SVN
::Prompt
::ssl_server_trust
),
2650 SVN
::Client
::get_username_prompt_provider
(
2651 \
&Git
::SVN
::Prompt
::username
, 2),
2653 my $config = SVN
::Core
::config_get_config
($config_dir);
2654 my $self = SVN
::Ra
->new(url
=> $url, auth
=> $baton,
2656 pool
=> SVN
::Pool
->new,
2657 auth_provider_callbacks
=> $callbacks);
2658 $self->{svn_path
} = $url;
2659 $self->{repos_root
} = $self->get_repos_root;
2660 $self->{svn_path
} =~ s
#^\Q$self->{repos_root}\E(/|$)##;
2661 $RA = bless $self, $class;
2665 # do not call the real DESTROY since we store ourselves in $RA
2669 my ($self, @args) = @_;
2670 my $pool = SVN
::Pool
->new;
2671 splice(@args, 3, 1) if ($SVN::Core
::VERSION
le '1.2.0');
2672 my $ret = $self->SUPER::get_log
(@args, $pool);
2677 sub get_commit_editor
{
2678 my ($self, $log, $cb, $pool) = @_;
2679 my @lock = $SVN::Core
::VERSION
ge '1.2.0' ?
(undef, 0) : ();
2680 $self->SUPER::get_commit_editor
($log, $cb, @lock, $pool);
2684 my ($self, $rev_a, $rev_b, $gs, $editor) = @_;
2685 my $new = ($rev_a == $rev_b);
2686 my $path = $gs->{path
};
2688 my $pool = SVN
::Pool
->new;
2689 $editor->set_path_strip($path);
2690 my (@pc) = split m
#/#, $path;
2691 my $reporter = $self->do_update($rev_b, (@pc ?
shift @pc : ''),
2693 my @lock = $SVN::Core
::VERSION
ge '1.2.0' ?
(undef) : ();
2695 # Since we can't rely on svn_ra_reparent being available, we'll
2696 # just have to do some magic with set_path to make it so
2697 # we only want a partial path.
2699 my $final = join('/', @pc);
2701 $reporter->set_path($sp, $rev_b, 0, @lock, $pool);
2702 $sp .= '/' if length $sp;
2705 die "BUG: '$sp' != '$final'\n" if ($sp ne $final);
2707 $reporter->set_path($sp, $rev_a, $new, @lock, $pool);
2709 $reporter->finish_report($pool);
2711 $editor->{git_commit_ok
};
2714 # this requires SVN 1.4.3 or later (do_switch didn't work before 1.4.3, and
2715 # svn_ra_reparent didn't work before 1.4)
2717 my ($self, $rev_a, $rev_b, $gs, $url_b, $editor) = @_;
2718 my $path = $gs->{path
};
2719 my $pool = SVN
::Pool
->new;
2721 my $full_url = $self->{url
};
2722 my $old_url = $full_url;
2723 $full_url .= "/$path" if length $path;
2724 my ($ra, $reparented);
2725 if ($old_url ne $full_url) {
2726 if ($old_url !~ m
#^svn(\+ssh)?://#) {
2727 SVN
::_Ra
::svn_ra_reparent
($self->{session
}, $full_url,
2729 $self->{url
} = $full_url;
2732 $ra = Git
::SVN
::Ra
->new($full_url);
2736 my $reporter = $ra->do_switch($rev_b, '', 1, $url_b, $editor, $pool);
2737 my @lock = $SVN::Core
::VERSION
ge '1.2.0' ?
(undef) : ();
2738 $reporter->set_path('', $rev_a, 0, @lock, $pool);
2739 $reporter->finish_report($pool);
2742 SVN
::_Ra
::svn_ra_reparent
($self->{session
}, $old_url, $pool);
2743 $self->{url
} = $old_url;
2747 $editor->{git_commit_ok
};
2750 sub gs_fetch_loop_common
{
2751 my ($self, $base, $head, $gsv, $globs) = @_;
2752 return if ($base > $head);
2753 my $inc = $_log_window_size;
2754 my ($min, $max) = ($base, $head < $base + $inc ?
$head : $base + $inc);
2756 my $common_max = scalar @
$gsv;
2758 foreach my $gs (@
$gsv) {
2759 my @tmp = split m
#/#, $gs->{path};
2762 $p .= length($p) ?
"/$_" : $_;
2768 $common_max += scalar @
$globs;
2769 foreach my $glob (@
$globs) {
2770 my @tmp = split m
#/#, $glob->{path}->{left};
2773 $p .= length($p) ?
"/$_" : $_;
2779 my $longest_path = '';
2780 foreach (sort {length $b <=> length $a} keys %common) {
2781 if ($common{$_} == $common_max) {
2789 my $err_handler = $SVN::Error
::handler
;
2790 $SVN::Error
::handler
= sub {
2792 skip_unknown_revs
($err);
2795 my ($paths, $r, $author, $date, $log) = @_;
2796 [ dup_changed_paths
($paths),
2797 { author
=> $author, date
=> $date, log => $log } ];
2799 $self->get_log([$longest_path], $min, $max, 0, 1, 1,
2800 sub { $revs{$_[1]} = _cb
(@_) });
2801 if ($err && $max >= $head) {
2802 print STDERR
"Path '$longest_path' ",
2803 "was probably deleted:\n",
2804 $err->expanded_message,
2805 "\nWill attempt to follow ",
2806 "revisions r$min .. r$max ",
2807 "committed before the deletion\n";
2809 while (--$hi >= $min) {
2811 $self->get_log([$longest_path], $min, $hi,
2814 $revs{$_[1]} = _cb
(@_) });
2816 print STDERR
"r$min .. r$ok OK\n";
2821 $SVN::Error
::handler
= $err_handler;
2823 my %exists = map { $_->{path
} => $_ } @
$gsv;
2824 foreach my $r (sort {$a <=> $b} keys %revs) {
2825 my ($paths, $logged) = @
{$revs{$r}};
2827 foreach my $gs ($self->match_globs(\
%exists, $paths,
2829 if ($gs->rev_db_max >= $r) {
2832 next unless $gs->match_paths($paths, $r);
2833 $gs->{logged_rev_props
} = $logged;
2834 if (my $last_commit = $gs->last_commit) {
2835 $gs->assert_index_clean($last_commit);
2837 my $log_entry = $gs->do_fetch($paths, $r);
2839 $gs->do_git_commit($log_entry);
2842 foreach my $g (@
$globs) {
2843 my $k = "svn-remote.$g->{remote}." .
2845 Git
::SVN
::tmp_config
($k, $r);
2848 # pre-fill the .rev_db since it'll eventually get filled in
2849 # with '0' x40 if something new gets committed
2850 foreach my $gs (@
$gsv) {
2851 next if defined $gs->rev_db_get($max);
2852 $gs->rev_db_set($max, 0 x40
);
2854 foreach my $g (@
$globs) {
2855 my $k = "svn-remote.$g->{remote}.$g->{t}-maxRev";
2856 Git
::SVN
::tmp_config
($k, $max);
2858 last if $max >= $head;
2861 $max = $head if ($max > $head);
2866 my ($self, $exists, $paths, $globs, $r) = @_;
2869 my ($self, $exists, $g, $r) = @_;
2870 my @x = eval { $self->get_dir($g->{path
}->{left
}, $r) };
2871 return unless scalar @x == 3;
2872 my $dirents = $x[0];
2873 foreach my $de (keys %$dirents) {
2874 next if $dirents->{$de}->kind != $SVN::Node
::dir
;
2875 my $p = $g->{path
}->full_path($de);
2876 next if $exists->{$p};
2877 next if (length $g->{path
}->{right
} &&
2878 ($self->check_path($p, $r) !=
2880 $exists->{$p} = Git
::SVN
->init($self->{url
}, $p, undef,
2881 $g->{ref}->full_path($de), 1);
2884 foreach my $g (@
$globs) {
2885 if (my $path = $paths->{"/$g->{path}->{left}"}) {
2886 if ($path->{action
} =~ /^[AR]$/) {
2887 get_dir_check
($self, $exists, $g, $r);
2890 foreach (keys %$paths) {
2891 if (/$g->{path}->{left_regex}/ &&
2892 !/$g->{path}->{regex}/) {
2893 next if $paths->{$_}->{action
} !~ /^[AR]$/;
2894 get_dir_check
($self, $exists, $g, $r);
2896 next unless /$g->{path}->{regex}/;
2898 my $pathname = $g->{path
}->full_path($p);
2899 next if $exists->{$pathname};
2900 $exists->{$pathname} = Git
::SVN
->init(
2901 $self->{url
}, $pathname, undef,
2902 $g->{ref}->full_path($p), 1);
2905 foreach (split m
#/#, $g->{path}->{left}) {
2907 next unless ($paths->{$c} &&
2908 ($paths->{$c}->{action
} =~ /^[AR]$/));
2909 get_dir_check
($self, $exists, $g, $r);
2917 return $self->{url
} if ($self->{url
} eq $self->{repos_root
});
2918 my $url = $self->{repos_root
};
2919 my @components = split(m!/!, $self->{svn_path
});
2922 $url .= "/$c" if length $c;
2923 eval { (ref $self)->new($url)->get_latest_revnum };
2924 } while ($@
&& ($c = shift @components));
2930 unless (defined $can_do_switch) {
2931 my $pool = SVN
::Pool
->new;
2933 $self->do_switch(1, '', 0, $self->{url
},
2934 SVN
::Delta
::Editor
->new, $pool);
2939 $rep->abort_report($pool);
2947 sub skip_unknown_revs
{
2949 my $errno = $err->apr_err();
2950 # Maybe the branch we're tracking didn't
2951 # exist when the repo started, so it's
2952 # not an error if it doesn't, just continue
2954 # Wonderfully consistent library, eh?
2955 # 160013 - svn:// and file://
2956 # 175002 - http(s)://
2957 # 175007 - http(s):// (this repo required authorization, too...)
2958 # More codes may be discovered later...
2959 if ($errno == 175007 || $errno == 175002 || $errno == 160013) {
2960 warn "W: Ignoring error from SVN, path probably ",
2961 "does not exist: ($errno): ",
2962 $err->expanded_message,"\n";
2965 die "Error from SVN, ($errno): ", $err->expanded_message,"\n";
2968 # svn_log_changed_path_t objects passed to get_log are likely to be
2969 # overwritten even if only the refs are copied to an external variable,
2970 # so we should dup the structures in their entirety. Using an externally
2971 # passed pool (instead of our temporary and quickly cleared pool in
2972 # Git::SVN::Ra) does not help matters at all...
2973 sub dup_changed_paths
{
2975 return undef unless $paths;
2977 foreach my $p (keys %$paths) {
2978 my $i = $paths->{$p};
2979 my %s = map { $_ => $i->$_ }
2980 qw
/copyfrom_path copyfrom_rev action/;
2986 package Git
::SVN
::Log
;
2989 use POSIX qw
/strftime/;
2990 use vars qw
/$TZ $limit $color $pager $non_recursive $verbose $oneline
2991 %rusers $show_commit $incremental/;
2996 return 1 if defined $c->{r
};
2997 if ($c->{l
} && $c->{l
}->[-1] eq "...\n" &&
2998 $c->{a_raw
} =~ /\@([a-f\d\-]+)>$/) {
2999 my @log = command
(qw
/cat-file commit/, $c->{c
});
3000 shift @log while ($log[0] ne "\n");
3002 @
{$c->{l
}} = grep !/^git-svn-id: /, @log;
3004 (undef, $c->{r
}, undef) = ::extract_metadata
(
3005 (grep(/^git-svn-id: /, @log))[-1]);
3007 return defined $c->{r
};
3013 $dcvar = 'color.diff';
3014 $dc = `git-config --get $dcvar`;
3016 # nothing at all; fallback to "diff.color"
3017 $dcvar = 'diff.color';
3018 $dc = `git-config --get $dcvar`;
3021 if ($dc eq 'auto') {
3023 $pc = `git-config --get color.pager`;
3025 # does not have it -- fallback to pager.color
3026 $pc = `git-config --bool --get pager.color`;
3029 $pc = `git-config --bool --get color.pager`;
3035 if (-t
*STDOUT
|| (defined $pager && $pc eq 'true')) {
3036 return ($ENV{TERM
} && $ENV{TERM
} ne 'dumb');
3040 return 0 if $dc eq 'never';
3041 return 1 if $dc eq 'always';
3042 chomp($dc = `git-config --bool --get $dcvar`);
3043 return ($dc eq 'true');
3046 sub git_svn_log_cmd
{
3047 my ($r_min, $r_max, @args) = @_;
3049 foreach my $x (@args) {
3051 next unless ::verify_ref
("$x^0");
3057 my ($fh, $ctx) = command_output_pipe
('rev-list', $head);
3060 $url = (::cmt_metadata
($_))[0];
3061 last if defined $url;
3063 close $fh; # break the pipe
3065 my $gs = Git
::SVN
->find_by_url($url) || Git
::SVN
->_new;
3066 my @cmd = (qw
/log --abbrev-commit --pretty=raw --default/,
3068 push @cmd, '-r' unless $non_recursive;
3069 push @cmd, qw
/--raw --name-status/ if $verbose;
3070 push @cmd, '--color' if log_use_color
();
3071 return @cmd unless defined $r_max;
3072 if ($r_max == $r_min) {
3073 push @cmd, '--max-count=1';
3074 if (my $c = $gs->rev_db_get($r_max)) {
3078 my ($c_min, $c_max);
3079 $c_max = $gs->rev_db_get($r_max);
3080 $c_min = $gs->rev_db_get($r_min);
3081 if (defined $c_min && defined $c_max) {
3082 if ($r_max > $r_max) {
3083 push @cmd, "$c_min..$c_max";
3085 push @cmd, "$c_max..$c_min";
3087 } elsif ($r_max > $r_min) {
3096 # adapted from pager.c
3098 $pager ||= $ENV{GIT_PAGER
} || $ENV{PAGER
};
3099 if (!defined $pager) {
3101 } elsif (length $pager == 0 || $pager eq 'cat') {
3107 return unless -t
*STDOUT
;
3108 pipe my $rfd, my $wfd or return;
3109 defined(my $pid = fork) or ::fatal
"Can't fork: $!\n";
3111 open STDOUT
, '>&', $wfd or
3112 ::fatal
"Can't redirect to stdout: $!\n";
3115 open STDIN
, '<&', $rfd or ::fatal
"Can't redirect stdin: $!\n";
3116 $ENV{LESS
} ||= 'FRSX';
3117 exec $pager or ::fatal
"Can't run pager: $! ($pager)\n";
3120 sub tz_to_s_offset
{
3123 return ($1 * 60) + ($tz * 3600);
3126 sub get_author_info
{
3127 my ($dest, $author, $t, $tz) = @_;
3128 $author =~ s/(?:^\s*|\s*$)//g;
3129 $dest->{a_raw
} = $author;
3132 $au = $rusers{$author} || undef;
3135 ($au) = ($author =~ /<([^>]+)\@[^>]+>$/);
3140 # Date::Parse isn't in the standard Perl distro :(
3141 if ($tz =~ s/^\+//) {
3142 $t += tz_to_s_offset
($tz);
3143 } elsif ($tz =~ s/^\-//) {
3144 $t -= tz_to_s_offset
($tz);
3146 $dest->{t_utc
} = $t;
3149 sub process_commit
{
3150 my ($c, $r_min, $r_max, $defer) = @_;
3151 if (defined $r_min && defined $r_max) {
3152 if ($r_min == $c->{r
} && $r_min == $r_max) {
3156 return 1 if $r_min == $r_max;
3157 if ($r_min < $r_max) {
3158 # we need to reverse the print order
3159 return 0 if (defined $limit && --$limit < 0);
3163 if ($r_min != $r_max) {
3164 return 1 if ($r_min < $c->{r
});
3165 return 1 if ($r_max > $c->{r
});
3168 return 0 if (defined $limit && --$limit < 0);
3177 if (my $l = $c->{l
}) {
3178 while ($l->[0] =~ /^\s*$/) { shift @
$l }
3181 $l_fmt ||= 'A' . length($c->{r
});
3182 print 'r',pack($l_fmt, $c->{r
}),' | ';
3183 print "$c->{c} | " if $show_commit;
3186 show_commit_normal
($c);
3190 sub show_commit_changed_paths
{
3192 return unless $c->{changed
};
3193 print "Changed paths:\n", @
{$c->{changed
}};
3196 sub show_commit_normal
{
3198 print '-' x72
, "\nr$c->{r} | ";
3199 print "$c->{c} | " if $show_commit;
3200 print "$c->{a} | ", strftime
("%Y-%m-%d %H:%M:%S %z (%a, %d %b %Y)",
3201 localtime($c->{t_utc
})), ' | ';
3204 if (my $l = $c->{l
}) {
3205 while ($l->[$#$l] eq "\n" && $#$l > 0
3206 && $l->[($#$l - 1)] eq "\n") {
3209 $nr_line = scalar @
$l;
3211 print "1 line\n\n\n";
3213 if ($nr_line == 1) {
3214 $nr_line = '1 line';
3216 $nr_line .= ' lines';
3218 print $nr_line, "\n";
3219 show_commit_changed_paths
($c);
3221 print $_ foreach @
$l;
3225 show_commit_changed_paths
($c);
3229 foreach my $x (qw
/raw diff/) {
3232 print $_ foreach @
{$c->{$x}}
3239 my ($r_min, $r_max);
3240 my $r_last = -1; # prevent dupes
3246 if (defined $::_revision
) {
3247 if ($::_revision
=~ /^(\d+):(\d+)$/) {
3248 ($r_min, $r_max) = ($1, $2);
3249 } elsif ($::_revision
=~ /^\d+$/) {
3250 $r_min = $r_max = $::_revision
;
3252 ::fatal
"-r$::_revision is not supported, use ",
3253 "standard \'git log\' arguments instead\n";
3258 @args = (git_svn_log_cmd
($r_min, $r_max, @args), @args);
3259 my $log = command_output_pipe
(@args);
3262 my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/;
3264 if (/^${esc_color}commit ($::sha1_short)/o) {
3266 if ($c && cmt_showable
($c) && $c->{r
} != $r_last) {
3268 process_commit
($c, $r_min, $r_max, \
@k) or
3273 } elsif (/^${esc_color}author (.+) (\d+) ([\-\+]?\d+)$/o) {
3274 get_author_info
($c, $1, $2, $3);
3275 } elsif (/^${esc_color}(?:tree|parent|committer) /o) {
3277 } elsif (/^${esc_color}:\d{6} \d{6} $::sha1_short/o) {
3278 push @
{$c->{raw
}}, $_;
3279 } elsif (/^${esc_color}[ACRMDT]\t/) {
3280 # we could add $SVN->{svn_path} here, but that requires
3281 # remote access at the moment (repo_path_split)...
3282 s
#^(${esc_color})([ACRMDT])\t#$1 $2 #o;
3283 push @
{$c->{changed
}}, $_;
3284 } elsif (/^${esc_color}diff /o) {
3286 push @
{$c->{diff
}}, $_;
3288 push @
{$c->{diff
}}, $_;
3289 } elsif (/^${esc_color} (git-svn-id:.+)$/o) {
3290 ($c->{url
}, $c->{r
}, undef) = ::extract_metadata
($1);
3291 } elsif (s/^${esc_color} //o) {
3292 push @
{$c->{l
}}, $_;
3295 if ($c && defined $c->{r
} && $c->{r
} != $r_last) {
3297 process_commit
($c, $r_min, $r_max, \
@k);
3303 process_commit
($_, $r_min, $r_max) foreach reverse @k;
3307 print '-' x72
,"\n" unless $incremental || $oneline;
3310 package Git
::SVN
::Migration
;
3311 # these version numbers do NOT correspond to actual version numbers
3312 # of git nor git-svn. They are just relative.
3314 # v0 layout: .git/$id/info/url, refs/heads/$id-HEAD
3316 # v1 layout: .git/$id/info/url, refs/remotes/$id
3318 # v2 layout: .git/svn/$id/info/url, refs/remotes/$id
3320 # v3 layout: .git/svn/$id, refs/remotes/$id
3321 # - info/url may remain for backwards compatibility
3322 # - this is what we migrate up to this layout automatically,
3323 # - this will be used by git svn init on single branches
3324 # v3.1 layout (auto migrated):
3325 # - .rev_db => .rev_db.$UUID, .rev_db will remain as a symlink
3326 # for backwards compatibility
3328 # v4 layout: .git/svn/$repo_id/$id, refs/remotes/$repo_id/$id
3329 # - this is only created for newly multi-init-ed
3330 # repositories. Similar in spirit to the
3331 # --use-separate-remotes option in git-clone (now default)
3332 # - we do not automatically migrate to this (following
3333 # the example set by core git)
3337 use File
::Path qw
/mkpath/;
3338 use File
::Basename qw
/dirname basename/;
3339 use vars qw
/$_minimize/;
3341 sub migrate_from_v0
{
3342 my $git_dir = $ENV{GIT_DIR
};
3343 return undef unless -d
$git_dir;
3344 my ($fh, $ctx) = command_output_pipe
(qw
/rev-parse --symbolic --all/);
3348 my ($id, $orig_ref) = ($_, $_);
3349 next unless $id =~ s
#^refs/heads/(.+)-HEAD$#$1#;
3350 next unless -f
"$git_dir/$id/info/url";
3351 my $new_ref = "refs/remotes/$id";
3352 if (::verify_ref
("$new_ref^0")) {
3353 print STDERR
"W: $orig_ref is probably an old ",
3354 "branch used by an ancient version of ",
3356 "However, $new_ref also exists.\n",
3357 "We will not be able ",
3358 "to use this branch until this ",
3359 "ambiguity is resolved.\n";
3362 print STDERR
"Migrating from v0 layout...\n" if !$migrated;
3363 print STDERR
"Renaming ref: $orig_ref => $new_ref\n";
3364 command_noisy
('update-ref', $new_ref, $orig_ref);
3365 command_noisy
('update-ref', '-d', $orig_ref, $orig_ref);
3368 command_close_pipe
($fh, $ctx);
3369 print STDERR
"Done migrating from v0 layout...\n" if $migrated;
3373 sub migrate_from_v1
{
3374 my $git_dir = $ENV{GIT_DIR
};
3376 return $migrated unless -d
$git_dir;
3377 my $svn_dir = "$git_dir/svn";
3379 # just in case somebody used 'svn' as their $id at some point...
3380 return $migrated if -d
$svn_dir && ! -f
"$svn_dir/info/url";
3382 print STDERR
"Migrating from a git-svn v1 layout...\n";
3384 print STDERR
"Data from a previous version of git-svn exists, but\n\t",
3385 "$svn_dir\n\t(required for this version ",
3386 "($::VERSION) of git-svn) does not. exist\n";
3387 my ($fh, $ctx) = command_output_pipe
(qw
/rev-parse --symbolic --all/);
3390 next unless $x =~ s
#^refs/remotes/##;
3392 next unless -f
"$git_dir/$x/info/url";
3393 my $u = eval { ::file_to_s
("$git_dir/$x/info/url") };
3395 my $dn = dirname
("$git_dir/svn/$x");
3396 mkpath
([$dn]) unless -d
$dn;
3397 if ($x eq 'svn') { # they used 'svn' as GIT_SVN_ID:
3398 mkpath
(["$git_dir/svn/svn"]);
3399 print STDERR
" - $git_dir/$x/info => ",
3400 "$git_dir/svn/$x/info\n";
3401 rename "$git_dir/$x/info", "$git_dir/svn/$x/info" or
3403 # don't worry too much about these, they probably
3404 # don't exist with repos this old (save for index,
3405 # and we can easily regenerate that)
3406 foreach my $f (qw
/unhandled.log index .rev_db/) {
3407 rename "$git_dir/$x/$f", "$git_dir/svn/$x/$f";
3410 print STDERR
" - $git_dir/$x => $git_dir/svn/$x\n";
3411 rename "$git_dir/$x", "$git_dir/svn/$x" or
3416 command_close_pipe
($fh, $ctx);
3417 print STDERR
"Done migrating from a git-svn v1 layout\n";
3422 my ($l_map, $pfx, $path) = @_;
3424 foreach (<$path/*>) {
3425 if (-r
"$_/info/url") {
3426 $pfx .= '/' if $pfx && $pfx !~ m
!/$!;
3427 my $ref_id = $pfx . basename
$_;
3428 my $url = ::file_to_s
("$_/info/url");
3429 $l_map->{$ref_id} = $url;
3436 $x =~ s!^\Q$ENV{GIT_DIR}\E/svn/!!o;
3437 read_old_urls
($l_map, $x, $_);
3441 sub migrate_from_v2
{
3442 my @cfg = command
(qw
/config -l/);
3443 return if grep /^svn-remote\..+\.url=/, @cfg;
3445 read_old_urls
(\
%l_map, '', "$ENV{GIT_DIR}/svn");
3448 foreach my $ref_id (sort keys %l_map) {
3449 eval { Git
::SVN
->init($l_map{$ref_id}, '', undef, $ref_id) };
3451 Git
::SVN
->init($l_map{$ref_id}, '', $ref_id, $ref_id);
3458 sub minimize_connections
{
3459 my $r = Git
::SVN
::read_all_remotes
();
3461 my $root_repos = {};
3462 foreach my $repo_id (keys %$r) {
3463 my $url = $r->{$repo_id}->{url
} or next;
3464 my $fetch = $r->{$repo_id}->{fetch
} or next;
3465 my $ra = Git
::SVN
::Ra
->new($url);
3467 # skip existing cases where we already connect to the root
3468 if (($ra->{url
} eq $ra->{repos_root
}) ||
3469 (Git
::SVN
::sanitize_remote_name
($ra->{repos_root
}) eq
3471 $root_repos->{$ra->{url
}} = $repo_id;
3475 my $root_ra = Git
::SVN
::Ra
->new($ra->{repos_root
});
3476 my $root_path = $ra->{url
};
3477 $root_path =~ s
#^\Q$ra->{repos_root}\E(/|$)##;
3478 foreach my $path (keys %$fetch) {
3479 my $ref_id = $fetch->{$path};
3480 my $gs = Git
::SVN
->new($ref_id, $repo_id, $path);
3482 # make sure we can read when connecting to
3483 # a higher level of a repository
3484 my ($last_rev, undef) = $gs->last_rev_commit;
3485 if (!defined $last_rev) {
3487 $root_ra->get_latest_revnum;
3491 my $new = $root_path;
3492 $new .= length $path ?
"/$path" : '';
3494 $root_ra->get_log([$new], $last_rev, $last_rev,
3498 $new_urls->{$ra->{repos_root
}}->{$new} =
3499 { ref_id
=> $ref_id,
3500 old_repo_id
=> $repo_id,
3501 old_path
=> $path };
3506 foreach my $url (keys %$new_urls) {
3507 # see if we can re-use an existing [svn-remote "repo_id"]
3508 # instead of creating a(n ugly) new section:
3509 my $repo_id = $root_repos->{$url} ||
3510 Git
::SVN
::sanitize_remote_name
($url);
3512 my $fetch = $new_urls->{$url};
3513 foreach my $path (keys %$fetch) {
3514 my $x = $fetch->{$path};
3515 Git
::SVN
->init($url, $path, $repo_id, $x->{ref_id
});
3516 my $pfx = "svn-remote.$x->{old_repo_id}";
3518 my $old_fetch = quotemeta("$x->{old_path}:".
3519 "refs/remotes/$x->{ref_id}");
3520 command_noisy
(qw
/config --unset/,
3521 "$pfx.fetch", '^'. $old_fetch . '$');
3522 delete $r->{$x->{old_repo_id
}}->
3523 {fetch
}->{$x->{old_path
}};
3524 if (!keys %{$r->{$x->{old_repo_id
}}->{fetch
}}) {
3525 command_noisy
(qw
/config --unset/,
3527 push @emptied, $x->{old_repo_id
}
3532 my $file = $ENV{GIT_CONFIG
} || $ENV{GIT_CONFIG_LOCAL
} ||
3533 "$ENV{GIT_DIR}/config";
3535 The following [svn-remote] sections in your config file ($file) are empty
3536 and can be safely removed:
3538 print STDERR
"[svn-remote \"$_\"]\n" foreach @emptied;
3542 sub migration_check
{
3546 minimize_connections
() if $_minimize;
3549 package Git
::IndexInfo
;
3552 use Git qw
/command_input_pipe command_close_pipe/;
3556 my ($gui, $ctx) = command_input_pipe
(qw
/update-index -z --index-info/);
3557 bless { gui
=> $gui, ctx
=> $ctx, nr
=> 0}, $class;
3561 my ($self, $path) = @_;
3562 if (print { $self->{gui
} } '0 ', 0 x
40, "\t", $path, "\0") {
3563 return ++$self->{nr
};
3569 my ($self, $mode, $hash, $path) = @_;
3570 if (print { $self->{gui
} } $mode, ' ', $hash, "\t", $path, "\0") {
3571 return ++$self->{nr
};
3578 command_close_pipe
($self->{gui
}, $self->{ctx
});
3581 package Git
::SVN
::GlobSpec
;
3586 my ($class, $glob) = @_;
3588 $re =~ s!/+$!!g; # no need for trailing slashes
3589 my $nr = ($re =~ s!^(.*)\*(.*)$!\(\[^/\]+\)!g);
3590 my ($left, $right) = ($1, $2);
3592 die "Only one '*' wildcard expansion ",
3593 "is supported (got $nr): '$glob'\n";
3594 } elsif ($nr == 0) {
3595 die "One '*' is needed for glob: '$glob'\n";
3597 $re = quotemeta($left) . $re . quotemeta($right);
3598 if (length $left && !($left =~ s!/+$!!g)) {
3599 die "Missing trailing '/' on left side of: '$glob' ($left)\n";
3601 if (length $right && !($right =~ s!^/+!!g)) {
3602 die "Missing leading '/' on right side of: '$glob' ($right)\n";
3604 my $left_re = qr/^\/\Q
$left\E
(\
/|$)/;
3605 bless { left
=> $left, right
=> $right, left_regex
=> $left_re,
3606 regex
=> qr/$re/, glob => $glob }, $class;
3610 my ($self, $path) = @_;
3611 return (length $self->{left
} ?
"$self->{left}/" : '') .
3612 $path . (length $self->{right
} ?
"/$self->{right}" : '');
3620 $remotes = { # returned by read_all_remotes()
3622 # svn-remote.svn.url=https://svn.musicpd.org
3623 url
=> 'https://svn.musicpd.org',
3624 # svn-remote.svn.fetch=mpd/trunk:trunk
3626 'mpd/trunk' => 'trunk',
3628 # svn-remote.svn.tags=mpd/tags/*:tags/*
3633 regex
=> qr!mpd/tags/([^/]+)$!,
3639 regex
=> qr!tags/([^/]+)$!,
3646 $log_entry hashref as returned by libsvn_log_entry
()
3648 log => 'whitespace-formatted log entry
3649 ', # trailing newline is preserved
3650 revision
=> '8', # integer
3651 date
=> '2004-02-24T17:01:44.108345Z', # commit date
3652 author
=> 'committer name'
3656 # this is generated by generate_diff();
3657 @mods = array of diff
-index line hashes
, each element represents one line
3658 of diff
-index output
3660 diff
-index line
($m hash
)
3662 mode_a
=> first column of diff
-index output
, no leading
':',
3663 mode_b
=> second column of diff
-index output
,
3664 sha1_b
=> sha1sum of the final blob
,
3665 chg
=> change type
[MCRADT
],
3666 file_a
=> original file name of a file
(iff chg is
'C' or 'R')
3667 file_b
=> new
/current file name of a file
(any chg
)
3671 # retval of read_url_paths{,_all}();
3673 # repository root url
3674 'https://svn.musicpd.org' => {
3675 # repository path # GIT_SVN_ID
3676 'mpd/trunk' => 'trunk',
3677 'mpd/tags/0.11.5' => 'tags/0.11.5',
3682 I don
't trust the each() function on unless I created %hash myself
3683 because the internal iterator may not have started at base.