tgupdate: merge girocco base into girocco
[git/gitweb.git] / git-svn.perl
blobfa423647858fede0cf63a27b2c11eb392b639a09
1 #!/usr/bin/perl
2 # Copyright (C) 2006, Eric Wong <normalperson@yhbt.net>
3 # License: GPL v2 or later
4 use 5.008;
5 use warnings;
6 use strict;
7 use vars qw/ $AUTHOR $VERSION
8 $sha1 $sha1_short $_revision $_repository
9 $_q $_authors $_authors_prog %users/;
10 $AUTHOR = 'Eric Wong <normalperson@yhbt.net>';
11 $VERSION = '@@GIT_VERSION@@';
13 use Carp qw/croak/;
14 use File::Basename qw/dirname basename/;
15 use File::Path qw/mkpath/;
16 use File::Spec;
17 use Getopt::Long qw/:config gnu_getopt no_ignore_case auto_abbrev/;
18 use Memoize;
20 use Git::SVN;
21 use Git::SVN::Editor;
22 use Git::SVN::Fetcher;
23 use Git::SVN::Ra;
24 use Git::SVN::Prompt;
25 use Git::SVN::Log;
26 use Git::SVN::Migration;
28 use Git::SVN::Utils qw(
29 fatal
30 can_compress
31 canonicalize_path
32 canonicalize_url
33 join_paths
34 add_path_to_url
35 join_paths
38 use Git qw(
39 git_cmd_try
40 command
41 command_oneline
42 command_noisy
43 command_output_pipe
44 command_close_pipe
45 command_bidi_pipe
46 command_close_bidi_pipe
47 get_record
50 BEGIN {
51 Memoize::memoize 'Git::config';
52 Memoize::memoize 'Git::config_bool';
56 # From which subdir have we been invoked?
57 my $cmd_dir_prefix = eval {
58 command_oneline([qw/rev-parse --show-prefix/], STDERR => 0)
59 } || '';
61 $Git::SVN::Ra::_log_window_size = 100;
63 if (! exists $ENV{SVN_SSH} && exists $ENV{GIT_SSH}) {
64 $ENV{SVN_SSH} = $ENV{GIT_SSH};
67 if (exists $ENV{SVN_SSH} && $^O eq 'msys') {
68 $ENV{SVN_SSH} =~ s/\\/\\\\/g;
69 $ENV{SVN_SSH} =~ s/(.*)/"$1"/;
72 $Git::SVN::Log::TZ = $ENV{TZ};
73 $ENV{TZ} = 'UTC';
74 $| = 1; # unbuffer STDOUT
76 # All SVN commands do it. Otherwise we may die on SIGPIPE when the remote
77 # repository decides to close the connection which we expect to be kept alive.
78 $SIG{PIPE} = 'IGNORE';
80 # Given a dot separated version number, "subtract" it from
81 # the SVN::Core::VERSION; non-negaitive return means the SVN::Core
82 # is at least at the version the caller asked for.
83 sub compare_svn_version {
84 my (@ours) = split(/\./, $SVN::Core::VERSION);
85 my (@theirs) = split(/\./, $_[0]);
86 my ($i, $diff);
88 for ($i = 0; $i < @ours && $i < @theirs; $i++) {
89 $diff = $ours[$i] - $theirs[$i];
90 return $diff if ($diff);
92 return 1 if ($i < @ours);
93 return -1 if ($i < @theirs);
94 return 0;
97 sub _req_svn {
98 require SVN::Core; # use()-ing this causes segfaults for me... *shrug*
99 require SVN::Ra;
100 require SVN::Delta;
101 if (::compare_svn_version('1.1.0') < 0) {
102 fatal "Need SVN::Core 1.1.0 or better (got $SVN::Core::VERSION)";
106 $sha1 = qr/[a-f\d]{40}/;
107 $sha1_short = qr/[a-f\d]{4,40}/;
108 my ($_stdin, $_help, $_edit,
109 $_message, $_file, $_branch_dest,
110 $_template, $_shared,
111 $_version, $_fetch_all, $_no_rebase, $_fetch_parent,
112 $_before, $_after,
113 $_merge, $_strategy, $_preserve_merges, $_dry_run, $_parents, $_local,
114 $_prefix, $_no_checkout, $_url, $_verbose,
115 $_commit_url, $_tag, $_merge_info, $_interactive, $_set_svn_props);
117 # This is a refactoring artifact so Git::SVN can get at this git-svn switch.
118 sub opt_prefix { return $_prefix || '' }
120 $Git::SVN::Fetcher::_placeholder_filename = ".gitignore";
121 $_q ||= 0;
122 my %remote_opts = ( 'username=s' => \$Git::SVN::Prompt::_username,
123 'config-dir=s' => \$Git::SVN::Ra::config_dir,
124 'no-auth-cache' => \$Git::SVN::Prompt::_no_auth_cache,
125 'ignore-paths=s' => \$Git::SVN::Fetcher::_ignore_regex,
126 'include-paths=s' => \$Git::SVN::Fetcher::_include_regex,
127 'ignore-refs=s' => \$Git::SVN::Ra::_ignore_refs_regex );
128 my %fc_opts = ( 'follow-parent|follow!' => \$Git::SVN::_follow_parent,
129 'authors-file|A=s' => \$_authors,
130 'authors-prog=s' => \$_authors_prog,
131 'repack:i' => \$Git::SVN::_repack,
132 'noMetadata' => \$Git::SVN::_no_metadata,
133 'useSvmProps' => \$Git::SVN::_use_svm_props,
134 'useSvnsyncProps' => \$Git::SVN::_use_svnsync_props,
135 'log-window-size=i' => \$Git::SVN::Ra::_log_window_size,
136 'no-checkout' => \$_no_checkout,
137 'quiet|q+' => \$_q,
138 'repack-flags|repack-args|repack-opts=s' =>
139 \$Git::SVN::_repack_flags,
140 'use-log-author' => \$Git::SVN::_use_log_author,
141 'add-author-from' => \$Git::SVN::_add_author_from,
142 'localtime' => \$Git::SVN::_localtime,
143 %remote_opts );
145 my ($_trunk, @_tags, @_branches, $_stdlayout);
146 my %icv;
147 my %init_opts = ( 'template=s' => \$_template, 'shared:s' => \$_shared,
148 'trunk|T=s' => \$_trunk, 'tags|t=s@' => \@_tags,
149 'branches|b=s@' => \@_branches, 'prefix=s' => \$_prefix,
150 'stdlayout|s' => \$_stdlayout,
151 'minimize-url|m!' => \$Git::SVN::_minimize_url,
152 'no-metadata' => sub { $icv{noMetadata} = 1 },
153 'use-svm-props' => sub { $icv{useSvmProps} = 1 },
154 'use-svnsync-props' => sub { $icv{useSvnsyncProps} = 1 },
155 'rewrite-root=s' => sub { $icv{rewriteRoot} = $_[1] },
156 'rewrite-uuid=s' => sub { $icv{rewriteUUID} = $_[1] },
157 %remote_opts );
158 my %cmt_opts = ( 'edit|e' => \$_edit,
159 'rmdir' => \$Git::SVN::Editor::_rmdir,
160 'find-copies-harder' => \$Git::SVN::Editor::_find_copies_harder,
161 'l=i' => \$Git::SVN::Editor::_rename_limit,
162 'copy-similarity|C=i'=> \$Git::SVN::Editor::_cp_similarity
165 my %cmd = (
166 fetch => [ \&cmd_fetch, "Download new revisions from SVN",
167 { 'revision|r=s' => \$_revision,
168 'fetch-all|all' => \$_fetch_all,
169 'parent|p' => \$_fetch_parent,
170 %fc_opts } ],
171 clone => [ \&cmd_clone, "Initialize and fetch revisions",
172 { 'revision|r=s' => \$_revision,
173 'preserve-empty-dirs' =>
174 \$Git::SVN::Fetcher::_preserve_empty_dirs,
175 'placeholder-filename=s' =>
176 \$Git::SVN::Fetcher::_placeholder_filename,
177 %fc_opts, %init_opts } ],
178 init => [ \&cmd_init, "Initialize a repo for tracking" .
179 " (requires URL argument)",
180 \%init_opts ],
181 'multi-init' => [ \&cmd_multi_init,
182 "Deprecated alias for ".
183 "'$0 init -T<trunk> -b<branches> -t<tags>'",
184 \%init_opts ],
185 dcommit => [ \&cmd_dcommit,
186 'Commit several diffs to merge with upstream',
187 { 'merge|m|M' => \$_merge,
188 'strategy|s=s' => \$_strategy,
189 'verbose|v' => \$_verbose,
190 'dry-run|n' => \$_dry_run,
191 'fetch-all|all' => \$_fetch_all,
192 'commit-url=s' => \$_commit_url,
193 'set-svn-props=s' => \$_set_svn_props,
194 'revision|r=i' => \$_revision,
195 'no-rebase' => \$_no_rebase,
196 'mergeinfo=s' => \$_merge_info,
197 'interactive|i' => \$_interactive,
198 %cmt_opts, %fc_opts } ],
199 branch => [ \&cmd_branch,
200 'Create a branch in the SVN repository',
201 { 'message|m=s' => \$_message,
202 'destination|d=s' => \$_branch_dest,
203 'dry-run|n' => \$_dry_run,
204 'parents' => \$_parents,
205 'tag|t' => \$_tag,
206 'username=s' => \$Git::SVN::Prompt::_username,
207 'commit-url=s' => \$_commit_url } ],
208 tag => [ sub { $_tag = 1; cmd_branch(@_) },
209 'Create a tag in the SVN repository',
210 { 'message|m=s' => \$_message,
211 'destination|d=s' => \$_branch_dest,
212 'dry-run|n' => \$_dry_run,
213 'parents' => \$_parents,
214 'username=s' => \$Git::SVN::Prompt::_username,
215 'commit-url=s' => \$_commit_url } ],
216 'set-tree' => [ \&cmd_set_tree,
217 "Set an SVN repository to a git tree-ish",
218 { 'stdin' => \$_stdin, %cmt_opts, %fc_opts, } ],
219 'create-ignore' => [ \&cmd_create_ignore,
220 'Create a .gitignore per svn:ignore',
221 { 'revision|r=i' => \$_revision
222 } ],
223 'mkdirs' => [ \&cmd_mkdirs ,
224 "recreate empty directories after a checkout",
225 { 'revision|r=i' => \$_revision } ],
226 'propget' => [ \&cmd_propget,
227 'Print the value of a property on a file or directory',
228 { 'revision|r=i' => \$_revision } ],
229 'propset' => [ \&cmd_propset,
230 'Set the value of a property on a file or directory - will be set on commit',
231 {} ],
232 'proplist' => [ \&cmd_proplist,
233 'List all properties of a file or directory',
234 { 'revision|r=i' => \$_revision } ],
235 'show-ignore' => [ \&cmd_show_ignore, "Show svn:ignore listings",
236 { 'revision|r=i' => \$_revision
237 } ],
238 'show-externals' => [ \&cmd_show_externals, "Show svn:externals listings",
239 { 'revision|r=i' => \$_revision
240 } ],
241 'multi-fetch' => [ \&cmd_multi_fetch,
242 "Deprecated alias for $0 fetch --all",
243 { 'revision|r=s' => \$_revision, %fc_opts } ],
244 'migrate' => [ sub { },
245 # no-op, we automatically run this anyways,
246 'Migrate configuration/metadata/layout from
247 previous versions of git-svn',
248 { 'minimize' => \$Git::SVN::Migration::_minimize,
249 %remote_opts } ],
250 'log' => [ \&Git::SVN::Log::cmd_show_log, 'Show commit logs',
251 { 'limit=i' => \$Git::SVN::Log::limit,
252 'revision|r=s' => \$_revision,
253 'verbose|v' => \$Git::SVN::Log::verbose,
254 'incremental' => \$Git::SVN::Log::incremental,
255 'oneline' => \$Git::SVN::Log::oneline,
256 'show-commit' => \$Git::SVN::Log::show_commit,
257 'non-recursive' => \$Git::SVN::Log::non_recursive,
258 'authors-file|A=s' => \$_authors,
259 'color' => \$Git::SVN::Log::color,
260 'pager=s' => \$Git::SVN::Log::pager
261 } ],
262 'find-rev' => [ \&cmd_find_rev,
263 "Translate between SVN revision numbers and tree-ish",
264 { 'B|before' => \$_before,
265 'A|after' => \$_after } ],
266 'rebase' => [ \&cmd_rebase, "Fetch and rebase your working directory",
267 { 'merge|m|M' => \$_merge,
268 'verbose|v' => \$_verbose,
269 'strategy|s=s' => \$_strategy,
270 'local|l' => \$_local,
271 'fetch-all|all' => \$_fetch_all,
272 'dry-run|n' => \$_dry_run,
273 'preserve-merges|p' => \$_preserve_merges,
274 %fc_opts } ],
275 'commit-diff' => [ \&cmd_commit_diff,
276 'Commit a diff between two trees',
277 { 'message|m=s' => \$_message,
278 'file|F=s' => \$_file,
279 'revision|r=s' => \$_revision,
280 %cmt_opts } ],
281 'info' => [ \&cmd_info,
282 "Show info about the latest SVN revision
283 on the current branch",
284 { 'url' => \$_url, } ],
285 'blame' => [ \&Git::SVN::Log::cmd_blame,
286 "Show what revision and author last modified each line of a file",
287 { 'git-format' => \$Git::SVN::Log::_git_format } ],
288 'reset' => [ \&cmd_reset,
289 "Undo fetches back to the specified SVN revision",
290 { 'revision|r=s' => \$_revision,
291 'parent|p' => \$_fetch_parent } ],
292 'gc' => [ \&cmd_gc,
293 "Compress unhandled.log files in .git/svn and remove " .
294 "index files in .git/svn",
295 {} ],
298 package FakeTerm;
299 sub new {
300 my ($class, $reason) = @_;
301 return bless \$reason, shift;
303 sub readline {
304 my $self = shift;
305 die "Cannot use readline on FakeTerm: $$self";
307 package main;
309 my $term;
310 sub term_init {
311 $term = eval {
312 require Term::ReadLine;
313 $ENV{"GIT_SVN_NOTTY"}
314 ? new Term::ReadLine 'git-svn', \*STDIN, \*STDOUT
315 : new Term::ReadLine 'git-svn';
317 if ($@) {
318 $term = new FakeTerm "$@: going non-interactive";
322 my $cmd;
323 for (my $i = 0; $i < @ARGV; $i++) {
324 if (defined $cmd{$ARGV[$i]}) {
325 $cmd = $ARGV[$i];
326 splice @ARGV, $i, 1;
327 last;
328 } elsif ($ARGV[$i] eq 'help') {
329 $cmd = $ARGV[$i+1];
330 usage(0);
334 # make sure we're always running at the top-level working directory
335 if ($cmd && $cmd =~ /(?:clone|init|multi-init)$/) {
336 $ENV{GIT_DIR} ||= ".git";
337 # catch the submodule case
338 if (-f $ENV{GIT_DIR}) {
339 open(my $fh, '<', $ENV{GIT_DIR}) or
340 die "failed to open $ENV{GIT_DIR}: $!\n";
341 $ENV{GIT_DIR} = $1 if <$fh> =~ /^gitdir: (.+)$/;
343 } elsif ($cmd) {
344 my ($git_dir, $cdup);
345 git_cmd_try {
346 $git_dir = command_oneline([qw/rev-parse --git-dir/]);
347 } "Unable to find .git directory\n";
348 git_cmd_try {
349 $cdup = command_oneline(qw/rev-parse --show-cdup/);
350 chomp $cdup if ($cdup);
351 $cdup = "." unless ($cdup && length $cdup);
352 } "Already at toplevel, but $git_dir not found\n";
353 $ENV{GIT_DIR} = $git_dir;
354 chdir $cdup or die "Unable to chdir up to '$cdup'\n";
355 $_repository = Git->repository(Repository => $ENV{GIT_DIR});
358 my %opts = %{$cmd{$cmd}->[2]} if (defined $cmd);
360 read_git_config(\%opts) if $ENV{GIT_DIR};
361 if ($cmd && ($cmd eq 'log' || $cmd eq 'blame')) {
362 Getopt::Long::Configure('pass_through');
364 my $rv = GetOptions(%opts, 'h|H' => \$_help, 'version|V' => \$_version,
365 'minimize-connections' => \$Git::SVN::Migration::_minimize,
366 'id|i=s' => \$Git::SVN::default_ref_id,
367 'svn-remote|remote|R=s' => sub {
368 $Git::SVN::no_reuse_existing = 1;
369 $Git::SVN::default_repo_id = $_[1] });
370 exit 1 if (!$rv && $cmd && $cmd ne 'log');
372 usage(0) if $_help;
373 version() if $_version;
374 usage(1) unless defined $cmd;
375 load_authors() if $_authors;
376 if (defined $_authors_prog) {
377 $_authors_prog = "'" . File::Spec->rel2abs($_authors_prog) . "'";
380 unless ($cmd =~ /^(?:clone|init|multi-init|commit-diff)$/) {
381 Git::SVN::Migration::migration_check();
383 Git::SVN::init_vars();
384 eval {
385 Git::SVN::verify_remotes_sanity();
386 $cmd{$cmd}->[0]->(@ARGV);
387 post_fetch_checkout();
389 fatal $@ if $@;
390 exit 0;
392 ####################### primary functions ######################
393 sub usage {
394 my $exit = shift || 0;
395 my $fd = $exit ? \*STDERR : \*STDOUT;
396 print $fd <<"";
397 git-svn - bidirectional operations between a single Subversion tree and git
398 usage: git svn <command> [options] [arguments]\n
400 print $fd "Available commands:\n" unless $cmd;
402 foreach (sort keys %cmd) {
403 next if $cmd && $cmd ne $_;
404 next if /^multi-/; # don't show deprecated commands
405 print $fd ' ',pack('A17',$_),$cmd{$_}->[1],"\n";
406 foreach (sort keys %{$cmd{$_}->[2]}) {
407 # mixed-case options are for .git/config only
408 next if /[A-Z]/ && /^[a-z]+$/i;
409 # prints out arguments as they should be passed:
410 my $x = s#[:=]s$## ? '<arg>' : s#[:=]i$## ? '<num>' : '';
411 print $fd ' ' x 21, join(', ', map { length $_ > 1 ?
412 "--$_" : "-$_" }
413 split /\|/,$_)," $x\n";
416 print $fd <<"";
417 \nGIT_SVN_ID may be set in the environment or via the --id/-i switch to an
418 arbitrary identifier if you're tracking multiple SVN branches/repositories in
419 one git repository and want to keep them separate. See git-svn(1) for more
420 information.
422 exit $exit;
425 sub version {
426 ::_req_svn();
427 print "git-svn version $VERSION (svn $SVN::Core::VERSION)\n";
428 exit 0;
431 sub ask {
432 my ($prompt, %arg) = @_;
433 my $valid_re = $arg{valid_re};
434 my $default = $arg{default};
435 my $resp;
436 my $i = 0;
437 term_init() unless $term;
439 if ( !( defined($term->IN)
440 && defined( fileno($term->IN) )
441 && defined( $term->OUT )
442 && defined( fileno($term->OUT) ) ) ){
443 return defined($default) ? $default : undef;
446 while ($i++ < 10) {
447 $resp = $term->readline($prompt);
448 if (!defined $resp) { # EOF
449 print "\n";
450 return defined $default ? $default : undef;
452 if ($resp eq '' and defined $default) {
453 return $default;
455 if (!defined $valid_re or $resp =~ /$valid_re/) {
456 return $resp;
459 return undef;
462 sub do_git_init_db {
463 unless (-d $ENV{GIT_DIR}) {
464 my @init_db = ('init');
465 push @init_db, "--template=$_template" if defined $_template;
466 if (defined $_shared) {
467 if ($_shared =~ /[a-z]/) {
468 push @init_db, "--shared=$_shared";
469 } else {
470 push @init_db, "--shared";
473 command_noisy(@init_db);
474 $_repository = Git->repository(Repository => ".git");
476 my $set;
477 my $pfx = "svn-remote.$Git::SVN::default_repo_id";
478 foreach my $i (keys %icv) {
479 die "'$set' and '$i' cannot both be set\n" if $set;
480 next unless defined $icv{$i};
481 command_noisy('config', "$pfx.$i", $icv{$i});
482 $set = $i;
484 my $ignore_paths_regex = \$Git::SVN::Fetcher::_ignore_regex;
485 command_noisy('config', "$pfx.ignore-paths", $$ignore_paths_regex)
486 if defined $$ignore_paths_regex;
487 my $include_paths_regex = \$Git::SVN::Fetcher::_include_regex;
488 command_noisy('config', "$pfx.include-paths", $$include_paths_regex)
489 if defined $$include_paths_regex;
490 my $ignore_refs_regex = \$Git::SVN::Ra::_ignore_refs_regex;
491 command_noisy('config', "$pfx.ignore-refs", $$ignore_refs_regex)
492 if defined $$ignore_refs_regex;
494 if (defined $Git::SVN::Fetcher::_preserve_empty_dirs) {
495 my $fname = \$Git::SVN::Fetcher::_placeholder_filename;
496 command_noisy('config', "$pfx.preserve-empty-dirs", 'true');
497 command_noisy('config', "$pfx.placeholder-filename", $$fname);
501 sub init_subdir {
502 my $repo_path = shift or return;
503 mkpath([$repo_path]) unless -d $repo_path;
504 chdir $repo_path or die "Couldn't chdir to $repo_path: $!\n";
505 $ENV{GIT_DIR} = '.git';
506 $_repository = Git->repository(Repository => $ENV{GIT_DIR});
509 sub cmd_clone {
510 my ($url, $path) = @_;
511 if (!$url) {
512 die "SVN repository location required ",
513 "as a command-line argument\n";
514 } elsif (!defined $path &&
515 (defined $_trunk || @_branches || @_tags ||
516 defined $_stdlayout) &&
517 $url !~ m#^[a-z\+]+://#) {
518 $path = $url;
520 $path = basename($url) if !defined $path || !length $path;
521 my $authors_absolute = $_authors ? File::Spec->rel2abs($_authors) : "";
522 cmd_init($url, $path);
523 command_oneline('config', 'svn.authorsfile', $authors_absolute)
524 if $_authors;
525 Git::SVN::fetch_all($Git::SVN::default_repo_id);
528 sub cmd_init {
529 if (defined $_stdlayout) {
530 $_trunk = 'trunk' if (!defined $_trunk);
531 @_tags = 'tags' if (! @_tags);
532 @_branches = 'branches' if (! @_branches);
534 if (defined $_trunk || @_branches || @_tags) {
535 return cmd_multi_init(@_);
537 my $url = shift or die "SVN repository location required ",
538 "as a command-line argument\n";
539 $url = canonicalize_url($url);
540 init_subdir(@_);
541 do_git_init_db();
543 if ($Git::SVN::_minimize_url eq 'unset') {
544 $Git::SVN::_minimize_url = 0;
547 Git::SVN->init($url);
550 sub cmd_fetch {
551 if (grep /^\d+=./, @_) {
552 die "'<rev>=<commit>' fetch arguments are ",
553 "no longer supported.\n";
555 my ($remote) = @_;
556 if (@_ > 1) {
557 die "usage: $0 fetch [--all] [--parent] [svn-remote]\n";
559 $Git::SVN::no_reuse_existing = undef;
560 if ($_fetch_parent) {
561 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
562 unless ($gs) {
563 die "Unable to determine upstream SVN information from ",
564 "working tree history\n";
566 # just fetch, don't checkout.
567 $_no_checkout = 'true';
568 $_fetch_all ? $gs->fetch_all : $gs->fetch;
569 } elsif ($_fetch_all) {
570 cmd_multi_fetch();
571 } else {
572 $remote ||= $Git::SVN::default_repo_id;
573 Git::SVN::fetch_all($remote, Git::SVN::read_all_remotes());
577 sub cmd_set_tree {
578 my (@commits) = @_;
579 if ($_stdin || !@commits) {
580 print "Reading from stdin...\n";
581 @commits = ();
582 while (<STDIN>) {
583 if (/\b($sha1_short)\b/o) {
584 unshift @commits, $1;
588 my @revs;
589 foreach my $c (@commits) {
590 my @tmp = command('rev-parse',$c);
591 if (scalar @tmp == 1) {
592 push @revs, $tmp[0];
593 } elsif (scalar @tmp > 1) {
594 push @revs, reverse(command('rev-list',@tmp));
595 } else {
596 fatal "Failed to rev-parse $c";
599 my $gs = Git::SVN->new;
600 my ($r_last, $cmt_last) = $gs->last_rev_commit;
601 $gs->fetch;
602 if (defined $gs->{last_rev} && $r_last != $gs->{last_rev}) {
603 fatal "There are new revisions that were fetched ",
604 "and need to be merged (or acknowledged) ",
605 "before committing.\nlast rev: $r_last\n",
606 " current: $gs->{last_rev}";
608 $gs->set_tree($_) foreach @revs;
609 print "Done committing ",scalar @revs," revisions to SVN\n";
610 unlink $gs->{index};
613 sub split_merge_info_range {
614 my ($range) = @_;
615 if ($range =~ /(\d+)-(\d+)/) {
616 return (int($1), int($2));
617 } else {
618 return (int($range), int($range));
622 sub combine_ranges {
623 my ($in) = @_;
625 my @fnums = ();
626 my @arr = split(/,/, $in);
627 for my $element (@arr) {
628 my ($start, $end) = split_merge_info_range($element);
629 push @fnums, $start;
632 my @sorted = @arr [ sort {
633 $fnums[$a] <=> $fnums[$b]
634 } 0..$#arr ];
636 my @return = ();
637 my $last = -1;
638 my $first = -1;
639 for my $element (@sorted) {
640 my ($start, $end) = split_merge_info_range($element);
642 if ($last == -1) {
643 $first = $start;
644 $last = $end;
645 next;
647 if ($start <= $last+1) {
648 if ($end > $last) {
649 $last = $end;
651 next;
653 if ($first == $last) {
654 push @return, "$first";
655 } else {
656 push @return, "$first-$last";
658 $first = $start;
659 $last = $end;
662 if ($first != -1) {
663 if ($first == $last) {
664 push @return, "$first";
665 } else {
666 push @return, "$first-$last";
670 return join(',', @return);
673 sub merge_revs_into_hash {
674 my ($hash, $minfo) = @_;
675 my @lines = split(' ', $minfo);
677 for my $line (@lines) {
678 my ($branchpath, $revs) = split(/:/, $line);
680 if (exists($hash->{$branchpath})) {
681 # Merge the two revision sets
682 my $combined = "$hash->{$branchpath},$revs";
683 $hash->{$branchpath} = combine_ranges($combined);
684 } else {
685 # Just do range combining for consolidation
686 $hash->{$branchpath} = combine_ranges($revs);
691 sub merge_merge_info {
692 my ($mergeinfo_one, $mergeinfo_two, $ignore_branch) = @_;
693 my %result_hash = ();
695 merge_revs_into_hash(\%result_hash, $mergeinfo_one);
696 merge_revs_into_hash(\%result_hash, $mergeinfo_two);
698 delete $result_hash{$ignore_branch} if $ignore_branch;
700 my $result = '';
701 # Sort below is for consistency's sake
702 for my $branchname (sort keys(%result_hash)) {
703 my $revlist = $result_hash{$branchname};
704 $result .= "$branchname:$revlist\n"
706 return $result;
709 sub populate_merge_info {
710 my ($d, $gs, $uuid, $linear_refs, $rewritten_parent) = @_;
712 my %parentshash;
713 read_commit_parents(\%parentshash, $d);
714 my @parents = @{$parentshash{$d}};
715 if ($#parents > 0) {
716 # Merge commit
717 my $all_parents_ok = 1;
718 my $aggregate_mergeinfo = '';
719 my $rooturl = $gs->repos_root;
720 my ($target_branch) = $gs->full_pushurl =~ /^\Q$rooturl\E(.*)/;
722 if (defined($rewritten_parent)) {
723 # Replace first parent with newly-rewritten version
724 shift @parents;
725 unshift @parents, $rewritten_parent;
728 foreach my $parent (@parents) {
729 my ($branchurl, $svnrev, $paruuid) =
730 cmt_metadata($parent);
732 unless (defined($svnrev)) {
733 # Should have been caught be preflight check
734 fatal "merge commit $d has ancestor $parent, but that change "
735 ."does not have git-svn metadata!";
737 unless ($branchurl =~ /^\Q$rooturl\E(.*)/) {
738 fatal "commit $parent git-svn metadata changed mid-run!";
740 my $branchpath = $1;
742 my $ra = Git::SVN::Ra->new($branchurl);
743 my (undef, undef, $props) =
744 $ra->get_dir(canonicalize_path("."), $svnrev);
745 my $par_mergeinfo = $props->{'svn:mergeinfo'};
746 unless (defined $par_mergeinfo) {
747 $par_mergeinfo = '';
749 # Merge previous mergeinfo values
750 $aggregate_mergeinfo =
751 merge_merge_info($aggregate_mergeinfo,
752 $par_mergeinfo,
753 $target_branch);
755 next if $parent eq $parents[0]; # Skip first parent
756 # Add new changes being placed in tree by merge
757 my @cmd = (qw/rev-list --reverse/,
758 $parent, qw/--not/);
759 foreach my $par (@parents) {
760 unless ($par eq $parent) {
761 push @cmd, $par;
764 my @revsin = ();
765 my ($revlist, $ctx) = command_output_pipe(@cmd);
766 while (<$revlist>) {
767 my $irev = $_;
768 chomp $irev;
769 my (undef, $csvnrev, undef) =
770 cmt_metadata($irev);
771 unless (defined $csvnrev) {
772 # A child is missing SVN annotations...
773 # this might be OK, or might not be.
774 warn "W:child $irev is merged into revision "
775 ."$d but does not have git-svn metadata. "
776 ."This means git-svn cannot determine the "
777 ."svn revision numbers to place into the "
778 ."svn:mergeinfo property. You must ensure "
779 ."a branch is entirely committed to "
780 ."SVN before merging it in order for "
781 ."svn:mergeinfo population to function "
782 ."properly";
784 push @revsin, $csvnrev;
786 command_close_pipe($revlist, $ctx);
788 last unless $all_parents_ok;
790 # We now have a list of all SVN revnos which are
791 # merged by this particular parent. Integrate them.
792 next if $#revsin == -1;
793 my $newmergeinfo = "$branchpath:" . join(',', @revsin);
794 $aggregate_mergeinfo =
795 merge_merge_info($aggregate_mergeinfo,
796 $newmergeinfo,
797 $target_branch);
799 if ($all_parents_ok and $aggregate_mergeinfo) {
800 return $aggregate_mergeinfo;
804 return undef;
807 sub dcommit_rebase {
808 my ($is_last, $current, $fetched_ref, $svn_error) = @_;
809 my @diff;
811 if ($svn_error) {
812 print STDERR "\nERROR from SVN:\n",
813 $svn_error->expanded_message, "\n";
815 unless ($_no_rebase) {
816 # we always want to rebase against the current HEAD,
817 # not any head that was passed to us
818 @diff = command('diff-tree', $current,
819 $fetched_ref, '--');
820 my @finish;
821 if (@diff) {
822 @finish = rebase_cmd();
823 print STDERR "W: $current and ", $fetched_ref,
824 " differ, using @finish:\n",
825 join("\n", @diff), "\n";
826 } elsif ($is_last) {
827 print "No changes between ", $current, " and ",
828 $fetched_ref,
829 "\nResetting to the latest ",
830 $fetched_ref, "\n";
831 @finish = qw/reset --mixed/;
833 command_noisy(@finish, $fetched_ref) if @finish;
835 if ($svn_error) {
836 die "ERROR: Not all changes have been committed into SVN"
837 .($_no_rebase ? ".\n" : ", however the committed\n"
838 ."ones (if any) seem to be successfully integrated "
839 ."into the working tree.\n")
840 ."Please see the above messages for details.\n";
842 return @diff;
845 sub cmd_dcommit {
846 my $head = shift;
847 command_noisy(qw/update-index --refresh/);
848 git_cmd_try { command_oneline(qw/diff-index --quiet HEAD --/) }
849 'Cannot dcommit with a dirty index. Commit your changes first, '
850 . "or stash them with `git stash'.\n";
851 $head ||= 'HEAD';
853 my $old_head;
854 if ($head ne 'HEAD') {
855 $old_head = eval {
856 command_oneline([qw/symbolic-ref -q HEAD/])
858 if ($old_head) {
859 $old_head =~ s{^refs/heads/}{};
860 } else {
861 $old_head = eval { command_oneline(qw/rev-parse HEAD/) };
863 command(['checkout', $head], STDERR => 0);
866 my @refs;
867 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD', \@refs);
868 unless ($gs) {
869 die "Unable to determine upstream SVN information from ",
870 "$head history.\nPerhaps the repository is empty.";
873 if (defined $_commit_url) {
874 $url = $_commit_url;
875 } else {
876 $url = eval { command_oneline('config', '--get',
877 "svn-remote.$gs->{repo_id}.commiturl") };
878 if (!$url) {
879 $url = $gs->full_pushurl
883 my $last_rev = $_revision if defined $_revision;
884 if ($url) {
885 print "Committing to $url ...\n";
887 my ($linear_refs, $parents) = linearize_history($gs, \@refs);
888 if ($_no_rebase && scalar(@$linear_refs) > 1) {
889 warn "Attempting to commit more than one change while ",
890 "--no-rebase is enabled.\n",
891 "If these changes depend on each other, re-running ",
892 "without --no-rebase may be required."
895 if (defined $_interactive){
896 my $ask_default = "y";
897 foreach my $d (@$linear_refs){
898 my ($fh, $ctx) = command_output_pipe(qw(show --summary), "$d");
899 while (<$fh>){
900 print $_;
902 command_close_pipe($fh, $ctx);
903 $_ = ask("Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): ",
904 valid_re => qr/^(?:yes|y|no|n|quit|q|all|a)/i,
905 default => $ask_default);
906 die "Commit this patch reply required" unless defined $_;
907 if (/^[nq]/i) {
908 exit(0);
909 } elsif (/^a/i) {
910 last;
915 my $expect_url = $url;
917 my $push_merge_info = eval {
918 command_oneline(qw/config --get svn.pushmergeinfo/)
920 if (not defined($push_merge_info)
921 or $push_merge_info eq "false"
922 or $push_merge_info eq "no"
923 or $push_merge_info eq "never") {
924 $push_merge_info = 0;
927 unless (defined($_merge_info) || ! $push_merge_info) {
928 # Preflight check of changes to ensure no issues with mergeinfo
929 # This includes check for uncommitted-to-SVN parents
930 # (other than the first parent, which we will handle),
931 # information from different SVN repos, and paths
932 # which are not underneath this repository root.
933 my $rooturl = $gs->repos_root;
934 foreach my $d (@$linear_refs) {
935 my %parentshash;
936 read_commit_parents(\%parentshash, $d);
937 my @realparents = @{$parentshash{$d}};
938 if ($#realparents > 0) {
939 # Merge commit
940 shift @realparents; # Remove/ignore first parent
941 foreach my $parent (@realparents) {
942 my ($branchurl, $svnrev, $paruuid) = cmt_metadata($parent);
943 unless (defined $paruuid) {
944 # A parent is missing SVN annotations...
945 # abort the whole operation.
946 fatal "$parent is merged into revision $d, "
947 ."but does not have git-svn metadata. "
948 ."Either dcommit the branch or use a "
949 ."local cherry-pick, FF merge, or rebase "
950 ."instead of an explicit merge commit.";
953 unless ($paruuid eq $uuid) {
954 # Parent has SVN metadata from different repository
955 fatal "merge parent $parent for change $d has "
956 ."git-svn uuid $paruuid, while current change "
957 ."has uuid $uuid!";
960 unless ($branchurl =~ /^\Q$rooturl\E(.*)/) {
961 # This branch is very strange indeed.
962 fatal "merge parent $parent for $d is on branch "
963 ."$branchurl, which is not under the "
964 ."git-svn root $rooturl!";
971 my $rewritten_parent;
972 my $current_head = command_oneline(qw/rev-parse HEAD/);
973 Git::SVN::remove_username($expect_url);
974 if (defined($_merge_info)) {
975 $_merge_info =~ tr{ }{\n};
977 while (1) {
978 my $d = shift @$linear_refs or last;
979 unless (defined $last_rev) {
980 (undef, $last_rev, undef) = cmt_metadata("$d~1");
981 unless (defined $last_rev) {
982 fatal "Unable to extract revision information ",
983 "from commit $d~1";
986 if ($_dry_run) {
987 print "diff-tree $d~1 $d\n";
988 } else {
989 my $cmt_rev;
991 unless (defined($_merge_info) || ! $push_merge_info) {
992 $_merge_info = populate_merge_info($d, $gs,
993 $uuid,
994 $linear_refs,
995 $rewritten_parent);
998 my %ed_opts = ( r => $last_rev,
999 log => get_commit_entry($d)->{log},
1000 ra => Git::SVN::Ra->new($url),
1001 config => SVN::Core::config_get_config(
1002 $Git::SVN::Ra::config_dir
1004 tree_a => "$d~1",
1005 tree_b => $d,
1006 editor_cb => sub {
1007 print "Committed r$_[0]\n";
1008 $cmt_rev = $_[0];
1010 mergeinfo => $_merge_info,
1011 svn_path => '');
1013 my $err_handler = $SVN::Error::handler;
1014 $SVN::Error::handler = sub {
1015 my $err = shift;
1016 dcommit_rebase(1, $current_head, $gs->refname,
1017 $err);
1020 if (!Git::SVN::Editor->new(\%ed_opts)->apply_diff) {
1021 print "No changes\n$d~1 == $d\n";
1022 } elsif ($parents->{$d} && @{$parents->{$d}}) {
1023 $gs->{inject_parents_dcommit}->{$cmt_rev} =
1024 $parents->{$d};
1026 $_fetch_all ? $gs->fetch_all : $gs->fetch;
1027 $SVN::Error::handler = $err_handler;
1028 $last_rev = $cmt_rev;
1029 next if $_no_rebase;
1031 my @diff = dcommit_rebase(@$linear_refs == 0, $d,
1032 $gs->refname, undef);
1034 $rewritten_parent = command_oneline(qw/rev-parse/,
1035 $gs->refname);
1037 if (@diff) {
1038 $current_head = command_oneline(qw/rev-parse
1039 HEAD/);
1040 @refs = ();
1041 my ($url_, $rev_, $uuid_, $gs_) =
1042 working_head_info('HEAD', \@refs);
1043 my ($linear_refs_, $parents_) =
1044 linearize_history($gs_, \@refs);
1045 if (scalar(@$linear_refs) !=
1046 scalar(@$linear_refs_)) {
1047 fatal "# of revisions changed ",
1048 "\nbefore:\n",
1049 join("\n", @$linear_refs),
1050 "\n\nafter:\n",
1051 join("\n", @$linear_refs_), "\n",
1052 'If you are attempting to commit ',
1053 "merges, try running:\n\t",
1054 'git rebase --interactive',
1055 '--preserve-merges ',
1056 $gs->refname,
1057 "\nBefore dcommitting";
1059 if ($url_ ne $expect_url) {
1060 if ($url_ eq $gs->metadata_url) {
1061 print
1062 "Accepting rewritten URL:",
1063 " $url_\n";
1064 } else {
1065 fatal
1066 "URL mismatch after rebase:",
1067 " $url_ != $expect_url";
1070 if ($uuid_ ne $uuid) {
1071 fatal "uuid mismatch after rebase: ",
1072 "$uuid_ != $uuid";
1074 # remap parents
1075 my (%p, @l, $i);
1076 for ($i = 0; $i < scalar @$linear_refs; $i++) {
1077 my $new = $linear_refs_->[$i] or next;
1078 $p{$new} =
1079 $parents->{$linear_refs->[$i]};
1080 push @l, $new;
1082 $parents = \%p;
1083 $linear_refs = \@l;
1084 undef $last_rev;
1089 if ($old_head) {
1090 my $new_head = command_oneline(qw/rev-parse HEAD/);
1091 my $new_is_symbolic = eval {
1092 command_oneline(qw/symbolic-ref -q HEAD/);
1094 if ($new_is_symbolic) {
1095 print "dcommitted the branch ", $head, "\n";
1096 } else {
1097 print "dcommitted on a detached HEAD because you gave ",
1098 "a revision argument.\n",
1099 "The rewritten commit is: ", $new_head, "\n";
1101 command(['checkout', $old_head], STDERR => 0);
1104 unlink $gs->{index};
1107 sub cmd_branch {
1108 my ($branch_name, $head) = @_;
1110 unless (defined $branch_name && length $branch_name) {
1111 die(($_tag ? "tag" : "branch") . " name required\n");
1113 $head ||= 'HEAD';
1115 my (undef, $rev, undef, $gs) = working_head_info($head);
1116 my $src = $gs->full_pushurl;
1118 my $remote = Git::SVN::read_all_remotes()->{$gs->{repo_id}};
1119 my $allglobs = $remote->{ $_tag ? 'tags' : 'branches' };
1120 my $glob;
1121 if ($#{$allglobs} == 0) {
1122 $glob = $allglobs->[0];
1123 } else {
1124 unless(defined $_branch_dest) {
1125 die "Multiple ",
1126 $_tag ? "tag" : "branch",
1127 " paths defined for Subversion repository.\n",
1128 "You must specify where you want to create the ",
1129 $_tag ? "tag" : "branch",
1130 " with the --destination argument.\n";
1132 foreach my $g (@{$allglobs}) {
1133 my $re = Git::SVN::Editor::glob2pat($g->{path}->{left});
1134 if ($_branch_dest =~ /$re/) {
1135 $glob = $g;
1136 last;
1139 unless (defined $glob) {
1140 my $dest_re = qr/\b\Q$_branch_dest\E\b/;
1141 foreach my $g (@{$allglobs}) {
1142 $g->{path}->{left} =~ /$dest_re/ or next;
1143 if (defined $glob) {
1144 die "Ambiguous destination: ",
1145 $_branch_dest, "\nmatches both '",
1146 $glob->{path}->{left}, "' and '",
1147 $g->{path}->{left}, "'\n";
1149 $glob = $g;
1151 unless (defined $glob) {
1152 die "Unknown ",
1153 $_tag ? "tag" : "branch",
1154 " destination $_branch_dest\n";
1158 my ($lft, $rgt) = @{ $glob->{path} }{qw/left right/};
1159 my $url;
1160 if (defined $_commit_url) {
1161 $url = $_commit_url;
1162 } else {
1163 $url = eval { command_oneline('config', '--get',
1164 "svn-remote.$gs->{repo_id}.commiturl") };
1165 if (!$url) {
1166 $url = $remote->{pushurl} || $remote->{url};
1169 my $dst = join '/', $url, $lft, $branch_name, ($rgt || ());
1171 if ($dst =~ /^https:/ && $src =~ /^http:/) {
1172 $src=~s/^http:/https:/;
1175 ::_req_svn();
1176 require SVN::Client;
1178 my $ctx = SVN::Client->new(
1179 config => SVN::Core::config_get_config(
1180 $Git::SVN::Ra::config_dir
1182 log_msg => sub {
1183 ${ $_[0] } = defined $_message
1184 ? $_message
1185 : 'Create ' . ($_tag ? 'tag ' : 'branch ' )
1186 . $branch_name;
1190 eval {
1191 $ctx->ls($dst, 'HEAD', 0);
1192 } and die "branch ${branch_name} already exists\n";
1194 if ($_parents) {
1195 mk_parent_dirs($ctx, $dst);
1198 print "Copying ${src} at r${rev} to ${dst}...\n";
1199 $ctx->copy($src, $rev, $dst)
1200 unless $_dry_run;
1202 $gs->fetch_all;
1205 sub mk_parent_dirs {
1206 my ($ctx, $parent) = @_;
1207 $parent =~ s{/[^/]*$}{};
1209 if (!eval{$ctx->ls($parent, 'HEAD', 0)}) {
1210 mk_parent_dirs($ctx, $parent);
1211 print "Creating parent folder ${parent} ...\n";
1212 $ctx->mkdir($parent) unless $_dry_run;
1216 sub cmd_find_rev {
1217 my $revision_or_hash = shift or die "SVN or git revision required ",
1218 "as a command-line argument\n";
1219 my $result;
1220 if ($revision_or_hash =~ /^r\d+$/) {
1221 my $head = shift;
1222 $head ||= 'HEAD';
1223 my @refs;
1224 my (undef, undef, $uuid, $gs) = working_head_info($head, \@refs);
1225 unless ($gs) {
1226 die "Unable to determine upstream SVN information from ",
1227 "$head history\n";
1229 my $desired_revision = substr($revision_or_hash, 1);
1230 if ($_before) {
1231 $result = $gs->find_rev_before($desired_revision, 1);
1232 } elsif ($_after) {
1233 $result = $gs->find_rev_after($desired_revision, 1);
1234 } else {
1235 $result = $gs->rev_map_get($desired_revision, $uuid);
1237 } else {
1238 my (undef, $rev, undef) = cmt_metadata($revision_or_hash);
1239 $result = $rev;
1241 print "$result\n" if $result;
1244 sub auto_create_empty_directories {
1245 my ($gs) = @_;
1246 my $var = eval { command_oneline('config', '--get', '--bool',
1247 "svn-remote.$gs->{repo_id}.automkdirs") };
1248 # By default, create empty directories by consulting the unhandled log,
1249 # but allow setting it to 'false' to skip it.
1250 return !($var && $var eq 'false');
1253 sub cmd_rebase {
1254 command_noisy(qw/update-index --refresh/);
1255 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
1256 unless ($gs) {
1257 die "Unable to determine upstream SVN information from ",
1258 "working tree history\n";
1260 if ($_dry_run) {
1261 print "Remote Branch: " . $gs->refname . "\n";
1262 print "SVN URL: " . $url . "\n";
1263 return;
1265 if (command(qw/diff-index HEAD --/)) {
1266 print STDERR "Cannot rebase with uncommitted changes:\n";
1267 command_noisy('status');
1268 exit 1;
1270 unless ($_local) {
1271 # rebase will checkout for us, so no need to do it explicitly
1272 $_no_checkout = 'true';
1273 $_fetch_all ? $gs->fetch_all : $gs->fetch;
1275 command_noisy(rebase_cmd(), $gs->refname);
1276 if (auto_create_empty_directories($gs)) {
1277 $gs->mkemptydirs;
1281 sub cmd_show_ignore {
1282 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
1283 $gs ||= Git::SVN->new;
1284 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
1285 $gs->prop_walk($gs->path, $r, sub {
1286 my ($gs, $path, $props) = @_;
1287 print STDOUT "\n# $path\n";
1288 my $s = $props->{'svn:ignore'} or return;
1289 $s =~ s/[\r\n]+/\n/g;
1290 $s =~ s/^\n+//;
1291 chomp $s;
1292 $s =~ s#^#$path#gm;
1293 print STDOUT "$s\n";
1297 sub cmd_show_externals {
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);
1301 $gs->prop_walk($gs->path, $r, sub {
1302 my ($gs, $path, $props) = @_;
1303 print STDOUT "\n# $path\n";
1304 my $s = $props->{'svn:externals'} or return;
1305 $s =~ s/[\r\n]+/\n/g;
1306 chomp $s;
1307 $s =~ s#^#$path#gm;
1308 print STDOUT "$s\n";
1312 sub cmd_create_ignore {
1313 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
1314 $gs ||= Git::SVN->new;
1315 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
1316 $gs->prop_walk($gs->path, $r, sub {
1317 my ($gs, $path, $props) = @_;
1318 # $path is of the form /path/to/dir/
1319 $path = '.' . $path;
1320 # SVN can have attributes on empty directories,
1321 # which git won't track
1322 mkpath([$path]) unless -d $path;
1323 my $ignore = $path . '.gitignore';
1324 my $s = $props->{'svn:ignore'} or return;
1325 open(GITIGNORE, '>', $ignore)
1326 or fatal("Failed to open `$ignore' for writing: $!");
1327 $s =~ s/[\r\n]+/\n/g;
1328 $s =~ s/^\n+//;
1329 chomp $s;
1330 # Prefix all patterns so that the ignore doesn't apply
1331 # to sub-directories.
1332 $s =~ s#^#/#gm;
1333 print GITIGNORE "$s\n";
1334 close(GITIGNORE)
1335 or fatal("Failed to close `$ignore': $!");
1336 command_noisy('add', '-f', $ignore);
1340 sub cmd_mkdirs {
1341 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
1342 $gs ||= Git::SVN->new;
1343 $gs->mkemptydirs($_revision);
1346 # get_svnprops(PATH)
1347 # ------------------
1348 # Helper for cmd_propget and cmd_proplist below.
1349 sub get_svnprops {
1350 my $path = shift;
1351 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
1352 $gs ||= Git::SVN->new;
1354 # prefix THE PATH by the sub-directory from which the user
1355 # invoked us.
1356 $path = $cmd_dir_prefix . $path;
1357 fatal("No such file or directory: $path") unless -e $path;
1358 my $is_dir = -d $path ? 1 : 0;
1359 $path = join_paths($gs->path, $path);
1361 # canonicalize the path (otherwise libsvn will abort or fail to
1362 # find the file)
1363 $path = canonicalize_path($path);
1365 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
1366 my $props;
1367 if ($is_dir) {
1368 (undef, undef, $props) = $gs->ra->get_dir($path, $r);
1370 else {
1371 (undef, $props) = $gs->ra->get_file($path, $r, undef);
1373 return $props;
1376 # cmd_propget (PROP, PATH)
1377 # ------------------------
1378 # Print the SVN property PROP for PATH.
1379 sub cmd_propget {
1380 my ($prop, $path) = @_;
1381 $path = '.' if not defined $path;
1382 usage(1) if not defined $prop;
1383 my $props = get_svnprops($path);
1384 if (not defined $props->{$prop}) {
1385 fatal("`$path' does not have a `$prop' SVN property.");
1387 print $props->{$prop} . "\n";
1390 # cmd_propset (PROPNAME, PROPVAL, PATH)
1391 # ------------------------
1392 # Adjust the SVN property PROPNAME to PROPVAL for PATH.
1393 sub cmd_propset {
1394 my ($propname, $propval, $path) = @_;
1395 $path = '.' if not defined $path;
1396 $path = $cmd_dir_prefix . $path;
1397 usage(1) if not defined $propname;
1398 usage(1) if not defined $propval;
1399 my $file = basename($path);
1400 my $dn = dirname($path);
1401 my $cur_props = Git::SVN::Editor::check_attr( "svn-properties", $path );
1402 my @new_props;
1403 if (!$cur_props || $cur_props eq "unset" || $cur_props eq "" || $cur_props eq "set") {
1404 push @new_props, "$propname=$propval";
1405 } else {
1406 # TODO: handle combining properties better
1407 my @props = split(/;/, $cur_props);
1408 my $replaced_prop;
1409 foreach my $prop (@props) {
1410 # Parse 'name=value' syntax and set the property.
1411 if ($prop =~ /([^=]+)=(.*)/) {
1412 my ($n,$v) = ($1,$2);
1413 if ($n eq $propname) {
1414 $v = $propval;
1415 $replaced_prop = 1;
1417 push @new_props, "$n=$v";
1420 if (!$replaced_prop) {
1421 push @new_props, "$propname=$propval";
1424 my $attrfile = "$dn/.gitattributes";
1425 open my $attrfh, '>>', $attrfile or die "Can't open $attrfile: $!\n";
1426 # TODO: don't simply append here if $file already has svn-properties
1427 my $new_props = join(';', @new_props);
1428 print $attrfh "$file svn-properties=$new_props\n" or
1429 die "write to $attrfile: $!\n";
1430 close $attrfh or die "close $attrfile: $!\n";
1433 # cmd_proplist (PATH)
1434 # -------------------
1435 # Print the list of SVN properties for PATH.
1436 sub cmd_proplist {
1437 my $path = shift;
1438 $path = '.' if not defined $path;
1439 my $props = get_svnprops($path);
1440 print "Properties on '$path':\n";
1441 foreach (sort keys %{$props}) {
1442 print " $_\n";
1446 sub cmd_multi_init {
1447 my $url = shift;
1448 unless (defined $_trunk || @_branches || @_tags) {
1449 usage(1);
1452 $_prefix = 'origin/' unless defined $_prefix;
1453 if (defined $url) {
1454 $url = canonicalize_url($url);
1455 init_subdir(@_);
1457 do_git_init_db();
1458 if (defined $_trunk) {
1459 $_trunk =~ s#^/+##;
1460 my $trunk_ref = 'refs/remotes/' . $_prefix . 'trunk';
1461 # try both old-style and new-style lookups:
1462 my $gs_trunk = eval { Git::SVN->new($trunk_ref) };
1463 unless ($gs_trunk) {
1464 my ($trunk_url, $trunk_path) =
1465 complete_svn_url($url, $_trunk);
1466 $gs_trunk = Git::SVN->init($trunk_url, $trunk_path,
1467 undef, $trunk_ref);
1470 return unless @_branches || @_tags;
1471 my $ra = $url ? Git::SVN::Ra->new($url) : undef;
1472 foreach my $path (@_branches) {
1473 complete_url_ls_init($ra, $path, '--branches/-b', $_prefix);
1475 foreach my $path (@_tags) {
1476 complete_url_ls_init($ra, $path, '--tags/-t', $_prefix.'tags/');
1480 sub cmd_multi_fetch {
1481 $Git::SVN::no_reuse_existing = undef;
1482 my $remotes = Git::SVN::read_all_remotes();
1483 foreach my $repo_id (sort keys %$remotes) {
1484 if ($remotes->{$repo_id}->{url}) {
1485 Git::SVN::fetch_all($repo_id, $remotes);
1490 # this command is special because it requires no metadata
1491 sub cmd_commit_diff {
1492 my ($ta, $tb, $url) = @_;
1493 my $usage = "usage: $0 commit-diff -r<revision> ".
1494 "<tree-ish> <tree-ish> [<URL>]";
1495 fatal($usage) if (!defined $ta || !defined $tb);
1496 my $svn_path = '';
1497 if (!defined $url) {
1498 my $gs = eval { Git::SVN->new };
1499 if (!$gs) {
1500 fatal("Needed URL or usable git-svn --id in ",
1501 "the command-line\n", $usage);
1503 $url = $gs->url;
1504 $svn_path = $gs->path;
1506 unless (defined $_revision) {
1507 fatal("-r|--revision is a required argument\n", $usage);
1509 if (defined $_message && defined $_file) {
1510 fatal("Both --message/-m and --file/-F specified ",
1511 "for the commit message.\n",
1512 "I have no idea what you mean");
1514 if (defined $_file) {
1515 $_message = file_to_s($_file);
1516 } else {
1517 $_message ||= get_commit_entry($tb)->{log};
1519 my $ra ||= Git::SVN::Ra->new($url);
1520 my $r = $_revision;
1521 if ($r eq 'HEAD') {
1522 $r = $ra->get_latest_revnum;
1523 } elsif ($r !~ /^\d+$/) {
1524 die "revision argument: $r not understood by git-svn\n";
1526 my %ed_opts = ( r => $r,
1527 log => $_message,
1528 ra => $ra,
1529 tree_a => $ta,
1530 tree_b => $tb,
1531 editor_cb => sub { print "Committed r$_[0]\n" },
1532 svn_path => $svn_path );
1533 if (!Git::SVN::Editor->new(\%ed_opts)->apply_diff) {
1534 print "No changes\n$ta == $tb\n";
1538 sub cmd_info {
1539 my $path_arg = defined($_[0]) ? $_[0] : '.';
1540 my $path = $path_arg;
1541 if (File::Spec->file_name_is_absolute($path)) {
1542 $path = canonicalize_path($path);
1544 my $toplevel = eval {
1545 my @cmd = qw/rev-parse --show-toplevel/;
1546 command_oneline(\@cmd, STDERR => 0);
1549 # remove $toplevel from the absolute path:
1550 my ($vol, $dirs, $file) = File::Spec->splitpath($path);
1551 my (undef, $tdirs, $tfile) = File::Spec->splitpath($toplevel);
1552 my @dirs = File::Spec->splitdir($dirs);
1553 my @tdirs = File::Spec->splitdir($tdirs);
1554 pop @dirs if $dirs[-1] eq '';
1555 pop @tdirs if $tdirs[-1] eq '';
1556 push @dirs, $file;
1557 push @tdirs, $tfile;
1558 while (@tdirs && @dirs && $tdirs[0] eq $dirs[0]) {
1559 shift @dirs;
1560 shift @tdirs;
1562 $dirs = File::Spec->catdir(@dirs);
1563 $path = File::Spec->catpath($vol, $dirs);
1565 $path = canonicalize_path($path);
1566 } else {
1567 $path = canonicalize_path($cmd_dir_prefix . $path);
1569 if (exists $_[1]) {
1570 die "Too many arguments specified\n";
1573 my ($file_type, $diff_status) = find_file_type_and_diff_status($path);
1575 if (!$file_type && !$diff_status) {
1576 print STDERR "svn: '$path' is not under version control\n";
1577 exit 1;
1580 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
1581 unless ($gs) {
1582 die "Unable to determine upstream SVN information from ",
1583 "working tree history\n";
1586 # canonicalize_path() will return "" to make libsvn 1.5.x happy,
1587 $path = "." if $path eq "";
1589 my $full_url = canonicalize_url( add_path_to_url( $url, $path ) );
1591 if ($_url) {
1592 print "$full_url\n";
1593 return;
1596 my $result = "Path: $path_arg\n";
1597 $result .= "Name: " . basename($path) . "\n" if $file_type ne "dir";
1598 $result .= "URL: $full_url\n";
1600 eval {
1601 my $repos_root = $gs->repos_root;
1602 Git::SVN::remove_username($repos_root);
1603 $result .= "Repository Root: " . canonicalize_url($repos_root) . "\n";
1605 if ($@) {
1606 $result .= "Repository Root: (offline)\n";
1608 ::_req_svn();
1609 $result .= "Repository UUID: $uuid\n" unless $diff_status eq "A" &&
1610 (::compare_svn_version('1.5.4') <= 0 || $file_type ne "dir");
1611 $result .= "Revision: " . ($diff_status eq "A" ? 0 : $rev) . "\n";
1613 $result .= "Node Kind: " .
1614 ($file_type eq "dir" ? "directory" : "file") . "\n";
1616 my $schedule = $diff_status eq "A"
1617 ? "add"
1618 : ($diff_status eq "D" ? "delete" : "normal");
1619 $result .= "Schedule: $schedule\n";
1621 if ($diff_status eq "A") {
1622 print $result, "\n";
1623 return;
1626 my ($lc_author, $lc_rev, $lc_date_utc);
1627 my @args = Git::SVN::Log::git_svn_log_cmd($rev, $rev, "--", $path);
1628 my $log = command_output_pipe(@args);
1629 my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/;
1630 while (<$log>) {
1631 if (/^${esc_color}author (.+) <[^>]+> (\d+) ([\-\+]?\d+)$/o) {
1632 $lc_author = $1;
1633 $lc_date_utc = Git::SVN::Log::parse_git_date($2, $3);
1634 } elsif (/^${esc_color} (git-svn-id:.+)$/o) {
1635 (undef, $lc_rev, undef) = ::extract_metadata($1);
1638 close $log;
1640 Git::SVN::Log::set_local_timezone();
1642 $result .= "Last Changed Author: $lc_author\n";
1643 $result .= "Last Changed Rev: $lc_rev\n";
1644 $result .= "Last Changed Date: " .
1645 Git::SVN::Log::format_svn_date($lc_date_utc) . "\n";
1647 if ($file_type ne "dir") {
1648 my $text_last_updated_date =
1649 ($diff_status eq "D" ? $lc_date_utc : (stat $path)[9]);
1650 $result .=
1651 "Text Last Updated: " .
1652 Git::SVN::Log::format_svn_date($text_last_updated_date) .
1653 "\n";
1654 my $checksum;
1655 if ($diff_status eq "D") {
1656 my ($fh, $ctx) =
1657 command_output_pipe(qw(cat-file blob), "HEAD:$path");
1658 if ($file_type eq "link") {
1659 my $file_name = <$fh>;
1660 $checksum = md5sum("link $file_name");
1661 } else {
1662 $checksum = md5sum($fh);
1664 command_close_pipe($fh, $ctx);
1665 } elsif ($file_type eq "link") {
1666 my $file_name =
1667 command(qw(cat-file blob), "HEAD:$path");
1668 $checksum =
1669 md5sum("link " . $file_name);
1670 } else {
1671 open FILE, "<", $path or die $!;
1672 $checksum = md5sum(\*FILE);
1673 close FILE or die $!;
1675 $result .= "Checksum: " . $checksum . "\n";
1678 print $result, "\n";
1681 sub cmd_reset {
1682 my $target = shift || $_revision or die "SVN revision required\n";
1683 $target = $1 if $target =~ /^r(\d+)$/;
1684 $target =~ /^\d+$/ or die "Numeric SVN revision expected\n";
1685 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
1686 unless ($gs) {
1687 die "Unable to determine upstream SVN information from ".
1688 "history\n";
1690 my ($r, $c) = $gs->find_rev_before($target, not $_fetch_parent);
1691 die "Cannot find SVN revision $target\n" unless defined($c);
1692 $gs->rev_map_set($r, $c, 'reset', $uuid);
1693 print "r$r = $c ($gs->{ref_id})\n";
1696 sub cmd_gc {
1697 require File::Find;
1698 if (!can_compress()) {
1699 warn "Compress::Zlib could not be found; unhandled.log " .
1700 "files will not be compressed.\n";
1702 File::Find::find({ wanted => \&gc_directory, no_chdir => 1},
1703 Git::SVN::svn_dir());
1706 ########################### utility functions #########################
1708 sub rebase_cmd {
1709 my @cmd = qw/rebase/;
1710 push @cmd, '-v' if $_verbose;
1711 push @cmd, qw/--merge/ if $_merge;
1712 push @cmd, "--strategy=$_strategy" if $_strategy;
1713 push @cmd, "--preserve-merges" if $_preserve_merges;
1714 @cmd;
1717 sub post_fetch_checkout {
1718 return if $_no_checkout;
1719 return if verify_ref('HEAD^0');
1720 my $gs = $Git::SVN::_head or return;
1722 # look for "trunk" ref if it exists
1723 my $remote = Git::SVN::read_all_remotes()->{$gs->{repo_id}};
1724 my $fetch = $remote->{fetch};
1725 if ($fetch) {
1726 foreach my $p (keys %$fetch) {
1727 basename($fetch->{$p}) eq 'trunk' or next;
1728 $gs = Git::SVN->new($fetch->{$p}, $gs->{repo_id}, $p);
1729 last;
1733 command_noisy(qw(update-ref HEAD), $gs->refname);
1734 return unless verify_ref('HEAD^0');
1736 return if $ENV{GIT_DIR} !~ m#^(?:.*/)?\.git$#;
1737 my $index = command_oneline(qw(rev-parse --git-path index));
1738 return if -f $index;
1740 return if command_oneline(qw/rev-parse --is-inside-work-tree/) eq 'false';
1741 return if command_oneline(qw/rev-parse --is-inside-git-dir/) eq 'true';
1742 command_noisy(qw/read-tree -m -u -v HEAD HEAD/);
1743 print STDERR "Checked out HEAD:\n ",
1744 $gs->full_url, " r", $gs->last_rev, "\n";
1745 if (auto_create_empty_directories($gs)) {
1746 $gs->mkemptydirs($gs->last_rev);
1750 sub complete_svn_url {
1751 my ($url, $path) = @_;
1753 if ($path =~ m#^[a-z\+]+://#i) { # path is a URL
1754 $path = canonicalize_url($path);
1755 } else {
1756 $path = canonicalize_path($path);
1757 if (!defined $url || $url !~ m#^[a-z\+]+://#i) {
1758 fatal("E: '$path' is not a complete URL ",
1759 "and a separate URL is not specified");
1761 return ($url, $path);
1763 return ($path, '');
1766 sub complete_url_ls_init {
1767 my ($ra, $repo_path, $switch, $pfx) = @_;
1768 unless ($repo_path) {
1769 print STDERR "W: $switch not specified\n";
1770 return;
1772 if ($repo_path =~ m#^[a-z\+]+://#i) {
1773 $repo_path = canonicalize_url($repo_path);
1774 $ra = Git::SVN::Ra->new($repo_path);
1775 $repo_path = '';
1776 } else {
1777 $repo_path = canonicalize_path($repo_path);
1778 $repo_path =~ s#^/+##;
1779 unless ($ra) {
1780 fatal("E: '$repo_path' is not a complete URL ",
1781 "and a separate URL is not specified");
1784 my $url = $ra->url;
1785 my $gs = Git::SVN->init($url, undef, undef, undef, 1);
1786 my $k = "svn-remote.$gs->{repo_id}.url";
1787 my $orig_url = eval { command_oneline(qw/config --get/, $k) };
1788 if ($orig_url && ($orig_url ne $gs->url)) {
1789 die "$k already set: $orig_url\n",
1790 "wanted to set to: $gs->url\n";
1792 command_oneline('config', $k, $gs->url) unless $orig_url;
1794 my $remote_path = join_paths( $gs->path, $repo_path );
1795 $remote_path =~ s{%([0-9A-F]{2})}{chr hex($1)}ieg;
1796 $remote_path =~ s#^/##g;
1797 $remote_path .= "/*" if $remote_path !~ /\*/;
1798 my ($n) = ($switch =~ /^--(\w+)/);
1799 if (length $pfx && $pfx !~ m#/$#) {
1800 die "--prefix='$pfx' must have a trailing slash '/'\n";
1802 command_noisy('config',
1803 '--add',
1804 "svn-remote.$gs->{repo_id}.$n",
1805 "$remote_path:refs/remotes/$pfx*" .
1806 ('/*' x (($remote_path =~ tr/*/*/) - 1)) );
1809 sub verify_ref {
1810 my ($ref) = @_;
1811 eval { command_oneline([ 'rev-parse', '--verify', $ref ],
1812 { STDERR => 0 }); };
1815 sub get_tree_from_treeish {
1816 my ($treeish) = @_;
1817 # $treeish can be a symbolic ref, too:
1818 my $type = command_oneline(qw/cat-file -t/, $treeish);
1819 my $expected;
1820 while ($type eq 'tag') {
1821 ($treeish, $type) = command(qw/cat-file tag/, $treeish);
1823 if ($type eq 'commit') {
1824 $expected = (grep /^tree /, command(qw/cat-file commit/,
1825 $treeish))[0];
1826 ($expected) = ($expected =~ /^tree ($sha1)$/o);
1827 die "Unable to get tree from $treeish\n" unless $expected;
1828 } elsif ($type eq 'tree') {
1829 $expected = $treeish;
1830 } else {
1831 die "$treeish is a $type, expected tree, tag or commit\n";
1833 return $expected;
1836 sub get_commit_entry {
1837 my ($treeish) = shift;
1838 my %log_entry = ( log => '', tree => get_tree_from_treeish($treeish) );
1839 my @git_path = qw(rev-parse --git-path);
1840 my $commit_editmsg = command_oneline(@git_path, 'COMMIT_EDITMSG');
1841 my $commit_msg = command_oneline(@git_path, 'COMMIT_MSG');
1842 open my $log_fh, '>', $commit_editmsg or croak $!;
1844 my $type = command_oneline(qw/cat-file -t/, $treeish);
1845 if ($type eq 'commit' || $type eq 'tag') {
1846 my ($msg_fh, $ctx) = command_output_pipe('cat-file',
1847 $type, $treeish);
1848 my $in_msg = 0;
1849 my $author;
1850 my $saw_from = 0;
1851 my $msgbuf = "";
1852 while (<$msg_fh>) {
1853 if (!$in_msg) {
1854 $in_msg = 1 if (/^$/);
1855 $author = $1 if (/^author (.*>)/);
1856 } elsif (/^git-svn-id: /) {
1857 # skip this for now, we regenerate the
1858 # correct one on re-fetch anyways
1859 # TODO: set *:merge properties or like...
1860 } else {
1861 if (/^From:/ || /^Signed-off-by:/) {
1862 $saw_from = 1;
1864 $msgbuf .= $_;
1867 $msgbuf =~ s/\s+$//s;
1868 if ($Git::SVN::_add_author_from && defined($author)
1869 && !$saw_from) {
1870 $msgbuf .= "\n\nFrom: $author";
1872 print $log_fh $msgbuf or croak $!;
1873 command_close_pipe($msg_fh, $ctx);
1875 close $log_fh or croak $!;
1877 if ($_edit || ($type eq 'tree')) {
1878 chomp(my $editor = command_oneline(qw(var GIT_EDITOR)));
1879 system('sh', '-c', $editor.' "$@"', $editor, $commit_editmsg);
1881 rename $commit_editmsg, $commit_msg or croak $!;
1883 require Encode;
1884 # SVN requires messages to be UTF-8 when entering the repo
1885 open $log_fh, '<', $commit_msg or croak $!;
1886 binmode $log_fh;
1887 chomp($log_entry{log} = get_record($log_fh, undef));
1889 my $enc = Git::config('i18n.commitencoding') || 'UTF-8';
1890 my $msg = $log_entry{log};
1892 eval { $msg = Encode::decode($enc, $msg, 1) };
1893 if ($@) {
1894 die "Could not decode as $enc:\n", $msg,
1895 "\nPerhaps you need to set i18n.commitencoding\n";
1898 eval { $msg = Encode::encode('UTF-8', $msg, 1) };
1899 die "Could not encode as UTF-8:\n$msg\n" if $@;
1901 $log_entry{log} = $msg;
1903 close $log_fh or croak $!;
1905 unlink $commit_msg;
1906 \%log_entry;
1909 sub s_to_file {
1910 my ($str, $file, $mode) = @_;
1911 open my $fd,'>',$file or croak $!;
1912 print $fd $str,"\n" or croak $!;
1913 close $fd or croak $!;
1914 chmod ($mode &~ umask, $file) if (defined $mode);
1917 sub file_to_s {
1918 my $file = shift;
1919 open my $fd,'<',$file or croak "$!: file: $file\n";
1920 local $/;
1921 my $ret = <$fd>;
1922 close $fd or croak $!;
1923 $ret =~ s/\s*$//s;
1924 return $ret;
1927 # '<svn username> = real-name <email address>' mapping based on git-svnimport:
1928 sub load_authors {
1929 open my $authors, '<', $_authors or die "Can't open $_authors $!\n";
1930 my $log = $cmd eq 'log';
1931 while (<$authors>) {
1932 chomp;
1933 next unless /^(.+?|\(no author\))\s*=\s*(.+?)\s*<(.*)>\s*$/;
1934 my ($user, $name, $email) = ($1, $2, $3);
1935 if ($log) {
1936 $Git::SVN::Log::rusers{"$name <$email>"} = $user;
1937 } else {
1938 $users{$user} = [$name, $email];
1941 close $authors or croak $!;
1944 # convert GetOpt::Long specs for use by git-config
1945 sub read_git_config {
1946 my $opts = shift;
1947 my @config_only;
1948 foreach my $o (keys %$opts) {
1949 # if we have mixedCase and a long option-only, then
1950 # it's a config-only variable that we don't need for
1951 # the command-line.
1952 push @config_only, $o if ($o =~ /[A-Z]/ && $o =~ /^[a-z]+$/i);
1953 my $v = $opts->{$o};
1954 my ($key) = ($o =~ /^([a-zA-Z\-]+)/);
1955 $key =~ s/-//g;
1956 my $arg = 'git config';
1957 $arg .= ' --int' if ($o =~ /[:=]i$/);
1958 $arg .= ' --bool' if ($o !~ /[:=][sfi]$/);
1959 if (ref $v eq 'ARRAY') {
1960 chomp(my @tmp = `$arg --get-all svn.$key`);
1961 @$v = @tmp if @tmp;
1962 } else {
1963 chomp(my $tmp = `$arg --get svn.$key`);
1964 if ($tmp && !($arg =~ / --bool/ && $tmp eq 'false')) {
1965 $$v = $tmp;
1969 delete @$opts{@config_only} if @config_only;
1972 sub extract_metadata {
1973 my $id = shift or return (undef, undef, undef);
1974 my ($url, $rev, $uuid) = ($id =~ /^\s*git-svn-id:\s+(.*)\@(\d+)
1975 \s([a-f\d\-]+)$/ix);
1976 if (!defined $rev || !$uuid || !$url) {
1977 # some of the original repositories I made had
1978 # identifiers like this:
1979 ($rev, $uuid) = ($id =~/^\s*git-svn-id:\s(\d+)\@([a-f\d\-]+)/i);
1981 return ($url, $rev, $uuid);
1984 sub cmt_metadata {
1985 return extract_metadata((grep(/^git-svn-id: /,
1986 command(qw/cat-file commit/, shift)))[-1]);
1989 sub cmt_sha2rev_batch {
1990 my %s2r;
1991 my ($pid, $in, $out, $ctx) = command_bidi_pipe(qw/cat-file --batch/);
1992 my $list = shift;
1994 foreach my $sha (@{$list}) {
1995 my $first = 1;
1996 my $size = 0;
1997 print $out $sha, "\n";
1999 while (my $line = <$in>) {
2000 if ($first && $line =~ /^[[:xdigit:]]{40}\smissing$/) {
2001 last;
2002 } elsif ($first &&
2003 $line =~ /^[[:xdigit:]]{40}\scommit\s(\d+)$/) {
2004 $first = 0;
2005 $size = $1;
2006 next;
2007 } elsif ($line =~ /^(git-svn-id: )/) {
2008 my (undef, $rev, undef) =
2009 extract_metadata($line);
2010 $s2r{$sha} = $rev;
2013 $size -= length($line);
2014 last if ($size == 0);
2018 command_close_bidi_pipe($pid, $in, $out, $ctx);
2020 return \%s2r;
2023 sub working_head_info {
2024 my ($head, $refs) = @_;
2025 my @args = qw/rev-list --first-parent --pretty=medium/;
2026 my ($fh, $ctx) = command_output_pipe(@args, $head, "--");
2027 my $hash;
2028 my %max;
2029 while (<$fh>) {
2030 if ( m{^commit ($::sha1)$} ) {
2031 unshift @$refs, $hash if $hash and $refs;
2032 $hash = $1;
2033 next;
2035 next unless s{^\s*(git-svn-id:)}{$1};
2036 my ($url, $rev, $uuid) = extract_metadata($_);
2037 if (defined $url && defined $rev) {
2038 next if $max{$url} and $max{$url} < $rev;
2039 if (my $gs = Git::SVN->find_by_url($url)) {
2040 my $c = $gs->rev_map_get($rev, $uuid);
2041 if ($c && $c eq $hash) {
2042 close $fh; # break the pipe
2043 return ($url, $rev, $uuid, $gs);
2044 } else {
2045 $max{$url} ||= $gs->rev_map_max;
2050 command_close_pipe($fh, $ctx);
2051 (undef, undef, undef, undef);
2054 sub read_commit_parents {
2055 my ($parents, $c) = @_;
2056 chomp(my $p = command_oneline(qw/rev-list --parents -1/, $c));
2057 $p =~ s/^($c)\s*// or die "rev-list --parents -1 $c failed!\n";
2058 @{$parents->{$c}} = split(/ /, $p);
2061 sub linearize_history {
2062 my ($gs, $refs) = @_;
2063 my %parents;
2064 foreach my $c (@$refs) {
2065 read_commit_parents(\%parents, $c);
2068 my @linear_refs;
2069 my %skip = ();
2070 my $last_svn_commit = $gs->last_commit;
2071 foreach my $c (reverse @$refs) {
2072 next if $c eq $last_svn_commit;
2073 last if $skip{$c};
2075 unshift @linear_refs, $c;
2076 $skip{$c} = 1;
2078 # we only want the first parent to diff against for linear
2079 # history, we save the rest to inject when we finalize the
2080 # svn commit
2081 my $fp_a = verify_ref("$c~1");
2082 my $fp_b = shift @{$parents{$c}} if $parents{$c};
2083 if (!$fp_a || !$fp_b) {
2084 die "Commit $c\n",
2085 "has no parent commit, and therefore ",
2086 "nothing to diff against.\n",
2087 "You should be working from a repository ",
2088 "originally created by git-svn\n";
2090 if ($fp_a ne $fp_b) {
2091 die "$c~1 = $fp_a, however parsing commit $c ",
2092 "revealed that:\n$c~1 = $fp_b\nBUG!\n";
2095 foreach my $p (@{$parents{$c}}) {
2096 $skip{$p} = 1;
2099 (\@linear_refs, \%parents);
2102 sub find_file_type_and_diff_status {
2103 my ($path) = @_;
2104 return ('dir', '') if $path eq '';
2106 my $diff_output =
2107 command_oneline(qw(diff --cached --name-status --), $path) || "";
2108 my $diff_status = (split(' ', $diff_output))[0] || "";
2110 my $ls_tree = command_oneline(qw(ls-tree HEAD), $path) || "";
2112 return (undef, undef) if !$diff_status && !$ls_tree;
2114 if ($diff_status eq "A") {
2115 return ("link", $diff_status) if -l $path;
2116 return ("dir", $diff_status) if -d $path;
2117 return ("file", $diff_status);
2120 my $mode = (split(' ', $ls_tree))[0] || "";
2122 return ("link", $diff_status) if $mode eq "120000";
2123 return ("dir", $diff_status) if $mode eq "040000";
2124 return ("file", $diff_status);
2127 sub md5sum {
2128 my $arg = shift;
2129 my $ref = ref $arg;
2130 require Digest::MD5;
2131 my $md5 = Digest::MD5->new();
2132 if ($ref eq 'GLOB' || $ref eq 'IO::File' || $ref eq 'File::Temp') {
2133 $md5->addfile($arg) or croak $!;
2134 } elsif ($ref eq 'SCALAR') {
2135 $md5->add($$arg) or croak $!;
2136 } elsif (!$ref) {
2137 $md5->add($arg) or croak $!;
2138 } else {
2139 fatal "Can't provide MD5 hash for unknown ref type: '", $ref, "'";
2141 return $md5->hexdigest();
2144 sub gc_directory {
2145 if (can_compress() && -f $_ && basename($_) eq "unhandled.log") {
2146 my $out_filename = $_ . ".gz";
2147 open my $in_fh, "<", $_ or die "Unable to open $_: $!\n";
2148 binmode $in_fh;
2149 my $gz = Compress::Zlib::gzopen($out_filename, "ab") or
2150 die "Unable to open $out_filename: $!\n";
2152 my $res;
2153 while ($res = sysread($in_fh, my $str, 1024)) {
2154 $gz->gzwrite($str) or
2155 die "Unable to write: ".$gz->gzerror()."!\n";
2157 no warnings 'once'; # $File::Find::name would warn
2158 unlink $_ or die "unlink $File::Find::name: $!\n";
2159 } elsif (-f $_ && basename($_) eq "index") {
2160 unlink $_ or die "unlink $_: $!\n";
2164 __END__
2166 Data structures:
2169 $remotes = { # returned by read_all_remotes()
2170 'svn' => {
2171 # svn-remote.svn.url=https://svn.musicpd.org
2172 url => 'https://svn.musicpd.org',
2173 # svn-remote.svn.fetch=mpd/trunk:trunk
2174 fetch => {
2175 'mpd/trunk' => 'trunk',
2177 # svn-remote.svn.tags=mpd/tags/*:tags/*
2178 tags => {
2179 path => {
2180 left => 'mpd/tags',
2181 right => '',
2182 regex => qr!mpd/tags/([^/]+)$!,
2183 glob => 'tags/*',
2185 ref => {
2186 left => 'tags',
2187 right => '',
2188 regex => qr!tags/([^/]+)$!,
2189 glob => 'tags/*',
2195 $log_entry hashref as returned by libsvn_log_entry()
2197 log => 'whitespace-formatted log entry
2198 ', # trailing newline is preserved
2199 revision => '8', # integer
2200 date => '2004-02-24T17:01:44.108345Z', # commit date
2201 author => 'committer name'
2205 # this is generated by generate_diff();
2206 @mods = array of diff-index line hashes, each element represents one line
2207 of diff-index output
2209 diff-index line ($m hash)
2211 mode_a => first column of diff-index output, no leading ':',
2212 mode_b => second column of diff-index output,
2213 sha1_b => sha1sum of the final blob,
2214 chg => change type [MCRADT],
2215 file_a => original file name of a file (iff chg is 'C' or 'R')
2216 file_b => new/current file name of a file (any chg)
2220 # retval of read_url_paths{,_all}();
2221 $l_map = {
2222 # repository root url
2223 'https://svn.musicpd.org' => {
2224 # repository path # GIT_SVN_ID
2225 'mpd/trunk' => 'trunk',
2226 'mpd/tags/0.11.5' => 'tags/0.11.5',
2230 Notes:
2231 I don't trust the each() function on unless I created %hash myself
2232 because the internal iterator may not have started at base.