conflicts: Implement `SkipContentParsing` in `ListConflictFiles`

In the previous commit, we introduced the new field `SkipContentParsing`
in the proto definition of `ListConflictFilesRequest`. The field will be
used to skip conflicted file's content parsing and streaming.

Let's implement the usage of the field by simply skipping the content
parsing and streaming section within the `ListConflictFiles` RPC. Also
add a test to test for this new functionality.

2 files changed, 51 insertions, 0 deletions

diff --git a/internal/gitaly/service/conflicts/list_conflict_files.go b/internal/gitaly/service/conflicts/list_conflict_files.go
index 8ee05a132..d5f62a810 100644
--- a/internal/gitaly/service/conflicts/list_conflict_files.go
+++ b/internal/gitaly/service/conflicts/list_conflict_files.go
@@ -127,6 +127,11 @@ func (s *server) conflictFilesWithGitMergeTree(
 			},
 		})
 
+		// Clients do not want the contents of the conflicted files, so we skip this section.
+		if request.GetSkipContent() {
+			continue
+		}
+
 		path := conflict.ourPath
 		if path == "" {
 			path = conflict.theirPath
diff --git a/internal/gitaly/service/conflicts/list_conflict_files_test.go b/internal/gitaly/service/conflicts/list_conflict_files_test.go
index ccfbd4adb..04b5725c5 100644
--- a/internal/gitaly/service/conflicts/list_conflict_files_test.go
+++ b/internal/gitaly/service/conflicts/list_conflict_files_test.go
@@ -85,6 +85,52 @@ func TestListConflictFiles(t *testing.T) {
 			},
 		},
 		{
+			"Lists the expected conflict files without content",
+			func(tb testing.TB, ctx context.Context) setupData {
+				cfg, client := setupConflictsService(tb, nil)
+				repo, repoPath := gittest.CreateRepository(tb, ctx, cfg)
+
+				ourCommitID := gittest.WriteCommit(tb, cfg, repoPath, gittest.WithTreeEntries(
+					gittest.TreeEntry{Path: "a", Mode: "100644", Content: "apple"},
+					gittest.TreeEntry{Path: "b", Mode: "100644", Content: "banana"},
+				))
+				theirCommitID := gittest.WriteCommit(tb, cfg, repoPath, gittest.WithTreeEntries(
+					gittest.TreeEntry{Path: "a", Mode: "100644", Content: "mango"},
+					gittest.TreeEntry{Path: "b", Mode: "100644", Content: "peach"},
+				))
+
+				request := &gitalypb.ListConflictFilesRequest{
+					Repository:     repo,
+					OurCommitOid:   ourCommitID.String(),
+					TheirCommitOid: theirCommitID.String(),
+					SkipContent:    true,
+				}
+
+				return setupData{
+					client:  client,
+					request: request,
+					expectedFiles: []*conflictFile{
+						{
+							Header: &gitalypb.ConflictFileHeader{
+								CommitOid: ourCommitID.String(),
+								TheirPath: []byte("a"),
+								OurPath:   []byte("a"),
+								OurMode:   int32(0o100644),
+							},
+						},
+						{
+							Header: &gitalypb.ConflictFileHeader{
+								CommitOid: ourCommitID.String(),
+								TheirPath: []byte("b"),
+								OurPath:   []byte("b"),
+								OurMode:   int32(0o100644),
+							},
+						},
+					},
+				}
+			},
+		},
+		{
 			"Lists the expected conflict files with short OIDs",
 			func(tb testing.TB, ctx context.Context) setupData {
 				cfg, client := setupConflictsService(tb, nil)