@matheusbsbs / matheus-bagliano / commits / fbcc1737d6
Fork 0

git-svn: reintroduce using a single get_log() to fetch

We'll need to rely on path matching to handle wildcard support for branches and tags. Signed-off-by: Eric Wong <normalperson@yhbt.net>

Eric Wong committed Feb 6, 2007 at 18:35 UTC fbcc1737d61f2b83846c59a7cc0d820e09833350
1 file changed +49 -54
git-svn.perl
+49 -54
@@ -1112,6 +1112,24 @@ sub do_git_commit {
1112 return $commit;
1113 }
1114
1115 +sub match_paths {
1116 + my ($self, $paths, $r) = @_;
1117 + $self->{path_regex} ||= qr/^\/\Q$self->{path}\E\/?/;
1118 + if (grep /$self->{path_regex}/, keys %$paths) {
1119 + return 1;
1120 + }
1121 + my $c = '';
1122 + foreach (split m#/#, $self->{path}) {
1123 + $c .= "/$_";
1124 + next unless ($paths->{$c} && ($paths->{$c}->{action} eq 'A'));
1125 + my @x = eval { $self->ra->get_dir($self->{path}, $r) };
1126 + if (scalar @x == 3) {
1127 + return 1;
1128 + }
1129 + }
1130 + return 0;
1131 +}
1132 +
1133 sub find_parent_branch {
1134 my ($self, $paths, $rev) = @_;
1135 return undef unless $_follow_parent;
@@ -1308,15 +1326,21 @@ sub make_log_entry {
1326 print $un $_, "\n" foreach @$untracked;
1327 my %log_entry = ( parents => $parents || [], revision => $rev,
1328 log => '');
1311 - my $rp = $self->ra->rev_proplist($rev);
1312 - foreach (sort keys %$rp) {
1313 - my $v = $rp->{$_};
1314 - if (/^svn:(author|date|log)$/) {
1315 - $log_entry{$1} = $v;
1316 - } else {
1317 - print $un " rev_prop: ", uri_encode($_), ' ',
1318 - uri_encode($v), "\n";
1329 +
1330 + my $logged = delete $self->{logged_rev_props};
1331 + if (!$logged || $self->{-want_extra_revprops}) {
1332 + my $rp = $self->ra->rev_proplist($rev);
1333 + foreach (sort keys %$rp) {
1334 + my $v = $rp->{$_};
1335 + if (/^svn:(author|date|log)$/) {
1336 + $log_entry{$1} = $v;
1337 + } else {
1338 + print $un " rev_prop: ", uri_encode($_), ' ',
1339 + uri_encode($v), "\n";
1340 + }
1341 }
1342 + } else {
1343 + map { $log_entry{$_} = $logged->{$_} } keys %$logged;
1344 }
1345 close $un or croak $!;
1346
@@ -2416,55 +2440,26 @@ sub gs_fetch_loop_common {
2440 }
2441 while (1) {
2442 my %revs;
2419 - my $err;
2443 my $err_handler = $SVN::Error::handler;
2421 - $SVN::Error::handler = sub {
2422 - ($err) = @_;
2423 - skip_unknown_revs($err);
2424 - };
2425 - foreach my $gs (@gs) {
2426 - my $min_r = $min;
2427 - my $rdb_max = $gs->rev_db_max;
2428 - next if $rdb_max >= $max;
2429 - $min_r = $rdb_max + 1 if ($rdb_max > $min_r);
2430 - $self->get_log([$gs->{path}], $min_r, $max,
2431 - 0, 1, 1, sub
2432 - { my ($paths, $rev) = @_;
2433 - push @{$revs{$rev}},
2434 - [ $gs,
2435 - dup_changed_paths($paths) ] });
2436 -
2437 - next unless ($err && $max >= $head);
2438 -
2439 - print STDERR "Path '$gs->{path}' ",
2440 - "was probably deleted:\n",
2441 - $err->expanded_message,
2442 - "\nWill attempt to follow ",
2443 - "revisions r$min .. r$max ",
2444 - "committed before the deletion\n";
2445 - my $hi = $max;
2446 - while (--$hi >= $min) {
2447 - my $ok;
2448 - $self->get_log([$gs->{path}], $min, $hi,
2449 - 0, 1, 1, sub {
2450 - my ($paths, $rev) = @_;
2451 - $ok = $rev;
2452 - push @{$revs{$rev}}, [ $gs,
2453 - dup_changed_paths($_[0])]});
2454 - if ($ok) {
2455 - print STDERR "r$min .. r$ok OK\n";
2456 - last;
2457 - }
2458 - }
2459 - }
2444 + $SVN::Error::handler = \&skip_unknown_revs;
2445 + $self->get_log([''], $min, $max, 0, 1, 1, sub {
2446 + my ($paths, $r, $author, $date, $log) = @_;
2447 + $revs{$r} = [ dup_changed_paths($paths),
2448 + { author => $author,
2449 + date => $date,
2450 + log => $log } ] });
2451 $SVN::Error::handler = $err_handler;
2452 +
2453 foreach my $r (sort {$a <=> $b} keys %revs) {
2462 - foreach (@{$revs{$r}}) {
2463 - my ($gs, $paths) = @$_;
2464 - my $lr = $gs->last_rev;
2465 - next if defined $lr && $lr >= $r;
2466 - next if defined $gs->rev_db_get($r);
2467 - if (my $log_entry = $gs->do_fetch($paths, $r)) {
2454 + my ($paths, $logged) = @{$revs{$r}};
2455 + foreach my $gs (@gs) {
2456 + if ($gs->rev_db_max >= $r) {
2457 + next;
2458 + }
2459 + next unless $gs->match_paths($paths, $r);
2460 + $gs->{logged_rev_props} = $logged;
2461 + my $log_entry = $gs->do_fetch($paths, $r);
2462 + if ($log_entry) {
2463 $gs->do_git_commit($log_entry);
2464 }
2465 }