Extract Git::SVN::Migration from git-svn.
[git/git.git] / git-svn.perl
CommitLineData
0754e089 1#!/usr/bin/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
29499c0b 13use Git::SVN;
b74fda1c 14use Git::SVN::Log;
b772cb99 15use Git::SVN::Migration;
c2768fa1
MS
16use Git::SVN::Utils qw(fatal can_compress);
17
b0e75250
MS
18use Git qw(
19 git_cmd_try
20 command
21 command_oneline
22 command_noisy
23 command_output_pipe
24 command_close_pipe
25 command_bidi_pipe
26 command_close_bidi_pipe
27);
28
29
15153451
BS
30# From which subdir have we been invoked?
31my $cmd_dir_prefix = eval {
32 command_oneline([qw/rev-parse --show-prefix/], STDERR => 0)
33} || '';
34
5253dc33 35my $git_dir_user_set = 1 if defined $ENV{GIT_DIR};
706587fc 36$ENV{GIT_DIR} ||= '.git';
6af1db44 37$Git::SVN::Ra::_log_window_size = 100;
13ccd6d4 38
184892fb
SS
39if (! exists $ENV{SVN_SSH} && exists $ENV{GIT_SSH}) {
40 $ENV{SVN_SSH} = $ENV{GIT_SSH};
41}
42
43if (exists $ENV{SVN_SSH} && $^O eq 'msys') {
44 $ENV{SVN_SSH} =~ s/\\/\\\\/g;
45 $ENV{SVN_SSH} =~ s/(.*)/"$1"/;
f3a87d92
K
46}
47
f8c9d1d2 48$Git::SVN::Log::TZ = $ENV{TZ};
3397f9df 49$ENV{TZ} = 'UTC';
a00439ac 50$| = 1; # unbuffer STDOUT
3397f9df 51
6ade9bda
RK
52# All SVN commands do it. Otherwise we may die on SIGPIPE when the remote
53# repository decides to close the connection which we expect to be kept alive.
54$SIG{PIPE} = 'IGNORE';
55
f760c903
JH
56# Given a dot separated version number, "subtract" it from
57# the SVN::Core::VERSION; non-negaitive return means the SVN::Core
58# is at least at the version the caller asked for.
59sub compare_svn_version {
60 my (@ours) = split(/\./, $SVN::Core::VERSION);
61 my (@theirs) = split(/\./, $_[0]);
62 my ($i, $diff);
63
64 for ($i = 0; $i < @ours && $i < @theirs; $i++) {
65 $diff = $ours[$i] - $theirs[$i];
66 return $diff if ($diff);
67 }
68 return 1 if ($i < @ours);
69 return -1 if ($i < @theirs);
70 return 0;
71}
72
d32fad2b 73sub _req_svn {
74 require SVN::Core; # use()-ing this causes segfaults for me... *shrug*
75 require SVN::Ra;
76 require SVN::Delta;
f760c903 77 if (::compare_svn_version('1.1.0') < 0) {
d32fad2b 78 fatal "Need SVN::Core 1.1.0 or better (got $SVN::Core::VERSION)";
79 }
b9c85187 80}
c2768fa1 81
3397f9df 82use Carp qw/croak/;
8d7c4fad 83use Digest::MD5;
3397f9df
EW
84use IO::File qw//;
85use File::Basename qw/dirname basename/;
86use File::Path qw/mkpath/;
36db1edd 87use File::Spec;
2da9ee08 88use File::Find;
512b620b 89use Getopt::Long qw/:config gnu_getopt no_ignore_case auto_abbrev/;
968bdf1f 90use IPC::Open3;
8f9facfe 91use Git::SVN::Editor qw//;
a6180325 92use Git::SVN::Fetcher qw//;
9f7ad147 93use Git::SVN::Ra qw//;
c102f4cf 94use Git::SVN::Prompt qw//;
f5549afd 95use Memoize; # core since 5.8.0, Jul 2002
a5e0cedc 96
336f1714 97BEGIN {
f5549afd
JK
98 Memoize::memoize 'Git::config';
99 Memoize::memoize 'Git::config_bool';
336f1714
EW
100}
101
b9c85187 102my ($SVN);
83e9940a 103
f8c9d1d2
EW
104$sha1 = qr/[a-f\d]{40}/;
105$sha1_short = qr/[a-f\d]{4,40}/;
44320b9e 106my ($_stdin, $_help, $_edit,
62244069 107 $_message, $_file, $_branch_dest,
d05d72e0 108 $_template, $_shared,
c2abd83f 109 $_version, $_fetch_all, $_no_rebase, $_fetch_parent,
b64e1f58 110 $_merge, $_strategy, $_preserve_merges, $_dry_run, $_local,
4be40381 111 $_prefix, $_no_checkout, $_url, $_verbose,
2c96a6c3 112 $_commit_url, $_tag, $_merge_info, $_interactive);
0f80aa03
MS
113
114# This is a refactoring artifact so Git::SVN can get at this git-svn switch.
115sub opt_prefix { return $_prefix || '' }
116
72827aa4 117$Git::SVN::Fetcher::_placeholder_filename = ".gitignore";
49750f30 118$_q ||= 0;
706587fc
EW
119my %remote_opts = ( 'username=s' => \$Git::SVN::Prompt::_username,
120 'config-dir=s' => \$Git::SVN::Ra::config_dir,
edc662f9 121 'no-auth-cache' => \$Git::SVN::Prompt::_no_auth_cache,
72827aa4 122 'ignore-paths=s' => \$Git::SVN::Fetcher::_ignore_regex,
cdb51a13 123 'ignore-refs=s' => \$Git::SVN::Ra::_ignore_refs_regex );
0bed5eaa 124my %fc_opts = ( 'follow-parent|follow!' => \$Git::SVN::_follow_parent,
dc5869c0 125 'authors-file|A=s' => \$_authors,
36db1edd 126 'authors-prog=s' => \$_authors_prog,
ecc712dd 127 'repack:i' => \$Git::SVN::_repack,
97ae0911
EW
128 'noMetadata' => \$Git::SVN::_no_metadata,
129 'useSvmProps' => \$Git::SVN::_use_svm_props,
62e349d2 130 'useSvnsyncProps' => \$Git::SVN::_use_svnsync_props,
6af1db44 131 'log-window-size=i' => \$Git::SVN::Ra::_log_window_size,
1e889ef3 132 'no-checkout' => \$_no_checkout,
49750f30 133 'quiet|q+' => \$_q,
ecc712dd
EW
134 'repack-flags|repack-args|repack-opts=s' =>
135 \$Git::SVN::_repack_flags,
70ae04e4 136 'use-log-author' => \$Git::SVN::_use_log_author,
6aa9ba14 137 'add-author-from' => \$Git::SVN::_add_author_from,
e82f0d73 138 'localtime' => \$Git::SVN::_localtime,
706587fc 139 %remote_opts );
36f5b1f0 140
62244069 141my ($_trunk, @_tags, @_branches, $_stdlayout);
0dfaf0a4 142my %icv;
dadc6d2a 143my %init_opts = ( 'template=s' => \$_template, 'shared:s' => \$_shared,
62244069
MB
144 'trunk|T=s' => \$_trunk, 'tags|t=s@' => \@_tags,
145 'branches|b=s@' => \@_branches, 'prefix=s' => \$_prefix,
8f728fb9 146 'stdlayout|s' => \$_stdlayout,
6b48829d 147 'minimize-url|m!' => \$Git::SVN::_minimize_url,
0dfaf0a4
EW
148 'no-metadata' => sub { $icv{noMetadata} = 1 },
149 'use-svm-props' => sub { $icv{useSvmProps} = 1 },
150 'use-svnsync-props' => sub { $icv{useSvnsyncProps} = 1 },
151 'rewrite-root=s' => sub { $icv{rewriteRoot} = $_[1] },
3e18ce1a 152 'rewrite-uuid=s' => sub { $icv{rewriteUUID} = $_[1] },
dadc6d2a 153 %remote_opts );
27e9fb8d 154my %cmt_opts = ( 'edit|e' => \$_edit,
72827aa4
JN
155 'rmdir' => \$Git::SVN::Editor::_rmdir,
156 'find-copies-harder' => \$Git::SVN::Editor::_find_copies_harder,
157 'l=i' => \$Git::SVN::Editor::_rename_limit,
158 'copy-similarity|C=i'=> \$Git::SVN::Editor::_cp_similarity
27e9fb8d 159);
9d55b41a 160
3397f9df 161my %cmd = (
2a3240be 162 fetch => [ \&cmd_fetch, "Download new revisions from SVN",
e98671e5 163 { 'revision|r=s' => \$_revision,
905f8b7d 164 'fetch-all|all' => \$_fetch_all,
c2abd83f 165 'parent|p' => \$_fetch_parent,
e98671e5 166 %fc_opts } ],
0425ea90
EW
167 clone => [ \&cmd_clone, "Initialize and fetch revisions",
168 { 'revision|r=s' => \$_revision,
40a1530c 169 'preserve-empty-dirs' =>
72827aa4 170 \$Git::SVN::Fetcher::_preserve_empty_dirs,
40a1530c 171 'placeholder-filename=s' =>
72827aa4 172 \$Git::SVN::Fetcher::_placeholder_filename,
0425ea90 173 %fc_opts, %init_opts } ],
d2866f9e 174 init => [ \&cmd_init, "Initialize a repo for tracking" .
f8ab6b73 175 " (requires URL argument)",
9d55b41a 176 \%init_opts ],
dadc6d2a
EW
177 'multi-init' => [ \&cmd_multi_init,
178 "Deprecated alias for ".
179 "'$0 init -T<trunk> -b<branches> -t<tags>'",
180 \%init_opts ],
d7ad3bed
EW
181 dcommit => [ \&cmd_dcommit,
182 'Commit several diffs to merge with upstream',
3289e86e
EW
183 { 'merge|m|M' => \$_merge,
184 'strategy|s=s' => \$_strategy,
905f8b7d 185 'verbose|v' => \$_verbose,
3289e86e 186 'dry-run|n' => \$_dry_run,
905f8b7d 187 'fetch-all|all' => \$_fetch_all,
ba24e745
EW
188 'commit-url=s' => \$_commit_url,
189 'revision|r=i' => \$_revision,
171af110 190 'no-rebase' => \$_no_rebase,
6abd9332 191 'mergeinfo=s' => \$_merge_info,
afd7f1eb 192 'interactive|i' => \$_interactive,
4b155223 193 %cmt_opts, %fc_opts } ],
5de70efb
FR
194 branch => [ \&cmd_branch,
195 'Create a branch in the SVN repository',
196 { 'message|m=s' => \$_message,
62244069 197 'destination|d=s' => \$_branch_dest,
5de70efb 198 'dry-run|n' => \$_dry_run,
6594f0b7
IM
199 'tag|t' => \$_tag,
200 'username=s' => \$Git::SVN::Prompt::_username,
201 'commit-url=s' => \$_commit_url } ],
5de70efb
FR
202 tag => [ sub { $_tag = 1; cmd_branch(@_) },
203 'Create a tag in the SVN repository',
204 { 'message|m=s' => \$_message,
62244069 205 'destination|d=s' => \$_branch_dest,
6594f0b7
IM
206 'dry-run|n' => \$_dry_run,
207 'username=s' => \$Git::SVN::Prompt::_username,
208 'commit-url=s' => \$_commit_url } ],
1ce255dc
EW
209 'set-tree' => [ \&cmd_set_tree,
210 "Set an SVN repository to a git tree-ish",
e84dc6df 211 { 'stdin' => \$_stdin, %cmt_opts, %fc_opts, } ],
d05ddec5
BS
212 'create-ignore' => [ \&cmd_create_ignore,
213 'Create a .gitignore per svn:ignore',
214 { 'revision|r=i' => \$_revision
215 } ],
6111b934
EW
216 'mkdirs' => [ \&cmd_mkdirs ,
217 "recreate empty directories after a checkout",
218 { 'revision|r=i' => \$_revision } ],
15153451
BS
219 'propget' => [ \&cmd_propget,
220 'Print the value of a property on a file or directory',
221 { 'revision|r=i' => \$_revision } ],
51e057cf
BS
222 'proplist' => [ \&cmd_proplist,
223 'List all properties of a file or directory',
224 { 'revision|r=i' => \$_revision } ],
5969cbe1 225 'show-ignore' => [ \&cmd_show_ignore, "Show svn:ignore listings",
4dbfe2e9 226 { 'revision|r=i' => \$_revision
05b4df31 227 } ],
2d879792
VK
228 'show-externals' => [ \&cmd_show_externals, "Show svn:externals listings",
229 { 'revision|r=i' => \$_revision
230 } ],
1c8443b0 231 'multi-fetch' => [ \&cmd_multi_fetch,
e98671e5
EW
232 "Deprecated alias for $0 fetch --all",
233 { 'revision|r=s' => \$_revision, %fc_opts } ],
706587fc
EW
234 'migrate' => [ sub { },
235 # no-op, we automatically run this anyways,
706587fc
EW
236 'Migrate configuration/metadata/layout from
237 previous versions of git-svn',
a836a0e1
EW
238 { 'minimize' => \$Git::SVN::Migration::_minimize,
239 %remote_opts } ],
f8c9d1d2
EW
240 'log' => [ \&Git::SVN::Log::cmd_show_log, 'Show commit logs',
241 { 'limit=i' => \$Git::SVN::Log::limit,
79bb8d88 242 'revision|r=s' => \$_revision,
f8c9d1d2
EW
243 'verbose|v' => \$Git::SVN::Log::verbose,
244 'incremental' => \$Git::SVN::Log::incremental,
245 'oneline' => \$Git::SVN::Log::oneline,
246 'show-commit' => \$Git::SVN::Log::show_commit,
247 'non-recursive' => \$Git::SVN::Log::non_recursive,
79bb8d88 248 'authors-file|A=s' => \$_authors,
f8c9d1d2 249 'color' => \$Git::SVN::Log::color,
4dbfe2e9 250 'pager=s' => \$Git::SVN::Log::pager
79bb8d88 251 } ],
222566e4
EW
252 'find-rev' => [ \&cmd_find_rev,
253 "Translate between SVN revision numbers and tree-ish",
4dbfe2e9 254 {} ],
905f8b7d
EW
255 'rebase' => [ \&cmd_rebase, "Fetch and rebase your working directory",
256 { 'merge|m|M' => \$_merge,
257 'verbose|v' => \$_verbose,
258 'strategy|s=s' => \$_strategy,
dee41f3e 259 'local|l' => \$_local,
905f8b7d 260 'fetch-all|all' => \$_fetch_all,
7d45e146 261 'dry-run|n' => \$_dry_run,
b64e1f58 262 'preserve-merges|p' => \$_preserve_merges,
905f8b7d 263 %fc_opts } ],
44320b9e
EW
264 'commit-diff' => [ \&cmd_commit_diff,
265 'Commit a diff between two trees',
27e9fb8d
EW
266 { 'message|m=s' => \$_message,
267 'file|F=s' => \$_file,
45bf473a 268 'revision|r=s' => \$_revision,
27e9fb8d 269 %cmt_opts } ],
e6fefa92
DK
270 'info' => [ \&cmd_info,
271 "Show info about the latest SVN revision
272 on the current branch",
8b014d71 273 { 'url' => \$_url, } ],
6fb5375e
TS
274 'blame' => [ \&Git::SVN::Log::cmd_blame,
275 "Show what revision and author last modified each line of a file",
2c96a6c3 276 { 'git-format' => \$Git::SVN::Log::_git_format } ],
195643f2
BJ
277 'reset' => [ \&cmd_reset,
278 "Undo fetches back to the specified SVN revision",
279 { 'revision|r=s' => \$_revision,
280 'parent|p' => \$_fetch_parent } ],
2da9ee08
RZ
281 'gc' => [ \&cmd_gc,
282 "Compress unhandled.log files in .git/svn and remove " .
283 "index files in .git/svn",
284 {} ],
3397f9df 285);
9d55b41a 286
afd7f1eb
FH
287use Term::ReadLine;
288package FakeTerm;
289sub new {
290 my ($class, $reason) = @_;
291 return bless \$reason, shift;
292}
293sub readline {
294 my $self = shift;
295 die "Cannot use readline on FakeTerm: $$self";
296}
297package main;
298
299my $term = eval {
300 $ENV{"GIT_SVN_NOTTY"}
301 ? new Term::ReadLine 'git-svn', \*STDIN, \*STDOUT
302 : new Term::ReadLine 'git-svn';
303};
304if ($@) {
305 $term = new FakeTerm "$@: going non-interactive";
306}
307
3397f9df
EW
308my $cmd;
309for (my $i = 0; $i < @ARGV; $i++) {
310 if (defined $cmd{$ARGV[$i]}) {
311 $cmd = $ARGV[$i];
312 splice @ARGV, $i, 1;
313 last;
9a8c92ac
BJ
314 } elsif ($ARGV[$i] eq 'help') {
315 $cmd = $ARGV[$i+1];
316 usage(0);
3397f9df
EW
317 }
318};
319
540424b2
EW
320# make sure we're always running at the top-level working directory
321unless ($cmd && $cmd =~ /(?:clone|init|multi-init)$/) {
5253dc33
EW
322 unless (-d $ENV{GIT_DIR}) {
323 if ($git_dir_user_set) {
324 die "GIT_DIR=$ENV{GIT_DIR} explicitly set, ",
325 "but it is not a directory\n";
326 }
327 my $git_dir = delete $ENV{GIT_DIR};
fe4003f6
DM
328 my $cdup = undef;
329 git_cmd_try {
330 $cdup = command_oneline(qw/rev-parse --show-cdup/);
331 $git_dir = '.' unless ($cdup);
332 chomp $cdup if ($cdup);
333 $cdup = "." unless ($cdup && length $cdup);
334 } "Already at toplevel, but $git_dir not found\n";
5253dc33
EW
335 chdir $cdup or die "Unable to chdir up to '$cdup'\n";
336 unless (-d $git_dir) {
337 die "$git_dir still not found after going to ",
338 "'$cdup'\n";
339 }
340 $ENV{GIT_DIR} = $git_dir;
341 }
ffe256f9 342 $_repository = Git->repository(Repository => $ENV{GIT_DIR});
5253dc33 343}
f4dd334b
GH
344
345my %opts = %{$cmd{$cmd}->[2]} if (defined $cmd);
346
1a30582b 347read_git_config(\%opts);
222566e4
EW
348if ($cmd && ($cmd eq 'log' || $cmd eq 'blame')) {
349 Getopt::Long::Configure('pass_through');
350}
87182b17 351my $rv = GetOptions(%opts, 'h|H' => \$_help, 'version|V' => \$_version,
f4dd334b
GH
352 'minimize-connections' => \$Git::SVN::Migration::_minimize,
353 'id|i=s' => \$Git::SVN::default_ref_id,
354 'svn-remote|remote|R=s' => sub {
355 $Git::SVN::no_reuse_existing = 1;
356 $Git::SVN::default_repo_id = $_[1] });
357exit 1 if (!$rv && $cmd && $cmd ne 'log');
358
359usage(0) if $_help;
360version() if $_version;
361usage(1) unless defined $cmd;
362load_authors() if $_authors;
36db1edd
ML
363if (defined $_authors_prog) {
364 $_authors_prog = "'" . File::Spec->rel2abs($_authors_prog) . "'";
365}
f4dd334b 366
0425ea90 367unless ($cmd =~ /^(?:clone|init|multi-init|commit-diff)$/) {
706587fc
EW
368 Git::SVN::Migration::migration_check();
369}
ecc712dd 370Git::SVN::init_vars();
b805b44a
EW
371eval {
372 Git::SVN::verify_remotes_sanity();
373 $cmd{$cmd}->[0]->(@ARGV);
e3bd4dda 374 post_fetch_checkout();
b805b44a
EW
375};
376fatal $@ if $@;
3397f9df
EW
377exit 0;
378
379####################### primary functions ######################
380sub usage {
381 my $exit = shift || 0;
382 my $fd = $exit ? \*STDERR : \*STDOUT;
383 print $fd <<"";
384git-svn - bidirectional operations between a single Subversion tree and git
1b1dd23f 385Usage: git svn <command> [options] [arguments]\n
448c81b4
EW
386
387 print $fd "Available commands:\n" unless $cmd;
3397f9df
EW
388
389 foreach (sort keys %cmd) {
448c81b4 390 next if $cmd && $cmd ne $_;
a836a0e1 391 next if /^multi-/; # don't show deprecated commands
b203b769 392 print $fd ' ',pack('A17',$_),$cmd{$_}->[1],"\n";
aa807bc2 393 foreach (sort keys %{$cmd{$_}->[2]}) {
512b620b
EW
394 # mixed-case options are for .git/config only
395 next if /[A-Z]/ && /^[a-z]+$/i;
448c81b4 396 # prints out arguments as they should be passed:
b8c92cad 397 my $x = s#[:=]s$## ? '<arg>' : s#[:=]i$## ? '<num>' : '';
b203b769 398 print $fd ' ' x 21, join(', ', map { length $_ > 1 ?
448c81b4
EW
399 "--$_" : "-$_" }
400 split /\|/,$_)," $x\n";
401 }
3397f9df
EW
402 }
403 print $fd <<"";
448c81b4
EW
404\nGIT_SVN_ID may be set in the environment or via the --id/-i switch to an
405arbitrary identifier if you're tracking multiple SVN branches/repositories in
406one git repository and want to keep them separate. See git-svn(1) for more
407information.
3397f9df
EW
408
409 exit $exit;
410}
411
551ce28f 412sub version {
b0779246 413 ::_req_svn();
7d60ab2c 414 print "git-svn version $VERSION (svn $SVN::Core::VERSION)\n";
551ce28f
EW
415 exit 0;
416}
417
afd7f1eb
FH
418sub ask {
419 my ($prompt, %arg) = @_;
420 my $valid_re = $arg{valid_re};
421 my $default = $arg{default};
422 my $resp;
423 my $i = 0;
424
425 if ( !( defined($term->IN)
426 && defined( fileno($term->IN) )
427 && defined( $term->OUT )
428 && defined( fileno($term->OUT) ) ) ){
429 return defined($default) ? $default : undef;
430 }
431
432 while ($i++ < 10) {
433 $resp = $term->readline($prompt);
434 if (!defined $resp) { # EOF
435 print "\n";
436 return defined $default ? $default : undef;
437 }
438 if ($resp eq '' and defined $default) {
439 return $default;
440 }
441 if (!defined $valid_re or $resp =~ /$valid_re/) {
442 return $resp;
443 }
444 }
445 return undef;
446}
447
8164b652
EW
448sub do_git_init_db {
449 unless (-d $ENV{GIT_DIR}) {
450 my @init_db = ('init');
451 push @init_db, "--template=$_template" if defined $_template;
dadc6d2a
EW
452 if (defined $_shared) {
453 if ($_shared =~ /[a-z]/) {
454 push @init_db, "--shared=$_shared";
455 } else {
456 push @init_db, "--shared";
457 }
458 }
8164b652 459 command_noisy(@init_db);
ffe256f9 460 $_repository = Git->repository(Repository => ".git");
8164b652 461 }
0dfaf0a4
EW
462 my $set;
463 my $pfx = "svn-remote.$Git::SVN::default_repo_id";
464 foreach my $i (keys %icv) {
465 die "'$set' and '$i' cannot both be set\n" if $set;
466 next unless defined $icv{$i};
467 command_noisy('config', "$pfx.$i", $icv{$i});
468 $set = $i;
469 }
72827aa4 470 my $ignore_paths_regex = \$Git::SVN::Fetcher::_ignore_regex;
cdb51a13
MO
471 command_noisy('config', "$pfx.ignore-paths", $$ignore_paths_regex)
472 if defined $$ignore_paths_regex;
473 my $ignore_refs_regex = \$Git::SVN::Ra::_ignore_refs_regex;
474 command_noisy('config', "$pfx.ignore-refs", $$ignore_refs_regex)
475 if defined $$ignore_refs_regex;
40a1530c 476
72827aa4
JN
477 if (defined $Git::SVN::Fetcher::_preserve_empty_dirs) {
478 my $fname = \$Git::SVN::Fetcher::_placeholder_filename;
40a1530c
RC
479 command_noisy('config', "$pfx.preserve-empty-dirs", 'true');
480 command_noisy('config', "$pfx.placeholder-filename", $$fname);
481 }
8164b652
EW
482}
483
dadc6d2a
EW
484sub init_subdir {
485 my $repo_path = shift or return;
486 mkpath([$repo_path]) unless -d $repo_path;
487 chdir $repo_path or die "Couldn't chdir to $repo_path: $!\n";
f30603fc 488 $ENV{GIT_DIR} = '.git';
ffe256f9 489 $_repository = Git->repository(Repository => $ENV{GIT_DIR});
dadc6d2a
EW
490}
491
0425ea90
EW
492sub cmd_clone {
493 my ($url, $path) = @_;
494 if (!defined $path &&
62244069 495 (defined $_trunk || @_branches || @_tags ||
8f728fb9 496 defined $_stdlayout) &&
0425ea90
EW
497 $url !~ m#^[a-z\+]+://#) {
498 $path = $url;
499 }
0425ea90 500 $path = basename($url) if !defined $path || !length $path;
2bc35dcb 501 my $authors_absolute = $_authors ? File::Spec->rel2abs($_authors) : "";
f30603fc 502 cmd_init($url, $path);
2bc35dcb
AV
503 command_oneline('config', 'svn.authorsfile', $authors_absolute)
504 if $_authors;
f5841509 505 Git::SVN::fetch_all($Git::SVN::default_repo_id);
0425ea90
EW
506}
507
d2866f9e 508sub cmd_init {
8f728fb9 509 if (defined $_stdlayout) {
510 $_trunk = 'trunk' if (!defined $_trunk);
62244069
MB
511 @_tags = 'tags' if (! @_tags);
512 @_branches = 'branches' if (! @_branches);
8f728fb9 513 }
62244069 514 if (defined $_trunk || @_branches || @_tags) {
dadc6d2a 515 return cmd_multi_init(@_);
03e0ea87 516 }
dadc6d2a
EW
517 my $url = shift or die "SVN repository location required ",
518 "as a command-line argument\n";
50ff2366 519 $url = canonicalize_url($url);
dadc6d2a 520 init_subdir(@_);
8164b652 521 do_git_init_db();
03e0ea87 522
6b48829d
EW
523 if ($Git::SVN::_minimize_url eq 'unset') {
524 $Git::SVN::_minimize_url = 0;
525 }
526
706587fc 527 Git::SVN->init($url);
3397f9df
EW
528}
529
2a3240be 530sub cmd_fetch {
e98671e5
EW
531 if (grep /^\d+=./, @_) {
532 die "'<rev>=<commit>' fetch arguments are ",
533 "no longer supported.\n";
07a1c950 534 }
e98671e5
EW
535 my ($remote) = @_;
536 if (@_ > 1) {
c2abd83f 537 die "Usage: $0 fetch [--all] [--parent] [svn-remote]\n";
e98671e5 538 }
4d0157d6 539 $Git::SVN::no_reuse_existing = undef;
c2abd83f
JM
540 if ($_fetch_parent) {
541 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
542 unless ($gs) {
543 die "Unable to determine upstream SVN information from ",
544 "working tree history\n";
545 }
546 # just fetch, don't checkout.
547 $_no_checkout = 'true';
548 $_fetch_all ? $gs->fetch_all : $gs->fetch;
549 } elsif ($_fetch_all) {
e98671e5
EW
550 cmd_multi_fetch();
551 } else {
c2abd83f 552 $remote ||= $Git::SVN::default_repo_id;
e98671e5 553 Git::SVN::fetch_all($remote, Git::SVN::read_all_remotes());
1c8443b0 554 }
2a3240be
EW
555}
556
1ce255dc 557sub cmd_set_tree {
3397f9df
EW
558 my (@commits) = @_;
559 if ($_stdin || !@commits) {
560 print "Reading from stdin...\n";
561 @commits = ();
562 while (<STDIN>) {
1ca72aef 563 if (/\b($sha1_short)\b/o) {
3397f9df
EW
564 unshift @commits, $1;
565 }
566 }
567 }
568 my @revs;
8de010ad 569 foreach my $c (@commits) {
aef4e921 570 my @tmp = command('rev-parse',$c);
8de010ad
EW
571 if (scalar @tmp == 1) {
572 push @revs, $tmp[0];
573 } elsif (scalar @tmp > 1) {
aef4e921 574 push @revs, reverse(command('rev-list',@tmp));
8de010ad 575 } else {
207f1a75 576 fatal "Failed to rev-parse $c";
8de010ad 577 }
3397f9df 578 }
1ce255dc
EW
579 my $gs = Git::SVN->new;
580 my ($r_last, $cmt_last) = $gs->last_rev_commit;
581 $gs->fetch;
97f6987a 582 if (defined $gs->{last_rev} && $r_last != $gs->{last_rev}) {
1ce255dc
EW
583 fatal "There are new revisions that were fetched ",
584 "and need to be merged (or acknowledged) ",
585 "before committing.\nlast rev: $r_last\n",
207f1a75 586 " current: $gs->{last_rev}";
a5e0cedc 587 }
1ce255dc
EW
588 $gs->set_tree($_) foreach @revs;
589 print "Done committing ",scalar @revs," revisions to SVN\n";
3157dd9e 590 unlink $gs->{index};
a5e0cedc 591}
8f22562c 592
1e5814f3
BJ
593sub split_merge_info_range {
594 my ($range) = @_;
595 if ($range =~ /(\d+)-(\d+)/) {
596 return (int($1), int($2));
597 } else {
598 return (int($range), int($range));
599 }
600}
601
602sub combine_ranges {
603 my ($in) = @_;
604
605 my @fnums = ();
606 my @arr = split(/,/, $in);
607 for my $element (@arr) {
608 my ($start, $end) = split_merge_info_range($element);
609 push @fnums, $start;
610 }
611
612 my @sorted = @arr [ sort {
613 $fnums[$a] <=> $fnums[$b]
614 } 0..$#arr ];
615
616 my @return = ();
617 my $last = -1;
618 my $first = -1;
619 for my $element (@sorted) {
620 my ($start, $end) = split_merge_info_range($element);
621
622 if ($last == -1) {
623 $first = $start;
624 $last = $end;
625 next;
626 }
627 if ($start <= $last+1) {
628 if ($end > $last) {
629 $last = $end;
630 }
631 next;
632 }
633 if ($first == $last) {
634 push @return, "$first";
635 } else {
636 push @return, "$first-$last";
637 }
638 $first = $start;
639 $last = $end;
640 }
641
642 if ($first != -1) {
643 if ($first == $last) {
644 push @return, "$first";
645 } else {
646 push @return, "$first-$last";
647 }
648 }
649
650 return join(',', @return);
651}
652
653sub merge_revs_into_hash {
654 my ($hash, $minfo) = @_;
655 my @lines = split(' ', $minfo);
656
657 for my $line (@lines) {
658 my ($branchpath, $revs) = split(/:/, $line);
659
660 if (exists($hash->{$branchpath})) {
661 # Merge the two revision sets
662 my $combined = "$hash->{$branchpath},$revs";
663 $hash->{$branchpath} = combine_ranges($combined);
664 } else {
665 # Just do range combining for consolidation
666 $hash->{$branchpath} = combine_ranges($revs);
667 }
668 }
669}
670
671sub merge_merge_info {
672 my ($mergeinfo_one, $mergeinfo_two) = @_;
673 my %result_hash = ();
674
675 merge_revs_into_hash(\%result_hash, $mergeinfo_one);
676 merge_revs_into_hash(\%result_hash, $mergeinfo_two);
677
678 my $result = '';
679 # Sort below is for consistency's sake
680 for my $branchname (sort keys(%result_hash)) {
681 my $revlist = $result_hash{$branchname};
682 $result .= "$branchname:$revlist\n"
683 }
684 return $result;
685}
686
687sub populate_merge_info {
688 my ($d, $gs, $uuid, $linear_refs, $rewritten_parent) = @_;
689
690 my %parentshash;
691 read_commit_parents(\%parentshash, $d);
692 my @parents = @{$parentshash{$d}};
693 if ($#parents > 0) {
694 # Merge commit
695 my $all_parents_ok = 1;
696 my $aggregate_mergeinfo = '';
697 my $rooturl = $gs->repos_root;
698
699 if (defined($rewritten_parent)) {
700 # Replace first parent with newly-rewritten version
701 shift @parents;
702 unshift @parents, $rewritten_parent;
703 }
704
705 foreach my $parent (@parents) {
706 my ($branchurl, $svnrev, $paruuid) =
707 cmt_metadata($parent);
708
709 unless (defined($svnrev)) {
710 # Should have been caught be preflight check
711 fatal "merge commit $d has ancestor $parent, but that change "
712 ."does not have git-svn metadata!";
713 }
0e7e30f5 714 unless ($branchurl =~ /^\Q$rooturl\E(.*)/) {
1e5814f3
BJ
715 fatal "commit $parent git-svn metadata changed mid-run!";
716 }
717 my $branchpath = $1;
718
719 my $ra = Git::SVN::Ra->new($branchurl);
720 my (undef, undef, $props) =
721 $ra->get_dir(canonicalize_path("."), $svnrev);
722 my $par_mergeinfo = $props->{'svn:mergeinfo'};
723 unless (defined $par_mergeinfo) {
724 $par_mergeinfo = '';
725 }
726 # Merge previous mergeinfo values
727 $aggregate_mergeinfo =
728 merge_merge_info($aggregate_mergeinfo,
729 $par_mergeinfo, 0);
730
731 next if $parent eq $parents[0]; # Skip first parent
732 # Add new changes being placed in tree by merge
733 my @cmd = (qw/rev-list --reverse/,
734 $parent, qw/--not/);
735 foreach my $par (@parents) {
736 unless ($par eq $parent) {
737 push @cmd, $par;
738 }
739 }
740 my @revsin = ();
741 my ($revlist, $ctx) = command_output_pipe(@cmd);
742 while (<$revlist>) {
743 my $irev = $_;
744 chomp $irev;
745 my (undef, $csvnrev, undef) =
746 cmt_metadata($irev);
747 unless (defined $csvnrev) {
748 # A child is missing SVN annotations...
749 # this might be OK, or might not be.
750 warn "W:child $irev is merged into revision "
751 ."$d but does not have git-svn metadata. "
752 ."This means git-svn cannot determine the "
753 ."svn revision numbers to place into the "
754 ."svn:mergeinfo property. You must ensure "
755 ."a branch is entirely committed to "
756 ."SVN before merging it in order for "
757 ."svn:mergeinfo population to function "
758 ."properly";
759 }
760 push @revsin, $csvnrev;
761 }
762 command_close_pipe($revlist, $ctx);
763
764 last unless $all_parents_ok;
765
766 # We now have a list of all SVN revnos which are
767 # merged by this particular parent. Integrate them.
768 next if $#revsin == -1;
769 my $newmergeinfo = "$branchpath:" . join(',', @revsin);
770 $aggregate_mergeinfo =
771 merge_merge_info($aggregate_mergeinfo,
772 $newmergeinfo, 1);
773 }
774 if ($all_parents_ok and $aggregate_mergeinfo) {
775 return $aggregate_mergeinfo;
776 }
777 }
778
779 return undef;
780}
781
d7ad3bed
EW
782sub cmd_dcommit {
783 my $head = shift;
181264ad 784 command_noisy(qw/update-index --refresh/);
c8cfa3e4 785 git_cmd_try { command_oneline(qw/diff-index --quiet HEAD/) }
826a9339 786 'Cannot dcommit with a dirty index. Commit your changes first, '
c8cfa3e4 787 . "or stash them with `git stash'.\n";
d7ad3bed 788 $head ||= 'HEAD';
5eec27e3
TR
789
790 my $old_head;
791 if ($head ne 'HEAD') {
792 $old_head = eval {
793 command_oneline([qw/symbolic-ref -q HEAD/])
794 };
795 if ($old_head) {
796 $old_head =~ s{^refs/heads/}{};
797 } else {
798 $old_head = eval { command_oneline(qw/rev-parse HEAD/) };
799 }
800 command(['checkout', $head], STDERR => 0);
801 }
802
a8ae2623 803 my @refs;
5eec27e3 804 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD', \@refs);
2cb61105
TR
805 unless ($gs) {
806 die "Unable to determine upstream SVN information from ",
807 "$head history.\nPerhaps the repository is empty.";
808 }
0df84059
PO
809
810 if (defined $_commit_url) {
811 $url = $_commit_url;
812 } else {
813 $url = eval { command_oneline('config', '--get',
814 "svn-remote.$gs->{repo_id}.commiturl") };
815 if (!$url) {
12a296bc 816 $url = $gs->full_pushurl
0df84059
PO
817 }
818 }
819
ba24e745 820 my $last_rev = $_revision if defined $_revision;
59b0c24d
MM
821 if ($url) {
822 print "Committing to $url ...\n";
823 }
733a65aa 824 my ($linear_refs, $parents) = linearize_history($gs, \@refs);
751eb395
EW
825 if ($_no_rebase && scalar(@$linear_refs) > 1) {
826 warn "Attempting to commit more than one change while ",
827 "--no-rebase is enabled.\n",
828 "If these changes depend on each other, re-running ",
7dfa16b9 829 "without --no-rebase may be required."
751eb395 830 }
afd7f1eb
FH
831
832 if (defined $_interactive){
833 my $ask_default = "y";
834 foreach my $d (@$linear_refs){
835 my ($fh, $ctx) = command_output_pipe(qw(show --summary), "$d");
836 while (<$fh>){
837 print $_;
838 }
839 command_close_pipe($fh, $ctx);
840 $_ = ask("Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): ",
841 valid_re => qr/^(?:yes|y|no|n|quit|q|all|a)/i,
842 default => $ask_default);
843 die "Commit this patch reply required" unless defined $_;
844 if (/^[nq]/i) {
845 exit(0);
846 } elsif (/^a/i) {
847 last;
848 }
849 }
850 }
851
711521e2 852 my $expect_url = $url;
1e5814f3
BJ
853
854 my $push_merge_info = eval {
855 command_oneline(qw/config --get svn.pushmergeinfo/)
856 };
857 if (not defined($push_merge_info)
858 or $push_merge_info eq "false"
859 or $push_merge_info eq "no"
860 or $push_merge_info eq "never") {
861 $push_merge_info = 0;
862 }
863
864 unless (defined($_merge_info) || ! $push_merge_info) {
865 # Preflight check of changes to ensure no issues with mergeinfo
866 # This includes check for uncommitted-to-SVN parents
867 # (other than the first parent, which we will handle),
868 # information from different SVN repos, and paths
869 # which are not underneath this repository root.
870 my $rooturl = $gs->repos_root;
871 foreach my $d (@$linear_refs) {
872 my %parentshash;
873 read_commit_parents(\%parentshash, $d);
874 my @realparents = @{$parentshash{$d}};
875 if ($#realparents > 0) {
876 # Merge commit
877 shift @realparents; # Remove/ignore first parent
878 foreach my $parent (@realparents) {
879 my ($branchurl, $svnrev, $paruuid) = cmt_metadata($parent);
880 unless (defined $paruuid) {
881 # A parent is missing SVN annotations...
882 # abort the whole operation.
883 fatal "$parent is merged into revision $d, "
884 ."but does not have git-svn metadata. "
885 ."Either dcommit the branch or use a "
886 ."local cherry-pick, FF merge, or rebase "
887 ."instead of an explicit merge commit.";
888 }
889
890 unless ($paruuid eq $uuid) {
891 # Parent has SVN metadata from different repository
892 fatal "merge parent $parent for change $d has "
893 ."git-svn uuid $paruuid, while current change "
894 ."has uuid $uuid!";
895 }
896
0e7e30f5 897 unless ($branchurl =~ /^\Q$rooturl\E(.*)/) {
1e5814f3
BJ
898 # This branch is very strange indeed.
899 fatal "merge parent $parent for $d is on branch "
900 ."$branchurl, which is not under the "
901 ."git-svn root $rooturl!";
902 }
903 }
904 }
905 }
906 }
907
908 my $rewritten_parent;
711521e2 909 Git::SVN::remove_username($expect_url);
98c4ab32
BJ
910 if (defined($_merge_info)) {
911 $_merge_info =~ tr{ }{\n};
912 }
c74d9acf
EW
913 while (1) {
914 my $d = shift @$linear_refs or last;
45bf473a
EW
915 unless (defined $last_rev) {
916 (undef, $last_rev, undef) = cmt_metadata("$d~1");
917 unless (defined $last_rev) {
d7ad3bed 918 fatal "Unable to extract revision information ",
207f1a75 919 "from commit $d~1";
45bf473a
EW
920 }
921 }
b22d4497
EW
922 if ($_dry_run) {
923 print "diff-tree $d~1 $d\n";
924 } else {
751eb395 925 my $cmt_rev;
1e5814f3
BJ
926
927 unless (defined($_merge_info) || ! $push_merge_info) {
928 $_merge_info = populate_merge_info($d, $gs,
929 $uuid,
930 $linear_refs,
931 $rewritten_parent);
932 }
933
d7ad3bed 934 my %ed_opts = ( r => $last_rev,
61395354 935 log => get_commit_entry($d)->{log},
ba24e745 936 ra => Git::SVN::Ra->new($url),
3caf320b
KA
937 config => SVN::Core::config_get_config(
938 $Git::SVN::Ra::config_dir
939 ),
61395354
EW
940 tree_a => "$d~1",
941 tree_b => $d,
942 editor_cb => sub {
943 print "Committed r$_[0]\n";
751eb395
EW
944 $cmt_rev = $_[0];
945 },
6abd9332 946 mergeinfo => $_merge_info,
a8ae2623 947 svn_path => '');
72827aa4 948 if (!Git::SVN::Editor->new(\%ed_opts)->apply_diff) {
d7ad3bed 949 print "No changes\n$d~1 == $d\n";
733a65aa 950 } elsif ($parents->{$d} && @{$parents->{$d}}) {
751eb395 951 $gs->{inject_parents_dcommit}->{$cmt_rev} =
733a65aa 952 $parents->{$d};
d7ad3bed 953 }
751eb395 954 $_fetch_all ? $gs->fetch_all : $gs->fetch;
7dfa16b9 955 $last_rev = $cmt_rev;
751eb395
EW
956 next if $_no_rebase;
957
958 # we always want to rebase against the current HEAD,
959 # not any head that was passed to us
c74d9acf 960 my @diff = command('diff-tree', $d,
751eb395
EW
961 $gs->refname, '--');
962 my @finish;
963 if (@diff) {
964 @finish = rebase_cmd();
c74d9acf 965 print STDERR "W: $d and ", $gs->refname,
751eb395 966 " differ, using @finish:\n",
c74d9acf 967 join("\n", @diff), "\n";
751eb395
EW
968 } else {
969 print "No changes between current HEAD and ",
970 $gs->refname,
971 "\nResetting to the latest ",
972 $gs->refname, "\n";
973 @finish = qw/reset --mixed/;
974 }
975 command_noisy(@finish, $gs->refname);
1e5814f3
BJ
976
977 $rewritten_parent = command_oneline(qw/rev-parse HEAD/);
978
c74d9acf
EW
979 if (@diff) {
980 @refs = ();
981 my ($url_, $rev_, $uuid_, $gs_) =
5eec27e3 982 working_head_info('HEAD', \@refs);
c74d9acf
EW
983 my ($linear_refs_, $parents_) =
984 linearize_history($gs_, \@refs);
985 if (scalar(@$linear_refs) !=
986 scalar(@$linear_refs_)) {
987 fatal "# of revisions changed ",
988 "\nbefore:\n",
989 join("\n", @$linear_refs),
990 "\n\nafter:\n",
991 join("\n", @$linear_refs_), "\n",
992 'If you are attempting to commit ',
993 "merges, try running:\n\t",
994 'git rebase --interactive',
995 '--preserve-merges ',
996 $gs->refname,
997 "\nBefore dcommitting";
998 }
711521e2 999 if ($url_ ne $expect_url) {
c03c1f79
AG
1000 if ($url_ eq $gs->metadata_url) {
1001 print
1002 "Accepting rewritten URL:",
1003 " $url_\n";
1004 } else {
1005 fatal
1006 "URL mismatch after rebase:",
1007 " $url_ != $expect_url";
1008 }
c74d9acf
EW
1009 }
1010 if ($uuid_ ne $uuid) {
1011 fatal "uuid mismatch after rebase: ",
1012 "$uuid_ != $uuid";
1013 }
1014 # remap parents
1015 my (%p, @l, $i);
1016 for ($i = 0; $i < scalar @$linear_refs; $i++) {
1017 my $new = $linear_refs_->[$i] or next;
1018 $p{$new} =
1019 $parents->{$linear_refs->[$i]};
1020 push @l, $new;
1021 }
1022 $parents = \%p;
1023 $linear_refs = \@l;
1024 }
b22d4497
EW
1025 }
1026 }
5eec27e3
TR
1027
1028 if ($old_head) {
1029 my $new_head = command_oneline(qw/rev-parse HEAD/);
1030 my $new_is_symbolic = eval {
1031 command_oneline(qw/symbolic-ref -q HEAD/);
1032 };
1033 if ($new_is_symbolic) {
1034 print "dcommitted the branch ", $head, "\n";
1035 } else {
1036 print "dcommitted on a detached HEAD because you gave ",
1037 "a revision argument.\n",
1038 "The rewritten commit is: ", $new_head, "\n";
1039 }
1040 command(['checkout', $old_head], STDERR => 0);
1041 }
1042
3157dd9e 1043 unlink $gs->{index};
b22d4497
EW
1044}
1045
5de70efb
FR
1046sub cmd_branch {
1047 my ($branch_name, $head) = @_;
1048
1049 unless (defined $branch_name && length $branch_name) {
1050 die(($_tag ? "tag" : "branch") . " name required\n");
1051 }
1052 $head ||= 'HEAD';
1053
150d38c4 1054 my (undef, $rev, undef, $gs) = working_head_info($head);
12a296bc 1055 my $src = $gs->full_pushurl;
5de70efb 1056
a0fbc87c 1057 my $remote = Git::SVN::read_all_remotes()->{$gs->{repo_id}};
62244069
MB
1058 my $allglobs = $remote->{ $_tag ? 'tags' : 'branches' };
1059 my $glob;
1060 if ($#{$allglobs} == 0) {
1061 $glob = $allglobs->[0];
1062 } else {
1063 unless(defined $_branch_dest) {
1064 die "Multiple ",
1065 $_tag ? "tag" : "branch",
1066 " paths defined for Subversion repository.\n",
1067 "You must specify where you want to create the ",
1068 $_tag ? "tag" : "branch",
1069 " with the --destination argument.\n";
1070 }
1071 foreach my $g (@{$allglobs}) {
72827aa4 1072 my $re = Git::SVN::Editor::glob2pat($g->{path}->{left});
f7050599 1073 if ($_branch_dest =~ /$re/) {
62244069
MB
1074 $glob = $g;
1075 last;
1076 }
1077 }
1078 unless (defined $glob) {
eaa14ff8
EW
1079 my $dest_re = qr/\b\Q$_branch_dest\E\b/;
1080 foreach my $g (@{$allglobs}) {
1081 $g->{path}->{left} =~ /$dest_re/ or next;
1082 if (defined $glob) {
1083 die "Ambiguous destination: ",
1084 $_branch_dest, "\nmatches both '",
1085 $glob->{path}->{left}, "' and '",
1086 $g->{path}->{left}, "'\n";
1087 }
1088 $glob = $g;
1089 }
1090 unless (defined $glob) {
1091 die "Unknown ",
1092 $_tag ? "tag" : "branch",
1093 " destination $_branch_dest\n";
1094 }
62244069
MB
1095 }
1096 }
5de70efb 1097 my ($lft, $rgt) = @{ $glob->{path} }{qw/left right/};
99bacd6c
IM
1098 my $url;
1099 if (defined $_commit_url) {
1100 $url = $_commit_url;
1101 } else {
1102 $url = eval { command_oneline('config', '--get',
1103 "svn-remote.$gs->{repo_id}.commiturl") };
1104 if (!$url) {
12a296bc 1105 $url = $remote->{pushurl} || $remote->{url};
99bacd6c
IM
1106 }
1107 }
1108 my $dst = join '/', $url, $lft, $branch_name, ($rgt || ());
5de70efb 1109
a83b91e7
IM
1110 if ($dst =~ /^https:/ && $src =~ /^http:/) {
1111 $src=~s/^http:/https:/;
1112 }
1113
d32fad2b 1114 ::_req_svn();
1115
5de70efb
FR
1116 my $ctx = SVN::Client->new(
1117 auth => Git::SVN::Ra::_auth_providers(),
1118 log_msg => sub {
1119 ${ $_[0] } = defined $_message
1120 ? $_message
1121 : 'Create ' . ($_tag ? 'tag ' : 'branch ' )
1122 . $branch_name;
1123 },
1124 );
1125
1126 eval {
1127 $ctx->ls($dst, 'HEAD', 0);
1128 } and die "branch ${branch_name} already exists\n";
1129
1130 print "Copying ${src} at r${rev} to ${dst}...\n";
1131 $ctx->copy($src, $rev, $dst)
1132 unless $_dry_run;
1133
1134 $gs->fetch_all;
1135}
1136
26e60160 1137sub cmd_find_rev {
ea14e6c5
MAL
1138 my $revision_or_hash = shift or die "SVN or git revision required ",
1139 "as a command-line argument\n";
26e60160
AR
1140 my $result;
1141 if ($revision_or_hash =~ /^r\d+$/) {
b3cb7e45
AR
1142 my $head = shift;
1143 $head ||= 'HEAD';
1144 my @refs;
63c56022 1145 my (undef, undef, $uuid, $gs) = working_head_info($head, \@refs);
b3cb7e45
AR
1146 unless ($gs) {
1147 die "Unable to determine upstream SVN information from ",
1148 "$head history\n";
26e60160 1149 }
b3cb7e45 1150 my $desired_revision = substr($revision_or_hash, 1);
63c56022 1151 $result = $gs->rev_map_get($desired_revision, $uuid);
26e60160
AR
1152 } else {
1153 my (undef, $rev, undef) = cmt_metadata($revision_or_hash);
1154 $result = $rev;
1155 }
1156 print "$result\n" if $result;
1157}
1158
55f9d7a7
MH
1159sub auto_create_empty_directories {
1160 my ($gs) = @_;
1161 my $var = eval { command_oneline('config', '--get', '--bool',
1162 "svn-remote.$gs->{repo_id}.automkdirs") };
1163 # By default, create empty directories by consulting the unhandled log,
1164 # but allow setting it to 'false' to skip it.
1165 return !($var && $var eq 'false');
1166}
1167
905f8b7d
EW
1168sub cmd_rebase {
1169 command_noisy(qw/update-index --refresh/);
13c823fb
EW
1170 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
1171 unless ($gs) {
905f8b7d
EW
1172 die "Unable to determine upstream SVN information from ",
1173 "working tree history\n";
1174 }
7d45e146
SF
1175 if ($_dry_run) {
1176 print "Remote Branch: " . $gs->refname . "\n";
1177 print "SVN URL: " . $url . "\n";
1178 return;
1179 }
905f8b7d
EW
1180 if (command(qw/diff-index HEAD --/)) {
1181 print STDERR "Cannot rebase with uncommited changes:\n";
1182 command_noisy('status');
1183 exit 1;
1184 }
dee41f3e 1185 unless ($_local) {
cec0d5a3
SG
1186 # rebase will checkout for us, so no need to do it explicitly
1187 $_no_checkout = 'true';
dee41f3e
EW
1188 $_fetch_all ? $gs->fetch_all : $gs->fetch;
1189 }
905f8b7d 1190 command_noisy(rebase_cmd(), $gs->refname);
55f9d7a7
MH
1191 if (auto_create_empty_directories($gs)) {
1192 $gs->mkemptydirs;
1193 }
905f8b7d
EW
1194}
1195
5969cbe1 1196sub cmd_show_ignore {
13c823fb
EW
1197 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
1198 $gs ||= Git::SVN->new;
5969cbe1 1199 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
01bdab84
BS
1200 $gs->prop_walk($gs->{path}, $r, sub {
1201 my ($gs, $path, $props) = @_;
1202 print STDOUT "\n# $path\n";
1203 my $s = $props->{'svn:ignore'} or return;
1204 $s =~ s/[\r\n]+/\n/g;
a7d72544 1205 $s =~ s/^\n+//;
01bdab84
BS
1206 chomp $s;
1207 $s =~ s#^#$path#gm;
1208 print STDOUT "$s\n";
1209 });
a5e0cedc
EW
1210}
1211
2d879792
VK
1212sub cmd_show_externals {
1213 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
1214 $gs ||= Git::SVN->new;
1215 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
1216 $gs->prop_walk($gs->{path}, $r, sub {
1217 my ($gs, $path, $props) = @_;
1218 print STDOUT "\n# $path\n";
1219 my $s = $props->{'svn:externals'} or return;
1220 $s =~ s/[\r\n]+/\n/g;
1221 chomp $s;
1222 $s =~ s#^#$path#gm;
1223 print STDOUT "$s\n";
1224 });
1225}
1226
d05ddec5
BS
1227sub cmd_create_ignore {
1228 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
1229 $gs ||= Git::SVN->new;
1230 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
1231 $gs->prop_walk($gs->{path}, $r, sub {
1232 my ($gs, $path, $props) = @_;
1233 # $path is of the form /path/to/dir/
7d9fd459
BG
1234 $path = '.' . $path;
1235 # SVN can have attributes on empty directories,
1236 # which git won't track
1237 mkpath([$path]) unless -d $path;
1238 my $ignore = $path . '.gitignore';
d05ddec5
BS
1239 my $s = $props->{'svn:ignore'} or return;
1240 open(GITIGNORE, '>', $ignore)
207f1a75 1241 or fatal("Failed to open `$ignore' for writing: $!");
d05ddec5 1242 $s =~ s/[\r\n]+/\n/g;
a7d72544 1243 $s =~ s/^\n+//;
d05ddec5
BS
1244 chomp $s;
1245 # Prefix all patterns so that the ignore doesn't apply
1246 # to sub-directories.
1247 $s =~ s#^#/#gm;
1248 print GITIGNORE "$s\n";
1249 close(GITIGNORE)
207f1a75 1250 or fatal("Failed to close `$ignore': $!");
c4c66b26 1251 command_noisy('add', '-f', $ignore);
d05ddec5
BS
1252 });
1253}
1254
6111b934
EW
1255sub cmd_mkdirs {
1256 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
1257 $gs ||= Git::SVN->new;
1258 $gs->mkemptydirs($_revision);
1259}
1260
b2b3ada7
DK
1261sub canonicalize_path {
1262 my ($path) = @_;
e6fefa92
DK
1263 my $dot_slash_added = 0;
1264 if (substr($path, 0, 1) ne "/") {
1265 $path = "./" . $path;
1266 $dot_slash_added = 1;
1267 }
b2b3ada7
DK
1268 # File::Spec->canonpath doesn't collapse x/../y into y (for a
1269 # good reason), so let's do this manually.
1270 $path =~ s#/+#/#g;
1271 $path =~ s#/\.(?:/|$)#/#g;
1272 $path =~ s#/[^/]+/\.\.##g;
1273 $path =~ s#/$##g;
e6fefa92 1274 $path =~ s#^\./## if $dot_slash_added;
2fe403e7
GP
1275 $path =~ s#^/##;
1276 $path =~ s#^\.$##;
b2b3ada7
DK
1277 return $path;
1278}
1279
50ff2366
UD
1280sub canonicalize_url {
1281 my ($url) = @_;
1282 $url =~ s#^([^:]+://[^/]*/)(.*)$#$1 . canonicalize_path($2)#e;
1283 return $url;
1284}
1285
15153451
BS
1286# get_svnprops(PATH)
1287# ------------------
51e057cf 1288# Helper for cmd_propget and cmd_proplist below.
15153451
BS
1289sub get_svnprops {
1290 my $path = shift;
1291 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
1292 $gs ||= Git::SVN->new;
1293
1294 # prefix THE PATH by the sub-directory from which the user
1295 # invoked us.
1296 $path = $cmd_dir_prefix . $path;
207f1a75 1297 fatal("No such file or directory: $path") unless -e $path;
15153451
BS
1298 my $is_dir = -d $path ? 1 : 0;
1299 $path = $gs->{path} . '/' . $path;
1300
1301 # canonicalize the path (otherwise libsvn will abort or fail to
1302 # find the file)
b2b3ada7 1303 $path = canonicalize_path($path);
15153451
BS
1304
1305 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
1306 my $props;
1307 if ($is_dir) {
1308 (undef, undef, $props) = $gs->ra->get_dir($path, $r);
1309 }
1310 else {
1311 (undef, $props) = $gs->ra->get_file($path, $r, undef);
1312 }
1313 return $props;
1314}
1315
1316# cmd_propget (PROP, PATH)
1317# ------------------------
1318# Print the SVN property PROP for PATH.
1319sub cmd_propget {
1320 my ($prop, $path) = @_;
1321 $path = '.' if not defined $path;
1322 usage(1) if not defined $prop;
1323 my $props = get_svnprops($path);
1324 if (not defined $props->{$prop}) {
207f1a75 1325 fatal("`$path' does not have a `$prop' SVN property.");
15153451
BS
1326 }
1327 print $props->{$prop} . "\n";
1328}
1329
51e057cf
BS
1330# cmd_proplist (PATH)
1331# -------------------
1332# Print the list of SVN properties for PATH.
1333sub cmd_proplist {
1334 my $path = shift;
1335 $path = '.' if not defined $path;
1336 my $props = get_svnprops($path);
1337 print "Properties on '$path':\n";
1338 foreach (sort keys %{$props}) {
1339 print " $_\n";
1340 }
1341}
1342
8164b652 1343sub cmd_multi_init {
9d55b41a 1344 my $url = shift;
62244069 1345 unless (defined $_trunk || @_branches || @_tags) {
98327e58 1346 usage(1);
9d55b41a 1347 }
dc431666 1348
8164b652 1349 $_prefix = '' unless defined $_prefix;
dadc6d2a 1350 if (defined $url) {
50ff2366 1351 $url = canonicalize_url($url);
dadc6d2a
EW
1352 init_subdir(@_);
1353 }
f30603fc 1354 do_git_init_db();
98327e58 1355 if (defined $_trunk) {
b4b33600 1356 $_trunk =~ s#^/+##;
6f5748e1 1357 my $trunk_ref = 'refs/remotes/' . $_prefix . 'trunk';
706587fc
EW
1358 # try both old-style and new-style lookups:
1359 my $gs_trunk = eval { Git::SVN->new($trunk_ref) };
8164b652 1360 unless ($gs_trunk) {
706587fc
EW
1361 my ($trunk_url, $trunk_path) =
1362 complete_svn_url($url, $_trunk);
1363 $gs_trunk = Git::SVN->init($trunk_url, $trunk_path,
1364 undef, $trunk_ref);
98327e58 1365 }
c35b96e7 1366 }
62244069 1367 return unless @_branches || @_tags;
e7db67e6 1368 my $ra = $url ? Git::SVN::Ra->new($url) : undef;
62244069
MB
1369 foreach my $path (@_branches) {
1370 complete_url_ls_init($ra, $path, '--branches/-b', $_prefix);
1371 }
1372 foreach my $path (@_tags) {
1373 complete_url_ls_init($ra, $path, '--tags/-t', $_prefix.'tags/');
1374 }
9d55b41a
EW
1375}
1376
1c8443b0 1377sub cmd_multi_fetch {
4d0157d6 1378 $Git::SVN::no_reuse_existing = undef;
0af9c9f9
EW
1379 my $remotes = Git::SVN::read_all_remotes();
1380 foreach my $repo_id (sort keys %$remotes) {
db03cd24 1381 if ($remotes->{$repo_id}->{url}) {
4bb9ed04
EW
1382 Git::SVN::fetch_all($repo_id, $remotes);
1383 }
9d55b41a 1384 }
9d55b41a
EW
1385}
1386
44320b9e
EW
1387# this command is special because it requires no metadata
1388sub cmd_commit_diff {
1389 my ($ta, $tb, $url) = @_;
1390 my $usage = "Usage: $0 commit-diff -r<revision> ".
207f1a75 1391 "<tree-ish> <tree-ish> [<URL>]";
44320b9e 1392 fatal($usage) if (!defined $ta || !defined $tb);
d72ab8c8 1393 my $svn_path = '';
44320b9e
EW
1394 if (!defined $url) {
1395 my $gs = eval { Git::SVN->new };
1396 if (!$gs) {
1397 fatal("Needed URL or usable git-svn --id in ",
1398 "the command-line\n", $usage);
1399 }
1400 $url = $gs->{url};
d3a840dc 1401 $svn_path = $gs->{path};
44320b9e
EW
1402 }
1403 unless (defined $_revision) {
1404 fatal("-r|--revision is a required argument\n", $usage);
1405 }
1406 if (defined $_message && defined $_file) {
1407 fatal("Both --message/-m and --file/-F specified ",
1408 "for the commit message.\n",
207f1a75 1409 "I have no idea what you mean");
44320b9e
EW
1410 }
1411 if (defined $_file) {
1412 $_message = file_to_s($_file);
1413 } else {
1414 $_message ||= get_commit_entry($tb)->{log};
1415 }
1416 my $ra ||= Git::SVN::Ra->new($url);
1417 my $r = $_revision;
1418 if ($r eq 'HEAD') {
1419 $r = $ra->get_latest_revnum;
1420 } elsif ($r !~ /^\d+$/) {
1421 die "revision argument: $r not understood by git-svn\n";
1422 }
61395354
EW
1423 my %ed_opts = ( r => $r,
1424 log => $_message,
1425 ra => $ra,
1426 tree_a => $ta,
1427 tree_b => $tb,
1428 editor_cb => sub { print "Committed r$_[0]\n" },
1429 svn_path => $svn_path );
72827aa4 1430 if (!Git::SVN::Editor->new(\%ed_opts)->apply_diff) {
44320b9e
EW
1431 print "No changes\n$ta == $tb\n";
1432 }
44320b9e
EW
1433}
1434
05427b91
TR
1435sub escape_uri_only {
1436 my ($uri) = @_;
1437 my @tmp;
1438 foreach (split m{/}, $uri) {
6a004d3f 1439 s/([^~\w.%+-]|%(?![a-fA-F0-9]{2}))/sprintf("%%%02X",ord($1))/eg;
05427b91
TR
1440 push @tmp, $_;
1441 }
1442 join('/', @tmp);
1443}
1444
1445sub escape_url {
1446 my ($url) = @_;
1447 if ($url =~ m#^([^:]+)://([^/]*)(.*)$#) {
1448 my ($scheme, $domain, $uri) = ($1, $2, escape_uri_only($3));
1449 $url = "$scheme://$domain$uri";
1450 }
1451 $url;
1452}
1453
e6fefa92 1454sub cmd_info {
bd2d4f96 1455 my $path = canonicalize_path(defined($_[0]) ? $_[0] : ".");
edde9112 1456 my $fullpath = canonicalize_path($cmd_dir_prefix . $path);
bd2d4f96 1457 if (exists $_[1]) {
e6fefa92
DK
1458 die "Too many arguments specified\n";
1459 }
1460
1461 my ($file_type, $diff_status) = find_file_type_and_diff_status($path);
1462
1463 if (!$file_type && !$diff_status) {
2cf3e3ac
TR
1464 print STDERR "svn: '$path' is not under version control\n";
1465 exit 1;
e6fefa92
DK
1466 }
1467
1468 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
1469 unless ($gs) {
1470 die "Unable to determine upstream SVN information from ",
1471 "working tree history\n";
1472 }
bd2d4f96
EW
1473
1474 # canonicalize_path() will return "" to make libsvn 1.5.x happy,
1475 $path = "." if $path eq "";
1476
edde9112 1477 my $full_url = $url . ($fullpath eq "" ? "" : "/$fullpath");
e6fefa92 1478
8b014d71 1479 if ($_url) {
05427b91 1480 print escape_url($full_url), "\n";
8b014d71
DK
1481 return;
1482 }
1483
e6fefa92
DK
1484 my $result = "Path: $path\n";
1485 $result .= "Name: " . basename($path) . "\n" if $file_type ne "dir";
05427b91 1486 $result .= "URL: " . escape_url($full_url) . "\n";
e6fefa92 1487
a5460eb7
EW
1488 eval {
1489 my $repos_root = $gs->repos_root;
1490 Git::SVN::remove_username($repos_root);
05427b91 1491 $result .= "Repository Root: " . escape_url($repos_root) . "\n";
a5460eb7
EW
1492 };
1493 if ($@) {
1494 $result .= "Repository Root: (offline)\n";
1495 }
b91a8a3e 1496 ::_req_svn();
22ba47f5 1497 $result .= "Repository UUID: $uuid\n" unless $diff_status eq "A" &&
f760c903 1498 (::compare_svn_version('1.5.4') <= 0 || $file_type ne "dir");
e6fefa92
DK
1499 $result .= "Revision: " . ($diff_status eq "A" ? 0 : $rev) . "\n";
1500
1501 $result .= "Node Kind: " .
1502 ($file_type eq "dir" ? "directory" : "file") . "\n";
1503
1504 my $schedule = $diff_status eq "A"
1505 ? "add"
1506 : ($diff_status eq "D" ? "delete" : "normal");
1507 $result .= "Schedule: $schedule\n";
1508
1509 if ($diff_status eq "A") {
1510 print $result, "\n";
1511 return;
1512 }
1513
1514 my ($lc_author, $lc_rev, $lc_date_utc);
edde9112 1515 my @args = Git::SVN::Log::git_svn_log_cmd($rev, $rev, "--", $fullpath);
e6fefa92
DK
1516 my $log = command_output_pipe(@args);
1517 my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/;
1518 while (<$log>) {
1519 if (/^${esc_color}author (.+) <[^>]+> (\d+) ([\-\+]?\d+)$/o) {
1520 $lc_author = $1;
1521 $lc_date_utc = Git::SVN::Log::parse_git_date($2, $3);
1522 } elsif (/^${esc_color} (git-svn-id:.+)$/o) {
1523 (undef, $lc_rev, undef) = ::extract_metadata($1);
1524 }
1525 }
1526 close $log;
1527
1528 Git::SVN::Log::set_local_timezone();
1529
1530 $result .= "Last Changed Author: $lc_author\n";
1531 $result .= "Last Changed Rev: $lc_rev\n";
1532 $result .= "Last Changed Date: " .
1533 Git::SVN::Log::format_svn_date($lc_date_utc) . "\n";
1534
1535 if ($file_type ne "dir") {
1536 my $text_last_updated_date =
1537 ($diff_status eq "D" ? $lc_date_utc : (stat $path)[9]);
1538 $result .=
1539 "Text Last Updated: " .
1540 Git::SVN::Log::format_svn_date($text_last_updated_date) .
1541 "\n";
1542 my $checksum;
1543 if ($diff_status eq "D") {
1544 my ($fh, $ctx) =
1545 command_output_pipe(qw(cat-file blob), "HEAD:$path");
1546 if ($file_type eq "link") {
1547 my $file_name = <$fh>;
8d7c4fad 1548 $checksum = md5sum("link $file_name");
e6fefa92 1549 } else {
8d7c4fad 1550 $checksum = md5sum($fh);
e6fefa92
DK
1551 }
1552 command_close_pipe($fh, $ctx);
1553 } elsif ($file_type eq "link") {
1554 my $file_name =
1555 command(qw(cat-file blob), "HEAD:$path");
1556 $checksum =
8d7c4fad 1557 md5sum("link " . $file_name);
e6fefa92
DK
1558 } else {
1559 open FILE, "<", $path or die $!;
8d7c4fad 1560 $checksum = md5sum(\*FILE);
e6fefa92
DK
1561 close FILE or die $!;
1562 }
1563 $result .= "Checksum: " . $checksum . "\n";
1564 }
1565
1566 print $result, "\n";
1567}
1568
195643f2
BJ
1569sub cmd_reset {
1570 my $target = shift || $_revision or die "SVN revision required\n";
1571 $target = $1 if $target =~ /^r(\d+)$/;
1572 $target =~ /^\d+$/ or die "Numeric SVN revision expected\n";
1573 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
1574 unless ($gs) {
1575 die "Unable to determine upstream SVN information from ".
1576 "history\n";
1577 }
1578 my ($r, $c) = $gs->find_rev_before($target, not $_fetch_parent);
70ee0b77 1579 die "Cannot find SVN revision $target\n" unless defined($c);
195643f2
BJ
1580 $gs->rev_map_set($r, $c, 'reset', $uuid);
1581 print "r$r = $c ($gs->{ref_id})\n";
1582}
1583
2da9ee08 1584sub cmd_gc {
c2768fa1 1585 if (!can_compress()) {
2da9ee08
RZ
1586 warn "Compress::Zlib could not be found; unhandled.log " .
1587 "files will not be compressed.\n";
1588 }
1589 find({ wanted => \&gc_directory, no_chdir => 1}, "$ENV{GIT_DIR}/svn");
1590}
1591
3397f9df
EW
1592########################### utility functions #########################
1593
905f8b7d
EW
1594sub rebase_cmd {
1595 my @cmd = qw/rebase/;
1596 push @cmd, '-v' if $_verbose;
1597 push @cmd, qw/--merge/ if $_merge;
1598 push @cmd, "--strategy=$_strategy" if $_strategy;
b64e1f58 1599 push @cmd, "--preserve-merges" if $_preserve_merges;
905f8b7d
EW
1600 @cmd;
1601}
1602
1e889ef3
EW
1603sub post_fetch_checkout {
1604 return if $_no_checkout;
e3bd4dda 1605 return if verify_ref('HEAD^0');
1e889ef3 1606 my $gs = $Git::SVN::_head or return;
1e889ef3 1607
b186a261
EW
1608 # look for "trunk" ref if it exists
1609 my $remote = Git::SVN::read_all_remotes()->{$gs->{repo_id}};
1610 my $fetch = $remote->{fetch};
1611 if ($fetch) {
1612 foreach my $p (keys %$fetch) {
1613 basename($fetch->{$p}) eq 'trunk' or next;
1614 $gs = Git::SVN->new($fetch->{$p}, $gs->{repo_id}, $p);
1615 last;
1616 }
1617 }
1618
e3bd4dda
MO
1619 command_noisy(qw(update-ref HEAD), $gs->refname);
1620 return unless verify_ref('HEAD^0');
1e889ef3
EW
1621
1622 return if $ENV{GIT_DIR} !~ m#^(?:.*/)?\.git$#;
1623 my $index = $ENV{GIT_INDEX_FILE} || "$ENV{GIT_DIR}/index";
1624 return if -f $index;
1625
7ae3df8c 1626 return if command_oneline(qw/rev-parse --is-inside-work-tree/) eq 'false';
1e889ef3
EW
1627 return if command_oneline(qw/rev-parse --is-inside-git-dir/) eq 'true';
1628 command_noisy(qw/read-tree -m -u -v HEAD HEAD/);
1629 print STDERR "Checked out HEAD:\n ",
1630 $gs->full_url, " r", $gs->last_rev, "\n";
55f9d7a7
MH
1631 if (auto_create_empty_directories($gs)) {
1632 $gs->mkemptydirs($gs->last_rev);
1633 }
1e889ef3
EW
1634}
1635
98327e58
EW
1636sub complete_svn_url {
1637 my ($url, $path) = @_;
1638 $path =~ s#/+$##;
98327e58 1639 if ($path !~ m#^[a-z\+]+://#) {
98327e58
EW
1640 if (!defined $url || $url !~ m#^[a-z\+]+://#) {
1641 fatal("E: '$path' is not a complete URL ",
207f1a75 1642 "and a separate URL is not specified");
98327e58 1643 }
706587fc 1644 return ($url, $path);
98327e58 1645 }
706587fc 1646 return ($path, '');
98327e58
EW
1647}
1648
9d55b41a 1649sub complete_url_ls_init {
706587fc
EW
1650 my ($ra, $repo_path, $switch, $pfx) = @_;
1651 unless ($repo_path) {
9d55b41a
EW
1652 print STDERR "W: $switch not specified\n";
1653 return;
1654 }
706587fc
EW
1655 $repo_path =~ s#/+$##;
1656 if ($repo_path =~ m#^[a-z\+]+://#) {
1657 $ra = Git::SVN::Ra->new($repo_path);
1658 $repo_path = '';
e7db67e6 1659 } else {
706587fc 1660 $repo_path =~ s#^/+##;
e7db67e6 1661 unless ($ra) {
706587fc 1662 fatal("E: '$repo_path' is not a complete URL ",
207f1a75 1663 "and a separate URL is not specified");
8164b652 1664 }
e7db67e6 1665 }
706587fc 1666 my $url = $ra->{url};
b4d57e5e
EW
1667 my $gs = Git::SVN->init($url, undef, undef, undef, 1);
1668 my $k = "svn-remote.$gs->{repo_id}.url";
1669 my $orig_url = eval { command_oneline(qw/config --get/, $k) };
1670 if ($orig_url && ($orig_url ne $gs->{url})) {
1671 die "$k already set: $orig_url\n",
1672 "wanted to set to: $gs->{url}\n";
88cf4107 1673 }
b4d57e5e 1674 command_oneline('config', $k, $gs->{url}) unless $orig_url;
0b2af457 1675 my $remote_path = "$gs->{path}/$repo_path";
5268f9ed 1676 $remote_path =~ s{%([0-9A-F]{2})}{chr hex($1)}ieg;
b4d57e5e
EW
1677 $remote_path =~ s#/+#/#g;
1678 $remote_path =~ s#^/##g;
ed0b9d43 1679 $remote_path .= "/*" if $remote_path !~ /\*/;
b4d57e5e
EW
1680 my ($n) = ($switch =~ /^--(\w+)/);
1681 if (length $pfx && $pfx !~ m#/$#) {
1682 die "--prefix='$pfx' must have a trailing slash '/'\n";
9d55b41a 1683 }
570d35c2 1684 command_noisy('config',
62244069 1685 '--add',
570d35c2
MG
1686 "svn-remote.$gs->{repo_id}.$n",
1687 "$remote_path:refs/remotes/$pfx*" .
1688 ('/*' x (($remote_path =~ tr/*/*/) - 1)) );
9d55b41a
EW
1689}
1690
aef4e921
EW
1691sub verify_ref {
1692 my ($ref) = @_;
2c5c1d53
EW
1693 eval { command_oneline([ 'rev-parse', '--verify', $ref ],
1694 { STDERR => 0 }); };
aef4e921
EW
1695}
1696
a5e0cedc 1697sub get_tree_from_treeish {
cf52b8f0 1698 my ($treeish) = @_;
44320b9e 1699 # $treeish can be a symbolic ref, too:
aef4e921 1700 my $type = command_oneline(qw/cat-file -t/, $treeish);
cf52b8f0
EW
1701 my $expected;
1702 while ($type eq 'tag') {
aef4e921 1703 ($treeish, $type) = command(qw/cat-file tag/, $treeish);
cf52b8f0
EW
1704 }
1705 if ($type eq 'commit') {
aef4e921
EW
1706 $expected = (grep /^tree /, command(qw/cat-file commit/,
1707 $treeish))[0];
44320b9e 1708 ($expected) = ($expected =~ /^tree ($sha1)$/o);
cf52b8f0
EW
1709 die "Unable to get tree from $treeish\n" unless $expected;
1710 } elsif ($type eq 'tree') {
1711 $expected = $treeish;
1712 } else {
1713 die "$treeish is a $type, expected tree, tag or commit\n";
1714 }
a5e0cedc
EW
1715 return $expected;
1716}
1717
44320b9e
EW
1718sub get_commit_entry {
1719 my ($treeish) = shift;
1720 my %log_entry = ( log => '', tree => get_tree_from_treeish($treeish) );
1721 my $commit_editmsg = "$ENV{GIT_DIR}/COMMIT_EDITMSG";
1722 my $commit_msg = "$ENV{GIT_DIR}/COMMIT_MSG";
1723 open my $log_fh, '>', $commit_editmsg or croak $!;
3397f9df 1724
44320b9e 1725 my $type = command_oneline(qw/cat-file -t/, $treeish);
4ad4515d 1726 if ($type eq 'commit' || $type eq 'tag') {
aef4e921 1727 my ($msg_fh, $ctx) = command_output_pipe('cat-file',
44320b9e 1728 $type, $treeish);
3397f9df 1729 my $in_msg = 0;
6aa9ba14
AP
1730 my $author;
1731 my $saw_from = 0;
328eb9b3 1732 my $msgbuf = "";
3397f9df
EW
1733 while (<$msg_fh>) {
1734 if (!$in_msg) {
1735 $in_msg = 1 if (/^\s*$/);
6aa9ba14 1736 $author = $1 if (/^author (.*>)/);
df746c5a 1737 } elsif (/^git-svn-id: /) {
44320b9e
EW
1738 # skip this for now, we regenerate the
1739 # correct one on re-fetch anyways
1740 # TODO: set *:merge properties or like...
3397f9df 1741 } else {
6aa9ba14
AP
1742 if (/^From:/ || /^Signed-off-by:/) {
1743 $saw_from = 1;
1744 }
328eb9b3 1745 $msgbuf .= $_;
3397f9df
EW
1746 }
1747 }
328eb9b3 1748 $msgbuf =~ s/\s+$//s;
6aa9ba14
AP
1749 if ($Git::SVN::_add_author_from && defined($author)
1750 && !$saw_from) {
328eb9b3 1751 $msgbuf .= "\n\nFrom: $author";
6aa9ba14 1752 }
328eb9b3 1753 print $log_fh $msgbuf or croak $!;
aef4e921 1754 command_close_pipe($msg_fh, $ctx);
3397f9df 1755 }
44320b9e 1756 close $log_fh or croak $!;
3397f9df
EW
1757
1758 if ($_edit || ($type eq 'tree')) {
b4479f07
JN
1759 chomp(my $editor = command_oneline(qw(var GIT_EDITOR)));
1760 system('sh', '-c', $editor.' "$@"', $editor, $commit_editmsg);
3397f9df 1761 }
44320b9e 1762 rename $commit_editmsg, $commit_msg or croak $!;
16fc08e2 1763 {
b510df8a 1764 require Encode;
16fc08e2
EW
1765 # SVN requires messages to be UTF-8 when entering the repo
1766 local $/;
1767 open $log_fh, '<', $commit_msg or croak $!;
1768 binmode $log_fh;
1769 chomp($log_entry{log} = <$log_fh>);
1770
b510df8a
EW
1771 my $enc = Git::config('i18n.commitencoding') || 'UTF-8';
1772 my $msg = $log_entry{log};
1773
1774 eval { $msg = Encode::decode($enc, $msg, 1) };
1775 if ($@) {
1776 die "Could not decode as $enc:\n", $msg,
1777 "\nPerhaps you need to set i18n.commitencoding\n";
16fc08e2 1778 }
b510df8a
EW
1779
1780 eval { $msg = Encode::encode('UTF-8', $msg, 1) };
1781 die "Could not encode as UTF-8:\n$msg\n" if $@;
1782
1783 $log_entry{log} = $msg;
1784
16fc08e2
EW
1785 close $log_fh or croak $!;
1786 }
44320b9e
EW
1787 unlink $commit_msg;
1788 \%log_entry;
a5e0cedc
EW
1789}
1790
3397f9df
EW
1791sub s_to_file {
1792 my ($str, $file, $mode) = @_;
1793 open my $fd,'>',$file or croak $!;
1794 print $fd $str,"\n" or croak $!;
1795 close $fd or croak $!;
1796 chmod ($mode &~ umask, $file) if (defined $mode);
1797}
1798
1799sub file_to_s {
1800 my $file = shift;
1801 open my $fd,'<',$file or croak "$!: file: $file\n";
1802 local $/;
1803 my $ret = <$fd>;
1804 close $fd or croak $!;
1805 $ret =~ s/\s*$//s;
1806 return $ret;
1807}
1808
eeb0abe0
EW
1809# '<svn username> = real-name <email address>' mapping based on git-svnimport:
1810sub load_authors {
1811 open my $authors, '<', $_authors or die "Can't open $_authors $!\n";
f8c9d1d2 1812 my $log = $cmd eq 'log';
eeb0abe0
EW
1813 while (<$authors>) {
1814 chomp;
575d025c 1815 next unless /^(.+?|\(no author\))\s*=\s*(.+?)\s*<(.+)>\s*$/;
eeb0abe0 1816 my ($user, $name, $email) = ($1, $2, $3);
f8c9d1d2
EW
1817 if ($log) {
1818 $Git::SVN::Log::rusers{"$name <$email>"} = $user;
1819 } else {
1820 $users{$user} = [$name, $email];
1821 }
79bb8d88
EW
1822 }
1823 close $authors or croak $!;
1824}
1825
e0d10e1c 1826# convert GetOpt::Long specs for use by git-config
1a30582b 1827sub read_git_config {
b8c92cad 1828 my $opts = shift;
97ae0911 1829 my @config_only;
b8c92cad 1830 foreach my $o (keys %$opts) {
97ae0911
EW
1831 # if we have mixedCase and a long option-only, then
1832 # it's a config-only variable that we don't need for
1833 # the command-line.
1834 push @config_only, $o if ($o =~ /[A-Z]/ && $o =~ /^[a-z]+$/i);
b8c92cad 1835 my $v = $opts->{$o};
97ae0911 1836 my ($key) = ($o =~ /^([a-zA-Z\-]+)/);
b8c92cad 1837 $key =~ s/-//g;
225f1d0c 1838 my $arg = 'git config';
b8c92cad
EW
1839 $arg .= ' --int' if ($o =~ /[:=]i$/);
1840 $arg .= ' --bool' if ($o !~ /[:=][sfi]$/);
1841 if (ref $v eq 'ARRAY') {
1842 chomp(my @tmp = `$arg --get-all svn.$key`);
1843 @$v = @tmp if @tmp;
1844 } else {
1845 chomp(my $tmp = `$arg --get svn.$key`);
7774284a 1846 if ($tmp && !($arg =~ / --bool/ && $tmp eq 'false')) {
b8c92cad
EW
1847 $$v = $tmp;
1848 }
1849 }
1850 }
97ae0911 1851 delete @$opts{@config_only} if @config_only;
b8c92cad
EW
1852}
1853
79bb8d88 1854sub extract_metadata {
c1927a85 1855 my $id = shift or return (undef, undef, undef);
3dfab993 1856 my ($url, $rev, $uuid) = ($id =~ /^\s*git-svn-id:\s+(.*)\@(\d+)
b3e95936 1857 \s([a-f\d\-]+)$/ix);
e70dc780 1858 if (!defined $rev || !$uuid || !$url) {
79bb8d88 1859 # some of the original repositories I made had
82e5a82f 1860 # identifiers like this:
b3e95936 1861 ($rev, $uuid) = ($id =~/^\s*git-svn-id:\s(\d+)\@([a-f\d\-]+)/i);
79bb8d88
EW
1862 }
1863 return ($url, $rev, $uuid);
1864}
1865
c1927a85
EW
1866sub cmt_metadata {
1867 return extract_metadata((grep(/^git-svn-id: /,
aef4e921 1868 command(qw/cat-file commit/, shift)))[-1]);
c1927a85
EW
1869}
1870
6ea42032
BB
1871sub cmt_sha2rev_batch {
1872 my %s2r;
1873 my ($pid, $in, $out, $ctx) = command_bidi_pipe(qw/cat-file --batch/);
1874 my $list = shift;
1875
1876 foreach my $sha (@{$list}) {
1877 my $first = 1;
1878 my $size = 0;
1879 print $out $sha, "\n";
1880
1881 while (my $line = <$in>) {
1882 if ($first && $line =~ /^[[:xdigit:]]{40}\smissing$/) {
1883 last;
1884 } elsif ($first &&
1885 $line =~ /^[[:xdigit:]]{40}\scommit\s(\d+)$/) {
1886 $first = 0;
1887 $size = $1;
1888 next;
1889 } elsif ($line =~ /^(git-svn-id: )/) {
1890 my (undef, $rev, undef) =
1891 extract_metadata($line);
1892 $s2r{$sha} = $rev;
1893 }
1894
1895 $size -= length($line);
1896 last if ($size == 0);
1897 }
1898 }
1899
1900 command_close_bidi_pipe($pid, $in, $out, $ctx);
1901
1902 return \%s2r;
1903}
1904
905f8b7d
EW
1905sub working_head_info {
1906 my ($head, $refs) = @_;
83cf21f9 1907 my @args = qw/rev-list --first-parent --pretty=medium/;
05b4df31 1908 my ($fh, $ctx) = command_output_pipe(@args, $head);
3dfab993 1909 my $hash;
40cb8f8f 1910 my %max;
3dfab993
SV
1911 while (<$fh>) {
1912 if ( m{^commit ($::sha1)$} ) {
1913 unshift @$refs, $hash if $hash and $refs;
1914 $hash = $1;
1915 next;
1916 }
1917 next unless s{^\s*(git-svn-id:)}{$1};
1918 my ($url, $rev, $uuid) = extract_metadata($_);
13c823fb 1919 if (defined $url && defined $rev) {
40cb8f8f 1920 next if $max{$url} and $max{$url} < $rev;
13c823fb 1921 if (my $gs = Git::SVN->find_by_url($url)) {
63c56022 1922 my $c = $gs->rev_map_get($rev, $uuid);
b03c7a63 1923 if ($c && $c eq $hash) {
13c823fb
EW
1924 close $fh; # break the pipe
1925 return ($url, $rev, $uuid, $gs);
40cb8f8f 1926 } else {
060610c5 1927 $max{$url} ||= $gs->rev_map_max;
13c823fb
EW
1928 }
1929 }
1930 }
905f8b7d 1931 }
13c823fb
EW
1932 command_close_pipe($fh, $ctx);
1933 (undef, undef, undef, undef);
905f8b7d
EW
1934}
1935
733a65aa
EW
1936sub read_commit_parents {
1937 my ($parents, $c) = @_;
7b02b85a
EW
1938 chomp(my $p = command_oneline(qw/rev-list --parents -1/, $c));
1939 $p =~ s/^($c)\s*// or die "rev-list --parents -1 $c failed!\n";
1940 @{$parents->{$c}} = split(/ /, $p);
733a65aa
EW
1941}
1942
1943sub linearize_history {
1944 my ($gs, $refs) = @_;
1945 my %parents;
1946 foreach my $c (@$refs) {
1947 read_commit_parents(\%parents, $c);
1948 }
1949
1950 my @linear_refs;
1951 my %skip = ();
1952 my $last_svn_commit = $gs->last_commit;
1953 foreach my $c (reverse @$refs) {
1954 next if $c eq $last_svn_commit;
1955 last if $skip{$c};
1956
1957 unshift @linear_refs, $c;
1958 $skip{$c} = 1;
1959
1960 # we only want the first parent to diff against for linear
1961 # history, we save the rest to inject when we finalize the
1962 # svn commit
1963 my $fp_a = verify_ref("$c~1");
1964 my $fp_b = shift @{$parents{$c}} if $parents{$c};
1965 if (!$fp_a || !$fp_b) {
1966 die "Commit $c\n",
1967 "has no parent commit, and therefore ",
1968 "nothing to diff against.\n",
1969 "You should be working from a repository ",
1970 "originally created by git-svn\n";
1971 }
1972 if ($fp_a ne $fp_b) {
1973 die "$c~1 = $fp_a, however parsing commit $c ",
1974 "revealed that:\n$c~1 = $fp_b\nBUG!\n";
1975 }
1976
1977 foreach my $p (@{$parents{$c}}) {
1978 $skip{$p} = 1;
1979 }
1980 }
1981 (\@linear_refs, \%parents);
1982}
1983
e6fefa92
DK
1984sub find_file_type_and_diff_status {
1985 my ($path) = @_;
107cee50 1986 return ('dir', '') if $path eq '';
e6fefa92
DK
1987
1988 my $diff_output =
1989 command_oneline(qw(diff --cached --name-status --), $path) || "";
1990 my $diff_status = (split(' ', $diff_output))[0] || "";
1991
1992 my $ls_tree = command_oneline(qw(ls-tree HEAD), $path) || "";
1993
1994 return (undef, undef) if !$diff_status && !$ls_tree;
1995
1996 if ($diff_status eq "A") {
1997 return ("link", $diff_status) if -l $path;
1998 return ("dir", $diff_status) if -d $path;
1999 return ("file", $diff_status);
2000 }
2001
2002 my $mode = (split(' ', $ls_tree))[0] || "";
2003
2004 return ("link", $diff_status) if $mode eq "120000";
2005 return ("dir", $diff_status) if $mode eq "040000";
2006 return ("file", $diff_status);
2007}
2008
b2b3ada7
DK
2009sub md5sum {
2010 my $arg = shift;
2011 my $ref = ref $arg;
2012 my $md5 = Digest::MD5->new();
0b19138b 2013 if ($ref eq 'GLOB' || $ref eq 'IO::File' || $ref eq 'File::Temp') {
b2b3ada7
DK
2014 $md5->addfile($arg) or croak $!;
2015 } elsif ($ref eq 'SCALAR') {
2016 $md5->add($$arg) or croak $!;
2017 } elsif (!$ref) {
2018 $md5->add($arg) or croak $!;
2019 } else {
c2768fa1 2020 fatal "Can't provide MD5 hash for unknown ref type: '", $ref, "'";
b2b3ada7
DK
2021 }
2022 return $md5->hexdigest();
2023}
2024
2da9ee08 2025sub gc_directory {
c2768fa1 2026 if (can_compress() && -f $_ && basename($_) eq "unhandled.log") {
2da9ee08
RZ
2027 my $out_filename = $_ . ".gz";
2028 open my $in_fh, "<", $_ or die "Unable to open $_: $!\n";
2029 binmode $in_fh;
2030 my $gz = Compress::Zlib::gzopen($out_filename, "ab") or
2031 die "Unable to open $out_filename: $!\n";
2032
2033 my $res;
2034 while ($res = sysread($in_fh, my $str, 1024)) {
2035 $gz->gzwrite($str) or
2036 die "Unable to write: ".$gz->gzerror()."!\n";
2037 }
2038 unlink $_ or die "unlink $File::Find::name: $!\n";
2039 } elsif (-f $_ && basename($_) eq "index") {
2040 unlink $_ or die "unlink $_: $!\n";
2041 }
2042}
2043
18ea92bd 2044
ef3cfaad
EW
2045package Git::IndexInfo;
2046use strict;
2047use warnings;
2048use Git qw/command_input_pipe command_close_pipe/;
2049
2050sub new {
2051 my ($class) = @_;
2052 my ($gui, $ctx) = command_input_pipe(qw/update-index -z --index-info/);
2053 bless { gui => $gui, ctx => $ctx, nr => 0}, $class;
2054}
2055
2056sub remove {
2057 my ($self, $path) = @_;
2058 if (print { $self->{gui} } '0 ', 0 x 40, "\t", $path, "\0") {
2059 return ++$self->{nr};
2060 }
2061 undef;
2062}
2063
2064sub update {
2065 my ($self, $mode, $hash, $path) = @_;
2066 if (print { $self->{gui} } $mode, ' ', $hash, "\t", $path, "\0") {
2067 return ++$self->{nr};
2068 }
2069 undef;
2070}
2071
2072sub DESTROY {
2073 my ($self) = @_;
2074 command_close_pipe($self->{gui}, $self->{ctx});
2075}
2076
4bb9ed04
EW
2077package Git::SVN::GlobSpec;
2078use strict;
2079use warnings;
2080
2081sub new {
07576208 2082 my ($class, $glob, $pattern_ok) = @_;
4bb9ed04
EW
2083 my $re = $glob;
2084 $re =~ s!/+$!!g; # no need for trailing slashes
07576208
JS
2085 my (@left, @right, @patterns);
2086 my $state = "left";
2087 my $die_msg = "Only one set of wildcard directories " .
2088 "(e.g. '*' or '*/*/*') is supported: '$glob'\n";
2089 for my $part (split(m|/|, $glob)) {
2090 if ($part =~ /\*/ && $part ne "*") {
2091 die "Invalid pattern in '$glob': $part\n";
2092 } elsif ($pattern_ok && $part =~ /[{}]/ &&
2093 $part !~ /^\{[^{}]+\}/) {
2094 die "Invalid pattern in '$glob': $part\n";
2095 }
2096 if ($part eq "*") {
2097 die $die_msg if $state eq "right";
2098 $state = "pattern";
2099 push(@patterns, "[^/]*");
2100 } elsif ($pattern_ok && $part =~ /^\{(.*)\}$/) {
2101 die $die_msg if $state eq "right";
2102 $state = "pattern";
2103 my $p = quotemeta($1);
2104 $p =~ s/\\,/|/g;
2105 push(@patterns, "(?:$p)");
2106 } else {
2107 if ($state eq "left") {
2108 push(@left, $part);
2109 } else {
2110 push(@right, $part);
2111 $state = "right";
2112 }
2113 }
570d35c2 2114 }
07576208 2115 my $depth = @patterns;
570d35c2 2116 if ($depth == 0) {
07576208 2117 die "One '*' is needed in glob: '$glob'\n";
4e9f6cc7 2118 }
07576208
JS
2119 my $left = join('/', @left);
2120 my $right = join('/', @right);
2121 $re = join('/', @patterns);
2122 $re = join('\/',
2123 grep(length, quotemeta($left), "($re)", quotemeta($right)));
74a81227
EW
2124 my $left_re = qr/^\/\Q$left\E(\/|$)/;
2125 bless { left => $left, right => $right, left_regex => $left_re,
570d35c2 2126 regex => qr/$re/, glob => $glob, depth => $depth }, $class;
4bb9ed04
EW
2127}
2128
2129sub full_path {
2130 my ($self, $path) = @_;
2131 return (length $self->{left} ? "$self->{left}/" : '') .
2132 $path . (length $self->{right} ? "/$self->{right}" : '');
2133}
2134
3397f9df
EW
2135__END__
2136
2137Data structures:
2138
4bb9ed04
EW
2139
2140$remotes = { # returned by read_all_remotes()
2141 'svn' => {
2142 # svn-remote.svn.url=https://svn.musicpd.org
2143 url => 'https://svn.musicpd.org',
2144 # svn-remote.svn.fetch=mpd/trunk:trunk
2145 fetch => {
2146 'mpd/trunk' => 'trunk',
2147 },
2148 # svn-remote.svn.tags=mpd/tags/*:tags/*
2149 tags => {
2150 path => {
2151 left => 'mpd/tags',
2152 right => '',
2153 regex => qr!mpd/tags/([^/]+)$!,
2154 glob => 'tags/*',
2155 },
2156 ref => {
2157 left => 'tags',
2158 right => '',
2159 regex => qr!tags/([^/]+)$!,
2160 glob => 'tags/*',
2161 },
2162 }
2163 }
2164};
2165
44320b9e 2166$log_entry hashref as returned by libsvn_log_entry()
3397f9df 2167{
44320b9e 2168 log => 'whitespace-formatted log entry
3397f9df
EW
2169', # trailing newline is preserved
2170 revision => '8', # integer
2171 date => '2004-02-24T17:01:44.108345Z', # commit date
2172 author => 'committer name'
2173};
2174
6e8548cc
EW
2175
2176# this is generated by generate_diff();
3397f9df
EW
2177@mods = array of diff-index line hashes, each element represents one line
2178 of diff-index output
2179
2180diff-index line ($m hash)
2181{
2182 mode_a => first column of diff-index output, no leading ':',
2183 mode_b => second column of diff-index output,
2184 sha1_b => sha1sum of the final blob,
ac8e0b91 2185 chg => change type [MCRADT],
3397f9df
EW
2186 file_a => original file name of a file (iff chg is 'C' or 'R')
2187 file_b => new/current file name of a file (any chg)
2188}
2189;
a5e0cedc 2190
a00439ac
EW
2191# retval of read_url_paths{,_all}();
2192$l_map = {
2193 # repository root url
2194 'https://svn.musicpd.org' => {
2195 # repository path # GIT_SVN_ID
2196 'mpd/trunk' => 'trunk',
2197 'mpd/tags/0.11.5' => 'tags/0.11.5',
2198 },
2199}
2200
a5e0cedc
EW
2201Notes:
2202 I don't trust the each() function on unless I created %hash myself
2203 because the internal iterator may not have started at base.