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