Update draft release notes for 1.8.3
[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
e96cdba1
MS
13use Carp qw/croak/;
14use Digest::MD5;
15use IO::File qw//;
16use File::Basename qw/dirname basename/;
17use File::Path qw/mkpath/;
18use File::Spec;
19use File::Find;
20use Getopt::Long qw/:config gnu_getopt no_ignore_case auto_abbrev/;
21use IPC::Open3;
22use Memoize;
23
29499c0b 24use Git::SVN;
e96cdba1
MS
25use Git::SVN::Editor;
26use Git::SVN::Fetcher;
27use Git::SVN::Ra;
28use Git::SVN::Prompt;
b74fda1c 29use Git::SVN::Log;
b772cb99 30use Git::SVN::Migration;
c2768fa1 31
91e6e0c5
MS
32use Git::SVN::Utils qw(
33 fatal
34 can_compress
35 canonicalize_path
36 canonicalize_url
ca475a61 37 join_paths
d2fd119c 38 add_path_to_url
5eaa1fd0 39 join_paths
91e6e0c5
MS
40);
41
b0e75250
MS
42use Git qw(
43 git_cmd_try
44 command
45 command_oneline
46 command_noisy
47 command_output_pipe
48 command_close_pipe
49 command_bidi_pipe
50 command_close_bidi_pipe
51);
52
e96cdba1
MS
53BEGIN {
54 Memoize::memoize 'Git::config';
55 Memoize::memoize 'Git::config_bool';
56}
57
b0e75250 58
15153451
BS
59# From which subdir have we been invoked?
60my $cmd_dir_prefix = eval {
61 command_oneline([qw/rev-parse --show-prefix/], STDERR => 0)
62} || '';
63
6af1db44 64$Git::SVN::Ra::_log_window_size = 100;
13ccd6d4 65
184892fb
SS
66if (! exists $ENV{SVN_SSH} && exists $ENV{GIT_SSH}) {
67 $ENV{SVN_SSH} = $ENV{GIT_SSH};
68}
69
70if (exists $ENV{SVN_SSH} && $^O eq 'msys') {
71 $ENV{SVN_SSH} =~ s/\\/\\\\/g;
72 $ENV{SVN_SSH} =~ s/(.*)/"$1"/;
f3a87d92
K
73}
74
f8c9d1d2 75$Git::SVN::Log::TZ = $ENV{TZ};
3397f9df 76$ENV{TZ} = 'UTC';
a00439ac 77$| = 1; # unbuffer STDOUT
3397f9df 78
6ade9bda
RK
79# All SVN commands do it. Otherwise we may die on SIGPIPE when the remote
80# repository decides to close the connection which we expect to be kept alive.
81$SIG{PIPE} = 'IGNORE';
82
f760c903
JH
83# Given a dot separated version number, "subtract" it from
84# the SVN::Core::VERSION; non-negaitive return means the SVN::Core
85# is at least at the version the caller asked for.
86sub compare_svn_version {
87 my (@ours) = split(/\./, $SVN::Core::VERSION);
88 my (@theirs) = split(/\./, $_[0]);
89 my ($i, $diff);
90
91 for ($i = 0; $i < @ours && $i < @theirs; $i++) {
92 $diff = $ours[$i] - $theirs[$i];
93 return $diff if ($diff);
94 }
95 return 1 if ($i < @ours);
96 return -1 if ($i < @theirs);
97 return 0;
98}
99
d32fad2b 100sub _req_svn {
101 require SVN::Core; # use()-ing this causes segfaults for me... *shrug*
102 require SVN::Ra;
103 require SVN::Delta;
f760c903 104 if (::compare_svn_version('1.1.0') < 0) {
d32fad2b 105 fatal "Need SVN::Core 1.1.0 or better (got $SVN::Core::VERSION)";
106 }
b9c85187 107}
c2768fa1 108
f8c9d1d2
EW
109$sha1 = qr/[a-f\d]{40}/;
110$sha1_short = qr/[a-f\d]{4,40}/;
44320b9e 111my ($_stdin, $_help, $_edit,
62244069 112 $_message, $_file, $_branch_dest,
d05d72e0 113 $_template, $_shared,
c2abd83f 114 $_version, $_fetch_all, $_no_rebase, $_fetch_parent,
2934a484 115 $_before, $_after,
b64e1f58 116 $_merge, $_strategy, $_preserve_merges, $_dry_run, $_local,
4be40381 117 $_prefix, $_no_checkout, $_url, $_verbose,
2c96a6c3 118 $_commit_url, $_tag, $_merge_info, $_interactive);
0f80aa03
MS
119
120# This is a refactoring artifact so Git::SVN can get at this git-svn switch.
121sub opt_prefix { return $_prefix || '' }
122
72827aa4 123$Git::SVN::Fetcher::_placeholder_filename = ".gitignore";
49750f30 124$_q ||= 0;
706587fc
EW
125my %remote_opts = ( 'username=s' => \$Git::SVN::Prompt::_username,
126 'config-dir=s' => \$Git::SVN::Ra::config_dir,
edc662f9 127 'no-auth-cache' => \$Git::SVN::Prompt::_no_auth_cache,
72827aa4 128 'ignore-paths=s' => \$Git::SVN::Fetcher::_ignore_regex,
cdb51a13 129 'ignore-refs=s' => \$Git::SVN::Ra::_ignore_refs_regex );
0bed5eaa 130my %fc_opts = ( 'follow-parent|follow!' => \$Git::SVN::_follow_parent,
dc5869c0 131 'authors-file|A=s' => \$_authors,
36db1edd 132 'authors-prog=s' => \$_authors_prog,
ecc712dd 133 'repack:i' => \$Git::SVN::_repack,
97ae0911
EW
134 'noMetadata' => \$Git::SVN::_no_metadata,
135 'useSvmProps' => \$Git::SVN::_use_svm_props,
62e349d2 136 'useSvnsyncProps' => \$Git::SVN::_use_svnsync_props,
6af1db44 137 'log-window-size=i' => \$Git::SVN::Ra::_log_window_size,
1e889ef3 138 'no-checkout' => \$_no_checkout,
49750f30 139 'quiet|q+' => \$_q,
ecc712dd
EW
140 'repack-flags|repack-args|repack-opts=s' =>
141 \$Git::SVN::_repack_flags,
70ae04e4 142 'use-log-author' => \$Git::SVN::_use_log_author,
6aa9ba14 143 'add-author-from' => \$Git::SVN::_add_author_from,
e82f0d73 144 'localtime' => \$Git::SVN::_localtime,
706587fc 145 %remote_opts );
36f5b1f0 146
62244069 147my ($_trunk, @_tags, @_branches, $_stdlayout);
0dfaf0a4 148my %icv;
dadc6d2a 149my %init_opts = ( 'template=s' => \$_template, 'shared:s' => \$_shared,
62244069
MB
150 'trunk|T=s' => \$_trunk, 'tags|t=s@' => \@_tags,
151 'branches|b=s@' => \@_branches, 'prefix=s' => \$_prefix,
8f728fb9 152 'stdlayout|s' => \$_stdlayout,
6b48829d 153 'minimize-url|m!' => \$Git::SVN::_minimize_url,
0dfaf0a4
EW
154 'no-metadata' => sub { $icv{noMetadata} = 1 },
155 'use-svm-props' => sub { $icv{useSvmProps} = 1 },
156 'use-svnsync-props' => sub { $icv{useSvnsyncProps} = 1 },
157 'rewrite-root=s' => sub { $icv{rewriteRoot} = $_[1] },
3e18ce1a 158 'rewrite-uuid=s' => sub { $icv{rewriteUUID} = $_[1] },
dadc6d2a 159 %remote_opts );
27e9fb8d 160my %cmt_opts = ( 'edit|e' => \$_edit,
72827aa4
JN
161 'rmdir' => \$Git::SVN::Editor::_rmdir,
162 'find-copies-harder' => \$Git::SVN::Editor::_find_copies_harder,
163 'l=i' => \$Git::SVN::Editor::_rename_limit,
164 'copy-similarity|C=i'=> \$Git::SVN::Editor::_cp_similarity
27e9fb8d 165);
9d55b41a 166
3397f9df 167my %cmd = (
2a3240be 168 fetch => [ \&cmd_fetch, "Download new revisions from SVN",
e98671e5 169 { 'revision|r=s' => \$_revision,
905f8b7d 170 'fetch-all|all' => \$_fetch_all,
c2abd83f 171 'parent|p' => \$_fetch_parent,
e98671e5 172 %fc_opts } ],
0425ea90
EW
173 clone => [ \&cmd_clone, "Initialize and fetch revisions",
174 { 'revision|r=s' => \$_revision,
40a1530c 175 'preserve-empty-dirs' =>
72827aa4 176 \$Git::SVN::Fetcher::_preserve_empty_dirs,
40a1530c 177 'placeholder-filename=s' =>
72827aa4 178 \$Git::SVN::Fetcher::_placeholder_filename,
0425ea90 179 %fc_opts, %init_opts } ],
d2866f9e 180 init => [ \&cmd_init, "Initialize a repo for tracking" .
f8ab6b73 181 " (requires URL argument)",
9d55b41a 182 \%init_opts ],
dadc6d2a
EW
183 'multi-init' => [ \&cmd_multi_init,
184 "Deprecated alias for ".
185 "'$0 init -T<trunk> -b<branches> -t<tags>'",
186 \%init_opts ],
d7ad3bed
EW
187 dcommit => [ \&cmd_dcommit,
188 'Commit several diffs to merge with upstream',
3289e86e
EW
189 { 'merge|m|M' => \$_merge,
190 'strategy|s=s' => \$_strategy,
905f8b7d 191 'verbose|v' => \$_verbose,
3289e86e 192 'dry-run|n' => \$_dry_run,
905f8b7d 193 'fetch-all|all' => \$_fetch_all,
ba24e745
EW
194 'commit-url=s' => \$_commit_url,
195 'revision|r=i' => \$_revision,
171af110 196 'no-rebase' => \$_no_rebase,
6abd9332 197 'mergeinfo=s' => \$_merge_info,
afd7f1eb 198 'interactive|i' => \$_interactive,
4b155223 199 %cmt_opts, %fc_opts } ],
5de70efb
FR
200 branch => [ \&cmd_branch,
201 'Create a branch in the SVN repository',
202 { 'message|m=s' => \$_message,
62244069 203 'destination|d=s' => \$_branch_dest,
5de70efb 204 'dry-run|n' => \$_dry_run,
6594f0b7
IM
205 'tag|t' => \$_tag,
206 'username=s' => \$Git::SVN::Prompt::_username,
207 'commit-url=s' => \$_commit_url } ],
5de70efb
FR
208 tag => [ sub { $_tag = 1; cmd_branch(@_) },
209 'Create a tag in the SVN repository',
210 { 'message|m=s' => \$_message,
62244069 211 'destination|d=s' => \$_branch_dest,
6594f0b7
IM
212 'dry-run|n' => \$_dry_run,
213 'username=s' => \$Git::SVN::Prompt::_username,
214 'commit-url=s' => \$_commit_url } ],
1ce255dc
EW
215 'set-tree' => [ \&cmd_set_tree,
216 "Set an SVN repository to a git tree-ish",
e84dc6df 217 { 'stdin' => \$_stdin, %cmt_opts, %fc_opts, } ],
d05ddec5
BS
218 'create-ignore' => [ \&cmd_create_ignore,
219 'Create a .gitignore per svn:ignore',
220 { 'revision|r=i' => \$_revision
221 } ],
6111b934
EW
222 'mkdirs' => [ \&cmd_mkdirs ,
223 "recreate empty directories after a checkout",
224 { 'revision|r=i' => \$_revision } ],
15153451
BS
225 'propget' => [ \&cmd_propget,
226 'Print the value of a property on a file or directory',
227 { 'revision|r=i' => \$_revision } ],
51e057cf
BS
228 'proplist' => [ \&cmd_proplist,
229 'List all properties of a file or directory',
230 { 'revision|r=i' => \$_revision } ],
5969cbe1 231 'show-ignore' => [ \&cmd_show_ignore, "Show svn:ignore listings",
4dbfe2e9 232 { 'revision|r=i' => \$_revision
05b4df31 233 } ],
2d879792
VK
234 'show-externals' => [ \&cmd_show_externals, "Show svn:externals listings",
235 { 'revision|r=i' => \$_revision
236 } ],
1c8443b0 237 'multi-fetch' => [ \&cmd_multi_fetch,
e98671e5
EW
238 "Deprecated alias for $0 fetch --all",
239 { 'revision|r=s' => \$_revision, %fc_opts } ],
706587fc
EW
240 'migrate' => [ sub { },
241 # no-op, we automatically run this anyways,
706587fc
EW
242 'Migrate configuration/metadata/layout from
243 previous versions of git-svn',
a836a0e1
EW
244 { 'minimize' => \$Git::SVN::Migration::_minimize,
245 %remote_opts } ],
f8c9d1d2
EW
246 'log' => [ \&Git::SVN::Log::cmd_show_log, 'Show commit logs',
247 { 'limit=i' => \$Git::SVN::Log::limit,
79bb8d88 248 'revision|r=s' => \$_revision,
f8c9d1d2
EW
249 'verbose|v' => \$Git::SVN::Log::verbose,
250 'incremental' => \$Git::SVN::Log::incremental,
251 'oneline' => \$Git::SVN::Log::oneline,
252 'show-commit' => \$Git::SVN::Log::show_commit,
253 'non-recursive' => \$Git::SVN::Log::non_recursive,
79bb8d88 254 'authors-file|A=s' => \$_authors,
f8c9d1d2 255 'color' => \$Git::SVN::Log::color,
4dbfe2e9 256 'pager=s' => \$Git::SVN::Log::pager
79bb8d88 257 } ],
222566e4
EW
258 'find-rev' => [ \&cmd_find_rev,
259 "Translate between SVN revision numbers and tree-ish",
2934a484
JK
260 { 'before' => \$_before,
261 'after' => \$_after } ],
905f8b7d
EW
262 'rebase' => [ \&cmd_rebase, "Fetch and rebase your working directory",
263 { 'merge|m|M' => \$_merge,
264 'verbose|v' => \$_verbose,
265 'strategy|s=s' => \$_strategy,
dee41f3e 266 'local|l' => \$_local,
905f8b7d 267 'fetch-all|all' => \$_fetch_all,
7d45e146 268 'dry-run|n' => \$_dry_run,
b64e1f58 269 'preserve-merges|p' => \$_preserve_merges,
905f8b7d 270 %fc_opts } ],
44320b9e
EW
271 'commit-diff' => [ \&cmd_commit_diff,
272 'Commit a diff between two trees',
27e9fb8d
EW
273 { 'message|m=s' => \$_message,
274 'file|F=s' => \$_file,
45bf473a 275 'revision|r=s' => \$_revision,
27e9fb8d 276 %cmt_opts } ],
e6fefa92
DK
277 'info' => [ \&cmd_info,
278 "Show info about the latest SVN revision
279 on the current branch",
8b014d71 280 { 'url' => \$_url, } ],
6fb5375e
TS
281 'blame' => [ \&Git::SVN::Log::cmd_blame,
282 "Show what revision and author last modified each line of a file",
2c96a6c3 283 { 'git-format' => \$Git::SVN::Log::_git_format } ],
195643f2
BJ
284 'reset' => [ \&cmd_reset,
285 "Undo fetches back to the specified SVN revision",
286 { 'revision|r=s' => \$_revision,
287 'parent|p' => \$_fetch_parent } ],
2da9ee08
RZ
288 'gc' => [ \&cmd_gc,
289 "Compress unhandled.log files in .git/svn and remove " .
290 "index files in .git/svn",
291 {} ],
3397f9df 292);
9d55b41a 293
afd7f1eb
FH
294use Term::ReadLine;
295package FakeTerm;
296sub new {
297 my ($class, $reason) = @_;
298 return bless \$reason, shift;
299}
300sub readline {
301 my $self = shift;
302 die "Cannot use readline on FakeTerm: $$self";
303}
304package main;
305
306my $term = eval {
307 $ENV{"GIT_SVN_NOTTY"}
308 ? new Term::ReadLine 'git-svn', \*STDIN, \*STDOUT
309 : new Term::ReadLine 'git-svn';
310};
311if ($@) {
312 $term = new FakeTerm "$@: going non-interactive";
313}
314
3397f9df
EW
315my $cmd;
316for (my $i = 0; $i < @ARGV; $i++) {
317 if (defined $cmd{$ARGV[$i]}) {
318 $cmd = $ARGV[$i];
319 splice @ARGV, $i, 1;
320 last;
9a8c92ac
BJ
321 } elsif ($ARGV[$i] eq 'help') {
322 $cmd = $ARGV[$i+1];
323 usage(0);
3397f9df
EW
324 }
325};
326
540424b2 327# make sure we're always running at the top-level working directory
bc93ceb7
BW
328if ($cmd && $cmd =~ /(?:clone|init|multi-init)$/) {
329 $ENV{GIT_DIR} ||= ".git";
330} else {
331 my ($git_dir, $cdup);
332 git_cmd_try {
333 $git_dir = command_oneline([qw/rev-parse --git-dir/]);
334 } "Unable to find .git directory\n";
335 git_cmd_try {
336 $cdup = command_oneline(qw/rev-parse --show-cdup/);
337 chomp $cdup if ($cdup);
338 $cdup = "." unless ($cdup && length $cdup);
339 } "Already at toplevel, but $git_dir not found\n";
340 $ENV{GIT_DIR} = $git_dir;
341 chdir $cdup or die "Unable to chdir up to '$cdup'\n";
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
1ca6e587 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) {
0b670abd 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
e48fb750
RL
782sub dcommit_rebase {
783 my ($is_last, $current, $fetched_ref, $svn_error) = @_;
784 my @diff;
785
786 if ($svn_error) {
787 print STDERR "\nERROR from SVN:\n",
788 $svn_error->expanded_message, "\n";
789 }
790 unless ($_no_rebase) {
791 # we always want to rebase against the current HEAD,
792 # not any head that was passed to us
793 @diff = command('diff-tree', $current,
794 $fetched_ref, '--');
795 my @finish;
796 if (@diff) {
797 @finish = rebase_cmd();
798 print STDERR "W: $current and ", $fetched_ref,
799 " differ, using @finish:\n",
800 join("\n", @diff), "\n";
801 } elsif ($is_last) {
802 print "No changes between ", $current, " and ",
803 $fetched_ref,
804 "\nResetting to the latest ",
805 $fetched_ref, "\n";
806 @finish = qw/reset --mixed/;
807 }
808 command_noisy(@finish, $fetched_ref) if @finish;
809 }
810 if ($svn_error) {
811 die "ERROR: Not all changes have been committed into SVN"
812 .($_no_rebase ? ".\n" : ", however the committed\n"
813 ."ones (if any) seem to be successfully integrated "
814 ."into the working tree.\n")
815 ."Please see the above messages for details.\n";
816 }
817 return @diff;
818}
819
d7ad3bed
EW
820sub cmd_dcommit {
821 my $head = shift;
181264ad 822 command_noisy(qw/update-index --refresh/);
c8cfa3e4 823 git_cmd_try { command_oneline(qw/diff-index --quiet HEAD/) }
826a9339 824 'Cannot dcommit with a dirty index. Commit your changes first, '
c8cfa3e4 825 . "or stash them with `git stash'.\n";
d7ad3bed 826 $head ||= 'HEAD';
5eec27e3
TR
827
828 my $old_head;
829 if ($head ne 'HEAD') {
830 $old_head = eval {
831 command_oneline([qw/symbolic-ref -q HEAD/])
832 };
833 if ($old_head) {
834 $old_head =~ s{^refs/heads/}{};
835 } else {
836 $old_head = eval { command_oneline(qw/rev-parse HEAD/) };
837 }
838 command(['checkout', $head], STDERR => 0);
839 }
840
a8ae2623 841 my @refs;
5eec27e3 842 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD', \@refs);
2cb61105
TR
843 unless ($gs) {
844 die "Unable to determine upstream SVN information from ",
845 "$head history.\nPerhaps the repository is empty.";
846 }
0df84059
PO
847
848 if (defined $_commit_url) {
849 $url = $_commit_url;
850 } else {
851 $url = eval { command_oneline('config', '--get',
852 "svn-remote.$gs->{repo_id}.commiturl") };
853 if (!$url) {
12a296bc 854 $url = $gs->full_pushurl
0df84059
PO
855 }
856 }
857
ba24e745 858 my $last_rev = $_revision if defined $_revision;
59b0c24d
MM
859 if ($url) {
860 print "Committing to $url ...\n";
861 }
733a65aa 862 my ($linear_refs, $parents) = linearize_history($gs, \@refs);
751eb395
EW
863 if ($_no_rebase && scalar(@$linear_refs) > 1) {
864 warn "Attempting to commit more than one change while ",
865 "--no-rebase is enabled.\n",
866 "If these changes depend on each other, re-running ",
7dfa16b9 867 "without --no-rebase may be required."
751eb395 868 }
afd7f1eb
FH
869
870 if (defined $_interactive){
871 my $ask_default = "y";
872 foreach my $d (@$linear_refs){
873 my ($fh, $ctx) = command_output_pipe(qw(show --summary), "$d");
874 while (<$fh>){
875 print $_;
876 }
877 command_close_pipe($fh, $ctx);
878 $_ = ask("Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): ",
879 valid_re => qr/^(?:yes|y|no|n|quit|q|all|a)/i,
880 default => $ask_default);
881 die "Commit this patch reply required" unless defined $_;
882 if (/^[nq]/i) {
883 exit(0);
884 } elsif (/^a/i) {
885 last;
886 }
887 }
888 }
889
711521e2 890 my $expect_url = $url;
1e5814f3
BJ
891
892 my $push_merge_info = eval {
893 command_oneline(qw/config --get svn.pushmergeinfo/)
894 };
895 if (not defined($push_merge_info)
896 or $push_merge_info eq "false"
897 or $push_merge_info eq "no"
898 or $push_merge_info eq "never") {
899 $push_merge_info = 0;
900 }
901
902 unless (defined($_merge_info) || ! $push_merge_info) {
903 # Preflight check of changes to ensure no issues with mergeinfo
904 # This includes check for uncommitted-to-SVN parents
905 # (other than the first parent, which we will handle),
906 # information from different SVN repos, and paths
907 # which are not underneath this repository root.
908 my $rooturl = $gs->repos_root;
909 foreach my $d (@$linear_refs) {
910 my %parentshash;
911 read_commit_parents(\%parentshash, $d);
912 my @realparents = @{$parentshash{$d}};
913 if ($#realparents > 0) {
914 # Merge commit
915 shift @realparents; # Remove/ignore first parent
916 foreach my $parent (@realparents) {
917 my ($branchurl, $svnrev, $paruuid) = cmt_metadata($parent);
918 unless (defined $paruuid) {
919 # A parent is missing SVN annotations...
920 # abort the whole operation.
921 fatal "$parent is merged into revision $d, "
922 ."but does not have git-svn metadata. "
923 ."Either dcommit the branch or use a "
924 ."local cherry-pick, FF merge, or rebase "
925 ."instead of an explicit merge commit.";
926 }
927
928 unless ($paruuid eq $uuid) {
929 # Parent has SVN metadata from different repository
930 fatal "merge parent $parent for change $d has "
931 ."git-svn uuid $paruuid, while current change "
932 ."has uuid $uuid!";
933 }
934
0e7e30f5 935 unless ($branchurl =~ /^\Q$rooturl\E(.*)/) {
1e5814f3
BJ
936 # This branch is very strange indeed.
937 fatal "merge parent $parent for $d is on branch "
938 ."$branchurl, which is not under the "
939 ."git-svn root $rooturl!";
940 }
941 }
942 }
943 }
944 }
945
946 my $rewritten_parent;
e48fb750 947 my $current_head = command_oneline(qw/rev-parse HEAD/);
711521e2 948 Git::SVN::remove_username($expect_url);
98c4ab32
BJ
949 if (defined($_merge_info)) {
950 $_merge_info =~ tr{ }{\n};
951 }
c74d9acf
EW
952 while (1) {
953 my $d = shift @$linear_refs or last;
45bf473a
EW
954 unless (defined $last_rev) {
955 (undef, $last_rev, undef) = cmt_metadata("$d~1");
956 unless (defined $last_rev) {
d7ad3bed 957 fatal "Unable to extract revision information ",
207f1a75 958 "from commit $d~1";
45bf473a
EW
959 }
960 }
b22d4497
EW
961 if ($_dry_run) {
962 print "diff-tree $d~1 $d\n";
963 } else {
751eb395 964 my $cmt_rev;
1e5814f3
BJ
965
966 unless (defined($_merge_info) || ! $push_merge_info) {
967 $_merge_info = populate_merge_info($d, $gs,
968 $uuid,
969 $linear_refs,
970 $rewritten_parent);
971 }
972
d7ad3bed 973 my %ed_opts = ( r => $last_rev,
61395354 974 log => get_commit_entry($d)->{log},
ba24e745 975 ra => Git::SVN::Ra->new($url),
3caf320b
KA
976 config => SVN::Core::config_get_config(
977 $Git::SVN::Ra::config_dir
978 ),
61395354
EW
979 tree_a => "$d~1",
980 tree_b => $d,
981 editor_cb => sub {
982 print "Committed r$_[0]\n";
751eb395
EW
983 $cmt_rev = $_[0];
984 },
6abd9332 985 mergeinfo => $_merge_info,
a8ae2623 986 svn_path => '');
e48fb750
RL
987
988 my $err_handler = $SVN::Error::handler;
989 $SVN::Error::handler = sub {
990 my $err = shift;
991 dcommit_rebase(1, $current_head, $gs->refname,
992 $err);
993 };
994
72827aa4 995 if (!Git::SVN::Editor->new(\%ed_opts)->apply_diff) {
d7ad3bed 996 print "No changes\n$d~1 == $d\n";
733a65aa 997 } elsif ($parents->{$d} && @{$parents->{$d}}) {
751eb395 998 $gs->{inject_parents_dcommit}->{$cmt_rev} =
733a65aa 999 $parents->{$d};
d7ad3bed 1000 }
751eb395 1001 $_fetch_all ? $gs->fetch_all : $gs->fetch;
e48fb750 1002 $SVN::Error::handler = $err_handler;
7dfa16b9 1003 $last_rev = $cmt_rev;
751eb395
EW
1004 next if $_no_rebase;
1005
e48fb750
RL
1006 my @diff = dcommit_rebase(@$linear_refs == 0, $d,
1007 $gs->refname, undef);
1e5814f3 1008
e48fb750
RL
1009 $rewritten_parent = command_oneline(qw/rev-parse/,
1010 $gs->refname);
1e5814f3 1011
c74d9acf 1012 if (@diff) {
e48fb750
RL
1013 $current_head = command_oneline(qw/rev-parse
1014 HEAD/);
c74d9acf
EW
1015 @refs = ();
1016 my ($url_, $rev_, $uuid_, $gs_) =
5eec27e3 1017 working_head_info('HEAD', \@refs);
c74d9acf
EW
1018 my ($linear_refs_, $parents_) =
1019 linearize_history($gs_, \@refs);
1020 if (scalar(@$linear_refs) !=
1021 scalar(@$linear_refs_)) {
1022 fatal "# of revisions changed ",
1023 "\nbefore:\n",
1024 join("\n", @$linear_refs),
1025 "\n\nafter:\n",
1026 join("\n", @$linear_refs_), "\n",
1027 'If you are attempting to commit ',
1028 "merges, try running:\n\t",
1029 'git rebase --interactive',
1030 '--preserve-merges ',
1031 $gs->refname,
1032 "\nBefore dcommitting";
1033 }
711521e2 1034 if ($url_ ne $expect_url) {
c03c1f79
AG
1035 if ($url_ eq $gs->metadata_url) {
1036 print
1037 "Accepting rewritten URL:",
1038 " $url_\n";
1039 } else {
1040 fatal
1041 "URL mismatch after rebase:",
1042 " $url_ != $expect_url";
1043 }
c74d9acf
EW
1044 }
1045 if ($uuid_ ne $uuid) {
1046 fatal "uuid mismatch after rebase: ",
1047 "$uuid_ != $uuid";
1048 }
1049 # remap parents
1050 my (%p, @l, $i);
1051 for ($i = 0; $i < scalar @$linear_refs; $i++) {
1052 my $new = $linear_refs_->[$i] or next;
1053 $p{$new} =
1054 $parents->{$linear_refs->[$i]};
1055 push @l, $new;
1056 }
1057 $parents = \%p;
1058 $linear_refs = \@l;
e48fb750 1059 undef $last_rev;
c74d9acf 1060 }
b22d4497
EW
1061 }
1062 }
5eec27e3
TR
1063
1064 if ($old_head) {
1065 my $new_head = command_oneline(qw/rev-parse HEAD/);
1066 my $new_is_symbolic = eval {
1067 command_oneline(qw/symbolic-ref -q HEAD/);
1068 };
1069 if ($new_is_symbolic) {
1070 print "dcommitted the branch ", $head, "\n";
1071 } else {
1072 print "dcommitted on a detached HEAD because you gave ",
1073 "a revision argument.\n",
1074 "The rewritten commit is: ", $new_head, "\n";
1075 }
1076 command(['checkout', $old_head], STDERR => 0);
1077 }
1078
3157dd9e 1079 unlink $gs->{index};
b22d4497
EW
1080}
1081
5de70efb
FR
1082sub cmd_branch {
1083 my ($branch_name, $head) = @_;
1084
1085 unless (defined $branch_name && length $branch_name) {
1086 die(($_tag ? "tag" : "branch") . " name required\n");
1087 }
1088 $head ||= 'HEAD';
1089
150d38c4 1090 my (undef, $rev, undef, $gs) = working_head_info($head);
12a296bc 1091 my $src = $gs->full_pushurl;
5de70efb 1092
a0fbc87c 1093 my $remote = Git::SVN::read_all_remotes()->{$gs->{repo_id}};
62244069
MB
1094 my $allglobs = $remote->{ $_tag ? 'tags' : 'branches' };
1095 my $glob;
1096 if ($#{$allglobs} == 0) {
1097 $glob = $allglobs->[0];
1098 } else {
1099 unless(defined $_branch_dest) {
1100 die "Multiple ",
1101 $_tag ? "tag" : "branch",
1102 " paths defined for Subversion repository.\n",
1103 "You must specify where you want to create the ",
1104 $_tag ? "tag" : "branch",
1105 " with the --destination argument.\n";
1106 }
1107 foreach my $g (@{$allglobs}) {
72827aa4 1108 my $re = Git::SVN::Editor::glob2pat($g->{path}->{left});
f7050599 1109 if ($_branch_dest =~ /$re/) {
62244069
MB
1110 $glob = $g;
1111 last;
1112 }
1113 }
1114 unless (defined $glob) {
eaa14ff8
EW
1115 my $dest_re = qr/\b\Q$_branch_dest\E\b/;
1116 foreach my $g (@{$allglobs}) {
1117 $g->{path}->{left} =~ /$dest_re/ or next;
1118 if (defined $glob) {
1119 die "Ambiguous destination: ",
1120 $_branch_dest, "\nmatches both '",
1121 $glob->{path}->{left}, "' and '",
1122 $g->{path}->{left}, "'\n";
1123 }
1124 $glob = $g;
1125 }
1126 unless (defined $glob) {
1127 die "Unknown ",
1128 $_tag ? "tag" : "branch",
1129 " destination $_branch_dest\n";
1130 }
62244069
MB
1131 }
1132 }
5de70efb 1133 my ($lft, $rgt) = @{ $glob->{path} }{qw/left right/};
99bacd6c
IM
1134 my $url;
1135 if (defined $_commit_url) {
1136 $url = $_commit_url;
1137 } else {
1138 $url = eval { command_oneline('config', '--get',
1139 "svn-remote.$gs->{repo_id}.commiturl") };
1140 if (!$url) {
12a296bc 1141 $url = $remote->{pushurl} || $remote->{url};
99bacd6c
IM
1142 }
1143 }
1144 my $dst = join '/', $url, $lft, $branch_name, ($rgt || ());
5de70efb 1145
a83b91e7
IM
1146 if ($dst =~ /^https:/ && $src =~ /^http:/) {
1147 $src=~s/^http:/https:/;
1148 }
1149
d32fad2b 1150 ::_req_svn();
1151
5de70efb
FR
1152 my $ctx = SVN::Client->new(
1153 auth => Git::SVN::Ra::_auth_providers(),
1154 log_msg => sub {
1155 ${ $_[0] } = defined $_message
1156 ? $_message
1157 : 'Create ' . ($_tag ? 'tag ' : 'branch ' )
1158 . $branch_name;
1159 },
1160 );
1161
1162 eval {
1163 $ctx->ls($dst, 'HEAD', 0);
1164 } and die "branch ${branch_name} already exists\n";
1165
1166 print "Copying ${src} at r${rev} to ${dst}...\n";
1167 $ctx->copy($src, $rev, $dst)
1168 unless $_dry_run;
1169
1170 $gs->fetch_all;
1171}
1172
26e60160 1173sub cmd_find_rev {
ea14e6c5
MAL
1174 my $revision_or_hash = shift or die "SVN or git revision required ",
1175 "as a command-line argument\n";
26e60160
AR
1176 my $result;
1177 if ($revision_or_hash =~ /^r\d+$/) {
b3cb7e45
AR
1178 my $head = shift;
1179 $head ||= 'HEAD';
1180 my @refs;
63c56022 1181 my (undef, undef, $uuid, $gs) = working_head_info($head, \@refs);
b3cb7e45
AR
1182 unless ($gs) {
1183 die "Unable to determine upstream SVN information from ",
1184 "$head history\n";
26e60160 1185 }
b3cb7e45 1186 my $desired_revision = substr($revision_or_hash, 1);
2934a484
JK
1187 if ($_before) {
1188 $result = $gs->find_rev_before($desired_revision, 1);
1189 } elsif ($_after) {
1190 $result = $gs->find_rev_after($desired_revision, 1);
1191 } else {
1192 $result = $gs->rev_map_get($desired_revision, $uuid);
1193 }
26e60160
AR
1194 } else {
1195 my (undef, $rev, undef) = cmt_metadata($revision_or_hash);
1196 $result = $rev;
1197 }
1198 print "$result\n" if $result;
1199}
1200
55f9d7a7
MH
1201sub auto_create_empty_directories {
1202 my ($gs) = @_;
1203 my $var = eval { command_oneline('config', '--get', '--bool',
1204 "svn-remote.$gs->{repo_id}.automkdirs") };
1205 # By default, create empty directories by consulting the unhandled log,
1206 # but allow setting it to 'false' to skip it.
1207 return !($var && $var eq 'false');
1208}
1209
905f8b7d
EW
1210sub cmd_rebase {
1211 command_noisy(qw/update-index --refresh/);
13c823fb
EW
1212 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
1213 unless ($gs) {
905f8b7d
EW
1214 die "Unable to determine upstream SVN information from ",
1215 "working tree history\n";
1216 }
7d45e146
SF
1217 if ($_dry_run) {
1218 print "Remote Branch: " . $gs->refname . "\n";
1219 print "SVN URL: " . $url . "\n";
1220 return;
1221 }
905f8b7d
EW
1222 if (command(qw/diff-index HEAD --/)) {
1223 print STDERR "Cannot rebase with uncommited changes:\n";
1224 command_noisy('status');
1225 exit 1;
1226 }
dee41f3e 1227 unless ($_local) {
cec0d5a3
SG
1228 # rebase will checkout for us, so no need to do it explicitly
1229 $_no_checkout = 'true';
dee41f3e
EW
1230 $_fetch_all ? $gs->fetch_all : $gs->fetch;
1231 }
905f8b7d 1232 command_noisy(rebase_cmd(), $gs->refname);
55f9d7a7
MH
1233 if (auto_create_empty_directories($gs)) {
1234 $gs->mkemptydirs;
1235 }
905f8b7d
EW
1236}
1237
5969cbe1 1238sub cmd_show_ignore {
13c823fb
EW
1239 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
1240 $gs ||= Git::SVN->new;
5969cbe1 1241 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
6a8d999e 1242 $gs->prop_walk($gs->path, $r, sub {
01bdab84
BS
1243 my ($gs, $path, $props) = @_;
1244 print STDOUT "\n# $path\n";
1245 my $s = $props->{'svn:ignore'} or return;
1246 $s =~ s/[\r\n]+/\n/g;
a7d72544 1247 $s =~ s/^\n+//;
01bdab84
BS
1248 chomp $s;
1249 $s =~ s#^#$path#gm;
1250 print STDOUT "$s\n";
1251 });
a5e0cedc
EW
1252}
1253
2d879792
VK
1254sub cmd_show_externals {
1255 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
1256 $gs ||= Git::SVN->new;
1257 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
6a8d999e 1258 $gs->prop_walk($gs->path, $r, sub {
2d879792
VK
1259 my ($gs, $path, $props) = @_;
1260 print STDOUT "\n# $path\n";
1261 my $s = $props->{'svn:externals'} or return;
1262 $s =~ s/[\r\n]+/\n/g;
1263 chomp $s;
1264 $s =~ s#^#$path#gm;
1265 print STDOUT "$s\n";
1266 });
1267}
1268
d05ddec5
BS
1269sub cmd_create_ignore {
1270 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
1271 $gs ||= Git::SVN->new;
1272 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
6a8d999e 1273 $gs->prop_walk($gs->path, $r, sub {
d05ddec5
BS
1274 my ($gs, $path, $props) = @_;
1275 # $path is of the form /path/to/dir/
7d9fd459
BG
1276 $path = '.' . $path;
1277 # SVN can have attributes on empty directories,
1278 # which git won't track
1279 mkpath([$path]) unless -d $path;
1280 my $ignore = $path . '.gitignore';
d05ddec5
BS
1281 my $s = $props->{'svn:ignore'} or return;
1282 open(GITIGNORE, '>', $ignore)
207f1a75 1283 or fatal("Failed to open `$ignore' for writing: $!");
d05ddec5 1284 $s =~ s/[\r\n]+/\n/g;
a7d72544 1285 $s =~ s/^\n+//;
d05ddec5
BS
1286 chomp $s;
1287 # Prefix all patterns so that the ignore doesn't apply
1288 # to sub-directories.
1289 $s =~ s#^#/#gm;
1290 print GITIGNORE "$s\n";
1291 close(GITIGNORE)
207f1a75 1292 or fatal("Failed to close `$ignore': $!");
c4c66b26 1293 command_noisy('add', '-f', $ignore);
d05ddec5
BS
1294 });
1295}
1296
6111b934
EW
1297sub cmd_mkdirs {
1298 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
1299 $gs ||= Git::SVN->new;
1300 $gs->mkemptydirs($_revision);
1301}
1302
15153451
BS
1303# get_svnprops(PATH)
1304# ------------------
51e057cf 1305# Helper for cmd_propget and cmd_proplist below.
15153451
BS
1306sub get_svnprops {
1307 my $path = shift;
1308 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
1309 $gs ||= Git::SVN->new;
1310
1311 # prefix THE PATH by the sub-directory from which the user
1312 # invoked us.
1313 $path = $cmd_dir_prefix . $path;
207f1a75 1314 fatal("No such file or directory: $path") unless -e $path;
15153451 1315 my $is_dir = -d $path ? 1 : 0;
f3045919 1316 $path = join_paths($gs->path, $path);
15153451
BS
1317
1318 # canonicalize the path (otherwise libsvn will abort or fail to
1319 # find the file)
b2b3ada7 1320 $path = canonicalize_path($path);
15153451
BS
1321
1322 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
1323 my $props;
1324 if ($is_dir) {
1325 (undef, undef, $props) = $gs->ra->get_dir($path, $r);
1326 }
1327 else {
1328 (undef, $props) = $gs->ra->get_file($path, $r, undef);
1329 }
1330 return $props;
1331}
1332
1333# cmd_propget (PROP, PATH)
1334# ------------------------
1335# Print the SVN property PROP for PATH.
1336sub cmd_propget {
1337 my ($prop, $path) = @_;
1338 $path = '.' if not defined $path;
1339 usage(1) if not defined $prop;
1340 my $props = get_svnprops($path);
1341 if (not defined $props->{$prop}) {
207f1a75 1342 fatal("`$path' does not have a `$prop' SVN property.");
15153451
BS
1343 }
1344 print $props->{$prop} . "\n";
1345}
1346
51e057cf
BS
1347# cmd_proplist (PATH)
1348# -------------------
1349# Print the list of SVN properties for PATH.
1350sub cmd_proplist {
1351 my $path = shift;
1352 $path = '.' if not defined $path;
1353 my $props = get_svnprops($path);
1354 print "Properties on '$path':\n";
1355 foreach (sort keys %{$props}) {
1356 print " $_\n";
1357 }
1358}
1359
8164b652 1360sub cmd_multi_init {
9d55b41a 1361 my $url = shift;
62244069 1362 unless (defined $_trunk || @_branches || @_tags) {
98327e58 1363 usage(1);
9d55b41a 1364 }
dc431666 1365
8164b652 1366 $_prefix = '' unless defined $_prefix;
dadc6d2a 1367 if (defined $url) {
50ff2366 1368 $url = canonicalize_url($url);
dadc6d2a
EW
1369 init_subdir(@_);
1370 }
f30603fc 1371 do_git_init_db();
98327e58 1372 if (defined $_trunk) {
b4b33600 1373 $_trunk =~ s#^/+##;
6f5748e1 1374 my $trunk_ref = 'refs/remotes/' . $_prefix . 'trunk';
706587fc
EW
1375 # try both old-style and new-style lookups:
1376 my $gs_trunk = eval { Git::SVN->new($trunk_ref) };
8164b652 1377 unless ($gs_trunk) {
706587fc
EW
1378 my ($trunk_url, $trunk_path) =
1379 complete_svn_url($url, $_trunk);
1380 $gs_trunk = Git::SVN->init($trunk_url, $trunk_path,
1381 undef, $trunk_ref);
98327e58 1382 }
c35b96e7 1383 }
62244069 1384 return unless @_branches || @_tags;
e7db67e6 1385 my $ra = $url ? Git::SVN::Ra->new($url) : undef;
62244069
MB
1386 foreach my $path (@_branches) {
1387 complete_url_ls_init($ra, $path, '--branches/-b', $_prefix);
1388 }
1389 foreach my $path (@_tags) {
1390 complete_url_ls_init($ra, $path, '--tags/-t', $_prefix.'tags/');
1391 }
9d55b41a
EW
1392}
1393
1c8443b0 1394sub cmd_multi_fetch {
4d0157d6 1395 $Git::SVN::no_reuse_existing = undef;
0af9c9f9
EW
1396 my $remotes = Git::SVN::read_all_remotes();
1397 foreach my $repo_id (sort keys %$remotes) {
db03cd24 1398 if ($remotes->{$repo_id}->{url}) {
4bb9ed04
EW
1399 Git::SVN::fetch_all($repo_id, $remotes);
1400 }
9d55b41a 1401 }
9d55b41a
EW
1402}
1403
44320b9e
EW
1404# this command is special because it requires no metadata
1405sub cmd_commit_diff {
1406 my ($ta, $tb, $url) = @_;
0b670abd 1407 my $usage = "usage: $0 commit-diff -r<revision> ".
207f1a75 1408 "<tree-ish> <tree-ish> [<URL>]";
44320b9e 1409 fatal($usage) if (!defined $ta || !defined $tb);
d72ab8c8 1410 my $svn_path = '';
44320b9e
EW
1411 if (!defined $url) {
1412 my $gs = eval { Git::SVN->new };
1413 if (!$gs) {
1414 fatal("Needed URL or usable git-svn --id in ",
1415 "the command-line\n", $usage);
1416 }
b1ea6c38 1417 $url = $gs->url;
6a8d999e 1418 $svn_path = $gs->path;
44320b9e
EW
1419 }
1420 unless (defined $_revision) {
1421 fatal("-r|--revision is a required argument\n", $usage);
1422 }
1423 if (defined $_message && defined $_file) {
1424 fatal("Both --message/-m and --file/-F specified ",
1425 "for the commit message.\n",
207f1a75 1426 "I have no idea what you mean");
44320b9e
EW
1427 }
1428 if (defined $_file) {
1429 $_message = file_to_s($_file);
1430 } else {
1431 $_message ||= get_commit_entry($tb)->{log};
1432 }
1433 my $ra ||= Git::SVN::Ra->new($url);
1434 my $r = $_revision;
1435 if ($r eq 'HEAD') {
1436 $r = $ra->get_latest_revnum;
1437 } elsif ($r !~ /^\d+$/) {
1438 die "revision argument: $r not understood by git-svn\n";
1439 }
61395354
EW
1440 my %ed_opts = ( r => $r,
1441 log => $_message,
1442 ra => $ra,
1443 tree_a => $ta,
1444 tree_b => $tb,
1445 editor_cb => sub { print "Committed r$_[0]\n" },
1446 svn_path => $svn_path );
72827aa4 1447 if (!Git::SVN::Editor->new(\%ed_opts)->apply_diff) {
44320b9e
EW
1448 print "No changes\n$ta == $tb\n";
1449 }
44320b9e
EW
1450}
1451
05427b91 1452
e6fefa92 1453sub cmd_info {
bd2d4f96 1454 my $path = canonicalize_path(defined($_[0]) ? $_[0] : ".");
edde9112 1455 my $fullpath = canonicalize_path($cmd_dir_prefix . $path);
bd2d4f96 1456 if (exists $_[1]) {
e6fefa92
DK
1457 die "Too many arguments specified\n";
1458 }
1459
1460 my ($file_type, $diff_status) = find_file_type_and_diff_status($path);
1461
1462 if (!$file_type && !$diff_status) {
2cf3e3ac
TR
1463 print STDERR "svn: '$path' is not under version control\n";
1464 exit 1;
e6fefa92
DK
1465 }
1466
1467 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
1468 unless ($gs) {
1469 die "Unable to determine upstream SVN information from ",
1470 "working tree history\n";
1471 }
bd2d4f96
EW
1472
1473 # canonicalize_path() will return "" to make libsvn 1.5.x happy,
1474 $path = "." if $path eq "";
1475
d2fd119c 1476 my $full_url = canonicalize_url( add_path_to_url( $url, $fullpath ) );
e6fefa92 1477
8b014d71 1478 if ($_url) {
8266fc8b 1479 print "$full_url\n";
8b014d71
DK
1480 return;
1481 }
1482
e6fefa92
DK
1483 my $result = "Path: $path\n";
1484 $result .= "Name: " . basename($path) . "\n" if $file_type ne "dir";
8266fc8b 1485 $result .= "URL: $full_url\n";
e6fefa92 1486
a5460eb7
EW
1487 eval {
1488 my $repos_root = $gs->repos_root;
1489 Git::SVN::remove_username($repos_root);
9c27a57b 1490 $result .= "Repository Root: " . canonicalize_url($repos_root) . "\n";
a5460eb7
EW
1491 };
1492 if ($@) {
1493 $result .= "Repository Root: (offline)\n";
1494 }
b91a8a3e 1495 ::_req_svn();
22ba47f5 1496 $result .= "Repository UUID: $uuid\n" unless $diff_status eq "A" &&
f760c903 1497 (::compare_svn_version('1.5.4') <= 0 || $file_type ne "dir");
e6fefa92
DK
1498 $result .= "Revision: " . ($diff_status eq "A" ? 0 : $rev) . "\n";
1499
1500 $result .= "Node Kind: " .
1501 ($file_type eq "dir" ? "directory" : "file") . "\n";
1502
1503 my $schedule = $diff_status eq "A"
1504 ? "add"
1505 : ($diff_status eq "D" ? "delete" : "normal");
1506 $result .= "Schedule: $schedule\n";
1507
1508 if ($diff_status eq "A") {
1509 print $result, "\n";
1510 return;
1511 }
1512
1513 my ($lc_author, $lc_rev, $lc_date_utc);
edde9112 1514 my @args = Git::SVN::Log::git_svn_log_cmd($rev, $rev, "--", $fullpath);
e6fefa92
DK
1515 my $log = command_output_pipe(@args);
1516 my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/;
1517 while (<$log>) {
1518 if (/^${esc_color}author (.+) <[^>]+> (\d+) ([\-\+]?\d+)$/o) {
1519 $lc_author = $1;
1520 $lc_date_utc = Git::SVN::Log::parse_git_date($2, $3);
1521 } elsif (/^${esc_color} (git-svn-id:.+)$/o) {
1522 (undef, $lc_rev, undef) = ::extract_metadata($1);
1523 }
1524 }
1525 close $log;
1526
1527 Git::SVN::Log::set_local_timezone();
1528
1529 $result .= "Last Changed Author: $lc_author\n";
1530 $result .= "Last Changed Rev: $lc_rev\n";
1531 $result .= "Last Changed Date: " .
1532 Git::SVN::Log::format_svn_date($lc_date_utc) . "\n";
1533
1534 if ($file_type ne "dir") {
1535 my $text_last_updated_date =
1536 ($diff_status eq "D" ? $lc_date_utc : (stat $path)[9]);
1537 $result .=
1538 "Text Last Updated: " .
1539 Git::SVN::Log::format_svn_date($text_last_updated_date) .
1540 "\n";
1541 my $checksum;
1542 if ($diff_status eq "D") {
1543 my ($fh, $ctx) =
1544 command_output_pipe(qw(cat-file blob), "HEAD:$path");
1545 if ($file_type eq "link") {
1546 my $file_name = <$fh>;
8d7c4fad 1547 $checksum = md5sum("link $file_name");
e6fefa92 1548 } else {
8d7c4fad 1549 $checksum = md5sum($fh);
e6fefa92
DK
1550 }
1551 command_close_pipe($fh, $ctx);
1552 } elsif ($file_type eq "link") {
1553 my $file_name =
1554 command(qw(cat-file blob), "HEAD:$path");
1555 $checksum =
8d7c4fad 1556 md5sum("link " . $file_name);
e6fefa92
DK
1557 } else {
1558 open FILE, "<", $path or die $!;
8d7c4fad 1559 $checksum = md5sum(\*FILE);
e6fefa92
DK
1560 close FILE or die $!;
1561 }
1562 $result .= "Checksum: " . $checksum . "\n";
1563 }
1564
1565 print $result, "\n";
1566}
1567
195643f2
BJ
1568sub cmd_reset {
1569 my $target = shift || $_revision or die "SVN revision required\n";
1570 $target = $1 if $target =~ /^r(\d+)$/;
1571 $target =~ /^\d+$/ or die "Numeric SVN revision expected\n";
1572 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
1573 unless ($gs) {
1574 die "Unable to determine upstream SVN information from ".
1575 "history\n";
1576 }
1577 my ($r, $c) = $gs->find_rev_before($target, not $_fetch_parent);
70ee0b77 1578 die "Cannot find SVN revision $target\n" unless defined($c);
195643f2
BJ
1579 $gs->rev_map_set($r, $c, 'reset', $uuid);
1580 print "r$r = $c ($gs->{ref_id})\n";
1581}
1582
2da9ee08 1583sub cmd_gc {
c2768fa1 1584 if (!can_compress()) {
2da9ee08
RZ
1585 warn "Compress::Zlib could not be found; unhandled.log " .
1586 "files will not be compressed.\n";
1587 }
1588 find({ wanted => \&gc_directory, no_chdir => 1}, "$ENV{GIT_DIR}/svn");
1589}
1590
3397f9df
EW
1591########################### utility functions #########################
1592
905f8b7d
EW
1593sub rebase_cmd {
1594 my @cmd = qw/rebase/;
1595 push @cmd, '-v' if $_verbose;
1596 push @cmd, qw/--merge/ if $_merge;
1597 push @cmd, "--strategy=$_strategy" if $_strategy;
b64e1f58 1598 push @cmd, "--preserve-merges" if $_preserve_merges;
905f8b7d
EW
1599 @cmd;
1600}
1601
1e889ef3
EW
1602sub post_fetch_checkout {
1603 return if $_no_checkout;
e3bd4dda 1604 return if verify_ref('HEAD^0');
1e889ef3 1605 my $gs = $Git::SVN::_head or return;
1e889ef3 1606
b186a261
EW
1607 # look for "trunk" ref if it exists
1608 my $remote = Git::SVN::read_all_remotes()->{$gs->{repo_id}};
1609 my $fetch = $remote->{fetch};
1610 if ($fetch) {
1611 foreach my $p (keys %$fetch) {
1612 basename($fetch->{$p}) eq 'trunk' or next;
1613 $gs = Git::SVN->new($fetch->{$p}, $gs->{repo_id}, $p);
1614 last;
1615 }
1616 }
1617
e3bd4dda
MO
1618 command_noisy(qw(update-ref HEAD), $gs->refname);
1619 return unless verify_ref('HEAD^0');
1e889ef3
EW
1620
1621 return if $ENV{GIT_DIR} !~ m#^(?:.*/)?\.git$#;
1622 my $index = $ENV{GIT_INDEX_FILE} || "$ENV{GIT_DIR}/index";
1623 return if -f $index;
1624
7ae3df8c 1625 return if command_oneline(qw/rev-parse --is-inside-work-tree/) eq 'false';
1e889ef3
EW
1626 return if command_oneline(qw/rev-parse --is-inside-git-dir/) eq 'true';
1627 command_noisy(qw/read-tree -m -u -v HEAD HEAD/);
1628 print STDERR "Checked out HEAD:\n ",
1629 $gs->full_url, " r", $gs->last_rev, "\n";
55f9d7a7
MH
1630 if (auto_create_empty_directories($gs)) {
1631 $gs->mkemptydirs($gs->last_rev);
1632 }
1e889ef3
EW
1633}
1634
98327e58
EW
1635sub complete_svn_url {
1636 my ($url, $path) = @_;
5eaa1fd0 1637 $path = canonicalize_path($path);
6a8d999e
MS
1638
1639 # If the path is not a URL...
98327e58 1640 if ($path !~ m#^[a-z\+]+://#) {
98327e58
EW
1641 if (!defined $url || $url !~ m#^[a-z\+]+://#) {
1642 fatal("E: '$path' is not a complete URL ",
207f1a75 1643 "and a separate URL is not specified");
98327e58 1644 }
706587fc 1645 return ($url, $path);
98327e58 1646 }
706587fc 1647 return ($path, '');
98327e58
EW
1648}
1649
9d55b41a 1650sub complete_url_ls_init {
706587fc
EW
1651 my ($ra, $repo_path, $switch, $pfx) = @_;
1652 unless ($repo_path) {
9d55b41a
EW
1653 print STDERR "W: $switch not specified\n";
1654 return;
1655 }
5eaa1fd0 1656 $repo_path = canonicalize_path($repo_path);
706587fc
EW
1657 if ($repo_path =~ m#^[a-z\+]+://#) {
1658 $ra = Git::SVN::Ra->new($repo_path);
1659 $repo_path = '';
e7db67e6 1660 } else {
706587fc 1661 $repo_path =~ s#^/+##;
e7db67e6 1662 unless ($ra) {
706587fc 1663 fatal("E: '$repo_path' is not a complete URL ",
207f1a75 1664 "and a separate URL is not specified");
8164b652 1665 }
e7db67e6 1666 }
b1ea6c38 1667 my $url = $ra->url;
b4d57e5e
EW
1668 my $gs = Git::SVN->init($url, undef, undef, undef, 1);
1669 my $k = "svn-remote.$gs->{repo_id}.url";
1670 my $orig_url = eval { command_oneline(qw/config --get/, $k) };
b1ea6c38 1671 if ($orig_url && ($orig_url ne $gs->url)) {
b4d57e5e 1672 die "$k already set: $orig_url\n",
b1ea6c38 1673 "wanted to set to: $gs->url\n";
88cf4107 1674 }
b1ea6c38
MS
1675 command_oneline('config', $k, $gs->url) unless $orig_url;
1676
5eaa1fd0 1677 my $remote_path = join_paths( $gs->path, $repo_path );
5268f9ed 1678 $remote_path =~ s{%([0-9A-F]{2})}{chr hex($1)}ieg;
b4d57e5e 1679 $remote_path =~ s#^/##g;
ed0b9d43 1680 $remote_path .= "/*" if $remote_path !~ /\*/;
b4d57e5e
EW
1681 my ($n) = ($switch =~ /^--(\w+)/);
1682 if (length $pfx && $pfx !~ m#/$#) {
1683 die "--prefix='$pfx' must have a trailing slash '/'\n";
9d55b41a 1684 }
570d35c2 1685 command_noisy('config',
62244069 1686 '--add',
570d35c2
MG
1687 "svn-remote.$gs->{repo_id}.$n",
1688 "$remote_path:refs/remotes/$pfx*" .
1689 ('/*' x (($remote_path =~ tr/*/*/) - 1)) );
9d55b41a
EW
1690}
1691
aef4e921
EW
1692sub verify_ref {
1693 my ($ref) = @_;
2c5c1d53
EW
1694 eval { command_oneline([ 'rev-parse', '--verify', $ref ],
1695 { STDERR => 0 }); };
aef4e921
EW
1696}
1697
a5e0cedc 1698sub get_tree_from_treeish {
cf52b8f0 1699 my ($treeish) = @_;
44320b9e 1700 # $treeish can be a symbolic ref, too:
aef4e921 1701 my $type = command_oneline(qw/cat-file -t/, $treeish);
cf52b8f0
EW
1702 my $expected;
1703 while ($type eq 'tag') {
aef4e921 1704 ($treeish, $type) = command(qw/cat-file tag/, $treeish);
cf52b8f0
EW
1705 }
1706 if ($type eq 'commit') {
aef4e921
EW
1707 $expected = (grep /^tree /, command(qw/cat-file commit/,
1708 $treeish))[0];
44320b9e 1709 ($expected) = ($expected =~ /^tree ($sha1)$/o);
cf52b8f0
EW
1710 die "Unable to get tree from $treeish\n" unless $expected;
1711 } elsif ($type eq 'tree') {
1712 $expected = $treeish;
1713 } else {
1714 die "$treeish is a $type, expected tree, tag or commit\n";
1715 }
a5e0cedc
EW
1716 return $expected;
1717}
1718
44320b9e
EW
1719sub get_commit_entry {
1720 my ($treeish) = shift;
1721 my %log_entry = ( log => '', tree => get_tree_from_treeish($treeish) );
1722 my $commit_editmsg = "$ENV{GIT_DIR}/COMMIT_EDITMSG";
1723 my $commit_msg = "$ENV{GIT_DIR}/COMMIT_MSG";
1724 open my $log_fh, '>', $commit_editmsg or croak $!;
3397f9df 1725
44320b9e 1726 my $type = command_oneline(qw/cat-file -t/, $treeish);
4ad4515d 1727 if ($type eq 'commit' || $type eq 'tag') {
aef4e921 1728 my ($msg_fh, $ctx) = command_output_pipe('cat-file',
44320b9e 1729 $type, $treeish);
3397f9df 1730 my $in_msg = 0;
6aa9ba14
AP
1731 my $author;
1732 my $saw_from = 0;
328eb9b3 1733 my $msgbuf = "";
3397f9df
EW
1734 while (<$msg_fh>) {
1735 if (!$in_msg) {
1736 $in_msg = 1 if (/^\s*$/);
6aa9ba14 1737 $author = $1 if (/^author (.*>)/);
df746c5a 1738 } elsif (/^git-svn-id: /) {
44320b9e
EW
1739 # skip this for now, we regenerate the
1740 # correct one on re-fetch anyways
1741 # TODO: set *:merge properties or like...
3397f9df 1742 } else {
6aa9ba14
AP
1743 if (/^From:/ || /^Signed-off-by:/) {
1744 $saw_from = 1;
1745 }
328eb9b3 1746 $msgbuf .= $_;
3397f9df
EW
1747 }
1748 }
328eb9b3 1749 $msgbuf =~ s/\s+$//s;
6aa9ba14
AP
1750 if ($Git::SVN::_add_author_from && defined($author)
1751 && !$saw_from) {
328eb9b3 1752 $msgbuf .= "\n\nFrom: $author";
6aa9ba14 1753 }
328eb9b3 1754 print $log_fh $msgbuf or croak $!;
aef4e921 1755 command_close_pipe($msg_fh, $ctx);
3397f9df 1756 }
44320b9e 1757 close $log_fh or croak $!;
3397f9df
EW
1758
1759 if ($_edit || ($type eq 'tree')) {
b4479f07
JN
1760 chomp(my $editor = command_oneline(qw(var GIT_EDITOR)));
1761 system('sh', '-c', $editor.' "$@"', $editor, $commit_editmsg);
3397f9df 1762 }
44320b9e 1763 rename $commit_editmsg, $commit_msg or croak $!;
16fc08e2 1764 {
b510df8a 1765 require Encode;
16fc08e2
EW
1766 # SVN requires messages to be UTF-8 when entering the repo
1767 local $/;
1768 open $log_fh, '<', $commit_msg or croak $!;
1769 binmode $log_fh;
1770 chomp($log_entry{log} = <$log_fh>);
1771
b510df8a
EW
1772 my $enc = Git::config('i18n.commitencoding') || 'UTF-8';
1773 my $msg = $log_entry{log};
1774
1775 eval { $msg = Encode::decode($enc, $msg, 1) };
1776 if ($@) {
1777 die "Could not decode as $enc:\n", $msg,
1778 "\nPerhaps you need to set i18n.commitencoding\n";
16fc08e2 1779 }
b510df8a
EW
1780
1781 eval { $msg = Encode::encode('UTF-8', $msg, 1) };
1782 die "Could not encode as UTF-8:\n$msg\n" if $@;
1783
1784 $log_entry{log} = $msg;
1785
16fc08e2
EW
1786 close $log_fh or croak $!;
1787 }
44320b9e
EW
1788 unlink $commit_msg;
1789 \%log_entry;
a5e0cedc
EW
1790}
1791
3397f9df
EW
1792sub s_to_file {
1793 my ($str, $file, $mode) = @_;
1794 open my $fd,'>',$file or croak $!;
1795 print $fd $str,"\n" or croak $!;
1796 close $fd or croak $!;
1797 chmod ($mode &~ umask, $file) if (defined $mode);
1798}
1799
1800sub file_to_s {
1801 my $file = shift;
1802 open my $fd,'<',$file or croak "$!: file: $file\n";
1803 local $/;
1804 my $ret = <$fd>;
1805 close $fd or croak $!;
1806 $ret =~ s/\s*$//s;
1807 return $ret;
1808}
1809
eeb0abe0
EW
1810# '<svn username> = real-name <email address>' mapping based on git-svnimport:
1811sub load_authors {
1812 open my $authors, '<', $_authors or die "Can't open $_authors $!\n";
f8c9d1d2 1813 my $log = $cmd eq 'log';
eeb0abe0
EW
1814 while (<$authors>) {
1815 chomp;
575d025c 1816 next unless /^(.+?|\(no author\))\s*=\s*(.+?)\s*<(.+)>\s*$/;
eeb0abe0 1817 my ($user, $name, $email) = ($1, $2, $3);
f8c9d1d2
EW
1818 if ($log) {
1819 $Git::SVN::Log::rusers{"$name <$email>"} = $user;
1820 } else {
1821 $users{$user} = [$name, $email];
1822 }
79bb8d88
EW
1823 }
1824 close $authors or croak $!;
1825}
1826
e0d10e1c 1827# convert GetOpt::Long specs for use by git-config
1a30582b 1828sub read_git_config {
b8c92cad 1829 my $opts = shift;
97ae0911 1830 my @config_only;
b8c92cad 1831 foreach my $o (keys %$opts) {
97ae0911
EW
1832 # if we have mixedCase and a long option-only, then
1833 # it's a config-only variable that we don't need for
1834 # the command-line.
1835 push @config_only, $o if ($o =~ /[A-Z]/ && $o =~ /^[a-z]+$/i);
b8c92cad 1836 my $v = $opts->{$o};
97ae0911 1837 my ($key) = ($o =~ /^([a-zA-Z\-]+)/);
b8c92cad 1838 $key =~ s/-//g;
225f1d0c 1839 my $arg = 'git config';
b8c92cad
EW
1840 $arg .= ' --int' if ($o =~ /[:=]i$/);
1841 $arg .= ' --bool' if ($o !~ /[:=][sfi]$/);
1842 if (ref $v eq 'ARRAY') {
1843 chomp(my @tmp = `$arg --get-all svn.$key`);
1844 @$v = @tmp if @tmp;
1845 } else {
1846 chomp(my $tmp = `$arg --get svn.$key`);
7774284a 1847 if ($tmp && !($arg =~ / --bool/ && $tmp eq 'false')) {
b8c92cad
EW
1848 $$v = $tmp;
1849 }
1850 }
1851 }
97ae0911 1852 delete @$opts{@config_only} if @config_only;
b8c92cad
EW
1853}
1854
79bb8d88 1855sub extract_metadata {
c1927a85 1856 my $id = shift or return (undef, undef, undef);
3dfab993 1857 my ($url, $rev, $uuid) = ($id =~ /^\s*git-svn-id:\s+(.*)\@(\d+)
b3e95936 1858 \s([a-f\d\-]+)$/ix);
e70dc780 1859 if (!defined $rev || !$uuid || !$url) {
79bb8d88 1860 # some of the original repositories I made had
82e5a82f 1861 # identifiers like this:
b3e95936 1862 ($rev, $uuid) = ($id =~/^\s*git-svn-id:\s(\d+)\@([a-f\d\-]+)/i);
79bb8d88
EW
1863 }
1864 return ($url, $rev, $uuid);
1865}
1866
c1927a85
EW
1867sub cmt_metadata {
1868 return extract_metadata((grep(/^git-svn-id: /,
aef4e921 1869 command(qw/cat-file commit/, shift)))[-1]);
c1927a85
EW
1870}
1871
6ea42032
BB
1872sub cmt_sha2rev_batch {
1873 my %s2r;
1874 my ($pid, $in, $out, $ctx) = command_bidi_pipe(qw/cat-file --batch/);
1875 my $list = shift;
1876
1877 foreach my $sha (@{$list}) {
1878 my $first = 1;
1879 my $size = 0;
1880 print $out $sha, "\n";
1881
1882 while (my $line = <$in>) {
1883 if ($first && $line =~ /^[[:xdigit:]]{40}\smissing$/) {
1884 last;
1885 } elsif ($first &&
1886 $line =~ /^[[:xdigit:]]{40}\scommit\s(\d+)$/) {
1887 $first = 0;
1888 $size = $1;
1889 next;
1890 } elsif ($line =~ /^(git-svn-id: )/) {
1891 my (undef, $rev, undef) =
1892 extract_metadata($line);
1893 $s2r{$sha} = $rev;
1894 }
1895
1896 $size -= length($line);
1897 last if ($size == 0);
1898 }
1899 }
1900
1901 command_close_bidi_pipe($pid, $in, $out, $ctx);
1902
1903 return \%s2r;
1904}
1905
905f8b7d
EW
1906sub working_head_info {
1907 my ($head, $refs) = @_;
83cf21f9 1908 my @args = qw/rev-list --first-parent --pretty=medium/;
05b4df31 1909 my ($fh, $ctx) = command_output_pipe(@args, $head);
3dfab993 1910 my $hash;
40cb8f8f 1911 my %max;
3dfab993
SV
1912 while (<$fh>) {
1913 if ( m{^commit ($::sha1)$} ) {
1914 unshift @$refs, $hash if $hash and $refs;
1915 $hash = $1;
1916 next;
1917 }
1918 next unless s{^\s*(git-svn-id:)}{$1};
1919 my ($url, $rev, $uuid) = extract_metadata($_);
13c823fb 1920 if (defined $url && defined $rev) {
40cb8f8f 1921 next if $max{$url} and $max{$url} < $rev;
13c823fb 1922 if (my $gs = Git::SVN->find_by_url($url)) {
63c56022 1923 my $c = $gs->rev_map_get($rev, $uuid);
b03c7a63 1924 if ($c && $c eq $hash) {
13c823fb
EW
1925 close $fh; # break the pipe
1926 return ($url, $rev, $uuid, $gs);
40cb8f8f 1927 } else {
060610c5 1928 $max{$url} ||= $gs->rev_map_max;
13c823fb
EW
1929 }
1930 }
1931 }
905f8b7d 1932 }
13c823fb
EW
1933 command_close_pipe($fh, $ctx);
1934 (undef, undef, undef, undef);
905f8b7d
EW
1935}
1936
733a65aa
EW
1937sub read_commit_parents {
1938 my ($parents, $c) = @_;
7b02b85a
EW
1939 chomp(my $p = command_oneline(qw/rev-list --parents -1/, $c));
1940 $p =~ s/^($c)\s*// or die "rev-list --parents -1 $c failed!\n";
1941 @{$parents->{$c}} = split(/ /, $p);
733a65aa
EW
1942}
1943
1944sub linearize_history {
1945 my ($gs, $refs) = @_;
1946 my %parents;
1947 foreach my $c (@$refs) {
1948 read_commit_parents(\%parents, $c);
1949 }
1950
1951 my @linear_refs;
1952 my %skip = ();
1953 my $last_svn_commit = $gs->last_commit;
1954 foreach my $c (reverse @$refs) {
1955 next if $c eq $last_svn_commit;
1956 last if $skip{$c};
1957
1958 unshift @linear_refs, $c;
1959 $skip{$c} = 1;
1960
1961 # we only want the first parent to diff against for linear
1962 # history, we save the rest to inject when we finalize the
1963 # svn commit
1964 my $fp_a = verify_ref("$c~1");
1965 my $fp_b = shift @{$parents{$c}} if $parents{$c};
1966 if (!$fp_a || !$fp_b) {
1967 die "Commit $c\n",
1968 "has no parent commit, and therefore ",
1969 "nothing to diff against.\n",
1970 "You should be working from a repository ",
1971 "originally created by git-svn\n";
1972 }
1973 if ($fp_a ne $fp_b) {
1974 die "$c~1 = $fp_a, however parsing commit $c ",
1975 "revealed that:\n$c~1 = $fp_b\nBUG!\n";
1976 }
1977
1978 foreach my $p (@{$parents{$c}}) {
1979 $skip{$p} = 1;
1980 }
1981 }
1982 (\@linear_refs, \%parents);
1983}
1984
e6fefa92
DK
1985sub find_file_type_and_diff_status {
1986 my ($path) = @_;
107cee50 1987 return ('dir', '') if $path eq '';
e6fefa92
DK
1988
1989 my $diff_output =
1990 command_oneline(qw(diff --cached --name-status --), $path) || "";
1991 my $diff_status = (split(' ', $diff_output))[0] || "";
1992
1993 my $ls_tree = command_oneline(qw(ls-tree HEAD), $path) || "";
1994
1995 return (undef, undef) if !$diff_status && !$ls_tree;
1996
1997 if ($diff_status eq "A") {
1998 return ("link", $diff_status) if -l $path;
1999 return ("dir", $diff_status) if -d $path;
2000 return ("file", $diff_status);
2001 }
2002
2003 my $mode = (split(' ', $ls_tree))[0] || "";
2004
2005 return ("link", $diff_status) if $mode eq "120000";
2006 return ("dir", $diff_status) if $mode eq "040000";
2007 return ("file", $diff_status);
2008}
2009
b2b3ada7
DK
2010sub md5sum {
2011 my $arg = shift;
2012 my $ref = ref $arg;
2013 my $md5 = Digest::MD5->new();
0b19138b 2014 if ($ref eq 'GLOB' || $ref eq 'IO::File' || $ref eq 'File::Temp') {
b2b3ada7
DK
2015 $md5->addfile($arg) or croak $!;
2016 } elsif ($ref eq 'SCALAR') {
2017 $md5->add($$arg) or croak $!;
2018 } elsif (!$ref) {
2019 $md5->add($arg) or croak $!;
2020 } else {
c2768fa1 2021 fatal "Can't provide MD5 hash for unknown ref type: '", $ref, "'";
b2b3ada7
DK
2022 }
2023 return $md5->hexdigest();
2024}
2025
2da9ee08 2026sub gc_directory {
c2768fa1 2027 if (can_compress() && -f $_ && basename($_) eq "unhandled.log") {
2da9ee08
RZ
2028 my $out_filename = $_ . ".gz";
2029 open my $in_fh, "<", $_ or die "Unable to open $_: $!\n";
2030 binmode $in_fh;
2031 my $gz = Compress::Zlib::gzopen($out_filename, "ab") or
2032 die "Unable to open $out_filename: $!\n";
2033
2034 my $res;
2035 while ($res = sysread($in_fh, my $str, 1024)) {
2036 $gz->gzwrite($str) or
2037 die "Unable to write: ".$gz->gzerror()."!\n";
2038 }
2039 unlink $_ or die "unlink $File::Find::name: $!\n";
2040 } elsif (-f $_ && basename($_) eq "index") {
2041 unlink $_ or die "unlink $_: $!\n";
2042 }
2043}
2044
3397f9df
EW
2045__END__
2046
2047Data structures:
2048
4bb9ed04
EW
2049
2050$remotes = { # returned by read_all_remotes()
2051 'svn' => {
2052 # svn-remote.svn.url=https://svn.musicpd.org
2053 url => 'https://svn.musicpd.org',
2054 # svn-remote.svn.fetch=mpd/trunk:trunk
2055 fetch => {
2056 'mpd/trunk' => 'trunk',
2057 },
2058 # svn-remote.svn.tags=mpd/tags/*:tags/*
2059 tags => {
2060 path => {
2061 left => 'mpd/tags',
2062 right => '',
2063 regex => qr!mpd/tags/([^/]+)$!,
2064 glob => 'tags/*',
2065 },
2066 ref => {
2067 left => 'tags',
2068 right => '',
2069 regex => qr!tags/([^/]+)$!,
2070 glob => 'tags/*',
2071 },
2072 }
2073 }
2074};
2075
44320b9e 2076$log_entry hashref as returned by libsvn_log_entry()
3397f9df 2077{
44320b9e 2078 log => 'whitespace-formatted log entry
3397f9df
EW
2079', # trailing newline is preserved
2080 revision => '8', # integer
2081 date => '2004-02-24T17:01:44.108345Z', # commit date
2082 author => 'committer name'
2083};
2084
6e8548cc
EW
2085
2086# this is generated by generate_diff();
3397f9df
EW
2087@mods = array of diff-index line hashes, each element represents one line
2088 of diff-index output
2089
2090diff-index line ($m hash)
2091{
2092 mode_a => first column of diff-index output, no leading ':',
2093 mode_b => second column of diff-index output,
2094 sha1_b => sha1sum of the final blob,
ac8e0b91 2095 chg => change type [MCRADT],
3397f9df
EW
2096 file_a => original file name of a file (iff chg is 'C' or 'R')
2097 file_b => new/current file name of a file (any chg)
2098}
2099;
a5e0cedc 2100
a00439ac
EW
2101# retval of read_url_paths{,_all}();
2102$l_map = {
2103 # repository root url
2104 'https://svn.musicpd.org' => {
2105 # repository path # GIT_SVN_ID
2106 'mpd/trunk' => 'trunk',
2107 'mpd/tags/0.11.5' => 'tags/0.11.5',
2108 },
2109}
2110
a5e0cedc
EW
2111Notes:
2112 I don't trust the each() function on unless I created %hash myself
2113 because the internal iterator may not have started at base.