git-svn: Fix for svn paths removed > log-window-size revisions ago
Instead of trying to find the end of the commit history only in the last window, track if we have seen commits yet, and use that to judge if we need to backtrack and look for a tail. Otherwise, conversion can silently lose up to 100 revisions of a branch if it was deleted >100 revisions ago. Signed-off-by: Alex Vandiver <alexmv@mit.edu> Acked-by: Eric Wong <normalperson@yhbt.net>
This commit is contained in:
parent
da083d688e
commit
c69700fe04
@ -4438,6 +4438,7 @@ sub gs_fetch_loop_common {
|
|||||||
my ($min, $max) = ($base, $head < $base + $inc ? $head : $base + $inc);
|
my ($min, $max) = ($base, $head < $base + $inc ? $head : $base + $inc);
|
||||||
my $longest_path = longest_common_path($gsv, $globs);
|
my $longest_path = longest_common_path($gsv, $globs);
|
||||||
my $ra_url = $self->{url};
|
my $ra_url = $self->{url};
|
||||||
|
my $find_trailing_edge;
|
||||||
while (1) {
|
while (1) {
|
||||||
my %revs;
|
my %revs;
|
||||||
my $err;
|
my $err;
|
||||||
@ -4455,8 +4456,10 @@ sub gs_fetch_loop_common {
|
|||||||
sub { $revs{$_[1]} = _cb(@_) });
|
sub { $revs{$_[1]} = _cb(@_) });
|
||||||
if ($err) {
|
if ($err) {
|
||||||
print "Checked through r$max\r";
|
print "Checked through r$max\r";
|
||||||
|
} else {
|
||||||
|
$find_trailing_edge = 1;
|
||||||
}
|
}
|
||||||
if ($err && $max >= $head) {
|
if ($err and $find_trailing_edge) {
|
||||||
print STDERR "Path '$longest_path' ",
|
print STDERR "Path '$longest_path' ",
|
||||||
"was probably deleted:\n",
|
"was probably deleted:\n",
|
||||||
$err->expanded_message,
|
$err->expanded_message,
|
||||||
@ -4475,6 +4478,7 @@ sub gs_fetch_loop_common {
|
|||||||
last;
|
last;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
$find_trailing_edge = 0;
|
||||||
}
|
}
|
||||||
$SVN::Error::handler = $err_handler;
|
$SVN::Error::handler = $err_handler;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user