[PATCH 3/5] git-svn: fix some mistakes with interpreting SVN mergeinfo commit ranges
- From
Sam Vilain <sam@vilain.net>
- Date
- Dec 19, 2009, 16:33 UTC
- Message-ID
- <1261240435-8948-4-git-send-email-sam@vilain.net>
- In-Reply-To
- <1261240435-8948-3-git-send-email-sam@vilain.net>
SVN's list of commit ranges in mergeinfo tickets is inclusive, whereas git commit ranges are exclusive on the left hand side. Also, the end points of the commit ranges may not exist; they simply delineate ranges of commits which may or may not exist. Fix these two mistakes.
Signed-off-by: Sam Vilain <sam@vilain.net> --- git-svn.perl | 12 +++--------- t/t9151-svn-mergeinfo.sh | 2 +- 2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/git-svn.perl b/git-svn.perl index 3b17a83..9cf4a3e 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -2988,14 +2988,8 @@ sub lookup_svn_merge { for my $range ( @ranges ) { my ($bottom, $top) = split "-", $range; $top ||= $bottom; - my $bottom_commit = - $gs->rev_map_get($bottom, $uuid) || - $gs->rev_map_get($bottom+1, $uuid); - my $top_commit; - for (; !$top_commit && $top >= $bottom; --$top) { - $top_commit = - $gs->rev_map_get($top, $uuid); - } + my $bottom_commit = $gs->find_rev_after( $bottom, 1, $top ); + my $top_commit = $gs->find_rev_before( $top, 1, $bottom ); unless ($top_commit and $bottom_commit) { warn "W:unknown path/rev in svn:mergeinfo " @@ -3004,7 +2998,7 @@ sub lookup_svn_merge { } push @merged_commit_ranges, - "$bottom_commit..$top_commit"; + "$bottom_commit^..$top_commit"; if ( !defined $tip or $top > $tip ) { $tip = $top; diff --git a/t/t9151-svn-mergeinfo.sh b/t/t9151-svn-mergeinfo.sh index dc3478f..f6e00ea 100755 --- a/t/t9151-svn-mergeinfo.sh +++ b/t/t9151-svn-mergeinfo.sh @@ -33,7 +33,7 @@ test_expect_success 'svn non-merge merge commits did not become git merge commit [ -z "$bad_non_merges" ] ' -test_expect_failure 'everything got merged in the end' ' +test_expect_success 'everything got merged in the end' ' unmerged=$(git rev-list --all --not master) [ -z "$unmerged" ] '
-- 1.6.3.3