threads / patch / 19205

patch, 2 partsgit-svn: Correctly report max revision when following deleted paths

Subject: [PATCH 2/2] git-svn: Correctly report max revision when following deleted paths

## tl;dr

3 messages between May 6, 2009 and May 10, 2009. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Alex Vandiver· May 6, 2009, 20:18 UTC · lore

[PATCH 1/2] 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>
---
 git-svn.perl |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

Show changes to git-svn.perl +5 −1

diff --git a/git-svn.perl b/git-svn.perl
index ef1d30d..5836dde 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -4438,6 +4438,7 @@ sub gs_fetch_loop_common {
 	my ($min, $max) = ($base, $head < $base + $inc ? $head : $base + $inc);
 	my $longest_path = longest_common_path($gsv, $globs);
 	my $ra_url = $self->{url};
+	my $find_trailing_edge;
 	while (1) {
 		my %revs;
 		my $err;
@@ -4455,8 +4456,10 @@ sub gs_fetch_loop_common {
 		               sub { $revs{$_[1]} = _cb(@_) });
 		if ($err) {
 			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' ",
 				     "was probably deleted:\n",
 				     $err->expanded_message,
@@ -4475,6 +4478,7 @@ sub gs_fetch_loop_common {
 					last;
 				}
 			}
+			$find_trailing_edge = 0;
 		}
 		$SVN::Error::handler = $err_handler;

-- 
1.6.3.rc4.225.g060aa4

Alex Vandiver· May 6, 2009, 20:18 UTC · re: Alex Vandiver · lore

Report the maximum found revision in the range, instead of the minimum changed revision.

Signed-off-by: Alex Vandiver <alexmv@mit.edu>
---
 git-svn.perl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Show changes to git-svn.perl +1 −1

diff --git a/git-svn.perl b/git-svn.perl
index 5836dde..eebcf0f 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -4471,7 +4471,7 @@ sub gs_fetch_loop_common {
 				my $ok;
 				$self->get_log([$longest_path], $min, $hi,
 				               0, 1, 1, sub {
-				               $ok ||= $_[1];
+				               $ok = $_[1];
 				               $revs{$_[1]} = _cb(@_) });
 				if ($ok) {
 					print STDERR "r$min .. r$ok OK\n";

-- 
1.6.3.rc4.225.g060aa4

Eric Wong· May 10, 2009, 01:32 UTC · re: Alex Vandiver · lore

Re: [PATCH 1/2] git-svn: Fix for svn paths removed > log-window-size revisions ago

Alex Vandiver <alexmv@MIT.EDU> wrote:

Show 7 quoted lines

> 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>

Thanks Alex,

This series (and your svn.authorsfile patch)
Acked-by: Eric Wong <normalperson@yhbt.net>

..and pushed out to git://git.bogomips.org/git-svn

-- 
Eric Wong