gitpipe: Use ObjectReader instead of ObjectInfoReader

Modify places where we still call ObjectInfoReader and replace with
ObjectReader. Also change a callsite where RequestRevision is still
being called to calling RequestContents.

4 files changed, 21 insertions, 21 deletions

diff --git a/internal/git/gitpipe/catfile_info.go b/internal/git/gitpipe/catfile_info.go
index 07e29525b..722624c16 100644
--- a/internal/git/gitpipe/catfile_info.go
+++ b/internal/git/gitpipe/catfile_info.go
@@ -62,7 +62,7 @@ type catfileInfoRequest struct {
 // to fail. Context cancellation will gracefully halt the pipeline.
 func CatfileInfo(
 	ctx context.Context,
-	objectInfoReader catfile.ObjectInfoReader,
+	objectReader catfile.ObjectReader,
 	it ObjectIterator,
 	opts ...CatfileInfoOption,
 ) (CatfileInfoIterator, error) {
@@ -71,7 +71,7 @@ func CatfileInfo(
 		opt(&cfg)
 	}
 
-	queue, queueCleanup, err := objectInfoReader.InfoQueue(ctx)
+	queue, queueCleanup, err := objectReader.ObjectQueue(ctx)
 	if err != nil {
 		return nil, err
 	}
@@ -88,7 +88,7 @@ func CatfileInfo(
 
 		var i int64
 		for it.Next() {
-			if err := queue.RequestRevision(it.ObjectID().Revision()); err != nil {
+			if err := queue.RequestInfo(it.ObjectID().Revision()); err != nil {
 				sendCatfileInfoRequest(ctx, requestChan, catfileInfoRequest{err: err})
 				return
 			}
diff --git a/internal/git/gitpipe/catfile_info_test.go b/internal/git/gitpipe/catfile_info_test.go
index 317c93ba3..11125e217 100644
--- a/internal/git/gitpipe/catfile_info_test.go
+++ b/internal/git/gitpipe/catfile_info_test.go
@@ -142,11 +142,11 @@ func TestCatfileInfo(t *testing.T) {
 			catfileCache := catfile.NewCache(cfg)
 			defer catfileCache.Stop()
 
-			objectInfoReader, cancel, err := catfileCache.ObjectInfoReader(ctx, repo)
+			objectReader, cancel, err := catfileCache.ObjectReader(ctx, repo)
 			require.NoError(t, err)
 			defer cancel()
 
-			it, err := CatfileInfo(ctx, objectInfoReader, NewRevisionIterator(ctx, tc.revlistInputs), tc.opts...)
+			it, err := CatfileInfo(ctx, objectReader, NewRevisionIterator(ctx, tc.revlistInputs), tc.opts...)
 			require.NoError(t, err)
 
 			var results []CatfileInfoResult
@@ -172,11 +172,11 @@ func TestCatfileInfo(t *testing.T) {
 		catfileCache := catfile.NewCache(cfg)
 		defer catfileCache.Stop()
 
-		objectInfoReader, objectInfoReaderCancel, err := catfileCache.ObjectInfoReader(ctx, repo)
+		objectReader, objectReaderCancel, err := catfileCache.ObjectReader(ctx, repo)
 		require.NoError(t, err)
-		defer objectInfoReaderCancel()
+		defer objectReaderCancel()
 
-		it, err := CatfileInfo(ctx, objectInfoReader, NewRevisionIterator(ctx, []RevisionResult{
+		it, err := CatfileInfo(ctx, objectReader, NewRevisionIterator(ctx, []RevisionResult{
 			{OID: blobA},
 			{OID: blobA},
 		}))
@@ -206,13 +206,13 @@ func TestCatfileInfo(t *testing.T) {
 		catfileCache := catfile.NewCache(cfg)
 		defer catfileCache.Stop()
 
-		objectInfoReader, objectInfoReaderCancel, err := catfileCache.ObjectInfoReader(ctx, repo)
+		objectReader, objectReaderCancel, err := catfileCache.ObjectReader(ctx, repo)
 		require.NoError(t, err)
-		defer objectInfoReaderCancel()
+		defer objectReaderCancel()
 
 		inputIter, inputCh, nextCh := newChanObjectIterator()
 
-		it, err := CatfileInfo(ctx, objectInfoReader, inputIter)
+		it, err := CatfileInfo(ctx, objectReader, inputIter)
 		require.NoError(t, err)
 
 		// We request a single object from the catfile process. Because the request queue is
@@ -255,7 +255,7 @@ func TestCatfileInfo(t *testing.T) {
 		catfileCache := catfile.NewCache(cfg)
 		defer catfileCache.Stop()
 
-		objectInfoReader, cancel, err := catfileCache.ObjectInfoReader(ctx, repo)
+		objectReader, cancel, err := catfileCache.ObjectReader(ctx, repo)
 		require.NoError(t, err)
 		defer cancel()
 
@@ -263,19 +263,19 @@ func TestCatfileInfo(t *testing.T) {
 			{OID: blobA},
 		}
 
-		it, err := CatfileInfo(ctx, objectInfoReader, NewRevisionIterator(ctx, input))
+		it, err := CatfileInfo(ctx, objectReader, NewRevisionIterator(ctx, input))
 		require.NoError(t, err)
 
 		// Reusing the queue is not allowed, so we should get an error here.
-		_, err = CatfileInfo(ctx, objectInfoReader, NewRevisionIterator(ctx, input))
-		require.Equal(t, fmt.Errorf("object info queue already in use"), err)
+		_, err = CatfileInfo(ctx, objectReader, NewRevisionIterator(ctx, input))
+		require.Equal(t, fmt.Errorf("object queue already in use"), err)
 
 		// We now consume all the input of the iterator.
 		require.True(t, it.Next())
 		require.False(t, it.Next())
 
 		// Which means that the queue should now be unused, so we can again use it.
-		_, err = CatfileInfo(ctx, objectInfoReader, NewRevisionIterator(ctx, input))
+		_, err = CatfileInfo(ctx, objectReader, NewRevisionIterator(ctx, input))
 		require.NoError(t, err)
 	})
 }
diff --git a/internal/git/gitpipe/catfile_object.go b/internal/git/gitpipe/catfile_object.go
index 5fe031579..517ea6a60 100644
--- a/internal/git/gitpipe/catfile_object.go
+++ b/internal/git/gitpipe/catfile_object.go
@@ -72,7 +72,7 @@ func CatfileObject(
 
 		var i int64
 		for it.Next() {
-			if err := queue.RequestRevision(it.ObjectID().Revision()); err != nil {
+			if err := queue.RequestContents(it.ObjectID().Revision()); err != nil {
 				sendRequest(catfileObjectRequest{err: err})
 				return
 			}
diff --git a/internal/git/gitpipe/pipeline_test.go b/internal/git/gitpipe/pipeline_test.go
index 2af0f0496..179b41743 100644
--- a/internal/git/gitpipe/pipeline_test.go
+++ b/internal/git/gitpipe/pipeline_test.go
@@ -241,7 +241,7 @@ func TestPipeline_revlist(t *testing.T) {
 			catfileCache := catfile.NewCache(cfg)
 			defer catfileCache.Stop()
 
-			objectInfoReader, cancel, err := catfileCache.ObjectInfoReader(ctx, repo)
+			objectInfoReader, cancel, err := catfileCache.ObjectReader(ctx, repo)
 			require.NoError(t, err)
 			defer cancel()
 
@@ -299,7 +299,7 @@ func TestPipeline_revlist(t *testing.T) {
 		catfileCache := catfile.NewCache(cfg)
 		defer catfileCache.Stop()
 
-		objectInfoReader, cancelReader, err := catfileCache.ObjectInfoReader(ctx, repo)
+		objectInfoReader, cancelReader, err := catfileCache.ObjectReader(ctx, repo)
 		require.NoError(t, err)
 		defer cancelReader()
 
@@ -341,7 +341,7 @@ func TestPipeline_revlist(t *testing.T) {
 		catfileCache := catfile.NewCache(cfg)
 		defer catfileCache.Stop()
 
-		objectInfoReader, cancel, err := catfileCache.ObjectInfoReader(ctx, repo)
+		objectInfoReader, cancel, err := catfileCache.ObjectReader(ctx, repo)
 		require.NoError(t, err)
 		defer cancel()
 
@@ -406,7 +406,7 @@ func TestPipeline_forEachRef(t *testing.T) {
 	catfileCache := catfile.NewCache(cfg)
 	defer catfileCache.Stop()
 
-	objectInfoReader, cancel, err := catfileCache.ObjectInfoReader(ctx, repo)
+	objectInfoReader, cancel, err := catfileCache.ObjectReader(ctx, repo)
 	require.NoError(t, err)
 	defer cancel()