[#45] branch 조합의 merge risk를 계산하고 충돌 그래프로 집계한다

src/git/gitCleanCodeContextCollector.ts

@@ -27,16 +27,19 @@ export async function collectCleanOverlapEvidence(
   mergeResult: GitMergeTreePairResult,
   pairIndex: number,
   repositoryPath: string
-): Promise<MergeCodeContextEvidence[]> {
+): Promise<{
+  overlapFiles: string[]
+  evidence: MergeCodeContextEvidence[]
+}> {
   const context = await pairCodeContext(mergeResult, repositoryPath)
   const [leftFiles, rightFiles] = await Promise.all([
     changedFiles(repositoryPath, context.mergeBaseOid, context.leftOid),
     changedFiles(repositoryPath, context.mergeBaseOid, context.rightOid)
   ])
   const rightFileSet = new Set(rightFiles)
-  const commonFiles = leftFiles
-    .filter(filePath => rightFileSet.has(filePath))
-    .sort(compareText)
+  const commonFiles = [...new Set(
+    leftFiles.filter(filePath => rightFileSet.has(filePath))
+  )].sort(compareText)
   const prepared: PreparedCodeContextEvidence[] = []
 
   for (const [fileIndex, filePath] of commonFiles.entries()) {
@@ -135,13 +138,16 @@ export async function collectCleanOverlapEvidence(
     }
   }
 
-  return collectPreparedEvidence(
-    mergeResult,
-    "clean_hunk_overlap",
-    context,
-    prepared,
-    repositoryPath
-  )
+  return {
+    overlapFiles: commonFiles,
+    evidence: await collectPreparedEvidence(
+      mergeResult,
+      "clean_hunk_overlap",
+      context,
+      prepared,
+      repositoryPath
+    )
+  }
 }
 
 // base 좌표와 겹치는 merged hunk의 변경 후 좌표를 선택

src/git/gitMergeCodeContextCollector.ts

@@ -18,29 +18,41 @@ export async function collect(
     if (mergeResult.status === "merge_check_failed") {
       results.push({
         pair: mergeResult.pair,
+        overlapFiles: [],
         evidence: []
       })
       continue
     }
 
     try {
-      results.push({
-        pair: mergeResult.pair,
-        evidence: mergeResult.status === "confirmed_conflict"
-          ? await collectConflictEvidence(
-            mergeResult,
-            pairIndex,
-            options.repositoryPath
-          )
-          : await collectCleanOverlapEvidence(
+      if (mergeResult.status === "confirmed_conflict") {
+        results.push({
+          pair: mergeResult.pair,
+          overlapFiles: sortedUnique(mergeResult.conflictFiles),
+          evidence: await collectConflictEvidence(
             mergeResult,
             pairIndex,
             options.repositoryPath
           )
+        })
+        continue
+      }
+
+      const collection = await collectCleanOverlapEvidence(
+        mergeResult,
+        pairIndex,
+        options.repositoryPath
+      )
+
+      results.push({
+        pair: mergeResult.pair,
+        overlapFiles: collection.overlapFiles,
+        evidence: collection.evidence
       })
     } catch (error) {
       results.push({
         pair: mergeResult.pair,
+        overlapFiles: [],
         evidence: [],
         errorMessage: diagnosticFor(error)
       })
@@ -50,6 +62,18 @@ export async function collect(
   return results
 }
 
+function sortedUnique(values: string[]): string[] {
+  return [...new Set(values)].sort(compareText)
+}
+
+function compareText(text: string, other: string): number {
+  if (text === other) {
+    return 0
+  }
+
+  return text < other ? -1 : 1
+}
+
 function diagnosticFor(error: unknown): string {
   return utf8Prefix(
     `Git code context collection failed: ${errorFor(error).message}`,

src/git/types.ts

@@ -84,6 +84,7 @@ export type MergeCodeContextEvidence = {
 
 export type GitMergeCodeContextPairResult = {
   pair: BranchComparisonPair
+  overlapFiles: string[]
   evidence: MergeCodeContextEvidence[]
   errorMessage?: string
 }