2 # Copyright (C) 2006, Eric Wong <normalperson@yhbt.net>
3 # License: GPL v2 or later
7 use vars qw
/ $AUTHOR $VERSION
8 $sha1 $sha1_short $_revision $_repository
9 $_q $_authors $_authors_prog %users/;
10 $AUTHOR = 'Eric Wong <normalperson@yhbt.net>';
11 $VERSION = '@@GIT_VERSION@@';
13 # From which subdir have we been invoked?
14 my $cmd_dir_prefix = eval {
15 command_oneline
([qw
/rev-parse --show-prefix/], STDERR
=> 0)
18 my $git_dir_user_set = 1 if defined $ENV{GIT_DIR
};
19 $ENV{GIT_DIR
} ||= '.git';
20 $Git::SVN
::default_repo_id
= 'svn';
21 $Git::SVN
::default_ref_id
= $ENV{GIT_SVN_ID
} || 'git-svn';
22 $Git::SVN
::Ra
::_log_window_size
= 100;
23 $Git::SVN
::_minimize_url
= 'unset';
25 if (! exists $ENV{SVN_SSH
} && exists $ENV{GIT_SSH
}) {
26 $ENV{SVN_SSH
} = $ENV{GIT_SSH
};
29 if (exists $ENV{SVN_SSH
} && $^O
eq 'msys') {
30 $ENV{SVN_SSH
} =~ s/\\/\\\\/g;
31 $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 # All SVN commands do it. Otherwise we may die on SIGPIPE when the remote
41 # repository decides to close the connection which we expect to be kept alive.
42 $SIG{PIPE
} = 'IGNORE';
44 # Given a dot separated version number, "subtract" it from
45 # the SVN::Core::VERSION; non-negaitive return means the SVN::Core
46 # is at least at the version the caller asked for.
47 sub compare_svn_version
{
48 my (@ours) = split(/\./, $SVN::Core
::VERSION
);
49 my (@theirs) = split(/\./, $_[0]);
52 for ($i = 0; $i < @ours && $i < @theirs; $i++) {
53 $diff = $ours[$i] - $theirs[$i];
54 return $diff if ($diff);
56 return 1 if ($i < @ours);
57 return -1 if ($i < @theirs);
62 require SVN
::Core
; # use()-ing this causes segfaults for me... *shrug*
65 if (::compare_svn_version
('1.1.0') < 0) {
66 fatal
"Need SVN::Core 1.1.0 or better (got $SVN::Core::VERSION)";
69 my $can_compress = eval { require Compress
::Zlib
; 1};
70 push @Git::SVN
::Ra
::ISA
, 'SVN::Ra';
71 push @SVN::Git
::Editor
::ISA
, 'SVN::Delta::Editor';
72 push @SVN::Git
::Fetcher
::ISA
, 'SVN::Delta::Editor';
76 use File
::Basename qw
/dirname basename/;
77 use File
::Path qw
/mkpath/;
80 use Getopt
::Long qw
/:config gnu_getopt no_ignore_case auto_abbrev/;
83 use Git
::SVN
::Prompt qw
//;
84 use Memoize
; # core since 5.8.0, Jul 2002
87 # import functions from Git into our packages, en masse
89 foreach (qw
/command command_oneline command_noisy command_output_pipe
90 command_input_pipe command_close_pipe
91 command_bidi_pipe command_close_bidi_pipe
/) {
92 for my $package ( qw(SVN::Git::Editor SVN::Git::Fetcher
93 Git::SVN::Migration Git::SVN::Log Git::SVN),
95 *{"${package}::$_"} = \
&{"Git::$_"};
98 Memoize
::memoize
'Git::config';
99 Memoize
::memoize
'Git::config_bool';
104 $sha1 = qr/[a-f\d]{40}/;
105 $sha1_short = qr/[a-f\d]{4,40}/;
106 my ($_stdin, $_help, $_edit,
107 $_message, $_file, $_branch_dest,
108 $_template, $_shared,
109 $_version, $_fetch_all, $_no_rebase, $_fetch_parent,
110 $_merge, $_strategy, $_preserve_merges, $_dry_run, $_local,
111 $_prefix, $_no_checkout, $_url, $_verbose,
112 $_git_format, $_commit_url, $_tag, $_merge_info, $_interactive);
113 $Git::SVN
::_follow_parent
= 1;
114 $SVN::Git
::Fetcher
::_placeholder_filename
= ".gitignore";
116 my %remote_opts = ( 'username=s' => \
$Git::SVN
::Prompt
::_username
,
117 'config-dir=s' => \
$Git::SVN
::Ra
::config_dir
,
118 'no-auth-cache' => \
$Git::SVN
::Prompt
::_no_auth_cache
,
119 'ignore-paths=s' => \
$SVN::Git
::Fetcher
::_ignore_regex
,
120 'ignore-refs=s' => \
$Git::SVN
::Ra
::_ignore_refs_regex
);
121 my %fc_opts = ( 'follow-parent|follow!' => \
$Git::SVN
::_follow_parent
,
122 'authors-file|A=s' => \
$_authors,
123 'authors-prog=s' => \
$_authors_prog,
124 'repack:i' => \
$Git::SVN
::_repack
,
125 'noMetadata' => \
$Git::SVN
::_no_metadata
,
126 'useSvmProps' => \
$Git::SVN
::_use_svm_props
,
127 'useSvnsyncProps' => \
$Git::SVN
::_use_svnsync_props
,
128 'log-window-size=i' => \
$Git::SVN
::Ra
::_log_window_size
,
129 'no-checkout' => \
$_no_checkout,
131 'repack-flags|repack-args|repack-opts=s' =>
132 \
$Git::SVN
::_repack_flags
,
133 'use-log-author' => \
$Git::SVN
::_use_log_author
,
134 'add-author-from' => \
$Git::SVN
::_add_author_from
,
135 'localtime' => \
$Git::SVN
::_localtime
,
138 my ($_trunk, @_tags, @_branches, $_stdlayout);
140 my %init_opts = ( 'template=s' => \
$_template, 'shared:s' => \
$_shared,
141 'trunk|T=s' => \
$_trunk, 'tags|t=s@' => \
@_tags,
142 'branches|b=s@' => \
@_branches, 'prefix=s' => \
$_prefix,
143 'stdlayout|s' => \
$_stdlayout,
144 'minimize-url|m!' => \
$Git::SVN
::_minimize_url
,
145 'no-metadata' => sub { $icv{noMetadata
} = 1 },
146 'use-svm-props' => sub { $icv{useSvmProps
} = 1 },
147 'use-svnsync-props' => sub { $icv{useSvnsyncProps
} = 1 },
148 'rewrite-root=s' => sub { $icv{rewriteRoot
} = $_[1] },
149 'rewrite-uuid=s' => sub { $icv{rewriteUUID
} = $_[1] },
151 my %cmt_opts = ( 'edit|e' => \
$_edit,
152 'rmdir' => \
$SVN::Git
::Editor
::_rmdir
,
153 'find-copies-harder' => \
$SVN::Git
::Editor
::_find_copies_harder
,
154 'l=i' => \
$SVN::Git
::Editor
::_rename_limit
,
155 'copy-similarity|C=i'=> \
$SVN::Git
::Editor
::_cp_similarity
159 fetch
=> [ \
&cmd_fetch
, "Download new revisions from SVN",
160 { 'revision|r=s' => \
$_revision,
161 'fetch-all|all' => \
$_fetch_all,
162 'parent|p' => \
$_fetch_parent,
164 clone
=> [ \
&cmd_clone
, "Initialize and fetch revisions",
165 { 'revision|r=s' => \
$_revision,
166 'preserve-empty-dirs' =>
167 \
$SVN::Git
::Fetcher
::_preserve_empty_dirs
,
168 'placeholder-filename=s' =>
169 \
$SVN::Git
::Fetcher
::_placeholder_filename
,
170 %fc_opts, %init_opts } ],
171 init
=> [ \
&cmd_init
, "Initialize a repo for tracking" .
172 " (requires URL argument)",
174 'multi-init' => [ \
&cmd_multi_init
,
175 "Deprecated alias for ".
176 "'$0 init -T<trunk> -b<branches> -t<tags>'",
178 dcommit
=> [ \
&cmd_dcommit
,
179 'Commit several diffs to merge with upstream',
180 { 'merge|m|M' => \
$_merge,
181 'strategy|s=s' => \
$_strategy,
182 'verbose|v' => \
$_verbose,
183 'dry-run|n' => \
$_dry_run,
184 'fetch-all|all' => \
$_fetch_all,
185 'commit-url=s' => \
$_commit_url,
186 'revision|r=i' => \
$_revision,
187 'no-rebase' => \
$_no_rebase,
188 'mergeinfo=s' => \
$_merge_info,
189 'interactive|i' => \
$_interactive,
190 %cmt_opts, %fc_opts } ],
191 branch
=> [ \
&cmd_branch
,
192 'Create a branch in the SVN repository',
193 { 'message|m=s' => \
$_message,
194 'destination|d=s' => \
$_branch_dest,
195 'dry-run|n' => \
$_dry_run,
197 'username=s' => \
$Git::SVN
::Prompt
::_username
,
198 'commit-url=s' => \
$_commit_url } ],
199 tag
=> [ sub { $_tag = 1; cmd_branch
(@_) },
200 'Create a tag in the SVN repository',
201 { 'message|m=s' => \
$_message,
202 'destination|d=s' => \
$_branch_dest,
203 'dry-run|n' => \
$_dry_run,
204 'username=s' => \
$Git::SVN
::Prompt
::_username
,
205 'commit-url=s' => \
$_commit_url } ],
206 'set-tree' => [ \
&cmd_set_tree
,
207 "Set an SVN repository to a git tree-ish",
208 { 'stdin' => \
$_stdin, %cmt_opts, %fc_opts, } ],
209 'create-ignore' => [ \
&cmd_create_ignore
,
210 'Create a .gitignore per svn:ignore',
211 { 'revision|r=i' => \
$_revision
213 'mkdirs' => [ \
&cmd_mkdirs
,
214 "recreate empty directories after a checkout",
215 { 'revision|r=i' => \
$_revision } ],
216 'propget' => [ \
&cmd_propget
,
217 'Print the value of a property on a file or directory',
218 { 'revision|r=i' => \
$_revision } ],
219 'proplist' => [ \
&cmd_proplist
,
220 'List all properties of a file or directory',
221 { 'revision|r=i' => \
$_revision } ],
222 'show-ignore' => [ \
&cmd_show_ignore
, "Show svn:ignore listings",
223 { 'revision|r=i' => \
$_revision
225 'show-externals' => [ \
&cmd_show_externals
, "Show svn:externals listings",
226 { 'revision|r=i' => \
$_revision
228 'multi-fetch' => [ \
&cmd_multi_fetch
,
229 "Deprecated alias for $0 fetch --all",
230 { 'revision|r=s' => \
$_revision, %fc_opts } ],
231 'migrate' => [ sub { },
232 # no-op, we automatically run this anyways,
233 'Migrate configuration/metadata/layout from
234 previous versions of git-svn',
235 { 'minimize' => \
$Git::SVN
::Migration
::_minimize
,
237 'log' => [ \
&Git
::SVN
::Log
::cmd_show_log
, 'Show commit logs',
238 { 'limit=i' => \
$Git::SVN
::Log
::limit
,
239 'revision|r=s' => \
$_revision,
240 'verbose|v' => \
$Git::SVN
::Log
::verbose
,
241 'incremental' => \
$Git::SVN
::Log
::incremental
,
242 'oneline' => \
$Git::SVN
::Log
::oneline
,
243 'show-commit' => \
$Git::SVN
::Log
::show_commit
,
244 'non-recursive' => \
$Git::SVN
::Log
::non_recursive
,
245 'authors-file|A=s' => \
$_authors,
246 'color' => \
$Git::SVN
::Log
::color
,
247 'pager=s' => \
$Git::SVN
::Log
::pager
249 'find-rev' => [ \
&cmd_find_rev
,
250 "Translate between SVN revision numbers and tree-ish",
252 'rebase' => [ \
&cmd_rebase
, "Fetch and rebase your working directory",
253 { 'merge|m|M' => \
$_merge,
254 'verbose|v' => \
$_verbose,
255 'strategy|s=s' => \
$_strategy,
256 'local|l' => \
$_local,
257 'fetch-all|all' => \
$_fetch_all,
258 'dry-run|n' => \
$_dry_run,
259 'preserve-merges|p' => \
$_preserve_merges,
261 'commit-diff' => [ \
&cmd_commit_diff
,
262 'Commit a diff between two trees',
263 { 'message|m=s' => \
$_message,
264 'file|F=s' => \
$_file,
265 'revision|r=s' => \
$_revision,
267 'info' => [ \
&cmd_info
,
268 "Show info about the latest SVN revision
269 on the current branch",
270 { 'url' => \
$_url, } ],
271 'blame' => [ \
&Git
::SVN
::Log
::cmd_blame
,
272 "Show what revision and author last modified each line of a file",
273 { 'git-format' => \
$_git_format } ],
274 'reset' => [ \
&cmd_reset
,
275 "Undo fetches back to the specified SVN revision",
276 { 'revision|r=s' => \
$_revision,
277 'parent|p' => \
$_fetch_parent } ],
279 "Compress unhandled.log files in .git/svn and remove " .
280 "index files in .git/svn",
287 my ($class, $reason) = @_;
288 return bless \
$reason, shift;
292 die "Cannot use readline on FakeTerm: $$self";
297 $ENV{"GIT_SVN_NOTTY"}
298 ? new Term
::ReadLine
'git-svn', \
*STDIN
, \
*STDOUT
299 : new Term
::ReadLine
'git-svn';
302 $term = new FakeTerm
"$@: going non-interactive";
306 for (my $i = 0; $i < @ARGV; $i++) {
307 if (defined $cmd{$ARGV[$i]}) {
311 } elsif ($ARGV[$i] eq 'help') {
317 # make sure we're always running at the top-level working directory
318 unless ($cmd && $cmd =~ /(?:clone|init|multi-init)$/) {
319 unless (-d
$ENV{GIT_DIR
}) {
320 if ($git_dir_user_set) {
321 die "GIT_DIR=$ENV{GIT_DIR} explicitly set, ",
322 "but it is not a directory\n";
324 my $git_dir = delete $ENV{GIT_DIR
};
327 $cdup = command_oneline
(qw
/rev-parse --show-cdup/);
328 $git_dir = '.' unless ($cdup);
329 chomp $cdup if ($cdup);
330 $cdup = "." unless ($cdup && length $cdup);
331 } "Already at toplevel, but $git_dir not found\n";
332 chdir $cdup or die "Unable to chdir up to '$cdup'\n";
333 unless (-d
$git_dir) {
334 die "$git_dir still not found after going to ",
337 $ENV{GIT_DIR
} = $git_dir;
339 $_repository = Git
->repository(Repository
=> $ENV{GIT_DIR
});
342 my %opts = %{$cmd{$cmd}->[2]} if (defined $cmd);
344 read_git_config
(\
%opts);
345 if ($cmd && ($cmd eq 'log' || $cmd eq 'blame')) {
346 Getopt
::Long
::Configure
('pass_through');
348 my $rv = GetOptions
(%opts, 'h|H' => \
$_help, 'version|V' => \
$_version,
349 'minimize-connections' => \
$Git::SVN
::Migration
::_minimize
,
350 'id|i=s' => \
$Git::SVN
::default_ref_id
,
351 'svn-remote|remote|R=s' => sub {
352 $Git::SVN
::no_reuse_existing
= 1;
353 $Git::SVN
::default_repo_id
= $_[1] });
354 exit 1 if (!$rv && $cmd && $cmd ne 'log');
357 version
() if $_version;
358 usage
(1) unless defined $cmd;
359 load_authors
() if $_authors;
360 if (defined $_authors_prog) {
361 $_authors_prog = "'" . File
::Spec
->rel2abs($_authors_prog) . "'";
364 unless ($cmd =~ /^(?:clone|init|multi-init|commit-diff)$/) {
365 Git
::SVN
::Migration
::migration_check
();
367 Git
::SVN
::init_vars
();
369 Git
::SVN
::verify_remotes_sanity
();
370 $cmd{$cmd}->[0]->(@ARGV);
373 post_fetch_checkout
();
376 ####################### primary functions ######################
378 my $exit = shift || 0;
379 my $fd = $exit ? \
*STDERR
: \
*STDOUT
;
381 git
-svn
- bidirectional operations between a single Subversion tree
and git
382 Usage
: git svn
<command
> [options
] [arguments
]\n
384 print $fd "Available commands:\n" unless $cmd;
386 foreach (sort keys %cmd) {
387 next if $cmd && $cmd ne $_;
388 next if /^multi-/; # don't show deprecated commands
389 print $fd ' ',pack('A17',$_),$cmd{$_}->[1],"\n";
390 foreach (sort keys %{$cmd{$_}->[2]}) {
391 # mixed-case options are for .git/config only
392 next if /[A-Z]/ && /^[a-z]+$/i;
393 # prints out arguments as they should be passed:
394 my $x = s
#[:=]s$## ? '<arg>' : s#[:=]i$## ? '<num>' : '';
395 print $fd ' ' x
21, join(', ', map { length $_ > 1 ?
397 split /\|/,$_)," $x\n";
401 \nGIT_SVN_ID may be set
in the environment
or via the
--id
/-i switch to an
402 arbitrary identifier
if you
're tracking multiple SVN branches/repositories in
403 one git repository and want to keep them separate. See git-svn(1) for more
411 print "git-svn version $VERSION (svn $SVN::Core::VERSION)\n";
416 my ($prompt, %arg) = @_;
417 my $valid_re = $arg{valid_re};
418 my $default = $arg{default};
422 if ( !( defined($term->IN)
423 && defined( fileno($term->IN) )
424 && defined( $term->OUT )
425 && defined( fileno($term->OUT) ) ) ){
426 return defined($default) ? $default : undef;
430 $resp = $term->readline($prompt);
431 if (!defined $resp) { # EOF
433 return defined $default ? $default : undef;
435 if ($resp eq '' and defined $default) {
438 if (!defined $valid_re or $resp =~ /$valid_re/) {
446 unless (-d $ENV{GIT_DIR}) {
447 my @init_db = ('init
');
448 push @init_db, "--template=$_template" if defined $_template;
449 if (defined $_shared) {
450 if ($_shared =~ /[a-z]/) {
451 push @init_db, "--shared=$_shared";
453 push @init_db, "--shared";
456 command_noisy(@init_db);
457 $_repository = Git->repository(Repository => ".git");
460 my $pfx = "svn-remote.$Git::SVN::default_repo_id";
461 foreach my $i (keys %icv) {
462 die "'$set' and '$i' cannot both be set\n" if $set;
463 next unless defined $icv{$i};
464 command_noisy('config
', "$pfx.$i", $icv{$i});
467 my $ignore_paths_regex = \$SVN::Git::Fetcher::_ignore_regex;
468 command_noisy('config
', "$pfx.ignore-paths", $$ignore_paths_regex)
469 if defined $$ignore_paths_regex;
470 my $ignore_refs_regex = \$Git::SVN::Ra::_ignore_refs_regex;
471 command_noisy('config
', "$pfx.ignore-refs", $$ignore_refs_regex)
472 if defined $$ignore_refs_regex;
474 if (defined $SVN::Git::Fetcher::_preserve_empty_dirs) {
475 my $fname = \$SVN::Git::Fetcher::_placeholder_filename;
476 command_noisy('config
', "$pfx.preserve-empty-dirs", 'true
');
477 command_noisy('config
', "$pfx.placeholder-filename", $$fname);
482 my $repo_path = shift or return;
483 mkpath([$repo_path]) unless -d $repo_path;
484 chdir $repo_path or die "Couldn't
chdir to
$repo_path: $!\n";
485 $ENV{GIT_DIR} = '.git';
486 $_repository = Git->repository(Repository => $ENV{GIT_DIR});
490 my ($url, $path) = @_;
491 if (!defined $path &&
492 (defined $_trunk || @_branches || @_tags ||
493 defined $_stdlayout) &&
494 $url !~ m#^[a-z\+]+://#) {
497 $path = basename($url) if !defined $path || !length $path;
498 my $authors_absolute = $_authors ? File::Spec->rel2abs($_authors) : "";
499 cmd_init($url, $path);
500 command_oneline('config', 'svn.authorsfile', $authors_absolute)
502 Git::SVN::fetch_all($Git::SVN::default_repo_id);
506 if (defined $_stdlayout) {
507 $_trunk = 'trunk' if (!defined $_trunk);
508 @_tags = 'tags' if (! @_tags);
509 @_branches = 'branches' if (! @_branches);
511 if (defined $_trunk || @_branches || @_tags) {
512 return cmd_multi_init(@_);
514 my $url = shift or die "SVN repository location required
",
515 "as a command
-line argument
\n";
516 $url = canonicalize_url($url);
520 if ($Git::SVN::_minimize_url eq 'unset') {
521 $Git::SVN::_minimize_url = 0;
524 Git::SVN->init($url);
528 if (grep /^\d+=./, @_) {
529 die "'<rev>=<commit>' fetch arguments are
",
530 "no longer supported
.\n";
534 die "Usage
: $0 fetch
[--all
] [--parent
] [svn
-remote
]\n";
536 $Git::SVN::no_reuse_existing = undef;
537 if ($_fetch_parent) {
538 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
540 die "Unable to determine upstream SVN information from
",
541 "working tree history
\n";
543 # just fetch, don't checkout.
544 $_no_checkout = 'true';
545 $_fetch_all ? $gs->fetch_all : $gs->fetch;
546 } elsif ($_fetch_all) {
549 $remote ||= $Git::SVN::default_repo_id;
550 Git::SVN::fetch_all($remote, Git::SVN::read_all_remotes());
556 if ($_stdin || !@commits) {
557 print "Reading from stdin
...\n";
560 if (/\b($sha1_short)\b/o) {
561 unshift @commits, $1;
566 foreach my $c (@commits) {
567 my @tmp = command('rev-parse',$c);
568 if (scalar @tmp == 1) {
570 } elsif (scalar @tmp > 1) {
571 push @revs, reverse(command('rev-list',@tmp));
573 fatal "Failed to rev
-parse
$c";
576 my $gs = Git::SVN->new;
577 my ($r_last, $cmt_last) = $gs->last_rev_commit;
579 if (defined $gs->{last_rev} && $r_last != $gs->{last_rev}) {
580 fatal "There are new revisions that were fetched
",
581 "and need to be merged
(or acknowledged
) ",
582 "before committing
.\nlast rev
: $r_last\n",
583 " current
: $gs->{last_rev
}";
585 $gs->set_tree($_) foreach @revs;
586 print "Done committing
",scalar @revs," revisions to SVN
\n";
590 sub split_merge_info_range {
592 if ($range =~ /(\d+)-(\d+)/) {
593 return (int($1), int($2));
595 return (int($range), int($range));
603 my @arr = split(/,/, $in);
604 for my $element (@arr) {
605 my ($start, $end) = split_merge_info_range($element);
609 my @sorted = @arr [ sort {
610 $fnums[$a] <=> $fnums[$b]
616 for my $element (@sorted) {
617 my ($start, $end) = split_merge_info_range($element);
624 if ($start <= $last+1) {
630 if ($first == $last) {
631 push @return, "$first";
633 push @return, "$first-$last";
640 if ($first == $last) {
641 push @return, "$first";
643 push @return, "$first-$last";
647 return join(',', @return);
650 sub merge_revs_into_hash {
651 my ($hash, $minfo) = @_;
652 my @lines = split(' ', $minfo);
654 for my $line (@lines) {
655 my ($branchpath, $revs) = split(/:/, $line);
657 if (exists($hash->{$branchpath})) {
658 # Merge the two revision sets
659 my $combined = "$hash->{$branchpath},$revs";
660 $hash->{$branchpath} = combine_ranges($combined);
662 # Just do range combining for consolidation
663 $hash->{$branchpath} = combine_ranges($revs);
668 sub merge_merge_info {
669 my ($mergeinfo_one, $mergeinfo_two) = @_;
670 my %result_hash = ();
672 merge_revs_into_hash(\%result_hash, $mergeinfo_one);
673 merge_revs_into_hash(\%result_hash, $mergeinfo_two);
676 # Sort below is for consistency's sake
677 for my $branchname (sort keys(%result_hash)) {
678 my $revlist = $result_hash{$branchname};
679 $result .= "$branchname:$revlist\n"
684 sub populate_merge_info {
685 my ($d, $gs, $uuid, $linear_refs, $rewritten_parent) = @_;
688 read_commit_parents(\%parentshash, $d);
689 my @parents = @{$parentshash{$d}};
692 my $all_parents_ok = 1;
693 my $aggregate_mergeinfo = '';
694 my $rooturl = $gs->repos_root;
696 if (defined($rewritten_parent)) {
697 # Replace first parent with newly-rewritten version
699 unshift @parents, $rewritten_parent;
702 foreach my $parent (@parents) {
703 my ($branchurl, $svnrev, $paruuid) =
704 cmt_metadata($parent);
706 unless (defined($svnrev)) {
707 # Should have been caught be preflight check
708 fatal "merge commit
$d has ancestor
$parent, but that change
"
709 ."does
not have git
-svn metadata
!";
711 unless ($branchurl =~ /^\Q$rooturl\E(.*)/) {
712 fatal "commit
$parent git
-svn metadata changed mid
-run
!";
716 my $ra = Git::SVN::Ra->new($branchurl);
717 my (undef, undef, $props) =
718 $ra->get_dir(canonicalize_path("."), $svnrev);
719 my $par_mergeinfo = $props->{'svn:mergeinfo'};
720 unless (defined $par_mergeinfo) {
723 # Merge previous mergeinfo values
724 $aggregate_mergeinfo =
725 merge_merge_info($aggregate_mergeinfo,
728 next if $parent eq $parents[0]; # Skip first parent
729 # Add new changes being placed in tree by merge
730 my @cmd = (qw/rev-list --reverse/,
732 foreach my $par (@parents) {
733 unless ($par eq $parent) {
738 my ($revlist, $ctx) = command_output_pipe(@cmd);
742 my (undef, $csvnrev, undef) =
744 unless (defined $csvnrev) {
745 # A child is missing SVN annotations...
746 # this might be OK, or might not be.
747 warn "W
:child
$irev is merged into revision
"
748 ."$d but does
not have git
-svn metadata
. "
749 ."This means git
-svn cannot determine the
"
750 ."svn revision numbers to place into the
"
751 ."svn
:mergeinfo property
. You must ensure
"
752 ."a branch is entirely committed to
"
753 ."SVN before merging it
in order
for "
754 ."svn
:mergeinfo population to function
"
757 push @revsin, $csvnrev;
759 command_close_pipe($revlist, $ctx);
761 last unless $all_parents_ok;
763 # We now have a list of all SVN revnos which are
764 # merged by this particular parent. Integrate them.
765 next if $#revsin == -1;
766 my $newmergeinfo = "$branchpath:" . join(',', @revsin);
767 $aggregate_mergeinfo =
768 merge_merge_info($aggregate_mergeinfo,
771 if ($all_parents_ok and $aggregate_mergeinfo) {
772 return $aggregate_mergeinfo;
781 command_noisy(qw/update-index --refresh/);
782 git_cmd_try { command_oneline(qw/diff-index --quiet HEAD/) }
783 'Cannot dcommit with a dirty index. Commit your changes first, '
784 . "or stash them with
`git stash'.\n";
788 if ($head ne 'HEAD') {
790 command_oneline([qw/symbolic-ref -q HEAD/])
793 $old_head =~ s{^refs/heads/}{};
795 $old_head = eval { command_oneline(qw/rev-parse HEAD/) };
797 command(['checkout', $head], STDERR => 0);
801 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD', \@refs);
803 die "Unable to determine upstream SVN information from ",
804 "$head history.\nPerhaps the repository is empty.";
807 if (defined $_commit_url) {
810 $url = eval { command_oneline('config', '--get',
811 "svn-remote.$gs->{repo_id}.commiturl") };
813 $url = $gs->full_pushurl
817 my $last_rev = $_revision if defined $_revision;
819 print "Committing to $url ...\n";
821 my ($linear_refs, $parents) = linearize_history($gs, \@refs);
822 if ($_no_rebase && scalar(@$linear_refs) > 1) {
823 warn "Attempting to commit more than one change while ",
824 "--no-rebase is enabled.\n",
825 "If these changes depend on each other, re-running ",
826 "without --no-rebase may be required."
829 if (defined $_interactive){
830 my $ask_default = "y";
831 foreach my $d (@$linear_refs){
832 my ($fh, $ctx) = command_output_pipe(qw(show --summary), "$d");
836 command_close_pipe
($fh, $ctx);
837 $_ = ask
("Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): ",
838 valid_re
=> qr/^(?:yes|y|no|n|quit|q|all|a)/i,
839 default => $ask_default);
840 die "Commit this patch reply required" unless defined $_;
849 my $expect_url = $url;
851 my $push_merge_info = eval {
852 command_oneline
(qw
/config --get svn.pushmergeinfo/)
854 if (not defined($push_merge_info)
855 or $push_merge_info eq "false"
856 or $push_merge_info eq "no"
857 or $push_merge_info eq "never") {
858 $push_merge_info = 0;
861 unless (defined($_merge_info) || ! $push_merge_info) {
862 # Preflight check of changes to ensure no issues with mergeinfo
863 # This includes check for uncommitted-to-SVN parents
864 # (other than the first parent, which we will handle),
865 # information from different SVN repos, and paths
866 # which are not underneath this repository root.
867 my $rooturl = $gs->repos_root;
868 foreach my $d (@
$linear_refs) {
870 read_commit_parents
(\
%parentshash, $d);
871 my @realparents = @
{$parentshash{$d}};
872 if ($#realparents > 0) {
874 shift @realparents; # Remove/ignore first parent
875 foreach my $parent (@realparents) {
876 my ($branchurl, $svnrev, $paruuid) = cmt_metadata
($parent);
877 unless (defined $paruuid) {
878 # A parent is missing SVN annotations...
879 # abort the whole operation.
880 fatal
"$parent is merged into revision $d, "
881 ."but does not have git-svn metadata. "
882 ."Either dcommit the branch or use a "
883 ."local cherry-pick, FF merge, or rebase "
884 ."instead of an explicit merge commit.";
887 unless ($paruuid eq $uuid) {
888 # Parent has SVN metadata from different repository
889 fatal
"merge parent $parent for change $d has "
890 ."git-svn uuid $paruuid, while current change "
894 unless ($branchurl =~ /^\Q$rooturl\E(.*)/) {
895 # This branch is very strange indeed.
896 fatal
"merge parent $parent for $d is on branch "
897 ."$branchurl, which is not under the "
898 ."git-svn root $rooturl!";
905 my $rewritten_parent;
906 Git
::SVN
::remove_username
($expect_url);
907 if (defined($_merge_info)) {
908 $_merge_info =~ tr{ }{\n};
911 my $d = shift @
$linear_refs or last;
912 unless (defined $last_rev) {
913 (undef, $last_rev, undef) = cmt_metadata
("$d~1");
914 unless (defined $last_rev) {
915 fatal
"Unable to extract revision information ",
920 print "diff-tree $d~1 $d\n";
924 unless (defined($_merge_info) || ! $push_merge_info) {
925 $_merge_info = populate_merge_info
($d, $gs,
931 my %ed_opts = ( r
=> $last_rev,
932 log => get_commit_entry
($d)->{log},
933 ra
=> Git
::SVN
::Ra
->new($url),
934 config
=> SVN
::Core
::config_get_config
(
935 $Git::SVN
::Ra
::config_dir
940 print "Committed r$_[0]\n";
943 mergeinfo
=> $_merge_info,
945 if (!SVN
::Git
::Editor
->new(\
%ed_opts)->apply_diff) {
946 print "No changes\n$d~1 == $d\n";
947 } elsif ($parents->{$d} && @
{$parents->{$d}}) {
948 $gs->{inject_parents_dcommit
}->{$cmt_rev} =
951 $_fetch_all ?
$gs->fetch_all : $gs->fetch;
952 $last_rev = $cmt_rev;
955 # we always want to rebase against the current HEAD,
956 # not any head that was passed to us
957 my @diff = command
('diff-tree', $d,
961 @finish = rebase_cmd
();
962 print STDERR
"W: $d and ", $gs->refname,
963 " differ, using @finish:\n",
964 join("\n", @diff), "\n";
966 print "No changes between current HEAD and ",
968 "\nResetting to the latest ",
970 @finish = qw
/reset --mixed/;
972 command_noisy
(@finish, $gs->refname);
974 $rewritten_parent = command_oneline
(qw
/rev-parse HEAD/);
978 my ($url_, $rev_, $uuid_, $gs_) =
979 working_head_info
('HEAD', \
@refs);
980 my ($linear_refs_, $parents_) =
981 linearize_history
($gs_, \
@refs);
982 if (scalar(@
$linear_refs) !=
983 scalar(@
$linear_refs_)) {
984 fatal
"# of revisions changed ",
986 join("\n", @
$linear_refs),
988 join("\n", @
$linear_refs_), "\n",
989 'If you are attempting to commit ',
990 "merges, try running:\n\t",
991 'git rebase --interactive',
992 '--preserve-merges ',
994 "\nBefore dcommitting";
996 if ($url_ ne $expect_url) {
997 if ($url_ eq $gs->metadata_url) {
999 "Accepting rewritten URL:",
1003 "URL mismatch after rebase:",
1004 " $url_ != $expect_url";
1007 if ($uuid_ ne $uuid) {
1008 fatal
"uuid mismatch after rebase: ",
1013 for ($i = 0; $i < scalar @
$linear_refs; $i++) {
1014 my $new = $linear_refs_->[$i] or next;
1016 $parents->{$linear_refs->[$i]};
1026 my $new_head = command_oneline
(qw
/rev-parse HEAD/);
1027 my $new_is_symbolic = eval {
1028 command_oneline
(qw
/symbolic-ref -q HEAD/);
1030 if ($new_is_symbolic) {
1031 print "dcommitted the branch ", $head, "\n";
1033 print "dcommitted on a detached HEAD because you gave ",
1034 "a revision argument.\n",
1035 "The rewritten commit is: ", $new_head, "\n";
1037 command
(['checkout', $old_head], STDERR
=> 0);
1040 unlink $gs->{index};
1044 my ($branch_name, $head) = @_;
1046 unless (defined $branch_name && length $branch_name) {
1047 die(($_tag ?
"tag" : "branch") . " name required\n");
1051 my (undef, $rev, undef, $gs) = working_head_info
($head);
1052 my $src = $gs->full_pushurl;
1054 my $remote = Git
::SVN
::read_all_remotes
()->{$gs->{repo_id
}};
1055 my $allglobs = $remote->{ $_tag ?
'tags' : 'branches' };
1057 if ($#{$allglobs} == 0) {
1058 $glob = $allglobs->[0];
1060 unless(defined $_branch_dest) {
1062 $_tag ?
"tag" : "branch",
1063 " paths defined for Subversion repository.\n",
1064 "You must specify where you want to create the ",
1065 $_tag ?
"tag" : "branch",
1066 " with the --destination argument.\n";
1068 foreach my $g (@
{$allglobs}) {
1069 # SVN::Git::Editor could probably be moved to Git.pm..
1070 my $re = SVN
::Git
::Editor
::glob2pat
($g->{path
}->{left
});
1071 if ($_branch_dest =~ /$re/) {
1076 unless (defined $glob) {
1077 my $dest_re = qr/\b\Q$_branch_dest\E\b/;
1078 foreach my $g (@
{$allglobs}) {
1079 $g->{path
}->{left
} =~ /$dest_re/ or next;
1080 if (defined $glob) {
1081 die "Ambiguous destination: ",
1082 $_branch_dest, "\nmatches both '",
1083 $glob->{path
}->{left
}, "' and '",
1084 $g->{path
}->{left
}, "'\n";
1088 unless (defined $glob) {
1090 $_tag ?
"tag" : "branch",
1091 " destination $_branch_dest\n";
1095 my ($lft, $rgt) = @
{ $glob->{path
} }{qw
/left right/};
1097 if (defined $_commit_url) {
1098 $url = $_commit_url;
1100 $url = eval { command_oneline
('config', '--get',
1101 "svn-remote.$gs->{repo_id}.commiturl") };
1103 $url = $remote->{pushurl
} || $remote->{url
};
1106 my $dst = join '/', $url, $lft, $branch_name, ($rgt || ());
1108 if ($dst =~ /^https:/ && $src =~ /^http:/) {
1109 $src=~s/^http:/https:/;
1114 my $ctx = SVN
::Client
->new(
1115 auth
=> Git
::SVN
::Ra
::_auth_providers
(),
1117 ${ $_[0] } = defined $_message
1119 : 'Create ' . ($_tag ?
'tag ' : 'branch ' )
1125 $ctx->ls($dst, 'HEAD', 0);
1126 } and die "branch ${branch_name} already exists\n";
1128 print "Copying ${src} at r${rev} to ${dst}...\n";
1129 $ctx->copy($src, $rev, $dst)
1136 my $revision_or_hash = shift or die "SVN or git revision required ",
1137 "as a command-line argument\n";
1139 if ($revision_or_hash =~ /^r\d+$/) {
1143 my (undef, undef, $uuid, $gs) = working_head_info
($head, \
@refs);
1145 die "Unable to determine upstream SVN information from ",
1148 my $desired_revision = substr($revision_or_hash, 1);
1149 $result = $gs->rev_map_get($desired_revision, $uuid);
1151 my (undef, $rev, undef) = cmt_metadata
($revision_or_hash);
1154 print "$result\n" if $result;
1157 sub auto_create_empty_directories
{
1159 my $var = eval { command_oneline
('config', '--get', '--bool',
1160 "svn-remote.$gs->{repo_id}.automkdirs") };
1161 # By default, create empty directories by consulting the unhandled log,
1162 # but allow setting it to 'false' to skip it.
1163 return !($var && $var eq 'false');
1167 command_noisy
(qw
/update-index --refresh/);
1168 my ($url, $rev, $uuid, $gs) = working_head_info
('HEAD');
1170 die "Unable to determine upstream SVN information from ",
1171 "working tree history\n";
1174 print "Remote Branch: " . $gs->refname . "\n";
1175 print "SVN URL: " . $url . "\n";
1178 if (command
(qw
/diff-index HEAD --/)) {
1179 print STDERR
"Cannot rebase with uncommited changes:\n";
1180 command_noisy
('status');
1184 # rebase will checkout for us, so no need to do it explicitly
1185 $_no_checkout = 'true';
1186 $_fetch_all ?
$gs->fetch_all : $gs->fetch;
1188 command_noisy
(rebase_cmd
(), $gs->refname);
1189 if (auto_create_empty_directories
($gs)) {
1194 sub cmd_show_ignore
{
1195 my ($url, $rev, $uuid, $gs) = working_head_info
('HEAD');
1196 $gs ||= Git
::SVN
->new;
1197 my $r = (defined $_revision ?
$_revision : $gs->ra->get_latest_revnum);
1198 $gs->prop_walk($gs->{path
}, $r, sub {
1199 my ($gs, $path, $props) = @_;
1200 print STDOUT
"\n# $path\n";
1201 my $s = $props->{'svn:ignore'} or return;
1202 $s =~ s/[\r\n]+/\n/g;
1206 print STDOUT
"$s\n";
1210 sub cmd_show_externals
{
1211 my ($url, $rev, $uuid, $gs) = working_head_info
('HEAD');
1212 $gs ||= Git
::SVN
->new;
1213 my $r = (defined $_revision ?
$_revision : $gs->ra->get_latest_revnum);
1214 $gs->prop_walk($gs->{path
}, $r, sub {
1215 my ($gs, $path, $props) = @_;
1216 print STDOUT
"\n# $path\n";
1217 my $s = $props->{'svn:externals'} or return;
1218 $s =~ s/[\r\n]+/\n/g;
1221 print STDOUT
"$s\n";
1225 sub cmd_create_ignore
{
1226 my ($url, $rev, $uuid, $gs) = working_head_info
('HEAD');
1227 $gs ||= Git
::SVN
->new;
1228 my $r = (defined $_revision ?
$_revision : $gs->ra->get_latest_revnum);
1229 $gs->prop_walk($gs->{path
}, $r, sub {
1230 my ($gs, $path, $props) = @_;
1231 # $path is of the form /path/to/dir/
1232 $path = '.' . $path;
1233 # SVN can have attributes on empty directories,
1234 # which git won't track
1235 mkpath
([$path]) unless -d
$path;
1236 my $ignore = $path . '.gitignore';
1237 my $s = $props->{'svn:ignore'} or return;
1238 open(GITIGNORE
, '>', $ignore)
1239 or fatal
("Failed to open `$ignore' for writing: $!");
1240 $s =~ s/[\r\n]+/\n/g;
1243 # Prefix all patterns so that the ignore doesn't apply
1244 # to sub-directories.
1246 print GITIGNORE
"$s\n";
1248 or fatal
("Failed to close `$ignore': $!");
1249 command_noisy
('add', '-f', $ignore);
1254 my ($url, $rev, $uuid, $gs) = working_head_info
('HEAD');
1255 $gs ||= Git
::SVN
->new;
1256 $gs->mkemptydirs($_revision);
1259 sub canonicalize_path
{
1261 my $dot_slash_added = 0;
1262 if (substr($path, 0, 1) ne "/") {
1263 $path = "./" . $path;
1264 $dot_slash_added = 1;
1266 # File::Spec->canonpath doesn't collapse x/../y into y (for a
1267 # good reason), so let's do this manually.
1269 $path =~ s
#/\.(?:/|$)#/#g;
1270 $path =~ s
#/[^/]+/\.\.##g;
1272 $path =~ s
#^\./## if $dot_slash_added;
1278 sub canonicalize_url
{
1280 $url =~ s
#^([^:]+://[^/]*/)(.*)$#$1 . canonicalize_path($2)#e;
1284 # get_svnprops(PATH)
1285 # ------------------
1286 # Helper for cmd_propget and cmd_proplist below.
1289 my ($url, $rev, $uuid, $gs) = working_head_info
('HEAD');
1290 $gs ||= Git
::SVN
->new;
1292 # prefix THE PATH by the sub-directory from which the user
1294 $path = $cmd_dir_prefix . $path;
1295 fatal
("No such file or directory: $path") unless -e
$path;
1296 my $is_dir = -d
$path ?
1 : 0;
1297 $path = $gs->{path
} . '/' . $path;
1299 # canonicalize the path (otherwise libsvn will abort or fail to
1301 $path = canonicalize_path
($path);
1303 my $r = (defined $_revision ?
$_revision : $gs->ra->get_latest_revnum);
1306 (undef, undef, $props) = $gs->ra->get_dir($path, $r);
1309 (undef, $props) = $gs->ra->get_file($path, $r, undef);
1314 # cmd_propget (PROP, PATH)
1315 # ------------------------
1316 # Print the SVN property PROP for PATH.
1318 my ($prop, $path) = @_;
1319 $path = '.' if not defined $path;
1320 usage
(1) if not defined $prop;
1321 my $props = get_svnprops
($path);
1322 if (not defined $props->{$prop}) {
1323 fatal
("`$path' does not have a `$prop' SVN property.");
1325 print $props->{$prop} . "\n";
1328 # cmd_proplist (PATH)
1329 # -------------------
1330 # Print the list of SVN properties for PATH.
1333 $path = '.' if not defined $path;
1334 my $props = get_svnprops
($path);
1335 print "Properties on '$path':\n";
1336 foreach (sort keys %{$props}) {
1341 sub cmd_multi_init
{
1343 unless (defined $_trunk || @_branches || @_tags) {
1347 $_prefix = '' unless defined $_prefix;
1349 $url = canonicalize_url
($url);
1353 if (defined $_trunk) {
1355 my $trunk_ref = 'refs/remotes/' . $_prefix . 'trunk';
1356 # try both old-style and new-style lookups:
1357 my $gs_trunk = eval { Git
::SVN
->new($trunk_ref) };
1358 unless ($gs_trunk) {
1359 my ($trunk_url, $trunk_path) =
1360 complete_svn_url
($url, $_trunk);
1361 $gs_trunk = Git
::SVN
->init($trunk_url, $trunk_path,
1365 return unless @_branches || @_tags;
1366 my $ra = $url ? Git
::SVN
::Ra
->new($url) : undef;
1367 foreach my $path (@_branches) {
1368 complete_url_ls_init
($ra, $path, '--branches/-b', $_prefix);
1370 foreach my $path (@_tags) {
1371 complete_url_ls_init
($ra, $path, '--tags/-t', $_prefix.'tags/');
1375 sub cmd_multi_fetch
{
1376 $Git::SVN
::no_reuse_existing
= undef;
1377 my $remotes = Git
::SVN
::read_all_remotes
();
1378 foreach my $repo_id (sort keys %$remotes) {
1379 if ($remotes->{$repo_id}->{url
}) {
1380 Git
::SVN
::fetch_all
($repo_id, $remotes);
1385 # this command is special because it requires no metadata
1386 sub cmd_commit_diff
{
1387 my ($ta, $tb, $url) = @_;
1388 my $usage = "Usage: $0 commit-diff -r<revision> ".
1389 "<tree-ish> <tree-ish> [<URL>]";
1390 fatal
($usage) if (!defined $ta || !defined $tb);
1392 if (!defined $url) {
1393 my $gs = eval { Git
::SVN
->new };
1395 fatal
("Needed URL or usable git-svn --id in ",
1396 "the command-line\n", $usage);
1399 $svn_path = $gs->{path
};
1401 unless (defined $_revision) {
1402 fatal
("-r|--revision is a required argument\n", $usage);
1404 if (defined $_message && defined $_file) {
1405 fatal
("Both --message/-m and --file/-F specified ",
1406 "for the commit message.\n",
1407 "I have no idea what you mean");
1409 if (defined $_file) {
1410 $_message = file_to_s
($_file);
1412 $_message ||= get_commit_entry
($tb)->{log};
1414 my $ra ||= Git
::SVN
::Ra
->new($url);
1417 $r = $ra->get_latest_revnum;
1418 } elsif ($r !~ /^\d+$/) {
1419 die "revision argument: $r not understood by git-svn\n";
1421 my %ed_opts = ( r
=> $r,
1426 editor_cb
=> sub { print "Committed r$_[0]\n" },
1427 svn_path
=> $svn_path );
1428 if (!SVN
::Git
::Editor
->new(\
%ed_opts)->apply_diff) {
1429 print "No changes\n$ta == $tb\n";
1433 sub escape_uri_only
{
1436 foreach (split m{/}, $uri) {
1437 s/([^~\w.%+-]|%(?![a-fA-F0-9]{2}))/sprintf("%%%02X",ord($1))/eg;
1445 if ($url =~ m
#^([^:]+)://([^/]*)(.*)$#) {
1446 my ($scheme, $domain, $uri) = ($1, $2, escape_uri_only
($3));
1447 $url = "$scheme://$domain$uri";
1453 my $path = canonicalize_path
(defined($_[0]) ?
$_[0] : ".");
1454 my $fullpath = canonicalize_path
($cmd_dir_prefix . $path);
1456 die "Too many arguments specified\n";
1459 my ($file_type, $diff_status) = find_file_type_and_diff_status
($path);
1461 if (!$file_type && !$diff_status) {
1462 print STDERR
"svn: '$path' is not under version control\n";
1466 my ($url, $rev, $uuid, $gs) = working_head_info
('HEAD');
1468 die "Unable to determine upstream SVN information from ",
1469 "working tree history\n";
1472 # canonicalize_path() will return "" to make libsvn 1.5.x happy,
1473 $path = "." if $path eq "";
1475 my $full_url = $url . ($fullpath eq "" ?
"" : "/$fullpath");
1478 print escape_url
($full_url), "\n";
1482 my $result = "Path: $path\n";
1483 $result .= "Name: " . basename
($path) . "\n" if $file_type ne "dir";
1484 $result .= "URL: " . escape_url
($full_url) . "\n";
1487 my $repos_root = $gs->repos_root;
1488 Git
::SVN
::remove_username
($repos_root);
1489 $result .= "Repository Root: " . escape_url
($repos_root) . "\n";
1492 $result .= "Repository Root: (offline)\n";
1495 $result .= "Repository UUID: $uuid\n" unless $diff_status eq "A" &&
1496 (::compare_svn_version
('1.5.4') <= 0 || $file_type ne "dir");
1497 $result .= "Revision: " . ($diff_status eq "A" ?
0 : $rev) . "\n";
1499 $result .= "Node Kind: " .
1500 ($file_type eq "dir" ?
"directory" : "file") . "\n";
1502 my $schedule = $diff_status eq "A"
1504 : ($diff_status eq "D" ?
"delete" : "normal");
1505 $result .= "Schedule: $schedule\n";
1507 if ($diff_status eq "A") {
1508 print $result, "\n";
1512 my ($lc_author, $lc_rev, $lc_date_utc);
1513 my @args = Git
::SVN
::Log
::git_svn_log_cmd
($rev, $rev, "--", $fullpath);
1514 my $log = command_output_pipe
(@args);
1515 my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/;
1517 if (/^${esc_color}author (.+) <[^>]+> (\d+) ([\-\+]?\d+)$/o) {
1519 $lc_date_utc = Git
::SVN
::Log
::parse_git_date
($2, $3);
1520 } elsif (/^${esc_color} (git-svn-id:.+)$/o) {
1521 (undef, $lc_rev, undef) = ::extract_metadata
($1);
1526 Git
::SVN
::Log
::set_local_timezone
();
1528 $result .= "Last Changed Author: $lc_author\n";
1529 $result .= "Last Changed Rev: $lc_rev\n";
1530 $result .= "Last Changed Date: " .
1531 Git
::SVN
::Log
::format_svn_date
($lc_date_utc) . "\n";
1533 if ($file_type ne "dir") {
1534 my $text_last_updated_date =
1535 ($diff_status eq "D" ?
$lc_date_utc : (stat $path)[9]);
1537 "Text Last Updated: " .
1538 Git
::SVN
::Log
::format_svn_date
($text_last_updated_date) .
1541 if ($diff_status eq "D") {
1543 command_output_pipe
(qw(cat-file blob), "HEAD:$path");
1544 if ($file_type eq "link") {
1545 my $file_name = <$fh>;
1546 $checksum = md5sum
("link $file_name");
1548 $checksum = md5sum
($fh);
1550 command_close_pipe
($fh, $ctx);
1551 } elsif ($file_type eq "link") {
1553 command
(qw(cat-file blob), "HEAD:$path");
1555 md5sum
("link " . $file_name);
1557 open FILE
, "<", $path or die $!;
1558 $checksum = md5sum
(\
*FILE
);
1559 close FILE
or die $!;
1561 $result .= "Checksum: " . $checksum . "\n";
1564 print $result, "\n";
1568 my $target = shift || $_revision or die "SVN revision required\n";
1569 $target = $1 if $target =~ /^r(\d+)$/;
1570 $target =~ /^\d+$/ or die "Numeric SVN revision expected\n";
1571 my ($url, $rev, $uuid, $gs) = working_head_info
('HEAD');
1573 die "Unable to determine upstream SVN information from ".
1576 my ($r, $c) = $gs->find_rev_before($target, not $_fetch_parent);
1577 die "Cannot find SVN revision $target\n" unless defined($c);
1578 $gs->rev_map_set($r, $c, 'reset', $uuid);
1579 print "r$r = $c ($gs->{ref_id})\n";
1583 if (!$can_compress) {
1584 warn "Compress::Zlib could not be found; unhandled.log " .
1585 "files will not be compressed.\n";
1587 find
({ wanted
=> \
&gc_directory
, no_chdir
=> 1}, "$ENV{GIT_DIR}/svn");
1590 ########################### utility functions #########################
1593 my @cmd = qw
/rebase/;
1594 push @cmd, '-v' if $_verbose;
1595 push @cmd, qw
/--merge/ if $_merge;
1596 push @cmd, "--strategy=$_strategy" if $_strategy;
1597 push @cmd, "--preserve-merges" if $_preserve_merges;
1601 sub post_fetch_checkout
{
1602 return if $_no_checkout;
1603 my $gs = $Git::SVN
::_head
or return;
1604 return if verify_ref
('refs/heads/master^0');
1606 # look for "trunk" ref if it exists
1607 my $remote = Git
::SVN
::read_all_remotes
()->{$gs->{repo_id
}};
1608 my $fetch = $remote->{fetch
};
1610 foreach my $p (keys %$fetch) {
1611 basename
($fetch->{$p}) eq 'trunk' or next;
1612 $gs = Git
::SVN
->new($fetch->{$p}, $gs->{repo_id
}, $p);
1617 my $valid_head = verify_ref
('HEAD^0');
1618 command_noisy
(qw(update-ref refs/heads/master), $gs->refname);
1619 return if ($valid_head || !verify_ref
('HEAD^0'));
1621 return if $ENV{GIT_DIR
} !~ m
#^(?:.*/)?\.git$#;
1622 my $index = $ENV{GIT_INDEX_FILE
} || "$ENV{GIT_DIR}/index";
1623 return if -f
$index;
1625 return if command_oneline
(qw
/rev-parse --is-inside-work-tree/) eq 'false';
1626 return if command_oneline
(qw
/rev-parse --is-inside-git-dir/) eq 'true';
1627 command_noisy
(qw
/read-tree -m -u -v HEAD HEAD/);
1628 print STDERR
"Checked out HEAD:\n ",
1629 $gs->full_url, " r", $gs->last_rev, "\n";
1630 if (auto_create_empty_directories
($gs)) {
1631 $gs->mkemptydirs($gs->last_rev);
1635 sub complete_svn_url
{
1636 my ($url, $path) = @_;
1638 if ($path !~ m
#^[a-z\+]+://#) {
1639 if (!defined $url || $url !~ m
#^[a-z\+]+://#) {
1640 fatal
("E: '$path' is not a complete URL ",
1641 "and a separate URL is not specified");
1643 return ($url, $path);
1648 sub complete_url_ls_init
{
1649 my ($ra, $repo_path, $switch, $pfx) = @_;
1650 unless ($repo_path) {
1651 print STDERR
"W: $switch not specified\n";
1654 $repo_path =~ s
#/+$##;
1655 if ($repo_path =~ m
#^[a-z\+]+://#) {
1656 $ra = Git
::SVN
::Ra
->new($repo_path);
1659 $repo_path =~ s
#^/+##;
1661 fatal
("E: '$repo_path' is not a complete URL ",
1662 "and a separate URL is not specified");
1665 my $url = $ra->{url
};
1666 my $gs = Git
::SVN
->init($url, undef, undef, undef, 1);
1667 my $k = "svn-remote.$gs->{repo_id}.url";
1668 my $orig_url = eval { command_oneline
(qw
/config --get/, $k) };
1669 if ($orig_url && ($orig_url ne $gs->{url
})) {
1670 die "$k already set: $orig_url\n",
1671 "wanted to set to: $gs->{url}\n";
1673 command_oneline
('config', $k, $gs->{url
}) unless $orig_url;
1674 my $remote_path = "$gs->{path}/$repo_path";
1675 $remote_path =~ s{%([0-9A-F]{2})}{chr hex($1)}ieg;
1676 $remote_path =~ s
#/+#/#g;
1677 $remote_path =~ s
#^/##g;
1678 $remote_path .= "/*" if $remote_path !~ /\
*/;
1679 my ($n) = ($switch =~ /^--(\w+)/);
1680 if (length $pfx && $pfx !~ m
#/$#) {
1681 die "--prefix='$pfx' must have a trailing slash '/'\n";
1683 command_noisy
('config',
1685 "svn-remote.$gs->{repo_id}.$n",
1686 "$remote_path:refs/remotes/$pfx*" .
1687 ('/*' x
(($remote_path =~ tr
/*/*/) - 1)) );
1692 eval { command_oneline
([ 'rev-parse', '--verify', $ref ],
1693 { STDERR
=> 0 }); };
1696 sub get_tree_from_treeish
{
1698 # $treeish can be a symbolic ref, too:
1699 my $type = command_oneline
(qw
/cat-file -t/, $treeish);
1701 while ($type eq 'tag') {
1702 ($treeish, $type) = command
(qw
/cat-file tag/, $treeish);
1704 if ($type eq 'commit') {
1705 $expected = (grep /^tree /, command
(qw
/cat-file commit/,
1707 ($expected) = ($expected =~ /^tree ($sha1)$/o);
1708 die "Unable to get tree from $treeish\n" unless $expected;
1709 } elsif ($type eq 'tree') {
1710 $expected = $treeish;
1712 die "$treeish is a $type, expected tree, tag or commit\n";
1717 sub get_commit_entry
{
1718 my ($treeish) = shift;
1719 my %log_entry = ( log => '', tree
=> get_tree_from_treeish
($treeish) );
1720 my $commit_editmsg = "$ENV{GIT_DIR}/COMMIT_EDITMSG";
1721 my $commit_msg = "$ENV{GIT_DIR}/COMMIT_MSG";
1722 open my $log_fh, '>', $commit_editmsg or croak
$!;
1724 my $type = command_oneline
(qw
/cat-file -t/, $treeish);
1725 if ($type eq 'commit' || $type eq 'tag') {
1726 my ($msg_fh, $ctx) = command_output_pipe
('cat-file',
1734 $in_msg = 1 if (/^\s*$/);
1735 $author = $1 if (/^author (.*>)/);
1736 } elsif (/^git-svn-id: /) {
1737 # skip this for now, we regenerate the
1738 # correct one on re-fetch anyways
1739 # TODO: set *:merge properties or like...
1741 if (/^From:/ || /^Signed-off-by:/) {
1747 $msgbuf =~ s/\s+$//s;
1748 if ($Git::SVN
::_add_author_from
&& defined($author)
1750 $msgbuf .= "\n\nFrom: $author";
1752 print $log_fh $msgbuf or croak
$!;
1753 command_close_pipe
($msg_fh, $ctx);
1755 close $log_fh or croak
$!;
1757 if ($_edit || ($type eq 'tree')) {
1758 chomp(my $editor = command_oneline
(qw(var GIT_EDITOR)));
1759 system('sh', '-c', $editor.' "$@"', $editor, $commit_editmsg);
1761 rename $commit_editmsg, $commit_msg or croak
$!;
1764 # SVN requires messages to be UTF-8 when entering the repo
1766 open $log_fh, '<', $commit_msg or croak
$!;
1768 chomp($log_entry{log} = <$log_fh>);
1770 my $enc = Git
::config
('i18n.commitencoding') || 'UTF-8';
1771 my $msg = $log_entry{log};
1773 eval { $msg = Encode
::decode
($enc, $msg, 1) };
1775 die "Could not decode as $enc:\n", $msg,
1776 "\nPerhaps you need to set i18n.commitencoding\n";
1779 eval { $msg = Encode
::encode
('UTF-8', $msg, 1) };
1780 die "Could not encode as UTF-8:\n$msg\n" if $@
;
1782 $log_entry{log} = $msg;
1784 close $log_fh or croak
$!;
1791 my ($str, $file, $mode) = @_;
1792 open my $fd,'>',$file or croak
$!;
1793 print $fd $str,"\n" or croak
$!;
1794 close $fd or croak
$!;
1795 chmod ($mode &~ umask, $file) if (defined $mode);
1800 open my $fd,'<',$file or croak
"$!: file: $file\n";
1803 close $fd or croak
$!;
1808 # '<svn username> = real-name <email address>' mapping based on git-svnimport:
1810 open my $authors, '<', $_authors or die "Can't open $_authors $!\n";
1811 my $log = $cmd eq 'log';
1812 while (<$authors>) {
1814 next unless /^(.+?|\(no author\))\s*=\s*(.+?)\s*<(.+)>\s*$/;
1815 my ($user, $name, $email) = ($1, $2, $3);
1817 $Git::SVN
::Log
::rusers
{"$name <$email>"} = $user;
1819 $users{$user} = [$name, $email];
1822 close $authors or croak
$!;
1825 # convert GetOpt::Long specs for use by git-config
1826 sub read_git_config
{
1829 foreach my $o (keys %$opts) {
1830 # if we have mixedCase and a long option-only, then
1831 # it's a config-only variable that we don't need for
1833 push @config_only, $o if ($o =~ /[A-Z]/ && $o =~ /^[a-z]+$/i);
1834 my $v = $opts->{$o};
1835 my ($key) = ($o =~ /^([a-zA-Z\-]+)/);
1837 my $arg = 'git config';
1838 $arg .= ' --int' if ($o =~ /[:=]i$/);
1839 $arg .= ' --bool' if ($o !~ /[:=][sfi]$/);
1840 if (ref $v eq 'ARRAY') {
1841 chomp(my @tmp = `$arg --get-all svn.$key`);
1844 chomp(my $tmp = `$arg --get svn.$key`);
1845 if ($tmp && !($arg =~ / --bool/ && $tmp eq 'false')) {
1850 delete @
$opts{@config_only} if @config_only;
1853 sub extract_metadata
{
1854 my $id = shift or return (undef, undef, undef);
1855 my ($url, $rev, $uuid) = ($id =~ /^\s
*git
-svn
-id
:\s
+(.*)\@
(\d
+)
1856 \s
([a
-f\d\
-]+)$/ix
);
1857 if (!defined $rev || !$uuid || !$url) {
1858 # some of the original repositories I made had
1859 # identifiers like this:
1860 ($rev, $uuid) = ($id =~/^\s*git-svn-id:\s(\d+)\@([a-f\d\-]+)/i);
1862 return ($url, $rev, $uuid);
1866 return extract_metadata
((grep(/^git-svn-id: /,
1867 command
(qw
/cat-file commit/, shift)))[-1]);
1870 sub cmt_sha2rev_batch
{
1872 my ($pid, $in, $out, $ctx) = command_bidi_pipe
(qw
/cat-file --batch/);
1875 foreach my $sha (@
{$list}) {
1878 print $out $sha, "\n";
1880 while (my $line = <$in>) {
1881 if ($first && $line =~ /^[[:xdigit:]]{40}\smissing$/) {
1884 $line =~ /^[[:xdigit:]]{40}\scommit\s(\d+)$/) {
1888 } elsif ($line =~ /^(git-svn-id: )/) {
1889 my (undef, $rev, undef) =
1890 extract_metadata
($line);
1894 $size -= length($line);
1895 last if ($size == 0);
1899 command_close_bidi_pipe
($pid, $in, $out, $ctx);
1904 sub working_head_info
{
1905 my ($head, $refs) = @_;
1906 my @args = qw
/rev-list --first-parent --pretty=medium/;
1907 my ($fh, $ctx) = command_output_pipe
(@args, $head);
1911 if ( m{^commit ($::sha1)$} ) {
1912 unshift @
$refs, $hash if $hash and $refs;
1916 next unless s{^\s*(git-svn-id:)}{$1};
1917 my ($url, $rev, $uuid) = extract_metadata
($_);
1918 if (defined $url && defined $rev) {
1919 next if $max{$url} and $max{$url} < $rev;
1920 if (my $gs = Git
::SVN
->find_by_url($url)) {
1921 my $c = $gs->rev_map_get($rev, $uuid);
1922 if ($c && $c eq $hash) {
1923 close $fh; # break the pipe
1924 return ($url, $rev, $uuid, $gs);
1926 $max{$url} ||= $gs->rev_map_max;
1931 command_close_pipe
($fh, $ctx);
1932 (undef, undef, undef, undef);
1935 sub read_commit_parents
{
1936 my ($parents, $c) = @_;
1937 chomp(my $p = command_oneline
(qw
/rev-list --parents -1/, $c));
1938 $p =~ s/^($c)\s*// or die "rev-list --parents -1 $c failed!\n";
1939 @
{$parents->{$c}} = split(/ /, $p);
1942 sub linearize_history
{
1943 my ($gs, $refs) = @_;
1945 foreach my $c (@
$refs) {
1946 read_commit_parents
(\
%parents, $c);
1951 my $last_svn_commit = $gs->last_commit;
1952 foreach my $c (reverse @
$refs) {
1953 next if $c eq $last_svn_commit;
1956 unshift @linear_refs, $c;
1959 # we only want the first parent to diff against for linear
1960 # history, we save the rest to inject when we finalize the
1962 my $fp_a = verify_ref
("$c~1");
1963 my $fp_b = shift @
{$parents{$c}} if $parents{$c};
1964 if (!$fp_a || !$fp_b) {
1966 "has no parent commit, and therefore ",
1967 "nothing to diff against.\n",
1968 "You should be working from a repository ",
1969 "originally created by git-svn\n";
1971 if ($fp_a ne $fp_b) {
1972 die "$c~1 = $fp_a, however parsing commit $c ",
1973 "revealed that:\n$c~1 = $fp_b\nBUG!\n";
1976 foreach my $p (@
{$parents{$c}}) {
1980 (\
@linear_refs, \
%parents);
1983 sub find_file_type_and_diff_status
{
1985 return ('dir', '') if $path eq '';
1988 command_oneline
(qw(diff --cached --name-status --), $path) || "";
1989 my $diff_status = (split(' ', $diff_output))[0] || "";
1991 my $ls_tree = command_oneline
(qw(ls-tree HEAD), $path) || "";
1993 return (undef, undef) if !$diff_status && !$ls_tree;
1995 if ($diff_status eq "A") {
1996 return ("link", $diff_status) if -l
$path;
1997 return ("dir", $diff_status) if -d
$path;
1998 return ("file", $diff_status);
2001 my $mode = (split(' ', $ls_tree))[0] || "";
2003 return ("link", $diff_status) if $mode eq "120000";
2004 return ("dir", $diff_status) if $mode eq "040000";
2005 return ("file", $diff_status);
2011 my $md5 = Digest
::MD5
->new();
2012 if ($ref eq 'GLOB' || $ref eq 'IO::File' || $ref eq 'File::Temp') {
2013 $md5->addfile($arg) or croak
$!;
2014 } elsif ($ref eq 'SCALAR') {
2015 $md5->add($$arg) or croak
$!;
2017 $md5->add($arg) or croak
$!;
2019 ::fatal
"Can't provide MD5 hash for unknown ref type: '", $ref, "'";
2021 return $md5->hexdigest();
2025 if ($can_compress && -f
$_ && basename
($_) eq "unhandled.log") {
2026 my $out_filename = $_ . ".gz";
2027 open my $in_fh, "<", $_ or die "Unable to open $_: $!\n";
2029 my $gz = Compress
::Zlib
::gzopen
($out_filename, "ab") or
2030 die "Unable to open $out_filename: $!\n";
2033 while ($res = sysread($in_fh, my $str, 1024)) {
2034 $gz->gzwrite($str) or
2035 die "Unable to write: ".$gz->gzerror()."!\n";
2037 unlink $_ or die "unlink $File::Find::name: $!\n";
2038 } elsif (-f
$_ && basename
($_) eq "index") {
2039 unlink $_ or die "unlink $_: $!\n";
2046 use Fcntl qw
/:DEFAULT :seek/;
2047 use constant rev_map_fmt
=> 'NH40';
2048 use vars qw
/$default_repo_id $default_ref_id $_no_metadata $_follow_parent
2049 $_repack $_repack_flags $_use_svm_props $_head
2050 $_use_svnsync_props $no_reuse_existing $_minimize_url
2051 $_use_log_author $_add_author_from $_localtime/;
2053 use File
::Path qw
/mkpath/;
2054 use File
::Copy qw
/copy/;
2057 use Memoize
; # core since 5.8.0, Jul 2002
2058 use Memoize
::Storable
;
2059 use POSIX
qw(:signal_h);
2061 my ($_gc_nr, $_gc_period);
2063 # properties that we do not log:
2066 %SKIP_PROP = map { $_ => 1 } qw
/svn
:wc
:ra_dav
:version
-url
2067 svn
:special svn
:executable
2068 svn
:entry
:committed
-rev
2069 svn
:entry
:last-author
2071 svn
:entry
:committed
-date
/;
2073 # some options are read globally, but can be overridden locally
2074 # per [svn-remote "..."] section. Command-line options will *NOT*
2075 # override options set in an [svn-remote "..."] section
2077 for my $option (qw
/follow_parent no_metadata use_svm_props
2078 use_svnsync_props
/) {
2081 my $prop = "-$option";
2084 return $self->{$prop} if exists $self->{$prop};
2085 my $k = "svn-remote.$self->{repo_id}.$key";
2086 eval { command_oneline
(qw
/config --get/, $k) };
2088 $self->{$prop} = ${"Git::SVN::_$option"};
2090 my $v = command_oneline
(qw
/config --bool/,$k);
2091 $self->{$prop} = $v eq 'false' ?
0 : 1;
2093 return $self->{$prop};
2099 my (%LOCKFILES, %INDEX_FILES);
2101 unlink keys %LOCKFILES if %LOCKFILES;
2102 unlink keys %INDEX_FILES if %INDEX_FILES;
2105 sub resolve_local_globs
{
2106 my ($url, $fetch, $glob_spec) = @_;
2107 return unless defined $glob_spec;
2108 my $ref = $glob_spec->{ref};
2109 my $path = $glob_spec->{path
};
2110 foreach (command
(qw
#for-each-ref --format=%(refname) refs/#)) {
2111 next unless m
#^$ref->{regex}$#;
2113 my $pathname = desanitize_refname
($path->full_path($p));
2114 my $refname = desanitize_refname
($ref->full_path($p));
2115 if (my $existing = $fetch->{$pathname}) {
2116 if ($existing ne $refname) {
2117 die "Refspec conflict:\n",
2118 "existing: $existing\n",
2119 " globbed: $refname\n";
2121 my $u = (::cmt_metadata
("$refname"))[0];
2122 $u =~ s!^\Q$url\E(/|$)!! or die
2123 "$refname: '$url' not found in '$u'\n";
2124 if ($pathname ne $u) {
2125 warn "W: Refspec glob conflict ",
2126 "(ref: $refname):\n",
2127 "expected path: $pathname\n",
2129 "Continuing ahead with $u\n";
2133 $fetch->{$pathname} = $refname;
2138 sub parse_revision_argument
{
2139 my ($base, $head) = @_;
2140 if (!defined $::_revision
|| $::_revision
eq 'BASE:HEAD') {
2141 return ($base, $head);
2143 return ($1, $2) if ($::_revision
=~ /^(\d+):(\d+)$/);
2144 return ($::_revision
, $::_revision
) if ($::_revision
=~ /^\d+$/);
2145 return ($head, $head) if ($::_revision
eq 'HEAD');
2146 return ($base, $1) if ($::_revision
=~ /^BASE:(\d+)$/);
2147 return ($1, $head) if ($::_revision
=~ /^(\d+):HEAD$/);
2148 die "revision argument: $::_revision not understood by git-svn\n";
2152 my ($repo_id, $remotes) = @_;
2156 $repo_id = $gs->{repo_id
};
2158 $remotes ||= read_all_remotes
();
2159 my $remote = $remotes->{$repo_id} or
2160 die "[svn-remote \"$repo_id\"] unknown\n";
2161 my $fetch = $remote->{fetch
};
2162 my $url = $remote->{url
} or die "svn-remote.$repo_id.url not defined\n";
2164 my $ra = Git
::SVN
::Ra
->new($url);
2165 my $uuid = $ra->get_uuid;
2166 my $head = $ra->get_latest_revnum;
2168 # ignore errors, $head revision may not even exist anymore
2169 eval { $ra->get_log("", $head, 0, 1, 0, 1, sub { $head = $_[1] }) };
2170 warn "W: $@\n" if $@
;
2172 my $base = defined $fetch ?
$head : 0;
2174 # read the max revs for wildcard expansion (branches/*, tags/*)
2175 foreach my $t (qw
/branches tags/) {
2176 defined $remote->{$t} or next;
2177 push @globs, @
{$remote->{$t}};
2179 my $max_rev = eval { tmp_config
(qw
/--int --get/,
2180 "svn-remote.$repo_id.${t}-maxRev") };
2181 if (defined $max_rev && ($max_rev < $base)) {
2183 } elsif (!defined $max_rev) {
2189 foreach my $p (sort keys %$fetch) {
2190 my $gs = Git
::SVN
->new($fetch->{$p}, $repo_id, $p);
2191 my $lr = $gs->rev_map_max;
2193 $base = $lr if ($lr < $base);
2199 ($base, $head) = parse_revision_argument
($base, $head);
2200 $ra->gs_fetch_loop_common($base, $head, \
@gs, \
@globs);
2203 sub read_all_remotes
{
2205 my $use_svm_props = eval { command_oneline
(qw
/config
--bool
2206 svn
.useSvmProps
/) };
2207 $use_svm_props = $use_svm_props eq 'true' if $use_svm_props;
2208 my $svn_refspec = qr{\s*(.*?)\s*:\s*(.+?)\s*};
2209 foreach (grep { s/^svn-remote\.// } command
(qw
/config -l/)) {
2210 if (m!^(.+)\.fetch=$svn_refspec$!) {
2211 my ($remote, $local_ref, $remote_ref) = ($1, $2, $3);
2212 die("svn-remote.$remote: remote ref '$remote_ref' "
2213 . "must start with 'refs/'\n")
2214 unless $remote_ref =~ m{^refs/};
2215 $local_ref = uri_decode
($local_ref);
2216 $r->{$remote}->{fetch
}->{$local_ref} = $remote_ref;
2217 $r->{$remote}->{svm
} = {} if $use_svm_props;
2218 } elsif (m!^(.+)\.usesvmprops=\s*(.*)\s*$!) {
2219 $r->{$1}->{svm
} = {};
2220 } elsif (m!^(.+)\.url=\s*(.*)\s*$!) {
2221 $r->{$1}->{url
} = $2;
2222 } elsif (m!^(.+)\.pushurl=\s*(.*)\s*$!) {
2223 $r->{$1}->{pushurl
} = $2;
2224 } elsif (m!^(.+)\.ignore-refs=\s*(.*)\s*$!) {
2225 $r->{$1}->{ignore_refs_regex
} = $2;
2226 } elsif (m!^(.+)\.(branches|tags)=$svn_refspec$!) {
2227 my ($remote, $t, $local_ref, $remote_ref) =
2229 die("svn-remote.$remote: remote ref '$remote_ref' ($t) "
2230 . "must start with 'refs/'\n")
2231 unless $remote_ref =~ m{^refs/};
2232 $local_ref = uri_decode
($local_ref);
2236 path
=> Git
::SVN
::GlobSpec
->new($local_ref, 1),
2237 ref => Git
::SVN
::GlobSpec
->new($remote_ref, 0) };
2238 if (length($rs->{ref}->{right
}) != 0) {
2239 die "The '*' glob character must be the last ",
2240 "character of '$remote_ref'\n";
2242 push @
{ $r->{$remote}->{$t} }, $rs;
2247 if (defined $r->{$_}->{svm
}) {
2250 my $section = "svn-remote.$_";
2252 source
=> tmp_config
('--get',
2253 "$section.svm-source"),
2254 replace
=> tmp_config
('--get',
2255 "$section.svm-replace"),
2258 $r->{$_}->{svm
} = $svm;
2262 foreach my $remote (keys %$r) {
2263 foreach ( grep { defined $_ }
2264 map { $r->{$remote}->{$_} } qw(branches tags) ) {
2265 foreach my $rs ( @
$_ ) {
2266 $rs->{ignore_refs_regex
} =
2267 $r->{$remote}->{ignore_refs_regex
};
2276 $_gc_nr = $_gc_period = 1000;
2277 if (defined $_repack || defined $_repack_flags) {
2278 warn "Repack options are obsolete; they have no effect.\n";
2282 sub verify_remotes_sanity
{
2283 return unless -d
$ENV{GIT_DIR
};
2285 foreach (command
(qw
/config -l/)) {
2286 if (m!^svn-remote\.(?:.+)\.fetch=.*:refs/remotes/(\S+)\s*$!) {
2288 die "Remote ref refs/remote/$1 is tracked by",
2289 "\n \"$_\"\nand\n \"$seen{$1}\"\n",
2290 "Please resolve this ambiguity in ",
2291 "your git configuration file before ",
2299 sub find_existing_remote
{
2300 my ($url, $remotes) = @_;
2301 return undef if $no_reuse_existing;
2303 foreach my $repo_id (keys %$remotes) {
2304 my $u = $remotes->{$repo_id}->{url
} or next;
2306 $existing = $repo_id;
2312 sub init_remote_config
{
2313 my ($self, $url, $no_write) = @_;
2314 $url =~ s!/+$!!; # strip trailing slash
2315 my $r = read_all_remotes
();
2316 my $existing = find_existing_remote
($url, $r);
2318 unless ($no_write) {
2319 print STDERR
"Using existing ",
2320 "[svn-remote \"$existing\"]\n";
2322 $self->{repo_id
} = $existing;
2323 } elsif ($_minimize_url) {
2324 my $min_url = Git
::SVN
::Ra
->new($url)->minimize_url;
2325 $existing = find_existing_remote
($min_url, $r);
2327 unless ($no_write) {
2328 print STDERR
"Using existing ",
2329 "[svn-remote \"$existing\"]\n";
2331 $self->{repo_id
} = $existing;
2333 if ($min_url ne $url) {
2334 unless ($no_write) {
2335 print STDERR
"Using higher level of URL: ",
2336 "$url => $min_url\n";
2338 my $old_path = $self->{path
};
2339 $self->{path
} = $url;
2340 $self->{path
} =~ s!^\Q$min_url\E(/|$)!!;
2341 if (length $old_path) {
2342 $self->{path
} .= "/$old_path";
2349 # verify that we aren't overwriting anything:
2351 command_oneline
('config', '--get',
2352 "svn-remote.$self->{repo_id}.url")
2354 if ($orig_url && ($orig_url ne $url)) {
2355 die "svn-remote.$self->{repo_id}.url already set: ",
2356 "$orig_url\nwanted to set to: $url\n";
2359 my ($xrepo_id, $xpath) = find_ref
($self->refname);
2360 if (!$no_write && defined $xpath) {
2361 die "svn-remote.$xrepo_id.fetch already set to track ",
2362 "$xpath:", $self->refname, "\n";
2364 unless ($no_write) {
2365 command_noisy
('config',
2366 "svn-remote.$self->{repo_id}.url", $url);
2367 $self->{path
} =~ s{^/}{};
2368 $self->{path
} =~ s{%([0-9A-F]{2})}{chr hex($1)}ieg;
2369 command_noisy
('config', '--add',
2370 "svn-remote.$self->{repo_id}.fetch",
2371 "$self->{path}:".$self->refname);
2373 $self->{url
} = $url;
2376 sub find_by_url
{ # repos_root and, path are optional
2377 my ($class, $full_url, $repos_root, $path) = @_;
2379 return undef unless defined $full_url;
2380 remove_username
($full_url);
2381 remove_username
($repos_root) if defined $repos_root;
2382 my $remotes = read_all_remotes
();
2383 if (defined $full_url && defined $repos_root && !defined $path) {
2385 $path =~ s
#^\Q$repos_root\E(?:/|$)##;
2387 foreach my $repo_id (keys %$remotes) {
2388 my $u = $remotes->{$repo_id}->{url
} or next;
2389 remove_username
($u);
2390 next if defined $repos_root && $repos_root ne $u;
2392 my $fetch = $remotes->{$repo_id}->{fetch
} || {};
2393 foreach my $t (qw
/branches tags/) {
2394 foreach my $globspec (@
{$remotes->{$repo_id}->{$t}}) {
2395 resolve_local_globs
($u, $fetch, $globspec);
2399 my $rwr = rewrite_root
({repo_id
=> $repo_id});
2400 my $svm = $remotes->{$repo_id}->{svm
}
2401 if defined $remotes->{$repo_id}->{svm
};
2402 unless (defined $p) {
2408 remove_username
($z);
2409 } elsif (defined $svm) {
2410 $z = $svm->{source
};
2411 $prefix = $svm->{replace
};
2412 $prefix =~ s
#^\Q$u\E(?:/|$)##;
2415 $p =~ s
#^\Q$z\E(?:/|$)#$prefix# or next;
2417 foreach my $f (keys %$fetch) {
2419 return Git
::SVN
->new($fetch->{$f}, $repo_id, $f);
2426 my ($class, $url, $path, $repo_id, $ref_id, $no_write) = @_;
2427 my $self = _new
($class, $repo_id, $ref_id, $path);
2429 $self->init_remote_config($url, $no_write);
2436 foreach (command
(qw
/config -l/)) {
2437 next unless m
!^svn
-remote\
.(.+)\
.fetch
=
2438 \s
*(.*?
)\s
*:\s
*(.+?
)\s
*$!x
;
2439 my ($repo_id, $path, $ref) = ($1, $2, $3);
2440 if ($ref eq $ref_id) {
2441 $path = '' if ($path =~ m
#^\./?#);
2442 return ($repo_id, $path);
2445 (undef, undef, undef);
2449 my ($class, $ref_id, $repo_id, $path) = @_;
2450 if (defined $ref_id && !defined $repo_id && !defined $path) {
2451 ($repo_id, $path) = find_ref
($ref_id);
2452 if (!defined $repo_id) {
2453 die "Could not find a \"svn-remote.*.fetch\" key ",
2454 "in the repository configuration matching: ",
2458 my $self = _new
($class, $repo_id, $ref_id, $path);
2459 if (!defined $self->{path
} || !length $self->{path
}) {
2460 my $fetch = command_oneline
('config', '--get',
2461 "svn-remote.$repo_id.fetch",
2463 die "Failed to read \"svn-remote.$repo_id.fetch\" ",
2464 "\":$ref_id\$\" in config\n";
2465 ($self->{path
}, undef) = split(/\s*:\s*/, $fetch);
2467 $self->{path
} =~ s{/+}{/}g;
2468 $self->{path
} =~ s{\A/}{};
2469 $self->{path
} =~ s{/\z}{};
2470 $self->{url
} = command_oneline
('config', '--get',
2471 "svn-remote.$repo_id.url") or
2472 die "Failed to read \"svn-remote.$repo_id.url\" in config\n";
2473 $self->{pushurl
} = eval { command_oneline
('config', '--get',
2474 "svn-remote.$repo_id.pushurl") };
2480 my ($refname) = $_[0]->{ref_id
} ;
2482 # It cannot end with a slash /, we'll throw up on this because
2483 # SVN can't have directories with a slash in their name, either:
2484 if ($refname =~ m{/$}) {
2485 die "ref: '$refname' ends with a trailing slash, this is ",
2486 "not permitted by git nor Subversion\n";
2489 # It cannot have ASCII control character space, tilde ~, caret ^,
2490 # colon :, question-mark ?, asterisk *, space, or open bracket [
2493 # Additionally, % must be escaped because it is used for escaping
2494 # and we want our escaped refname to be reversible
2495 $refname =~ s{([ \%~\^:\?\*\[\t])}{uc sprintf('%%%02x',ord($1))}eg;
2497 # no slash-separated component can begin with a dot .
2499 $refname =~ s{/\.}{/%2E}g;
2501 # It cannot have two consecutive dots .. anywhere
2503 $refname =~ s{\.\.}{%2E%2E}g;
2505 # trailing dots and .lock are not allowed
2506 # .$ becomes %2E and .lock becomes %2Elock
2507 $refname =~ s{\.(?=$|lock$)}{%2E};
2509 # the sequence @{ is used to access the reflog
2511 $refname =~ s{\@\{}{%40\{}g;
2516 sub desanitize_refname
{
2518 $refname =~ s{%(?:([0-9A-F]{2}))}{chr hex($1)}eg;
2524 return $self->{svm
}->{uuid
} if $self->svm;
2526 unless ($self->{svm
}) {
2527 die "SVM UUID not cached, and reading remotely failed\n";
2529 $self->{svm
}->{uuid
};
2534 return $self->{svm
} if $self->{svm
};
2536 # see if we have it in our config, first:
2538 my $section = "svn-remote.$self->{repo_id}";
2540 source
=> tmp_config
('--get', "$section.svm-source"),
2541 uuid
=> tmp_config
('--get', "$section.svm-uuid"),
2542 replace
=> tmp_config
('--get', "$section.svm-replace"),
2545 if ($svm && $svm->{source
} && $svm->{uuid
} && $svm->{replace
}) {
2546 $self->{svm
} = $svm;
2552 my ($self, $ra) = @_;
2553 return $ra if $self->svm;
2555 my @err = ( "useSvmProps set, but failed to read SVM properties\n",
2556 "(svm:source, svm:uuid) ",
2557 "from the following URLs:\n" );
2558 sub read_svm_props
{
2559 my ($self, $ra, $path, $r) = @_;
2560 my $props = ($ra->get_dir($path, $r))[2];
2561 my $src = $props->{'svm:source'};
2562 my $uuid = $props->{'svm:uuid'};
2563 return undef if (!$src || !$uuid);
2567 $uuid =~ m{^[0-9a-f\-]{30,}$}i
2568 or die "doesn't look right - svm:uuid is '$uuid'\n";
2570 # the '!' is used to mark the repos_root!/relative/path
2571 $src =~ s{/?!/?}{/};
2572 $src =~ s{/+$}{}; # no trailing slashes please
2573 # username is of no interest
2574 $src =~ s{(^[a-z\+]*://)[^/@]*@}{$1};
2576 my $replace = $ra->{url
};
2577 $replace .= "/$path" if length $path;
2579 my $section = "svn-remote.$self->{repo_id}";
2580 tmp_config
("$section.svm-source", $src);
2581 tmp_config
("$section.svm-replace", $replace);
2582 tmp_config
("$section.svm-uuid", $uuid);
2590 my $r = $ra->get_latest_revnum;
2591 my $path = $self->{path
};
2593 while (length $path) {
2594 unless ($tried{"$self->{url}/$path"}) {
2595 return $ra if $self->read_svm_props($ra, $path, $r);
2596 $tried{"$self->{url}/$path"} = 1;
2598 $path =~ s
#/?[^/]+$##;
2600 die "Path: '$path' should be ''\n" if $path ne '';
2601 return $ra if $self->read_svm_props($ra, $path, $r);
2602 $tried{"$self->{url}/$path"} = 1;
2604 if ($ra->{repos_root
} eq $self->{url
}) {
2605 die @err, (map { " $_\n" } keys %tried), "\n";
2608 # nope, make sure we're connected to the repository root:
2611 $path = $ra->{svn_path
};
2612 $ra = Git
::SVN
::Ra
->new($ra->{repos_root
});
2613 while (length $path) {
2614 unless ($tried{"$ra->{url}/$path"}) {
2615 $ok = $self->read_svm_props($ra, $path, $r);
2617 $tried{"$ra->{url}/$path"} = 1;
2619 $path =~ s
#/?[^/]+$##;
2621 die "Path: '$path' should be ''\n" if $path ne '';
2622 $ok ||= $self->read_svm_props($ra, $path, $r);
2623 $tried{"$ra->{url}/$path"} = 1;
2625 die @err, (map { " $_\n" } keys %tried), "\n";
2627 Git
::SVN
::Ra
->new($self->{url
});
2632 return $self->{svnsync
} if $self->{svnsync
};
2634 if ($self->no_metadata) {
2635 die "Can't have both 'noMetadata' and ",
2636 "'useSvnsyncProps' options set!\n";
2638 if ($self->rewrite_root) {
2639 die "Can't have both 'useSvnsyncProps' and 'rewriteRoot' ",
2642 if ($self->rewrite_uuid) {
2643 die "Can't have both 'useSvnsyncProps' and 'rewriteUUID' ",
2648 # see if we have it in our config, first:
2650 my $section = "svn-remote.$self->{repo_id}";
2652 my $url = tmp_config
('--get', "$section.svnsync-url");
2653 ($url) = ($url =~ m{^([a-z\+]+://\S+)$}) or
2654 die "doesn't look right - svn:sync-from-url is '$url'\n";
2656 my $uuid = tmp_config
('--get', "$section.svnsync-uuid");
2657 ($uuid) = ($uuid =~ m{^([0-9a-f\-]{30,})$}i
) or
2658 die "doesn't look right - svn:sync-from-uuid is '$uuid'\n";
2660 $svnsync = { url
=> $url, uuid
=> $uuid }
2662 if ($svnsync && $svnsync->{url
} && $svnsync->{uuid
}) {
2663 return $self->{svnsync
} = $svnsync;
2666 my $err = "useSvnsyncProps set, but failed to read " .
2667 "svnsync property: svn:sync-from-";
2668 my $rp = $self->ra->rev_proplist(0);
2670 my $url = $rp->{'svn:sync-from-url'} or die $err . "url\n";
2671 ($url) = ($url =~ m{^([a-z\+]+://\S+)$}) or
2672 die "doesn't look right - svn:sync-from-url is '$url'\n";
2674 my $uuid = $rp->{'svn:sync-from-uuid'} or die $err . "uuid\n";
2675 ($uuid) = ($uuid =~ m{^([0-9a-f\-]{30,})$}i
) or
2676 die "doesn't look right - svn:sync-from-uuid is '$uuid'\n";
2678 my $section = "svn-remote.$self->{repo_id}";
2679 tmp_config
('--add', "$section.svnsync-uuid", $uuid);
2680 tmp_config
('--add', "$section.svnsync-url", $url);
2681 return $self->{svnsync
} = { url
=> $url, uuid
=> $uuid };
2684 # this allows us to memoize our SVN::Ra UUID locally and avoid a
2685 # remote lookup (useful for 'git svn log').
2688 unless ($self->{ra_uuid
}) {
2689 my $key = "svn-remote.$self->{repo_id}.uuid";
2690 my $uuid = eval { tmp_config
('--get', $key) };
2691 if (!$@
&& $uuid && $uuid =~ /^([a-f\d\-]{30,})$/i) {
2692 $self->{ra_uuid
} = $uuid;
2694 die "ra_uuid called without URL\n" unless $self->{url
};
2695 $self->{ra_uuid
} = $self->ra->get_uuid;
2696 tmp_config
('--add', $key, $self->{ra_uuid
});
2702 sub _set_repos_root
{
2703 my ($self, $repos_root) = @_;
2704 my $k = "svn-remote.$self->{repo_id}.reposRoot";
2705 $repos_root ||= $self->ra->{repos_root
};
2706 tmp_config
($k, $repos_root);
2712 my $k = "svn-remote.$self->{repo_id}.reposRoot";
2713 eval { tmp_config
('--get', $k) } || $self->_set_repos_root;
2718 my $ra = Git
::SVN
::Ra
->new($self->{url
});
2719 $self->_set_repos_root($ra->{repos_root
});
2720 if ($self->use_svm_props && !$self->{svm
}) {
2721 if ($self->no_metadata) {
2722 die "Can't have both 'noMetadata' and ",
2723 "'useSvmProps' options set!\n";
2724 } elsif ($self->use_svnsync_props) {
2725 die "Can't have both 'useSvnsyncProps' and ",
2726 "'useSvmProps' options set!\n";
2728 $ra = $self->_set_svm_vars($ra);
2729 $self->{-want_revprops
} = 1;
2734 # prop_walk(PATH, REV, SUB)
2735 # -------------------------
2736 # Recursively traverse PATH at revision REV and invoke SUB for each
2737 # directory that contains a SVN property. SUB will be invoked as
2738 # follows: &SUB(gs, path, props); where `gs' is this instance of
2739 # Git::SVN, `path' the path to the directory where the properties
2740 # `props' were found. The `path' will be relative to point of checkout,
2741 # that is, if url://repo/trunk is the current Git branch, and that
2742 # directory contains a sub-directory `d', SUB will be invoked with `/d/'
2743 # as `path' (note the trailing `/').
2745 my ($self, $path, $rev, $sub) = @_;
2748 my ($dirent, undef, $props) = $self->ra->get_dir($path, $rev);
2751 # Strip the irrelevant part of the path.
2752 $p =~ s
#^/+\Q$self->{path}\E(/|$)#/#;
2753 # Ensure the path is terminated by a `/'.
2756 # The properties contain all the internal SVN stuff nobody
2757 # (usually) cares about.
2758 my $interesting_props = 0;
2759 foreach (keys %{$props}) {
2760 # If it doesn't start with `svn:', it must be a
2761 # user-defined property.
2762 ++$interesting_props and next if $_ !~ /^svn:/;
2763 # FIXME: Fragile, if SVN adds new public properties,
2764 # this needs to be updated.
2765 ++$interesting_props if /^svn
:(?
:ignore
|keywords
|executable
2766 |eol
-style
|mime
-type
2767 |externals
|needs
-lock)$/x
;
2769 &$sub($self, $p, $props) if $interesting_props;
2771 foreach (sort keys %$dirent) {
2772 next if $dirent->{$_}->{kind
} != $SVN::Node
::dir
;
2773 $self->prop_walk($self->{path
} . $p . $_, $rev, $sub);
2777 sub last_rev
{ ($_[0]->last_rev_commit)[0] }
2778 sub last_commit
{ ($_[0]->last_rev_commit)[1] }
2780 # returns the newest SVN revision number and newest commit SHA1
2781 sub last_rev_commit
{
2783 if (defined $self->{last_rev
} && defined $self->{last_commit
}) {
2784 return ($self->{last_rev
}, $self->{last_commit
});
2786 my $c = ::verify_ref
($self->refname.'^0');
2787 if ($c && !$self->use_svm_props && !$self->no_metadata) {
2788 my $rev = (::cmt_metadata
($c))[1];
2790 ($self->{last_rev
}, $self->{last_commit
}) = ($rev, $c);
2794 my $map_path = $self->map_path;
2795 unless (-e
$map_path) {
2796 ($self->{last_rev
}, $self->{last_commit
}) = (undef, undef);
2797 return (undef, undef);
2799 my ($rev, $commit) = $self->rev_map_max(1);
2800 ($self->{last_rev
}, $self->{last_commit
}) = ($rev, $commit);
2801 return ($rev, $commit);
2804 sub get_fetch_range
{
2805 my ($self, $min, $max) = @_;
2806 $max ||= $self->ra->get_latest_revnum;
2807 $min ||= $self->rev_map_max;
2813 my $old_def_config = "$ENV{GIT_DIR}/svn/config";
2814 my $config = "$ENV{GIT_DIR}/svn/.metadata";
2815 if (! -f
$config && -f
$old_def_config) {
2816 rename $old_def_config, $config or
2817 die "Failed rename $old_def_config => $config: $!\n";
2819 my $old_config = $ENV{GIT_CONFIG
};
2820 $ENV{GIT_CONFIG
} = $config;
2823 unless (-f
$config) {
2825 open my $fh, '>', $config or
2826 die "Can't open $config: $!\n";
2827 print $fh "; This file is used internally by ",
2829 "Couldn't write to $config: $!\n";
2830 print $fh "; You should not have to edit it\n" or
2831 die "Couldn't write to $config: $!\n";
2832 close $fh or die "Couldn't close $config: $!\n";
2834 command
('config', @args);
2837 if (defined $old_config) {
2838 $ENV{GIT_CONFIG
} = $old_config;
2840 delete $ENV{GIT_CONFIG
};
2843 wantarray ?
@ret : $ret[0];
2847 my ($self, $sub) = @_;
2848 my $old_index = $ENV{GIT_INDEX_FILE
};
2849 $ENV{GIT_INDEX_FILE
} = $self->{index};
2852 my ($dir, $base) = ($self->{index} =~ m
#^(.*?)/?([^/]+)$#);
2853 mkpath
([$dir]) unless -d
$dir;
2857 if (defined $old_index) {
2858 $ENV{GIT_INDEX_FILE
} = $old_index;
2860 delete $ENV{GIT_INDEX_FILE
};
2863 wantarray ?
@ret : $ret[0];
2866 sub assert_index_clean
{
2867 my ($self, $treeish) = @_;
2869 $self->tmp_index_do(sub {
2870 command_noisy
('read-tree', $treeish) unless -e
$self->{index};
2871 my $x = command_oneline
('write-tree');
2872 my ($y) = (command
(qw
/cat-file commit/, $treeish) =~
2873 /^tree ($::sha1)/mo);
2876 warn "Index mismatch: $y != $x\nrereading $treeish\n";
2877 unlink $self->{index} or die "unlink $self->{index}: $!\n";
2878 command_noisy
('read-tree', $treeish);
2879 $x = command_oneline
('write-tree');
2881 ::fatal
"trees ($treeish) $y != $x\n",
2882 "Something is seriously wrong...";
2887 sub get_commit_parents
{
2888 my ($self, $log_entry) = @_;
2889 my (%seen, @ret, @tmp);
2890 # legacy support for 'set-tree'; this is only used by set_tree_cb:
2891 if (my $ip = $self->{inject_parents
}) {
2892 if (my $commit = delete $ip->{$log_entry->{revision
}}) {
2896 if (my $cur = ::verify_ref
($self->refname.'^0')) {
2899 if (my $ipd = $self->{inject_parents_dcommit
}) {
2900 if (my $commit = delete $ipd->{$log_entry->{revision
}}) {
2901 push @tmp, @
$commit;
2904 push @tmp, $_ foreach (@
{$log_entry->{parents
}}, @tmp);
2905 while (my $p = shift @tmp) {
2915 return $self->{-rewrite_root
} if exists $self->{-rewrite_root
};
2916 my $k = "svn-remote.$self->{repo_id}.rewriteRoot";
2917 my $rwr = eval { command_oneline
(qw
/config --get/, $k) };
2920 if ($rwr !~ m
#^[a-z\+]+://#) {
2921 die "$rwr is not a valid URL (key: $k)\n";
2924 $self->{-rewrite_root
} = $rwr;
2929 return $self->{-rewrite_uuid
} if exists $self->{-rewrite_uuid
};
2930 my $k = "svn-remote.$self->{repo_id}.rewriteUUID";
2931 my $rwid = eval { command_oneline
(qw
/config --get/, $k) };
2934 if ($rwid !~ m
#^[a-f0-9]{8}-(?:[a-f0-9]{4}-){3}[a-f0-9]{12}$#) {
2935 die "$rwid is not a valid UUID (key: $k)\n";
2938 $self->{-rewrite_uuid
} = $rwid;
2943 ($self->rewrite_root || $self->{url
}) .
2944 (length $self->{path
} ?
'/' . $self->{path
} : '');
2949 $self->{url
} . (length $self->{path
} ?
'/' . $self->{path
} : '');
2954 if ($self->{pushurl
}) {
2955 return $self->{pushurl
} . (length $self->{path
} ?
'/' .
2956 $self->{path
} : '');
2958 return $self->full_url;
2962 sub set_commit_header_env
{
2963 my ($log_entry) = @_;
2965 foreach my $ned (qw
/NAME EMAIL DATE/) {
2966 foreach my $ac (qw
/AUTHOR COMMITTER/) {
2967 $env{"GIT_${ac}_${ned}"} = $ENV{"GIT_${ac}_${ned}"};
2971 $ENV{GIT_AUTHOR_NAME
} = $log_entry->{name
};
2972 $ENV{GIT_AUTHOR_EMAIL
} = $log_entry->{email
};
2973 $ENV{GIT_AUTHOR_DATE
} = $ENV{GIT_COMMITTER_DATE
} = $log_entry->{date
};
2975 $ENV{GIT_COMMITTER_NAME
} = (defined $log_entry->{commit_name
})
2976 ?
$log_entry->{commit_name
}
2977 : $log_entry->{name
};
2978 $ENV{GIT_COMMITTER_EMAIL
} = (defined $log_entry->{commit_email
})
2979 ?
$log_entry->{commit_email
}
2980 : $log_entry->{email
};
2984 sub restore_commit_header_env
{
2986 foreach my $ned (qw
/NAME EMAIL DATE/) {
2987 foreach my $ac (qw
/AUTHOR COMMITTER/) {
2988 my $k = "GIT_${ac}_${ned}";
2989 if (defined $env->{$k}) {
2990 $ENV{$k} = $env->{$k};
2999 command_noisy
('gc', '--auto');
3003 my ($self, $log_entry) = @_;
3004 my $lr = $self->last_rev;
3005 if (defined $lr && $lr >= $log_entry->{revision
}) {
3006 die "Last fetched revision of ", $self->refname,
3007 " was r$lr, but we are about to fetch: ",
3008 "r$log_entry->{revision}!\n";
3010 if (my $c = $self->rev_map_get($log_entry->{revision
})) {
3011 croak
"$log_entry->{revision} = $c already exists! ",
3012 "Why are we refetching it?\n";
3014 my $old_env = set_commit_header_env
($log_entry);
3015 my $tree = $log_entry->{tree
};
3016 if (!defined $tree) {
3017 $tree = $self->tmp_index_do(sub {
3018 command_oneline
('write-tree') });
3020 die "Tree is not a valid sha1: $tree\n" if $tree !~ /^$::sha1$/o;
3022 my @exec = ('git', 'commit-tree', $tree);
3023 foreach ($self->get_commit_parents($log_entry)) {
3024 push @exec, '-p', $_;
3026 defined(my $pid = open3
(my $msg_fh, my $out_fh, '>&STDERR', @exec))
3030 # we always get UTF-8 from SVN, but we may want our commits in
3031 # a different encoding.
3032 if (my $enc = Git
::config
('i18n.commitencoding')) {
3034 Encode
::from_to
($log_entry->{log}, 'UTF-8', $enc);
3036 print $msg_fh $log_entry->{log} or croak
$!;
3037 restore_commit_header_env
($old_env);
3038 unless ($self->no_metadata) {
3039 print $msg_fh "\ngit-svn-id: $log_entry->{metadata}\n"
3042 $msg_fh->flush == 0 or croak
$!;
3043 close $msg_fh or croak
$!;
3044 chomp(my $commit = do { local $/; <$out_fh> });
3045 close $out_fh or croak
$!;
3048 if ($commit !~ /^$::sha1$/o) {
3049 die "Failed to commit, invalid sha1: $commit\n";
3052 $self->rev_map_set($log_entry->{revision
}, $commit, 1);
3054 $self->{last_rev
} = $log_entry->{revision
};
3055 $self->{last_commit
} = $commit;
3056 print "r$log_entry->{revision}" unless $::_q
> 1;
3057 if (defined $log_entry->{svm_revision
}) {
3058 print " (\@$log_entry->{svm_revision})" unless $::_q
> 1;
3059 $self->rev_map_set($log_entry->{svm_revision
}, $commit,
3060 0, $self->svm_uuid);
3062 print " = $commit ($self->{ref_id})\n" unless $::_q
> 1;
3063 if (--$_gc_nr == 0) {
3064 $_gc_nr = $_gc_period;
3071 my ($self, $paths, $r) = @_;
3072 return 1 if $self->{path
} eq '';
3073 if (my $path = $paths->{"/$self->{path}"}) {
3074 return ($path->{action
} eq 'D') ?
0 : 1;
3076 $self->{path_regex
} ||= qr/^\/\Q
$self->{path
}\E\
//;
3077 if (grep /$self->{path_regex}/, keys %$paths) {
3081 foreach (split m
#/#, $self->{path}) {
3083 next unless ($paths->{$c} &&
3084 ($paths->{$c}->{action
} =~ /^[AR]$/));
3085 if ($self->ra->check_path($self->{path
}, $r) ==
3093 sub find_parent_branch
{
3094 my ($self, $paths, $rev) = @_;
3095 return undef unless $self->follow_parent;
3096 unless (defined $paths) {
3097 my $err_handler = $SVN::Error
::handler
;
3098 $SVN::Error
::handler
= \
&Git
::SVN
::Ra
::skip_unknown_revs
;
3099 $self->ra->get_log([$self->{path
}], $rev, $rev, 0, 1, 1,
3100 sub { $paths = $_[0] });
3101 $SVN::Error
::handler
= $err_handler;
3103 return undef unless defined $paths;
3105 # look for a parent from another branch:
3106 my @b_path_components = split m
#/#, $self->{path};
3107 my @a_path_components;
3109 while (@b_path_components) {
3110 $i = $paths->{'/'.join('/', @b_path_components)};
3111 last if $i && defined $i->{copyfrom_path
};
3112 unshift(@a_path_components, pop(@b_path_components));
3114 return undef unless defined $i && defined $i->{copyfrom_path
};
3115 my $branch_from = $i->{copyfrom_path
};
3116 if (@a_path_components) {
3117 print STDERR
"branch_from: $branch_from => ";
3118 $branch_from .= '/'.join('/', @a_path_components);
3119 print STDERR
$branch_from, "\n";
3121 my $r = $i->{copyfrom_rev
};
3122 my $repos_root = $self->ra->{repos_root
};
3123 my $url = $self->ra->{url
};
3124 my $new_url = $url . $branch_from;
3125 print STDERR
"Found possible branch point: ",
3126 "$new_url => ", $self->full_url, ", $r\n"
3128 $branch_from =~ s
#^/##;
3129 my $gs = $self->other_gs($new_url, $url,
3130 $branch_from, $r, $self->{ref_id
});
3131 my ($r0, $parent) = $gs->find_rev_before($r, 1);
3134 if (!defined $r0 || !defined $parent) {
3135 ($base, $head) = parse_revision_argument
(0, $r);
3138 $gs->ra->get_log([$gs->{path
}], $r0 + 1, $r, 1,
3139 0, 1, sub { $base = $_[1] - 1 });
3142 if (defined $base && $base <= $r) {
3143 $gs->fetch($base, $r);
3145 ($r0, $parent) = $gs->find_rev_before($r, 1);
3147 if (defined $r0 && defined $parent) {
3148 print STDERR
"Found branch parent: ($self->{ref_id}) $parent\n"
3151 if ($self->ra->can_do_switch) {
3152 $self->assert_index_clean($parent);
3153 print STDERR
"Following parent with do_switch\n"
3155 # do_switch works with svn/trunk >= r22312, but that
3156 # is not included with SVN 1.4.3 (the latest version
3157 # at the moment), so we can't rely on it
3158 $self->{last_rev
} = $r0;
3159 $self->{last_commit
} = $parent;
3160 $ed = SVN
::Git
::Fetcher
->new($self, $gs->{path
});
3161 $gs->ra->gs_do_switch($r0, $rev, $gs,
3162 $self->full_url, $ed)
3163 or die "SVN connection failed somewhere...\n";
3164 } elsif ($self->ra->trees_match($new_url, $r0,
3165 $self->full_url, $rev)) {
3166 print STDERR
"Trees match:\n",
3168 " ${\$self->full_url}\@$rev\n",
3169 "Following parent with no changes\n"
3171 $self->tmp_index_do(sub {
3172 command_noisy
('read-tree', $parent);
3174 $self->{last_commit
} = $parent;
3176 print STDERR
"Following parent with do_update\n"
3178 $ed = SVN
::Git
::Fetcher
->new($self);
3179 $self->ra->gs_do_update($rev, $rev, $self, $ed)
3180 or die "SVN connection failed somewhere...\n";
3182 print STDERR
"Successfully followed parent\n" unless $::_q
> 1;
3183 return $self->make_log_entry($rev, [$parent], $ed);
3189 my ($self, $paths, $rev) = @_;
3191 my ($last_rev, @parents);
3192 if (my $lc = $self->last_commit) {
3193 # we can have a branch that was deleted, then re-added
3194 # under the same name but copied from another path, in
3195 # which case we'll have multiple parents (we don't
3196 # want to break the original ref, nor lose copypath info):
3197 if (my $log_entry = $self->find_parent_branch($paths, $rev)) {
3198 push @
{$log_entry->{parents
}}, $lc;
3201 $ed = SVN
::Git
::Fetcher
->new($self);
3202 $last_rev = $self->{last_rev
};
3207 if (my $log_entry = $self->find_parent_branch($paths, $rev)) {
3210 $ed = SVN
::Git
::Fetcher
->new($self);
3212 unless ($self->ra->gs_do_update($last_rev, $rev, $self, $ed)) {
3213 die "SVN connection failed somewhere...\n";
3215 $self->make_log_entry($rev, \
@parents, $ed);
3219 my ($self, $r) = @_;
3222 my ($r, $empty_dirs, $line) = @_;
3223 if (defined $r && $line =~ /^r(\d+)$/) {
3224 return 0 if $1 > $r;
3225 } elsif ($line =~ /^ \+empty_dir: (.+)$/) {
3226 $empty_dirs->{$1} = 1;
3227 } elsif ($line =~ /^ \-empty_dir: (.+)$/) {
3228 my @d = grep {m
[^\Q
$1\E
(/|$)]} (keys %$empty_dirs);
3229 delete @
$empty_dirs{@d};
3234 my %empty_dirs = ();
3235 my $gz_file = "$self->{dir}/unhandled.log.gz";
3237 if (!$can_compress) {
3238 warn "Compress::Zlib could not be found; ",
3239 "empty directories in $gz_file will not be read\n";
3241 my $gz = Compress
::Zlib
::gzopen
($gz_file, "rb") or
3242 die "Unable to open $gz_file: $!\n";
3244 while ($gz->gzreadline($line) > 0) {
3245 scan
($r, \
%empty_dirs, $line) or last;
3251 if (open my $fh, '<', "$self->{dir}/unhandled.log") {
3252 binmode $fh or croak
"binmode: $!";
3254 scan
($r, \
%empty_dirs, $_) or last;
3259 my $strip = qr/\A\Q$self->{path}\E(?:\/|$)/;
3260 foreach my $d (sort keys %empty_dirs) {
3261 $d = uri_decode
($d);
3263 next unless length($d);
3266 warn "$d exists but is not a directory\n";
3268 print "creating empty directory: $d\n";
3275 my ($self, $ed) = @_;
3277 my $h = $ed->{empty
};
3278 foreach (sort keys %$h) {
3279 my $act = $h->{$_} ?
'+empty_dir' : '-empty_dir';
3280 push @out, " $act: " . uri_encode
($_);
3281 warn "W: $act: $_\n";
3283 foreach my $t (qw
/dir_prop file_prop/) {
3284 $h = $ed->{$t} or next;
3285 foreach my $path (sort keys %$h) {
3286 my $ppath = $path eq '' ?
'.' : $path;
3287 foreach my $prop (sort keys %{$h->{$path}}) {
3288 next if $SKIP_PROP{$prop};
3289 my $v = $h->{$path}->{$prop};
3290 my $t_ppath_prop = "$t: " .
3291 uri_encode
($ppath) . ' ' .
3294 push @out, " +$t_ppath_prop " .
3297 push @out, " -$t_ppath_prop";
3302 foreach my $t (qw
/absent_file absent_directory/) {
3303 $h = $ed->{$t} or next;
3304 foreach my $parent (sort keys %$h) {
3305 foreach my $path (sort @
{$h->{$parent}}) {
3306 push @out, " $t: " .
3307 uri_encode
("$parent/$path");
3308 warn "W: $t: $parent/$path ",
3309 "Insufficient permissions?\n";
3317 # some systmes don't handle or mishandle %z, so be creative.
3318 my $t = shift || time;
3319 my $gm = timelocal
(gmtime($t));
3320 my $sign = qw( + + - )[ $t <=> $gm ];
3321 return sprintf("%s%02d%02d", $sign, (gmtime(abs($t - $gm)))[2,1]);
3324 # parse_svn_date(DATE)
3325 # --------------------
3326 # Given a date (in UTC) from Subversion, return a string in the format
3327 # "<TZ Offset> <local date/time>" that Git will use.
3329 # By default the parsed date will be in UTC; if $Git::SVN::_localtime
3330 # is true we'll convert it to the local timezone instead.
3331 sub parse_svn_date
{
3332 my $date = shift || return '+0000 1970-01-01 00:00:00';
3333 my ($Y,$m,$d,$H,$M,$S) = ($date =~ /^(\d
{4})\
-(\d\d
)\
-(\d\d
)T
3334 (\d\d
)\
:(\d\d
)\
:(\d\d
)\
.\d
*Z
$/x
) or
3335 croak
"Unable to parse date: $date\n";
3336 my $parsed_date; # Set next.
3338 if ($Git::SVN
::_localtime
) {
3339 # Translate the Subversion datetime to an epoch time.
3340 # Begin by switching ourselves to $date's timezone, UTC.
3341 my $old_env_TZ = $ENV{TZ
};
3345 POSIX
::strftime
('%s', $S, $M, $H, $d, $m - 1, $Y - 1900);
3347 # Determine our local timezone (including DST) at the
3348 # time of $epoch_in_UTC. $Git::SVN::Log::TZ stored the
3349 # value of TZ, if any, at the time we were run.
3350 if (defined $Git::SVN
::Log
::TZ
) {
3351 $ENV{TZ
} = $Git::SVN
::Log
::TZ
;
3356 my $our_TZ = get_tz
();
3358 # This converts $epoch_in_UTC into our local timezone.
3359 my ($sec, $min, $hour, $mday, $mon, $year,
3360 $wday, $yday, $isdst) = localtime($epoch_in_UTC);
3362 $parsed_date = sprintf('%s %04d-%02d-%02d %02d:%02d:%02d',
3363 $our_TZ, $year + 1900, $mon + 1,
3364 $mday, $hour, $min, $sec);
3366 # Reset us to the timezone in effect when we entered
3368 if (defined $old_env_TZ) {
3369 $ENV{TZ
} = $old_env_TZ;
3374 $parsed_date = "+0000 $Y-$m-$d $H:$M:$S";
3377 return $parsed_date;
3381 my ($self, $new_url, $url,
3382 $branch_from, $r, $old_ref_id) = @_;
3383 my $gs = Git
::SVN
->find_by_url($new_url, $url, $branch_from);
3385 my $ref_id = $old_ref_id;
3386 $ref_id =~ s/\@\d+-*$//;
3388 # just grow a tail if we're not unique enough :x
3389 $ref_id .= '-' while find_ref
($ref_id);
3390 my ($u, $p, $repo_id) = ($new_url, '', $ref_id);
3391 if ($u =~ s
#^\Q$url\E(/|$)##) {
3394 $repo_id = $self->{repo_id
};
3397 # It is possible to tag two different subdirectories at
3398 # the same revision. If the url for an existing ref
3399 # does not match, we must either find a ref with a
3400 # matching url or create a new ref by growing a tail.
3401 $gs = Git
::SVN
->init($u, $p, $repo_id, $ref_id, 1);
3402 my (undef, $max_commit) = $gs->rev_map_max(1);
3403 last if (!$max_commit);
3404 my ($url) = ::cmt_metadata
($max_commit);
3405 last if ($url eq $gs->metadata_url);
3408 print STDERR
"Initializing parent: $ref_id\n" unless $::_q
> 1;
3413 sub call_authors_prog
{
3414 my ($orig_author) = @_;
3415 $orig_author = command_oneline
('rev-parse', '--sq-quote', $orig_author);
3416 my $author = `$::_authors_prog $orig_author`;
3418 die "$::_authors_prog failed with exit code $?\n"
3420 if ($author =~ /^\s*(.+?)\s*<(.*)>\s*$/) {
3421 my ($name, $email) = ($1, $2);
3422 $email = undef if length $2 == 0;
3423 return [$name, $email];
3425 die "Author: $orig_author: $::_authors_prog returned "
3426 . "invalid author format: $author\n";
3432 if (!defined $author || length $author == 0) {
3433 $author = '(no author)';
3435 if (!defined $::users
{$author}) {
3436 if (defined $::_authors_prog
) {
3437 $::users
{$author} = call_authors_prog
($author);
3438 } elsif (defined $::_authors
) {
3439 die "Author: $author not defined in $::_authors file\n";
3445 sub find_extra_svk_parents
{
3446 my ($self, $ed, $tickets, $parents) = @_;
3447 # aha! svk:merge property changed...
3448 my @tickets = split "\n", $tickets;
3450 for my $ticket ( @tickets ) {
3451 my ($uuid, $path, $rev) = split /:/, $ticket;
3452 if ( $uuid eq $self->ra_uuid ) {
3453 my $url = $self->{url
};
3454 my $repos_root = $url;
3455 my $branch_from = $path;
3456 $branch_from =~ s{^/}{};
3457 my $gs = $self->other_gs($repos_root."/".$branch_from,
3462 if ( my $commit = $gs->rev_map_get($rev, $uuid) ) {
3463 # wahey! we found it, but it might be
3465 push @known_parents, [ $rev, $commit ];
3469 # Ordering matters; highest-numbered commit merge tickets
3470 # first, as they may account for later merge ticket additions
3472 @known_parents = map {$_->[1]} sort {$b->[0] <=> $a->[0]} @known_parents;
3473 for my $parent ( @known_parents ) {
3474 my @cmd = ('rev-list', $parent, map { "^$_" } @
$parents );
3475 my ($msg_fh, $ctx) = command_output_pipe
(@cmd);
3477 while ( <$msg_fh> ) {
3480 command_close_pipe
($msg_fh, $ctx);
3483 "Found merge parent (svk:merge ticket): $parent\n";
3484 push @
$parents, $parent;
3489 sub lookup_svn_merge
{
3494 my ($source, $revs) = split ":", $merge;
3497 my $gs = Git
::SVN
->find_by_url($url.$source, $url, $path);
3499 warn "Couldn't find revmap for $url$source\n";
3502 my @ranges = split ",", $revs;
3503 my ($tip, $tip_commit);
3504 my @merged_commit_ranges;
3506 for my $range ( @ranges ) {
3507 my ($bottom, $top) = split "-", $range;
3509 my $bottom_commit = $gs->find_rev_after( $bottom, 1, $top );
3510 my $top_commit = $gs->find_rev_before( $top, 1, $bottom );
3512 unless ($top_commit and $bottom_commit) {
3513 warn "W:unknown path/rev in svn:mergeinfo "
3514 ."dirprop: $source:$range\n";
3518 if (scalar(command
('rev-parse', "$bottom_commit^@"))) {
3519 push @merged_commit_ranges,
3520 "$bottom_commit^..$top_commit";
3522 push @merged_commit_ranges, "$top_commit";
3525 if ( !defined $tip or $top > $tip ) {
3527 $tip_commit = $top_commit;
3530 return ($tip_commit, @merged_commit_ranges);
3534 my ($msg_fh, $ctx) = command_output_pipe
(
3538 while ( <$msg_fh> ) {
3542 command_close_pipe
($msg_fh, $ctx);
3546 sub check_cherry_pick
{
3549 my $parents = shift;
3551 my %commits = map { $_ => 1 }
3552 _rev_list
("--no-merges", $tip, "--not", $base, @
$parents, "--");
3553 for my $range ( @ranges ) {
3554 delete @commits{_rev_list
($range, "--")};
3556 for my $commit (keys %commits) {
3557 if (has_no_changes
($commit)) {
3558 delete $commits{$commit};
3561 return (keys %commits);
3564 sub has_no_changes
{
3567 my @revs = split / /, command_oneline
(
3568 qw(rev-list --parents -1 -m), $commit);
3570 # Commits with no parents, e.g. the start of a partial branch,
3571 # have changes by definition.
3572 return 1 if (@revs < 2);
3574 # Commits with multiple parents, e.g a merge, have no changes
3576 return 0 if (@revs > 2);
3578 return (command_oneline
("rev-parse", "$commit^{tree}") eq
3579 command_oneline
("rev-parse", "$commit~1^{tree}"));
3582 # The GIT_DIR environment variable is not always set until after the command
3583 # line arguments are processed, so we can't memoize in a BEGIN block.
3587 sub memoize_svn_mergeinfo_functions
{
3588 return if $memoized;
3591 my $cache_path = "$ENV{GIT_DIR}/svn/.caches/";
3592 mkpath
([$cache_path]) unless -d
$cache_path;
3594 tie
my %lookup_svn_merge_cache => 'Memoize::Storable',
3595 "$cache_path/lookup_svn_merge.db", 'nstore';
3596 memoize
'lookup_svn_merge',
3597 SCALAR_CACHE
=> 'FAULT',
3598 LIST_CACHE
=> ['HASH' => \
%lookup_svn_merge_cache],
3601 tie
my %check_cherry_pick_cache => 'Memoize::Storable',
3602 "$cache_path/check_cherry_pick.db", 'nstore';
3603 memoize
'check_cherry_pick',
3604 SCALAR_CACHE
=> 'FAULT',
3605 LIST_CACHE
=> ['HASH' => \
%check_cherry_pick_cache],
3608 tie
my %has_no_changes_cache => 'Memoize::Storable',
3609 "$cache_path/has_no_changes.db", 'nstore';
3610 memoize
'has_no_changes',
3611 SCALAR_CACHE
=> ['HASH' => \
%has_no_changes_cache],
3612 LIST_CACHE
=> 'FAULT',
3616 sub unmemoize_svn_mergeinfo_functions
{
3617 return if not $memoized;
3620 Memoize
::unmemoize
'lookup_svn_merge';
3621 Memoize
::unmemoize
'check_cherry_pick';
3622 Memoize
::unmemoize
'has_no_changes';
3625 Memoize
::memoize
'Git::SVN::repos_root';
3629 # Force cache writeout explicitly instead of waiting for
3630 # global destruction to avoid segfault in Storable:
3631 # http://rt.cpan.org/Public/Bug/Display.html?id=36087
3632 unmemoize_svn_mergeinfo_functions
();
3635 sub parents_exclude
{
3636 my $parents = shift;
3638 return unless @commits;
3643 my @cmd = ('rev-list', "-1", @commits, "--not", @
$parents );
3644 $excluded = command_oneline
(@cmd);
3648 for my $commit ( @commits ) {
3649 if ( $commit eq $excluded ) {
3650 push @excluded, $commit;
3658 die "saw commit '$excluded' in rev-list output, "
3659 ."but we didn't ask for that commit (wanted: @commits --not @$parents)"
3664 while ($excluded and @commits);
3670 # note: this function should only be called if the various dirprops
3671 # have actually changed
3672 sub find_extra_svn_parents
{
3673 my ($self, $ed, $mergeinfo, $parents) = @_;
3674 # aha! svk:merge property changed...
3676 memoize_svn_mergeinfo_functions
();
3678 # We first search for merged tips which are not in our
3679 # history. Then, we figure out which git revisions are in
3680 # that tip, but not this revision. If all of those revisions
3681 # are now marked as merge, we can add the tip as a parent.
3682 my @merges = split "\n", $mergeinfo;
3684 my $url = $self->{url
};
3685 my $uuid = $self->ra_uuid;
3687 for my $merge ( @merges ) {
3688 my ($tip_commit, @ranges) =
3689 lookup_svn_merge
( $uuid, $url, $merge );
3690 unless (!$tip_commit or
3691 grep { $_ eq $tip_commit } @
$parents ) {
3692 push @merge_tips, $tip_commit;
3693 $ranges{$tip_commit} = \
@ranges;
3695 push @merge_tips, undef;
3699 my %excluded = map { $_ => 1 }
3700 parents_exclude
($parents, grep { defined } @merge_tips);
3702 # check merge tips for new parents
3704 for my $merge_tip ( @merge_tips ) {
3705 my $spec = shift @merges;
3706 next unless $merge_tip and $excluded{$merge_tip};
3708 my $ranges = $ranges{$merge_tip};
3710 # check out 'new' tips
3713 $merge_base = command_oneline
(
3715 @
$parents, $merge_tip,
3719 die "An error occurred during merge-base"
3720 unless $@
->isa("Git::Error::Command");
3722 warn "W: Cannot find common ancestor between ".
3723 "@$parents and $merge_tip. Ignoring merge info.\n";
3727 # double check that there are no missing non-merge commits
3728 my (@incomplete) = check_cherry_pick
(
3729 $merge_base, $merge_tip,
3734 if ( @incomplete ) {
3735 warn "W:svn cherry-pick ignored ($spec) - missing "
3736 .@incomplete." commit(s) (eg $incomplete[0])\n";
3739 "Found merge parent (svn:mergeinfo prop): ",
3741 push @new_parents, $merge_tip;
3745 # cater for merges which merge commits from multiple branches
3746 if ( @new_parents > 1 ) {
3747 for ( my $i = 0; $i <= $#new_parents; $i++ ) {
3748 for ( my $j = 0; $j <= $#new_parents; $j++ ) {
3750 next unless $new_parents[$i];
3751 next unless $new_parents[$j];
3752 my $revs = command_oneline
(
3754 "$new_parents[$i]..$new_parents[$j]",
3757 undef($new_parents[$j]);
3762 push @
$parents, grep { defined } @new_parents;
3765 sub make_log_entry
{
3766 my ($self, $rev, $parents, $ed) = @_;
3767 my $untracked = $self->get_untracked($ed);
3769 my @parents = @
$parents;
3770 my $ps = $ed->{path_strip
} || "";
3771 for my $path ( grep { m/$ps/ } %{$ed->{dir_prop
}} ) {
3772 my $props = $ed->{dir_prop
}{$path};
3773 if ( $props->{"svk:merge"} ) {
3774 $self->find_extra_svk_parents
3775 ($ed, $props->{"svk:merge"}, \
@parents);
3777 if ( $props->{"svn:mergeinfo"} ) {
3778 $self->find_extra_svn_parents
3780 $props->{"svn:mergeinfo"},
3785 open my $un, '>>', "$self->{dir}/unhandled.log" or croak
$!;
3786 print $un "r$rev\n" or croak
$!;
3787 print $un $_, "\n" foreach @
$untracked;
3788 my %log_entry = ( parents
=> \
@parents, revision
=> $rev,
3792 my $logged = delete $self->{logged_rev_props
};
3793 if (!$logged || $self->{-want_revprops
}) {
3794 my $rp = $self->ra->rev_proplist($rev);
3795 foreach (sort keys %$rp) {
3797 if (/^svn:(author|date|log)$/) {
3798 $log_entry{$1} = $v;
3799 } elsif ($_ eq 'svm:headrev') {
3802 print $un " rev_prop: ", uri_encode
($_), ' ',
3803 uri_encode
($v), "\n";
3807 map { $log_entry{$_} = $logged->{$_} } keys %$logged;
3809 close $un or croak
$!;
3811 $log_entry{date
} = parse_svn_date
($log_entry{date
});
3812 $log_entry{log} .= "\n";
3813 my $author = $log_entry{author
} = check_author
($log_entry{author
});
3814 my ($name, $email) = defined $::users
{$author} ? @
{$::users
{$author}}
3817 my ($commit_name, $commit_email) = ($name, $email);
3818 if ($_use_log_author) {
3820 if ($log_entry{log} =~ /From:\s+(.*\S)\s*\n/i) {
3822 } elsif ($log_entry{log} =~ /Signed-off-by:\s+(.*\S)\s*\n/i) {
3825 if (!defined $name_field) {
3826 if (!defined $email) {
3829 } elsif ($name_field =~ /(.*?)\s+<(.*)>/) {
3830 ($name, $email) = ($1, $2);
3831 } elsif ($name_field =~ /(.*)@/) {
3832 ($name, $email) = ($1, $name_field);
3834 ($name, $email) = ($name_field, $name_field);
3837 if (defined $headrev && $self->use_svm_props) {
3838 if ($self->rewrite_root) {
3839 die "Can't have both 'useSvmProps' and 'rewriteRoot' ",
3842 if ($self->rewrite_uuid) {
3843 die "Can't have both 'useSvmProps' and 'rewriteUUID' ",
3846 my ($uuid, $r) = $headrev =~ m{^([a-f\d\-]{30,}):(\d
+)$}i
;
3847 # we don't want "SVM: initializing mirror for junk" ...
3848 return undef if $r == 0;
3849 my $svm = $self->svm;
3850 if ($uuid ne $svm->{uuid
}) {
3851 die "UUID mismatch on SVM path:\n",
3852 "expected: $svm->{uuid}\n",
3855 my $full_url = $self->full_url;
3856 $full_url =~ s
#^\Q$svm->{replace}\E(/|$)#$svm->{source}$1# or
3857 die "Failed to replace '$svm->{replace}' with ",
3858 "'$svm->{source}' in $full_url\n";
3859 # throw away username for storing in records
3860 remove_username
($full_url);
3861 $log_entry{metadata
} = "$full_url\@$r $uuid";
3862 $log_entry{svm_revision
} = $r;
3863 $email ||= "$author\@$uuid";
3864 $commit_email ||= "$author\@$uuid";
3865 } elsif ($self->use_svnsync_props) {
3866 my $full_url = $self->svnsync->{url
};
3867 $full_url .= "/$self->{path}" if length $self->{path
};
3868 remove_username
($full_url);
3869 my $uuid = $self->svnsync->{uuid
};
3870 $log_entry{metadata
} = "$full_url\@$rev $uuid";
3871 $email ||= "$author\@$uuid";
3872 $commit_email ||= "$author\@$uuid";
3874 my $url = $self->metadata_url;
3875 remove_username
($url);
3876 my $uuid = $self->rewrite_uuid || $self->ra->get_uuid;
3877 $log_entry{metadata
} = "$url\@$rev " . $uuid;
3878 $email ||= "$author\@" . $uuid;
3879 $commit_email ||= "$author\@" . $uuid;
3881 $log_entry{name
} = $name;
3882 $log_entry{email
} = $email;
3883 $log_entry{commit_name
} = $commit_name;
3884 $log_entry{commit_email
} = $commit_email;
3889 my ($self, $min_rev, $max_rev, @parents) = @_;
3890 my ($last_rev, $last_commit) = $self->last_rev_commit;
3891 my ($base, $head) = $self->get_fetch_range($min_rev, $max_rev);
3892 $self->ra->gs_fetch_loop_common($base, $head, [$self]);
3896 my ($self, $log_entry, $tree, $rev, $date, $author) = @_;
3897 $self->{inject_parents
} = { $rev => $tree };
3898 $self->fetch(undef, undef);
3902 my ($self, $tree) = (shift, shift);
3903 my $log_entry = ::get_commit_entry
($tree);
3904 unless ($self->{last_rev
}) {
3905 ::fatal
("Must have an existing revision to commit");
3907 my %ed_opts = ( r
=> $self->{last_rev
},
3908 log => $log_entry->{log},
3910 tree_a
=> $self->{last_commit
},
3913 $self->set_tree_cb($log_entry, $tree, @_) },
3914 svn_path
=> $self->{path
} );
3915 if (!SVN
::Git
::Editor
->new(\
%ed_opts)->apply_diff) {
3916 print "No changes\nr$self->{last_rev} = $tree\n";
3920 sub rebuild_from_rev_db
{
3921 my ($self, $path) = @_;
3923 open my $fh, '<', $path or croak
"open: $!";
3924 binmode $fh or croak
"binmode: $!";
3926 length($_) == 41 or croak
"inconsistent size in ($_) != 41";
3929 next if $_ eq ('0' x
40);
3930 $self->rev_map_set($r, $_);
3933 close $fh or croak
"close: $!";
3934 unlink $path or croak
"unlink: $!";
3939 my $map_path = $self->map_path;
3940 my $partial = (-e
$map_path && ! -z
$map_path);
3941 return unless ::verify_ref
($self->refname.'^0');
3942 if (!$partial && ($self->use_svm_props || $self->no_metadata)) {
3943 my $rev_db = $self->rev_db_path;
3944 $self->rebuild_from_rev_db($rev_db);
3945 if ($self->use_svm_props) {
3946 my $svm_rev_db = $self->rev_db_path($self->svm_uuid);
3947 $self->rebuild_from_rev_db($svm_rev_db);
3949 $self->unlink_rev_db_symlink;
3952 print "Rebuilding $map_path ...\n" if (!$partial);
3953 my ($base_rev, $head) = ($partial ?
$self->rev_map_max_norebuild(1) :
3956 command_output_pipe
(qw
/rev-list --pretty=raw --reverse/,
3957 ($head ?
"$head.." : "") . $self->refname,
3959 my $metadata_url = $self->metadata_url;
3960 remove_username
($metadata_url);
3961 my $svn_uuid = $self->rewrite_uuid || $self->ra_uuid;
3964 if ( m{^commit ($::sha1)$} ) {
3968 next unless s{^\s*(git-svn-id:)}{$1};
3969 my ($url, $rev, $uuid) = ::extract_metadata
($_);
3970 remove_username
($url);
3972 # ignore merges (from set-tree)
3973 next if (!defined $rev || !$uuid);
3975 # if we merged or otherwise started elsewhere, this is
3976 # how we break out of it
3977 if (($uuid ne $svn_uuid) ||
3978 ($metadata_url && $url && ($url ne $metadata_url))) {
3981 if ($partial && $head) {
3982 print "Partial-rebuilding $map_path ...\n";
3983 print "Currently at $base_rev = $head\n";
3987 $self->rev_map_set($rev, $c);
3988 print "r$rev = $c\n";
3990 command_close_pipe
($log, $ctx);
3991 print "Done rebuilding $map_path\n" if (!$partial || !$head);
3992 my $rev_db_path = $self->rev_db_path;
3993 if (-f
$self->rev_db_path) {
3994 unlink $self->rev_db_path or croak
"unlink: $!";
3996 $self->unlink_rev_db_symlink;
4000 # Tie::File seems to be prone to offset errors if revisions get sparse,
4001 # it's not that fast, either. Tie::File is also not in Perl 5.6. So
4002 # one of my favorite modules is out :< Next up would be one of the DBM
4003 # modules, but I'm not sure which is most portable...
4005 # This is the replacement for the rev_db format, which was too big
4006 # and inefficient for large repositories with a lot of sparse history
4009 # The format is this:
4010 # - 24 bytes for every record,
4011 # * 4 bytes for the integer representing an SVN revision number
4012 # * 20 bytes representing the sha1 of a git commit
4013 # - No empty padding records like the old format
4014 # (except the last record, which can be overwritten)
4015 # - new records are written append-only since SVN revision numbers
4016 # increase monotonically
4017 # - lookups on SVN revision number are done via a binary search
4018 # - Piping the file to xxd -c24 is a good way of dumping it for
4019 # viewing or editing (piped back through xxd -r), should the need
4021 # - The last record can be padding revision with an all-zero sha1
4022 # This is used to optimize fetch performance when using multiple
4023 # "fetch" directives in .git/config
4025 # These files are disposable unless noMetadata or useSvmProps is set
4028 my ($fh, $rev, $commit) = @_;
4030 binmode $fh or croak
"binmode: $!";
4031 my $size = (stat($fh))[7];
4032 ($size % 24) == 0 or croak
"inconsistent size: $size";
4036 sysseek($fh, -24, SEEK_END
) or croak
"seek: $!";
4037 my $read = sysread($fh, my $buf, 24) or croak
"read: $!";
4038 $read == 24 or croak
"read only $read bytes (!= 24)";
4039 my ($last_rev, $last_commit) = unpack(rev_map_fmt
, $buf);
4040 if ($last_commit eq ('0' x40
)) {
4042 sysseek($fh, -48, SEEK_END
) or croak
"seek: $!";
4043 $read = sysread($fh, $buf, 24) or
4046 croak
"read only $read bytes (!= 24)";
4047 ($last_rev, $last_commit) =
4048 unpack(rev_map_fmt
, $buf);
4049 if ($last_commit eq ('0' x40
)) {
4050 croak
"inconsistent .rev_map\n";
4053 if ($last_rev >= $rev) {
4054 croak
"last_rev is higher!: $last_rev >= $rev";
4059 sysseek($fh, $wr_offset, SEEK_END
) or croak
"seek: $!";
4060 syswrite($fh, pack(rev_map_fmt
, $rev, $commit), 24) == 24 or
4064 sub _rev_map_reset
{
4065 my ($fh, $rev, $commit) = @_;
4066 my $c = _rev_map_get
($fh, $rev);
4067 $c eq $commit or die "_rev_map_reset(@_) commit $c does not match!\n";
4068 my $offset = sysseek($fh, 0, SEEK_CUR
) or croak
"seek: $!";
4069 truncate $fh, $offset or croak
"truncate: $!";
4075 my ($dir, $base) = ($path =~ m
#^(.*?)/?([^/]+)$#);
4076 mkpath
([$dir]) unless -d
$dir;
4077 open my $fh, '>>', $path or die "Couldn't create $path: $!\n";
4078 close $fh or die "Couldn't close (create) $path: $!\n";
4083 my ($self, $rev, $commit, $update_ref, $uuid) = @_;
4084 defined $commit or die "missing arg3\n";
4085 length $commit == 40 or die "arg3 must be a full SHA1 hexsum\n";
4086 my $db = $self->map_path($uuid);
4087 my $db_lock = "$db.lock";
4091 $sigmask = POSIX
::SigSet
->new();
4092 my $signew = POSIX
::SigSet
->new(SIGINT
, SIGHUP
, SIGTERM
,
4093 SIGALRM
, SIGUSR1
, SIGUSR2
);
4094 sigprocmask
(SIG_BLOCK
, $signew, $sigmask) or
4095 croak
"Can't block signals: $!";
4099 $LOCKFILES{$db_lock} = 1;
4101 # both of these options make our .rev_db file very, very important
4102 # and we can't afford to lose it because rebuild() won't work
4103 if ($self->use_svm_props || $self->no_metadata) {
4105 copy
($db, $db_lock) or die "rev_map_set(@_): ",
4107 "$db => $db_lock ($!)\n";
4109 rename $db, $db_lock or die "rev_map_set(@_): ",
4110 "Failed to rename: ",
4111 "$db => $db_lock ($!)\n";
4114 sysopen(my $fh, $db_lock, O_RDWR
| O_CREAT
)
4115 or croak
"Couldn't open $db_lock: $!\n";
4116 $update_ref eq 'reset' ? _rev_map_reset
($fh, $rev, $commit) :
4117 _rev_map_set
($fh, $rev, $commit);
4119 $fh->flush or die "Couldn't flush $db_lock: $!\n";
4120 $fh->sync or die "Couldn't sync $db_lock: $!\n";
4122 close $fh or croak
$!;
4126 $note = " ($update_ref)" if ($update_ref !~ /^\d*$/);
4127 command_noisy
('update-ref', '-m', "r$rev$note",
4128 $self->refname, $commit);
4130 rename $db_lock, $db or die "rev_map_set(@_): ", "Failed to rename: ",
4131 "$db_lock => $db ($!)\n";
4132 delete $LOCKFILES{$db_lock};
4134 sigprocmask
(SIG_SETMASK
, $sigmask) or
4135 croak
"Can't restore signal mask: $!";
4139 # If want_commit, this will return an array of (rev, commit) where
4140 # commit _must_ be a valid commit in the archive.
4141 # Otherwise, it'll return the max revision (whether or not the
4142 # commit is valid or just a 0x40 placeholder).
4144 my ($self, $want_commit) = @_;
4146 my ($r, $c) = $self->rev_map_max_norebuild($want_commit);
4147 $want_commit ?
($r, $c) : $r;
4150 sub rev_map_max_norebuild
{
4151 my ($self, $want_commit) = @_;
4152 my $map_path = $self->map_path;
4153 stat $map_path or return $want_commit ?
(0, undef) : 0;
4154 sysopen(my $fh, $map_path, O_RDONLY
) or croak
"open: $!";
4155 binmode $fh or croak
"binmode: $!";
4156 my $size = (stat($fh))[7];
4157 ($size % 24) == 0 or croak
"inconsistent size: $size";
4160 close $fh or croak
"close: $!";
4161 return $want_commit ?
(0, undef) : 0;
4164 sysseek($fh, -24, SEEK_END
) or croak
"seek: $!";
4165 sysread($fh, my $buf, 24) == 24 or croak
"read: $!";
4166 my ($r, $c) = unpack(rev_map_fmt
, $buf);
4167 if ($want_commit && $c eq ('0' x40
)) {
4169 return $want_commit ?
(0, undef) : 0;
4171 sysseek($fh, -48, SEEK_END
) or croak
"seek: $!";
4172 sysread($fh, $buf, 24) == 24 or croak
"read: $!";
4173 ($r, $c) = unpack(rev_map_fmt
, $buf);
4174 if ($c eq ('0'x40
)) {
4175 croak
"Penultimate record is all-zeroes in $map_path";
4178 close $fh or croak
"close: $!";
4179 $want_commit ?
($r, $c) : $r;
4183 my ($self, $rev, $uuid) = @_;
4184 my $map_path = $self->map_path($uuid);
4185 return undef unless -e
$map_path;
4187 sysopen(my $fh, $map_path, O_RDONLY
) or croak
"open: $!";
4188 my $c = _rev_map_get
($fh, $rev);
4189 close($fh) or croak
"close: $!";
4194 my ($fh, $rev) = @_;
4196 binmode $fh or croak
"binmode: $!";
4197 my $size = (stat($fh))[7];
4198 ($size % 24) == 0 or croak
"inconsistent size: $size";
4204 my ($l, $u) = (0, $size - 24);
4208 my $i = int(($l/24 + $u/24) / 2) * 24;
4209 sysseek($fh, $i, SEEK_SET
) or croak
"seek: $!";
4210 sysread($fh, my $buf, 24) == 24 or croak
"read: $!";
4211 my ($r, $c) = unpack(rev_map_fmt
, $buf);
4215 } elsif ($r > $rev) {
4217 } else { # $r == $rev
4218 return $c eq ('0' x
40) ?
undef : $c;
4224 # Finds the first svn revision that exists on (if $eq_ok is true) or
4225 # before $rev for the current branch. It will not search any lower
4226 # than $min_rev. Returns the git commit hash and svn revision number
4227 # if found, else (undef, undef).
4228 sub find_rev_before
{
4229 my ($self, $rev, $eq_ok, $min_rev) = @_;
4230 --$rev unless $eq_ok;
4232 my $max_rev = $self->rev_map_max;
4233 $rev = $max_rev if ($rev > $max_rev);
4234 while ($rev >= $min_rev) {
4235 if (my $c = $self->rev_map_get($rev)) {
4240 return (undef, undef);
4243 # Finds the first svn revision that exists on (if $eq_ok is true) or
4244 # after $rev for the current branch. It will not search any higher
4245 # than $max_rev. Returns the git commit hash and svn revision number
4246 # if found, else (undef, undef).
4247 sub find_rev_after
{
4248 my ($self, $rev, $eq_ok, $max_rev) = @_;
4249 ++$rev unless $eq_ok;
4250 $max_rev ||= $self->rev_map_max;
4251 while ($rev <= $max_rev) {
4252 if (my $c = $self->rev_map_get($rev)) {
4257 return (undef, undef);
4261 my ($class, $repo_id, $ref_id, $path) = @_;
4262 unless (defined $repo_id && length $repo_id) {
4263 $repo_id = $Git::SVN
::default_repo_id
;
4265 unless (defined $ref_id && length $ref_id) {
4266 $_prefix = '' unless defined($_prefix);
4268 "refs/remotes/$_prefix$Git::SVN::default_ref_id";
4271 my $dir = "$ENV{GIT_DIR}/svn/$ref_id";
4273 # Older repos imported by us used $GIT_DIR/svn/foo instead of
4274 # $GIT_DIR/svn/refs/remotes/foo when tracking refs/remotes/foo
4275 if ($ref_id =~ m{^refs/remotes/(.*)}) {
4276 my $old_dir = "$ENV{GIT_DIR}/svn/$1";
4277 if (-d
$old_dir && ! -d
$dir) {
4282 $_[3] = $path = '' unless (defined $path);
4285 ref_id
=> $ref_id, dir
=> $dir, index => "$dir/index",
4286 path
=> $path, config
=> "$ENV{GIT_DIR}/svn/config",
4287 map_root
=> "$dir/.rev_map", repo_id
=> $repo_id }, $class;
4290 # for read-only access of old .rev_db formats
4291 sub unlink_rev_db_symlink
{
4293 my $link = $self->rev_db_path;
4294 $link =~ s/\.[\w-]+$// or croak
"missing UUID at the end of $link";
4296 unlink $link or croak
"unlink: $link failed!";
4301 my ($self, $uuid) = @_;
4302 my $db_path = $self->map_path($uuid);
4303 $db_path =~ s{/\.rev_map\.}{/\.rev_db\.}
4304 or croak
"map_path: $db_path does not contain '/.rev_map.' !";
4308 # the new replacement for .rev_db
4310 my ($self, $uuid) = @_;
4311 $uuid ||= $self->ra_uuid;
4312 "$self->{map_root}.$uuid";
4317 $f =~ s
#([^a-zA-Z0-9\*!\:_\./\-])#uc sprintf("%%%02x",ord($1))#eg;
4323 $f =~ s
#%([0-9a-fA-F]{2})#chr(hex($1))#eg;
4327 sub remove_username
{
4328 $_[0] =~ s{^([^:]*://)[^@]+@}{$1};
4331 package SVN
::Git
::Fetcher
;
4332 use vars qw
/@ISA $_ignore_regex $_preserve_empty_dirs $_placeholder_filename
4333 @deleted_gpath %added_placeholder $repo_id/;
4337 use File
::Basename qw
/dirname/;
4340 # file baton members: path, mode_a, mode_b, pool, fh, blob, base
4342 my ($class, $git_svn, $switch_path) = @_;
4343 my $self = SVN
::Delta
::Editor
->new;
4344 bless $self, $class;
4345 if (exists $git_svn->{last_commit
}) {
4346 $self->{c
} = $git_svn->{last_commit
};
4347 $self->{empty_symlinks
} =
4348 _mark_empty_symlinks
($git_svn, $switch_path);
4351 # some options are read globally, but can be overridden locally
4352 # per [svn-remote "..."] section. Command-line options will *NOT*
4353 # override options set in an [svn-remote "..."] section
4354 $repo_id = $git_svn->{repo_id
};
4355 my $k = "svn-remote.$repo_id.ignore-paths";
4356 my $v = eval { command_oneline
('config', '--get', $k) };
4357 $self->{ignore_regex
} = $v;
4359 $k = "svn-remote.$repo_id.preserve-empty-dirs";
4360 $v = eval { command_oneline
('config', '--get', '--bool', $k) };
4361 if ($v && $v eq 'true') {
4362 $_preserve_empty_dirs = 1;
4363 $k = "svn-remote.$repo_id.placeholder-filename";
4364 $v = eval { command_oneline
('config', '--get', $k) };
4365 $_placeholder_filename = $v;
4368 # Load the list of placeholder files added during previous invocations.
4369 $k = "svn-remote.$repo_id.added-placeholder";
4370 $v = eval { command_oneline
('config', '--get-all', $k) };
4371 if ($_preserve_empty_dirs && $v) {
4372 # command() prints errors to stderr, so we only call it if
4373 # command_oneline() succeeded.
4374 my @v = command
('config', '--get-all', $k);
4375 $added_placeholder{ dirname
($_) } = $_ foreach @v;
4378 $self->{empty
} = {};
4379 $self->{dir_prop
} = {};
4380 $self->{file_prop
} = {};
4381 $self->{absent_dir
} = {};
4382 $self->{absent_file
} = {};
4383 $self->{gii
} = $git_svn->tmp_index_do(sub { Git
::IndexInfo
->new });
4384 $self->{pathnameencoding
} = Git
::config
('svn.pathnameencoding');
4388 # this uses the Ra object, so it must be called before do_{switch,update},
4389 # not inside them (when the Git::SVN::Fetcher object is passed) to
4390 # do_{switch,update}
4391 sub _mark_empty_symlinks
{
4392 my ($git_svn, $switch_path) = @_;
4393 my $bool = Git
::config_bool
('svn.brokenSymlinkWorkaround');
4394 return {} if (!defined($bool)) || (defined($bool) && ! $bool);
4397 my ($rev, $cmt) = $git_svn->last_rev_commit;
4398 return {} unless ($rev && $cmt);
4400 # allow the warning to be printed for each revision we fetch to
4401 # ensure the user sees it. The user can also disable the workaround
4402 # on the repository even while git svn is running and the next
4403 # revision fetched will skip this expensive function.
4404 my $printed_warning;
4405 chomp(my $empty_blob = `git hash-object -t blob --stdin < /dev/null`);
4406 my ($ls, $ctx) = command_output_pipe
(qw
/ls-tree -r -z/, $cmt);
4408 my $pfx = defined($switch_path) ?
$switch_path : $git_svn->{path
};
4409 $pfx .= '/' if length($pfx);
4412 s/\A100644 blob $empty_blob\t//o or next;
4413 unless ($printed_warning) {
4414 print STDERR
"Scanning for empty symlinks, ",
4415 "this may take a while if you have ",
4416 "many empty files\n",
4417 "You may disable this with `",
4418 "git config svn.brokenSymlinkWorkaround ",
4420 "This may be done in a different ",
4421 "terminal without restarting ",
4423 $printed_warning = 1;
4426 my (undef, $props) =
4427 $git_svn->ra->get_file($pfx.$path, $rev, undef);
4428 if ($props->{'svn:special'}) {
4432 command_close_pipe
($ls, $ctx);
4436 # returns true if a given path is inside a ".git" directory
4438 $_[0] =~ m{(?:^|/)\.git(?:/|$)};
4441 # return value: 0 -- don't ignore, 1 -- ignore
4442 sub is_path_ignored
{
4443 my ($self, $path) = @_;
4444 return 1 if in_dot_git
($path);
4445 return 1 if defined($self->{ignore_regex
}) &&
4446 $path =~ m!$self->{ignore_regex}!;
4447 return 0 unless defined($_ignore_regex);
4448 return 1 if $path =~ m!$_ignore_regex!o;
4452 sub set_path_strip
{
4453 my ($self, $path) = @_;
4454 $self->{path_strip
} = qr/^\Q$path\E(\/|$)/ if length $path;
4461 sub open_directory
{
4462 my ($self, $path, $pb, $rev) = @_;
4467 my ($self, $path) = @_;
4468 if (my $enc = $self->{pathnameencoding
}) {
4470 Encode
::from_to
($path, 'UTF-8', $enc);
4472 if ($self->{path_strip
}) {
4473 $path =~ s!$self->{path_strip}!! or
4474 die "Failed to strip path '$path' ($self->{path_strip})\n";
4480 my ($self, $path, $rev, $pb) = @_;
4481 return undef if $self->is_path_ignored($path);
4483 my $gpath = $self->git_path($path);
4484 return undef if ($gpath eq '');
4486 # remove entire directories.
4487 my ($tree) = (command
('ls-tree', '-z', $self->{c
}, "./$gpath")
4488 =~ /\A040000 tree ([a-f\d]{40})\t\Q$gpath\E\0/);
4490 my ($ls, $ctx) = command_output_pipe
(qw
/ls
-tree
4496 my $rmpath = "$gpath/$_";
4497 $self->{gii
}->remove($rmpath);
4498 print "\tD\t$rmpath\n" unless $::_q
;
4500 print "\tD\t$gpath/\n" unless $::_q
;
4501 command_close_pipe
($ls, $ctx);
4503 $self->{gii
}->remove($gpath);
4504 print "\tD\t$gpath\n" unless $::_q
;
4506 # Don't add to @deleted_gpath if we're deleting a placeholder file.
4507 push @deleted_gpath, $gpath unless $added_placeholder{dirname
($path)};
4508 $self->{empty
}->{$path} = 0;
4513 my ($self, $path, $pb, $rev) = @_;
4516 goto out
if $self->is_path_ignored($path);
4518 my $gpath = $self->git_path($path);
4519 ($mode, $blob) = (command
('ls-tree', '-z', $self->{c
}, "./$gpath")
4520 =~ /\A(\d{6}) blob ([a-f\d]{40})\t\Q$gpath\E\0/);
4521 unless (defined $mode && defined $blob) {
4522 die "$path was not found in commit $self->{c} (r$rev)\n";
4524 if ($mode eq '100644' && $self->{empty_symlinks
}->{$path}) {
4528 { path
=> $path, mode_a
=> $mode, mode_b
=> $mode, blob
=> $blob,
4529 pool
=> SVN
::Pool
->new, action
=> 'M' };
4533 my ($self, $path, $pb, $cp_path, $cp_rev) = @_;
4536 if (!$self->is_path_ignored($path)) {
4537 my ($dir, $file) = ($path =~ m
#^(.*?)/?([^/]+)$#);
4538 delete $self->{empty
}->{$dir};
4541 if ($added_placeholder{$dir}) {
4542 # Remove our placeholder file, if we created one.
4543 delete_entry
($self, $added_placeholder{$dir})
4544 unless $path eq $added_placeholder{$dir};
4545 delete $added_placeholder{$dir}
4549 { path
=> $path, mode_a
=> $mode, mode_b
=> $mode,
4550 pool
=> SVN
::Pool
->new, action
=> 'A' };
4554 my ($self, $path, $cp_path, $cp_rev) = @_;
4555 goto out
if $self->is_path_ignored($path);
4556 my $gpath = $self->git_path($path);
4558 my ($ls, $ctx) = command_output_pipe
(qw
/ls
-tree
4564 $self->{gii
}->remove($_);
4565 print "\tD\t$_\n" unless $::_q
;
4566 push @deleted_gpath, $gpath;
4568 command_close_pipe
($ls, $ctx);
4569 $self->{empty
}->{$path} = 0;
4571 my ($dir, $file) = ($path =~ m
#^(.*?)/?([^/]+)$#);
4572 delete $self->{empty
}->{$dir};
4573 $self->{empty
}->{$path} = 1;
4575 if ($added_placeholder{$dir}) {
4576 # Remove our placeholder file, if we created one.
4577 delete_entry
($self, $added_placeholder{$dir});
4578 delete $added_placeholder{$dir}
4585 sub change_dir_prop
{
4586 my ($self, $db, $prop, $value) = @_;
4587 return undef if $self->is_path_ignored($db->{path
});
4588 $self->{dir_prop
}->{$db->{path
}} ||= {};
4589 $self->{dir_prop
}->{$db->{path
}}->{$prop} = $value;
4593 sub absent_directory
{
4594 my ($self, $path, $pb) = @_;
4595 return undef if $self->is_path_ignored($path);
4596 $self->{absent_dir
}->{$pb->{path
}} ||= [];
4597 push @
{$self->{absent_dir
}->{$pb->{path
}}}, $path;
4602 my ($self, $path, $pb) = @_;
4603 return undef if $self->is_path_ignored($path);
4604 $self->{absent_file
}->{$pb->{path
}} ||= [];
4605 push @
{$self->{absent_file
}->{$pb->{path
}}}, $path;
4609 sub change_file_prop
{
4610 my ($self, $fb, $prop, $value) = @_;
4611 return undef if $self->is_path_ignored($fb->{path
});
4612 if ($prop eq 'svn:executable') {
4613 if ($fb->{mode_b
} != 120000) {
4614 $fb->{mode_b
} = defined $value ?
100755 : 100644;
4616 } elsif ($prop eq 'svn:special') {
4617 $fb->{mode_b
} = defined $value ?
120000 : 100644;
4619 $self->{file_prop
}->{$fb->{path
}} ||= {};
4620 $self->{file_prop
}->{$fb->{path
}}->{$prop} = $value;
4625 sub apply_textdelta
{
4626 my ($self, $fb, $exp) = @_;
4627 return undef if $self->is_path_ignored($fb->{path
});
4628 my $fh = $::_repository
->temp_acquire('svn_delta');
4629 # $fh gets auto-closed() by SVN::TxDelta::apply(),
4630 # (but $base does not,) so dup() it for reading in close_file
4631 open my $dup, '<&', $fh or croak
$!;
4632 my $base = $::_repository
->temp_acquire('git_blob');
4635 my ($base_is_link, $size);
4637 if ($fb->{mode_a
} eq '120000' &&
4638 ! $self->{empty_symlinks
}->{$fb->{path
}}) {
4639 print $base 'link ' or die "print $!\n";
4643 $size = $::_repository
->cat_blob($fb->{blob
}, $base);
4644 die "Failed to read object $fb->{blob}" if ($size < 0);
4647 seek $base, 0, 0 or croak
$!;
4648 my $got = ::md5sum
($base);
4650 my $err = "Checksum mismatch: ".
4651 "$fb->{path} $fb->{blob}\n" .
4652 "expected: $exp\n" .
4654 if ($base_is_link) {
4656 "Retrying... (possibly ",
4657 "a bad symlink from SVN)\n";
4658 $::_repository
->temp_reset($base);
4666 seek $base, 0, 0 or croak
$!;
4668 $fb->{base
} = $base;
4669 [ SVN
::TxDelta
::apply
($base, $dup, undef, $fb->{path
}, $fb->{pool
}) ];
4673 my ($self, $fb, $exp) = @_;
4674 return undef if $self->is_path_ignored($fb->{path
});
4677 my $path = $self->git_path($fb->{path
});
4678 if (my $fh = $fb->{fh
}) {
4680 seek($fh, 0, 0) or croak
$!;
4681 my $got = ::md5sum
($fh);
4683 die "Checksum mismatch: $path\n",
4684 "expected: $exp\n got: $got\n";
4687 if ($fb->{mode_b
} == 120000) {
4688 sysseek($fh, 0, 0) or croak
$!;
4689 my $rd = sysread($fh, my $buf, 5);
4692 croak
"sysread: $!\n";
4693 } elsif ($rd == 0) {
4694 warn "$path has mode 120000",
4695 " but it points to nothing\n",
4696 "converting to an empty file with mode",
4698 $fb->{mode_b
} = '100644';
4699 } elsif ($buf ne 'link ') {
4700 warn "$path has mode 120000",
4701 " but is not a link\n";
4703 my $tmp_fh = $::_repository
->temp_acquire(
4706 while ($res = sysread($fh, my $str, 1024)) {
4707 my $out = syswrite($tmp_fh, $str, $res);
4708 defined($out) && $out == $res
4710 Git
::temp_path
($tmp_fh),
4713 defined $res or croak
$!;
4715 ($fh, $tmp_fh) = ($tmp_fh, $fh);
4716 Git
::temp_release
($tmp_fh, 1);
4720 $hash = $::_repository
->hash_and_insert_object(
4721 Git
::temp_path
($fh));
4722 $hash =~ /^[a-f\d]{40}$/ or die "not a sha1: $hash\n";
4724 Git
::temp_release
($fb->{base
}, 1);
4725 Git
::temp_release
($fh, 1);
4727 $hash = $fb->{blob
} or die "no blob information\n";
4730 $self->{gii
}->update($fb->{mode_b
}, $hash, $path) or croak
$!;
4731 print "\t$fb->{action}\t$path\n" if $fb->{action
} && ! $::_q
;
4737 $self->{nr
} = $self->{gii
}->{nr
};
4738 delete $self->{gii
};
4739 $self->SUPER::abort_edit
(@_);
4745 if ($_preserve_empty_dirs) {
4748 # Any entry flagged as empty that also has an associated
4749 # dir_prop represents a newly created empty directory.
4750 foreach my $i (keys %{$self->{empty
}}) {
4751 push @empty_dirs, $i if exists $self->{dir_prop
}->{$i};
4754 # Search for directories that have become empty due subsequent
4756 push @empty_dirs, $self->find_empty_directories();
4758 # Finally, add a placeholder file to each empty directory.
4759 $self->add_placeholder_file($_) foreach (@empty_dirs);
4761 $self->stash_placeholder_list();
4764 $self->{git_commit_ok
} = 1;
4765 $self->{nr
} = $self->{gii
}->{nr
};
4766 delete $self->{gii
};
4767 $self->SUPER::close_edit
(@_);
4770 sub find_empty_directories
{
4773 my %dirs = map { dirname
($_) => 1 } @deleted_gpath;
4775 foreach my $dir (sort keys %dirs) {
4776 next if $dir eq ".";
4778 # If there have been any additions to this directory, there is
4779 # no reason to check if it is empty.
4781 foreach my $t (qw
/dir_prop file_prop/) {
4782 foreach my $path (keys %{ $self->{$t} }) {
4783 if (exists $self->{$t}->{dirname
($path)}) {
4788 last if $skip_added;
4790 next if $skip_added;
4792 # Use `git ls-tree` to get the filenames of this directory
4793 # that existed prior to this particular commit.
4794 my $ls = command
('ls-tree', '-z', '--name-only',
4795 $self->{c
}, "$dir/");
4796 my %files = map { $_ => 1 } split(/\0/, $ls);
4798 # Remove the filenames that were deleted during this commit.
4799 delete $files{$_} foreach (@deleted_gpath);
4801 # Report the directory if there are no filenames left.
4802 push @empty_dirs, $dir unless (scalar %files);
4807 sub add_placeholder_file
{
4808 my ($self, $dir) = @_;
4809 my $path = "$dir/$_placeholder_filename";
4810 my $gpath = $self->git_path($path);
4812 my $fh = $::_repository
->temp_acquire($gpath);
4813 my $hash = $::_repository
->hash_and_insert_object(Git
::temp_path
($fh));
4814 Git
::temp_release
($fh, 1);
4815 $self->{gii
}->update('100644', $hash, $gpath) or croak
$!;
4817 # The directory should no longer be considered empty.
4818 delete $self->{empty
}->{$dir} if exists $self->{empty
}->{$dir};
4820 # Keep track of any placeholder files we create.
4821 $added_placeholder{$dir} = $path;
4824 sub stash_placeholder_list
{
4826 my $k = "svn-remote.$repo_id.added-placeholder";
4827 my $v = eval { command_oneline
('config', '--get-all', $k) };
4828 command_noisy
('config', '--unset-all', $k) if $v;
4829 foreach (values %added_placeholder) {
4830 command_noisy
('config', '--add', $k, $_);
4834 package SVN
::Git
::Editor
;
4835 use vars qw
/@ISA $_rmdir $_cp_similarity $_find_copies_harder $_rename_limit/;
4842 my ($class, $opts) = @_;
4843 foreach (qw
/svn_path r ra tree_a tree_b log editor_cb/) {
4844 die "$_ required!\n" unless (defined $opts->{$_});
4847 my $pool = SVN
::Pool
->new;
4848 my $mods = generate_diff
($opts->{tree_a
}, $opts->{tree_b
});
4849 my $types = check_diff_paths
($opts->{ra
}, $opts->{svn_path
},
4852 # $opts->{ra} functions should not be used after this:
4853 my @ce = $opts->{ra
}->get_commit_editor($opts->{log},
4854 $opts->{editor_cb
}, $pool);
4855 my $self = SVN
::Delta
::Editor
->new(@ce, $pool);
4856 bless $self, $class;
4857 foreach (qw
/svn_path r tree_a tree_b/) {
4858 $self->{$_} = $opts->{$_};
4860 $self->{url
} = $opts->{ra
}->{url
};
4861 $self->{mods
} = $mods;
4862 $self->{types
} = $types;
4863 $self->{pool
} = $pool;
4864 $self->{bat
} = { '' => $self->open_root($self->{r
}, $self->{pool
}) };
4866 $self->{path_prefix
} = length $self->{svn_path
} ?
4867 "$self->{svn_path}/" : '';
4868 $self->{config
} = $opts->{config
};
4869 $self->{mergeinfo
} = $opts->{mergeinfo
};
4874 my ($tree_a, $tree_b) = @_;
4875 my @diff_tree = qw(diff-tree -z -r);
4876 if ($_cp_similarity) {
4877 push @diff_tree, "-C$_cp_similarity";
4879 push @diff_tree, '-C';
4881 push @diff_tree, '--find-copies-harder' if $_find_copies_harder;
4882 push @diff_tree, "-l$_rename_limit" if defined $_rename_limit;
4883 push @diff_tree, $tree_a, $tree_b;
4884 my ($diff_fh, $ctx) = command_output_pipe
(@diff_tree);
4888 while (<$diff_fh>) {
4889 chomp $_; # this gets rid of the trailing "\0"
4890 if ($state eq 'meta' && /^:(\d
{6})\s
(\d
{6})\s
4891 ($::sha1
)\s
($::sha1
)\s
4892 ([MTCRAD
])\d
*$/xo
) {
4893 push @mods, { mode_a
=> $1, mode_b
=> $2,
4894 sha1_a
=> $3, sha1_b
=> $4,
4896 if ($5 =~ /^(?:C|R)$/) {
4901 } elsif ($state eq 'file_a') {
4902 my $x = $mods[$#mods] or croak
"Empty array\n";
4903 if ($x->{chg
} !~ /^(?:C|R)$/) {
4904 croak
"Error parsing $_, $x->{chg}\n";
4908 } elsif ($state eq 'file_b') {
4909 my $x = $mods[$#mods] or croak
"Empty array\n";
4910 if (exists $x->{file_a
} && $x->{chg
} !~ /^(?:C|R)$/) {
4911 croak
"Error parsing $_, $x->{chg}\n";
4913 if (!exists $x->{file_a
} && $x->{chg
} =~ /^(?:C|R)$/) {
4914 croak
"Error parsing $_, $x->{chg}\n";
4919 croak
"Error parsing $_\n";
4922 command_close_pipe
($diff_fh, $ctx);
4926 sub check_diff_paths
{
4927 my ($ra, $pfx, $rev, $mods) = @_;
4929 $pfx .= '/' if length $pfx;
4931 sub type_diff_paths
{
4932 my ($ra, $types, $path, $rev) = @_;
4933 my @p = split m
#/+#, $path;
4935 unless (defined $types->{$c}) {
4936 $types->{$c} = $ra->check_path($c, $rev);
4939 $c .= '/' . shift @p;
4940 next if defined $types->{$c};
4941 $types->{$c} = $ra->check_path($c, $rev);
4945 foreach my $m (@
$mods) {
4946 foreach my $f (qw
/file_a file_b/) {
4947 next unless defined $m->{$f};
4948 my ($dir) = ($m->{$f} =~ m
#^(.*?)/?(?:[^/]+)$#);
4949 if (length $pfx.$dir && ! defined $types{$dir}) {
4950 type_diff_paths
($ra, \
%types, $pfx.$dir, $rev);
4958 return ($_[0] =~ m
#^(.*?)/?([^/]+)$#);
4962 my ($self, $path) = @_;
4963 if (my $enc = $self->{pathnameencoding
}) {
4965 Encode
::from_to
($path, $enc, 'UTF-8');
4967 $self->{path_prefix
}.(defined $path ?
$path : '');
4971 my ($self, $path) = @_;
4972 if ($self->{url
} =~ m
#^https?://#) {
4973 $path =~ s!([^~a-zA-Z0-9_./-])!uc sprintf("%%%02x",ord($1))!eg;
4975 $self->{url
} . '/' . $self->repo_path($path);
4980 my $rm = $self->{rm
};
4981 delete $rm->{''}; # we never delete the url we're tracking
4984 foreach (keys %$rm) {
4985 my @d = split m
#/#, $_;
4989 $c .= '/' . shift @d;
4993 delete $rm->{$self->{svn_path
}};
4994 delete $rm->{''}; # we never delete the url we're tracking
4997 my ($fh, $ctx) = command_output_pipe
(qw
/ls-tree --name-only -r -z/,
5002 my @dn = split m
#/#, $_;
5004 delete $rm->{join '/', @dn};
5011 command_close_pipe
($fh, $ctx);
5013 my ($r, $p, $bat) = ($self->{r
}, $self->{pool
}, $self->{bat
});
5014 foreach my $d (sort { $b =~ tr
#/#/# <=> $a =~ tr#/#/# } keys %$rm) {
5015 $self->close_directory($bat->{$d}, $p);
5016 my ($dn) = ($d =~ m
#^(.*?)/?(?:[^/]+)$#);
5017 print "\tD+\t$d/\n" unless $::_q
;
5018 $self->SUPER::delete_entry
($d, $r, $bat->{$dn}, $p);
5023 sub open_or_add_dir
{
5024 my ($self, $full_path, $baton, $deletions) = @_;
5025 my $t = $self->{types
}->{$full_path};
5027 die "$full_path not known in r$self->{r} or we have a bug!\n";
5031 # SVN::Node::none and SVN::Node::file are used only once,
5032 # so we're shutting up Perl's warnings about them.
5033 if ($t == $SVN::Node
::none
|| defined($deletions->{$full_path})) {
5034 return $self->add_directory($full_path, $baton,
5035 undef, -1, $self->{pool
});
5036 } elsif ($t == $SVN::Node
::dir
) {
5037 return $self->open_directory($full_path, $baton,
5038 $self->{r
}, $self->{pool
});
5039 } # no warnings 'once'
5040 print STDERR
"$full_path already exists in repository at ",
5041 "r$self->{r} and it is not a directory (",
5042 ($t == $SVN::Node
::file ?
'file' : 'unknown'),"/$t)\n";
5043 } # no warnings 'once'
5048 my ($self, $path, $deletions) = @_;
5049 my $bat = $self->{bat
};
5050 my $repo_path = $self->repo_path($path);
5051 return $bat->{''} unless (length $repo_path);
5053 my @p = split m
#/+#, $repo_path;
5055 $bat->{$c} ||= $self->open_or_add_dir($c, $bat->{''}, $deletions);
5058 $c .= '/' . shift @p;
5059 $bat->{$c} ||= $self->open_or_add_dir($c, $bat->{$c0}, $deletions);
5064 # Subroutine to convert a globbing pattern to a regular expression.
5065 # From perl cookbook.
5067 my $globstr = shift;
5068 my %patmap = ('*' => '.*', '?' => '.', '[' => '[', ']' => ']');
5069 $globstr =~ s{(.)} { $patmap{$1} || "\Q$1" }ge;
5070 return '^' . $globstr . '$';
5073 sub check_autoprop
{
5074 my ($self, $pattern, $properties, $file, $fbat) = @_;
5075 # Convert the globbing pattern to a regular expression.
5076 my $regex = glob2pat
($pattern);
5077 # Check if the pattern matches the file name.
5078 if($file =~ m/($regex)/) {
5079 # Parse the list of properties to set.
5080 my @props = split(/;/, $properties);
5081 foreach my $prop (@props) {
5082 # Parse 'name=value' syntax and set the property.
5083 if ($prop =~ /([^=]+)=(.*)/) {
5084 my ($n,$v) = ($1,$2);
5088 $self->change_file_prop($fbat, $n, $v);
5094 sub apply_autoprops
{
5095 my ($self, $file, $fbat) = @_;
5096 my $conf_t = ${$self->{config
}}{'config'};
5098 # Check [miscellany]/enable-auto-props in svn configuration.
5099 if (SVN
::_Core
::svn_config_get_bool
(
5101 $SVN::_Core
::SVN_CONFIG_SECTION_MISCELLANY
,
5102 $SVN::_Core
::SVN_CONFIG_OPTION_ENABLE_AUTO_PROPS
,
5104 # Auto-props are enabled. Enumerate them to look for matches.
5105 my $callback = sub {
5106 $self->check_autoprop($_[0], $_[1], $file, $fbat);
5108 SVN
::_Core
::svn_config_enumerate
(
5110 $SVN::_Core
::SVN_CONFIG_SECTION_AUTO_PROPS
,
5116 my ($self, $m, $deletions) = @_;
5117 my ($dir, $file) = split_path
($m->{file_b
});
5118 my $pbat = $self->ensure_path($dir, $deletions);
5119 my $fbat = $self->add_file($self->repo_path($m->{file_b
}), $pbat,
5121 print "\tA\t$m->{file_b}\n" unless $::_q
;
5122 $self->apply_autoprops($file, $fbat);
5123 $self->chg_file($fbat, $m);
5124 $self->close_file($fbat,undef,$self->{pool
});
5128 my ($self, $m, $deletions) = @_;
5129 my ($dir, $file) = split_path
($m->{file_b
});
5130 my $pbat = $self->ensure_path($dir, $deletions);
5131 my $fbat = $self->add_file($self->repo_path($m->{file_b
}), $pbat,
5132 $self->url_path($m->{file_a
}), $self->{r
});
5133 print "\tC\t$m->{file_a} => $m->{file_b}\n" unless $::_q
;
5134 $self->chg_file($fbat, $m);
5135 $self->close_file($fbat,undef,$self->{pool
});
5139 my ($self, $path, $pbat) = @_;
5140 my $rpath = $self->repo_path($path);
5141 my ($dir, $file) = split_path
($rpath);
5142 $self->{rm
}->{$dir} = 1;
5143 $self->SUPER::delete_entry
($rpath, $self->{r
}, $pbat, $self->{pool
});
5147 my ($self, $m, $deletions) = @_;
5148 my ($dir, $file) = split_path
($m->{file_b
});
5149 my $pbat = $self->ensure_path($dir, $deletions);
5150 my $fbat = $self->add_file($self->repo_path($m->{file_b
}), $pbat,
5151 $self->url_path($m->{file_a
}), $self->{r
});
5152 print "\tR\t$m->{file_a} => $m->{file_b}\n" unless $::_q
;
5153 $self->apply_autoprops($file, $fbat);
5154 $self->chg_file($fbat, $m);
5155 $self->close_file($fbat,undef,$self->{pool
});
5157 ($dir, $file) = split_path
($m->{file_a
});
5158 $pbat = $self->ensure_path($dir, $deletions);
5159 $self->delete_entry($m->{file_a
}, $pbat);
5163 my ($self, $m, $deletions) = @_;
5164 my ($dir, $file) = split_path
($m->{file_b
});
5165 my $pbat = $self->ensure_path($dir, $deletions);
5166 my $fbat = $self->open_file($self->repo_path($m->{file_b
}),
5167 $pbat,$self->{r
},$self->{pool
});
5168 print "\t$m->{chg}\t$m->{file_b}\n" unless $::_q
;
5169 $self->chg_file($fbat, $m);
5170 $self->close_file($fbat,undef,$self->{pool
});
5173 sub T
{ shift->M(@_) }
5175 sub change_file_prop
{
5176 my ($self, $fbat, $pname, $pval) = @_;
5177 $self->SUPER::change_file_prop
($fbat, $pname, $pval, $self->{pool
});
5180 sub change_dir_prop
{
5181 my ($self, $pbat, $pname, $pval) = @_;
5182 $self->SUPER::change_dir_prop
($pbat, $pname, $pval, $self->{pool
});
5185 sub _chg_file_get_blob
($$$$) {
5186 my ($self, $fbat, $m, $which) = @_;
5187 my $fh = $::_repository
->temp_acquire("git_blob_$which");
5188 if ($m->{"mode_$which"} =~ /^120/) {
5189 print $fh 'link ' or croak
$!;
5190 $self->change_file_prop($fbat,'svn:special','*');
5191 } elsif ($m->{mode_a
} =~ /^120/ && $m->{"mode_$which"} !~ /^120/) {
5192 $self->change_file_prop($fbat,'svn:special',undef);
5194 my $blob = $m->{"sha1_$which"};
5195 return ($fh,) if ($blob =~ /^0{40}$/);
5196 my $size = $::_repository
->cat_blob($blob, $fh);
5197 croak
"Failed to read object $blob" if ($size < 0);
5198 $fh->flush == 0 or croak
$!;
5199 seek $fh, 0, 0 or croak
$!;
5201 my $exp = ::md5sum
($fh);
5202 seek $fh, 0, 0 or croak
$!;
5207 my ($self, $fbat, $m) = @_;
5208 if ($m->{mode_b
} =~ /755$/ && $m->{mode_a
} !~ /755$/) {
5209 $self->change_file_prop($fbat,'svn:executable','*');
5210 } elsif ($m->{mode_b
} !~ /755$/ && $m->{mode_a
} =~ /755$/) {
5211 $self->change_file_prop($fbat,'svn:executable',undef);
5213 my ($fh_a, $exp_a) = _chg_file_get_blob
$self, $fbat, $m, 'a';
5214 my ($fh_b, $exp_b) = _chg_file_get_blob
$self, $fbat, $m, 'b';
5215 my $pool = SVN
::Pool
->new;
5216 my $atd = $self->apply_textdelta($fbat, $exp_a, $pool);
5218 my $txstream = SVN
::TxDelta
::new
($fh_a, $fh_b, $pool);
5219 my $res = SVN
::TxDelta
::send_txstream
($txstream, @
$atd, $pool);
5221 die "Unexpected result from send_txstream: $res\n",
5222 "(SVN::Core::VERSION: $SVN::Core::VERSION)\n";
5225 my $got = SVN
::TxDelta
::send_stream
($fh_b, @
$atd, $pool);
5226 die "Checksum mismatch\nexpected: $exp_b\ngot: $got\n"
5227 if ($got ne $exp_b);
5229 Git
::temp_release
($fh_b, 1);
5230 Git
::temp_release
($fh_a, 1);
5235 my ($self, $m, $deletions) = @_;
5236 my ($dir, $file) = split_path
($m->{file_b
});
5237 my $pbat = $self->ensure_path($dir, $deletions);
5238 print "\tD\t$m->{file_b}\n" unless $::_q
;
5239 $self->delete_entry($m->{file_b
}, $pbat);
5244 my ($p,$bat) = ($self->{pool
}, $self->{bat
});
5245 foreach (sort { $b =~ tr
#/#/# <=> $a =~ tr#/#/# } keys %$bat) {
5247 $self->close_directory($bat->{$_}, $p);
5249 $self->close_directory($bat->{''}, $p);
5250 $self->SUPER::close_edit
($p);
5256 $self->SUPER::abort_edit
($self->{pool
});
5261 $self->SUPER::DESTROY
(@_);
5262 $self->{pool
}->clear;
5265 # this drives the editor
5268 my $mods = $self->{mods
};
5269 my %o = ( D
=> 0, C
=> 1, R
=> 2, A
=> 3, M
=> 4, T
=> 5 );
5272 foreach my $m (@
$mods) {
5273 if ($m->{chg
} eq "D") {
5274 $deletions{$m->{file_b
}} = 1;
5278 foreach my $m (sort { $o{$a->{chg
}} <=> $o{$b->{chg
}} } @
$mods) {
5280 if (defined $o{$f}) {
5281 $self->$f($m, \
%deletions);
5283 fatal
("Invalid change type: $f");
5287 if (defined($self->{mergeinfo
})) {
5288 $self->change_dir_prop($self->{bat
}{''}, "svn:mergeinfo",
5289 $self->{mergeinfo
});
5291 $self->rmdirs if $_rmdir;
5292 if (@
$mods == 0 && !defined($self->{mergeinfo
})) {
5297 return scalar @
$mods;
5300 package Git
::SVN
::Ra
;
5301 use vars qw
/@ISA $config_dir $_ignore_refs_regex $_log_window_size/;
5304 my ($ra_invalid, $can_do_switch, %ignored_err, $RA);
5307 # enforce temporary pool usage for some simple functions
5309 for my $f (qw
/rev_proplist get_latest_revnum get_uuid get_repos_root
5311 my $SUPER = "SUPER::$f";
5314 my $pool = SVN
::Pool
->new;
5315 my @ret = $self->$SUPER(@_,$pool);
5317 wantarray ?
@ret : $ret[0];
5322 sub _auth_providers
() {
5324 SVN
::Client
::get_simple_provider
(),
5325 SVN
::Client
::get_ssl_server_trust_file_provider
(),
5326 SVN
::Client
::get_simple_prompt_provider
(
5327 \
&Git
::SVN
::Prompt
::simple
, 2),
5328 SVN
::Client
::get_ssl_client_cert_file_provider
(),
5329 SVN
::Client
::get_ssl_client_cert_prompt_provider
(
5330 \
&Git
::SVN
::Prompt
::ssl_client_cert
, 2),
5331 SVN
::Client
::get_ssl_client_cert_pw_file_provider
(),
5332 SVN
::Client
::get_ssl_client_cert_pw_prompt_provider
(
5333 \
&Git
::SVN
::Prompt
::ssl_client_cert_pw
, 2),
5334 SVN
::Client
::get_username_provider
(),
5335 SVN
::Client
::get_ssl_server_trust_prompt_provider
(
5336 \
&Git
::SVN
::Prompt
::ssl_server_trust
),
5337 SVN
::Client
::get_username_prompt_provider
(
5338 \
&Git
::SVN
::Prompt
::username
, 2)
5341 # earlier 1.6.x versions would segfault, and <= 1.5.x didn't have
5343 if (::compare_svn_version
('1.6.12') > 0) {
5344 my $config = SVN
::Core
::config_get_config
($config_dir);
5346 # config_get_config returns all config files from
5347 # ~/.subversion, auth_get_platform_specific_client_providers
5348 # just wants the config "file".
5349 @a = ($config->{'config'}, undef);
5350 $p = SVN
::Core
::auth_get_platform_specific_client_providers
(@a);
5351 # Insert the return value from
5352 # auth_get_platform_specific_providers
5358 sub escape_uri_only
{
5361 foreach (split m{/}, $uri) {
5362 s/([^~\w.%+-]|%(?![a-fA-F0-9]{2}))/sprintf("%%%02X",ord($1))/eg;
5370 if ($url =~ m
#^(https?)://([^/]+)(.*)$#) {
5371 my ($scheme, $domain, $uri) = ($1, $2, escape_uri_only
($3));
5372 $url = "$scheme://$domain$uri";
5378 my ($class, $url) = @_;
5380 return $RA if ($RA && $RA->{url
} eq $url);
5384 SVN
::_Core
::svn_config_ensure
($config_dir, undef);
5385 my ($baton, $callbacks) = SVN
::Core
::auth_open_helper
(_auth_providers
);
5386 my $config = SVN
::Core
::config_get_config
($config_dir);
5388 my $dont_store_passwords = 1;
5389 my $conf_t = ${$config}{'config'};
5392 # The usage of $SVN::_Core::SVN_CONFIG_* variables
5393 # produces warnings that variables are used only once.
5394 # I had not found the better way to shut them up, so
5395 # the warnings of type 'once' are disabled in this block.
5396 if (SVN
::_Core
::svn_config_get_bool
($conf_t,
5397 $SVN::_Core
::SVN_CONFIG_SECTION_AUTH
,
5398 $SVN::_Core
::SVN_CONFIG_OPTION_STORE_PASSWORDS
,
5400 SVN
::_Core
::svn_auth_set_parameter
($baton,
5401 $SVN::_Core
::SVN_AUTH_PARAM_DONT_STORE_PASSWORDS
,
5402 bless (\
$dont_store_passwords, "_p_void"));
5404 if (SVN
::_Core
::svn_config_get_bool
($conf_t,
5405 $SVN::_Core
::SVN_CONFIG_SECTION_AUTH
,
5406 $SVN::_Core
::SVN_CONFIG_OPTION_STORE_AUTH_CREDS
,
5408 $Git::SVN
::Prompt
::_no_auth_cache
= 1;
5410 } # no warnings 'once'
5411 my $self = SVN
::Ra
->new(url
=> escape_url
($url), auth
=> $baton,
5413 pool
=> SVN
::Pool
->new,
5414 auth_provider_callbacks
=> $callbacks);
5415 $self->{url
} = $url;
5416 $self->{svn_path
} = $url;
5417 $self->{repos_root
} = $self->get_repos_root;
5418 $self->{svn_path
} =~ s
#^\Q$self->{repos_root}\E(/|$)##;
5419 $self->{cache
} = { check_path
=> { r
=> 0, data
=> {} },
5420 get_dir
=> { r
=> 0, data
=> {} } };
5421 $RA = bless $self, $class;
5425 my ($self, $path, $r) = @_;
5426 my $cache = $self->{cache
}->{check_path
};
5427 if ($r == $cache->{r
} && exists $cache->{data
}->{$path}) {
5428 return $cache->{data
}->{$path};
5430 my $pool = SVN
::Pool
->new;
5431 my $t = $self->SUPER::check_path
($path, $r, $pool);
5433 if ($r != $cache->{r
}) {
5434 %{$cache->{data
}} = ();
5437 $cache->{data
}->{$path} = $t;
5441 my ($self, $dir, $r) = @_;
5442 my $cache = $self->{cache
}->{get_dir
};
5443 if ($r == $cache->{r
}) {
5444 if (my $x = $cache->{data
}->{$dir}) {
5445 return wantarray ? @
$x : $x->[0];
5448 my $pool = SVN
::Pool
->new;
5449 my ($d, undef, $props) = $self->SUPER::get_dir
($dir, $r, $pool);
5450 my %dirents = map { $_ => { kind
=> $d->{$_}->kind } } keys %$d;
5452 if ($r != $cache->{r
}) {
5453 %{$cache->{data
}} = ();
5456 $cache->{data
}->{$dir} = [ \
%dirents, $r, $props ];
5457 wantarray ?
(\
%dirents, $r, $props) : \
%dirents;
5461 # do not call the real DESTROY since we store ourselves in $RA
5464 # get_log(paths, start, end, limit,
5465 # discover_changed_paths, strict_node_history, receiver)
5467 my ($self, @args) = @_;
5468 my $pool = SVN
::Pool
->new;
5470 # svn_log_changed_path_t objects passed to get_log are likely to be
5471 # overwritten even if only the refs are copied to an external variable,
5472 # so we should dup the structures in their entirety. Using an
5473 # externally passed pool (instead of our temporary and quickly cleared
5474 # pool in Git::SVN::Ra) does not help matters at all...
5475 my $receiver = pop @args;
5476 my $prefix = "/".$self->{svn_path
};
5477 $prefix =~ s
#/+($)##;
5478 my $prefix_regex = qr
#^\Q$prefix\E#;
5480 my ($paths) = $_[0];
5481 return &$receiver(@_) unless $paths;
5483 foreach my $p (keys %$paths) {
5484 my $i = $paths->{$p};
5485 # Make path relative to our url, not repos_root
5486 $p =~ s/$prefix_regex//;
5487 my %s = map { $_ => $i->$_; }
5488 qw
/copyfrom_path copyfrom_rev action/;
5489 if ($s{'copyfrom_path'}) {
5490 $s{'copyfrom_path'} =~ s/$prefix_regex//;
5498 # the limit parameter was not supported in SVN 1.1.x, so we
5499 # drop it. Therefore, the receiver callback passed to it
5500 # is made aware of this limitation by being wrapped if
5501 # the limit passed to is being wrapped.
5502 if (::compare_svn_version
('1.2.0') <= 0) {
5503 my $limit = splice(@args, 3, 1);
5505 my $receiver = pop @args;
5506 push(@args, sub { &$receiver(@_) if (--$limit >= 0) });
5509 my $ret = $self->SUPER::get_log
(@args, $pool);
5515 my ($self, $url1, $rev1, $url2, $rev2) = @_;
5516 my $ctx = SVN
::Client
->new(auth
=> _auth_providers
);
5517 my $out = IO
::File
->new_tmpfile;
5519 # older SVN (1.1.x) doesn't take $pool as the last parameter for
5520 # $ctx->diff(), so we'll create a default one
5521 my $pool = SVN
::Pool
->new_default_sub;
5523 $ra_invalid = 1; # this will open a new SVN::Ra connection to $url1
5524 $ctx->diff([], $url1, $rev1, $url2, $rev2, 1, 1, 0, $out, $out);
5526 my $ret = (($out->stat)[7] == 0);
5527 close $out or croak
$!;
5532 sub get_commit_editor
{
5533 my ($self, $log, $cb, $pool) = @_;
5535 my @lock = (::compare_svn_version
('1.2.0') >= 0) ?
(undef, 0) : ();
5536 $self->SUPER::get_commit_editor
($log, $cb, @lock, $pool);
5540 my ($self, $rev_a, $rev_b, $gs, $editor) = @_;
5541 my $new = ($rev_a == $rev_b);
5542 my $path = $gs->{path
};
5544 if ($new && -e
$gs->{index}) {
5545 unlink $gs->{index} or die
5546 "Couldn't unlink index: $gs->{index}: $!\n";
5548 my $pool = SVN
::Pool
->new;
5549 $editor->set_path_strip($path);
5550 my (@pc) = split m
#/#, $path;
5551 my $reporter = $self->do_update($rev_b, (@pc ?
shift @pc : ''),
5553 my @lock = (::compare_svn_version
('1.2.0') >= 0) ?
(undef) : ();
5555 # Since we can't rely on svn_ra_reparent being available, we'll
5556 # just have to do some magic with set_path to make it so
5557 # we only want a partial path.
5559 my $final = join('/', @pc);
5561 $reporter->set_path($sp, $rev_b, 0, @lock, $pool);
5562 $sp .= '/' if length $sp;
5565 die "BUG: '$sp' != '$final'\n" if ($sp ne $final);
5567 $reporter->set_path($sp, $rev_a, $new, @lock, $pool);
5569 $reporter->finish_report($pool);
5571 $editor->{git_commit_ok
};
5574 # this requires SVN 1.4.3 or later (do_switch didn't work before 1.4.3, and
5575 # svn_ra_reparent didn't work before 1.4)
5577 my ($self, $rev_a, $rev_b, $gs, $url_b, $editor) = @_;
5578 my $path = $gs->{path
};
5579 my $pool = SVN
::Pool
->new;
5581 my $full_url = $self->{url
};
5582 my $old_url = $full_url;
5583 $full_url .= '/' . $path if length $path;
5584 my ($ra, $reparented);
5586 if ($old_url =~ m
#^svn(\+ssh)?://# ||
5587 ($full_url =~ m
#^https?://# &&
5588 escape_url
($full_url) ne $full_url)) {
5592 $ra = Git
::SVN
::Ra
->new($full_url);
5594 } elsif ($old_url ne $full_url) {
5595 SVN
::_Ra
::svn_ra_reparent
($self->{session
}, $full_url, $pool);
5596 $self->{url
} = $full_url;
5601 $url_b = escape_url
($url_b);
5602 my $reporter = $ra->do_switch($rev_b, '', 1, $url_b, $editor, $pool);
5603 my @lock = (::compare_svn_version
('1.2.0') >= 0) ?
(undef) : ();
5604 $reporter->set_path('', $rev_a, 0, @lock, $pool);
5605 $reporter->finish_report($pool);
5608 SVN
::_Ra
::svn_ra_reparent
($self->{session
}, $old_url, $pool);
5609 $self->{url
} = $old_url;
5613 $editor->{git_commit_ok
};
5616 sub longest_common_path
{
5617 my ($gsv, $globs) = @_;
5619 my $common_max = scalar @
$gsv;
5621 foreach my $gs (@
$gsv) {
5622 my @tmp = split m
#/#, $gs->{path};
5625 $p .= length($p) ?
"/$_" : $_;
5631 $common_max += scalar @
$globs;
5632 foreach my $glob (@
$globs) {
5633 my @tmp = split m
#/#, $glob->{path}->{left};
5636 $p .= length($p) ?
"/$_" : $_;
5642 my $longest_path = '';
5643 foreach (sort {length $b <=> length $a} keys %common) {
5644 if ($common{$_} == $common_max) {
5652 sub gs_fetch_loop_common
{
5653 my ($self, $base, $head, $gsv, $globs) = @_;
5654 return if ($base > $head);
5655 my $inc = $_log_window_size;
5656 my ($min, $max) = ($base, $head < $base + $inc ?
$head : $base + $inc);
5657 my $longest_path = longest_common_path
($gsv, $globs);
5658 my $ra_url = $self->{url
};
5659 my $find_trailing_edge;
5663 my $err_handler = $SVN::Error
::handler
;
5664 $SVN::Error
::handler
= sub {
5666 skip_unknown_revs
($err);
5669 my ($paths, $r, $author, $date, $log) = @_;
5671 { author
=> $author, date
=> $date, log => $log } ];
5673 $self->get_log([$longest_path], $min, $max, 0, 1, 1,
5674 sub { $revs{$_[1]} = _cb
(@_) });
5676 print "Checked through r$max\r";
5678 $find_trailing_edge = 1;
5680 if ($err and $find_trailing_edge) {
5681 print STDERR
"Path '$longest_path' ",
5682 "was probably deleted:\n",
5683 $err->expanded_message,
5684 "\nWill attempt to follow ",
5685 "revisions r$min .. r$max ",
5686 "committed before the deletion\n";
5688 while (--$hi >= $min) {
5690 $self->get_log([$longest_path], $min, $hi,
5693 $revs{$_[1]} = _cb
(@_) });
5695 print STDERR
"r$min .. r$ok OK\n";
5699 $find_trailing_edge = 0;
5701 $SVN::Error
::handler
= $err_handler;
5703 my %exists = map { $_->{path
} => $_ } @
$gsv;
5704 foreach my $r (sort {$a <=> $b} keys %revs) {
5705 my ($paths, $logged) = @
{$revs{$r}};
5707 foreach my $gs ($self->match_globs(\
%exists, $paths,
5709 if ($gs->rev_map_max >= $r) {
5712 next unless $gs->match_paths($paths, $r);
5713 $gs->{logged_rev_props
} = $logged;
5714 if (my $last_commit = $gs->last_commit) {
5715 $gs->assert_index_clean($last_commit);
5717 my $log_entry = $gs->do_fetch($paths, $r);
5719 $gs->do_git_commit($log_entry);
5721 $INDEX_FILES{$gs->{index}} = 1;
5723 foreach my $g (@
$globs) {
5724 my $k = "svn-remote.$g->{remote}." .
5726 Git
::SVN
::tmp_config
($k, $r);
5732 $self = Git
::SVN
::Ra
->new($ra_url);
5733 $ra_invalid = undef;
5736 # pre-fill the .rev_db since it'll eventually get filled in
5737 # with '0' x40 if something new gets committed
5738 foreach my $gs (@
$gsv) {
5739 next if $gs->rev_map_max >= $max;
5740 next if defined $gs->rev_map_get($max);
5741 $gs->rev_map_set($max, 0 x40
);
5743 foreach my $g (@
$globs) {
5744 my $k = "svn-remote.$g->{remote}.$g->{t}-maxRev";
5745 Git
::SVN
::tmp_config
($k, $max);
5747 last if $max >= $head;
5750 $max = $head if ($max > $head);
5755 sub get_dir_globbed
{
5756 my ($self, $left, $depth, $r) = @_;
5758 my @x = eval { $self->get_dir($left, $r) };
5759 return unless scalar @x == 3;
5760 my $dirents = $x[0];
5762 foreach my $de (keys %$dirents) {
5763 next if $dirents->{$de}->{kind
} != $SVN::Node
::dir
;
5765 my @args = ("$left/$de", $depth - 1, $r);
5766 foreach my $dir ($self->get_dir_globbed(@args)) {
5767 push @finalents, "$de/$dir";
5770 push @finalents, $de;
5776 # return value: 0 -- don't ignore, 1 -- ignore
5777 sub is_ref_ignored
{
5779 my $refname = $g->{ref}->full_path($p);
5780 return 1 if defined($g->{ignore_refs_regex
}) &&
5781 $refname =~ m!$g->{ignore_refs_regex}!;
5782 return 0 unless defined($_ignore_refs_regex);
5783 return 1 if $refname =~ m!$_ignore_refs_regex!o;
5788 my ($self, $exists, $paths, $globs, $r) = @_;
5791 my ($self, $exists, $g, $r) = @_;
5793 my @dirs = $self->get_dir_globbed($g->{path
}->{left
},
5794 $g->{path
}->{depth
},
5797 foreach my $de (@dirs) {
5798 my $p = $g->{path
}->full_path($de);
5799 next if $exists->{$p};
5800 next if (length $g->{path
}->{right
} &&
5801 ($self->check_path($p, $r) !=
5803 next unless $p =~ /$g->{path}->{regex}/;
5804 $exists->{$p} = Git
::SVN
->init($self->{url
}, $p, undef,
5805 $g->{ref}->full_path($de), 1);
5808 foreach my $g (@
$globs) {
5809 if (my $path = $paths->{"/$g->{path}->{left}"}) {
5810 if ($path->{action
} =~ /^[AR]$/) {
5811 get_dir_check
($self, $exists, $g, $r);
5814 foreach (keys %$paths) {
5815 if (/$g->{path}->{left_regex}/ &&
5816 !/$g->{path}->{regex}/) {
5817 next if $paths->{$_}->{action
} !~ /^[AR]$/;
5818 get_dir_check
($self, $exists, $g, $r);
5820 next unless /$g->{path}->{regex}/;
5822 my $pathname = $g->{path
}->full_path($p);
5823 next if is_ref_ignored
($g, $p);
5824 next if $exists->{$pathname};
5825 next if ($self->check_path($pathname, $r) !=
5827 $exists->{$pathname} = Git
::SVN
->init(
5828 $self->{url
}, $pathname, undef,
5829 $g->{ref}->full_path($p), 1);
5832 foreach (split m
#/#, $g->{path}->{left}) {
5834 next unless ($paths->{$c} &&
5835 ($paths->{$c}->{action
} =~ /^[AR]$/));
5836 get_dir_check
($self, $exists, $g, $r);
5844 return $self->{url
} if ($self->{url
} eq $self->{repos_root
});
5845 my $url = $self->{repos_root
};
5846 my @components = split(m!/!, $self->{svn_path
});
5849 $url .= "/$c" if length $c;
5851 my $ra = (ref $self)->new($url);
5852 my $latest = $ra->get_latest_revnum;
5853 $ra->get_log("", $latest, 0, 1, 0, 1, sub {});
5855 } while ($@
&& ($c = shift @components));
5861 unless (defined $can_do_switch) {
5862 my $pool = SVN
::Pool
->new;
5864 $self->do_switch(1, '', 0, $self->{url
},
5865 SVN
::Delta
::Editor
->new, $pool);
5870 $rep->abort_report($pool);
5878 sub skip_unknown_revs
{
5880 my $errno = $err->apr_err();
5881 # Maybe the branch we're tracking didn't
5882 # exist when the repo started, so it's
5883 # not an error if it doesn't, just continue
5885 # Wonderfully consistent library, eh?
5886 # 160013 - svn:// and file://
5887 # 175002 - http(s)://
5888 # 175007 - http(s):// (this repo required authorization, too...)
5889 # More codes may be discovered later...
5890 if ($errno == 175007 || $errno == 175002 || $errno == 160013) {
5891 my $err_key = $err->expanded_message;
5892 # revision numbers change every time, filter them out
5893 $err_key =~ s/\d+/\0/g;
5894 $err_key = "$errno\0$err_key";
5895 unless ($ignored_err{$err_key}) {
5896 warn "W: Ignoring error from SVN, path probably ",
5897 "does not exist: ($errno): ",
5898 $err->expanded_message,"\n";
5899 warn "W: Do not be alarmed at the above message ",
5900 "git-svn is just searching aggressively for ",
5902 "This may take a while on large repositories\n";
5903 $ignored_err{$err_key} = 1;
5907 die "Error from SVN, ($errno): ", $err->expanded_message,"\n";
5910 package Git
::SVN
::Log
;
5913 use POSIX qw
/strftime/;
5914 use constant commit_log_separator
=> ('-' x
72) . "\n";
5915 use vars qw
/$TZ $limit $color $pager $non_recursive $verbose $oneline
5916 %rusers $show_commit $incremental/;
5921 return 1 if defined $c->{r
};
5923 # big commit message got truncated by the 16k pretty buffer in rev-list
5924 if ($c->{l
} && $c->{l
}->[-1] eq "...\n" &&
5925 $c->{a_raw
} =~ /\@([a-f\d\-]+)>$/) {
5927 my @log = command
(qw
/cat-file commit/, $c->{c
});
5929 # shift off the headers
5930 shift @log while ($log[0] ne '');
5933 # TODO: make $c->{l} not have a trailing newline in the future
5934 @
{$c->{l
}} = map { "$_\n" } grep !/^git-svn-id: /, @log;
5936 (undef, $c->{r
}, undef) = ::extract_metadata
(
5937 (grep(/^git-svn-id: /, @log))[-1]);
5939 return defined $c->{r
};
5943 return $color || Git
->repository->get_colorbool('color.diff');
5946 sub git_svn_log_cmd
{
5947 my ($r_min, $r_max, @args) = @_;
5949 my (@files, @log_opts);
5950 foreach my $x (@args) {
5951 if ($x eq '--' || @files) {
5954 if (::verify_ref
("$x^0")) {
5962 my ($url, $rev, $uuid, $gs) = ::working_head_info
($head);
5963 $gs ||= Git
::SVN
->_new;
5964 my @cmd = (qw
/log --abbrev-commit --pretty=raw --default/,
5966 push @cmd, '-r' unless $non_recursive;
5967 push @cmd, qw
/--raw --name-status/ if $verbose;
5968 push @cmd, '--color' if log_use_color
();
5969 push @cmd, @log_opts;
5970 if (defined $r_max && $r_max == $r_min) {
5971 push @cmd, '--max-count=1';
5972 if (my $c = $gs->rev_map_get($r_max)) {
5975 } elsif (defined $r_max) {
5976 if ($r_max < $r_min) {
5977 ($r_min, $r_max) = ($r_max, $r_min);
5979 my (undef, $c_max) = $gs->find_rev_before($r_max, 1, $r_min);
5980 my (undef, $c_min) = $gs->find_rev_after($r_min, 1, $r_max);
5981 # If there are no commits in the range, both $c_max and $c_min
5982 # will be undefined. If there is at least 1 commit in the
5983 # range, both will be defined.
5984 return () if !defined $c_min || !defined $c_max;
5985 if ($c_min eq $c_max) {
5986 push @cmd, '--max-count=1', $c_min;
5988 push @cmd, '--boundary', "$c_min..$c_max";
5991 return (@cmd, @files);
5994 # adapted from pager.c
5997 $ENV{GIT_PAGER_IN_USE
} = 'false';
6001 chomp($pager = command_oneline
(qw(var GIT_PAGER)));
6002 if ($pager eq 'cat') {
6005 $ENV{GIT_PAGER_IN_USE
} = defined($pager);
6009 return unless defined $pager;
6010 pipe my ($rfd, $wfd) or return;
6011 defined(my $pid = fork) or ::fatal
"Can't fork: $!";
6013 open STDOUT
, '>&', $wfd or
6014 ::fatal
"Can't redirect to stdout: $!";
6017 open STDIN
, '<&', $rfd or ::fatal
"Can't redirect stdin: $!";
6018 $ENV{LESS
} ||= 'FRSX';
6019 exec $pager or ::fatal
"Can't run pager: $! ($pager)";
6022 sub format_svn_date
{
6023 my $t = shift || time;
6024 my $gmoff = Git
::SVN
::get_tz
($t);
6025 return strftime
("%Y-%m-%d %H:%M:%S $gmoff (%a, %d %b %Y)", localtime($t));
6028 sub parse_git_date
{
6030 # Date::Parse isn't in the standard Perl distro :(
6031 if ($tz =~ s/^\+//) {
6032 $t += tz_to_s_offset
($tz);
6033 } elsif ($tz =~ s/^\-//) {
6034 $t -= tz_to_s_offset
($tz);
6039 sub set_local_timezone
{
6047 sub tz_to_s_offset
{
6050 return ($1 * 60) + ($tz * 3600);
6053 sub get_author_info
{
6054 my ($dest, $author, $t, $tz) = @_;
6055 $author =~ s/(?:^\s*|\s*$)//g;
6056 $dest->{a_raw
} = $author;
6059 $au = $rusers{$author} || undef;
6062 ($au) = ($author =~ /<([^>]+)\@[^>]+>$/);
6067 $dest->{t_utc
} = parse_git_date
($t, $tz);
6070 sub process_commit
{
6071 my ($c, $r_min, $r_max, $defer) = @_;
6072 if (defined $r_min && defined $r_max) {
6073 if ($r_min == $c->{r
} && $r_min == $r_max) {
6077 return 1 if $r_min == $r_max;
6078 if ($r_min < $r_max) {
6079 # we need to reverse the print order
6080 return 0 if (defined $limit && --$limit < 0);
6084 if ($r_min != $r_max) {
6085 return 1 if ($r_min < $c->{r
});
6086 return 1 if ($r_max > $c->{r
});
6089 return 0 if (defined $limit && --$limit < 0);
6098 if (my $l = $c->{l
}) {
6099 while ($l->[0] =~ /^\s*$/) { shift @
$l }
6102 $l_fmt ||= 'A' . length($c->{r
});
6103 print 'r',pack($l_fmt, $c->{r
}),' | ';
6104 print "$c->{c} | " if $show_commit;
6107 show_commit_normal
($c);
6111 sub show_commit_changed_paths
{
6113 return unless $c->{changed
};
6114 print "Changed paths:\n", @
{$c->{changed
}};
6117 sub show_commit_normal
{
6119 print commit_log_separator
, "r$c->{r} | ";
6120 print "$c->{c} | " if $show_commit;
6121 print "$c->{a} | ", format_svn_date
($c->{t_utc
}), ' | ';
6124 if (my $l = $c->{l
}) {
6125 while ($l->[$#$l] eq "\n" && $#$l > 0
6126 && $l->[($#$l - 1)] eq "\n") {
6129 $nr_line = scalar @
$l;
6131 print "1 line\n\n\n";
6133 if ($nr_line == 1) {
6134 $nr_line = '1 line';
6136 $nr_line .= ' lines';
6138 print $nr_line, "\n";
6139 show_commit_changed_paths
($c);
6141 print $_ foreach @
$l;
6145 show_commit_changed_paths
($c);
6149 foreach my $x (qw
/raw stat diff/) {
6152 print $_ foreach @
{$c->{$x}}
6159 my ($r_min, $r_max);
6160 my $r_last = -1; # prevent dupes
6161 set_local_timezone
();
6162 if (defined $::_revision
) {
6163 if ($::_revision
=~ /^(\d+):(\d+)$/) {
6164 ($r_min, $r_max) = ($1, $2);
6165 } elsif ($::_revision
=~ /^\d+$/) {
6166 $r_min = $r_max = $::_revision
;
6168 ::fatal
"-r$::_revision is not supported, use ",
6169 "standard 'git log' arguments instead";
6174 @args = git_svn_log_cmd
($r_min, $r_max, @args);
6176 print commit_log_separator
unless $incremental || $oneline;
6179 my $log = command_output_pipe
(@args);
6181 my (@k, $c, $d, $stat);
6182 my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/;
6184 if (/^${esc_color}commit (?:- )?($::sha1_short)/o) {
6186 if ($c && cmt_showable
($c) && $c->{r
} != $r_last) {
6188 process_commit
($c, $r_min, $r_max, \
@k) or
6193 } elsif (/^${esc_color}author (.+) (\d+) ([\-\+]?\d+)$/o) {
6194 get_author_info
($c, $1, $2, $3);
6195 } elsif (/^${esc_color}(?:tree|parent|committer) /o) {
6197 } elsif (/^${esc_color}:\d{6} \d{6} $::sha1_short/o) {
6198 push @
{$c->{raw
}}, $_;
6199 } elsif (/^${esc_color}[ACRMDT]\t/) {
6200 # we could add $SVN->{svn_path} here, but that requires
6201 # remote access at the moment (repo_path_split)...
6202 s
#^(${esc_color})([ACRMDT])\t#$1 $2 #o;
6203 push @
{$c->{changed
}}, $_;
6204 } elsif (/^${esc_color}diff /o) {
6206 push @
{$c->{diff
}}, $_;
6208 push @
{$c->{diff
}}, $_;
6209 } elsif (/^\
.+\ \
|\s
*\d
+\
$esc_color[\
+\
-]*
6210 $esc_color*[\
+\
-]*$esc_color$/x
) {
6212 push @
{$c->{stat}}, $_;
6213 } elsif ($stat && /^ \d+ files changed, \d+ insertions/) {
6214 push @
{$c->{stat}}, $_;
6216 } elsif (/^${esc_color} (git-svn-id:.+)$/o) {
6217 ($c->{url
}, $c->{r
}, undef) = ::extract_metadata
($1);
6218 } elsif (s/^${esc_color} //o) {
6219 push @
{$c->{l
}}, $_;
6222 if ($c && defined $c->{r
} && $c->{r
} != $r_last) {
6224 process_commit
($c, $r_min, $r_max, \
@k);
6227 ($r_min, $r_max) = ($r_max, $r_min);
6228 process_commit
($_, $r_min, $r_max) foreach reverse @k;
6232 print commit_log_separator
unless $incremental || $oneline;
6241 my ($fh, $ctx, $rev);
6244 ($fh, $ctx) = command_output_pipe
('blame', @_, $path);
6245 while (my $line = <$fh>) {
6246 if ($line =~ /^\^?([[:xdigit:]]+)\s/) {
6247 # Uncommitted edits show up as a rev ID of
6248 # all zeros, which we can't look up with
6251 (undef, $rev, undef) =
6253 $rev = '0' if (!$rev);
6257 $rev = sprintf('%-10s', $rev);
6258 $line =~ s/^\^?[[:xdigit:]]+(\s)/$rev$1/;
6263 ($fh, $ctx) = command_output_pipe
('blame', '-p', @_, 'HEAD',
6268 my %dsha; #distinct sha keys
6270 while (my $line = <$fh>) {
6271 push @buffer, $line;
6272 if ($line =~ /^([[:xdigit:]]{40})\s\d+\s\d+/) {
6277 my $s2r = ::cmt_sha2rev_batch
([keys %dsha]);
6279 foreach my $line (@buffer) {
6280 if ($line =~ /^([[:xdigit:]]{40})\s\d+\s\d+/) {
6282 $rev = '0' if (!$rev)
6284 elsif ($line =~ /^author (.*)/) {
6285 $authors{$rev} = $1;
6286 $authors{$rev} =~ s/\s/_/g;
6288 elsif ($line =~ /^\t(.*)$/) {
6289 printf("%6s %10s %s\n", $rev, $authors{$rev}, $1);
6293 command_close_pipe
($fh, $ctx);
6296 package Git
::SVN
::Migration
;
6297 # these version numbers do NOT correspond to actual version numbers
6298 # of git nor git-svn. They are just relative.
6300 # v0 layout: .git/$id/info/url, refs/heads/$id-HEAD
6302 # v1 layout: .git/$id/info/url, refs/remotes/$id
6304 # v2 layout: .git/svn/$id/info/url, refs/remotes/$id
6306 # v3 layout: .git/svn/$id, refs/remotes/$id
6307 # - info/url may remain for backwards compatibility
6308 # - this is what we migrate up to this layout automatically,
6309 # - this will be used by git svn init on single branches
6310 # v3.1 layout (auto migrated):
6311 # - .rev_db => .rev_db.$UUID, .rev_db will remain as a symlink
6312 # for backwards compatibility
6314 # v4 layout: .git/svn/$repo_id/$id, refs/remotes/$repo_id/$id
6315 # - this is only created for newly multi-init-ed
6316 # repositories. Similar in spirit to the
6317 # --use-separate-remotes option in git-clone (now default)
6318 # - we do not automatically migrate to this (following
6319 # the example set by core git)
6321 # v5 layout: .rev_db.$UUID => .rev_map.$UUID
6322 # - newer, more-efficient format that uses 24-bytes per record
6323 # with no filler space.
6324 # - use xxd -c24 < .rev_map.$UUID to view and debug
6325 # - This is a one-way migration, repositories updated to the
6326 # new format will not be able to use old git-svn without
6327 # rebuilding the .rev_db. Rebuilding the rev_db is not
6328 # possible if noMetadata or useSvmProps are set; but should
6329 # be no problem for users that use the (sensible) defaults.
6333 use File
::Path qw
/mkpath/;
6334 use File
::Basename qw
/dirname basename/;
6335 use vars qw
/$_minimize/;
6337 sub migrate_from_v0
{
6338 my $git_dir = $ENV{GIT_DIR
};
6339 return undef unless -d
$git_dir;
6340 my ($fh, $ctx) = command_output_pipe
(qw
/rev-parse --symbolic --all/);
6344 my ($id, $orig_ref) = ($_, $_);
6345 next unless $id =~ s
#^refs/heads/(.+)-HEAD$#$1#;
6346 next unless -f
"$git_dir/$id/info/url";
6347 my $new_ref = "refs/remotes/$id";
6348 if (::verify_ref
("$new_ref^0")) {
6349 print STDERR
"W: $orig_ref is probably an old ",
6350 "branch used by an ancient version of ",
6352 "However, $new_ref also exists.\n",
6353 "We will not be able ",
6354 "to use this branch until this ",
6355 "ambiguity is resolved.\n";
6358 print STDERR
"Migrating from v0 layout...\n" if !$migrated;
6359 print STDERR
"Renaming ref: $orig_ref => $new_ref\n";
6360 command_noisy
('update-ref', $new_ref, $orig_ref);
6361 command_noisy
('update-ref', '-d', $orig_ref, $orig_ref);
6364 command_close_pipe
($fh, $ctx);
6365 print STDERR
"Done migrating from v0 layout...\n" if $migrated;
6369 sub migrate_from_v1
{
6370 my $git_dir = $ENV{GIT_DIR
};
6372 return $migrated unless -d
$git_dir;
6373 my $svn_dir = "$git_dir/svn";
6375 # just in case somebody used 'svn' as their $id at some point...
6376 return $migrated if -d
$svn_dir && ! -f
"$svn_dir/info/url";
6378 print STDERR
"Migrating from a git-svn v1 layout...\n";
6380 print STDERR
"Data from a previous version of git-svn exists, but\n\t",
6381 "$svn_dir\n\t(required for this version ",
6382 "($::VERSION) of git-svn) does not exist.\n";
6383 my ($fh, $ctx) = command_output_pipe
(qw
/rev-parse --symbolic --all/);
6386 next unless $x =~ s
#^refs/remotes/##;
6388 next unless -f
"$git_dir/$x/info/url";
6389 my $u = eval { ::file_to_s
("$git_dir/$x/info/url") };
6391 my $dn = dirname
("$git_dir/svn/$x");
6392 mkpath
([$dn]) unless -d
$dn;
6393 if ($x eq 'svn') { # they used 'svn' as GIT_SVN_ID:
6394 mkpath
(["$git_dir/svn/svn"]);
6395 print STDERR
" - $git_dir/$x/info => ",
6396 "$git_dir/svn/$x/info\n";
6397 rename "$git_dir/$x/info", "$git_dir/svn/$x/info" or
6399 # don't worry too much about these, they probably
6400 # don't exist with repos this old (save for index,
6401 # and we can easily regenerate that)
6402 foreach my $f (qw
/unhandled.log index .rev_db/) {
6403 rename "$git_dir/$x/$f", "$git_dir/svn/$x/$f";
6406 print STDERR
" - $git_dir/$x => $git_dir/svn/$x\n";
6407 rename "$git_dir/$x", "$git_dir/svn/$x" or
6412 command_close_pipe
($fh, $ctx);
6413 print STDERR
"Done migrating from a git-svn v1 layout\n";
6418 my ($l_map, $pfx, $path) = @_;
6420 foreach (<$path/*>) {
6421 if (-r
"$_/info/url") {
6422 $pfx .= '/' if $pfx && $pfx !~ m
!/$!;
6423 my $ref_id = $pfx . basename
$_;
6424 my $url = ::file_to_s
("$_/info/url");
6425 $l_map->{$ref_id} = $url;
6432 $x =~ s!^\Q$ENV{GIT_DIR}\E/svn/!!o;
6433 read_old_urls
($l_map, $x, $_);
6437 sub migrate_from_v2
{
6438 my @cfg = command
(qw
/config -l/);
6439 return if grep /^svn-remote\..+\.url=/, @cfg;
6441 read_old_urls
(\
%l_map, '', "$ENV{GIT_DIR}/svn");
6444 foreach my $ref_id (sort keys %l_map) {
6445 eval { Git
::SVN
->init($l_map{$ref_id}, '', undef, $ref_id) };
6447 Git
::SVN
->init($l_map{$ref_id}, '', $ref_id, $ref_id);
6454 sub minimize_connections
{
6455 my $r = Git
::SVN
::read_all_remotes
();
6457 my $root_repos = {};
6458 foreach my $repo_id (keys %$r) {
6459 my $url = $r->{$repo_id}->{url
} or next;
6460 my $fetch = $r->{$repo_id}->{fetch
} or next;
6461 my $ra = Git
::SVN
::Ra
->new($url);
6463 # skip existing cases where we already connect to the root
6464 if (($ra->{url
} eq $ra->{repos_root
}) ||
6465 ($ra->{repos_root
} eq $repo_id)) {
6466 $root_repos->{$ra->{url
}} = $repo_id;
6470 my $root_ra = Git
::SVN
::Ra
->new($ra->{repos_root
});
6471 my $root_path = $ra->{url
};
6472 $root_path =~ s
#^\Q$ra->{repos_root}\E(/|$)##;
6473 foreach my $path (keys %$fetch) {
6474 my $ref_id = $fetch->{$path};
6475 my $gs = Git
::SVN
->new($ref_id, $repo_id, $path);
6477 # make sure we can read when connecting to
6478 # a higher level of a repository
6479 my ($last_rev, undef) = $gs->last_rev_commit;
6480 if (!defined $last_rev) {
6482 $root_ra->get_latest_revnum;
6486 my $new = $root_path;
6487 $new .= length $path ?
"/$path" : '';
6489 $root_ra->get_log([$new], $last_rev, $last_rev,
6493 $new_urls->{$ra->{repos_root
}}->{$new} =
6494 { ref_id
=> $ref_id,
6495 old_repo_id
=> $repo_id,
6496 old_path
=> $path };
6501 foreach my $url (keys %$new_urls) {
6502 # see if we can re-use an existing [svn-remote "repo_id"]
6503 # instead of creating a(n ugly) new section:
6504 my $repo_id = $root_repos->{$url} || $url;
6506 my $fetch = $new_urls->{$url};
6507 foreach my $path (keys %$fetch) {
6508 my $x = $fetch->{$path};
6509 Git
::SVN
->init($url, $path, $repo_id, $x->{ref_id
});
6510 my $pfx = "svn-remote.$x->{old_repo_id}";
6512 my $old_fetch = quotemeta("$x->{old_path}:".
6514 command_noisy
(qw
/config --unset/,
6515 "$pfx.fetch", '^'. $old_fetch . '$');
6516 delete $r->{$x->{old_repo_id
}}->
6517 {fetch
}->{$x->{old_path
}};
6518 if (!keys %{$r->{$x->{old_repo_id
}}->{fetch
}}) {
6519 command_noisy
(qw
/config --unset/,
6521 push @emptied, $x->{old_repo_id
}
6526 my $file = $ENV{GIT_CONFIG
} || "$ENV{GIT_DIR}/config";
6528 The following [svn-remote] sections in your config file ($file) are empty
6529 and can be safely removed:
6531 print STDERR
"[svn-remote \"$_\"]\n" foreach @emptied;
6535 sub migration_check
{
6539 minimize_connections
() if $_minimize;
6542 package Git
::IndexInfo
;
6545 use Git qw
/command_input_pipe command_close_pipe/;
6549 my ($gui, $ctx) = command_input_pipe
(qw
/update-index -z --index-info/);
6550 bless { gui
=> $gui, ctx
=> $ctx, nr
=> 0}, $class;
6554 my ($self, $path) = @_;
6555 if (print { $self->{gui
} } '0 ', 0 x
40, "\t", $path, "\0") {
6556 return ++$self->{nr
};
6562 my ($self, $mode, $hash, $path) = @_;
6563 if (print { $self->{gui
} } $mode, ' ', $hash, "\t", $path, "\0") {
6564 return ++$self->{nr
};
6571 command_close_pipe
($self->{gui
}, $self->{ctx
});
6574 package Git
::SVN
::GlobSpec
;
6579 my ($class, $glob, $pattern_ok) = @_;
6581 $re =~ s!/+$!!g; # no need for trailing slashes
6582 my (@left, @right, @patterns);
6584 my $die_msg = "Only one set of wildcard directories " .
6585 "(e.g. '*' or '*/*/*') is supported: '$glob'\n";
6586 for my $part (split(m
|/|, $glob)) {
6587 if ($part =~ /\*/ && $part ne "*") {
6588 die "Invalid pattern in '$glob': $part\n";
6589 } elsif ($pattern_ok && $part =~ /[{}]/ &&
6590 $part !~ /^\{[^{}]+\}/) {
6591 die "Invalid pattern in '$glob': $part\n";
6594 die $die_msg if $state eq "right";
6596 push(@patterns, "[^/]*");
6597 } elsif ($pattern_ok && $part =~ /^\{(.*)\}$/) {
6598 die $die_msg if $state eq "right";
6600 my $p = quotemeta($1);
6602 push(@patterns, "(?:$p)");
6604 if ($state eq "left") {
6607 push(@right, $part);
6612 my $depth = @patterns;
6614 die "One '*' is needed in glob: '$glob'\n";
6616 my $left = join('/', @left);
6617 my $right = join('/', @right);
6618 $re = join('/', @patterns);
6620 grep(length, quotemeta($left), "($re)", quotemeta($right)));
6621 my $left_re = qr/^\/\Q
$left\E
(\
/|$)/;
6622 bless { left
=> $left, right
=> $right, left_regex
=> $left_re,
6623 regex
=> qr/$re/, glob => $glob, depth
=> $depth }, $class;
6627 my ($self, $path) = @_;
6628 return (length $self->{left
} ?
"$self->{left}/" : '') .
6629 $path . (length $self->{right
} ?
"/$self->{right}" : '');
6637 $remotes = { # returned by read_all_remotes()
6639 # svn-remote.svn.url=https://svn.musicpd.org
6640 url
=> 'https://svn.musicpd.org',
6641 # svn-remote.svn.fetch=mpd/trunk:trunk
6643 'mpd/trunk' => 'trunk',
6645 # svn-remote.svn.tags=mpd/tags/*:tags/*
6650 regex
=> qr!mpd/tags/([^/]+)$!,
6656 regex
=> qr!tags/([^/]+)$!,
6663 $log_entry hashref as returned by libsvn_log_entry
()
6665 log => 'whitespace-formatted log entry
6666 ', # trailing newline is preserved
6667 revision
=> '8', # integer
6668 date
=> '2004-02-24T17:01:44.108345Z', # commit date
6669 author
=> 'committer name'
6673 # this is generated by generate_diff();
6674 @mods = array of diff
-index line hashes
, each element represents one line
6675 of diff
-index output
6677 diff
-index line
($m hash
)
6679 mode_a
=> first column of diff
-index output
, no leading
':',
6680 mode_b
=> second column of diff
-index output
,
6681 sha1_b
=> sha1sum of the final blob
,
6682 chg
=> change type
[MCRADT
],
6683 file_a
=> original file name of a file
(iff chg is
'C' or 'R')
6684 file_b
=> new
/current file name of a file
(any chg
)
6688 # retval of read_url_paths{,_all}();
6690 # repository root url
6691 'https://svn.musicpd.org' => {
6692 # repository path # GIT_SVN_ID
6693 'mpd/trunk' => 'trunk',
6694 'mpd/tags/0.11.5' => 'tags/0.11.5',
6699 I don
't trust the each() function on unless I created %hash myself
6700 because the internal iterator may not have started at base.