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,
59 $_prefix, $_no_checkout, $_verbose);
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 'useSvnsyncProps' => \
$Git::SVN
::_use_svnsync_props
,
70 'log-window-size=i' => \
$Git::SVN
::Ra
::_log_window_size
,
71 'no-checkout' => \
$_no_checkout,
73 'repack-flags|repack-args|repack-opts=s' =>
74 \
$Git::SVN
::_repack_flags
,
77 my ($_trunk, $_tags, $_branches);
79 my %init_opts = ( 'template=s' => \
$_template, 'shared:s' => \
$_shared,
80 'trunk|T=s' => \
$_trunk, 'tags|t=s' => \
$_tags,
81 'branches|b=s' => \
$_branches, 'prefix=s' => \
$_prefix,
82 'no-metadata' => sub { $icv{noMetadata
} = 1 },
83 'use-svm-props' => sub { $icv{useSvmProps
} = 1 },
84 'use-svnsync-props' => sub { $icv{useSvnsyncProps
} = 1 },
85 'rewrite-root=s' => sub { $icv{rewriteRoot
} = $_[1] },
87 my %cmt_opts = ( 'edit|e' => \
$_edit,
88 'rmdir' => \
$SVN::Git
::Editor
::_rmdir
,
89 'find-copies-harder' => \
$SVN::Git
::Editor
::_find_copies_harder
,
90 'l=i' => \
$SVN::Git
::Editor
::_rename_limit
,
91 'copy-similarity|C=i'=> \
$SVN::Git
::Editor
::_cp_similarity
95 fetch
=> [ \
&cmd_fetch
, "Download new revisions from SVN",
96 { 'revision|r=s' => \
$_revision,
97 'fetch-all|all' => \
$_fetch_all,
99 clone
=> [ \
&cmd_clone
, "Initialize and fetch revisions",
100 { 'revision|r=s' => \
$_revision,
101 %fc_opts, %init_opts } ],
102 init
=> [ \
&cmd_init
, "Initialize a repo for tracking" .
103 " (requires URL argument)",
105 'multi-init' => [ \
&cmd_multi_init
,
106 "Deprecated alias for ".
107 "'$0 init -T<trunk> -b<branches> -t<tags>'",
109 dcommit
=> [ \
&cmd_dcommit
,
110 'Commit several diffs to merge with upstream',
111 { 'merge|m|M' => \
$_merge,
112 'strategy|s=s' => \
$_strategy,
113 'verbose|v' => \
$_verbose,
114 'dry-run|n' => \
$_dry_run,
115 'fetch-all|all' => \
$_fetch_all,
116 %cmt_opts, %fc_opts } ],
117 'set-tree' => [ \
&cmd_set_tree
,
118 "Set an SVN repository to a git tree-ish",
119 { 'stdin|' => \
$_stdin, %cmt_opts, %fc_opts, } ],
120 'show-ignore' => [ \
&cmd_show_ignore
, "Show svn:ignore listings",
121 { 'revision|r=i' => \
$_revision } ],
122 'multi-fetch' => [ \
&cmd_multi_fetch
,
123 "Deprecated alias for $0 fetch --all",
124 { 'revision|r=s' => \
$_revision, %fc_opts } ],
125 'migrate' => [ sub { },
126 # no-op, we automatically run this anyways,
127 'Migrate configuration/metadata/layout from
128 previous versions of git-svn',
129 { 'minimize' => \
$Git::SVN
::Migration
::_minimize
,
131 'log' => [ \
&Git
::SVN
::Log
::cmd_show_log
, 'Show commit logs',
132 { 'limit=i' => \
$Git::SVN
::Log
::limit
,
133 'revision|r=s' => \
$_revision,
134 'verbose|v' => \
$Git::SVN
::Log
::verbose
,
135 'incremental' => \
$Git::SVN
::Log
::incremental
,
136 'oneline' => \
$Git::SVN
::Log
::oneline
,
137 'show-commit' => \
$Git::SVN
::Log
::show_commit
,
138 'non-recursive' => \
$Git::SVN
::Log
::non_recursive
,
139 'authors-file|A=s' => \
$_authors,
140 'color' => \
$Git::SVN
::Log
::color
,
141 'pager=s' => \
$Git::SVN
::Log
::pager
,
143 'rebase' => [ \
&cmd_rebase
, "Fetch and rebase your working directory",
144 { 'merge|m|M' => \
$_merge,
145 'verbose|v' => \
$_verbose,
146 'strategy|s=s' => \
$_strategy,
147 'fetch-all|all' => \
$_fetch_all,
149 'commit-diff' => [ \
&cmd_commit_diff
,
150 'Commit a diff between two trees',
151 { 'message|m=s' => \
$_message,
152 'file|F=s' => \
$_file,
153 'revision|r=s' => \
$_revision,
158 for (my $i = 0; $i < @ARGV; $i++) {
159 if (defined $cmd{$ARGV[$i]}) {
166 my %opts = %{$cmd{$cmd}->[2]} if (defined $cmd);
168 read_repo_config
(\
%opts);
169 my $rv = GetOptions
(%opts, 'help|H|h' => \
$_help, 'version|V' => \
$_version,
170 'minimize-connections' => \
$Git::SVN
::Migration
::_minimize
,
171 'id|i=s' => \
$Git::SVN
::default_ref_id
,
172 'svn-remote|remote|R=s' => sub {
173 $Git::SVN
::no_reuse_existing
= 1;
174 $Git::SVN
::default_repo_id
= $_[1] });
175 exit 1 if (!$rv && $cmd ne 'log');
178 version
() if $_version;
179 usage
(1) unless defined $cmd;
180 load_authors
() if $_authors;
181 unless ($cmd =~ /^(?:clone|init|multi-init|commit-diff)$/) {
182 Git
::SVN
::Migration
::migration_check
();
184 Git
::SVN
::init_vars
();
186 Git
::SVN
::verify_remotes_sanity
();
187 $cmd{$cmd}->[0]->(@ARGV);
190 post_fetch_checkout
();
193 ####################### primary functions ######################
195 my $exit = shift || 0;
196 my $fd = $exit ? \
*STDERR
: \
*STDOUT
;
198 git
-svn
- bidirectional operations between a single Subversion tree
and git
199 Usage
: $0 <command
> [options
] [arguments
]\n
201 print $fd "Available commands:\n" unless $cmd;
203 foreach (sort keys %cmd) {
204 next if $cmd && $cmd ne $_;
205 next if /^multi-/; # don't show deprecated commands
206 print $fd ' ',pack('A17',$_),$cmd{$_}->[1],"\n";
207 foreach (keys %{$cmd{$_}->[2]}) {
208 # prints out arguments as they should be passed:
209 my $x = s
#[:=]s$## ? '<arg>' : s#[:=]i$## ? '<num>' : '';
210 print $fd ' ' x
21, join(', ', map { length $_ > 1 ?
212 split /\|/,$_)," $x\n";
216 \nGIT_SVN_ID may be set
in the environment
or via the
--id
/-i switch to an
217 arbitrary identifier
if you
're tracking multiple SVN branches/repositories in
218 one git repository and want to keep them separate. See git-svn(1) for more
225 print "git-svn version $VERSION (svn $SVN::Core::VERSION)\n";
230 unless (-d $ENV{GIT_DIR}) {
231 my @init_db = ('init
');
232 push @init_db, "--template=$_template" if defined $_template;
233 if (defined $_shared) {
234 if ($_shared =~ /[a-z]/) {
235 push @init_db, "--shared=$_shared";
237 push @init_db, "--shared";
240 command_noisy(@init_db);
243 my $pfx = "svn-remote.$Git::SVN::default_repo_id";
244 foreach my $i (keys %icv) {
245 die "'$set' and '$i' cannot both be set\n" if $set;
246 next unless defined $icv{$i};
247 command_noisy('config
', "$pfx.$i", $icv{$i});
253 my $repo_path = shift or return;
254 mkpath([$repo_path]) unless -d $repo_path;
255 chdir $repo_path or die "Couldn't
chdir to
$repo_path: $!\n";
256 $ENV{GIT_DIR} = $repo_path . "/.git
";
260 my ($url, $path) = @_;
261 if (!defined $path &&
262 (defined $_trunk || defined $_branches || defined $_tags) &&
263 $url !~ m#^[a-z\+]+://#) {
266 warn "--path
: $path\n" if defined $path;
267 $path = basename($url) if !defined $path || !length $path;
268 warn "++path
: $path\n" if defined $path;
270 chdir $path or die "Couldn
't chdir to $path\n";
272 Git::SVN::fetch_all($Git::SVN::default_repo_id);
276 if (defined $_trunk || defined $_branches || defined $_tags) {
277 return cmd_multi_init(@_);
279 my $url = shift or die "SVN repository location required ",
280 "as a command-line argument\n";
284 Git::SVN->init($url);
288 if (grep /^\d+=./, @_) {
289 die "'<rev
>=<commit
>' fetch arguments are ",
290 "no longer supported.\n";
294 die "Usage: $0 fetch [--all] [svn-remote]\n";
296 $remote ||= $Git::SVN::default_repo_id;
300 Git::SVN::fetch_all($remote, Git::SVN::read_all_remotes());
306 if ($_stdin || !@commits) {
307 print "Reading from stdin...\n";
310 if (/\b($sha1_short)\b/o) {
311 unshift @commits, $1;
316 foreach my $c (@commits) {
317 my @tmp = command('rev
-parse
',$c);
318 if (scalar @tmp == 1) {
320 } elsif (scalar @tmp > 1) {
321 push @revs, reverse(command('rev
-list
',@tmp));
323 fatal "Failed to rev-parse $c\n";
326 my $gs = Git::SVN->new;
327 my ($r_last, $cmt_last) = $gs->last_rev_commit;
329 if (defined $gs->{last_rev} && $r_last != $gs->{last_rev}) {
330 fatal "There are new revisions that were fetched ",
331 "and need to be merged (or acknowledged) ",
332 "before committing.\nlast rev: $r_last\n",
333 " current: $gs->{last_rev}\n";
335 $gs->set_tree($_) foreach @revs;
336 print "Done committing ",scalar @revs," revisions to SVN\n";
343 my ($url, $rev, $uuid) = working_head_info($head, \@refs);
345 unless (defined $url && defined $rev && defined $uuid) {
346 die "Unable to determine upstream SVN information from ",
349 my $gs = Git::SVN->find_by_url($url);
351 foreach my $d (@refs) {
352 if (!verify_ref("$d~1")) {
354 "has no parent commit, and therefore ",
355 "nothing to diff against.\n",
356 "You should be working from a repository ",
357 "originally created by git-svn\n";
359 unless (defined $last_rev) {
360 (undef, $last_rev, undef) = cmt_metadata("$d~1");
361 unless (defined $last_rev) {
362 fatal "Unable to extract revision information ",
363 "from commit $d~1\n";
367 print "diff-tree $d~1 $d\n";
369 my %ed_opts = ( r => $last_rev,
370 log => get_commit_entry($d)->{log},
371 ra => Git::SVN::Ra->new($url),
375 print "Committed r$_[0]\n";
376 $last_rev = $_[0]; },
378 if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) {
379 print "No changes\n$d~1 == $d\n";
385 warn "Could not determine fetch information for $url\n",
386 "Will not attempt to fetch and rebase commits.\n",
387 "This probably means you have useSvmProps and should\n",
388 "now resync your SVN::Mirror repository.\n";
391 $_fetch_all ? $gs->fetch_all : $gs->fetch;
392 # we always want to rebase against the current HEAD, not any
393 # head that was passed to us
394 my @diff = command('diff
-tree
', 'HEAD
', $gs->refname, '--');
397 @finish = rebase_cmd();
398 print STDERR "W: HEAD and ", $gs->refname, " differ, ",
399 "using @finish:\n", "@diff";
401 print "No changes between current HEAD and ",
402 $gs->refname, "\nResetting to the latest ",
404 @finish = qw/reset --mixed/;
406 command_noisy(@finish, $gs->refname);
410 command_noisy(qw/update-index --refresh/);
411 my $url = (working_head_info('HEAD
'))[0];
413 die "Unable to determine upstream SVN information from ",
414 "working tree history\n";
417 my $gs = Git::SVN->find_by_url($url);
418 if (command(qw/diff-index HEAD --/)) {
419 print STDERR "Cannot rebase with uncommited changes:\n";
420 command_noisy('status
');
423 $_fetch_all ? $gs->fetch_all : $gs->fetch;
424 command_noisy(rebase_cmd(), $gs->refname);
427 sub cmd_show_ignore {
428 my $url = (::working_head_info('HEAD
'))[0];
429 my $gs = Git::SVN->find_by_url($url) || Git::SVN->new;
430 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
431 $gs->traverse_ignore(\*STDOUT, '', $r);
436 unless (defined $_trunk || defined $_branches || defined $_tags) {
440 $_prefix = '' unless defined $_prefix;
445 if (defined $_trunk) {
446 my $trunk_ref = $_prefix . 'trunk
';
447 # try both old-style and new-style lookups:
448 my $gs_trunk = eval { Git::SVN->new($trunk_ref) };
450 my ($trunk_url, $trunk_path) =
451 complete_svn_url($url, $_trunk);
452 $gs_trunk = Git::SVN->init($trunk_url, $trunk_path,
456 return unless defined $_branches || defined $_tags;
457 my $ra = $url ? Git::SVN::Ra->new($url) : undef;
458 complete_url_ls_init($ra, $_branches, '--branches
/-b
', $_prefix);
459 complete_url_ls_init($ra, $_tags, '--tags
/-t', $_prefix . 'tags/');
462 sub cmd_multi_fetch {
463 my $remotes = Git::SVN::read_all_remotes();
464 foreach my $repo_id (sort keys %$remotes) {
465 if ($remotes->{$repo_id}->{url}) {
466 Git::SVN::fetch_all($repo_id, $remotes);
471 # this command is special because it requires no metadata
472 sub cmd_commit_diff {
473 my ($ta, $tb, $url) = @_;
474 my $usage = "Usage: $0 commit-diff -r<revision> ".
475 "<tree-ish> <tree-ish> [<URL>]\n";
476 fatal($usage) if (!defined $ta || !defined $tb);
479 my $gs = eval { Git::SVN->new };
481 fatal("Needed URL or usable git-svn --id in ",
482 "the command-line\n", $usage);
485 $svn_path = $gs->{path};
487 unless (defined $_revision) {
488 fatal("-r|--revision is a required argument\n", $usage);
490 if (defined $_message && defined $_file) {
491 fatal("Both --message/-m and --file/-F specified ",
492 "for the commit message.\n",
493 "I have no idea what you mean\n");
495 if (defined $_file) {
496 $_message = file_to_s($_file);
498 $_message ||= get_commit_entry($tb)->{log};
500 my $ra ||= Git::SVN::Ra->new($url);
501 $svn_path ||= $ra->{svn_path};
504 $r = $ra->get_latest_revnum;
505 } elsif ($r !~ /^\d+$/) {
506 die "revision argument: $r not understood by git-svn\n";
508 my %ed_opts = ( r => $r,
513 editor_cb => sub { print "Committed r$_[0]\n" },
514 svn_path => $svn_path );
515 if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) {
516 print "No changes\n$ta == $tb\n";
520 ########################### utility functions #########################
523 my @cmd = qw/rebase/;
524 push @cmd, '-v
' if $_verbose;
525 push @cmd, qw/--merge/ if $_merge;
526 push @cmd, "--strategy=$_strategy" if $_strategy;
530 sub post_fetch_checkout {
531 return if $_no_checkout;
532 my $gs = $Git::SVN::_head or return;
533 return if verify_ref('refs
/heads/master
^0');
535 my $valid_head = verify_ref('HEAD
^0');
536 command_noisy(qw(update-ref refs/heads/master), $gs->refname);
537 return if ($valid_head || !verify_ref
('HEAD^0'));
539 return if $ENV{GIT_DIR
} !~ m
#^(?:.*/)?\.git$#;
540 my $index = $ENV{GIT_INDEX_FILE
} || "$ENV{GIT_DIR}/index";
543 chomp(my $bare = `git config --bool --get core.bare`);
544 return if $bare eq 'true';
545 return if command_oneline
(qw
/rev-parse --is-inside-git-dir/) eq 'true';
546 command_noisy
(qw
/read-tree -m -u -v HEAD HEAD/);
547 print STDERR
"Checked out HEAD:\n ",
548 $gs->full_url, " r", $gs->last_rev, "\n";
551 sub complete_svn_url
{
552 my ($url, $path) = @_;
554 if ($path !~ m
#^[a-z\+]+://#) {
555 if (!defined $url || $url !~ m
#^[a-z\+]+://#) {
556 fatal
("E: '$path' is not a complete URL ",
557 "and a separate URL is not specified\n");
559 return ($url, $path);
564 sub complete_url_ls_init
{
565 my ($ra, $repo_path, $switch, $pfx) = @_;
566 unless ($repo_path) {
567 print STDERR
"W: $switch not specified\n";
570 $repo_path =~ s
#/+$##;
571 if ($repo_path =~ m
#^[a-z\+]+://#) {
572 $ra = Git
::SVN
::Ra
->new($repo_path);
575 $repo_path =~ s
#^/+##;
577 fatal
("E: '$repo_path' is not a complete URL ",
578 "and a separate URL is not specified\n");
581 my $url = $ra->{url
};
582 my $gs = Git
::SVN
->init($url, undef, undef, undef, 1);
583 my $k = "svn-remote.$gs->{repo_id}.url";
584 my $orig_url = eval { command_oneline
(qw
/config --get/, $k) };
585 if ($orig_url && ($orig_url ne $gs->{url
})) {
586 die "$k already set: $orig_url\n",
587 "wanted to set to: $gs->{url}\n";
589 command_oneline
('config', $k, $gs->{url
}) unless $orig_url;
590 my $remote_path = "$ra->{svn_path}/$repo_path/*";
591 $remote_path =~ s
#/+#/#g;
592 $remote_path =~ s
#^/##g;
593 my ($n) = ($switch =~ /^--(\w+)/);
594 if (length $pfx && $pfx !~ m
#/$#) {
595 die "--prefix='$pfx' must have a trailing slash '/'\n";
597 command_noisy
('config', "svn-remote.$gs->{repo_id}.$n",
598 "$remote_path:refs/remotes/$pfx*");
603 eval { command_oneline
([ 'rev-parse', '--verify', $ref ],
607 sub get_tree_from_treeish
{
609 # $treeish can be a symbolic ref, too:
610 my $type = command_oneline
(qw
/cat-file -t/, $treeish);
612 while ($type eq 'tag') {
613 ($treeish, $type) = command
(qw
/cat-file tag/, $treeish);
615 if ($type eq 'commit') {
616 $expected = (grep /^tree /, command
(qw
/cat-file commit/,
618 ($expected) = ($expected =~ /^tree ($sha1)$/o);
619 die "Unable to get tree from $treeish\n" unless $expected;
620 } elsif ($type eq 'tree') {
621 $expected = $treeish;
623 die "$treeish is a $type, expected tree, tag or commit\n";
628 sub get_commit_entry
{
629 my ($treeish) = shift;
630 my %log_entry = ( log => '', tree
=> get_tree_from_treeish
($treeish) );
631 my $commit_editmsg = "$ENV{GIT_DIR}/COMMIT_EDITMSG";
632 my $commit_msg = "$ENV{GIT_DIR}/COMMIT_MSG";
633 open my $log_fh, '>', $commit_editmsg or croak
$!;
635 my $type = command_oneline
(qw
/cat-file -t/, $treeish);
636 if ($type eq 'commit' || $type eq 'tag') {
637 my ($msg_fh, $ctx) = command_output_pipe
('cat-file',
642 $in_msg = 1 if (/^\s*$/);
643 } elsif (/^git-svn-id: /) {
644 # skip this for now, we regenerate the
645 # correct one on re-fetch anyways
646 # TODO: set *:merge properties or like...
648 print $log_fh $_ or croak
$!;
651 command_close_pipe
($msg_fh, $ctx);
653 close $log_fh or croak
$!;
655 if ($_edit || ($type eq 'tree')) {
656 my $editor = $ENV{VISUAL
} || $ENV{EDITOR
} || 'vi';
657 # TODO: strip out spaces, comments, like git-commit.sh
658 system($editor, $commit_editmsg);
660 rename $commit_editmsg, $commit_msg or croak
$!;
661 open $log_fh, '<', $commit_msg or croak
$!;
662 { local $/; chomp($log_entry{log} = <$log_fh>); }
663 close $log_fh or croak
$!;
669 my ($str, $file, $mode) = @_;
670 open my $fd,'>',$file or croak
$!;
671 print $fd $str,"\n" or croak
$!;
672 close $fd or croak
$!;
673 chmod ($mode &~ umask, $file) if (defined $mode);
678 open my $fd,'<',$file or croak
"$!: file: $file\n";
681 close $fd or croak
$!;
686 # '<svn username> = real-name <email address>' mapping based on git-svnimport:
688 open my $authors, '<', $_authors or die "Can't open $_authors $!\n";
689 my $log = $cmd eq 'log';
692 next unless /^(\S+?|\(no author\))\s*=\s*(.+?)\s*<(.+)>\s*$/;
693 my ($user, $name, $email) = ($1, $2, $3);
695 $Git::SVN
::Log
::rusers
{"$name <$email>"} = $user;
697 $users{$user} = [$name, $email];
700 close $authors or croak
$!;
703 # convert GetOpt::Long specs for use by git-config
704 sub read_repo_config
{
705 return unless -d
$ENV{GIT_DIR
};
708 foreach my $o (keys %$opts) {
709 # if we have mixedCase and a long option-only, then
710 # it's a config-only variable that we don't need for
712 push @config_only, $o if ($o =~ /[A-Z]/ && $o =~ /^[a-z]+$/i);
714 my ($key) = ($o =~ /^([a-zA-Z\-]+)/);
716 my $arg = 'git-config';
717 $arg .= ' --int' if ($o =~ /[:=]i$/);
718 $arg .= ' --bool' if ($o !~ /[:=][sfi]$/);
719 if (ref $v eq 'ARRAY') {
720 chomp(my @tmp = `$arg --get-all svn.$key`);
723 chomp(my $tmp = `$arg --get svn.$key`);
724 if ($tmp && !($arg =~ / --bool/ && $tmp eq 'false')) {
729 delete @
$opts{@config_only} if @config_only;
732 sub extract_metadata
{
733 my $id = shift or return (undef, undef, undef);
734 my ($url, $rev, $uuid) = ($id =~ /^git
-svn
-id
:\s
(\S
+?
)\@
(\d
+)
736 if (!defined $rev || !$uuid || !$url) {
737 # some of the original repositories I made had
738 # identifiers like this:
739 ($rev, $uuid) = ($id =~/^git-svn-id:\s(\d+)\@([a-f\d\-]+)/);
741 return ($url, $rev, $uuid);
745 return extract_metadata
((grep(/^git-svn-id: /,
746 command
(qw
/cat-file commit/, shift)))[-1]);
749 sub working_head_info
{
750 my ($head, $refs) = @_;
751 my ($url, $rev, $uuid);
752 my ($fh, $ctx) = command_output_pipe
('rev-list', $head);
755 ($url, $rev, $uuid) = cmt_metadata
($_);
756 last if (defined $url && defined $rev && defined $uuid);
757 unshift @
$refs, $_ if $refs;
759 close $fh; # break the pipe
766 use vars qw
/$default_repo_id $default_ref_id $_no_metadata $_follow_parent
767 $_repack $_repack_flags $_use_svm_props $_head
768 $_use_svnsync_props $no_reuse_existing/;
770 use File
::Path qw
/mkpath/;
771 use File
::Copy qw
/copy/;
775 # properties that we do not log:
778 %SKIP_PROP = map { $_ => 1 } qw
/svn
:wc
:ra_dav
:version
-url
779 svn
:special svn
:executable
780 svn
:entry
:committed
-rev
781 svn
:entry
:last-author
783 svn
:entry
:committed
-date
/;
785 # some options are read globally, but can be overridden locally
786 # per [svn-remote "..."] section. Command-line options will *NOT*
787 # override options set in an [svn-remote "..."] section
789 foreach (qw
/follow_parent no_metadata use_svm_props
790 use_svnsync_props
/) {
795 return \$self->{-$_} if exists \$self->{-$_};
796 my \$k = \"svn-remote.\$self->{repo_id}\.$key\";
797 eval { command_oneline(qw/config --get/, \$k) };
799 \$self->{-$_} = \$Git::SVN::_$_;
801 my \$v = command_oneline(qw/config --bool/,\$k);
802 \$self->{-$_} = \$v eq 'false' ? 0 : 1;
804 return \$self->{-$_} }\n";
811 END { unlink keys %LOCKFILES if %LOCKFILES }
813 sub resolve_local_globs
{
814 my ($url, $fetch, $glob_spec) = @_;
815 return unless defined $glob_spec;
816 my $ref = $glob_spec->{ref};
817 my $path = $glob_spec->{path
};
818 foreach (command
(qw
#for-each-ref --format=%(refname) refs/remotes#)) {
819 next unless m
#^refs/remotes/$ref->{regex}$#;
821 my $pathname = $path->full_path($p);
822 my $refname = $ref->full_path($p);
823 if (my $existing = $fetch->{$pathname}) {
824 if ($existing ne $refname) {
825 die "Refspec conflict:\n",
826 "existing: refs/remotes/$existing\n",
827 " globbed: refs/remotes/$refname\n";
829 my $u = (::cmt_metadata
("refs/remotes/$refname"))[0];
830 $u =~ s!^\Q$url\E(/|$)!! or die
831 "refs/remotes/$refname: '$url' not found in '$u'\n";
832 if ($pathname ne $u) {
833 warn "W: Refspec glob conflict ",
834 "(ref: refs/remotes/$refname):\n",
835 "expected path: $pathname\n",
837 "Continuing ahead with $u\n";
841 $fetch->{$pathname} = $refname;
846 sub parse_revision_argument
{
847 my ($base, $head) = @_;
848 if (!defined $::_revision
|| $::_revision
eq 'BASE:HEAD') {
849 return ($base, $head);
851 return ($1, $2) if ($::_revision
=~ /^(\d+):(\d+)$/);
852 return ($::_revision
, $::_revision
) if ($::_revision
=~ /^\d+$/);
853 return ($head, $head) if ($::_revision
eq 'HEAD');
854 return ($base, $1) if ($::_revision
=~ /^BASE:(\d+)$/);
855 return ($1, $head) if ($::_revision
=~ /^(\d+):HEAD$/);
856 die "revision argument: $::_revision not understood by git-svn\n";
860 my ($repo_id, $remotes) = @_;
864 $repo_id = $gs->{repo_id
};
866 $remotes ||= read_all_remotes
();
867 my $remote = $remotes->{$repo_id} or
868 die "[svn-remote \"$repo_id\"] unknown\n";
869 my $fetch = $remote->{fetch
};
870 my $url = $remote->{url
} or die "svn-remote.$repo_id.url not defined\n";
872 my $ra = Git
::SVN
::Ra
->new($url);
873 my $uuid = $ra->get_uuid;
874 my $head = $ra->get_latest_revnum;
875 my $base = defined $fetch ?
$head : 0;
877 # read the max revs for wildcard expansion (branches/*, tags/*)
878 foreach my $t (qw
/branches tags/) {
879 defined $remote->{$t} or next;
880 push @globs, $remote->{$t};
881 my $max_rev = eval { tmp_config
(qw
/--int --get/,
882 "svn-remote.$repo_id.${t}-maxRev") };
883 if (defined $max_rev && ($max_rev < $base)) {
885 } elsif (!defined $max_rev) {
891 foreach my $p (sort keys %$fetch) {
892 my $gs = Git
::SVN
->new($fetch->{$p}, $repo_id, $p);
893 my $lr = $gs->rev_db_max;
895 $base = $lr if ($lr < $base);
901 ($base, $head) = parse_revision_argument
($base, $head);
902 $ra->gs_fetch_loop_common($base, $head, \
@gs, \
@globs);
905 sub read_all_remotes
{
907 foreach (grep { s/^svn-remote\.// } command
(qw
/config -l/)) {
908 if (m!^(.+)\.fetch=\s*(.*)\s*:\s*refs/remotes/(.+)\s*$!) {
909 $r->{$1}->{fetch
}->{$2} = $3;
910 } elsif (m!^(.+)\.url=\s*(.*)\s*$!) {
911 $r->{$1}->{url
} = $2;
912 } elsif (m
!^(.+)\
.(branches
|tags
)=
913 (.*):refs
/remotes
/(.+)\s
*$/!x
) {
914 my ($p, $g) = ($3, $4);
915 my $rs = $r->{$1}->{$2} = {
918 path
=> Git
::SVN
::GlobSpec
->new($p),
919 ref => Git
::SVN
::GlobSpec
->new($g) };
920 if (length($rs->{ref}->{right
}) != 0) {
921 die "The '*' glob character must be the last ",
922 "character of '$g'\n";
930 if (defined $_repack) {
931 $_repack = 1000 if ($_repack <= 0);
932 $_repack_nr = $_repack;
933 $_repack_flags ||= '-d';
937 sub verify_remotes_sanity
{
938 return unless -d
$ENV{GIT_DIR
};
940 foreach (command
(qw
/config -l/)) {
941 if (m!^svn-remote\.(?:.+)\.fetch=.*:refs/remotes/(\S+)\s*$!) {
943 die "Remote ref refs/remote/$1 is tracked by",
944 "\n \"$_\"\nand\n \"$seen{$1}\"\n",
945 "Please resolve this ambiguity in ",
946 "your git configuration file before ",
954 # we allow more chars than remotes2config.sh...
955 sub sanitize_remote_name
{
957 $name =~ tr{A-Za-z0-9:,/+-}{.}c;
961 sub find_existing_remote
{
962 my ($url, $remotes) = @_;
963 return undef if $no_reuse_existing;
965 foreach my $repo_id (keys %$remotes) {
966 my $u = $remotes->{$repo_id}->{url
} or next;
968 $existing = $repo_id;
974 sub init_remote_config
{
975 my ($self, $url, $no_write) = @_;
976 $url =~ s!/+$!!; # strip trailing slash
977 my $r = read_all_remotes
();
978 my $existing = find_existing_remote
($url, $r);
981 print STDERR
"Using existing ",
982 "[svn-remote \"$existing\"]\n";
984 $self->{repo_id
} = $existing;
986 my $min_url = Git
::SVN
::Ra
->new($url)->minimize_url;
987 $existing = find_existing_remote
($min_url, $r);
990 print STDERR
"Using existing ",
991 "[svn-remote \"$existing\"]\n";
993 $self->{repo_id
} = $existing;
995 if ($min_url ne $url) {
997 print STDERR
"Using higher level of URL: ",
998 "$url => $min_url\n";
1000 my $old_path = $self->{path
};
1001 $self->{path
} = $url;
1002 $self->{path
} =~ s!^\Q$min_url\E(/|$)!!;
1003 if (length $old_path) {
1004 $self->{path
} .= "/$old_path";
1011 # verify that we aren't overwriting anything:
1013 command_oneline
('config', '--get',
1014 "svn-remote.$self->{repo_id}.url")
1016 if ($orig_url && ($orig_url ne $url)) {
1017 die "svn-remote.$self->{repo_id}.url already set: ",
1018 "$orig_url\nwanted to set to: $url\n";
1021 my ($xrepo_id, $xpath) = find_ref
($self->refname);
1022 if (defined $xpath) {
1023 die "svn-remote.$xrepo_id.fetch already set to track ",
1024 "$xpath:refs/remotes/", $self->refname, "\n";
1026 unless ($no_write) {
1027 command_noisy
('config',
1028 "svn-remote.$self->{repo_id}.url", $url);
1029 command_noisy
('config', '--add',
1030 "svn-remote.$self->{repo_id}.fetch",
1031 "$self->{path}:".$self->refname);
1033 $self->{url
} = $url;
1036 sub find_by_url
{ # repos_root and, path are optional
1037 my ($class, $full_url, $repos_root, $path) = @_;
1038 return undef unless defined $full_url;
1039 my $remotes = read_all_remotes
();
1040 if (defined $full_url && defined $repos_root && !defined $path) {
1042 $path =~ s
#^\Q$repos_root\E(?:/|$)##;
1044 foreach my $repo_id (keys %$remotes) {
1045 my $u = $remotes->{$repo_id}->{url
} or next;
1046 next if defined $repos_root && $repos_root ne $u;
1048 my $fetch = $remotes->{$repo_id}->{fetch
} || {};
1049 foreach (qw
/branches tags/) {
1050 resolve_local_globs
($u, $fetch,
1051 $remotes->{$repo_id}->{$_});
1054 unless (defined $p) {
1056 $p =~ s
#^\Q$u\E(?:/|$)## or next;
1058 foreach my $f (keys %$fetch) {
1060 return Git
::SVN
->new($fetch->{$f}, $repo_id, $f);
1067 my ($class, $url, $path, $repo_id, $ref_id, $no_write) = @_;
1068 my $self = _new
($class, $repo_id, $ref_id, $path);
1070 $self->init_remote_config($url, $no_write);
1077 foreach (command
(qw
/config -l/)) {
1078 next unless m
!^svn
-remote\
.(.+)\
.fetch
=
1079 \s
*(.*)\s
*:\s
*refs
/remotes/(.+)\s
*$!x
;
1080 my ($repo_id, $path, $ref) = ($1, $2, $3);
1081 if ($ref eq $ref_id) {
1082 $path = '' if ($path =~ m
#^\./?#);
1083 return ($repo_id, $path);
1086 (undef, undef, undef);
1090 my ($class, $ref_id, $repo_id, $path) = @_;
1091 if (defined $ref_id && !defined $repo_id && !defined $path) {
1092 ($repo_id, $path) = find_ref
($ref_id);
1093 if (!defined $repo_id) {
1094 die "Could not find a \"svn-remote.*.fetch\" key ",
1095 "in the repository configuration matching: ",
1096 "refs/remotes/$ref_id\n";
1099 my $self = _new
($class, $repo_id, $ref_id, $path);
1100 if (!defined $self->{path
} || !length $self->{path
}) {
1101 my $fetch = command_oneline
('config', '--get',
1102 "svn-remote.$repo_id.fetch",
1103 ":refs/remotes/$ref_id\$") or
1104 die "Failed to read \"svn-remote.$repo_id.fetch\" ",
1105 "\":refs/remotes/$ref_id\$\" in config\n";
1106 ($self->{path
}, undef) = split(/\s*:\s*/, $fetch);
1108 $self->{url
} = command_oneline
('config', '--get',
1109 "svn-remote.$repo_id.url") or
1110 die "Failed to read \"svn-remote.$repo_id.url\" in config\n";
1115 sub refname
{ "refs/remotes/$_[0]->{ref_id}" }
1119 return $self->{svm
}->{uuid
} if $self->svm;
1121 unless ($self->{svm
}) {
1122 die "SVM UUID not cached, and reading remotely failed\n";
1124 $self->{svm
}->{uuid
};
1129 return $self->{svm
} if $self->{svm
};
1131 # see if we have it in our config, first:
1133 my $section = "svn-remote.$self->{repo_id}";
1135 source
=> tmp_config
('--get', "$section.svm-source"),
1136 uuid
=> tmp_config
('--get', "$section.svm-uuid"),
1137 replace
=> tmp_config
('--get', "$section.svm-replace"),
1140 if ($svm && $svm->{source
} && $svm->{uuid
} && $svm->{replace
}) {
1141 $self->{svm
} = $svm;
1147 my ($self, $ra) = @_;
1148 return $ra if $self->svm;
1150 my @err = ( "useSvmProps set, but failed to read SVM properties\n",
1151 "(svm:source, svm:uuid) ",
1152 "from the following URLs:\n" );
1153 sub read_svm_props
{
1154 my ($self, $ra, $path, $r) = @_;
1155 my $props = ($ra->get_dir($path, $r))[2];
1156 my $src = $props->{'svm:source'};
1157 my $uuid = $props->{'svm:uuid'};
1158 return undef if (!$src || !$uuid);
1162 $uuid =~ m{^[0-9a-f\-]{30,}$}
1163 or die "doesn't look right - svm:uuid is '$uuid'\n";
1165 # the '!' is used to mark the repos_root!/relative/path
1166 $src =~ s{/?!/?}{/};
1167 $src =~ s{/+$}{}; # no trailing slashes please
1168 # username is of no interest
1169 $src =~ s{(^[a-z\+]*://)[^/@]*@}{$1};
1171 my $replace = $ra->{url
};
1172 $replace .= "/$path" if length $path;
1174 my $section = "svn-remote.$self->{repo_id}";
1175 tmp_config
("$section.svm-source", $src);
1176 tmp_config
("$section.svm-replace", $replace);
1177 tmp_config
("$section.svm-uuid", $uuid);
1185 my $r = $ra->get_latest_revnum;
1186 my $path = $self->{path
};
1188 while (length $path) {
1189 unless ($tried{"$self->{url}/$path"}) {
1190 return $ra if $self->read_svm_props($ra, $path, $r);
1191 $tried{"$self->{url}/$path"} = 1;
1193 $path =~ s
#/?[^/]+$##;
1195 die "Path: '$path' should be ''\n" if $path ne '';
1196 return $ra if $self->read_svm_props($ra, $path, $r);
1197 $tried{"$self->{url}/$path"} = 1;
1199 if ($ra->{repos_root
} eq $self->{url
}) {
1200 die @err, (map { " $_\n" } keys %tried), "\n";
1203 # nope, make sure we're connected to the repository root:
1206 $path = $ra->{svn_path
};
1207 $ra = Git
::SVN
::Ra
->new($ra->{repos_root
});
1208 while (length $path) {
1209 unless ($tried{"$ra->{url}/$path"}) {
1210 $ok = $self->read_svm_props($ra, $path, $r);
1212 $tried{"$ra->{url}/$path"} = 1;
1214 $path =~ s
#/?[^/]+$##;
1216 die "Path: '$path' should be ''\n" if $path ne '';
1217 $ok ||= $self->read_svm_props($ra, $path, $r);
1218 $tried{"$ra->{url}/$path"} = 1;
1220 die @err, (map { " $_\n" } keys %tried), "\n";
1222 Git
::SVN
::Ra
->new($self->{url
});
1227 return $self->{svnsync
} if $self->{svnsync
};
1229 if ($self->no_metadata) {
1230 die "Can't have both 'noMetadata' and ",
1231 "'useSvnsyncProps' options set!\n";
1233 if ($self->rewrite_root) {
1234 die "Can't have both 'useSvnsyncProps' and 'rewriteRoot' ",
1239 # see if we have it in our config, first:
1241 my $section = "svn-remote.$self->{repo_id}";
1243 url
=> tmp_config
('--get', "$section.svnsync-url"),
1244 uuid
=> tmp_config
('--get', "$section.svnsync-uuid"),
1247 if ($svnsync && $svnsync->{url
} && $svnsync->{uuid
}) {
1248 return $self->{svnsync
} = $svnsync;
1251 my $err = "useSvnsyncProps set, but failed to read " .
1252 "svnsync property: svn:sync-from-";
1253 my $rp = $self->ra->rev_proplist(0);
1255 my $url = $rp->{'svn:sync-from-url'} or die $err . "url\n";
1256 $url =~ m{^[a-z\+]+://} or
1257 die "doesn't look right - svn:sync-from-url is '$url'\n";
1259 my $uuid = $rp->{'svn:sync-from-uuid'} or die $err . "uuid\n";
1260 $uuid =~ m{^[0-9a-f\-]{30,}$} or
1261 die "doesn't look right - svn:sync-from-uuid is '$uuid'\n";
1263 my $section = "svn-remote.$self->{repo_id}";
1264 tmp_config
('--add', "$section.svnsync-uuid", $uuid);
1265 tmp_config
('--add', "$section.svnsync-url", $url);
1266 return $self->{svnsync
} = { url
=> $url, uuid
=> $uuid };
1269 # this allows us to memoize our SVN::Ra UUID locally and avoid a
1270 # remote lookup (useful for 'git svn log').
1273 unless ($self->{ra_uuid
}) {
1274 my $key = "svn-remote.$self->{repo_id}.uuid";
1275 my $uuid = eval { tmp_config
('--get', $key) };
1276 if (!$@
&& $uuid && $uuid =~ /^([a-f\d\-]{30,})$/) {
1277 $self->{ra_uuid
} = $uuid;
1279 die "ra_uuid called without URL\n" unless $self->{url
};
1280 $self->{ra_uuid
} = $self->ra->get_uuid;
1281 tmp_config
('--add', $key, $self->{ra_uuid
});
1289 my $ra = Git
::SVN
::Ra
->new($self->{url
});
1290 if ($self->use_svm_props && !$self->{svm
}) {
1291 if ($self->no_metadata) {
1292 die "Can't have both 'noMetadata' and ",
1293 "'useSvmProps' options set!\n";
1294 } elsif ($self->use_svnsync_props) {
1295 die "Can't have both 'useSvnsyncProps' and ",
1296 "'useSvmProps' options set!\n";
1298 $ra = $self->_set_svm_vars($ra);
1299 $self->{-want_revprops
} = 1;
1306 my $repos_root = $self->ra->{repos_root
};
1307 return $self->{path
} if ($self->{url
} eq $repos_root);
1308 die "BUG: rel_path failed! repos_root: $repos_root, Ra URL: ",
1309 $self->ra->{url
}, " path: $self->{path}, URL: $self->{url}\n";
1312 sub traverse_ignore
{
1313 my ($self, $fh, $path, $r) = @_;
1316 my ($dirent, undef, $props) = $ra->get_dir($path, $r);
1318 $p =~ s
#^\Q$ra->{svn_path}\E/##;
1319 print $fh length $p ?
"\n# $p\n" : "\n# /\n";
1320 if (my $s = $props->{'svn:ignore'}) {
1321 $s =~ s/[\r\n]+/\n/g;
1323 if (length $p == 0) {
1327 $s =~ s
#\n#\n/$p/#g;
1328 print $fh "/$p/$s\n";
1331 foreach (sort keys %$dirent) {
1332 next if $dirent->{$_}->kind != $SVN::Node
::dir
;
1333 $self->traverse_ignore($fh, "$path/$_", $r);
1337 sub last_rev
{ ($_[0]->last_rev_commit)[0] }
1338 sub last_commit
{ ($_[0]->last_rev_commit)[1] }
1340 # returns the newest SVN revision number and newest commit SHA1
1341 sub last_rev_commit
{
1343 if (defined $self->{last_rev
} && defined $self->{last_commit
}) {
1344 return ($self->{last_rev
}, $self->{last_commit
});
1346 my $c = ::verify_ref
($self->refname.'^0');
1347 if ($c && !$self->use_svm_props && !$self->no_metadata) {
1348 my $rev = (::cmt_metadata
($c))[1];
1350 ($self->{last_rev
}, $self->{last_commit
}) = ($rev, $c);
1354 my $db_path = $self->db_path;
1355 unless (-e
$db_path) {
1356 ($self->{last_rev
}, $self->{last_commit
}) = (undef, undef);
1357 return (undef, undef);
1359 my $offset = -41; # from tail
1361 open my $fh, '<', $db_path or croak
"$db_path not readable: $!\n";
1362 sysseek($fh, $offset, 2); # don't care for errors
1363 sysread($fh, $rl, 41) == 41 or return (undef, undef);
1365 while (('0' x40
) eq $rl && sysseek($fh, 0, 1) != 0) {
1367 sysseek($fh, $offset, 2); # don't care for errors
1368 sysread($fh, $rl, 41) == 41 or return (undef, undef);
1371 if ($c && $c ne $rl) {
1372 die "$db_path and ", $self->refname,
1373 " inconsistent!:\n$c != $rl\n";
1375 my $rev = sysseek($fh, 0, 1) or croak
$!;
1376 $rev = ($rev - 41) / 41;
1377 close $fh or croak
$!;
1378 ($self->{last_rev
}, $self->{last_commit
}) = ($rev, $c);
1382 sub get_fetch_range
{
1383 my ($self, $min, $max) = @_;
1384 $max ||= $self->ra->get_latest_revnum;
1385 $min ||= $self->rev_db_max;
1391 my $old_def_config = "$ENV{GIT_DIR}/svn/config";
1392 my $config = "$ENV{GIT_DIR}/svn/.metadata";
1393 if (-e
$old_def_config && ! -e
$config) {
1394 rename $old_def_config, $config or
1395 die "Failed rename $old_def_config => $config: $!\n";
1397 my $old_config = $ENV{GIT_CONFIG
};
1398 $ENV{GIT_CONFIG
} = $config;
1401 unless (-f
$config) {
1403 open my $fh, '>', $config or
1404 die "Can't open $config: $!\n";
1405 print $fh "; This file is used internally by ",
1407 "Couldn't write to $config: $!\n";
1408 print $fh "; You should not have to edit it\n" or
1409 die "Couldn't write to $config: $!\n";
1410 close $fh or die "Couldn't close $config: $!\n";
1412 command
('config', @args);
1415 if (defined $old_config) {
1416 $ENV{GIT_CONFIG
} = $old_config;
1418 delete $ENV{GIT_CONFIG
};
1421 wantarray ?
@ret : $ret[0];
1425 my ($self, $sub) = @_;
1426 my $old_index = $ENV{GIT_INDEX_FILE
};
1427 $ENV{GIT_INDEX_FILE
} = $self->{index};
1430 my ($dir, $base) = ($self->{index} =~ m
#^(.*?)/?([^/]+)$#);
1431 mkpath
([$dir]) unless -d
$dir;
1435 if (defined $old_index) {
1436 $ENV{GIT_INDEX_FILE
} = $old_index;
1438 delete $ENV{GIT_INDEX_FILE
};
1441 wantarray ?
@ret : $ret[0];
1444 sub assert_index_clean
{
1445 my ($self, $treeish) = @_;
1447 $self->tmp_index_do(sub {
1448 command_noisy
('read-tree', $treeish) unless -e
$self->{index};
1449 my $x = command_oneline
('write-tree');
1450 my ($y) = (command
(qw
/cat-file commit/, $treeish) =~
1451 /^tree ($::sha1)/mo);
1454 warn "Index mismatch: $y != $x\nrereading $treeish\n";
1455 unlink $self->{index} or die "unlink $self->{index}: $!\n";
1456 command_noisy
('read-tree', $treeish);
1457 $x = command_oneline
('write-tree');
1459 ::fatal
"trees ($treeish) $y != $x\n",
1460 "Something is seriously wrong...\n";
1465 sub get_commit_parents
{
1466 my ($self, $log_entry) = @_;
1467 my (%seen, @ret, @tmp);
1468 # legacy support for 'set-tree'; this is only used by set_tree_cb:
1469 if (my $ip = $self->{inject_parents
}) {
1470 if (my $commit = delete $ip->{$log_entry->{revision
}}) {
1474 if (my $cur = ::verify_ref
($self->refname.'^0')) {
1477 push @tmp, $_ foreach (@
{$log_entry->{parents
}}, @tmp);
1478 while (my $p = shift @tmp) {
1482 # MAXPARENT is defined to 16 in commit-tree.c:
1486 die "r$log_entry->{revision}: No room for parents:\n\t",
1487 join("\n\t", @tmp), "\n";
1494 return $self->{-rewrite_root
} if exists $self->{-rewrite_root
};
1495 my $k = "svn-remote.$self->{repo_id}.rewriteRoot";
1496 my $rwr = eval { command_oneline
(qw
/config --get/, $k) };
1499 if ($rwr !~ m
#^[a-z\+]+://#) {
1500 die "$rwr is not a valid URL (key: $k)\n";
1503 $self->{-rewrite_root
} = $rwr;
1508 ($self->rewrite_root || $self->{url
}) .
1509 (length $self->{path
} ?
'/' . $self->{path
} : '');
1514 $self->{url
} . (length $self->{path
} ?
'/' . $self->{path
} : '');
1518 my ($self, $log_entry) = @_;
1519 my $lr = $self->last_rev;
1520 if (defined $lr && $lr >= $log_entry->{revision
}) {
1521 die "Last fetched revision of ", $self->refname,
1522 " was r$lr, but we are about to fetch: ",
1523 "r$log_entry->{revision}!\n";
1525 if (my $c = $self->rev_db_get($log_entry->{revision
})) {
1526 croak
"$log_entry->{revision} = $c already exists! ",
1527 "Why are we refetching it?\n";
1529 $ENV{GIT_AUTHOR_NAME
} = $ENV{GIT_COMMITTER_NAME
} = $log_entry->{name
};
1530 $ENV{GIT_AUTHOR_EMAIL
} = $ENV{GIT_COMMITTER_EMAIL
} =
1531 $log_entry->{email
};
1532 $ENV{GIT_AUTHOR_DATE
} = $ENV{GIT_COMMITTER_DATE
} = $log_entry->{date
};
1534 my $tree = $log_entry->{tree
};
1535 if (!defined $tree) {
1536 $tree = $self->tmp_index_do(sub {
1537 command_oneline
('write-tree') });
1539 die "Tree is not a valid sha1: $tree\n" if $tree !~ /^$::sha1$/o;
1541 my @exec = ('git-commit-tree', $tree);
1542 foreach ($self->get_commit_parents($log_entry)) {
1543 push @exec, '-p', $_;
1545 defined(my $pid = open3
(my $msg_fh, my $out_fh, '>&STDERR', @exec))
1547 print $msg_fh $log_entry->{log} or croak
$!;
1548 unless ($self->no_metadata) {
1549 print $msg_fh "\ngit-svn-id: $log_entry->{metadata}\n"
1552 $msg_fh->flush == 0 or croak
$!;
1553 close $msg_fh or croak
$!;
1554 chomp(my $commit = do { local $/; <$out_fh> });
1555 close $out_fh or croak
$!;
1558 if ($commit !~ /^$::sha1$/o) {
1559 die "Failed to commit, invalid sha1: $commit\n";
1562 $self->rev_db_set($log_entry->{revision
}, $commit, 1);
1564 $self->{last_rev
} = $log_entry->{revision
};
1565 $self->{last_commit
} = $commit;
1566 print "r$log_entry->{revision}";
1567 if (defined $log_entry->{svm_revision
}) {
1568 print " (\@$log_entry->{svm_revision})";
1569 $self->rev_db_set($log_entry->{svm_revision
}, $commit,
1570 0, $self->svm_uuid);
1572 print " = $commit ($self->{ref_id})\n";
1573 if (defined $_repack && (--$_repack_nr == 0)) {
1574 $_repack_nr = $_repack;
1575 # repack doesn't use any arguments with spaces in them, does it?
1576 print "Running git repack $_repack_flags ...\n";
1577 command_noisy
('repack', split(/\s+/, $_repack_flags));
1578 print "Done repacking\n";
1584 my ($self, $paths, $r) = @_;
1585 return 1 if $self->{path
} eq '';
1586 if (my $path = $paths->{"/$self->{path}"}) {
1587 return ($path->{action
} eq 'D') ?
0 : 1;
1589 $self->{path_regex
} ||= qr/^\/\Q
$self->{path
}\E\
//;
1590 if (grep /$self->{path_regex}/, keys %$paths) {
1594 foreach (split m
#/#, $self->{path}) {
1596 next unless ($paths->{$c} &&
1597 ($paths->{$c}->{action
} =~ /^[AR]$/));
1598 if ($self->ra->check_path($self->{path
}, $r) ==
1606 sub find_parent_branch
{
1607 my ($self, $paths, $rev) = @_;
1608 return undef unless $self->follow_parent;
1609 unless (defined $paths) {
1610 my $err_handler = $SVN::Error
::handler
;
1611 $SVN::Error
::handler
= \
&Git
::SVN
::Ra
::skip_unknown_revs
;
1612 $self->ra->get_log([$self->{path
}], $rev, $rev, 0, 1, 1, sub {
1614 Git
::SVN
::Ra
::dup_changed_paths
($_[0]) });
1615 $SVN::Error
::handler
= $err_handler;
1617 return undef unless defined $paths;
1619 # look for a parent from another branch:
1620 my @b_path_components = split m
#/#, $self->rel_path;
1621 my @a_path_components;
1623 while (@b_path_components) {
1624 $i = $paths->{'/'.join('/', @b_path_components)};
1625 last if $i && defined $i->{copyfrom_path
};
1626 unshift(@a_path_components, pop(@b_path_components));
1628 return undef unless defined $i && defined $i->{copyfrom_path
};
1629 my $branch_from = $i->{copyfrom_path
};
1630 if (@a_path_components) {
1631 print STDERR
"branch_from: $branch_from => ";
1632 $branch_from .= '/'.join('/', @a_path_components);
1633 print STDERR
$branch_from, "\n";
1635 my $r = $i->{copyfrom_rev
};
1636 my $repos_root = $self->ra->{repos_root
};
1637 my $url = $self->ra->{url
};
1638 my $new_url = $repos_root . $branch_from;
1639 print STDERR
"Found possible branch point: ",
1640 "$new_url => ", $self->full_url, ", $r\n";
1641 $branch_from =~ s
#^/##;
1642 my $gs = Git
::SVN
->find_by_url($new_url, $repos_root, $branch_from);
1644 my $ref_id = $self->{ref_id
};
1645 $ref_id =~ s/\@\d+$//;
1647 # just grow a tail if we're not unique enough :x
1648 $ref_id .= '-' while find_ref
($ref_id);
1649 print STDERR
"Initializing parent: $ref_id\n";
1650 $gs = Git
::SVN
->init($new_url, '', $ref_id, $ref_id, 1);
1652 my ($r0, $parent) = $gs->find_rev_before($r, 1);
1653 if (!defined $r0 || !defined $parent) {
1655 ($r0, $parent) = $gs->last_rev_commit;
1657 if (defined $r0 && defined $parent) {
1658 print STDERR
"Found branch parent: ($self->{ref_id}) $parent\n";
1659 $self->assert_index_clean($parent);
1661 if ($self->ra->can_do_switch) {
1662 print STDERR
"Following parent with do_switch\n";
1663 # do_switch works with svn/trunk >= r22312, but that
1664 # is not included with SVN 1.4.3 (the latest version
1665 # at the moment), so we can't rely on it
1666 $self->{last_commit
} = $parent;
1667 $ed = SVN
::Git
::Fetcher
->new($self);
1668 $gs->ra->gs_do_switch($r0, $rev, $gs,
1669 $self->full_url, $ed)
1670 or die "SVN connection failed somewhere...\n";
1672 print STDERR
"Following parent with do_update\n";
1673 $ed = SVN
::Git
::Fetcher
->new($self);
1674 $self->ra->gs_do_update($rev, $rev, $self, $ed)
1675 or die "SVN connection failed somewhere...\n";
1677 print STDERR
"Successfully followed parent\n";
1678 return $self->make_log_entry($rev, [$parent], $ed);
1684 my ($self, $paths, $rev) = @_;
1686 my ($last_rev, @parents);
1687 if (my $lc = $self->last_commit) {
1688 # we can have a branch that was deleted, then re-added
1689 # under the same name but copied from another path, in
1690 # which case we'll have multiple parents (we don't
1691 # want to break the original ref, nor lose copypath info):
1692 if (my $log_entry = $self->find_parent_branch($paths, $rev)) {
1693 push @
{$log_entry->{parents
}}, $lc;
1696 $ed = SVN
::Git
::Fetcher
->new($self);
1697 $last_rev = $self->{last_rev
};
1702 if (my $log_entry = $self->find_parent_branch($paths, $rev)) {
1705 $ed = SVN
::Git
::Fetcher
->new($self);
1707 unless ($self->ra->gs_do_update($last_rev, $rev, $self, $ed)) {
1708 die "SVN connection failed somewhere...\n";
1710 $self->make_log_entry($rev, \
@parents, $ed);
1714 my ($self, $ed) = @_;
1716 my $h = $ed->{empty
};
1717 foreach (sort keys %$h) {
1718 my $act = $h->{$_} ?
'+empty_dir' : '-empty_dir';
1719 push @out, " $act: " . uri_encode
($_);
1720 warn "W: $act: $_\n";
1722 foreach my $t (qw
/dir_prop file_prop/) {
1723 $h = $ed->{$t} or next;
1724 foreach my $path (sort keys %$h) {
1725 my $ppath = $path eq '' ?
'.' : $path;
1726 foreach my $prop (sort keys %{$h->{$path}}) {
1727 next if $SKIP_PROP{$prop};
1728 my $v = $h->{$path}->{$prop};
1729 my $t_ppath_prop = "$t: " .
1730 uri_encode
($ppath) . ' ' .
1733 push @out, " +$t_ppath_prop " .
1736 push @out, " -$t_ppath_prop";
1741 foreach my $t (qw
/absent_file absent_directory/) {
1742 $h = $ed->{$t} or next;
1743 foreach my $parent (sort keys %$h) {
1744 foreach my $path (sort @
{$h->{$parent}}) {
1745 push @out, " $t: " .
1746 uri_encode
("$parent/$path");
1747 warn "W: $t: $parent/$path ",
1748 "Insufficient permissions?\n";
1755 sub parse_svn_date
{
1756 my $date = shift || return '+0000 1970-01-01 00:00:00';
1757 my ($Y,$m,$d,$H,$M,$S) = ($date =~ /^(\d
{4})\
-(\d\d
)\
-(\d\d
)T
1758 (\d\d
)\
:(\d\d
)\
:(\d\d
).\d
+Z
$/x
) or
1759 croak
"Unable to parse date: $date\n";
1760 "+0000 $Y-$m-$d $H:$M:$S";
1765 if (!defined $author || length $author == 0) {
1766 $author = '(no author)';
1768 if (defined $::_authors
&& ! defined $::users
{$author}) {
1769 die "Author: $author not defined in $::_authors file\n";
1774 sub make_log_entry
{
1775 my ($self, $rev, $parents, $ed) = @_;
1776 my $untracked = $self->get_untracked($ed);
1778 open my $un, '>>', "$self->{dir}/unhandled.log" or croak
$!;
1779 print $un "r$rev\n" or croak
$!;
1780 print $un $_, "\n" foreach @
$untracked;
1781 my %log_entry = ( parents
=> $parents || [], revision
=> $rev,
1785 my $logged = delete $self->{logged_rev_props
};
1786 if (!$logged || $self->{-want_revprops
}) {
1787 my $rp = $self->ra->rev_proplist($rev);
1788 foreach (sort keys %$rp) {
1790 if (/^svn:(author|date|log)$/) {
1791 $log_entry{$1} = $v;
1792 } elsif ($_ eq 'svm:headrev') {
1795 print $un " rev_prop: ", uri_encode
($_), ' ',
1796 uri_encode
($v), "\n";
1800 map { $log_entry{$_} = $logged->{$_} } keys %$logged;
1802 close $un or croak
$!;
1804 $log_entry{date
} = parse_svn_date
($log_entry{date
});
1805 $log_entry{log} .= "\n";
1806 my $author = $log_entry{author
} = check_author
($log_entry{author
});
1807 my ($name, $email) = defined $::users
{$author} ? @
{$::users
{$author}}
1809 if (defined $headrev && $self->use_svm_props) {
1810 if ($self->rewrite_root) {
1811 die "Can't have both 'useSvmProps' and 'rewriteRoot' ",
1814 my ($uuid, $r) = $headrev =~ m{^([a-f\d\-]{30,}):(\d
+)$};
1815 # we don't want "SVM: initializing mirror for junk" ...
1816 return undef if $r == 0;
1817 my $svm = $self->svm;
1818 if ($uuid ne $svm->{uuid
}) {
1819 die "UUID mismatch on SVM path:\n",
1820 "expected: $svm->{uuid}\n",
1823 my $full_url = $self->full_url;
1824 $full_url =~ s
#^\Q$svm->{replace}\E(/|$)#$svm->{source}$1# or
1825 die "Failed to replace '$svm->{replace}' with ",
1826 "'$svm->{source}' in $full_url\n";
1827 $log_entry{metadata
} = "$full_url\@$r $uuid";
1828 $log_entry{svm_revision
} = $r;
1829 $email ||= "$author\@$uuid"
1830 } elsif ($self->use_svnsync_props) {
1831 my $full_url = $self->svnsync->{url
};
1832 $full_url .= "/$self->{path}" if length $self->{path
};
1833 my $uuid = $self->svnsync->{uuid
};
1834 $log_entry{metadata
} = "$full_url\@$rev $uuid";
1835 $email ||= "$author\@$uuid"
1837 $log_entry{metadata
} = $self->metadata_url. "\@$rev " .
1838 $self->ra->get_uuid;
1839 $email ||= "$author\@" . $self->ra->get_uuid;
1841 $log_entry{name
} = $name;
1842 $log_entry{email
} = $email;
1847 my ($self, $min_rev, $max_rev, @parents) = @_;
1848 my ($last_rev, $last_commit) = $self->last_rev_commit;
1849 my ($base, $head) = $self->get_fetch_range($min_rev, $max_rev);
1850 $self->ra->gs_fetch_loop_common($base, $head, [$self]);
1854 my ($self, $log_entry, $tree, $rev, $date, $author) = @_;
1855 $self->{inject_parents
} = { $rev => $tree };
1856 $self->fetch(undef, undef);
1860 my ($self, $tree) = (shift, shift);
1861 my $log_entry = ::get_commit_entry
($tree);
1862 unless ($self->{last_rev
}) {
1863 fatal
("Must have an existing revision to commit\n");
1865 my %ed_opts = ( r
=> $self->{last_rev
},
1866 log => $log_entry->{log},
1868 tree_a
=> $self->{last_commit
},
1871 $self->set_tree_cb($log_entry, $tree, @_) },
1872 svn_path
=> $self->{path
} );
1873 if (!SVN
::Git
::Editor
->new(\
%ed_opts)->apply_diff) {
1874 print "No changes\nr$self->{last_rev} = $tree\n";
1880 my $db_path = $self->db_path;
1881 return if (-e
$db_path && ! -z
$db_path);
1882 return unless ::verify_ref
($self->refname.'^0');
1883 if (-f
$self->{db_root
}) {
1884 rename $self->{db_root
}, $db_path or die
1885 "rename $self->{db_root} => $db_path failed: $!\n";
1886 my ($dir, $base) = ($db_path =~ m
#^(.*?)/?([^/]+)$#);
1887 symlink $base, $self->{db_root
} or die
1888 "symlink $base => $self->{db_root} failed: $!\n";
1891 print "Rebuilding $db_path ...\n";
1892 my ($rev_list, $ctx) = command_output_pipe
("rev-list", $self->refname);
1894 my $full_url = $self->full_url;
1896 while (<$rev_list>) {
1899 die "Non-SHA1: $c\n" unless $c =~ /^$::sha1$/o;
1900 my ($url, $rev, $uuid) = ::cmt_metadata
($c);
1902 # ignore merges (from set-tree)
1903 next if (!defined $rev || !$uuid);
1905 # if we merged or otherwise started elsewhere, this is
1906 # how we break out of it
1907 if ((defined $svn_uuid && ($uuid ne $svn_uuid)) ||
1908 ($full_url && $url && ($url ne $full_url))) {
1912 $svn_uuid ||= $uuid;
1914 $self->rev_db_set($rev, $c);
1915 print "r$rev = $c\n";
1917 command_close_pipe
($rev_list, $ctx);
1918 print "Done rebuilding $db_path\n";
1922 # Tie::File seems to be prone to offset errors if revisions get sparse,
1923 # it's not that fast, either. Tie::File is also not in Perl 5.6. So
1924 # one of my favorite modules is out :< Next up would be one of the DBM
1925 # modules, but I'm not sure which is most portable... So I'll just
1926 # go with something that's plain-text, but still capable of
1927 # being randomly accessed. So here's my ultra-simple fixed-width
1928 # database. All records are 40 characters + "\n", so it's easy to seek
1929 # to a revision: (41 * rev) is the byte offset.
1930 # A record of 40 0s denotes an empty revision.
1931 # And yes, it's still pretty fast (faster than Tie::File).
1932 # These files are disposable unless noMetadata or useSvmProps is set
1935 my ($fh, $rev, $commit) = @_;
1936 my $offset = $rev * 41;
1937 # assume that append is the common case:
1938 seek $fh, 0, 2 or croak
$!;
1940 if ($pos < $offset) {
1941 for (1 .. (($offset - $pos) / 41)) {
1942 print $fh (('0' x
40),"\n") or croak
$!;
1945 seek $fh, $offset, 0 or croak
$!;
1946 print $fh $commit,"\n" or croak
$!;
1952 my ($dir, $base) = ($path =~ m
#^(.*?)/?([^/]+)$#);
1953 mkpath
([$dir]) unless -d
$dir;
1954 open my $fh, '>>', $path or die "Couldn't create $path: $!\n";
1955 close $fh or die "Couldn't close (create) $path: $!\n";
1960 my ($self, $rev, $commit, $update_ref, $uuid) = @_;
1961 length $commit == 40 or die "arg3 must be a full SHA1 hexsum\n";
1962 my $db = $self->db_path($uuid);
1963 my $db_lock = "$db.lock";
1966 $SIG{INT
} = $SIG{HUP
} = $SIG{TERM
} = $SIG{ALRM
} = $SIG{PIPE
} =
1967 $SIG{USR1
} = $SIG{USR2
} = sub { $sig = $_[0] };
1971 $LOCKFILES{$db_lock} = 1;
1973 # both of these options make our .rev_db file very, very important
1974 # and we can't afford to lose it because rebuild() won't work
1975 if ($self->use_svm_props || $self->no_metadata) {
1977 copy
($db, $db_lock) or die "rev_db_set(@_): ",
1979 "$db => $db_lock ($!)\n";
1981 rename $db, $db_lock or die "rev_db_set(@_): ",
1982 "Failed to rename: ",
1983 "$db => $db_lock ($!)\n";
1985 open my $fh, '+<', $db_lock or die "Couldn't open $db_lock: $!\n";
1986 _rev_db_set
($fh, $rev, $commit);
1988 $fh->flush or die "Couldn't flush $db_lock: $!\n";
1989 $fh->sync or die "Couldn't sync $db_lock: $!\n";
1991 close $fh or croak
$!;
1994 command_noisy
('update-ref', '-m', "r$rev",
1995 $self->refname, $commit);
1997 rename $db_lock, $db or die "rev_db_set(@_): ", "Failed to rename: ",
1998 "$db_lock => $db ($!)\n";
1999 delete $LOCKFILES{$db_lock};
2001 $SIG{INT
} = $SIG{HUP
} = $SIG{TERM
} = $SIG{ALRM
} = $SIG{PIPE
} =
2002 $SIG{USR1
} = $SIG{USR2
} = 'DEFAULT';
2003 kill $sig, $$ if defined $sig;
2010 my $db_path = $self->db_path;
2011 my @stat = stat $db_path or return 0;
2012 ($stat[7] % 41) == 0 or die "$db_path inconsistent size: $stat[7]\n";
2013 my $max = $stat[7] / 41;
2014 (($max > 0) ?
$max - 1 : 0);
2018 my ($self, $rev, $uuid) = @_;
2020 my $offset = $rev * 41;
2021 my $db_path = $self->db_path($uuid);
2022 return undef unless -e
$db_path;
2023 open my $fh, '<', $db_path or croak
$!;
2024 if (sysseek($fh, $offset, 0) == $offset) {
2025 my $read = sysread($fh, $ret, 40);
2026 $ret = undef if ($read != 40 || $ret eq ('0'x40
));
2028 close $fh or croak
$!;
2032 sub find_rev_before
{
2033 my ($self, $rev, $eq_ok) = @_;
2034 --$rev unless $eq_ok;
2036 if (my $c = $self->rev_db_get($rev)) {
2041 return (undef, undef);
2045 my ($class, $repo_id, $ref_id, $path) = @_;
2046 unless (defined $repo_id && length $repo_id) {
2047 $repo_id = $Git::SVN
::default_repo_id
;
2049 unless (defined $ref_id && length $ref_id) {
2050 $_[2] = $ref_id = $Git::SVN
::default_ref_id
;
2052 $_[1] = $repo_id = sanitize_remote_name
($repo_id);
2053 my $dir = "$ENV{GIT_DIR}/svn/$ref_id";
2054 $_[3] = $path = '' unless (defined $path);
2055 mkpath
(["$ENV{GIT_DIR}/svn"]);
2057 ref_id
=> $ref_id, dir
=> $dir, index => "$dir/index",
2058 path
=> $path, config
=> "$ENV{GIT_DIR}/svn/config",
2059 db_root
=> "$dir/.rev_db", repo_id
=> $repo_id }, $class;
2063 my ($self, $uuid) = @_;
2064 $uuid ||= $self->ra_uuid;
2065 "$self->{db_root}.$uuid";
2070 $f =~ s
#([^a-zA-Z0-9\*!\:_\./\-])#uc sprintf("%%%02x",ord($1))#eg;
2074 package Git
::SVN
::Prompt
;
2078 use vars qw
/$_no_auth_cache $_username/;
2081 my ($cred, $realm, $default_username, $may_save, $pool) = @_;
2082 $may_save = undef if $_no_auth_cache;
2083 $default_username = $_username if defined $_username;
2084 if (defined $default_username && length $default_username) {
2085 if (defined $realm && length $realm) {
2086 print STDERR
"Authentication realm: $realm\n";
2089 $cred->username($default_username);
2091 username
($cred, $realm, $may_save, $pool);
2093 $cred->password(_read_password
("Password for '" .
2094 $cred->username . "': ", $realm));
2095 $cred->may_save($may_save);
2096 $SVN::_Core
::SVN_NO_ERROR
;
2099 sub ssl_server_trust
{
2100 my ($cred, $realm, $failures, $cert_info, $may_save, $pool) = @_;
2101 $may_save = undef if $_no_auth_cache;
2102 print STDERR
"Error validating server certificate for '$realm':\n";
2103 if ($failures & $SVN::Auth
::SSL
::UNKNOWNCA
) {
2104 print STDERR
" - The certificate is not issued by a trusted ",
2105 "authority. Use the\n",
2106 " fingerprint to validate the certificate manually!\n";
2108 if ($failures & $SVN::Auth
::SSL
::CNMISMATCH
) {
2109 print STDERR
" - The certificate hostname does not match.\n";
2111 if ($failures & $SVN::Auth
::SSL
::NOTYETVALID
) {
2112 print STDERR
" - The certificate is not yet valid.\n";
2114 if ($failures & $SVN::Auth
::SSL
::EXPIRED
) {
2115 print STDERR
" - The certificate has expired.\n";
2117 if ($failures & $SVN::Auth
::SSL
::OTHER
) {
2118 print STDERR
" - The certificate has an unknown error.\n";
2121 "Certificate information:\n".
2122 " - Hostname: %s\n".
2123 " - Valid: from %s until %s\n".
2125 " - Fingerprint: %s\n",
2126 map $cert_info->$_, qw(hostname valid_from valid_until
2127 issuer_dname fingerprint);
2130 print STDERR
$may_save ?
2131 "(R)eject, accept (t)emporarily or accept (p)ermanently? " :
2132 "(R)eject or accept (t)emporarily? ";
2134 $choice = lc(substr(<STDIN
> || 'R', 0, 1));
2135 if ($choice =~ /^t$/i) {
2136 $cred->may_save(undef);
2137 } elsif ($choice =~ /^r$/i) {
2139 } elsif ($may_save && $choice =~ /^p$/i) {
2140 $cred->may_save($may_save);
2144 $cred->accepted_failures($failures);
2145 $SVN::_Core
::SVN_NO_ERROR
;
2148 sub ssl_client_cert
{
2149 my ($cred, $realm, $may_save, $pool) = @_;
2150 $may_save = undef if $_no_auth_cache;
2151 print STDERR
"Client certificate filename: ";
2153 chomp(my $filename = <STDIN
>);
2154 $cred->cert_file($filename);
2155 $cred->may_save($may_save);
2156 $SVN::_Core
::SVN_NO_ERROR
;
2159 sub ssl_client_cert_pw
{
2160 my ($cred, $realm, $may_save, $pool) = @_;
2161 $may_save = undef if $_no_auth_cache;
2162 $cred->password(_read_password
("Password: ", $realm));
2163 $cred->may_save($may_save);
2164 $SVN::_Core
::SVN_NO_ERROR
;
2168 my ($cred, $realm, $may_save, $pool) = @_;
2169 $may_save = undef if $_no_auth_cache;
2170 if (defined $realm && length $realm) {
2171 print STDERR
"Authentication realm: $realm\n";
2174 if (defined $_username) {
2175 $username = $_username;
2177 print STDERR
"Username: ";
2179 chomp($username = <STDIN
>);
2181 $cred->username($username);
2182 $cred->may_save($may_save);
2183 $SVN::_Core
::SVN_NO_ERROR
;
2186 sub _read_password
{
2187 my ($prompt, $realm) = @_;
2188 print STDERR
$prompt;
2190 require Term
::ReadKey
;
2191 Term
::ReadKey
::ReadMode
('noecho');
2193 while (defined(my $key = Term
::ReadKey
::ReadKey
(0))) {
2194 last if $key =~ /[\012\015]/; # \n\r
2197 Term
::ReadKey
::ReadMode
('restore');
2206 my $kill_stupid_warnings = $SVN::Node
::none
.$SVN::Node
::file
.
2207 $SVN::Node
::dir
.$SVN::Node
::unknown
.
2208 $SVN::Node
::none
.$SVN::Node
::file
.
2209 $SVN::Node
::dir
.$SVN::Node
::unknown
.
2210 $SVN::Auth
::SSL
::CNMISMATCH
.
2211 $SVN::Auth
::SSL
::NOTYETVALID
.
2212 $SVN::Auth
::SSL
::EXPIRED
.
2213 $SVN::Auth
::SSL
::UNKNOWNCA
.
2214 $SVN::Auth
::SSL
::OTHER
;
2217 package SVN
::Git
::Fetcher
;
2225 # file baton members: path, mode_a, mode_b, pool, fh, blob, base
2227 my ($class, $git_svn) = @_;
2228 my $self = SVN
::Delta
::Editor
->new;
2229 bless $self, $class;
2230 $self->{c
} = $git_svn->{last_commit
} if exists $git_svn->{last_commit
};
2231 $self->{empty
} = {};
2232 $self->{dir_prop
} = {};
2233 $self->{file_prop
} = {};
2234 $self->{absent_dir
} = {};
2235 $self->{absent_file
} = {};
2236 $self->{gii
} = $git_svn->tmp_index_do(sub { Git
::IndexInfo
->new });
2240 sub set_path_strip
{
2241 my ($self, $path) = @_;
2242 $self->{path_strip
} = qr/^\Q$path\E(\/|$)/ if length $path;
2249 sub open_directory
{
2250 my ($self, $path, $pb, $rev) = @_;
2255 my ($self, $path) = @_;
2256 if ($self->{path_strip
}) {
2257 $path =~ s!$self->{path_strip}!! or
2258 die "Failed to strip path '$path' ($self->{path_strip})\n";
2264 my ($self, $path, $rev, $pb) = @_;
2266 my $gpath = $self->git_path($path);
2267 return undef if ($gpath eq '');
2269 # remove entire directories.
2270 if (command
('ls-tree', $self->{c
}, '--', $gpath) =~ /^040000 tree/) {
2271 my ($ls, $ctx) = command_output_pipe
(qw
/ls
-tree
2273 $self->{c
}, '--', $gpath);
2277 $self->{gii
}->remove($_);
2278 print "\tD\t$_\n" unless $::_q
;
2280 print "\tD\t$gpath/\n" unless $::_q
;
2281 command_close_pipe
($ls, $ctx);
2282 $self->{empty
}->{$path} = 0
2284 $self->{gii
}->remove($gpath);
2285 print "\tD\t$gpath\n" unless $::_q
;
2291 my ($self, $path, $pb, $rev) = @_;
2292 my $gpath = $self->git_path($path);
2293 my ($mode, $blob) = (command
('ls-tree', $self->{c
}, '--', $gpath)
2294 =~ /^(\d{6}) blob ([a-f\d]{40})\t/);
2295 unless (defined $mode && defined $blob) {
2296 die "$path was not found in commit $self->{c} (r$rev)\n";
2298 { path
=> $path, mode_a
=> $mode, mode_b
=> $mode, blob
=> $blob,
2299 pool
=> SVN
::Pool
->new, action
=> 'M' };
2303 my ($self, $path, $pb, $cp_path, $cp_rev) = @_;
2304 my ($dir, $file) = ($path =~ m
#^(.*?)/?([^/]+)$#);
2305 delete $self->{empty
}->{$dir};
2306 { path
=> $path, mode_a
=> 100644, mode_b
=> 100644,
2307 pool
=> SVN
::Pool
->new, action
=> 'A' };
2311 my ($self, $path, $cp_path, $cp_rev) = @_;
2312 my ($dir, $file) = ($path =~ m
#^(.*?)/?([^/]+)$#);
2313 delete $self->{empty
}->{$dir};
2314 $self->{empty
}->{$path} = 1;
2318 sub change_dir_prop
{
2319 my ($self, $db, $prop, $value) = @_;
2320 $self->{dir_prop
}->{$db->{path
}} ||= {};
2321 $self->{dir_prop
}->{$db->{path
}}->{$prop} = $value;
2325 sub absent_directory
{
2326 my ($self, $path, $pb) = @_;
2327 $self->{absent_dir
}->{$pb->{path
}} ||= [];
2328 push @
{$self->{absent_dir
}->{$pb->{path
}}}, $path;
2333 my ($self, $path, $pb) = @_;
2334 $self->{absent_file
}->{$pb->{path
}} ||= [];
2335 push @
{$self->{absent_file
}->{$pb->{path
}}}, $path;
2339 sub change_file_prop
{
2340 my ($self, $fb, $prop, $value) = @_;
2341 if ($prop eq 'svn:executable') {
2342 if ($fb->{mode_b
} != 120000) {
2343 $fb->{mode_b
} = defined $value ?
100755 : 100644;
2345 } elsif ($prop eq 'svn:special') {
2346 $fb->{mode_b
} = defined $value ?
120000 : 100644;
2348 $self->{file_prop
}->{$fb->{path
}} ||= {};
2349 $self->{file_prop
}->{$fb->{path
}}->{$prop} = $value;
2354 sub apply_textdelta
{
2355 my ($self, $fb, $exp) = @_;
2356 my $fh = IO
::File
->new_tmpfile;
2358 # $fh gets auto-closed() by SVN::TxDelta::apply(),
2359 # (but $base does not,) so dup() it for reading in close_file
2360 open my $dup, '<&', $fh or croak
$!;
2361 my $base = IO
::File
->new_tmpfile;
2362 $base->autoflush(1);
2364 defined (my $pid = fork) or croak
$!;
2366 open STDOUT
, '>&', $base or croak
$!;
2367 print STDOUT
'link ' if ($fb->{mode_a
} == 120000);
2368 exec qw
/git-cat-file blob/, $fb->{blob
} or croak
$!;
2374 seek $base, 0, 0 or croak
$!;
2375 my $md5 = Digest
::MD5
->new;
2376 $md5->addfile($base);
2377 my $got = $md5->hexdigest;
2378 die "Checksum mismatch: $fb->{path} $fb->{blob}\n",
2380 " got: $got\n" if ($got ne $exp);
2383 seek $base, 0, 0 or croak
$!;
2385 $fb->{base
} = $base;
2386 [ SVN
::TxDelta
::apply
($base, $fh, undef, $fb->{path
}, $fb->{pool
}) ];
2390 my ($self, $fb, $exp) = @_;
2392 my $path = $self->git_path($fb->{path
});
2393 if (my $fh = $fb->{fh
}) {
2394 seek($fh, 0, 0) or croak
$!;
2395 my $md5 = Digest
::MD5
->new;
2397 my $got = $md5->hexdigest;
2398 die "Checksum mismatch: $path\n",
2399 "expected: $exp\n got: $got\n" if ($got ne $exp);
2400 seek($fh, 0, 0) or croak
$!;
2401 if ($fb->{mode_b
} == 120000) {
2402 read($fh, my $buf, 5) == 5 or croak
$!;
2403 $buf eq 'link ' or die "$path has mode 120000",
2404 "but is not a link\n";
2406 defined(my $pid = open my $out,'-|') or die "Can't fork: $!\n";
2408 open STDIN
, '<&', $fh or croak
$!;
2409 exec qw
/git-hash-object -w --stdin/ or croak
$!;
2411 chomp($hash = do { local $/; <$out> });
2412 close $out or croak
$!;
2413 close $fh or croak
$!;
2414 $hash =~ /^[a-f\d]{40}$/ or die "not a sha1: $hash\n";
2415 close $fb->{base
} or croak
$!;
2417 $hash = $fb->{blob
} or die "no blob information\n";
2420 $self->{gii
}->update($fb->{mode_b
}, $hash, $path) or croak
$!;
2421 print "\t$fb->{action}\t$path\n" if $fb->{action
} && ! $::_q
;
2427 $self->{nr
} = $self->{gii
}->{nr
};
2428 delete $self->{gii
};
2429 $self->SUPER::abort_edit
(@_);
2434 $self->{git_commit_ok
} = 1;
2435 $self->{nr
} = $self->{gii
}->{nr
};
2436 delete $self->{gii
};
2437 $self->SUPER::close_edit
(@_);
2440 package SVN
::Git
::Editor
;
2441 use vars qw
/@ISA $_rmdir $_cp_similarity $_find_copies_harder $_rename_limit/;
2449 my ($class, $opts) = @_;
2450 foreach (qw
/svn_path r ra tree_a tree_b log editor_cb/) {
2451 die "$_ required!\n" unless (defined $opts->{$_});
2454 my $pool = SVN
::Pool
->new;
2455 my $mods = generate_diff
($opts->{tree_a
}, $opts->{tree_b
});
2456 my $types = check_diff_paths
($opts->{ra
}, $opts->{svn_path
},
2459 # $opts->{ra} functions should not be used after this:
2460 my @ce = $opts->{ra
}->get_commit_editor($opts->{log},
2461 $opts->{editor_cb
}, $pool);
2462 my $self = SVN
::Delta
::Editor
->new(@ce, $pool);
2463 bless $self, $class;
2464 foreach (qw
/svn_path r tree_a tree_b/) {
2465 $self->{$_} = $opts->{$_};
2467 $self->{url
} = $opts->{ra
}->{url
};
2468 $self->{mods
} = $mods;
2469 $self->{types
} = $types;
2470 $self->{pool
} = $pool;
2471 $self->{bat
} = { '' => $self->open_root($self->{r
}, $self->{pool
}) };
2473 $self->{path_prefix
} = length $self->{svn_path
} ?
2474 "$self->{svn_path}/" : '';
2479 my ($tree_a, $tree_b) = @_;
2480 my @diff_tree = qw(diff-tree -z -r);
2481 if ($_cp_similarity) {
2482 push @diff_tree, "-C$_cp_similarity";
2484 push @diff_tree, '-C';
2486 push @diff_tree, '--find-copies-harder' if $_find_copies_harder;
2487 push @diff_tree, "-l$_rename_limit" if defined $_rename_limit;
2488 push @diff_tree, $tree_a, $tree_b;
2489 my ($diff_fh, $ctx) = command_output_pipe
(@diff_tree);
2493 while (<$diff_fh>) {
2494 chomp $_; # this gets rid of the trailing "\0"
2495 if ($state eq 'meta' && /^:(\d
{6})\s
(\d
{6})\s
2496 $::sha1\s
($::sha1
)\s
2497 ([MTCRAD
])\d
*$/xo
) {
2498 push @mods, { mode_a
=> $1, mode_b
=> $2,
2499 sha1_b
=> $3, chg
=> $4 };
2500 if ($4 =~ /^(?:C|R)$/) {
2505 } elsif ($state eq 'file_a') {
2506 my $x = $mods[$#mods] or croak
"Empty array\n";
2507 if ($x->{chg
} !~ /^(?:C|R)$/) {
2508 croak
"Error parsing $_, $x->{chg}\n";
2512 } elsif ($state eq 'file_b') {
2513 my $x = $mods[$#mods] or croak
"Empty array\n";
2514 if (exists $x->{file_a
} && $x->{chg
} !~ /^(?:C|R)$/) {
2515 croak
"Error parsing $_, $x->{chg}\n";
2517 if (!exists $x->{file_a
} && $x->{chg
} =~ /^(?:C|R)$/) {
2518 croak
"Error parsing $_, $x->{chg}\n";
2523 croak
"Error parsing $_\n";
2526 command_close_pipe
($diff_fh, $ctx);
2530 sub check_diff_paths
{
2531 my ($ra, $pfx, $rev, $mods) = @_;
2533 $pfx .= '/' if length $pfx;
2535 sub type_diff_paths
{
2536 my ($ra, $types, $path, $rev) = @_;
2537 my @p = split m
#/+#, $path;
2539 unless (defined $types->{$c}) {
2540 $types->{$c} = $ra->check_path($c, $rev);
2543 $c .= '/' . shift @p;
2544 next if defined $types->{$c};
2545 $types->{$c} = $ra->check_path($c, $rev);
2549 foreach my $m (@
$mods) {
2550 foreach my $f (qw
/file_a file_b/) {
2551 next unless defined $m->{$f};
2552 my ($dir) = ($m->{$f} =~ m
#^(.*?)/?(?:[^/]+)$#);
2553 if (length $pfx.$dir && ! defined $types{$dir}) {
2554 type_diff_paths
($ra, \
%types, $pfx.$dir, $rev);
2562 return ($_[0] =~ m
#^(.*?)/?([^/]+)$#);
2566 my ($self, $path) = @_;
2567 $self->{path_prefix
}.(defined $path ?
$path : '');
2571 my ($self, $path) = @_;
2572 $self->{url
} . '/' . $self->repo_path($path);
2577 my $rm = $self->{rm
};
2578 delete $rm->{''}; # we never delete the url we're tracking
2581 foreach (keys %$rm) {
2582 my @d = split m
#/#, $_;
2586 $c .= '/' . shift @d;
2590 delete $rm->{$self->{svn_path
}};
2591 delete $rm->{''}; # we never delete the url we're tracking
2594 my ($fh, $ctx) = command_output_pipe
(qw
/ls-tree --name-only -r -z/,
2599 my @dn = split m
#/#, $_;
2601 delete $rm->{join '/', @dn};
2608 command_close_pipe
($fh, $ctx);
2610 my ($r, $p, $bat) = ($self->{r
}, $self->{pool
}, $self->{bat
});
2611 foreach my $d (sort { $b =~ tr
#/#/# <=> $a =~ tr#/#/# } keys %$rm) {
2612 $self->close_directory($bat->{$d}, $p);
2613 my ($dn) = ($d =~ m
#^(.*?)/?(?:[^/]+)$#);
2614 print "\tD+\t$d/\n" unless $::_q
;
2615 $self->SUPER::delete_entry
($d, $r, $bat->{$dn}, $p);
2620 sub open_or_add_dir
{
2621 my ($self, $full_path, $baton) = @_;
2622 my $t = $self->{types
}->{$full_path};
2624 die "$full_path not known in r$self->{r} or we have a bug!\n";
2626 if ($t == $SVN::Node
::none
) {
2627 return $self->add_directory($full_path, $baton,
2628 undef, -1, $self->{pool
});
2629 } elsif ($t == $SVN::Node
::dir
) {
2630 return $self->open_directory($full_path, $baton,
2631 $self->{r
}, $self->{pool
});
2633 print STDERR
"$full_path already exists in repository at ",
2634 "r$self->{r} and it is not a directory (",
2635 ($t == $SVN::Node
::file ?
'file' : 'unknown'),"/$t)\n";
2640 my ($self, $path) = @_;
2641 my $bat = $self->{bat
};
2642 my $repo_path = $self->repo_path($path);
2643 return $bat->{''} unless (length $repo_path);
2644 my @p = split m
#/+#, $repo_path;
2646 $bat->{$c} ||= $self->open_or_add_dir($c, $bat->{''});
2649 $c .= '/' . shift @p;
2650 $bat->{$c} ||= $self->open_or_add_dir($c, $bat->{$c0});
2656 my ($self, $m) = @_;
2657 my ($dir, $file) = split_path
($m->{file_b
});
2658 my $pbat = $self->ensure_path($dir);
2659 my $fbat = $self->add_file($self->repo_path($m->{file_b
}), $pbat,
2661 print "\tA\t$m->{file_b}\n" unless $::_q
;
2662 $self->chg_file($fbat, $m);
2663 $self->close_file($fbat,undef,$self->{pool
});
2667 my ($self, $m) = @_;
2668 my ($dir, $file) = split_path
($m->{file_b
});
2669 my $pbat = $self->ensure_path($dir);
2670 my $fbat = $self->add_file($self->repo_path($m->{file_b
}), $pbat,
2671 $self->url_path($m->{file_a
}), $self->{r
});
2672 print "\tC\t$m->{file_a} => $m->{file_b}\n" unless $::_q
;
2673 $self->chg_file($fbat, $m);
2674 $self->close_file($fbat,undef,$self->{pool
});
2678 my ($self, $path, $pbat) = @_;
2679 my $rpath = $self->repo_path($path);
2680 my ($dir, $file) = split_path
($rpath);
2681 $self->{rm
}->{$dir} = 1;
2682 $self->SUPER::delete_entry
($rpath, $self->{r
}, $pbat, $self->{pool
});
2686 my ($self, $m) = @_;
2687 my ($dir, $file) = split_path
($m->{file_b
});
2688 my $pbat = $self->ensure_path($dir);
2689 my $fbat = $self->add_file($self->repo_path($m->{file_b
}), $pbat,
2690 $self->url_path($m->{file_a
}), $self->{r
});
2691 print "\tR\t$m->{file_a} => $m->{file_b}\n" unless $::_q
;
2692 $self->chg_file($fbat, $m);
2693 $self->close_file($fbat,undef,$self->{pool
});
2695 ($dir, $file) = split_path
($m->{file_a
});
2696 $pbat = $self->ensure_path($dir);
2697 $self->delete_entry($m->{file_a
}, $pbat);
2701 my ($self, $m) = @_;
2702 my ($dir, $file) = split_path
($m->{file_b
});
2703 my $pbat = $self->ensure_path($dir);
2704 my $fbat = $self->open_file($self->repo_path($m->{file_b
}),
2705 $pbat,$self->{r
},$self->{pool
});
2706 print "\t$m->{chg}\t$m->{file_b}\n" unless $::_q
;
2707 $self->chg_file($fbat, $m);
2708 $self->close_file($fbat,undef,$self->{pool
});
2711 sub T
{ shift->M(@_) }
2713 sub change_file_prop
{
2714 my ($self, $fbat, $pname, $pval) = @_;
2715 $self->SUPER::change_file_prop
($fbat, $pname, $pval, $self->{pool
});
2719 my ($self, $fbat, $m) = @_;
2720 if ($m->{mode_b
} =~ /755$/ && $m->{mode_a
} !~ /755$/) {
2721 $self->change_file_prop($fbat,'svn:executable','*');
2722 } elsif ($m->{mode_b
} !~ /755$/ && $m->{mode_a
} =~ /755$/) {
2723 $self->change_file_prop($fbat,'svn:executable',undef);
2725 my $fh = IO
::File
->new_tmpfile or croak
$!;
2726 if ($m->{mode_b
} =~ /^120/) {
2727 print $fh 'link ' or croak
$!;
2728 $self->change_file_prop($fbat,'svn:special','*');
2729 } elsif ($m->{mode_a
} =~ /^120/ && $m->{mode_b
} !~ /^120/) {
2730 $self->change_file_prop($fbat,'svn:special',undef);
2732 defined(my $pid = fork) or croak
$!;
2734 open STDOUT
, '>&', $fh or croak
$!;
2735 exec qw
/git-cat-file blob/, $m->{sha1_b
} or croak
$!;
2739 $fh->flush == 0 or croak
$!;
2740 seek $fh, 0, 0 or croak
$!;
2742 my $md5 = Digest
::MD5
->new;
2743 $md5->addfile($fh) or croak
$!;
2744 seek $fh, 0, 0 or croak
$!;
2746 my $exp = $md5->hexdigest;
2747 my $pool = SVN
::Pool
->new;
2748 my $atd = $self->apply_textdelta($fbat, undef, $pool);
2749 my $got = SVN
::TxDelta
::send_stream
($fh, @
$atd, $pool);
2750 die "Checksum mismatch\nexpected: $exp\ngot: $got\n" if ($got ne $exp);
2753 close $fh or croak
$!;
2757 my ($self, $m) = @_;
2758 my ($dir, $file) = split_path
($m->{file_b
});
2759 my $pbat = $self->ensure_path($dir);
2760 print "\tD\t$m->{file_b}\n" unless $::_q
;
2761 $self->delete_entry($m->{file_b
}, $pbat);
2766 my ($p,$bat) = ($self->{pool
}, $self->{bat
});
2767 foreach (sort { $b =~ tr
#/#/# <=> $a =~ tr#/#/# } keys %$bat) {
2768 $self->close_directory($bat->{$_}, $p);
2770 $self->SUPER::close_edit
($p);
2776 $self->SUPER::abort_edit
($self->{pool
});
2781 $self->SUPER::DESTROY
(@_);
2782 $self->{pool
}->clear;
2785 # this drives the editor
2788 my $mods = $self->{mods
};
2789 my %o = ( D
=> 1, R
=> 0, C
=> -1, A
=> 3, M
=> 3, T
=> 3 );
2790 foreach my $m (sort { $o{$a->{chg
}} <=> $o{$b->{chg
}} } @
$mods) {
2792 if (defined $o{$f}) {
2795 fatal
("Invalid change type: $f\n");
2798 $self->rmdirs if $_rmdir;
2804 return scalar @
$mods;
2807 package Git
::SVN
::Ra
;
2808 use vars qw
/@ISA $config_dir $_log_window_size/;
2811 my ($can_do_switch);
2815 # enforce temporary pool usage for some simple functions
2817 foreach (qw
/get_latest_revnum get_uuid get_repos_root/) {
2820 my \$pool = SVN::Pool->new;
2821 my \@ret = \$self->SUPER::$_(\@_,\$pool);
2823 wantarray ? \@ret : \$ret[0]; }\n";
2826 # get_dir needs $pool held in cache for dirents to work,
2827 # check_path is cacheable and rev_proplist is close enough
2829 foreach (qw
/check_path get_dir rev_proplist/) {
2830 $e .= "my \%${_}_cache; my \$${_}_rev = 0; sub $_ {
2833 my \$k = join(\"\\0\", \@_);
2834 if (my \$x = \$${_}_cache{\$r}->{\$k}) {
2835 return wantarray ? \@\$x : \$x->[0];
2837 my \$pool = SVN::Pool->new;
2838 my \@ret = \$self->SUPER::$_(\@_, \$r, \$pool);
2839 if (\$r != \$${_}_rev) {
2840 \%${_}_cache = ( pool => [] );
2843 \$${_}_cache{\$r}->{\$k} = \\\@ret;
2844 push \@{\$${_}_cache{pool}}, \$pool;
2845 wantarray ? \@ret : \$ret[0]; }\n";
2852 my ($class, $url) = @_;
2854 return $RA if ($RA && $RA->{url
} eq $url);
2856 SVN
::_Core
::svn_config_ensure
($config_dir, undef);
2857 my ($baton, $callbacks) = SVN
::Core
::auth_open_helper
([
2858 SVN
::Client
::get_simple_provider
(),
2859 SVN
::Client
::get_ssl_server_trust_file_provider
(),
2860 SVN
::Client
::get_simple_prompt_provider
(
2861 \
&Git
::SVN
::Prompt
::simple
, 2),
2862 SVN
::Client
::get_ssl_client_cert_prompt_provider
(
2863 \
&Git
::SVN
::Prompt
::ssl_client_cert
, 2),
2864 SVN
::Client
::get_ssl_client_cert_pw_prompt_provider
(
2865 \
&Git
::SVN
::Prompt
::ssl_client_cert_pw
, 2),
2866 SVN
::Client
::get_username_provider
(),
2867 SVN
::Client
::get_ssl_server_trust_prompt_provider
(
2868 \
&Git
::SVN
::Prompt
::ssl_server_trust
),
2869 SVN
::Client
::get_username_prompt_provider
(
2870 \
&Git
::SVN
::Prompt
::username
, 2),
2872 my $config = SVN
::Core
::config_get_config
($config_dir);
2873 my $self = SVN
::Ra
->new(url
=> $url, auth
=> $baton,
2875 pool
=> SVN
::Pool
->new,
2876 auth_provider_callbacks
=> $callbacks);
2877 $self->{svn_path
} = $url;
2878 $self->{repos_root
} = $self->get_repos_root;
2879 $self->{svn_path
} =~ s
#^\Q$self->{repos_root}\E(/|$)##;
2880 $RA = bless $self, $class;
2884 # do not call the real DESTROY since we store ourselves in $RA
2888 my ($self, @args) = @_;
2889 my $pool = SVN
::Pool
->new;
2890 splice(@args, 3, 1) if ($SVN::Core
::VERSION
le '1.2.0');
2891 my $ret = $self->SUPER::get_log
(@args, $pool);
2896 sub get_commit_editor
{
2897 my ($self, $log, $cb, $pool) = @_;
2898 my @lock = $SVN::Core
::VERSION
ge '1.2.0' ?
(undef, 0) : ();
2899 $self->SUPER::get_commit_editor
($log, $cb, @lock, $pool);
2903 my ($self, $rev_a, $rev_b, $gs, $editor) = @_;
2904 my $new = ($rev_a == $rev_b);
2905 my $path = $gs->{path
};
2907 my $pool = SVN
::Pool
->new;
2908 $editor->set_path_strip($path);
2909 my (@pc) = split m
#/#, $path;
2910 my $reporter = $self->do_update($rev_b, (@pc ?
shift @pc : ''),
2912 my @lock = $SVN::Core
::VERSION
ge '1.2.0' ?
(undef) : ();
2914 # Since we can't rely on svn_ra_reparent being available, we'll
2915 # just have to do some magic with set_path to make it so
2916 # we only want a partial path.
2918 my $final = join('/', @pc);
2920 $reporter->set_path($sp, $rev_b, 0, @lock, $pool);
2921 $sp .= '/' if length $sp;
2924 die "BUG: '$sp' != '$final'\n" if ($sp ne $final);
2926 $reporter->set_path($sp, $rev_a, $new, @lock, $pool);
2928 $reporter->finish_report($pool);
2930 $editor->{git_commit_ok
};
2933 # this requires SVN 1.4.3 or later (do_switch didn't work before 1.4.3, and
2934 # svn_ra_reparent didn't work before 1.4)
2936 my ($self, $rev_a, $rev_b, $gs, $url_b, $editor) = @_;
2937 my $path = $gs->{path
};
2938 my $pool = SVN
::Pool
->new;
2940 my $full_url = $self->{url
};
2941 my $old_url = $full_url;
2942 $full_url .= "/$path" if length $path;
2943 my ($ra, $reparented);
2944 if ($old_url ne $full_url) {
2945 if ($old_url !~ m
#^svn(\+ssh)?://#) {
2946 SVN
::_Ra
::svn_ra_reparent
($self->{session
}, $full_url,
2948 $self->{url
} = $full_url;
2951 $ra = Git
::SVN
::Ra
->new($full_url);
2955 my $reporter = $ra->do_switch($rev_b, '', 1, $url_b, $editor, $pool);
2956 my @lock = $SVN::Core
::VERSION
ge '1.2.0' ?
(undef) : ();
2957 $reporter->set_path('', $rev_a, 0, @lock, $pool);
2958 $reporter->finish_report($pool);
2961 SVN
::_Ra
::svn_ra_reparent
($self->{session
}, $old_url, $pool);
2962 $self->{url
} = $old_url;
2966 $editor->{git_commit_ok
};
2969 sub gs_fetch_loop_common
{
2970 my ($self, $base, $head, $gsv, $globs) = @_;
2971 return if ($base > $head);
2972 my $inc = $_log_window_size;
2973 my ($min, $max) = ($base, $head < $base + $inc ?
$head : $base + $inc);
2975 my $common_max = scalar @
$gsv;
2977 foreach my $gs (@
$gsv) {
2978 my @tmp = split m
#/#, $gs->{path};
2981 $p .= length($p) ?
"/$_" : $_;
2987 $common_max += scalar @
$globs;
2988 foreach my $glob (@
$globs) {
2989 my @tmp = split m
#/#, $glob->{path}->{left};
2992 $p .= length($p) ?
"/$_" : $_;
2998 my $longest_path = '';
2999 foreach (sort {length $b <=> length $a} keys %common) {
3000 if ($common{$_} == $common_max) {
3008 my $err_handler = $SVN::Error
::handler
;
3009 $SVN::Error
::handler
= sub {
3011 skip_unknown_revs
($err);
3014 my ($paths, $r, $author, $date, $log) = @_;
3015 [ dup_changed_paths
($paths),
3016 { author
=> $author, date
=> $date, log => $log } ];
3018 $self->get_log([$longest_path], $min, $max, 0, 1, 1,
3019 sub { $revs{$_[1]} = _cb
(@_) });
3020 if ($err && $max >= $head) {
3021 print STDERR
"Path '$longest_path' ",
3022 "was probably deleted:\n",
3023 $err->expanded_message,
3024 "\nWill attempt to follow ",
3025 "revisions r$min .. r$max ",
3026 "committed before the deletion\n";
3028 while (--$hi >= $min) {
3030 $self->get_log([$longest_path], $min, $hi,
3033 $revs{$_[1]} = _cb
(@_) });
3035 print STDERR
"r$min .. r$ok OK\n";
3040 $SVN::Error
::handler
= $err_handler;
3042 my %exists = map { $_->{path
} => $_ } @
$gsv;
3043 foreach my $r (sort {$a <=> $b} keys %revs) {
3044 my ($paths, $logged) = @
{$revs{$r}};
3046 foreach my $gs ($self->match_globs(\
%exists, $paths,
3048 if ($gs->rev_db_max >= $r) {
3051 next unless $gs->match_paths($paths, $r);
3052 $gs->{logged_rev_props
} = $logged;
3053 if (my $last_commit = $gs->last_commit) {
3054 $gs->assert_index_clean($last_commit);
3056 my $log_entry = $gs->do_fetch($paths, $r);
3058 $gs->do_git_commit($log_entry);
3061 foreach my $g (@
$globs) {
3062 my $k = "svn-remote.$g->{remote}." .
3064 Git
::SVN
::tmp_config
($k, $r);
3067 # pre-fill the .rev_db since it'll eventually get filled in
3068 # with '0' x40 if something new gets committed
3069 foreach my $gs (@
$gsv) {
3070 next if defined $gs->rev_db_get($max);
3071 $gs->rev_db_set($max, 0 x40
);
3073 foreach my $g (@
$globs) {
3074 my $k = "svn-remote.$g->{remote}.$g->{t}-maxRev";
3075 Git
::SVN
::tmp_config
($k, $max);
3077 last if $max >= $head;
3080 $max = $head if ($max > $head);
3085 my ($self, $exists, $paths, $globs, $r) = @_;
3088 my ($self, $exists, $g, $r) = @_;
3089 my @x = eval { $self->get_dir($g->{path
}->{left
}, $r) };
3090 return unless scalar @x == 3;
3091 my $dirents = $x[0];
3092 foreach my $de (keys %$dirents) {
3093 next if $dirents->{$de}->kind != $SVN::Node
::dir
;
3094 my $p = $g->{path
}->full_path($de);
3095 next if $exists->{$p};
3096 next if (length $g->{path
}->{right
} &&
3097 ($self->check_path($p, $r) !=
3099 $exists->{$p} = Git
::SVN
->init($self->{url
}, $p, undef,
3100 $g->{ref}->full_path($de), 1);
3103 foreach my $g (@
$globs) {
3104 if (my $path = $paths->{"/$g->{path}->{left}"}) {
3105 if ($path->{action
} =~ /^[AR]$/) {
3106 get_dir_check
($self, $exists, $g, $r);
3109 foreach (keys %$paths) {
3110 if (/$g->{path}->{left_regex}/ &&
3111 !/$g->{path}->{regex}/) {
3112 next if $paths->{$_}->{action
} !~ /^[AR]$/;
3113 get_dir_check
($self, $exists, $g, $r);
3115 next unless /$g->{path}->{regex}/;
3117 my $pathname = $g->{path
}->full_path($p);
3118 next if $exists->{$pathname};
3119 $exists->{$pathname} = Git
::SVN
->init(
3120 $self->{url
}, $pathname, undef,
3121 $g->{ref}->full_path($p), 1);
3124 foreach (split m
#/#, $g->{path}->{left}) {
3126 next unless ($paths->{$c} &&
3127 ($paths->{$c}->{action
} =~ /^[AR]$/));
3128 get_dir_check
($self, $exists, $g, $r);
3136 return $self->{url
} if ($self->{url
} eq $self->{repos_root
});
3137 my $url = $self->{repos_root
};
3138 my @components = split(m!/!, $self->{svn_path
});
3141 $url .= "/$c" if length $c;
3142 eval { (ref $self)->new($url)->get_latest_revnum };
3143 } while ($@
&& ($c = shift @components));
3149 unless (defined $can_do_switch) {
3150 my $pool = SVN
::Pool
->new;
3152 $self->do_switch(1, '', 0, $self->{url
},
3153 SVN
::Delta
::Editor
->new, $pool);
3158 $rep->abort_report($pool);
3166 sub skip_unknown_revs
{
3168 my $errno = $err->apr_err();
3169 # Maybe the branch we're tracking didn't
3170 # exist when the repo started, so it's
3171 # not an error if it doesn't, just continue
3173 # Wonderfully consistent library, eh?
3174 # 160013 - svn:// and file://
3175 # 175002 - http(s)://
3176 # 175007 - http(s):// (this repo required authorization, too...)
3177 # More codes may be discovered later...
3178 if ($errno == 175007 || $errno == 175002 || $errno == 160013) {
3179 warn "W: Ignoring error from SVN, path probably ",
3180 "does not exist: ($errno): ",
3181 $err->expanded_message,"\n";
3184 die "Error from SVN, ($errno): ", $err->expanded_message,"\n";
3187 # svn_log_changed_path_t objects passed to get_log are likely to be
3188 # overwritten even if only the refs are copied to an external variable,
3189 # so we should dup the structures in their entirety. Using an externally
3190 # passed pool (instead of our temporary and quickly cleared pool in
3191 # Git::SVN::Ra) does not help matters at all...
3192 sub dup_changed_paths
{
3194 return undef unless $paths;
3196 foreach my $p (keys %$paths) {
3197 my $i = $paths->{$p};
3198 my %s = map { $_ => $i->$_ }
3199 qw
/copyfrom_path copyfrom_rev action/;
3205 package Git
::SVN
::Log
;
3208 use POSIX qw
/strftime/;
3209 use vars qw
/$TZ $limit $color $pager $non_recursive $verbose $oneline
3210 %rusers $show_commit $incremental/;
3215 return 1 if defined $c->{r
};
3216 if ($c->{l
} && $c->{l
}->[-1] eq "...\n" &&
3217 $c->{a_raw
} =~ /\@([a-f\d\-]+)>$/) {
3218 my @log = command
(qw
/cat-file commit/, $c->{c
});
3219 shift @log while ($log[0] ne "\n");
3221 @
{$c->{l
}} = grep !/^git-svn-id: /, @log;
3223 (undef, $c->{r
}, undef) = ::extract_metadata
(
3224 (grep(/^git-svn-id: /, @log))[-1]);
3226 return defined $c->{r
};
3232 $dcvar = 'color.diff';
3233 $dc = `git-config --get $dcvar`;
3235 # nothing at all; fallback to "diff.color"
3236 $dcvar = 'diff.color';
3237 $dc = `git-config --get $dcvar`;
3240 if ($dc eq 'auto') {
3242 $pc = `git-config --get color.pager`;
3244 # does not have it -- fallback to pager.color
3245 $pc = `git-config --bool --get pager.color`;
3248 $pc = `git-config --bool --get color.pager`;
3254 if (-t
*STDOUT
|| (defined $pager && $pc eq 'true')) {
3255 return ($ENV{TERM
} && $ENV{TERM
} ne 'dumb');
3259 return 0 if $dc eq 'never';
3260 return 1 if $dc eq 'always';
3261 chomp($dc = `git-config --bool --get $dcvar`);
3262 return ($dc eq 'true');
3265 sub git_svn_log_cmd
{
3266 my ($r_min, $r_max, @args) = @_;
3268 foreach my $x (@args) {
3270 next unless ::verify_ref
("$x^0");
3275 my $url = (::working_head_info
($head))[0];
3276 my $gs = Git
::SVN
->find_by_url($url) || Git
::SVN
->_new;
3277 my @cmd = (qw
/log --abbrev-commit --pretty=raw --default/,
3279 push @cmd, '-r' unless $non_recursive;
3280 push @cmd, qw
/--raw --name-status/ if $verbose;
3281 push @cmd, '--color' if log_use_color
();
3282 return @cmd unless defined $r_max;
3283 if ($r_max == $r_min) {
3284 push @cmd, '--max-count=1';
3285 if (my $c = $gs->rev_db_get($r_max)) {
3289 my ($c_min, $c_max);
3290 $c_max = $gs->rev_db_get($r_max);
3291 $c_min = $gs->rev_db_get($r_min);
3292 if (defined $c_min && defined $c_max) {
3293 if ($r_max > $r_max) {
3294 push @cmd, "$c_min..$c_max";
3296 push @cmd, "$c_max..$c_min";
3298 } elsif ($r_max > $r_min) {
3307 # adapted from pager.c
3309 $pager ||= $ENV{GIT_PAGER
} || $ENV{PAGER
};
3310 if (!defined $pager) {
3312 } elsif (length $pager == 0 || $pager eq 'cat') {
3318 return unless -t
*STDOUT
;
3319 pipe my $rfd, my $wfd or return;
3320 defined(my $pid = fork) or ::fatal
"Can't fork: $!\n";
3322 open STDOUT
, '>&', $wfd or
3323 ::fatal
"Can't redirect to stdout: $!\n";
3326 open STDIN
, '<&', $rfd or ::fatal
"Can't redirect stdin: $!\n";
3327 $ENV{LESS
} ||= 'FRSX';
3328 exec $pager or ::fatal
"Can't run pager: $! ($pager)\n";
3331 sub tz_to_s_offset
{
3334 return ($1 * 60) + ($tz * 3600);
3337 sub get_author_info
{
3338 my ($dest, $author, $t, $tz) = @_;
3339 $author =~ s/(?:^\s*|\s*$)//g;
3340 $dest->{a_raw
} = $author;
3343 $au = $rusers{$author} || undef;
3346 ($au) = ($author =~ /<([^>]+)\@[^>]+>$/);
3351 # Date::Parse isn't in the standard Perl distro :(
3352 if ($tz =~ s/^\+//) {
3353 $t += tz_to_s_offset
($tz);
3354 } elsif ($tz =~ s/^\-//) {
3355 $t -= tz_to_s_offset
($tz);
3357 $dest->{t_utc
} = $t;
3360 sub process_commit
{
3361 my ($c, $r_min, $r_max, $defer) = @_;
3362 if (defined $r_min && defined $r_max) {
3363 if ($r_min == $c->{r
} && $r_min == $r_max) {
3367 return 1 if $r_min == $r_max;
3368 if ($r_min < $r_max) {
3369 # we need to reverse the print order
3370 return 0 if (defined $limit && --$limit < 0);
3374 if ($r_min != $r_max) {
3375 return 1 if ($r_min < $c->{r
});
3376 return 1 if ($r_max > $c->{r
});
3379 return 0 if (defined $limit && --$limit < 0);
3388 if (my $l = $c->{l
}) {
3389 while ($l->[0] =~ /^\s*$/) { shift @
$l }
3392 $l_fmt ||= 'A' . length($c->{r
});
3393 print 'r',pack($l_fmt, $c->{r
}),' | ';
3394 print "$c->{c} | " if $show_commit;
3397 show_commit_normal
($c);
3401 sub show_commit_changed_paths
{
3403 return unless $c->{changed
};
3404 print "Changed paths:\n", @
{$c->{changed
}};
3407 sub show_commit_normal
{
3409 print '-' x72
, "\nr$c->{r} | ";
3410 print "$c->{c} | " if $show_commit;
3411 print "$c->{a} | ", strftime
("%Y-%m-%d %H:%M:%S %z (%a, %d %b %Y)",
3412 localtime($c->{t_utc
})), ' | ';
3415 if (my $l = $c->{l
}) {
3416 while ($l->[$#$l] eq "\n" && $#$l > 0
3417 && $l->[($#$l - 1)] eq "\n") {
3420 $nr_line = scalar @
$l;
3422 print "1 line\n\n\n";
3424 if ($nr_line == 1) {
3425 $nr_line = '1 line';
3427 $nr_line .= ' lines';
3429 print $nr_line, "\n";
3430 show_commit_changed_paths
($c);
3432 print $_ foreach @
$l;
3436 show_commit_changed_paths
($c);
3440 foreach my $x (qw
/raw stat diff/) {
3443 print $_ foreach @
{$c->{$x}}
3450 my ($r_min, $r_max);
3451 my $r_last = -1; # prevent dupes
3457 if (defined $::_revision
) {
3458 if ($::_revision
=~ /^(\d+):(\d+)$/) {
3459 ($r_min, $r_max) = ($1, $2);
3460 } elsif ($::_revision
=~ /^\d+$/) {
3461 $r_min = $r_max = $::_revision
;
3463 ::fatal
"-r$::_revision is not supported, use ",
3464 "standard \'git log\' arguments instead\n";
3469 @args = (git_svn_log_cmd
($r_min, $r_max, @args), @args);
3470 my $log = command_output_pipe
(@args);
3472 my (@k, $c, $d, $stat);
3473 my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/;
3475 if (/^${esc_color}commit ($::sha1_short)/o) {
3477 if ($c && cmt_showable
($c) && $c->{r
} != $r_last) {
3479 process_commit
($c, $r_min, $r_max, \
@k) or
3484 } elsif (/^${esc_color}author (.+) (\d+) ([\-\+]?\d+)$/o) {
3485 get_author_info
($c, $1, $2, $3);
3486 } elsif (/^${esc_color}(?:tree|parent|committer) /o) {
3488 } elsif (/^${esc_color}:\d{6} \d{6} $::sha1_short/o) {
3489 push @
{$c->{raw
}}, $_;
3490 } elsif (/^${esc_color}[ACRMDT]\t/) {
3491 # we could add $SVN->{svn_path} here, but that requires
3492 # remote access at the moment (repo_path_split)...
3493 s
#^(${esc_color})([ACRMDT])\t#$1 $2 #o;
3494 push @
{$c->{changed
}}, $_;
3495 } elsif (/^${esc_color}diff /o) {
3497 push @
{$c->{diff
}}, $_;
3499 push @
{$c->{diff
}}, $_;
3500 } elsif (/^\
.+\ \
|\s
*\d
+\
$esc_color[\
+\
-]*
3501 $esc_color*[\
+\
-]*$esc_color$/x
) {
3503 push @
{$c->{stat}}, $_;
3504 } elsif ($stat && /^ \d+ files changed, \d+ insertions/) {
3505 push @
{$c->{stat}}, $_;
3507 } elsif (/^${esc_color} (git-svn-id:.+)$/o) {
3508 ($c->{url
}, $c->{r
}, undef) = ::extract_metadata
($1);
3509 } elsif (s/^${esc_color} //o) {
3510 push @
{$c->{l
}}, $_;
3513 if ($c && defined $c->{r
} && $c->{r
} != $r_last) {
3515 process_commit
($c, $r_min, $r_max, \
@k);
3521 process_commit
($_, $r_min, $r_max) foreach reverse @k;
3525 print '-' x72
,"\n" unless $incremental || $oneline;
3528 package Git
::SVN
::Migration
;
3529 # these version numbers do NOT correspond to actual version numbers
3530 # of git nor git-svn. They are just relative.
3532 # v0 layout: .git/$id/info/url, refs/heads/$id-HEAD
3534 # v1 layout: .git/$id/info/url, refs/remotes/$id
3536 # v2 layout: .git/svn/$id/info/url, refs/remotes/$id
3538 # v3 layout: .git/svn/$id, refs/remotes/$id
3539 # - info/url may remain for backwards compatibility
3540 # - this is what we migrate up to this layout automatically,
3541 # - this will be used by git svn init on single branches
3542 # v3.1 layout (auto migrated):
3543 # - .rev_db => .rev_db.$UUID, .rev_db will remain as a symlink
3544 # for backwards compatibility
3546 # v4 layout: .git/svn/$repo_id/$id, refs/remotes/$repo_id/$id
3547 # - this is only created for newly multi-init-ed
3548 # repositories. Similar in spirit to the
3549 # --use-separate-remotes option in git-clone (now default)
3550 # - we do not automatically migrate to this (following
3551 # the example set by core git)
3555 use File
::Path qw
/mkpath/;
3556 use File
::Basename qw
/dirname basename/;
3557 use vars qw
/$_minimize/;
3559 sub migrate_from_v0
{
3560 my $git_dir = $ENV{GIT_DIR
};
3561 return undef unless -d
$git_dir;
3562 my ($fh, $ctx) = command_output_pipe
(qw
/rev-parse --symbolic --all/);
3566 my ($id, $orig_ref) = ($_, $_);
3567 next unless $id =~ s
#^refs/heads/(.+)-HEAD$#$1#;
3568 next unless -f
"$git_dir/$id/info/url";
3569 my $new_ref = "refs/remotes/$id";
3570 if (::verify_ref
("$new_ref^0")) {
3571 print STDERR
"W: $orig_ref is probably an old ",
3572 "branch used by an ancient version of ",
3574 "However, $new_ref also exists.\n",
3575 "We will not be able ",
3576 "to use this branch until this ",
3577 "ambiguity is resolved.\n";
3580 print STDERR
"Migrating from v0 layout...\n" if !$migrated;
3581 print STDERR
"Renaming ref: $orig_ref => $new_ref\n";
3582 command_noisy
('update-ref', $new_ref, $orig_ref);
3583 command_noisy
('update-ref', '-d', $orig_ref, $orig_ref);
3586 command_close_pipe
($fh, $ctx);
3587 print STDERR
"Done migrating from v0 layout...\n" if $migrated;
3591 sub migrate_from_v1
{
3592 my $git_dir = $ENV{GIT_DIR
};
3594 return $migrated unless -d
$git_dir;
3595 my $svn_dir = "$git_dir/svn";
3597 # just in case somebody used 'svn' as their $id at some point...
3598 return $migrated if -d
$svn_dir && ! -f
"$svn_dir/info/url";
3600 print STDERR
"Migrating from a git-svn v1 layout...\n";
3602 print STDERR
"Data from a previous version of git-svn exists, but\n\t",
3603 "$svn_dir\n\t(required for this version ",
3604 "($::VERSION) of git-svn) does not. exist\n";
3605 my ($fh, $ctx) = command_output_pipe
(qw
/rev-parse --symbolic --all/);
3608 next unless $x =~ s
#^refs/remotes/##;
3610 next unless -f
"$git_dir/$x/info/url";
3611 my $u = eval { ::file_to_s
("$git_dir/$x/info/url") };
3613 my $dn = dirname
("$git_dir/svn/$x");
3614 mkpath
([$dn]) unless -d
$dn;
3615 if ($x eq 'svn') { # they used 'svn' as GIT_SVN_ID:
3616 mkpath
(["$git_dir/svn/svn"]);
3617 print STDERR
" - $git_dir/$x/info => ",
3618 "$git_dir/svn/$x/info\n";
3619 rename "$git_dir/$x/info", "$git_dir/svn/$x/info" or
3621 # don't worry too much about these, they probably
3622 # don't exist with repos this old (save for index,
3623 # and we can easily regenerate that)
3624 foreach my $f (qw
/unhandled.log index .rev_db/) {
3625 rename "$git_dir/$x/$f", "$git_dir/svn/$x/$f";
3628 print STDERR
" - $git_dir/$x => $git_dir/svn/$x\n";
3629 rename "$git_dir/$x", "$git_dir/svn/$x" or
3634 command_close_pipe
($fh, $ctx);
3635 print STDERR
"Done migrating from a git-svn v1 layout\n";
3640 my ($l_map, $pfx, $path) = @_;
3642 foreach (<$path/*>) {
3643 if (-r
"$_/info/url") {
3644 $pfx .= '/' if $pfx && $pfx !~ m
!/$!;
3645 my $ref_id = $pfx . basename
$_;
3646 my $url = ::file_to_s
("$_/info/url");
3647 $l_map->{$ref_id} = $url;
3654 $x =~ s!^\Q$ENV{GIT_DIR}\E/svn/!!o;
3655 read_old_urls
($l_map, $x, $_);
3659 sub migrate_from_v2
{
3660 my @cfg = command
(qw
/config -l/);
3661 return if grep /^svn-remote\..+\.url=/, @cfg;
3663 read_old_urls
(\
%l_map, '', "$ENV{GIT_DIR}/svn");
3666 foreach my $ref_id (sort keys %l_map) {
3667 eval { Git
::SVN
->init($l_map{$ref_id}, '', undef, $ref_id) };
3669 Git
::SVN
->init($l_map{$ref_id}, '', $ref_id, $ref_id);
3676 sub minimize_connections
{
3677 my $r = Git
::SVN
::read_all_remotes
();
3679 my $root_repos = {};
3680 foreach my $repo_id (keys %$r) {
3681 my $url = $r->{$repo_id}->{url
} or next;
3682 my $fetch = $r->{$repo_id}->{fetch
} or next;
3683 my $ra = Git
::SVN
::Ra
->new($url);
3685 # skip existing cases where we already connect to the root
3686 if (($ra->{url
} eq $ra->{repos_root
}) ||
3687 (Git
::SVN
::sanitize_remote_name
($ra->{repos_root
}) eq
3689 $root_repos->{$ra->{url
}} = $repo_id;
3693 my $root_ra = Git
::SVN
::Ra
->new($ra->{repos_root
});
3694 my $root_path = $ra->{url
};
3695 $root_path =~ s
#^\Q$ra->{repos_root}\E(/|$)##;
3696 foreach my $path (keys %$fetch) {
3697 my $ref_id = $fetch->{$path};
3698 my $gs = Git
::SVN
->new($ref_id, $repo_id, $path);
3700 # make sure we can read when connecting to
3701 # a higher level of a repository
3702 my ($last_rev, undef) = $gs->last_rev_commit;
3703 if (!defined $last_rev) {
3705 $root_ra->get_latest_revnum;
3709 my $new = $root_path;
3710 $new .= length $path ?
"/$path" : '';
3712 $root_ra->get_log([$new], $last_rev, $last_rev,
3716 $new_urls->{$ra->{repos_root
}}->{$new} =
3717 { ref_id
=> $ref_id,
3718 old_repo_id
=> $repo_id,
3719 old_path
=> $path };
3724 foreach my $url (keys %$new_urls) {
3725 # see if we can re-use an existing [svn-remote "repo_id"]
3726 # instead of creating a(n ugly) new section:
3727 my $repo_id = $root_repos->{$url} ||
3728 Git
::SVN
::sanitize_remote_name
($url);
3730 my $fetch = $new_urls->{$url};
3731 foreach my $path (keys %$fetch) {
3732 my $x = $fetch->{$path};
3733 Git
::SVN
->init($url, $path, $repo_id, $x->{ref_id
});
3734 my $pfx = "svn-remote.$x->{old_repo_id}";
3736 my $old_fetch = quotemeta("$x->{old_path}:".
3737 "refs/remotes/$x->{ref_id}");
3738 command_noisy
(qw
/config --unset/,
3739 "$pfx.fetch", '^'. $old_fetch . '$');
3740 delete $r->{$x->{old_repo_id
}}->
3741 {fetch
}->{$x->{old_path
}};
3742 if (!keys %{$r->{$x->{old_repo_id
}}->{fetch
}}) {
3743 command_noisy
(qw
/config --unset/,
3745 push @emptied, $x->{old_repo_id
}
3750 my $file = $ENV{GIT_CONFIG
} || $ENV{GIT_CONFIG_LOCAL
} ||
3751 "$ENV{GIT_DIR}/config";
3753 The following [svn-remote] sections in your config file ($file) are empty
3754 and can be safely removed:
3756 print STDERR
"[svn-remote \"$_\"]\n" foreach @emptied;
3760 sub migration_check
{
3764 minimize_connections
() if $_minimize;
3767 package Git
::IndexInfo
;
3770 use Git qw
/command_input_pipe command_close_pipe/;
3774 my ($gui, $ctx) = command_input_pipe
(qw
/update-index -z --index-info/);
3775 bless { gui
=> $gui, ctx
=> $ctx, nr
=> 0}, $class;
3779 my ($self, $path) = @_;
3780 if (print { $self->{gui
} } '0 ', 0 x
40, "\t", $path, "\0") {
3781 return ++$self->{nr
};
3787 my ($self, $mode, $hash, $path) = @_;
3788 if (print { $self->{gui
} } $mode, ' ', $hash, "\t", $path, "\0") {
3789 return ++$self->{nr
};
3796 command_close_pipe
($self->{gui
}, $self->{ctx
});
3799 package Git
::SVN
::GlobSpec
;
3804 my ($class, $glob) = @_;
3806 $re =~ s!/+$!!g; # no need for trailing slashes
3807 my $nr = ($re =~ s!^(.*)\*(.*)$!\(\[^/\]+\)!g);
3808 my ($left, $right) = ($1, $2);
3810 die "Only one '*' wildcard expansion ",
3811 "is supported (got $nr): '$glob'\n";
3812 } elsif ($nr == 0) {
3813 die "One '*' is needed for glob: '$glob'\n";
3815 $re = quotemeta($left) . $re . quotemeta($right);
3816 if (length $left && !($left =~ s!/+$!!g)) {
3817 die "Missing trailing '/' on left side of: '$glob' ($left)\n";
3819 if (length $right && !($right =~ s!^/+!!g)) {
3820 die "Missing leading '/' on right side of: '$glob' ($right)\n";
3822 my $left_re = qr/^\/\Q
$left\E
(\
/|$)/;
3823 bless { left
=> $left, right
=> $right, left_regex
=> $left_re,
3824 regex
=> qr/$re/, glob => $glob }, $class;
3828 my ($self, $path) = @_;
3829 return (length $self->{left
} ?
"$self->{left}/" : '') .
3830 $path . (length $self->{right
} ?
"/$self->{right}" : '');
3838 $remotes = { # returned by read_all_remotes()
3840 # svn-remote.svn.url=https://svn.musicpd.org
3841 url
=> 'https://svn.musicpd.org',
3842 # svn-remote.svn.fetch=mpd/trunk:trunk
3844 'mpd/trunk' => 'trunk',
3846 # svn-remote.svn.tags=mpd/tags/*:tags/*
3851 regex
=> qr!mpd/tags/([^/]+)$!,
3857 regex
=> qr!tags/([^/]+)$!,
3864 $log_entry hashref as returned by libsvn_log_entry
()
3866 log => 'whitespace-formatted log entry
3867 ', # trailing newline is preserved
3868 revision
=> '8', # integer
3869 date
=> '2004-02-24T17:01:44.108345Z', # commit date
3870 author
=> 'committer name'
3874 # this is generated by generate_diff();
3875 @mods = array of diff
-index line hashes
, each element represents one line
3876 of diff
-index output
3878 diff
-index line
($m hash
)
3880 mode_a
=> first column of diff
-index output
, no leading
':',
3881 mode_b
=> second column of diff
-index output
,
3882 sha1_b
=> sha1sum of the final blob
,
3883 chg
=> change type
[MCRADT
],
3884 file_a
=> original file name of a file
(iff chg is
'C' or 'R')
3885 file_b
=> new
/current file name of a file
(any chg
)
3889 # retval of read_url_paths{,_all}();
3891 # repository root url
3892 'https://svn.musicpd.org' => {
3893 # repository path # GIT_SVN_ID
3894 'mpd/trunk' => 'trunk',
3895 'mpd/tags/0.11.5' => 'tags/0.11.5',
3900 I don
't trust the each() function on unless I created %hash myself
3901 because the internal iterator may not have started at base.