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 $_repository
8 $_q $_authors $_authors_prog %users/;
9 $AUTHOR = 'Eric Wong <normalperson@yhbt.net>';
10 $VERSION = '@@GIT_VERSION@@';
12 # From which subdir have we been invoked?
13 my $cmd_dir_prefix = eval {
14 command_oneline
([qw
/rev-parse --show-prefix/], STDERR
=> 0)
17 my $git_dir_user_set = 1 if defined $ENV{GIT_DIR
};
18 $ENV{GIT_DIR
} ||= '.git';
19 $Git::SVN
::default_repo_id
= 'svn';
20 $Git::SVN
::default_ref_id
= $ENV{GIT_SVN_ID
} || 'git-svn';
21 $Git::SVN
::Ra
::_log_window_size
= 100;
22 $Git::SVN
::_minimize_url
= 'unset';
24 if (! exists $ENV{SVN_SSH
}) {
25 if (exists $ENV{GIT_SSH
}) {
26 $ENV{SVN_SSH
} = $ENV{GIT_SSH
};
28 $ENV{SVN_SSH
} =~ s/\\/\\\\/g;
29 $ENV{SVN_SSH
} =~ s/(.*)/"$1"/;
34 $Git::SVN
::Log
::TZ
= $ENV{TZ
};
36 $| = 1; # unbuffer STDOUT
38 sub fatal
(@
) { print STDERR
"@_\n"; exit 1 }
40 require SVN
::Core
; # use()-ing this causes segfaults for me... *shrug*
43 if ($SVN::Core
::VERSION
lt '1.1.0') {
44 fatal
"Need SVN::Core 1.1.0 or better (got $SVN::Core::VERSION)";
47 my $can_compress = eval { require Compress
::Zlib
; 1};
48 push @Git::SVN
::Ra
::ISA
, 'SVN::Ra';
49 push @SVN::Git
::Editor
::ISA
, 'SVN::Delta::Editor';
50 push @SVN::Git
::Fetcher
::ISA
, 'SVN::Delta::Editor';
54 use File
::Basename qw
/dirname basename/;
55 use File
::Path qw
/mkpath/;
58 use Getopt
::Long qw
/:config gnu_getopt no_ignore_case auto_abbrev/;
63 # import functions from Git into our packages, en masse
65 foreach (qw
/command command_oneline command_noisy command_output_pipe
66 command_input_pipe command_close_pipe
67 command_bidi_pipe command_close_bidi_pipe
/) {
68 for my $package ( qw(SVN::Git::Editor SVN::Git::Fetcher
69 Git::SVN::Migration Git::SVN::Log Git::SVN),
71 *{"${package}::$_"} = \
&{"Git::$_"};
78 $sha1 = qr/[a-f\d]{40}/;
79 $sha1_short = qr/[a-f\d]{4,40}/;
80 my ($_stdin, $_help, $_edit,
81 $_message, $_file, $_branch_dest,
83 $_version, $_fetch_all, $_no_rebase, $_fetch_parent,
84 $_merge, $_strategy, $_dry_run, $_local,
85 $_prefix, $_no_checkout, $_url, $_verbose,
86 $_git_format, $_commit_url, $_tag);
87 $Git::SVN
::_follow_parent
= 1;
89 my %remote_opts = ( 'username=s' => \
$Git::SVN
::Prompt
::_username
,
90 'config-dir=s' => \
$Git::SVN
::Ra
::config_dir
,
91 'no-auth-cache' => \
$Git::SVN
::Prompt
::_no_auth_cache
,
92 'ignore-paths=s' => \
$SVN::Git
::Fetcher
::_ignore_regex
);
93 my %fc_opts = ( 'follow-parent|follow!' => \
$Git::SVN
::_follow_parent
,
94 'authors-file|A=s' => \
$_authors,
95 'authors-prog=s' => \
$_authors_prog,
96 'repack:i' => \
$Git::SVN
::_repack
,
97 'noMetadata' => \
$Git::SVN
::_no_metadata
,
98 'useSvmProps' => \
$Git::SVN
::_use_svm_props
,
99 'useSvnsyncProps' => \
$Git::SVN
::_use_svnsync_props
,
100 'log-window-size=i' => \
$Git::SVN
::Ra
::_log_window_size
,
101 'no-checkout' => \
$_no_checkout,
103 'repack-flags|repack-args|repack-opts=s' =>
104 \
$Git::SVN
::_repack_flags
,
105 'use-log-author' => \
$Git::SVN
::_use_log_author
,
106 'add-author-from' => \
$Git::SVN
::_add_author_from
,
107 'localtime' => \
$Git::SVN
::_localtime
,
110 my ($_trunk, @_tags, @_branches, $_stdlayout);
112 my %init_opts = ( 'template=s' => \
$_template, 'shared:s' => \
$_shared,
113 'trunk|T=s' => \
$_trunk, 'tags|t=s@' => \
@_tags,
114 'branches|b=s@' => \
@_branches, 'prefix=s' => \
$_prefix,
115 'stdlayout|s' => \
$_stdlayout,
116 'minimize-url|m!' => \
$Git::SVN
::_minimize_url
,
117 'no-metadata' => sub { $icv{noMetadata
} = 1 },
118 'use-svm-props' => sub { $icv{useSvmProps
} = 1 },
119 'use-svnsync-props' => sub { $icv{useSvnsyncProps
} = 1 },
120 'rewrite-root=s' => sub { $icv{rewriteRoot
} = $_[1] },
121 'rewrite-uuid=s' => sub { $icv{rewriteUUID
} = $_[1] },
123 my %cmt_opts = ( 'edit|e' => \
$_edit,
124 'rmdir' => \
$SVN::Git
::Editor
::_rmdir
,
125 'find-copies-harder' => \
$SVN::Git
::Editor
::_find_copies_harder
,
126 'l=i' => \
$SVN::Git
::Editor
::_rename_limit
,
127 'copy-similarity|C=i'=> \
$SVN::Git
::Editor
::_cp_similarity
131 fetch
=> [ \
&cmd_fetch
, "Download new revisions from SVN",
132 { 'revision|r=s' => \
$_revision,
133 'fetch-all|all' => \
$_fetch_all,
134 'parent|p' => \
$_fetch_parent,
136 clone
=> [ \
&cmd_clone
, "Initialize and fetch revisions",
137 { 'revision|r=s' => \
$_revision,
138 %fc_opts, %init_opts } ],
139 init
=> [ \
&cmd_init
, "Initialize a repo for tracking" .
140 " (requires URL argument)",
142 'multi-init' => [ \
&cmd_multi_init
,
143 "Deprecated alias for ".
144 "'$0 init -T<trunk> -b<branches> -t<tags>'",
146 dcommit
=> [ \
&cmd_dcommit
,
147 'Commit several diffs to merge with upstream',
148 { 'merge|m|M' => \
$_merge,
149 'strategy|s=s' => \
$_strategy,
150 'verbose|v' => \
$_verbose,
151 'dry-run|n' => \
$_dry_run,
152 'fetch-all|all' => \
$_fetch_all,
153 'commit-url=s' => \
$_commit_url,
154 'revision|r=i' => \
$_revision,
155 'no-rebase' => \
$_no_rebase,
156 %cmt_opts, %fc_opts } ],
157 branch
=> [ \
&cmd_branch
,
158 'Create a branch in the SVN repository',
159 { 'message|m=s' => \
$_message,
160 'destination|d=s' => \
$_branch_dest,
161 'dry-run|n' => \
$_dry_run,
163 'username=s' => \
$Git::SVN
::Prompt
::_username
,
164 'commit-url=s' => \
$_commit_url } ],
165 tag
=> [ sub { $_tag = 1; cmd_branch
(@_) },
166 'Create a tag in the SVN repository',
167 { 'message|m=s' => \
$_message,
168 'destination|d=s' => \
$_branch_dest,
169 'dry-run|n' => \
$_dry_run,
170 'username=s' => \
$Git::SVN
::Prompt
::_username
,
171 'commit-url=s' => \
$_commit_url } ],
172 'set-tree' => [ \
&cmd_set_tree
,
173 "Set an SVN repository to a git tree-ish",
174 { 'stdin' => \
$_stdin, %cmt_opts, %fc_opts, } ],
175 'create-ignore' => [ \
&cmd_create_ignore
,
176 'Create a .gitignore per svn:ignore',
177 { 'revision|r=i' => \
$_revision
179 'mkdirs' => [ \
&cmd_mkdirs
,
180 "recreate empty directories after a checkout",
181 { 'revision|r=i' => \
$_revision } ],
182 'propget' => [ \
&cmd_propget
,
183 'Print the value of a property on a file or directory',
184 { 'revision|r=i' => \
$_revision } ],
185 'proplist' => [ \
&cmd_proplist
,
186 'List all properties of a file or directory',
187 { 'revision|r=i' => \
$_revision } ],
188 'show-ignore' => [ \
&cmd_show_ignore
, "Show svn:ignore listings",
189 { 'revision|r=i' => \
$_revision
191 'show-externals' => [ \
&cmd_show_externals
, "Show svn:externals listings",
192 { 'revision|r=i' => \
$_revision
194 'multi-fetch' => [ \
&cmd_multi_fetch
,
195 "Deprecated alias for $0 fetch --all",
196 { 'revision|r=s' => \
$_revision, %fc_opts } ],
197 'migrate' => [ sub { },
198 # no-op, we automatically run this anyways,
199 'Migrate configuration/metadata/layout from
200 previous versions of git-svn',
201 { 'minimize' => \
$Git::SVN
::Migration
::_minimize
,
203 'log' => [ \
&Git
::SVN
::Log
::cmd_show_log
, 'Show commit logs',
204 { 'limit=i' => \
$Git::SVN
::Log
::limit
,
205 'revision|r=s' => \
$_revision,
206 'verbose|v' => \
$Git::SVN
::Log
::verbose
,
207 'incremental' => \
$Git::SVN
::Log
::incremental
,
208 'oneline' => \
$Git::SVN
::Log
::oneline
,
209 'show-commit' => \
$Git::SVN
::Log
::show_commit
,
210 'non-recursive' => \
$Git::SVN
::Log
::non_recursive
,
211 'authors-file|A=s' => \
$_authors,
212 'color' => \
$Git::SVN
::Log
::color
,
213 'pager=s' => \
$Git::SVN
::Log
::pager
215 'find-rev' => [ \
&cmd_find_rev
,
216 "Translate between SVN revision numbers and tree-ish",
218 'rebase' => [ \
&cmd_rebase
, "Fetch and rebase your working directory",
219 { 'merge|m|M' => \
$_merge,
220 'verbose|v' => \
$_verbose,
221 'strategy|s=s' => \
$_strategy,
222 'local|l' => \
$_local,
223 'fetch-all|all' => \
$_fetch_all,
224 'dry-run|n' => \
$_dry_run,
226 'commit-diff' => [ \
&cmd_commit_diff
,
227 'Commit a diff between two trees',
228 { 'message|m=s' => \
$_message,
229 'file|F=s' => \
$_file,
230 'revision|r=s' => \
$_revision,
232 'info' => [ \
&cmd_info
,
233 "Show info about the latest SVN revision
234 on the current branch",
235 { 'url' => \
$_url, } ],
236 'blame' => [ \
&Git
::SVN
::Log
::cmd_blame
,
237 "Show what revision and author last modified each line of a file",
238 { 'git-format' => \
$_git_format } ],
239 'reset' => [ \
&cmd_reset
,
240 "Undo fetches back to the specified SVN revision",
241 { 'revision|r=s' => \
$_revision,
242 'parent|p' => \
$_fetch_parent } ],
244 "Compress unhandled.log files in .git/svn and remove " .
245 "index files in .git/svn",
250 for (my $i = 0; $i < @ARGV; $i++) {
251 if (defined $cmd{$ARGV[$i]}) {
255 } elsif ($ARGV[$i] eq 'help') {
261 # make sure we're always running at the top-level working directory
262 unless ($cmd && $cmd =~ /(?:clone|init|multi-init)$/) {
263 unless (-d
$ENV{GIT_DIR
}) {
264 if ($git_dir_user_set) {
265 die "GIT_DIR=$ENV{GIT_DIR} explicitly set, ",
266 "but it is not a directory\n";
268 my $git_dir = delete $ENV{GIT_DIR
};
271 $cdup = command_oneline
(qw
/rev-parse --show-cdup/);
272 $git_dir = '.' unless ($cdup);
273 chomp $cdup if ($cdup);
274 $cdup = "." unless ($cdup && length $cdup);
275 } "Already at toplevel, but $git_dir not found\n";
276 chdir $cdup or die "Unable to chdir up to '$cdup'\n";
277 unless (-d
$git_dir) {
278 die "$git_dir still not found after going to ",
281 $ENV{GIT_DIR
} = $git_dir;
283 $_repository = Git
->repository(Repository
=> $ENV{GIT_DIR
});
286 my %opts = %{$cmd{$cmd}->[2]} if (defined $cmd);
288 read_git_config
(\
%opts);
289 if ($cmd && ($cmd eq 'log' || $cmd eq 'blame')) {
290 Getopt
::Long
::Configure
('pass_through');
292 my $rv = GetOptions
(%opts, 'help|H|h' => \
$_help, 'version|V' => \
$_version,
293 'minimize-connections' => \
$Git::SVN
::Migration
::_minimize
,
294 'id|i=s' => \
$Git::SVN
::default_ref_id
,
295 'svn-remote|remote|R=s' => sub {
296 $Git::SVN
::no_reuse_existing
= 1;
297 $Git::SVN
::default_repo_id
= $_[1] });
298 exit 1 if (!$rv && $cmd && $cmd ne 'log');
301 version
() if $_version;
302 usage
(1) unless defined $cmd;
303 load_authors
() if $_authors;
304 if (defined $_authors_prog) {
305 $_authors_prog = "'" . File
::Spec
->rel2abs($_authors_prog) . "'";
308 unless ($cmd =~ /^(?:clone|init|multi-init|commit-diff)$/) {
309 Git
::SVN
::Migration
::migration_check
();
311 Git
::SVN
::init_vars
();
313 Git
::SVN
::verify_remotes_sanity
();
314 $cmd{$cmd}->[0]->(@ARGV);
317 post_fetch_checkout
();
320 ####################### primary functions ######################
322 my $exit = shift || 0;
323 my $fd = $exit ? \
*STDERR
: \
*STDOUT
;
325 git
-svn
- bidirectional operations between a single Subversion tree
and git
326 Usage
: git svn
<command
> [options
] [arguments
]\n
328 print $fd "Available commands:\n" unless $cmd;
330 foreach (sort keys %cmd) {
331 next if $cmd && $cmd ne $_;
332 next if /^multi-/; # don't show deprecated commands
333 print $fd ' ',pack('A17',$_),$cmd{$_}->[1],"\n";
334 foreach (sort keys %{$cmd{$_}->[2]}) {
335 # mixed-case options are for .git/config only
336 next if /[A-Z]/ && /^[a-z]+$/i;
337 # prints out arguments as they should be passed:
338 my $x = s
#[:=]s$## ? '<arg>' : s#[:=]i$## ? '<num>' : '';
339 print $fd ' ' x
21, join(', ', map { length $_ > 1 ?
341 split /\|/,$_)," $x\n";
345 \nGIT_SVN_ID may be set
in the environment
or via the
--id
/-i switch to an
346 arbitrary identifier
if you
're tracking multiple SVN branches/repositories in
347 one git repository and want to keep them separate. See git-svn(1) for more
355 print "git-svn version $VERSION (svn $SVN::Core::VERSION)\n";
360 unless (-d $ENV{GIT_DIR}) {
361 my @init_db = ('init
');
362 push @init_db, "--template=$_template" if defined $_template;
363 if (defined $_shared) {
364 if ($_shared =~ /[a-z]/) {
365 push @init_db, "--shared=$_shared";
367 push @init_db, "--shared";
370 command_noisy(@init_db);
371 $_repository = Git->repository(Repository => ".git");
374 my $pfx = "svn-remote.$Git::SVN::default_repo_id";
375 foreach my $i (keys %icv) {
376 die "'$set' and '$i' cannot both be set\n" if $set;
377 next unless defined $icv{$i};
378 command_noisy('config
', "$pfx.$i", $icv{$i});
381 my $ignore_regex = \$SVN::Git::Fetcher::_ignore_regex;
382 command_noisy('config
', "$pfx.ignore-paths", $$ignore_regex)
383 if defined $$ignore_regex;
387 my $repo_path = shift or return;
388 mkpath([$repo_path]) unless -d $repo_path;
389 chdir $repo_path or die "Couldn't
chdir to
$repo_path: $!\n";
390 $ENV{GIT_DIR} = '.git';
391 $_repository = Git->repository(Repository => $ENV{GIT_DIR});
395 my ($url, $path) = @_;
396 if (!defined $path &&
397 (defined $_trunk || @_branches || @_tags ||
398 defined $_stdlayout) &&
399 $url !~ m#^[a-z\+]+://#) {
402 $path = basename($url) if !defined $path || !length $path;
403 my $authors_absolute = $_authors ? File::Spec->rel2abs($_authors) : "";
404 cmd_init($url, $path);
405 command_oneline('config', 'svn.authorsfile', $authors_absolute)
407 Git::SVN::fetch_all($Git::SVN::default_repo_id);
411 if (defined $_stdlayout) {
412 $_trunk = 'trunk' if (!defined $_trunk);
413 @_tags = 'tags' if (! @_tags);
414 @_branches = 'branches' if (! @_branches);
416 if (defined $_trunk || @_branches || @_tags) {
417 return cmd_multi_init(@_);
419 my $url = shift or die "SVN repository location required
",
420 "as a command
-line argument
\n";
421 $url = canonicalize_url($url);
425 if ($Git::SVN::_minimize_url eq 'unset') {
426 $Git::SVN::_minimize_url = 0;
429 Git::SVN->init($url);
433 if (grep /^\d+=./, @_) {
434 die "'<rev>=<commit>' fetch arguments are
",
435 "no longer supported
.\n";
439 die "Usage
: $0 fetch
[--all
] [--parent
] [svn
-remote
]\n";
441 $Git::SVN::no_reuse_existing = undef;
442 if ($_fetch_parent) {
443 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
445 die "Unable to determine upstream SVN information from
",
446 "working tree history
\n";
448 # just fetch, don't checkout.
449 $_no_checkout = 'true';
450 $_fetch_all ? $gs->fetch_all : $gs->fetch;
451 } elsif ($_fetch_all) {
454 $remote ||= $Git::SVN::default_repo_id;
455 Git::SVN::fetch_all($remote, Git::SVN::read_all_remotes());
461 if ($_stdin || !@commits) {
462 print "Reading from stdin
...\n";
465 if (/\b($sha1_short)\b/o) {
466 unshift @commits, $1;
471 foreach my $c (@commits) {
472 my @tmp = command('rev-parse',$c);
473 if (scalar @tmp == 1) {
475 } elsif (scalar @tmp > 1) {
476 push @revs, reverse(command('rev-list',@tmp));
478 fatal "Failed to rev
-parse
$c";
481 my $gs = Git::SVN->new;
482 my ($r_last, $cmt_last) = $gs->last_rev_commit;
484 if (defined $gs->{last_rev} && $r_last != $gs->{last_rev}) {
485 fatal "There are new revisions that were fetched
",
486 "and need to be merged
(or acknowledged
) ",
487 "before committing
.\nlast rev
: $r_last\n",
488 " current
: $gs->{last_rev
}";
490 $gs->set_tree($_) foreach @revs;
491 print "Done committing
",scalar @revs," revisions to SVN
\n";
497 command_noisy(qw/update-index --refresh/);
498 git_cmd_try { command_oneline(qw/diff-index --quiet HEAD/) }
499 'Cannot dcommit with a dirty index. Commit your changes first, '
500 . "or stash them with
`git stash'.\n";
504 if ($head ne 'HEAD') {
506 command_oneline([qw/symbolic-ref -q HEAD/])
509 $old_head =~ s{^refs/heads/}{};
511 $old_head = eval { command_oneline(qw/rev-parse HEAD/) };
513 command(['checkout', $head], STDERR => 0);
517 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD', \@refs);
519 die "Unable to determine upstream SVN information from ",
520 "$head history.\nPerhaps the repository is empty.";
523 if (defined $_commit_url) {
526 $url = eval { command_oneline('config', '--get',
527 "svn-remote.$gs->{repo_id}.commiturl") };
533 my $last_rev = $_revision if defined $_revision;
535 print "Committing to $url ...\n";
537 my ($linear_refs, $parents) = linearize_history($gs, \@refs);
538 if ($_no_rebase && scalar(@$linear_refs) > 1) {
539 warn "Attempting to commit more than one change while ",
540 "--no-rebase is enabled.\n",
541 "If these changes depend on each other, re-running ",
542 "without --no-rebase may be required."
544 my $expect_url = $url;
545 Git::SVN::remove_username($expect_url);
547 my $d = shift @$linear_refs or last;
548 unless (defined $last_rev) {
549 (undef, $last_rev, undef) = cmt_metadata("$d~1");
550 unless (defined $last_rev) {
551 fatal "Unable to extract revision information ",
556 print "diff-tree $d~1 $d\n";
559 my %ed_opts = ( r => $last_rev,
560 log => get_commit_entry($d)->{log},
561 ra => Git::SVN::Ra->new($url),
562 config => SVN::Core::config_get_config(
563 $Git::SVN::Ra::config_dir
568 print "Committed r$_[0]\n";
572 if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) {
573 print "No changes\n$d~1 == $d\n";
574 } elsif ($parents->{$d} && @{$parents->{$d}}) {
575 $gs->{inject_parents_dcommit}->{$cmt_rev} =
578 $_fetch_all ? $gs->fetch_all : $gs->fetch;
579 $last_rev = $cmt_rev;
582 # we always want to rebase against the current HEAD,
583 # not any head that was passed to us
584 my @diff = command('diff-tree', $d,
588 @finish = rebase_cmd();
589 print STDERR "W: $d and ", $gs->refname,
590 " differ, using @finish:\n",
591 join("\n", @diff), "\n";
593 print "No changes between current HEAD and ",
595 "\nResetting to the latest ",
597 @finish = qw/reset --mixed/;
599 command_noisy(@finish, $gs->refname);
602 my ($url_, $rev_, $uuid_, $gs_) =
603 working_head_info('HEAD', \@refs);
604 my ($linear_refs_, $parents_) =
605 linearize_history($gs_, \@refs);
606 if (scalar(@$linear_refs) !=
607 scalar(@$linear_refs_)) {
608 fatal "# of revisions changed ",
610 join("\n", @$linear_refs),
612 join("\n", @$linear_refs_), "\n",
613 'If you are attempting to commit ',
614 "merges, try running:\n\t",
615 'git rebase --interactive',
616 '--preserve-merges ',
618 "\nBefore dcommitting";
620 if ($url_ ne $expect_url) {
621 if ($url_ eq $gs->metadata_url) {
623 "Accepting rewritten URL:",
627 "URL mismatch after rebase:",
628 " $url_ != $expect_url";
631 if ($uuid_ ne $uuid) {
632 fatal "uuid mismatch after rebase: ",
637 for ($i = 0; $i < scalar @$linear_refs; $i++) {
638 my $new = $linear_refs_->[$i] or next;
640 $parents->{$linear_refs->[$i]};
650 my $new_head = command_oneline(qw/rev-parse HEAD/);
651 my $new_is_symbolic = eval {
652 command_oneline(qw/symbolic-ref -q HEAD/);
654 if ($new_is_symbolic) {
655 print "dcommitted the branch ", $head, "\n";
657 print "dcommitted on a detached HEAD because you gave ",
658 "a revision argument.\n",
659 "The rewritten commit is: ", $new_head, "\n";
661 command(['checkout', $old_head], STDERR => 0);
668 my ($branch_name, $head) = @_;
670 unless (defined $branch_name && length $branch_name) {
671 die(($_tag ? "tag" : "branch") . " name required\n");
675 my (undef, $rev, undef, $gs) = working_head_info($head);
676 my $src = $gs->full_url;
678 my $remote = Git::SVN::read_all_remotes()->{$gs->{repo_id}};
679 my $allglobs = $remote->{ $_tag ? 'tags' : 'branches' };
681 if ($#{$allglobs} == 0) {
682 $glob = $allglobs->[0];
684 unless(defined $_branch_dest) {
686 $_tag ? "tag" : "branch",
687 " paths defined for Subversion repository.\n",
688 "You must specify where you want to create the ",
689 $_tag ? "tag" : "branch",
690 " with the --destination argument.\n";
692 foreach my $g (@{$allglobs}) {
693 # SVN::Git::Editor could probably be moved to Git.pm..
694 my $re = SVN::Git::Editor::glob2pat($g->{path}->{left});
695 if ($_branch_dest =~ /$re/) {
700 unless (defined $glob) {
701 my $dest_re = qr/\b\Q$_branch_dest\E\b/;
702 foreach my $g (@{$allglobs}) {
703 $g->{path}->{left} =~ /$dest_re/ or next;
705 die "Ambiguous destination: ",
706 $_branch_dest, "\nmatches both '",
707 $glob->{path}->{left}, "' and '",
708 $g->{path}->{left}, "'\n";
712 unless (defined $glob) {
714 $_tag ? "tag" : "branch",
715 " destination $_branch_dest\n";
719 my ($lft, $rgt) = @{ $glob->{path} }{qw/left right/};
721 if (defined $_commit_url) {
724 $url = eval { command_oneline('config', '--get',
725 "svn-remote.$gs->{repo_id}.commiturl") };
727 $url = $remote->{url};
730 my $dst = join '/', $url, $lft, $branch_name, ($rgt || ());
732 if ($dst =~ /^https:/ && $src =~ /^http:/) {
733 $src=~s/^http:/https:/;
738 my $ctx = SVN::Client->new(
739 auth => Git::SVN::Ra::_auth_providers(),
741 ${ $_[0] } = defined $_message
743 : 'Create ' . ($_tag ? 'tag ' : 'branch ' )
749 $ctx->ls($dst, 'HEAD', 0);
750 } and die "branch ${branch_name} already exists\n";
752 print "Copying ${src} at r${rev} to ${dst}...\n";
753 $ctx->copy($src, $rev, $dst)
760 my $revision_or_hash = shift or die "SVN or git revision required ",
761 "as a command-line argument\n";
763 if ($revision_or_hash =~ /^r\d+$/) {
767 my (undef, undef, $uuid, $gs) = working_head_info($head, \@refs);
769 die "Unable to determine upstream SVN information from ",
772 my $desired_revision = substr($revision_or_hash, 1);
773 $result = $gs->rev_map_get($desired_revision, $uuid);
775 my (undef, $rev, undef) = cmt_metadata($revision_or_hash);
778 print "$result\n" if $result;
782 command_noisy(qw/update-index --refresh/);
783 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
785 die "Unable to determine upstream SVN information from ",
786 "working tree history\n";
789 print "Remote Branch: " . $gs->refname . "\n";
790 print "SVN URL: " . $url . "\n";
793 if (command(qw/diff-index HEAD --/)) {
794 print STDERR "Cannot rebase with uncommited changes:\n";
795 command_noisy('status');
799 # rebase will checkout for us, so no need to do it explicitly
800 $_no_checkout = 'true';
801 $_fetch_all ? $gs->fetch_all : $gs->fetch;
803 command_noisy(rebase_cmd(), $gs->refname);
807 sub cmd_show_ignore {
808 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
809 $gs ||= Git::SVN->new;
810 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
811 $gs->prop_walk($gs->{path}, $r, sub {
812 my ($gs, $path, $props) = @_;
813 print STDOUT "\n# $path\n";
814 my $s = $props->{'svn:ignore'} or return;
815 $s =~ s/[\r\n]+/\n/g;
823 sub cmd_show_externals {
824 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
825 $gs ||= Git::SVN->new;
826 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
827 $gs->prop_walk($gs->{path}, $r, sub {
828 my ($gs, $path, $props) = @_;
829 print STDOUT "\n# $path\n";
830 my $s = $props->{'svn:externals'} or return;
831 $s =~ s/[\r\n]+/\n/g;
838 sub cmd_create_ignore {
839 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
840 $gs ||= Git::SVN->new;
841 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
842 $gs->prop_walk($gs->{path}, $r, sub {
843 my ($gs, $path, $props) = @_;
844 # $path is of the form /path/to/dir/
846 # SVN can have attributes on empty directories,
847 # which git won't track
848 mkpath([$path]) unless -d $path;
849 my $ignore = $path . '.gitignore';
850 my $s = $props->{'svn:ignore'} or return;
851 open(GITIGNORE, '>', $ignore)
852 or fatal("Failed to open `$ignore' for writing: $!");
853 $s =~ s/[\r\n]+/\n/g;
856 # Prefix all patterns so that the ignore doesn't apply
857 # to sub-directories.
859 print GITIGNORE
"$s\n";
861 or fatal
("Failed to close `$ignore': $!");
862 command_noisy
('add', '-f', $ignore);
867 my ($url, $rev, $uuid, $gs) = working_head_info
('HEAD');
868 $gs ||= Git
::SVN
->new;
869 $gs->mkemptydirs($_revision);
872 sub canonicalize_path
{
874 my $dot_slash_added = 0;
875 if (substr($path, 0, 1) ne "/") {
876 $path = "./" . $path;
877 $dot_slash_added = 1;
879 # File::Spec->canonpath doesn't collapse x/../y into y (for a
880 # good reason), so let's do this manually.
882 $path =~ s
#/\.(?:/|$)#/#g;
883 $path =~ s
#/[^/]+/\.\.##g;
885 $path =~ s
#^\./## if $dot_slash_added;
891 sub canonicalize_url
{
893 $url =~ s
#^([^:]+://[^/]*/)(.*)$#$1 . canonicalize_path($2)#e;
899 # Helper for cmd_propget and cmd_proplist below.
902 my ($url, $rev, $uuid, $gs) = working_head_info
('HEAD');
903 $gs ||= Git
::SVN
->new;
905 # prefix THE PATH by the sub-directory from which the user
907 $path = $cmd_dir_prefix . $path;
908 fatal
("No such file or directory: $path") unless -e
$path;
909 my $is_dir = -d
$path ?
1 : 0;
910 $path = $gs->{path
} . '/' . $path;
912 # canonicalize the path (otherwise libsvn will abort or fail to
914 $path = canonicalize_path
($path);
916 my $r = (defined $_revision ?
$_revision : $gs->ra->get_latest_revnum);
919 (undef, undef, $props) = $gs->ra->get_dir($path, $r);
922 (undef, $props) = $gs->ra->get_file($path, $r, undef);
927 # cmd_propget (PROP, PATH)
928 # ------------------------
929 # Print the SVN property PROP for PATH.
931 my ($prop, $path) = @_;
932 $path = '.' if not defined $path;
933 usage
(1) if not defined $prop;
934 my $props = get_svnprops
($path);
935 if (not defined $props->{$prop}) {
936 fatal
("`$path' does not have a `$prop' SVN property.");
938 print $props->{$prop} . "\n";
941 # cmd_proplist (PATH)
942 # -------------------
943 # Print the list of SVN properties for PATH.
946 $path = '.' if not defined $path;
947 my $props = get_svnprops
($path);
948 print "Properties on '$path':\n";
949 foreach (sort keys %{$props}) {
956 unless (defined $_trunk || @_branches || @_tags) {
960 $_prefix = '' unless defined $_prefix;
962 $url = canonicalize_url
($url);
966 if (defined $_trunk) {
968 my $trunk_ref = 'refs/remotes/' . $_prefix . 'trunk';
969 # try both old-style and new-style lookups:
970 my $gs_trunk = eval { Git
::SVN
->new($trunk_ref) };
972 my ($trunk_url, $trunk_path) =
973 complete_svn_url
($url, $_trunk);
974 $gs_trunk = Git
::SVN
->init($trunk_url, $trunk_path,
978 return unless @_branches || @_tags;
979 my $ra = $url ? Git
::SVN
::Ra
->new($url) : undef;
980 foreach my $path (@_branches) {
981 complete_url_ls_init
($ra, $path, '--branches/-b', $_prefix);
983 foreach my $path (@_tags) {
984 complete_url_ls_init
($ra, $path, '--tags/-t', $_prefix.'tags/');
988 sub cmd_multi_fetch
{
989 $Git::SVN
::no_reuse_existing
= undef;
990 my $remotes = Git
::SVN
::read_all_remotes
();
991 foreach my $repo_id (sort keys %$remotes) {
992 if ($remotes->{$repo_id}->{url
}) {
993 Git
::SVN
::fetch_all
($repo_id, $remotes);
998 # this command is special because it requires no metadata
999 sub cmd_commit_diff
{
1000 my ($ta, $tb, $url) = @_;
1001 my $usage = "Usage: $0 commit-diff -r<revision> ".
1002 "<tree-ish> <tree-ish> [<URL>]";
1003 fatal
($usage) if (!defined $ta || !defined $tb);
1005 if (!defined $url) {
1006 my $gs = eval { Git
::SVN
->new };
1008 fatal
("Needed URL or usable git-svn --id in ",
1009 "the command-line\n", $usage);
1012 $svn_path = $gs->{path
};
1014 unless (defined $_revision) {
1015 fatal
("-r|--revision is a required argument\n", $usage);
1017 if (defined $_message && defined $_file) {
1018 fatal
("Both --message/-m and --file/-F specified ",
1019 "for the commit message.\n",
1020 "I have no idea what you mean");
1022 if (defined $_file) {
1023 $_message = file_to_s
($_file);
1025 $_message ||= get_commit_entry
($tb)->{log};
1027 my $ra ||= Git
::SVN
::Ra
->new($url);
1030 $r = $ra->get_latest_revnum;
1031 } elsif ($r !~ /^\d+$/) {
1032 die "revision argument: $r not understood by git-svn\n";
1034 my %ed_opts = ( r
=> $r,
1039 editor_cb
=> sub { print "Committed r$_[0]\n" },
1040 svn_path
=> $svn_path );
1041 if (!SVN
::Git
::Editor
->new(\
%ed_opts)->apply_diff) {
1042 print "No changes\n$ta == $tb\n";
1046 sub escape_uri_only
{
1049 foreach (split m{/}, $uri) {
1050 s/([^~\w.%+-]|%(?![a-fA-F0-9]{2}))/sprintf("%%%02X",ord($1))/eg;
1058 if ($url =~ m
#^([^:]+)://([^/]*)(.*)$#) {
1059 my ($scheme, $domain, $uri) = ($1, $2, escape_uri_only
($3));
1060 $url = "$scheme://$domain$uri";
1066 my $path = canonicalize_path
(defined($_[0]) ?
$_[0] : ".");
1067 my $fullpath = canonicalize_path
($cmd_dir_prefix . $path);
1069 die "Too many arguments specified\n";
1072 my ($file_type, $diff_status) = find_file_type_and_diff_status
($path);
1074 if (!$file_type && !$diff_status) {
1075 print STDERR
"svn: '$path' is not under version control\n";
1079 my ($url, $rev, $uuid, $gs) = working_head_info
('HEAD');
1081 die "Unable to determine upstream SVN information from ",
1082 "working tree history\n";
1085 # canonicalize_path() will return "" to make libsvn 1.5.x happy,
1086 $path = "." if $path eq "";
1088 my $full_url = $url . ($fullpath eq "" ?
"" : "/$fullpath");
1091 print escape_url
($full_url), "\n";
1095 my $result = "Path: $path\n";
1096 $result .= "Name: " . basename
($path) . "\n" if $file_type ne "dir";
1097 $result .= "URL: " . escape_url
($full_url) . "\n";
1100 my $repos_root = $gs->repos_root;
1101 Git
::SVN
::remove_username
($repos_root);
1102 $result .= "Repository Root: " . escape_url
($repos_root) . "\n";
1105 $result .= "Repository Root: (offline)\n";
1108 $result .= "Repository UUID: $uuid\n" unless $diff_status eq "A" &&
1109 ($SVN::Core
::VERSION
le '1.5.4' || $file_type ne "dir");
1110 $result .= "Revision: " . ($diff_status eq "A" ?
0 : $rev) . "\n";
1112 $result .= "Node Kind: " .
1113 ($file_type eq "dir" ?
"directory" : "file") . "\n";
1115 my $schedule = $diff_status eq "A"
1117 : ($diff_status eq "D" ?
"delete" : "normal");
1118 $result .= "Schedule: $schedule\n";
1120 if ($diff_status eq "A") {
1121 print $result, "\n";
1125 my ($lc_author, $lc_rev, $lc_date_utc);
1126 my @args = Git
::SVN
::Log
::git_svn_log_cmd
($rev, $rev, "--", $fullpath);
1127 my $log = command_output_pipe
(@args);
1128 my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/;
1130 if (/^${esc_color}author (.+) <[^>]+> (\d+) ([\-\+]?\d+)$/o) {
1132 $lc_date_utc = Git
::SVN
::Log
::parse_git_date
($2, $3);
1133 } elsif (/^${esc_color} (git-svn-id:.+)$/o) {
1134 (undef, $lc_rev, undef) = ::extract_metadata
($1);
1139 Git
::SVN
::Log
::set_local_timezone
();
1141 $result .= "Last Changed Author: $lc_author\n";
1142 $result .= "Last Changed Rev: $lc_rev\n";
1143 $result .= "Last Changed Date: " .
1144 Git
::SVN
::Log
::format_svn_date
($lc_date_utc) . "\n";
1146 if ($file_type ne "dir") {
1147 my $text_last_updated_date =
1148 ($diff_status eq "D" ?
$lc_date_utc : (stat $path)[9]);
1150 "Text Last Updated: " .
1151 Git
::SVN
::Log
::format_svn_date
($text_last_updated_date) .
1154 if ($diff_status eq "D") {
1156 command_output_pipe
(qw(cat-file blob), "HEAD:$path");
1157 if ($file_type eq "link") {
1158 my $file_name = <$fh>;
1159 $checksum = md5sum
("link $file_name");
1161 $checksum = md5sum
($fh);
1163 command_close_pipe
($fh, $ctx);
1164 } elsif ($file_type eq "link") {
1166 command
(qw(cat-file blob), "HEAD:$path");
1168 md5sum
("link " . $file_name);
1170 open FILE
, "<", $path or die $!;
1171 $checksum = md5sum
(\
*FILE
);
1172 close FILE
or die $!;
1174 $result .= "Checksum: " . $checksum . "\n";
1177 print $result, "\n";
1181 my $target = shift || $_revision or die "SVN revision required\n";
1182 $target = $1 if $target =~ /^r(\d+)$/;
1183 $target =~ /^\d+$/ or die "Numeric SVN revision expected\n";
1184 my ($url, $rev, $uuid, $gs) = working_head_info
('HEAD');
1186 die "Unable to determine upstream SVN information from ".
1189 my ($r, $c) = $gs->find_rev_before($target, not $_fetch_parent);
1190 die "Cannot find SVN revision $target\n" unless defined($c);
1191 $gs->rev_map_set($r, $c, 'reset', $uuid);
1192 print "r$r = $c ($gs->{ref_id})\n";
1196 if (!$can_compress) {
1197 warn "Compress::Zlib could not be found; unhandled.log " .
1198 "files will not be compressed.\n";
1200 find
({ wanted
=> \
&gc_directory
, no_chdir
=> 1}, "$ENV{GIT_DIR}/svn");
1203 ########################### utility functions #########################
1206 my @cmd = qw
/rebase/;
1207 push @cmd, '-v' if $_verbose;
1208 push @cmd, qw
/--merge/ if $_merge;
1209 push @cmd, "--strategy=$_strategy" if $_strategy;
1213 sub post_fetch_checkout
{
1214 return if $_no_checkout;
1215 my $gs = $Git::SVN
::_head
or return;
1216 return if verify_ref
('refs/heads/master^0');
1218 # look for "trunk" ref if it exists
1219 my $remote = Git
::SVN
::read_all_remotes
()->{$gs->{repo_id
}};
1220 my $fetch = $remote->{fetch
};
1222 foreach my $p (keys %$fetch) {
1223 basename
($fetch->{$p}) eq 'trunk' or next;
1224 $gs = Git
::SVN
->new($fetch->{$p}, $gs->{repo_id
}, $p);
1229 my $valid_head = verify_ref
('HEAD^0');
1230 command_noisy
(qw(update-ref refs/heads/master), $gs->refname);
1231 return if ($valid_head || !verify_ref
('HEAD^0'));
1233 return if $ENV{GIT_DIR
} !~ m
#^(?:.*/)?\.git$#;
1234 my $index = $ENV{GIT_INDEX_FILE
} || "$ENV{GIT_DIR}/index";
1235 return if -f
$index;
1237 return if command_oneline
(qw
/rev-parse --is-inside-work-tree/) eq 'false';
1238 return if command_oneline
(qw
/rev-parse --is-inside-git-dir/) eq 'true';
1239 command_noisy
(qw
/read-tree -m -u -v HEAD HEAD/);
1240 print STDERR
"Checked out HEAD:\n ",
1241 $gs->full_url, " r", $gs->last_rev, "\n";
1242 $gs->mkemptydirs($gs->last_rev);
1245 sub complete_svn_url
{
1246 my ($url, $path) = @_;
1248 if ($path !~ m
#^[a-z\+]+://#) {
1249 if (!defined $url || $url !~ m
#^[a-z\+]+://#) {
1250 fatal
("E: '$path' is not a complete URL ",
1251 "and a separate URL is not specified");
1253 return ($url, $path);
1258 sub complete_url_ls_init
{
1259 my ($ra, $repo_path, $switch, $pfx) = @_;
1260 unless ($repo_path) {
1261 print STDERR
"W: $switch not specified\n";
1264 $repo_path =~ s
#/+$##;
1265 if ($repo_path =~ m
#^[a-z\+]+://#) {
1266 $ra = Git
::SVN
::Ra
->new($repo_path);
1269 $repo_path =~ s
#^/+##;
1271 fatal
("E: '$repo_path' is not a complete URL ",
1272 "and a separate URL is not specified");
1275 my $url = $ra->{url
};
1276 my $gs = Git
::SVN
->init($url, undef, undef, undef, 1);
1277 my $k = "svn-remote.$gs->{repo_id}.url";
1278 my $orig_url = eval { command_oneline
(qw
/config --get/, $k) };
1279 if ($orig_url && ($orig_url ne $gs->{url
})) {
1280 die "$k already set: $orig_url\n",
1281 "wanted to set to: $gs->{url}\n";
1283 command_oneline
('config', $k, $gs->{url
}) unless $orig_url;
1284 my $remote_path = "$gs->{path}/$repo_path";
1285 $remote_path =~ s{%([0-9A-F]{2})}{chr hex($1)}ieg;
1286 $remote_path =~ s
#/+#/#g;
1287 $remote_path =~ s
#^/##g;
1288 $remote_path .= "/*" if $remote_path !~ /\
*/;
1289 my ($n) = ($switch =~ /^--(\w+)/);
1290 if (length $pfx && $pfx !~ m
#/$#) {
1291 die "--prefix='$pfx' must have a trailing slash '/'\n";
1293 command_noisy
('config',
1295 "svn-remote.$gs->{repo_id}.$n",
1296 "$remote_path:refs/remotes/$pfx*" .
1297 ('/*' x
(($remote_path =~ tr
/*/*/) - 1)) );
1302 eval { command_oneline
([ 'rev-parse', '--verify', $ref ],
1303 { STDERR
=> 0 }); };
1306 sub get_tree_from_treeish
{
1308 # $treeish can be a symbolic ref, too:
1309 my $type = command_oneline
(qw
/cat-file -t/, $treeish);
1311 while ($type eq 'tag') {
1312 ($treeish, $type) = command
(qw
/cat-file tag/, $treeish);
1314 if ($type eq 'commit') {
1315 $expected = (grep /^tree /, command
(qw
/cat-file commit/,
1317 ($expected) = ($expected =~ /^tree ($sha1)$/o);
1318 die "Unable to get tree from $treeish\n" unless $expected;
1319 } elsif ($type eq 'tree') {
1320 $expected = $treeish;
1322 die "$treeish is a $type, expected tree, tag or commit\n";
1327 sub get_commit_entry
{
1328 my ($treeish) = shift;
1329 my %log_entry = ( log => '', tree
=> get_tree_from_treeish
($treeish) );
1330 my $commit_editmsg = "$ENV{GIT_DIR}/COMMIT_EDITMSG";
1331 my $commit_msg = "$ENV{GIT_DIR}/COMMIT_MSG";
1332 open my $log_fh, '>', $commit_editmsg or croak
$!;
1334 my $type = command_oneline
(qw
/cat-file -t/, $treeish);
1335 if ($type eq 'commit' || $type eq 'tag') {
1336 my ($msg_fh, $ctx) = command_output_pipe
('cat-file',
1344 $in_msg = 1 if (/^\s*$/);
1345 $author = $1 if (/^author (.*>)/);
1346 } elsif (/^git-svn-id: /) {
1347 # skip this for now, we regenerate the
1348 # correct one on re-fetch anyways
1349 # TODO: set *:merge properties or like...
1351 if (/^From:/ || /^Signed-off-by:/) {
1357 $msgbuf =~ s/\s+$//s;
1358 if ($Git::SVN
::_add_author_from
&& defined($author)
1360 $msgbuf .= "\n\nFrom: $author";
1362 print $log_fh $msgbuf or croak
$!;
1363 command_close_pipe
($msg_fh, $ctx);
1365 close $log_fh or croak
$!;
1367 if ($_edit || ($type eq 'tree')) {
1368 chomp(my $editor = command_oneline
(qw(var GIT_EDITOR)));
1369 system('sh', '-c', $editor.' "$@"', $editor, $commit_editmsg);
1371 rename $commit_editmsg, $commit_msg or croak
$!;
1374 # SVN requires messages to be UTF-8 when entering the repo
1376 open $log_fh, '<', $commit_msg or croak
$!;
1378 chomp($log_entry{log} = <$log_fh>);
1380 my $enc = Git
::config
('i18n.commitencoding') || 'UTF-8';
1381 my $msg = $log_entry{log};
1383 eval { $msg = Encode
::decode
($enc, $msg, 1) };
1385 die "Could not decode as $enc:\n", $msg,
1386 "\nPerhaps you need to set i18n.commitencoding\n";
1389 eval { $msg = Encode
::encode
('UTF-8', $msg, 1) };
1390 die "Could not encode as UTF-8:\n$msg\n" if $@
;
1392 $log_entry{log} = $msg;
1394 close $log_fh or croak
$!;
1401 my ($str, $file, $mode) = @_;
1402 open my $fd,'>',$file or croak
$!;
1403 print $fd $str,"\n" or croak
$!;
1404 close $fd or croak
$!;
1405 chmod ($mode &~ umask, $file) if (defined $mode);
1410 open my $fd,'<',$file or croak
"$!: file: $file\n";
1413 close $fd or croak
$!;
1418 # '<svn username> = real-name <email address>' mapping based on git-svnimport:
1420 open my $authors, '<', $_authors or die "Can't open $_authors $!\n";
1421 my $log = $cmd eq 'log';
1422 while (<$authors>) {
1424 next unless /^(.+?|\(no author\))\s*=\s*(.+?)\s*<(.+)>\s*$/;
1425 my ($user, $name, $email) = ($1, $2, $3);
1427 $Git::SVN
::Log
::rusers
{"$name <$email>"} = $user;
1429 $users{$user} = [$name, $email];
1432 close $authors or croak
$!;
1435 # convert GetOpt::Long specs for use by git-config
1436 sub read_git_config
{
1439 foreach my $o (keys %$opts) {
1440 # if we have mixedCase and a long option-only, then
1441 # it's a config-only variable that we don't need for
1443 push @config_only, $o if ($o =~ /[A-Z]/ && $o =~ /^[a-z]+$/i);
1444 my $v = $opts->{$o};
1445 my ($key) = ($o =~ /^([a-zA-Z\-]+)/);
1447 my $arg = 'git config';
1448 $arg .= ' --int' if ($o =~ /[:=]i$/);
1449 $arg .= ' --bool' if ($o !~ /[:=][sfi]$/);
1450 if (ref $v eq 'ARRAY') {
1451 chomp(my @tmp = `$arg --get-all svn.$key`);
1454 chomp(my $tmp = `$arg --get svn.$key`);
1455 if ($tmp && !($arg =~ / --bool/ && $tmp eq 'false')) {
1460 delete @
$opts{@config_only} if @config_only;
1463 sub extract_metadata
{
1464 my $id = shift or return (undef, undef, undef);
1465 my ($url, $rev, $uuid) = ($id =~ /^\s
*git
-svn
-id
:\s
+(.*)\@
(\d
+)
1466 \s
([a
-f\d\
-]+)$/ix
);
1467 if (!defined $rev || !$uuid || !$url) {
1468 # some of the original repositories I made had
1469 # identifiers like this:
1470 ($rev, $uuid) = ($id =~/^\s*git-svn-id:\s(\d+)\@([a-f\d\-]+)/i);
1472 return ($url, $rev, $uuid);
1476 return extract_metadata
((grep(/^git-svn-id: /,
1477 command
(qw
/cat-file commit/, shift)))[-1]);
1480 sub cmt_sha2rev_batch
{
1482 my ($pid, $in, $out, $ctx) = command_bidi_pipe
(qw
/cat-file --batch/);
1485 foreach my $sha (@
{$list}) {
1488 print $out $sha, "\n";
1490 while (my $line = <$in>) {
1491 if ($first && $line =~ /^[[:xdigit:]]{40}\smissing$/) {
1494 $line =~ /^[[:xdigit:]]{40}\scommit\s(\d+)$/) {
1498 } elsif ($line =~ /^(git-svn-id: )/) {
1499 my (undef, $rev, undef) =
1500 extract_metadata
($line);
1504 $size -= length($line);
1505 last if ($size == 0);
1509 command_close_bidi_pipe
($pid, $in, $out, $ctx);
1514 sub working_head_info
{
1515 my ($head, $refs) = @_;
1516 my @args = ('log', '--no-color', '--first-parent', '--pretty=medium');
1517 my ($fh, $ctx) = command_output_pipe
(@args, $head);
1521 if ( m{^commit ($::sha1)$} ) {
1522 unshift @
$refs, $hash if $hash and $refs;
1526 next unless s{^\s*(git-svn-id:)}{$1};
1527 my ($url, $rev, $uuid) = extract_metadata
($_);
1528 if (defined $url && defined $rev) {
1529 next if $max{$url} and $max{$url} < $rev;
1530 if (my $gs = Git
::SVN
->find_by_url($url)) {
1531 my $c = $gs->rev_map_get($rev, $uuid);
1532 if ($c && $c eq $hash) {
1533 close $fh; # break the pipe
1534 return ($url, $rev, $uuid, $gs);
1536 $max{$url} ||= $gs->rev_map_max;
1541 command_close_pipe
($fh, $ctx);
1542 (undef, undef, undef, undef);
1545 sub read_commit_parents
{
1546 my ($parents, $c) = @_;
1547 chomp(my $p = command_oneline
(qw
/rev-list --parents -1/, $c));
1548 $p =~ s/^($c)\s*// or die "rev-list --parents -1 $c failed!\n";
1549 @
{$parents->{$c}} = split(/ /, $p);
1552 sub linearize_history
{
1553 my ($gs, $refs) = @_;
1555 foreach my $c (@
$refs) {
1556 read_commit_parents
(\
%parents, $c);
1561 my $last_svn_commit = $gs->last_commit;
1562 foreach my $c (reverse @
$refs) {
1563 next if $c eq $last_svn_commit;
1566 unshift @linear_refs, $c;
1569 # we only want the first parent to diff against for linear
1570 # history, we save the rest to inject when we finalize the
1572 my $fp_a = verify_ref
("$c~1");
1573 my $fp_b = shift @
{$parents{$c}} if $parents{$c};
1574 if (!$fp_a || !$fp_b) {
1576 "has no parent commit, and therefore ",
1577 "nothing to diff against.\n",
1578 "You should be working from a repository ",
1579 "originally created by git-svn\n";
1581 if ($fp_a ne $fp_b) {
1582 die "$c~1 = $fp_a, however parsing commit $c ",
1583 "revealed that:\n$c~1 = $fp_b\nBUG!\n";
1586 foreach my $p (@
{$parents{$c}}) {
1590 (\
@linear_refs, \
%parents);
1593 sub find_file_type_and_diff_status
{
1595 return ('dir', '') if $path eq '';
1598 command_oneline
(qw(diff --cached --name-status --), $path) || "";
1599 my $diff_status = (split(' ', $diff_output))[0] || "";
1601 my $ls_tree = command_oneline
(qw(ls-tree HEAD), $path) || "";
1603 return (undef, undef) if !$diff_status && !$ls_tree;
1605 if ($diff_status eq "A") {
1606 return ("link", $diff_status) if -l
$path;
1607 return ("dir", $diff_status) if -d
$path;
1608 return ("file", $diff_status);
1611 my $mode = (split(' ', $ls_tree))[0] || "";
1613 return ("link", $diff_status) if $mode eq "120000";
1614 return ("dir", $diff_status) if $mode eq "040000";
1615 return ("file", $diff_status);
1621 my $md5 = Digest
::MD5
->new();
1622 if ($ref eq 'GLOB' || $ref eq 'IO::File' || $ref eq 'File::Temp') {
1623 $md5->addfile($arg) or croak
$!;
1624 } elsif ($ref eq 'SCALAR') {
1625 $md5->add($$arg) or croak
$!;
1627 $md5->add($arg) or croak
$!;
1629 ::fatal
"Can't provide MD5 hash for unknown ref type: '", $ref, "'";
1631 return $md5->hexdigest();
1635 if ($can_compress && -f
$_ && basename
($_) eq "unhandled.log") {
1636 my $out_filename = $_ . ".gz";
1637 open my $in_fh, "<", $_ or die "Unable to open $_: $!\n";
1639 my $gz = Compress
::Zlib
::gzopen
($out_filename, "ab") or
1640 die "Unable to open $out_filename: $!\n";
1643 while ($res = sysread($in_fh, my $str, 1024)) {
1644 $gz->gzwrite($str) or
1645 die "Unable to write: ".$gz->gzerror()."!\n";
1647 unlink $_ or die "unlink $File::Find::name: $!\n";
1648 } elsif (-f
$_ && basename
($_) eq "index") {
1649 unlink $_ or die "unlink $_: $!\n";
1656 use Fcntl qw
/:DEFAULT :seek/;
1657 use constant rev_map_fmt
=> 'NH40';
1658 use vars qw
/$default_repo_id $default_ref_id $_no_metadata $_follow_parent
1659 $_repack $_repack_flags $_use_svm_props $_head
1660 $_use_svnsync_props $no_reuse_existing $_minimize_url
1661 $_use_log_author $_add_author_from $_localtime/;
1663 use File
::Path qw
/mkpath/;
1664 use File
::Copy qw
/copy/;
1666 use Memoize
; # core since 5.8.0, Jul 2002
1667 use Memoize
::Storable
;
1669 my ($_gc_nr, $_gc_period);
1671 # properties that we do not log:
1674 %SKIP_PROP = map { $_ => 1 } qw
/svn
:wc
:ra_dav
:version
-url
1675 svn
:special svn
:executable
1676 svn
:entry
:committed
-rev
1677 svn
:entry
:last-author
1679 svn
:entry
:committed
-date
/;
1681 # some options are read globally, but can be overridden locally
1682 # per [svn-remote "..."] section. Command-line options will *NOT*
1683 # override options set in an [svn-remote "..."] section
1685 for my $option (qw
/follow_parent no_metadata use_svm_props
1686 use_svnsync_props
/) {
1689 my $prop = "-$option";
1692 return $self->{$prop} if exists $self->{$prop};
1693 my $k = "svn-remote.$self->{repo_id}.$key";
1694 eval { command_oneline
(qw
/config --get/, $k) };
1696 $self->{$prop} = ${"Git::SVN::_$option"};
1698 my $v = command_oneline
(qw
/config --bool/,$k);
1699 $self->{$prop} = $v eq 'false' ?
0 : 1;
1701 return $self->{$prop};
1707 my (%LOCKFILES, %INDEX_FILES);
1709 unlink keys %LOCKFILES if %LOCKFILES;
1710 unlink keys %INDEX_FILES if %INDEX_FILES;
1713 sub resolve_local_globs
{
1714 my ($url, $fetch, $glob_spec) = @_;
1715 return unless defined $glob_spec;
1716 my $ref = $glob_spec->{ref};
1717 my $path = $glob_spec->{path
};
1718 foreach (command
(qw
#for-each-ref --format=%(refname) refs/#)) {
1719 next unless m
#^$ref->{regex}$#;
1721 my $pathname = desanitize_refname
($path->full_path($p));
1722 my $refname = desanitize_refname
($ref->full_path($p));
1723 if (my $existing = $fetch->{$pathname}) {
1724 if ($existing ne $refname) {
1725 die "Refspec conflict:\n",
1726 "existing: $existing\n",
1727 " globbed: $refname\n";
1729 my $u = (::cmt_metadata
("$refname"))[0];
1730 $u =~ s!^\Q$url\E(/|$)!! or die
1731 "$refname: '$url' not found in '$u'\n";
1732 if ($pathname ne $u) {
1733 warn "W: Refspec glob conflict ",
1734 "(ref: $refname):\n",
1735 "expected path: $pathname\n",
1737 "Continuing ahead with $u\n";
1741 $fetch->{$pathname} = $refname;
1746 sub parse_revision_argument
{
1747 my ($base, $head) = @_;
1748 if (!defined $::_revision
|| $::_revision
eq 'BASE:HEAD') {
1749 return ($base, $head);
1751 return ($1, $2) if ($::_revision
=~ /^(\d+):(\d+)$/);
1752 return ($::_revision
, $::_revision
) if ($::_revision
=~ /^\d+$/);
1753 return ($head, $head) if ($::_revision
eq 'HEAD');
1754 return ($base, $1) if ($::_revision
=~ /^BASE:(\d+)$/);
1755 return ($1, $head) if ($::_revision
=~ /^(\d+):HEAD$/);
1756 die "revision argument: $::_revision not understood by git-svn\n";
1760 my ($repo_id, $remotes) = @_;
1764 $repo_id = $gs->{repo_id
};
1766 $remotes ||= read_all_remotes
();
1767 my $remote = $remotes->{$repo_id} or
1768 die "[svn-remote \"$repo_id\"] unknown\n";
1769 my $fetch = $remote->{fetch
};
1770 my $url = $remote->{url
} or die "svn-remote.$repo_id.url not defined\n";
1772 my $ra = Git
::SVN
::Ra
->new($url);
1773 my $uuid = $ra->get_uuid;
1774 my $head = $ra->get_latest_revnum;
1776 # ignore errors, $head revision may not even exist anymore
1777 eval { $ra->get_log("", $head, 0, 1, 0, 1, sub { $head = $_[1] }) };
1778 warn "W: $@\n" if $@
;
1780 my $base = defined $fetch ?
$head : 0;
1782 # read the max revs for wildcard expansion (branches/*, tags/*)
1783 foreach my $t (qw
/branches tags/) {
1784 defined $remote->{$t} or next;
1785 push @globs, @
{$remote->{$t}};
1787 my $max_rev = eval { tmp_config
(qw
/--int --get/,
1788 "svn-remote.$repo_id.${t}-maxRev") };
1789 if (defined $max_rev && ($max_rev < $base)) {
1791 } elsif (!defined $max_rev) {
1797 foreach my $p (sort keys %$fetch) {
1798 my $gs = Git
::SVN
->new($fetch->{$p}, $repo_id, $p);
1799 my $lr = $gs->rev_map_max;
1801 $base = $lr if ($lr < $base);
1807 ($base, $head) = parse_revision_argument
($base, $head);
1808 $ra->gs_fetch_loop_common($base, $head, \
@gs, \
@globs);
1811 sub read_all_remotes
{
1813 my $use_svm_props = eval { command_oneline
(qw
/config
--bool
1814 svn
.useSvmProps
/) };
1815 $use_svm_props = $use_svm_props eq 'true' if $use_svm_props;
1816 my $svn_refspec = qr{\s*(.*?)\s*:\s*(.+?)\s*};
1817 foreach (grep { s/^svn-remote\.// } command
(qw
/config -l/)) {
1818 if (m!^(.+)\.fetch=$svn_refspec$!) {
1819 my ($remote, $local_ref, $remote_ref) = ($1, $2, $3);
1820 die("svn-remote.$remote: remote ref '$remote_ref' "
1821 . "must start with 'refs/'\n")
1822 unless $remote_ref =~ m{^refs/};
1823 $local_ref = uri_decode
($local_ref);
1824 $r->{$remote}->{fetch
}->{$local_ref} = $remote_ref;
1825 $r->{$remote}->{svm
} = {} if $use_svm_props;
1826 } elsif (m!^(.+)\.usesvmprops=\s*(.*)\s*$!) {
1827 $r->{$1}->{svm
} = {};
1828 } elsif (m!^(.+)\.url=\s*(.*)\s*$!) {
1829 $r->{$1}->{url
} = $2;
1830 } elsif (m!^(.+)\.(branches|tags)=$svn_refspec$!) {
1831 my ($remote, $t, $local_ref, $remote_ref) =
1833 die("svn-remote.$remote: remote ref '$remote_ref' ($t) "
1834 . "must start with 'refs/'\n")
1835 unless $remote_ref =~ m{^refs/};
1836 $local_ref = uri_decode
($local_ref);
1840 path
=> Git
::SVN
::GlobSpec
->new($local_ref, 1),
1841 ref => Git
::SVN
::GlobSpec
->new($remote_ref, 0) };
1842 if (length($rs->{ref}->{right
}) != 0) {
1843 die "The '*' glob character must be the last ",
1844 "character of '$remote_ref'\n";
1846 push @
{ $r->{$remote}->{$t} }, $rs;
1851 if (defined $r->{$_}->{svm
}) {
1854 my $section = "svn-remote.$_";
1856 source
=> tmp_config
('--get',
1857 "$section.svm-source"),
1858 replace
=> tmp_config
('--get',
1859 "$section.svm-replace"),
1862 $r->{$_}->{svm
} = $svm;
1870 $_gc_nr = $_gc_period = 1000;
1871 if (defined $_repack || defined $_repack_flags) {
1872 warn "Repack options are obsolete; they have no effect.\n";
1876 sub verify_remotes_sanity
{
1877 return unless -d
$ENV{GIT_DIR
};
1879 foreach (command
(qw
/config -l/)) {
1880 if (m!^svn-remote\.(?:.+)\.fetch=.*:refs/remotes/(\S+)\s*$!) {
1882 die "Remote ref refs/remote/$1 is tracked by",
1883 "\n \"$_\"\nand\n \"$seen{$1}\"\n",
1884 "Please resolve this ambiguity in ",
1885 "your git configuration file before ",
1893 sub find_existing_remote
{
1894 my ($url, $remotes) = @_;
1895 return undef if $no_reuse_existing;
1897 foreach my $repo_id (keys %$remotes) {
1898 my $u = $remotes->{$repo_id}->{url
} or next;
1900 $existing = $repo_id;
1906 sub init_remote_config
{
1907 my ($self, $url, $no_write) = @_;
1908 $url =~ s!/+$!!; # strip trailing slash
1909 my $r = read_all_remotes
();
1910 my $existing = find_existing_remote
($url, $r);
1912 unless ($no_write) {
1913 print STDERR
"Using existing ",
1914 "[svn-remote \"$existing\"]\n";
1916 $self->{repo_id
} = $existing;
1917 } elsif ($_minimize_url) {
1918 my $min_url = Git
::SVN
::Ra
->new($url)->minimize_url;
1919 $existing = find_existing_remote
($min_url, $r);
1921 unless ($no_write) {
1922 print STDERR
"Using existing ",
1923 "[svn-remote \"$existing\"]\n";
1925 $self->{repo_id
} = $existing;
1927 if ($min_url ne $url) {
1928 unless ($no_write) {
1929 print STDERR
"Using higher level of URL: ",
1930 "$url => $min_url\n";
1932 my $old_path = $self->{path
};
1933 $self->{path
} = $url;
1934 $self->{path
} =~ s!^\Q$min_url\E(/|$)!!;
1935 if (length $old_path) {
1936 $self->{path
} .= "/$old_path";
1943 # verify that we aren't overwriting anything:
1945 command_oneline
('config', '--get',
1946 "svn-remote.$self->{repo_id}.url")
1948 if ($orig_url && ($orig_url ne $url)) {
1949 die "svn-remote.$self->{repo_id}.url already set: ",
1950 "$orig_url\nwanted to set to: $url\n";
1953 my ($xrepo_id, $xpath) = find_ref
($self->refname);
1954 if (!$no_write && defined $xpath) {
1955 die "svn-remote.$xrepo_id.fetch already set to track ",
1956 "$xpath:", $self->refname, "\n";
1958 unless ($no_write) {
1959 command_noisy
('config',
1960 "svn-remote.$self->{repo_id}.url", $url);
1961 $self->{path
} =~ s{^/}{};
1962 $self->{path
} =~ s{%([0-9A-F]{2})}{chr hex($1)}ieg;
1963 command_noisy
('config', '--add',
1964 "svn-remote.$self->{repo_id}.fetch",
1965 "$self->{path}:".$self->refname);
1967 $self->{url
} = $url;
1970 sub find_by_url
{ # repos_root and, path are optional
1971 my ($class, $full_url, $repos_root, $path) = @_;
1973 return undef unless defined $full_url;
1974 remove_username
($full_url);
1975 remove_username
($repos_root) if defined $repos_root;
1976 my $remotes = read_all_remotes
();
1977 if (defined $full_url && defined $repos_root && !defined $path) {
1979 $path =~ s
#^\Q$repos_root\E(?:/|$)##;
1981 foreach my $repo_id (keys %$remotes) {
1982 my $u = $remotes->{$repo_id}->{url
} or next;
1983 remove_username
($u);
1984 next if defined $repos_root && $repos_root ne $u;
1986 my $fetch = $remotes->{$repo_id}->{fetch
} || {};
1987 foreach my $t (qw
/branches tags/) {
1988 foreach my $globspec (@
{$remotes->{$repo_id}->{$t}}) {
1989 resolve_local_globs
($u, $fetch, $globspec);
1993 my $rwr = rewrite_root
({repo_id
=> $repo_id});
1994 my $svm = $remotes->{$repo_id}->{svm
}
1995 if defined $remotes->{$repo_id}->{svm
};
1996 unless (defined $p) {
2002 remove_username
($z);
2003 } elsif (defined $svm) {
2004 $z = $svm->{source
};
2005 $prefix = $svm->{replace
};
2006 $prefix =~ s
#^\Q$u\E(?:/|$)##;
2009 $p =~ s
#^\Q$z\E(?:/|$)#$prefix# or next;
2011 foreach my $f (keys %$fetch) {
2013 return Git
::SVN
->new($fetch->{$f}, $repo_id, $f);
2020 my ($class, $url, $path, $repo_id, $ref_id, $no_write) = @_;
2021 my $self = _new
($class, $repo_id, $ref_id, $path);
2023 $self->init_remote_config($url, $no_write);
2030 foreach (command
(qw
/config -l/)) {
2031 next unless m
!^svn
-remote\
.(.+)\
.fetch
=
2032 \s
*(.*?
)\s
*:\s
*(.+?
)\s
*$!x
;
2033 my ($repo_id, $path, $ref) = ($1, $2, $3);
2034 if ($ref eq $ref_id) {
2035 $path = '' if ($path =~ m
#^\./?#);
2036 return ($repo_id, $path);
2039 (undef, undef, undef);
2043 my ($class, $ref_id, $repo_id, $path) = @_;
2044 if (defined $ref_id && !defined $repo_id && !defined $path) {
2045 ($repo_id, $path) = find_ref
($ref_id);
2046 if (!defined $repo_id) {
2047 die "Could not find a \"svn-remote.*.fetch\" key ",
2048 "in the repository configuration matching: ",
2052 my $self = _new
($class, $repo_id, $ref_id, $path);
2053 if (!defined $self->{path
} || !length $self->{path
}) {
2054 my $fetch = command_oneline
('config', '--get',
2055 "svn-remote.$repo_id.fetch",
2057 die "Failed to read \"svn-remote.$repo_id.fetch\" ",
2058 "\":$ref_id\$\" in config\n";
2059 ($self->{path
}, undef) = split(/\s*:\s*/, $fetch);
2061 $self->{path
} =~ s{/+}{/}g;
2062 $self->{path
} =~ s{\A/}{};
2063 $self->{path
} =~ s{/\z}{};
2064 $self->{url
} = command_oneline
('config', '--get',
2065 "svn-remote.$repo_id.url") or
2066 die "Failed to read \"svn-remote.$repo_id.url\" in config\n";
2072 my ($refname) = $_[0]->{ref_id
} ;
2074 # It cannot end with a slash /, we'll throw up on this because
2075 # SVN can't have directories with a slash in their name, either:
2076 if ($refname =~ m{/$}) {
2077 die "ref: '$refname' ends with a trailing slash, this is ",
2078 "not permitted by git nor Subversion\n";
2081 # It cannot have ASCII control character space, tilde ~, caret ^,
2082 # colon :, question-mark ?, asterisk *, space, or open bracket [
2085 # Additionally, % must be escaped because it is used for escaping
2086 # and we want our escaped refname to be reversible
2087 $refname =~ s{([ \%~\^:\?\*\[\t])}{uc sprintf('%%%02x',ord($1))}eg;
2089 # no slash-separated component can begin with a dot .
2091 $refname =~ s{/\.}{/%2E}g;
2093 # It cannot have two consecutive dots .. anywhere
2095 $refname =~ s{\.\.}{%2E%2E}g;
2097 # trailing dots and .lock are not allowed
2098 # .$ becomes %2E and .lock becomes %2Elock
2099 $refname =~ s{\.(?=$|lock$)}{%2E};
2101 # the sequence @{ is used to access the reflog
2103 $refname =~ s{\@\{}{%40\{}g;
2108 sub desanitize_refname
{
2110 $refname =~ s{%(?:([0-9A-F]{2}))}{chr hex($1)}eg;
2116 return $self->{svm
}->{uuid
} if $self->svm;
2118 unless ($self->{svm
}) {
2119 die "SVM UUID not cached, and reading remotely failed\n";
2121 $self->{svm
}->{uuid
};
2126 return $self->{svm
} if $self->{svm
};
2128 # see if we have it in our config, first:
2130 my $section = "svn-remote.$self->{repo_id}";
2132 source
=> tmp_config
('--get', "$section.svm-source"),
2133 uuid
=> tmp_config
('--get', "$section.svm-uuid"),
2134 replace
=> tmp_config
('--get', "$section.svm-replace"),
2137 if ($svm && $svm->{source
} && $svm->{uuid
} && $svm->{replace
}) {
2138 $self->{svm
} = $svm;
2144 my ($self, $ra) = @_;
2145 return $ra if $self->svm;
2147 my @err = ( "useSvmProps set, but failed to read SVM properties\n",
2148 "(svm:source, svm:uuid) ",
2149 "from the following URLs:\n" );
2150 sub read_svm_props
{
2151 my ($self, $ra, $path, $r) = @_;
2152 my $props = ($ra->get_dir($path, $r))[2];
2153 my $src = $props->{'svm:source'};
2154 my $uuid = $props->{'svm:uuid'};
2155 return undef if (!$src || !$uuid);
2159 $uuid =~ m{^[0-9a-f\-]{30,}$}i
2160 or die "doesn't look right - svm:uuid is '$uuid'\n";
2162 # the '!' is used to mark the repos_root!/relative/path
2163 $src =~ s{/?!/?}{/};
2164 $src =~ s{/+$}{}; # no trailing slashes please
2165 # username is of no interest
2166 $src =~ s{(^[a-z\+]*://)[^/@]*@}{$1};
2168 my $replace = $ra->{url
};
2169 $replace .= "/$path" if length $path;
2171 my $section = "svn-remote.$self->{repo_id}";
2172 tmp_config
("$section.svm-source", $src);
2173 tmp_config
("$section.svm-replace", $replace);
2174 tmp_config
("$section.svm-uuid", $uuid);
2182 my $r = $ra->get_latest_revnum;
2183 my $path = $self->{path
};
2185 while (length $path) {
2186 unless ($tried{"$self->{url}/$path"}) {
2187 return $ra if $self->read_svm_props($ra, $path, $r);
2188 $tried{"$self->{url}/$path"} = 1;
2190 $path =~ s
#/?[^/]+$##;
2192 die "Path: '$path' should be ''\n" if $path ne '';
2193 return $ra if $self->read_svm_props($ra, $path, $r);
2194 $tried{"$self->{url}/$path"} = 1;
2196 if ($ra->{repos_root
} eq $self->{url
}) {
2197 die @err, (map { " $_\n" } keys %tried), "\n";
2200 # nope, make sure we're connected to the repository root:
2203 $path = $ra->{svn_path
};
2204 $ra = Git
::SVN
::Ra
->new($ra->{repos_root
});
2205 while (length $path) {
2206 unless ($tried{"$ra->{url}/$path"}) {
2207 $ok = $self->read_svm_props($ra, $path, $r);
2209 $tried{"$ra->{url}/$path"} = 1;
2211 $path =~ s
#/?[^/]+$##;
2213 die "Path: '$path' should be ''\n" if $path ne '';
2214 $ok ||= $self->read_svm_props($ra, $path, $r);
2215 $tried{"$ra->{url}/$path"} = 1;
2217 die @err, (map { " $_\n" } keys %tried), "\n";
2219 Git
::SVN
::Ra
->new($self->{url
});
2224 return $self->{svnsync
} if $self->{svnsync
};
2226 if ($self->no_metadata) {
2227 die "Can't have both 'noMetadata' and ",
2228 "'useSvnsyncProps' options set!\n";
2230 if ($self->rewrite_root) {
2231 die "Can't have both 'useSvnsyncProps' and 'rewriteRoot' ",
2234 if ($self->rewrite_uuid) {
2235 die "Can't have both 'useSvnsyncProps' and 'rewriteUUID' ",
2240 # see if we have it in our config, first:
2242 my $section = "svn-remote.$self->{repo_id}";
2244 my $url = tmp_config
('--get', "$section.svnsync-url");
2245 ($url) = ($url =~ m{^([a-z\+]+://\S+)$}) or
2246 die "doesn't look right - svn:sync-from-url is '$url'\n";
2248 my $uuid = tmp_config
('--get', "$section.svnsync-uuid");
2249 ($uuid) = ($uuid =~ m{^([0-9a-f\-]{30,})$}i
) or
2250 die "doesn't look right - svn:sync-from-uuid is '$uuid'\n";
2252 $svnsync = { url
=> $url, uuid
=> $uuid }
2254 if ($svnsync && $svnsync->{url
} && $svnsync->{uuid
}) {
2255 return $self->{svnsync
} = $svnsync;
2258 my $err = "useSvnsyncProps set, but failed to read " .
2259 "svnsync property: svn:sync-from-";
2260 my $rp = $self->ra->rev_proplist(0);
2262 my $url = $rp->{'svn:sync-from-url'} or die $err . "url\n";
2263 ($url) = ($url =~ m{^([a-z\+]+://\S+)$}) or
2264 die "doesn't look right - svn:sync-from-url is '$url'\n";
2266 my $uuid = $rp->{'svn:sync-from-uuid'} or die $err . "uuid\n";
2267 ($uuid) = ($uuid =~ m{^([0-9a-f\-]{30,})$}i
) or
2268 die "doesn't look right - svn:sync-from-uuid is '$uuid'\n";
2270 my $section = "svn-remote.$self->{repo_id}";
2271 tmp_config
('--add', "$section.svnsync-uuid", $uuid);
2272 tmp_config
('--add', "$section.svnsync-url", $url);
2273 return $self->{svnsync
} = { url
=> $url, uuid
=> $uuid };
2276 # this allows us to memoize our SVN::Ra UUID locally and avoid a
2277 # remote lookup (useful for 'git svn log').
2280 unless ($self->{ra_uuid
}) {
2281 my $key = "svn-remote.$self->{repo_id}.uuid";
2282 my $uuid = eval { tmp_config
('--get', $key) };
2283 if (!$@
&& $uuid && $uuid =~ /^([a-f\d\-]{30,})$/i) {
2284 $self->{ra_uuid
} = $uuid;
2286 die "ra_uuid called without URL\n" unless $self->{url
};
2287 $self->{ra_uuid
} = $self->ra->get_uuid;
2288 tmp_config
('--add', $key, $self->{ra_uuid
});
2294 sub _set_repos_root
{
2295 my ($self, $repos_root) = @_;
2296 my $k = "svn-remote.$self->{repo_id}.reposRoot";
2297 $repos_root ||= $self->ra->{repos_root
};
2298 tmp_config
($k, $repos_root);
2304 my $k = "svn-remote.$self->{repo_id}.reposRoot";
2305 eval { tmp_config
('--get', $k) } || $self->_set_repos_root;
2310 my $ra = Git
::SVN
::Ra
->new($self->{url
});
2311 $self->_set_repos_root($ra->{repos_root
});
2312 if ($self->use_svm_props && !$self->{svm
}) {
2313 if ($self->no_metadata) {
2314 die "Can't have both 'noMetadata' and ",
2315 "'useSvmProps' options set!\n";
2316 } elsif ($self->use_svnsync_props) {
2317 die "Can't have both 'useSvnsyncProps' and ",
2318 "'useSvmProps' options set!\n";
2320 $ra = $self->_set_svm_vars($ra);
2321 $self->{-want_revprops
} = 1;
2326 # prop_walk(PATH, REV, SUB)
2327 # -------------------------
2328 # Recursively traverse PATH at revision REV and invoke SUB for each
2329 # directory that contains a SVN property. SUB will be invoked as
2330 # follows: &SUB(gs, path, props); where `gs' is this instance of
2331 # Git::SVN, `path' the path to the directory where the properties
2332 # `props' were found. The `path' will be relative to point of checkout,
2333 # that is, if url://repo/trunk is the current Git branch, and that
2334 # directory contains a sub-directory `d', SUB will be invoked with `/d/'
2335 # as `path' (note the trailing `/').
2337 my ($self, $path, $rev, $sub) = @_;
2340 my ($dirent, undef, $props) = $self->ra->get_dir($path, $rev);
2343 # Strip the irrelevant part of the path.
2344 $p =~ s
#^/+\Q$self->{path}\E(/|$)#/#;
2345 # Ensure the path is terminated by a `/'.
2348 # The properties contain all the internal SVN stuff nobody
2349 # (usually) cares about.
2350 my $interesting_props = 0;
2351 foreach (keys %{$props}) {
2352 # If it doesn't start with `svn:', it must be a
2353 # user-defined property.
2354 ++$interesting_props and next if $_ !~ /^svn:/;
2355 # FIXME: Fragile, if SVN adds new public properties,
2356 # this needs to be updated.
2357 ++$interesting_props if /^svn
:(?
:ignore
|keywords
|executable
2358 |eol
-style
|mime
-type
2359 |externals
|needs
-lock)$/x
;
2361 &$sub($self, $p, $props) if $interesting_props;
2363 foreach (sort keys %$dirent) {
2364 next if $dirent->{$_}->{kind
} != $SVN::Node
::dir
;
2365 $self->prop_walk($self->{path
} . $p . $_, $rev, $sub);
2369 sub last_rev
{ ($_[0]->last_rev_commit)[0] }
2370 sub last_commit
{ ($_[0]->last_rev_commit)[1] }
2372 # returns the newest SVN revision number and newest commit SHA1
2373 sub last_rev_commit
{
2375 if (defined $self->{last_rev
} && defined $self->{last_commit
}) {
2376 return ($self->{last_rev
}, $self->{last_commit
});
2378 my $c = ::verify_ref
($self->refname.'^0');
2379 if ($c && !$self->use_svm_props && !$self->no_metadata) {
2380 my $rev = (::cmt_metadata
($c))[1];
2382 ($self->{last_rev
}, $self->{last_commit
}) = ($rev, $c);
2386 my $map_path = $self->map_path;
2387 unless (-e
$map_path) {
2388 ($self->{last_rev
}, $self->{last_commit
}) = (undef, undef);
2389 return (undef, undef);
2391 my ($rev, $commit) = $self->rev_map_max(1);
2392 ($self->{last_rev
}, $self->{last_commit
}) = ($rev, $commit);
2393 return ($rev, $commit);
2396 sub get_fetch_range
{
2397 my ($self, $min, $max) = @_;
2398 $max ||= $self->ra->get_latest_revnum;
2399 $min ||= $self->rev_map_max;
2405 my $old_def_config = "$ENV{GIT_DIR}/svn/config";
2406 my $config = "$ENV{GIT_DIR}/svn/.metadata";
2407 if (! -f
$config && -f
$old_def_config) {
2408 rename $old_def_config, $config or
2409 die "Failed rename $old_def_config => $config: $!\n";
2411 my $old_config = $ENV{GIT_CONFIG
};
2412 $ENV{GIT_CONFIG
} = $config;
2415 unless (-f
$config) {
2417 open my $fh, '>', $config or
2418 die "Can't open $config: $!\n";
2419 print $fh "; This file is used internally by ",
2421 "Couldn't write to $config: $!\n";
2422 print $fh "; You should not have to edit it\n" or
2423 die "Couldn't write to $config: $!\n";
2424 close $fh or die "Couldn't close $config: $!\n";
2426 command
('config', @args);
2429 if (defined $old_config) {
2430 $ENV{GIT_CONFIG
} = $old_config;
2432 delete $ENV{GIT_CONFIG
};
2435 wantarray ?
@ret : $ret[0];
2439 my ($self, $sub) = @_;
2440 my $old_index = $ENV{GIT_INDEX_FILE
};
2441 $ENV{GIT_INDEX_FILE
} = $self->{index};
2444 my ($dir, $base) = ($self->{index} =~ m
#^(.*?)/?([^/]+)$#);
2445 mkpath
([$dir]) unless -d
$dir;
2449 if (defined $old_index) {
2450 $ENV{GIT_INDEX_FILE
} = $old_index;
2452 delete $ENV{GIT_INDEX_FILE
};
2455 wantarray ?
@ret : $ret[0];
2458 sub assert_index_clean
{
2459 my ($self, $treeish) = @_;
2461 $self->tmp_index_do(sub {
2462 command_noisy
('read-tree', $treeish) unless -e
$self->{index};
2463 my $x = command_oneline
('write-tree');
2464 my ($y) = (command
(qw
/cat-file commit/, $treeish) =~
2465 /^tree ($::sha1)/mo);
2468 warn "Index mismatch: $y != $x\nrereading $treeish\n";
2469 unlink $self->{index} or die "unlink $self->{index}: $!\n";
2470 command_noisy
('read-tree', $treeish);
2471 $x = command_oneline
('write-tree');
2473 ::fatal
"trees ($treeish) $y != $x\n",
2474 "Something is seriously wrong...";
2479 sub get_commit_parents
{
2480 my ($self, $log_entry) = @_;
2481 my (%seen, @ret, @tmp);
2482 # legacy support for 'set-tree'; this is only used by set_tree_cb:
2483 if (my $ip = $self->{inject_parents
}) {
2484 if (my $commit = delete $ip->{$log_entry->{revision
}}) {
2488 if (my $cur = ::verify_ref
($self->refname.'^0')) {
2491 if (my $ipd = $self->{inject_parents_dcommit
}) {
2492 if (my $commit = delete $ipd->{$log_entry->{revision
}}) {
2493 push @tmp, @
$commit;
2496 push @tmp, $_ foreach (@
{$log_entry->{parents
}}, @tmp);
2497 while (my $p = shift @tmp) {
2507 return $self->{-rewrite_root
} if exists $self->{-rewrite_root
};
2508 my $k = "svn-remote.$self->{repo_id}.rewriteRoot";
2509 my $rwr = eval { command_oneline
(qw
/config --get/, $k) };
2512 if ($rwr !~ m
#^[a-z\+]+://#) {
2513 die "$rwr is not a valid URL (key: $k)\n";
2516 $self->{-rewrite_root
} = $rwr;
2521 return $self->{-rewrite_uuid
} if exists $self->{-rewrite_uuid
};
2522 my $k = "svn-remote.$self->{repo_id}.rewriteUUID";
2523 my $rwid = eval { command_oneline
(qw
/config --get/, $k) };
2526 if ($rwid !~ m
#^[a-f0-9]{8}-(?:[a-f0-9]{4}-){3}[a-f0-9]{12}$#) {
2527 die "$rwid is not a valid UUID (key: $k)\n";
2530 $self->{-rewrite_uuid
} = $rwid;
2535 ($self->rewrite_root || $self->{url
}) .
2536 (length $self->{path
} ?
'/' . $self->{path
} : '');
2541 $self->{url
} . (length $self->{path
} ?
'/' . $self->{path
} : '');
2545 sub set_commit_header_env
{
2546 my ($log_entry) = @_;
2548 foreach my $ned (qw
/NAME EMAIL DATE/) {
2549 foreach my $ac (qw
/AUTHOR COMMITTER/) {
2550 $env{"GIT_${ac}_${ned}"} = $ENV{"GIT_${ac}_${ned}"};
2554 $ENV{GIT_AUTHOR_NAME
} = $log_entry->{name
};
2555 $ENV{GIT_AUTHOR_EMAIL
} = $log_entry->{email
};
2556 $ENV{GIT_AUTHOR_DATE
} = $ENV{GIT_COMMITTER_DATE
} = $log_entry->{date
};
2558 $ENV{GIT_COMMITTER_NAME
} = (defined $log_entry->{commit_name
})
2559 ?
$log_entry->{commit_name
}
2560 : $log_entry->{name
};
2561 $ENV{GIT_COMMITTER_EMAIL
} = (defined $log_entry->{commit_email
})
2562 ?
$log_entry->{commit_email
}
2563 : $log_entry->{email
};
2567 sub restore_commit_header_env
{
2569 foreach my $ned (qw
/NAME EMAIL DATE/) {
2570 foreach my $ac (qw
/AUTHOR COMMITTER/) {
2571 my $k = "GIT_${ac}_${ned}";
2572 if (defined $env->{$k}) {
2573 $ENV{$k} = $env->{$k};
2582 command_noisy
('gc', '--auto');
2586 my ($self, $log_entry) = @_;
2587 my $lr = $self->last_rev;
2588 if (defined $lr && $lr >= $log_entry->{revision
}) {
2589 die "Last fetched revision of ", $self->refname,
2590 " was r$lr, but we are about to fetch: ",
2591 "r$log_entry->{revision}!\n";
2593 if (my $c = $self->rev_map_get($log_entry->{revision
})) {
2594 croak
"$log_entry->{revision} = $c already exists! ",
2595 "Why are we refetching it?\n";
2597 my $old_env = set_commit_header_env
($log_entry);
2598 my $tree = $log_entry->{tree
};
2599 if (!defined $tree) {
2600 $tree = $self->tmp_index_do(sub {
2601 command_oneline
('write-tree') });
2603 die "Tree is not a valid sha1: $tree\n" if $tree !~ /^$::sha1$/o;
2605 my @exec = ('git', 'commit-tree', $tree);
2606 foreach ($self->get_commit_parents($log_entry)) {
2607 push @exec, '-p', $_;
2609 defined(my $pid = open3
(my $msg_fh, my $out_fh, '>&STDERR', @exec))
2613 # we always get UTF-8 from SVN, but we may want our commits in
2614 # a different encoding.
2615 if (my $enc = Git
::config
('i18n.commitencoding')) {
2617 Encode
::from_to
($log_entry->{log}, 'UTF-8', $enc);
2619 print $msg_fh $log_entry->{log} or croak
$!;
2620 restore_commit_header_env
($old_env);
2621 unless ($self->no_metadata) {
2622 print $msg_fh "\ngit-svn-id: $log_entry->{metadata}\n"
2625 $msg_fh->flush == 0 or croak
$!;
2626 close $msg_fh or croak
$!;
2627 chomp(my $commit = do { local $/; <$out_fh> });
2628 close $out_fh or croak
$!;
2631 if ($commit !~ /^$::sha1$/o) {
2632 die "Failed to commit, invalid sha1: $commit\n";
2635 $self->rev_map_set($log_entry->{revision
}, $commit, 1);
2637 $self->{last_rev
} = $log_entry->{revision
};
2638 $self->{last_commit
} = $commit;
2639 print "r$log_entry->{revision}" unless $::_q
> 1;
2640 if (defined $log_entry->{svm_revision
}) {
2641 print " (\@$log_entry->{svm_revision})" unless $::_q
> 1;
2642 $self->rev_map_set($log_entry->{svm_revision
}, $commit,
2643 0, $self->svm_uuid);
2645 print " = $commit ($self->{ref_id})\n" unless $::_q
> 1;
2646 if (--$_gc_nr == 0) {
2647 $_gc_nr = $_gc_period;
2654 my ($self, $paths, $r) = @_;
2655 return 1 if $self->{path
} eq '';
2656 if (my $path = $paths->{"/$self->{path}"}) {
2657 return ($path->{action
} eq 'D') ?
0 : 1;
2659 $self->{path_regex
} ||= qr/^\/\Q
$self->{path
}\E\
//;
2660 if (grep /$self->{path_regex}/, keys %$paths) {
2664 foreach (split m
#/#, $self->{path}) {
2666 next unless ($paths->{$c} &&
2667 ($paths->{$c}->{action
} =~ /^[AR]$/));
2668 if ($self->ra->check_path($self->{path
}, $r) ==
2676 sub find_parent_branch
{
2677 my ($self, $paths, $rev) = @_;
2678 return undef unless $self->follow_parent;
2679 unless (defined $paths) {
2680 my $err_handler = $SVN::Error
::handler
;
2681 $SVN::Error
::handler
= \
&Git
::SVN
::Ra
::skip_unknown_revs
;
2682 $self->ra->get_log([$self->{path
}], $rev, $rev, 0, 1, 1,
2683 sub { $paths = $_[0] });
2684 $SVN::Error
::handler
= $err_handler;
2686 return undef unless defined $paths;
2688 # look for a parent from another branch:
2689 my @b_path_components = split m
#/#, $self->{path};
2690 my @a_path_components;
2692 while (@b_path_components) {
2693 $i = $paths->{'/'.join('/', @b_path_components)};
2694 last if $i && defined $i->{copyfrom_path
};
2695 unshift(@a_path_components, pop(@b_path_components));
2697 return undef unless defined $i && defined $i->{copyfrom_path
};
2698 my $branch_from = $i->{copyfrom_path
};
2699 if (@a_path_components) {
2700 print STDERR
"branch_from: $branch_from => ";
2701 $branch_from .= '/'.join('/', @a_path_components);
2702 print STDERR
$branch_from, "\n";
2704 my $r = $i->{copyfrom_rev
};
2705 my $repos_root = $self->ra->{repos_root
};
2706 my $url = $self->ra->{url
};
2707 my $new_url = $url . $branch_from;
2708 print STDERR
"Found possible branch point: ",
2709 "$new_url => ", $self->full_url, ", $r\n"
2711 $branch_from =~ s
#^/##;
2712 my $gs = $self->other_gs($new_url, $url,
2713 $branch_from, $r, $self->{ref_id
});
2714 my ($r0, $parent) = $gs->find_rev_before($r, 1);
2717 if (!defined $r0 || !defined $parent) {
2718 ($base, $head) = parse_revision_argument
(0, $r);
2721 $gs->ra->get_log([$gs->{path
}], $r0 + 1, $r, 1,
2722 0, 1, sub { $base = $_[1] - 1 });
2725 if (defined $base && $base <= $r) {
2726 $gs->fetch($base, $r);
2728 ($r0, $parent) = $gs->find_rev_before($r, 1);
2730 if (defined $r0 && defined $parent) {
2731 print STDERR
"Found branch parent: ($self->{ref_id}) $parent\n"
2734 if ($self->ra->can_do_switch) {
2735 $self->assert_index_clean($parent);
2736 print STDERR
"Following parent with do_switch\n"
2738 # do_switch works with svn/trunk >= r22312, but that
2739 # is not included with SVN 1.4.3 (the latest version
2740 # at the moment), so we can't rely on it
2741 $self->{last_rev
} = $r0;
2742 $self->{last_commit
} = $parent;
2743 $ed = SVN
::Git
::Fetcher
->new($self, $gs->{path
});
2744 $gs->ra->gs_do_switch($r0, $rev, $gs,
2745 $self->full_url, $ed)
2746 or die "SVN connection failed somewhere...\n";
2747 } elsif ($self->ra->trees_match($new_url, $r0,
2748 $self->full_url, $rev)) {
2749 print STDERR
"Trees match:\n",
2751 " ${\$self->full_url}\@$rev\n",
2752 "Following parent with no changes\n"
2754 $self->tmp_index_do(sub {
2755 command_noisy
('read-tree', $parent);
2757 $self->{last_commit
} = $parent;
2759 print STDERR
"Following parent with do_update\n"
2761 $ed = SVN
::Git
::Fetcher
->new($self);
2762 $self->ra->gs_do_update($rev, $rev, $self, $ed)
2763 or die "SVN connection failed somewhere...\n";
2765 print STDERR
"Successfully followed parent\n" unless $::_q
> 1;
2766 return $self->make_log_entry($rev, [$parent], $ed);
2772 my ($self, $paths, $rev) = @_;
2774 my ($last_rev, @parents);
2775 if (my $lc = $self->last_commit) {
2776 # we can have a branch that was deleted, then re-added
2777 # under the same name but copied from another path, in
2778 # which case we'll have multiple parents (we don't
2779 # want to break the original ref, nor lose copypath info):
2780 if (my $log_entry = $self->find_parent_branch($paths, $rev)) {
2781 push @
{$log_entry->{parents
}}, $lc;
2784 $ed = SVN
::Git
::Fetcher
->new($self);
2785 $last_rev = $self->{last_rev
};
2790 if (my $log_entry = $self->find_parent_branch($paths, $rev)) {
2793 $ed = SVN
::Git
::Fetcher
->new($self);
2795 unless ($self->ra->gs_do_update($last_rev, $rev, $self, $ed)) {
2796 die "SVN connection failed somewhere...\n";
2798 $self->make_log_entry($rev, \
@parents, $ed);
2802 my ($self, $r) = @_;
2805 my ($r, $empty_dirs, $line) = @_;
2806 if (defined $r && $line =~ /^r(\d+)$/) {
2807 return 0 if $1 > $r;
2808 } elsif ($line =~ /^ \+empty_dir: (.+)$/) {
2809 $empty_dirs->{$1} = 1;
2810 } elsif ($line =~ /^ \-empty_dir: (.+)$/) {
2811 my @d = grep {m
[^\Q
$1\E
(/|$)]} (keys %$empty_dirs);
2812 delete @
$empty_dirs{@d};
2817 my %empty_dirs = ();
2818 my $gz_file = "$self->{dir}/unhandled.log.gz";
2820 if (!$can_compress) {
2821 warn "Compress::Zlib could not be found; ",
2822 "empty directories in $gz_file will not be read\n";
2824 my $gz = Compress
::Zlib
::gzopen
($gz_file, "rb") or
2825 die "Unable to open $gz_file: $!\n";
2827 while ($gz->gzreadline($line) > 0) {
2828 scan
($r, \
%empty_dirs, $line) or last;
2834 if (open my $fh, '<', "$self->{dir}/unhandled.log") {
2835 binmode $fh or croak
"binmode: $!";
2837 scan
($r, \
%empty_dirs, $_) or last;
2842 my $strip = qr/\A\Q$self->{path}\E(?:\/|$)/;
2843 foreach my $d (sort keys %empty_dirs) {
2844 $d = uri_decode
($d);
2846 next unless length($d);
2849 warn "$d exists but is not a directory\n";
2851 print "creating empty directory: $d\n";
2858 my ($self, $ed) = @_;
2860 my $h = $ed->{empty
};
2861 foreach (sort keys %$h) {
2862 my $act = $h->{$_} ?
'+empty_dir' : '-empty_dir';
2863 push @out, " $act: " . uri_encode
($_);
2864 warn "W: $act: $_\n";
2866 foreach my $t (qw
/dir_prop file_prop/) {
2867 $h = $ed->{$t} or next;
2868 foreach my $path (sort keys %$h) {
2869 my $ppath = $path eq '' ?
'.' : $path;
2870 foreach my $prop (sort keys %{$h->{$path}}) {
2871 next if $SKIP_PROP{$prop};
2872 my $v = $h->{$path}->{$prop};
2873 my $t_ppath_prop = "$t: " .
2874 uri_encode
($ppath) . ' ' .
2877 push @out, " +$t_ppath_prop " .
2880 push @out, " -$t_ppath_prop";
2885 foreach my $t (qw
/absent_file absent_directory/) {
2886 $h = $ed->{$t} or next;
2887 foreach my $parent (sort keys %$h) {
2888 foreach my $path (sort @
{$h->{$parent}}) {
2889 push @out, " $t: " .
2890 uri_encode
("$parent/$path");
2891 warn "W: $t: $parent/$path ",
2892 "Insufficient permissions?\n";
2899 # parse_svn_date(DATE)
2900 # --------------------
2901 # Given a date (in UTC) from Subversion, return a string in the format
2902 # "<TZ Offset> <local date/time>" that Git will use.
2904 # By default the parsed date will be in UTC; if $Git::SVN::_localtime
2905 # is true we'll convert it to the local timezone instead.
2906 sub parse_svn_date
{
2907 my $date = shift || return '+0000 1970-01-01 00:00:00';
2908 my ($Y,$m,$d,$H,$M,$S) = ($date =~ /^(\d
{4})\
-(\d\d
)\
-(\d\d
)T
2909 (\d\d
)\
:(\d\d
)\
:(\d\d
)\
.\d
*Z
$/x
) or
2910 croak
"Unable to parse date: $date\n";
2911 my $parsed_date; # Set next.
2913 if ($Git::SVN
::_localtime
) {
2914 # Translate the Subversion datetime to an epoch time.
2915 # Begin by switching ourselves to $date's timezone, UTC.
2916 my $old_env_TZ = $ENV{TZ
};
2920 POSIX
::strftime
('%s', $S, $M, $H, $d, $m - 1, $Y - 1900);
2922 # Determine our local timezone (including DST) at the
2923 # time of $epoch_in_UTC. $Git::SVN::Log::TZ stored the
2924 # value of TZ, if any, at the time we were run.
2925 if (defined $Git::SVN
::Log
::TZ
) {
2926 $ENV{TZ
} = $Git::SVN
::Log
::TZ
;
2932 POSIX
::strftime
('%Z', $S, $M, $H, $d, $m - 1, $Y - 1900);
2934 # This converts $epoch_in_UTC into our local timezone.
2935 my ($sec, $min, $hour, $mday, $mon, $year,
2936 $wday, $yday, $isdst) = localtime($epoch_in_UTC);
2938 $parsed_date = sprintf('%s %04d-%02d-%02d %02d:%02d:%02d',
2939 $our_TZ, $year + 1900, $mon + 1,
2940 $mday, $hour, $min, $sec);
2942 # Reset us to the timezone in effect when we entered
2944 if (defined $old_env_TZ) {
2945 $ENV{TZ
} = $old_env_TZ;
2950 $parsed_date = "+0000 $Y-$m-$d $H:$M:$S";
2953 return $parsed_date;
2957 my ($self, $new_url, $url,
2958 $branch_from, $r, $old_ref_id) = @_;
2959 my $gs = Git
::SVN
->find_by_url($new_url, $url, $branch_from);
2961 my $ref_id = $old_ref_id;
2962 $ref_id =~ s/\@\d+-*$//;
2964 # just grow a tail if we're not unique enough :x
2965 $ref_id .= '-' while find_ref
($ref_id);
2966 my ($u, $p, $repo_id) = ($new_url, '', $ref_id);
2967 if ($u =~ s
#^\Q$url\E(/|$)##) {
2970 $repo_id = $self->{repo_id
};
2973 # It is possible to tag two different subdirectories at
2974 # the same revision. If the url for an existing ref
2975 # does not match, we must either find a ref with a
2976 # matching url or create a new ref by growing a tail.
2977 $gs = Git
::SVN
->init($u, $p, $repo_id, $ref_id, 1);
2978 my (undef, $max_commit) = $gs->rev_map_max(1);
2979 last if (!$max_commit);
2980 my ($url) = ::cmt_metadata
($max_commit);
2981 last if ($url eq $gs->full_url);
2984 print STDERR
"Initializing parent: $ref_id\n" unless $::_q
> 1;
2989 sub call_authors_prog
{
2990 my ($orig_author) = @_;
2991 $orig_author = command_oneline
('rev-parse', '--sq-quote', $orig_author);
2992 my $author = `$::_authors_prog $orig_author`;
2994 die "$::_authors_prog failed with exit code $?\n"
2996 if ($author =~ /^\s*(.+?)\s*<(.*)>\s*$/) {
2997 my ($name, $email) = ($1, $2);
2998 $email = undef if length $2 == 0;
2999 return [$name, $email];
3001 die "Author: $orig_author: $::_authors_prog returned "
3002 . "invalid author format: $author\n";
3008 if (!defined $author || length $author == 0) {
3009 $author = '(no author)';
3011 if (!defined $::users
{$author}) {
3012 if (defined $::_authors_prog
) {
3013 $::users
{$author} = call_authors_prog
($author);
3014 } elsif (defined $::_authors
) {
3015 die "Author: $author not defined in $::_authors file\n";
3021 sub find_extra_svk_parents
{
3022 my ($self, $ed, $tickets, $parents) = @_;
3023 # aha! svk:merge property changed...
3024 my @tickets = split "\n", $tickets;
3026 for my $ticket ( @tickets ) {
3027 my ($uuid, $path, $rev) = split /:/, $ticket;
3028 if ( $uuid eq $self->ra_uuid ) {
3029 my $url = $self->{url
};
3030 my $repos_root = $url;
3031 my $branch_from = $path;
3032 $branch_from =~ s{^/}{};
3033 my $gs = $self->other_gs($repos_root."/".$branch_from,
3038 if ( my $commit = $gs->rev_map_get($rev, $uuid) ) {
3039 # wahey! we found it, but it might be
3041 push @known_parents, [ $rev, $commit ];
3045 # Ordering matters; highest-numbered commit merge tickets
3046 # first, as they may account for later merge ticket additions
3048 @known_parents = map {$_->[1]} sort {$b->[0] <=> $a->[0]} @known_parents;
3049 for my $parent ( @known_parents ) {
3050 my @cmd = ('rev-list', $parent, map { "^$_" } @
$parents );
3051 my ($msg_fh, $ctx) = command_output_pipe
(@cmd);
3053 while ( <$msg_fh> ) {
3056 command_close_pipe
($msg_fh, $ctx);
3059 "Found merge parent (svk:merge ticket): $parent\n";
3060 push @
$parents, $parent;
3065 sub lookup_svn_merge
{
3070 my ($source, $revs) = split ":", $merge;
3073 my $gs = Git
::SVN
->find_by_url($url.$source, $url, $path);
3075 warn "Couldn't find revmap for $url$source\n";
3078 my @ranges = split ",", $revs;
3079 my ($tip, $tip_commit);
3080 my @merged_commit_ranges;
3082 for my $range ( @ranges ) {
3083 my ($bottom, $top) = split "-", $range;
3085 my $bottom_commit = $gs->find_rev_after( $bottom, 1, $top );
3086 my $top_commit = $gs->find_rev_before( $top, 1, $bottom );
3088 unless ($top_commit and $bottom_commit) {
3089 warn "W:unknown path/rev in svn:mergeinfo "
3090 ."dirprop: $source:$range\n";
3094 push @merged_commit_ranges,
3095 "$bottom_commit^..$top_commit";
3097 if ( !defined $tip or $top > $tip ) {
3099 $tip_commit = $top_commit;
3102 return ($tip_commit, @merged_commit_ranges);
3106 my ($msg_fh, $ctx) = command_output_pipe
(
3110 while ( <$msg_fh> ) {
3114 command_close_pipe
($msg_fh, $ctx);
3118 sub check_cherry_pick
{
3121 my $parents = shift;
3123 my %commits = map { $_ => 1 }
3124 _rev_list
("--no-merges", $tip, "--not", $base, @
$parents);
3125 for my $range ( @ranges ) {
3126 delete @commits{_rev_list
($range)};
3128 for my $commit (keys %commits) {
3129 if (has_no_changes
($commit)) {
3130 delete $commits{$commit};
3133 return (keys %commits);
3136 sub has_no_changes
{
3139 my @revs = split / /, command_oneline
(
3140 qw(rev-list --parents -1 -m), $commit);
3142 # Commits with no parents, e.g. the start of a partial branch,
3143 # have changes by definition.
3144 return 1 if (@revs < 2);
3146 # Commits with multiple parents, e.g a merge, have no changes
3148 return 0 if (@revs > 2);
3150 return (command_oneline
("rev-parse", "$commit^{tree}") eq
3151 command_oneline
("rev-parse", "$commit~1^{tree}"));
3154 # The GIT_DIR environment variable is not always set until after the command
3155 # line arguments are processed, so we can't memoize in a BEGIN block.
3159 sub memoize_svn_mergeinfo_functions
{
3160 return if $memoized;
3163 my $cache_path = "$ENV{GIT_DIR}/svn/.caches/";
3164 mkpath
([$cache_path]) unless -d
$cache_path;
3166 tie
my %lookup_svn_merge_cache => 'Memoize::Storable',
3167 "$cache_path/lookup_svn_merge.db", 'nstore';
3168 memoize
'lookup_svn_merge',
3169 SCALAR_CACHE
=> 'FAULT',
3170 LIST_CACHE
=> ['HASH' => \
%lookup_svn_merge_cache],
3173 tie
my %check_cherry_pick_cache => 'Memoize::Storable',
3174 "$cache_path/check_cherry_pick.db", 'nstore';
3175 memoize
'check_cherry_pick',
3176 SCALAR_CACHE
=> 'FAULT',
3177 LIST_CACHE
=> ['HASH' => \
%check_cherry_pick_cache],
3180 tie
my %has_no_changes_cache => 'Memoize::Storable',
3181 "$cache_path/has_no_changes.db", 'nstore';
3182 memoize
'has_no_changes',
3183 SCALAR_CACHE
=> ['HASH' => \
%has_no_changes_cache],
3184 LIST_CACHE
=> 'FAULT',
3188 sub unmemoize_svn_mergeinfo_functions
{
3189 return if not $memoized;
3192 Memoize
::unmemoize
'lookup_svn_merge';
3193 Memoize
::unmemoize
'check_cherry_pick';
3194 Memoize
::unmemoize
'has_no_changes';
3199 # Force cache writeout explicitly instead of waiting for
3200 # global destruction to avoid segfault in Storable:
3201 # http://rt.cpan.org/Public/Bug/Display.html?id=36087
3202 unmemoize_svn_mergeinfo_functions
();
3205 sub parents_exclude
{
3206 my $parents = shift;
3208 return unless @commits;
3213 my @cmd = ('rev-list', "-1", @commits, "--not", @
$parents );
3214 $excluded = command_oneline
(@cmd);
3218 for my $commit ( @commits ) {
3219 if ( $commit eq $excluded ) {
3220 push @excluded, $commit;
3228 die "saw commit '$excluded' in rev-list output, "
3229 ."but we didn't ask for that commit (wanted: @commits --not @$parents)"
3234 while ($excluded and @commits);
3240 # note: this function should only be called if the various dirprops
3241 # have actually changed
3242 sub find_extra_svn_parents
{
3243 my ($self, $ed, $mergeinfo, $parents) = @_;
3244 # aha! svk:merge property changed...
3246 memoize_svn_mergeinfo_functions
();
3248 # We first search for merged tips which are not in our
3249 # history. Then, we figure out which git revisions are in
3250 # that tip, but not this revision. If all of those revisions
3251 # are now marked as merge, we can add the tip as a parent.
3252 my @merges = split "\n", $mergeinfo;
3254 my $url = $self->{url
};
3255 my $uuid = $self->ra_uuid;
3257 for my $merge ( @merges ) {
3258 my ($tip_commit, @ranges) =
3259 lookup_svn_merge
( $uuid, $url, $merge );
3260 unless (!$tip_commit or
3261 grep { $_ eq $tip_commit } @
$parents ) {
3262 push @merge_tips, $tip_commit;
3263 $ranges{$tip_commit} = \
@ranges;
3265 push @merge_tips, undef;
3269 my %excluded = map { $_ => 1 }
3270 parents_exclude
($parents, grep { defined } @merge_tips);
3272 # check merge tips for new parents
3274 for my $merge_tip ( @merge_tips ) {
3275 my $spec = shift @merges;
3276 next unless $merge_tip and $excluded{$merge_tip};
3278 my $ranges = $ranges{$merge_tip};
3280 # check out 'new' tips
3283 $merge_base = command_oneline
(
3285 @
$parents, $merge_tip,
3289 die "An error occurred during merge-base"
3290 unless $@
->isa("Git::Error::Command");
3292 warn "W: Cannot find common ancestor between ".
3293 "@$parents and $merge_tip. Ignoring merge info.\n";
3297 # double check that there are no missing non-merge commits
3298 my (@incomplete) = check_cherry_pick
(
3299 $merge_base, $merge_tip,
3304 if ( @incomplete ) {
3305 warn "W:svn cherry-pick ignored ($spec) - missing "
3306 .@incomplete." commit(s) (eg $incomplete[0])\n";
3309 "Found merge parent (svn:mergeinfo prop): ",
3311 push @new_parents, $merge_tip;
3315 # cater for merges which merge commits from multiple branches
3316 if ( @new_parents > 1 ) {
3317 for ( my $i = 0; $i <= $#new_parents; $i++ ) {
3318 for ( my $j = 0; $j <= $#new_parents; $j++ ) {
3320 next unless $new_parents[$i];
3321 next unless $new_parents[$j];
3322 my $revs = command_oneline
(
3324 "$new_parents[$i]..$new_parents[$j]",
3327 undef($new_parents[$j]);
3332 push @
$parents, grep { defined } @new_parents;
3335 sub make_log_entry
{
3336 my ($self, $rev, $parents, $ed) = @_;
3337 my $untracked = $self->get_untracked($ed);
3339 my @parents = @
$parents;
3340 my $ps = $ed->{path_strip
} || "";
3341 for my $path ( grep { m/$ps/ } %{$ed->{dir_prop
}} ) {
3342 my $props = $ed->{dir_prop
}{$path};
3343 if ( $props->{"svk:merge"} ) {
3344 $self->find_extra_svk_parents
3345 ($ed, $props->{"svk:merge"}, \
@parents);
3347 if ( $props->{"svn:mergeinfo"} ) {
3348 $self->find_extra_svn_parents
3350 $props->{"svn:mergeinfo"},
3355 open my $un, '>>', "$self->{dir}/unhandled.log" or croak
$!;
3356 print $un "r$rev\n" or croak
$!;
3357 print $un $_, "\n" foreach @
$untracked;
3358 my %log_entry = ( parents
=> \
@parents, revision
=> $rev,
3362 my $logged = delete $self->{logged_rev_props
};
3363 if (!$logged || $self->{-want_revprops
}) {
3364 my $rp = $self->ra->rev_proplist($rev);
3365 foreach (sort keys %$rp) {
3367 if (/^svn:(author|date|log)$/) {
3368 $log_entry{$1} = $v;
3369 } elsif ($_ eq 'svm:headrev') {
3372 print $un " rev_prop: ", uri_encode
($_), ' ',
3373 uri_encode
($v), "\n";
3377 map { $log_entry{$_} = $logged->{$_} } keys %$logged;
3379 close $un or croak
$!;
3381 $log_entry{date
} = parse_svn_date
($log_entry{date
});
3382 $log_entry{log} .= "\n";
3383 my $author = $log_entry{author
} = check_author
($log_entry{author
});
3384 my ($name, $email) = defined $::users
{$author} ? @
{$::users
{$author}}
3387 my ($commit_name, $commit_email) = ($name, $email);
3388 if ($_use_log_author) {
3390 if ($log_entry{log} =~ /From:\s+(.*\S)\s*\n/i) {
3392 } elsif ($log_entry{log} =~ /Signed-off-by:\s+(.*\S)\s*\n/i) {
3395 if (!defined $name_field) {
3396 if (!defined $email) {
3399 } elsif ($name_field =~ /(.*?)\s+<(.*)>/) {
3400 ($name, $email) = ($1, $2);
3401 } elsif ($name_field =~ /(.*)@/) {
3402 ($name, $email) = ($1, $name_field);
3404 ($name, $email) = ($name_field, $name_field);
3407 if (defined $headrev && $self->use_svm_props) {
3408 if ($self->rewrite_root) {
3409 die "Can't have both 'useSvmProps' and 'rewriteRoot' ",
3412 if ($self->rewrite_uuid) {
3413 die "Can't have both 'useSvmProps' and 'rewriteUUID' ",
3416 my ($uuid, $r) = $headrev =~ m{^([a-f\d\-]{30,}):(\d
+)$}i
;
3417 # we don't want "SVM: initializing mirror for junk" ...
3418 return undef if $r == 0;
3419 my $svm = $self->svm;
3420 if ($uuid ne $svm->{uuid
}) {
3421 die "UUID mismatch on SVM path:\n",
3422 "expected: $svm->{uuid}\n",
3425 my $full_url = $self->full_url;
3426 $full_url =~ s
#^\Q$svm->{replace}\E(/|$)#$svm->{source}$1# or
3427 die "Failed to replace '$svm->{replace}' with ",
3428 "'$svm->{source}' in $full_url\n";
3429 # throw away username for storing in records
3430 remove_username
($full_url);
3431 $log_entry{metadata
} = "$full_url\@$r $uuid";
3432 $log_entry{svm_revision
} = $r;
3433 $email ||= "$author\@$uuid";
3434 $commit_email ||= "$author\@$uuid";
3435 } elsif ($self->use_svnsync_props) {
3436 my $full_url = $self->svnsync->{url
};
3437 $full_url .= "/$self->{path}" if length $self->{path
};
3438 remove_username
($full_url);
3439 my $uuid = $self->svnsync->{uuid
};
3440 $log_entry{metadata
} = "$full_url\@$rev $uuid";
3441 $email ||= "$author\@$uuid";
3442 $commit_email ||= "$author\@$uuid";
3444 my $url = $self->metadata_url;
3445 remove_username
($url);
3446 my $uuid = $self->rewrite_uuid || $self->ra->get_uuid;
3447 $log_entry{metadata
} = "$url\@$rev " . $uuid;
3448 $email ||= "$author\@" . $uuid;
3449 $commit_email ||= "$author\@" . $uuid;
3451 $log_entry{name
} = $name;
3452 $log_entry{email
} = $email;
3453 $log_entry{commit_name
} = $commit_name;
3454 $log_entry{commit_email
} = $commit_email;
3459 my ($self, $min_rev, $max_rev, @parents) = @_;
3460 my ($last_rev, $last_commit) = $self->last_rev_commit;
3461 my ($base, $head) = $self->get_fetch_range($min_rev, $max_rev);
3462 $self->ra->gs_fetch_loop_common($base, $head, [$self]);
3466 my ($self, $log_entry, $tree, $rev, $date, $author) = @_;
3467 $self->{inject_parents
} = { $rev => $tree };
3468 $self->fetch(undef, undef);
3472 my ($self, $tree) = (shift, shift);
3473 my $log_entry = ::get_commit_entry
($tree);
3474 unless ($self->{last_rev
}) {
3475 ::fatal
("Must have an existing revision to commit");
3477 my %ed_opts = ( r
=> $self->{last_rev
},
3478 log => $log_entry->{log},
3480 tree_a
=> $self->{last_commit
},
3483 $self->set_tree_cb($log_entry, $tree, @_) },
3484 svn_path
=> $self->{path
} );
3485 if (!SVN
::Git
::Editor
->new(\
%ed_opts)->apply_diff) {
3486 print "No changes\nr$self->{last_rev} = $tree\n";
3490 sub rebuild_from_rev_db
{
3491 my ($self, $path) = @_;
3493 open my $fh, '<', $path or croak
"open: $!";
3494 binmode $fh or croak
"binmode: $!";
3496 length($_) == 41 or croak
"inconsistent size in ($_) != 41";
3499 next if $_ eq ('0' x
40);
3500 $self->rev_map_set($r, $_);
3503 close $fh or croak
"close: $!";
3504 unlink $path or croak
"unlink: $!";
3509 my $map_path = $self->map_path;
3510 my $partial = (-e
$map_path && ! -z
$map_path);
3511 return unless ::verify_ref
($self->refname.'^0');
3512 if (!$partial && ($self->use_svm_props || $self->no_metadata)) {
3513 my $rev_db = $self->rev_db_path;
3514 $self->rebuild_from_rev_db($rev_db);
3515 if ($self->use_svm_props) {
3516 my $svm_rev_db = $self->rev_db_path($self->svm_uuid);
3517 $self->rebuild_from_rev_db($svm_rev_db);
3519 $self->unlink_rev_db_symlink;
3522 print "Rebuilding $map_path ...\n" if (!$partial);
3523 my ($base_rev, $head) = ($partial ?
$self->rev_map_max_norebuild(1) :
3526 command_output_pipe
(qw
/rev-list --pretty=raw --no-color --reverse/,
3527 ($head ?
"$head.." : "") . $self->refname,
3529 my $metadata_url = $self->metadata_url;
3530 remove_username
($metadata_url);
3531 my $svn_uuid = $self->rewrite_uuid || $self->ra_uuid;
3534 if ( m{^commit ($::sha1)$} ) {
3538 next unless s{^\s*(git-svn-id:)}{$1};
3539 my ($url, $rev, $uuid) = ::extract_metadata
($_);
3540 remove_username
($url);
3542 # ignore merges (from set-tree)
3543 next if (!defined $rev || !$uuid);
3545 # if we merged or otherwise started elsewhere, this is
3546 # how we break out of it
3547 if (($uuid ne $svn_uuid) ||
3548 ($metadata_url && $url && ($url ne $metadata_url))) {
3551 if ($partial && $head) {
3552 print "Partial-rebuilding $map_path ...\n";
3553 print "Currently at $base_rev = $head\n";
3557 $self->rev_map_set($rev, $c);
3558 print "r$rev = $c\n";
3560 command_close_pipe
($log, $ctx);
3561 print "Done rebuilding $map_path\n" if (!$partial || !$head);
3562 my $rev_db_path = $self->rev_db_path;
3563 if (-f
$self->rev_db_path) {
3564 unlink $self->rev_db_path or croak
"unlink: $!";
3566 $self->unlink_rev_db_symlink;
3570 # Tie::File seems to be prone to offset errors if revisions get sparse,
3571 # it's not that fast, either. Tie::File is also not in Perl 5.6. So
3572 # one of my favorite modules is out :< Next up would be one of the DBM
3573 # modules, but I'm not sure which is most portable...
3575 # This is the replacement for the rev_db format, which was too big
3576 # and inefficient for large repositories with a lot of sparse history
3579 # The format is this:
3580 # - 24 bytes for every record,
3581 # * 4 bytes for the integer representing an SVN revision number
3582 # * 20 bytes representing the sha1 of a git commit
3583 # - No empty padding records like the old format
3584 # (except the last record, which can be overwritten)
3585 # - new records are written append-only since SVN revision numbers
3586 # increase monotonically
3587 # - lookups on SVN revision number are done via a binary search
3588 # - Piping the file to xxd -c24 is a good way of dumping it for
3589 # viewing or editing (piped back through xxd -r), should the need
3591 # - The last record can be padding revision with an all-zero sha1
3592 # This is used to optimize fetch performance when using multiple
3593 # "fetch" directives in .git/config
3595 # These files are disposable unless noMetadata or useSvmProps is set
3598 my ($fh, $rev, $commit) = @_;
3600 binmode $fh or croak
"binmode: $!";
3601 my $size = (stat($fh))[7];
3602 ($size % 24) == 0 or croak
"inconsistent size: $size";
3606 sysseek($fh, -24, SEEK_END
) or croak
"seek: $!";
3607 my $read = sysread($fh, my $buf, 24) or croak
"read: $!";
3608 $read == 24 or croak
"read only $read bytes (!= 24)";
3609 my ($last_rev, $last_commit) = unpack(rev_map_fmt
, $buf);
3610 if ($last_commit eq ('0' x40
)) {
3612 sysseek($fh, -48, SEEK_END
) or croak
"seek: $!";
3613 $read = sysread($fh, $buf, 24) or
3616 croak
"read only $read bytes (!= 24)";
3617 ($last_rev, $last_commit) =
3618 unpack(rev_map_fmt
, $buf);
3619 if ($last_commit eq ('0' x40
)) {
3620 croak
"inconsistent .rev_map\n";
3623 if ($last_rev >= $rev) {
3624 croak
"last_rev is higher!: $last_rev >= $rev";
3629 sysseek($fh, $wr_offset, SEEK_END
) or croak
"seek: $!";
3630 syswrite($fh, pack(rev_map_fmt
, $rev, $commit), 24) == 24 or
3634 sub _rev_map_reset
{
3635 my ($fh, $rev, $commit) = @_;
3636 my $c = _rev_map_get
($fh, $rev);
3637 $c eq $commit or die "_rev_map_reset(@_) commit $c does not match!\n";
3638 my $offset = sysseek($fh, 0, SEEK_CUR
) or croak
"seek: $!";
3639 truncate $fh, $offset or croak
"truncate: $!";
3645 my ($dir, $base) = ($path =~ m
#^(.*?)/?([^/]+)$#);
3646 mkpath
([$dir]) unless -d
$dir;
3647 open my $fh, '>>', $path or die "Couldn't create $path: $!\n";
3648 close $fh or die "Couldn't close (create) $path: $!\n";
3653 my ($self, $rev, $commit, $update_ref, $uuid) = @_;
3654 defined $commit or die "missing arg3\n";
3655 length $commit == 40 or die "arg3 must be a full SHA1 hexsum\n";
3656 my $db = $self->map_path($uuid);
3657 my $db_lock = "$db.lock";
3661 $SIG{INT
} = $SIG{HUP
} = $SIG{TERM
} = $SIG{ALRM
} = $SIG{PIPE
} =
3662 $SIG{USR1
} = $SIG{USR2
} = sub { $sig = $_[0] };
3666 $LOCKFILES{$db_lock} = 1;
3668 # both of these options make our .rev_db file very, very important
3669 # and we can't afford to lose it because rebuild() won't work
3670 if ($self->use_svm_props || $self->no_metadata) {
3672 copy
($db, $db_lock) or die "rev_map_set(@_): ",
3674 "$db => $db_lock ($!)\n";
3676 rename $db, $db_lock or die "rev_map_set(@_): ",
3677 "Failed to rename: ",
3678 "$db => $db_lock ($!)\n";
3681 sysopen(my $fh, $db_lock, O_RDWR
| O_CREAT
)
3682 or croak
"Couldn't open $db_lock: $!\n";
3683 $update_ref eq 'reset' ? _rev_map_reset
($fh, $rev, $commit) :
3684 _rev_map_set
($fh, $rev, $commit);
3686 $fh->flush or die "Couldn't flush $db_lock: $!\n";
3687 $fh->sync or die "Couldn't sync $db_lock: $!\n";
3689 close $fh or croak
$!;
3693 $note = " ($update_ref)" if ($update_ref !~ /^\d*$/);
3694 command_noisy
('update-ref', '-m', "r$rev$note",
3695 $self->refname, $commit);
3697 rename $db_lock, $db or die "rev_map_set(@_): ", "Failed to rename: ",
3698 "$db_lock => $db ($!)\n";
3699 delete $LOCKFILES{$db_lock};
3701 $SIG{INT
} = $SIG{HUP
} = $SIG{TERM
} = $SIG{ALRM
} = $SIG{PIPE
} =
3702 $SIG{USR1
} = $SIG{USR2
} = 'DEFAULT';
3703 kill $sig, $$ if defined $sig;
3707 # If want_commit, this will return an array of (rev, commit) where
3708 # commit _must_ be a valid commit in the archive.
3709 # Otherwise, it'll return the max revision (whether or not the
3710 # commit is valid or just a 0x40 placeholder).
3712 my ($self, $want_commit) = @_;
3714 my ($r, $c) = $self->rev_map_max_norebuild($want_commit);
3715 $want_commit ?
($r, $c) : $r;
3718 sub rev_map_max_norebuild
{
3719 my ($self, $want_commit) = @_;
3720 my $map_path = $self->map_path;
3721 stat $map_path or return $want_commit ?
(0, undef) : 0;
3722 sysopen(my $fh, $map_path, O_RDONLY
) or croak
"open: $!";
3723 binmode $fh or croak
"binmode: $!";
3724 my $size = (stat($fh))[7];
3725 ($size % 24) == 0 or croak
"inconsistent size: $size";
3728 close $fh or croak
"close: $!";
3729 return $want_commit ?
(0, undef) : 0;
3732 sysseek($fh, -24, SEEK_END
) or croak
"seek: $!";
3733 sysread($fh, my $buf, 24) == 24 or croak
"read: $!";
3734 my ($r, $c) = unpack(rev_map_fmt
, $buf);
3735 if ($want_commit && $c eq ('0' x40
)) {
3737 return $want_commit ?
(0, undef) : 0;
3739 sysseek($fh, -48, SEEK_END
) or croak
"seek: $!";
3740 sysread($fh, $buf, 24) == 24 or croak
"read: $!";
3741 ($r, $c) = unpack(rev_map_fmt
, $buf);
3742 if ($c eq ('0'x40
)) {
3743 croak
"Penultimate record is all-zeroes in $map_path";
3746 close $fh or croak
"close: $!";
3747 $want_commit ?
($r, $c) : $r;
3751 my ($self, $rev, $uuid) = @_;
3752 my $map_path = $self->map_path($uuid);
3753 return undef unless -e
$map_path;
3755 sysopen(my $fh, $map_path, O_RDONLY
) or croak
"open: $!";
3756 my $c = _rev_map_get
($fh, $rev);
3757 close($fh) or croak
"close: $!";
3762 my ($fh, $rev) = @_;
3764 binmode $fh or croak
"binmode: $!";
3765 my $size = (stat($fh))[7];
3766 ($size % 24) == 0 or croak
"inconsistent size: $size";
3772 my ($l, $u) = (0, $size - 24);
3776 my $i = int(($l/24 + $u/24) / 2) * 24;
3777 sysseek($fh, $i, SEEK_SET
) or croak
"seek: $!";
3778 sysread($fh, my $buf, 24) == 24 or croak
"read: $!";
3779 my ($r, $c) = unpack(rev_map_fmt
, $buf);
3783 } elsif ($r > $rev) {
3785 } else { # $r == $rev
3786 return $c eq ('0' x
40) ?
undef : $c;
3792 # Finds the first svn revision that exists on (if $eq_ok is true) or
3793 # before $rev for the current branch. It will not search any lower
3794 # than $min_rev. Returns the git commit hash and svn revision number
3795 # if found, else (undef, undef).
3796 sub find_rev_before
{
3797 my ($self, $rev, $eq_ok, $min_rev) = @_;
3798 --$rev unless $eq_ok;
3800 my $max_rev = $self->rev_map_max;
3801 $rev = $max_rev if ($rev > $max_rev);
3802 while ($rev >= $min_rev) {
3803 if (my $c = $self->rev_map_get($rev)) {
3808 return (undef, undef);
3811 # Finds the first svn revision that exists on (if $eq_ok is true) or
3812 # after $rev for the current branch. It will not search any higher
3813 # than $max_rev. Returns the git commit hash and svn revision number
3814 # if found, else (undef, undef).
3815 sub find_rev_after
{
3816 my ($self, $rev, $eq_ok, $max_rev) = @_;
3817 ++$rev unless $eq_ok;
3818 $max_rev ||= $self->rev_map_max;
3819 while ($rev <= $max_rev) {
3820 if (my $c = $self->rev_map_get($rev)) {
3825 return (undef, undef);
3829 my ($class, $repo_id, $ref_id, $path) = @_;
3830 unless (defined $repo_id && length $repo_id) {
3831 $repo_id = $Git::SVN
::default_repo_id
;
3833 unless (defined $ref_id && length $ref_id) {
3834 $_prefix = '' unless defined($_prefix);
3836 "refs/remotes/$_prefix$Git::SVN::default_ref_id";
3839 my $dir = "$ENV{GIT_DIR}/svn/$ref_id";
3841 # Older repos imported by us used $GIT_DIR/svn/foo instead of
3842 # $GIT_DIR/svn/refs/remotes/foo when tracking refs/remotes/foo
3843 if ($ref_id =~ m{^refs/remotes/(.*)}) {
3844 my $old_dir = "$ENV{GIT_DIR}/svn/$1";
3845 if (-d
$old_dir && ! -d
$dir) {
3850 $_[3] = $path = '' unless (defined $path);
3853 ref_id
=> $ref_id, dir
=> $dir, index => "$dir/index",
3854 path
=> $path, config
=> "$ENV{GIT_DIR}/svn/config",
3855 map_root
=> "$dir/.rev_map", repo_id
=> $repo_id }, $class;
3858 # for read-only access of old .rev_db formats
3859 sub unlink_rev_db_symlink
{
3861 my $link = $self->rev_db_path;
3862 $link =~ s/\.[\w-]+$// or croak
"missing UUID at the end of $link";
3864 unlink $link or croak
"unlink: $link failed!";
3869 my ($self, $uuid) = @_;
3870 my $db_path = $self->map_path($uuid);
3871 $db_path =~ s{/\.rev_map\.}{/\.rev_db\.}
3872 or croak
"map_path: $db_path does not contain '/.rev_map.' !";
3876 # the new replacement for .rev_db
3878 my ($self, $uuid) = @_;
3879 $uuid ||= $self->ra_uuid;
3880 "$self->{map_root}.$uuid";
3885 $f =~ s
#([^a-zA-Z0-9\*!\:_\./\-])#uc sprintf("%%%02x",ord($1))#eg;
3891 $f =~ s
#%([0-9a-fA-F]{2})#chr(hex($1))#eg;
3895 sub remove_username
{
3896 $_[0] =~ s{^([^:]*://)[^@]+@}{$1};
3899 package Git
::SVN
::Prompt
;
3903 use vars qw
/$_no_auth_cache $_username/;
3906 my ($cred, $realm, $default_username, $may_save, $pool) = @_;
3907 $may_save = undef if $_no_auth_cache;
3908 $default_username = $_username if defined $_username;
3909 if (defined $default_username && length $default_username) {
3910 if (defined $realm && length $realm) {
3911 print STDERR
"Authentication realm: $realm\n";
3914 $cred->username($default_username);
3916 username
($cred, $realm, $may_save, $pool);
3918 $cred->password(_read_password
("Password for '" .
3919 $cred->username . "': ", $realm));
3920 $cred->may_save($may_save);
3921 $SVN::_Core
::SVN_NO_ERROR
;
3924 sub ssl_server_trust
{
3925 my ($cred, $realm, $failures, $cert_info, $may_save, $pool) = @_;
3926 $may_save = undef if $_no_auth_cache;
3927 print STDERR
"Error validating server certificate for '$realm':\n";
3930 # All variables SVN::Auth::SSL::* are used only once,
3931 # so we're shutting up Perl warnings about this.
3932 if ($failures & $SVN::Auth
::SSL
::UNKNOWNCA
) {
3933 print STDERR
" - The certificate is not issued ",
3934 "by a trusted authority. Use the\n",
3935 " fingerprint to validate ",
3936 "the certificate manually!\n";
3938 if ($failures & $SVN::Auth
::SSL
::CNMISMATCH
) {
3939 print STDERR
" - The certificate hostname ",
3940 "does not match.\n";
3942 if ($failures & $SVN::Auth
::SSL
::NOTYETVALID
) {
3943 print STDERR
" - The certificate is not yet valid.\n";
3945 if ($failures & $SVN::Auth
::SSL
::EXPIRED
) {
3946 print STDERR
" - The certificate has expired.\n";
3948 if ($failures & $SVN::Auth
::SSL
::OTHER
) {
3949 print STDERR
" - The certificate has ",
3950 "an unknown error.\n";
3952 } # no warnings 'once'
3954 "Certificate information:\n".
3955 " - Hostname: %s\n".
3956 " - Valid: from %s until %s\n".
3958 " - Fingerprint: %s\n",
3959 map $cert_info->$_, qw(hostname valid_from valid_until
3960 issuer_dname fingerprint);
3963 print STDERR
$may_save ?
3964 "(R)eject, accept (t)emporarily or accept (p)ermanently? " :
3965 "(R)eject or accept (t)emporarily? ";
3967 $choice = lc(substr(<STDIN
> || 'R', 0, 1));
3968 if ($choice =~ /^t$/i) {
3969 $cred->may_save(undef);
3970 } elsif ($choice =~ /^r$/i) {
3972 } elsif ($may_save && $choice =~ /^p$/i) {
3973 $cred->may_save($may_save);
3977 $cred->accepted_failures($failures);
3978 $SVN::_Core
::SVN_NO_ERROR
;
3981 sub ssl_client_cert
{
3982 my ($cred, $realm, $may_save, $pool) = @_;
3983 $may_save = undef if $_no_auth_cache;
3984 print STDERR
"Client certificate filename: ";
3986 chomp(my $filename = <STDIN
>);
3987 $cred->cert_file($filename);
3988 $cred->may_save($may_save);
3989 $SVN::_Core
::SVN_NO_ERROR
;
3992 sub ssl_client_cert_pw
{
3993 my ($cred, $realm, $may_save, $pool) = @_;
3994 $may_save = undef if $_no_auth_cache;
3995 $cred->password(_read_password
("Password: ", $realm));
3996 $cred->may_save($may_save);
3997 $SVN::_Core
::SVN_NO_ERROR
;
4001 my ($cred, $realm, $may_save, $pool) = @_;
4002 $may_save = undef if $_no_auth_cache;
4003 if (defined $realm && length $realm) {
4004 print STDERR
"Authentication realm: $realm\n";
4007 if (defined $_username) {
4008 $username = $_username;
4010 print STDERR
"Username: ";
4012 chomp($username = <STDIN
>);
4014 $cred->username($username);
4015 $cred->may_save($may_save);
4016 $SVN::_Core
::SVN_NO_ERROR
;
4019 sub _read_password
{
4020 my ($prompt, $realm) = @_;
4022 if (exists $ENV{GIT_ASKPASS
}) {
4023 open(PH
, "-|", $ENV{GIT_ASKPASS
}, $prompt);
4025 $password =~ s/[\012\015]//; # \n\r
4028 print STDERR
$prompt;
4030 require Term
::ReadKey
;
4031 Term
::ReadKey
::ReadMode
('noecho');
4032 while (defined(my $key = Term
::ReadKey
::ReadKey
(0))) {
4033 last if $key =~ /[\012\015]/; # \n\r
4036 Term
::ReadKey
::ReadMode
('restore');
4043 package SVN
::Git
::Fetcher
;
4049 use vars qw
/$_ignore_regex/;
4051 # file baton members: path, mode_a, mode_b, pool, fh, blob, base
4053 my ($class, $git_svn, $switch_path) = @_;
4054 my $self = SVN
::Delta
::Editor
->new;
4055 bless $self, $class;
4056 if (exists $git_svn->{last_commit
}) {
4057 $self->{c
} = $git_svn->{last_commit
};
4058 $self->{empty_symlinks
} =
4059 _mark_empty_symlinks
($git_svn, $switch_path);
4061 $self->{ignore_regex
} = eval { command_oneline
('config', '--get',
4062 "svn-remote.$git_svn->{repo_id}.ignore-paths") };
4063 $self->{empty
} = {};
4064 $self->{dir_prop
} = {};
4065 $self->{file_prop
} = {};
4066 $self->{absent_dir
} = {};
4067 $self->{absent_file
} = {};
4068 $self->{gii
} = $git_svn->tmp_index_do(sub { Git
::IndexInfo
->new });
4069 $self->{pathnameencoding
} = Git
::config
('svn.pathnameencoding');
4073 # this uses the Ra object, so it must be called before do_{switch,update},
4074 # not inside them (when the Git::SVN::Fetcher object is passed) to
4075 # do_{switch,update}
4076 sub _mark_empty_symlinks
{
4077 my ($git_svn, $switch_path) = @_;
4078 my $bool = Git
::config_bool
('svn.brokenSymlinkWorkaround');
4079 return {} if (!defined($bool)) || (defined($bool) && ! $bool);
4082 my ($rev, $cmt) = $git_svn->last_rev_commit;
4083 return {} unless ($rev && $cmt);
4085 # allow the warning to be printed for each revision we fetch to
4086 # ensure the user sees it. The user can also disable the workaround
4087 # on the repository even while git svn is running and the next
4088 # revision fetched will skip this expensive function.
4089 my $printed_warning;
4090 chomp(my $empty_blob = `git hash-object -t blob --stdin < /dev/null`);
4091 my ($ls, $ctx) = command_output_pipe
(qw
/ls-tree -r -z/, $cmt);
4093 my $pfx = defined($switch_path) ?
$switch_path : $git_svn->{path
};
4094 $pfx .= '/' if length($pfx);
4097 s/\A100644 blob $empty_blob\t//o or next;
4098 unless ($printed_warning) {
4099 print STDERR
"Scanning for empty symlinks, ",
4100 "this may take a while if you have ",
4101 "many empty files\n",
4102 "You may disable this with `",
4103 "git config svn.brokenSymlinkWorkaround ",
4105 "This may be done in a different ",
4106 "terminal without restarting ",
4108 $printed_warning = 1;
4111 my (undef, $props) =
4112 $git_svn->ra->get_file($pfx.$path, $rev, undef);
4113 if ($props->{'svn:special'}) {
4117 command_close_pipe
($ls, $ctx);
4121 # returns true if a given path is inside a ".git" directory
4123 $_[0] =~ m{(?:^|/)\.git(?:/|$)};
4126 # return value: 0 -- don't ignore, 1 -- ignore
4127 sub is_path_ignored
{
4128 my ($self, $path) = @_;
4129 return 1 if in_dot_git
($path);
4130 return 1 if defined($self->{ignore_regex
}) &&
4131 $path =~ m!$self->{ignore_regex}!;
4132 return 0 unless defined($_ignore_regex);
4133 return 1 if $path =~ m!$_ignore_regex!o;
4137 sub set_path_strip
{
4138 my ($self, $path) = @_;
4139 $self->{path_strip
} = qr/^\Q$path\E(\/|$)/ if length $path;
4146 sub open_directory
{
4147 my ($self, $path, $pb, $rev) = @_;
4152 my ($self, $path) = @_;
4153 if (my $enc = $self->{pathnameencoding
}) {
4155 Encode
::from_to
($path, 'UTF-8', $enc);
4157 if ($self->{path_strip
}) {
4158 $path =~ s!$self->{path_strip}!! or
4159 die "Failed to strip path '$path' ($self->{path_strip})\n";
4165 my ($self, $path, $rev, $pb) = @_;
4166 return undef if $self->is_path_ignored($path);
4168 my $gpath = $self->git_path($path);
4169 return undef if ($gpath eq '');
4171 # remove entire directories.
4172 my ($tree) = (command
('ls-tree', '-z', $self->{c
}, "./$gpath")
4173 =~ /\A040000 tree ([a-f\d]{40})\t\Q$gpath\E\0/);
4175 my ($ls, $ctx) = command_output_pipe
(qw
/ls
-tree
4181 my $rmpath = "$gpath/$_";
4182 $self->{gii
}->remove($rmpath);
4183 print "\tD\t$rmpath\n" unless $::_q
;
4185 print "\tD\t$gpath/\n" unless $::_q
;
4186 command_close_pipe
($ls, $ctx);
4188 $self->{gii
}->remove($gpath);
4189 print "\tD\t$gpath\n" unless $::_q
;
4191 $self->{empty
}->{$path} = 0;
4196 my ($self, $path, $pb, $rev) = @_;
4199 goto out
if $self->is_path_ignored($path);
4201 my $gpath = $self->git_path($path);
4202 ($mode, $blob) = (command
('ls-tree', '-z', $self->{c
}, "./$gpath")
4203 =~ /\A(\d{6}) blob ([a-f\d]{40})\t\Q$gpath\E\0/);
4204 unless (defined $mode && defined $blob) {
4205 die "$path was not found in commit $self->{c} (r$rev)\n";
4207 if ($mode eq '100644' && $self->{empty_symlinks
}->{$path}) {
4211 { path
=> $path, mode_a
=> $mode, mode_b
=> $mode, blob
=> $blob,
4212 pool
=> SVN
::Pool
->new, action
=> 'M' };
4216 my ($self, $path, $pb, $cp_path, $cp_rev) = @_;
4219 if (!$self->is_path_ignored($path)) {
4220 my ($dir, $file) = ($path =~ m
#^(.*?)/?([^/]+)$#);
4221 delete $self->{empty
}->{$dir};
4224 { path
=> $path, mode_a
=> $mode, mode_b
=> $mode,
4225 pool
=> SVN
::Pool
->new, action
=> 'A' };
4229 my ($self, $path, $cp_path, $cp_rev) = @_;
4230 goto out
if $self->is_path_ignored($path);
4231 my $gpath = $self->git_path($path);
4233 my ($ls, $ctx) = command_output_pipe
(qw
/ls
-tree
4239 $self->{gii
}->remove($_);
4240 print "\tD\t$_\n" unless $::_q
;
4242 command_close_pipe
($ls, $ctx);
4243 $self->{empty
}->{$path} = 0;
4245 my ($dir, $file) = ($path =~ m
#^(.*?)/?([^/]+)$#);
4246 delete $self->{empty
}->{$dir};
4247 $self->{empty
}->{$path} = 1;
4252 sub change_dir_prop
{
4253 my ($self, $db, $prop, $value) = @_;
4254 return undef if $self->is_path_ignored($db->{path
});
4255 $self->{dir_prop
}->{$db->{path
}} ||= {};
4256 $self->{dir_prop
}->{$db->{path
}}->{$prop} = $value;
4260 sub absent_directory
{
4261 my ($self, $path, $pb) = @_;
4262 return undef if $self->is_path_ignored($path);
4263 $self->{absent_dir
}->{$pb->{path
}} ||= [];
4264 push @
{$self->{absent_dir
}->{$pb->{path
}}}, $path;
4269 my ($self, $path, $pb) = @_;
4270 return undef if $self->is_path_ignored($path);
4271 $self->{absent_file
}->{$pb->{path
}} ||= [];
4272 push @
{$self->{absent_file
}->{$pb->{path
}}}, $path;
4276 sub change_file_prop
{
4277 my ($self, $fb, $prop, $value) = @_;
4278 return undef if $self->is_path_ignored($fb->{path
});
4279 if ($prop eq 'svn:executable') {
4280 if ($fb->{mode_b
} != 120000) {
4281 $fb->{mode_b
} = defined $value ?
100755 : 100644;
4283 } elsif ($prop eq 'svn:special') {
4284 $fb->{mode_b
} = defined $value ?
120000 : 100644;
4286 $self->{file_prop
}->{$fb->{path
}} ||= {};
4287 $self->{file_prop
}->{$fb->{path
}}->{$prop} = $value;
4292 sub apply_textdelta
{
4293 my ($self, $fb, $exp) = @_;
4294 return undef if $self->is_path_ignored($fb->{path
});
4295 my $fh = $::_repository
->temp_acquire('svn_delta');
4296 # $fh gets auto-closed() by SVN::TxDelta::apply(),
4297 # (but $base does not,) so dup() it for reading in close_file
4298 open my $dup, '<&', $fh or croak
$!;
4299 my $base = $::_repository
->temp_acquire('git_blob');
4302 my ($base_is_link, $size);
4304 if ($fb->{mode_a
} eq '120000' &&
4305 ! $self->{empty_symlinks
}->{$fb->{path
}}) {
4306 print $base 'link ' or die "print $!\n";
4310 $size = $::_repository
->cat_blob($fb->{blob
}, $base);
4311 die "Failed to read object $fb->{blob}" if ($size < 0);
4314 seek $base, 0, 0 or croak
$!;
4315 my $got = ::md5sum
($base);
4317 my $err = "Checksum mismatch: ".
4318 "$fb->{path} $fb->{blob}\n" .
4319 "expected: $exp\n" .
4321 if ($base_is_link) {
4323 "Retrying... (possibly ",
4324 "a bad symlink from SVN)\n";
4325 $::_repository
->temp_reset($base);
4333 seek $base, 0, 0 or croak
$!;
4335 $fb->{base
} = $base;
4336 [ SVN
::TxDelta
::apply
($base, $dup, undef, $fb->{path
}, $fb->{pool
}) ];
4340 my ($self, $fb, $exp) = @_;
4341 return undef if $self->is_path_ignored($fb->{path
});
4344 my $path = $self->git_path($fb->{path
});
4345 if (my $fh = $fb->{fh
}) {
4347 seek($fh, 0, 0) or croak
$!;
4348 my $got = ::md5sum
($fh);
4350 die "Checksum mismatch: $path\n",
4351 "expected: $exp\n got: $got\n";
4354 if ($fb->{mode_b
} == 120000) {
4355 sysseek($fh, 0, 0) or croak
$!;
4356 my $rd = sysread($fh, my $buf, 5);
4359 croak
"sysread: $!\n";
4360 } elsif ($rd == 0) {
4361 warn "$path has mode 120000",
4362 " but it points to nothing\n",
4363 "converting to an empty file with mode",
4365 $fb->{mode_b
} = '100644';
4366 } elsif ($buf ne 'link ') {
4367 warn "$path has mode 120000",
4368 " but is not a link\n";
4370 my $tmp_fh = $::_repository
->temp_acquire(
4373 while ($res = sysread($fh, my $str, 1024)) {
4374 my $out = syswrite($tmp_fh, $str, $res);
4375 defined($out) && $out == $res
4377 Git
::temp_path
($tmp_fh),
4380 defined $res or croak
$!;
4382 ($fh, $tmp_fh) = ($tmp_fh, $fh);
4383 Git
::temp_release
($tmp_fh, 1);
4387 $hash = $::_repository
->hash_and_insert_object(
4388 Git
::temp_path
($fh));
4389 $hash =~ /^[a-f\d]{40}$/ or die "not a sha1: $hash\n";
4391 Git
::temp_release
($fb->{base
}, 1);
4392 Git
::temp_release
($fh, 1);
4394 $hash = $fb->{blob
} or die "no blob information\n";
4397 $self->{gii
}->update($fb->{mode_b
}, $hash, $path) or croak
$!;
4398 print "\t$fb->{action}\t$path\n" if $fb->{action
} && ! $::_q
;
4404 $self->{nr
} = $self->{gii
}->{nr
};
4405 delete $self->{gii
};
4406 $self->SUPER::abort_edit
(@_);
4411 $self->{git_commit_ok
} = 1;
4412 $self->{nr
} = $self->{gii
}->{nr
};
4413 delete $self->{gii
};
4414 $self->SUPER::close_edit
(@_);
4417 package SVN
::Git
::Editor
;
4418 use vars qw
/@ISA $_rmdir $_cp_similarity $_find_copies_harder $_rename_limit/;
4425 my ($class, $opts) = @_;
4426 foreach (qw
/svn_path r ra tree_a tree_b log editor_cb/) {
4427 die "$_ required!\n" unless (defined $opts->{$_});
4430 my $pool = SVN
::Pool
->new;
4431 my $mods = generate_diff
($opts->{tree_a
}, $opts->{tree_b
});
4432 my $types = check_diff_paths
($opts->{ra
}, $opts->{svn_path
},
4435 # $opts->{ra} functions should not be used after this:
4436 my @ce = $opts->{ra
}->get_commit_editor($opts->{log},
4437 $opts->{editor_cb
}, $pool);
4438 my $self = SVN
::Delta
::Editor
->new(@ce, $pool);
4439 bless $self, $class;
4440 foreach (qw
/svn_path r tree_a tree_b/) {
4441 $self->{$_} = $opts->{$_};
4443 $self->{url
} = $opts->{ra
}->{url
};
4444 $self->{mods
} = $mods;
4445 $self->{types
} = $types;
4446 $self->{pool
} = $pool;
4447 $self->{bat
} = { '' => $self->open_root($self->{r
}, $self->{pool
}) };
4449 $self->{path_prefix
} = length $self->{svn_path
} ?
4450 "$self->{svn_path}/" : '';
4451 $self->{config
} = $opts->{config
};
4456 my ($tree_a, $tree_b) = @_;
4457 my @diff_tree = qw(diff-tree -z -r);
4458 if ($_cp_similarity) {
4459 push @diff_tree, "-C$_cp_similarity";
4461 push @diff_tree, '-C';
4463 push @diff_tree, '--find-copies-harder' if $_find_copies_harder;
4464 push @diff_tree, "-l$_rename_limit" if defined $_rename_limit;
4465 push @diff_tree, $tree_a, $tree_b;
4466 my ($diff_fh, $ctx) = command_output_pipe
(@diff_tree);
4470 while (<$diff_fh>) {
4471 chomp $_; # this gets rid of the trailing "\0"
4472 if ($state eq 'meta' && /^:(\d
{6})\s
(\d
{6})\s
4473 ($::sha1
)\s
($::sha1
)\s
4474 ([MTCRAD
])\d
*$/xo
) {
4475 push @mods, { mode_a
=> $1, mode_b
=> $2,
4476 sha1_a
=> $3, sha1_b
=> $4,
4478 if ($5 =~ /^(?:C|R)$/) {
4483 } elsif ($state eq 'file_a') {
4484 my $x = $mods[$#mods] or croak
"Empty array\n";
4485 if ($x->{chg
} !~ /^(?:C|R)$/) {
4486 croak
"Error parsing $_, $x->{chg}\n";
4490 } elsif ($state eq 'file_b') {
4491 my $x = $mods[$#mods] or croak
"Empty array\n";
4492 if (exists $x->{file_a
} && $x->{chg
} !~ /^(?:C|R)$/) {
4493 croak
"Error parsing $_, $x->{chg}\n";
4495 if (!exists $x->{file_a
} && $x->{chg
} =~ /^(?:C|R)$/) {
4496 croak
"Error parsing $_, $x->{chg}\n";
4501 croak
"Error parsing $_\n";
4504 command_close_pipe
($diff_fh, $ctx);
4508 sub check_diff_paths
{
4509 my ($ra, $pfx, $rev, $mods) = @_;
4511 $pfx .= '/' if length $pfx;
4513 sub type_diff_paths
{
4514 my ($ra, $types, $path, $rev) = @_;
4515 my @p = split m
#/+#, $path;
4517 unless (defined $types->{$c}) {
4518 $types->{$c} = $ra->check_path($c, $rev);
4521 $c .= '/' . shift @p;
4522 next if defined $types->{$c};
4523 $types->{$c} = $ra->check_path($c, $rev);
4527 foreach my $m (@
$mods) {
4528 foreach my $f (qw
/file_a file_b/) {
4529 next unless defined $m->{$f};
4530 my ($dir) = ($m->{$f} =~ m
#^(.*?)/?(?:[^/]+)$#);
4531 if (length $pfx.$dir && ! defined $types{$dir}) {
4532 type_diff_paths
($ra, \
%types, $pfx.$dir, $rev);
4540 return ($_[0] =~ m
#^(.*?)/?([^/]+)$#);
4544 my ($self, $path) = @_;
4545 if (my $enc = $self->{pathnameencoding
}) {
4547 Encode
::from_to
($path, $enc, 'UTF-8');
4549 $self->{path_prefix
}.(defined $path ?
$path : '');
4553 my ($self, $path) = @_;
4554 if ($self->{url
} =~ m
#^https?://#) {
4555 $path =~ s!([^~a-zA-Z0-9_./-])!uc sprintf("%%%02x",ord($1))!eg;
4557 $self->{url
} . '/' . $self->repo_path($path);
4562 my $rm = $self->{rm
};
4563 delete $rm->{''}; # we never delete the url we're tracking
4566 foreach (keys %$rm) {
4567 my @d = split m
#/#, $_;
4571 $c .= '/' . shift @d;
4575 delete $rm->{$self->{svn_path
}};
4576 delete $rm->{''}; # we never delete the url we're tracking
4579 my ($fh, $ctx) = command_output_pipe
(qw
/ls-tree --name-only -r -z/,
4584 my @dn = split m
#/#, $_;
4586 delete $rm->{join '/', @dn};
4593 command_close_pipe
($fh, $ctx);
4595 my ($r, $p, $bat) = ($self->{r
}, $self->{pool
}, $self->{bat
});
4596 foreach my $d (sort { $b =~ tr
#/#/# <=> $a =~ tr#/#/# } keys %$rm) {
4597 $self->close_directory($bat->{$d}, $p);
4598 my ($dn) = ($d =~ m
#^(.*?)/?(?:[^/]+)$#);
4599 print "\tD+\t$d/\n" unless $::_q
;
4600 $self->SUPER::delete_entry
($d, $r, $bat->{$dn}, $p);
4605 sub open_or_add_dir
{
4606 my ($self, $full_path, $baton) = @_;
4607 my $t = $self->{types
}->{$full_path};
4609 die "$full_path not known in r$self->{r} or we have a bug!\n";
4613 # SVN::Node::none and SVN::Node::file are used only once,
4614 # so we're shutting up Perl's warnings about them.
4615 if ($t == $SVN::Node
::none
) {
4616 return $self->add_directory($full_path, $baton,
4617 undef, -1, $self->{pool
});
4618 } elsif ($t == $SVN::Node
::dir
) {
4619 return $self->open_directory($full_path, $baton,
4620 $self->{r
}, $self->{pool
});
4621 } # no warnings 'once'
4622 print STDERR
"$full_path already exists in repository at ",
4623 "r$self->{r} and it is not a directory (",
4624 ($t == $SVN::Node
::file ?
'file' : 'unknown'),"/$t)\n";
4625 } # no warnings 'once'
4630 my ($self, $path) = @_;
4631 my $bat = $self->{bat
};
4632 my $repo_path = $self->repo_path($path);
4633 return $bat->{''} unless (length $repo_path);
4634 my @p = split m
#/+#, $repo_path;
4636 $bat->{$c} ||= $self->open_or_add_dir($c, $bat->{''});
4639 $c .= '/' . shift @p;
4640 $bat->{$c} ||= $self->open_or_add_dir($c, $bat->{$c0});
4645 # Subroutine to convert a globbing pattern to a regular expression.
4646 # From perl cookbook.
4648 my $globstr = shift;
4649 my %patmap = ('*' => '.*', '?' => '.', '[' => '[', ']' => ']');
4650 $globstr =~ s{(.)} { $patmap{$1} || "\Q$1" }ge;
4651 return '^' . $globstr . '$';
4654 sub check_autoprop
{
4655 my ($self, $pattern, $properties, $file, $fbat) = @_;
4656 # Convert the globbing pattern to a regular expression.
4657 my $regex = glob2pat
($pattern);
4658 # Check if the pattern matches the file name.
4659 if($file =~ m/($regex)/) {
4660 # Parse the list of properties to set.
4661 my @props = split(/;/, $properties);
4662 foreach my $prop (@props) {
4663 # Parse 'name=value' syntax and set the property.
4664 if ($prop =~ /([^=]+)=(.*)/) {
4665 my ($n,$v) = ($1,$2);
4669 $self->change_file_prop($fbat, $n, $v);
4675 sub apply_autoprops
{
4676 my ($self, $file, $fbat) = @_;
4677 my $conf_t = ${$self->{config
}}{'config'};
4679 # Check [miscellany]/enable-auto-props in svn configuration.
4680 if (SVN
::_Core
::svn_config_get_bool
(
4682 $SVN::_Core
::SVN_CONFIG_SECTION_MISCELLANY
,
4683 $SVN::_Core
::SVN_CONFIG_OPTION_ENABLE_AUTO_PROPS
,
4685 # Auto-props are enabled. Enumerate them to look for matches.
4686 my $callback = sub {
4687 $self->check_autoprop($_[0], $_[1], $file, $fbat);
4689 SVN
::_Core
::svn_config_enumerate
(
4691 $SVN::_Core
::SVN_CONFIG_SECTION_AUTO_PROPS
,
4697 my ($self, $m) = @_;
4698 my ($dir, $file) = split_path
($m->{file_b
});
4699 my $pbat = $self->ensure_path($dir);
4700 my $fbat = $self->add_file($self->repo_path($m->{file_b
}), $pbat,
4702 print "\tA\t$m->{file_b}\n" unless $::_q
;
4703 $self->apply_autoprops($file, $fbat);
4704 $self->chg_file($fbat, $m);
4705 $self->close_file($fbat,undef,$self->{pool
});
4709 my ($self, $m) = @_;
4710 my ($dir, $file) = split_path
($m->{file_b
});
4711 my $pbat = $self->ensure_path($dir);
4712 my $fbat = $self->add_file($self->repo_path($m->{file_b
}), $pbat,
4713 $self->url_path($m->{file_a
}), $self->{r
});
4714 print "\tC\t$m->{file_a} => $m->{file_b}\n" unless $::_q
;
4715 $self->chg_file($fbat, $m);
4716 $self->close_file($fbat,undef,$self->{pool
});
4720 my ($self, $path, $pbat) = @_;
4721 my $rpath = $self->repo_path($path);
4722 my ($dir, $file) = split_path
($rpath);
4723 $self->{rm
}->{$dir} = 1;
4724 $self->SUPER::delete_entry
($rpath, $self->{r
}, $pbat, $self->{pool
});
4728 my ($self, $m) = @_;
4729 my ($dir, $file) = split_path
($m->{file_b
});
4730 my $pbat = $self->ensure_path($dir);
4731 my $fbat = $self->add_file($self->repo_path($m->{file_b
}), $pbat,
4732 $self->url_path($m->{file_a
}), $self->{r
});
4733 print "\tR\t$m->{file_a} => $m->{file_b}\n" unless $::_q
;
4734 $self->apply_autoprops($file, $fbat);
4735 $self->chg_file($fbat, $m);
4736 $self->close_file($fbat,undef,$self->{pool
});
4738 ($dir, $file) = split_path
($m->{file_a
});
4739 $pbat = $self->ensure_path($dir);
4740 $self->delete_entry($m->{file_a
}, $pbat);
4744 my ($self, $m) = @_;
4745 my ($dir, $file) = split_path
($m->{file_b
});
4746 my $pbat = $self->ensure_path($dir);
4747 my $fbat = $self->open_file($self->repo_path($m->{file_b
}),
4748 $pbat,$self->{r
},$self->{pool
});
4749 print "\t$m->{chg}\t$m->{file_b}\n" unless $::_q
;
4750 $self->chg_file($fbat, $m);
4751 $self->close_file($fbat,undef,$self->{pool
});
4754 sub T
{ shift->M(@_) }
4756 sub change_file_prop
{
4757 my ($self, $fbat, $pname, $pval) = @_;
4758 $self->SUPER::change_file_prop
($fbat, $pname, $pval, $self->{pool
});
4761 sub _chg_file_get_blob
($$$$) {
4762 my ($self, $fbat, $m, $which) = @_;
4763 my $fh = $::_repository
->temp_acquire("git_blob_$which");
4764 if ($m->{"mode_$which"} =~ /^120/) {
4765 print $fh 'link ' or croak
$!;
4766 $self->change_file_prop($fbat,'svn:special','*');
4767 } elsif ($m->{mode_a
} =~ /^120/ && $m->{"mode_$which"} !~ /^120/) {
4768 $self->change_file_prop($fbat,'svn:special',undef);
4770 my $blob = $m->{"sha1_$which"};
4771 return ($fh,) if ($blob =~ /^0{40}$/);
4772 my $size = $::_repository
->cat_blob($blob, $fh);
4773 croak
"Failed to read object $blob" if ($size < 0);
4774 $fh->flush == 0 or croak
$!;
4775 seek $fh, 0, 0 or croak
$!;
4777 my $exp = ::md5sum
($fh);
4778 seek $fh, 0, 0 or croak
$!;
4783 my ($self, $fbat, $m) = @_;
4784 if ($m->{mode_b
} =~ /755$/ && $m->{mode_a
} !~ /755$/) {
4785 $self->change_file_prop($fbat,'svn:executable','*');
4786 } elsif ($m->{mode_b
} !~ /755$/ && $m->{mode_a
} =~ /755$/) {
4787 $self->change_file_prop($fbat,'svn:executable',undef);
4789 my ($fh_a, $exp_a) = _chg_file_get_blob
$self, $fbat, $m, 'a';
4790 my ($fh_b, $exp_b) = _chg_file_get_blob
$self, $fbat, $m, 'b';
4791 my $pool = SVN
::Pool
->new;
4792 my $atd = $self->apply_textdelta($fbat, $exp_a, $pool);
4794 my $txstream = SVN
::TxDelta
::new
($fh_a, $fh_b, $pool);
4795 my $res = SVN
::TxDelta
::send_txstream
($txstream, @
$atd, $pool);
4797 die "Unexpected result from send_txstream: $res\n",
4798 "(SVN::Core::VERSION: $SVN::Core::VERSION)\n";
4801 my $got = SVN
::TxDelta
::send_stream
($fh_b, @
$atd, $pool);
4802 die "Checksum mismatch\nexpected: $exp_b\ngot: $got\n"
4803 if ($got ne $exp_b);
4805 Git
::temp_release
($fh_b, 1);
4806 Git
::temp_release
($fh_a, 1);
4811 my ($self, $m) = @_;
4812 my ($dir, $file) = split_path
($m->{file_b
});
4813 my $pbat = $self->ensure_path($dir);
4814 print "\tD\t$m->{file_b}\n" unless $::_q
;
4815 $self->delete_entry($m->{file_b
}, $pbat);
4820 my ($p,$bat) = ($self->{pool
}, $self->{bat
});
4821 foreach (sort { $b =~ tr
#/#/# <=> $a =~ tr#/#/# } keys %$bat) {
4823 $self->close_directory($bat->{$_}, $p);
4825 $self->close_directory($bat->{''}, $p);
4826 $self->SUPER::close_edit
($p);
4832 $self->SUPER::abort_edit
($self->{pool
});
4837 $self->SUPER::DESTROY
(@_);
4838 $self->{pool
}->clear;
4841 # this drives the editor
4844 my $mods = $self->{mods
};
4845 my %o = ( D
=> 1, R
=> 0, C
=> -1, A
=> 3, M
=> 3, T
=> 3 );
4846 foreach my $m (sort { $o{$a->{chg
}} <=> $o{$b->{chg
}} } @
$mods) {
4848 if (defined $o{$f}) {
4851 fatal
("Invalid change type: $f");
4854 $self->rmdirs if $_rmdir;
4860 return scalar @
$mods;
4863 package Git
::SVN
::Ra
;
4864 use vars qw
/@ISA $config_dir $_log_window_size/;
4867 my ($ra_invalid, $can_do_switch, %ignored_err, $RA);
4870 # enforce temporary pool usage for some simple functions
4872 for my $f (qw
/rev_proplist get_latest_revnum get_uuid get_repos_root
4874 my $SUPER = "SUPER::$f";
4877 my $pool = SVN
::Pool
->new;
4878 my @ret = $self->$SUPER(@_,$pool);
4880 wantarray ?
@ret : $ret[0];
4885 sub _auth_providers
() {
4887 SVN
::Client
::get_simple_provider
(),
4888 SVN
::Client
::get_ssl_server_trust_file_provider
(),
4889 SVN
::Client
::get_simple_prompt_provider
(
4890 \
&Git
::SVN
::Prompt
::simple
, 2),
4891 SVN
::Client
::get_ssl_client_cert_file_provider
(),
4892 SVN
::Client
::get_ssl_client_cert_prompt_provider
(
4893 \
&Git
::SVN
::Prompt
::ssl_client_cert
, 2),
4894 SVN
::Client
::get_ssl_client_cert_pw_file_provider
(),
4895 SVN
::Client
::get_ssl_client_cert_pw_prompt_provider
(
4896 \
&Git
::SVN
::Prompt
::ssl_client_cert_pw
, 2),
4897 SVN
::Client
::get_username_provider
(),
4898 SVN
::Client
::get_ssl_server_trust_prompt_provider
(
4899 \
&Git
::SVN
::Prompt
::ssl_server_trust
),
4900 SVN
::Client
::get_username_prompt_provider
(
4901 \
&Git
::SVN
::Prompt
::username
, 2)
4905 sub escape_uri_only
{
4908 foreach (split m{/}, $uri) {
4909 s/([^~\w.%+-]|%(?![a-fA-F0-9]{2}))/sprintf("%%%02X",ord($1))/eg;
4917 if ($url =~ m
#^(https?)://([^/]+)(.*)$#) {
4918 my ($scheme, $domain, $uri) = ($1, $2, escape_uri_only
($3));
4919 $url = "$scheme://$domain$uri";
4925 my ($class, $url) = @_;
4927 return $RA if ($RA && $RA->{url
} eq $url);
4931 SVN
::_Core
::svn_config_ensure
($config_dir, undef);
4932 my ($baton, $callbacks) = SVN
::Core
::auth_open_helper
(_auth_providers
);
4933 my $config = SVN
::Core
::config_get_config
($config_dir);
4935 my $dont_store_passwords = 1;
4936 my $conf_t = ${$config}{'config'};
4939 # The usage of $SVN::_Core::SVN_CONFIG_* variables
4940 # produces warnings that variables are used only once.
4941 # I had not found the better way to shut them up, so
4942 # the warnings of type 'once' are disabled in this block.
4943 if (SVN
::_Core
::svn_config_get_bool
($conf_t,
4944 $SVN::_Core
::SVN_CONFIG_SECTION_AUTH
,
4945 $SVN::_Core
::SVN_CONFIG_OPTION_STORE_PASSWORDS
,
4947 SVN
::_Core
::svn_auth_set_parameter
($baton,
4948 $SVN::_Core
::SVN_AUTH_PARAM_DONT_STORE_PASSWORDS
,
4949 bless (\
$dont_store_passwords, "_p_void"));
4951 if (SVN
::_Core
::svn_config_get_bool
($conf_t,
4952 $SVN::_Core
::SVN_CONFIG_SECTION_AUTH
,
4953 $SVN::_Core
::SVN_CONFIG_OPTION_STORE_AUTH_CREDS
,
4955 $Git::SVN
::Prompt
::_no_auth_cache
= 1;
4957 } # no warnings 'once'
4958 my $self = SVN
::Ra
->new(url
=> escape_url
($url), auth
=> $baton,
4960 pool
=> SVN
::Pool
->new,
4961 auth_provider_callbacks
=> $callbacks);
4962 $self->{url
} = $url;
4963 $self->{svn_path
} = $url;
4964 $self->{repos_root
} = $self->get_repos_root;
4965 $self->{svn_path
} =~ s
#^\Q$self->{repos_root}\E(/|$)##;
4966 $self->{cache
} = { check_path
=> { r
=> 0, data
=> {} },
4967 get_dir
=> { r
=> 0, data
=> {} } };
4968 $RA = bless $self, $class;
4972 my ($self, $path, $r) = @_;
4973 my $cache = $self->{cache
}->{check_path
};
4974 if ($r == $cache->{r
} && exists $cache->{data
}->{$path}) {
4975 return $cache->{data
}->{$path};
4977 my $pool = SVN
::Pool
->new;
4978 my $t = $self->SUPER::check_path
($path, $r, $pool);
4980 if ($r != $cache->{r
}) {
4981 %{$cache->{data
}} = ();
4984 $cache->{data
}->{$path} = $t;
4988 my ($self, $dir, $r) = @_;
4989 my $cache = $self->{cache
}->{get_dir
};
4990 if ($r == $cache->{r
}) {
4991 if (my $x = $cache->{data
}->{$dir}) {
4992 return wantarray ? @
$x : $x->[0];
4995 my $pool = SVN
::Pool
->new;
4996 my ($d, undef, $props) = $self->SUPER::get_dir
($dir, $r, $pool);
4997 my %dirents = map { $_ => { kind
=> $d->{$_}->kind } } keys %$d;
4999 if ($r != $cache->{r
}) {
5000 %{$cache->{data
}} = ();
5003 $cache->{data
}->{$dir} = [ \
%dirents, $r, $props ];
5004 wantarray ?
(\
%dirents, $r, $props) : \
%dirents;
5008 # do not call the real DESTROY since we store ourselves in $RA
5011 # get_log(paths, start, end, limit,
5012 # discover_changed_paths, strict_node_history, receiver)
5014 my ($self, @args) = @_;
5015 my $pool = SVN
::Pool
->new;
5017 # svn_log_changed_path_t objects passed to get_log are likely to be
5018 # overwritten even if only the refs are copied to an external variable,
5019 # so we should dup the structures in their entirety. Using an
5020 # externally passed pool (instead of our temporary and quickly cleared
5021 # pool in Git::SVN::Ra) does not help matters at all...
5022 my $receiver = pop @args;
5023 my $prefix = "/".$self->{svn_path
};
5024 $prefix =~ s
#/+($)##;
5025 my $prefix_regex = qr
#^\Q$prefix\E#;
5027 my ($paths) = $_[0];
5028 return &$receiver(@_) unless $paths;
5030 foreach my $p (keys %$paths) {
5031 my $i = $paths->{$p};
5032 # Make path relative to our url, not repos_root
5033 $p =~ s/$prefix_regex//;
5034 my %s = map { $_ => $i->$_; }
5035 qw
/copyfrom_path copyfrom_rev action/;
5036 if ($s{'copyfrom_path'}) {
5037 $s{'copyfrom_path'} =~ s/$prefix_regex//;
5045 # the limit parameter was not supported in SVN 1.1.x, so we
5046 # drop it. Therefore, the receiver callback passed to it
5047 # is made aware of this limitation by being wrapped if
5048 # the limit passed to is being wrapped.
5049 if ($SVN::Core
::VERSION
le '1.2.0') {
5050 my $limit = splice(@args, 3, 1);
5052 my $receiver = pop @args;
5053 push(@args, sub { &$receiver(@_) if (--$limit >= 0) });
5056 my $ret = $self->SUPER::get_log
(@args, $pool);
5062 my ($self, $url1, $rev1, $url2, $rev2) = @_;
5063 my $ctx = SVN
::Client
->new(auth
=> _auth_providers
);
5064 my $out = IO
::File
->new_tmpfile;
5066 # older SVN (1.1.x) doesn't take $pool as the last parameter for
5067 # $ctx->diff(), so we'll create a default one
5068 my $pool = SVN
::Pool
->new_default_sub;
5070 $ra_invalid = 1; # this will open a new SVN::Ra connection to $url1
5071 $ctx->diff([], $url1, $rev1, $url2, $rev2, 1, 1, 0, $out, $out);
5073 my $ret = (($out->stat)[7] == 0);
5074 close $out or croak
$!;
5079 sub get_commit_editor
{
5080 my ($self, $log, $cb, $pool) = @_;
5081 my @lock = $SVN::Core
::VERSION
ge '1.2.0' ?
(undef, 0) : ();
5082 $self->SUPER::get_commit_editor
($log, $cb, @lock, $pool);
5086 my ($self, $rev_a, $rev_b, $gs, $editor) = @_;
5087 my $new = ($rev_a == $rev_b);
5088 my $path = $gs->{path
};
5090 if ($new && -e
$gs->{index}) {
5091 unlink $gs->{index} or die
5092 "Couldn't unlink index: $gs->{index}: $!\n";
5094 my $pool = SVN
::Pool
->new;
5095 $editor->set_path_strip($path);
5096 my (@pc) = split m
#/#, $path;
5097 my $reporter = $self->do_update($rev_b, (@pc ?
shift @pc : ''),
5099 my @lock = $SVN::Core
::VERSION
ge '1.2.0' ?
(undef) : ();
5101 # Since we can't rely on svn_ra_reparent being available, we'll
5102 # just have to do some magic with set_path to make it so
5103 # we only want a partial path.
5105 my $final = join('/', @pc);
5107 $reporter->set_path($sp, $rev_b, 0, @lock, $pool);
5108 $sp .= '/' if length $sp;
5111 die "BUG: '$sp' != '$final'\n" if ($sp ne $final);
5113 $reporter->set_path($sp, $rev_a, $new, @lock, $pool);
5115 $reporter->finish_report($pool);
5117 $editor->{git_commit_ok
};
5120 # this requires SVN 1.4.3 or later (do_switch didn't work before 1.4.3, and
5121 # svn_ra_reparent didn't work before 1.4)
5123 my ($self, $rev_a, $rev_b, $gs, $url_b, $editor) = @_;
5124 my $path = $gs->{path
};
5125 my $pool = SVN
::Pool
->new;
5127 my $full_url = $self->{url
};
5128 my $old_url = $full_url;
5129 $full_url .= '/' . $path if length $path;
5130 my ($ra, $reparented);
5132 if ($old_url =~ m
#^svn(\+ssh)?://# ||
5133 ($full_url =~ m
#^https?://# &&
5134 escape_url
($full_url) ne $full_url)) {
5138 $ra = Git
::SVN
::Ra
->new($full_url);
5140 } elsif ($old_url ne $full_url) {
5141 SVN
::_Ra
::svn_ra_reparent
($self->{session
}, $full_url, $pool);
5142 $self->{url
} = $full_url;
5147 $url_b = escape_url
($url_b);
5148 my $reporter = $ra->do_switch($rev_b, '', 1, $url_b, $editor, $pool);
5149 my @lock = $SVN::Core
::VERSION
ge '1.2.0' ?
(undef) : ();
5150 $reporter->set_path('', $rev_a, 0, @lock, $pool);
5151 $reporter->finish_report($pool);
5154 SVN
::_Ra
::svn_ra_reparent
($self->{session
}, $old_url, $pool);
5155 $self->{url
} = $old_url;
5159 $editor->{git_commit_ok
};
5162 sub longest_common_path
{
5163 my ($gsv, $globs) = @_;
5165 my $common_max = scalar @
$gsv;
5167 foreach my $gs (@
$gsv) {
5168 my @tmp = split m
#/#, $gs->{path};
5171 $p .= length($p) ?
"/$_" : $_;
5177 $common_max += scalar @
$globs;
5178 foreach my $glob (@
$globs) {
5179 my @tmp = split m
#/#, $glob->{path}->{left};
5182 $p .= length($p) ?
"/$_" : $_;
5188 my $longest_path = '';
5189 foreach (sort {length $b <=> length $a} keys %common) {
5190 if ($common{$_} == $common_max) {
5198 sub gs_fetch_loop_common
{
5199 my ($self, $base, $head, $gsv, $globs) = @_;
5200 return if ($base > $head);
5201 my $inc = $_log_window_size;
5202 my ($min, $max) = ($base, $head < $base + $inc ?
$head : $base + $inc);
5203 my $longest_path = longest_common_path
($gsv, $globs);
5204 my $ra_url = $self->{url
};
5205 my $find_trailing_edge;
5209 my $err_handler = $SVN::Error
::handler
;
5210 $SVN::Error
::handler
= sub {
5212 skip_unknown_revs
($err);
5215 my ($paths, $r, $author, $date, $log) = @_;
5217 { author
=> $author, date
=> $date, log => $log } ];
5219 $self->get_log([$longest_path], $min, $max, 0, 1, 1,
5220 sub { $revs{$_[1]} = _cb
(@_) });
5222 print "Checked through r$max\r";
5224 $find_trailing_edge = 1;
5226 if ($err and $find_trailing_edge) {
5227 print STDERR
"Path '$longest_path' ",
5228 "was probably deleted:\n",
5229 $err->expanded_message,
5230 "\nWill attempt to follow ",
5231 "revisions r$min .. r$max ",
5232 "committed before the deletion\n";
5234 while (--$hi >= $min) {
5236 $self->get_log([$longest_path], $min, $hi,
5239 $revs{$_[1]} = _cb
(@_) });
5241 print STDERR
"r$min .. r$ok OK\n";
5245 $find_trailing_edge = 0;
5247 $SVN::Error
::handler
= $err_handler;
5249 my %exists = map { $_->{path
} => $_ } @
$gsv;
5250 foreach my $r (sort {$a <=> $b} keys %revs) {
5251 my ($paths, $logged) = @
{$revs{$r}};
5253 foreach my $gs ($self->match_globs(\
%exists, $paths,
5255 if ($gs->rev_map_max >= $r) {
5258 next unless $gs->match_paths($paths, $r);
5259 $gs->{logged_rev_props
} = $logged;
5260 if (my $last_commit = $gs->last_commit) {
5261 $gs->assert_index_clean($last_commit);
5263 my $log_entry = $gs->do_fetch($paths, $r);
5265 $gs->do_git_commit($log_entry);
5267 $INDEX_FILES{$gs->{index}} = 1;
5269 foreach my $g (@
$globs) {
5270 my $k = "svn-remote.$g->{remote}." .
5272 Git
::SVN
::tmp_config
($k, $r);
5278 $self = Git
::SVN
::Ra
->new($ra_url);
5279 $ra_invalid = undef;
5282 # pre-fill the .rev_db since it'll eventually get filled in
5283 # with '0' x40 if something new gets committed
5284 foreach my $gs (@
$gsv) {
5285 next if $gs->rev_map_max >= $max;
5286 next if defined $gs->rev_map_get($max);
5287 $gs->rev_map_set($max, 0 x40
);
5289 foreach my $g (@
$globs) {
5290 my $k = "svn-remote.$g->{remote}.$g->{t}-maxRev";
5291 Git
::SVN
::tmp_config
($k, $max);
5293 last if $max >= $head;
5296 $max = $head if ($max > $head);
5301 sub get_dir_globbed
{
5302 my ($self, $left, $depth, $r) = @_;
5304 my @x = eval { $self->get_dir($left, $r) };
5305 return unless scalar @x == 3;
5306 my $dirents = $x[0];
5308 foreach my $de (keys %$dirents) {
5309 next if $dirents->{$de}->{kind
} != $SVN::Node
::dir
;
5311 my @args = ("$left/$de", $depth - 1, $r);
5312 foreach my $dir ($self->get_dir_globbed(@args)) {
5313 push @finalents, "$de/$dir";
5316 push @finalents, $de;
5323 my ($self, $exists, $paths, $globs, $r) = @_;
5326 my ($self, $exists, $g, $r) = @_;
5328 my @dirs = $self->get_dir_globbed($g->{path
}->{left
},
5329 $g->{path
}->{depth
},
5332 foreach my $de (@dirs) {
5333 my $p = $g->{path
}->full_path($de);
5334 next if $exists->{$p};
5335 next if (length $g->{path
}->{right
} &&
5336 ($self->check_path($p, $r) !=
5338 next unless $p =~ /$g->{path}->{regex}/;
5339 $exists->{$p} = Git
::SVN
->init($self->{url
}, $p, undef,
5340 $g->{ref}->full_path($de), 1);
5343 foreach my $g (@
$globs) {
5344 if (my $path = $paths->{"/$g->{path}->{left}"}) {
5345 if ($path->{action
} =~ /^[AR]$/) {
5346 get_dir_check
($self, $exists, $g, $r);
5349 foreach (keys %$paths) {
5350 if (/$g->{path}->{left_regex}/ &&
5351 !/$g->{path}->{regex}/) {
5352 next if $paths->{$_}->{action
} !~ /^[AR]$/;
5353 get_dir_check
($self, $exists, $g, $r);
5355 next unless /$g->{path}->{regex}/;
5357 my $pathname = $g->{path
}->full_path($p);
5358 next if $exists->{$pathname};
5359 next if ($self->check_path($pathname, $r) !=
5361 $exists->{$pathname} = Git
::SVN
->init(
5362 $self->{url
}, $pathname, undef,
5363 $g->{ref}->full_path($p), 1);
5366 foreach (split m
#/#, $g->{path}->{left}) {
5368 next unless ($paths->{$c} &&
5369 ($paths->{$c}->{action
} =~ /^[AR]$/));
5370 get_dir_check
($self, $exists, $g, $r);
5378 return $self->{url
} if ($self->{url
} eq $self->{repos_root
});
5379 my $url = $self->{repos_root
};
5380 my @components = split(m!/!, $self->{svn_path
});
5383 $url .= "/$c" if length $c;
5385 my $ra = (ref $self)->new($url);
5386 my $latest = $ra->get_latest_revnum;
5387 $ra->get_log("", $latest, 0, 1, 0, 1, sub {});
5389 } while ($@
&& ($c = shift @components));
5395 unless (defined $can_do_switch) {
5396 my $pool = SVN
::Pool
->new;
5398 $self->do_switch(1, '', 0, $self->{url
},
5399 SVN
::Delta
::Editor
->new, $pool);
5404 $rep->abort_report($pool);
5412 sub skip_unknown_revs
{
5414 my $errno = $err->apr_err();
5415 # Maybe the branch we're tracking didn't
5416 # exist when the repo started, so it's
5417 # not an error if it doesn't, just continue
5419 # Wonderfully consistent library, eh?
5420 # 160013 - svn:// and file://
5421 # 175002 - http(s)://
5422 # 175007 - http(s):// (this repo required authorization, too...)
5423 # More codes may be discovered later...
5424 if ($errno == 175007 || $errno == 175002 || $errno == 160013) {
5425 my $err_key = $err->expanded_message;
5426 # revision numbers change every time, filter them out
5427 $err_key =~ s/\d+/\0/g;
5428 $err_key = "$errno\0$err_key";
5429 unless ($ignored_err{$err_key}) {
5430 warn "W: Ignoring error from SVN, path probably ",
5431 "does not exist: ($errno): ",
5432 $err->expanded_message,"\n";
5433 warn "W: Do not be alarmed at the above message ",
5434 "git-svn is just searching aggressively for ",
5436 "This may take a while on large repositories\n";
5437 $ignored_err{$err_key} = 1;
5441 die "Error from SVN, ($errno): ", $err->expanded_message,"\n";
5444 package Git
::SVN
::Log
;
5447 use POSIX qw
/strftime/;
5449 use constant commit_log_separator
=> ('-' x
72) . "\n";
5450 use vars qw
/$TZ $limit $color $pager $non_recursive $verbose $oneline
5451 %rusers $show_commit $incremental/;
5456 return 1 if defined $c->{r
};
5458 # big commit message got truncated by the 16k pretty buffer in rev-list
5459 if ($c->{l
} && $c->{l
}->[-1] eq "...\n" &&
5460 $c->{a_raw
} =~ /\@([a-f\d\-]+)>$/) {
5462 my @log = command
(qw
/cat-file commit/, $c->{c
});
5464 # shift off the headers
5465 shift @log while ($log[0] ne '');
5468 # TODO: make $c->{l} not have a trailing newline in the future
5469 @
{$c->{l
}} = map { "$_\n" } grep !/^git-svn-id: /, @log;
5471 (undef, $c->{r
}, undef) = ::extract_metadata
(
5472 (grep(/^git-svn-id: /, @log))[-1]);
5474 return defined $c->{r
};
5478 return $color || Git
->repository->get_colorbool('color.diff');
5481 sub git_svn_log_cmd
{
5482 my ($r_min, $r_max, @args) = @_;
5484 my (@files, @log_opts);
5485 foreach my $x (@args) {
5486 if ($x eq '--' || @files) {
5489 if (::verify_ref
("$x^0")) {
5497 my ($url, $rev, $uuid, $gs) = ::working_head_info
($head);
5498 $gs ||= Git
::SVN
->_new;
5499 my @cmd = (qw
/log --abbrev-commit --pretty=raw --default/,
5501 push @cmd, '-r' unless $non_recursive;
5502 push @cmd, qw
/--raw --name-status/ if $verbose;
5503 push @cmd, '--color' if log_use_color
();
5504 push @cmd, @log_opts;
5505 if (defined $r_max && $r_max == $r_min) {
5506 push @cmd, '--max-count=1';
5507 if (my $c = $gs->rev_map_get($r_max)) {
5510 } elsif (defined $r_max) {
5511 if ($r_max < $r_min) {
5512 ($r_min, $r_max) = ($r_max, $r_min);
5514 my (undef, $c_max) = $gs->find_rev_before($r_max, 1, $r_min);
5515 my (undef, $c_min) = $gs->find_rev_after($r_min, 1, $r_max);
5516 # If there are no commits in the range, both $c_max and $c_min
5517 # will be undefined. If there is at least 1 commit in the
5518 # range, both will be defined.
5519 return () if !defined $c_min || !defined $c_max;
5520 if ($c_min eq $c_max) {
5521 push @cmd, '--max-count=1', $c_min;
5523 push @cmd, '--boundary', "$c_min..$c_max";
5526 return (@cmd, @files);
5529 # adapted from pager.c
5532 $ENV{GIT_PAGER_IN_USE
} = 'false';
5536 chomp($pager = command_oneline
(qw(var GIT_PAGER)));
5537 if ($pager eq 'cat') {
5540 $ENV{GIT_PAGER_IN_USE
} = defined($pager);
5544 return unless defined $pager;
5545 pipe my ($rfd, $wfd) or return;
5546 defined(my $pid = fork) or ::fatal
"Can't fork: $!";
5548 open STDOUT
, '>&', $wfd or
5549 ::fatal
"Can't redirect to stdout: $!";
5552 open STDIN
, '<&', $rfd or ::fatal
"Can't redirect stdin: $!";
5553 $ENV{LESS
} ||= 'FRSX';
5554 exec $pager or ::fatal
"Can't run pager: $! ($pager)";
5557 sub format_svn_date
{
5558 # some systmes don't handle or mishandle %z, so be creative.
5559 my $t = shift || time;
5560 my $gm = timelocal
(gmtime($t));
5561 my $sign = qw( + + - )[ $t <=> $gm ];
5562 my $gmoff = sprintf("%s%02d%02d", $sign, (gmtime(abs($t - $gm)))[2,1]);
5563 return strftime
("%Y-%m-%d %H:%M:%S $gmoff (%a, %d %b %Y)", localtime($t));
5566 sub parse_git_date
{
5568 # Date::Parse isn't in the standard Perl distro :(
5569 if ($tz =~ s/^\+//) {
5570 $t += tz_to_s_offset
($tz);
5571 } elsif ($tz =~ s/^\-//) {
5572 $t -= tz_to_s_offset
($tz);
5577 sub set_local_timezone
{
5585 sub tz_to_s_offset
{
5588 return ($1 * 60) + ($tz * 3600);
5591 sub get_author_info
{
5592 my ($dest, $author, $t, $tz) = @_;
5593 $author =~ s/(?:^\s*|\s*$)//g;
5594 $dest->{a_raw
} = $author;
5597 $au = $rusers{$author} || undef;
5600 ($au) = ($author =~ /<([^>]+)\@[^>]+>$/);
5605 $dest->{t_utc
} = parse_git_date
($t, $tz);
5608 sub process_commit
{
5609 my ($c, $r_min, $r_max, $defer) = @_;
5610 if (defined $r_min && defined $r_max) {
5611 if ($r_min == $c->{r
} && $r_min == $r_max) {
5615 return 1 if $r_min == $r_max;
5616 if ($r_min < $r_max) {
5617 # we need to reverse the print order
5618 return 0 if (defined $limit && --$limit < 0);
5622 if ($r_min != $r_max) {
5623 return 1 if ($r_min < $c->{r
});
5624 return 1 if ($r_max > $c->{r
});
5627 return 0 if (defined $limit && --$limit < 0);
5636 if (my $l = $c->{l
}) {
5637 while ($l->[0] =~ /^\s*$/) { shift @
$l }
5640 $l_fmt ||= 'A' . length($c->{r
});
5641 print 'r',pack($l_fmt, $c->{r
}),' | ';
5642 print "$c->{c} | " if $show_commit;
5645 show_commit_normal
($c);
5649 sub show_commit_changed_paths
{
5651 return unless $c->{changed
};
5652 print "Changed paths:\n", @
{$c->{changed
}};
5655 sub show_commit_normal
{
5657 print commit_log_separator
, "r$c->{r} | ";
5658 print "$c->{c} | " if $show_commit;
5659 print "$c->{a} | ", format_svn_date
($c->{t_utc
}), ' | ';
5662 if (my $l = $c->{l
}) {
5663 while ($l->[$#$l] eq "\n" && $#$l > 0
5664 && $l->[($#$l - 1)] eq "\n") {
5667 $nr_line = scalar @
$l;
5669 print "1 line\n\n\n";
5671 if ($nr_line == 1) {
5672 $nr_line = '1 line';
5674 $nr_line .= ' lines';
5676 print $nr_line, "\n";
5677 show_commit_changed_paths
($c);
5679 print $_ foreach @
$l;
5683 show_commit_changed_paths
($c);
5687 foreach my $x (qw
/raw stat diff/) {
5690 print $_ foreach @
{$c->{$x}}
5697 my ($r_min, $r_max);
5698 my $r_last = -1; # prevent dupes
5699 set_local_timezone
();
5700 if (defined $::_revision
) {
5701 if ($::_revision
=~ /^(\d+):(\d+)$/) {
5702 ($r_min, $r_max) = ($1, $2);
5703 } elsif ($::_revision
=~ /^\d+$/) {
5704 $r_min = $r_max = $::_revision
;
5706 ::fatal
"-r$::_revision is not supported, use ",
5707 "standard 'git log' arguments instead";
5712 @args = git_svn_log_cmd
($r_min, $r_max, @args);
5714 print commit_log_separator
unless $incremental || $oneline;
5717 my $log = command_output_pipe
(@args);
5719 my (@k, $c, $d, $stat);
5720 my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/;
5722 if (/^${esc_color}commit -?($::sha1_short)/o) {
5724 if ($c && cmt_showable
($c) && $c->{r
} != $r_last) {
5726 process_commit
($c, $r_min, $r_max, \
@k) or
5731 } elsif (/^${esc_color}author (.+) (\d+) ([\-\+]?\d+)$/o) {
5732 get_author_info
($c, $1, $2, $3);
5733 } elsif (/^${esc_color}(?:tree|parent|committer) /o) {
5735 } elsif (/^${esc_color}:\d{6} \d{6} $::sha1_short/o) {
5736 push @
{$c->{raw
}}, $_;
5737 } elsif (/^${esc_color}[ACRMDT]\t/) {
5738 # we could add $SVN->{svn_path} here, but that requires
5739 # remote access at the moment (repo_path_split)...
5740 s
#^(${esc_color})([ACRMDT])\t#$1 $2 #o;
5741 push @
{$c->{changed
}}, $_;
5742 } elsif (/^${esc_color}diff /o) {
5744 push @
{$c->{diff
}}, $_;
5746 push @
{$c->{diff
}}, $_;
5747 } elsif (/^\
.+\ \
|\s
*\d
+\
$esc_color[\
+\
-]*
5748 $esc_color*[\
+\
-]*$esc_color$/x
) {
5750 push @
{$c->{stat}}, $_;
5751 } elsif ($stat && /^ \d+ files changed, \d+ insertions/) {
5752 push @
{$c->{stat}}, $_;
5754 } elsif (/^${esc_color} (git-svn-id:.+)$/o) {
5755 ($c->{url
}, $c->{r
}, undef) = ::extract_metadata
($1);
5756 } elsif (s/^${esc_color} //o) {
5757 push @
{$c->{l
}}, $_;
5760 if ($c && defined $c->{r
} && $c->{r
} != $r_last) {
5762 process_commit
($c, $r_min, $r_max, \
@k);
5765 ($r_min, $r_max) = ($r_max, $r_min);
5766 process_commit
($_, $r_min, $r_max) foreach reverse @k;
5770 print commit_log_separator
unless $incremental || $oneline;
5779 my ($fh, $ctx, $rev);
5782 ($fh, $ctx) = command_output_pipe
('blame', @_, $path);
5783 while (my $line = <$fh>) {
5784 if ($line =~ /^\^?([[:xdigit:]]+)\s/) {
5785 # Uncommitted edits show up as a rev ID of
5786 # all zeros, which we can't look up with
5789 (undef, $rev, undef) =
5791 $rev = '0' if (!$rev);
5795 $rev = sprintf('%-10s', $rev);
5796 $line =~ s/^\^?[[:xdigit:]]+(\s)/$rev$1/;
5801 ($fh, $ctx) = command_output_pipe
('blame', '-p', @_, 'HEAD',
5806 my %dsha; #distinct sha keys
5808 while (my $line = <$fh>) {
5809 push @buffer, $line;
5810 if ($line =~ /^([[:xdigit:]]{40})\s\d+\s\d+/) {
5815 my $s2r = ::cmt_sha2rev_batch
([keys %dsha]);
5817 foreach my $line (@buffer) {
5818 if ($line =~ /^([[:xdigit:]]{40})\s\d+\s\d+/) {
5820 $rev = '0' if (!$rev)
5822 elsif ($line =~ /^author (.*)/) {
5823 $authors{$rev} = $1;
5824 $authors{$rev} =~ s/\s/_/g;
5826 elsif ($line =~ /^\t(.*)$/) {
5827 printf("%6s %10s %s\n", $rev, $authors{$rev}, $1);
5831 command_close_pipe
($fh, $ctx);
5834 package Git
::SVN
::Migration
;
5835 # these version numbers do NOT correspond to actual version numbers
5836 # of git nor git-svn. They are just relative.
5838 # v0 layout: .git/$id/info/url, refs/heads/$id-HEAD
5840 # v1 layout: .git/$id/info/url, refs/remotes/$id
5842 # v2 layout: .git/svn/$id/info/url, refs/remotes/$id
5844 # v3 layout: .git/svn/$id, refs/remotes/$id
5845 # - info/url may remain for backwards compatibility
5846 # - this is what we migrate up to this layout automatically,
5847 # - this will be used by git svn init on single branches
5848 # v3.1 layout (auto migrated):
5849 # - .rev_db => .rev_db.$UUID, .rev_db will remain as a symlink
5850 # for backwards compatibility
5852 # v4 layout: .git/svn/$repo_id/$id, refs/remotes/$repo_id/$id
5853 # - this is only created for newly multi-init-ed
5854 # repositories. Similar in spirit to the
5855 # --use-separate-remotes option in git-clone (now default)
5856 # - we do not automatically migrate to this (following
5857 # the example set by core git)
5859 # v5 layout: .rev_db.$UUID => .rev_map.$UUID
5860 # - newer, more-efficient format that uses 24-bytes per record
5861 # with no filler space.
5862 # - use xxd -c24 < .rev_map.$UUID to view and debug
5863 # - This is a one-way migration, repositories updated to the
5864 # new format will not be able to use old git-svn without
5865 # rebuilding the .rev_db. Rebuilding the rev_db is not
5866 # possible if noMetadata or useSvmProps are set; but should
5867 # be no problem for users that use the (sensible) defaults.
5871 use File
::Path qw
/mkpath/;
5872 use File
::Basename qw
/dirname basename/;
5873 use vars qw
/$_minimize/;
5875 sub migrate_from_v0
{
5876 my $git_dir = $ENV{GIT_DIR
};
5877 return undef unless -d
$git_dir;
5878 my ($fh, $ctx) = command_output_pipe
(qw
/rev-parse --symbolic --all/);
5882 my ($id, $orig_ref) = ($_, $_);
5883 next unless $id =~ s
#^refs/heads/(.+)-HEAD$#$1#;
5884 next unless -f
"$git_dir/$id/info/url";
5885 my $new_ref = "refs/remotes/$id";
5886 if (::verify_ref
("$new_ref^0")) {
5887 print STDERR
"W: $orig_ref is probably an old ",
5888 "branch used by an ancient version of ",
5890 "However, $new_ref also exists.\n",
5891 "We will not be able ",
5892 "to use this branch until this ",
5893 "ambiguity is resolved.\n";
5896 print STDERR
"Migrating from v0 layout...\n" if !$migrated;
5897 print STDERR
"Renaming ref: $orig_ref => $new_ref\n";
5898 command_noisy
('update-ref', $new_ref, $orig_ref);
5899 command_noisy
('update-ref', '-d', $orig_ref, $orig_ref);
5902 command_close_pipe
($fh, $ctx);
5903 print STDERR
"Done migrating from v0 layout...\n" if $migrated;
5907 sub migrate_from_v1
{
5908 my $git_dir = $ENV{GIT_DIR
};
5910 return $migrated unless -d
$git_dir;
5911 my $svn_dir = "$git_dir/svn";
5913 # just in case somebody used 'svn' as their $id at some point...
5914 return $migrated if -d
$svn_dir && ! -f
"$svn_dir/info/url";
5916 print STDERR
"Migrating from a git-svn v1 layout...\n";
5918 print STDERR
"Data from a previous version of git-svn exists, but\n\t",
5919 "$svn_dir\n\t(required for this version ",
5920 "($::VERSION) of git-svn) does not exist.\n";
5921 my ($fh, $ctx) = command_output_pipe
(qw
/rev-parse --symbolic --all/);
5924 next unless $x =~ s
#^refs/remotes/##;
5926 next unless -f
"$git_dir/$x/info/url";
5927 my $u = eval { ::file_to_s
("$git_dir/$x/info/url") };
5929 my $dn = dirname
("$git_dir/svn/$x");
5930 mkpath
([$dn]) unless -d
$dn;
5931 if ($x eq 'svn') { # they used 'svn' as GIT_SVN_ID:
5932 mkpath
(["$git_dir/svn/svn"]);
5933 print STDERR
" - $git_dir/$x/info => ",
5934 "$git_dir/svn/$x/info\n";
5935 rename "$git_dir/$x/info", "$git_dir/svn/$x/info" or
5937 # don't worry too much about these, they probably
5938 # don't exist with repos this old (save for index,
5939 # and we can easily regenerate that)
5940 foreach my $f (qw
/unhandled.log index .rev_db/) {
5941 rename "$git_dir/$x/$f", "$git_dir/svn/$x/$f";
5944 print STDERR
" - $git_dir/$x => $git_dir/svn/$x\n";
5945 rename "$git_dir/$x", "$git_dir/svn/$x" or
5950 command_close_pipe
($fh, $ctx);
5951 print STDERR
"Done migrating from a git-svn v1 layout\n";
5956 my ($l_map, $pfx, $path) = @_;
5958 foreach (<$path/*>) {
5959 if (-r
"$_/info/url") {
5960 $pfx .= '/' if $pfx && $pfx !~ m
!/$!;
5961 my $ref_id = $pfx . basename
$_;
5962 my $url = ::file_to_s
("$_/info/url");
5963 $l_map->{$ref_id} = $url;
5970 $x =~ s!^\Q$ENV{GIT_DIR}\E/svn/!!o;
5971 read_old_urls
($l_map, $x, $_);
5975 sub migrate_from_v2
{
5976 my @cfg = command
(qw
/config -l/);
5977 return if grep /^svn-remote\..+\.url=/, @cfg;
5979 read_old_urls
(\
%l_map, '', "$ENV{GIT_DIR}/svn");
5982 foreach my $ref_id (sort keys %l_map) {
5983 eval { Git
::SVN
->init($l_map{$ref_id}, '', undef, $ref_id) };
5985 Git
::SVN
->init($l_map{$ref_id}, '', $ref_id, $ref_id);
5992 sub minimize_connections
{
5993 my $r = Git
::SVN
::read_all_remotes
();
5995 my $root_repos = {};
5996 foreach my $repo_id (keys %$r) {
5997 my $url = $r->{$repo_id}->{url
} or next;
5998 my $fetch = $r->{$repo_id}->{fetch
} or next;
5999 my $ra = Git
::SVN
::Ra
->new($url);
6001 # skip existing cases where we already connect to the root
6002 if (($ra->{url
} eq $ra->{repos_root
}) ||
6003 ($ra->{repos_root
} eq $repo_id)) {
6004 $root_repos->{$ra->{url
}} = $repo_id;
6008 my $root_ra = Git
::SVN
::Ra
->new($ra->{repos_root
});
6009 my $root_path = $ra->{url
};
6010 $root_path =~ s
#^\Q$ra->{repos_root}\E(/|$)##;
6011 foreach my $path (keys %$fetch) {
6012 my $ref_id = $fetch->{$path};
6013 my $gs = Git
::SVN
->new($ref_id, $repo_id, $path);
6015 # make sure we can read when connecting to
6016 # a higher level of a repository
6017 my ($last_rev, undef) = $gs->last_rev_commit;
6018 if (!defined $last_rev) {
6020 $root_ra->get_latest_revnum;
6024 my $new = $root_path;
6025 $new .= length $path ?
"/$path" : '';
6027 $root_ra->get_log([$new], $last_rev, $last_rev,
6031 $new_urls->{$ra->{repos_root
}}->{$new} =
6032 { ref_id
=> $ref_id,
6033 old_repo_id
=> $repo_id,
6034 old_path
=> $path };
6039 foreach my $url (keys %$new_urls) {
6040 # see if we can re-use an existing [svn-remote "repo_id"]
6041 # instead of creating a(n ugly) new section:
6042 my $repo_id = $root_repos->{$url} || $url;
6044 my $fetch = $new_urls->{$url};
6045 foreach my $path (keys %$fetch) {
6046 my $x = $fetch->{$path};
6047 Git
::SVN
->init($url, $path, $repo_id, $x->{ref_id
});
6048 my $pfx = "svn-remote.$x->{old_repo_id}";
6050 my $old_fetch = quotemeta("$x->{old_path}:".
6052 command_noisy
(qw
/config --unset/,
6053 "$pfx.fetch", '^'. $old_fetch . '$');
6054 delete $r->{$x->{old_repo_id
}}->
6055 {fetch
}->{$x->{old_path
}};
6056 if (!keys %{$r->{$x->{old_repo_id
}}->{fetch
}}) {
6057 command_noisy
(qw
/config --unset/,
6059 push @emptied, $x->{old_repo_id
}
6064 my $file = $ENV{GIT_CONFIG
} || "$ENV{GIT_DIR}/config";
6066 The following [svn-remote] sections in your config file ($file) are empty
6067 and can be safely removed:
6069 print STDERR
"[svn-remote \"$_\"]\n" foreach @emptied;
6073 sub migration_check
{
6077 minimize_connections
() if $_minimize;
6080 package Git
::IndexInfo
;
6083 use Git qw
/command_input_pipe command_close_pipe/;
6087 my ($gui, $ctx) = command_input_pipe
(qw
/update-index -z --index-info/);
6088 bless { gui
=> $gui, ctx
=> $ctx, nr
=> 0}, $class;
6092 my ($self, $path) = @_;
6093 if (print { $self->{gui
} } '0 ', 0 x
40, "\t", $path, "\0") {
6094 return ++$self->{nr
};
6100 my ($self, $mode, $hash, $path) = @_;
6101 if (print { $self->{gui
} } $mode, ' ', $hash, "\t", $path, "\0") {
6102 return ++$self->{nr
};
6109 command_close_pipe
($self->{gui
}, $self->{ctx
});
6112 package Git
::SVN
::GlobSpec
;
6117 my ($class, $glob, $pattern_ok) = @_;
6119 $re =~ s!/+$!!g; # no need for trailing slashes
6120 my (@left, @right, @patterns);
6122 my $die_msg = "Only one set of wildcard directories " .
6123 "(e.g. '*' or '*/*/*') is supported: '$glob'\n";
6124 for my $part (split(m
|/|, $glob)) {
6125 if ($part =~ /\*/ && $part ne "*") {
6126 die "Invalid pattern in '$glob': $part\n";
6127 } elsif ($pattern_ok && $part =~ /[{}]/ &&
6128 $part !~ /^\{[^{}]+\}/) {
6129 die "Invalid pattern in '$glob': $part\n";
6132 die $die_msg if $state eq "right";
6134 push(@patterns, "[^/]*");
6135 } elsif ($pattern_ok && $part =~ /^\{(.*)\}$/) {
6136 die $die_msg if $state eq "right";
6138 my $p = quotemeta($1);
6140 push(@patterns, "(?:$p)");
6142 if ($state eq "left") {
6145 push(@right, $part);
6150 my $depth = @patterns;
6152 die "One '*' is needed in glob: '$glob'\n";
6154 my $left = join('/', @left);
6155 my $right = join('/', @right);
6156 $re = join('/', @patterns);
6158 grep(length, quotemeta($left), "($re)", quotemeta($right)));
6159 my $left_re = qr/^\/\Q
$left\E
(\
/|$)/;
6160 bless { left
=> $left, right
=> $right, left_regex
=> $left_re,
6161 regex
=> qr/$re/, glob => $glob, depth
=> $depth }, $class;
6165 my ($self, $path) = @_;
6166 return (length $self->{left
} ?
"$self->{left}/" : '') .
6167 $path . (length $self->{right
} ?
"/$self->{right}" : '');
6175 $remotes = { # returned by read_all_remotes()
6177 # svn-remote.svn.url=https://svn.musicpd.org
6178 url
=> 'https://svn.musicpd.org',
6179 # svn-remote.svn.fetch=mpd/trunk:trunk
6181 'mpd/trunk' => 'trunk',
6183 # svn-remote.svn.tags=mpd/tags/*:tags/*
6188 regex
=> qr!mpd/tags/([^/]+)$!,
6194 regex
=> qr!tags/([^/]+)$!,
6201 $log_entry hashref as returned by libsvn_log_entry
()
6203 log => 'whitespace-formatted log entry
6204 ', # trailing newline is preserved
6205 revision
=> '8', # integer
6206 date
=> '2004-02-24T17:01:44.108345Z', # commit date
6207 author
=> 'committer name'
6211 # this is generated by generate_diff();
6212 @mods = array of diff
-index line hashes
, each element represents one line
6213 of diff
-index output
6215 diff
-index line
($m hash
)
6217 mode_a
=> first column of diff
-index output
, no leading
':',
6218 mode_b
=> second column of diff
-index output
,
6219 sha1_b
=> sha1sum of the final blob
,
6220 chg
=> change type
[MCRADT
],
6221 file_a
=> original file name of a file
(iff chg is
'C' or 'R')
6222 file_b
=> new
/current file name of a file
(any chg
)
6226 # retval of read_url_paths{,_all}();
6228 # repository root url
6229 'https://svn.musicpd.org' => {
6230 # repository path # GIT_SVN_ID
6231 'mpd/trunk' => 'trunk',
6232 'mpd/tags/0.11.5' => 'tags/0.11.5',
6237 I don
't trust the each() function on unless I created %hash myself
6238 because the internal iterator may not have started at base.