?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
git-svn: reinstate --no-metadata, add --svn-remote=, variable cleanups
[git/dscho.git] / git-svn.perl
blobcc5736d793c1c286c763b50d5c15423816126f43
1 #!/usr/bin/env perl
2 # Copyright (C) 2006, Eric Wong <normalperson@yhbt.net>
3 # License: GPL v2 or later
4 use warnings;
5 use strict;
6 use vars qw/ $AUTHOR $VERSION
7 $sha1 $sha1_short $_revision
8 $_q $_authors %users/;
9 $AUTHOR = 'Eric Wong <normalperson@yhbt.net>';
10 $VERSION = '@@GIT_VERSION@@';
11
12 $ENV{GIT_DIR} ||= '.git';
13 $Git::SVN::default_repo_id = 'git-svn';
14 $Git::SVN::default_ref_id = $ENV{GIT_SVN_ID} || 'git-svn';
15
16 $Git::SVN::Log::TZ = $ENV{TZ};
17 $ENV{TZ} = 'UTC';
18 $| = 1; # unbuffer STDOUT
19
20 sub fatal (@) { print STDERR @_; exit 1 }
21 require SVN::Core; # use()-ing this causes segfaults for me... *shrug*
22 require SVN::Ra;
23 require SVN::Delta;
24 if ($SVN::Core::VERSION lt '1.1.0') {
25 fatal "Need SVN::Core 1.1.0 or better (got $SVN::Core::VERSION)\n";
26 }
27 push @Git::SVN::Ra::ISA, 'SVN::Ra';
28 push @SVN::Git::Editor::ISA, 'SVN::Delta::Editor';
29 push @SVN::Git::Fetcher::ISA, 'SVN::Delta::Editor';
30 use Carp qw/croak/;
31 use IO::File qw//;
32 use File::Basename qw/dirname basename/;
33 use File::Path qw/mkpath/;
34 use Getopt::Long qw/:config gnu_getopt no_ignore_case auto_abbrev pass_through/;
35 use IPC::Open3;
36 use Git;
37
38 BEGIN {
39 my $s;
40 foreach (qw/command command_oneline command_noisy command_output_pipe
41 command_input_pipe command_close_pipe/) {
42 $s .= "*SVN::Git::Editor::$_ = *SVN::Git::Fetcher::$_ = ".
43 "*Git::SVN::Migration::$_ = ".
44 "*Git::SVN::Log::$_ = *Git::SVN::$_ = *$_ = *Git::$_; ";
45 }
46 eval $s;
47 }
48
49 my ($SVN);
50
51 my $_optimize_commits = 1 unless $ENV{GIT_SVN_NO_OPTIMIZE_COMMITS};
52 $sha1 = qr/[a-f\d]{40}/;
53 $sha1_short = qr/[a-f\d]{4,40}/;
54 my ($_stdin, $_help, $_edit,
55 $_repack, $_repack_nr, $_repack_flags,
56 $_message, $_file,
57 $_template, $_shared,
58 $_version,
59 $_merge, $_strategy, $_dry_run,
60 $_prefix);
61
62 my %remote_opts = ( 'username=s' => \$Git::SVN::Prompt::_username,
63 'config-dir=s' => \$Git::SVN::Ra::config_dir,
64 'no-auth-cache' => \$Git::SVN::Prompt::_no_auth_cache );
65 my %fc_opts = ( 'follow-parent|follow' => \$Git::SVN::_follow_parent,
66 'authors-file|A=s' => \$_authors,
67 'repack:i' => \$_repack,
68 'no-metadata' => \$Git::SVN::_no_metadata,
69 'quiet|q' => \$_q,
70 'repack-flags|repack-args|repack-opts=s' => \$_repack_flags,
71 %remote_opts );
72
73 my ($_trunk, $_tags, $_branches);
74 my %multi_opts = ( 'trunk|T=s' => \$_trunk,
75 'tags|t=s' => \$_tags,
76 'branches|b=s' => \$_branches );
77 my %init_opts = ( 'template=s' => \$_template, 'shared' => \$_shared );
78 my %cmt_opts = ( 'edit|e' => \$_edit,
79 'rmdir' => \$SVN::Git::Editor::_rmdir,
80 'find-copies-harder' => \$SVN::Git::Editor::_find_copies_harder,
81 'l=i' => \$SVN::Git::Editor::_rename_limit,
82 'copy-similarity|C=i'=> \$SVN::Git::Editor::_cp_similarity
83 );
84
85 my %cmd = (
86 fetch => [ \&cmd_fetch, "Download new revisions from SVN",
87 { 'revision|r=s' => \$_revision, %fc_opts } ],
88 init => [ \&cmd_init, "Initialize a repo for tracking" .
89 " (requires URL argument)",
90 \%init_opts ],
91 dcommit => [ \&cmd_dcommit,
92 'Commit several diffs to merge with upstream',
93 { 'merge|m|M' => \$_merge,
94 'strategy|s=s' => \$_strategy,
95 'dry-run|n' => \$_dry_run,
96 %cmt_opts, %fc_opts } ],
97 'set-tree' => [ \&cmd_set_tree,
98 "Set an SVN repository to a git tree-ish",
99 { 'stdin|' => \$_stdin, %cmt_opts, %fc_opts, } ],
100 'show-ignore' => [ \&cmd_show_ignore, "Show svn:ignore listings",
101 { 'revision|r=i' => \$_revision } ],
102 'multi-init' => [ \&cmd_multi_init,
103 'Initialize multiple trees (like git-svnimport)',
104 { %multi_opts, %init_opts, %remote_opts,
105 'revision|r=i' => \$_revision,
106 'prefix=s' => \$_prefix,
107 } ],
108 'multi-fetch' => [ \&cmd_multi_fetch,
109 'Fetch multiple trees (like git-svnimport)',
110 \%fc_opts ],
111 'migrate' => [ sub { },
112 # no-op, we automatically run this anyways,
113 'Migrate configuration/metadata/layout from
114 previous versions of git-svn',
115 \%remote_opts ],
116 'log' => [ \&Git::SVN::Log::cmd_show_log, 'Show commit logs',
117 { 'limit=i' => \$Git::SVN::Log::limit,
118 'revision|r=s' => \$_revision,
119 'verbose|v' => \$Git::SVN::Log::verbose,
120 'incremental' => \$Git::SVN::Log::incremental,
121 'oneline' => \$Git::SVN::Log::oneline,
122 'show-commit' => \$Git::SVN::Log::show_commit,
123 'non-recursive' => \$Git::SVN::Log::non_recursive,
124 'authors-file|A=s' => \$_authors,
125 'color' => \$Git::SVN::Log::color,
126 'pager=s' => \$Git::SVN::Log::pager,
127 } ],
128 'commit-diff' => [ \&cmd_commit_diff,
129 'Commit a diff between two trees',
130 { 'message|m=s' => \$_message,
131 'file|F=s' => \$_file,
132 'revision|r=s' => \$_revision,
133 %cmt_opts } ],
134 );
135
136 my $cmd;
137 for (my $i = 0; $i < @ARGV; $i++) {
138 if (defined $cmd{$ARGV[$i]}) {
139 $cmd = $ARGV[$i];
140 splice @ARGV, $i, 1;
141 last;
142 }
143 };
144
145 my %opts = %{$cmd{$cmd}->[2]} if (defined $cmd);
146
147 read_repo_config(\%opts);
148 my $rv = GetOptions(%opts, 'help|H|h' => \$_help, 'version|V' => \$_version,
149 'minimize-connections' => \$Git::SVN::Migration::_minimize,
150 'id|i=s' => \$Git::SVN::default_ref_id,
151 'svn-remote|remote|R=s' => \$Git::SVN::default_repo_id);
152 exit 1 if (!$rv && $cmd ne 'log');
153
154 usage(0) if $_help;
155 version() if $_version;
156 usage(1) unless defined $cmd;
157 load_authors() if $_authors;
158 unless ($cmd =~ /^(?:init|multi-init|commit-diff)$/) {
159 Git::SVN::Migration::migration_check();
160 }
161 eval {
162 Git::SVN::verify_remotes_sanity();
163 $cmd{$cmd}->[0]->(@ARGV);
164 };
165 fatal $@ if $@;
166 exit 0;
167
168 ####################### primary functions ######################
169 sub usage {
170 my $exit = shift || 0;
171 my $fd = $exit ? \*STDERR : \*STDOUT;
172 print $fd <<"";
173 git-svn - bidirectional operations between a single Subversion tree and git
174 Usage: $0 <command> [options] [arguments]\n
175
176 print $fd "Available commands:\n" unless $cmd;
177
178 foreach (sort keys %cmd) {
179 next if $cmd && $cmd ne $_;
180 print $fd ' ',pack('A17',$_),$cmd{$_}->[1],"\n";
181 foreach (keys %{$cmd{$_}->[2]}) {
182 # prints out arguments as they should be passed:
183 my $x = s#[:=]s$## ? '<arg>' : s#[:=]i$## ? '<num>' : '';
184 print $fd ' ' x 21, join(', ', map { length $_ > 1 ?
185 "--$_" : "-$_" }
186 split /\|/,$_)," $x\n";
187 }
188 }
189 print $fd <<"";
190 \nGIT_SVN_ID may be set in the environment or via the --id/-i switch to an
191 arbitrary identifier if you're tracking multiple SVN branches/repositories in
192 one git repository and want to keep them separate. See git-svn(1) for more
193 information.
194
195 exit $exit;
196 }
197
198 sub version {
199 print "git-svn version $VERSION (svn $SVN::Core::VERSION)\n";
200 exit 0;
201 }
202
203 sub do_git_init_db {
204 unless (-d $ENV{GIT_DIR}) {
205 my @init_db = ('init');
206 push @init_db, "--template=$_template" if defined $_template;
207 push @init_db, "--shared" if defined $_shared;
208 command_noisy(@init_db);
209 }
210 }
211
212 sub cmd_init {
213 my $url = shift or die "SVN repository location required " .
214 "as a command-line argument\n";
215 if (my $repo_path = shift) {
216 unless (-d $repo_path) {
217 mkpath([$repo_path]);
218 }
219 chdir $repo_path or croak $!;
220 $ENV{GIT_DIR} = $repo_path . "/.git";
221 }
222 do_git_init_db();
223
224 Git::SVN->init($url);
225 }
226
227 sub cmd_fetch {
228 if (@_) {
229 die "Additional fetch arguments are no longer supported.\n",
230 "Use --follow-parent if you have moved/copied directories
231 instead.\n";
232 }
233 my $gs = Git::SVN->new;
234 $gs->fetch(parse_revision_argument());
235 if ($gs->{last_commit} && !verify_ref('refs/heads/master^0')) {
236 command_noisy(qw(update-ref refs/heads/master),
237 $gs->{last_commit});
238 }
239 }
240
241 sub cmd_set_tree {
242 my (@commits) = @_;
243 if ($_stdin || !@commits) {
244 print "Reading from stdin...\n";
245 @commits = ();
246 while (<STDIN>) {
247 if (/\b($sha1_short)\b/o) {
248 unshift @commits, $1;
249 }
250 }
251 }
252 my @revs;
253 foreach my $c (@commits) {
254 my @tmp = command('rev-parse',$c);
255 if (scalar @tmp == 1) {
256 push @revs, $tmp[0];
257 } elsif (scalar @tmp > 1) {
258 push @revs, reverse(command('rev-list',@tmp));
259 } else {
260 fatal "Failed to rev-parse $c\n";
261 }
262 }
263 my $gs = Git::SVN->new;
264 my ($r_last, $cmt_last) = $gs->last_rev_commit;
265 $gs->fetch;
266 if (defined $gs->{last_rev} && $r_last != $gs->{last_rev}) {
267 fatal "There are new revisions that were fetched ",
268 "and need to be merged (or acknowledged) ",
269 "before committing.\nlast rev: $r_last\n",
270 " current: $gs->{last_rev}\n";
271 }
272 $gs->set_tree($_) foreach @revs;
273 print "Done committing ",scalar @revs," revisions to SVN\n";
274 }
275
276 sub cmd_dcommit {
277 my $head = shift;
278 my $gs = Git::SVN->new;
279 $head ||= 'HEAD';
280 my @refs = command(qw/rev-list --no-merges/, $gs->refname."..$head");
281 my $last_rev;
282 foreach my $d (reverse @refs) {
283 if (!verify_ref("$d~1")) {
284 fatal "Commit $d\n",
285 "has no parent commit, and therefore ",
286 "nothing to diff against.\n",
287 "You should be working from a repository ",
288 "originally created by git-svn\n";
289 }
290 unless (defined $last_rev) {
291 (undef, $last_rev, undef) = cmt_metadata("$d~1");
292 unless (defined $last_rev) {
293 fatal "Unable to extract revision information ",
294 "from commit $d~1\n";
295 }
296 }
297 if ($_dry_run) {
298 print "diff-tree $d~1 $d\n";
299 } else {
300 my %ed_opts = ( r => $last_rev,
301 log => get_commit_entry($d)->{log},
302 ra => $gs->ra,
303 tree_a => "$d~1",
304 tree_b => $d,
305 editor_cb => sub {
306 print "Committed r$_[0]\n";
307 $last_rev = $_[0]; },
308 svn_path => $gs->{path} );
309 if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) {
310 print "No changes\n$d~1 == $d\n";
311 }
312 }
313 }
314 return if $_dry_run;
315 $gs->fetch;
316 # we always want to rebase against the current HEAD, not any
317 # head that was passed to us
318 my @diff = command('diff-tree', 'HEAD', $gs->refname, '--');
319 my @finish;
320 if (@diff) {
321 @finish = qw/rebase/;
322 push @finish, qw/--merge/ if $_merge;
323 push @finish, "--strategy=$_strategy" if $_strategy;
324 print STDERR "W: HEAD and ", $gs->refname, " differ, ",
325 "using @finish:\n", "@diff";
326 } else {
327 print "No changes between current HEAD and ",
328 $gs->refname, "\nResetting to the latest ",
329 $gs->refname, "\n";
330 @finish = qw/reset --mixed/;
331 }
332 command_noisy(@finish, $gs->refname);
333 }
334
335 sub cmd_show_ignore {
336 my $gs = Git::SVN->new;
337 my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
338 $gs->traverse_ignore(\*STDOUT, '', $r);
339 }
340
341 sub cmd_multi_init {
342 my $url = shift;
343 unless (defined $_trunk || defined $_branches || defined $_tags) {
344 usage(1);
345 }
346 do_git_init_db();
347 $_prefix = '' unless defined $_prefix;
348 $url =~ s#/+$## if defined $url;
349 if (defined $_trunk) {
350 my $trunk_ref = $_prefix . 'trunk';
351 # try both old-style and new-style lookups:
352 my $gs_trunk = eval { Git::SVN->new($trunk_ref) };
353 unless ($gs_trunk) {
354 my ($trunk_url, $trunk_path) =
355 complete_svn_url($url, $_trunk);
356 $gs_trunk = Git::SVN->init($trunk_url, $trunk_path,
357 undef, $trunk_ref);
358 }
359 }
360 return unless defined $_branches || defined $_tags;
361 my $ra = $url ? Git::SVN::Ra->new($url) : undef;
362 complete_url_ls_init($ra, $_branches, '--branches/-b', $_prefix);
363 complete_url_ls_init($ra, $_tags, '--tags/-t', $_prefix . 'tags/');
364 }
365
366 sub cmd_multi_fetch {
367 my $remotes = Git::SVN::read_all_remotes();
368 foreach my $repo_id (sort keys %$remotes) {
369 my $url = $remotes->{$repo_id}->{url} or next;
370 my $fetch = $remotes->{$repo_id}->{fetch} or next;
371 Git::SVN::fetch_all($repo_id, $url, $fetch);
372 }
373 }
374
375 # this command is special because it requires no metadata
376 sub cmd_commit_diff {
377 my ($ta, $tb, $url) = @_;
378 my $usage = "Usage: $0 commit-diff -r<revision> ".
379 "<tree-ish> <tree-ish> [<URL>]\n";
380 fatal($usage) if (!defined $ta || !defined $tb);
381 my $svn_path;
382 if (!defined $url) {
383 my $gs = eval { Git::SVN->new };
384 if (!$gs) {
385 fatal("Needed URL or usable git-svn --id in ",
386 "the command-line\n", $usage);
387 }
388 $url = $gs->{url};
389 $svn_path = $gs->{path};
390 }
391 unless (defined $_revision) {
392 fatal("-r|--revision is a required argument\n", $usage);
393 }
394 if (defined $_message && defined $_file) {
395 fatal("Both --message/-m and --file/-F specified ",
396 "for the commit message.\n",
397 "I have no idea what you mean\n");
398 }
399 if (defined $_file) {
400 $_message = file_to_s($_file);
401 } else {
402 $_message ||= get_commit_entry($tb)->{log};
403 }
404 my $ra ||= Git::SVN::Ra->new($url);
405 $svn_path ||= $ra->{svn_path};
406 my $r = $_revision;
407 if ($r eq 'HEAD') {
408 $r = $ra->get_latest_revnum;
409 } elsif ($r !~ /^\d+$/) {
410 die "revision argument: $r not understood by git-svn\n";
411 }
412 my %ed_opts = ( r => $r,
413 log => $_message,
414 ra => $ra,
415 tree_a => $ta,
416 tree_b => $tb,
417 editor_cb => sub { print "Committed r$_[0]\n" },
418 svn_path => $svn_path );
419 if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) {
420 print "No changes\n$ta == $tb\n";
421 }
422 }
423
424 ########################### utility functions #########################
425
426 sub parse_revision_argument {
427 if (!defined $_revision || $_revision eq 'BASE:HEAD') {
428 return (undef, undef);
429 }
430 return ($1, $2) if ($_revision =~ /^(\d+):(\d+)$/);
431 return ($_revision, $_revision) if ($_revision =~ /^\d+$/);
432 return (undef, $1) if ($_revision =~ /^BASE:(\d+)$/);
433 return ($1, undef) if ($_revision =~ /^(\d+):HEAD$/);
434 die "revision argument: $_revision not understood by git-svn\n",
435 "Try using the command-line svn client instead\n";
436 }
437
438 sub complete_svn_url {
439 my ($url, $path) = @_;
440 $path =~ s#/+$##;
441 if ($path !~ m#^[a-z\+]+://#) {
442 if (!defined $url || $url !~ m#^[a-z\+]+://#) {
443 fatal("E: '$path' is not a complete URL ",
444 "and a separate URL is not specified\n");
445 }
446 return ($url, $path);
447 }
448 return ($path, '');
449 }
450
451 sub complete_url_ls_init {
452 my ($ra, $repo_path, $switch, $pfx) = @_;
453 unless ($repo_path) {
454 print STDERR "W: $switch not specified\n";
455 return;
456 }
457 $repo_path =~ s#/+$##;
458 if ($repo_path =~ m#^[a-z\+]+://#) {
459 $ra = Git::SVN::Ra->new($repo_path);
460 $repo_path = '';
461 } else {
462 $repo_path =~ s#^/+##;
463 unless ($ra) {
464 fatal("E: '$repo_path' is not a complete URL ",
465 "and a separate URL is not specified\n");
466 }
467 }
468 my $r = defined $_revision ? $_revision : $ra->get_latest_revnum;
469 my ($dirent, undef, undef) = $ra->get_dir($repo_path, $r);
470 my $url = $ra->{url};
471 foreach my $d (sort keys %$dirent) {
472 next if ($dirent->{$d}->kind != $SVN::Node::dir);
473 my $path = "$repo_path/$d";
474 my $ref = "$pfx$d";
475 my $gs = eval { Git::SVN->new($ref) };
476 # don't try to init already existing refs
477 unless ($gs) {
478 print "init $url/$path => $ref\n";
479 Git::SVN->init($url, $path, undef, $ref);
480 }
481 }
482 }
483
484 sub verify_ref {
485 my ($ref) = @_;
486 eval { command_oneline([ 'rev-parse', '--verify', $ref ],
487 { STDERR => 0 }); };
488 }
489
490 sub get_tree_from_treeish {
491 my ($treeish) = @_;
492 # $treeish can be a symbolic ref, too:
493 my $type = command_oneline(qw/cat-file -t/, $treeish);
494 my $expected;
495 while ($type eq 'tag') {
496 ($treeish, $type) = command(qw/cat-file tag/, $treeish);
497 }
498 if ($type eq 'commit') {
499 $expected = (grep /^tree /, command(qw/cat-file commit/,
500 $treeish))[0];
501 ($expected) = ($expected =~ /^tree ($sha1)$/o);
502 die "Unable to get tree from $treeish\n" unless $expected;
503 } elsif ($type eq 'tree') {
504 $expected = $treeish;
505 } else {
506 die "$treeish is a $type, expected tree, tag or commit\n";
507 }
508 return $expected;
509 }
510
511 sub get_commit_entry {
512 my ($treeish) = shift;
513 my %log_entry = ( log => '', tree => get_tree_from_treeish($treeish) );
514 my $commit_editmsg = "$ENV{GIT_DIR}/COMMIT_EDITMSG";
515 my $commit_msg = "$ENV{GIT_DIR}/COMMIT_MSG";
516 open my $log_fh, '>', $commit_editmsg or croak $!;
517
518 my $type = command_oneline(qw/cat-file -t/, $treeish);
519 if ($type eq 'commit' || $type eq 'tag') {
520 my ($msg_fh, $ctx) = command_output_pipe('cat-file',
521 $type, $treeish);
522 my $in_msg = 0;
523 while (<$msg_fh>) {
524 if (!$in_msg) {
525 $in_msg = 1 if (/^\s*$/);
526 } elsif (/^git-svn-id: /) {
527 # skip this for now, we regenerate the
528 # correct one on re-fetch anyways
529 # TODO: set *:merge properties or like...
530 } else {
531 print $log_fh $_ or croak $!;
532 }
533 }
534 command_close_pipe($msg_fh, $ctx);
535 }
536 close $log_fh or croak $!;
537
538 if ($_edit || ($type eq 'tree')) {
539 my $editor = $ENV{VISUAL} || $ENV{EDITOR} || 'vi';
540 # TODO: strip out spaces, comments, like git-commit.sh
541 system($editor, $commit_editmsg);
542 }
543 rename $commit_editmsg, $commit_msg or croak $!;
544 open $log_fh, '<', $commit_msg or croak $!;
545 { local $/; chomp($log_entry{log} = <$log_fh>); }
546 close $log_fh or croak $!;
547 unlink $commit_msg;
548 \%log_entry;
549 }
550
551 sub s_to_file {
552 my ($str, $file, $mode) = @_;
553 open my $fd,'>',$file or croak $!;
554 print $fd $str,"\n" or croak $!;
555 close $fd or croak $!;
556 chmod ($mode &~ umask, $file) if (defined $mode);
557 }
558
559 sub file_to_s {
560 my $file = shift;
561 open my $fd,'<',$file or croak "$!: file: $file\n";
562 local $/;
563 my $ret = <$fd>;
564 close $fd or croak $!;
565 $ret =~ s/\s*$//s;
566 return $ret;
567 }
568
569 # '<svn username> = real-name <email address>' mapping based on git-svnimport:
570 sub load_authors {
571 open my $authors, '<', $_authors or die "Can't open $_authors $!\n";
572 my $log = $cmd eq 'log';
573 while (<$authors>) {
574 chomp;
575 next unless /^(\S+?|\(no author\))\s*=\s*(.+?)\s*<(.+)>\s*$/;
576 my ($user, $name, $email) = ($1, $2, $3);
577 if ($log) {
578 $Git::SVN::Log::rusers{"$name <$email>"} = $user;
579 } else {
580 $users{$user} = [$name, $email];
581 }
582 }
583 close $authors or croak $!;
584 }
585
586 # convert GetOpt::Long specs for use by git-config
587 sub read_repo_config {
588 return unless -d $ENV{GIT_DIR};
589 my $opts = shift;
590 foreach my $o (keys %$opts) {
591 my $v = $opts->{$o};
592 my ($key) = ($o =~ /^([a-z\-]+)/);
593 $key =~ s/-//g;
594 my $arg = 'git-config';
595 $arg .= ' --int' if ($o =~ /[:=]i$/);
596 $arg .= ' --bool' if ($o !~ /[:=][sfi]$/);
597 if (ref $v eq 'ARRAY') {
598 chomp(my @tmp = `$arg --get-all svn.$key`);
599 @$v = @tmp if @tmp;
600 } else {
601 chomp(my $tmp = `$arg --get svn.$key`);
602 if ($tmp && !($arg =~ / --bool/ && $tmp eq 'false')) {
603 $$v = $tmp;
604 }
605 }
606 }
607 }
608
609 sub extract_metadata {
610 my $id = shift or return (undef, undef, undef);
611 my ($url, $rev, $uuid) = ($id =~ /^git-svn-id:\s(\S+?)\@(\d+)
612 \s([a-f\d\-]+)$/x);
613 if (!defined $rev || !$uuid || !$url) {
614 # some of the original repositories I made had
615 # identifiers like this:
616 ($rev, $uuid) = ($id =~/^git-svn-id:\s(\d+)\@([a-f\d\-]+)/);
617 }
618 return ($url, $rev, $uuid);
619 }
620
621 sub cmt_metadata {
622 return extract_metadata((grep(/^git-svn-id: /,
623 command(qw/cat-file commit/, shift)))[-1]);
624 }
625
626 package Git::SVN;
627 use strict;
628 use warnings;
629 use vars qw/$default_repo_id $default_ref_id $_no_metadata $_follow_parent/;
630 use Carp qw/croak/;
631 use File::Path qw/mkpath/;
632 use IPC::Open3;
633
634 # properties that we do not log:
635 my %SKIP_PROP;
636 BEGIN {
637 %SKIP_PROP = map { $_ => 1 } qw/svn:wc:ra_dav:version-url
638 svn:special svn:executable
639 svn:entry:committed-rev
640 svn:entry:last-author
641 svn:entry:uuid
642 svn:entry:committed-date/;
643 }
644
645 sub fetch_all {
646 my ($repo_id, $url, $fetch) = @_;
647 my @gs;
648 my $ra = Git::SVN::Ra->new($url);
649 my $head = $ra->get_latest_revnum;
650 my $base = $head;
651 my $new_remote;
652 foreach my $p (sort keys %$fetch) {
653 my $gs = Git::SVN->new($fetch->{$p}, $repo_id, $p);
654 my $lr = $gs->last_rev;
655 if (defined $lr) {
656 $base = $lr if ($lr < $base);
657 } else {
658 $new_remote = 1;
659 }
660 push @gs, $gs;
661 }
662 $base = 0 if $new_remote;
663 return if (++$base > $head);
664 $ra->gs_fetch_loop_common($base, $head, @gs);
665 }
666
667 sub read_all_remotes {
668 my $r = {};
669 foreach (grep { s/^svn-remote\.// } command(qw/config -l/)) {
670 if (m!^(.+)\.fetch=\s*(.*)\s*:\s*refs/remotes/(.+)\s*$!) {
671 $r->{$1}->{fetch}->{$2} = $3;
672 } elsif (m!^(.+)\.url=\s*(.*)\s*$!) {
673 $r->{$1}->{url} = $2;
674 }
675 }
676 $r;
677 }
678
679 sub verify_remotes_sanity {
680 return unless -d $ENV{GIT_DIR};
681 my %seen;
682 foreach (command(qw/config -l/)) {
683 if (m!^svn-remote\.(?:.+)\.fetch=.*:refs/remotes/(\S+)\s*$!) {
684 if ($seen{$1}) {
685 die "Remote ref refs/remote/$1 is tracked by",
686 "\n \"$_\"\nand\n \"$seen{$1}\"\n",
687 "Please resolve this ambiguity in ",
688 "your git configuration file before ",
689 "continuing\n";
690 }
691 $seen{$1} = $_;
692 }
693 }
694 }
695
696 # we allow more chars than remotes2config.sh...
697 sub sanitize_remote_name {
698 my ($name) = @_;
699 $name =~ tr{A-Za-z0-9:,/+-}{.}c;
700 $name;
701 }
702
703 sub find_existing_remote {
704 my ($url, $remotes) = @_;
705 my $existing;
706 foreach my $repo_id (keys %$remotes) {
707 my $u = $remotes->{$repo_id}->{url} or next;
708 next if $u ne $url;
709 $existing = $repo_id;
710 last;
711 }
712 $existing;
713 }
714
715 sub init_remote_config {
716 my ($self, $url) = @_;
717 $url =~ s!/+$!!; # strip trailing slash
718 my $r = read_all_remotes();
719 my $existing = find_existing_remote($url, $r);
720 if ($existing) {
721 print STDERR "Using existing ",
722 "[svn-remote \"$existing\"]\n";
723 $self->{repo_id} = $existing;
724 } else {
725 my $min_url = Git::SVN::Ra->new($url)->minimize_url;
726 $existing = find_existing_remote($min_url, $r);
727 if ($existing) {
728 print STDERR "Using existing ",
729 "[svn-remote \"$existing\"]\n";
730 $self->{repo_id} = $existing;
731 }
732 if ($min_url ne $url) {
733 print STDERR "Using higher level of URL: ",
734 "$url => $min_url\n";
735 my $old_path = $self->{path};
736 $self->{path} = $url;
737 $self->{path} =~ s!^\Q$min_url\E/*!!;
738 if (length $old_path) {
739 $self->{path} .= "/$old_path";
740 }
741 $url = $min_url;
742 }
743 }
744 my $orig_url;
745 if (!$existing) {
746 # verify that we aren't overwriting anything:
747 $orig_url = eval {
748 command_oneline('config', '--get',
749 "svn-remote.$self->{repo_id}.url")
750 };
751 if ($orig_url && ($orig_url ne $url)) {
752 die "svn-remote.$self->{repo_id}.url already set: ",
753 "$orig_url\nwanted to set to: $url\n";
754 }
755 }
756 my ($xrepo_id, $xpath) = find_ref($self->refname);
757 if (defined $xpath) {
758 die "svn-remote.$xrepo_id.fetch already set to track ",
759 "$xpath:refs/remotes/", $self->refname, "\n";
760 }
761 command_noisy('config',
762 "svn-remote.$self->{repo_id}.url", $url);
763 command_noisy('config', '--add',
764 "svn-remote.$self->{repo_id}.fetch",
765 "$self->{path}:".$self->refname);
766 $self->{url} = $url;
767 }
768
769 sub init {
770 my ($class, $url, $path, $repo_id, $ref_id) = @_;
771 my $self = _new($class, $repo_id, $ref_id, $path);
772 if (defined $url) {
773 $self->init_remote_config($url);
774 }
775 $self;
776 }
777
778 sub find_ref {
779 my ($ref_id) = @_;
780 foreach (command(qw/config -l/)) {
781 next unless m!^svn-remote\.(.+)\.fetch=
782 \s*(.*)\s*:\s*refs/remotes/(.+)\s*$!x;
783 my ($repo_id, $path, $ref) = ($1, $2, $3);
784 if ($ref eq $ref_id) {
785 $path = '' if ($path =~ m#^\./?#);
786 return ($repo_id, $path);
787 }
788 }
789 (undef, undef, undef);
790 }
791
792 sub new {
793 my ($class, $ref_id, $repo_id, $path) = @_;
794 if (defined $ref_id && !defined $repo_id && !defined $path) {
795 ($repo_id, $path) = find_ref($ref_id);
796 if (!defined $repo_id) {
797 die "Could not find a \"svn-remote.*.fetch\" key ",
798 "in the repository configuration matching: ",
799 "refs/remotes/$ref_id\n";
800 }
801 }
802 my $self = _new($class, $repo_id, $ref_id, $path);
803 if (!defined $self->{path} || !length $self->{path}) {
804 my $fetch = command_oneline('config', '--get',
805 "svn-remote.$repo_id.fetch",
806 ":refs/remotes/$ref_id\$") or
807 die "Failed to read \"svn-remote.$repo_id.fetch\" ",
808 "\":refs/remotes/$ref_id\$\" in config\n";
809 ($self->{path}, undef) = split(/\s*:\s*/, $fetch);
810 }
811 $self->{url} = command_oneline('config', '--get',
812 "svn-remote.$repo_id.url") or
813 die "Failed to read \"svn-remote.$repo_id.url\" in config\n";
814 if (-z $self->{db_path} && ::verify_ref($self->refname.'^0')) {
815 $self->rebuild;
816 }
817 $self;
818 }
819
820 sub refname { "refs/remotes/$_[0]->{ref_id}" }
821
822 sub ra {
823 my ($self) = shift;
824 Git::SVN::Ra->new($self->{url});
825 }
826
827 sub rel_path {
828 my ($self) = @_;
829 my $repos_root = $self->ra->{repos_root};
830 return $self->{path} if ($self->{url} eq $repos_root);
831 my $url = $self->{url} .
832 (length $self->{path} ? "/$self->{path}" : $self->{path});
833 $url =~ s!^\Q$repos_root\E/*!!g;
834 $url;
835 }
836
837 sub traverse_ignore {
838 my ($self, $fh, $path, $r) = @_;
839 $path =~ s#^/+##g;
840 my $ra = $self->ra;
841 my ($dirent, undef, $props) = $ra->get_dir($path, $r);
842 my $p = $path;
843 $p =~ s#^\Q$ra->{svn_path}\E/##;
844 print $fh length $p ? "\n# $p\n" : "\n# /\n";
845 if (my $s = $props->{'svn:ignore'}) {
846 $s =~ s/[\r\n]+/\n/g;
847 chomp $s;
848 if (length $p == 0) {
849 $s =~ s#\n#\n/$p#g;
850 print $fh "/$s\n";
851 } else {
852 $s =~ s#\n#\n/$p/#g;
853 print $fh "/$p/$s\n";
854 }
855 }
856 foreach (sort keys %$dirent) {
857 next if $dirent->{$_}->kind != $SVN::Node::dir;
858 $self->traverse_ignore($fh, "$path/$_", $r);
859 }
860 }
861
862 sub last_rev { ($_[0]->last_rev_commit)[0] }
863 sub last_commit { ($_[0]->last_rev_commit)[1] }
864
865 # returns the newest SVN revision number and newest commit SHA1
866 sub last_rev_commit {
867 my ($self) = @_;
868 if (defined $self->{last_rev} && defined $self->{last_commit}) {
869 return ($self->{last_rev}, $self->{last_commit});
870 }
871 my $c = ::verify_ref($self->refname.'^0');
872 if ($c) {
873 my $rev = (::cmt_metadata($c))[1];
874 if (defined $rev) {
875 ($self->{last_rev}, $self->{last_commit}) = ($rev, $c);
876 return ($rev, $c);
877 }
878 }
879 my $offset = -41; # from tail
880 my $rl;
881 open my $fh, '<', $self->{db_path} or
882 croak "$self->{db_path} not readable: $!\n";
883 seek $fh, $offset, 2;
884 $rl = readline $fh;
885 defined $rl or return (undef, undef);
886 chomp $rl;
887 while ($c ne $rl && tell $fh != 0) {
888 $offset -= 41;
889 seek $fh, $offset, 2;
890 $rl = readline $fh;
891 defined $rl or return (undef, undef);
892 chomp $rl;
893 }
894 my $rev = tell $fh;
895 croak $! if ($rev < 0);
896 $rev = ($rev - 41) / 41;
897 close $fh or croak $!;
898 ($self->{last_rev}, $self->{last_commit}) = ($rev, $c);
899 return ($rev, $c);
900 }
901
902 sub get_fetch_range {
903 my ($self, $min, $max) = @_;
904 $max ||= $self->ra->get_latest_revnum;
905 $min ||= $self->last_rev || 0;
906 (++$min, $max);
907 }
908
909 sub tmp_index_do {
910 my ($self, $sub) = @_;
911 my $old_index = $ENV{GIT_INDEX_FILE};
912 $ENV{GIT_INDEX_FILE} = $self->{index};
913 my @ret = &$sub;
914 if ($old_index) {
915 $ENV{GIT_INDEX_FILE} = $old_index;
916 } else {
917 delete $ENV{GIT_INDEX_FILE};
918 }
919 wantarray ? @ret : $ret[0];
920 }
921
922 sub assert_index_clean {
923 my ($self, $treeish) = @_;
924
925 $self->tmp_index_do(sub {
926 command_noisy('read-tree', $treeish) unless -e $self->{index};
927 my $x = command_oneline('write-tree');
928 my ($y) = (command(qw/cat-file commit/, $treeish) =~
929 /^tree ($::sha1)/mo);
930 if ($y ne $x) {
931 unlink $self->{index} or croak $!;
932 command_noisy('read-tree', $treeish);
933 }
934 $x = command_oneline('write-tree');
935 if ($y ne $x) {
936 ::fatal "trees ($treeish) $y != $x\n",
937 "Something is seriously wrong...\n";
938 }
939 });
940 }
941
942 sub get_commit_parents {
943 my ($self, $log_entry) = @_;
944 my (%seen, @ret, @tmp);
945 # legacy support for 'set-tree'; this is only used by set_tree_cb:
946 if (my $ip = $self->{inject_parents}) {
947 if (my $commit = delete $ip->{$log_entry->{revision}}) {
948 push @tmp, $commit;
949 }
950 }
951 if (my $cur = ::verify_ref($self->refname.'^0')) {
952 push @tmp, $cur;
953 }
954 push @tmp, $_ foreach (@{$log_entry->{parents}}, @tmp);
955 while (my $p = shift @tmp) {
956 next if $seen{$p};
957 $seen{$p} = 1;
958 push @ret, $p;
959 # MAXPARENT is defined to 16 in commit-tree.c:
960 last if @ret >= 16;
961 }
962 if (@tmp) {
963 die "r$log_entry->{revision}: No room for parents:\n\t",
964 join("\n\t", @tmp), "\n";
965 }
966 @ret;
967 }
968
969 sub full_url {
970 my ($self) = @_;
971 $self->{url} . (length $self->{path} ? '/' . $self->{path} : '');
972 }
973
974 sub do_git_commit {
975 my ($self, $log_entry) = @_;
976 my $lr = $self->last_rev;
977 if (defined $lr && $lr >= $log_entry->{revision}) {
978 die "Last fetched revision of ", $self->refname,
979 " was r$lr, but we are about to fetch: ",
980 "r$log_entry->{revision}!\n";
981 }
982 if (my $c = $self->rev_db_get($log_entry->{revision})) {
983 croak "$log_entry->{revision} = $c already exists! ",
984 "Why are we refetching it?\n";
985 }
986 my $author = $log_entry->{author};
987 my ($name, $email) = (defined $::users{$author} ? @{$::users{$author}}
988 : ($author, "$author\@".$self->ra->uuid));
989 $ENV{GIT_AUTHOR_NAME} = $ENV{GIT_COMMITTER_NAME} = $name;
990 $ENV{GIT_AUTHOR_EMAIL} = $ENV{GIT_COMMITTER_EMAIL} = $email;
991 $ENV{GIT_AUTHOR_DATE} = $ENV{GIT_COMMITTER_DATE} = $log_entry->{date};
992
993 my $tree = $log_entry->{tree};
994 if (!defined $tree) {
995 $tree = $self->tmp_index_do(sub {
996 command_oneline('write-tree') });
997 }
998 die "Tree is not a valid sha1: $tree\n" if $tree !~ /^$::sha1$/o;
999
1000 my @exec = ('git-commit-tree', $tree);
1001 foreach ($self->get_commit_parents($log_entry)) {
1002 push @exec, '-p', $_;
1003 }
1004 defined(my $pid = open3(my $msg_fh, my $out_fh, '>&STDERR', @exec))
1005 or croak $!;
1006 print $msg_fh $log_entry->{log} or croak $!;
1007 unless ($_no_metadata) {
1008 print $msg_fh "\ngit-svn-id: ", $self->full_url, '@',
1009 $log_entry->{revision}, ' ',
1010 $self->ra->uuid, "\n" or croak $!;
1011 }
1012 $msg_fh->flush == 0 or croak $!;
1013 close $msg_fh or croak $!;
1014 chomp(my $commit = do { local $/; <$out_fh> });
1015 close $out_fh or croak $!;
1016 waitpid $pid, 0;
1017 croak $? if $?;
1018 if ($commit !~ /^$::sha1$/o) {
1019 die "Failed to commit, invalid sha1: $commit\n";
1020 }
1021
1022 command_noisy('update-ref',$self->refname, $commit);
1023 $self->rev_db_set($log_entry->{revision}, $commit);
1024
1025 $self->{last_rev} = $log_entry->{revision};
1026 $self->{last_commit} = $commit;
1027 print "r$log_entry->{revision} = $commit ($self->{ref_id})\n";
1028 return $commit;
1029 }
1030
1031 sub revisions_eq {
1032 my ($self, $r0, $r1) = @_;
1033 return 1 if $r0 == $r1;
1034 my $nr = 0;
1035 $self->ra->get_log([$self->{path}], $r0, $r1,
1036 0, 0, 1, sub { $nr++ });
1037 return 0 if ($nr > 1);
1038 return 1;
1039 }
1040
1041 sub match_paths {
1042 my ($self, $paths) = @_;
1043 return 1 if $paths->{'/'};
1044 $self->{path_regex} ||= qr/^\/\Q$self->{path}\E\/?/;
1045 grep /$self->{path_regex}/, keys %$paths and return 1;
1046 my $c = '';
1047 foreach (split m#/#, $self->rel_path) {
1048 $c .= "/$_";
1049 return 1 if $paths->{$c};
1050 }
1051 return 0;
1052 }
1053
1054 sub find_parent_branch {
1055 my ($self, $paths, $rev) = @_;
1056 return undef unless $_follow_parent;
1057 unless (defined $paths) {
1058 $self->ra->get_log([$self->{path}], $rev, $rev, 0, 1, 1,
1059 sub { $paths = dup_changed_paths($_[0]) });
1060 }
1061 return undef unless defined $paths;
1062
1063 # look for a parent from another branch:
1064 my @b_path_components = split m#/#, $self->rel_path;
1065 my @a_path_components;
1066 my $i;
1067 while (@b_path_components) {
1068 $i = $paths->{'/'.join('/', @b_path_components)};
1069 last if $i;
1070 unshift(@a_path_components, pop(@b_path_components));
1071 }
1072 goto not_found unless defined $i;
1073 my $branch_from = $i->{copyfrom_path} or goto not_found;
1074 if (@a_path_components) {
1075 print STDERR "branch_from: $branch_from => ";
1076 $branch_from .= '/'.join('/', @a_path_components);
1077 print STDERR $branch_from, "\n";
1078 }
1079 my $r = $i->{copyfrom_rev};
1080 my $repos_root = $self->ra->{repos_root};
1081 my $url = $self->ra->{url};
1082 my $new_url = $repos_root . $branch_from;
1083 print STDERR "Found possible branch point: ",
1084 "$new_url => ", $self->full_url, ", $r\n";
1085 $branch_from =~ s#^/##;
1086 my $remotes = read_all_remotes();
1087 my $gs;
1088 foreach my $repo_id (keys %$remotes) {
1089 my $u = $remotes->{$repo_id}->{url} or next;
1090 next if $url ne $u;
1091 my $fetch = $remotes->{$repo_id}->{fetch};
1092 foreach my $f (keys %$fetch) {
1093 next if $f ne $branch_from;
1094 $gs = Git::SVN->new($fetch->{$f}, $repo_id, $f);
1095 last;
1096 }
1097 last if $gs;
1098 }
1099 unless ($gs) {
1100 my $ref_id = $self->{ref_id};
1101 $ref_id =~ s/\@\d+$//;
1102 $ref_id .= "\@$r";
1103 # just grow a tail if we're not unique enough :x
1104 $ref_id .= '-' while find_ref($ref_id);
1105 print STDERR "Initializing parent: $ref_id\n";
1106 $gs = Git::SVN->init($new_url, '', $ref_id, $ref_id);
1107 }
1108 my ($r0, $parent) = $gs->find_rev_before($r, 1);
1109 if ($_follow_parent && (!defined $r0 || !defined $parent)) {
1110 $gs->fetch(0, $r);
1111 ($r0, $parent) = $gs->last_rev_commit;
1112 }
1113 if (defined $r0 && defined $parent && $gs->revisions_eq($r0, $r)) {
1114 print STDERR "Found branch parent: ($self->{ref_id}) $parent\n";
1115 $self->assert_index_clean($parent);
1116 my $ed;
1117 if ($self->ra->can_do_switch) {
1118 print STDERR "Following parent with do_switch\n";
1119 # do_switch works with svn/trunk >= r22312, but that
1120 # is not included with SVN 1.4.3 (the latest version
1121 # at the moment), so we can't rely on it
1122 $self->{last_commit} = $parent;
1123 $ed = SVN::Git::Fetcher->new($self);
1124 $gs->ra->gs_do_switch($r0, $rev, $gs,
1125 $self->full_url, $ed)
1126 or die "SVN connection failed somewhere...\n";
1127 } else {
1128 print STDERR "Following parent with do_update\n";
1129 $ed = SVN::Git::Fetcher->new($self);
1130 $self->ra->gs_do_update($rev, $rev, $self, $ed)
1131 or die "SVN connection failed somewhere...\n";
1132 }
1133 print STDERR "Successfully followed parent\n";
1134 $ed->{new_fetch} = 1;
1135 return $self->make_log_entry($rev, [$parent], $ed);
1136 }
1137 not_found:
1138 print STDERR "Branch parent for path: '/",
1139 $self->rel_path, "' @ r$rev not found:\n";
1140 return undef unless $paths;
1141 print STDERR "Changed paths:\n";
1142 foreach my $x (sort keys %$paths) {
1143 my $p = $paths->{$x};
1144 print STDERR "\t$p->{action}\t$x";
1145 if ($p->{copyfrom_path}) {
1146 print STDERR "(from $p->{copyfrom_path}: ",
1147 "$p->{copyfrom_rev})";
1148 }
1149 print STDERR "\n";
1150 }
1151 print STDERR '-'x72, "\n";
1152 return undef;
1153 }
1154
1155 sub do_fetch {
1156 my ($self, $paths, $rev) = @_;
1157 my $ed;
1158 my ($last_rev, @parents);
1159 if ($self->{last_commit}) {
1160 $ed = SVN::Git::Fetcher->new($self);
1161 $last_rev = $self->{last_rev};
1162 $ed->{c} = $self->{last_commit};
1163 @parents = ($self->{last_commit});
1164 } else {
1165 $last_rev = $rev;
1166 if (my $log_entry = $self->find_parent_branch($paths, $rev)) {
1167 return $log_entry;
1168 }
1169 $ed = SVN::Git::Fetcher->new($self);
1170 $ed->{new_fetch} = 1;
1171 }
1172 unless ($self->ra->gs_do_update($last_rev, $rev, $self, $ed)) {
1173 die "SVN connection failed somewhere...\n";
1174 }
1175 $self->make_log_entry($rev, \@parents, $ed);
1176 }
1177
1178 sub get_untracked {
1179 my ($self, $ed) = @_;
1180 my @out;
1181 my $h = $ed->{empty};
1182 foreach (sort keys %$h) {
1183 my $act = $h->{$_} ? '+empty_dir' : '-empty_dir';
1184 push @out, " $act: " . uri_encode($_);
1185 warn "W: $act: $_\n";
1186 }
1187 foreach my $t (qw/dir_prop file_prop/) {
1188 $h = $ed->{$t} or next;
1189 foreach my $path (sort keys %$h) {
1190 my $ppath = $path eq '' ? '.' : $path;
1191 foreach my $prop (sort keys %{$h->{$path}}) {
1192 next if $SKIP_PROP{$prop};
1193 my $v = $h->{$path}->{$prop};
1194 my $t_ppath_prop = "$t: " .
1195 uri_encode($ppath) . ' ' .
1196 uri_encode($prop);
1197 if (defined $v) {
1198 push @out, " +$t_ppath_prop " .
1199 uri_encode($v);
1200 } else {
1201 push @out, " -$t_ppath_prop";
1202 }
1203 }
1204 }
1205 }
1206 foreach my $t (qw/absent_file absent_directory/) {
1207 $h = $ed->{$t} or next;
1208 foreach my $parent (sort keys %$h) {
1209 foreach my $path (sort @{$h->{$parent}}) {
1210 push @out, " $t: " .
1211 uri_encode("$parent/$path");
1212 warn "W: $t: $parent/$path ",
1213 "Insufficient permissions?\n";
1214 }
1215 }
1216 }
1217 \@out;
1218 }
1219
1220 sub parse_svn_date {
1221 my $date = shift || return '+0000 1970-01-01 00:00:00';
1222 my ($Y,$m,$d,$H,$M,$S) = ($date =~ /^(\d{4})\-(\d\d)\-(\d\d)T
1223 (\d\d)\:(\d\d)\:(\d\d).\d+Z$/x) or
1224 croak "Unable to parse date: $date\n";
1225 "+0000 $Y-$m-$d $H:$M:$S";
1226 }
1227
1228 sub check_author {
1229 my ($author) = @_;
1230 if (!defined $author || length $author == 0) {
1231 $author = '(no author)';
1232 }
1233 if (defined $::_authors && ! defined $::users{$author}) {
1234 die "Author: $author not defined in $::_authors file\n";
1235 }
1236 $author;
1237 }
1238
1239 sub make_log_entry {
1240 my ($self, $rev, $parents, $ed) = @_;
1241 my $untracked = $self->get_untracked($ed);
1242
1243 return undef if (! $ed->{new_fetch} && ! $ed->{nr} && ! @$untracked);
1244
1245 open my $un, '>>', "$self->{dir}/unhandled.log" or croak $!;
1246 print $un "r$rev\n" or croak $!;
1247 print $un $_, "\n" foreach @$untracked;
1248 my %log_entry = ( parents => $parents || [], revision => $rev,
1249 log => '');
1250 my $rp = $self->ra->rev_proplist($rev);
1251 foreach (sort keys %$rp) {
1252 my $v = $rp->{$_};
1253 if (/^svn:(author|date|log)$/) {
1254 $log_entry{$1} = $v;
1255 } else {
1256 print $un " rev_prop: ", uri_encode($_), ' ',
1257 uri_encode($v), "\n";
1258 }
1259 }
1260 close $un or croak $!;
1261
1262 $log_entry{date} = parse_svn_date($log_entry{date});
1263 $log_entry{author} = check_author($log_entry{author});
1264 $log_entry{log} .= "\n";
1265 \%log_entry;
1266 }
1267
1268 sub fetch {
1269 my ($self, $min_rev, $max_rev, @parents) = @_;
1270 my ($last_rev, $last_commit) = $self->last_rev_commit;
1271 my ($base, $head) = $self->get_fetch_range($min_rev, $max_rev);
1272 return if ($base > $head);
1273 $self->ra->gs_fetch_loop_common($base, $head, $self);
1274 }
1275
1276 sub set_tree_cb {
1277 my ($self, $log_entry, $tree, $rev, $date, $author) = @_;
1278 # TODO: enable and test optimized commits:
1279 if (0 && $rev == ($self->{last_rev} + 1)) {
1280 $log_entry->{revision} = $rev;
1281 $log_entry->{author} = $author;
1282 $self->do_git_commit($log_entry, "$rev=$tree");
1283 } else {
1284 $self->{inject_parents} = { $rev => $tree };
1285 $self->fetch(undef, undef);
1286 }
1287 }
1288
1289 sub set_tree {
1290 my ($self, $tree) = (shift, shift);
1291 my $log_entry = ::get_commit_entry($tree);
1292 unless ($self->{last_rev}) {
1293 fatal("Must have an existing revision to commit\n");
1294 }
1295 my %ed_opts = ( r => $self->{last_rev},
1296 log => $log_entry->{log},
1297 ra => $self->ra,
1298 tree_a => $self->{last_commit},
1299 tree_b => $tree,
1300 editor_cb => sub {
1301 $self->set_tree_cb($log_entry, $tree, @_) },
1302 svn_path => $self->{path} );
1303 if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) {
1304 print "No changes\nr$self->{last_rev} = $tree\n";
1305 }
1306 }
1307
1308 sub rebuild {
1309 my ($self) = @_;
1310 print "Rebuilding $self->{db_path} ...\n";
1311 my ($rev_list, $ctx) = command_output_pipe("rev-list", $self->refname);
1312 my $latest;
1313 my $full_url = $self->full_url;
1314 my $svn_uuid;
1315 while (<$rev_list>) {
1316 chomp;
1317 my $c = $_;
1318 die "Non-SHA1: $c\n" unless $c =~ /^$::sha1$/o;
1319 my ($url, $rev, $uuid) = ::cmt_metadata($c);
1320
1321 # ignore merges (from set-tree)
1322 next if (!defined $rev || !$uuid);
1323
1324 # if we merged or otherwise started elsewhere, this is
1325 # how we break out of it
1326 if ((defined $svn_uuid && ($uuid ne $svn_uuid)) ||
1327 ($full_url && $url && ($url ne $full_url))) {
1328 next;
1329 }
1330 $latest ||= $rev;
1331 $svn_uuid ||= $uuid;
1332
1333 $self->rev_db_set($rev, $c);
1334 print "r$rev = $c\n";
1335 }
1336 command_close_pipe($rev_list, $ctx);
1337 print "Done rebuilding $self->{db_path}\n";
1338 }
1339
1340 # rev_db:
1341 # Tie::File seems to be prone to offset errors if revisions get sparse,
1342 # it's not that fast, either. Tie::File is also not in Perl 5.6. So
1343 # one of my favorite modules is out :< Next up would be one of the DBM
1344 # modules, but I'm not sure which is most portable... So I'll just
1345 # go with something that's plain-text, but still capable of
1346 # being randomly accessed. So here's my ultra-simple fixed-width
1347 # database. All records are 40 characters + "\n", so it's easy to seek
1348 # to a revision: (41 * rev) is the byte offset.
1349 # A record of 40 0s denotes an empty revision.
1350 # And yes, it's still pretty fast (faster than Tie::File).
1351
1352 sub rev_db_set {
1353 my ($self, $rev, $commit) = @_;
1354 length $commit == 40 or croak "arg3 must be a full SHA1 hexsum\n";
1355 open my $fh, '+<', $self->{db_path} or croak $!;
1356 my $offset = $rev * 41;
1357 # assume that append is the common case:
1358 seek $fh, 0, 2 or croak $!;
1359 my $pos = tell $fh;
1360 if ($pos < $offset) {
1361 print $fh (('0' x 40),"\n") x (($offset - $pos) / 41)
1362 or croak $!;
1363 }
1364 seek $fh, $offset, 0 or croak $!;
1365 print $fh $commit,"\n" or croak $!;
1366 close $fh or croak $!;
1367 }
1368
1369 sub rev_db_get {
1370 my ($self, $rev) = @_;
1371 my $ret;
1372 my $offset = $rev * 41;
1373 open my $fh, '<', $self->{db_path} or croak $!;
1374 if (seek $fh, $offset, 0) {
1375 $ret = readline $fh;
1376 if (defined $ret) {
1377 chomp $ret;
1378 $ret = undef if ($ret =~ /^0{40}$/);
1379 }
1380 }
1381 close $fh or croak $!;
1382 $ret;
1383 }
1384
1385 sub find_rev_before {
1386 my ($self, $rev, $eq_ok) = @_;
1387 --$rev unless $eq_ok;
1388 while ($rev > 0) {
1389 if (my $c = $self->rev_db_get($rev)) {
1390 return ($rev, $c);
1391 }
1392 --$rev;
1393 }
1394 return (undef, undef);
1395 }
1396
1397 sub _new {
1398 my ($class, $repo_id, $ref_id, $path) = @_;
1399 unless (defined $repo_id && length $repo_id) {
1400 $repo_id = $Git::SVN::default_repo_id;
1401 }
1402 unless (defined $ref_id && length $ref_id) {
1403 $_[2] = $ref_id = $Git::SVN::default_ref_id;
1404 }
1405 $_[1] = $repo_id = sanitize_remote_name($repo_id);
1406 my $dir = "$ENV{GIT_DIR}/svn/$ref_id";
1407 $_[3] = $path = '' unless (defined $path);
1408 mkpath([$dir]);
1409 unless (-f "$dir/.rev_db") {
1410 open my $fh, '>>', "$dir/.rev_db" or croak $!;
1411 close $fh or croak $!;
1412 }
1413 bless { ref_id => $ref_id, dir => $dir, index => "$dir/index",
1414 path => $path,
1415 db_path => "$dir/.rev_db", repo_id => $repo_id }, $class;
1416 }
1417
1418 sub uri_encode {
1419 my ($f) = @_;
1420 $f =~ s#([^a-zA-Z0-9\*!\:_\./\-])#uc sprintf("%%%02x",ord($1))#eg;
1421 $f
1422 }
1423
1424 package Git::SVN::Prompt;
1425 use strict;
1426 use warnings;
1427 require SVN::Core;
1428 use vars qw/$_no_auth_cache $_username/;
1429
1430 sub simple {
1431 my ($cred, $realm, $default_username, $may_save, $pool) = @_;
1432 $may_save = undef if $_no_auth_cache;
1433 $default_username = $_username if defined $_username;
1434 if (defined $default_username && length $default_username) {
1435 if (defined $realm && length $realm) {
1436 print STDERR "Authentication realm: $realm\n";
1437 STDERR->flush;
1438 }
1439 $cred->username($default_username);
1440 } else {
1441 username($cred, $realm, $may_save, $pool);
1442 }
1443 $cred->password(_read_password("Password for '" .
1444 $cred->username . "': ", $realm));
1445 $cred->may_save($may_save);
1446 $SVN::_Core::SVN_NO_ERROR;
1447 }
1448
1449 sub ssl_server_trust {
1450 my ($cred, $realm, $failures, $cert_info, $may_save, $pool) = @_;
1451 $may_save = undef if $_no_auth_cache;
1452 print STDERR "Error validating server certificate for '$realm':\n";
1453 if ($failures & $SVN::Auth::SSL::UNKNOWNCA) {
1454 print STDERR " - The certificate is not issued by a trusted ",
1455 "authority. Use the\n",
1456 " fingerprint to validate the certificate manually!\n";
1457 }
1458 if ($failures & $SVN::Auth::SSL::CNMISMATCH) {
1459 print STDERR " - The certificate hostname does not match.\n";
1460 }
1461 if ($failures & $SVN::Auth::SSL::NOTYETVALID) {
1462 print STDERR " - The certificate is not yet valid.\n";
1463 }
1464 if ($failures & $SVN::Auth::SSL::EXPIRED) {
1465 print STDERR " - The certificate has expired.\n";
1466 }
1467 if ($failures & $SVN::Auth::SSL::OTHER) {
1468 print STDERR " - The certificate has an unknown error.\n";
1469 }
1470 printf STDERR
1471 "Certificate information:\n".
1472 " - Hostname: %s\n".
1473 " - Valid: from %s until %s\n".
1474 " - Issuer: %s\n".
1475 " - Fingerprint: %s\n",
1476 map $cert_info->$_, qw(hostname valid_from valid_until
1477 issuer_dname fingerprint);
1478 my $choice;
1479 prompt:
1480 print STDERR $may_save ?
1481 "(R)eject, accept (t)emporarily or accept (p)ermanently? " :
1482 "(R)eject or accept (t)emporarily? ";
1483 STDERR->flush;
1484 $choice = lc(substr(<STDIN> || 'R', 0, 1));
1485 if ($choice =~ /^t$/i) {
1486 $cred->may_save(undef);
1487 } elsif ($choice =~ /^r$/i) {
1488 return -1;
1489 } elsif ($may_save && $choice =~ /^p$/i) {
1490 $cred->may_save($may_save);
1491 } else {
1492 goto prompt;
1493 }
1494 $cred->accepted_failures($failures);
1495 $SVN::_Core::SVN_NO_ERROR;
1496 }
1497
1498 sub ssl_client_cert {
1499 my ($cred, $realm, $may_save, $pool) = @_;
1500 $may_save = undef if $_no_auth_cache;
1501 print STDERR "Client certificate filename: ";
1502 STDERR->flush;
1503 chomp(my $filename = <STDIN>);
1504 $cred->cert_file($filename);
1505 $cred->may_save($may_save);
1506 $SVN::_Core::SVN_NO_ERROR;
1507 }
1508
1509 sub ssl_client_cert_pw {
1510 my ($cred, $realm, $may_save, $pool) = @_;
1511 $may_save = undef if $_no_auth_cache;
1512 $cred->password(_read_password("Password: ", $realm));
1513 $cred->may_save($may_save);
1514 $SVN::_Core::SVN_NO_ERROR;
1515 }
1516
1517 sub username {
1518 my ($cred, $realm, $may_save, $pool) = @_;
1519 $may_save = undef if $_no_auth_cache;
1520 if (defined $realm && length $realm) {
1521 print STDERR "Authentication realm: $realm\n";
1522 }
1523 my $username;
1524 if (defined $_username) {
1525 $username = $_username;
1526 } else {
1527 print STDERR "Username: ";
1528 STDERR->flush;
1529 chomp($username = <STDIN>);
1530 }
1531 $cred->username($username);
1532 $cred->may_save($may_save);
1533 $SVN::_Core::SVN_NO_ERROR;
1534 }
1535
1536 sub _read_password {
1537 my ($prompt, $realm) = @_;
1538 print STDERR $prompt;
1539 STDERR->flush;
1540 require Term::ReadKey;
1541 Term::ReadKey::ReadMode('noecho');
1542 my $password = '';
1543 while (defined(my $key = Term::ReadKey::ReadKey(0))) {
1544 last if $key =~ /[\012\015]/; # \n\r
1545 $password .= $key;
1546 }
1547 Term::ReadKey::ReadMode('restore');
1548 print STDERR "\n";
1549 STDERR->flush;
1550 $password;
1551 }
1552
1553 package main;
1554
1555 {
1556 my $kill_stupid_warnings = $SVN::Node::none.$SVN::Node::file.
1557 $SVN::Node::dir.$SVN::Node::unknown.
1558 $SVN::Node::none.$SVN::Node::file.
1559 $SVN::Node::dir.$SVN::Node::unknown.
1560 $SVN::Auth::SSL::CNMISMATCH.
1561 $SVN::Auth::SSL::NOTYETVALID.
1562 $SVN::Auth::SSL::EXPIRED.
1563 $SVN::Auth::SSL::UNKNOWNCA.
1564 $SVN::Auth::SSL::OTHER;
1565 }
1566
1567 package SVN::Git::Fetcher;
1568 use vars qw/@ISA/;
1569 use strict;
1570 use warnings;
1571 use Carp qw/croak/;
1572 use IO::File qw//;
1573 use Digest::MD5;
1574
1575 # file baton members: path, mode_a, mode_b, pool, fh, blob, base
1576 sub new {
1577 my ($class, $git_svn) = @_;
1578 my $self = SVN::Delta::Editor->new;
1579 bless $self, $class;
1580 $self->{c} = $git_svn->{last_commit} if exists $git_svn->{last_commit};
1581 $self->{empty} = {};
1582 $self->{dir_prop} = {};
1583 $self->{file_prop} = {};
1584 $self->{absent_dir} = {};
1585 $self->{absent_file} = {};
1586 $self->{gii} = $git_svn->tmp_index_do(sub { Git::IndexInfo->new });
1587 $self;
1588 }
1589
1590 sub set_path_strip {
1591 my ($self, $path) = @_;
1592 $self->{path_strip} = qr/^\Q$path\E\/?/;
1593 }
1594
1595 sub open_root {
1596 { path => '' };
1597 }
1598
1599 sub open_directory {
1600 my ($self, $path, $pb, $rev) = @_;
1601 { path => $path };
1602 }
1603
1604 sub git_path {
1605 my ($self, $path) = @_;
1606 if ($self->{path_strip}) {
1607 $path =~ s!$self->{path_strip}!! or
1608 die "Failed to strip path '$path' ($self->{path_strip})\n";
1609 }
1610 $path;
1611 }
1612
1613 sub delete_entry {
1614 my ($self, $path, $rev, $pb) = @_;
1615
1616 my $gpath = $self->git_path($path);
1617 return undef if ($gpath eq '');
1618
1619 # remove entire directories.
1620 if (command('ls-tree', $self->{c}, '--', $gpath) =~ /^040000 tree/) {
1621 my ($ls, $ctx) = command_output_pipe(qw/ls-tree
1622 -r --name-only -z/,
1623 $self->{c}, '--', $gpath);
1624 local $/ = "\0";
1625 while (<$ls>) {
1626 chomp;
1627 $self->{gii}->remove($_);
1628 print "\tD\t$_\n" unless $self->{q};
1629 }
1630 print "\tD\t$gpath/\n" unless $self->{q};
1631 command_close_pipe($ls, $ctx);
1632 $self->{empty}->{$path} = 0
1633 } else {
1634 $self->{gii}->remove($gpath);
1635 print "\tD\t$gpath\n" unless $self->{q};
1636 }
1637 undef;
1638 }
1639
1640 sub open_file {
1641 my ($self, $path, $pb, $rev) = @_;
1642 my $gpath = $self->git_path($path);
1643 my ($mode, $blob) = (command('ls-tree', $self->{c}, '--', $gpath)
1644 =~ /^(\d{6}) blob ([a-f\d]{40})\t/);
1645 unless (defined $mode && defined $blob) {
1646 die "$path was not found in commit $self->{c} (r$rev)\n";
1647 }
1648 { path => $path, mode_a => $mode, mode_b => $mode, blob => $blob,
1649 pool => SVN::Pool->new, action => 'M' };
1650 }
1651
1652 sub add_file {
1653 my ($self, $path, $pb, $cp_path, $cp_rev) = @_;
1654 my ($dir, $file) = ($path =~ m#^(.*?)/?([^/]+)$#);
1655 delete $self->{empty}->{$dir};
1656 { path => $path, mode_a => 100644, mode_b => 100644,
1657 pool => SVN::Pool->new, action => 'A' };
1658 }
1659
1660 sub add_directory {
1661 my ($self, $path, $cp_path, $cp_rev) = @_;
1662 my ($dir, $file) = ($path =~ m#^(.*?)/?([^/]+)$#);
1663 delete $self->{empty}->{$dir};
1664 $self->{empty}->{$path} = 1;
1665 { path => $path };
1666 }
1667
1668 sub change_dir_prop {
1669 my ($self, $db, $prop, $value) = @_;
1670 $self->{dir_prop}->{$db->{path}} ||= {};
1671 $self->{dir_prop}->{$db->{path}}->{$prop} = $value;
1672 undef;
1673 }
1674
1675 sub absent_directory {
1676 my ($self, $path, $pb) = @_;
1677 $self->{absent_dir}->{$pb->{path}} ||= [];
1678 push @{$self->{absent_dir}->{$pb->{path}}}, $path;
1679 undef;
1680 }
1681
1682 sub absent_file {
1683 my ($self, $path, $pb) = @_;
1684 $self->{absent_file}->{$pb->{path}} ||= [];
1685 push @{$self->{absent_file}->{$pb->{path}}}, $path;
1686 undef;
1687 }
1688
1689 sub change_file_prop {
1690 my ($self, $fb, $prop, $value) = @_;
1691 if ($prop eq 'svn:executable') {
1692 if ($fb->{mode_b} != 120000) {
1693 $fb->{mode_b} = defined $value ? 100755 : 100644;
1694 }
1695 } elsif ($prop eq 'svn:special') {
1696 $fb->{mode_b} = defined $value ? 120000 : 100644;
1697 } else {
1698 $self->{file_prop}->{$fb->{path}} ||= {};
1699 $self->{file_prop}->{$fb->{path}}->{$prop} = $value;
1700 }
1701 undef;
1702 }
1703
1704 sub apply_textdelta {
1705 my ($self, $fb, $exp) = @_;
1706 my $fh = IO::File->new_tmpfile;
1707 $fh->autoflush(1);
1708 # $fh gets auto-closed() by SVN::TxDelta::apply(),
1709 # (but $base does not,) so dup() it for reading in close_file
1710 open my $dup, '<&', $fh or croak $!;
1711 my $base = IO::File->new_tmpfile;
1712 $base->autoflush(1);
1713 if ($fb->{blob}) {
1714 defined (my $pid = fork) or croak $!;
1715 if (!$pid) {
1716 open STDOUT, '>&', $base or croak $!;
1717 print STDOUT 'link ' if ($fb->{mode_a} == 120000);
1718 exec qw/git-cat-file blob/, $fb->{blob} or croak $!;
1719 }
1720 waitpid $pid, 0;
1721 croak $? if $?;
1722
1723 if (defined $exp) {
1724 seek $base, 0, 0 or croak $!;
1725 my $md5 = Digest::MD5->new;
1726 $md5->addfile($base);
1727 my $got = $md5->hexdigest;
1728 die "Checksum mismatch: $fb->{path} $fb->{blob}\n",
1729 "expected: $exp\n",
1730 " got: $got\n" if ($got ne $exp);
1731 }
1732 }
1733 seek $base, 0, 0 or croak $!;
1734 $fb->{fh} = $dup;
1735 $fb->{base} = $base;
1736 [ SVN::TxDelta::apply($base, $fh, undef, $fb->{path}, $fb->{pool}) ];
1737 }
1738
1739 sub close_file {
1740 my ($self, $fb, $exp) = @_;
1741 my $hash;
1742 my $path = $self->git_path($fb->{path});
1743 if (my $fh = $fb->{fh}) {
1744 seek($fh, 0, 0) or croak $!;
1745 my $md5 = Digest::MD5->new;
1746 $md5->addfile($fh);
1747 my $got = $md5->hexdigest;
1748 die "Checksum mismatch: $path\n",
1749 "expected: $exp\n got: $got\n" if ($got ne $exp);
1750 seek($fh, 0, 0) or croak $!;
1751 if ($fb->{mode_b} == 120000) {
1752 read($fh, my $buf, 5) == 5 or croak $!;
1753 $buf eq 'link ' or die "$path has mode 120000",
1754 "but is not a link\n";
1755 }
1756 defined(my $pid = open my $out,'-|') or die "Can't fork: $!\n";
1757 if (!$pid) {
1758 open STDIN, '<&', $fh or croak $!;
1759 exec qw/git-hash-object -w --stdin/ or croak $!;
1760 }
1761 chomp($hash = do { local $/; <$out> });
1762 close $out or croak $!;
1763 close $fh or croak $!;
1764 $hash =~ /^[a-f\d]{40}$/ or die "not a sha1: $hash\n";
1765 close $fb->{base} or croak $!;
1766 } else {
1767 $hash = $fb->{blob} or die "no blob information\n";
1768 }
1769 $fb->{pool}->clear;
1770 $self->{gii}->update($fb->{mode_b}, $hash, $path) or croak $!;
1771 print "\t$fb->{action}\t$path\n" if $fb->{action} && ! $self->{q};
1772 undef;
1773 }
1774
1775 sub abort_edit {
1776 my $self = shift;
1777 $self->{nr} = $self->{gii}->{nr};
1778 delete $self->{gii};
1779 $self->SUPER::abort_edit(@_);
1780 }
1781
1782 sub close_edit {
1783 my $self = shift;
1784 $self->{git_commit_ok} = 1;
1785 $self->{nr} = $self->{gii}->{nr};
1786 delete $self->{gii};
1787 $self->SUPER::close_edit(@_);
1788 }
1789
1790 package SVN::Git::Editor;
1791 use vars qw/@ISA $_rmdir $_cp_similarity $_find_copies_harder $_rename_limit/;
1792 use strict;
1793 use warnings;
1794 use Carp qw/croak/;
1795 use IO::File;
1796 use Digest::MD5;
1797
1798 sub new {
1799 my ($class, $opts) = @_;
1800 foreach (qw/svn_path r ra tree_a tree_b log editor_cb/) {
1801 die "$_ required!\n" unless (defined $opts->{$_});
1802 }
1803
1804 my $pool = SVN::Pool->new;
1805 my $mods = generate_diff($opts->{tree_a}, $opts->{tree_b});
1806 my $types = check_diff_paths($opts->{ra}, $opts->{svn_path},
1807 $opts->{r}, $mods);
1808
1809 # $opts->{ra} functions should not be used after this:
1810 my @ce = $opts->{ra}->get_commit_editor($opts->{log},
1811 $opts->{editor_cb}, $pool);
1812 my $self = SVN::Delta::Editor->new(@ce, $pool);
1813 bless $self, $class;
1814 foreach (qw/svn_path r tree_a tree_b/) {
1815 $self->{$_} = $opts->{$_};
1816 }
1817 $self->{url} = $opts->{ra}->{url};
1818 $self->{mods} = $mods;
1819 $self->{types} = $types;
1820 $self->{pool} = $pool;
1821 $self->{bat} = { '' => $self->open_root($self->{r}, $self->{pool}) };
1822 $self->{rm} = { };
1823 $self->{path_prefix} = length $self->{svn_path} ?
1824 "$self->{svn_path}/" : '';
1825 return $self;
1826 }
1827
1828 sub generate_diff {
1829 my ($tree_a, $tree_b) = @_;
1830 my @diff_tree = qw(diff-tree -z -r);
1831 if ($_cp_similarity) {
1832 push @diff_tree, "-C$_cp_similarity";
1833 } else {
1834 push @diff_tree, '-C';
1835 }
1836 push @diff_tree, '--find-copies-harder' if $_find_copies_harder;
1837 push @diff_tree, "-l$_rename_limit" if defined $_rename_limit;
1838 push @diff_tree, $tree_a, $tree_b;
1839 my ($diff_fh, $ctx) = command_output_pipe(@diff_tree);
1840 local $/ = "\0";
1841 my $state = 'meta';
1842 my @mods;
1843 while (<$diff_fh>) {
1844 chomp $_; # this gets rid of the trailing "\0"
1845 if ($state eq 'meta' && /^:(\d{6})\s(\d{6})\s
1846 $::sha1\s($::sha1)\s
1847 ([MTCRAD])\d*$/xo) {
1848 push @mods, { mode_a => $1, mode_b => $2,
1849 sha1_b => $3, chg => $4 };
1850 if ($4 =~ /^(?:C|R)$/) {
1851 $state = 'file_a';
1852 } else {
1853 $state = 'file_b';
1854 }
1855 } elsif ($state eq 'file_a') {
1856 my $x = $mods[$#mods] or croak "Empty array\n";
1857 if ($x->{chg} !~ /^(?:C|R)$/) {
1858 croak "Error parsing $_, $x->{chg}\n";
1859 }
1860 $x->{file_a} = $_;
1861 $state = 'file_b';
1862 } elsif ($state eq 'file_b') {
1863 my $x = $mods[$#mods] or croak "Empty array\n";
1864 if (exists $x->{file_a} && $x->{chg} !~ /^(?:C|R)$/) {
1865 croak "Error parsing $_, $x->{chg}\n";
1866 }
1867 if (!exists $x->{file_a} && $x->{chg} =~ /^(?:C|R)$/) {
1868 croak "Error parsing $_, $x->{chg}\n";
1869 }
1870 $x->{file_b} = $_;
1871 $state = 'meta';
1872 } else {
1873 croak "Error parsing $_\n";
1874 }
1875 }
1876 command_close_pipe($diff_fh, $ctx);
1877 \@mods;
1878 }
1879
1880 sub check_diff_paths {
1881 my ($ra, $pfx, $rev, $mods) = @_;
1882 my %types;
1883 $pfx .= '/' if length $pfx;
1884
1885 sub type_diff_paths {
1886 my ($ra, $types, $path, $rev) = @_;
1887 my @p = split m#/+#, $path;
1888 my $c = shift @p;
1889 unless (defined $types->{$c}) {
1890 $types->{$c} = $ra->check_path($c, $rev);
1891 }
1892 while (@p) {
1893 $c .= '/' . shift @p;
1894 next if defined $types->{$c};
1895 $types->{$c} = $ra->check_path($c, $rev);
1896 }
1897 }
1898
1899 foreach my $m (@$mods) {
1900 foreach my $f (qw/file_a file_b/) {
1901 next unless defined $m->{$f};
1902 my ($dir) = ($m->{$f} =~ m#^(.*?)/?(?:[^/]+)$#);
1903 if (length $pfx.$dir && ! defined $types{$dir}) {
1904 type_diff_paths($ra, \%types, $pfx.$dir, $rev);
1905 }
1906 }
1907 }
1908 \%types;
1909 }
1910
1911 sub split_path {
1912 return ($_[0] =~ m#^(.*?)/?([^/]+)$#);
1913 }
1914
1915 sub repo_path {
1916 my ($self, $path) = @_;
1917 $self->{path_prefix}.(defined $path ? $path : '');
1918 }
1919
1920 sub url_path {
1921 my ($self, $path) = @_;
1922 $self->{url} . '/' . $self->repo_path($path);
1923 }
1924
1925 sub rmdirs {
1926 my ($self) = @_;
1927 my $rm = $self->{rm};
1928 delete $rm->{''}; # we never delete the url we're tracking
1929 return unless %$rm;
1930
1931 foreach (keys %$rm) {
1932 my @d = split m#/#, $_;
1933 my $c = shift @d;
1934 $rm->{$c} = 1;
1935 while (@d) {
1936 $c .= '/' . shift @d;
1937 $rm->{$c} = 1;
1938 }
1939 }
1940 delete $rm->{$self->{svn_path}};
1941 delete $rm->{''}; # we never delete the url we're tracking
1942 return unless %$rm;
1943
1944 my ($fh, $ctx) = command_output_pipe(qw/ls-tree --name-only -r -z/,
1945 $self->{tree_b});
1946 local $/ = "\0";
1947 while (<$fh>) {
1948 chomp;
1949 my @dn = split m#/#, $_;
1950 while (pop @dn) {
1951 delete $rm->{join '/', @dn};
1952 }
1953 unless (%$rm) {
1954 close $fh;
1955 return;
1956 }
1957 }
1958 command_close_pipe($fh, $ctx);
1959
1960 my ($r, $p, $bat) = ($self->{r}, $self->{pool}, $self->{bat});
1961 foreach my $d (sort { $b =~ tr#/#/# <=> $a =~ tr#/#/# } keys %$rm) {
1962 $self->close_directory($bat->{$d}, $p);
1963 my ($dn) = ($d =~ m#^(.*?)/?(?:[^/]+)$#);
1964 print "\tD+\t$d/\n" unless $::_q;
1965 $self->SUPER::delete_entry($d, $r, $bat->{$dn}, $p);
1966 delete $bat->{$d};
1967 }
1968 }
1969
1970 sub open_or_add_dir {
1971 my ($self, $full_path, $baton) = @_;
1972 my $t = $self->{types}->{$full_path};
1973 if (!defined $t) {
1974 die "$full_path not known in r$self->{r} or we have a bug!\n";
1975 }
1976 if ($t == $SVN::Node::none) {
1977 return $self->add_directory($full_path, $baton,
1978 undef, -1, $self->{pool});
1979 } elsif ($t == $SVN::Node::dir) {
1980 return $self->open_directory($full_path, $baton,
1981 $self->{r}, $self->{pool});
1982 }
1983 print STDERR "$full_path already exists in repository at ",
1984 "r$self->{r} and it is not a directory (",
1985 ($t == $SVN::Node::file ? 'file' : 'unknown'),"/$t)\n";
1986 exit 1;
1987 }
1988
1989 sub ensure_path {
1990 my ($self, $path) = @_;
1991 my $bat = $self->{bat};
1992 my $repo_path = $self->repo_path($path);
1993 return $bat->{''} unless (length $repo_path);
1994 my @p = split m#/+#, $repo_path;
1995 my $c = shift @p;
1996 $bat->{$c} ||= $self->open_or_add_dir($c, $bat->{''});
1997 while (@p) {
1998 my $c0 = $c;
1999 $c .= '/' . shift @p;
2000 $bat->{$c} ||= $self->open_or_add_dir($c, $bat->{$c0});
2001 }
2002 return $bat->{$c};
2003 }
2004
2005 sub A {
2006 my ($self, $m) = @_;
2007 my ($dir, $file) = split_path($m->{file_b});
2008 my $pbat = $self->ensure_path($dir);
2009 my $fbat = $self->add_file($self->repo_path($m->{file_b}), $pbat,
2010 undef, -1);
2011 print "\tA\t$m->{file_b}\n" unless $::_q;
2012 $self->chg_file($fbat, $m);
2013 $self->close_file($fbat,undef,$self->{pool});
2014 }
2015
2016 sub C {
2017 my ($self, $m) = @_;
2018 my ($dir, $file) = split_path($m->{file_b});
2019 my $pbat = $self->ensure_path($dir);
2020 my $fbat = $self->add_file($self->repo_path($m->{file_b}), $pbat,
2021 $self->url_path($m->{file_a}), $self->{r});
2022 print "\tC\t$m->{file_a} => $m->{file_b}\n" unless $::_q;
2023 $self->chg_file($fbat, $m);
2024 $self->close_file($fbat,undef,$self->{pool});
2025 }
2026
2027 sub delete_entry {
2028 my ($self, $path, $pbat) = @_;
2029 my $rpath = $self->repo_path($path);
2030 my ($dir, $file) = split_path($rpath);
2031 $self->{rm}->{$dir} = 1;
2032 $self->SUPER::delete_entry($rpath, $self->{r}, $pbat, $self->{pool});
2033 }
2034
2035 sub R {
2036 my ($self, $m) = @_;
2037 my ($dir, $file) = split_path($m->{file_b});
2038 my $pbat = $self->ensure_path($dir);
2039 my $fbat = $self->add_file($self->repo_path($m->{file_b}), $pbat,
2040 $self->url_path($m->{file_a}), $self->{r});
2041 print "\tR\t$m->{file_a} => $m->{file_b}\n" unless $::_q;
2042 $self->chg_file($fbat, $m);
2043 $self->close_file($fbat,undef,$self->{pool});
2044
2045 ($dir, $file) = split_path($m->{file_a});
2046 $pbat = $self->ensure_path($dir);
2047 $self->delete_entry($m->{file_a}, $pbat);
2048 }
2049
2050 sub M {
2051 my ($self, $m) = @_;
2052 my ($dir, $file) = split_path($m->{file_b});
2053 my $pbat = $self->ensure_path($dir);
2054 my $fbat = $self->open_file($self->repo_path($m->{file_b}),
2055 $pbat,$self->{r},$self->{pool});
2056 print "\t$m->{chg}\t$m->{file_b}\n" unless $::_q;
2057 $self->chg_file($fbat, $m);
2058 $self->close_file($fbat,undef,$self->{pool});
2059 }
2060
2061 sub T { shift->M(@_) }
2062
2063 sub change_file_prop {
2064 my ($self, $fbat, $pname, $pval) = @_;
2065 $self->SUPER::change_file_prop($fbat, $pname, $pval, $self->{pool});
2066 }
2067
2068 sub chg_file {
2069 my ($self, $fbat, $m) = @_;
2070 if ($m->{mode_b} =~ /755$/ && $m->{mode_a} !~ /755$/) {
2071 $self->change_file_prop($fbat,'svn:executable','*');
2072 } elsif ($m->{mode_b} !~ /755$/ && $m->{mode_a} =~ /755$/) {
2073 $self->change_file_prop($fbat,'svn:executable',undef);
2074 }
2075 my $fh = IO::File->new_tmpfile or croak $!;
2076 if ($m->{mode_b} =~ /^120/) {
2077 print $fh 'link ' or croak $!;
2078 $self->change_file_prop($fbat,'svn:special','*');
2079 } elsif ($m->{mode_a} =~ /^120/ && $m->{mode_b} !~ /^120/) {
2080 $self->change_file_prop($fbat,'svn:special',undef);
2081 }
2082 defined(my $pid = fork) or croak $!;
2083 if (!$pid) {
2084 open STDOUT, '>&', $fh or croak $!;
2085 exec qw/git-cat-file blob/, $m->{sha1_b} or croak $!;
2086 }
2087 waitpid $pid, 0;
2088 croak $? if $?;
2089 $fh->flush == 0 or croak $!;
2090 seek $fh, 0, 0 or croak $!;
2091
2092 my $md5 = Digest::MD5->new;
2093 $md5->addfile($fh) or croak $!;
2094 seek $fh, 0, 0 or croak $!;
2095
2096 my $exp = $md5->hexdigest;
2097 my $pool = SVN::Pool->new;
2098 my $atd = $self->apply_textdelta($fbat, undef, $pool);
2099 my $got = SVN::TxDelta::send_stream($fh, @$atd, $pool);
2100 die "Checksum mismatch\nexpected: $exp\ngot: $got\n" if ($got ne $exp);
2101 $pool->clear;
2102
2103 close $fh or croak $!;
2104 }
2105
2106 sub D {
2107 my ($self, $m) = @_;
2108 my ($dir, $file) = split_path($m->{file_b});
2109 my $pbat = $self->ensure_path($dir);
2110 print "\tD\t$m->{file_b}\n" unless $::_q;
2111 $self->delete_entry($m->{file_b}, $pbat);
2112 }
2113
2114 sub close_edit {
2115 my ($self) = @_;
2116 my ($p,$bat) = ($self->{pool}, $self->{bat});
2117 foreach (sort { $b =~ tr#/#/# <=> $a =~ tr#/#/# } keys %$bat) {
2118 $self->close_directory($bat->{$_}, $p);
2119 }
2120 $self->SUPER::close_edit($p);
2121 $p->clear;
2122 }
2123
2124 sub abort_edit {
2125 my ($self) = @_;
2126 $self->SUPER::abort_edit($self->{pool});
2127 }
2128
2129 sub DESTROY {
2130 my $self = shift;
2131 $self->SUPER::DESTROY(@_);
2132 $self->{pool}->clear;
2133 }
2134
2135 # this drives the editor
2136 sub apply_diff {
2137 my ($self) = @_;
2138 my $mods = $self->{mods};
2139 my %o = ( D => 1, R => 0, C => -1, A => 3, M => 3, T => 3 );
2140 foreach my $m (sort { $o{$a->{chg}} <=> $o{$b->{chg}} } @$mods) {
2141 my $f = $m->{chg};
2142 if (defined $o{$f}) {
2143 $self->$f($m);
2144 } else {
2145 fatal("Invalid change type: $f\n");
2146 }
2147 }
2148 $self->rmdirs if $_rmdir;
2149 if (@$mods == 0) {
2150 $self->abort_edit;
2151 } else {
2152 $self->close_edit;
2153 }
2154 return scalar @$mods;
2155 }
2156
2157 package Git::SVN::Ra;
2158 use vars qw/@ISA $config_dir/;
2159 use strict;
2160 use warnings;
2161 my ($can_do_switch);
2162 my $RA;
2163
2164 BEGIN {
2165 # enforce temporary pool usage for some simple functions
2166 my $e;
2167 foreach (qw/get_latest_revnum rev_proplist get_file
2168 check_path get_dir get_uuid get_repos_root/) {
2169 $e .= "sub $_ {
2170 my \$self = shift;
2171 my \$pool = SVN::Pool->new;
2172 my \@ret = \$self->SUPER::$_(\@_,\$pool);
2173 \$pool->clear;
2174 wantarray ? \@ret : \$ret[0]; }\n";
2175 }
2176 eval $e;
2177 }
2178
2179 sub new {
2180 my ($class, $url) = @_;
2181 $url =~ s!/+$!!;
2182 return $RA if ($RA && $RA->{url} eq $url);
2183
2184 SVN::_Core::svn_config_ensure($config_dir, undef);
2185 my ($baton, $callbacks) = SVN::Core::auth_open_helper([
2186 SVN::Client::get_simple_provider(),
2187 SVN::Client::get_ssl_server_trust_file_provider(),
2188 SVN::Client::get_simple_prompt_provider(
2189 \&Git::SVN::Prompt::simple, 2),
2190 SVN::Client::get_ssl_client_cert_prompt_provider(
2191 \&Git::SVN::Prompt::ssl_client_cert, 2),
2192 SVN::Client::get_ssl_client_cert_pw_prompt_provider(
2193 \&Git::SVN::Prompt::ssl_client_cert_pw, 2),
2194 SVN::Client::get_username_provider(),
2195 SVN::Client::get_ssl_server_trust_prompt_provider(
2196 \&Git::SVN::Prompt::ssl_server_trust),
2197 SVN::Client::get_username_prompt_provider(
2198 \&Git::SVN::Prompt::username, 2),
2199 ]);
2200 my $config = SVN::Core::config_get_config($config_dir);
2201 my $self = SVN::Ra->new(url => $url, auth => $baton,
2202 config => $config,
2203 pool => SVN::Pool->new,
2204 auth_provider_callbacks => $callbacks);
2205 $self->{svn_path} = $url;
2206 $self->{repos_root} = $self->get_repos_root;
2207 $self->{svn_path} =~ s#^\Q$self->{repos_root}\E/*##;
2208 $RA = bless $self, $class;
2209 }
2210
2211 sub DESTROY {
2212 # do not call the real DESTROY since we store ourselves in $RA
2213 }
2214
2215 sub get_log {
2216 my ($self, @args) = @_;
2217 my $pool = SVN::Pool->new;
2218 splice(@args, 3, 1) if ($SVN::Core::VERSION le '1.2.0');
2219 my $ret = $self->SUPER::get_log(@args, $pool);
2220 $pool->clear;
2221 $ret;
2222 }
2223
2224 sub get_commit_editor {
2225 my ($self, $log, $cb, $pool) = @_;
2226 my @lock = $SVN::Core::VERSION ge '1.2.0' ? (undef, 0) : ();
2227 $self->SUPER::get_commit_editor($log, $cb, @lock, $pool);
2228 }
2229
2230 sub uuid {
2231 my ($self) = @_;
2232 $self->{uuid} ||= $self->get_uuid;
2233 }
2234
2235 sub gs_do_update {
2236 my ($self, $rev_a, $rev_b, $gs, $editor) = @_;
2237 my $new = ($rev_a == $rev_b);
2238 my $path = $gs->{path};
2239
2240 my $ta = $self->check_path($path, $rev_a);
2241 my $tb = $new ? $ta : $self->check_path($path, $rev_b);
2242 return 1 if ($tb != $SVN::Node::dir && $ta != $SVN::Node::dir);
2243 if ($ta == $SVN::Node::none) {
2244 $rev_a = $rev_b;
2245 $new = 1;
2246 }
2247
2248 my $pool = SVN::Pool->new;
2249 $editor->set_path_strip($path);
2250 my (@pc) = split m#/#, $path;
2251 my $reporter = $self->do_update($rev_b, (@pc ? shift @pc : ''),
2252 1, $editor, $pool);
2253 my @lock = $SVN::Core::VERSION ge '1.2.0' ? (undef) : ();
2254
2255 # Since we can't rely on svn_ra_reparent being available, we'll
2256 # just have to do some magic with set_path to make it so
2257 # we only want a partial path.
2258 my $sp = '';
2259 my $final = join('/', @pc);
2260 while (@pc) {
2261 $reporter->set_path($sp, $rev_b, 0, @lock, $pool);
2262 $sp .= '/' if length $sp;
2263 $sp .= shift @pc;
2264 }
2265 die "BUG: '$sp' != '$final'\n" if ($sp ne $final);
2266
2267 $reporter->set_path($sp, $rev_a, $new, @lock, $pool);
2268
2269 $reporter->finish_report($pool);
2270 $pool->clear;
2271 $editor->{git_commit_ok};
2272 }
2273
2274 # this requires SVN 1.4.3 or later (do_switch didn't work before 1.4.3, and
2275 # svn_ra_reparent didn't work before 1.4)
2276 sub gs_do_switch {
2277 my ($self, $rev_a, $rev_b, $gs, $url_b, $editor) = @_;
2278 my $path = $gs->{path};
2279 my $pool = SVN::Pool->new;
2280
2281 my $full_url = $self->{url};
2282 my $old_url = $full_url;
2283 $full_url .= "/$path" if length $path;
2284 my ($ra, $reparented);
2285 if ($old_url ne $full_url) {
2286 if ($old_url !~ m#^svn(\+ssh)?://#) {
2287 SVN::_Ra::svn_ra_reparent($self->{session}, $full_url,
2288 $pool);
2289 $self->{url} = $full_url;
2290 $reparented = 1;
2291 } else {
2292 $ra = Git::SVN::Ra->new($full_url);
2293 }
2294 }
2295 $ra ||= $self;
2296 my $reporter = $ra->do_switch($rev_b, '', 1, $url_b, $editor, $pool);
2297 my @lock = $SVN::Core::VERSION ge '1.2.0' ? (undef) : ();
2298 $reporter->set_path('', $rev_a, 0, @lock, $pool);
2299 $reporter->finish_report($pool);
2300
2301 if ($reparented) {
2302 SVN::_Ra::svn_ra_reparent($self->{session}, $old_url, $pool);
2303 $self->{url} = $old_url;
2304 }
2305
2306 $pool->clear;
2307 $editor->{git_commit_ok};
2308 }
2309
2310 sub gs_fetch_loop_common {
2311 my ($self, $base, $head, @gs) = @_;
2312 my $inc = 1000;
2313 my ($min, $max) = ($base, $head < $base + $inc ? $head : $base + $inc);
2314 my @paths = @gs == 1 ? ($gs[0]->{path}) : ('');
2315 foreach my $gs (@gs) {
2316 if (my $last_commit = $gs->last_commit) {
2317 $gs->assert_index_clean($last_commit);
2318 }
2319 }
2320 while (1) {
2321 my @revs;
2322 my $err;
2323 my $err_handler = $SVN::Error::handler;
2324 $SVN::Error::handler = sub {
2325 ($err) = @_;
2326 skip_unknown_revs($err);
2327 };
2328 $self->get_log(\@paths, $min, $max, 0, 1, 1,
2329 sub { push @revs, [ dup_changed_paths($_[0]), $_[1] ]; });
2330 $SVN::Error::handler = $err_handler;
2331
2332 if (! @revs && $err && $max >= $head) {
2333 print STDERR "Branch probably deleted:\n ",
2334 $err->expanded_message,
2335 "\nWill attempt to follow revisions ",
2336 "r$min .. r$max ",
2337 "committed before the deletion\n";
2338 @revs = map { [ undef, $_ ] } ($min .. $max);
2339 }
2340 foreach (@revs) {
2341 my ($paths, $r) = @$_;
2342 foreach my $gs (@gs) {
2343 if ($paths) {
2344 $gs->match_paths($paths) or next;
2345 }
2346 my $lr = $gs->last_rev;
2347 next if defined $lr && $lr >= $r;
2348 next if defined $gs->rev_db_get($r);
2349 if (my $log_entry = $gs->do_fetch($paths, $r)) {
2350 $gs->do_git_commit($log_entry);
2351 }
2352 }
2353 }
2354 last if $max >= $head;
2355 $min = $max + 1;
2356 $max += $inc;
2357 $max = $head if ($max > $head);
2358 }
2359 }
2360
2361 sub minimize_url {
2362 my ($self) = @_;
2363 return $self->{url} if ($self->{url} eq $self->{repos_root});
2364 my $url = $self->{repos_root};
2365 my @components = split(m!/!, $self->{svn_path});
2366 my $c = '';
2367 do {
2368 $url .= "/$c" if length $c;
2369 eval { (ref $self)->new($url)->get_latest_revnum };
2370 } while ($@ && ($c = shift @components));
2371 $url;
2372 }
2373
2374 sub can_do_switch {
2375 my $self = shift;
2376 unless (defined $can_do_switch) {
2377 my $pool = SVN::Pool->new;
2378 my $rep = eval {
2379 $self->do_switch(1, '', 0, $self->{url},
2380 SVN::Delta::Editor->new, $pool);
2381 };
2382 if ($@) {
2383 $can_do_switch = 0;
2384 } else {
2385 $rep->abort_report($pool);
2386 $can_do_switch = 1;
2387 }
2388 $pool->clear;
2389 }
2390 $can_do_switch;
2391 }
2392
2393 sub skip_unknown_revs {
2394 my ($err) = @_;
2395 my $errno = $err->apr_err();
2396 # Maybe the branch we're tracking didn't
2397 # exist when the repo started, so it's
2398 # not an error if it doesn't, just continue
2399 #
2400 # Wonderfully consistent library, eh?
2401 # 160013 - svn:// and file://
2402 # 175002 - http(s)://
2403 # 175007 - http(s):// (this repo required authorization, too...)
2404 # More codes may be discovered later...
2405 if ($errno == 175007 || $errno == 175002 || $errno == 160013) {
2406 return;
2407 }
2408 die "Error from SVN, ($errno): ", $err->expanded_message,"\n";
2409 }
2410
2411 # svn_log_changed_path_t objects passed to get_log are likely to be
2412 # overwritten even if only the refs are copied to an external variable,
2413 # so we should dup the structures in their entirety. Using an externally
2414 # passed pool (instead of our temporary and quickly cleared pool in
2415 # Git::SVN::Ra) does not help matters at all...
2416 sub dup_changed_paths {
2417 my ($paths) = @_;
2418 return undef unless $paths;
2419 my %ret;
2420 foreach my $p (keys %$paths) {
2421 my $i = $paths->{$p};
2422 my %s = map { $_ => $i->$_ }
2423 qw/copyfrom_path copyfrom_rev action/;
2424 $ret{$p} = \%s;
2425 }
2426 \%ret;
2427 }
2428
2429 package Git::SVN::Log;
2430 use strict;
2431 use warnings;
2432 use POSIX qw/strftime/;
2433 use vars qw/$TZ $limit $color $pager $non_recursive $verbose $oneline
2434 %rusers $show_commit $incremental/;
2435 my $l_fmt;
2436
2437 sub cmt_showable {
2438 my ($c) = @_;
2439 return 1 if defined $c->{r};
2440 if ($c->{l} && $c->{l}->[-1] eq "...\n" &&
2441 $c->{a_raw} =~ /\@([a-f\d\-]+)>$/) {
2442 my @log = command(qw/cat-file commit/, $c->{c});
2443 shift @log while ($log[0] ne "\n");
2444 shift @log;
2445 @{$c->{l}} = grep !/^git-svn-id: /, @log;
2446
2447 (undef, $c->{r}, undef) = ::extract_metadata(
2448 (grep(/^git-svn-id: /, @log))[-1]);
2449 }
2450 return defined $c->{r};
2451 }
2452
2453 sub log_use_color {
2454 return 1 if $color;
2455 my ($dc, $dcvar);
2456 $dcvar = 'color.diff';
2457 $dc = `git-config --get $dcvar`;
2458 if ($dc eq '') {
2459 # nothing at all; fallback to "diff.color"
2460 $dcvar = 'diff.color';
2461 $dc = `git-config --get $dcvar`;
2462 }
2463 chomp($dc);
2464 if ($dc eq 'auto') {
2465 my $pc;
2466 $pc = `git-config --get color.pager`;
2467 if ($pc eq '') {
2468 # does not have it -- fallback to pager.color
2469 $pc = `git-config --bool --get pager.color`;
2470 }
2471 else {
2472 $pc = `git-config --bool --get color.pager`;
2473 if ($?) {
2474 $pc = 'false';
2475 }
2476 }
2477 chomp($pc);
2478 if (-t *STDOUT || (defined $pager && $pc eq 'true')) {
2479 return ($ENV{TERM} && $ENV{TERM} ne 'dumb');
2480 }
2481 return 0;
2482 }
2483 return 0 if $dc eq 'never';
2484 return 1 if $dc eq 'always';
2485 chomp($dc = `git-config --bool --get $dcvar`);
2486 return ($dc eq 'true');
2487 }
2488
2489 sub git_svn_log_cmd {
2490 my ($r_min, $r_max) = @_;
2491 my $gs = Git::SVN->_new;
2492 my @cmd = (qw/log --abbrev-commit --pretty=raw --default/,
2493 $gs->refname);
2494 push @cmd, '-r' unless $non_recursive;
2495 push @cmd, qw/--raw --name-status/ if $verbose;
2496 push @cmd, '--color' if log_use_color();
2497 return @cmd unless defined $r_max;
2498 if ($r_max == $r_min) {
2499 push @cmd, '--max-count=1';
2500 if (my $c = $gs->rev_db_get($r_max)) {
2501 push @cmd, $c;
2502 }
2503 } else {
2504 my ($c_min, $c_max);
2505 $c_max = $gs->rev_db_get($r_max);
2506 $c_min = $gs->rev_db_get($r_min);
2507 if (defined $c_min && defined $c_max) {
2508 if ($r_max > $r_max) {
2509 push @cmd, "$c_min..$c_max";
2510 } else {
2511 push @cmd, "$c_max..$c_min";
2512 }
2513 } elsif ($r_max > $r_min) {
2514 push @cmd, $c_max;
2515 } else {
2516 push @cmd, $c_min;
2517 }
2518 }
2519 return @cmd;
2520 }
2521
2522 # adapted from pager.c
2523 sub config_pager {
2524 $pager ||= $ENV{GIT_PAGER} || $ENV{PAGER};
2525 if (!defined $pager) {
2526 $pager = 'less';
2527 } elsif (length $pager == 0 || $pager eq 'cat') {
2528 $pager = undef;
2529 }
2530 }
2531
2532 sub run_pager {
2533 return unless -t *STDOUT;
2534 pipe my $rfd, my $wfd or return;
2535 defined(my $pid = fork) or ::fatal "Can't fork: $!\n";
2536 if (!$pid) {
2537 open STDOUT, '>&', $wfd or
2538 ::fatal "Can't redirect to stdout: $!\n";
2539 return;
2540 }
2541 open STDIN, '<&', $rfd or ::fatal "Can't redirect stdin: $!\n";
2542 $ENV{LESS} ||= 'FRSX';
2543 exec $pager or ::fatal "Can't run pager: $! ($pager)\n";
2544 }
2545
2546 sub tz_to_s_offset {
2547 my ($tz) = @_;
2548 $tz =~ s/(\d\d)$//;
2549 return ($1 * 60) + ($tz * 3600);
2550 }
2551
2552 sub get_author_info {
2553 my ($dest, $author, $t, $tz) = @_;
2554 $author =~ s/(?:^\s*|\s*$)//g;
2555 $dest->{a_raw} = $author;
2556 my $au;
2557 if ($::_authors) {
2558 $au = $rusers{$author} || undef;
2559 }
2560 if (!$au) {
2561 ($au) = ($author =~ /<([^>]+)\@[^>]+>$/);
2562 }
2563 $dest->{t} = $t;
2564 $dest->{tz} = $tz;
2565 $dest->{a} = $au;
2566 # Date::Parse isn't in the standard Perl distro :(
2567 if ($tz =~ s/^\+//) {
2568 $t += tz_to_s_offset($tz);
2569 } elsif ($tz =~ s/^\-//) {
2570 $t -= tz_to_s_offset($tz);
2571 }
2572 $dest->{t_utc} = $t;
2573 }
2574
2575 sub process_commit {
2576 my ($c, $r_min, $r_max, $defer) = @_;
2577 if (defined $r_min && defined $r_max) {
2578 if ($r_min == $c->{r} && $r_min == $r_max) {
2579 show_commit($c);
2580 return 0;
2581 }
2582 return 1 if $r_min == $r_max;
2583 if ($r_min < $r_max) {
2584 # we need to reverse the print order
2585 return 0 if (defined $limit && --$limit < 0);
2586 push @$defer, $c;
2587 return 1;
2588 }
2589 if ($r_min != $r_max) {
2590 return 1 if ($r_min < $c->{r});
2591 return 1 if ($r_max > $c->{r});
2592 }
2593 }
2594 return 0 if (defined $limit && --$limit < 0);
2595 show_commit($c);
2596 return 1;
2597 }
2598
2599 sub show_commit {
2600 my $c = shift;
2601 if ($oneline) {
2602 my $x = "\n";
2603 if (my $l = $c->{l}) {
2604 while ($l->[0] =~ /^\s*$/) { shift @$l }
2605 $x = $l->[0];
2606 }
2607 $l_fmt ||= 'A' . length($c->{r});
2608 print 'r',pack($l_fmt, $c->{r}),' | ';
2609 print "$c->{c} | " if $show_commit;
2610 print $x;
2611 } else {
2612 show_commit_normal($c);
2613 }
2614 }
2615
2616 sub show_commit_changed_paths {
2617 my ($c) = @_;
2618 return unless $c->{changed};
2619 print "Changed paths:\n", @{$c->{changed}};
2620 }
2621
2622 sub show_commit_normal {
2623 my ($c) = @_;
2624 print '-' x72, "\nr$c->{r} | ";
2625 print "$c->{c} | " if $show_commit;
2626 print "$c->{a} | ", strftime("%Y-%m-%d %H:%M:%S %z (%a, %d %b %Y)",
2627 localtime($c->{t_utc})), ' | ';
2628 my $nr_line = 0;
2629
2630 if (my $l = $c->{l}) {
2631 while ($l->[$#$l] eq "\n" && $#$l > 0
2632 && $l->[($#$l - 1)] eq "\n") {
2633 pop @$l;
2634 }
2635 $nr_line = scalar @$l;
2636 if (!$nr_line) {
2637 print "1 line\n\n\n";
2638 } else {
2639 if ($nr_line == 1) {
2640 $nr_line = '1 line';
2641 } else {
2642 $nr_line .= ' lines';
2643 }
2644 print $nr_line, "\n";
2645 show_commit_changed_paths($c);
2646 print "\n";
2647 print $_ foreach @$l;
2648 }
2649 } else {
2650 print "1 line\n";
2651 show_commit_changed_paths($c);
2652 print "\n";
2653
2654 }
2655 foreach my $x (qw/raw diff/) {
2656 if ($c->{$x}) {
2657 print "\n";
2658 print $_ foreach @{$c->{$x}}
2659 }
2660 }
2661 }
2662
2663 sub cmd_show_log {
2664 my (@args) = @_;
2665 my ($r_min, $r_max);
2666 my $r_last = -1; # prevent dupes
2667 if (defined $TZ) {
2668 $ENV{TZ} = $TZ;
2669 } else {
2670 delete $ENV{TZ};
2671 }
2672 if (defined $::_revision) {
2673 if ($::_revision =~ /^(\d+):(\d+)$/) {
2674 ($r_min, $r_max) = ($1, $2);
2675 } elsif ($::_revision =~ /^\d+$/) {
2676 $r_min = $r_max = $::_revision;
2677 } else {
2678 ::fatal "-r$::_revision is not supported, use ",
2679 "standard \'git log\' arguments instead\n";
2680 }
2681 }
2682
2683 config_pager();
2684 @args = (git_svn_log_cmd($r_min, $r_max), @args);
2685 my $log = command_output_pipe(@args);
2686 run_pager();
2687 my (@k, $c, $d);
2688 my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/;
2689 while (<$log>) {
2690 if (/^${esc_color}commit ($::sha1_short)/o) {
2691 my $cmt = $1;
2692 if ($c && cmt_showable($c) && $c->{r} != $r_last) {
2693 $r_last = $c->{r};
2694 process_commit($c, $r_min, $r_max, \@k) or
2695 goto out;
2696 }
2697 $d = undef;
2698 $c = { c => $cmt };
2699 } elsif (/^${esc_color}author (.+) (\d+) ([\-\+]?\d+)$/o) {
2700 get_author_info($c, $1, $2, $3);
2701 } elsif (/^${esc_color}(?:tree|parent|committer) /o) {
2702 # ignore
2703 } elsif (/^${esc_color}:\d{6} \d{6} $::sha1_short/o) {
2704 push @{$c->{raw}}, $_;
2705 } elsif (/^${esc_color}[ACRMDT]\t/) {
2706 # we could add $SVN->{svn_path} here, but that requires
2707 # remote access at the moment (repo_path_split)...
2708 s#^(${esc_color})([ACRMDT])\t#$1 $2 #o;
2709 push @{$c->{changed}}, $_;
2710 } elsif (/^${esc_color}diff /o) {
2711 $d = 1;
2712 push @{$c->{diff}}, $_;
2713 } elsif ($d) {
2714 push @{$c->{diff}}, $_;
2715 } elsif (/^${esc_color} (git-svn-id:.+)$/o) {
2716 ($c->{url}, $c->{r}, undef) = ::extract_metadata($1);
2717 } elsif (s/^${esc_color} //o) {
2718 push @{$c->{l}}, $_;
2719 }
2720 }
2721 if ($c && defined $c->{r} && $c->{r} != $r_last) {
2722 $r_last = $c->{r};
2723 process_commit($c, $r_min, $r_max, \@k);
2724 }
2725 if (@k) {
2726 my $swap = $r_max;
2727 $r_max = $r_min;
2728 $r_min = $swap;
2729 process_commit($_, $r_min, $r_max) foreach reverse @k;
2730 }
2731 out:
2732 close $log;
2733 print '-' x72,"\n" unless $incremental || $oneline;
2734 }
2735
2736 package Git::SVN::Migration;
2737 # these version numbers do NOT correspond to actual version numbers
2738 # of git nor git-svn. They are just relative.
2739 #
2740 # v0 layout: .git/$id/info/url, refs/heads/$id-HEAD
2741 #
2742 # v1 layout: .git/$id/info/url, refs/remotes/$id
2743 #
2744 # v2 layout: .git/svn/$id/info/url, refs/remotes/$id
2745 #
2746 # v3 layout: .git/svn/$id, refs/remotes/$id
2747 # - info/url may remain for backwards compatibility
2748 # - this is what we migrate up to this layout automatically,
2749 # - this will be used by git svn init on single branches
2750 #
2751 # v4 layout: .git/svn/$repo_id/$id, refs/remotes/$repo_id/$id
2752 # - this is only created for newly multi-init-ed
2753 # repositories. Similar in spirit to the
2754 # --use-separate-remotes option in git-clone (now default)
2755 # - we do not automatically migrate to this (following
2756 # the example set by core git)
2757 use strict;
2758 use warnings;
2759 use Carp qw/croak/;
2760 use File::Path qw/mkpath/;
2761 use File::Basename qw/dirname basename/;
2762 use vars qw/$_minimize/;
2763
2764 sub migrate_from_v0 {
2765 my $git_dir = $ENV{GIT_DIR};
2766 return undef unless -d $git_dir;
2767 my ($fh, $ctx) = command_output_pipe(qw/rev-parse --symbolic --all/);
2768 my $migrated = 0;
2769 while (<$fh>) {
2770 chomp;
2771 my ($id, $orig_ref) = ($_, $_);
2772 next unless $id =~ s#^refs/heads/(.+)-HEAD$#$1#;
2773 next unless -f "$git_dir/$id/info/url";
2774 my $new_ref = "refs/remotes/$id";
2775 if (::verify_ref("$new_ref^0")) {
2776 print STDERR "W: $orig_ref is probably an old ",
2777 "branch used by an ancient version of ",
2778 "git-svn.\n",
2779 "However, $new_ref also exists.\n",
2780 "We will not be able ",
2781 "to use this branch until this ",
2782 "ambiguity is resolved.\n";
2783 next;
2784 }
2785 print STDERR "Migrating from v0 layout...\n" if !$migrated;
2786 print STDERR "Renaming ref: $orig_ref => $new_ref\n";
2787 command_noisy('update-ref', $new_ref, $orig_ref);
2788 command_noisy('update-ref', '-d', $orig_ref, $orig_ref);
2789 $migrated++;
2790 }
2791 command_close_pipe($fh, $ctx);
2792 print STDERR "Done migrating from v0 layout...\n" if $migrated;
2793 $migrated;
2794 }
2795
2796 sub migrate_from_v1 {
2797 my $git_dir = $ENV{GIT_DIR};
2798 my $migrated = 0;
2799 return $migrated unless -d $git_dir;
2800 my $svn_dir = "$git_dir/svn";
2801
2802 # just in case somebody used 'svn' as their $id at some point...
2803 return $migrated if -d $svn_dir && ! -f "$svn_dir/info/url";
2804
2805 print STDERR "Migrating from a git-svn v1 layout...\n";
2806 mkpath([$svn_dir]);
2807 print STDERR "Data from a previous version of git-svn exists, but\n\t",
2808 "$svn_dir\n\t(required for this version ",
2809 "($::VERSION) of git-svn) does not. exist\n";
2810 my ($fh, $ctx) = command_output_pipe(qw/rev-parse --symbolic --all/);
2811 while (<$fh>) {
2812 my $x = $_;
2813 next unless $x =~ s#^refs/remotes/##;
2814 chomp $x;
2815 next unless -f "$git_dir/$x/info/url";
2816 my $u = eval { ::file_to_s("$git_dir/$x/info/url") };
2817 next unless $u;
2818 my $dn = dirname("$git_dir/svn/$x");
2819 mkpath([$dn]) unless -d $dn;
2820 if ($x eq 'svn') { # they used 'svn' as GIT_SVN_ID:
2821 mkpath(["$git_dir/svn/svn"]);
2822 print STDERR " - $git_dir/$x/info => ",
2823 "$git_dir/svn/$x/info\n";
2824 rename "$git_dir/$x/info", "$git_dir/svn/$x/info" or
2825 croak "$!: $x";
2826 # don't worry too much about these, they probably
2827 # don't exist with repos this old (save for index,
2828 # and we can easily regenerate that)
2829 foreach my $f (qw/unhandled.log index .rev_db/) {
2830 rename "$git_dir/$x/$f", "$git_dir/svn/$x/$f";
2831 }
2832 } else {
2833 print STDERR " - $git_dir/$x => $git_dir/svn/$x\n";
2834 rename "$git_dir/$x", "$git_dir/svn/$x" or
2835 croak "$!: $x";
2836 }
2837 $migrated++;
2838 }
2839 command_close_pipe($fh, $ctx);
2840 print STDERR "Done migrating from a git-svn v1 layout\n";
2841 $migrated;
2842 }
2843
2844 sub read_old_urls {
2845 my ($l_map, $pfx, $path) = @_;
2846 my @dir;
2847 foreach (<$path/*>) {
2848 if (-r "$_/info/url") {
2849 $pfx .= '/' if $pfx && $pfx !~ m!/$!;
2850 my $ref_id = $pfx . basename $_;
2851 my $url = ::file_to_s("$_/info/url");
2852 $l_map->{$ref_id} = $url;
2853 } elsif (-d $_) {
2854 push @dir, $_;
2855 }
2856 }
2857 foreach (@dir) {
2858 my $x = $_;
2859 $x =~ s!^\Q$ENV{GIT_DIR}\E/svn/!!o;
2860 read_old_urls($l_map, $x, $_);
2861 }
2862 }
2863
2864 sub migrate_from_v2 {
2865 my @cfg = command(qw/config -l/);
2866 return if grep /^svn-remote\..+\.url=/, @cfg;
2867 my %l_map;
2868 read_old_urls(\%l_map, '', "$ENV{GIT_DIR}/svn");
2869 my $migrated = 0;
2870
2871 foreach my $ref_id (sort keys %l_map) {
2872 Git::SVN->init($l_map{$ref_id}, '', $ref_id, $ref_id);
2873 $migrated++;
2874 }
2875 $migrated;
2876 }
2877
2878 sub minimize_connections {
2879 my $r = Git::SVN::read_all_remotes();
2880 my $new_urls = {};
2881 my $root_repos = {};
2882 foreach my $repo_id (keys %$r) {
2883 my $url = $r->{$repo_id}->{url} or next;
2884 my $fetch = $r->{$repo_id}->{fetch} or next;
2885 my $ra = Git::SVN::Ra->new($url);
2886
2887 # skip existing cases where we already connect to the root
2888 if (($ra->{url} eq $ra->{repos_root}) ||
2889 (Git::SVN::sanitize_remote_name($ra->{repos_root}) eq
2890 $repo_id)) {
2891 $root_repos->{$ra->{url}} = $repo_id;
2892 next;
2893 }
2894
2895 my $root_ra = Git::SVN::Ra->new($ra->{repos_root});
2896 my $root_path = $ra->{url};
2897 $root_path =~ s#^\Q$ra->{repos_root}\E/*##;
2898 foreach my $path (keys %$fetch) {
2899 my $ref_id = $fetch->{$path};
2900 my $gs = Git::SVN->new($ref_id, $repo_id, $path);
2901
2902 # make sure we can read when connecting to
2903 # a higher level of a repository
2904 my ($last_rev, undef) = $gs->last_rev_commit;
2905 if (!defined $last_rev) {
2906 $last_rev = eval {
2907 $root_ra->get_latest_revnum;
2908 };
2909 next if $@;
2910 }
2911 my $new = $root_path;
2912 $new .= length $path ? "/$path" : '';
2913 eval {
2914 $root_ra->get_log([$new], $last_rev, $last_rev,
2915 0, 0, 1, sub { });
2916 };
2917 next if $@;
2918 $new_urls->{$ra->{repos_root}}->{$new} =
2919 { ref_id => $ref_id,
2920 old_repo_id => $repo_id,
2921 old_path => $path };
2922 }
2923 }
2924
2925 my @emptied;
2926 foreach my $url (keys %$new_urls) {
2927 # see if we can re-use an existing [svn-remote "repo_id"]
2928 # instead of creating a(n ugly) new section:
2929 my $repo_id = $root_repos->{$url} ||
2930 Git::SVN::sanitize_remote_name($url);
2931
2932 my $fetch = $new_urls->{$url};
2933 foreach my $path (keys %$fetch) {
2934 my $x = $fetch->{$path};
2935 Git::SVN->init($url, $path, $repo_id, $x->{ref_id});
2936 my $pfx = "svn-remote.$x->{old_repo_id}";
2937
2938 my $old_fetch = quotemeta("$x->{old_path}:".
2939 "refs/remotes/$x->{ref_id}");
2940 command_noisy(qw/config --unset/,
2941 "$pfx.fetch", '^'. $old_fetch . '$');
2942 delete $r->{$x->{old_repo_id}}->
2943 {fetch}->{$x->{old_path}};
2944 if (!keys %{$r->{$x->{old_repo_id}}->{fetch}}) {
2945 command_noisy(qw/config --unset/,
2946 "$pfx.url");
2947 push @emptied, $x->{old_repo_id}
2948 }
2949 }
2950 }
2951 if (@emptied) {
2952 my $file = $ENV{GIT_CONFIG} || $ENV{GIT_CONFIG_LOCAL} ||
2953 "$ENV{GIT_DIR}/config";
2954 print STDERR <<EOF;
2955 The following [svn-remote] sections in your config file ($file) are empty
2956 and can be safely removed:
2957 EOF
2958 print STDERR "[svn-remote \"$_\"]\n" foreach @emptied;
2959 }
2960 }
2961
2962 sub migration_check {
2963 migrate_from_v0();
2964 migrate_from_v1();
2965 migrate_from_v2();
2966 minimize_connections() if $_minimize;
2967 }
2968
2969 package Git::IndexInfo;
2970 use strict;
2971 use warnings;
2972 use Git qw/command_input_pipe command_close_pipe/;
2973
2974 sub new {
2975 my ($class) = @_;
2976 my ($gui, $ctx) = command_input_pipe(qw/update-index -z --index-info/);
2977 bless { gui => $gui, ctx => $ctx, nr => 0}, $class;
2978 }
2979
2980 sub remove {
2981 my ($self, $path) = @_;
2982 if (print { $self->{gui} } '0 ', 0 x 40, "\t", $path, "\0") {
2983 return ++$self->{nr};
2984 }
2985 undef;
2986 }
2987
2988 sub update {
2989 my ($self, $mode, $hash, $path) = @_;
2990 if (print { $self->{gui} } $mode, ' ', $hash, "\t", $path, "\0") {
2991 return ++$self->{nr};
2992 }
2993 undef;
2994 }
2995
2996 sub DESTROY {
2997 my ($self) = @_;
2998 command_close_pipe($self->{gui}, $self->{ctx});
2999 }
3000
3001 __END__
3002
3003 Data structures:
3004
3005 $log_entry hashref as returned by libsvn_log_entry()
3006 {
3007 log => 'whitespace-formatted log entry
3008 ', # trailing newline is preserved
3009 revision => '8', # integer
3010 date => '2004-02-24T17:01:44.108345Z', # commit date
3011 author => 'committer name'
3012 };
3013
3014
3015 # this is generated by generate_diff();
3016 @mods = array of diff-index line hashes, each element represents one line
3017 of diff-index output
3018
3019 diff-index line ($m hash)
3020 {
3021 mode_a => first column of diff-index output, no leading ':',
3022 mode_b => second column of diff-index output,
3023 sha1_b => sha1sum of the final blob,
3024 chg => change type [MCRADT],
3025 file_a => original file name of a file (iff chg is 'C' or 'R')
3026 file_b => new/current file name of a file (any chg)
3027 }
3028 ;
3029
3030 # retval of read_url_paths{,_all}();
3031 $l_map = {
3032 # repository root url
3033 'https://svn.musicpd.org' => {
3034 # repository path # GIT_SVN_ID
3035 'mpd/trunk' => 'trunk',
3036 'mpd/tags/0.11.5' => 'tags/0.11.5',
3037 },
3038 }
3039
3040 Notes:
3041 I don't trust the each() function on unless I created %hash myself
3042 because the internal iterator may not have started at base.
Dscho's miscellaneous git branches