]> git.ipfire.org Git - thirdparty/git.git/blame - git-svn.perl
projects / thirdparty / git.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
git svn: add an option to recode pathnames
[thirdparty/git.git] / git-svn.perl
CommitLineData
3397f9df 1#!/usr/bin/env perl
551ce28f
EW		 2# Copyright (C) 2006, Eric Wong <normalperson@yhbt.net>
3# License: GPL v2 or later
3397f9df
EW		 4use warnings;
5use strict;
6use vars qw/ $AUTHOR $VERSION
ffe256f9 7 $sha1 $sha1_short $_revision $_repository
36db1edd 8 $_q $_authors $_authors_prog %users/;
3397f9df 9$AUTHOR = 'Eric Wong <normalperson@yhbt.net>';
60d02ccc 10$VERSION = '@@GIT_VERSION@@';
13ccd6d4 11
15153451
BS		 12# From which subdir have we been invoked?
13my $cmd_dir_prefix = eval {
14 command_oneline([qw/rev-parse --show-prefix/], STDERR => 0)
15} || '';
16
5253dc33 17my $git_dir_user_set = 1 if defined $ENV{GIT_DIR};
706587fc 18$ENV{GIT_DIR} ||= '.git';
9fa00b65 19$Git::SVN::default_repo_id = 'svn';
8b8fc068 20$Git::SVN::default_ref_id = $ENV{GIT_SVN_ID} || 'git-svn';
6af1db44 21$Git::SVN::Ra::_log_window_size = 100;
6b48829d 22$Git::SVN::_minimize_url = 'unset';
13ccd6d4 23
f3a87d92
K		 24if (! exists $ENV{SVN_SSH}) {
25 if (exists $ENV{GIT_SSH}) {
26 $ENV{SVN_SSH} = $ENV{GIT_SSH};
27 if ($^O eq 'msys') {
28 $ENV{SVN_SSH} =~ s/\\/\\\\/g;
a004fb92 29 $ENV{SVN_SSH} =~ s/(.*)/"$1"/;
f3a87d92
K		 30 }
31 }
32}
33
f8c9d1d2 34$Git::SVN::Log::TZ = $ENV{TZ};
3397f9df 35$ENV{TZ} = 'UTC';
a00439ac 36$| = 1; # unbuffer STDOUT
3397f9df 37
207f1a75 38sub fatal (@) { print STDERR "@_\n"; exit 1 }
d32fad2b 39sub _req_svn {
40 require SVN::Core; # use()-ing this causes segfaults for me... *shrug*
41 require SVN::Ra;
42 require SVN::Delta;
43 if ($SVN::Core::VERSION lt '1.1.0') {
44 fatal "Need SVN::Core 1.1.0 or better (got $SVN::Core::VERSION)";
45 }
b9c85187 46}
2da9ee08 47my $can_compress = eval { require Compress::Zlib; 1};
d81bf827 48push @Git::SVN::Ra::ISA, 'SVN::Ra';
b9c85187
EW		 49push @SVN::Git::Editor::ISA, 'SVN::Delta::Editor';
50push @SVN::Git::Fetcher::ISA, 'SVN::Delta::Editor';
3397f9df 51use Carp qw/croak/;
8d7c4fad 52use Digest::MD5;
3397f9df
EW		 53use IO::File qw//;
54use File::Basename qw/dirname basename/;
55use File::Path qw/mkpath/;
36db1edd 56use File::Spec;
2da9ee08 57use File::Find;
512b620b 58use Getopt::Long qw/:config gnu_getopt no_ignore_case auto_abbrev/;
968bdf1f 59use IPC::Open3;
336f1714 60use Git;
a5e0cedc 61
336f1714 62BEGIN {
c5f71ad0
SV		 63 # import functions from Git into our packages, en masse
64 no strict 'refs';
336f1714 65 foreach (qw/command command_oneline command_noisy command_output_pipe
6ea42032
BB		 66 command_input_pipe command_close_pipe
67 command_bidi_pipe command_close_bidi_pipe/) {
c5f71ad0 68 for my $package ( qw(SVN::Git::Editor SVN::Git::Fetcher
8d7c4fad 69 Git::SVN::Migration Git::SVN::Log Git::SVN),
c5f71ad0
SV		 70 __PACKAGE__) {
71 *{"${package}::$_"} = \&{"Git::$_"};
72 }
336f1714 73 }
336f1714
EW		 74}
75
b9c85187 76my ($SVN);
83e9940a 77
f8c9d1d2
EW		 78$sha1 = qr/[a-f\d]{40}/;
79$sha1_short = qr/[a-f\d]{4,40}/;
44320b9e 80my ($_stdin, $_help, $_edit,
62244069 81 $_message, $_file, $_branch_dest,
d05d72e0 82 $_template, $_shared,
c2abd83f 83 $_version, $_fetch_all, $_no_rebase, $_fetch_parent,
dee41f3e 84 $_merge, $_strategy, $_dry_run, $_local,
4be40381 85 $_prefix, $_no_checkout, $_url, $_verbose,
5de70efb 86 $_git_format, $_commit_url, $_tag);
0bed5eaa 87$Git::SVN::_follow_parent = 1;
49750f30 88$_q ||= 0;
706587fc
EW		 89my %remote_opts = ( 'username=s' => \$Git::SVN::Prompt::_username,
90 'config-dir=s' => \$Git::SVN::Ra::config_dir,
edc662f9
VS		 91 'no-auth-cache' => \$Git::SVN::Prompt::_no_auth_cache,
92 'ignore-paths=s' => \$SVN::Git::Fetcher::_ignore_regex );
0bed5eaa 93my %fc_opts = ( 'follow-parent|follow!' => \$Git::SVN::_follow_parent,
dc5869c0 94 'authors-file|A=s' => \$_authors,
36db1edd 95 'authors-prog=s' => \$_authors_prog,
ecc712dd 96 'repack:i' => \$Git::SVN::_repack,
97ae0911
EW		 97 'noMetadata' => \$Git::SVN::_no_metadata,
98 'useSvmProps' => \$Git::SVN::_use_svm_props,
62e349d2 99 'useSvnsyncProps' => \$Git::SVN::_use_svnsync_props,
6af1db44 100 'log-window-size=i' => \$Git::SVN::Ra::_log_window_size,
1e889ef3 101 'no-checkout' => \$_no_checkout,
49750f30 102 'quiet|q+' => \$_q,
ecc712dd
EW		 103 'repack-flags|repack-args|repack-opts=s' =>
104 \$Git::SVN::_repack_flags,
70ae04e4 105 'use-log-author' => \$Git::SVN::_use_log_author,
6aa9ba14 106 'add-author-from' => \$Git::SVN::_add_author_from,
e82f0d73 107 'localtime' => \$Git::SVN::_localtime,
706587fc 108 %remote_opts );
36f5b1f0 109
62244069 110my ($_trunk, @_tags, @_branches, $_stdlayout);
0dfaf0a4 111my %icv;
dadc6d2a 112my %init_opts = ( 'template=s' => \$_template, 'shared:s' => \$_shared,
62244069
MB		 113 'trunk|T=s' => \$_trunk, 'tags|t=s@' => \@_tags,
114 'branches|b=s@' => \@_branches, 'prefix=s' => \$_prefix,
8f728fb9 115 'stdlayout|s' => \$_stdlayout,
6b48829d 116 'minimize-url|m!' => \$Git::SVN::_minimize_url,
0dfaf0a4
EW		 117 'no-metadata' => sub { $icv{noMetadata} = 1 },
118 'use-svm-props' => sub { $icv{useSvmProps} = 1 },
119 'use-svnsync-props' => sub { $icv{useSvnsyncProps} = 1 },
120 'rewrite-root=s' => sub { $icv{rewriteRoot} = $_[1] },
3e18ce1a 121 'rewrite-uuid=s' => sub { $icv{rewriteUUID} = $_[1] },
dadc6d2a 122 %remote_opts );
27e9fb8d 123my %cmt_opts = ( 'edit|e' => \$_edit,
24e22aa8
EW		 124 'rmdir' => \$SVN::Git::Editor::_rmdir,
125 'find-copies-harder' => \$SVN::Git::Editor::_find_copies_harder,
126 'l=i' => \$SVN::Git::Editor::_rename_limit,
127 'copy-similarity|C=i'=> \$SVN::Git::Editor::_cp_similarity
27e9fb8d 128);
9d55b41a 129
3397f9df 130my %cmd = (
2a3240be 131 fetch => [ \&cmd_fetch, "Download new revisions from SVN",
e98671e5 132 { 'revision|r=s' => \$_revision,
905f8b7d 133 'fetch-all|all' => \$_fetch_all,
c2abd83f 134 'parent|p' => \$_fetch_parent,
e98671e5 135 %fc_opts } ],
0425ea90
EW		 136 clone => [ \&cmd_clone, "Initialize and fetch revisions",
137 { 'revision|r=s' => \$_revision,
138 %fc_opts, %init_opts } ],
d2866f9e 139 init => [ \&cmd_init, "Initialize a repo for tracking" .
f8ab6b73 140 " (requires URL argument)",
9d55b41a 141 \%init_opts ],
dadc6d2a
EW		 142 'multi-init' => [ \&cmd_multi_init,
143 "Deprecated alias for ".
144 "'$0 init -T<trunk> -b<branches> -t<tags>'",
145 \%init_opts ],
d7ad3bed
EW		 146 dcommit => [ \&cmd_dcommit,
147 'Commit several diffs to merge with upstream',
3289e86e
EW		 148 { 'merge|m|M' => \$_merge,
149 'strategy|s=s' => \$_strategy,
905f8b7d 150 'verbose|v' => \$_verbose,
3289e86e 151 'dry-run|n' => \$_dry_run,
905f8b7d 152 'fetch-all|all' => \$_fetch_all,
ba24e745
EW		 153 'commit-url=s' => \$_commit_url,
154 'revision|r=i' => \$_revision,
171af110 155 'no-rebase' => \$_no_rebase,
4b155223 156 %cmt_opts, %fc_opts } ],
5de70efb
FR		 157 branch => [ \&cmd_branch,
158 'Create a branch in the SVN repository',
159 { 'message|m=s' => \$_message,
62244069 160 'destination|d=s' => \$_branch_dest,
5de70efb 161 'dry-run|n' => \$_dry_run,
6594f0b7
IM		 162 'tag|t' => \$_tag,
163 'username=s' => \$Git::SVN::Prompt::_username,
164 'commit-url=s' => \$_commit_url } ],
5de70efb
FR		 165 tag => [ sub { $_tag = 1; cmd_branch(@_) },
166 'Create a tag in the SVN repository',
167 { 'message|m=s' => \$_message,
62244069 168 'destination|d=s' => \$_branch_dest,
6594f0b7
IM		 169 'dry-run|n' => \$_dry_run,
170 'username=s' => \$Git::SVN::Prompt::_username,
171 'commit-url=s' => \$_commit_url } ],
1ce255dc
EW		 172 'set-tree' => [ \&cmd_set_tree,
173 "Set an SVN repository to a git tree-ish",
e84dc6df 174 { 'stdin' => \$_stdin, %cmt_opts, %fc_opts, } ],
d05ddec5
BS		 175 'create-ignore' => [ \&cmd_create_ignore,
176 'Create a .gitignore per svn:ignore',
177 { 'revision|r=i' => \$_revision
178 } ],
6111b934
EW		 179 'mkdirs' => [ \&cmd_mkdirs ,
180 "recreate empty directories after a checkout",
181 { 'revision|r=i' => \$_revision } ],
15153451
BS		 182 'propget' => [ \&cmd_propget,
183 'Print the value of a property on a file or directory',
184 { 'revision|r=i' => \$_revision } ],
51e057cf
BS		 185 'proplist' => [ \&cmd_proplist,
186 'List all properties of a file or directory',
187 { 'revision|r=i' => \$_revision } ],
5969cbe1 188 'show-ignore' => [ \&cmd_show_ignore, "Show svn:ignore listings",
4dbfe2e9 189 { 'revision|r=i' => \$_revision
05b4df31 190 } ],
2d879792
VK		 191 'show-externals' => [ \&cmd_show_externals, "Show svn:externals listings",
192 { 'revision|r=i' => \$_revision
193 } ],
1c8443b0 194 'multi-fetch' => [ \&cmd_multi_fetch,
e98671e5
EW		 195 "Deprecated alias for $0 fetch --all",
196 { 'revision|r=s' => \$_revision, %fc_opts } ],
706587fc
EW		 197 'migrate' => [ sub { },
198 # no-op, we automatically run this anyways,
706587fc
EW		 199 'Migrate configuration/metadata/layout from
200 previous versions of git-svn',
a836a0e1
EW		 201 { 'minimize' => \$Git::SVN::Migration::_minimize,
202 %remote_opts } ],
f8c9d1d2
EW		 203 'log' => [ \&Git::SVN::Log::cmd_show_log, 'Show commit logs',
204 { 'limit=i' => \$Git::SVN::Log::limit,
79bb8d88 205 'revision|r=s' => \$_revision,
f8c9d1d2
EW		 206 'verbose|v' => \$Git::SVN::Log::verbose,
207 'incremental' => \$Git::SVN::Log::incremental,
208 'oneline' => \$Git::SVN::Log::oneline,
209 'show-commit' => \$Git::SVN::Log::show_commit,
210 'non-recursive' => \$Git::SVN::Log::non_recursive,
79bb8d88 211 'authors-file|A=s' => \$_authors,
f8c9d1d2 212 'color' => \$Git::SVN::Log::color,
4dbfe2e9 213 'pager=s' => \$Git::SVN::Log::pager
79bb8d88 214 } ],
222566e4
EW		 215 'find-rev' => [ \&cmd_find_rev,
216 "Translate between SVN revision numbers and tree-ish",
4dbfe2e9 217 {} ],
905f8b7d
EW		 218 'rebase' => [ \&cmd_rebase, "Fetch and rebase your working directory",
219 { 'merge|m|M' => \$_merge,
220 'verbose|v' => \$_verbose,
221 'strategy|s=s' => \$_strategy,
dee41f3e 222 'local|l' => \$_local,
905f8b7d 223 'fetch-all|all' => \$_fetch_all,
7d45e146 224 'dry-run|n' => \$_dry_run,
905f8b7d 225 %fc_opts } ],
44320b9e
EW		 226 'commit-diff' => [ \&cmd_commit_diff,
227 'Commit a diff between two trees',
27e9fb8d
EW		 228 { 'message|m=s' => \$_message,
229 'file|F=s' => \$_file,
45bf473a 230 'revision|r=s' => \$_revision,
27e9fb8d 231 %cmt_opts } ],
e6fefa92
DK		 232 'info' => [ \&cmd_info,
233 "Show info about the latest SVN revision
234 on the current branch",
8b014d71 235 { 'url' => \$_url, } ],
6fb5375e
TS		 236 'blame' => [ \&Git::SVN::Log::cmd_blame,
237 "Show what revision and author last modified each line of a file",
4be40381 238 { 'git-format' => \$_git_format } ],
195643f2
BJ		 239 'reset' => [ \&cmd_reset,
240 "Undo fetches back to the specified SVN revision",
241 { 'revision|r=s' => \$_revision,
242 'parent|p' => \$_fetch_parent } ],
2da9ee08
RZ		 243 'gc' => [ \&cmd_gc,
244 "Compress unhandled.log files in .git/svn and remove " .
245 "index files in .git/svn",
246 {} ],
3397f9df 247);
9d55b41a 248
3397f9df
EW		 249my $cmd;
250for (my $i = 0; $i < @ARGV; $i++) {
251 if (defined $cmd{$ARGV[$i]}) {
252 $cmd = $ARGV[$i];
253 splice @ARGV, $i, 1;
254 last;
9a8c92ac
BJ		 255 } elsif ($ARGV[$i] eq 'help') {
256 $cmd = $ARGV[$i+1];
257 usage(0);
3397f9df
EW		 258 }
259};
260
540424b2
EW		 261# make sure we're always running at the top-level working directory
262unless ($cmd && $cmd =~ /(?:clone|init|multi-init)$/) {
5253dc33
EW		 263 unless (-d $ENV{GIT_DIR}) {
264 if ($git_dir_user_set) {
265 die "GIT_DIR=$ENV{GIT_DIR} explicitly set, ",
266 "but it is not a directory\n";
267 }
268 my $git_dir = delete $ENV{GIT_DIR};
fe4003f6
DM		 269 my $cdup = undef;
270 git_cmd_try {
271 $cdup = command_oneline(qw/rev-parse --show-cdup/);
272 $git_dir = '.' unless ($cdup);
273 chomp $cdup if ($cdup);
274 $cdup = "." unless ($cdup && length $cdup);
275 } "Already at toplevel, but $git_dir not found\n";
5253dc33
EW		 276 chdir $cdup or die "Unable to chdir up to '$cdup'\n";
277 unless (-d $git_dir) {
278 die "$git_dir still not found after going to ",
279 "'$cdup'\n";
280 }
281 $ENV{GIT_DIR} = $git_dir;
282 }
ffe256f9 283 $_repository = Git->repository(Repository => $ENV{GIT_DIR});
5253dc33 284}
f4dd334b
GH		 285
286my %opts = %{$cmd{$cmd}->[2]} if (defined $cmd);
287
1a30582b 288read_git_config(\%opts);
222566e4
EW		 289if ($cmd && ($cmd eq 'log' || $cmd eq 'blame')) {
290 Getopt::Long::Configure('pass_through');
291}
f4dd334b
GH		 292my $rv = GetOptions(%opts, 'help|H|h' => \$_help, 'version|V' => \$_version,
293 'minimize-connections' => \$Git::SVN::Migration::_minimize,
294 'id|i=s' => \$Git::SVN::default_ref_id,
295 'svn-remote|remote|R=s' => sub {
296 $Git::SVN::no_reuse_existing = 1;
297 $Git::SVN::default_repo_id = $_[1] });
298exit 1 if (!$rv && $cmd && $cmd ne 'log');
299
300usage(0) if $_help;
301version() if $_version;
302usage(1) unless defined $cmd;
303load_authors() if $_authors;
36db1edd
ML		 304if (defined $_authors_prog) {
305 $_authors_prog = "'" . File::Spec->rel2abs($_authors_prog) . "'";
306}
f4dd334b 307
0425ea90 308unless ($cmd =~ /^(?:clone|init|multi-init|commit-diff)$/) {
706587fc
EW		 309 Git::SVN::Migration::migration_check();
310}
ecc712dd 311Git::SVN::init_vars();
b805b44a
EW		 312eval {
313 Git::SVN::verify_remotes_sanity();
314 $cmd{$cmd}->[0]->(@ARGV);
315};
316fatal $@ if $@;
1e889ef3 317post_fetch_checkout();
3397f9df
EW		 318exit 0;
319
320####################### primary functions ######################
321sub usage {
322 my $exit = shift || 0;
323 my $fd = $exit ? \*STDERR : \*STDOUT;
324 print $fd <<"";
325git-svn - bidirectional operations between a single Subversion tree and git
1b1dd23f 326Usage: git svn <command> [options] [arguments]\n
448c81b4
EW		 327
328 print $fd "Available commands:\n" unless $cmd;
3397f9df
EW		 329
330 foreach (sort keys %cmd) {
448c81b4 331 next if $cmd && $cmd ne $_;
a836a0e1 332 next if /^multi-/; # don't show deprecated commands
b203b769 333 print $fd ' ',pack('A17',$_),$cmd{$_}->[1],"\n";
aa807bc2 334 foreach (sort keys %{$cmd{$_}->[2]}) {
512b620b
EW		 335 # mixed-case options are for .git/config only
336 next if /[A-Z]/ && /^[a-z]+$/i;
448c81b4 337 # prints out arguments as they should be passed:
b8c92cad 338 my $x = s#[:=]s$## ? '<arg>' : s#[:=]i$## ? '<num>' : '';
b203b769 339 print $fd ' ' x 21, join(', ', map { length $_ > 1 ?
448c81b4
EW		 340 "--$_" : "-$_" }
341 split /\|/,$_)," $x\n";
342 }
3397f9df
EW		 343 }
344 print $fd <<"";
448c81b4
EW		 345\nGIT_SVN_ID may be set in the environment or via the --id/-i switch to an
346arbitrary identifier if you're tracking multiple SVN branches/repositories in
347one git repository and want to keep them separate. See git-svn(1) for more
348information.
3397f9df
EW		 349
350 exit $exit;
351}
352
551ce28f 353sub version {
b0779246 354 ::_req_svn();
7d60ab2c 355 print "git-svn version $VERSION (svn $SVN::Core::VERSION)\n";
551ce28f
EW		 356 exit 0;
357}
358
8164b652
EW		 359sub do_git_init_db {
360 unless (-d $ENV{GIT_DIR}) {
361 my @init_db = ('init');
362 push @init_db, "--template=$_template" if defined $_template;
dadc6d2a
EW		 363 if (defined $_shared) {
364 if ($_shared =~ /[a-z]/) {
365 push @init_db, "--shared=$_shared";
366 } else {
367 push @init_db, "--shared";
368 }
369 }
8164b652 370 command_noisy(@init_db);
ffe256f9 371 $_repository = Git->repository(Repository => ".git");
8164b652 372 }
0dfaf0a4
EW		 373 my $set;
374 my $pfx = "svn-remote.$Git::SVN::default_repo_id";
375 foreach my $i (keys %icv) {
376 die "'$set' and '$i' cannot both be set\n" if $set;
377 next unless defined $icv{$i};
378 command_noisy('config', "$pfx.$i", $icv{$i});
379 $set = $i;
380 }
88ec2054
BJ		 381 my $ignore_regex = \$SVN::Git::Fetcher::_ignore_regex;
382 command_noisy('config', "$pfx.ignore-paths", $$ignore_regex)
383 if defined $$ignore_regex;
8164b652
EW		 384}
385
dadc6d2a
EW		 386sub init_subdir {
387 my $repo_path = shift or return;
388 mkpath([$repo_path]) unless -d $repo_path;
389 chdir $repo_path or die "Couldn't chdir to $repo_path: $!\n";
f30603fc 390 $ENV{GIT_DIR} = '.git';
ffe256f9 391 $_repository = Git->repository(Repository => $ENV{GIT_DIR});
dadc6d2a
EW		 392}
393
0425ea90
EW		 394sub cmd_clone {
395 my ($url, $path) = @_;
396 if (!defined $path &&
62244069 397 (defined $_trunk || @_branches || @_tags ||
8f728fb9 398 defined $_stdlayout) &&
0425ea90
EW		 399 $url !~ m#^[a-z\+]+://#) {
400 $path = $url;
401 }
0425ea90 402 $path = basename($url) if !defined $path || !length $path;
2bc35dcb 403 my $authors_absolute = $_authors ? File::Spec->rel2abs($_authors) : "";
f30603fc 404 cmd_init($url, $path);
2bc35dcb
AV		 405 command_oneline('config', 'svn.authorsfile', $authors_absolute)
406 if $_authors;
f5841509 407 Git::SVN::fetch_all($Git::SVN::default_repo_id);
0425ea90
EW		 408}
409
d2866f9e 410sub cmd_init {
8f728fb9 411 if (defined $_stdlayout) {
412 $_trunk = 'trunk' if (!defined $_trunk);
62244069
MB		 413 @_tags = 'tags' if (! @_tags);
414 @_branches = 'branches' if (! @_branches);
8f728fb9 415 }
62244069 416 if (defined $_trunk || @_branches || @_tags) {
dadc6d2a 417 return cmd_multi_init(@_);
03e0ea87 418 }
dadc6d2a
EW		 419 my $url = shift or die "SVN repository location required ",
420 "as a command-line argument\n";
50ff2366 421 $url = canonicalize_url($url);
dadc6d2a 422 init_subdir(@_);
8164b652 423 do_git_init_db();
03e0ea87 424
6b48829d
EW		 425 if ($Git::SVN::_minimize_url eq 'unset') {
426 $Git::SVN::_minimize_url = 0;
427 }
428
706587fc 429 Git::SVN->init($url);
3397f9df
EW		 430}
431
2a3240be 432sub cmd_fetch {
e98671e5
EW		 433 if (grep /^\d+=./, @_) {
434 die "'<rev>=<commit>' fetch arguments are ",
435 "no longer supported.\n";
07a1c950 436 }
e98671e5
EW		 437 my ($remote) = @_;
438 if (@_ > 1) {
c2abd83f 439 die "Usage: $0 fetch [--all] [--parent] [svn-remote]\n";
e98671e5 440 }
4d0157d6 441 $Git::SVN::no_reuse_existing = undef;
c2abd83f
JM		 442 if ($_fetch_parent) {
443 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
444 unless ($gs) {
445 die "Unable to determine upstream SVN information from ",
446 "working tree history\n";
447 }
448 # just fetch, don't checkout.
449 $_no_checkout = 'true';
450 $_fetch_all ? $gs->fetch_all : $gs->fetch;
451 } elsif ($_fetch_all) {
e98671e5
EW		 452 cmd_multi_fetch();
453 } else {
c2abd83f 454 $remote ||= $Git::SVN::default_repo_id;
e98671e5 455 Git::SVN::fetch_all($remote, Git::SVN::read_all_remotes());
1c8443b0 456 }
2a3240be
EW		 457}
458
1ce255dc 459sub cmd_set_tree {
3397f9df
EW		 460 my (@commits) = @_;
461 if ($_stdin || !@commits) {
462 print "Reading from stdin...\n";
463 @commits = ();
464 while (<STDIN>) {
1ca72aef 465 if (/\b($sha1_short)\b/o) {
3397f9df
EW		 466 unshift @commits, $1;
467 }
468 }
469 }
470 my @revs;
8de010ad 471 foreach my $c (@commits) {
aef4e921 472 my @tmp = command('rev-parse',$c);
8de010ad
EW		 473 if (scalar @tmp == 1) {
474 push @revs, $tmp[0];
475 } elsif (scalar @tmp > 1) {
aef4e921 476 push @revs, reverse(command('rev-list',@tmp));
8de010ad 477 } else {
207f1a75 478 fatal "Failed to rev-parse $c";
8de010ad 479 }
3397f9df 480 }
1ce255dc
EW		 481 my $gs = Git::SVN->new;
482 my ($r_last, $cmt_last) = $gs->last_rev_commit;
483 $gs->fetch;
97f6987a 484 if (defined $gs->{last_rev} && $r_last != $gs->{last_rev}) {
1ce255dc
EW		 485 fatal "There are new revisions that were fetched ",
486 "and need to be merged (or acknowledged) ",
487 "before committing.\nlast rev: $r_last\n",
207f1a75 488 " current: $gs->{last_rev}";
a5e0cedc 489 }
1ce255dc
EW		 490 $gs->set_tree($_) foreach @revs;
491 print "Done committing ",scalar @revs," revisions to SVN\n";
3157dd9e 492 unlink $gs->{index};
a5e0cedc 493}
8f22562c 494
d7ad3bed
EW		 495sub cmd_dcommit {
496 my $head = shift;
c8cfa3e4 497 git_cmd_try { command_oneline(qw/diff-index --quiet HEAD/) }
826a9339 498 'Cannot dcommit with a dirty index. Commit your changes first, '
c8cfa3e4 499 . "or stash them with `git stash'.\n";
d7ad3bed 500 $head ||= 'HEAD';
5eec27e3
TR		 501
502 my $old_head;
503 if ($head ne 'HEAD') {
504 $old_head = eval {
505 command_oneline([qw/symbolic-ref -q HEAD/])
506 };
507 if ($old_head) {
508 $old_head =~ s{^refs/heads/}{};
509 } else {
510 $old_head = eval { command_oneline(qw/rev-parse HEAD/) };
511 }
512 command(['checkout', $head], STDERR => 0);
513 }
514
a8ae2623 515 my @refs;
5eec27e3 516 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD', \@refs);
2cb61105
TR		 517 unless ($gs) {
518 die "Unable to determine upstream SVN information from ",
519 "$head history.\nPerhaps the repository is empty.";
520 }
0df84059
PO		 521
522 if (defined $_commit_url) {
523 $url = $_commit_url;
524 } else {
525 $url = eval { command_oneline('config', '--get',
526 "svn-remote.$gs->{repo_id}.commiturl") };
527 if (!$url) {
528 $url = $gs->full_url
529 }
530 }
531
ba24e745 532 my $last_rev = $_revision if defined $_revision;
59b0c24d
MM		 533 if ($url) {
534 print "Committing to $url ...\n";
535 }
733a65aa 536 my ($linear_refs, $parents) = linearize_history($gs, \@refs);
751eb395
EW		 537 if ($_no_rebase && scalar(@$linear_refs) > 1) {
538 warn "Attempting to commit more than one change while ",
539 "--no-rebase is enabled.\n",
540 "If these changes depend on each other, re-running ",
7dfa16b9 541 "without --no-rebase may be required."
751eb395 542 }
711521e2
EW		 543 my $expect_url = $url;
544 Git::SVN::remove_username($expect_url);
c74d9acf
EW		 545 while (1) {
546 my $d = shift @$linear_refs or last;
45bf473a
EW		 547 unless (defined $last_rev) {
548 (undef, $last_rev, undef) = cmt_metadata("$d~1");
549 unless (defined $last_rev) {
d7ad3bed 550 fatal "Unable to extract revision information ",
207f1a75 551 "from commit $d~1";
45bf473a
EW		 552 }
553 }
b22d4497
EW		 554 if ($_dry_run) {
555 print "diff-tree $d~1 $d\n";
556 } else {
751eb395 557 my $cmt_rev;
d7ad3bed 558 my %ed_opts = ( r => $last_rev,
61395354 559 log => get_commit_entry($d)->{log},
ba24e745 560 ra => Git::SVN::Ra->new($url),
3caf320b
KA		 561 config => SVN::Core::config_get_config(
562 $Git::SVN::Ra::config_dir
563 ),
61395354
EW		 564 tree_a => "$d~1",
565 tree_b => $d,
566 editor_cb => sub {
567 print "Committed r$_[0]\n";
751eb395
EW		 568 $cmt_rev = $_[0];
569 },
a8ae2623 570 svn_path => '');
61395354 571 if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) {
d7ad3bed 572 print "No changes\n$d~1 == $d\n";
733a65aa 573 } elsif ($parents->{$d} && @{$parents->{$d}}) {
751eb395 574 $gs->{inject_parents_dcommit}->{$cmt_rev} =
733a65aa 575 $parents->{$d};
d7ad3bed 576 }
751eb395 577 $_fetch_all ? $gs->fetch_all : $gs->fetch;
7dfa16b9 578 $last_rev = $cmt_rev;
751eb395
EW		 579 next if $_no_rebase;
580
581 # we always want to rebase against the current HEAD,
582 # not any head that was passed to us
c74d9acf 583 my @diff = command('diff-tree', $d,
751eb395
EW		 584 $gs->refname, '--');
585 my @finish;
586 if (@diff) {
587 @finish = rebase_cmd();
c74d9acf 588 print STDERR "W: $d and ", $gs->refname,
751eb395 589 " differ, using @finish:\n",
c74d9acf 590 join("\n", @diff), "\n";
751eb395
EW		 591 } else {
592 print "No changes between current HEAD and ",
593 $gs->refname,
594 "\nResetting to the latest ",
595 $gs->refname, "\n";
596 @finish = qw/reset --mixed/;
597 }
598 command_noisy(@finish, $gs->refname);
c74d9acf
EW		 599 if (@diff) {
600 @refs = ();
601 my ($url_, $rev_, $uuid_, $gs_) =
5eec27e3 602 working_head_info('HEAD', \@refs);
c74d9acf
EW		 603 my ($linear_refs_, $parents_) =
604 linearize_history($gs_, \@refs);
605 if (scalar(@$linear_refs) !=
606 scalar(@$linear_refs_)) {
607 fatal "# of revisions changed ",
608 "\nbefore:\n",
609 join("\n", @$linear_refs),
610 "\n\nafter:\n",
611 join("\n", @$linear_refs_), "\n",
612 'If you are attempting to commit ',
613 "merges, try running:\n\t",
614 'git rebase --interactive',
615 '--preserve-merges ',
616 $gs->refname,
617 "\nBefore dcommitting";
618 }
711521e2 619 if ($url_ ne $expect_url) {
c03c1f79
AG		 620 if ($url_ eq $gs->metadata_url) {
621 print
622 "Accepting rewritten URL:",
623 " $url_\n";
624 } else {
625 fatal
626 "URL mismatch after rebase:",
627 " $url_ != $expect_url";
628 }
c74d9acf
EW		 629 }
630 if ($uuid_ ne $uuid) {
631 fatal "uuid mismatch after rebase: ",
632 "$uuid_ != $uuid";
633 }
634 # remap parents
635 my (%p, @l, $i);
636 for ($i = 0; $i < scalar @$linear_refs; $i++) {
637 my $new = $linear_refs_->[$i] or next;
638 $p{$new} =
639 $parents->{$linear_refs->[$i]};
640 push @l, $new;
641 }
642 $parents = \%p;
643 $linear_refs = \@l;
644 }
b22d4497
EW		 645 }
646 }
5eec27e3
TR		 647
648 if ($old_head) {
649 my $new_head = command_oneline(qw/rev-parse HEAD/);
650 my $new_is_symbolic = eval {
651 command_oneline(qw/symbolic-ref -q HEAD/);
652 };
653 if ($new_is_symbolic) {
654 print "dcommitted the branch ", $head, "\n";
655 } else {
656 print "dcommitted on a detached HEAD because you gave ",
657 "a revision argument.\n",
658 "The rewritten commit is: ", $new_head, "\n";
659 }
660 command(['checkout', $old_head], STDERR => 0);
661 }
662
3157dd9e 663 unlink $gs->{index};
b22d4497
EW		 664}
665
5de70efb
FR		 666sub cmd_branch {
667 my ($branch_name, $head) = @_;
668
669 unless (defined $branch_name && length $branch_name) {
670 die(($_tag ? "tag" : "branch") . " name required\n");
671 }
672 $head ||= 'HEAD';
673
150d38c4
EW		 674 my (undef, $rev, undef, $gs) = working_head_info($head);
675 my $src = $gs->full_url;
5de70efb 676
a0fbc87c 677 my $remote = Git::SVN::read_all_remotes()->{$gs->{repo_id}};
62244069
MB		 678 my $allglobs = $remote->{ $_tag ? 'tags' : 'branches' };
679 my $glob;
680 if ($#{$allglobs} == 0) {
681 $glob = $allglobs->[0];
682 } else {
683 unless(defined $_branch_dest) {
684 die "Multiple ",
685 $_tag ? "tag" : "branch",
686 " paths defined for Subversion repository.\n",
687 "You must specify where you want to create the ",
688 $_tag ? "tag" : "branch",
689 " with the --destination argument.\n";
690 }
691 foreach my $g (@{$allglobs}) {
f7050599
EW		 692 # SVN::Git::Editor could probably be moved to Git.pm..
693 my $re = SVN::Git::Editor::glob2pat($g->{path}->{left});
694 if ($_branch_dest =~ /$re/) {
62244069
MB		 695 $glob = $g;
696 last;
697 }
698 }
699 unless (defined $glob) {
eaa14ff8
EW		 700 my $dest_re = qr/\b\Q$_branch_dest\E\b/;
701 foreach my $g (@{$allglobs}) {
702 $g->{path}->{left} =~ /$dest_re/ or next;
703 if (defined $glob) {
704 die "Ambiguous destination: ",
705 $_branch_dest, "\nmatches both '",
706 $glob->{path}->{left}, "' and '",
707 $g->{path}->{left}, "'\n";
708 }
709 $glob = $g;
710 }
711 unless (defined $glob) {
712 die "Unknown ",
713 $_tag ? "tag" : "branch",
714 " destination $_branch_dest\n";
715 }
62244069
MB		 716 }
717 }
5de70efb 718 my ($lft, $rgt) = @{ $glob->{path} }{qw/left right/};
99bacd6c
IM		 719 my $url;
720 if (defined $_commit_url) {
721 $url = $_commit_url;
722 } else {
723 $url = eval { command_oneline('config', '--get',
724 "svn-remote.$gs->{repo_id}.commiturl") };
725 if (!$url) {
726 $url = $remote->{url};
727 }
728 }
729 my $dst = join '/', $url, $lft, $branch_name, ($rgt || ());
5de70efb 730
a83b91e7
IM		 731 if ($dst =~ /^https:/ && $src =~ /^http:/) {
732 $src=~s/^http:/https:/;
733 }
734
d32fad2b 735 ::_req_svn();
736
5de70efb
FR		 737 my $ctx = SVN::Client->new(
738 auth => Git::SVN::Ra::_auth_providers(),
739 log_msg => sub {
740 ${ $_[0] } = defined $_message
741 ? $_message
742 : 'Create ' . ($_tag ? 'tag ' : 'branch ' )
743 . $branch_name;
744 },
745 );
746
747 eval {
748 $ctx->ls($dst, 'HEAD', 0);
749 } and die "branch ${branch_name} already exists\n";
750
751 print "Copying ${src} at r${rev} to ${dst}...\n";
752 $ctx->copy($src, $rev, $dst)
753 unless $_dry_run;
754
755 $gs->fetch_all;
756}
757
26e60160 758sub cmd_find_rev {
ea14e6c5
MAL		 759 my $revision_or_hash = shift or die "SVN or git revision required ",
760 "as a command-line argument\n";
26e60160
AR		 761 my $result;
762 if ($revision_or_hash =~ /^r\d+$/) {
b3cb7e45
AR		 763 my $head = shift;
764 $head ||= 'HEAD';
765 my @refs;
63c56022 766 my (undef, undef, $uuid, $gs) = working_head_info($head, \@refs);
b3cb7e45
AR		 767 unless ($gs) {
768 die "Unable to determine upstream SVN information from ",
769 "$head history\n";
26e60160 770 }
b3cb7e45 771 my $desired_revision = substr($revision_or_hash, 1);
63c56022 772 $result = $gs->rev_map_get($desired_revision, $uuid);
26e60160
AR		 773 } else {
774 my (undef, $rev, undef) = cmt_metadata($revision_or_hash);
775 $result = $rev;
776 }
777 print "$result\n" if $result;
778}
779
905f8b7d
EW		 780sub cmd_rebase {
781 command_noisy(qw/update-index --refresh/);
13c823fb
EW		 782 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
783 unless ($gs) {
905f8b7d
EW		 784 die "Unable to determine upstream SVN information from ",
785 "working tree history\n";
786 }
7d45e146
SF		 787 if ($_dry_run) {
788 print "Remote Branch: " . $gs->refname . "\n";
789 print "SVN URL: " . $url . "\n";
790 return;
791 }
905f8b7d
EW		 792 if (command(qw/diff-index HEAD --/)) {
793 print STDERR "Cannot rebase with uncommited changes:\n";
794 command_noisy('status');
795 exit 1;
796 }
dee41f3e 797 unless ($_local) {
cec0d5a3
SG		 798 # rebase will checkout for us, so no need to do it explicitly
799 $_no_checkout = 'true';
dee41f3e
EW		 800 $_fetch_all ? $gs->fetch_all : $gs->fetch;
801 }
905f8b7d 802 command_noisy(rebase_cmd(), $gs->refname);
6111b934 803 $gs->mkemptydirs;
905f8b7d
EW		 804}
805
5969cbe1 806sub cmd_show_ignore {
13c823fb
EW		 807 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
808 $gs ||= Git::SVN->new;
5969cbe1 809 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
01bdab84
BS		 810 $gs->prop_walk($gs->{path}, $r, sub {
811 my ($gs, $path, $props) = @_;
812 print STDOUT "\n# $path\n";
813 my $s = $props->{'svn:ignore'} or return;
814 $s =~ s/[\r\n]+/\n/g;
a7d72544 815 $s =~ s/^\n+//;
01bdab84
BS		 816 chomp $s;
817 $s =~ s#^#$path#gm;
818 print STDOUT "$s\n";
819 });
a5e0cedc
EW		 820}
821
2d879792
VK		 822sub cmd_show_externals {
823 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
824 $gs ||= Git::SVN->new;
825 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
826 $gs->prop_walk($gs->{path}, $r, sub {
827 my ($gs, $path, $props) = @_;
828 print STDOUT "\n# $path\n";
829 my $s = $props->{'svn:externals'} or return;
830 $s =~ s/[\r\n]+/\n/g;
831 chomp $s;
832 $s =~ s#^#$path#gm;
833 print STDOUT "$s\n";
834 });
835}
836
d05ddec5
BS		 837sub cmd_create_ignore {
838 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
839 $gs ||= Git::SVN->new;
840 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
841 $gs->prop_walk($gs->{path}, $r, sub {
842 my ($gs, $path, $props) = @_;
843 # $path is of the form /path/to/dir/
7d9fd459
BG		 844 $path = '.' . $path;
845 # SVN can have attributes on empty directories,
846 # which git won't track
847 mkpath([$path]) unless -d $path;
848 my $ignore = $path . '.gitignore';
d05ddec5
BS		 849 my $s = $props->{'svn:ignore'} or return;
850 open(GITIGNORE, '>', $ignore)
207f1a75 851 or fatal("Failed to open `$ignore' for writing: $!");
d05ddec5 852 $s =~ s/[\r\n]+/\n/g;
a7d72544 853 $s =~ s/^\n+//;
d05ddec5
BS		 854 chomp $s;
855 # Prefix all patterns so that the ignore doesn't apply
856 # to sub-directories.
857 $s =~ s#^#/#gm;
858 print GITIGNORE "$s\n";
859 close(GITIGNORE)
207f1a75 860 or fatal("Failed to close `$ignore': $!");
c4c66b26 861 command_noisy('add', '-f', $ignore);
d05ddec5
BS		 862 });
863}
864
6111b934
EW		 865sub cmd_mkdirs {
866 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
867 $gs ||= Git::SVN->new;
868 $gs->mkemptydirs($_revision);
869}
870
b2b3ada7
DK		 871sub canonicalize_path {
872 my ($path) = @_;
e6fefa92
DK		 873 my $dot_slash_added = 0;
874 if (substr($path, 0, 1) ne "/") {
875 $path = "./" . $path;
876 $dot_slash_added = 1;
877 }
b2b3ada7
DK		 878 # File::Spec->canonpath doesn't collapse x/../y into y (for a
879 # good reason), so let's do this manually.
880 $path =~ s#/+#/#g;
881 $path =~ s#/\.(?:/|$)#/#g;
882 $path =~ s#/[^/]+/\.\.##g;
883 $path =~ s#/$##g;
e6fefa92 884 $path =~ s#^\./## if $dot_slash_added;
2fe403e7
GP		 885 $path =~ s#^/##;
886 $path =~ s#^\.$##;
b2b3ada7
DK		 887 return $path;
888}
889
50ff2366
UD		 890sub canonicalize_url {
891 my ($url) = @_;
892 $url =~ s#^([^:]+://[^/]*/)(.*)$#$1 . canonicalize_path($2)#e;
893 return $url;
894}
895
15153451
BS		 896# get_svnprops(PATH)
897# ------------------
51e057cf 898# Helper for cmd_propget and cmd_proplist below.
15153451
BS		 899sub get_svnprops {
900 my $path = shift;
901 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
902 $gs ||= Git::SVN->new;
903
904 # prefix THE PATH by the sub-directory from which the user
905 # invoked us.
906 $path = $cmd_dir_prefix . $path;
207f1a75 907 fatal("No such file or directory: $path") unless -e $path;
15153451
BS		 908 my $is_dir = -d $path ? 1 : 0;
909 $path = $gs->{path} . '/' . $path;
910
911 # canonicalize the path (otherwise libsvn will abort or fail to
912 # find the file)
b2b3ada7 913 $path = canonicalize_path($path);
15153451
BS		 914
915 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
916 my $props;
917 if ($is_dir) {
918 (undef, undef, $props) = $gs->ra->get_dir($path, $r);
919 }
920 else {
921 (undef, $props) = $gs->ra->get_file($path, $r, undef);
922 }
923 return $props;
924}
925
926# cmd_propget (PROP, PATH)
927# ------------------------
928# Print the SVN property PROP for PATH.
929sub cmd_propget {
930 my ($prop, $path) = @_;
931 $path = '.' if not defined $path;
932 usage(1) if not defined $prop;
933 my $props = get_svnprops($path);
934 if (not defined $props->{$prop}) {
207f1a75 935 fatal("`$path' does not have a `$prop' SVN property.");
15153451
BS		 936 }
937 print $props->{$prop} . "\n";
938}
939
51e057cf
BS		 940# cmd_proplist (PATH)
941# -------------------
942# Print the list of SVN properties for PATH.
943sub cmd_proplist {
944 my $path = shift;
945 $path = '.' if not defined $path;
946 my $props = get_svnprops($path);
947 print "Properties on '$path':\n";
948 foreach (sort keys %{$props}) {
949 print " $_\n";
950 }
951}
952
8164b652 953sub cmd_multi_init {
9d55b41a 954 my $url = shift;
62244069 955 unless (defined $_trunk || @_branches || @_tags) {
98327e58 956 usage(1);
9d55b41a 957 }
dc431666 958
8164b652 959 $_prefix = '' unless defined $_prefix;
dadc6d2a 960 if (defined $url) {
50ff2366 961 $url = canonicalize_url($url);
dadc6d2a
EW		 962 init_subdir(@_);
963 }
f30603fc 964 do_git_init_db();
98327e58 965 if (defined $_trunk) {
b4b33600 966 $_trunk =~ s#^/+##;
6f5748e1 967 my $trunk_ref = 'refs/remotes/' . $_prefix . 'trunk';
706587fc
EW		 968 # try both old-style and new-style lookups:
969 my $gs_trunk = eval { Git::SVN->new($trunk_ref) };
8164b652 970 unless ($gs_trunk) {
706587fc
EW		 971 my ($trunk_url, $trunk_path) =
972 complete_svn_url($url, $_trunk);
973 $gs_trunk = Git::SVN->init($trunk_url, $trunk_path,
974 undef, $trunk_ref);
98327e58 975 }
c35b96e7 976 }
62244069 977 return unless @_branches || @_tags;
e7db67e6 978 my $ra = $url ? Git::SVN::Ra->new($url) : undef;
62244069
MB		 979 foreach my $path (@_branches) {
980 complete_url_ls_init($ra, $path, '--branches/-b', $_prefix);
981 }
982 foreach my $path (@_tags) {
983 complete_url_ls_init($ra, $path, '--tags/-t', $_prefix.'tags/');
984 }
9d55b41a
EW		 985}
986
1c8443b0 987sub cmd_multi_fetch {
4d0157d6 988 $Git::SVN::no_reuse_existing = undef;
0af9c9f9
EW		 989 my $remotes = Git::SVN::read_all_remotes();
990 foreach my $repo_id (sort keys %$remotes) {
db03cd24 991 if ($remotes->{$repo_id}->{url}) {
4bb9ed04
EW		 992 Git::SVN::fetch_all($repo_id, $remotes);
993 }
9d55b41a 994 }
9d55b41a
EW		 995}
996
44320b9e
EW		 997# this command is special because it requires no metadata
998sub cmd_commit_diff {
999 my ($ta, $tb, $url) = @_;
1000 my $usage = "Usage: $0 commit-diff -r<revision> ".
207f1a75 1001 "<tree-ish> <tree-ish> [<URL>]";
44320b9e 1002 fatal($usage) if (!defined $ta || !defined $tb);
d72ab8c8 1003 my $svn_path = '';
44320b9e
EW		 1004 if (!defined $url) {
1005 my $gs = eval { Git::SVN->new };
1006 if (!$gs) {
1007 fatal("Needed URL or usable git-svn --id in ",
1008 "the command-line\n", $usage);
1009 }
1010 $url = $gs->{url};
d3a840dc 1011 $svn_path = $gs->{path};
44320b9e
EW		 1012 }
1013 unless (defined $_revision) {
1014 fatal("-r|--revision is a required argument\n", $usage);
1015 }
1016 if (defined $_message && defined $_file) {
1017 fatal("Both --message/-m and --file/-F specified ",
1018 "for the commit message.\n",
207f1a75 1019 "I have no idea what you mean");
44320b9e
EW		 1020 }
1021 if (defined $_file) {
1022 $_message = file_to_s($_file);
1023 } else {
1024 $_message ||= get_commit_entry($tb)->{log};
1025 }
1026 my $ra ||= Git::SVN::Ra->new($url);
1027 my $r = $_revision;
1028 if ($r eq 'HEAD') {
1029 $r = $ra->get_latest_revnum;
1030 } elsif ($r !~ /^\d+$/) {
1031 die "revision argument: $r not understood by git-svn\n";
1032 }
61395354
EW		 1033 my %ed_opts = ( r => $r,
1034 log => $_message,
1035 ra => $ra,
1036 tree_a => $ta,
1037 tree_b => $tb,
1038 editor_cb => sub { print "Committed r$_[0]\n" },
1039 svn_path => $svn_path );
1040 if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) {
44320b9e
EW		 1041 print "No changes\n$ta == $tb\n";
1042 }
44320b9e
EW		 1043}
1044
05427b91
TR		 1045sub escape_uri_only {
1046 my ($uri) = @_;
1047 my @tmp;
1048 foreach (split m{/}, $uri) {
6a004d3f 1049 s/([^~\w.%+-]|%(?![a-fA-F0-9]{2}))/sprintf("%%%02X",ord($1))/eg;
05427b91
TR		 1050 push @tmp, $_;
1051 }
1052 join('/', @tmp);
1053}
1054
1055sub escape_url {
1056 my ($url) = @_;
1057 if ($url =~ m#^([^:]+)://([^/]*)(.*)$#) {
1058 my ($scheme, $domain, $uri) = ($1, $2, escape_uri_only($3));
1059 $url = "$scheme://$domain$uri";
1060 }
1061 $url;
1062}
1063
e6fefa92 1064sub cmd_info {
bd2d4f96 1065 my $path = canonicalize_path(defined($_[0]) ? $_[0] : ".");
edde9112 1066 my $fullpath = canonicalize_path($cmd_dir_prefix . $path);
bd2d4f96 1067 if (exists $_[1]) {
e6fefa92
DK		 1068 die "Too many arguments specified\n";
1069 }
1070
1071 my ($file_type, $diff_status) = find_file_type_and_diff_status($path);
1072
1073 if (!$file_type && !$diff_status) {
2cf3e3ac
TR		 1074 print STDERR "svn: '$path' is not under version control\n";
1075 exit 1;
e6fefa92
DK		 1076 }
1077
1078 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
1079 unless ($gs) {
1080 die "Unable to determine upstream SVN information from ",
1081 "working tree history\n";
1082 }
bd2d4f96
EW		 1083
1084 # canonicalize_path() will return "" to make libsvn 1.5.x happy,
1085 $path = "." if $path eq "";
1086
edde9112 1087 my $full_url = $url . ($fullpath eq "" ? "" : "/$fullpath");
e6fefa92 1088
8b014d71 1089 if ($_url) {
05427b91 1090 print escape_url($full_url), "\n";
8b014d71
DK		 1091 return;
1092 }
1093
e6fefa92
DK		 1094 my $result = "Path: $path\n";
1095 $result .= "Name: " . basename($path) . "\n" if $file_type ne "dir";
05427b91 1096 $result .= "URL: " . escape_url($full_url) . "\n";
e6fefa92 1097
a5460eb7
EW		 1098 eval {
1099 my $repos_root = $gs->repos_root;
1100 Git::SVN::remove_username($repos_root);
05427b91 1101 $result .= "Repository Root: " . escape_url($repos_root) . "\n";
a5460eb7
EW		 1102 };
1103 if ($@) {
1104 $result .= "Repository Root: (offline)\n";
1105 }
b91a8a3e 1106 ::_req_svn();
22ba47f5
MK		 1107 $result .= "Repository UUID: $uuid\n" unless $diff_status eq "A" &&
1108 ($SVN::Core::VERSION le '1.5.4' || $file_type ne "dir");
e6fefa92
DK		 1109 $result .= "Revision: " . ($diff_status eq "A" ? 0 : $rev) . "\n";
1110
1111 $result .= "Node Kind: " .
1112 ($file_type eq "dir" ? "directory" : "file") . "\n";
1113
1114 my $schedule = $diff_status eq "A"
1115 ? "add"
1116 : ($diff_status eq "D" ? "delete" : "normal");
1117 $result .= "Schedule: $schedule\n";
1118
1119 if ($diff_status eq "A") {
1120 print $result, "\n";
1121 return;
1122 }
1123
1124 my ($lc_author, $lc_rev, $lc_date_utc);
edde9112 1125 my @args = Git::SVN::Log::git_svn_log_cmd($rev, $rev, "--", $fullpath);
e6fefa92
DK		 1126 my $log = command_output_pipe(@args);
1127 my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/;
1128 while (<$log>) {
1129 if (/^${esc_color}author (.+) <[^>]+> (\d+) ([\-\+]?\d+)$/o) {
1130 $lc_author = $1;
1131 $lc_date_utc = Git::SVN::Log::parse_git_date($2, $3);
1132 } elsif (/^${esc_color} (git-svn-id:.+)$/o) {
1133 (undef, $lc_rev, undef) = ::extract_metadata($1);
1134 }
1135 }
1136 close $log;
1137
1138 Git::SVN::Log::set_local_timezone();
1139
1140 $result .= "Last Changed Author: $lc_author\n";
1141 $result .= "Last Changed Rev: $lc_rev\n";
1142 $result .= "Last Changed Date: " .
1143 Git::SVN::Log::format_svn_date($lc_date_utc) . "\n";
1144
1145 if ($file_type ne "dir") {
1146 my $text_last_updated_date =
1147 ($diff_status eq "D" ? $lc_date_utc : (stat $path)[9]);
1148 $result .=
1149 "Text Last Updated: " .
1150 Git::SVN::Log::format_svn_date($text_last_updated_date) .
1151 "\n";
1152 my $checksum;
1153 if ($diff_status eq "D") {
1154 my ($fh, $ctx) =
1155 command_output_pipe(qw(cat-file blob), "HEAD:$path");
1156 if ($file_type eq "link") {
1157 my $file_name = <$fh>;
8d7c4fad 1158 $checksum = md5sum("link $file_name");
e6fefa92 1159 } else {
8d7c4fad 1160 $checksum = md5sum($fh);
e6fefa92
DK		 1161 }
1162 command_close_pipe($fh, $ctx);
1163 } elsif ($file_type eq "link") {
1164 my $file_name =
1165 command(qw(cat-file blob), "HEAD:$path");
1166 $checksum =
8d7c4fad 1167 md5sum("link " . $file_name);
e6fefa92
DK		 1168 } else {
1169 open FILE, "<", $path or die $!;
8d7c4fad 1170 $checksum = md5sum(\*FILE);
e6fefa92
DK		 1171 close FILE or die $!;
1172 }
1173 $result .= "Checksum: " . $checksum . "\n";
1174 }
1175
1176 print $result, "\n";
1177}
1178
195643f2
BJ		 1179sub cmd_reset {
1180 my $target = shift || $_revision or die "SVN revision required\n";
1181 $target = $1 if $target =~ /^r(\d+)$/;
1182 $target =~ /^\d+$/ or die "Numeric SVN revision expected\n";
1183 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
1184 unless ($gs) {
1185 die "Unable to determine upstream SVN information from ".
1186 "history\n";
1187 }
1188 my ($r, $c) = $gs->find_rev_before($target, not $_fetch_parent);
70ee0b77 1189 die "Cannot find SVN revision $target\n" unless defined($c);
195643f2
BJ		 1190 $gs->rev_map_set($r, $c, 'reset', $uuid);
1191 print "r$r = $c ($gs->{ref_id})\n";
1192}
1193
2da9ee08
RZ		 1194sub cmd_gc {
1195 if (!$can_compress) {
1196 warn "Compress::Zlib could not be found; unhandled.log " .
1197 "files will not be compressed.\n";
1198 }
1199 find({ wanted => \&gc_directory, no_chdir => 1}, "$ENV{GIT_DIR}/svn");
1200}
1201
3397f9df
EW		 1202########################### utility functions #########################
1203
905f8b7d
EW		 1204sub rebase_cmd {
1205 my @cmd = qw/rebase/;
1206 push @cmd, '-v' if $_verbose;
1207 push @cmd, qw/--merge/ if $_merge;
1208 push @cmd, "--strategy=$_strategy" if $_strategy;
1209 @cmd;
1210}
1211
1e889ef3
EW		 1212sub post_fetch_checkout {
1213 return if $_no_checkout;
1214 my $gs = $Git::SVN::_head or return;
1215 return if verify_ref('refs/heads/master^0');
1216
b186a261
EW		 1217 # look for "trunk" ref if it exists
1218 my $remote = Git::SVN::read_all_remotes()->{$gs->{repo_id}};
1219 my $fetch = $remote->{fetch};
1220 if ($fetch) {
1221 foreach my $p (keys %$fetch) {
1222 basename($fetch->{$p}) eq 'trunk' or next;
1223 $gs = Git::SVN->new($fetch->{$p}, $gs->{repo_id}, $p);
1224 last;
1225 }
1226 }
1227
1e889ef3
EW		 1228 my $valid_head = verify_ref('HEAD^0');
1229 command_noisy(qw(update-ref refs/heads/master), $gs->refname);
1230 return if ($valid_head || !verify_ref('HEAD^0'));
1231
1232 return if $ENV{GIT_DIR} !~ m#^(?:.*/)?\.git$#;
1233 my $index = $ENV{GIT_INDEX_FILE} || "$ENV{GIT_DIR}/index";
1234 return if -f $index;
1235
7ae3df8c 1236 return if command_oneline(qw/rev-parse --is-inside-work-tree/) eq 'false';
1e889ef3
EW		 1237 return if command_oneline(qw/rev-parse --is-inside-git-dir/) eq 'true';
1238 command_noisy(qw/read-tree -m -u -v HEAD HEAD/);
1239 print STDERR "Checked out HEAD:\n ",
1240 $gs->full_url, " r", $gs->last_rev, "\n";
6111b934 1241 $gs->mkemptydirs($gs->last_rev);
1e889ef3
EW		 1242}
1243
98327e58
EW		 1244sub complete_svn_url {
1245 my ($url, $path) = @_;
1246 $path =~ s#/+$##;
98327e58 1247 if ($path !~ m#^[a-z\+]+://#) {
98327e58
EW		 1248 if (!defined $url || $url !~ m#^[a-z\+]+://#) {
1249 fatal("E: '$path' is not a complete URL ",
207f1a75 1250 "and a separate URL is not specified");
98327e58 1251 }
706587fc 1252 return ($url, $path);
98327e58 1253 }
706587fc 1254 return ($path, '');
98327e58
EW		 1255}
1256
9d55b41a 1257sub complete_url_ls_init {
706587fc
EW		 1258 my ($ra, $repo_path, $switch, $pfx) = @_;
1259 unless ($repo_path) {
9d55b41a
EW		 1260 print STDERR "W: $switch not specified\n";
1261 return;
1262 }
706587fc
EW		 1263 $repo_path =~ s#/+$##;
1264 if ($repo_path =~ m#^[a-z\+]+://#) {
1265 $ra = Git::SVN::Ra->new($repo_path);
1266 $repo_path = '';
e7db67e6 1267 } else {
706587fc 1268 $repo_path =~ s#^/+##;
e7db67e6 1269 unless ($ra) {
706587fc 1270 fatal("E: '$repo_path' is not a complete URL ",
207f1a75 1271 "and a separate URL is not specified");
8164b652 1272 }
e7db67e6 1273 }
706587fc 1274 my $url = $ra->{url};
b4d57e5e
EW		 1275 my $gs = Git::SVN->init($url, undef, undef, undef, 1);
1276 my $k = "svn-remote.$gs->{repo_id}.url";
1277 my $orig_url = eval { command_oneline(qw/config --get/, $k) };
1278 if ($orig_url && ($orig_url ne $gs->{url})) {
1279 die "$k already set: $orig_url\n",
1280 "wanted to set to: $gs->{url}\n";
88cf4107 1281 }
b4d57e5e 1282 command_oneline('config', $k, $gs->{url}) unless $orig_url;
0b2af457 1283 my $remote_path = "$gs->{path}/$repo_path";
5268f9ed 1284 $remote_path =~ s{%([0-9A-F]{2})}{chr hex($1)}ieg;
b4d57e5e
EW		 1285 $remote_path =~ s#/+#/#g;
1286 $remote_path =~ s#^/##g;
ed0b9d43 1287 $remote_path .= "/*" if $remote_path !~ /\*/;
b4d57e5e
EW		 1288 my ($n) = ($switch =~ /^--(\w+)/);
1289 if (length $pfx && $pfx !~ m#/$#) {
1290 die "--prefix='$pfx' must have a trailing slash '/'\n";
9d55b41a 1291 }
570d35c2 1292 command_noisy('config',
62244069 1293 '--add',
570d35c2
MG		 1294 "svn-remote.$gs->{repo_id}.$n",
1295 "$remote_path:refs/remotes/$pfx*" .
1296 ('/*' x (($remote_path =~ tr/*/*/) - 1)) );
9d55b41a
EW		 1297}
1298
aef4e921
EW		 1299sub verify_ref {
1300 my ($ref) = @_;
2c5c1d53
EW		 1301 eval { command_oneline([ 'rev-parse', '--verify', $ref ],
1302 { STDERR => 0 }); };
aef4e921
EW		 1303}
1304
a5e0cedc 1305sub get_tree_from_treeish {
cf52b8f0 1306 my ($treeish) = @_;
44320b9e 1307 # $treeish can be a symbolic ref, too:
aef4e921 1308 my $type = command_oneline(qw/cat-file -t/, $treeish);
cf52b8f0
EW		 1309 my $expected;
1310 while ($type eq 'tag') {
aef4e921 1311 ($treeish, $type) = command(qw/cat-file tag/, $treeish);
cf52b8f0
EW		 1312 }
1313 if ($type eq 'commit') {
aef4e921
EW		 1314 $expected = (grep /^tree /, command(qw/cat-file commit/,
1315 $treeish))[0];
44320b9e 1316 ($expected) = ($expected =~ /^tree ($sha1)$/o);
cf52b8f0
EW		 1317 die "Unable to get tree from $treeish\n" unless $expected;
1318 } elsif ($type eq 'tree') {
1319 $expected = $treeish;
1320 } else {
1321 die "$treeish is a $type, expected tree, tag or commit\n";
1322 }
a5e0cedc
EW		 1323 return $expected;
1324}
1325
44320b9e
EW		 1326sub get_commit_entry {
1327 my ($treeish) = shift;
1328 my %log_entry = ( log => '', tree => get_tree_from_treeish($treeish) );
1329 my $commit_editmsg = "$ENV{GIT_DIR}/COMMIT_EDITMSG";
1330 my $commit_msg = "$ENV{GIT_DIR}/COMMIT_MSG";
1331 open my $log_fh, '>', $commit_editmsg or croak $!;
3397f9df 1332
44320b9e 1333 my $type = command_oneline(qw/cat-file -t/, $treeish);
4ad4515d 1334 if ($type eq 'commit' || $type eq 'tag') {
aef4e921 1335 my ($msg_fh, $ctx) = command_output_pipe('cat-file',
44320b9e 1336 $type, $treeish);
3397f9df 1337 my $in_msg = 0;
6aa9ba14
AP		 1338 my $author;
1339 my $saw_from = 0;
328eb9b3 1340 my $msgbuf = "";
3397f9df
EW		 1341 while (<$msg_fh>) {
1342 if (!$in_msg) {
1343 $in_msg = 1 if (/^\s*$/);
6aa9ba14 1344 $author = $1 if (/^author (.*>)/);
df746c5a 1345 } elsif (/^git-svn-id: /) {
44320b9e
EW		 1346 # skip this for now, we regenerate the
1347 # correct one on re-fetch anyways
1348 # TODO: set *:merge properties or like...
3397f9df 1349 } else {
6aa9ba14
AP		 1350 if (/^From:/ || /^Signed-off-by:/) {
1351 $saw_from = 1;
1352 }
328eb9b3 1353 $msgbuf .= $_;
3397f9df
EW		 1354 }
1355 }
328eb9b3 1356 $msgbuf =~ s/\s+$//s;
6aa9ba14
AP		 1357 if ($Git::SVN::_add_author_from && defined($author)
1358 && !$saw_from) {
328eb9b3 1359 $msgbuf .= "\n\nFrom: $author";
6aa9ba14 1360 }
328eb9b3 1361 print $log_fh $msgbuf or croak $!;
aef4e921 1362 command_close_pipe($msg_fh, $ctx);
3397f9df 1363 }
44320b9e 1364 close $log_fh or croak $!;
3397f9df
EW		 1365
1366 if ($_edit || ($type eq 'tree')) {
b4479f07
JN		 1367 chomp(my $editor = command_oneline(qw(var GIT_EDITOR)));
1368 system('sh', '-c', $editor.' "$@"', $editor, $commit_editmsg);
3397f9df 1369 }
44320b9e 1370 rename $commit_editmsg, $commit_msg or croak $!;
16fc08e2 1371 {
b510df8a 1372 require Encode;
16fc08e2
EW		 1373 # SVN requires messages to be UTF-8 when entering the repo
1374 local $/;
1375 open $log_fh, '<', $commit_msg or croak $!;
1376 binmode $log_fh;
1377 chomp($log_entry{log} = <$log_fh>);
1378
b510df8a
EW		 1379 my $enc = Git::config('i18n.commitencoding') || 'UTF-8';
1380 my $msg = $log_entry{log};
1381
1382 eval { $msg = Encode::decode($enc, $msg, 1) };
1383 if ($@) {
1384 die "Could not decode as $enc:\n", $msg,
1385 "\nPerhaps you need to set i18n.commitencoding\n";
16fc08e2 1386 }
b510df8a
EW		 1387
1388 eval { $msg = Encode::encode('UTF-8', $msg, 1) };
1389 die "Could not encode as UTF-8:\n$msg\n" if $@;
1390
1391 $log_entry{log} = $msg;
1392
16fc08e2
EW		 1393 close $log_fh or croak $!;
1394 }
44320b9e
EW		 1395 unlink $commit_msg;
1396 \%log_entry;
a5e0cedc
EW		 1397}
1398
3397f9df
EW		 1399sub s_to_file {
1400 my ($str, $file, $mode) = @_;
1401 open my $fd,'>',$file or croak $!;
1402 print $fd $str,"\n" or croak $!;
1403 close $fd or croak $!;
1404 chmod ($mode &~ umask, $file) if (defined $mode);
1405}
1406
1407sub file_to_s {
1408 my $file = shift;
1409 open my $fd,'<',$file or croak "$!: file: $file\n";
1410 local $/;
1411 my $ret = <$fd>;
1412 close $fd or croak $!;
1413 $ret =~ s/\s*$//s;
1414 return $ret;
1415}
1416
eeb0abe0
EW		 1417# '<svn username> = real-name <email address>' mapping based on git-svnimport:
1418sub load_authors {
1419 open my $authors, '<', $_authors or die "Can't open $_authors $!\n";
f8c9d1d2 1420 my $log = $cmd eq 'log';
eeb0abe0
EW		 1421 while (<$authors>) {
1422 chomp;
575d025c 1423 next unless /^(.+?|\(no author\))\s*=\s*(.+?)\s*<(.+)>\s*$/;
eeb0abe0 1424 my ($user, $name, $email) = ($1, $2, $3);
f8c9d1d2
EW		 1425 if ($log) {
1426 $Git::SVN::Log::rusers{"$name <$email>"} = $user;
1427 } else {
1428 $users{$user} = [$name, $email];
1429 }
79bb8d88
EW		 1430 }
1431 close $authors or croak $!;
1432}
1433
e0d10e1c 1434# convert GetOpt::Long specs for use by git-config
1a30582b 1435sub read_git_config {
b8c92cad 1436 my $opts = shift;
97ae0911 1437 my @config_only;
b8c92cad 1438 foreach my $o (keys %$opts) {
97ae0911
EW		 1439 # if we have mixedCase and a long option-only, then
1440 # it's a config-only variable that we don't need for
1441 # the command-line.
1442 push @config_only, $o if ($o =~ /[A-Z]/ && $o =~ /^[a-z]+$/i);
b8c92cad 1443 my $v = $opts->{$o};
97ae0911 1444 my ($key) = ($o =~ /^([a-zA-Z\-]+)/);
b8c92cad 1445 $key =~ s/-//g;
225f1d0c 1446 my $arg = 'git config';
b8c92cad
EW		 1447 $arg .= ' --int' if ($o =~ /[:=]i$/);
1448 $arg .= ' --bool' if ($o !~ /[:=][sfi]$/);
1449 if (ref $v eq 'ARRAY') {
1450 chomp(my @tmp = `$arg --get-all svn.$key`);
1451 @$v = @tmp if @tmp;
1452 } else {
1453 chomp(my $tmp = `$arg --get svn.$key`);
7774284a 1454 if ($tmp && !($arg =~ / --bool/ && $tmp eq 'false')) {
b8c92cad
EW		 1455 $$v = $tmp;
1456 }
1457 }
1458 }
97ae0911 1459 delete @$opts{@config_only} if @config_only;
b8c92cad
EW		 1460}
1461
79bb8d88 1462sub extract_metadata {
c1927a85 1463 my $id = shift or return (undef, undef, undef);
3dfab993 1464 my ($url, $rev, $uuid) = ($id =~ /^\s*git-svn-id:\s+(.*)\@(\d+)
b3e95936 1465 \s([a-f\d\-]+)$/ix);
e70dc780 1466 if (!defined $rev || !$uuid || !$url) {
79bb8d88 1467 # some of the original repositories I made had
82e5a82f 1468 # identifiers like this:
b3e95936 1469 ($rev, $uuid) = ($id =~/^\s*git-svn-id:\s(\d+)\@([a-f\d\-]+)/i);
79bb8d88
EW		 1470 }
1471 return ($url, $rev, $uuid);
1472}
1473
c1927a85
EW		 1474sub cmt_metadata {
1475 return extract_metadata((grep(/^git-svn-id: /,
aef4e921 1476 command(qw/cat-file commit/, shift)))[-1]);
c1927a85
EW		 1477}
1478
6ea42032
BB		 1479sub cmt_sha2rev_batch {
1480 my %s2r;
1481 my ($pid, $in, $out, $ctx) = command_bidi_pipe(qw/cat-file --batch/);
1482 my $list = shift;
1483
1484 foreach my $sha (@{$list}) {
1485 my $first = 1;
1486 my $size = 0;
1487 print $out $sha, "\n";
1488
1489 while (my $line = <$in>) {
1490 if ($first && $line =~ /^[[:xdigit:]]{40}\smissing$/) {
1491 last;
1492 } elsif ($first &&
1493 $line =~ /^[[:xdigit:]]{40}\scommit\s(\d+)$/) {
1494 $first = 0;
1495 $size = $1;
1496 next;
1497 } elsif ($line =~ /^(git-svn-id: )/) {
1498 my (undef, $rev, undef) =
1499 extract_metadata($line);
1500 $s2r{$sha} = $rev;
1501 }
1502
1503 $size -= length($line);
1504 last if ($size == 0);
1505 }
1506 }
1507
1508 command_close_bidi_pipe($pid, $in, $out, $ctx);
1509
1510 return \%s2r;
1511}
1512
905f8b7d
EW		 1513sub working_head_info {
1514 my ($head, $refs) = @_;
b6309ac2 1515 my @args = ('log', '--no-color', '--first-parent', '--pretty=medium');
05b4df31 1516 my ($fh, $ctx) = command_output_pipe(@args, $head);
3dfab993 1517 my $hash;
40cb8f8f 1518 my %max;
3dfab993
SV		 1519 while (<$fh>) {
1520 if ( m{^commit ($::sha1)$} ) {
1521 unshift @$refs, $hash if $hash and $refs;
1522 $hash = $1;
1523 next;
1524 }
1525 next unless s{^\s*(git-svn-id:)}{$1};
1526 my ($url, $rev, $uuid) = extract_metadata($_);
13c823fb 1527 if (defined $url && defined $rev) {
40cb8f8f 1528 next if $max{$url} and $max{$url} < $rev;
13c823fb 1529 if (my $gs = Git::SVN->find_by_url($url)) {
63c56022 1530 my $c = $gs->rev_map_get($rev, $uuid);
b03c7a63 1531 if ($c && $c eq $hash) {
13c823fb
EW		 1532 close $fh; # break the pipe
1533 return ($url, $rev, $uuid, $gs);
40cb8f8f 1534 } else {
060610c5 1535 $max{$url} ||= $gs->rev_map_max;
13c823fb
EW		 1536 }
1537 }
1538 }
905f8b7d 1539 }
13c823fb
EW		 1540 command_close_pipe($fh, $ctx);
1541 (undef, undef, undef, undef);
905f8b7d
EW		 1542}
1543
733a65aa
EW		 1544sub read_commit_parents {
1545 my ($parents, $c) = @_;
7b02b85a
EW		 1546 chomp(my $p = command_oneline(qw/rev-list --parents -1/, $c));
1547 $p =~ s/^($c)\s*// or die "rev-list --parents -1 $c failed!\n";
1548 @{$parents->{$c}} = split(/ /, $p);
733a65aa
EW		 1549}
1550
1551sub linearize_history {
1552 my ($gs, $refs) = @_;
1553 my %parents;
1554 foreach my $c (@$refs) {
1555 read_commit_parents(\%parents, $c);
1556 }
1557
1558 my @linear_refs;
1559 my %skip = ();
1560 my $last_svn_commit = $gs->last_commit;
1561 foreach my $c (reverse @$refs) {
1562 next if $c eq $last_svn_commit;
1563 last if $skip{$c};
1564
1565 unshift @linear_refs, $c;
1566 $skip{$c} = 1;
1567
1568 # we only want the first parent to diff against for linear
1569 # history, we save the rest to inject when we finalize the
1570 # svn commit
1571 my $fp_a = verify_ref("$c~1");
1572 my $fp_b = shift @{$parents{$c}} if $parents{$c};
1573 if (!$fp_a || !$fp_b) {
1574 die "Commit $c\n",
1575 "has no parent commit, and therefore ",
1576 "nothing to diff against.\n",
1577 "You should be working from a repository ",
1578 "originally created by git-svn\n";
1579 }
1580 if ($fp_a ne $fp_b) {
1581 die "$c~1 = $fp_a, however parsing commit $c ",
1582 "revealed that:\n$c~1 = $fp_b\nBUG!\n";
1583 }
1584
1585 foreach my $p (@{$parents{$c}}) {
1586 $skip{$p} = 1;
1587 }
1588 }
1589 (\@linear_refs, \%parents);
1590}
1591
e6fefa92
DK		 1592sub find_file_type_and_diff_status {
1593 my ($path) = @_;
107cee50 1594 return ('dir', '') if $path eq '';
e6fefa92
DK		 1595
1596 my $diff_output =
1597 command_oneline(qw(diff --cached --name-status --), $path) || "";
1598 my $diff_status = (split(' ', $diff_output))[0] || "";
1599
1600 my $ls_tree = command_oneline(qw(ls-tree HEAD), $path) || "";
1601
1602 return (undef, undef) if !$diff_status && !$ls_tree;
1603
1604 if ($diff_status eq "A") {
1605 return ("link", $diff_status) if -l $path;
1606 return ("dir", $diff_status) if -d $path;
1607 return ("file", $diff_status);
1608 }
1609
1610 my $mode = (split(' ', $ls_tree))[0] || "";
1611
1612 return ("link", $diff_status) if $mode eq "120000";
1613 return ("dir", $diff_status) if $mode eq "040000";
1614 return ("file", $diff_status);
1615}
1616
b2b3ada7
DK		 1617sub md5sum {
1618 my $arg = shift;
1619 my $ref = ref $arg;
1620 my $md5 = Digest::MD5->new();
0b19138b 1621 if ($ref eq 'GLOB' || $ref eq 'IO::File' || $ref eq 'File::Temp') {
b2b3ada7
DK		 1622 $md5->addfile($arg) or croak $!;
1623 } elsif ($ref eq 'SCALAR') {
1624 $md5->add($$arg) or croak $!;
1625 } elsif (!$ref) {
1626 $md5->add($arg) or croak $!;
1627 } else {
1628 ::fatal "Can't provide MD5 hash for unknown ref type: '", $ref, "'";
1629 }
1630 return $md5->hexdigest();
1631}
1632
2da9ee08
RZ		 1633sub gc_directory {
1634 if ($can_compress && -f $_ && basename($_) eq "unhandled.log") {
1635 my $out_filename = $_ . ".gz";
1636 open my $in_fh, "<", $_ or die "Unable to open $_: $!\n";
1637 binmode $in_fh;
1638 my $gz = Compress::Zlib::gzopen($out_filename, "ab") or
1639 die "Unable to open $out_filename: $!\n";
1640
1641 my $res;
1642 while ($res = sysread($in_fh, my $str, 1024)) {
1643 $gz->gzwrite($str) or
1644 die "Unable to write: ".$gz->gzerror()."!\n";
1645 }
1646 unlink $_ or die "unlink $File::Find::name: $!\n";
1647 } elsif (-f $_ && basename($_) eq "index") {
1648 unlink $_ or die "unlink $_: $!\n";
1649 }
1650}
1651
9b981fc6
EW		 1652package Git::SVN;
1653use strict;
1654use warnings;
060610c5
EW		 1655use Fcntl qw/:DEFAULT :seek/;
1656use constant rev_map_fmt => 'NH40';
ecc712dd 1657use vars qw/$default_repo_id $default_ref_id $_no_metadata $_follow_parent
62e349d2 1658 $_repack $_repack_flags $_use_svm_props $_head
70ae04e4 1659 $_use_svnsync_props $no_reuse_existing $_minimize_url
e82f0d73 1660 $_use_log_author $_add_author_from $_localtime/;
9b981fc6
EW		 1661use Carp qw/croak/;
1662use File::Path qw/mkpath/;
373274f9 1663use File::Copy qw/copy/;
9b981fc6 1664use IPC::Open3;
7d944c33 1665use Memoize; # core since 5.8.0, Jul 2002
8bff7c53 1666use Memoize::Storable;
9b981fc6 1667
94bc914c
KW		 1668my ($_gc_nr, $_gc_period);
1669
9b981fc6
EW		 1670# properties that we do not log:
1671my %SKIP_PROP;
1672BEGIN {
1673 %SKIP_PROP = map { $_ => 1 } qw/svn:wc:ra_dav:version-url
1674 svn:special svn:executable
1675 svn:entry:committed-rev
1676 svn:entry:last-author
1677 svn:entry:uuid
1678 svn:entry:committed-date/;
91b03282
EW		 1679
1680 # some options are read globally, but can be overridden locally
1681 # per [svn-remote "..."] section. Command-line options will *NOT*
1682 # override options set in an [svn-remote "..."] section
c5f71ad0
SV		 1683 no strict 'refs';
1684 for my $option (qw/follow_parent no_metadata use_svm_props
1685 use_svnsync_props/) {
1686 my $key = $option;
91b03282 1687 $key =~ tr/_//d;
c5f71ad0
SV		 1688 my $prop = "-$option";
1689 *$option = sub {
1690 my ($self) = @_;
1691 return $self->{$prop} if exists $self->{$prop};
1692 my $k = "svn-remote.$self->{repo_id}.$key";
1693 eval { command_oneline(qw/config --get/, $k) };
1694 if ($@) {
1695 $self->{$prop} = ${"Git::SVN::_$option"};
91b03282 1696 } else {
c5f71ad0
SV		 1697 my $v = command_oneline(qw/config --bool/,$k);
1698 $self->{$prop} = $v eq 'false' ? 0 : 1;
91b03282 1699 }
c5f71ad0
SV		 1700 return $self->{$prop};
1701 }
91b03282 1702 }
9b981fc6
EW		 1703}
1704
0b19138b 1705
321b1842
EW		 1706my (%LOCKFILES, %INDEX_FILES);
1707END {
1708 unlink keys %LOCKFILES if %LOCKFILES;
1709 unlink keys %INDEX_FILES if %INDEX_FILES;
1710}
373274f9 1711
4bb9ed04
EW		 1712sub resolve_local_globs {
1713 my ($url, $fetch, $glob_spec) = @_;
1714 return unless defined $glob_spec;
1715 my $ref = $glob_spec->{ref};
1716 my $path = $glob_spec->{path};
6f5748e1
AB		 1717 foreach (command(qw#for-each-ref --format=%(refname) refs/#)) {
1718 next unless m#^$ref->{regex}$#;
4bb9ed04 1719 my $p = $1;
bf655fd7
RE		 1720 my $pathname = desanitize_refname($path->full_path($p));
1721 my $refname = desanitize_refname($ref->full_path($p));
4bb9ed04
EW		 1722 if (my $existing = $fetch->{$pathname}) {
1723 if ($existing ne $refname) {
1724 die "Refspec conflict:\n",
6f5748e1
AB		 1725 "existing: $existing\n",
1726 " globbed: $refname\n";
4bb9ed04 1727 }
6f5748e1 1728 my $u = (::cmt_metadata("$refname"))[0];
4e9f6cc7 1729 $u =~ s!^\Q$url\E(/|$)!! or die
6f5748e1 1730 "$refname: '$url' not found in '$u'\n";
4bb9ed04
EW		 1731 if ($pathname ne $u) {
1732 warn "W: Refspec glob conflict ",
6f5748e1 1733 "(ref: $refname):\n",
4bb9ed04
EW		 1734 "expected path: $pathname\n",
1735 " real path: $u\n",
1736 "Continuing ahead with $u\n";
1737 next;
1738 }
1739 } else {
4bb9ed04
EW		 1740 $fetch->{$pathname} = $refname;
1741 }
1742 }
1743}
1744
e98671e5
EW		 1745sub parse_revision_argument {
1746 my ($base, $head) = @_;
1747 if (!defined $::_revision || $::_revision eq 'BASE:HEAD') {
1748 return ($base, $head);
1749 }
1750 return ($1, $2) if ($::_revision =~ /^(\d+):(\d+)$/);
1751 return ($::_revision, $::_revision) if ($::_revision =~ /^\d+$/);
1752 return ($head, $head) if ($::_revision eq 'HEAD');
1753 return ($base, $1) if ($::_revision =~ /^BASE:(\d+)$/);
1754 return ($1, $head) if ($::_revision =~ /^(\d+):HEAD$/);
1755 die "revision argument: $::_revision not understood by git-svn\n";
1756}
1757
0af9c9f9 1758sub fetch_all {
4bb9ed04 1759 my ($repo_id, $remotes) = @_;
905f8b7d
EW		 1760 if (ref $repo_id) {
1761 my $gs = $repo_id;
1762 $repo_id = undef;
1763 $repo_id = $gs->{repo_id};
1764 }
1765 $remotes ||= read_all_remotes();
7447b4bc
EW		 1766 my $remote = $remotes->{$repo_id} or
1767 die "[svn-remote \"$repo_id\"] unknown\n";
e518192f 1768 my $fetch = $remote->{fetch};
7447b4bc 1769 my $url = $remote->{url} or die "svn-remote.$repo_id.url not defined\n";
e518192f 1770 my (@gs, @globs);
0af9c9f9 1771 my $ra = Git::SVN::Ra->new($url);
26a62d57 1772 my $uuid = $ra->get_uuid;
0af9c9f9 1773 my $head = $ra->get_latest_revnum;
577e9fca
EW		 1774
1775 # ignore errors, $head revision may not even exist anymore
1776 eval { $ra->get_log("", $head, 0, 1, 0, 1, sub { $head = $_[1] }) };
1777 warn "W: $@\n" if $@;
1778
28710f74 1779 my $base = defined $fetch ? $head : 0;
e518192f
EW		 1780
1781 # read the max revs for wildcard expansion (branches/*, tags/*)
1782 foreach my $t (qw/branches tags/) {
1783 defined $remote->{$t} or next;
62244069
MB		 1784 push @globs, @{$remote->{$t}};
1785
93f2689c
EW		 1786 my $max_rev = eval { tmp_config(qw/--int --get/,
1787 "svn-remote.$repo_id.${t}-maxRev") };
1788 if (defined $max_rev && ($max_rev < $base)) {
1789 $base = $max_rev;
d6d3346b
EW		 1790 } elsif (!defined $max_rev) {
1791 $base = 0;
e518192f
EW		 1792 }
1793 }
1794
db03cd24
EW		 1795 if ($fetch) {
1796 foreach my $p (sort keys %$fetch) {
1797 my $gs = Git::SVN->new($fetch->{$p}, $repo_id, $p);
060610c5 1798 my $lr = $gs->rev_map_max;
db03cd24
EW		 1799 if (defined $lr) {
1800 $base = $lr if ($lr < $base);
1801 }
1802 push @gs, $gs;
0af9c9f9 1803 }
0af9c9f9 1804 }
e98671e5
EW		 1805
1806 ($base, $head) = parse_revision_argument($base, $head);
e518192f 1807 $ra->gs_fetch_loop_common($base, $head, \@gs, \@globs);
0af9c9f9
EW		 1808}
1809
47e39c55
EW		 1810sub read_all_remotes {
1811 my $r = {};
63c56022
JA		 1812 my $use_svm_props = eval { command_oneline(qw/config --bool
1813 svn.useSvmProps/) };
1814 $use_svm_props = $use_svm_props eq 'true' if $use_svm_props;
ffd5c8e4 1815 my $svn_refspec = qr{\s*(.*?)\s*:\s*(.+?)\s*};
8b8fc068 1816 foreach (grep { s/^svn-remote\.// } command(qw/config -l/)) {
6f5748e1
AB		 1817 if (m!^(.+)\.fetch=$svn_refspec$!) {
1818 my ($remote, $local_ref, $remote_ref) = ($1, $2, $3);
1819 die("svn-remote.$remote: remote ref '$remote_ref' "
1820 . "must start with 'refs/'\n")
1821 unless $remote_ref =~ m{^refs/};
46cf98ba 1822 $r->{$remote}->{fetch}->{$local_ref} = $remote_ref;
63c56022
JA		 1823 $r->{$remote}->{svm} = {} if $use_svm_props;
1824 } elsif (m!^(.+)\.usesvmprops=\s*(.*)\s*$!) {
1825 $r->{$1}->{svm} = {};
47e39c55
EW		 1826 } elsif (m!^(.+)\.url=\s*(.*)\s*$!) {
1827 $r->{$1}->{url} = $2;
6f5748e1
AB		 1828 } elsif (m!^(.+)\.(branches|tags)=$svn_refspec$!) {
1829 my ($remote, $t, $local_ref, $remote_ref) =
1830 ($1, $2, $3, $4);
1831 die("svn-remote.$remote: remote ref '$remote_ref' ($t) "
1832 . "must start with 'refs/'\n")
1833 unless $remote_ref =~ m{^refs/};
62244069 1834 my $rs = {
6f5748e1
AB		 1835 t => $t,
1836 remote => $remote,
07576208
JS		 1837 path => Git::SVN::GlobSpec->new($local_ref, 1),
1838 ref => Git::SVN::GlobSpec->new($remote_ref, 0) };
4bb9ed04
EW		 1839 if (length($rs->{ref}->{right}) != 0) {
1840 die "The '*' glob character must be the last ",
6f5748e1 1841 "character of '$remote_ref'\n";
4bb9ed04 1842 }
6f5748e1 1843 push @{ $r->{$remote}->{$t} }, $rs;
47e39c55
EW		 1844 }
1845 }
63c56022
JA		 1846
1847 map {
1848 if (defined $r->{$_}->{svm}) {
1849 my $svm;
1850 eval {
1851 my $section = "svn-remote.$_";
1852 $svm = {
1853 source => tmp_config('--get',
1854 "$section.svm-source"),
1855 replace => tmp_config('--get',
1856 "$section.svm-replace"),
1857 }
1858 };
1859 $r->{$_}->{svm} = $svm;
1860 }
1861 } keys %$r;
1862
47e39c55
EW		 1863 $r;
1864}
1865
ecc712dd 1866sub init_vars {
94bc914c 1867 $_gc_nr = $_gc_period = 1000;
af788a6e
KW		 1868 if (defined $_repack || defined $_repack_flags) {
1869 warn "Repack options are obsolete; they have no effect.\n";
1870 }
ecc712dd
EW		 1871}
1872
b805b44a 1873sub verify_remotes_sanity {
536c4b09 1874 return unless -d $ENV{GIT_DIR};
b805b44a
EW		 1875 my %seen;
1876 foreach (command(qw/config -l/)) {
1877 if (m!^svn-remote\.(?:.+)\.fetch=.*:refs/remotes/(\S+)\s*$!) {
1878 if ($seen{$1}) {
1879 die "Remote ref refs/remote/$1 is tracked by",
1880 "\n \"$_\"\nand\n \"$seen{$1}\"\n",
1881 "Please resolve this ambiguity in ",
1882 "your git configuration file before ",
1883 "continuing\n";
1884 }
1885 $seen{$1} = $_;
1886 }
1887 }
1888}
1889
e6434f87
EW		 1890sub find_existing_remote {
1891 my ($url, $remotes) = @_;
befc9adc 1892 return undef if $no_reuse_existing;
e6434f87
EW		 1893 my $existing;
1894 foreach my $repo_id (keys %$remotes) {
1895 my $u = $remotes->{$repo_id}->{url} or next;
1896 next if $u ne $url;
1897 $existing = $repo_id;
1898 last;
1899 }
1900 $existing;
1901}
b805b44a 1902
e6434f87 1903sub init_remote_config {
d8115c51 1904 my ($self, $url, $no_write) = @_;
e6434f87
EW		 1905 $url =~ s!/+$!!; # strip trailing slash
1906 my $r = read_all_remotes();
1907 my $existing = find_existing_remote($url, $r);
1908 if ($existing) {
e518192f
EW		 1909 unless ($no_write) {
1910 print STDERR "Using existing ",
1911 "[svn-remote \"$existing\"]\n";
1912 }
e6434f87 1913 $self->{repo_id} = $existing;
4a1bb4c3 1914 } elsif ($_minimize_url) {
e6434f87
EW		 1915 my $min_url = Git::SVN::Ra->new($url)->minimize_url;
1916 $existing = find_existing_remote($min_url, $r);
1917 if ($existing) {
e518192f
EW		 1918 unless ($no_write) {
1919 print STDERR "Using existing ",
1920 "[svn-remote \"$existing\"]\n";
1921 }
e6434f87
EW		 1922 $self->{repo_id} = $existing;
1923 }
1924 if ($min_url ne $url) {
e518192f
EW		 1925 unless ($no_write) {
1926 print STDERR "Using higher level of URL: ",
1927 "$url => $min_url\n";
1928 }
e6434f87
EW		 1929 my $old_path = $self->{path};
1930 $self->{path} = $url;
4e9f6cc7 1931 $self->{path} =~ s!^\Q$min_url\E(/|$)!!;
e6434f87
EW		 1932 if (length $old_path) {
1933 $self->{path} .= "/$old_path";
1934 }
1935 $url = $min_url;
1936 }
1937 }
1938 my $orig_url;
1939 if (!$existing) {
b805b44a 1940 # verify that we aren't overwriting anything:
e6434f87 1941 $orig_url = eval {
706587fc 1942 command_oneline('config', '--get',
e6434f87 1943 "svn-remote.$self->{repo_id}.url")
706587fc 1944 };
b805b44a 1945 if ($orig_url && ($orig_url ne $url)) {
e6434f87 1946 die "svn-remote.$self->{repo_id}.url already set: ",
b805b44a
EW		 1947 "$orig_url\nwanted to set to: $url\n";
1948 }
9b981fc6 1949 }
e6434f87 1950 my ($xrepo_id, $xpath) = find_ref($self->refname);
6f5748e1 1951 if (!$no_write && defined $xpath) {
e6434f87 1952 die "svn-remote.$xrepo_id.fetch already set to track ",
6f5748e1 1953 "$xpath:", $self->refname, "\n";
e6434f87 1954 }
d8115c51
EW		 1955 unless ($no_write) {
1956 command_noisy('config',
1957 "svn-remote.$self->{repo_id}.url", $url);
46cf98ba 1958 $self->{path} =~ s{^/}{};
5268f9ed 1959 $self->{path} =~ s{%([0-9A-F]{2})}{chr hex($1)}ieg;
d8115c51
EW		 1960 command_noisy('config', '--add',
1961 "svn-remote.$self->{repo_id}.fetch",
1962 "$self->{path}:".$self->refname);
1963 }
9b981fc6 1964 $self->{url} = $url;
e6434f87
EW		 1965}
1966
a8ae2623
EW		 1967sub find_by_url { # repos_root and, path are optional
1968 my ($class, $full_url, $repos_root, $path) = @_;
56973d20 1969
1a97a506 1970 return undef unless defined $full_url;
56973d20
AR		 1971 remove_username($full_url);
1972 remove_username($repos_root) if defined $repos_root;
a8ae2623
EW		 1973 my $remotes = read_all_remotes();
1974 if (defined $full_url && defined $repos_root && !defined $path) {
1975 $path = $full_url;
1976 $path =~ s#^\Q$repos_root\E(?:/|$)##;
1977 }
1978 foreach my $repo_id (keys %$remotes) {
1979 my $u = $remotes->{$repo_id}->{url} or next;
56973d20 1980 remove_username($u);
a8ae2623
EW		 1981 next if defined $repos_root && $repos_root ne $u;
1982
1983 my $fetch = $remotes->{$repo_id}->{fetch} || {};
62244069
MB		 1984 foreach my $t (qw/branches tags/) {
1985 foreach my $globspec (@{$remotes->{$repo_id}->{$t}}) {
1986 resolve_local_globs($u, $fetch, $globspec);
1987 }
a8ae2623
EW		 1988 }
1989 my $p = $path;
0bb91d9a 1990 my $rwr = rewrite_root({repo_id => $repo_id});
63c56022
JA		 1991 my $svm = $remotes->{$repo_id}->{svm}
1992 if defined $remotes->{$repo_id}->{svm};
a8ae2623
EW		 1993 unless (defined $p) {
1994 $p = $full_url;
0bb91d9a 1995 my $z = $u;
63c56022 1996 my $prefix = '';
0bb91d9a
JG		 1997 if ($rwr) {
1998 $z = $rwr;
1b7e543a 1999 remove_username($z);
63c56022
JA		 2000 } elsif (defined $svm) {
2001 $z = $svm->{source};
2002 $prefix = $svm->{replace};
2003 $prefix =~ s#^\Q$u\E(?:/|$)##;
2004 $prefix =~ s#/$##;
0bb91d9a 2005 }
63c56022 2006 $p =~ s#^\Q$z\E(?:/|$)#$prefix# or next;
a8ae2623
EW		 2007 }
2008 foreach my $f (keys %$fetch) {
2009 next if $f ne $p;
2010 return Git::SVN->new($fetch->{$f}, $repo_id, $f);
2011 }
2012 }
2013 undef;
2014}
2015
e6434f87 2016sub init {
d8115c51 2017 my ($class, $url, $path, $repo_id, $ref_id, $no_write) = @_;
e6434f87
EW		 2018 my $self = _new($class, $repo_id, $ref_id, $path);
2019 if (defined $url) {
d8115c51 2020 $self->init_remote_config($url, $no_write);
e6434f87 2021 }
9b981fc6
EW		 2022 $self;
2023}
2024
706587fc
EW		 2025sub find_ref {
2026 my ($ref_id) = @_;
2027 foreach (command(qw/config -l/)) {
2028 next unless m!^svn-remote\.(.+)\.fetch=
ffd5c8e4 2029 \s*(.*?)\s*:\s*(.+?)\s*$!x;
706587fc
EW		 2030 my ($repo_id, $path, $ref) = ($1, $2, $3);
2031 if ($ref eq $ref_id) {
2032 $path = '' if ($path =~ m#^\./?#);
2033 return ($repo_id, $path);
2034 }
2035 }
2036 (undef, undef, undef);
2037}
2038
9b981fc6 2039sub new {
706587fc
EW		 2040 my ($class, $ref_id, $repo_id, $path) = @_;
2041 if (defined $ref_id && !defined $repo_id && !defined $path) {
2042 ($repo_id, $path) = find_ref($ref_id);
2043 if (!defined $repo_id) {
2044 die "Could not find a \"svn-remote.*.fetch\" key ",
2045 "in the repository configuration matching: ",
6f5748e1 2046 "$ref_id\n";
706587fc
EW		 2047 }
2048 }
2049 my $self = _new($class, $repo_id, $ref_id, $path);
8b8fc068
EW		 2050 if (!defined $self->{path} || !length $self->{path}) {
2051 my $fetch = command_oneline('config', '--get',
2052 "svn-remote.$repo_id.fetch",
6f5748e1 2053 ":$ref_id\$") or
8b8fc068 2054 die "Failed to read \"svn-remote.$repo_id.fetch\" ",
6f5748e1 2055 "\":$ref_id\$\" in config\n";
8b8fc068
EW		 2056 ($self->{path}, undef) = split(/\s*:\s*/, $fetch);
2057 }
b1a954a3
EW		 2058 $self->{path} =~ s{/+}{/}g;
2059 $self->{path} =~ s{\A/}{};
2060 $self->{path} =~ s{/\z}{};
706587fc
EW		 2061 $self->{url} = command_oneline('config', '--get',
2062 "svn-remote.$repo_id.url") or
2063 die "Failed to read \"svn-remote.$repo_id.url\" in config\n";
d6d3346b 2064 $self->rebuild;
9b981fc6
EW		 2065 $self;
2066}
2067
bf655fd7 2068sub refname {
6f5748e1 2069 my ($refname) = $_[0]->{ref_id} ;
bf655fd7
RE		 2070
2071 # It cannot end with a slash /, we'll throw up on this because
2072 # SVN can't have directories with a slash in their name, either:
2073 if ($refname =~ m{/$}) {
2074 die "ref: '$refname' ends with a trailing slash, this is ",
2075 "not permitted by git nor Subversion\n";
2076 }
2077
2078 # It cannot have ASCII control character space, tilde ~, caret ^,
2079 # colon :, question-mark ?, asterisk *, space, or open bracket [
2080 # anywhere.
2081 #
2082 # Additionally, % must be escaped because it is used for escaping
2083 # and we want our escaped refname to be reversible
2084 $refname =~ s{([ \%~\^:\?\*\[\t])}{uc sprintf('%%%02x',ord($1))}eg;
2085
2086 # no slash-separated component can begin with a dot .
2087 # /.* becomes /%2E*
2088 $refname =~ s{/\.}{/%2E}g;
2089
2090 # It cannot have two consecutive dots .. anywhere
2091 # .. becomes %2E%2E
2092 $refname =~ s{\.\.}{%2E%2E}g;
2093
73d41955
TS		 2094 # trailing dots and .lock are not allowed
2095 # .$ becomes %2E and .lock becomes %2Elock
2096 $refname =~ s{\.(?=$|lock$)}{%2E};
2097
2098 # the sequence @{ is used to access the reflog
2099 # @{ becomes %40{
2100 $refname =~ s{\@\{}{%40\{}g;
2101
bf655fd7
RE		 2102 return $refname;
2103}
2104
2105sub desanitize_refname {
2106 my ($refname) = @_;
2107 $refname =~ s{%(?:([0-9A-F]{2}))}{chr hex($1)}eg;
2108 return $refname;
2109}
9b981fc6 2110
26a62d57
EW		 2111sub svm_uuid {
2112 my ($self) = @_;
2113 return $self->{svm}->{uuid} if $self->svm;
2114 $self->ra;
2115 unless ($self->{svm}) {
2116 die "SVM UUID not cached, and reading remotely failed\n";
2117 }
2118 $self->{svm}->{uuid};
2119}
8a49ee97 2120
26a62d57
EW		 2121sub svm {
2122 my ($self) = @_;
2123 return $self->{svm} if $self->{svm};
2124 my $svm;
8a49ee97
EW		 2125 # see if we have it in our config, first:
2126 eval {
26a62d57
EW		 2127 my $section = "svn-remote.$self->{repo_id}";
2128 $svm = {
93f2689c
EW		 2129 source => tmp_config('--get', "$section.svm-source"),
2130 uuid => tmp_config('--get', "$section.svm-uuid"),
befc9adc 2131 replace => tmp_config('--get', "$section.svm-replace"),
8a49ee97
EW		 2132 }
2133 };
befc9adc
EW		 2134 if ($svm && $svm->{source} && $svm->{uuid} && $svm->{replace}) {
2135 $self->{svm} = $svm;
2136 }
26a62d57
EW		 2137 $self->{svm};
2138}
2139
2140sub _set_svm_vars {
2141 my ($self, $ra) = @_;
db03cd24
EW		 2142 return $ra if $self->svm;
2143
2144 my @err = ( "useSvmProps set, but failed to read SVM properties\n",
befc9adc 2145 "(svm:source, svm:uuid) ",
db03cd24
EW		 2146 "from the following URLs:\n" );
2147 sub read_svm_props {
befc9adc
EW		 2148 my ($self, $ra, $path, $r) = @_;
2149 my $props = ($ra->get_dir($path, $r))[2];
db03cd24 2150 my $src = $props->{'svm:source'};
db03cd24 2151 my $uuid = $props->{'svm:uuid'};
befc9adc 2152 return undef if (!$src || !$uuid);
26a62d57 2153
befc9adc 2154 chomp($src, $uuid);
26a62d57 2155
b3e95936 2156 $uuid =~ m{^[0-9a-f\-]{30,}$}i
db03cd24 2157 or die "doesn't look right - svm:uuid is '$uuid'\n";
befc9adc
EW		 2158
2159 # the '!' is used to mark the repos_root!/relative/path
2160 $src =~ s{/?!/?}{/};
db03cd24 2161 $src =~ s{/+$}{}; # no trailing slashes please
befc9adc 2162 # username is of no interest
8a49ee97 2163 $src =~ s{(^[a-z\+]*://)[^/@]*@}{$1};
8a49ee97 2164
befc9adc
EW		 2165 my $replace = $ra->{url};
2166 $replace .= "/$path" if length $path;
2167
db03cd24 2168 my $section = "svn-remote.$self->{repo_id}";
befc9adc
EW		 2169 tmp_config("$section.svm-source", $src);
2170 tmp_config("$section.svm-replace", $replace);
2171 tmp_config("$section.svm-uuid", $uuid);
2172 $self->{svm} = {
2173 source => $src,
2174 uuid => $uuid,
2175 replace => $replace
2176 };
db03cd24
EW		 2177 }
2178
2179 my $r = $ra->get_latest_revnum;
2180 my $path = $self->{path};
befc9adc 2181 my %tried;
db03cd24 2182 while (length $path) {
befc9adc
EW		 2183 unless ($tried{"$self->{url}/$path"}) {
2184 return $ra if $self->read_svm_props($ra, $path, $r);
2185 $tried{"$self->{url}/$path"} = 1;
db03cd24 2186 }
befc9adc 2187 $path =~ s#/?[^/]+$##;
8a49ee97 2188 }
befc9adc
EW		 2189 die "Path: '$path' should be ''\n" if $path ne '';
2190 return $ra if $self->read_svm_props($ra, $path, $r);
2191 $tried{"$self->{url}/$path"} = 1;
db03cd24
EW		 2192
2193 if ($ra->{repos_root} eq $self->{url}) {
befc9adc 2194 die @err, (map { " $_\n" } keys %tried), "\n";
db03cd24
EW		 2195 }
2196
2197 # nope, make sure we're connected to the repository root:
2198 my $ok;
2199 my @tried_b;
2200 $path = $ra->{svn_path};
db03cd24
EW		 2201 $ra = Git::SVN::Ra->new($ra->{repos_root});
2202 while (length $path) {
befc9adc
EW		 2203 unless ($tried{"$ra->{url}/$path"}) {
2204 $ok = $self->read_svm_props($ra, $path, $r);
2205 last if $ok;
2206 $tried{"$ra->{url}/$path"} = 1;
2207 }
2208 $path =~ s#/?[^/]+$##;
db03cd24 2209 }
befc9adc
EW		 2210 die "Path: '$path' should be ''\n" if $path ne '';
2211 $ok ||= $self->read_svm_props($ra, $path, $r);
2212 $tried{"$ra->{url}/$path"} = 1;
db03cd24 2213 if (!$ok) {
befc9adc 2214 die @err, (map { " $_\n" } keys %tried), "\n";
db03cd24
EW		 2215 }
2216 Git::SVN::Ra->new($self->{url});
8a49ee97
EW		 2217}
2218
62e349d2
EW		 2219sub svnsync {
2220 my ($self) = @_;
2221 return $self->{svnsync} if $self->{svnsync};
2222
2223 if ($self->no_metadata) {
2224 die "Can't have both 'noMetadata' and ",
2225 "'useSvnsyncProps' options set!\n";
2226 }
2227 if ($self->rewrite_root) {
2228 die "Can't have both 'useSvnsyncProps' and 'rewriteRoot' ",
2229 "options set!\n";
2230 }
3e18ce1a
JS		 2231 if ($self->rewrite_uuid) {
2232 die "Can't have both 'useSvnsyncProps' and 'rewriteUUID' ",
2233 "options set!\n";
2234 }
62e349d2
EW		 2235
2236 my $svnsync;
2237 # see if we have it in our config, first:
2238 eval {
2239 my $section = "svn-remote.$self->{repo_id}";
98fa5b68
EW		 2240
2241 my $url = tmp_config('--get', "$section.svnsync-url");
2242 ($url) = ($url =~ m{^([a-z\+]+://\S+)$}) or
2243 die "doesn't look right - svn:sync-from-url is '$url'\n";
2244
2245 my $uuid = tmp_config('--get', "$section.svnsync-uuid");
b3e95936 2246 ($uuid) = ($uuid =~ m{^([0-9a-f\-]{30,})$}i) or
98fa5b68
EW		 2247 die "doesn't look right - svn:sync-from-uuid is '$uuid'\n";
2248
2249 $svnsync = { url => $url, uuid => $uuid }
62e349d2
EW		 2250 };
2251 if ($svnsync && $svnsync->{url} && $svnsync->{uuid}) {
2252 return $self->{svnsync} = $svnsync;
2253 }
2254
2255 my $err = "useSvnsyncProps set, but failed to read " .
2256 "svnsync property: svn:sync-from-";
2257 my $rp = $self->ra->rev_proplist(0);
2258
2259 my $url = $rp->{'svn:sync-from-url'} or die $err . "url\n";
98fa5b68 2260 ($url) = ($url =~ m{^([a-z\+]+://\S+)$}) or
62e349d2
EW		 2261 die "doesn't look right - svn:sync-from-url is '$url'\n";
2262
2263 my $uuid = $rp->{'svn:sync-from-uuid'} or die $err . "uuid\n";
b3e95936 2264 ($uuid) = ($uuid =~ m{^([0-9a-f\-]{30,})$}i) or
62e349d2
EW		 2265 die "doesn't look right - svn:sync-from-uuid is '$uuid'\n";
2266
2267 my $section = "svn-remote.$self->{repo_id}";
2268 tmp_config('--add', "$section.svnsync-uuid", $uuid);
2269 tmp_config('--add', "$section.svnsync-url", $url);
2270 return $self->{svnsync} = { url => $url, uuid => $uuid };
2271}
2272
26a62d57
EW		 2273# this allows us to memoize our SVN::Ra UUID locally and avoid a
2274# remote lookup (useful for 'git svn log').
2275sub ra_uuid {
2276 my ($self) = @_;
2277 unless ($self->{ra_uuid}) {
2278 my $key = "svn-remote.$self->{repo_id}.uuid";
2279 my $uuid = eval { tmp_config('--get', $key) };
b3e95936 2280 if (!$@ && $uuid && $uuid =~ /^([a-f\d\-]{30,})$/i) {
26a62d57
EW		 2281 $self->{ra_uuid} = $uuid;
2282 } else {
2283 die "ra_uuid called without URL\n" unless $self->{url};
2284 $self->{ra_uuid} = $self->ra->get_uuid;
2285 tmp_config('--add', $key, $self->{ra_uuid});
2286 }
2287 }
2288 $self->{ra_uuid};
2289}
2290
a5460eb7
EW		 2291sub _set_repos_root {
2292 my ($self, $repos_root) = @_;
2293 my $k = "svn-remote.$self->{repo_id}.reposRoot";
2294 $repos_root ||= $self->ra->{repos_root};
2295 tmp_config($k, $repos_root);
2296 $repos_root;
2297}
2298
2299sub repos_root {
2300 my ($self) = @_;
2301 my $k = "svn-remote.$self->{repo_id}.reposRoot";
2302 eval { tmp_config('--get', $k) } || $self->_set_repos_root;
2303}
2304
9b981fc6
EW		 2305sub ra {
2306 my ($self) = shift;
8a49ee97 2307 my $ra = Git::SVN::Ra->new($self->{url});
a5460eb7 2308 $self->_set_repos_root($ra->{repos_root});
91b03282
EW		 2309 if ($self->use_svm_props && !$self->{svm}) {
2310 if ($self->no_metadata) {
97ae0911
EW		 2311 die "Can't have both 'noMetadata' and ",
2312 "'useSvmProps' options set!\n";
62e349d2
EW		 2313 } elsif ($self->use_svnsync_props) {
2314 die "Can't have both 'useSvnsyncProps' and ",
2315 "'useSvmProps' options set!\n";
91b03282 2316 }
26a62d57 2317 $ra = $self->_set_svm_vars($ra);
8a49ee97
EW		 2318 $self->{-want_revprops} = 1;
2319 }
2320 $ra;
9b981fc6
EW		 2321}
2322
01bdab84
BS		 2323# prop_walk(PATH, REV, SUB)
2324# -------------------------
2325# Recursively traverse PATH at revision REV and invoke SUB for each
2326# directory that contains a SVN property. SUB will be invoked as
2327# follows: &SUB(gs, path, props); where `gs' is this instance of
2328# Git::SVN, `path' the path to the directory where the properties
2329# `props' were found. The `path' will be relative to point of checkout,
2330# that is, if url://repo/trunk is the current Git branch, and that
2331# directory contains a sub-directory `d', SUB will be invoked with `/d/'
2332# as `path' (note the trailing `/').
2333sub prop_walk {
2334 my ($self, $path, $rev, $sub) = @_;
2335
35cda061 2336 $path =~ s#^/##;
01bdab84
BS		 2337 my ($dirent, undef, $props) = $self->ra->get_dir($path, $rev);
2338 $path =~ s#^/*#/#g;
9b981fc6 2339 my $p = $path;
01bdab84
BS		 2340 # Strip the irrelevant part of the path.
2341 $p =~ s#^/+\Q$self->{path}\E(/|$)#/#;
2342 # Ensure the path is terminated by a `/'.
2343 $p =~ s#/*$#/#;
2344
2345 # The properties contain all the internal SVN stuff nobody
2346 # (usually) cares about.
2347 my $interesting_props = 0;
2348 foreach (keys %{$props}) {
2349 # If it doesn't start with `svn:', it must be a
2350 # user-defined property.
2351 ++$interesting_props and next if $_ !~ /^svn:/;
2352 # FIXME: Fragile, if SVN adds new public properties,
2353 # this needs to be updated.
2354 ++$interesting_props if /^svn:(?:ignore|keywords|executable
2355 |eol-style|mime-type
2356 |externals|needs-lock)$/x;
2357 }
2358 &$sub($self, $p, $props) if $interesting_props;
2359
9b981fc6 2360 foreach (sort keys %$dirent) {
0dc03d6a 2361 next if $dirent->{$_}->{kind} != $SVN::Node::dir;
b7166cce 2362 $self->prop_walk($self->{path} . $p . $_, $rev, $sub);
9b981fc6
EW		 2363 }
2364}
2365
3ebe8df7
EW		 2366sub last_rev { ($_[0]->last_rev_commit)[0] }
2367sub last_commit { ($_[0]->last_rev_commit)[1] }
2368
9b981fc6
EW		 2369# returns the newest SVN revision number and newest commit SHA1
2370sub last_rev_commit {
2371 my ($self) = @_;
2372 if (defined $self->{last_rev} && defined $self->{last_commit}) {
2373 return ($self->{last_rev}, $self->{last_commit});
2374 }
d2866f9e 2375 my $c = ::verify_ref($self->refname.'^0');
91b03282 2376 if ($c && !$self->use_svm_props && !$self->no_metadata) {
d2866f9e 2377 my $rev = (::cmt_metadata($c))[1];
9b981fc6
EW		 2378 if (defined $rev) {
2379 ($self->{last_rev}, $self->{last_commit}) = ($rev, $c);
2380 return ($rev, $c);
2381 }
2382 }
060610c5
EW		 2383 my $map_path = $self->map_path;
2384 unless (-e $map_path) {
26a62d57
EW		 2385 ($self->{last_rev}, $self->{last_commit}) = (undef, undef);
2386 return (undef, undef);
2387 }
66ab84b9 2388 my ($rev, $commit) = $self->rev_map_max(1);
060610c5
EW		 2389 ($self->{last_rev}, $self->{last_commit}) = ($rev, $commit);
2390 return ($rev, $commit);
9b981fc6
EW		 2391}
2392
3ebe8df7
EW		 2393sub get_fetch_range {
2394 my ($self, $min, $max) = @_;
2395 $max ||= $self->ra->get_latest_revnum;
060610c5 2396 $min ||= $self->rev_map_max;
3ebe8df7 2397 (++$min, $max);
9b981fc6
EW		 2398}
2399
8a49ee97 2400sub tmp_config {
93f2689c 2401 my (@args) = @_;
b7e5348c
EW		 2402 my $old_def_config = "$ENV{GIT_DIR}/svn/config";
2403 my $config = "$ENV{GIT_DIR}/svn/.metadata";
38570a47 2404 if (! -f $config && -f $old_def_config) {
b7e5348c
EW		 2405 rename $old_def_config, $config or
2406 die "Failed rename $old_def_config => $config: $!\n";
2407 }
8a49ee97 2408 my $old_config = $ENV{GIT_CONFIG};
93f2689c 2409 $ENV{GIT_CONFIG} = $config;
8a49ee97 2410 $@ = undef;
b4d57e5e
EW		 2411 my @ret = eval {
2412 unless (-f $config) {
2413 mkfile($config);
2414 open my $fh, '>', $config or
2415 die "Can't open $config: $!\n";
2416 print $fh "; This file is used internally by ",
2417 "git-svn\n" or die
2418 "Couldn't write to $config: $!\n";
2419 print $fh "; You should not have to edit it\n" or
2420 die "Couldn't write to $config: $!\n";
2421 close $fh or die "Couldn't close $config: $!\n";
2422 }
2423 command('config', @args);
2424 };
8a49ee97
EW		 2425 my $err = $@;
2426 if (defined $old_config) {
2427 $ENV{GIT_CONFIG} = $old_config;
2428 } else {
2429 delete $ENV{GIT_CONFIG};
2430 }
2431 die $err if $err;
2432 wantarray ? @ret : $ret[0];
2433}
2434
9b981fc6
EW		 2435sub tmp_index_do {
2436 my ($self, $sub) = @_;
2437 my $old_index = $ENV{GIT_INDEX_FILE};
2438 $ENV{GIT_INDEX_FILE} = $self->{index};
8a49ee97 2439 $@ = undef;
b4d57e5e
EW		 2440 my @ret = eval {
2441 my ($dir, $base) = ($self->{index} =~ m#^(.*?)/?([^/]+)$#);
2442 mkpath([$dir]) unless -d $dir;
2443 &$sub;
2444 };
8a49ee97
EW		 2445 my $err = $@;
2446 if (defined $old_index) {
9b981fc6
EW		 2447 $ENV{GIT_INDEX_FILE} = $old_index;
2448 } else {
2449 delete $ENV{GIT_INDEX_FILE};
2450 }
8a49ee97 2451 die $err if $err;
9b981fc6
EW		 2452 wantarray ? @ret : $ret[0];
2453}
2454
2455sub assert_index_clean {
2456 my ($self, $treeish) = @_;
2457
2458 $self->tmp_index_do(sub {
2459 command_noisy('read-tree', $treeish) unless -e $self->{index};
2460 my $x = command_oneline('write-tree');
2461 my ($y) = (command(qw/cat-file commit/, $treeish) =~
2462 /^tree ($::sha1)/mo);
e8d120bd
EW		 2463 return if $y eq $x;
2464
2465 warn "Index mismatch: $y != $x\nrereading $treeish\n";
2466 unlink $self->{index} or die "unlink $self->{index}: $!\n";
2467 command_noisy('read-tree', $treeish);
9b981fc6
EW		 2468 $x = command_oneline('write-tree');
2469 if ($y ne $x) {
2470 ::fatal "trees ($treeish) $y != $x\n",
207f1a75 2471 "Something is seriously wrong...";
9b981fc6
EW		 2472 }
2473 });
2474}
2475
2476sub get_commit_parents {
0af9c9f9 2477 my ($self, $log_entry) = @_;
9b981fc6 2478 my (%seen, @ret, @tmp);
0af9c9f9
EW		 2479 # legacy support for 'set-tree'; this is only used by set_tree_cb:
2480 if (my $ip = $self->{inject_parents}) {
2481 if (my $commit = delete $ip->{$log_entry->{revision}}) {
2482 push @tmp, $commit;
9b981fc6
EW		 2483 }
2484 }
d2866f9e 2485 if (my $cur = ::verify_ref($self->refname.'^0')) {
9b981fc6
EW		 2486 push @tmp, $cur;
2487 }
733a65aa
EW		 2488 if (my $ipd = $self->{inject_parents_dcommit}) {
2489 if (my $commit = delete $ipd->{$log_entry->{revision}}) {
2490 push @tmp, @$commit;
2491 }
2492 }
44320b9e 2493 push @tmp, $_ foreach (@{$log_entry->{parents}}, @tmp);
9b981fc6
EW		 2494 while (my $p = shift @tmp) {
2495 next if $seen{$p};
2496 $seen{$p} = 1;
2497 push @ret, $p;
9b981fc6
EW		 2498 }
2499 @ret;
2500}
2501
aea736cc
EW		 2502sub rewrite_root {
2503 my ($self) = @_;
2504 return $self->{-rewrite_root} if exists $self->{-rewrite_root};
2505 my $k = "svn-remote.$self->{repo_id}.rewriteRoot";
2506 my $rwr = eval { command_oneline(qw/config --get/, $k) };
2507 if ($rwr) {
2508 $rwr =~ s#/+$##;
2509 if ($rwr !~ m#^[a-z\+]+://#) {
2510 die "$rwr is not a valid URL (key: $k)\n";
2511 }
2512 }
2513 $self->{-rewrite_root} = $rwr;
2514}
2515
3e18ce1a
JS		 2516sub rewrite_uuid {
2517 my ($self) = @_;
2518 return $self->{-rewrite_uuid} if exists $self->{-rewrite_uuid};
2519 my $k = "svn-remote.$self->{repo_id}.rewriteUUID";
2520 my $rwid = eval { command_oneline(qw/config --get/, $k) };
2521 if ($rwid) {
2522 $rwid =~ s#/+$##;
2523 if ($rwid !~ m#^[a-f0-9]{8}-(?:[a-f0-9]{4}-){3}[a-f0-9]{12}$#) {
2524 die "$rwid is not a valid UUID (key: $k)\n";
2525 }
2526 }
2527 $self->{-rewrite_uuid} = $rwid;
2528}
2529
aea736cc
EW		 2530sub metadata_url {
2531 my ($self) = @_;
2532 ($self->rewrite_root || $self->{url}) .
2533 (length $self->{path} ? '/' . $self->{path} : '');
2534}
2535
706587fc 2536sub full_url {
9b981fc6 2537 my ($self) = @_;
5d3b7cd5 2538 $self->{url} . (length $self->{path} ? '/' . $self->{path} : '');
9b981fc6
EW		 2539}
2540
ad94802a
EW		 2541
2542sub set_commit_header_env {
2543 my ($log_entry) = @_;
2544 my %env;
2545 foreach my $ned (qw/NAME EMAIL DATE/) {
2546 foreach my $ac (qw/AUTHOR COMMITTER/) {
2547 $env{"GIT_${ac}_${ned}"} = $ENV{"GIT_${ac}_${ned}"};
2548 }
9b981fc6 2549 }
ad94802a 2550
70ae04e4
AW		 2551 $ENV{GIT_AUTHOR_NAME} = $log_entry->{name};
2552 $ENV{GIT_AUTHOR_EMAIL} = $log_entry->{email};
44320b9e 2553 $ENV{GIT_AUTHOR_DATE} = $ENV{GIT_COMMITTER_DATE} = $log_entry->{date};
9b981fc6 2554
70ae04e4
AW		 2555 $ENV{GIT_COMMITTER_NAME} = (defined $log_entry->{commit_name})
2556 ? $log_entry->{commit_name}
2557 : $log_entry->{name};
2558 $ENV{GIT_COMMITTER_EMAIL} = (defined $log_entry->{commit_email})
2559 ? $log_entry->{commit_email}
2560 : $log_entry->{email};
ad94802a
EW		 2561 \%env;
2562}
70ae04e4 2563
ad94802a
EW		 2564sub restore_commit_header_env {
2565 my ($env) = @_;
2566 foreach my $ned (qw/NAME EMAIL DATE/) {
2567 foreach my $ac (qw/AUTHOR COMMITTER/) {
2568 my $k = "GIT_${ac}_${ned}";
2569 if (defined $env->{$k}) {
2570 $ENV{$k} = $env->{$k};
2571 } else {
2572 delete $ENV{$k};
2573 }
2574 }
2575 }
2576}
2577
94bc914c
KW		 2578sub gc {
2579 command_noisy('gc', '--auto');
2580};
2581
ad94802a
EW		 2582sub do_git_commit {
2583 my ($self, $log_entry) = @_;
2584 my $lr = $self->last_rev;
2585 if (defined $lr && $lr >= $log_entry->{revision}) {
2586 die "Last fetched revision of ", $self->refname,
2587 " was r$lr, but we are about to fetch: ",
2588 "r$log_entry->{revision}!\n";
2589 }
2590 if (my $c = $self->rev_map_get($log_entry->{revision})) {
2591 croak "$log_entry->{revision} = $c already exists! ",
2592 "Why are we refetching it?\n";
2593 }
2594 my $old_env = set_commit_header_env($log_entry);
44320b9e 2595 my $tree = $log_entry->{tree};
9b981fc6
EW		 2596 if (!defined $tree) {
2597 $tree = $self->tmp_index_do(sub {
2598 command_oneline('write-tree') });
2599 }
2600 die "Tree is not a valid sha1: $tree\n" if $tree !~ /^$::sha1$/o;
2601
e855bfc0 2602 my @exec = ('git', 'commit-tree', $tree);
0af9c9f9 2603 foreach ($self->get_commit_parents($log_entry)) {
9b981fc6
EW		 2604 push @exec, '-p', $_;
2605 }
2606 defined(my $pid = open3(my $msg_fh, my $out_fh, '>&STDERR', @exec))
2607 or croak $!;
16fc08e2
EW		 2608 binmode $msg_fh;
2609
2610 # we always get UTF-8 from SVN, but we may want our commits in
2611 # a different encoding.
2612 if (my $enc = Git::config('i18n.commitencoding')) {
2613 require Encode;
2614 Encode::from_to($log_entry->{log}, 'UTF-8', $enc);
2615 }
44320b9e 2616 print $msg_fh $log_entry->{log} or croak $!;
ad94802a 2617 restore_commit_header_env($old_env);
91b03282 2618 unless ($self->no_metadata) {
8a49ee97
EW		 2619 print $msg_fh "\ngit-svn-id: $log_entry->{metadata}\n"
2620 or croak $!;
9760adcc 2621 }
9b981fc6
EW		 2622 $msg_fh->flush == 0 or croak $!;
2623 close $msg_fh or croak $!;
2624 chomp(my $commit = do { local $/; <$out_fh> });
2625 close $out_fh or croak $!;
2626 waitpid $pid, 0;
2627 croak $? if $?;
2628 if ($commit !~ /^$::sha1$/o) {
2629 die "Failed to commit, invalid sha1: $commit\n";
2630 }
2631
060610c5 2632 $self->rev_map_set($log_entry->{revision}, $commit, 1);
9b981fc6 2633
44320b9e 2634 $self->{last_rev} = $log_entry->{revision};
9b981fc6 2635 $self->{last_commit} = $commit;
49750f30 2636 print "r$log_entry->{revision}" unless $::_q > 1;
8a49ee97 2637 if (defined $log_entry->{svm_revision}) {
49750f30 2638 print " (\@$log_entry->{svm_revision})" unless $::_q > 1;
060610c5 2639 $self->rev_map_set($log_entry->{svm_revision}, $commit,
26a62d57 2640 0, $self->svm_uuid);
8a49ee97 2641 }
49750f30 2642 print " = $commit ($self->{ref_id})\n" unless $::_q > 1;
94bc914c
KW		 2643 if (--$_gc_nr == 0) {
2644 $_gc_nr = $_gc_period;
2645 gc();
2646 }
9b981fc6
EW		 2647 return $commit;
2648}
2649
fbcc1737
EW		 2650sub match_paths {
2651 my ($self, $paths, $r) = @_;
4e9f6cc7 2652 return 1 if $self->{path} eq '';
d542aedb
EW		 2653 if (my $path = $paths->{"/$self->{path}"}) {
2654 return ($path->{action} eq 'D') ? 0 : 1;
2655 }
0b2af457 2656 $self->{path_regex} ||= qr/^\/\Q$self->{path}\E\//;
fbcc1737
EW		 2657 if (grep /$self->{path_regex}/, keys %$paths) {
2658 return 1;
2659 }
2660 my $c = '';
2661 foreach (split m#/#, $self->{path}) {
2662 $c .= "/$_";
74a81227
EW		 2663 next unless ($paths->{$c} &&
2664 ($paths->{$c}->{action} =~ /^[AR]$/));
e518192f
EW		 2665 if ($self->ra->check_path($self->{path}, $r) ==
2666 $SVN::Node::dir) {
fbcc1737
EW		 2667 return 1;
2668 }
2669 }
2670 return 0;
2671}
2672
15710b6f
EW		 2673sub find_parent_branch {
2674 my ($self, $paths, $rev) = @_;
91b03282 2675 return undef unless $self->follow_parent;
e5a0b240 2676 unless (defined $paths) {
c7eba716
EW		 2677 my $err_handler = $SVN::Error::handler;
2678 $SVN::Error::handler = \&Git::SVN::Ra::skip_unknown_revs;
3c49a035
MN		 2679 $self->ra->get_log([$self->{path}], $rev, $rev, 0, 1, 1,
2680 sub { $paths = $_[0] });
c7eba716 2681 $SVN::Error::handler = $err_handler;
e5a0b240
EW		 2682 }
2683 return undef unless defined $paths;
15710b6f
EW		 2684
2685 # look for a parent from another branch:
0b2af457 2686 my @b_path_components = split m#/#, $self->{path};
7f578c55
EW		 2687 my @a_path_components;
2688 my $i;
2689 while (@b_path_components) {
2690 $i = $paths->{'/'.join('/', @b_path_components)};
74a81227 2691 last if $i && defined $i->{copyfrom_path};
7f578c55
EW		 2692 unshift(@a_path_components, pop(@b_path_components));
2693 }
74a81227
EW		 2694 return undef unless defined $i && defined $i->{copyfrom_path};
2695 my $branch_from = $i->{copyfrom_path};
7f578c55
EW		 2696 if (@a_path_components) {
2697 print STDERR "branch_from: $branch_from => ";
2698 $branch_from .= '/'.join('/', @a_path_components);
2699 print STDERR $branch_from, "\n";
2700 }
3ebe8df7 2701 my $r = $i->{copyfrom_rev};
15710b6f
EW		 2702 my $repos_root = $self->ra->{repos_root};
2703 my $url = $self->ra->{url};
0b2af457 2704 my $new_url = $url . $branch_from;
15710b6f 2705 print STDERR "Found possible branch point: ",
85886162
SA		 2706 "$new_url => ", $self->full_url, ", $r\n"
2707 unless $::_q > 1;
15710b6f 2708 $branch_from =~ s#^/##;
0b2af457 2709 my $gs = $self->other_gs($new_url, $url,
8e3f9b17 2710 $branch_from, $r, $self->{ref_id});
15710b6f 2711 my ($r0, $parent) = $gs->find_rev_before($r, 1);
553589f7
DM		 2712 {
2713 my ($base, $head);
2714 if (!defined $r0 || !defined $parent) {
2715 ($base, $head) = parse_revision_argument(0, $r);
2716 } else {
2717 if ($r0 < $r) {
2718 $gs->ra->get_log([$gs->{path}], $r0 + 1, $r, 1,
2719 0, 1, sub { $base = $_[1] - 1 });
2720 }
2721 }
2722 if (defined $base && $base <= $r) {
d627de6b
EW		 2723 $gs->fetch($base, $r);
2724 }
553589f7 2725 ($r0, $parent) = $gs->find_rev_before($r, 1);
15710b6f 2726 }
ef70de96 2727 if (defined $r0 && defined $parent) {
85886162
SA		 2728 print STDERR "Found branch parent: ($self->{ref_id}) $parent\n"
2729 unless $::_q > 1;
15710b6f
EW		 2730 my $ed;
2731 if ($self->ra->can_do_switch) {
2e5e2480 2732 $self->assert_index_clean($parent);
85886162
SA		 2733 print STDERR "Following parent with do_switch\n"
2734 unless $::_q > 1;
15710b6f 2735 # do_switch works with svn/trunk >= r22312, but that
2b27f6c8 2736 # is not included with SVN 1.4.3 (the latest version
15710b6f 2737 # at the moment), so we can't rely on it
83c2fcff 2738 $self->{last_rev} = $r0;
15710b6f 2739 $self->{last_commit} = $parent;
8841b37f 2740 $ed = SVN::Git::Fetcher->new($self, $gs->{path});
8a603774 2741 $gs->ra->gs_do_switch($r0, $rev, $gs,
15710b6f
EW		 2742 $self->full_url, $ed)
2743 or die "SVN connection failed somewhere...\n";
9ff74e95
SW		 2744 } elsif ($self->ra->trees_match($new_url, $r0,
2745 $self->full_url, $rev)) {
2746 print STDERR "Trees match:\n",
2747 " $new_url\@$r0\n",
2748 " ${\$self->full_url}\@$rev\n",
85886162
SA		 2749 "Following parent with no changes\n"
2750 unless $::_q > 1;
9ff74e95
SW		 2751 $self->tmp_index_do(sub {
2752 command_noisy('read-tree', $parent);
2753 });
2754 $self->{last_commit} = $parent;
15710b6f 2755 } else {
85886162
SA		 2756 print STDERR "Following parent with do_update\n"
2757 unless $::_q > 1;
15710b6f 2758 $ed = SVN::Git::Fetcher->new($self);
8a603774 2759 $self->ra->gs_do_update($rev, $rev, $self, $ed)
15710b6f
EW		 2760 or die "SVN connection failed somewhere...\n";
2761 }
85886162 2762 print STDERR "Successfully followed parent\n" unless $::_q > 1;
15710b6f
EW		 2763 return $self->make_log_entry($rev, [$parent], $ed);
2764 }
15710b6f
EW		 2765 return undef;
2766}
2767
9b981fc6 2768sub do_fetch {
706587fc 2769 my ($self, $paths, $rev) = @_;
15710b6f 2770 my $ed;
9b981fc6 2771 my ($last_rev, @parents);
b9dffd8c
EW		 2772 if (my $lc = $self->last_commit) {
2773 # we can have a branch that was deleted, then re-added
2774 # under the same name but copied from another path, in
2775 # which case we'll have multiple parents (we don't
2776 # want to break the original ref, nor lose copypath info):
2777 if (my $log_entry = $self->find_parent_branch($paths, $rev)) {
2778 push @{$log_entry->{parents}}, $lc;
2779 return $log_entry;
2780 }
15710b6f 2781 $ed = SVN::Git::Fetcher->new($self);
9b981fc6 2782 $last_rev = $self->{last_rev};
b9dffd8c
EW		 2783 $ed->{c} = $lc;
2784 @parents = ($lc);
9b981fc6
EW		 2785 } else {
2786 $last_rev = $rev;
15710b6f
EW		 2787 if (my $log_entry = $self->find_parent_branch($paths, $rev)) {
2788 return $log_entry;
2789 }
2790 $ed = SVN::Git::Fetcher->new($self);
9b981fc6 2791 }
8a603774 2792 unless ($self->ra->gs_do_update($last_rev, $rev, $self, $ed)) {
9b981fc6
EW		 2793 die "SVN connection failed somewhere...\n";
2794 }
2795 $self->make_log_entry($rev, \@parents, $ed);
2796}
2797
6111b934
EW		 2798sub mkemptydirs {
2799 my ($self, $r) = @_;
a5b80d92
EW		 2800
2801 sub scan {
2802 my ($r, $empty_dirs, $line) = @_;
2803 if (defined $r && $line =~ /^r(\d+)$/) {
2804 return 0 if $1 > $r;
2805 } elsif ($line =~ /^ \+empty_dir: (.+)$/) {
2806 $empty_dirs->{$1} = 1;
2807 } elsif ($line =~ /^ \-empty_dir: (.+)$/) {
2808 my @d = grep {m[^\Q$1\E(/|$)]} (keys %$empty_dirs);
2809 delete @$empty_dirs{@d};
2810 }
2811 1; # continue
2812 };
2813
6111b934 2814 my %empty_dirs = ();
a5b80d92
EW		 2815 my $gz_file = "$self->{dir}/unhandled.log.gz";
2816 if (-f $gz_file) {
2817 if (!$can_compress) {
2818 warn "Compress::Zlib could not be found; ",
2819 "empty directories in $gz_file will not be read\n";
2820 } else {
2821 my $gz = Compress::Zlib::gzopen($gz_file, "rb") or
2822 die "Unable to open $gz_file: $!\n";
2823 my $line;
2824 while ($gz->gzreadline($line) > 0) {
2825 scan($r, \%empty_dirs, $line) or last;
2826 }
2827 $gz->gzclose;
2828 }
2829 }
6111b934 2830
a5b80d92
EW		 2831 if (open my $fh, '<', "$self->{dir}/unhandled.log") {
2832 binmode $fh or croak "binmode: $!";
2833 while (<$fh>) {
2834 scan($r, \%empty_dirs, $_) or last;
6111b934 2835 }
a5b80d92 2836 close $fh;
6111b934 2837 }
9be30eed
EW		 2838
2839 my $strip = qr/\A\Q$self->{path}\E(?:\/|$)/;
6111b934
EW		 2840 foreach my $d (sort keys %empty_dirs) {
2841 $d = uri_decode($d);
9be30eed 2842 $d =~ s/$strip//;
7c42e390 2843 next unless length($d);
6111b934 2844 next if -d $d;
7c42e390 2845 if (-e $d) {
6111b934
EW		 2846 warn "$d exists but is not a directory\n";
2847 } else {
2848 print "creating empty directory: $d\n";
2849 mkpath([$d]);
2850 }
2851 }
2852}
2853
97f6987a
EW		 2854sub get_untracked {
2855 my ($self, $ed) = @_;
2856 my @out;
2857 my $h = $ed->{empty};
9b981fc6
EW		 2858 foreach (sort keys %$h) {
2859 my $act = $h->{$_} ? '+empty_dir' : '-empty_dir';
97f6987a 2860 push @out, " $act: " . uri_encode($_);
9b981fc6
EW		 2861 warn "W: $act: $_\n";
2862 }
2863 foreach my $t (qw/dir_prop file_prop/) {
97f6987a 2864 $h = $ed->{$t} or next;
9b981fc6
EW		 2865 foreach my $path (sort keys %$h) {
2866 my $ppath = $path eq '' ? '.' : $path;
2867 foreach my $prop (sort keys %{$h->{$path}}) {
1ce255dc 2868 next if $SKIP_PROP{$prop};
9b981fc6 2869 my $v = $h->{$path}->{$prop};
97f6987a
EW		 2870 my $t_ppath_prop = "$t: " .
2871 uri_encode($ppath) . ' ' .
2872 uri_encode($prop);
9b981fc6 2873 if (defined $v) {
97f6987a
EW		 2874 push @out, " +$t_ppath_prop " .
2875 uri_encode($v);
9b981fc6 2876 } else {
97f6987a 2877 push @out, " -$t_ppath_prop";
9b981fc6
EW		 2878 }
2879 }
2880 }
2881 }
2882 foreach my $t (qw/absent_file absent_directory/) {
97f6987a 2883 $h = $ed->{$t} or next;
9b981fc6
EW		 2884 foreach my $parent (sort keys %$h) {
2885 foreach my $path (sort @{$h->{$parent}}) {
97f6987a
EW		 2886 push @out, " $t: " .
2887 uri_encode("$parent/$path");
9b981fc6
EW		 2888 warn "W: $t: $parent/$path ",
2889 "Insufficient permissions?\n";
2890 }
2891 }
2892 }
97f6987a 2893 \@out;
9b981fc6
EW		 2894}
2895
e82f0d73
PH		 2896# parse_svn_date(DATE)
2897# --------------------
2898# Given a date (in UTC) from Subversion, return a string in the format
2899# "<TZ Offset> <local date/time>" that Git will use.
2900#
2901# By default the parsed date will be in UTC; if $Git::SVN::_localtime
2902# is true we'll convert it to the local timezone instead.
1c8443b0
EW		 2903sub parse_svn_date {
2904 my $date = shift || return '+0000 1970-01-01 00:00:00';
2905 my ($Y,$m,$d,$H,$M,$S) = ($date =~ /^(\d{4})\-(\d\d)\-(\d\d)T
b94ead75 2906 (\d\d)\:(\d\d)\:(\d\d)\.\d*Z$/x) or
1c8443b0 2907 croak "Unable to parse date: $date\n";
e82f0d73
PH		 2908 my $parsed_date; # Set next.
2909
2910 if ($Git::SVN::_localtime) {
2911 # Translate the Subversion datetime to an epoch time.
2912 # Begin by switching ourselves to $date's timezone, UTC.
2913 my $old_env_TZ = $ENV{TZ};
2914 $ENV{TZ} = 'UTC';
2915
2916 my $epoch_in_UTC =
2917 POSIX::strftime('%s', $S, $M, $H, $d, $m - 1, $Y - 1900);
2918
2919 # Determine our local timezone (including DST) at the
2920 # time of $epoch_in_UTC. $Git::SVN::Log::TZ stored the
2921 # value of TZ, if any, at the time we were run.
2922 if (defined $Git::SVN::Log::TZ) {
2923 $ENV{TZ} = $Git::SVN::Log::TZ;
2924 } else {
2925 delete $ENV{TZ};
2926 }
2927
2928 my $our_TZ =
2929 POSIX::strftime('%Z', $S, $M, $H, $d, $m - 1, $Y - 1900);
2930
2931 # This converts $epoch_in_UTC into our local timezone.
2932 my ($sec, $min, $hour, $mday, $mon, $year,
2933 $wday, $yday, $isdst) = localtime($epoch_in_UTC);
2934
2935 $parsed_date = sprintf('%s %04d-%02d-%02d %02d:%02d:%02d',
2936 $our_TZ, $year + 1900, $mon + 1,
2937 $mday, $hour, $min, $sec);
2938
2939 # Reset us to the timezone in effect when we entered
2940 # this routine.
2941 if (defined $old_env_TZ) {
2942 $ENV{TZ} = $old_env_TZ;
2943 } else {
2944 delete $ENV{TZ};
2945 }
2946 } else {
2947 $parsed_date = "+0000 $Y-$m-$d $H:$M:$S";
2948 }
2949
2950 return $parsed_date;
1c8443b0
EW		 2951}
2952
8e3f9b17 2953sub other_gs {
0b2af457 2954 my ($self, $new_url, $url,
8e3f9b17 2955 $branch_from, $r, $old_ref_id) = @_;
0b2af457 2956 my $gs = Git::SVN->find_by_url($new_url, $url, $branch_from);
8e3f9b17
SV		 2957 unless ($gs) {
2958 my $ref_id = $old_ref_id;
2959 $ref_id =~ s/\@\d+$//;
2960 $ref_id .= "\@$r";
2961 # just grow a tail if we're not unique enough :x
2962 $ref_id .= '-' while find_ref($ref_id);
85886162 2963 print STDERR "Initializing parent: $ref_id\n" unless $::_q > 1;
8e3f9b17
SV		 2964 my ($u, $p, $repo_id) = ($new_url, '', $ref_id);
2965 if ($u =~ s#^\Q$url\E(/|$)##) {
2966 $p = $u;
2967 $u = $url;
2968 $repo_id = $self->{repo_id};
2969 }
2970 $gs = Git::SVN->init($u, $p, $repo_id, $ref_id, 1);
2971 }
2972 $gs
2973}
2974
36db1edd
ML		 2975sub call_authors_prog {
2976 my ($orig_author) = @_;
d3d7d47e 2977 $orig_author = command_oneline('rev-parse', '--sq-quote', $orig_author);
36db1edd
ML		 2978 my $author = `$::_authors_prog $orig_author`;
2979 if ($? != 0) {
2980 die "$::_authors_prog failed with exit code $?\n"
2981 }
2982 if ($author =~ /^\s*(.+?)\s*<(.*)>\s*$/) {
2983 my ($name, $email) = ($1, $2);
2984 $email = undef if length $2 == 0;
2985 return [$name, $email];
2986 } else {
2987 die "Author: $orig_author: $::_authors_prog returned "
2988 . "invalid author format: $author\n";
2989 }
2990}
2991
1c8443b0
EW		 2992sub check_author {
2993 my ($author) = @_;
2994 if (!defined $author || length $author == 0) {
2995 $author = '(no author)';
36db1edd
ML		 2996 }
2997 if (!defined $::users{$author}) {
2998 if (defined $::_authors_prog) {
2999 $::users{$author} = call_authors_prog($author);
3000 } elsif (defined $::_authors) {
3001 die "Author: $author not defined in $::_authors file\n";
3002 }
1c8443b0
EW		 3003 }
3004 $author;
3005}
3006
f1264bd6
SV		 3007sub find_extra_svk_parents {
3008 my ($self, $ed, $tickets, $parents) = @_;
3009 # aha! svk:merge property changed...
3010 my @tickets = split "\n", $tickets;
3011 my @known_parents;
3012 for my $ticket ( @tickets ) {
3013 my ($uuid, $path, $rev) = split /:/, $ticket;
3014 if ( $uuid eq $self->ra_uuid ) {
bf60fff8 3015 my $url = $self->{url};
f1264bd6
SV		 3016 my $repos_root = $url;
3017 my $branch_from = $path;
3018 $branch_from =~ s{^/}{};
3019 my $gs = $self->other_gs($repos_root."/".$branch_from,
3020 $url,
3021 $branch_from,
3022 $rev,
3023 $self->{ref_id});
3024 if ( my $commit = $gs->rev_map_get($rev, $uuid) ) {
3025 # wahey! we found it, but it might be
3026 # an old one (!)
e9e4c8b7 3027 push @known_parents, [ $rev, $commit ];
f1264bd6
SV		 3028 }
3029 }
3030 }
e9e4c8b7
AV		 3031 # Ordering matters; highest-numbered commit merge tickets
3032 # first, as they may account for later merge ticket additions
3033 # or changes.
3034 @known_parents = map {$_->[1]} sort {$b->[0] <=> $a->[0]} @known_parents;
f1264bd6
SV		 3035 for my $parent ( @known_parents ) {
3036 my @cmd = ('rev-list', $parent, map { "^$_" } @$parents );
3037 my ($msg_fh, $ctx) = command_output_pipe(@cmd);
3038 my $new;
3039 while ( <$msg_fh> ) {
3040 $new=1;last;
3041 }
3042 command_close_pipe($msg_fh, $ctx);
3043 if ( $new ) {
3044 print STDERR
3045 "Found merge parent (svk:merge ticket): $parent\n";
3046 push @$parents, $parent;
3047 }
3048 }
3049}
3050
7d944c33
SV		 3051sub lookup_svn_merge {
3052 my $uuid = shift;
3053 my $url = shift;
3054 my $merge = shift;
3055
3056 my ($source, $revs) = split ":", $merge;
3057 my $path = $source;
3058 $path =~ s{^/}{};
3059 my $gs = Git::SVN->find_by_url($url.$source, $url, $path);
3060 if ( !$gs ) {
3061 warn "Couldn't find revmap for $url$source\n";
3062 return;
3063 }
3064 my @ranges = split ",", $revs;
3065 my ($tip, $tip_commit);
3066 my @merged_commit_ranges;
3067 # find the tip
3068 for my $range ( @ranges ) {
3069 my ($bottom, $top) = split "-", $range;
3070 $top ||= $bottom;
33973a5b
SV		 3071 my $bottom_commit = $gs->find_rev_after( $bottom, 1, $top );
3072 my $top_commit = $gs->find_rev_before( $top, 1, $bottom );
7d944c33
SV		 3073
3074 unless ($top_commit and $bottom_commit) {
3075 warn "W:unknown path/rev in svn:mergeinfo "
3076 ."dirprop: $source:$range\n";
3077 next;
3078 }
3079
3080 push @merged_commit_ranges,
33973a5b 3081 "$bottom_commit^..$top_commit";
7d944c33
SV		 3082
3083 if ( !defined $tip or $top > $tip ) {
3084 $tip = $top;
3085 $tip_commit = $top_commit;
3086 }
3087 }
3088 return ($tip_commit, @merged_commit_ranges);
3089}
7a955a53
SV		 3090
3091sub _rev_list {
3092 my ($msg_fh, $ctx) = command_output_pipe(
3093 "rev-list", @_,
3094 );
3095 my @rv;
3096 while ( <$msg_fh> ) {
3097 chomp;
3098 push @rv, $_;
3099 }
3100 command_close_pipe($msg_fh, $ctx);
3101 @rv;
3102}
3103
3104sub check_cherry_pick {
3105 my $base = shift;
3106 my $tip = shift;
3107 my @ranges = @_;
3108 my %commits = map { $_ => 1 }
3109 _rev_list("--no-merges", $tip, "--not", $base);
3110 for my $range ( @ranges ) {
3111 delete @commits{_rev_list($range)};
3112 }
1cef6500
AM		 3113 for my $commit (keys %commits) {
3114 if (has_no_changes($commit)) {
3115 delete $commits{$commit};
3116 }
3117 }
7a955a53
SV		 3118 return (keys %commits);
3119}
3120
1cef6500
AM		 3121sub has_no_changes {
3122 my $commit = shift;
3123
3124 my @revs = split / /, command_oneline(
3125 qw(rev-list --parents -1 -m), $commit);
3126
3127 # Commits with no parents, e.g. the start of a partial branch,
3128 # have changes by definition.
3129 return 1 if (@revs < 2);
3130
3131 # Commits with multiple parents, e.g a merge, have no changes
3132 # by definition.
3133 return 0 if (@revs > 2);
3134
3135 return (command_oneline("rev-parse", "$commit^{tree}") eq
3136 command_oneline("rev-parse", "$commit~1^{tree}"));
3137}
3138
8bff7c53
AM		 3139# The GIT_DIR environment variable is not always set until after the command
3140# line arguments are processed, so we can't memoize in a BEGIN block.
3141{
3142 my $memoized = 0;
3143
3144 sub memoize_svn_mergeinfo_functions {
3145 return if $memoized;
3146 $memoized = 1;
3147
3148 my $cache_path = "$ENV{GIT_DIR}/svn/.caches/";
3149 mkpath([$cache_path]) unless -d $cache_path;
3150
3151 tie my %lookup_svn_merge_cache => 'Memoize::Storable',
3152 "$cache_path/lookup_svn_merge.db", 'nstore';
3153 memoize 'lookup_svn_merge',
3154 SCALAR_CACHE => 'FAULT',
3155 LIST_CACHE => ['HASH' => \%lookup_svn_merge_cache],
3156 ;
3157
3158 tie my %check_cherry_pick_cache => 'Memoize::Storable',
3159 "$cache_path/check_cherry_pick.db", 'nstore';
3160 memoize 'check_cherry_pick',
3161 SCALAR_CACHE => 'FAULT',
3162 LIST_CACHE => ['HASH' => \%check_cherry_pick_cache],
3163 ;
3164
3165 tie my %has_no_changes_cache => 'Memoize::Storable',
3166 "$cache_path/has_no_changes.db", 'nstore';
3167 memoize 'has_no_changes',
3168 SCALAR_CACHE => ['HASH' => \%has_no_changes_cache],
3169 LIST_CACHE => 'FAULT',
3170 ;
3171 }
8ac3a667
SV		 3172
3173 sub unmemoize_svn_mergeinfo_functions {
3174 return if not $memoized;
3175 $memoized = 0;
3176
3177 Memoize::unmemoize 'lookup_svn_merge';
3178 Memoize::unmemoize 'check_cherry_pick';
3179 Memoize::unmemoize 'has_no_changes';
3180 }
3181}
3182
3183END {
3184 # Force cache writeout explicitly instead of waiting for
3185 # global destruction to avoid segfault in Storable:
3186 # http://rt.cpan.org/Public/Bug/Display.html?id=36087
3187 unmemoize_svn_mergeinfo_functions();
7d944c33
SV		 3188}
3189
ea020cbd
SV		 3190sub parents_exclude {
3191 my $parents = shift;
3192 my @commits = @_;
3193 return unless @commits;
3194
3195 my @excluded;
3196 my $excluded;
3197 do {
3198 my @cmd = ('rev-list', "-1", @commits, "--not", @$parents );
3199 $excluded = command_oneline(@cmd);
3200 if ( $excluded ) {
3201 my @new;
3202 my $found;
3203 for my $commit ( @commits ) {
3204 if ( $commit eq $excluded ) {
3205 push @excluded, $commit;
3206 $found++;
3207 last;
3208 }
3209 else {
3210 push @new, $commit;
3211 }
3212 }
3213 die "saw commit '$excluded' in rev-list output, "
3214 ."but we didn't ask for that commit (wanted: @commits --not @$parents)"
3215 unless $found;
3216 @commits = @new;
3217 }
3218 }
3219 while ($excluded and @commits);
3220
3221 return @excluded;
3222}
3223
3224
dff589ef
SV		 3225# note: this function should only be called if the various dirprops
3226# have actually changed
3227sub find_extra_svn_parents {
3228 my ($self, $ed, $mergeinfo, $parents) = @_;
3229 # aha! svk:merge property changed...
3230
8bff7c53
AM		 3231 memoize_svn_mergeinfo_functions();
3232
dff589ef
SV		 3233 # We first search for merged tips which are not in our
3234 # history. Then, we figure out which git revisions are in
3235 # that tip, but not this revision. If all of those revisions
3236 # are now marked as merge, we can add the tip as a parent.
3237 my @merges = split "\n", $mergeinfo;
3238 my @merge_tips;
bf60fff8 3239 my $url = $self->{url};
7d944c33 3240 my $uuid = $self->ra_uuid;
ea020cbd 3241 my %ranges;
dff589ef 3242 for my $merge ( @merges ) {
7d944c33
SV		 3243 my ($tip_commit, @ranges) =
3244 lookup_svn_merge( $uuid, $url, $merge );
dff589ef
SV		 3245 unless (!$tip_commit or
3246 grep { $_ eq $tip_commit } @$parents ) {
3247 push @merge_tips, $tip_commit;
ea020cbd 3248 $ranges{$tip_commit} = \@ranges;
dff589ef
SV		 3249 } else {
3250 push @merge_tips, undef;
3251 }
3252 }
ea020cbd
SV		 3253
3254 my %excluded = map { $_ => 1 }
3255 parents_exclude($parents, grep { defined } @merge_tips);
3256
3257 # check merge tips for new parents
3258 my @new_parents;
dff589ef
SV		 3259 for my $merge_tip ( @merge_tips ) {
3260 my $spec = shift @merges;
ea020cbd
SV		 3261 next unless $merge_tip and $excluded{$merge_tip};
3262
3263 my $ranges = $ranges{$merge_tip};
3264
7a955a53 3265 # check out 'new' tips
41c01693
AM		 3266 my $merge_base;
3267 eval {
3268 $merge_base = command_oneline(
3269 "merge-base",
3270 @$parents, $merge_tip,
3271 );
3272 };
3273 if ($@) {
3274 die "An error occurred during merge-base"
3275 unless $@->isa("Git::Error::Command");
3276
3277 warn "W: Cannot find common ancestor between ".
3278 "@$parents and $merge_tip. Ignoring merge info.\n";
3279 next;
3280 }
7a955a53
SV		 3281
3282 # double check that there are no missing non-merge commits
3283 my (@incomplete) = check_cherry_pick(
3284 $merge_base, $merge_tip,
3285 @$ranges,
3286 );
3287
3288 if ( @incomplete ) {
3289 warn "W:svn cherry-pick ignored ($spec) - missing "
3290 .@incomplete." commit(s) (eg $incomplete[0])\n";
3291 } else {
3292 warn
3293 "Found merge parent (svn:mergeinfo prop): ",
3294 $merge_tip, "\n";
3295 push @new_parents, $merge_tip;
3296 }
3297 }
3298
3299 # cater for merges which merge commits from multiple branches
3300 if ( @new_parents > 1 ) {
3301 for ( my $i = 0; $i <= $#new_parents; $i++ ) {
3302 for ( my $j = 0; $j <= $#new_parents; $j++ ) {
3303 next if $i == $j;
3304 next unless $new_parents[$i];
3305 next unless $new_parents[$j];
3306 my $revs = command_oneline(
0fe19753
EW		 3307 "rev-list", "-1",
3308 "$new_parents[$i]..$new_parents[$j]",
7a955a53
SV		 3309 );
3310 if ( !$revs ) {
6a2009e7 3311 undef($new_parents[$j]);
7a955a53 3312 }
dff589ef
SV		 3313 }
3314 }
3315 }
7a955a53 3316 push @$parents, grep { defined } @new_parents;
dff589ef
SV		 3317}
3318
9b981fc6 3319sub make_log_entry {
97f6987a
EW		 3320 my ($self, $rev, $parents, $ed) = @_;
3321 my $untracked = $self->get_untracked($ed);
3322
f1264bd6
SV		 3323 my @parents = @$parents;
3324 my $ps = $ed->{path_strip} || "";
3325 for my $path ( grep { m/$ps/ } %{$ed->{dir_prop}} ) {
3326 my $props = $ed->{dir_prop}{$path};
3327 if ( $props->{"svk:merge"} ) {
3328 $self->find_extra_svk_parents
3329 ($ed, $props->{"svk:merge"}, \@parents);
3330 }
dff589ef
SV		 3331 if ( $props->{"svn:mergeinfo"} ) {
3332 $self->find_extra_svn_parents
3333 ($ed,
3334 $props->{"svn:mergeinfo"},
3335 \@parents);
3336 }
f1264bd6
SV		 3337 }
3338
9b981fc6 3339 open my $un, '>>', "$self->{dir}/unhandled.log" or croak $!;
97f6987a
EW		 3340 print $un "r$rev\n" or croak $!;
3341 print $un $_, "\n" foreach @$untracked;
f1264bd6 3342 my %log_entry = ( parents => \@parents, revision => $rev,
97f6987a 3343 log => '');
fbcc1737 3344
8a49ee97 3345 my $headrev;
fbcc1737 3346 my $logged = delete $self->{logged_rev_props};
8a49ee97 3347 if (!$logged || $self->{-want_revprops}) {
fbcc1737
EW		 3348 my $rp = $self->ra->rev_proplist($rev);
3349 foreach (sort keys %$rp) {
3350 my $v = $rp->{$_};
3351 if (/^svn:(author|date|log)$/) {
3352 $log_entry{$1} = $v;
8a49ee97
EW		 3353 } elsif ($_ eq 'svm:headrev') {
3354 $headrev = $v;
fbcc1737
EW		 3355 } else {
3356 print $un " rev_prop: ", uri_encode($_), ' ',
3357 uri_encode($v), "\n";
3358 }
9b981fc6 3359 }
fbcc1737
EW		 3360 } else {
3361 map { $log_entry{$_} = $logged->{$_} } keys %$logged;
9b981fc6
EW		 3362 }
3363 close $un or croak $!;
97f6987a 3364
9b981fc6 3365 $log_entry{date} = parse_svn_date($log_entry{date});
9b981fc6 3366 $log_entry{log} .= "\n";
db03cd24
EW		 3367 my $author = $log_entry{author} = check_author($log_entry{author});
3368 my ($name, $email) = defined $::users{$author} ? @{$::users{$author}}
70ae04e4
AW		 3369 : ($author, undef);
3370
3371 my ($commit_name, $commit_email) = ($name, $email);
3372 if ($_use_log_author) {
5ff6aae8
AW		 3373 my $name_field;
3374 if ($log_entry{log} =~ /From:\s+(.*\S)\s*\n/i) {
3375 $name_field = $1;
3376 } elsif ($log_entry{log} =~ /Signed-off-by:\s+(.*\S)\s*\n/i) {
3377 $name_field = $1;
3378 }
3379 if (!defined $name_field) {
abfa533d
SB		 3380 if (!defined $email) {
3381 $email = $name;
3382 }
5ff6aae8 3383 } elsif ($name_field =~ /(.*?)\s+<(.*)>/) {
70ae04e4 3384 ($name, $email) = ($1, $2);
5ff6aae8
AW		 3385 } elsif ($name_field =~ /(.*)@/) {
3386 ($name, $email) = ($1, $name_field);
3387 } else {
abfa533d 3388 ($name, $email) = ($name_field, $name_field);
70ae04e4
AW		 3389 }
3390 }
91b03282 3391 if (defined $headrev && $self->use_svm_props) {
aea736cc
EW		 3392 if ($self->rewrite_root) {
3393 die "Can't have both 'useSvmProps' and 'rewriteRoot' ",
3394 "options set!\n";
3395 }
3e18ce1a
JS		 3396 if ($self->rewrite_uuid) {
3397 die "Can't have both 'useSvmProps' and 'rewriteUUID' ",
3398 "options set!\n";
3399 }
b3e95936 3400 my ($uuid, $r) = $headrev =~ m{^([a-f\d\-]{30,}):(\d+)$}i;
befc9adc
EW		 3401 # we don't want "SVM: initializing mirror for junk" ...
3402 return undef if $r == 0;
3403 my $svm = $self->svm;
3404 if ($uuid ne $svm->{uuid}) {
8a49ee97 3405 die "UUID mismatch on SVM path:\n",
befc9adc 3406 "expected: $svm->{uuid}\n",
8a49ee97
EW		 3407 " got: $uuid\n";
3408 }
befc9adc
EW		 3409 my $full_url = $self->full_url;
3410 $full_url =~ s#^\Q$svm->{replace}\E(/|$)#$svm->{source}$1# or
3411 die "Failed to replace '$svm->{replace}' with ",
3412 "'$svm->{source}' in $full_url\n";
18ea92bd
SV		 3413 # throw away username for storing in records
3414 remove_username($full_url);
8a49ee97
EW		 3415 $log_entry{metadata} = "$full_url\@$r $uuid";
3416 $log_entry{svm_revision} = $r;
70ae04e4
AW		 3417 $email ||= "$author\@$uuid";
3418 $commit_email ||= "$author\@$uuid";
62e349d2
EW		 3419 } elsif ($self->use_svnsync_props) {
3420 my $full_url = $self->svnsync->{url};
3421 $full_url .= "/$self->{path}" if length $self->{path};
ce118739 3422 remove_username($full_url);
62e349d2
EW		 3423 my $uuid = $self->svnsync->{uuid};
3424 $log_entry{metadata} = "$full_url\@$rev $uuid";
70ae04e4
AW		 3425 $email ||= "$author\@$uuid";
3426 $commit_email ||= "$author\@$uuid";
8a49ee97 3427 } else {
ce118739
AR		 3428 my $url = $self->metadata_url;
3429 remove_username($url);
3e18ce1a
JS		 3430 my $uuid = $self->rewrite_uuid || $self->ra->get_uuid;
3431 $log_entry{metadata} = "$url\@$rev " . $uuid;
3432 $email ||= "$author\@" . $uuid;
3433 $commit_email ||= "$author\@" . $uuid;
8a49ee97 3434 }
db03cd24
EW		 3435 $log_entry{name} = $name;
3436 $log_entry{email} = $email;
70ae04e4
AW		 3437 $log_entry{commit_name} = $commit_name;
3438 $log_entry{commit_email} = $commit_email;
9b981fc6
EW		 3439 \%log_entry;
3440}
3441
3442sub fetch {
3ebe8df7 3443 my ($self, $min_rev, $max_rev, @parents) = @_;
9b981fc6 3444 my ($last_rev, $last_commit) = $self->last_rev_commit;
3ebe8df7 3445 my ($base, $head) = $self->get_fetch_range($min_rev, $max_rev);
e518192f 3446 $self->ra->gs_fetch_loop_common($base, $head, [$self]);
9b981fc6
EW		 3447}
3448
3449sub set_tree_cb {
3450 my ($self, $log_entry, $tree, $rev, $date, $author) = @_;
490f49ea
EW		 3451 $self->{inject_parents} = { $rev => $tree };
3452 $self->fetch(undef, undef);
9b981fc6
EW		 3453}
3454
3455sub set_tree {
3456 my ($self, $tree) = (shift, shift);
1ce255dc 3457 my $log_entry = ::get_commit_entry($tree);
9b981fc6 3458 unless ($self->{last_rev}) {
0a1a1c86 3459 ::fatal("Must have an existing revision to commit");
9b981fc6 3460 }
61395354
EW		 3461 my %ed_opts = ( r => $self->{last_rev},
3462 log => $log_entry->{log},
3463 ra => $self->ra,
3464 tree_a => $self->{last_commit},
3465 tree_b => $tree,
3466 editor_cb => sub {
3467 $self->set_tree_cb($log_entry, $tree, @_) },
3468 svn_path => $self->{path} );
3469 if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) {
9b981fc6
EW		 3470 print "No changes\nr$self->{last_rev} = $tree\n";
3471 }
9b981fc6
EW		 3472}
3473
060610c5
EW		 3474sub rebuild_from_rev_db {
3475 my ($self, $path) = @_;
3476 my $r = -1;
3477 open my $fh, '<', $path or croak "open: $!";
4f7ec797 3478 binmode $fh or croak "binmode: $!";
060610c5
EW		 3479 while (<$fh>) {
3480 length($_) == 41 or croak "inconsistent size in ($_) != 41";
3481 chomp($_);
3482 ++$r;
3483 next if $_ eq ('0' x 40);
3484 $self->rev_map_set($r, $_);
3485 print "r$r = $_\n";
3486 }
3487 close $fh or croak "close: $!";
3488 unlink $path or croak "unlink: $!";
3489}
3490
f0ecca10
EW		 3491sub rebuild {
3492 my ($self) = @_;
060610c5 3493 my $map_path = $self->map_path;
2beec897 3494 my $partial = (-e $map_path && ! -z $map_path);
d6d3346b 3495 return unless ::verify_ref($self->refname.'^0');
2beec897 3496 if (!$partial && ($self->use_svm_props || $self->no_metadata)) {
060610c5
EW		 3497 my $rev_db = $self->rev_db_path;
3498 $self->rebuild_from_rev_db($rev_db);
3499 if ($self->use_svm_props) {
3500 my $svm_rev_db = $self->rev_db_path($self->svm_uuid);
3501 $self->rebuild_from_rev_db($svm_rev_db);
3502 }
3503 $self->unlink_rev_db_symlink;
26a62d57
EW		 3504 return;
3505 }
2beec897
DM		 3506 print "Rebuilding $map_path ...\n" if (!$partial);
3507 my ($base_rev, $head) = ($partial ? $self->rev_map_max_norebuild(1) :
3508 (undef, undef));
060610c5
EW		 3509 my ($log, $ctx) =
3510 command_output_pipe(qw/rev-list --pretty=raw --no-color --reverse/,
2beec897
DM		 3511 ($head ? "$head.." : "") . $self->refname,
3512 '--');
74b1e123
JK		 3513 my $metadata_url = $self->metadata_url;
3514 remove_username($metadata_url);
3e18ce1a 3515 my $svn_uuid = $self->rewrite_uuid || $self->ra_uuid;
3dfab993
SV		 3516 my $c;
3517 while (<$log>) {
3518 if ( m{^commit ($::sha1)$} ) {
3519 $c = $1;
3520 next;
3521 }
3522 next unless s{^\s*(git-svn-id:)}{$1};
3523 my ($url, $rev, $uuid) = ::extract_metadata($_);
18ea92bd 3524 remove_username($url);
f0ecca10
EW		 3525
3526 # ignore merges (from set-tree)
3527 next if (!defined $rev || !$uuid);
3528
3529 # if we merged or otherwise started elsewhere, this is
3530 # how we break out of it
060610c5 3531 if (($uuid ne $svn_uuid) ||
74b1e123 3532 ($metadata_url && $url && ($url ne $metadata_url))) {
f0ecca10
EW		 3533 next;
3534 }
2beec897
DM		 3535 if ($partial && $head) {
3536 print "Partial-rebuilding $map_path ...\n";
3537 print "Currently at $base_rev = $head\n";
3538 $head = undef;
3539 }
f0ecca10 3540
060610c5 3541 $self->rev_map_set($rev, $c);
f0ecca10
EW		 3542 print "r$rev = $c\n";
3543 }
3dfab993 3544 command_close_pipe($log, $ctx);
2beec897 3545 print "Done rebuilding $map_path\n" if (!$partial || !$head);
060610c5
EW		 3546 my $rev_db_path = $self->rev_db_path;
3547 if (-f $self->rev_db_path) {
3548 unlink $self->rev_db_path or croak "unlink: $!";
3549 }
3550 $self->unlink_rev_db_symlink;
f0ecca10
EW		 3551}
3552
060610c5 3553# rev_map:
9b981fc6
EW		 3554# Tie::File seems to be prone to offset errors if revisions get sparse,
3555# it's not that fast, either. Tie::File is also not in Perl 5.6. So
3556# one of my favorite modules is out :< Next up would be one of the DBM
060610c5
EW		 3557# modules, but I'm not sure which is most portable...
3558#
3559# This is the replacement for the rev_db format, which was too big
3560# and inefficient for large repositories with a lot of sparse history
3561# (mainly tags)
3562#
3563# The format is this:
3564# - 24 bytes for every record,
3565# * 4 bytes for the integer representing an SVN revision number
3566# * 20 bytes representing the sha1 of a git commit
3567# - No empty padding records like the old format
66ab84b9 3568# (except the last record, which can be overwritten)
060610c5
EW		 3569# - new records are written append-only since SVN revision numbers
3570# increase monotonically
3571# - lookups on SVN revision number are done via a binary search
66ab84b9
EW		 3572# - Piping the file to xxd -c24 is a good way of dumping it for
3573# viewing or editing (piped back through xxd -r), should the need
3574# ever arise.
3575# - The last record can be padding revision with an all-zero sha1
3576# This is used to optimize fetch performance when using multiple
3577# "fetch" directives in .git/config
060610c5 3578#
97ae0911 3579# These files are disposable unless noMetadata or useSvmProps is set
9b981fc6 3580
060610c5 3581sub _rev_map_set {
26a62d57 3582 my ($fh, $rev, $commit) = @_;
060610c5 3583
4f7ec797 3584 binmode $fh or croak "binmode: $!";
060610c5
EW		 3585 my $size = (stat($fh))[7];
3586 ($size % 24) == 0 or croak "inconsistent size: $size";
3587
66ab84b9 3588 my $wr_offset = 0;
060610c5
EW		 3589 if ($size > 0) {
3590 sysseek($fh, -24, SEEK_END) or croak "seek: $!";
3591 my $read = sysread($fh, my $buf, 24) or croak "read: $!";
3592 $read == 24 or croak "read only $read bytes (!= 24)";
3593 my ($last_rev, $last_commit) = unpack(rev_map_fmt, $buf);
66ab84b9
EW		 3594 if ($last_commit eq ('0' x40)) {
3595 if ($size >= 48) {
3596 sysseek($fh, -48, SEEK_END) or croak "seek: $!";
3597 $read = sysread($fh, $buf, 24) or
3598 croak "read: $!";
3599 $read == 24 or
3600 croak "read only $read bytes (!= 24)";
3601 ($last_rev, $last_commit) =
3602 unpack(rev_map_fmt, $buf);
3603 if ($last_commit eq ('0' x40)) {
3604 croak "inconsistent .rev_map\n";
3605 }
3606 }
3607 if ($last_rev >= $rev) {
3608 croak "last_rev is higher!: $last_rev >= $rev";
3609 }
3610 $wr_offset = -24;
26a62d57
EW		 3611 }
3612 }
66ab84b9 3613 sysseek($fh, $wr_offset, SEEK_END) or croak "seek: $!";
060610c5
EW		 3614 syswrite($fh, pack(rev_map_fmt, $rev, $commit), 24) == 24 or
3615 croak "write: $!";
26a62d57
EW		 3616}
3617
195643f2
BJ		 3618sub _rev_map_reset {
3619 my ($fh, $rev, $commit) = @_;
3620 my $c = _rev_map_get($fh, $rev);
3621 $c eq $commit or die "_rev_map_reset(@_) commit $c does not match!\n";
3622 my $offset = sysseek($fh, 0, SEEK_CUR) or croak "seek: $!";
3623 truncate $fh, $offset or croak "truncate: $!";
3624}
3625
26a62d57
EW		 3626sub mkfile {
3627 my ($path) = @_;
3628 unless (-e $path) {
3629 my ($dir, $base) = ($path =~ m#^(.*?)/?([^/]+)$#);
3630 mkpath([$dir]) unless -d $dir;
3631 open my $fh, '>>', $path or die "Couldn't create $path: $!\n";
3632 close $fh or die "Couldn't close (create) $path: $!\n";
3633 }
3634}
3635
060610c5 3636sub rev_map_set {
26a62d57 3637 my ($self, $rev, $commit, $update_ref, $uuid) = @_;
70ee0b77 3638 defined $commit or die "missing arg3\n";
26a62d57 3639 length $commit == 40 or die "arg3 must be a full SHA1 hexsum\n";
060610c5 3640 my $db = $self->map_path($uuid);
26a62d57 3641 my $db_lock = "$db.lock";
373274f9 3642 my $sig;
195643f2 3643 $update_ref ||= 0;
373274f9
EW		 3644 if ($update_ref) {
3645 $SIG{INT} = $SIG{HUP} = $SIG{TERM} = $SIG{ALRM} = $SIG{PIPE} =
3646 $SIG{USR1} = $SIG{USR2} = sub { $sig = $_[0] };
3647 }
26a62d57
EW		 3648 mkfile($db);
3649
373274f9 3650 $LOCKFILES{$db_lock} = 1;
97ae0911 3651 my $sync;
97ae0911
EW		 3652 # both of these options make our .rev_db file very, very important
3653 # and we can't afford to lose it because rebuild() won't work
3654 if ($self->use_svm_props || $self->no_metadata) {
3655 $sync = 1;
060610c5 3656 copy($db, $db_lock) or die "rev_map_set(@_): ",
26a62d57 3657 "Failed to copy: ",
373274f9
EW		 3658 "$db => $db_lock ($!)\n";
3659 } else {
060610c5 3660 rename $db, $db_lock or die "rev_map_set(@_): ",
26a62d57 3661 "Failed to rename: ",
373274f9
EW		 3662 "$db => $db_lock ($!)\n";
3663 }
060610c5 3664
66ab84b9 3665 sysopen(my $fh, $db_lock, O_RDWR | O_CREAT)
060610c5 3666 or croak "Couldn't open $db_lock: $!\n";
195643f2
BJ		 3667 $update_ref eq 'reset' ? _rev_map_reset($fh, $rev, $commit) :
3668 _rev_map_set($fh, $rev, $commit);
97ae0911
EW		 3669 if ($sync) {
3670 $fh->flush or die "Couldn't flush $db_lock: $!\n";
3671 $fh->sync or die "Couldn't sync $db_lock: $!\n";
3672 }
9b981fc6 3673 close $fh or croak $!;
373274f9 3674 if ($update_ref) {
1e889ef3 3675 $_head = $self;
195643f2
BJ		 3676 my $note = "";
3677 $note = " ($update_ref)" if ($update_ref !~ /^\d*$/);
3678 command_noisy('update-ref', '-m', "r$rev$note",
373274f9
EW		 3679 $self->refname, $commit);
3680 }
060610c5 3681 rename $db_lock, $db or die "rev_map_set(@_): ", "Failed to rename: ",
373274f9
EW		 3682 "$db_lock => $db ($!)\n";
3683 delete $LOCKFILES{$db_lock};
3684 if ($update_ref) {
3685 $SIG{INT} = $SIG{HUP} = $SIG{TERM} = $SIG{ALRM} = $SIG{PIPE} =
3686 $SIG{USR1} = $SIG{USR2} = 'DEFAULT';
3687 kill $sig, $$ if defined $sig;
3688 }
9b981fc6
EW		 3689}
3690
66ab84b9
EW		 3691# If want_commit, this will return an array of (rev, commit) where
3692# commit _must_ be a valid commit in the archive.
3693# Otherwise, it'll return the max revision (whether or not the
3694# commit is valid or just a 0x40 placeholder).
060610c5 3695sub rev_map_max {
66ab84b9 3696 my ($self, $want_commit) = @_;
d6d3346b 3697 $self->rebuild;
2beec897
DM		 3698 my ($r, $c) = $self->rev_map_max_norebuild($want_commit);
3699 $want_commit ? ($r, $c) : $r;
3700}
3701
3702sub rev_map_max_norebuild {
3703 my ($self, $want_commit) = @_;
060610c5 3704 my $map_path = $self->map_path;
66ab84b9 3705 stat $map_path or return $want_commit ? (0, undef) : 0;
060610c5 3706 sysopen(my $fh, $map_path, O_RDONLY) or croak "open: $!";
4f7ec797 3707 binmode $fh or croak "binmode: $!";
060610c5
EW		 3708 my $size = (stat($fh))[7];
3709 ($size % 24) == 0 or croak "inconsistent size: $size";
3710
3711 if ($size == 0) {
3712 close $fh or croak "close: $!";
66ab84b9 3713 return $want_commit ? (0, undef) : 0;
060610c5
EW		 3714 }
3715
66ab84b9 3716 sysseek($fh, -24, SEEK_END) or croak "seek: $!";
060610c5 3717 sysread($fh, my $buf, 24) == 24 or croak "read: $!";
060610c5 3718 my ($r, $c) = unpack(rev_map_fmt, $buf);
66ab84b9
EW		 3719 if ($want_commit && $c eq ('0' x40)) {
3720 if ($size < 48) {
3721 return $want_commit ? (0, undef) : 0;
3722 }
3723 sysseek($fh, -48, SEEK_END) or croak "seek: $!";
3724 sysread($fh, $buf, 24) == 24 or croak "read: $!";
3725 ($r, $c) = unpack(rev_map_fmt, $buf);
3726 if ($c eq ('0'x40)) {
3727 croak "Penultimate record is all-zeroes in $map_path";
3728 }
3729 }
3730 close $fh or croak "close: $!";
3731 $want_commit ? ($r, $c) : $r;
9c93fee5
EW		 3732}
3733
060610c5 3734sub rev_map_get {
26a62d57 3735 my ($self, $rev, $uuid) = @_;
060610c5
EW		 3736 my $map_path = $self->map_path($uuid);
3737 return undef unless -e $map_path;
3738
3739 sysopen(my $fh, $map_path, O_RDONLY) or croak "open: $!";
195643f2
BJ		 3740 my $c = _rev_map_get($fh, $rev);
3741 close($fh) or croak "close: $!";
3742 $c
3743}
3744
3745sub _rev_map_get {
3746 my ($fh, $rev) = @_;
3747
4f7ec797 3748 binmode $fh or croak "binmode: $!";
060610c5
EW		 3749 my $size = (stat($fh))[7];
3750 ($size % 24) == 0 or croak "inconsistent size: $size";
3751
3752 if ($size == 0) {
060610c5
EW		 3753 return undef;
3754 }
3755
3756 my ($l, $u) = (0, $size - 24);
3757 my ($r, $c, $buf);
3758
3759 while ($l <= $u) {
3760 my $i = int(($l/24 + $u/24) / 2) * 24;
3761 sysseek($fh, $i, SEEK_SET) or croak "seek: $!";
3762 sysread($fh, my $buf, 24) == 24 or croak "read: $!";
c83f4e68 3763 my ($r, $c) = unpack(rev_map_fmt, $buf);
060610c5
EW		 3764
3765 if ($r < $rev) {
3766 $l = $i + 24;
3767 } elsif ($r > $rev) {
3768 $u = $i - 24;
3769 } else { # $r == $rev
66ab84b9 3770 return $c eq ('0' x 40) ? undef : $c;
060610c5 3771 }
9b981fc6 3772 }
060610c5 3773 undef;
9b981fc6
EW		 3774}
3775
111947ef
DK		 3776# Finds the first svn revision that exists on (if $eq_ok is true) or
3777# before $rev for the current branch. It will not search any lower
3778# than $min_rev. Returns the git commit hash and svn revision number
3779# if found, else (undef, undef).
15710b6f 3780sub find_rev_before {
111947ef 3781 my ($self, $rev, $eq_ok, $min_rev) = @_;
15710b6f 3782 --$rev unless $eq_ok;
111947ef 3783 $min_rev ||= 1;
ca5e880e
BJ		 3784 my $max_rev = $self->rev_map_max;
3785 $rev = $max_rev if ($rev > $max_rev);
111947ef 3786 while ($rev >= $min_rev) {
060610c5 3787 if (my $c = $self->rev_map_get($rev)) {
15710b6f
EW		 3788 return ($rev, $c);
3789 }
3790 --$rev;
3791 }
3792 return (undef, undef);
3793}
3794
111947ef
DK		 3795# Finds the first svn revision that exists on (if $eq_ok is true) or
3796# after $rev for the current branch. It will not search any higher
3797# than $max_rev. Returns the git commit hash and svn revision number
3798# if found, else (undef, undef).
3799sub find_rev_after {
3800 my ($self, $rev, $eq_ok, $max_rev) = @_;
3801 ++$rev unless $eq_ok;
060610c5 3802 $max_rev ||= $self->rev_map_max;
111947ef 3803 while ($rev <= $max_rev) {
060610c5 3804 if (my $c = $self->rev_map_get($rev)) {
111947ef
DK		 3805 return ($rev, $c);
3806 }
3807 ++$rev;
3808 }
3809 return (undef, undef);
3810}
3811
9b981fc6 3812sub _new {
706587fc
EW		 3813 my ($class, $repo_id, $ref_id, $path) = @_;
3814 unless (defined $repo_id && length $repo_id) {
3815 $repo_id = $Git::SVN::default_repo_id;
3816 }
3817 unless (defined $ref_id && length $ref_id) {
63de84ad 3818 $_prefix = '' unless defined($_prefix);
6f5748e1
AB		 3819 $_[2] = $ref_id =
3820 "refs/remotes/$_prefix$Git::SVN::default_ref_id";
706587fc 3821 }
7829f20f 3822 $_[1] = $repo_id;
706587fc 3823 my $dir = "$ENV{GIT_DIR}/svn/$ref_id";
6f5748e1
AB		 3824
3825 # Older repos imported by us used $GIT_DIR/svn/foo instead of
3826 # $GIT_DIR/svn/refs/remotes/foo when tracking refs/remotes/foo
3827 if ($ref_id =~ m{^refs/remotes/(.*)}) {
3828 my $old_dir = "$ENV{GIT_DIR}/svn/$1";
3829 if (-d $old_dir && ! -d $dir) {
3830 $dir = $old_dir;
3831 }
3832 }
3833
706587fc 3834 $_[3] = $path = '' unless (defined $path);
6f5748e1 3835 mkpath([$dir]);
26a62d57
EW		 3836 bless {
3837 ref_id => $ref_id, dir => $dir, index => "$dir/index",
8a49ee97 3838 path => $path, config => "$ENV{GIT_DIR}/svn/config",
060610c5 3839 map_root => "$dir/.rev_map", repo_id => $repo_id }, $class;
26a62d57
EW		 3840}
3841
060610c5
EW		 3842# for read-only access of old .rev_db formats
3843sub unlink_rev_db_symlink {
3844 my ($self) = @_;
3845 my $link = $self->rev_db_path;
3846 $link =~ s/\.[\w-]+$// or croak "missing UUID at the end of $link";
3847 if (-l $link) {
3848 unlink $link or croak "unlink: $link failed!";
3849 }
3850}
3851
3852sub rev_db_path {
3853 my ($self, $uuid) = @_;
3854 my $db_path = $self->map_path($uuid);
3855 $db_path =~ s{/\.rev_map\.}{/\.rev_db\.}
3856 or croak "map_path: $db_path does not contain '/.rev_map.' !";
3857 $db_path;
3858}
3859
3860# the new replacement for .rev_db
3861sub map_path {
26a62d57
EW		 3862 my ($self, $uuid) = @_;
3863 $uuid ||= $self->ra_uuid;
060610c5 3864 "$self->{map_root}.$uuid";
9b981fc6
EW		 3865}
3866
1c8443b0
EW		 3867sub uri_encode {
3868 my ($f) = @_;
3869 $f =~ s#([^a-zA-Z0-9\*!\:_\./\-])#uc sprintf("%%%02x",ord($1))#eg;
3870 $f
3871}
9b981fc6 3872
6111b934
EW		 3873sub uri_decode {
3874 my ($f) = @_;
3875 $f =~ s#%([0-9a-fA-F]{2})#chr(hex($1))#eg;
3876 $f
3877}
3878
18ea92bd
SV		 3879sub remove_username {
3880 $_[0] =~ s{^([^:]*://)[^@]+@}{$1};
3881}
3882
d976acfd
EW		 3883package Git::SVN::Prompt;
3884use strict;
3885use warnings;
3886require SVN::Core;
3887use vars qw/$_no_auth_cache $_username/;
3888
3889sub simple {
30d055aa
EW		 3890 my ($cred, $realm, $default_username, $may_save, $pool) = @_;
3891 $may_save = undef if $_no_auth_cache;
3892 $default_username = $_username if defined $_username;
3893 if (defined $default_username && length $default_username) {
3894 if (defined $realm && length $realm) {
6f729591
EW		 3895 print STDERR "Authentication realm: $realm\n";
3896 STDERR->flush;
30d055aa
EW		 3897 }
3898 $cred->username($default_username);
3899 } else {
d976acfd 3900 username($cred, $realm, $may_save, $pool);
30d055aa
EW		 3901 }
3902 $cred->password(_read_password("Password for '" .
3903 $cred->username . "': ", $realm));
3904 $cred->may_save($may_save);
3905 $SVN::_Core::SVN_NO_ERROR;
3906}
3907
d976acfd 3908sub ssl_server_trust {
30d055aa
EW		 3909 my ($cred, $realm, $failures, $cert_info, $may_save, $pool) = @_;
3910 $may_save = undef if $_no_auth_cache;
6f729591 3911 print STDERR "Error validating server certificate for '$realm':\n";
fd499bcc
ER		 3912 {
3913 no warnings 'once';
3914 # All variables SVN::Auth::SSL::* are used only once,
3915 # so we're shutting up Perl warnings about this.
3916 if ($failures & $SVN::Auth::SSL::UNKNOWNCA) {
3917 print STDERR " - The certificate is not issued ",
3918 "by a trusted authority. Use the\n",
3919 " fingerprint to validate ",
3920 "the certificate manually!\n";
3921 }
3922 if ($failures & $SVN::Auth::SSL::CNMISMATCH) {
3923 print STDERR " - The certificate hostname ",
3924 "does not match.\n";
3925 }
3926 if ($failures & $SVN::Auth::SSL::NOTYETVALID) {
3927 print STDERR " - The certificate is not yet valid.\n";
3928 }
3929 if ($failures & $SVN::Auth::SSL::EXPIRED) {
3930 print STDERR " - The certificate has expired.\n";
3931 }
3932 if ($failures & $SVN::Auth::SSL::OTHER) {
3933 print STDERR " - The certificate has ",
3934 "an unknown error.\n";
3935 }
3936 } # no warnings 'once'
6f729591
EW		 3937 printf STDERR
3938 "Certificate information:\n".
30d055aa
EW		 3939 " - Hostname: %s\n".
3940 " - Valid: from %s until %s\n".
3941 " - Issuer: %s\n".
3942 " - Fingerprint: %s\n",
3943 map $cert_info->$_, qw(hostname valid_from valid_until
6f729591 3944 issuer_dname fingerprint);
30d055aa
EW		 3945 my $choice;
3946prompt:
6f729591 3947 print STDERR $may_save ?
30d055aa
EW		 3948 "(R)eject, accept (t)emporarily or accept (p)ermanently? " :
3949 "(R)eject or accept (t)emporarily? ";
6f729591 3950 STDERR->flush;
30d055aa
EW		 3951 $choice = lc(substr(<STDIN> || 'R', 0, 1));
3952 if ($choice =~ /^t$/i) {
3953 $cred->may_save(undef);
3954 } elsif ($choice =~ /^r$/i) {
3955 return -1;
3956 } elsif ($may_save && $choice =~ /^p$/i) {
3957 $cred->may_save($may_save);
3958 } else {
3959 goto prompt;
3960 }
3961 $cred->accepted_failures($failures);
3962 $SVN::_Core::SVN_NO_ERROR;
3963}
3964
d976acfd 3965sub ssl_client_cert {
30d055aa
EW		 3966 my ($cred, $realm, $may_save, $pool) = @_;
3967 $may_save = undef if $_no_auth_cache;
6f729591
EW		 3968 print STDERR "Client certificate filename: ";
3969 STDERR->flush;
30d055aa
EW		 3970 chomp(my $filename = <STDIN>);
3971 $cred->cert_file($filename);
3972 $cred->may_save($may_save);
3973 $SVN::_Core::SVN_NO_ERROR;
3974}
3975
d976acfd 3976sub ssl_client_cert_pw {
30d055aa
EW		 3977 my ($cred, $realm, $may_save, $pool) = @_;
3978 $may_save = undef if $_no_auth_cache;
3979 $cred->password(_read_password("Password: ", $realm));
3980 $cred->may_save($may_save);
3981 $SVN::_Core::SVN_NO_ERROR;
3982}
3983
d976acfd 3984sub username {
30d055aa
EW		 3985 my ($cred, $realm, $may_save, $pool) = @_;
3986 $may_save = undef if $_no_auth_cache;
3987 if (defined $realm && length $realm) {
6f729591 3988 print STDERR "Authentication realm: $realm\n";
30d055aa
EW		 3989 }
3990 my $username;
3991 if (defined $_username) {
3992 $username = $_username;
3993 } else {
6f729591
EW		 3994 print STDERR "Username: ";
3995 STDERR->flush;
30d055aa
EW		 3996 chomp($username = <STDIN>);
3997 }
3998 $cred->username($username);
3999 $cred->may_save($may_save);
4000 $SVN::_Core::SVN_NO_ERROR;
4001}
4002
4003sub _read_password {
4004 my ($prompt, $realm) = @_;
30d055aa 4005 my $password = '';
56a853b6
FL		 4006 if (exists $ENV{GIT_ASKPASS}) {
4007 open(PH, "-|", $ENV{GIT_ASKPASS}, $prompt);
4008 $password = <PH>;
4009 $password =~ s/[\012\015]//; # \n\r
4010 close(PH);
4011 } else {
4012 print STDERR $prompt;
4013 STDERR->flush;
4014 require Term::ReadKey;
4015 Term::ReadKey::ReadMode('noecho');
4016 while (defined(my $key = Term::ReadKey::ReadKey(0))) {
4017 last if $key =~ /[\012\015]/; # \n\r
4018 $password .= $key;
4019 }
4020 Term::ReadKey::ReadMode('restore');
4021 print STDERR "\n";
4022 STDERR->flush;
30d055aa 4023 }
30d055aa
EW		 4024 $password;
4025}
4026
27a1a801
EW		 4027package SVN::Git::Fetcher;
4028use vars qw/@ISA/;
4029use strict;
4030use warnings;
4031use Carp qw/croak/;
4032use IO::File qw//;
edc662f9 4033use vars qw/$_ignore_regex/;
27a1a801
EW		 4034
4035# file baton members: path, mode_a, mode_b, pool, fh, blob, base
4036sub new {
8841b37f 4037 my ($class, $git_svn, $switch_path) = @_;
27a1a801
EW		 4038 my $self = SVN::Delta::Editor->new;
4039 bless $self, $class;
dbc6c74d
EW		 4040 if (exists $git_svn->{last_commit}) {
4041 $self->{c} = $git_svn->{last_commit};
8841b37f
EW		 4042 $self->{empty_symlinks} =
4043 _mark_empty_symlinks($git_svn, $switch_path);
dbc6c74d 4044 }
0d8bee71
BJ		 4045 $self->{ignore_regex} = eval { command_oneline('config', '--get',
4046 "svn-remote.$git_svn->{repo_id}.ignore-paths") };
d2a9a87b
EW		 4047 $self->{empty} = {};
4048 $self->{dir_prop} = {};
4049 $self->{file_prop} = {};
4050 $self->{absent_dir} = {};
4051 $self->{absent_file} = {};
ef3cfaad 4052 $self->{gii} = $git_svn->tmp_index_do(sub { Git::IndexInfo->new });
3713e222 4053 $self->{pathnameencoding} = Git::config('svn.pathnameencoding');
27a1a801
EW		 4054 $self;
4055}
4056
dbc6c74d
EW		 4057# this uses the Ra object, so it must be called before do_{switch,update},
4058# not inside them (when the Git::SVN::Fetcher object is passed) to
4059# do_{switch,update}
4060sub _mark_empty_symlinks {
8841b37f 4061 my ($git_svn, $switch_path) = @_;
4c58a711 4062 my $bool = Git::config_bool('svn.brokenSymlinkWorkaround');
48679e5c 4063 return {} if (!defined($bool)) || (defined($bool) && ! $bool);
4c58a711 4064
dbc6c74d
EW		 4065 my %ret;
4066 my ($rev, $cmt) = $git_svn->last_rev_commit;
4067 return {} unless ($rev && $cmt);
4068
4c58a711
EW		 4069 # allow the warning to be printed for each revision we fetch to
4070 # ensure the user sees it. The user can also disable the workaround
4071 # on the repository even while git svn is running and the next
4072 # revision fetched will skip this expensive function.
4073 my $printed_warning;
dbc6c74d
EW		 4074 chomp(my $empty_blob = `git hash-object -t blob --stdin < /dev/null`);
4075 my ($ls, $ctx) = command_output_pipe(qw/ls-tree -r -z/, $cmt);
4076 local $/ = "\0";
8841b37f 4077 my $pfx = defined($switch_path) ? $switch_path : $git_svn->{path};
dbc6c74d
EW		 4078 $pfx .= '/' if length($pfx);
4079 while (<$ls>) {
4080 chomp;
4081 s/\A100644 blob $empty_blob\t//o or next;
4c58a711
EW		 4082 unless ($printed_warning) {
4083 print STDERR "Scanning for empty symlinks, ",
4084 "this may take a while if you have ",
4085 "many empty files\n",
4086 "You may disable this with `",
4087 "git config svn.brokenSymlinkWorkaround ",
4088 "false'.\n",
4089 "This may be done in a different ",
4090 "terminal without restarting ",
4091 "git svn\n";
4092 $printed_warning = 1;
4093 }
dbc6c74d
EW		 4094 my $path = $_;
4095 my (undef, $props) =
4096 $git_svn->ra->get_file($pfx.$path, $rev, undef);
4097 if ($props->{'svn:special'}) {
4098 $ret{$path} = 1;
4099 }
4100 }
4101 command_close_pipe($ls, $ctx);
4102 \%ret;
4103}
4104
b03a71a6
EW		 4105# returns true if a given path is inside a ".git" directory
4106sub in_dot_git {
4107 $_[0] =~ m{(?:^|/)\.git(?:/|$)};
4108}
4109
edc662f9
VS		 4110# return value: 0 -- don't ignore, 1 -- ignore
4111sub is_path_ignored {
0d8bee71 4112 my ($self, $path) = @_;
edc662f9 4113 return 1 if in_dot_git($path);
0d8bee71
BJ		 4114 return 1 if defined($self->{ignore_regex}) &&
4115 $path =~ m!$self->{ignore_regex}!;
edc662f9
VS		 4116 return 0 unless defined($_ignore_regex);
4117 return 1 if $path =~ m!$_ignore_regex!o;
4118 return 0;
4119}
4120
8b8fc068
EW		 4121sub set_path_strip {
4122 my ($self, $path) = @_;
4e9f6cc7 4123 $self->{path_strip} = qr/^\Q$path\E(\/|$)/ if length $path;
8b8fc068
EW		 4124}
4125
d2a9a87b
EW		 4126sub open_root {
4127 { path => '' };
4128}
4129
4130sub open_directory {
4131 my ($self, $path, $pb, $rev) = @_;
4132 { path => $path };
4133}
4134
706587fc
EW		 4135sub git_path {
4136 my ($self, $path) = @_;
3713e222
DS		 4137 if (my $enc = $self->{pathnameencoding}) {
4138 require Encode;
4139 Encode::from_to($path, 'UTF-8', $enc);
4140 }
2b27f6c8
EW		 4141 if ($self->{path_strip}) {
4142 $path =~ s!$self->{path_strip}!! or
4143 die "Failed to strip path '$path' ($self->{path_strip})\n";
4144 }
706587fc
EW		 4145 $path;
4146}
4147
27a1a801
EW		 4148sub delete_entry {
4149 my ($self, $path, $rev, $pb) = @_;
0d8bee71 4150 return undef if $self->is_path_ignored($path);
4a87db0e 4151
706587fc 4152 my $gpath = $self->git_path($path);
8a603774
EW		 4153 return undef if ($gpath eq '');
4154
4a87db0e 4155 # remove entire directories.
4f821012
EW		 4156 my ($tree) = (command('ls-tree', '-z', $self->{c}, "./$gpath")
4157 =~ /\A040000 tree ([a-f\d]{40})\t\Q$gpath\E\0/);
4158 if ($tree) {
4a87db0e
EW		 4159 my ($ls, $ctx) = command_output_pipe(qw/ls-tree
4160 -r --name-only -z/,
4f821012 4161 $tree);
4a87db0e
EW		 4162 local $/ = "\0";
4163 while (<$ls>) {
ef3cfaad 4164 chomp;
4f821012
EW		 4165 my $rmpath = "$gpath/$_";
4166 $self->{gii}->remove($rmpath);
4167 print "\tD\t$rmpath\n" unless $::_q;
4a87db0e 4168 }
9e3cdbd4 4169 print "\tD\t$gpath/\n" unless $::_q;
4a87db0e 4170 command_close_pipe($ls, $ctx);
4a87db0e 4171 } else {
ef3cfaad 4172 $self->{gii}->remove($gpath);
9e3cdbd4 4173 print "\tD\t$gpath\n" unless $::_q;
4a87db0e 4174 }
f9ad77a7 4175 $self->{empty}->{$path} = 0;
27a1a801
EW		 4176 undef;
4177}
4178
4179sub open_file {
4180 my ($self, $path, $pb, $rev) = @_;
b03a71a6
EW		 4181 my ($mode, $blob);
4182
0d8bee71 4183 goto out if $self->is_path_ignored($path);
b03a71a6 4184
706587fc 4185 my $gpath = $self->git_path($path);
4f821012
EW		 4186 ($mode, $blob) = (command('ls-tree', '-z', $self->{c}, "./$gpath")
4187 =~ /\A(\d{6}) blob ([a-f\d]{40})\t\Q$gpath\E\0/);
006ede5e
EW		 4188 unless (defined $mode && defined $blob) {
4189 die "$path was not found in commit $self->{c} (r$rev)\n";
4190 }
dbc6c74d
EW		 4191 if ($mode eq '100644' && $self->{empty_symlinks}->{$path}) {
4192 $mode = '120000';
4193 }
b03a71a6 4194out:
27a1a801 4195 { path => $path, mode_a => $mode, mode_b => $mode, blob => $blob,
0864e3ba 4196 pool => SVN::Pool->new, action => 'M' };
27a1a801
EW		 4197}
4198
4199sub add_file {
4200 my ($self, $path, $pb, $cp_path, $cp_rev) = @_;
b03a71a6
EW		 4201 my $mode;
4202
0d8bee71 4203 if (!$self->is_path_ignored($path)) {
b03a71a6
EW		 4204 my ($dir, $file) = ($path =~ m#^(.*?)/?([^/]+)$#);
4205 delete $self->{empty}->{$dir};
4206 $mode = '100644';
4207 }
4208 { path => $path, mode_a => $mode, mode_b => $mode,
0864e3ba 4209 pool => SVN::Pool->new, action => 'A' };
27a1a801
EW		 4210}
4211
d2a9a87b
EW		 4212sub add_directory {
4213 my ($self, $path, $cp_path, $cp_rev) = @_;
0d8bee71 4214 goto out if $self->is_path_ignored($path);
12a6d752
EW		 4215 my $gpath = $self->git_path($path);
4216 if ($gpath eq '') {
4217 my ($ls, $ctx) = command_output_pipe(qw/ls-tree
4218 -r --name-only -z/,
4219 $self->{c});
4220 local $/ = "\0";
4221 while (<$ls>) {
4222 chomp;
4223 $self->{gii}->remove($_);
4224 print "\tD\t$_\n" unless $::_q;
4225 }
4226 command_close_pipe($ls, $ctx);
4227 $self->{empty}->{$path} = 0;
4228 }
d2a9a87b
EW		 4229 my ($dir, $file) = ($path =~ m#^(.*?)/?([^/]+)$#);
4230 delete $self->{empty}->{$dir};
4231 $self->{empty}->{$path} = 1;
b03a71a6 4232out:
d2a9a87b
EW		 4233 { path => $path };
4234}
4235
4236sub change_dir_prop {
4237 my ($self, $db, $prop, $value) = @_;
0d8bee71 4238 return undef if $self->is_path_ignored($db->{path});
d2a9a87b
EW		 4239 $self->{dir_prop}->{$db->{path}} ||= {};
4240 $self->{dir_prop}->{$db->{path}}->{$prop} = $value;
4241 undef;
4242}
4243
4244sub absent_directory {
4245 my ($self, $path, $pb) = @_;
0d8bee71 4246 return undef if $self->is_path_ignored($path);
d2a9a87b
EW		 4247 $self->{absent_dir}->{$pb->{path}} ||= [];
4248 push @{$self->{absent_dir}->{$pb->{path}}}, $path;
4249 undef;
4250}
4251
4252sub absent_file {
4253 my ($self, $path, $pb) = @_;
0d8bee71 4254 return undef if $self->is_path_ignored($path);
d2a9a87b
EW		 4255 $self->{absent_file}->{$pb->{path}} ||= [];
4256 push @{$self->{absent_file}->{$pb->{path}}}, $path;
4257 undef;
4258}
4259
27a1a801
EW		 4260sub change_file_prop {
4261 my ($self, $fb, $prop, $value) = @_;
0d8bee71 4262 return undef if $self->is_path_ignored($fb->{path});
27a1a801
EW		 4263 if ($prop eq 'svn:executable') {
4264 if ($fb->{mode_b} != 120000) {
4265 $fb->{mode_b} = defined $value ? 100755 : 100644;
4266 }
4267 } elsif ($prop eq 'svn:special') {
4268 $fb->{mode_b} = defined $value ? 120000 : 100644;
d2a9a87b
EW		 4269 } else {
4270 $self->{file_prop}->{$fb->{path}} ||= {};
4271 $self->{file_prop}->{$fb->{path}}->{$prop} = $value;
27a1a801
EW		 4272 }
4273 undef;
4274}
4275
4276sub apply_textdelta {
4277 my ($self, $fb, $exp) = @_;
0d8bee71 4278 return undef if $self->is_path_ignored($fb->{path});
1b3069a7 4279 my $fh = $::_repository->temp_acquire('svn_delta');
27a1a801
EW		 4280 # $fh gets auto-closed() by SVN::TxDelta::apply(),
4281 # (but $base does not,) so dup() it for reading in close_file
4282 open my $dup, '<&', $fh or croak $!;
1b3069a7 4283 my $base = $::_repository->temp_acquire('git_blob');
b03a71a6 4284
27a1a801 4285 if ($fb->{blob}) {
baf5fa8a
EW		 4286 my ($base_is_link, $size);
4287
dbc6c74d
EW		 4288 if ($fb->{mode_a} eq '120000' &&
4289 ! $self->{empty_symlinks}->{$fb->{path}}) {
4290 print $base 'link ' or die "print $!\n";
baf5fa8a 4291 $base_is_link = 1;
dbc6c74d 4292 }
baf5fa8a
EW		 4293 retry:
4294 $size = $::_repository->cat_blob($fb->{blob}, $base);
d683a0e0 4295 die "Failed to read object $fb->{blob}" if ($size < 0);
27a1a801
EW		 4296
4297 if (defined $exp) {
4298 seek $base, 0, 0 or croak $!;
8d7c4fad 4299 my $got = ::md5sum($base);
baf5fa8a
EW		 4300 if ($got ne $exp) {
4301 my $err = "Checksum mismatch: ".
4302 "$fb->{path} $fb->{blob}\n" .
4303 "expected: $exp\n" .
4304 " got: $got\n";
4305 if ($base_is_link) {
4306 warn $err,
4307 "Retrying... (possibly ",
4308 "a bad symlink from SVN)\n";
4309 $::_repository->temp_reset($base);
4310 $base_is_link = 0;
4311 goto retry;
4312 }
4313 die $err;
4314 }
27a1a801
EW		 4315 }
4316 }
4317 seek $base, 0, 0 or croak $!;
0b19138b 4318 $fb->{fh} = $fh;
27a1a801 4319 $fb->{base} = $base;
0b19138b 4320 [ SVN::TxDelta::apply($base, $dup, undef, $fb->{path}, $fb->{pool}) ];
27a1a801
EW		 4321}
4322
4323sub close_file {
4324 my ($self, $fb, $exp) = @_;
0d8bee71 4325 return undef if $self->is_path_ignored($fb->{path});
b03a71a6 4326
27a1a801 4327 my $hash;
706587fc 4328 my $path = $self->git_path($fb->{path});
27a1a801 4329 if (my $fh = $fb->{fh}) {
7faf0686
EW		 4330 if (defined $exp) {
4331 seek($fh, 0, 0) or croak $!;
8d7c4fad 4332 my $got = ::md5sum($fh);
7faf0686
EW		 4333 if ($got ne $exp) {
4334 die "Checksum mismatch: $path\n",
4335 "expected: $exp\n got: $got\n";
4336 }
4337 }
27a1a801 4338 if ($fb->{mode_b} == 120000) {
510b0945 4339 sysseek($fh, 0, 0) or croak $!;
dbc6c74d 4340 my $rd = sysread($fh, my $buf, 5);
ffe256f9 4341
dbc6c74d
EW		 4342 if (!defined $rd) {
4343 croak "sysread: $!\n";
4344 } elsif ($rd == 0) {
4345 warn "$path has mode 120000",
4346 " but it points to nothing\n",
4347 "converting to an empty file with mode",
4348 " 100644\n";
4349 $fb->{mode_b} = '100644';
4350 } elsif ($buf ne 'link ') {
510b0945 4351 warn "$path has mode 120000",
dbc6c74d 4352 " but is not a link\n";
510b0945 4353 } else {
1b3069a7
MS		 4354 my $tmp_fh = $::_repository->temp_acquire(
4355 'svn_hash');
510b0945
MG		 4356 my $res;
4357 while ($res = sysread($fh, my $str, 1024)) {
4358 my $out = syswrite($tmp_fh, $str, $res);
4359 defined($out) && $out == $res
4360 or croak("write ",
836ff95d 4361 Git::temp_path($tmp_fh),
510b0945
MG		 4362 ": $!\n");
4363 }
4364 defined $res or croak $!;
ffe256f9 4365
510b0945
MG		 4366 ($fh, $tmp_fh) = ($tmp_fh, $fh);
4367 Git::temp_release($tmp_fh, 1);
4368 }
4369 }
0b19138b
MG		 4370
4371 $hash = $::_repository->hash_and_insert_object(
836ff95d 4372 Git::temp_path($fh));
27a1a801 4373 $hash =~ /^[a-f\d]{40}$/ or die "not a sha1: $hash\n";
0b19138b
MG		 4374
4375 Git::temp_release($fb->{base}, 1);
510b0945 4376 Git::temp_release($fh, 1);
27a1a801
EW		 4377 } else {
4378 $hash = $fb->{blob} or die "no blob information\n";
4379 }
4380 $fb->{pool}->clear;
ef3cfaad 4381 $self->{gii}->update($fb->{mode_b}, $hash, $path) or croak $!;
9e3cdbd4 4382 print "\t$fb->{action}\t$path\n" if $fb->{action} && ! $::_q;
27a1a801
EW		 4383 undef;
4384}
4385
4386sub abort_edit {
4387 my $self = shift;
ef3cfaad
EW		 4388 $self->{nr} = $self->{gii}->{nr};
4389 delete $self->{gii};
27a1a801
EW		 4390 $self->SUPER::abort_edit(@_);
4391}
4392
4393sub close_edit {
4394 my $self = shift;
dad73c0b 4395 $self->{git_commit_ok} = 1;
ef3cfaad
EW		 4396 $self->{nr} = $self->{gii}->{nr};
4397 delete $self->{gii};
27a1a801
EW		 4398 $self->SUPER::close_edit(@_);
4399}
1a82e793 4400
a5e0cedc 4401package SVN::Git::Editor;
24e22aa8 4402use vars qw/@ISA $_rmdir $_cp_similarity $_find_copies_harder $_rename_limit/;
a5e0cedc
EW		 4403use strict;
4404use warnings;
4405use Carp qw/croak/;
4406use IO::File;
4407
4408sub new {
61395354
EW		 4409 my ($class, $opts) = @_;
4410 foreach (qw/svn_path r ra tree_a tree_b log editor_cb/) {
4411 die "$_ required!\n" unless (defined $opts->{$_});
4412 }
4413
4414 my $pool = SVN::Pool->new;
4415 my $mods = generate_diff($opts->{tree_a}, $opts->{tree_b});
4416 my $types = check_diff_paths($opts->{ra}, $opts->{svn_path},
4417 $opts->{r}, $mods);
4418
4419 # $opts->{ra} functions should not be used after this:
4420 my @ce = $opts->{ra}->get_commit_editor($opts->{log},
4421 $opts->{editor_cb}, $pool);
4422 my $self = SVN::Delta::Editor->new(@ce, $pool);
a5e0cedc 4423 bless $self, $class;
61395354
EW		 4424 foreach (qw/svn_path r tree_a tree_b/) {
4425 $self->{$_} = $opts->{$_};
a5e0cedc 4426 }
61395354
EW		 4427 $self->{url} = $opts->{ra}->{url};
4428 $self->{mods} = $mods;
4429 $self->{types} = $types;
4430 $self->{pool} = $pool;
a5e0cedc
EW		 4431 $self->{bat} = { '' => $self->open_root($self->{r}, $self->{pool}) };
4432 $self->{rm} = { };
d3a840dc
EW		 4433 $self->{path_prefix} = length $self->{svn_path} ?
4434 "$self->{svn_path}/" : '';
128de657 4435 $self->{config} = $opts->{config};
a5e0cedc
EW		 4436 return $self;
4437}
4438
61395354
EW		 4439sub generate_diff {
4440 my ($tree_a, $tree_b) = @_;
4441 my @diff_tree = qw(diff-tree -z -r);
24e22aa8
EW		 4442 if ($_cp_similarity) {
4443 push @diff_tree, "-C$_cp_similarity";
61395354
EW		 4444 } else {
4445 push @diff_tree, '-C';
4446 }
24e22aa8
EW		 4447 push @diff_tree, '--find-copies-harder' if $_find_copies_harder;
4448 push @diff_tree, "-l$_rename_limit" if defined $_rename_limit;
61395354
EW		 4449 push @diff_tree, $tree_a, $tree_b;
4450 my ($diff_fh, $ctx) = command_output_pipe(@diff_tree);
4451 local $/ = "\0";
4452 my $state = 'meta';
4453 my @mods;
4454 while (<$diff_fh>) {
4455 chomp $_; # this gets rid of the trailing "\0"
4456 if ($state eq 'meta' && /^:(\d{6})\s(\d{6})\s
2d0c8acc 4457 ($::sha1)\s($::sha1)\s
61395354
EW		 4458 ([MTCRAD])\d*$/xo) {
4459 push @mods, { mode_a => $1, mode_b => $2,
2d0c8acc
FW		 4460 sha1_a => $3, sha1_b => $4,
4461 chg => $5 };
4462 if ($5 =~ /^(?:C|R)$/) {
61395354
EW		 4463 $state = 'file_a';
4464 } else {
4465 $state = 'file_b';
4466 }
4467 } elsif ($state eq 'file_a') {
4468 my $x = $mods[$#mods] or croak "Empty array\n";
4469 if ($x->{chg} !~ /^(?:C|R)$/) {
4470 croak "Error parsing $_, $x->{chg}\n";
4471 }
4472 $x->{file_a} = $_;
4473 $state = 'file_b';
4474 } elsif ($state eq 'file_b') {
4475 my $x = $mods[$#mods] or croak "Empty array\n";
4476 if (exists $x->{file_a} && $x->{chg} !~ /^(?:C|R)$/) {
4477 croak "Error parsing $_, $x->{chg}\n";
4478 }
4479 if (!exists $x->{file_a} && $x->{chg} =~ /^(?:C|R)$/) {
4480 croak "Error parsing $_, $x->{chg}\n";
4481 }
4482 $x->{file_b} = $_;
4483 $state = 'meta';
4484 } else {
4485 croak "Error parsing $_\n";
4486 }
4487 }
4488 command_close_pipe($diff_fh, $ctx);
4489 \@mods;
4490}
4491
4492sub check_diff_paths {
4493 my ($ra, $pfx, $rev, $mods) = @_;
4494 my %types;
4495 $pfx .= '/' if length $pfx;
4496
4497 sub type_diff_paths {
4498 my ($ra, $types, $path, $rev) = @_;
4499 my @p = split m#/+#, $path;
4500 my $c = shift @p;
4501 unless (defined $types->{$c}) {
4502 $types->{$c} = $ra->check_path($c, $rev);
4503 }
4504 while (@p) {
4505 $c .= '/' . shift @p;
4506 next if defined $types->{$c};
4507 $types->{$c} = $ra->check_path($c, $rev);
4508 }
4509 }
4510
4511 foreach my $m (@$mods) {
4512 foreach my $f (qw/file_a file_b/) {
4513 next unless defined $m->{$f};
4514 my ($dir) = ($m->{$f} =~ m#^(.*?)/?(?:[^/]+)$#);
4515 if (length $pfx.$dir && ! defined $types{$dir}) {
4516 type_diff_paths($ra, \%types, $pfx.$dir, $rev);
4517 }
4518 }
4519 }
4520 \%types;
4521}
4522
a5e0cedc
EW		 4523sub split_path {
4524 return ($_[0] =~ m#^(.*?)/?([^/]+)$#);
4525}
4526
4527sub repo_path {
d3a840dc 4528 my ($self, $path) = @_;
3713e222
DS		 4529 if (my $enc = $self->{pathnameencoding}) {
4530 require Encode;
4531 Encode::from_to($path, $enc, 'UTF-8');
4532 }
d3a840dc 4533 $self->{path_prefix}.(defined $path ? $path : '');
a5e0cedc
EW		 4534}
4535
4536sub url_path {
4537 my ($self, $path) = @_;
29633bb9 4538 if ($self->{url} =~ m#^https?://#) {
884cce5b 4539 $path =~ s!([^~a-zA-Z0-9_./-])!uc sprintf("%%%02x",ord($1))!eg;
29633bb9 4540 }
6e8548cc 4541 $self->{url} . '/' . $self->repo_path($path);
a5e0cedc
EW		 4542}
4543
4544sub rmdirs {
61395354 4545 my ($self) = @_;
a5e0cedc
EW		 4546 my $rm = $self->{rm};
4547 delete $rm->{''}; # we never delete the url we're tracking
4548 return unless %$rm;
4549
4550 foreach (keys %$rm) {
4551 my @d = split m#/#, $_;
4552 my $c = shift @d;
4553 $rm->{$c} = 1;
4554 while (@d) {
4555 $c .= '/' . shift @d;
4556 $rm->{$c} = 1;
4557 }
4558 }
4559 delete $rm->{$self->{svn_path}};
4560 delete $rm->{''}; # we never delete the url we're tracking
4561 return unless %$rm;
4562
61395354
EW		 4563 my ($fh, $ctx) = command_output_pipe(qw/ls-tree --name-only -r -z/,
4564 $self->{tree_b});
a5e0cedc
EW		 4565 local $/ = "\0";
4566 while (<$fh>) {
4567 chomp;
747fa12c 4568 my @dn = split m#/#, $_;
c07eee1f
EW		 4569 while (pop @dn) {
4570 delete $rm->{join '/', @dn};
4571 }
4572 unless (%$rm) {
22600a25 4573 close $fh;
c07eee1f
EW		 4574 return;
4575 }
a5e0cedc 4576 }
aef4e921 4577 command_close_pipe($fh, $ctx);
c07eee1f 4578
a5e0cedc
EW		 4579 my ($r, $p, $bat) = ($self->{r}, $self->{pool}, $self->{bat});
4580 foreach my $d (sort { $b =~ tr#/#/# <=> $a =~ tr#/#/# } keys %$rm) {
4581 $self->close_directory($bat->{$d}, $p);
4582 my ($dn) = ($d =~ m#^(.*?)/?(?:[^/]+)$#);
44320b9e 4583 print "\tD+\t$d/\n" unless $::_q;
a5e0cedc
EW		 4584 $self->SUPER::delete_entry($d, $r, $bat->{$dn}, $p);
4585 delete $bat->{$d};
4586 }
4587}
4588
4589sub open_or_add_dir {
4590 my ($self, $full_path, $baton) = @_;
6e8548cc
EW		 4591 my $t = $self->{types}->{$full_path};
4592 if (!defined $t) {
4593 die "$full_path not known in r$self->{r} or we have a bug!\n";
4594 }
fd499bcc
ER		 4595 {
4596 no warnings 'once';
4597 # SVN::Node::none and SVN::Node::file are used only once,
4598 # so we're shutting up Perl's warnings about them.
4599 if ($t == $SVN::Node::none) {
4600 return $self->add_directory($full_path, $baton,
4601 undef, -1, $self->{pool});
4602 } elsif ($t == $SVN::Node::dir) {
4603 return $self->open_directory($full_path, $baton,
4604 $self->{r}, $self->{pool});
4605 } # no warnings 'once'
4606 print STDERR "$full_path already exists in repository at ",
4607 "r$self->{r} and it is not a directory (",
4608 ($t == $SVN::Node::file ? 'file' : 'unknown'),"/$t)\n";
4609 } # no warnings 'once'
a5e0cedc
EW		 4610 exit 1;
4611}
4612
4613sub ensure_path {
4614 my ($self, $path) = @_;
4615 my $bat = $self->{bat};
6e8548cc
EW		 4616 my $repo_path = $self->repo_path($path);
4617 return $bat->{''} unless (length $repo_path);
4618 my @p = split m#/+#, $repo_path;
a5e0cedc
EW		 4619 my $c = shift @p;
4620 $bat->{$c} ||= $self->open_or_add_dir($c, $bat->{''});
4621 while (@p) {
4622 my $c0 = $c;
4623 $c .= '/' . shift @p;
4624 $bat->{$c} ||= $self->open_or_add_dir($c, $bat->{$c0});
4625 }
4626 return $bat->{$c};
4627}
4628
128de657
BK		 4629# Subroutine to convert a globbing pattern to a regular expression.
4630# From perl cookbook.
4631sub glob2pat {
4632 my $globstr = shift;
4633 my %patmap = ('*' => '.*', '?' => '.', '[' => '[', ']' => ']');
4634 $globstr =~ s{(.)} { $patmap{$1} || "\Q$1" }ge;
4635 return '^' . $globstr . '$';
4636}
4637
4638sub check_autoprop {
4639 my ($self, $pattern, $properties, $file, $fbat) = @_;
4640 # Convert the globbing pattern to a regular expression.
4641 my $regex = glob2pat($pattern);
4642 # Check if the pattern matches the file name.
4643 if($file =~ m/($regex)/) {
4644 # Parse the list of properties to set.
4645 my @props = split(/;/, $properties);
4646 foreach my $prop (@props) {
4647 # Parse 'name=value' syntax and set the property.
4648 if ($prop =~ /([^=]+)=(.*)/) {
4649 my ($n,$v) = ($1,$2);
4650 for ($n, $v) {
4651 s/^\s+//; s/\s+$//;
4652 }
4653 $self->change_file_prop($fbat, $n, $v);
4654 }
4655 }
4656 }
4657}
4658
4659sub apply_autoprops {
4660 my ($self, $file, $fbat) = @_;
4661 my $conf_t = ${$self->{config}}{'config'};
4662 no warnings 'once';
4663 # Check [miscellany]/enable-auto-props in svn configuration.
4664 if (SVN::_Core::svn_config_get_bool(
4665 $conf_t,
4666 $SVN::_Core::SVN_CONFIG_SECTION_MISCELLANY,
4667 $SVN::_Core::SVN_CONFIG_OPTION_ENABLE_AUTO_PROPS,
4668 0)) {
4669 # Auto-props are enabled. Enumerate them to look for matches.
4670 my $callback = sub {
4671 $self->check_autoprop($_[0], $_[1], $file, $fbat);
4672 };
4673 SVN::_Core::svn_config_enumerate(
4674 $conf_t,
4675 $SVN::_Core::SVN_CONFIG_SECTION_AUTO_PROPS,
4676 $callback);
4677 }
4678}
4679
a5e0cedc 4680sub A {
44320b9e 4681 my ($self, $m) = @_;
a5e0cedc
EW		 4682 my ($dir, $file) = split_path($m->{file_b});
4683 my $pbat = $self->ensure_path($dir);
4684 my $fbat = $self->add_file($self->repo_path($m->{file_b}), $pbat,
4685 undef, -1);
44320b9e 4686 print "\tA\t$m->{file_b}\n" unless $::_q;
128de657 4687 $self->apply_autoprops($file, $fbat);
a5e0cedc
EW		 4688 $self->chg_file($fbat, $m);
4689 $self->close_file($fbat,undef,$self->{pool});
4690}
4691
4692sub C {
44320b9e 4693 my ($self, $m) = @_;
a5e0cedc
EW		 4694 my ($dir, $file) = split_path($m->{file_b});
4695 my $pbat = $self->ensure_path($dir);
4696 my $fbat = $self->add_file($self->repo_path($m->{file_b}), $pbat,
4697 $self->url_path($m->{file_a}), $self->{r});
44320b9e 4698 print "\tC\t$m->{file_a} => $m->{file_b}\n" unless $::_q;
a5e0cedc
EW		 4699 $self->chg_file($fbat, $m);
4700 $self->close_file($fbat,undef,$self->{pool});
4701}
4702
4703sub delete_entry {
4704 my ($self, $path, $pbat) = @_;
4705 my $rpath = $self->repo_path($path);
4706 my ($dir, $file) = split_path($rpath);
4707 $self->{rm}->{$dir} = 1;
4708 $self->SUPER::delete_entry($rpath, $self->{r}, $pbat, $self->{pool});
4709}
4710
4711sub R {
44320b9e 4712 my ($self, $m) = @_;
a5e0cedc
EW		 4713 my ($dir, $file) = split_path($m->{file_b});
4714 my $pbat = $self->ensure_path($dir);
4715 my $fbat = $self->add_file($self->repo_path($m->{file_b}), $pbat,
4716 $self->url_path($m->{file_a}), $self->{r});
44320b9e 4717 print "\tR\t$m->{file_a} => $m->{file_b}\n" unless $::_q;
7c4d0219 4718 $self->apply_autoprops($file, $fbat);
a5e0cedc
EW		 4719 $self->chg_file($fbat, $m);
4720 $self->close_file($fbat,undef,$self->{pool});
4721
4722 ($dir, $file) = split_path($m->{file_a});
4723 $pbat = $self->ensure_path($dir);
4724 $self->delete_entry($m->{file_a}, $pbat);
4725}
4726
4727sub M {
44320b9e 4728 my ($self, $m) = @_;
a5e0cedc
EW		 4729 my ($dir, $file) = split_path($m->{file_b});
4730 my $pbat = $self->ensure_path($dir);
4731 my $fbat = $self->open_file($self->repo_path($m->{file_b}),
4732 $pbat,$self->{r},$self->{pool});
44320b9e 4733 print "\t$m->{chg}\t$m->{file_b}\n" unless $::_q;
a5e0cedc
EW		 4734 $self->chg_file($fbat, $m);
4735 $self->close_file($fbat,undef,$self->{pool});
4736}
4737
4738sub T { shift->M(@_) }
4739
4740sub change_file_prop {
4741 my ($self, $fbat, $pname, $pval) = @_;
4742 $self->SUPER::change_file_prop($fbat, $pname, $pval, $self->{pool});
4743}
4744
214a34d2
FW		 4745sub _chg_file_get_blob ($$$$) {
4746 my ($self, $fbat, $m, $which) = @_;
1b3069a7 4747 my $fh = $::_repository->temp_acquire("git_blob_$which");
214a34d2 4748 if ($m->{"mode_$which"} =~ /^120/) {
a5e0cedc
EW		 4749 print $fh 'link ' or croak $!;
4750 $self->change_file_prop($fbat,'svn:special','*');
214a34d2 4751 } elsif ($m->{mode_a} =~ /^120/ && $m->{"mode_$which"} !~ /^120/) {
a5e0cedc
EW		 4752 $self->change_file_prop($fbat,'svn:special',undef);
4753 }
214a34d2
FW		 4754 my $blob = $m->{"sha1_$which"};
4755 return ($fh,) if ($blob =~ /^0{40}$/);
4756 my $size = $::_repository->cat_blob($blob, $fh);
4757 croak "Failed to read object $blob" if ($size < 0);
a5e0cedc
EW		 4758 $fh->flush == 0 or croak $!;
4759 seek $fh, 0, 0 or croak $!;
4760
8d7c4fad 4761 my $exp = ::md5sum($fh);
a5e0cedc 4762 seek $fh, 0, 0 or croak $!;
214a34d2
FW		 4763 return ($fh, $exp);
4764}
a5e0cedc 4765
214a34d2
FW		 4766sub chg_file {
4767 my ($self, $fbat, $m) = @_;
4768 if ($m->{mode_b} =~ /755$/ && $m->{mode_a} !~ /755$/) {
4769 $self->change_file_prop($fbat,'svn:executable','*');
4770 } elsif ($m->{mode_b} !~ /755$/ && $m->{mode_a} =~ /755$/) {
4771 $self->change_file_prop($fbat,'svn:executable',undef);
4772 }
8598db93
FW		 4773 my ($fh_a, $exp_a) = _chg_file_get_blob $self, $fbat, $m, 'a';
4774 my ($fh_b, $exp_b) = _chg_file_get_blob $self, $fbat, $m, 'b';
f7197dff 4775 my $pool = SVN::Pool->new;
8598db93
FW		 4776 my $atd = $self->apply_textdelta($fbat, $exp_a, $pool);
4777 if (-s $fh_a) {
4778 my $txstream = SVN::TxDelta::new ($fh_a, $fh_b, $pool);
991255c6
EW		 4779 my $res = SVN::TxDelta::send_txstream($txstream, @$atd, $pool);
4780 if (defined $res) {
4781 die "Unexpected result from send_txstream: $res\n",
4782 "(SVN::Core::VERSION: $SVN::Core::VERSION)\n";
4783 }
8598db93
FW		 4784 } else {
4785 my $got = SVN::TxDelta::send_stream($fh_b, @$atd, $pool);
4786 die "Checksum mismatch\nexpected: $exp_b\ngot: $got\n"
4787 if ($got ne $exp_b);
4788 }
4789 Git::temp_release($fh_b, 1);
4790 Git::temp_release($fh_a, 1);
f7197dff 4791 $pool->clear;
a5e0cedc
EW		 4792}
4793
4794sub D {
44320b9e 4795 my ($self, $m) = @_;
a5e0cedc
EW		 4796 my ($dir, $file) = split_path($m->{file_b});
4797 my $pbat = $self->ensure_path($dir);
44320b9e 4798 print "\tD\t$m->{file_b}\n" unless $::_q;
a5e0cedc
EW		 4799 $self->delete_entry($m->{file_b}, $pbat);
4800}
4801
4802sub close_edit {
4803 my ($self) = @_;
4804 my ($p,$bat) = ($self->{pool}, $self->{bat});
4805 foreach (sort { $b =~ tr#/#/# <=> $a =~ tr#/#/# } keys %$bat) {
6442754d 4806 next if $_ eq '';
a5e0cedc
EW		 4807 $self->close_directory($bat->{$_}, $p);
4808 }
6442754d 4809 $self->close_directory($bat->{''}, $p);
a5e0cedc
EW		 4810 $self->SUPER::close_edit($p);
4811 $p->clear;
4812}
4813
4814sub abort_edit {
4815 my ($self) = @_;
4816 $self->SUPER::abort_edit($self->{pool});
61395354
EW		 4817}
4818
4819sub DESTROY {
4820 my $self = shift;
4821 $self->SUPER::DESTROY(@_);
a5e0cedc
EW		 4822 $self->{pool}->clear;
4823}
4824
44320b9e
EW		 4825# this drives the editor
4826sub apply_diff {
61395354
EW		 4827 my ($self) = @_;
4828 my $mods = $self->{mods};
44320b9e 4829 my %o = ( D => 1, R => 0, C => -1, A => 3, M => 3, T => 3 );
6e8548cc 4830 foreach my $m (sort { $o{$a->{chg}} <=> $o{$b->{chg}} } @$mods) {
44320b9e
EW		 4831 my $f = $m->{chg};
4832 if (defined $o{$f}) {
4833 $self->$f($m);
4834 } else {
207f1a75 4835 fatal("Invalid change type: $f");
44320b9e
EW		 4836 }
4837 }
24e22aa8 4838 $self->rmdirs if $_rmdir;
6e8548cc 4839 if (@$mods == 0) {
44320b9e
EW		 4840 $self->abort_edit;
4841 } else {
4842 $self->close_edit;
4843 }
6e8548cc 4844 return scalar @$mods;
44320b9e
EW		 4845}
4846
d81bf827 4847package Git::SVN::Ra;
6af1db44 4848use vars qw/@ISA $config_dir $_log_window_size/;
d81bf827
EW		 4849use strict;
4850use warnings;
a51cdb0c 4851my ($ra_invalid, $can_do_switch, %ignored_err, $RA);
d81bf827
EW		 4852
4853BEGIN {
4854 # enforce temporary pool usage for some simple functions
c5f71ad0 4855 no strict 'refs';
bf8a40b8
EW		 4856 for my $f (qw/rev_proplist get_latest_revnum get_uuid get_repos_root
4857 get_file/) {
c5f71ad0
SV		 4858 my $SUPER = "SUPER::$f";
4859 *$f = sub {
4860 my $self = shift;
4861 my $pool = SVN::Pool->new;
4862 my @ret = $self->$SUPER(@_,$pool);
4863 $pool->clear;
4864 wantarray ? @ret : $ret[0];
4865 };
d81bf827 4866 }
d81bf827
EW		 4867}
4868
9ff74e95
SW		 4869sub _auth_providers () {
4870 [
4871 SVN::Client::get_simple_provider(),
4872 SVN::Client::get_ssl_server_trust_file_provider(),
4873 SVN::Client::get_simple_prompt_provider(
4874 \&Git::SVN::Prompt::simple, 2),
4875 SVN::Client::get_ssl_client_cert_file_provider(),
4876 SVN::Client::get_ssl_client_cert_prompt_provider(
4877 \&Git::SVN::Prompt::ssl_client_cert, 2),
77266e96 4878 SVN::Client::get_ssl_client_cert_pw_file_provider(),
9ff74e95
SW		 4879 SVN::Client::get_ssl_client_cert_pw_prompt_provider(
4880 \&Git::SVN::Prompt::ssl_client_cert_pw, 2),
4881 SVN::Client::get_username_provider(),
4882 SVN::Client::get_ssl_server_trust_prompt_provider(
4883 \&Git::SVN::Prompt::ssl_server_trust),
4884 SVN::Client::get_username_prompt_provider(
4885 \&Git::SVN::Prompt::username, 2)
4886 ]
4887}
4888
cfbe7ab3
EW		 4889sub escape_uri_only {
4890 my ($uri) = @_;
4891 my @tmp;
4892 foreach (split m{/}, $uri) {
6a004d3f 4893 s/([^~\w.%+-]|%(?![a-fA-F0-9]{2}))/sprintf("%%%02X",ord($1))/eg;
cfbe7ab3
EW		 4894 push @tmp, $_;
4895 }
4896 join('/', @tmp);
4897}
4898
4899sub escape_url {
4900 my ($url) = @_;
4901 if ($url =~ m#^(https?)://([^/]+)(.*)$#) {
4902 my ($scheme, $domain, $uri) = ($1, $2, escape_uri_only($3));
4903 $url = "$scheme://$domain$uri";
4904 }
4905 $url;
4906}
4907
d81bf827
EW		 4908sub new {
4909 my ($class, $url) = @_;
f6f09876 4910 $url =~ s!/+$!!;
5d3b7cd5 4911 return $RA if ($RA && $RA->{url} eq $url);
f6f09876 4912
d32fad2b 4913 ::_req_svn();
4914
d81bf827 4915 SVN::_Core::svn_config_ensure($config_dir, undef);
9ff74e95 4916 my ($baton, $callbacks) = SVN::Core::auth_open_helper(_auth_providers);
d81bf827 4917 my $config = SVN::Core::config_get_config($config_dir);
7730fbe6 4918 $RA = undef;
602015e0
ER		 4919 my $dont_store_passwords = 1;
4920 my $conf_t = ${$config}{'config'};
4921 {
fd499bcc 4922 no warnings 'once';
602015e0
ER		 4923 # The usage of $SVN::_Core::SVN_CONFIG_* variables
4924 # produces warnings that variables are used only once.
4925 # I had not found the better way to shut them up, so
fd499bcc 4926 # the warnings of type 'once' are disabled in this block.
602015e0
ER		 4927 if (SVN::_Core::svn_config_get_bool($conf_t,
4928 $SVN::_Core::SVN_CONFIG_SECTION_AUTH,
4929 $SVN::_Core::SVN_CONFIG_OPTION_STORE_PASSWORDS,
4930 1) == 0) {
4931 SVN::_Core::svn_auth_set_parameter($baton,
4932 $SVN::_Core::SVN_AUTH_PARAM_DONT_STORE_PASSWORDS,
4933 bless (\$dont_store_passwords, "_p_void"));
4934 }
4935 if (SVN::_Core::svn_config_get_bool($conf_t,
4936 $SVN::_Core::SVN_CONFIG_SECTION_AUTH,
4937 $SVN::_Core::SVN_CONFIG_OPTION_STORE_AUTH_CREDS,
4938 1) == 0) {
4939 $Git::SVN::Prompt::_no_auth_cache = 1;
4940 }
fd499bcc 4941 } # no warnings 'once'
cfbe7ab3 4942 my $self = SVN::Ra->new(url => escape_url($url), auth => $baton,
d81bf827
EW		 4943 config => $config,
4944 pool => SVN::Pool->new,
4945 auth_provider_callbacks => $callbacks);
cfbe7ab3 4946 $self->{url} = $url;
d81bf827
EW		 4947 $self->{svn_path} = $url;
4948 $self->{repos_root} = $self->get_repos_root;
4e9f6cc7 4949 $self->{svn_path} =~ s#^\Q$self->{repos_root}\E(/|$)##;
0dc03d6a
EW		 4950 $self->{cache} = { check_path => { r => 0, data => {} },
4951 get_dir => { r => 0, data => {} } };
5d3b7cd5 4952 $RA = bless $self, $class;
d81bf827
EW		 4953}
4954
0dc03d6a
EW		 4955sub check_path {
4956 my ($self, $path, $r) = @_;
4957 my $cache = $self->{cache}->{check_path};
4958 if ($r == $cache->{r} && exists $cache->{data}->{$path}) {
4959 return $cache->{data}->{$path};
4960 }
4961 my $pool = SVN::Pool->new;
4962 my $t = $self->SUPER::check_path($path, $r, $pool);
4963 $pool->clear;
4964 if ($r != $cache->{r}) {
4965 %{$cache->{data}} = ();
4966 $cache->{r} = $r;
4967 }
4968 $cache->{data}->{$path} = $t;
4969}
4970
4971sub get_dir {
4972 my ($self, $dir, $r) = @_;
4973 my $cache = $self->{cache}->{get_dir};
4974 if ($r == $cache->{r}) {
4975 if (my $x = $cache->{data}->{$dir}) {
4976 return wantarray ? @$x : $x->[0];
4977 }
4978 }
4979 my $pool = SVN::Pool->new;
4980 my ($d, undef, $props) = $self->SUPER::get_dir($dir, $r, $pool);
4981 my %dirents = map { $_ => { kind => $d->{$_}->kind } } keys %$d;
4982 $pool->clear;
4983 if ($r != $cache->{r}) {
4984 %{$cache->{data}} = ();
4985 $cache->{r} = $r;
4986 }
4987 $cache->{data}->{$dir} = [ \%dirents, $r, $props ];
4988 wantarray ? (\%dirents, $r, $props) : \%dirents;
4989}
4990
d81bf827 4991sub DESTROY {
5d3b7cd5 4992 # do not call the real DESTROY since we store ourselves in $RA
d81bf827
EW		 4993}
4994
1ef626b4
EW		 4995# get_log(paths, start, end, limit,
4996# discover_changed_paths, strict_node_history, receiver)
d81bf827
EW		 4997sub get_log {
4998 my ($self, @args) = @_;
4999 my $pool = SVN::Pool->new;
1ef626b4 5000
3c49a035
MN		 5001 # svn_log_changed_path_t objects passed to get_log are likely to be
5002 # overwritten even if only the refs are copied to an external variable,
5003 # so we should dup the structures in their entirety. Using an
5004 # externally passed pool (instead of our temporary and quickly cleared
5005 # pool in Git::SVN::Ra) does not help matters at all...
5006 my $receiver = pop @args;
0b2af457
MN		 5007 my $prefix = "/".$self->{svn_path};
5008 $prefix =~ s#/+($)##;
5009 my $prefix_regex = qr#^\Q$prefix\E#;
3c49a035
MN		 5010 push(@args, sub {
5011 my ($paths) = $_[0];
5012 return &$receiver(@_) unless $paths;
5013 $_[0] = ();
5014 foreach my $p (keys %$paths) {
5015 my $i = $paths->{$p};
0b2af457
MN		 5016 # Make path relative to our url, not repos_root
5017 $p =~ s/$prefix_regex//;
5018 my %s = map { $_ => $i->$_; }
5019 qw/copyfrom_path copyfrom_rev action/;
5020 if ($s{'copyfrom_path'}) {
5021 $s{'copyfrom_path'} =~ s/$prefix_regex//;
5022 }
3c49a035
MN		 5023 $_[0]{$p} = \%s;
5024 }
5025 &$receiver(@_);
5026 });
5027
5028
1ef626b4
EW		 5029 # the limit parameter was not supported in SVN 1.1.x, so we
5030 # drop it. Therefore, the receiver callback passed to it
5031 # is made aware of this limitation by being wrapped if
5032 # the limit passed to is being wrapped.
5033 if ($SVN::Core::VERSION le '1.2.0') {
5034 my $limit = splice(@args, 3, 1);
5035 if ($limit > 0) {
5036 my $receiver = pop @args;
5037 push(@args, sub { &$receiver(@_) if (--$limit >= 0) });
5038 }
5039 }
d81bf827
EW		 5040 my $ret = $self->SUPER::get_log(@args, $pool);
5041 $pool->clear;
5042 $ret;
5043}
5044
9ff74e95
SW		 5045sub trees_match {
5046 my ($self, $url1, $rev1, $url2, $rev2) = @_;
5047 my $ctx = SVN::Client->new(auth => _auth_providers);
5048 my $out = IO::File->new_tmpfile;
5049
5050 # older SVN (1.1.x) doesn't take $pool as the last parameter for
5051 # $ctx->diff(), so we'll create a default one
5052 my $pool = SVN::Pool->new_default_sub;
5053
5054 $ra_invalid = 1; # this will open a new SVN::Ra connection to $url1
5055 $ctx->diff([], $url1, $rev1, $url2, $rev2, 1, 1, 0, $out, $out);
5056 $out->flush;
5057 my $ret = (($out->stat)[7] == 0);
5058 close $out or croak $!;
5059
5060 $ret;
5061}
5062
d81bf827 5063sub get_commit_editor {
44320b9e 5064 my ($self, $log, $cb, $pool) = @_;
d81bf827 5065 my @lock = $SVN::Core::VERSION ge '1.2.0' ? (undef, 0) : ();
44320b9e 5066 $self->SUPER::get_commit_editor($log, $cb, @lock, $pool);
d81bf827
EW		 5067}
5068
d81bf827 5069sub gs_do_update {
8a603774
EW		 5070 my ($self, $rev_a, $rev_b, $gs, $editor) = @_;
5071 my $new = ($rev_a == $rev_b);
5072 my $path = $gs->{path};
5073
2e5e2480
EW		 5074 if ($new && -e $gs->{index}) {
5075 unlink $gs->{index} or die
5076 "Couldn't unlink index: $gs->{index}: $!\n";
5077 }
d81bf827 5078 my $pool = SVN::Pool->new;
8b8fc068 5079 $editor->set_path_strip($path);
2b27f6c8
EW		 5080 my (@pc) = split m#/#, $path;
5081 my $reporter = $self->do_update($rev_b, (@pc ? shift @pc : ''),
8a603774 5082 1, $editor, $pool);
d81bf827 5083 my @lock = $SVN::Core::VERSION ge '1.2.0' ? (undef) : ();
2b27f6c8
EW		 5084
5085 # Since we can't rely on svn_ra_reparent being available, we'll
5086 # just have to do some magic with set_path to make it so
5087 # we only want a partial path.
5088 my $sp = '';
5089 my $final = join('/', @pc);
5090 while (@pc) {
5091 $reporter->set_path($sp, $rev_b, 0, @lock, $pool);
5092 $sp .= '/' if length $sp;
5093 $sp .= shift @pc;
5094 }
5095 die "BUG: '$sp' != '$final'\n" if ($sp ne $final);
5096
2b27f6c8
EW		 5097 $reporter->set_path($sp, $rev_a, $new, @lock, $pool);
5098
d81bf827
EW		 5099 $reporter->finish_report($pool);
5100 $pool->clear;
5101 $editor->{git_commit_ok};
5102}
5103
2b27f6c8
EW		 5104# this requires SVN 1.4.3 or later (do_switch didn't work before 1.4.3, and
5105# svn_ra_reparent didn't work before 1.4)
d81bf827 5106sub gs_do_switch {
8a603774
EW		 5107 my ($self, $rev_a, $rev_b, $gs, $url_b, $editor) = @_;
5108 my $path = $gs->{path};
d81bf827 5109 my $pool = SVN::Pool->new;
2b27f6c8
EW		 5110
5111 my $full_url = $self->{url};
5112 my $old_url = $full_url;
2a679c7a 5113 $full_url .= '/' . $path if length $path;
5d3b7cd5 5114 my ($ra, $reparented);
ad0a82ba 5115
2a679c7a
EW		 5116 if ($old_url =~ m#^svn(\+ssh)?://# ||
5117 ($full_url =~ m#^https?://# &&
5118 escape_url($full_url) ne $full_url)) {
ad0a82ba
AB		 5119 $_[0] = undef;
5120 $self = undef;
5121 $RA = undef;
5122 $ra = Git::SVN::Ra->new($full_url);
5123 $ra_invalid = 1;
5124 } elsif ($old_url ne $full_url) {
5125 SVN::_Ra::svn_ra_reparent($self->{session}, $full_url, $pool);
5126 $self->{url} = $full_url;
5127 $reparented = 1;
5d3b7cd5 5128 }
ad0a82ba 5129
5d3b7cd5 5130 $ra ||= $self;
f4392df4 5131 $url_b = escape_url($url_b);
8a603774 5132 my $reporter = $ra->do_switch($rev_b, '', 1, $url_b, $editor, $pool);
d81bf827 5133 my @lock = $SVN::Core::VERSION ge '1.2.0' ? (undef) : ();
8b8fc068 5134 $reporter->set_path('', $rev_a, 0, @lock, $pool);
d81bf827 5135 $reporter->finish_report($pool);
2b27f6c8 5136
5d3b7cd5
EW		 5137 if ($reparented) {
5138 SVN::_Ra::svn_ra_reparent($self->{session}, $old_url, $pool);
5139 $self->{url} = $old_url;
5140 }
2b27f6c8 5141
d81bf827
EW		 5142 $pool->clear;
5143 $editor->{git_commit_ok};
5144}
5145
b54a901e
EW		 5146sub longest_common_path {
5147 my ($gsv, $globs) = @_;
d2ae1434 5148 my %common;
e518192f
EW		 5149 my $common_max = scalar @$gsv;
5150
5151 foreach my $gs (@$gsv) {
d2ae1434
EW		 5152 my @tmp = split m#/#, $gs->{path};
5153 my $p = '';
5154 foreach (@tmp) {
5155 $p .= length($p) ? "/$_" : $_;
5156 $common{$p} ||= 0;
5157 $common{$p}++;
5158 }
5159 }
e518192f
EW		 5160 $globs ||= [];
5161 $common_max += scalar @$globs;
5162 foreach my $glob (@$globs) {
5163 my @tmp = split m#/#, $glob->{path}->{left};
5164 my $p = '';
5165 foreach (@tmp) {
5166 $p .= length($p) ? "/$_" : $_;
5167 $common{$p} ||= 0;
5168 $common{$p}++;
5169 }
5170 }
5171
d2ae1434
EW		 5172 my $longest_path = '';
5173 foreach (sort {length $b <=> length $a} keys %common) {
e518192f 5174 if ($common{$_} == $common_max) {
d2ae1434
EW		 5175 $longest_path = $_;
5176 last;
5177 }
0af9c9f9 5178 }
b54a901e
EW		 5179 $longest_path;
5180}
5181
5182sub gs_fetch_loop_common {
5183 my ($self, $base, $head, $gsv, $globs) = @_;
5184 return if ($base > $head);
5185 my $inc = $_log_window_size;
5186 my ($min, $max) = ($base, $head < $base + $inc ? $head : $base + $inc);
5187 my $longest_path = longest_common_path($gsv, $globs);
a51cdb0c 5188 my $ra_url = $self->{url};
c69700fe 5189 my $find_trailing_edge;
0af9c9f9 5190 while (1) {
d4eff2bd 5191 my %revs;
d2ae1434 5192 my $err;
f7c3fc4a 5193 my $err_handler = $SVN::Error::handler;
d2ae1434
EW		 5194 $SVN::Error::handler = sub {
5195 ($err) = @_;
5196 skip_unknown_revs($err);
5197 };
5198 sub _cb {
5199 my ($paths, $r, $author, $date, $log) = @_;
3c49a035 5200 [ $paths,
d2ae1434
EW		 5201 { author => $author, date => $date, log => $log } ];
5202 }
5203 $self->get_log([$longest_path], $min, $max, 0, 1, 1,
5204 sub { $revs{$_[1]} = _cb(@_) });
99366565
DM		 5205 if ($err) {
5206 print "Checked through r$max\r";
c69700fe
AV		 5207 } else {
5208 $find_trailing_edge = 1;
99366565 5209 }
c69700fe 5210 if ($err and $find_trailing_edge) {
d2ae1434
EW		 5211 print STDERR "Path '$longest_path' ",
5212 "was probably deleted:\n",
5213 $err->expanded_message,
5214 "\nWill attempt to follow ",
5215 "revisions r$min .. r$max ",
5216 "committed before the deletion\n";
5217 my $hi = $max;
5218 while (--$hi >= $min) {
5219 my $ok;
5220 $self->get_log([$longest_path], $min, $hi,
5221 0, 1, 1, sub {
b6c61778 5222 $ok = $_[1];
d2ae1434
EW		 5223 $revs{$_[1]} = _cb(@_) });
5224 if ($ok) {
5225 print STDERR "r$min .. r$ok OK\n";
5226 last;
5227 }
5228 }
c69700fe 5229 $find_trailing_edge = 0;
d2ae1434 5230 }
d4eff2bd 5231 $SVN::Error::handler = $err_handler;
fbcc1737 5232
e518192f 5233 my %exists = map { $_->{path} => $_ } @$gsv;
d4eff2bd 5234 foreach my $r (sort {$a <=> $b} keys %revs) {
fbcc1737 5235 my ($paths, $logged) = @{$revs{$r}};
e518192f
EW		 5236
5237 foreach my $gs ($self->match_globs(\%exists, $paths,
5238 $globs, $r)) {
060610c5 5239 if ($gs->rev_map_max >= $r) {
fbcc1737
EW		 5240 next;
5241 }
5242 next unless $gs->match_paths($paths, $r);
5243 $gs->{logged_rev_props} = $logged;
e8d120bd
EW		 5244 if (my $last_commit = $gs->last_commit) {
5245 $gs->assert_index_clean($last_commit);
5246 }
fbcc1737
EW		 5247 my $log_entry = $gs->do_fetch($paths, $r);
5248 if ($log_entry) {
0af9c9f9
EW		 5249 $gs->do_git_commit($log_entry);
5250 }
321b1842 5251 $INDEX_FILES{$gs->{index}} = 1;
0af9c9f9 5252 }
e518192f 5253 foreach my $g (@$globs) {
93f2689c
EW		 5254 my $k = "svn-remote.$g->{remote}." .
5255 "$g->{t}-maxRev";
5256 Git::SVN::tmp_config($k, $r);
e518192f 5257 }
a51cdb0c
EW		 5258 if ($ra_invalid) {
5259 $_[0] = undef;
5260 $self = undef;
5261 $RA = undef;
5262 $self = Git::SVN::Ra->new($ra_url);
5263 $ra_invalid = undef;
5264 }
0af9c9f9 5265 }
9c93fee5
EW		 5266 # pre-fill the .rev_db since it'll eventually get filled in
5267 # with '0' x40 if something new gets committed
e518192f 5268 foreach my $gs (@$gsv) {
66ab84b9
EW		 5269 next if $gs->rev_map_max >= $max;
5270 next if defined $gs->rev_map_get($max);
5271 $gs->rev_map_set($max, 0 x40);
9c93fee5 5272 }
c3560e53
EW		 5273 foreach my $g (@$globs) {
5274 my $k = "svn-remote.$g->{remote}.$g->{t}-maxRev";
5275 Git::SVN::tmp_config($k, $max);
5276 }
0af9c9f9
EW		 5277 last if $max >= $head;
5278 $min = $max + 1;
5279 $max += $inc;
5280 $max = $head if ($max > $head);
5281 }
94bc914c 5282 Git::SVN::gc();
0af9c9f9
EW		 5283}
5284
570d35c2
MG		 5285sub get_dir_globbed {
5286 my ($self, $left, $depth, $r) = @_;
5287
5288 my @x = eval { $self->get_dir($left, $r) };
5289 return unless scalar @x == 3;
5290 my $dirents = $x[0];
5291 my @finalents;
5292 foreach my $de (keys %$dirents) {
5293 next if $dirents->{$de}->{kind} != $SVN::Node::dir;
5294 if ($depth > 1) {
5295 my @args = ("$left/$de", $depth - 1, $r);
5296 foreach my $dir ($self->get_dir_globbed(@args)) {
5297 push @finalents, "$de/$dir";
5298 }
5299 } else {
5300 push @finalents, $de;
5301 }
5302 }
5303 @finalents;
5304}
5305
e518192f
EW		 5306sub match_globs {
5307 my ($self, $exists, $paths, $globs, $r) = @_;
74a81227
EW		 5308
5309 sub get_dir_check {
5310 my ($self, $exists, $g, $r) = @_;
570d35c2
MG		 5311
5312 my @dirs = $self->get_dir_globbed($g->{path}->{left},
5313 $g->{path}->{depth},
5314 $r);
5315
5316 foreach my $de (@dirs) {
74a81227
EW		 5317 my $p = $g->{path}->full_path($de);
5318 next if $exists->{$p};
5319 next if (length $g->{path}->{right} &&
5320 ($self->check_path($p, $r) !=
5321 $SVN::Node::dir));
07576208 5322 next unless $p =~ /$g->{path}->{regex}/;
74a81227
EW		 5323 $exists->{$p} = Git::SVN->init($self->{url}, $p, undef,
5324 $g->{ref}->full_path($de), 1);
5325 }
5326 }
e518192f 5327 foreach my $g (@$globs) {
74a81227
EW		 5328 if (my $path = $paths->{"/$g->{path}->{left}"}) {
5329 if ($path->{action} =~ /^[AR]$/) {
5330 get_dir_check($self, $exists, $g, $r);
5331 }
5332 }
e518192f 5333 foreach (keys %$paths) {
28710f74
EW		 5334 if (/$g->{path}->{left_regex}/ &&
5335 !/$g->{path}->{regex}/) {
74a81227
EW		 5336 next if $paths->{$_}->{action} !~ /^[AR]$/;
5337 get_dir_check($self, $exists, $g, $r);
5338 }
e518192f
EW		 5339 next unless /$g->{path}->{regex}/;
5340 my $p = $1;
5341 my $pathname = $g->{path}->full_path($p);
5342 next if $exists->{$pathname};
0c1ec5a1
EW		 5343 next if ($self->check_path($pathname, $r) !=
5344 $SVN::Node::dir);
e518192f
EW		 5345 $exists->{$pathname} = Git::SVN->init(
5346 $self->{url}, $pathname, undef,
5347 $g->{ref}->full_path($p), 1);
5348 }
5349 my $c = '';
5350 foreach (split m#/#, $g->{path}->{left}) {
5351 $c .= "/$_";
5352 next unless ($paths->{$c} &&
74a81227
EW		 5353 ($paths->{$c}->{action} =~ /^[AR]$/));
5354 get_dir_check($self, $exists, $g, $r);
e518192f
EW		 5355 }
5356 }
5357 values %$exists;
5358}
5359
e6434f87
EW		 5360sub minimize_url {
5361 my ($self) = @_;
5362 return $self->{url} if ($self->{url} eq $self->{repos_root});
5363 my $url = $self->{repos_root};
5364 my @components = split(m!/!, $self->{svn_path});
5365 my $c = '';
5366 do {
5367 $url .= "/$c" if length $c;
5f8b2cba
EW		 5368 eval {
5369 my $ra = (ref $self)->new($url);
5370 my $latest = $ra->get_latest_revnum;
5371 $ra->get_log("", $latest, 0, 1, 0, 1, sub {});
5372 };
e6434f87
EW		 5373 } while ($@ && ($c = shift @components));
5374 $url;
5375}
5376
d81bf827
EW		 5377sub can_do_switch {
5378 my $self = shift;
5379 unless (defined $can_do_switch) {
5380 my $pool = SVN::Pool->new;
5381 my $rep = eval {
5382 $self->do_switch(1, '', 0, $self->{url},
5383 SVN::Delta::Editor->new, $pool);
5384 };
5385 if ($@) {
5386 $can_do_switch = 0;
5387 } else {
5388 $rep->abort_report($pool);
5389 $can_do_switch = 1;
5390 }
5391 $pool->clear;
5392 }
5393 $can_do_switch;
5394}
5395
0af9c9f9
EW		 5396sub skip_unknown_revs {
5397 my ($err) = @_;
5398 my $errno = $err->apr_err();
5399 # Maybe the branch we're tracking didn't
5400 # exist when the repo started, so it's
5401 # not an error if it doesn't, just continue
5402 #
5403 # Wonderfully consistent library, eh?
5404 # 160013 - svn:// and file://
5405 # 175002 - http(s)://
5406 # 175007 - http(s):// (this repo required authorization, too...)
5407 # More codes may be discovered later...
5408 if ($errno == 175007 || $errno == 175002 || $errno == 160013) {
a6a15a99
EW		 5409 my $err_key = $err->expanded_message;
5410 # revision numbers change every time, filter them out
5411 $err_key =~ s/\d+/\0/g;
5412 $err_key = "$errno\0$err_key";
5413 unless ($ignored_err{$err_key}) {
5414 warn "W: Ignoring error from SVN, path probably ",
5415 "does not exist: ($errno): ",
5416 $err->expanded_message,"\n";
eee8a174
EW		 5417 warn "W: Do not be alarmed at the above message ",
5418 "git-svn is just searching aggressively for ",
5419 "old history.\n",
5420 "This may take a while on large repositories\n";
a6a15a99
EW		 5421 $ignored_err{$err_key} = 1;
5422 }
0af9c9f9
EW		 5423 return;
5424 }
5425 die "Error from SVN, ($errno): ", $err->expanded_message,"\n";
5426}
5427
f8c9d1d2
EW		 5428package Git::SVN::Log;
5429use strict;
5430use warnings;
5431use POSIX qw/strftime/;
e8717841 5432use Time::Local;
111947ef 5433use constant commit_log_separator => ('-' x 72) . "\n";
f8c9d1d2
EW		 5434use vars qw/$TZ $limit $color $pager $non_recursive $verbose $oneline
5435 %rusers $show_commit $incremental/;
5436my $l_fmt;
5437
5438sub cmt_showable {
5439 my ($c) = @_;
5440 return 1 if defined $c->{r};
c16d0871
EW		 5441
5442 # big commit message got truncated by the 16k pretty buffer in rev-list
f8c9d1d2
EW		 5443 if ($c->{l} && $c->{l}->[-1] eq "...\n" &&
5444 $c->{a_raw} =~ /\@([a-f\d\-]+)>$/) {
c16d0871 5445 @{$c->{l}} = ();
44320b9e 5446 my @log = command(qw/cat-file commit/, $c->{c});
c16d0871
EW		 5447
5448 # shift off the headers
5449 shift @log while ($log[0] ne '');
44320b9e 5450 shift @log;
c16d0871
EW		 5451
5452 # TODO: make $c->{l} not have a trailing newline in the future
5453 @{$c->{l}} = map { "$_\n" } grep !/^git-svn-id: /, @log;
f8c9d1d2
EW		 5454
5455 (undef, $c->{r}, undef) = ::extract_metadata(
44320b9e 5456 (grep(/^git-svn-id: /, @log))[-1]);
f8c9d1d2
EW		 5457 }
5458 return defined $c->{r};
5459}
5460
5461sub log_use_color {
cd459e3f 5462 return $color || Git->repository->get_colorbool('color.diff');
f8c9d1d2
EW		 5463}
5464
5465sub git_svn_log_cmd {
3bc718ba
EW		 5466 my ($r_min, $r_max, @args) = @_;
5467 my $head = 'HEAD';
6ed77266 5468 my (@files, @log_opts);
3bc718ba 5469 foreach my $x (@args) {
6ed77266
EW		 5470 if ($x eq '--' || @files) {
5471 push @files, $x;
5472 } else {
5473 if (::verify_ref("$x^0")) {
5474 $head = $x;
5475 } else {
5476 push @log_opts, $x;
5477 }
5478 }
3bc718ba
EW		 5479 }
5480
13c823fb
EW		 5481 my ($url, $rev, $uuid, $gs) = ::working_head_info($head);
5482 $gs ||= Git::SVN->_new;
f8c9d1d2
EW		 5483 my @cmd = (qw/log --abbrev-commit --pretty=raw --default/,
5484 $gs->refname);
5485 push @cmd, '-r' unless $non_recursive;
5486 push @cmd, qw/--raw --name-status/ if $verbose;
5487 push @cmd, '--color' if log_use_color();
6ed77266
EW		 5488 push @cmd, @log_opts;
5489 if (defined $r_max && $r_max == $r_min) {
f8c9d1d2 5490 push @cmd, '--max-count=1';
060610c5 5491 if (my $c = $gs->rev_map_get($r_max)) {
f8c9d1d2
EW		 5492 push @cmd, $c;
5493 }
6ed77266 5494 } elsif (defined $r_max) {
111947ef
DK		 5495 if ($r_max < $r_min) {
5496 ($r_min, $r_max) = ($r_max, $r_min);
5497 }
5498 my (undef, $c_max) = $gs->find_rev_before($r_max, 1, $r_min);
5499 my (undef, $c_min) = $gs->find_rev_after($r_min, 1, $r_max);
5500 # If there are no commits in the range, both $c_max and $c_min
5501 # will be undefined. If there is at least 1 commit in the
5502 # range, both will be defined.
5503 return () if !defined $c_min || !defined $c_max;
5504 if ($c_min eq $c_max) {
5505 push @cmd, '--max-count=1', $c_min;
f8c9d1d2 5506 } else {
111947ef 5507 push @cmd, '--boundary', "$c_min..$c_max";
f8c9d1d2
EW		 5508 }
5509 }
6ed77266 5510 return (@cmd, @files);
f8c9d1d2
EW		 5511}
5512
5513# adapted from pager.c
5514sub config_pager {
190c1cda
JN		 5515 if (! -t *STDOUT) {
5516 $ENV{GIT_PAGER_IN_USE} = 'false';
5517 $pager = undef;
5518 return;
5519 }
5520 chomp($pager = command_oneline(qw(var GIT_PAGER)));
dec543e6 5521 if ($pager eq 'cat') {
f8c9d1d2
EW		 5522 $pager = undef;
5523 }
cd459e3f 5524 $ENV{GIT_PAGER_IN_USE} = defined($pager);
f8c9d1d2
EW		 5525}
5526
5527sub run_pager {
190c1cda 5528 return unless defined $pager;
971e6283 5529 pipe my ($rfd, $wfd) or return;
207f1a75 5530 defined(my $pid = fork) or ::fatal "Can't fork: $!";
f8c9d1d2
EW		 5531 if (!$pid) {
5532 open STDOUT, '>&', $wfd or
207f1a75 5533 ::fatal "Can't redirect to stdout: $!";
f8c9d1d2
EW		 5534 return;
5535 }
207f1a75 5536 open STDIN, '<&', $rfd or ::fatal "Can't redirect stdin: $!";
f8c9d1d2 5537 $ENV{LESS} ||= 'FRSX';
207f1a75 5538 exec $pager or ::fatal "Can't run pager: $! ($pager)";
f8c9d1d2
EW		 5539}
5540
b2b3ada7 5541sub format_svn_date {
e8717841 5542 # some systmes don't handle or mishandle %z, so be creative.
736e619a 5543 my $t = shift || time;
e8717841
BW		 5544 my $gm = timelocal(gmtime($t));
5545 my $sign = qw( + + - )[ $t <=> $gm ];
5546 my $gmoff = sprintf("%s%02d%02d", $sign, (gmtime(abs($t - $gm)))[2,1]);
5547 return strftime("%Y-%m-%d %H:%M:%S $gmoff (%a, %d %b %Y)", localtime($t));
b2b3ada7
DK		 5548}
5549
5550sub parse_git_date {
5551 my ($t, $tz) = @_;
5552 # Date::Parse isn't in the standard Perl distro :(
5553 if ($tz =~ s/^\+//) {
5554 $t += tz_to_s_offset($tz);
5555 } elsif ($tz =~ s/^\-//) {
5556 $t -= tz_to_s_offset($tz);
5557 }
5558 return $t;
5559}
5560
5561sub set_local_timezone {
5562 if (defined $TZ) {
5563 $ENV{TZ} = $TZ;
5564 } else {
5565 delete $ENV{TZ};
5566 }
5567}
5568
21819a37
EW		 5569sub tz_to_s_offset {
5570 my ($tz) = @_;
5571 $tz =~ s/(\d\d)$//;
5572 return ($1 * 60) + ($tz * 3600);
5573}
5574
f8c9d1d2
EW		 5575sub get_author_info {
5576 my ($dest, $author, $t, $tz) = @_;
5577 $author =~ s/(?:^\s*|\s*$)//g;
5578 $dest->{a_raw} = $author;
5579 my $au;
1c8443b0 5580 if ($::_authors) {
f8c9d1d2
EW		 5581 $au = $rusers{$author} || undef;
5582 }
5583 if (!$au) {
5584 ($au) = ($author =~ /<([^>]+)\@[^>]+>$/);
5585 }
5586 $dest->{t} = $t;
5587 $dest->{tz} = $tz;
5588 $dest->{a} = $au;
b2b3ada7 5589 $dest->{t_utc} = parse_git_date($t, $tz);
f8c9d1d2
EW		 5590}
5591
5592sub process_commit {
5593 my ($c, $r_min, $r_max, $defer) = @_;
5594 if (defined $r_min && defined $r_max) {
5595 if ($r_min == $c->{r} && $r_min == $r_max) {
5596 show_commit($c);
5597 return 0;
5598 }
5599 return 1 if $r_min == $r_max;
5600 if ($r_min < $r_max) {
5601 # we need to reverse the print order
5602 return 0 if (defined $limit && --$limit < 0);
5603 push @$defer, $c;
5604 return 1;
5605 }
5606 if ($r_min != $r_max) {
5607 return 1 if ($r_min < $c->{r});
5608 return 1 if ($r_max > $c->{r});
5609 }
5610 }
5611 return 0 if (defined $limit && --$limit < 0);
5612 show_commit($c);
5613 return 1;
5614}
5615
5616sub show_commit {
5617 my $c = shift;
5618 if ($oneline) {
5619 my $x = "\n";
5620 if (my $l = $c->{l}) {
5621 while ($l->[0] =~ /^\s*$/) { shift @$l }
5622 $x = $l->[0];
5623 }
5624 $l_fmt ||= 'A' . length($c->{r});
5625 print 'r',pack($l_fmt, $c->{r}),' | ';
5626 print "$c->{c} | " if $show_commit;
5627 print $x;
5628 } else {
5629 show_commit_normal($c);
5630 }
5631}
5632
5633sub show_commit_changed_paths {
5634 my ($c) = @_;
5635 return unless $c->{changed};
5636 print "Changed paths:\n", @{$c->{changed}};
5637}
5638
5639sub show_commit_normal {
5640 my ($c) = @_;
111947ef 5641 print commit_log_separator, "r$c->{r} | ";
f8c9d1d2 5642 print "$c->{c} | " if $show_commit;
b2b3ada7 5643 print "$c->{a} | ", format_svn_date($c->{t_utc}), ' | ';
f8c9d1d2
EW		 5644 my $nr_line = 0;
5645
5646 if (my $l = $c->{l}) {
5647 while ($l->[$#$l] eq "\n" && $#$l > 0
5648 && $l->[($#$l - 1)] eq "\n") {
5649 pop @$l;
5650 }
5651 $nr_line = scalar @$l;
5652 if (!$nr_line) {
5653 print "1 line\n\n\n";
5654 } else {
5655 if ($nr_line == 1) {
5656 $nr_line = '1 line';
5657 } else {
5658 $nr_line .= ' lines';
5659 }
5660 print $nr_line, "\n";
5661 show_commit_changed_paths($c);
5662 print "\n";
5663 print $_ foreach @$l;
5664 }
5665 } else {
5666 print "1 line\n";
5667 show_commit_changed_paths($c);
5668 print "\n";
5669
5670 }
488a63ec 5671 foreach my $x (qw/raw stat diff/) {
f8c9d1d2
EW		 5672 if ($c->{$x}) {
5673 print "\n";
5674 print $_ foreach @{$c->{$x}}
5675 }
5676 }
5677}
5678
5679sub cmd_show_log {
5680 my (@args) = @_;
5681 my ($r_min, $r_max);
5682 my $r_last = -1; # prevent dupes
b2b3ada7 5683 set_local_timezone();
f8c9d1d2
EW		 5684 if (defined $::_revision) {
5685 if ($::_revision =~ /^(\d+):(\d+)$/) {
5686 ($r_min, $r_max) = ($1, $2);
5687 } elsif ($::_revision =~ /^\d+$/) {
5688 $r_min = $r_max = $::_revision;
5689 } else {
5690 ::fatal "-r$::_revision is not supported, use ",
207f1a75 5691 "standard 'git log' arguments instead";
f8c9d1d2
EW		 5692 }
5693 }
5694
5695 config_pager();
6ed77266 5696 @args = git_svn_log_cmd($r_min, $r_max, @args);
111947ef
DK		 5697 if (!@args) {
5698 print commit_log_separator unless $incremental || $oneline;
5699 return;
5700 }
f8c9d1d2
EW		 5701 my $log = command_output_pipe(@args);
5702 run_pager();
488a63ec 5703 my (@k, $c, $d, $stat);
f8c9d1d2
EW		 5704 my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/;
5705 while (<$log>) {
60f3ff12 5706 if (/^${esc_color}commit -?($::sha1_short)/o) {
f8c9d1d2
EW		 5707 my $cmt = $1;
5708 if ($c && cmt_showable($c) && $c->{r} != $r_last) {
5709 $r_last = $c->{r};
5710 process_commit($c, $r_min, $r_max, \@k) or
5711 goto out;
5712 }
5713 $d = undef;
5714 $c = { c => $cmt };
5715 } elsif (/^${esc_color}author (.+) (\d+) ([\-\+]?\d+)$/o) {
5716 get_author_info($c, $1, $2, $3);
5717 } elsif (/^${esc_color}(?:tree|parent|committer) /o) {
5718 # ignore
5719 } elsif (/^${esc_color}:\d{6} \d{6} $::sha1_short/o) {
5720 push @{$c->{raw}}, $_;
5721 } elsif (/^${esc_color}[ACRMDT]\t/) {
5722 # we could add $SVN->{svn_path} here, but that requires
5723 # remote access at the moment (repo_path_split)...
5724 s#^(${esc_color})([ACRMDT])\t#$1 $2 #o;
5725 push @{$c->{changed}}, $_;
5726 } elsif (/^${esc_color}diff /o) {
5727 $d = 1;
5728 push @{$c->{diff}}, $_;
5729 } elsif ($d) {
5730 push @{$c->{diff}}, $_;
488a63ec
EW		 5731 } elsif (/^\ .+\ \|\s*\d+\ $esc_color[\+\-]*
5732 $esc_color*[\+\-]*$esc_color$/x) {
5733 $stat = 1;
5734 push @{$c->{stat}}, $_;
5735 } elsif ($stat && /^ \d+ files changed, \d+ insertions/) {
5736 push @{$c->{stat}}, $_;
5737 $stat = undef;
f8c9d1d2
EW		 5738 } elsif (/^${esc_color} (git-svn-id:.+)$/o) {
5739 ($c->{url}, $c->{r}, undef) = ::extract_metadata($1);
5740 } elsif (s/^${esc_color} //o) {
5741 push @{$c->{l}}, $_;
5742 }
5743 }
5744 if ($c && defined $c->{r} && $c->{r} != $r_last) {
5745 $r_last = $c->{r};
5746 process_commit($c, $r_min, $r_max, \@k);
5747 }
5748 if (@k) {
111947ef 5749 ($r_min, $r_max) = ($r_max, $r_min);
f8c9d1d2
EW		 5750 process_commit($_, $r_min, $r_max) foreach reverse @k;
5751 }
5752out:
c843c464 5753 close $log;
111947ef 5754 print commit_log_separator unless $incremental || $oneline;
f8c9d1d2
EW		 5755}
5756
6fb5375e 5757sub cmd_blame {
4be40381 5758 my $path = pop;
6fb5375e
TS		 5759
5760 config_pager();
5761 run_pager();
5762
4be40381
SG		 5763 my ($fh, $ctx, $rev);
5764
5765 if ($_git_format) {
5766 ($fh, $ctx) = command_output_pipe('blame', @_, $path);
5767 while (my $line = <$fh>) {
5768 if ($line =~ /^\^?([[:xdigit:]]+)\s/) {
5769 # Uncommitted edits show up as a rev ID of
5770 # all zeros, which we can't look up with
5771 # cmt_metadata
5772 if ($1 !~ /^0+$/) {
5773 (undef, $rev, undef) =
5774 ::cmt_metadata($1);
5775 $rev = '0' if (!$rev);
5776 } else {
5777 $rev = '0';
5778 }
5779 $rev = sprintf('%-10s', $rev);
5780 $line =~ s/^\^?[[:xdigit:]]+(\s)/$rev$1/;
5781 }
5782 print $line;
5783 }
5784 } else {
5785 ($fh, $ctx) = command_output_pipe('blame', '-p', @_, 'HEAD',
5786 '--', $path);
5787 my ($sha1);
5788 my %authors;
6ea42032
BB		 5789 my @buffer;
5790 my %dsha; #distinct sha keys
5791
4be40381 5792 while (my $line = <$fh>) {
6ea42032
BB		 5793 push @buffer, $line;
5794 if ($line =~ /^([[:xdigit:]]{40})\s\d+\s\d+/) {
5795 $dsha{$1} = 1;
5796 }
5797 }
5798
5799 my $s2r = ::cmt_sha2rev_batch([keys %dsha]);
5800
5801 foreach my $line (@buffer) {
4be40381 5802 if ($line =~ /^([[:xdigit:]]{40})\s\d+\s\d+/) {
6ea42032
BB		 5803 $rev = $s2r->{$1};
5804 $rev = '0' if (!$rev)
4be40381
SG		 5805 }
5806 elsif ($line =~ /^author (.*)/) {
5807 $authors{$rev} = $1;
5808 $authors{$rev} =~ s/\s/_/g;
5809 }
5810 elsif ($line =~ /^\t(.*)$/) {
5811 printf("%6s %10s %s\n", $rev, $authors{$rev}, $1);
5812 }
6fb5375e 5813 }
6fb5375e
TS		 5814 }
5815 command_close_pipe($fh, $ctx);
5816}
5817
706587fc
EW		 5818package Git::SVN::Migration;
5819# these version numbers do NOT correspond to actual version numbers
5820# of git nor git-svn. They are just relative.
5821#
5822# v0 layout: .git/$id/info/url, refs/heads/$id-HEAD
5823#
5824# v1 layout: .git/$id/info/url, refs/remotes/$id
5825#
5826# v2 layout: .git/svn/$id/info/url, refs/remotes/$id
5827#
5828# v3 layout: .git/svn/$id, refs/remotes/$id
5829# - info/url may remain for backwards compatibility
5830# - this is what we migrate up to this layout automatically,
5831# - this will be used by git svn init on single branches
26a62d57
EW		 5832# v3.1 layout (auto migrated):
5833# - .rev_db => .rev_db.$UUID, .rev_db will remain as a symlink
5834# for backwards compatibility
706587fc
EW		 5835#
5836# v4 layout: .git/svn/$repo_id/$id, refs/remotes/$repo_id/$id
5837# - this is only created for newly multi-init-ed
5838# repositories. Similar in spirit to the
5839# --use-separate-remotes option in git-clone (now default)
5840# - we do not automatically migrate to this (following
5841# the example set by core git)
060610c5
EW		 5842#
5843# v5 layout: .rev_db.$UUID => .rev_map.$UUID
5844# - newer, more-efficient format that uses 24-bytes per record
5845# with no filler space.
5846# - use xxd -c24 < .rev_map.$UUID to view and debug
5847# - This is a one-way migration, repositories updated to the
5848# new format will not be able to use old git-svn without
5849# rebuilding the .rev_db. Rebuilding the rev_db is not
5850# possible if noMetadata or useSvmProps are set; but should
5851# be no problem for users that use the (sensible) defaults.
706587fc
EW		 5852use strict;
5853use warnings;
5854use Carp qw/croak/;
5855use File::Path qw/mkpath/;
47e39c55
EW		 5856use File::Basename qw/dirname basename/;
5857use vars qw/$_minimize/;
706587fc
EW		 5858
5859sub migrate_from_v0 {
5860 my $git_dir = $ENV{GIT_DIR};
5861 return undef unless -d $git_dir;
5862 my ($fh, $ctx) = command_output_pipe(qw/rev-parse --symbolic --all/);
5863 my $migrated = 0;
5864 while (<$fh>) {
5865 chomp;
5866 my ($id, $orig_ref) = ($_, $_);
5867 next unless $id =~ s#^refs/heads/(.+)-HEAD$#$1#;
5868 next unless -f "$git_dir/$id/info/url";
5869 my $new_ref = "refs/remotes/$id";
5870 if (::verify_ref("$new_ref^0")) {
5871 print STDERR "W: $orig_ref is probably an old ",
5872 "branch used by an ancient version of ",
5873 "git-svn.\n",
5874 "However, $new_ref also exists.\n",
5875 "We will not be able ",
5876 "to use this branch until this ",
5877 "ambiguity is resolved.\n";
5878 next;
5879 }
5880 print STDERR "Migrating from v0 layout...\n" if !$migrated;
5881 print STDERR "Renaming ref: $orig_ref => $new_ref\n";
5882 command_noisy('update-ref', $new_ref, $orig_ref);
5883 command_noisy('update-ref', '-d', $orig_ref, $orig_ref);
5884 $migrated++;
5885 }
5886 command_close_pipe($fh, $ctx);
5887 print STDERR "Done migrating from v0 layout...\n" if $migrated;
5888 $migrated;
5889}
5890
5891sub migrate_from_v1 {
5892 my $git_dir = $ENV{GIT_DIR};
5893 my $migrated = 0;
5894 return $migrated unless -d $git_dir;
5895 my $svn_dir = "$git_dir/svn";
5896
5897 # just in case somebody used 'svn' as their $id at some point...
5898 return $migrated if -d $svn_dir && ! -f "$svn_dir/info/url";
5899
5900 print STDERR "Migrating from a git-svn v1 layout...\n";
5901 mkpath([$svn_dir]);
5902 print STDERR "Data from a previous version of git-svn exists, but\n\t",
5903 "$svn_dir\n\t(required for this version ",
8f510bef 5904 "($::VERSION) of git-svn) does not exist.\n";
706587fc
EW		 5905 my ($fh, $ctx) = command_output_pipe(qw/rev-parse --symbolic --all/);
5906 while (<$fh>) {
5907 my $x = $_;
5908 next unless $x =~ s#^refs/remotes/##;
5909 chomp $x;
5910 next unless -f "$git_dir/$x/info/url";
5911 my $u = eval { ::file_to_s("$git_dir/$x/info/url") };
5912 next unless $u;
5913 my $dn = dirname("$git_dir/svn/$x");
5914 mkpath([$dn]) unless -d $dn;
5915 if ($x eq 'svn') { # they used 'svn' as GIT_SVN_ID:
5916 mkpath(["$git_dir/svn/svn"]);
5917 print STDERR " - $git_dir/$x/info => ",
5918 "$git_dir/svn/$x/info\n";
5919 rename "$git_dir/$x/info", "$git_dir/svn/$x/info" or
5920 croak "$!: $x";
5921 # don't worry too much about these, they probably
5922 # don't exist with repos this old (save for index,
5923 # and we can easily regenerate that)
5924 foreach my $f (qw/unhandled.log index .rev_db/) {
5925 rename "$git_dir/$x/$f", "$git_dir/svn/$x/$f";
5926 }
5927 } else {
5928 print STDERR " - $git_dir/$x => $git_dir/svn/$x\n";
5929 rename "$git_dir/$x", "$git_dir/svn/$x" or
5930 croak "$!: $x";
5931 }
5932 $migrated++;
5933 }
5934 command_close_pipe($fh, $ctx);
5935 print STDERR "Done migrating from a git-svn v1 layout\n";
5936 $migrated;
5937}
5938
5939sub read_old_urls {
5940 my ($l_map, $pfx, $path) = @_;
5941 my @dir;
5942 foreach (<$path/*>) {
5943 if (-r "$_/info/url") {
5944 $pfx .= '/' if $pfx && $pfx !~ m!/$!;
5945 my $ref_id = $pfx . basename $_;
5946 my $url = ::file_to_s("$_/info/url");
5947 $l_map->{$ref_id} = $url;
5948 } elsif (-d $_) {
5949 push @dir, $_;
5950 }
5951 }
5952 foreach (@dir) {
5953 my $x = $_;
5954 $x =~ s!^\Q$ENV{GIT_DIR}\E/svn/!!o;
5955 read_old_urls($l_map, $x, $_);
5956 }
5957}
5958
5959sub migrate_from_v2 {
5960 my @cfg = command(qw/config -l/);
5961 return if grep /^svn-remote\..+\.url=/, @cfg;
5962 my %l_map;
5963 read_old_urls(\%l_map, '', "$ENV{GIT_DIR}/svn");
5964 my $migrated = 0;
5965
5966 foreach my $ref_id (sort keys %l_map) {
471bc000
EW		 5967 eval { Git::SVN->init($l_map{$ref_id}, '', undef, $ref_id) };
5968 if ($@) {
5969 Git::SVN->init($l_map{$ref_id}, '', $ref_id, $ref_id);
5970 }
706587fc
EW		 5971 $migrated++;
5972 }
5973 $migrated;
5974}
5975
47e39c55
EW		 5976sub minimize_connections {
5977 my $r = Git::SVN::read_all_remotes();
5978 my $new_urls = {};
5979 my $root_repos = {};
5980 foreach my $repo_id (keys %$r) {
5981 my $url = $r->{$repo_id}->{url} or next;
5982 my $fetch = $r->{$repo_id}->{fetch} or next;
5983 my $ra = Git::SVN::Ra->new($url);
5984
5985 # skip existing cases where we already connect to the root
5986 if (($ra->{url} eq $ra->{repos_root}) ||
7829f20f 5987 ($ra->{repos_root} eq $repo_id)) {
47e39c55
EW		 5988 $root_repos->{$ra->{url}} = $repo_id;
5989 next;
5990 }
5991
5992 my $root_ra = Git::SVN::Ra->new($ra->{repos_root});
5993 my $root_path = $ra->{url};
4e9f6cc7 5994 $root_path =~ s#^\Q$ra->{repos_root}\E(/|$)##;
47e39c55
EW		 5995 foreach my $path (keys %$fetch) {
5996 my $ref_id = $fetch->{$path};
5997 my $gs = Git::SVN->new($ref_id, $repo_id, $path);
5998
5999 # make sure we can read when connecting to
6000 # a higher level of a repository
6001 my ($last_rev, undef) = $gs->last_rev_commit;
6002 if (!defined $last_rev) {
6003 $last_rev = eval {
6004 $root_ra->get_latest_revnum;
6005 };
6006 next if $@;
6007 }
6008 my $new = $root_path;
6009 $new .= length $path ? "/$path" : '';
6010 eval {
6011 $root_ra->get_log([$new], $last_rev, $last_rev,
6012 0, 0, 1, sub { });
6013 };
6014 next if $@;
6015 $new_urls->{$ra->{repos_root}}->{$new} =
6016 { ref_id => $ref_id,
6017 old_repo_id => $repo_id,
6018 old_path => $path };
6019 }
6020 }
6021
6022 my @emptied;
6023 foreach my $url (keys %$new_urls) {
6024 # see if we can re-use an existing [svn-remote "repo_id"]
6025 # instead of creating a(n ugly) new section:
7829f20f 6026 my $repo_id = $root_repos->{$url} || $url;
47e39c55
EW		 6027
6028 my $fetch = $new_urls->{$url};
6029 foreach my $path (keys %$fetch) {
6030 my $x = $fetch->{$path};
6031 Git::SVN->init($url, $path, $repo_id, $x->{ref_id});
6032 my $pfx = "svn-remote.$x->{old_repo_id}";
6033
6034 my $old_fetch = quotemeta("$x->{old_path}:".
6f5748e1 6035 "$x->{ref_id}");
8b8fc068 6036 command_noisy(qw/config --unset/,
47e39c55
EW		 6037 "$pfx.fetch", '^'. $old_fetch . '$');
6038 delete $r->{$x->{old_repo_id}}->
6039 {fetch}->{$x->{old_path}};
6040 if (!keys %{$r->{$x->{old_repo_id}}->{fetch}}) {
8b8fc068 6041 command_noisy(qw/config --unset/,
47e39c55
EW		 6042 "$pfx.url");
6043 push @emptied, $x->{old_repo_id}
6044 }
6045 }
6046 }
6047 if (@emptied) {
8befc50c 6048 my $file = $ENV{GIT_CONFIG} || "$ENV{GIT_DIR}/config";
47e39c55
EW		 6049 print STDERR <<EOF;
6050The following [svn-remote] sections in your config file ($file) are empty
6051and can be safely removed:
6052EOF
6053 print STDERR "[svn-remote \"$_\"]\n" foreach @emptied;
6054 }
6055}
6056
706587fc
EW		 6057sub migration_check {
6058 migrate_from_v0();
6059 migrate_from_v1();
6060 migrate_from_v2();
47e39c55 6061 minimize_connections() if $_minimize;
706587fc
EW		 6062}
6063
ef3cfaad
EW		 6064package Git::IndexInfo;
6065use strict;
6066use warnings;
6067use Git qw/command_input_pipe command_close_pipe/;
6068
6069sub new {
6070 my ($class) = @_;
6071 my ($gui, $ctx) = command_input_pipe(qw/update-index -z --index-info/);
6072 bless { gui => $gui, ctx => $ctx, nr => 0}, $class;
6073}
6074
6075sub remove {
6076 my ($self, $path) = @_;
6077 if (print { $self->{gui} } '0 ', 0 x 40, "\t", $path, "\0") {
6078 return ++$self->{nr};
6079 }
6080 undef;
6081}
6082
6083sub update {
6084 my ($self, $mode, $hash, $path) = @_;
6085 if (print { $self->{gui} } $mode, ' ', $hash, "\t", $path, "\0") {
6086 return ++$self->{nr};
6087 }
6088 undef;
6089}
6090
6091sub DESTROY {
6092 my ($self) = @_;
6093 command_close_pipe($self->{gui}, $self->{ctx});
6094}
6095
4bb9ed04
EW		 6096package Git::SVN::GlobSpec;
6097use strict;
6098use warnings;
6099
6100sub new {
07576208 6101 my ($class, $glob, $pattern_ok) = @_;
4bb9ed04
EW		 6102 my $re = $glob;
6103 $re =~ s!/+$!!g; # no need for trailing slashes
07576208
JS		 6104 my (@left, @right, @patterns);
6105 my $state = "left";
6106 my $die_msg = "Only one set of wildcard directories " .
6107 "(e.g. '*' or '*/*/*') is supported: '$glob'\n";
6108 for my $part (split(m|/|, $glob)) {
6109 if ($part =~ /\*/ && $part ne "*") {
6110 die "Invalid pattern in '$glob': $part\n";
6111 } elsif ($pattern_ok && $part =~ /[{}]/ &&
6112 $part !~ /^\{[^{}]+\}/) {
6113 die "Invalid pattern in '$glob': $part\n";
6114 }
6115 if ($part eq "*") {
6116 die $die_msg if $state eq "right";
6117 $state = "pattern";
6118 push(@patterns, "[^/]*");
6119 } elsif ($pattern_ok && $part =~ /^\{(.*)\}$/) {
6120 die $die_msg if $state eq "right";
6121 $state = "pattern";
6122 my $p = quotemeta($1);
6123 $p =~ s/\\,/|/g;
6124 push(@patterns, "(?:$p)");
6125 } else {
6126 if ($state eq "left") {
6127 push(@left, $part);
6128 } else {
6129 push(@right, $part);
6130 $state = "right";
6131 }
6132 }
570d35c2 6133 }
07576208 6134 my $depth = @patterns;
570d35c2 6135 if ($depth == 0) {
07576208 6136 die "One '*' is needed in glob: '$glob'\n";
4e9f6cc7 6137 }
07576208
JS		 6138 my $left = join('/', @left);
6139 my $right = join('/', @right);
6140 $re = join('/', @patterns);
6141 $re = join('\/',
6142 grep(length, quotemeta($left), "($re)", quotemeta($right)));
74a81227
EW		 6143 my $left_re = qr/^\/\Q$left\E(\/|$)/;
6144 bless { left => $left, right => $right, left_regex => $left_re,
570d35c2 6145 regex => qr/$re/, glob => $glob, depth => $depth }, $class;
4bb9ed04
EW		 6146}
6147
6148sub full_path {
6149 my ($self, $path) = @_;
6150 return (length $self->{left} ? "$self->{left}/" : '') .
6151 $path . (length $self->{right} ? "/$self->{right}" : '');
6152}
6153
3397f9df
EW		 6154__END__
6155
6156Data structures:
6157
4bb9ed04
EW		 6158
6159$remotes = { # returned by read_all_remotes()
6160 'svn' => {
6161 # svn-remote.svn.url=https://svn.musicpd.org
6162 url => 'https://svn.musicpd.org',
6163 # svn-remote.svn.fetch=mpd/trunk:trunk
6164 fetch => {
6165 'mpd/trunk' => 'trunk',
6166 },
6167 # svn-remote.svn.tags=mpd/tags/*:tags/*
6168 tags => {
6169 path => {
6170 left => 'mpd/tags',
6171 right => '',
6172 regex => qr!mpd/tags/([^/]+)$!,
6173 glob => 'tags/*',
6174 },
6175 ref => {
6176 left => 'tags',
6177 right => '',
6178 regex => qr!tags/([^/]+)$!,
6179 glob => 'tags/*',
6180 },
6181 }
6182 }
6183};
6184
44320b9e 6185$log_entry hashref as returned by libsvn_log_entry()
3397f9df 6186{
44320b9e 6187 log => 'whitespace-formatted log entry
3397f9df
EW		 6188', # trailing newline is preserved
6189 revision => '8', # integer
6190 date => '2004-02-24T17:01:44.108345Z', # commit date
6191 author => 'committer name'
6192};
6193
6e8548cc
EW		 6194
6195# this is generated by generate_diff();
3397f9df
EW		 6196@mods = array of diff-index line hashes, each element represents one line
6197 of diff-index output
6198
6199diff-index line ($m hash)
6200{
6201 mode_a => first column of diff-index output, no leading ':',
6202 mode_b => second column of diff-index output,
6203 sha1_b => sha1sum of the final blob,
ac8e0b91 6204 chg => change type [MCRADT],
3397f9df
EW		 6205 file_a => original file name of a file (iff chg is 'C' or 'R')
6206 file_b => new/current file name of a file (any chg)
6207}
6208;
a5e0cedc 6209
a00439ac
EW		 6210# retval of read_url_paths{,_all}();
6211$l_map = {
6212 # repository root url
6213 'https://svn.musicpd.org' => {
6214 # repository path # GIT_SVN_ID
6215 'mpd/trunk' => 'trunk',
6216 'mpd/tags/0.11.5' => 'tags/0.11.5',
6217 },
6218}
6219
a5e0cedc
EW		 6220Notes:
6221 I don't trust the each() function on unless I created %hash myself
6222 because the internal iterator may not have started at base.
Unnamed repository; edit this file 'description' to name the repository.