mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn: abstract out a block into new method other_gs()

Browse Source 
We will be adding a more places that need to find git revisions
corresponding to new parents, so abstract out this section into a new
method.

Signed-off-by: Yuval Kogman <nothingmuch@woobling.org>
Signed-off-by: Sam Vilain <sam@vilain.net>
Acked-by: Eric Wong <normalperson@yhbt.net>

[ew: minor formatting changes]
This commit is contained in:
Sam Vilain
2007-06-26 19:23:59 +12:00
committed by Eric Wong
parent 4c58a7111d
commit 8e3f9b17a5
1 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
git-svn.perl
View File

@ -2389,22 +2389,8 @@ sub find_parent_branch {
print STDERR "Found possible branch point: ", print STDERR "Found possible branch point: ",
"$new_url => ", $self->full_url, ", $r\n"; "$new_url => ", $self->full_url, ", $r\n";
$branch_from =~ s#^/##; $branch_from =~ s#^/##;
my $gs = Git::SVN->find_by_url($new_url, $repos_root, $branch_from); my $gs = $self->other_gs($new_url, $url, $repos_root,
unless ($gs) { $branch_from, $r, $self->{ref_id});
my $ref_id = $self->{ref_id};
$ref_id =~ s/\@\d+$//;
$ref_id .= "\@$r";
# just grow a tail if we're not unique enough :x
$ref_id .= '-' while find_ref($ref_id);
print STDERR "Initializing parent: $ref_id\n";
my ($u, $p, $repo_id) = ($new_url, '', $ref_id);
if ($u =~ s#^\Q$url\E(/|$)##) {
$p = $u;
$u = $url;
$repo_id = $self->{repo_id};
}
$gs = Git::SVN->init($u, $p, $repo_id, $ref_id, 1);
}
my ($r0, $parent) = $gs->find_rev_before($r, 1); my ($r0, $parent) = $gs->find_rev_before($r, 1);
{ {
my ($base, $head); my ($base, $head);
@ -2586,6 +2572,28 @@ sub parse_svn_date {
return $parsed_date; return $parsed_date;
} }
sub other_gs {
my ($self, $new_url, $url, $repos_root,
$branch_from, $r, $old_ref_id) = @_;
my $gs = Git::SVN->find_by_url($new_url, $repos_root, $branch_from);
unless ($gs) {
my $ref_id = $old_ref_id;
$ref_id =~ s/\@\d+$//;
$ref_id .= "\@$r";
# just grow a tail if we're not unique enough :x
$ref_id .= '-' while find_ref($ref_id);
print STDERR "Initializing parent: $ref_id\n";
my ($u, $p, $repo_id) = ($new_url, '', $ref_id);
if ($u =~ s#^\Q$url\E(/|$)##) {
$p = $u;
$u = $url;
$repo_id = $self->{repo_id};
}
$gs = Git::SVN->init($u, $p, $repo_id, $ref_id, 1);
}
$gs
}
sub check_author { sub check_author {
my ($author) = @_; my ($author) = @_;
if (!defined $author || length $author == 0) { if (!defined $author || length $author == 0) {