@@ -275,18 +275,24 @@ midx_pack_source () {
test_rev_exists () {
commit="$1"
+ kind="$2"
test_expect_success 'reverse index exists' '
GIT_TRACE2_EVENT_NESTING=10 \
GIT_TRACE2_EVENT=$(pwd)/event.trace \
git rev-list --test-bitmap "$commit" &&
- test_path_is_file $midx-$(midx_checksum $objdir).rev &&
- grep "\"category\":\"load_midx_revindex\",\"key\":\"source\",\"value\":\"rev\"" event.trace
+ if test "rev" = "$kind"
+ then
+ test_path_is_file $midx-$(midx_checksum $objdir).rev
+ fi &&
+ grep "\"category\":\"load_midx_revindex\",\"key\":\"source\",\"value\":\"$kind\"" event.trace
'
}
midx_bitmap_core () {
+ rev_kind="${1:-rev}"
+
setup_bitmap_history
test_expect_success 'create single-pack midx with bitmaps' '
@@ -296,7 +302,7 @@ midx_bitmap_core () {
test_path_is_file $midx-$(midx_checksum $objdir).bitmap
'
- test_rev_exists HEAD
+ test_rev_exists HEAD "$rev_kind"
basic_bitmap_tests
@@ -326,7 +332,7 @@ midx_bitmap_core () {
test_path_is_file $midx-$(midx_checksum $objdir).bitmap
'
- test_rev_exists HEAD
+ test_rev_exists HEAD "$rev_kind"
basic_bitmap_tests
@@ -429,6 +435,8 @@ midx_bitmap_core () {
}
midx_bitmap_partial_tests () {
+ rev_kind="${1:-rev}"
+
test_expect_success 'setup partial bitmaps' '
test_commit packed &&
git repack &&
@@ -438,7 +446,7 @@ midx_bitmap_partial_tests () {
test_path_is_file $midx-$(midx_checksum $objdir).bitmap
'
- test_rev_exists HEAD~
+ test_rev_exists HEAD~ "$rev_kind"
basic_bitmap_tests HEAD~
}
To prepare for reading the reverse index data out of the MIDX itself, teach the `test_rev_exists` function to take an expected "source" for the reverse index data. When given "rev", it asserts that the MIDX's `.rev` file exists, and is loaded when verifying the integrity of its bitmaps. Otherwise, it ensures that trace2 reports the source of the reverse index data as the same string which was given to test_rev_exists(). The following patch will implement reading the reverse index data from the MIDX itself. Signed-off-by: Taylor Blau <me@ttaylorr.com> --- t/lib-bitmap.sh | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)