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