fix file-history to be compared against parents, not previous snap

scopes/component/component-log/component-log.main.runtime.ts

@@ -8,6 +8,7 @@ import { compact } from 'lodash';
 import pMapSeries from 'p-map-series';
 import { Version } from '@teambit/legacy/dist/scope/models';
 import { pathNormalizeToLinux } from '@teambit/legacy/dist/utils/path';
+import { Ref } from '@teambit/legacy/dist/scope/objects';
 import { getFilesDiff } from '@teambit/legacy/dist/consumer/component-ops/components-diff';
 import chalk from 'chalk';
 import getRemoteByName from '@teambit/legacy/dist/remotes/get-remote-by-name';
@@ -24,6 +25,7 @@ export type FileLog = {
   date: string;
   message: string;
   fileHash: string;
+  parentFileHash?: string;
   fileDiff?: string;
 };
 
@@ -128,6 +130,27 @@ export class ComponentLogMain {
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         const fileInComp = versionObj!.files.find((f) => f.relativePath === filePathRelativeInComponent);
         if (!fileInComp) return;
+        const fileHash = fileInComp.file.toString();
+        const getFileHashFromParent = async (parent: Ref) => {
+          const parentObj = parent
+            ? await workspace.scope.getBitObjectVersion(modelComp, parent.toString(), true)
+            : undefined;
+
+          const parentFileInComp = parentObj
+            ? parentObj.files.find((f) => f.relativePath === filePathRelativeInComponent)
+            : undefined;
+
+          return parentFileInComp?.file.toString();
+        };
+        const fileHashesFromParent = versionObj ? await Promise.all(versionObj.parents.map(getFileHashFromParent)) : [];
+
+        const getParentFileHash = () => {
+          if (fileHashesFromParent.length === 0) return undefined;
+          if (fileHashesFromParent.length === 1) return fileHashesFromParent[0];
+          // if one parent has it, it means that this merge-snap didn't change the file.
+          if (fileHashesFromParent.includes(fileHash)) return fileHash;
+          return fileHashesFromParent[0];
+        };
 
         results.push({
           hash: logItem.hash,
@@ -136,26 +159,15 @@ export class ComponentLogMain {
           email: logItem.email,
           date: logItem.date || '<N/A>',
           message: logItem.message,
-          fileHash: fileInComp.file.toString(),
+          fileHash,
+          parentFileHash: getParentFileHash(),
         });
       },
       { concurrency: 100 }
     );
 
-    // remove entries that their fileHash is the same as the previous one
-    let lastFileHash: string;
-    results.forEach((item, index) => {
-      if (index === 0) {
-        lastFileHash = item.fileHash;
-        return;
-      }
-      if (item.fileHash === lastFileHash) {
-        delete results[index];
-      }
-      lastFileHash = item.fileHash;
-    });
-
-    return compact(results);
+    // remove entries that their fileHash is the same as their parent.
+    return results.filter((r) => r.fileHash !== r.parentFileHash);
   }
 
   async getFileLog(filePath: string) {