Git 1.7.7-rc1
[git/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
d48b2841 4use 5.008;
3397f9df
EW
5use warnings;
6use strict;
7use vars qw/ $AUTHOR $VERSION
ffe256f9 8 $sha1 $sha1_short $_revision $_repository
36db1edd 9 $_q $_authors $_authors_prog %users/;
3397f9df 10$AUTHOR = 'Eric Wong <normalperson@yhbt.net>';
60d02ccc 11$VERSION = '@@GIT_VERSION@@';
13ccd6d4 12
15153451
BS
13# From which subdir have we been invoked?
14my $cmd_dir_prefix = eval {
15 command_oneline([qw/rev-parse --show-prefix/], STDERR => 0)
16} || '';
17
5253dc33 18my $git_dir_user_set = 1 if defined $ENV{GIT_DIR};
706587fc 19$ENV{GIT_DIR} ||= '.git';
9fa00b65 20$Git::SVN::default_repo_id = 'svn';
8b8fc068 21$Git::SVN::default_ref_id = $ENV{GIT_SVN_ID} || 'git-svn';
6af1db44 22$Git::SVN::Ra::_log_window_size = 100;
6b48829d 23$Git::SVN::_minimize_url = 'unset';
13ccd6d4 24
f3a87d92
K
25if (! exists $ENV{SVN_SSH}) {
26 if (exists $ENV{GIT_SSH}) {
27 $ENV{SVN_SSH} = $ENV{GIT_SSH};
28 if ($^O eq 'msys') {
29 $ENV{SVN_SSH} =~ s/\\/\\\\/g;
a004fb92 30 $ENV{SVN_SSH} =~ s/(.*)/"$1"/;
f3a87d92
K
31 }
32 }
33}
34
f8c9d1d2 35$Git::SVN::Log::TZ = $ENV{TZ};
3397f9df 36$ENV{TZ} = 'UTC';
a00439ac 37$| = 1; # unbuffer STDOUT
3397f9df 38
207f1a75 39sub fatal (@) { print STDERR "@_\n"; exit 1 }
d32fad2b 40sub _req_svn {
41 require SVN::Core; # use()-ing this causes segfaults for me... *shrug*
42 require SVN::Ra;
43 require SVN::Delta;
44 if ($SVN::Core::VERSION lt '1.1.0') {
45 fatal "Need SVN::Core 1.1.0 or better (got $SVN::Core::VERSION)";
46 }
b9c85187 47}
2da9ee08 48my $can_compress = eval { require Compress::Zlib; 1};
d81bf827 49push @Git::SVN::Ra::ISA, 'SVN::Ra';
b9c85187
EW
50push @SVN::Git::Editor::ISA, 'SVN::Delta::Editor';
51push @SVN::Git::Fetcher::ISA, 'SVN::Delta::Editor';
3397f9df 52use Carp qw/croak/;
8d7c4fad 53use Digest::MD5;
3397f9df
EW
54use IO::File qw//;
55use File::Basename qw/dirname basename/;
56use File::Path qw/mkpath/;
36db1edd 57use File::Spec;
2da9ee08 58use File::Find;
512b620b 59use Getopt::Long qw/:config gnu_getopt no_ignore_case auto_abbrev/;
968bdf1f 60use IPC::Open3;
336f1714 61use Git;
f5549afd 62use Memoize; # core since 5.8.0, Jul 2002
a5e0cedc 63
336f1714 64BEGIN {
c5f71ad0
SV
65 # import functions from Git into our packages, en masse
66 no strict 'refs';
336f1714 67 foreach (qw/command command_oneline command_noisy command_output_pipe
6ea42032
BB
68 command_input_pipe command_close_pipe
69 command_bidi_pipe command_close_bidi_pipe/) {
c5f71ad0 70 for my $package ( qw(SVN::Git::Editor SVN::Git::Fetcher
8d7c4fad 71 Git::SVN::Migration Git::SVN::Log Git::SVN),
c5f71ad0
SV
72 __PACKAGE__) {
73 *{"${package}::$_"} = \&{"Git::$_"};
74 }
336f1714 75 }
f5549afd
JK
76 Memoize::memoize 'Git::config';
77 Memoize::memoize 'Git::config_bool';
336f1714
EW
78}
79
b9c85187 80my ($SVN);
83e9940a 81
f8c9d1d2
EW
82$sha1 = qr/[a-f\d]{40}/;
83$sha1_short = qr/[a-f\d]{4,40}/;
44320b9e 84my ($_stdin, $_help, $_edit,
62244069 85 $_message, $_file, $_branch_dest,
d05d72e0 86 $_template, $_shared,
c2abd83f 87 $_version, $_fetch_all, $_no_rebase, $_fetch_parent,
dee41f3e 88 $_merge, $_strategy, $_dry_run, $_local,
4be40381 89 $_prefix, $_no_checkout, $_url, $_verbose,
6abd9332 90 $_git_format, $_commit_url, $_tag, $_merge_info);
0bed5eaa 91$Git::SVN::_follow_parent = 1;
40a1530c 92$SVN::Git::Fetcher::_placeholder_filename = ".gitignore";
49750f30 93$_q ||= 0;
706587fc
EW
94my %remote_opts = ( 'username=s' => \$Git::SVN::Prompt::_username,
95 'config-dir=s' => \$Git::SVN::Ra::config_dir,
edc662f9
VS
96 'no-auth-cache' => \$Git::SVN::Prompt::_no_auth_cache,
97 'ignore-paths=s' => \$SVN::Git::Fetcher::_ignore_regex );
0bed5eaa 98my %fc_opts = ( 'follow-parent|follow!' => \$Git::SVN::_follow_parent,
dc5869c0 99 'authors-file|A=s' => \$_authors,
36db1edd 100 'authors-prog=s' => \$_authors_prog,
ecc712dd 101 'repack:i' => \$Git::SVN::_repack,
97ae0911
EW
102 'noMetadata' => \$Git::SVN::_no_metadata,
103 'useSvmProps' => \$Git::SVN::_use_svm_props,
62e349d2 104 'useSvnsyncProps' => \$Git::SVN::_use_svnsync_props,
6af1db44 105 'log-window-size=i' => \$Git::SVN::Ra::_log_window_size,
1e889ef3 106 'no-checkout' => \$_no_checkout,
49750f30 107 'quiet|q+' => \$_q,
ecc712dd
EW
108 'repack-flags|repack-args|repack-opts=s' =>
109 \$Git::SVN::_repack_flags,
70ae04e4 110 'use-log-author' => \$Git::SVN::_use_log_author,
6aa9ba14 111 'add-author-from' => \$Git::SVN::_add_author_from,
e82f0d73 112 'localtime' => \$Git::SVN::_localtime,
706587fc 113 %remote_opts );
36f5b1f0 114
62244069 115my ($_trunk, @_tags, @_branches, $_stdlayout);
0dfaf0a4 116my %icv;
dadc6d2a 117my %init_opts = ( 'template=s' => \$_template, 'shared:s' => \$_shared,
62244069
MB
118 'trunk|T=s' => \$_trunk, 'tags|t=s@' => \@_tags,
119 'branches|b=s@' => \@_branches, 'prefix=s' => \$_prefix,
8f728fb9 120 'stdlayout|s' => \$_stdlayout,
6b48829d 121 'minimize-url|m!' => \$Git::SVN::_minimize_url,
0dfaf0a4
EW
122 'no-metadata' => sub { $icv{noMetadata} = 1 },
123 'use-svm-props' => sub { $icv{useSvmProps} = 1 },
124 'use-svnsync-props' => sub { $icv{useSvnsyncProps} = 1 },
125 'rewrite-root=s' => sub { $icv{rewriteRoot} = $_[1] },
3e18ce1a 126 'rewrite-uuid=s' => sub { $icv{rewriteUUID} = $_[1] },
dadc6d2a 127 %remote_opts );
27e9fb8d 128my %cmt_opts = ( 'edit|e' => \$_edit,
24e22aa8
EW
129 'rmdir' => \$SVN::Git::Editor::_rmdir,
130 'find-copies-harder' => \$SVN::Git::Editor::_find_copies_harder,
131 'l=i' => \$SVN::Git::Editor::_rename_limit,
132 'copy-similarity|C=i'=> \$SVN::Git::Editor::_cp_similarity
27e9fb8d 133);
9d55b41a 134
3397f9df 135my %cmd = (
2a3240be 136 fetch => [ \&cmd_fetch, "Download new revisions from SVN",
e98671e5 137 { 'revision|r=s' => \$_revision,
905f8b7d 138 'fetch-all|all' => \$_fetch_all,
c2abd83f 139 'parent|p' => \$_fetch_parent,
e98671e5 140 %fc_opts } ],
0425ea90
EW
141 clone => [ \&cmd_clone, "Initialize and fetch revisions",
142 { 'revision|r=s' => \$_revision,
40a1530c
RC
143 'preserve-empty-dirs' =>
144 \$SVN::Git::Fetcher::_preserve_empty_dirs,
145 'placeholder-filename=s' =>
146 \$SVN::Git::Fetcher::_placeholder_filename,
0425ea90 147 %fc_opts, %init_opts } ],
d2866f9e 148 init => [ \&cmd_init, "Initialize a repo for tracking" .
f8ab6b73 149 " (requires URL argument)",
9d55b41a 150 \%init_opts ],
dadc6d2a
EW
151 'multi-init' => [ \&cmd_multi_init,
152 "Deprecated alias for ".
153 "'$0 init -T<trunk> -b<branches> -t<tags>'",
154 \%init_opts ],
d7ad3bed
EW
155 dcommit => [ \&cmd_dcommit,
156 'Commit several diffs to merge with upstream',
3289e86e
EW
157 { 'merge|m|M' => \$_merge,
158 'strategy|s=s' => \$_strategy,
905f8b7d 159 'verbose|v' => \$_verbose,
3289e86e 160 'dry-run|n' => \$_dry_run,
905f8b7d 161 'fetch-all|all' => \$_fetch_all,
ba24e745
EW
162 'commit-url=s' => \$_commit_url,
163 'revision|r=i' => \$_revision,
171af110 164 'no-rebase' => \$_no_rebase,
6abd9332 165 'mergeinfo=s' => \$_merge_info,
4b155223 166 %cmt_opts, %fc_opts } ],
5de70efb
FR
167 branch => [ \&cmd_branch,
168 'Create a branch in the SVN repository',
169 { 'message|m=s' => \$_message,
62244069 170 'destination|d=s' => \$_branch_dest,
5de70efb 171 'dry-run|n' => \$_dry_run,
6594f0b7
IM
172 'tag|t' => \$_tag,
173 'username=s' => \$Git::SVN::Prompt::_username,
174 'commit-url=s' => \$_commit_url } ],
5de70efb
FR
175 tag => [ sub { $_tag = 1; cmd_branch(@_) },
176 'Create a tag in the SVN repository',
177 { 'message|m=s' => \$_message,
62244069 178 'destination|d=s' => \$_branch_dest,
6594f0b7
IM
179 'dry-run|n' => \$_dry_run,
180 'username=s' => \$Git::SVN::Prompt::_username,
181 'commit-url=s' => \$_commit_url } ],
1ce255dc
EW
182 'set-tree' => [ \&cmd_set_tree,
183 "Set an SVN repository to a git tree-ish",
e84dc6df 184 { 'stdin' => \$_stdin, %cmt_opts, %fc_opts, } ],
d05ddec5
BS
185 'create-ignore' => [ \&cmd_create_ignore,
186 'Create a .gitignore per svn:ignore',
187 { 'revision|r=i' => \$_revision
188 } ],
6111b934
EW
189 'mkdirs' => [ \&cmd_mkdirs ,
190 "recreate empty directories after a checkout",
191 { 'revision|r=i' => \$_revision } ],
15153451
BS
192 'propget' => [ \&cmd_propget,
193 'Print the value of a property on a file or directory',
194 { 'revision|r=i' => \$_revision } ],
51e057cf
BS
195 'proplist' => [ \&cmd_proplist,
196 'List all properties of a file or directory',
197 { 'revision|r=i' => \$_revision } ],
5969cbe1 198 'show-ignore' => [ \&cmd_show_ignore, "Show svn:ignore listings",
4dbfe2e9 199 { 'revision|r=i' => \$_revision
05b4df31 200 } ],
2d879792
VK
201 'show-externals' => [ \&cmd_show_externals, "Show svn:externals listings",
202 { 'revision|r=i' => \$_revision
203 } ],
1c8443b0 204 'multi-fetch' => [ \&cmd_multi_fetch,
e98671e5
EW
205 "Deprecated alias for $0 fetch --all",
206 { 'revision|r=s' => \$_revision, %fc_opts } ],
706587fc
EW
207 'migrate' => [ sub { },
208 # no-op, we automatically run this anyways,
706587fc
EW
209 'Migrate configuration/metadata/layout from
210 previous versions of git-svn',
a836a0e1
EW
211 { 'minimize' => \$Git::SVN::Migration::_minimize,
212 %remote_opts } ],
f8c9d1d2
EW
213 'log' => [ \&Git::SVN::Log::cmd_show_log, 'Show commit logs',
214 { 'limit=i' => \$Git::SVN::Log::limit,
79bb8d88 215 'revision|r=s' => \$_revision,
f8c9d1d2
EW
216 'verbose|v' => \$Git::SVN::Log::verbose,
217 'incremental' => \$Git::SVN::Log::incremental,
218 'oneline' => \$Git::SVN::Log::oneline,
219 'show-commit' => \$Git::SVN::Log::show_commit,
220 'non-recursive' => \$Git::SVN::Log::non_recursive,
79bb8d88 221 'authors-file|A=s' => \$_authors,
f8c9d1d2 222 'color' => \$Git::SVN::Log::color,
4dbfe2e9 223 'pager=s' => \$Git::SVN::Log::pager
79bb8d88 224 } ],
222566e4
EW
225 'find-rev' => [ \&cmd_find_rev,
226 "Translate between SVN revision numbers and tree-ish",
4dbfe2e9 227 {} ],
905f8b7d
EW
228 'rebase' => [ \&cmd_rebase, "Fetch and rebase your working directory",
229 { 'merge|m|M' => \$_merge,
230 'verbose|v' => \$_verbose,
231 'strategy|s=s' => \$_strategy,
dee41f3e 232 'local|l' => \$_local,
905f8b7d 233 'fetch-all|all' => \$_fetch_all,
7d45e146 234 'dry-run|n' => \$_dry_run,
905f8b7d 235 %fc_opts } ],
44320b9e
EW
236 'commit-diff' => [ \&cmd_commit_diff,
237 'Commit a diff between two trees',
27e9fb8d
EW
238 { 'message|m=s' => \$_message,
239 'file|F=s' => \$_file,
45bf473a 240 'revision|r=s' => \$_revision,
27e9fb8d 241 %cmt_opts } ],
e6fefa92
DK
242 'info' => [ \&cmd_info,
243 "Show info about the latest SVN revision
244 on the current branch",
8b014d71 245 { 'url' => \$_url, } ],
6fb5375e
TS
246 'blame' => [ \&Git::SVN::Log::cmd_blame,
247 "Show what revision and author last modified each line of a file",
4be40381 248 { 'git-format' => \$_git_format } ],
195643f2
BJ
249 'reset' => [ \&cmd_reset,
250 "Undo fetches back to the specified SVN revision",
251 { 'revision|r=s' => \$_revision,
252 'parent|p' => \$_fetch_parent } ],
2da9ee08
RZ
253 'gc' => [ \&cmd_gc,
254 "Compress unhandled.log files in .git/svn and remove " .
255 "index files in .git/svn",
256 {} ],
3397f9df 257);
9d55b41a 258
3397f9df
EW
259my $cmd;
260for (my $i = 0; $i < @ARGV; $i++) {
261 if (defined $cmd{$ARGV[$i]}) {
262 $cmd = $ARGV[$i];
263 splice @ARGV, $i, 1;
264 last;
9a8c92ac
BJ
265 } elsif ($ARGV[$i] eq 'help') {
266 $cmd = $ARGV[$i+1];
267 usage(0);
3397f9df
EW
268 }
269};
270
540424b2
EW
271# make sure we're always running at the top-level working directory
272unless ($cmd && $cmd =~ /(?:clone|init|multi-init)$/) {
5253dc33
EW
273 unless (-d $ENV{GIT_DIR}) {
274 if ($git_dir_user_set) {
275 die "GIT_DIR=$ENV{GIT_DIR} explicitly set, ",
276 "but it is not a directory\n";
277 }
278 my $git_dir = delete $ENV{GIT_DIR};
fe4003f6
DM
279 my $cdup = undef;
280 git_cmd_try {
281 $cdup = command_oneline(qw/rev-parse --show-cdup/);
282 $git_dir = '.' unless ($cdup);
283 chomp $cdup if ($cdup);
284 $cdup = "." unless ($cdup && length $cdup);
285 } "Already at toplevel, but $git_dir not found\n";
5253dc33
EW
286 chdir $cdup or die "Unable to chdir up to '$cdup'\n";
287 unless (-d $git_dir) {
288 die "$git_dir still not found after going to ",
289 "'$cdup'\n";
290 }
291 $ENV{GIT_DIR} = $git_dir;
292 }
ffe256f9 293 $_repository = Git->repository(Repository => $ENV{GIT_DIR});
5253dc33 294}
f4dd334b
GH
295
296my %opts = %{$cmd{$cmd}->[2]} if (defined $cmd);
297
1a30582b 298read_git_config(\%opts);
222566e4
EW
299if ($cmd && ($cmd eq 'log' || $cmd eq 'blame')) {
300 Getopt::Long::Configure('pass_through');
301}
f4dd334b
GH
302my $rv = GetOptions(%opts, 'help|H|h' => \$_help, 'version|V' => \$_version,
303 'minimize-connections' => \$Git::SVN::Migration::_minimize,
304 'id|i=s' => \$Git::SVN::default_ref_id,
305 'svn-remote|remote|R=s' => sub {
306 $Git::SVN::no_reuse_existing = 1;
307 $Git::SVN::default_repo_id = $_[1] });
308exit 1 if (!$rv && $cmd && $cmd ne 'log');
309
310usage(0) if $_help;
311version() if $_version;
312usage(1) unless defined $cmd;
313load_authors() if $_authors;
36db1edd
ML
314if (defined $_authors_prog) {
315 $_authors_prog = "'" . File::Spec->rel2abs($_authors_prog) . "'";
316}
f4dd334b 317
0425ea90 318unless ($cmd =~ /^(?:clone|init|multi-init|commit-diff)$/) {
706587fc
EW
319 Git::SVN::Migration::migration_check();
320}
ecc712dd 321Git::SVN::init_vars();
b805b44a
EW
322eval {
323 Git::SVN::verify_remotes_sanity();
324 $cmd{$cmd}->[0]->(@ARGV);
325};
326fatal $@ if $@;
1e889ef3 327post_fetch_checkout();
3397f9df
EW
328exit 0;
329
330####################### primary functions ######################
331sub usage {
332 my $exit = shift || 0;
333 my $fd = $exit ? \*STDERR : \*STDOUT;
334 print $fd <<"";
335git-svn - bidirectional operations between a single Subversion tree and git
1b1dd23f 336Usage: git svn <command> [options] [arguments]\n
448c81b4
EW
337
338 print $fd "Available commands:\n" unless $cmd;
3397f9df
EW
339
340 foreach (sort keys %cmd) {
448c81b4 341 next if $cmd && $cmd ne $_;
a836a0e1 342 next if /^multi-/; # don't show deprecated commands
b203b769 343 print $fd ' ',pack('A17',$_),$cmd{$_}->[1],"\n";
aa807bc2 344 foreach (sort keys %{$cmd{$_}->[2]}) {
512b620b
EW
345 # mixed-case options are for .git/config only
346 next if /[A-Z]/ && /^[a-z]+$/i;
448c81b4 347 # prints out arguments as they should be passed:
b8c92cad 348 my $x = s#[:=]s$## ? '<arg>' : s#[:=]i$## ? '<num>' : '';
b203b769 349 print $fd ' ' x 21, join(', ', map { length $_ > 1 ?
448c81b4
EW
350 "--$_" : "-$_" }
351 split /\|/,$_)," $x\n";
352 }
3397f9df
EW
353 }
354 print $fd <<"";
448c81b4
EW
355\nGIT_SVN_ID may be set in the environment or via the --id/-i switch to an
356arbitrary identifier if you're tracking multiple SVN branches/repositories in
357one git repository and want to keep them separate. See git-svn(1) for more
358information.
3397f9df
EW
359
360 exit $exit;
361}
362
551ce28f 363sub version {
b0779246 364 ::_req_svn();
7d60ab2c 365 print "git-svn version $VERSION (svn $SVN::Core::VERSION)\n";
551ce28f
EW
366 exit 0;
367}
368
8164b652
EW
369sub do_git_init_db {
370 unless (-d $ENV{GIT_DIR}) {
371 my @init_db = ('init');
372 push @init_db, "--template=$_template" if defined $_template;
dadc6d2a
EW
373 if (defined $_shared) {
374 if ($_shared =~ /[a-z]/) {
375 push @init_db, "--shared=$_shared";
376 } else {
377 push @init_db, "--shared";
378 }
379 }
8164b652 380 command_noisy(@init_db);
ffe256f9 381 $_repository = Git->repository(Repository => ".git");
8164b652 382 }
0dfaf0a4
EW
383 my $set;
384 my $pfx = "svn-remote.$Git::SVN::default_repo_id";
385 foreach my $i (keys %icv) {
386 die "'$set' and '$i' cannot both be set\n" if $set;
387 next unless defined $icv{$i};
388 command_noisy('config', "$pfx.$i", $icv{$i});
389 $set = $i;
390 }
88ec2054
BJ
391 my $ignore_regex = \$SVN::Git::Fetcher::_ignore_regex;
392 command_noisy('config', "$pfx.ignore-paths", $$ignore_regex)
393 if defined $$ignore_regex;
40a1530c
RC
394
395 if (defined $SVN::Git::Fetcher::_preserve_empty_dirs) {
396 my $fname = \$SVN::Git::Fetcher::_placeholder_filename;
397 command_noisy('config', "$pfx.preserve-empty-dirs", 'true');
398 command_noisy('config', "$pfx.placeholder-filename", $$fname);
399 }
8164b652
EW
400}
401
dadc6d2a
EW
402sub init_subdir {
403 my $repo_path = shift or return;
404 mkpath([$repo_path]) unless -d $repo_path;
405 chdir $repo_path or die "Couldn't chdir to $repo_path: $!\n";
f30603fc 406 $ENV{GIT_DIR} = '.git';
ffe256f9 407 $_repository = Git->repository(Repository => $ENV{GIT_DIR});
dadc6d2a
EW
408}
409
0425ea90
EW
410sub cmd_clone {
411 my ($url, $path) = @_;
412 if (!defined $path &&
62244069 413 (defined $_trunk || @_branches || @_tags ||
8f728fb9 414 defined $_stdlayout) &&
0425ea90
EW
415 $url !~ m#^[a-z\+]+://#) {
416 $path = $url;
417 }
0425ea90 418 $path = basename($url) if !defined $path || !length $path;
2bc35dcb 419 my $authors_absolute = $_authors ? File::Spec->rel2abs($_authors) : "";
f30603fc 420 cmd_init($url, $path);
2bc35dcb
AV
421 command_oneline('config', 'svn.authorsfile', $authors_absolute)
422 if $_authors;
f5841509 423 Git::SVN::fetch_all($Git::SVN::default_repo_id);
0425ea90
EW
424}
425
d2866f9e 426sub cmd_init {
8f728fb9 427 if (defined $_stdlayout) {
428 $_trunk = 'trunk' if (!defined $_trunk);
62244069
MB
429 @_tags = 'tags' if (! @_tags);
430 @_branches = 'branches' if (! @_branches);
8f728fb9 431 }
62244069 432 if (defined $_trunk || @_branches || @_tags) {
dadc6d2a 433 return cmd_multi_init(@_);
03e0ea87 434 }
dadc6d2a
EW
435 my $url = shift or die "SVN repository location required ",
436 "as a command-line argument\n";
50ff2366 437 $url = canonicalize_url($url);
dadc6d2a 438 init_subdir(@_);
8164b652 439 do_git_init_db();
03e0ea87 440
6b48829d
EW
441 if ($Git::SVN::_minimize_url eq 'unset') {
442 $Git::SVN::_minimize_url = 0;
443 }
444
706587fc 445 Git::SVN->init($url);
3397f9df
EW
446}
447
2a3240be 448sub cmd_fetch {
e98671e5
EW
449 if (grep /^\d+=./, @_) {
450 die "'<rev>=<commit>' fetch arguments are ",
451 "no longer supported.\n";
07a1c950 452 }
e98671e5
EW
453 my ($remote) = @_;
454 if (@_ > 1) {
c2abd83f 455 die "Usage: $0 fetch [--all] [--parent] [svn-remote]\n";
e98671e5 456 }
4d0157d6 457 $Git::SVN::no_reuse_existing = undef;
c2abd83f
JM
458 if ($_fetch_parent) {
459 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
460 unless ($gs) {
461 die "Unable to determine upstream SVN information from ",
462 "working tree history\n";
463 }
464 # just fetch, don't checkout.
465 $_no_checkout = 'true';
466 $_fetch_all ? $gs->fetch_all : $gs->fetch;
467 } elsif ($_fetch_all) {
e98671e5
EW
468 cmd_multi_fetch();
469 } else {
c2abd83f 470 $remote ||= $Git::SVN::default_repo_id;
e98671e5 471 Git::SVN::fetch_all($remote, Git::SVN::read_all_remotes());
1c8443b0 472 }
2a3240be
EW
473}
474
1ce255dc 475sub cmd_set_tree {
3397f9df
EW
476 my (@commits) = @_;
477 if ($_stdin || !@commits) {
478 print "Reading from stdin...\n";
479 @commits = ();
480 while (<STDIN>) {
1ca72aef 481 if (/\b($sha1_short)\b/o) {
3397f9df
EW
482 unshift @commits, $1;
483 }
484 }
485 }
486 my @revs;
8de010ad 487 foreach my $c (@commits) {
aef4e921 488 my @tmp = command('rev-parse',$c);
8de010ad
EW
489 if (scalar @tmp == 1) {
490 push @revs, $tmp[0];
491 } elsif (scalar @tmp > 1) {
aef4e921 492 push @revs, reverse(command('rev-list',@tmp));
8de010ad 493 } else {
207f1a75 494 fatal "Failed to rev-parse $c";
8de010ad 495 }
3397f9df 496 }
1ce255dc
EW
497 my $gs = Git::SVN->new;
498 my ($r_last, $cmt_last) = $gs->last_rev_commit;
499 $gs->fetch;
97f6987a 500 if (defined $gs->{last_rev} && $r_last != $gs->{last_rev}) {
1ce255dc
EW
501 fatal "There are new revisions that were fetched ",
502 "and need to be merged (or acknowledged) ",
503 "before committing.\nlast rev: $r_last\n",
207f1a75 504 " current: $gs->{last_rev}";
a5e0cedc 505 }
1ce255dc
EW
506 $gs->set_tree($_) foreach @revs;
507 print "Done committing ",scalar @revs," revisions to SVN\n";
3157dd9e 508 unlink $gs->{index};
a5e0cedc 509}
8f22562c 510
d7ad3bed
EW
511sub cmd_dcommit {
512 my $head = shift;
181264ad 513 command_noisy(qw/update-index --refresh/);
c8cfa3e4 514 git_cmd_try { command_oneline(qw/diff-index --quiet HEAD/) }
826a9339 515 'Cannot dcommit with a dirty index. Commit your changes first, '
c8cfa3e4 516 . "or stash them with `git stash'.\n";
d7ad3bed 517 $head ||= 'HEAD';
5eec27e3
TR
518
519 my $old_head;
520 if ($head ne 'HEAD') {
521 $old_head = eval {
522 command_oneline([qw/symbolic-ref -q HEAD/])
523 };
524 if ($old_head) {
525 $old_head =~ s{^refs/heads/}{};
526 } else {
527 $old_head = eval { command_oneline(qw/rev-parse HEAD/) };
528 }
529 command(['checkout', $head], STDERR => 0);
530 }
531
a8ae2623 532 my @refs;
5eec27e3 533 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD', \@refs);
2cb61105
TR
534 unless ($gs) {
535 die "Unable to determine upstream SVN information from ",
536 "$head history.\nPerhaps the repository is empty.";
537 }
0df84059
PO
538
539 if (defined $_commit_url) {
540 $url = $_commit_url;
541 } else {
542 $url = eval { command_oneline('config', '--get',
543 "svn-remote.$gs->{repo_id}.commiturl") };
544 if (!$url) {
12a296bc 545 $url = $gs->full_pushurl
0df84059
PO
546 }
547 }
548
ba24e745 549 my $last_rev = $_revision if defined $_revision;
59b0c24d
MM
550 if ($url) {
551 print "Committing to $url ...\n";
552 }
733a65aa 553 my ($linear_refs, $parents) = linearize_history($gs, \@refs);
751eb395
EW
554 if ($_no_rebase && scalar(@$linear_refs) > 1) {
555 warn "Attempting to commit more than one change while ",
556 "--no-rebase is enabled.\n",
557 "If these changes depend on each other, re-running ",
7dfa16b9 558 "without --no-rebase may be required."
751eb395 559 }
711521e2
EW
560 my $expect_url = $url;
561 Git::SVN::remove_username($expect_url);
98c4ab32
BJ
562 if (defined($_merge_info)) {
563 $_merge_info =~ tr{ }{\n};
564 }
c74d9acf
EW
565 while (1) {
566 my $d = shift @$linear_refs or last;
45bf473a
EW
567 unless (defined $last_rev) {
568 (undef, $last_rev, undef) = cmt_metadata("$d~1");
569 unless (defined $last_rev) {
d7ad3bed 570 fatal "Unable to extract revision information ",
207f1a75 571 "from commit $d~1";
45bf473a
EW
572 }
573 }
b22d4497
EW
574 if ($_dry_run) {
575 print "diff-tree $d~1 $d\n";
576 } else {
751eb395 577 my $cmt_rev;
d7ad3bed 578 my %ed_opts = ( r => $last_rev,
61395354 579 log => get_commit_entry($d)->{log},
ba24e745 580 ra => Git::SVN::Ra->new($url),
3caf320b
KA
581 config => SVN::Core::config_get_config(
582 $Git::SVN::Ra::config_dir
583 ),
61395354
EW
584 tree_a => "$d~1",
585 tree_b => $d,
586 editor_cb => sub {
587 print "Committed r$_[0]\n";
751eb395
EW
588 $cmt_rev = $_[0];
589 },
6abd9332 590 mergeinfo => $_merge_info,
a8ae2623 591 svn_path => '');
61395354 592 if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) {
d7ad3bed 593 print "No changes\n$d~1 == $d\n";
733a65aa 594 } elsif ($parents->{$d} && @{$parents->{$d}}) {
751eb395 595 $gs->{inject_parents_dcommit}->{$cmt_rev} =
733a65aa 596 $parents->{$d};
d7ad3bed 597 }
751eb395 598 $_fetch_all ? $gs->fetch_all : $gs->fetch;
7dfa16b9 599 $last_rev = $cmt_rev;
751eb395
EW
600 next if $_no_rebase;
601
602 # we always want to rebase against the current HEAD,
603 # not any head that was passed to us
c74d9acf 604 my @diff = command('diff-tree', $d,
751eb395
EW
605 $gs->refname, '--');
606 my @finish;
607 if (@diff) {
608 @finish = rebase_cmd();
c74d9acf 609 print STDERR "W: $d and ", $gs->refname,
751eb395 610 " differ, using @finish:\n",
c74d9acf 611 join("\n", @diff), "\n";
751eb395
EW
612 } else {
613 print "No changes between current HEAD and ",
614 $gs->refname,
615 "\nResetting to the latest ",
616 $gs->refname, "\n";
617 @finish = qw/reset --mixed/;
618 }
619 command_noisy(@finish, $gs->refname);
c74d9acf
EW
620 if (@diff) {
621 @refs = ();
622 my ($url_, $rev_, $uuid_, $gs_) =
5eec27e3 623 working_head_info('HEAD', \@refs);
c74d9acf
EW
624 my ($linear_refs_, $parents_) =
625 linearize_history($gs_, \@refs);
626 if (scalar(@$linear_refs) !=
627 scalar(@$linear_refs_)) {
628 fatal "# of revisions changed ",
629 "\nbefore:\n",
630 join("\n", @$linear_refs),
631 "\n\nafter:\n",
632 join("\n", @$linear_refs_), "\n",
633 'If you are attempting to commit ',
634 "merges, try running:\n\t",
635 'git rebase --interactive',
636 '--preserve-merges ',
637 $gs->refname,
638 "\nBefore dcommitting";
639 }
711521e2 640 if ($url_ ne $expect_url) {
c03c1f79
AG
641 if ($url_ eq $gs->metadata_url) {
642 print
643 "Accepting rewritten URL:",
644 " $url_\n";
645 } else {
646 fatal
647 "URL mismatch after rebase:",
648 " $url_ != $expect_url";
649 }
c74d9acf
EW
650 }
651 if ($uuid_ ne $uuid) {
652 fatal "uuid mismatch after rebase: ",
653 "$uuid_ != $uuid";
654 }
655 # remap parents
656 my (%p, @l, $i);
657 for ($i = 0; $i < scalar @$linear_refs; $i++) {
658 my $new = $linear_refs_->[$i] or next;
659 $p{$new} =
660 $parents->{$linear_refs->[$i]};
661 push @l, $new;
662 }
663 $parents = \%p;
664 $linear_refs = \@l;
665 }
b22d4497
EW
666 }
667 }
5eec27e3
TR
668
669 if ($old_head) {
670 my $new_head = command_oneline(qw/rev-parse HEAD/);
671 my $new_is_symbolic = eval {
672 command_oneline(qw/symbolic-ref -q HEAD/);
673 };
674 if ($new_is_symbolic) {
675 print "dcommitted the branch ", $head, "\n";
676 } else {
677 print "dcommitted on a detached HEAD because you gave ",
678 "a revision argument.\n",
679 "The rewritten commit is: ", $new_head, "\n";
680 }
681 command(['checkout', $old_head], STDERR => 0);
682 }
683
3157dd9e 684 unlink $gs->{index};
b22d4497
EW
685}
686
5de70efb
FR
687sub cmd_branch {
688 my ($branch_name, $head) = @_;
689
690 unless (defined $branch_name && length $branch_name) {
691 die(($_tag ? "tag" : "branch") . " name required\n");
692 }
693 $head ||= 'HEAD';
694
150d38c4 695 my (undef, $rev, undef, $gs) = working_head_info($head);
12a296bc 696 my $src = $gs->full_pushurl;
5de70efb 697
a0fbc87c 698 my $remote = Git::SVN::read_all_remotes()->{$gs->{repo_id}};
62244069
MB
699 my $allglobs = $remote->{ $_tag ? 'tags' : 'branches' };
700 my $glob;
701 if ($#{$allglobs} == 0) {
702 $glob = $allglobs->[0];
703 } else {
704 unless(defined $_branch_dest) {
705 die "Multiple ",
706 $_tag ? "tag" : "branch",
707 " paths defined for Subversion repository.\n",
708 "You must specify where you want to create the ",
709 $_tag ? "tag" : "branch",
710 " with the --destination argument.\n";
711 }
712 foreach my $g (@{$allglobs}) {
f7050599
EW
713 # SVN::Git::Editor could probably be moved to Git.pm..
714 my $re = SVN::Git::Editor::glob2pat($g->{path}->{left});
715 if ($_branch_dest =~ /$re/) {
62244069
MB
716 $glob = $g;
717 last;
718 }
719 }
720 unless (defined $glob) {
eaa14ff8
EW
721 my $dest_re = qr/\b\Q$_branch_dest\E\b/;
722 foreach my $g (@{$allglobs}) {
723 $g->{path}->{left} =~ /$dest_re/ or next;
724 if (defined $glob) {
725 die "Ambiguous destination: ",
726 $_branch_dest, "\nmatches both '",
727 $glob->{path}->{left}, "' and '",
728 $g->{path}->{left}, "'\n";
729 }
730 $glob = $g;
731 }
732 unless (defined $glob) {
733 die "Unknown ",
734 $_tag ? "tag" : "branch",
735 " destination $_branch_dest\n";
736 }
62244069
MB
737 }
738 }
5de70efb 739 my ($lft, $rgt) = @{ $glob->{path} }{qw/left right/};
99bacd6c
IM
740 my $url;
741 if (defined $_commit_url) {
742 $url = $_commit_url;
743 } else {
744 $url = eval { command_oneline('config', '--get',
745 "svn-remote.$gs->{repo_id}.commiturl") };
746 if (!$url) {
12a296bc 747 $url = $remote->{pushurl} || $remote->{url};
99bacd6c
IM
748 }
749 }
750 my $dst = join '/', $url, $lft, $branch_name, ($rgt || ());
5de70efb 751
a83b91e7
IM
752 if ($dst =~ /^https:/ && $src =~ /^http:/) {
753 $src=~s/^http:/https:/;
754 }
755
d32fad2b 756 ::_req_svn();
757
5de70efb
FR
758 my $ctx = SVN::Client->new(
759 auth => Git::SVN::Ra::_auth_providers(),
760 log_msg => sub {
761 ${ $_[0] } = defined $_message
762 ? $_message
763 : 'Create ' . ($_tag ? 'tag ' : 'branch ' )
764 . $branch_name;
765 },
766 );
767
768 eval {
769 $ctx->ls($dst, 'HEAD', 0);
770 } and die "branch ${branch_name} already exists\n";
771
772 print "Copying ${src} at r${rev} to ${dst}...\n";
773 $ctx->copy($src, $rev, $dst)
774 unless $_dry_run;
775
776 $gs->fetch_all;
777}
778
26e60160 779sub cmd_find_rev {
ea14e6c5
MAL
780 my $revision_or_hash = shift or die "SVN or git revision required ",
781 "as a command-line argument\n";
26e60160
AR
782 my $result;
783 if ($revision_or_hash =~ /^r\d+$/) {
b3cb7e45
AR
784 my $head = shift;
785 $head ||= 'HEAD';
786 my @refs;
63c56022 787 my (undef, undef, $uuid, $gs) = working_head_info($head, \@refs);
b3cb7e45
AR
788 unless ($gs) {
789 die "Unable to determine upstream SVN information from ",
790 "$head history\n";
26e60160 791 }
b3cb7e45 792 my $desired_revision = substr($revision_or_hash, 1);
63c56022 793 $result = $gs->rev_map_get($desired_revision, $uuid);
26e60160
AR
794 } else {
795 my (undef, $rev, undef) = cmt_metadata($revision_or_hash);
796 $result = $rev;
797 }
798 print "$result\n" if $result;
799}
800
55f9d7a7
MH
801sub auto_create_empty_directories {
802 my ($gs) = @_;
803 my $var = eval { command_oneline('config', '--get', '--bool',
804 "svn-remote.$gs->{repo_id}.automkdirs") };
805 # By default, create empty directories by consulting the unhandled log,
806 # but allow setting it to 'false' to skip it.
807 return !($var && $var eq 'false');
808}
809
905f8b7d
EW
810sub cmd_rebase {
811 command_noisy(qw/update-index --refresh/);
13c823fb
EW
812 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
813 unless ($gs) {
905f8b7d
EW
814 die "Unable to determine upstream SVN information from ",
815 "working tree history\n";
816 }
7d45e146
SF
817 if ($_dry_run) {
818 print "Remote Branch: " . $gs->refname . "\n";
819 print "SVN URL: " . $url . "\n";
820 return;
821 }
905f8b7d
EW
822 if (command(qw/diff-index HEAD --/)) {
823 print STDERR "Cannot rebase with uncommited changes:\n";
824 command_noisy('status');
825 exit 1;
826 }
dee41f3e 827 unless ($_local) {
cec0d5a3
SG
828 # rebase will checkout for us, so no need to do it explicitly
829 $_no_checkout = 'true';
dee41f3e
EW
830 $_fetch_all ? $gs->fetch_all : $gs->fetch;
831 }
905f8b7d 832 command_noisy(rebase_cmd(), $gs->refname);
55f9d7a7
MH
833 if (auto_create_empty_directories($gs)) {
834 $gs->mkemptydirs;
835 }
905f8b7d
EW
836}
837
5969cbe1 838sub cmd_show_ignore {
13c823fb
EW
839 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
840 $gs ||= Git::SVN->new;
5969cbe1 841 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
01bdab84
BS
842 $gs->prop_walk($gs->{path}, $r, sub {
843 my ($gs, $path, $props) = @_;
844 print STDOUT "\n# $path\n";
845 my $s = $props->{'svn:ignore'} or return;
846 $s =~ s/[\r\n]+/\n/g;
a7d72544 847 $s =~ s/^\n+//;
01bdab84
BS
848 chomp $s;
849 $s =~ s#^#$path#gm;
850 print STDOUT "$s\n";
851 });
a5e0cedc
EW
852}
853
2d879792
VK
854sub cmd_show_externals {
855 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
856 $gs ||= Git::SVN->new;
857 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
858 $gs->prop_walk($gs->{path}, $r, sub {
859 my ($gs, $path, $props) = @_;
860 print STDOUT "\n# $path\n";
861 my $s = $props->{'svn:externals'} or return;
862 $s =~ s/[\r\n]+/\n/g;
863 chomp $s;
864 $s =~ s#^#$path#gm;
865 print STDOUT "$s\n";
866 });
867}
868
d05ddec5
BS
869sub cmd_create_ignore {
870 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
871 $gs ||= Git::SVN->new;
872 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
873 $gs->prop_walk($gs->{path}, $r, sub {
874 my ($gs, $path, $props) = @_;
875 # $path is of the form /path/to/dir/
7d9fd459
BG
876 $path = '.' . $path;
877 # SVN can have attributes on empty directories,
878 # which git won't track
879 mkpath([$path]) unless -d $path;
880 my $ignore = $path . '.gitignore';
d05ddec5
BS
881 my $s = $props->{'svn:ignore'} or return;
882 open(GITIGNORE, '>', $ignore)
207f1a75 883 or fatal("Failed to open `$ignore' for writing: $!");
d05ddec5 884 $s =~ s/[\r\n]+/\n/g;
a7d72544 885 $s =~ s/^\n+//;
d05ddec5
BS
886 chomp $s;
887 # Prefix all patterns so that the ignore doesn't apply
888 # to sub-directories.
889 $s =~ s#^#/#gm;
890 print GITIGNORE "$s\n";
891 close(GITIGNORE)
207f1a75 892 or fatal("Failed to close `$ignore': $!");
c4c66b26 893 command_noisy('add', '-f', $ignore);
d05ddec5
BS
894 });
895}
896
6111b934
EW
897sub cmd_mkdirs {
898 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
899 $gs ||= Git::SVN->new;
900 $gs->mkemptydirs($_revision);
901}
902
b2b3ada7
DK
903sub canonicalize_path {
904 my ($path) = @_;
e6fefa92
DK
905 my $dot_slash_added = 0;
906 if (substr($path, 0, 1) ne "/") {
907 $path = "./" . $path;
908 $dot_slash_added = 1;
909 }
b2b3ada7
DK
910 # File::Spec->canonpath doesn't collapse x/../y into y (for a
911 # good reason), so let's do this manually.
912 $path =~ s#/+#/#g;
913 $path =~ s#/\.(?:/|$)#/#g;
914 $path =~ s#/[^/]+/\.\.##g;
915 $path =~ s#/$##g;
e6fefa92 916 $path =~ s#^\./## if $dot_slash_added;
2fe403e7
GP
917 $path =~ s#^/##;
918 $path =~ s#^\.$##;
b2b3ada7
DK
919 return $path;
920}
921
50ff2366
UD
922sub canonicalize_url {
923 my ($url) = @_;
924 $url =~ s#^([^:]+://[^/]*/)(.*)$#$1 . canonicalize_path($2)#e;
925 return $url;
926}
927
15153451
BS
928# get_svnprops(PATH)
929# ------------------
51e057cf 930# Helper for cmd_propget and cmd_proplist below.
15153451
BS
931sub get_svnprops {
932 my $path = shift;
933 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
934 $gs ||= Git::SVN->new;
935
936 # prefix THE PATH by the sub-directory from which the user
937 # invoked us.
938 $path = $cmd_dir_prefix . $path;
207f1a75 939 fatal("No such file or directory: $path") unless -e $path;
15153451
BS
940 my $is_dir = -d $path ? 1 : 0;
941 $path = $gs->{path} . '/' . $path;
942
943 # canonicalize the path (otherwise libsvn will abort or fail to
944 # find the file)
b2b3ada7 945 $path = canonicalize_path($path);
15153451
BS
946
947 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
948 my $props;
949 if ($is_dir) {
950 (undef, undef, $props) = $gs->ra->get_dir($path, $r);
951 }
952 else {
953 (undef, $props) = $gs->ra->get_file($path, $r, undef);
954 }
955 return $props;
956}
957
958# cmd_propget (PROP, PATH)
959# ------------------------
960# Print the SVN property PROP for PATH.
961sub cmd_propget {
962 my ($prop, $path) = @_;
963 $path = '.' if not defined $path;
964 usage(1) if not defined $prop;
965 my $props = get_svnprops($path);
966 if (not defined $props->{$prop}) {
207f1a75 967 fatal("`$path' does not have a `$prop' SVN property.");
15153451
BS
968 }
969 print $props->{$prop} . "\n";
970}
971
51e057cf
BS
972# cmd_proplist (PATH)
973# -------------------
974# Print the list of SVN properties for PATH.
975sub cmd_proplist {
976 my $path = shift;
977 $path = '.' if not defined $path;
978 my $props = get_svnprops($path);
979 print "Properties on '$path':\n";
980 foreach (sort keys %{$props}) {
981 print " $_\n";
982 }
983}
984
8164b652 985sub cmd_multi_init {
9d55b41a 986 my $url = shift;
62244069 987 unless (defined $_trunk || @_branches || @_tags) {
98327e58 988 usage(1);
9d55b41a 989 }
dc431666 990
8164b652 991 $_prefix = '' unless defined $_prefix;
dadc6d2a 992 if (defined $url) {
50ff2366 993 $url = canonicalize_url($url);
dadc6d2a
EW
994 init_subdir(@_);
995 }
f30603fc 996 do_git_init_db();
98327e58 997 if (defined $_trunk) {
b4b33600 998 $_trunk =~ s#^/+##;
6f5748e1 999 my $trunk_ref = 'refs/remotes/' . $_prefix . 'trunk';
706587fc
EW
1000 # try both old-style and new-style lookups:
1001 my $gs_trunk = eval { Git::SVN->new($trunk_ref) };
8164b652 1002 unless ($gs_trunk) {
706587fc
EW
1003 my ($trunk_url, $trunk_path) =
1004 complete_svn_url($url, $_trunk);
1005 $gs_trunk = Git::SVN->init($trunk_url, $trunk_path,
1006 undef, $trunk_ref);
98327e58 1007 }
c35b96e7 1008 }
62244069 1009 return unless @_branches || @_tags;
e7db67e6 1010 my $ra = $url ? Git::SVN::Ra->new($url) : undef;
62244069
MB
1011 foreach my $path (@_branches) {
1012 complete_url_ls_init($ra, $path, '--branches/-b', $_prefix);
1013 }
1014 foreach my $path (@_tags) {
1015 complete_url_ls_init($ra, $path, '--tags/-t', $_prefix.'tags/');
1016 }
9d55b41a
EW
1017}
1018
1c8443b0 1019sub cmd_multi_fetch {
4d0157d6 1020 $Git::SVN::no_reuse_existing = undef;
0af9c9f9
EW
1021 my $remotes = Git::SVN::read_all_remotes();
1022 foreach my $repo_id (sort keys %$remotes) {
db03cd24 1023 if ($remotes->{$repo_id}->{url}) {
4bb9ed04
EW
1024 Git::SVN::fetch_all($repo_id, $remotes);
1025 }
9d55b41a 1026 }
9d55b41a
EW
1027}
1028
44320b9e
EW
1029# this command is special because it requires no metadata
1030sub cmd_commit_diff {
1031 my ($ta, $tb, $url) = @_;
1032 my $usage = "Usage: $0 commit-diff -r<revision> ".
207f1a75 1033 "<tree-ish> <tree-ish> [<URL>]";
44320b9e 1034 fatal($usage) if (!defined $ta || !defined $tb);
d72ab8c8 1035 my $svn_path = '';
44320b9e
EW
1036 if (!defined $url) {
1037 my $gs = eval { Git::SVN->new };
1038 if (!$gs) {
1039 fatal("Needed URL or usable git-svn --id in ",
1040 "the command-line\n", $usage);
1041 }
1042 $url = $gs->{url};
d3a840dc 1043 $svn_path = $gs->{path};
44320b9e
EW
1044 }
1045 unless (defined $_revision) {
1046 fatal("-r|--revision is a required argument\n", $usage);
1047 }
1048 if (defined $_message && defined $_file) {
1049 fatal("Both --message/-m and --file/-F specified ",
1050 "for the commit message.\n",
207f1a75 1051 "I have no idea what you mean");
44320b9e
EW
1052 }
1053 if (defined $_file) {
1054 $_message = file_to_s($_file);
1055 } else {
1056 $_message ||= get_commit_entry($tb)->{log};
1057 }
1058 my $ra ||= Git::SVN::Ra->new($url);
1059 my $r = $_revision;
1060 if ($r eq 'HEAD') {
1061 $r = $ra->get_latest_revnum;
1062 } elsif ($r !~ /^\d+$/) {
1063 die "revision argument: $r not understood by git-svn\n";
1064 }
61395354
EW
1065 my %ed_opts = ( r => $r,
1066 log => $_message,
1067 ra => $ra,
1068 tree_a => $ta,
1069 tree_b => $tb,
1070 editor_cb => sub { print "Committed r$_[0]\n" },
1071 svn_path => $svn_path );
1072 if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) {
44320b9e
EW
1073 print "No changes\n$ta == $tb\n";
1074 }
44320b9e
EW
1075}
1076
05427b91
TR
1077sub escape_uri_only {
1078 my ($uri) = @_;
1079 my @tmp;
1080 foreach (split m{/}, $uri) {
6a004d3f 1081 s/([^~\w.%+-]|%(?![a-fA-F0-9]{2}))/sprintf("%%%02X",ord($1))/eg;
05427b91
TR
1082 push @tmp, $_;
1083 }
1084 join('/', @tmp);
1085}
1086
1087sub escape_url {
1088 my ($url) = @_;
1089 if ($url =~ m#^([^:]+)://([^/]*)(.*)$#) {
1090 my ($scheme, $domain, $uri) = ($1, $2, escape_uri_only($3));
1091 $url = "$scheme://$domain$uri";
1092 }
1093 $url;
1094}
1095
e6fefa92 1096sub cmd_info {
bd2d4f96 1097 my $path = canonicalize_path(defined($_[0]) ? $_[0] : ".");
edde9112 1098 my $fullpath = canonicalize_path($cmd_dir_prefix . $path);
bd2d4f96 1099 if (exists $_[1]) {
e6fefa92
DK
1100 die "Too many arguments specified\n";
1101 }
1102
1103 my ($file_type, $diff_status) = find_file_type_and_diff_status($path);
1104
1105 if (!$file_type && !$diff_status) {
2cf3e3ac
TR
1106 print STDERR "svn: '$path' is not under version control\n";
1107 exit 1;
e6fefa92
DK
1108 }
1109
1110 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
1111 unless ($gs) {
1112 die "Unable to determine upstream SVN information from ",
1113 "working tree history\n";
1114 }
bd2d4f96
EW
1115
1116 # canonicalize_path() will return "" to make libsvn 1.5.x happy,
1117 $path = "." if $path eq "";
1118
edde9112 1119 my $full_url = $url . ($fullpath eq "" ? "" : "/$fullpath");
e6fefa92 1120
8b014d71 1121 if ($_url) {
05427b91 1122 print escape_url($full_url), "\n";
8b014d71
DK
1123 return;
1124 }
1125
e6fefa92
DK
1126 my $result = "Path: $path\n";
1127 $result .= "Name: " . basename($path) . "\n" if $file_type ne "dir";
05427b91 1128 $result .= "URL: " . escape_url($full_url) . "\n";
e6fefa92 1129
a5460eb7
EW
1130 eval {
1131 my $repos_root = $gs->repos_root;
1132 Git::SVN::remove_username($repos_root);
05427b91 1133 $result .= "Repository Root: " . escape_url($repos_root) . "\n";
a5460eb7
EW
1134 };
1135 if ($@) {
1136 $result .= "Repository Root: (offline)\n";
1137 }
b91a8a3e 1138 ::_req_svn();
22ba47f5
MK
1139 $result .= "Repository UUID: $uuid\n" unless $diff_status eq "A" &&
1140 ($SVN::Core::VERSION le '1.5.4' || $file_type ne "dir");
e6fefa92
DK
1141 $result .= "Revision: " . ($diff_status eq "A" ? 0 : $rev) . "\n";
1142
1143 $result .= "Node Kind: " .
1144 ($file_type eq "dir" ? "directory" : "file") . "\n";
1145
1146 my $schedule = $diff_status eq "A"
1147 ? "add"
1148 : ($diff_status eq "D" ? "delete" : "normal");
1149 $result .= "Schedule: $schedule\n";
1150
1151 if ($diff_status eq "A") {
1152 print $result, "\n";
1153 return;
1154 }
1155
1156 my ($lc_author, $lc_rev, $lc_date_utc);
edde9112 1157 my @args = Git::SVN::Log::git_svn_log_cmd($rev, $rev, "--", $fullpath);
e6fefa92
DK
1158 my $log = command_output_pipe(@args);
1159 my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/;
1160 while (<$log>) {
1161 if (/^${esc_color}author (.+) <[^>]+> (\d+) ([\-\+]?\d+)$/o) {
1162 $lc_author = $1;
1163 $lc_date_utc = Git::SVN::Log::parse_git_date($2, $3);
1164 } elsif (/^${esc_color} (git-svn-id:.+)$/o) {
1165 (undef, $lc_rev, undef) = ::extract_metadata($1);
1166 }
1167 }
1168 close $log;
1169
1170 Git::SVN::Log::set_local_timezone();
1171
1172 $result .= "Last Changed Author: $lc_author\n";
1173 $result .= "Last Changed Rev: $lc_rev\n";
1174 $result .= "Last Changed Date: " .
1175 Git::SVN::Log::format_svn_date($lc_date_utc) . "\n";
1176
1177 if ($file_type ne "dir") {
1178 my $text_last_updated_date =
1179 ($diff_status eq "D" ? $lc_date_utc : (stat $path)[9]);
1180 $result .=
1181 "Text Last Updated: " .
1182 Git::SVN::Log::format_svn_date($text_last_updated_date) .
1183 "\n";
1184 my $checksum;
1185 if ($diff_status eq "D") {
1186 my ($fh, $ctx) =
1187 command_output_pipe(qw(cat-file blob), "HEAD:$path");
1188 if ($file_type eq "link") {
1189 my $file_name = <$fh>;
8d7c4fad 1190 $checksum = md5sum("link $file_name");
e6fefa92 1191 } else {
8d7c4fad 1192 $checksum = md5sum($fh);
e6fefa92
DK
1193 }
1194 command_close_pipe($fh, $ctx);
1195 } elsif ($file_type eq "link") {
1196 my $file_name =
1197 command(qw(cat-file blob), "HEAD:$path");
1198 $checksum =
8d7c4fad 1199 md5sum("link " . $file_name);
e6fefa92
DK
1200 } else {
1201 open FILE, "<", $path or die $!;
8d7c4fad 1202 $checksum = md5sum(\*FILE);
e6fefa92
DK
1203 close FILE or die $!;
1204 }
1205 $result .= "Checksum: " . $checksum . "\n";
1206 }
1207
1208 print $result, "\n";
1209}
1210
195643f2
BJ
1211sub cmd_reset {
1212 my $target = shift || $_revision or die "SVN revision required\n";
1213 $target = $1 if $target =~ /^r(\d+)$/;
1214 $target =~ /^\d+$/ or die "Numeric SVN revision expected\n";
1215 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
1216 unless ($gs) {
1217 die "Unable to determine upstream SVN information from ".
1218 "history\n";
1219 }
1220 my ($r, $c) = $gs->find_rev_before($target, not $_fetch_parent);
70ee0b77 1221 die "Cannot find SVN revision $target\n" unless defined($c);
195643f2
BJ
1222 $gs->rev_map_set($r, $c, 'reset', $uuid);
1223 print "r$r = $c ($gs->{ref_id})\n";
1224}
1225
2da9ee08
RZ
1226sub cmd_gc {
1227 if (!$can_compress) {
1228 warn "Compress::Zlib could not be found; unhandled.log " .
1229 "files will not be compressed.\n";
1230 }
1231 find({ wanted => \&gc_directory, no_chdir => 1}, "$ENV{GIT_DIR}/svn");
1232}
1233
3397f9df
EW
1234########################### utility functions #########################
1235
905f8b7d
EW
1236sub rebase_cmd {
1237 my @cmd = qw/rebase/;
1238 push @cmd, '-v' if $_verbose;
1239 push @cmd, qw/--merge/ if $_merge;
1240 push @cmd, "--strategy=$_strategy" if $_strategy;
1241 @cmd;
1242}
1243
1e889ef3
EW
1244sub post_fetch_checkout {
1245 return if $_no_checkout;
1246 my $gs = $Git::SVN::_head or return;
1247 return if verify_ref('refs/heads/master^0');
1248
b186a261
EW
1249 # look for "trunk" ref if it exists
1250 my $remote = Git::SVN::read_all_remotes()->{$gs->{repo_id}};
1251 my $fetch = $remote->{fetch};
1252 if ($fetch) {
1253 foreach my $p (keys %$fetch) {
1254 basename($fetch->{$p}) eq 'trunk' or next;
1255 $gs = Git::SVN->new($fetch->{$p}, $gs->{repo_id}, $p);
1256 last;
1257 }
1258 }
1259
1e889ef3
EW
1260 my $valid_head = verify_ref('HEAD^0');
1261 command_noisy(qw(update-ref refs/heads/master), $gs->refname);
1262 return if ($valid_head || !verify_ref('HEAD^0'));
1263
1264 return if $ENV{GIT_DIR} !~ m#^(?:.*/)?\.git$#;
1265 my $index = $ENV{GIT_INDEX_FILE} || "$ENV{GIT_DIR}/index";
1266 return if -f $index;
1267
7ae3df8c 1268 return if command_oneline(qw/rev-parse --is-inside-work-tree/) eq 'false';
1e889ef3
EW
1269 return if command_oneline(qw/rev-parse --is-inside-git-dir/) eq 'true';
1270 command_noisy(qw/read-tree -m -u -v HEAD HEAD/);
1271 print STDERR "Checked out HEAD:\n ",
1272 $gs->full_url, " r", $gs->last_rev, "\n";
55f9d7a7
MH
1273 if (auto_create_empty_directories($gs)) {
1274 $gs->mkemptydirs($gs->last_rev);
1275 }
1e889ef3
EW
1276}
1277
98327e58
EW
1278sub complete_svn_url {
1279 my ($url, $path) = @_;
1280 $path =~ s#/+$##;
98327e58 1281 if ($path !~ m#^[a-z\+]+://#) {
98327e58
EW
1282 if (!defined $url || $url !~ m#^[a-z\+]+://#) {
1283 fatal("E: '$path' is not a complete URL ",
207f1a75 1284 "and a separate URL is not specified");
98327e58 1285 }
706587fc 1286 return ($url, $path);
98327e58 1287 }
706587fc 1288 return ($path, '');
98327e58
EW
1289}
1290
9d55b41a 1291sub complete_url_ls_init {
706587fc
EW
1292 my ($ra, $repo_path, $switch, $pfx) = @_;
1293 unless ($repo_path) {
9d55b41a
EW
1294 print STDERR "W: $switch not specified\n";
1295 return;
1296 }
706587fc
EW
1297 $repo_path =~ s#/+$##;
1298 if ($repo_path =~ m#^[a-z\+]+://#) {
1299 $ra = Git::SVN::Ra->new($repo_path);
1300 $repo_path = '';
e7db67e6 1301 } else {
706587fc 1302 $repo_path =~ s#^/+##;
e7db67e6 1303 unless ($ra) {
706587fc 1304 fatal("E: '$repo_path' is not a complete URL ",
207f1a75 1305 "and a separate URL is not specified");
8164b652 1306 }
e7db67e6 1307 }
706587fc 1308 my $url = $ra->{url};
b4d57e5e
EW
1309 my $gs = Git::SVN->init($url, undef, undef, undef, 1);
1310 my $k = "svn-remote.$gs->{repo_id}.url";
1311 my $orig_url = eval { command_oneline(qw/config --get/, $k) };
1312 if ($orig_url && ($orig_url ne $gs->{url})) {
1313 die "$k already set: $orig_url\n",
1314 "wanted to set to: $gs->{url}\n";
88cf4107 1315 }
b4d57e5e 1316 command_oneline('config', $k, $gs->{url}) unless $orig_url;
0b2af457 1317 my $remote_path = "$gs->{path}/$repo_path";
5268f9ed 1318 $remote_path =~ s{%([0-9A-F]{2})}{chr hex($1)}ieg;
b4d57e5e
EW
1319 $remote_path =~ s#/+#/#g;
1320 $remote_path =~ s#^/##g;
ed0b9d43 1321 $remote_path .= "/*" if $remote_path !~ /\*/;
b4d57e5e
EW
1322 my ($n) = ($switch =~ /^--(\w+)/);
1323 if (length $pfx && $pfx !~ m#/$#) {
1324 die "--prefix='$pfx' must have a trailing slash '/'\n";
9d55b41a 1325 }
570d35c2 1326 command_noisy('config',
62244069 1327 '--add',
570d35c2
MG
1328 "svn-remote.$gs->{repo_id}.$n",
1329 "$remote_path:refs/remotes/$pfx*" .
1330 ('/*' x (($remote_path =~ tr/*/*/) - 1)) );
9d55b41a
EW
1331}
1332
aef4e921
EW
1333sub verify_ref {
1334 my ($ref) = @_;
2c5c1d53
EW
1335 eval { command_oneline([ 'rev-parse', '--verify', $ref ],
1336 { STDERR => 0 }); };
aef4e921
EW
1337}
1338
a5e0cedc 1339sub get_tree_from_treeish {
cf52b8f0 1340 my ($treeish) = @_;
44320b9e 1341 # $treeish can be a symbolic ref, too:
aef4e921 1342 my $type = command_oneline(qw/cat-file -t/, $treeish);
cf52b8f0
EW
1343 my $expected;
1344 while ($type eq 'tag') {
aef4e921 1345 ($treeish, $type) = command(qw/cat-file tag/, $treeish);
cf52b8f0
EW
1346 }
1347 if ($type eq 'commit') {
aef4e921
EW
1348 $expected = (grep /^tree /, command(qw/cat-file commit/,
1349 $treeish))[0];
44320b9e 1350 ($expected) = ($expected =~ /^tree ($sha1)$/o);
cf52b8f0
EW
1351 die "Unable to get tree from $treeish\n" unless $expected;
1352 } elsif ($type eq 'tree') {
1353 $expected = $treeish;
1354 } else {
1355 die "$treeish is a $type, expected tree, tag or commit\n";
1356 }
a5e0cedc
EW
1357 return $expected;
1358}
1359
44320b9e
EW
1360sub get_commit_entry {
1361 my ($treeish) = shift;
1362 my %log_entry = ( log => '', tree => get_tree_from_treeish($treeish) );
1363 my $commit_editmsg = "$ENV{GIT_DIR}/COMMIT_EDITMSG";
1364 my $commit_msg = "$ENV{GIT_DIR}/COMMIT_MSG";
1365 open my $log_fh, '>', $commit_editmsg or croak $!;
3397f9df 1366
44320b9e 1367 my $type = command_oneline(qw/cat-file -t/, $treeish);
4ad4515d 1368 if ($type eq 'commit' || $type eq 'tag') {
aef4e921 1369 my ($msg_fh, $ctx) = command_output_pipe('cat-file',
44320b9e 1370 $type, $treeish);
3397f9df 1371 my $in_msg = 0;
6aa9ba14
AP
1372 my $author;
1373 my $saw_from = 0;
328eb9b3 1374 my $msgbuf = "";
3397f9df
EW
1375 while (<$msg_fh>) {
1376 if (!$in_msg) {
1377 $in_msg = 1 if (/^\s*$/);
6aa9ba14 1378 $author = $1 if (/^author (.*>)/);
df746c5a 1379 } elsif (/^git-svn-id: /) {
44320b9e
EW
1380 # skip this for now, we regenerate the
1381 # correct one on re-fetch anyways
1382 # TODO: set *:merge properties or like...
3397f9df 1383 } else {
6aa9ba14
AP
1384 if (/^From:/ || /^Signed-off-by:/) {
1385 $saw_from = 1;
1386 }
328eb9b3 1387 $msgbuf .= $_;
3397f9df
EW
1388 }
1389 }
328eb9b3 1390 $msgbuf =~ s/\s+$//s;
6aa9ba14
AP
1391 if ($Git::SVN::_add_author_from && defined($author)
1392 && !$saw_from) {
328eb9b3 1393 $msgbuf .= "\n\nFrom: $author";
6aa9ba14 1394 }
328eb9b3 1395 print $log_fh $msgbuf or croak $!;
aef4e921 1396 command_close_pipe($msg_fh, $ctx);
3397f9df 1397 }
44320b9e 1398 close $log_fh or croak $!;
3397f9df
EW
1399
1400 if ($_edit || ($type eq 'tree')) {
b4479f07
JN
1401 chomp(my $editor = command_oneline(qw(var GIT_EDITOR)));
1402 system('sh', '-c', $editor.' "$@"', $editor, $commit_editmsg);
3397f9df 1403 }
44320b9e 1404 rename $commit_editmsg, $commit_msg or croak $!;
16fc08e2 1405 {
b510df8a 1406 require Encode;
16fc08e2
EW
1407 # SVN requires messages to be UTF-8 when entering the repo
1408 local $/;
1409 open $log_fh, '<', $commit_msg or croak $!;
1410 binmode $log_fh;
1411 chomp($log_entry{log} = <$log_fh>);
1412
b510df8a
EW
1413 my $enc = Git::config('i18n.commitencoding') || 'UTF-8';
1414 my $msg = $log_entry{log};
1415
1416 eval { $msg = Encode::decode($enc, $msg, 1) };
1417 if ($@) {
1418 die "Could not decode as $enc:\n", $msg,
1419 "\nPerhaps you need to set i18n.commitencoding\n";
16fc08e2 1420 }
b510df8a
EW
1421
1422 eval { $msg = Encode::encode('UTF-8', $msg, 1) };
1423 die "Could not encode as UTF-8:\n$msg\n" if $@;
1424
1425 $log_entry{log} = $msg;
1426
16fc08e2
EW
1427 close $log_fh or croak $!;
1428 }
44320b9e
EW
1429 unlink $commit_msg;
1430 \%log_entry;
a5e0cedc
EW
1431}
1432
3397f9df
EW
1433sub s_to_file {
1434 my ($str, $file, $mode) = @_;
1435 open my $fd,'>',$file or croak $!;
1436 print $fd $str,"\n" or croak $!;
1437 close $fd or croak $!;
1438 chmod ($mode &~ umask, $file) if (defined $mode);
1439}
1440
1441sub file_to_s {
1442 my $file = shift;
1443 open my $fd,'<',$file or croak "$!: file: $file\n";
1444 local $/;
1445 my $ret = <$fd>;
1446 close $fd or croak $!;
1447 $ret =~ s/\s*$//s;
1448 return $ret;
1449}
1450
eeb0abe0
EW
1451# '<svn username> = real-name <email address>' mapping based on git-svnimport:
1452sub load_authors {
1453 open my $authors, '<', $_authors or die "Can't open $_authors $!\n";
f8c9d1d2 1454 my $log = $cmd eq 'log';
eeb0abe0
EW
1455 while (<$authors>) {
1456 chomp;
575d025c 1457 next unless /^(.+?|\(no author\))\s*=\s*(.+?)\s*<(.+)>\s*$/;
eeb0abe0 1458 my ($user, $name, $email) = ($1, $2, $3);
f8c9d1d2
EW
1459 if ($log) {
1460 $Git::SVN::Log::rusers{"$name <$email>"} = $user;
1461 } else {
1462 $users{$user} = [$name, $email];
1463 }
79bb8d88
EW
1464 }
1465 close $authors or croak $!;
1466}
1467
e0d10e1c 1468# convert GetOpt::Long specs for use by git-config
1a30582b 1469sub read_git_config {
b8c92cad 1470 my $opts = shift;
97ae0911 1471 my @config_only;
b8c92cad 1472 foreach my $o (keys %$opts) {
97ae0911
EW
1473 # if we have mixedCase and a long option-only, then
1474 # it's a config-only variable that we don't need for
1475 # the command-line.
1476 push @config_only, $o if ($o =~ /[A-Z]/ && $o =~ /^[a-z]+$/i);
b8c92cad 1477 my $v = $opts->{$o};
97ae0911 1478 my ($key) = ($o =~ /^([a-zA-Z\-]+)/);
b8c92cad 1479 $key =~ s/-//g;
225f1d0c 1480 my $arg = 'git config';
b8c92cad
EW
1481 $arg .= ' --int' if ($o =~ /[:=]i$/);
1482 $arg .= ' --bool' if ($o !~ /[:=][sfi]$/);
1483 if (ref $v eq 'ARRAY') {
1484 chomp(my @tmp = `$arg --get-all svn.$key`);
1485 @$v = @tmp if @tmp;
1486 } else {
1487 chomp(my $tmp = `$arg --get svn.$key`);
7774284a 1488 if ($tmp && !($arg =~ / --bool/ && $tmp eq 'false')) {
b8c92cad
EW
1489 $$v = $tmp;
1490 }
1491 }
1492 }
97ae0911 1493 delete @$opts{@config_only} if @config_only;
b8c92cad
EW
1494}
1495
79bb8d88 1496sub extract_metadata {
c1927a85 1497 my $id = shift or return (undef, undef, undef);
3dfab993 1498 my ($url, $rev, $uuid) = ($id =~ /^\s*git-svn-id:\s+(.*)\@(\d+)
b3e95936 1499 \s([a-f\d\-]+)$/ix);
e70dc780 1500 if (!defined $rev || !$uuid || !$url) {
79bb8d88 1501 # some of the original repositories I made had
82e5a82f 1502 # identifiers like this:
b3e95936 1503 ($rev, $uuid) = ($id =~/^\s*git-svn-id:\s(\d+)\@([a-f\d\-]+)/i);
79bb8d88
EW
1504 }
1505 return ($url, $rev, $uuid);
1506}
1507
c1927a85
EW
1508sub cmt_metadata {
1509 return extract_metadata((grep(/^git-svn-id: /,
aef4e921 1510 command(qw/cat-file commit/, shift)))[-1]);
c1927a85
EW
1511}
1512
6ea42032
BB
1513sub cmt_sha2rev_batch {
1514 my %s2r;
1515 my ($pid, $in, $out, $ctx) = command_bidi_pipe(qw/cat-file --batch/);
1516 my $list = shift;
1517
1518 foreach my $sha (@{$list}) {
1519 my $first = 1;
1520 my $size = 0;
1521 print $out $sha, "\n";
1522
1523 while (my $line = <$in>) {
1524 if ($first && $line =~ /^[[:xdigit:]]{40}\smissing$/) {
1525 last;
1526 } elsif ($first &&
1527 $line =~ /^[[:xdigit:]]{40}\scommit\s(\d+)$/) {
1528 $first = 0;
1529 $size = $1;
1530 next;
1531 } elsif ($line =~ /^(git-svn-id: )/) {
1532 my (undef, $rev, undef) =
1533 extract_metadata($line);
1534 $s2r{$sha} = $rev;
1535 }
1536
1537 $size -= length($line);
1538 last if ($size == 0);
1539 }
1540 }
1541
1542 command_close_bidi_pipe($pid, $in, $out, $ctx);
1543
1544 return \%s2r;
1545}
1546
905f8b7d
EW
1547sub working_head_info {
1548 my ($head, $refs) = @_;
8565a568
ML
1549 my @args = qw/log --no-color --no-decorate --first-parent
1550 --pretty=medium/;
05b4df31 1551 my ($fh, $ctx) = command_output_pipe(@args, $head);
3dfab993 1552 my $hash;
40cb8f8f 1553 my %max;
3dfab993
SV
1554 while (<$fh>) {
1555 if ( m{^commit ($::sha1)$} ) {
1556 unshift @$refs, $hash if $hash and $refs;
1557 $hash = $1;
1558 next;
1559 }
1560 next unless s{^\s*(git-svn-id:)}{$1};
1561 my ($url, $rev, $uuid) = extract_metadata($_);
13c823fb 1562 if (defined $url && defined $rev) {
40cb8f8f 1563 next if $max{$url} and $max{$url} < $rev;
13c823fb 1564 if (my $gs = Git::SVN->find_by_url($url)) {
63c56022 1565 my $c = $gs->rev_map_get($rev, $uuid);
b03c7a63 1566 if ($c && $c eq $hash) {
13c823fb
EW
1567 close $fh; # break the pipe
1568 return ($url, $rev, $uuid, $gs);
40cb8f8f 1569 } else {
060610c5 1570 $max{$url} ||= $gs->rev_map_max;
13c823fb
EW
1571 }
1572 }
1573 }
905f8b7d 1574 }
13c823fb
EW
1575 command_close_pipe($fh, $ctx);
1576 (undef, undef, undef, undef);
905f8b7d
EW
1577}
1578
733a65aa
EW
1579sub read_commit_parents {
1580 my ($parents, $c) = @_;
7b02b85a
EW
1581 chomp(my $p = command_oneline(qw/rev-list --parents -1/, $c));
1582 $p =~ s/^($c)\s*// or die "rev-list --parents -1 $c failed!\n";
1583 @{$parents->{$c}} = split(/ /, $p);
733a65aa
EW
1584}
1585
1586sub linearize_history {
1587 my ($gs, $refs) = @_;
1588 my %parents;
1589 foreach my $c (@$refs) {
1590 read_commit_parents(\%parents, $c);
1591 }
1592
1593 my @linear_refs;
1594 my %skip = ();
1595 my $last_svn_commit = $gs->last_commit;
1596 foreach my $c (reverse @$refs) {
1597 next if $c eq $last_svn_commit;
1598 last if $skip{$c};
1599
1600 unshift @linear_refs, $c;
1601 $skip{$c} = 1;
1602
1603 # we only want the first parent to diff against for linear
1604 # history, we save the rest to inject when we finalize the
1605 # svn commit
1606 my $fp_a = verify_ref("$c~1");
1607 my $fp_b = shift @{$parents{$c}} if $parents{$c};
1608 if (!$fp_a || !$fp_b) {
1609 die "Commit $c\n",
1610 "has no parent commit, and therefore ",
1611 "nothing to diff against.\n",
1612 "You should be working from a repository ",
1613 "originally created by git-svn\n";
1614 }
1615 if ($fp_a ne $fp_b) {
1616 die "$c~1 = $fp_a, however parsing commit $c ",
1617 "revealed that:\n$c~1 = $fp_b\nBUG!\n";
1618 }
1619
1620 foreach my $p (@{$parents{$c}}) {
1621 $skip{$p} = 1;
1622 }
1623 }
1624 (\@linear_refs, \%parents);
1625}
1626
e6fefa92
DK
1627sub find_file_type_and_diff_status {
1628 my ($path) = @_;
107cee50 1629 return ('dir', '') if $path eq '';
e6fefa92
DK
1630
1631 my $diff_output =
1632 command_oneline(qw(diff --cached --name-status --), $path) || "";
1633 my $diff_status = (split(' ', $diff_output))[0] || "";
1634
1635 my $ls_tree = command_oneline(qw(ls-tree HEAD), $path) || "";
1636
1637 return (undef, undef) if !$diff_status && !$ls_tree;
1638
1639 if ($diff_status eq "A") {
1640 return ("link", $diff_status) if -l $path;
1641 return ("dir", $diff_status) if -d $path;
1642 return ("file", $diff_status);
1643 }
1644
1645 my $mode = (split(' ', $ls_tree))[0] || "";
1646
1647 return ("link", $diff_status) if $mode eq "120000";
1648 return ("dir", $diff_status) if $mode eq "040000";
1649 return ("file", $diff_status);
1650}
1651
b2b3ada7
DK
1652sub md5sum {
1653 my $arg = shift;
1654 my $ref = ref $arg;
1655 my $md5 = Digest::MD5->new();
0b19138b 1656 if ($ref eq 'GLOB' || $ref eq 'IO::File' || $ref eq 'File::Temp') {
b2b3ada7
DK
1657 $md5->addfile($arg) or croak $!;
1658 } elsif ($ref eq 'SCALAR') {
1659 $md5->add($$arg) or croak $!;
1660 } elsif (!$ref) {
1661 $md5->add($arg) or croak $!;
1662 } else {
1663 ::fatal "Can't provide MD5 hash for unknown ref type: '", $ref, "'";
1664 }
1665 return $md5->hexdigest();
1666}
1667
2da9ee08
RZ
1668sub gc_directory {
1669 if ($can_compress && -f $_ && basename($_) eq "unhandled.log") {
1670 my $out_filename = $_ . ".gz";
1671 open my $in_fh, "<", $_ or die "Unable to open $_: $!\n";
1672 binmode $in_fh;
1673 my $gz = Compress::Zlib::gzopen($out_filename, "ab") or
1674 die "Unable to open $out_filename: $!\n";
1675
1676 my $res;
1677 while ($res = sysread($in_fh, my $str, 1024)) {
1678 $gz->gzwrite($str) or
1679 die "Unable to write: ".$gz->gzerror()."!\n";
1680 }
1681 unlink $_ or die "unlink $File::Find::name: $!\n";
1682 } elsif (-f $_ && basename($_) eq "index") {
1683 unlink $_ or die "unlink $_: $!\n";
1684 }
1685}
1686
9b981fc6
EW
1687package Git::SVN;
1688use strict;
1689use warnings;
060610c5
EW
1690use Fcntl qw/:DEFAULT :seek/;
1691use constant rev_map_fmt => 'NH40';
ecc712dd 1692use vars qw/$default_repo_id $default_ref_id $_no_metadata $_follow_parent
62e349d2 1693 $_repack $_repack_flags $_use_svm_props $_head
70ae04e4 1694 $_use_svnsync_props $no_reuse_existing $_minimize_url
e82f0d73 1695 $_use_log_author $_add_author_from $_localtime/;
9b981fc6
EW
1696use Carp qw/croak/;
1697use File::Path qw/mkpath/;
373274f9 1698use File::Copy qw/copy/;
9b981fc6 1699use IPC::Open3;
7d944c33 1700use Memoize; # core since 5.8.0, Jul 2002
8bff7c53 1701use Memoize::Storable;
9b981fc6 1702
94bc914c
KW
1703my ($_gc_nr, $_gc_period);
1704
9b981fc6
EW
1705# properties that we do not log:
1706my %SKIP_PROP;
1707BEGIN {
1708 %SKIP_PROP = map { $_ => 1 } qw/svn:wc:ra_dav:version-url
1709 svn:special svn:executable
1710 svn:entry:committed-rev
1711 svn:entry:last-author
1712 svn:entry:uuid
1713 svn:entry:committed-date/;
91b03282
EW
1714
1715 # some options are read globally, but can be overridden locally
1716 # per [svn-remote "..."] section. Command-line options will *NOT*
1717 # override options set in an [svn-remote "..."] section
c5f71ad0
SV
1718 no strict 'refs';
1719 for my $option (qw/follow_parent no_metadata use_svm_props
1720 use_svnsync_props/) {
1721 my $key = $option;
91b03282 1722 $key =~ tr/_//d;
c5f71ad0
SV
1723 my $prop = "-$option";
1724 *$option = sub {
1725 my ($self) = @_;
1726 return $self->{$prop} if exists $self->{$prop};
1727 my $k = "svn-remote.$self->{repo_id}.$key";
1728 eval { command_oneline(qw/config --get/, $k) };
1729 if ($@) {
1730 $self->{$prop} = ${"Git::SVN::_$option"};
91b03282 1731 } else {
c5f71ad0
SV
1732 my $v = command_oneline(qw/config --bool/,$k);
1733 $self->{$prop} = $v eq 'false' ? 0 : 1;
91b03282 1734 }
c5f71ad0
SV
1735 return $self->{$prop};
1736 }
91b03282 1737 }
9b981fc6
EW
1738}
1739
0b19138b 1740
321b1842
EW
1741my (%LOCKFILES, %INDEX_FILES);
1742END {
1743 unlink keys %LOCKFILES if %LOCKFILES;
1744 unlink keys %INDEX_FILES if %INDEX_FILES;
1745}
373274f9 1746
4bb9ed04
EW
1747sub resolve_local_globs {
1748 my ($url, $fetch, $glob_spec) = @_;
1749 return unless defined $glob_spec;
1750 my $ref = $glob_spec->{ref};
1751 my $path = $glob_spec->{path};
6f5748e1
AB
1752 foreach (command(qw#for-each-ref --format=%(refname) refs/#)) {
1753 next unless m#^$ref->{regex}$#;
4bb9ed04 1754 my $p = $1;
bf655fd7
RE
1755 my $pathname = desanitize_refname($path->full_path($p));
1756 my $refname = desanitize_refname($ref->full_path($p));
4bb9ed04
EW
1757 if (my $existing = $fetch->{$pathname}) {
1758 if ($existing ne $refname) {
1759 die "Refspec conflict:\n",
6f5748e1
AB
1760 "existing: $existing\n",
1761 " globbed: $refname\n";
4bb9ed04 1762 }
6f5748e1 1763 my $u = (::cmt_metadata("$refname"))[0];
4e9f6cc7 1764 $u =~ s!^\Q$url\E(/|$)!! or die
6f5748e1 1765 "$refname: '$url' not found in '$u'\n";
4bb9ed04
EW
1766 if ($pathname ne $u) {
1767 warn "W: Refspec glob conflict ",
6f5748e1 1768 "(ref: $refname):\n",
4bb9ed04
EW
1769 "expected path: $pathname\n",
1770 " real path: $u\n",
1771 "Continuing ahead with $u\n";
1772 next;
1773 }
1774 } else {
4bb9ed04
EW
1775 $fetch->{$pathname} = $refname;
1776 }
1777 }
1778}
1779
e98671e5
EW
1780sub parse_revision_argument {
1781 my ($base, $head) = @_;
1782 if (!defined $::_revision || $::_revision eq 'BASE:HEAD') {
1783 return ($base, $head);
1784 }
1785 return ($1, $2) if ($::_revision =~ /^(\d+):(\d+)$/);
1786 return ($::_revision, $::_revision) if ($::_revision =~ /^\d+$/);
1787 return ($head, $head) if ($::_revision eq 'HEAD');
1788 return ($base, $1) if ($::_revision =~ /^BASE:(\d+)$/);
1789 return ($1, $head) if ($::_revision =~ /^(\d+):HEAD$/);
1790 die "revision argument: $::_revision not understood by git-svn\n";
1791}
1792
0af9c9f9 1793sub fetch_all {
4bb9ed04 1794 my ($repo_id, $remotes) = @_;
905f8b7d
EW
1795 if (ref $repo_id) {
1796 my $gs = $repo_id;
1797 $repo_id = undef;
1798 $repo_id = $gs->{repo_id};
1799 }
1800 $remotes ||= read_all_remotes();
7447b4bc
EW
1801 my $remote = $remotes->{$repo_id} or
1802 die "[svn-remote \"$repo_id\"] unknown\n";
e518192f 1803 my $fetch = $remote->{fetch};
7447b4bc 1804 my $url = $remote->{url} or die "svn-remote.$repo_id.url not defined\n";
e518192f 1805 my (@gs, @globs);
0af9c9f9 1806 my $ra = Git::SVN::Ra->new($url);
26a62d57 1807 my $uuid = $ra->get_uuid;
0af9c9f9 1808 my $head = $ra->get_latest_revnum;
577e9fca
EW
1809
1810 # ignore errors, $head revision may not even exist anymore
1811 eval { $ra->get_log("", $head, 0, 1, 0, 1, sub { $head = $_[1] }) };
1812 warn "W: $@\n" if $@;
1813
28710f74 1814 my $base = defined $fetch ? $head : 0;
e518192f
EW
1815
1816 # read the max revs for wildcard expansion (branches/*, tags/*)
1817 foreach my $t (qw/branches tags/) {
1818 defined $remote->{$t} or next;
62244069
MB
1819 push @globs, @{$remote->{$t}};
1820
93f2689c
EW
1821 my $max_rev = eval { tmp_config(qw/--int --get/,
1822 "svn-remote.$repo_id.${t}-maxRev") };
1823 if (defined $max_rev && ($max_rev < $base)) {
1824 $base = $max_rev;
d6d3346b
EW
1825 } elsif (!defined $max_rev) {
1826 $base = 0;
e518192f
EW
1827 }
1828 }
1829
db03cd24
EW
1830 if ($fetch) {
1831 foreach my $p (sort keys %$fetch) {
1832 my $gs = Git::SVN->new($fetch->{$p}, $repo_id, $p);
060610c5 1833 my $lr = $gs->rev_map_max;
db03cd24
EW
1834 if (defined $lr) {
1835 $base = $lr if ($lr < $base);
1836 }
1837 push @gs, $gs;
0af9c9f9 1838 }
0af9c9f9 1839 }
e98671e5
EW
1840
1841 ($base, $head) = parse_revision_argument($base, $head);
e518192f 1842 $ra->gs_fetch_loop_common($base, $head, \@gs, \@globs);
0af9c9f9
EW
1843}
1844
47e39c55
EW
1845sub read_all_remotes {
1846 my $r = {};
63c56022
JA
1847 my $use_svm_props = eval { command_oneline(qw/config --bool
1848 svn.useSvmProps/) };
1849 $use_svm_props = $use_svm_props eq 'true' if $use_svm_props;
ffd5c8e4 1850 my $svn_refspec = qr{\s*(.*?)\s*:\s*(.+?)\s*};
8b8fc068 1851 foreach (grep { s/^svn-remote\.// } command(qw/config -l/)) {
6f5748e1
AB
1852 if (m!^(.+)\.fetch=$svn_refspec$!) {
1853 my ($remote, $local_ref, $remote_ref) = ($1, $2, $3);
1854 die("svn-remote.$remote: remote ref '$remote_ref' "
1855 . "must start with 'refs/'\n")
1856 unless $remote_ref =~ m{^refs/};
46cb16fb 1857 $local_ref = uri_decode($local_ref);
46cf98ba 1858 $r->{$remote}->{fetch}->{$local_ref} = $remote_ref;
63c56022
JA
1859 $r->{$remote}->{svm} = {} if $use_svm_props;
1860 } elsif (m!^(.+)\.usesvmprops=\s*(.*)\s*$!) {
1861 $r->{$1}->{svm} = {};
47e39c55
EW
1862 } elsif (m!^(.+)\.url=\s*(.*)\s*$!) {
1863 $r->{$1}->{url} = $2;
12a296bc
AS
1864 } elsif (m!^(.+)\.pushurl=\s*(.*)\s*$!) {
1865 $r->{$1}->{pushurl} = $2;
6f5748e1
AB
1866 } elsif (m!^(.+)\.(branches|tags)=$svn_refspec$!) {
1867 my ($remote, $t, $local_ref, $remote_ref) =
1868 ($1, $2, $3, $4);
1869 die("svn-remote.$remote: remote ref '$remote_ref' ($t) "
1870 . "must start with 'refs/'\n")
1871 unless $remote_ref =~ m{^refs/};
46cb16fb 1872 $local_ref = uri_decode($local_ref);
62244069 1873 my $rs = {
6f5748e1
AB
1874 t => $t,
1875 remote => $remote,
07576208
JS
1876 path => Git::SVN::GlobSpec->new($local_ref, 1),
1877 ref => Git::SVN::GlobSpec->new($remote_ref, 0) };
4bb9ed04
EW
1878 if (length($rs->{ref}->{right}) != 0) {
1879 die "The '*' glob character must be the last ",
6f5748e1 1880 "character of '$remote_ref'\n";
4bb9ed04 1881 }
6f5748e1 1882 push @{ $r->{$remote}->{$t} }, $rs;
47e39c55
EW
1883 }
1884 }
63c56022
JA
1885
1886 map {
1887 if (defined $r->{$_}->{svm}) {
1888 my $svm;
1889 eval {
1890 my $section = "svn-remote.$_";
1891 $svm = {
1892 source => tmp_config('--get',
1893 "$section.svm-source"),
1894 replace => tmp_config('--get',
1895 "$section.svm-replace"),
1896 }
1897 };
1898 $r->{$_}->{svm} = $svm;
1899 }
1900 } keys %$r;
1901
47e39c55
EW
1902 $r;
1903}
1904
ecc712dd 1905sub init_vars {
94bc914c 1906 $_gc_nr = $_gc_period = 1000;
af788a6e
KW
1907 if (defined $_repack || defined $_repack_flags) {
1908 warn "Repack options are obsolete; they have no effect.\n";
1909 }
ecc712dd
EW
1910}
1911
b805b44a 1912sub verify_remotes_sanity {
536c4b09 1913 return unless -d $ENV{GIT_DIR};
b805b44a
EW
1914 my %seen;
1915 foreach (command(qw/config -l/)) {
1916 if (m!^svn-remote\.(?:.+)\.fetch=.*:refs/remotes/(\S+)\s*$!) {
1917 if ($seen{$1}) {
1918 die "Remote ref refs/remote/$1 is tracked by",
1919 "\n \"$_\"\nand\n \"$seen{$1}\"\n",
1920 "Please resolve this ambiguity in ",
1921 "your git configuration file before ",
1922 "continuing\n";
1923 }
1924 $seen{$1} = $_;
1925 }
1926 }
1927}
1928
e6434f87
EW
1929sub find_existing_remote {
1930 my ($url, $remotes) = @_;
befc9adc 1931 return undef if $no_reuse_existing;
e6434f87
EW
1932 my $existing;
1933 foreach my $repo_id (keys %$remotes) {
1934 my $u = $remotes->{$repo_id}->{url} or next;
1935 next if $u ne $url;
1936 $existing = $repo_id;
1937 last;
1938 }
1939 $existing;
1940}
b805b44a 1941
e6434f87 1942sub init_remote_config {
d8115c51 1943 my ($self, $url, $no_write) = @_;
e6434f87
EW
1944 $url =~ s!/+$!!; # strip trailing slash
1945 my $r = read_all_remotes();
1946 my $existing = find_existing_remote($url, $r);
1947 if ($existing) {
e518192f
EW
1948 unless ($no_write) {
1949 print STDERR "Using existing ",
1950 "[svn-remote \"$existing\"]\n";
1951 }
e6434f87 1952 $self->{repo_id} = $existing;
4a1bb4c3 1953 } elsif ($_minimize_url) {
e6434f87
EW
1954 my $min_url = Git::SVN::Ra->new($url)->minimize_url;
1955 $existing = find_existing_remote($min_url, $r);
1956 if ($existing) {
e518192f
EW
1957 unless ($no_write) {
1958 print STDERR "Using existing ",
1959 "[svn-remote \"$existing\"]\n";
1960 }
e6434f87
EW
1961 $self->{repo_id} = $existing;
1962 }
1963 if ($min_url ne $url) {
e518192f
EW
1964 unless ($no_write) {
1965 print STDERR "Using higher level of URL: ",
1966 "$url => $min_url\n";
1967 }
e6434f87
EW
1968 my $old_path = $self->{path};
1969 $self->{path} = $url;
4e9f6cc7 1970 $self->{path} =~ s!^\Q$min_url\E(/|$)!!;
e6434f87
EW
1971 if (length $old_path) {
1972 $self->{path} .= "/$old_path";
1973 }
1974 $url = $min_url;
1975 }
1976 }
1977 my $orig_url;
1978 if (!$existing) {
b805b44a 1979 # verify that we aren't overwriting anything:
e6434f87 1980 $orig_url = eval {
706587fc 1981 command_oneline('config', '--get',
e6434f87 1982 "svn-remote.$self->{repo_id}.url")
706587fc 1983 };
b805b44a 1984 if ($orig_url && ($orig_url ne $url)) {
e6434f87 1985 die "svn-remote.$self->{repo_id}.url already set: ",
b805b44a
EW
1986 "$orig_url\nwanted to set to: $url\n";
1987 }
9b981fc6 1988 }
e6434f87 1989 my ($xrepo_id, $xpath) = find_ref($self->refname);
6f5748e1 1990 if (!$no_write && defined $xpath) {
e6434f87 1991 die "svn-remote.$xrepo_id.fetch already set to track ",
6f5748e1 1992 "$xpath:", $self->refname, "\n";
e6434f87 1993 }
d8115c51
EW
1994 unless ($no_write) {
1995 command_noisy('config',
1996 "svn-remote.$self->{repo_id}.url", $url);
46cf98ba 1997 $self->{path} =~ s{^/}{};
5268f9ed 1998 $self->{path} =~ s{%([0-9A-F]{2})}{chr hex($1)}ieg;
d8115c51
EW
1999 command_noisy('config', '--add',
2000 "svn-remote.$self->{repo_id}.fetch",
2001 "$self->{path}:".$self->refname);
2002 }
9b981fc6 2003 $self->{url} = $url;
e6434f87
EW
2004}
2005
a8ae2623
EW
2006sub find_by_url { # repos_root and, path are optional
2007 my ($class, $full_url, $repos_root, $path) = @_;
56973d20 2008
1a97a506 2009 return undef unless defined $full_url;
56973d20
AR
2010 remove_username($full_url);
2011 remove_username($repos_root) if defined $repos_root;
a8ae2623
EW
2012 my $remotes = read_all_remotes();
2013 if (defined $full_url && defined $repos_root && !defined $path) {
2014 $path = $full_url;
2015 $path =~ s#^\Q$repos_root\E(?:/|$)##;
2016 }
2017 foreach my $repo_id (keys %$remotes) {
2018 my $u = $remotes->{$repo_id}->{url} or next;
56973d20 2019 remove_username($u);
a8ae2623
EW
2020 next if defined $repos_root && $repos_root ne $u;
2021
2022 my $fetch = $remotes->{$repo_id}->{fetch} || {};
62244069
MB
2023 foreach my $t (qw/branches tags/) {
2024 foreach my $globspec (@{$remotes->{$repo_id}->{$t}}) {
2025 resolve_local_globs($u, $fetch, $globspec);
2026 }
a8ae2623
EW
2027 }
2028 my $p = $path;
0bb91d9a 2029 my $rwr = rewrite_root({repo_id => $repo_id});
63c56022
JA
2030 my $svm = $remotes->{$repo_id}->{svm}
2031 if defined $remotes->{$repo_id}->{svm};
a8ae2623
EW
2032 unless (defined $p) {
2033 $p = $full_url;
0bb91d9a 2034 my $z = $u;
63c56022 2035 my $prefix = '';
0bb91d9a
JG
2036 if ($rwr) {
2037 $z = $rwr;
1b7e543a 2038 remove_username($z);
63c56022
JA
2039 } elsif (defined $svm) {
2040 $z = $svm->{source};
2041 $prefix = $svm->{replace};
2042 $prefix =~ s#^\Q$u\E(?:/|$)##;
2043 $prefix =~ s#/$##;
0bb91d9a 2044 }
63c56022 2045 $p =~ s#^\Q$z\E(?:/|$)#$prefix# or next;
a8ae2623
EW
2046 }
2047 foreach my $f (keys %$fetch) {
2048 next if $f ne $p;
2049 return Git::SVN->new($fetch->{$f}, $repo_id, $f);
2050 }
2051 }
2052 undef;
2053}
2054
e6434f87 2055sub init {
d8115c51 2056 my ($class, $url, $path, $repo_id, $ref_id, $no_write) = @_;
e6434f87
EW
2057 my $self = _new($class, $repo_id, $ref_id, $path);
2058 if (defined $url) {
d8115c51 2059 $self->init_remote_config($url, $no_write);
e6434f87 2060 }
9b981fc6
EW
2061 $self;
2062}
2063
706587fc
EW
2064sub find_ref {
2065 my ($ref_id) = @_;
2066 foreach (command(qw/config -l/)) {
2067 next unless m!^svn-remote\.(.+)\.fetch=
ffd5c8e4 2068 \s*(.*?)\s*:\s*(.+?)\s*$!x;
706587fc
EW
2069 my ($repo_id, $path, $ref) = ($1, $2, $3);
2070 if ($ref eq $ref_id) {
2071 $path = '' if ($path =~ m#^\./?#);
2072 return ($repo_id, $path);
2073 }
2074 }
2075 (undef, undef, undef);
2076}
2077
9b981fc6 2078sub new {
706587fc
EW
2079 my ($class, $ref_id, $repo_id, $path) = @_;
2080 if (defined $ref_id && !defined $repo_id && !defined $path) {
2081 ($repo_id, $path) = find_ref($ref_id);
2082 if (!defined $repo_id) {
2083 die "Could not find a \"svn-remote.*.fetch\" key ",
2084 "in the repository configuration matching: ",
6f5748e1 2085 "$ref_id\n";
706587fc
EW
2086 }
2087 }
2088 my $self = _new($class, $repo_id, $ref_id, $path);
8b8fc068
EW
2089 if (!defined $self->{path} || !length $self->{path}) {
2090 my $fetch = command_oneline('config', '--get',
2091 "svn-remote.$repo_id.fetch",
6f5748e1 2092 ":$ref_id\$") or
8b8fc068 2093 die "Failed to read \"svn-remote.$repo_id.fetch\" ",
6f5748e1 2094 "\":$ref_id\$\" in config\n";
8b8fc068
EW
2095 ($self->{path}, undef) = split(/\s*:\s*/, $fetch);
2096 }
b1a954a3
EW
2097 $self->{path} =~ s{/+}{/}g;
2098 $self->{path} =~ s{\A/}{};
2099 $self->{path} =~ s{/\z}{};
706587fc
EW
2100 $self->{url} = command_oneline('config', '--get',
2101 "svn-remote.$repo_id.url") or
2102 die "Failed to read \"svn-remote.$repo_id.url\" in config\n";
12a296bc
AS
2103 $self->{pushurl} = eval { command_oneline('config', '--get',
2104 "svn-remote.$repo_id.pushurl") };
d6d3346b 2105 $self->rebuild;
9b981fc6
EW
2106 $self;
2107}
2108
bf655fd7 2109sub refname {
6f5748e1 2110 my ($refname) = $_[0]->{ref_id} ;
bf655fd7
RE
2111
2112 # It cannot end with a slash /, we'll throw up on this because
2113 # SVN can't have directories with a slash in their name, either:
2114 if ($refname =~ m{/$}) {
2115 die "ref: '$refname' ends with a trailing slash, this is ",
2116 "not permitted by git nor Subversion\n";
2117 }
2118
2119 # It cannot have ASCII control character space, tilde ~, caret ^,
2120 # colon :, question-mark ?, asterisk *, space, or open bracket [
2121 # anywhere.
2122 #
2123 # Additionally, % must be escaped because it is used for escaping
2124 # and we want our escaped refname to be reversible
2125 $refname =~ s{([ \%~\^:\?\*\[\t])}{uc sprintf('%%%02x',ord($1))}eg;
2126
2127 # no slash-separated component can begin with a dot .
2128 # /.* becomes /%2E*
2129 $refname =~ s{/\.}{/%2E}g;
2130
2131 # It cannot have two consecutive dots .. anywhere
2132 # .. becomes %2E%2E
2133 $refname =~ s{\.\.}{%2E%2E}g;
2134
73d41955
TS
2135 # trailing dots and .lock are not allowed
2136 # .$ becomes %2E and .lock becomes %2Elock
2137 $refname =~ s{\.(?=$|lock$)}{%2E};
2138
2139 # the sequence @{ is used to access the reflog
2140 # @{ becomes %40{
2141 $refname =~ s{\@\{}{%40\{}g;
2142
bf655fd7
RE
2143 return $refname;
2144}
2145
2146sub desanitize_refname {
2147 my ($refname) = @_;
2148 $refname =~ s{%(?:([0-9A-F]{2}))}{chr hex($1)}eg;
2149 return $refname;
2150}
9b981fc6 2151
26a62d57
EW
2152sub svm_uuid {
2153 my ($self) = @_;
2154 return $self->{svm}->{uuid} if $self->svm;
2155 $self->ra;
2156 unless ($self->{svm}) {
2157 die "SVM UUID not cached, and reading remotely failed\n";
2158 }
2159 $self->{svm}->{uuid};
2160}
8a49ee97 2161
26a62d57
EW
2162sub svm {
2163 my ($self) = @_;
2164 return $self->{svm} if $self->{svm};
2165 my $svm;
8a49ee97
EW
2166 # see if we have it in our config, first:
2167 eval {
26a62d57
EW
2168 my $section = "svn-remote.$self->{repo_id}";
2169 $svm = {
93f2689c
EW
2170 source => tmp_config('--get', "$section.svm-source"),
2171 uuid => tmp_config('--get', "$section.svm-uuid"),
befc9adc 2172 replace => tmp_config('--get', "$section.svm-replace"),
8a49ee97
EW
2173 }
2174 };
befc9adc
EW
2175 if ($svm && $svm->{source} && $svm->{uuid} && $svm->{replace}) {
2176 $self->{svm} = $svm;
2177 }
26a62d57
EW
2178 $self->{svm};
2179}
2180
2181sub _set_svm_vars {
2182 my ($self, $ra) = @_;
db03cd24
EW
2183 return $ra if $self->svm;
2184
2185 my @err = ( "useSvmProps set, but failed to read SVM properties\n",
befc9adc 2186 "(svm:source, svm:uuid) ",
db03cd24
EW
2187 "from the following URLs:\n" );
2188 sub read_svm_props {
befc9adc
EW
2189 my ($self, $ra, $path, $r) = @_;
2190 my $props = ($ra->get_dir($path, $r))[2];
db03cd24 2191 my $src = $props->{'svm:source'};
db03cd24 2192 my $uuid = $props->{'svm:uuid'};
befc9adc 2193 return undef if (!$src || !$uuid);
26a62d57 2194
befc9adc 2195 chomp($src, $uuid);
26a62d57 2196
b3e95936 2197 $uuid =~ m{^[0-9a-f\-]{30,}$}i
db03cd24 2198 or die "doesn't look right - svm:uuid is '$uuid'\n";
befc9adc
EW
2199
2200 # the '!' is used to mark the repos_root!/relative/path
2201 $src =~ s{/?!/?}{/};
db03cd24 2202 $src =~ s{/+$}{}; # no trailing slashes please
befc9adc 2203 # username is of no interest
8a49ee97 2204 $src =~ s{(^[a-z\+]*://)[^/@]*@}{$1};
8a49ee97 2205
befc9adc
EW
2206 my $replace = $ra->{url};
2207 $replace .= "/$path" if length $path;
2208
db03cd24 2209 my $section = "svn-remote.$self->{repo_id}";
befc9adc
EW
2210 tmp_config("$section.svm-source", $src);
2211 tmp_config("$section.svm-replace", $replace);
2212 tmp_config("$section.svm-uuid", $uuid);
2213 $self->{svm} = {
2214 source => $src,
2215 uuid => $uuid,
2216 replace => $replace
2217 };
db03cd24
EW
2218 }
2219
2220 my $r = $ra->get_latest_revnum;
2221 my $path = $self->{path};
befc9adc 2222 my %tried;
db03cd24 2223 while (length $path) {
befc9adc
EW
2224 unless ($tried{"$self->{url}/$path"}) {
2225 return $ra if $self->read_svm_props($ra, $path, $r);
2226 $tried{"$self->{url}/$path"} = 1;
db03cd24 2227 }
befc9adc 2228 $path =~ s#/?[^/]+$##;
8a49ee97 2229 }
befc9adc
EW
2230 die "Path: '$path' should be ''\n" if $path ne '';
2231 return $ra if $self->read_svm_props($ra, $path, $r);
2232 $tried{"$self->{url}/$path"} = 1;
db03cd24
EW
2233
2234 if ($ra->{repos_root} eq $self->{url}) {
befc9adc 2235 die @err, (map { " $_\n" } keys %tried), "\n";
db03cd24
EW
2236 }
2237
2238 # nope, make sure we're connected to the repository root:
2239 my $ok;
2240 my @tried_b;
2241 $path = $ra->{svn_path};
db03cd24
EW
2242 $ra = Git::SVN::Ra->new($ra->{repos_root});
2243 while (length $path) {
befc9adc
EW
2244 unless ($tried{"$ra->{url}/$path"}) {
2245 $ok = $self->read_svm_props($ra, $path, $r);
2246 last if $ok;
2247 $tried{"$ra->{url}/$path"} = 1;
2248 }
2249 $path =~ s#/?[^/]+$##;
db03cd24 2250 }
befc9adc
EW
2251 die "Path: '$path' should be ''\n" if $path ne '';
2252 $ok ||= $self->read_svm_props($ra, $path, $r);
2253 $tried{"$ra->{url}/$path"} = 1;
db03cd24 2254 if (!$ok) {
befc9adc 2255 die @err, (map { " $_\n" } keys %tried), "\n";
db03cd24
EW
2256 }
2257 Git::SVN::Ra->new($self->{url});
8a49ee97
EW
2258}
2259
62e349d2
EW
2260sub svnsync {
2261 my ($self) = @_;
2262 return $self->{svnsync} if $self->{svnsync};
2263
2264 if ($self->no_metadata) {
2265 die "Can't have both 'noMetadata' and ",
2266 "'useSvnsyncProps' options set!\n";
2267 }
2268 if ($self->rewrite_root) {
2269 die "Can't have both 'useSvnsyncProps' and 'rewriteRoot' ",
2270 "options set!\n";
2271 }
3e18ce1a
JS
2272 if ($self->rewrite_uuid) {
2273 die "Can't have both 'useSvnsyncProps' and 'rewriteUUID' ",
2274 "options set!\n";
2275 }
62e349d2
EW
2276
2277 my $svnsync;
2278 # see if we have it in our config, first:
2279 eval {
2280 my $section = "svn-remote.$self->{repo_id}";
98fa5b68
EW
2281
2282 my $url = tmp_config('--get', "$section.svnsync-url");
2283 ($url) = ($url =~ m{^([a-z\+]+://\S+)$}) or
2284 die "doesn't look right - svn:sync-from-url is '$url'\n";
2285
2286 my $uuid = tmp_config('--get', "$section.svnsync-uuid");
b3e95936 2287 ($uuid) = ($uuid =~ m{^([0-9a-f\-]{30,})$}i) or
98fa5b68
EW
2288 die "doesn't look right - svn:sync-from-uuid is '$uuid'\n";
2289
2290 $svnsync = { url => $url, uuid => $uuid }
62e349d2
EW
2291 };
2292 if ($svnsync && $svnsync->{url} && $svnsync->{uuid}) {
2293 return $self->{svnsync} = $svnsync;
2294 }
2295
2296 my $err = "useSvnsyncProps set, but failed to read " .
2297 "svnsync property: svn:sync-from-";
2298 my $rp = $self->ra->rev_proplist(0);
2299
2300 my $url = $rp->{'svn:sync-from-url'} or die $err . "url\n";
98fa5b68 2301 ($url) = ($url =~ m{^([a-z\+]+://\S+)$}) or
62e349d2
EW
2302 die "doesn't look right - svn:sync-from-url is '$url'\n";
2303
2304 my $uuid = $rp->{'svn:sync-from-uuid'} or die $err . "uuid\n";
b3e95936 2305 ($uuid) = ($uuid =~ m{^([0-9a-f\-]{30,})$}i) or
62e349d2
EW
2306 die "doesn't look right - svn:sync-from-uuid is '$uuid'\n";
2307
2308 my $section = "svn-remote.$self->{repo_id}";
2309 tmp_config('--add', "$section.svnsync-uuid", $uuid);
2310 tmp_config('--add', "$section.svnsync-url", $url);
2311 return $self->{svnsync} = { url => $url, uuid => $uuid };
2312}
2313
26a62d57
EW
2314# this allows us to memoize our SVN::Ra UUID locally and avoid a
2315# remote lookup (useful for 'git svn log').
2316sub ra_uuid {
2317 my ($self) = @_;
2318 unless ($self->{ra_uuid}) {
2319 my $key = "svn-remote.$self->{repo_id}.uuid";
2320 my $uuid = eval { tmp_config('--get', $key) };
b3e95936 2321 if (!$@ && $uuid && $uuid =~ /^([a-f\d\-]{30,})$/i) {
26a62d57
EW
2322 $self->{ra_uuid} = $uuid;
2323 } else {
2324 die "ra_uuid called without URL\n" unless $self->{url};
2325 $self->{ra_uuid} = $self->ra->get_uuid;
2326 tmp_config('--add', $key, $self->{ra_uuid});
2327 }
2328 }
2329 $self->{ra_uuid};
2330}
2331
a5460eb7
EW
2332sub _set_repos_root {
2333 my ($self, $repos_root) = @_;
2334 my $k = "svn-remote.$self->{repo_id}.reposRoot";
2335 $repos_root ||= $self->ra->{repos_root};
2336 tmp_config($k, $repos_root);
2337 $repos_root;
2338}
2339
2340sub repos_root {
2341 my ($self) = @_;
2342 my $k = "svn-remote.$self->{repo_id}.reposRoot";
2343 eval { tmp_config('--get', $k) } || $self->_set_repos_root;
2344}
2345
9b981fc6
EW
2346sub ra {
2347 my ($self) = shift;
8a49ee97 2348 my $ra = Git::SVN::Ra->new($self->{url});
a5460eb7 2349 $self->_set_repos_root($ra->{repos_root});
91b03282
EW
2350 if ($self->use_svm_props && !$self->{svm}) {
2351 if ($self->no_metadata) {
97ae0911
EW
2352 die "Can't have both 'noMetadata' and ",
2353 "'useSvmProps' options set!\n";
62e349d2
EW
2354 } elsif ($self->use_svnsync_props) {
2355 die "Can't have both 'useSvnsyncProps' and ",
2356 "'useSvmProps' options set!\n";
91b03282 2357 }
26a62d57 2358 $ra = $self->_set_svm_vars($ra);
8a49ee97
EW
2359 $self->{-want_revprops} = 1;
2360 }
2361 $ra;
9b981fc6
EW
2362}
2363
01bdab84
BS
2364# prop_walk(PATH, REV, SUB)
2365# -------------------------
2366# Recursively traverse PATH at revision REV and invoke SUB for each
2367# directory that contains a SVN property. SUB will be invoked as
2368# follows: &SUB(gs, path, props); where `gs' is this instance of
2369# Git::SVN, `path' the path to the directory where the properties
2370# `props' were found. The `path' will be relative to point of checkout,
2371# that is, if url://repo/trunk is the current Git branch, and that
2372# directory contains a sub-directory `d', SUB will be invoked with `/d/'
2373# as `path' (note the trailing `/').
2374sub prop_walk {
2375 my ($self, $path, $rev, $sub) = @_;
2376
35cda061 2377 $path =~ s#^/##;
01bdab84
BS
2378 my ($dirent, undef, $props) = $self->ra->get_dir($path, $rev);
2379 $path =~ s#^/*#/#g;
9b981fc6 2380 my $p = $path;
01bdab84
BS
2381 # Strip the irrelevant part of the path.
2382 $p =~ s#^/+\Q$self->{path}\E(/|$)#/#;
2383 # Ensure the path is terminated by a `/'.
2384 $p =~ s#/*$#/#;
2385
2386 # The properties contain all the internal SVN stuff nobody
2387 # (usually) cares about.
2388 my $interesting_props = 0;
2389 foreach (keys %{$props}) {
2390 # If it doesn't start with `svn:', it must be a
2391 # user-defined property.
2392 ++$interesting_props and next if $_ !~ /^svn:/;
2393 # FIXME: Fragile, if SVN adds new public properties,
2394 # this needs to be updated.
2395 ++$interesting_props if /^svn:(?:ignore|keywords|executable
2396 |eol-style|mime-type
2397 |externals|needs-lock)$/x;
2398 }
2399 &$sub($self, $p, $props) if $interesting_props;
2400
9b981fc6 2401 foreach (sort keys %$dirent) {
0dc03d6a 2402 next if $dirent->{$_}->{kind} != $SVN::Node::dir;
b7166cce 2403 $self->prop_walk($self->{path} . $p . $_, $rev, $sub);
9b981fc6
EW
2404 }
2405}
2406
3ebe8df7
EW
2407sub last_rev { ($_[0]->last_rev_commit)[0] }
2408sub last_commit { ($_[0]->last_rev_commit)[1] }
2409
9b981fc6
EW
2410# returns the newest SVN revision number and newest commit SHA1
2411sub last_rev_commit {
2412 my ($self) = @_;
2413 if (defined $self->{last_rev} && defined $self->{last_commit}) {
2414 return ($self->{last_rev}, $self->{last_commit});
2415 }
d2866f9e 2416 my $c = ::verify_ref($self->refname.'^0');
91b03282 2417 if ($c && !$self->use_svm_props && !$self->no_metadata) {
d2866f9e 2418 my $rev = (::cmt_metadata($c))[1];
9b981fc6
EW
2419 if (defined $rev) {
2420 ($self->{last_rev}, $self->{last_commit}) = ($rev, $c);
2421 return ($rev, $c);
2422 }
2423 }
060610c5
EW
2424 my $map_path = $self->map_path;
2425 unless (-e $map_path) {
26a62d57
EW
2426 ($self->{last_rev}, $self->{last_commit}) = (undef, undef);
2427 return (undef, undef);
2428 }
66ab84b9 2429 my ($rev, $commit) = $self->rev_map_max(1);
060610c5
EW
2430 ($self->{last_rev}, $self->{last_commit}) = ($rev, $commit);
2431 return ($rev, $commit);
9b981fc6
EW
2432}
2433
3ebe8df7
EW
2434sub get_fetch_range {
2435 my ($self, $min, $max) = @_;
2436 $max ||= $self->ra->get_latest_revnum;
060610c5 2437 $min ||= $self->rev_map_max;
3ebe8df7 2438 (++$min, $max);
9b981fc6
EW
2439}
2440
8a49ee97 2441sub tmp_config {
93f2689c 2442 my (@args) = @_;
b7e5348c
EW
2443 my $old_def_config = "$ENV{GIT_DIR}/svn/config";
2444 my $config = "$ENV{GIT_DIR}/svn/.metadata";
38570a47 2445 if (! -f $config && -f $old_def_config) {
b7e5348c
EW
2446 rename $old_def_config, $config or
2447 die "Failed rename $old_def_config => $config: $!\n";
2448 }
8a49ee97 2449 my $old_config = $ENV{GIT_CONFIG};
93f2689c 2450 $ENV{GIT_CONFIG} = $config;
8a49ee97 2451 $@ = undef;
b4d57e5e
EW
2452 my @ret = eval {
2453 unless (-f $config) {
2454 mkfile($config);
2455 open my $fh, '>', $config or
2456 die "Can't open $config: $!\n";
2457 print $fh "; This file is used internally by ",
2458 "git-svn\n" or die
2459 "Couldn't write to $config: $!\n";
2460 print $fh "; You should not have to edit it\n" or
2461 die "Couldn't write to $config: $!\n";
2462 close $fh or die "Couldn't close $config: $!\n";
2463 }
2464 command('config', @args);
2465 };
8a49ee97
EW
2466 my $err = $@;
2467 if (defined $old_config) {
2468 $ENV{GIT_CONFIG} = $old_config;
2469 } else {
2470 delete $ENV{GIT_CONFIG};
2471 }
2472 die $err if $err;
2473 wantarray ? @ret : $ret[0];
2474}
2475
9b981fc6
EW
2476sub tmp_index_do {
2477 my ($self, $sub) = @_;
2478 my $old_index = $ENV{GIT_INDEX_FILE};
2479 $ENV{GIT_INDEX_FILE} = $self->{index};
8a49ee97 2480 $@ = undef;
b4d57e5e
EW
2481 my @ret = eval {
2482 my ($dir, $base) = ($self->{index} =~ m#^(.*?)/?([^/]+)$#);
2483 mkpath([$dir]) unless -d $dir;
2484 &$sub;
2485 };
8a49ee97
EW
2486 my $err = $@;
2487 if (defined $old_index) {
9b981fc6
EW
2488 $ENV{GIT_INDEX_FILE} = $old_index;
2489 } else {
2490 delete $ENV{GIT_INDEX_FILE};
2491 }
8a49ee97 2492 die $err if $err;
9b981fc6
EW
2493 wantarray ? @ret : $ret[0];
2494}
2495
2496sub assert_index_clean {
2497 my ($self, $treeish) = @_;
2498
2499 $self->tmp_index_do(sub {
2500 command_noisy('read-tree', $treeish) unless -e $self->{index};
2501 my $x = command_oneline('write-tree');
2502 my ($y) = (command(qw/cat-file commit/, $treeish) =~
2503 /^tree ($::sha1)/mo);
e8d120bd
EW
2504 return if $y eq $x;
2505
2506 warn "Index mismatch: $y != $x\nrereading $treeish\n";
2507 unlink $self->{index} or die "unlink $self->{index}: $!\n";
2508 command_noisy('read-tree', $treeish);
9b981fc6
EW
2509 $x = command_oneline('write-tree');
2510 if ($y ne $x) {
2511 ::fatal "trees ($treeish) $y != $x\n",
207f1a75 2512 "Something is seriously wrong...";
9b981fc6
EW
2513 }
2514 });
2515}
2516
2517sub get_commit_parents {
0af9c9f9 2518 my ($self, $log_entry) = @_;
9b981fc6 2519 my (%seen, @ret, @tmp);
0af9c9f9
EW
2520 # legacy support for 'set-tree'; this is only used by set_tree_cb:
2521 if (my $ip = $self->{inject_parents}) {
2522 if (my $commit = delete $ip->{$log_entry->{revision}}) {
2523 push @tmp, $commit;
9b981fc6
EW
2524 }
2525 }
d2866f9e 2526 if (my $cur = ::verify_ref($self->refname.'^0')) {
9b981fc6
EW
2527 push @tmp, $cur;
2528 }
733a65aa
EW
2529 if (my $ipd = $self->{inject_parents_dcommit}) {
2530 if (my $commit = delete $ipd->{$log_entry->{revision}}) {
2531 push @tmp, @$commit;
2532 }
2533 }
44320b9e 2534 push @tmp, $_ foreach (@{$log_entry->{parents}}, @tmp);
9b981fc6
EW
2535 while (my $p = shift @tmp) {
2536 next if $seen{$p};
2537 $seen{$p} = 1;
2538 push @ret, $p;
9b981fc6
EW
2539 }
2540 @ret;
2541}
2542
aea736cc
EW
2543sub rewrite_root {
2544 my ($self) = @_;
2545 return $self->{-rewrite_root} if exists $self->{-rewrite_root};
2546 my $k = "svn-remote.$self->{repo_id}.rewriteRoot";
2547 my $rwr = eval { command_oneline(qw/config --get/, $k) };
2548 if ($rwr) {
2549 $rwr =~ s#/+$##;
2550 if ($rwr !~ m#^[a-z\+]+://#) {
2551 die "$rwr is not a valid URL (key: $k)\n";
2552 }
2553 }
2554 $self->{-rewrite_root} = $rwr;
2555}
2556
3e18ce1a
JS
2557sub rewrite_uuid {
2558 my ($self) = @_;
2559 return $self->{-rewrite_uuid} if exists $self->{-rewrite_uuid};
2560 my $k = "svn-remote.$self->{repo_id}.rewriteUUID";
2561 my $rwid = eval { command_oneline(qw/config --get/, $k) };
2562 if ($rwid) {
2563 $rwid =~ s#/+$##;
2564 if ($rwid !~ m#^[a-f0-9]{8}-(?:[a-f0-9]{4}-){3}[a-f0-9]{12}$#) {
2565 die "$rwid is not a valid UUID (key: $k)\n";
2566 }
2567 }
2568 $self->{-rewrite_uuid} = $rwid;
2569}
2570
aea736cc
EW
2571sub metadata_url {
2572 my ($self) = @_;
2573 ($self->rewrite_root || $self->{url}) .
2574 (length $self->{path} ? '/' . $self->{path} : '');
2575}
2576
706587fc 2577sub full_url {
9b981fc6 2578 my ($self) = @_;
5d3b7cd5 2579 $self->{url} . (length $self->{path} ? '/' . $self->{path} : '');
9b981fc6
EW
2580}
2581
12a296bc
AS
2582sub full_pushurl {
2583 my ($self) = @_;
2584 if ($self->{pushurl}) {
2585 return $self->{pushurl} . (length $self->{path} ? '/' .
2586 $self->{path} : '');
2587 } else {
2588 return $self->full_url;
2589 }
2590}
ad94802a
EW
2591
2592sub set_commit_header_env {
2593 my ($log_entry) = @_;
2594 my %env;
2595 foreach my $ned (qw/NAME EMAIL DATE/) {
2596 foreach my $ac (qw/AUTHOR COMMITTER/) {
2597 $env{"GIT_${ac}_${ned}"} = $ENV{"GIT_${ac}_${ned}"};
2598 }
9b981fc6 2599 }
ad94802a 2600
70ae04e4
AW
2601 $ENV{GIT_AUTHOR_NAME} = $log_entry->{name};
2602 $ENV{GIT_AUTHOR_EMAIL} = $log_entry->{email};
44320b9e 2603 $ENV{GIT_AUTHOR_DATE} = $ENV{GIT_COMMITTER_DATE} = $log_entry->{date};
9b981fc6 2604
70ae04e4
AW
2605 $ENV{GIT_COMMITTER_NAME} = (defined $log_entry->{commit_name})
2606 ? $log_entry->{commit_name}
2607 : $log_entry->{name};
2608 $ENV{GIT_COMMITTER_EMAIL} = (defined $log_entry->{commit_email})
2609 ? $log_entry->{commit_email}
2610 : $log_entry->{email};
ad94802a
EW
2611 \%env;
2612}
70ae04e4 2613
ad94802a
EW
2614sub restore_commit_header_env {
2615 my ($env) = @_;
2616 foreach my $ned (qw/NAME EMAIL DATE/) {
2617 foreach my $ac (qw/AUTHOR COMMITTER/) {
2618 my $k = "GIT_${ac}_${ned}";
2619 if (defined $env->{$k}) {
2620 $ENV{$k} = $env->{$k};
2621 } else {
2622 delete $ENV{$k};
2623 }
2624 }
2625 }
2626}
2627
94bc914c
KW
2628sub gc {
2629 command_noisy('gc', '--auto');
2630};
2631
ad94802a
EW
2632sub do_git_commit {
2633 my ($self, $log_entry) = @_;
2634 my $lr = $self->last_rev;
2635 if (defined $lr && $lr >= $log_entry->{revision}) {
2636 die "Last fetched revision of ", $self->refname,
2637 " was r$lr, but we are about to fetch: ",
2638 "r$log_entry->{revision}!\n";
2639 }
2640 if (my $c = $self->rev_map_get($log_entry->{revision})) {
2641 croak "$log_entry->{revision} = $c already exists! ",
2642 "Why are we refetching it?\n";
2643 }
2644 my $old_env = set_commit_header_env($log_entry);
44320b9e 2645 my $tree = $log_entry->{tree};
9b981fc6
EW
2646 if (!defined $tree) {
2647 $tree = $self->tmp_index_do(sub {
2648 command_oneline('write-tree') });
2649 }
2650 die "Tree is not a valid sha1: $tree\n" if $tree !~ /^$::sha1$/o;
2651
e855bfc0 2652 my @exec = ('git', 'commit-tree', $tree);
0af9c9f9 2653 foreach ($self->get_commit_parents($log_entry)) {
9b981fc6
EW
2654 push @exec, '-p', $_;
2655 }
2656 defined(my $pid = open3(my $msg_fh, my $out_fh, '>&STDERR', @exec))
2657 or croak $!;
16fc08e2
EW
2658 binmode $msg_fh;
2659
2660 # we always get UTF-8 from SVN, but we may want our commits in
2661 # a different encoding.
2662 if (my $enc = Git::config('i18n.commitencoding')) {
2663 require Encode;
2664 Encode::from_to($log_entry->{log}, 'UTF-8', $enc);
2665 }
44320b9e 2666 print $msg_fh $log_entry->{log} or croak $!;
ad94802a 2667 restore_commit_header_env($old_env);
91b03282 2668 unless ($self->no_metadata) {
8a49ee97
EW
2669 print $msg_fh "\ngit-svn-id: $log_entry->{metadata}\n"
2670 or croak $!;
9760adcc 2671 }
9b981fc6
EW
2672 $msg_fh->flush == 0 or croak $!;
2673 close $msg_fh or croak $!;
2674 chomp(my $commit = do { local $/; <$out_fh> });
2675 close $out_fh or croak $!;
2676 waitpid $pid, 0;
2677 croak $? if $?;
2678 if ($commit !~ /^$::sha1$/o) {
2679 die "Failed to commit, invalid sha1: $commit\n";
2680 }
2681
060610c5 2682 $self->rev_map_set($log_entry->{revision}, $commit, 1);
9b981fc6 2683
44320b9e 2684 $self->{last_rev} = $log_entry->{revision};
9b981fc6 2685 $self->{last_commit} = $commit;
49750f30 2686 print "r$log_entry->{revision}" unless $::_q > 1;
8a49ee97 2687 if (defined $log_entry->{svm_revision}) {
49750f30 2688 print " (\@$log_entry->{svm_revision})" unless $::_q > 1;
060610c5 2689 $self->rev_map_set($log_entry->{svm_revision}, $commit,
26a62d57 2690 0, $self->svm_uuid);
8a49ee97 2691 }
49750f30 2692 print " = $commit ($self->{ref_id})\n" unless $::_q > 1;
94bc914c
KW
2693 if (--$_gc_nr == 0) {
2694 $_gc_nr = $_gc_period;
2695 gc();
2696 }
9b981fc6
EW
2697 return $commit;
2698}
2699
fbcc1737
EW
2700sub match_paths {
2701 my ($self, $paths, $r) = @_;
4e9f6cc7 2702 return 1 if $self->{path} eq '';
d542aedb
EW
2703 if (my $path = $paths->{"/$self->{path}"}) {
2704 return ($path->{action} eq 'D') ? 0 : 1;
2705 }
0b2af457 2706 $self->{path_regex} ||= qr/^\/\Q$self->{path}\E\//;
fbcc1737
EW
2707 if (grep /$self->{path_regex}/, keys %$paths) {
2708 return 1;
2709 }
2710 my $c = '';
2711 foreach (split m#/#, $self->{path}) {
2712 $c .= "/$_";
74a81227
EW
2713 next unless ($paths->{$c} &&
2714 ($paths->{$c}->{action} =~ /^[AR]$/));
e518192f
EW
2715 if ($self->ra->check_path($self->{path}, $r) ==
2716 $SVN::Node::dir) {
fbcc1737
EW
2717 return 1;
2718 }
2719 }
2720 return 0;
2721}
2722
15710b6f
EW
2723sub find_parent_branch {
2724 my ($self, $paths, $rev) = @_;
91b03282 2725 return undef unless $self->follow_parent;
e5a0b240 2726 unless (defined $paths) {
c7eba716
EW
2727 my $err_handler = $SVN::Error::handler;
2728 $SVN::Error::handler = \&Git::SVN::Ra::skip_unknown_revs;
3c49a035
MN
2729 $self->ra->get_log([$self->{path}], $rev, $rev, 0, 1, 1,
2730 sub { $paths = $_[0] });
c7eba716 2731 $SVN::Error::handler = $err_handler;
e5a0b240
EW
2732 }
2733 return undef unless defined $paths;
15710b6f
EW
2734
2735 # look for a parent from another branch:
0b2af457 2736 my @b_path_components = split m#/#, $self->{path};
7f578c55
EW
2737 my @a_path_components;
2738 my $i;
2739 while (@b_path_components) {
2740 $i = $paths->{'/'.join('/', @b_path_components)};
74a81227 2741 last if $i && defined $i->{copyfrom_path};
7f578c55
EW
2742 unshift(@a_path_components, pop(@b_path_components));
2743 }
74a81227
EW
2744 return undef unless defined $i && defined $i->{copyfrom_path};
2745 my $branch_from = $i->{copyfrom_path};
7f578c55
EW
2746 if (@a_path_components) {
2747 print STDERR "branch_from: $branch_from => ";
2748 $branch_from .= '/'.join('/', @a_path_components);
2749 print STDERR $branch_from, "\n";
2750 }
3ebe8df7 2751 my $r = $i->{copyfrom_rev};
15710b6f
EW
2752 my $repos_root = $self->ra->{repos_root};
2753 my $url = $self->ra->{url};
0b2af457 2754 my $new_url = $url . $branch_from;
15710b6f 2755 print STDERR "Found possible branch point: ",
85886162
SA
2756 "$new_url => ", $self->full_url, ", $r\n"
2757 unless $::_q > 1;
15710b6f 2758 $branch_from =~ s#^/##;
0b2af457 2759 my $gs = $self->other_gs($new_url, $url,
8e3f9b17 2760 $branch_from, $r, $self->{ref_id});
15710b6f 2761 my ($r0, $parent) = $gs->find_rev_before($r, 1);
553589f7
DM
2762 {
2763 my ($base, $head);
2764 if (!defined $r0 || !defined $parent) {
2765 ($base, $head) = parse_revision_argument(0, $r);
2766 } else {
2767 if ($r0 < $r) {
2768 $gs->ra->get_log([$gs->{path}], $r0 + 1, $r, 1,
2769 0, 1, sub { $base = $_[1] - 1 });
2770 }
2771 }
2772 if (defined $base && $base <= $r) {
d627de6b
EW
2773 $gs->fetch($base, $r);
2774 }
553589f7 2775 ($r0, $parent) = $gs->find_rev_before($r, 1);
15710b6f 2776 }
ef70de96 2777 if (defined $r0 && defined $parent) {
85886162
SA
2778 print STDERR "Found branch parent: ($self->{ref_id}) $parent\n"
2779 unless $::_q > 1;
15710b6f
EW
2780 my $ed;
2781 if ($self->ra->can_do_switch) {
2e5e2480 2782 $self->assert_index_clean($parent);
85886162
SA
2783 print STDERR "Following parent with do_switch\n"
2784 unless $::_q > 1;
15710b6f 2785 # do_switch works with svn/trunk >= r22312, but that
2b27f6c8 2786 # is not included with SVN 1.4.3 (the latest version
15710b6f 2787 # at the moment), so we can't rely on it
83c2fcff 2788 $self->{last_rev} = $r0;
15710b6f 2789 $self->{last_commit} = $parent;
8841b37f 2790 $ed = SVN::Git::Fetcher->new($self, $gs->{path});
8a603774 2791 $gs->ra->gs_do_switch($r0, $rev, $gs,
15710b6f
EW
2792 $self->full_url, $ed)
2793 or die "SVN connection failed somewhere...\n";
9ff74e95
SW
2794 } elsif ($self->ra->trees_match($new_url, $r0,
2795 $self->full_url, $rev)) {
2796 print STDERR "Trees match:\n",
2797 " $new_url\@$r0\n",
2798 " ${\$self->full_url}\@$rev\n",
85886162
SA
2799 "Following parent with no changes\n"
2800 unless $::_q > 1;
9ff74e95
SW
2801 $self->tmp_index_do(sub {
2802 command_noisy('read-tree', $parent);
2803 });
2804 $self->{last_commit} = $parent;
15710b6f 2805 } else {
85886162
SA
2806 print STDERR "Following parent with do_update\n"
2807 unless $::_q > 1;
15710b6f 2808 $ed = SVN::Git::Fetcher->new($self);
8a603774 2809 $self->ra->gs_do_update($rev, $rev, $self, $ed)
15710b6f
EW
2810 or die "SVN connection failed somewhere...\n";
2811 }
85886162 2812 print STDERR "Successfully followed parent\n" unless $::_q > 1;
15710b6f
EW
2813 return $self->make_log_entry($rev, [$parent], $ed);
2814 }
15710b6f
EW
2815 return undef;
2816}
2817
9b981fc6 2818sub do_fetch {
706587fc 2819 my ($self, $paths, $rev) = @_;
15710b6f 2820 my $ed;
9b981fc6 2821 my ($last_rev, @parents);
b9dffd8c
EW
2822 if (my $lc = $self->last_commit) {
2823 # we can have a branch that was deleted, then re-added
2824 # under the same name but copied from another path, in
2825 # which case we'll have multiple parents (we don't
2826 # want to break the original ref, nor lose copypath info):
2827 if (my $log_entry = $self->find_parent_branch($paths, $rev)) {
2828 push @{$log_entry->{parents}}, $lc;
2829 return $log_entry;
2830 }
15710b6f 2831 $ed = SVN::Git::Fetcher->new($self);
9b981fc6 2832 $last_rev = $self->{last_rev};
b9dffd8c
EW
2833 $ed->{c} = $lc;
2834 @parents = ($lc);
9b981fc6
EW
2835 } else {
2836 $last_rev = $rev;
15710b6f
EW
2837 if (my $log_entry = $self->find_parent_branch($paths, $rev)) {
2838 return $log_entry;
2839 }
2840 $ed = SVN::Git::Fetcher->new($self);
9b981fc6 2841 }
8a603774 2842 unless ($self->ra->gs_do_update($last_rev, $rev, $self, $ed)) {
9b981fc6
EW
2843 die "SVN connection failed somewhere...\n";
2844 }
2845 $self->make_log_entry($rev, \@parents, $ed);
2846}
2847
6111b934
EW
2848sub mkemptydirs {
2849 my ($self, $r) = @_;
a5b80d92
EW
2850
2851 sub scan {
2852 my ($r, $empty_dirs, $line) = @_;
2853 if (defined $r && $line =~ /^r(\d+)$/) {
2854 return 0 if $1 > $r;
2855 } elsif ($line =~ /^ \+empty_dir: (.+)$/) {
2856 $empty_dirs->{$1} = 1;
2857 } elsif ($line =~ /^ \-empty_dir: (.+)$/) {
2858 my @d = grep {m[^\Q$1\E(/|$)]} (keys %$empty_dirs);
2859 delete @$empty_dirs{@d};
2860 }
2861 1; # continue
2862 };
2863
6111b934 2864 my %empty_dirs = ();
a5b80d92
EW
2865 my $gz_file = "$self->{dir}/unhandled.log.gz";
2866 if (-f $gz_file) {
2867 if (!$can_compress) {
2868 warn "Compress::Zlib could not be found; ",
2869 "empty directories in $gz_file will not be read\n";
2870 } else {
2871 my $gz = Compress::Zlib::gzopen($gz_file, "rb") or
2872 die "Unable to open $gz_file: $!\n";
2873 my $line;
2874 while ($gz->gzreadline($line) > 0) {
2875 scan($r, \%empty_dirs, $line) or last;
2876 }
2877 $gz->gzclose;
2878 }
2879 }
6111b934 2880
a5b80d92
EW
2881 if (open my $fh, '<', "$self->{dir}/unhandled.log") {
2882 binmode $fh or croak "binmode: $!";
2883 while (<$fh>) {
2884 scan($r, \%empty_dirs, $_) or last;
6111b934 2885 }
a5b80d92 2886 close $fh;
6111b934 2887 }
9be30eed
EW
2888
2889 my $strip = qr/\A\Q$self->{path}\E(?:\/|$)/;
6111b934
EW
2890 foreach my $d (sort keys %empty_dirs) {
2891 $d = uri_decode($d);
9be30eed 2892 $d =~ s/$strip//;
7c42e390 2893 next unless length($d);
6111b934 2894 next if -d $d;
7c42e390 2895 if (-e $d) {
6111b934
EW
2896 warn "$d exists but is not a directory\n";
2897 } else {
2898 print "creating empty directory: $d\n";
2899 mkpath([$d]);
2900 }
2901 }
2902}
2903
97f6987a
EW
2904sub get_untracked {
2905 my ($self, $ed) = @_;
2906 my @out;
2907 my $h = $ed->{empty};
9b981fc6
EW
2908 foreach (sort keys %$h) {
2909 my $act = $h->{$_} ? '+empty_dir' : '-empty_dir';
97f6987a 2910 push @out, " $act: " . uri_encode($_);
9b981fc6
EW
2911 warn "W: $act: $_\n";
2912 }
2913 foreach my $t (qw/dir_prop file_prop/) {
97f6987a 2914 $h = $ed->{$t} or next;
9b981fc6
EW
2915 foreach my $path (sort keys %$h) {
2916 my $ppath = $path eq '' ? '.' : $path;
2917 foreach my $prop (sort keys %{$h->{$path}}) {
1ce255dc 2918 next if $SKIP_PROP{$prop};
9b981fc6 2919 my $v = $h->{$path}->{$prop};
97f6987a
EW
2920 my $t_ppath_prop = "$t: " .
2921 uri_encode($ppath) . ' ' .
2922 uri_encode($prop);
9b981fc6 2923 if (defined $v) {
97f6987a
EW
2924 push @out, " +$t_ppath_prop " .
2925 uri_encode($v);
9b981fc6 2926 } else {
97f6987a 2927 push @out, " -$t_ppath_prop";
9b981fc6
EW
2928 }
2929 }
2930 }
2931 }
2932 foreach my $t (qw/absent_file absent_directory/) {
97f6987a 2933 $h = $ed->{$t} or next;
9b981fc6
EW
2934 foreach my $parent (sort keys %$h) {
2935 foreach my $path (sort @{$h->{$parent}}) {
97f6987a
EW
2936 push @out, " $t: " .
2937 uri_encode("$parent/$path");
9b981fc6
EW
2938 warn "W: $t: $parent/$path ",
2939 "Insufficient permissions?\n";
2940 }
2941 }
2942 }
97f6987a 2943 \@out;
9b981fc6
EW
2944}
2945
e82f0d73
PH
2946# parse_svn_date(DATE)
2947# --------------------
2948# Given a date (in UTC) from Subversion, return a string in the format
2949# "<TZ Offset> <local date/time>" that Git will use.
2950#
2951# By default the parsed date will be in UTC; if $Git::SVN::_localtime
2952# is true we'll convert it to the local timezone instead.
1c8443b0
EW
2953sub parse_svn_date {
2954 my $date = shift || return '+0000 1970-01-01 00:00:00';
2955 my ($Y,$m,$d,$H,$M,$S) = ($date =~ /^(\d{4})\-(\d\d)\-(\d\d)T
b94ead75 2956 (\d\d)\:(\d\d)\:(\d\d)\.\d*Z$/x) or
1c8443b0 2957 croak "Unable to parse date: $date\n";
e82f0d73
PH
2958 my $parsed_date; # Set next.
2959
2960 if ($Git::SVN::_localtime) {
2961 # Translate the Subversion datetime to an epoch time.
2962 # Begin by switching ourselves to $date's timezone, UTC.
2963 my $old_env_TZ = $ENV{TZ};
2964 $ENV{TZ} = 'UTC';
2965
2966 my $epoch_in_UTC =
2967 POSIX::strftime('%s', $S, $M, $H, $d, $m - 1, $Y - 1900);
2968
2969 # Determine our local timezone (including DST) at the
2970 # time of $epoch_in_UTC. $Git::SVN::Log::TZ stored the
2971 # value of TZ, if any, at the time we were run.
2972 if (defined $Git::SVN::Log::TZ) {
2973 $ENV{TZ} = $Git::SVN::Log::TZ;
2974 } else {
2975 delete $ENV{TZ};
2976 }
2977
2978 my $our_TZ =
2979 POSIX::strftime('%Z', $S, $M, $H, $d, $m - 1, $Y - 1900);
2980
2981 # This converts $epoch_in_UTC into our local timezone.
2982 my ($sec, $min, $hour, $mday, $mon, $year,
2983 $wday, $yday, $isdst) = localtime($epoch_in_UTC);
2984
2985 $parsed_date = sprintf('%s %04d-%02d-%02d %02d:%02d:%02d',
2986 $our_TZ, $year + 1900, $mon + 1,
2987 $mday, $hour, $min, $sec);
2988
2989 # Reset us to the timezone in effect when we entered
2990 # this routine.
2991 if (defined $old_env_TZ) {
2992 $ENV{TZ} = $old_env_TZ;
2993 } else {
2994 delete $ENV{TZ};
2995 }
2996 } else {
2997 $parsed_date = "+0000 $Y-$m-$d $H:$M:$S";
2998 }
2999
3000 return $parsed_date;
1c8443b0
EW
3001}
3002
8e3f9b17 3003sub other_gs {
0b2af457 3004 my ($self, $new_url, $url,
8e3f9b17 3005 $branch_from, $r, $old_ref_id) = @_;
0b2af457 3006 my $gs = Git::SVN->find_by_url($new_url, $url, $branch_from);
8e3f9b17
SV
3007 unless ($gs) {
3008 my $ref_id = $old_ref_id;
54fb7f9b 3009 $ref_id =~ s/\@\d+-*$//;
8e3f9b17
SV
3010 $ref_id .= "\@$r";
3011 # just grow a tail if we're not unique enough :x
3012 $ref_id .= '-' while find_ref($ref_id);
8e3f9b17
SV
3013 my ($u, $p, $repo_id) = ($new_url, '', $ref_id);
3014 if ($u =~ s#^\Q$url\E(/|$)##) {
3015 $p = $u;
3016 $u = $url;
3017 $repo_id = $self->{repo_id};
3018 }
3235b705
DK
3019 while (1) {
3020 # It is possible to tag two different subdirectories at
3021 # the same revision. If the url for an existing ref
3022 # does not match, we must either find a ref with a
3023 # matching url or create a new ref by growing a tail.
3024 $gs = Git::SVN->init($u, $p, $repo_id, $ref_id, 1);
3025 my (undef, $max_commit) = $gs->rev_map_max(1);
3026 last if (!$max_commit);
3027 my ($url) = ::cmt_metadata($max_commit);
85f022e9 3028 last if ($url eq $gs->metadata_url);
3235b705
DK
3029 $ref_id .= '-';
3030 }
3031 print STDERR "Initializing parent: $ref_id\n" unless $::_q > 1;
8e3f9b17
SV
3032 }
3033 $gs
3034}
3035
36db1edd
ML
3036sub call_authors_prog {
3037 my ($orig_author) = @_;
d3d7d47e 3038 $orig_author = command_oneline('rev-parse', '--sq-quote', $orig_author);
36db1edd
ML
3039 my $author = `$::_authors_prog $orig_author`;
3040 if ($? != 0) {
3041 die "$::_authors_prog failed with exit code $?\n"
3042 }
3043 if ($author =~ /^\s*(.+?)\s*<(.*)>\s*$/) {
3044 my ($name, $email) = ($1, $2);
3045 $email = undef if length $2 == 0;
3046 return [$name, $email];
3047 } else {
3048 die "Author: $orig_author: $::_authors_prog returned "
3049 . "invalid author format: $author\n";
3050 }
3051}
3052
1c8443b0
EW
3053sub check_author {
3054 my ($author) = @_;
3055 if (!defined $author || length $author == 0) {
3056 $author = '(no author)';
36db1edd
ML
3057 }
3058 if (!defined $::users{$author}) {
3059 if (defined $::_authors_prog) {
3060 $::users{$author} = call_authors_prog($author);
3061 } elsif (defined $::_authors) {
3062 die "Author: $author not defined in $::_authors file\n";
3063 }
1c8443b0
EW
3064 }
3065 $author;
3066}
3067
f1264bd6
SV
3068sub find_extra_svk_parents {
3069 my ($self, $ed, $tickets, $parents) = @_;
3070 # aha! svk:merge property changed...
3071 my @tickets = split "\n", $tickets;
3072 my @known_parents;
3073 for my $ticket ( @tickets ) {
3074 my ($uuid, $path, $rev) = split /:/, $ticket;
3075 if ( $uuid eq $self->ra_uuid ) {
bf60fff8 3076 my $url = $self->{url};
f1264bd6
SV
3077 my $repos_root = $url;
3078 my $branch_from = $path;
3079 $branch_from =~ s{^/}{};
3080 my $gs = $self->other_gs($repos_root."/".$branch_from,
3081 $url,
3082 $branch_from,
3083 $rev,
3084 $self->{ref_id});
3085 if ( my $commit = $gs->rev_map_get($rev, $uuid) ) {
3086 # wahey! we found it, but it might be
3087 # an old one (!)
e9e4c8b7 3088 push @known_parents, [ $rev, $commit ];
f1264bd6
SV
3089 }
3090 }
3091 }
e9e4c8b7
AV
3092 # Ordering matters; highest-numbered commit merge tickets
3093 # first, as they may account for later merge ticket additions
3094 # or changes.
3095 @known_parents = map {$_->[1]} sort {$b->[0] <=> $a->[0]} @known_parents;
f1264bd6
SV
3096 for my $parent ( @known_parents ) {
3097 my @cmd = ('rev-list', $parent, map { "^$_" } @$parents );
3098 my ($msg_fh, $ctx) = command_output_pipe(@cmd);
3099 my $new;
3100 while ( <$msg_fh> ) {
3101 $new=1;last;
3102 }
3103 command_close_pipe($msg_fh, $ctx);
3104 if ( $new ) {
3105 print STDERR
3106 "Found merge parent (svk:merge ticket): $parent\n";
3107 push @$parents, $parent;
3108 }
3109 }
3110}
3111
7d944c33
SV
3112sub lookup_svn_merge {
3113 my $uuid = shift;
3114 my $url = shift;
3115 my $merge = shift;
3116
3117 my ($source, $revs) = split ":", $merge;
3118 my $path = $source;
3119 $path =~ s{^/}{};
3120 my $gs = Git::SVN->find_by_url($url.$source, $url, $path);
3121 if ( !$gs ) {
3122 warn "Couldn't find revmap for $url$source\n";
3123 return;
3124 }
3125 my @ranges = split ",", $revs;
3126 my ($tip, $tip_commit);
3127 my @merged_commit_ranges;
3128 # find the tip
3129 for my $range ( @ranges ) {
3130 my ($bottom, $top) = split "-", $range;
3131 $top ||= $bottom;
33973a5b
SV
3132 my $bottom_commit = $gs->find_rev_after( $bottom, 1, $top );
3133 my $top_commit = $gs->find_rev_before( $top, 1, $bottom );
7d944c33
SV
3134
3135 unless ($top_commit and $bottom_commit) {
3136 warn "W:unknown path/rev in svn:mergeinfo "
3137 ."dirprop: $source:$range\n";
3138 next;
3139 }
3140
124b70a2
MH
3141 if (scalar(command('rev-parse', "$bottom_commit^@"))) {
3142 push @merged_commit_ranges,
3143 "$bottom_commit^..$top_commit";
3144 } else {
3145 push @merged_commit_ranges, "$top_commit";
3146 }
7d944c33
SV
3147
3148 if ( !defined $tip or $top > $tip ) {
3149 $tip = $top;
3150 $tip_commit = $top_commit;
3151 }
3152 }
3153 return ($tip_commit, @merged_commit_ranges);
3154}
7a955a53
SV
3155
3156sub _rev_list {
3157 my ($msg_fh, $ctx) = command_output_pipe(
3158 "rev-list", @_,
3159 );
3160 my @rv;
3161 while ( <$msg_fh> ) {
3162 chomp;
3163 push @rv, $_;
3164 }
3165 command_close_pipe($msg_fh, $ctx);
3166 @rv;
3167}
3168
3169sub check_cherry_pick {
3170 my $base = shift;
3171 my $tip = shift;
a3c75056 3172 my $parents = shift;
7a955a53
SV
3173 my @ranges = @_;
3174 my %commits = map { $_ => 1 }
eabd73a3 3175 _rev_list("--no-merges", $tip, "--not", $base, @$parents, "--");
7a955a53 3176 for my $range ( @ranges ) {
eabd73a3 3177 delete @commits{_rev_list($range, "--")};
7a955a53 3178 }
1cef6500
AM
3179 for my $commit (keys %commits) {
3180 if (has_no_changes($commit)) {
3181 delete $commits{$commit};
3182 }
3183 }
7a955a53
SV
3184 return (keys %commits);
3185}
3186
1cef6500
AM
3187sub has_no_changes {
3188 my $commit = shift;
3189
3190 my @revs = split / /, command_oneline(
3191 qw(rev-list --parents -1 -m), $commit);
3192
3193 # Commits with no parents, e.g. the start of a partial branch,
3194 # have changes by definition.
3195 return 1 if (@revs < 2);
3196
3197 # Commits with multiple parents, e.g a merge, have no changes
3198 # by definition.
3199 return 0 if (@revs > 2);
3200
3201 return (command_oneline("rev-parse", "$commit^{tree}") eq
3202 command_oneline("rev-parse", "$commit~1^{tree}"));
3203}
3204
8bff7c53
AM
3205# The GIT_DIR environment variable is not always set until after the command
3206# line arguments are processed, so we can't memoize in a BEGIN block.
3207{
3208 my $memoized = 0;
3209
3210 sub memoize_svn_mergeinfo_functions {
3211 return if $memoized;
3212 $memoized = 1;
3213
3214 my $cache_path = "$ENV{GIT_DIR}/svn/.caches/";
3215 mkpath([$cache_path]) unless -d $cache_path;
3216
3217 tie my %lookup_svn_merge_cache => 'Memoize::Storable',
3218 "$cache_path/lookup_svn_merge.db", 'nstore';
3219 memoize 'lookup_svn_merge',
3220 SCALAR_CACHE => 'FAULT',
3221 LIST_CACHE => ['HASH' => \%lookup_svn_merge_cache],
3222 ;
3223
3224 tie my %check_cherry_pick_cache => 'Memoize::Storable',
3225 "$cache_path/check_cherry_pick.db", 'nstore';
3226 memoize 'check_cherry_pick',
3227 SCALAR_CACHE => 'FAULT',
3228 LIST_CACHE => ['HASH' => \%check_cherry_pick_cache],
3229 ;
3230
3231 tie my %has_no_changes_cache => 'Memoize::Storable',
3232 "$cache_path/has_no_changes.db", 'nstore';
3233 memoize 'has_no_changes',
3234 SCALAR_CACHE => ['HASH' => \%has_no_changes_cache],
3235 LIST_CACHE => 'FAULT',
3236 ;
3237 }
8ac3a667
SV
3238
3239 sub unmemoize_svn_mergeinfo_functions {
3240 return if not $memoized;
3241 $memoized = 0;
3242
3243 Memoize::unmemoize 'lookup_svn_merge';
3244 Memoize::unmemoize 'check_cherry_pick';
3245 Memoize::unmemoize 'has_no_changes';
3246 }
f5549afd
JK
3247
3248 Memoize::memoize 'Git::SVN::repos_root';
8ac3a667
SV
3249}
3250
3251END {
3252 # Force cache writeout explicitly instead of waiting for
3253 # global destruction to avoid segfault in Storable:
3254 # http://rt.cpan.org/Public/Bug/Display.html?id=36087
3255 unmemoize_svn_mergeinfo_functions();
7d944c33
SV
3256}
3257
ea020cbd
SV
3258sub parents_exclude {
3259 my $parents = shift;
3260 my @commits = @_;
3261 return unless @commits;
3262
3263 my @excluded;
3264 my $excluded;
3265 do {
3266 my @cmd = ('rev-list', "-1", @commits, "--not", @$parents );
3267 $excluded = command_oneline(@cmd);
3268 if ( $excluded ) {
3269 my @new;
3270 my $found;
3271 for my $commit ( @commits ) {
3272 if ( $commit eq $excluded ) {
3273 push @excluded, $commit;
3274 $found++;
3275 last;
3276 }
3277 else {
3278 push @new, $commit;
3279 }
3280 }
3281 die "saw commit '$excluded' in rev-list output, "
3282 ."but we didn't ask for that commit (wanted: @commits --not @$parents)"
3283 unless $found;
3284 @commits = @new;
3285 }
3286 }
3287 while ($excluded and @commits);
3288
3289 return @excluded;
3290}
3291
3292
dff589ef
SV
3293# note: this function should only be called if the various dirprops
3294# have actually changed
3295sub find_extra_svn_parents {
3296 my ($self, $ed, $mergeinfo, $parents) = @_;
3297 # aha! svk:merge property changed...
3298
8bff7c53
AM
3299 memoize_svn_mergeinfo_functions();
3300
dff589ef
SV
3301 # We first search for merged tips which are not in our
3302 # history. Then, we figure out which git revisions are in
3303 # that tip, but not this revision. If all of those revisions
3304 # are now marked as merge, we can add the tip as a parent.
3305 my @merges = split "\n", $mergeinfo;
3306 my @merge_tips;
bf60fff8 3307 my $url = $self->{url};
7d944c33 3308 my $uuid = $self->ra_uuid;
ea020cbd 3309 my %ranges;
dff589ef 3310 for my $merge ( @merges ) {
7d944c33
SV
3311 my ($tip_commit, @ranges) =
3312 lookup_svn_merge( $uuid, $url, $merge );
dff589ef
SV
3313 unless (!$tip_commit or
3314 grep { $_ eq $tip_commit } @$parents ) {
3315 push @merge_tips, $tip_commit;
ea020cbd 3316 $ranges{$tip_commit} = \@ranges;
dff589ef
SV
3317 } else {
3318 push @merge_tips, undef;
3319 }
3320 }
ea020cbd
SV
3321
3322 my %excluded = map { $_ => 1 }
3323 parents_exclude($parents, grep { defined } @merge_tips);
3324
3325 # check merge tips for new parents
3326 my @new_parents;
dff589ef
SV
3327 for my $merge_tip ( @merge_tips ) {
3328 my $spec = shift @merges;
ea020cbd
SV
3329 next unless $merge_tip and $excluded{$merge_tip};
3330
3331 my $ranges = $ranges{$merge_tip};
3332
7a955a53 3333 # check out 'new' tips
41c01693
AM
3334 my $merge_base;
3335 eval {
3336 $merge_base = command_oneline(
3337 "merge-base",
3338 @$parents, $merge_tip,
3339 );
3340 };
3341 if ($@) {
3342 die "An error occurred during merge-base"
3343 unless $@->isa("Git::Error::Command");
3344
3345 warn "W: Cannot find common ancestor between ".
3346 "@$parents and $merge_tip. Ignoring merge info.\n";
3347 next;
3348 }
7a955a53
SV
3349
3350 # double check that there are no missing non-merge commits
3351 my (@incomplete) = check_cherry_pick(
3352 $merge_base, $merge_tip,
a3c75056 3353 $parents,
7a955a53
SV
3354 @$ranges,
3355 );
3356
3357 if ( @incomplete ) {
3358 warn "W:svn cherry-pick ignored ($spec) - missing "
3359 .@incomplete." commit(s) (eg $incomplete[0])\n";
3360 } else {
3361 warn
3362 "Found merge parent (svn:mergeinfo prop): ",
3363 $merge_tip, "\n";
3364 push @new_parents, $merge_tip;
3365 }
3366 }
3367
3368 # cater for merges which merge commits from multiple branches
3369 if ( @new_parents > 1 ) {
3370 for ( my $i = 0; $i <= $#new_parents; $i++ ) {
3371 for ( my $j = 0; $j <= $#new_parents; $j++ ) {
3372 next if $i == $j;
3373 next unless $new_parents[$i];
3374 next unless $new_parents[$j];
3375 my $revs = command_oneline(
0fe19753
EW
3376 "rev-list", "-1",
3377 "$new_parents[$i]..$new_parents[$j]",
7a955a53
SV
3378 );
3379 if ( !$revs ) {
6a2009e7 3380 undef($new_parents[$j]);
7a955a53 3381 }
dff589ef
SV
3382 }
3383 }
3384 }
7a955a53 3385 push @$parents, grep { defined } @new_parents;
dff589ef
SV
3386}
3387
9b981fc6 3388sub make_log_entry {
97f6987a
EW
3389 my ($self, $rev, $parents, $ed) = @_;
3390 my $untracked = $self->get_untracked($ed);
3391
f1264bd6
SV
3392 my @parents = @$parents;
3393 my $ps = $ed->{path_strip} || "";
3394 for my $path ( grep { m/$ps/ } %{$ed->{dir_prop}} ) {
3395 my $props = $ed->{dir_prop}{$path};
3396 if ( $props->{"svk:merge"} ) {
3397 $self->find_extra_svk_parents
3398 ($ed, $props->{"svk:merge"}, \@parents);
3399 }
dff589ef
SV
3400 if ( $props->{"svn:mergeinfo"} ) {
3401 $self->find_extra_svn_parents
3402 ($ed,
3403 $props->{"svn:mergeinfo"},
3404 \@parents);
3405 }
f1264bd6
SV
3406 }
3407
9b981fc6 3408 open my $un, '>>', "$self->{dir}/unhandled.log" or croak $!;
97f6987a
EW
3409 print $un "r$rev\n" or croak $!;
3410 print $un $_, "\n" foreach @$untracked;
f1264bd6 3411 my %log_entry = ( parents => \@parents, revision => $rev,
97f6987a 3412 log => '');
fbcc1737 3413
8a49ee97 3414 my $headrev;
fbcc1737 3415 my $logged = delete $self->{logged_rev_props};
8a49ee97 3416 if (!$logged || $self->{-want_revprops}) {
fbcc1737
EW
3417 my $rp = $self->ra->rev_proplist($rev);
3418 foreach (sort keys %$rp) {
3419 my $v = $rp->{$_};
3420 if (/^svn:(author|date|log)$/) {
3421 $log_entry{$1} = $v;
8a49ee97
EW
3422 } elsif ($_ eq 'svm:headrev') {
3423 $headrev = $v;
fbcc1737
EW
3424 } else {
3425 print $un " rev_prop: ", uri_encode($_), ' ',
3426 uri_encode($v), "\n";
3427 }
9b981fc6 3428 }
fbcc1737
EW
3429 } else {
3430 map { $log_entry{$_} = $logged->{$_} } keys %$logged;
9b981fc6
EW
3431 }
3432 close $un or croak $!;
97f6987a 3433
9b981fc6 3434 $log_entry{date} = parse_svn_date($log_entry{date});
9b981fc6 3435 $log_entry{log} .= "\n";
db03cd24
EW
3436 my $author = $log_entry{author} = check_author($log_entry{author});
3437 my ($name, $email) = defined $::users{$author} ? @{$::users{$author}}
70ae04e4
AW
3438 : ($author, undef);
3439
3440 my ($commit_name, $commit_email) = ($name, $email);
3441 if ($_use_log_author) {
5ff6aae8
AW
3442 my $name_field;
3443 if ($log_entry{log} =~ /From:\s+(.*\S)\s*\n/i) {
3444 $name_field = $1;
3445 } elsif ($log_entry{log} =~ /Signed-off-by:\s+(.*\S)\s*\n/i) {
3446 $name_field = $1;
3447 }
3448 if (!defined $name_field) {
abfa533d
SB
3449 if (!defined $email) {
3450 $email = $name;
3451 }
5ff6aae8 3452 } elsif ($name_field =~ /(.*?)\s+<(.*)>/) {
70ae04e4 3453 ($name, $email) = ($1, $2);
5ff6aae8
AW
3454 } elsif ($name_field =~ /(.*)@/) {
3455 ($name, $email) = ($1, $name_field);
3456 } else {
abfa533d 3457 ($name, $email) = ($name_field, $name_field);
70ae04e4
AW
3458 }
3459 }
91b03282 3460 if (defined $headrev && $self->use_svm_props) {
aea736cc
EW
3461 if ($self->rewrite_root) {
3462 die "Can't have both 'useSvmProps' and 'rewriteRoot' ",
3463 "options set!\n";
3464 }
3e18ce1a
JS
3465 if ($self->rewrite_uuid) {
3466 die "Can't have both 'useSvmProps' and 'rewriteUUID' ",
3467 "options set!\n";
3468 }
b3e95936 3469 my ($uuid, $r) = $headrev =~ m{^([a-f\d\-]{30,}):(\d+)$}i;
befc9adc
EW
3470 # we don't want "SVM: initializing mirror for junk" ...
3471 return undef if $r == 0;
3472 my $svm = $self->svm;
3473 if ($uuid ne $svm->{uuid}) {
8a49ee97 3474 die "UUID mismatch on SVM path:\n",
befc9adc 3475 "expected: $svm->{uuid}\n",
8a49ee97
EW
3476 " got: $uuid\n";
3477 }
befc9adc
EW
3478 my $full_url = $self->full_url;
3479 $full_url =~ s#^\Q$svm->{replace}\E(/|$)#$svm->{source}$1# or
3480 die "Failed to replace '$svm->{replace}' with ",
3481 "'$svm->{source}' in $full_url\n";
18ea92bd
SV
3482 # throw away username for storing in records
3483 remove_username($full_url);
8a49ee97
EW
3484 $log_entry{metadata} = "$full_url\@$r $uuid";
3485 $log_entry{svm_revision} = $r;
70ae04e4
AW
3486 $email ||= "$author\@$uuid";
3487 $commit_email ||= "$author\@$uuid";
62e349d2
EW
3488 } elsif ($self->use_svnsync_props) {
3489 my $full_url = $self->svnsync->{url};
3490 $full_url .= "/$self->{path}" if length $self->{path};
ce118739 3491 remove_username($full_url);
62e349d2
EW
3492 my $uuid = $self->svnsync->{uuid};
3493 $log_entry{metadata} = "$full_url\@$rev $uuid";
70ae04e4
AW
3494 $email ||= "$author\@$uuid";
3495 $commit_email ||= "$author\@$uuid";
8a49ee97 3496 } else {
ce118739
AR
3497 my $url = $self->metadata_url;
3498 remove_username($url);
3e18ce1a
JS
3499 my $uuid = $self->rewrite_uuid || $self->ra->get_uuid;
3500 $log_entry{metadata} = "$url\@$rev " . $uuid;
3501 $email ||= "$author\@" . $uuid;
3502 $commit_email ||= "$author\@" . $uuid;
8a49ee97 3503 }
db03cd24
EW
3504 $log_entry{name} = $name;
3505 $log_entry{email} = $email;
70ae04e4
AW
3506 $log_entry{commit_name} = $commit_name;
3507 $log_entry{commit_email} = $commit_email;
9b981fc6
EW
3508 \%log_entry;
3509}
3510
3511sub fetch {
3ebe8df7 3512 my ($self, $min_rev, $max_rev, @parents) = @_;
9b981fc6 3513 my ($last_rev, $last_commit) = $self->last_rev_commit;
3ebe8df7