@matheusbsbs / matheus-bagliano / commits / 15710b6f34
Fork 0

git-svn: fix --follow-parent to work with Git::SVN

While we're at it, beef up the test because I was getting false-passes during development. Signed-off-by: Eric Wong <normalperson@yhbt.net>

Eric Wong committed Jan 22, 2007 at 02:20 UTC 15710b6f34da26d30079dbc83c797a8335040b75
2 files changed +110 -92
git-svn.perl
+106 -90
@@ -790,6 +790,16 @@ sub ra {
790 $self->{ra} ||= Git::SVN::Ra->new($self->{url});
791 }
792
793 +sub rel_path {
794 + my ($self) = @_;
795 + my $repos_root = $self->ra->{repos_root};
796 + return $self->{path} if ($self->{url} eq $repos_root);
797 + my $url = $self->{url} .
798 + (length $self->{path} ? "/$self->{path}" : $self->{path});
799 + $url =~ s!^\Q$repos_root\E/*!!g;
800 + $url;
801 +}
802 +
803 sub copy_remote_ref {
804 my ($self) = @_;
805 my $origin = $::_cp_remote ? $::_cp_remote : 'origin';
@@ -998,16 +1008,97 @@ sub do_git_commit {
1008 return $commit;
1009 }
1010
1011 +sub revisions_eq {
1012 + my ($self, $r0, $r1) = @_;
1013 + return 1 if $r0 == $r1;
1014 + my $nr = 0;
1015 + $self->ra->get_log([$self->{path}], $r0, $r1,
1016 + 0, 0, 1, sub { $nr++ });
1017 + return 0 if ($nr > 1);
1018 + return 1;
1019 +}
1020 +
1021 +sub find_parent_branch {
1022 + my ($self, $paths, $rev) = @_;
1023 +
1024 + # look for a parent from another branch:
1025 + my $i = $paths->{'/'.$self->rel_path} or return;
1026 + my $branch_from = $i->copyfrom_path or return;
1027 + my $r = $i->copyfrom_rev;
1028 + my $repos_root = $self->ra->{repos_root};
1029 + my $url = $self->ra->{url};
1030 + my $new_url = $repos_root . $branch_from;
1031 + print STDERR "Found possible branch point: ",
1032 + "$new_url => ", $self->full_url, ", $r\n";
1033 + $branch_from =~ s#^/##;
1034 + my $remotes = read_all_remotes();
1035 + my $gs;
1036 + foreach my $repo_id (keys %$remotes) {
1037 + my $u = $remotes->{$repo_id}->{url} or next;
1038 + next if $url ne $u;
1039 + my $fetch = $remotes->{$repo_id}->{fetch};
1040 + foreach my $f (keys %$fetch) {
1041 + next if $f ne $branch_from;
1042 + $gs = Git::SVN->new($fetch->{$f}, $repo_id, $f);
1043 + last;
1044 + }
1045 + last if $gs;
1046 + }
1047 + unless ($gs) {
1048 + my $ref_id = $branch_from;
1049 + $ref_id .= "\@$r" if find_ref($ref_id);
1050 + # just grow a tail if we're not unique enough :x
1051 + $ref_id .= '-' while find_ref($ref_id);
1052 + $gs = Git::SVN->init($new_url, '', $ref_id, $ref_id);
1053 + }
1054 + my ($r0, $parent) = $gs->find_rev_before($r, 1);
1055 + if ($::_follow_parent && (!defined $r0 || !defined $parent)) {
1056 + foreach (0 .. $r) {
1057 + my $log_entry = eval { $gs->do_fetch(undef, $_) };
1058 + $gs->do_git_commit($log_entry) if $log_entry;
1059 + }
1060 + ($r0, $parent) = $gs->last_rev_commit;
1061 + }
1062 + if (defined $r0 && defined $parent && $gs->revisions_eq($r0, $r)) {
1063 + print STDERR "Found branch parent: ($self->{ref_id}) $parent\n";
1064 + command_noisy('read-tree', $parent);
1065 + my $ed;
1066 + if ($self->ra->can_do_switch) {
1067 + # do_switch works with svn/trunk >= r22312, but that
1068 + # is not included with SVN 1.4.2 (the latest version
1069 + # at the moment), so we can't rely on it
1070 + $self->{last_commit} = $parent;
1071 + $ed = SVN::Git::Fetcher->new($self);
1072 + $gs->ra->gs_do_switch($r0, $rev, $gs->{path}, 1,
1073 + $self->full_url, $ed)
1074 + or die "SVN connection failed somewhere...\n";
1075 + } else {
1076 + $ed = SVN::Git::Fetcher->new($self);
1077 + $self->ra->gs_do_update($rev, $rev, $self->{path},
1078 + 1, $ed)
1079 + or die "SVN connection failed somewhere...\n";
1080 + }
1081 + return $self->make_log_entry($rev, [$parent], $ed);
1082 + }
1083 + print STDERR "Branch parent not found...\n";
1084 + return undef;
1085 +}
1086 +
1087 sub do_fetch {
1088 my ($self, $paths, $rev) = @_;
1003 - my $ed = SVN::Git::Fetcher->new($self);
1089 + my $ed;
1090 my ($last_rev, @parents);
1091 if ($self->{last_commit}) {
1092 + $ed = SVN::Git::Fetcher->new($self);
1093 $last_rev = $self->{last_rev};
1094 $ed->{c} = $self->{last_commit};
1095 @parents = ($self->{last_commit});
1096 } else {
1097 $last_rev = $rev;
1098 + if (my $log_entry = $self->find_parent_branch($paths, $rev)) {
1099 + return $log_entry;
1100 + }
1101 + $ed = SVN::Git::Fetcher->new($self);
1102 }
1103 unless ($self->ra->gs_do_update($last_rev, $rev,
1104 $self->{path}, 1, $ed)) {
@@ -1120,9 +1211,9 @@ sub fetch {
1211 my @revs;
1212 $self->ra->get_log([''], $min, $max, 0, 1, 1, sub {
1213 my ($paths, $rev, $author, $date, $log) = @_;
1123 - push @revs, $rev });
1214 + push @revs, [ $paths, $rev ] });
1215 foreach (@revs) {
1125 - my $log_entry = $self->do_fetch(undef, $_);
1216 + my $log_entry = $self->do_fetch(@$_);
1217 $self->do_git_commit($log_entry, @parents);
1218 }
1219 last if $max >= $head;
@@ -1232,6 +1323,18 @@ sub rev_db_get {
1323 $ret;
1324 }
1325
1326 +sub find_rev_before {
1327 + my ($self, $rev, $eq_ok) = @_;
1328 + --$rev unless $eq_ok;
1329 + while ($rev > 0) {
1330 + if (my $c = $self->rev_db_get($rev)) {
1331 + return ($rev, $c);
1332 + }
1333 + --$rev;
1334 + }
1335 + return (undef, undef);
1336 +}
1337 +
1338 sub _new {
1339 my ($class, $repo_id, $ref_id, $path) = @_;
1340 unless (defined $repo_id && length $repo_id) {
@@ -1398,93 +1501,6 @@ sub uri_decode {
1501 $f
1502 }
1503
1401 -sub revisions_eq {
1402 - my ($path, $r0, $r1) = @_;
1403 - return 1 if $r0 == $r1;
1404 - my $nr = 0;
1405 - # should be OK to use Pool here (r1 - r0) should be small
1406 - $SVN->get_log([$path], $r0, $r1, 0, 0, 1, sub {$nr++});
1407 - return 0 if ($nr > 1);
1408 - return 1;
1409 -}
1410 -
1411 -sub libsvn_find_parent_branch {
1412 - my ($paths, $rev, $author, $date, $log) = @_;
1413 - my $svn_path = '/'.$SVN->{svn_path};
1414 -
1415 - # look for a parent from another branch:
1416 - my $i = $paths->{$svn_path} or return;
1417 - my $branch_from = $i->copyfrom_path or return;
1418 - my $r = $i->copyfrom_rev;
1419 - print STDERR "Found possible branch point: ",
1420 - "$branch_from => $svn_path, $r\n";
1421 - $branch_from =~ s#^/##;
1422 - my $l_map = {};
1423 - read_url_paths_all($l_map, '', "$GIT_DIR/svn");
1424 - my $url = $SVN->{repos_root};
1425 - defined $l_map->{$url} or return;
1426 - my $id = $l_map->{$url}->{$branch_from};
1427 - if (!defined $id && $_follow_parent) {
1428 - print STDERR "Following parent: $branch_from\@$r\n";
1429 - # auto create a new branch and follow it
1430 - $id = basename($branch_from);
1431 - $id .= '@'.$r if -r "$GIT_DIR/svn/$id";
1432 - while (-r "$GIT_DIR/svn/$id") {
1433 - # just grow a tail if we're not unique enough :x
1434 - $id .= '-';
1435 - }
1436 - }
1437 - return unless defined $id;
1438 -
1439 - my ($r0, $parent) = find_rev_before($r,$id,1);
1440 - if ($_follow_parent && (!defined $r0 || !defined $parent)) {
1441 - defined(my $pid = fork) or croak $!;
1442 - if (!$pid) {
1443 - $GIT_SVN = $ENV{GIT_SVN_ID} = $id;
1444 - init_vars();
1445 - $SVN_URL = "$url/$branch_from";
1446 - $SVN = undef;
1447 - setup_git_svn();
1448 - # we can't assume SVN_URL exists at r+1:
1449 - $_revision = "0:$r";
1450 - fetch_lib();
1451 - exit 0;
1452 - }
1453 - waitpid $pid, 0;
1454 - croak $? if $?;
1455 - ($r0, $parent) = find_rev_before($r,$id,1);
1456 - }
1457 - return unless (defined $r0 && defined $parent);
1458 - if (revisions_eq($branch_from, $r0, $r)) {
1459 - unlink $GIT_SVN_INDEX;
1460 - print STDERR "Found branch parent: ($GIT_SVN) $parent\n";
1461 - command_noisy('read-tree', $parent);
1462 - unless ($SVN->can_do_switch) {
1463 - return _libsvn_new_tree($paths, $rev, $author, $date,
1464 - $log, [$parent]);
1465 - }
1466 - # do_switch works with svn/trunk >= r22312, but that is not
1467 - # included with SVN 1.4.2 (the latest version at the moment),
1468 - # so we can't rely on it.
1469 - my $ra = Git::SVN::Ra->new("$url/$branch_from");
1470 - my $ed = SVN::Git::Fetcher->new({c => $parent, q => $_q });
1471 - $ra->gs_do_switch($r0, $rev, '', 1, $SVN->{url}, $ed) or
1472 - die "SVN connection failed somewhere...\n";
1473 - return libsvn_log_entry($rev, $author, $date, $log, [$parent]);
1474 - }
1475 - print STDERR "Nope, branch point not imported or unknown\n";
1476 - return undef;
1477 -}
1478 -
1479 -sub _libsvn_new_tree {
1480 - my ($paths, $rev, $author, $date, $log, $parents) = @_;
1481 - my $ed = SVN::Git::Fetcher->new({q => $_q});
1482 - unless ($SVN->gs_do_update($rev, $rev, '', 1, $ed)) {
1483 - die "SVN connection failed somewhere...\n";
1484 - }
1485 - libsvn_log_entry($rev, $author, $date, $log, $parents, $ed);
1486 -}
1487 -
1504 {
1505 my $kill_stupid_warnings = $SVN::Node::none.$SVN::Node::file.
1506 $SVN::Node::dir.$SVN::Node::unknown.
t/t9104-git-svn-follow-parent.sh
+4 -2
@@ -30,8 +30,10 @@ test_expect_success 'initialize repo' "
30 test_expect_success 'init and fetch --follow-parent a moved directory' "
31 git-svn init -i thunk $svnrepo/thunk &&
32 git-svn fetch --follow-parent -i thunk &&
33 - git-rev-parse --verify refs/remotes/trunk &&
34 - test '$?' -eq '0'
33 + test \"\`git-rev-parse --verify refs/remotes/trunk\`\" \
34 + = \"\`git-rev-parse --verify refs/remotes/thunk~1\`\" &&
35 + test \"\`git-cat-file blob refs/remotes/thunk:readme |\
36 + sed -n -e '3p'\`\" = goodbye
37 "
38
39 test_debug 'gitk --all &'