Add per-file diff stats (insertions/deletions) to tree view (#143)

Author: filoucool

README.md

@@ -81,3 +81,5 @@ This feature works with both PRs from the same repository and PRs from forks.
 `gitTreeCompare.refSortOrder` Determines how refs (branches, tags) are sorted when changing the comparison base. Default is `committerdate` which sorts by most recently committed first, making it easy to find recently-used branches. Can be set to `alphabetically` for alphabetical sorting.
 
 `gitTreeCompare.openChangesWithDifftool` When enabled, adds an "Open Changes with Difftool" command to the context menu for files. This command opens the changes in the external diff tool configured in Git (e.g., via `git config diff.tool <tool-name>`). Default is disabled. Note: This requires you to have a difftool configured in your Git settings.
+
+`gitTreeCompare.showDiffStats` When enabled, shows insertion/deletion counts (+N -N) next to each file name in the tree view. Default is disabled.

package.json

@@ -597,6 +597,11 @@
                     "type": "boolean",
                     "description": "Whether to show the 'Open Changes with Difftool' command in the context menu for files. This command opens the changes in the external diff tool configured in Git (e.g., via 'git config diff.tool').",
                     "default": false
+                },
+                "gitTreeCompare.showDiffStats": {
+                    "type": "boolean",
+                    "description": "Whether to show insertion/deletion counts (+N -N) next to each file.",
+                    "default": false
                 }
             }
         }

src/gitHelper.ts

@@ -110,6 +110,12 @@ export async function getHeadModificationDate(absGitDir: string): Promise<Date>
     return stats.mtime;
 }
 
+export interface IDiffStats {
+    insertions: number | undefined;
+    deletions: number | undefined;
+    isBinary: boolean;
+}
+
 export interface IDiffStatus {
     /**
      * A Addition of a file
@@ -130,6 +136,9 @@ export interface IDiffStatus {
 
     /** True if this was or is a submodule */
     isSubmodule: boolean
+
+    /** Per-file insertion/deletion counts (undefined when stats are disabled or unavailable) */
+    stats: IDiffStats | undefined;
 }
 
 const MODE_REGULAR_FILE = '100644';
@@ -140,6 +149,7 @@ class DiffStatus implements IDiffStatus {
     readonly srcAbsPath: string;
     readonly dstAbsPath: string;
     readonly isSubmodule: boolean;
+    stats: IDiffStats | undefined;
 
     constructor(repoRoot: string, public status: StatusCode, srcRelPath: string, dstRelPath: string | undefined, srcMode: string, dstMode: string) {
         this.srcAbsPath = path.join(repoRoot, srcRelPath);
@@ -194,7 +204,53 @@ function parseDiffIndexOutput(repoRoot: string, out: string): IDiffStatus[] {
     return entries;
 }
 
-export async function diffIndex(repo: Repository, ref: string, refreshIndex: boolean, findRenames: boolean, renameThreshold: number, omitUntrackedFiles: boolean, omitUnstagedChanges: boolean): Promise<IDiffStatus[]> {
+function parseDiffNumstat(repoRoot: string, out: string): Map<string, IDiffStats> {
+    const stats = new Map<string, IDiffStats>();
+    const lines = out.split('\n').filter(line => line.length > 0);
+    for (const line of lines) {
+        const parts = line.split('\t');
+        if (parts.length < 3) {
+            continue;
+        }
+        const [ins, del, ...pathParts] = parts;
+        const relPath = pathParts.join('\t');
+        const absPath = path.join(repoRoot, relPath);
+        if (ins === '-' && del === '-') {
+            stats.set(absPath, { insertions: undefined, deletions: undefined, isBinary: true });
+        } else {
+            stats.set(absPath, { insertions: parseInt(ins, 10), deletions: parseInt(del, 10), isBinary: false });
+        }
+    }
+    return stats;
+}
+
+const BINARY_CHECK_BYTES = 8192;
+
+async function computeUntrackedStats(entries: IDiffStatus[]): Promise<void> {
+    await Promise.all(entries.map(async (entry) => {
+        try {
+            const buf = Buffer.alloc(BINARY_CHECK_BYTES);
+            const handle = await fs.open(entry.dstAbsPath, 'r');
+            try {
+                const { bytesRead } = await handle.read(buf, 0, BINARY_CHECK_BYTES, 0);
+                if (buf.subarray(0, bytesRead).includes(0)) {
+                    entry.stats = { insertions: undefined, deletions: undefined, isBinary: true };
+                    return;
+                }
+            } finally {
+                await handle.close();
+            }
+            const content = await fs.readFile(entry.dstAbsPath, 'utf-8');
+            const lines = content.split('\n');
+            const lineCount = content.endsWith('\n') ? lines.length - 1 : lines.length;
+            entry.stats = { insertions: lineCount, deletions: 0, isBinary: false };
+        } catch {
+            // File may be inaccessible
+        }
+    }));
+}
+
+export async function diffIndex(repo: Repository, ref: string, refreshIndex: boolean, findRenames: boolean, renameThreshold: number, omitUntrackedFiles: boolean, omitUnstagedChanges: boolean, showDiffStats: boolean = false): Promise<IDiffStatus[]> {
     if (refreshIndex) {
         // avoid superfluous diff entries if files only got touched
         // (see https://github.com/letmaik/vscode-git-tree-compare/issues/37)
@@ -233,6 +289,22 @@ export async function diffIndex(repo: Repository, ref: string, refreshIndex: boo
     const filteredDiffIndexStatuses = diffIndexStatuses.filter(status => !untrackedAbsPaths.has(status.srcAbsPath));
 
     const statuses = filteredDiffIndexStatuses.concat(untrackedStatuses);
+
+    if (showDiffStats) {
+        const numstatResult = await repo.exec(['diff', '--numstat', renamesFlag, ref, '--']);
+        const numstatMap = parseDiffNumstat(repoRoot, numstatResult.stdout);
+        for (const entry of statuses) {
+            const fileStats = numstatMap.get(entry.dstAbsPath) || numstatMap.get(entry.srcAbsPath);
+            if (fileStats) {
+                entry.stats = fileStats;
+            }
+        }
+
+        if (untrackedStatuses.length > 0) {
+            await computeUntrackedStats(untrackedStatuses);
+        }
+    }
+
     statuses.sort((s1, s2) => s1.dstAbsPath.localeCompare(s2.dstAbsPath))
     return statuses;
 }

src/treeProvider.ts

@@ -11,7 +11,7 @@ import { Repository, Git } from './git/git'
 import { Ref, RefType } from './git/api/git'
 import { anyEvent, filterEvent, eventToPromise } from './git/util'
 import { getDefaultBranch, getHeadModificationDate, getBranchCommit,
-         diffIndex, IDiffStatus, StatusCode, getAbsGitDir,
+         diffIndex, IDiffStatus, IDiffStats, StatusCode, getAbsGitDir,
          getWorkspaceFolders, getGitRepositoryFolders, hasUncommittedChanges, rmFile } from './gitHelper'
 import { tryDeepenForMergeBase } from './deepenHelper'
 import { debounce, throttle } from './git/decorators'
@@ -47,7 +47,8 @@ class FileElement implements IDiffStatus {
         public dstAbsPath: string,
         public dstRelPath: string,
         public status: StatusCode,
-        public isSubmodule: boolean) {}
+        public isSubmodule: boolean,
+        public stats: IDiffStats | undefined = undefined) {}
 
     get label(): string {
         return path.basename(this.dstAbsPath)
@@ -139,6 +140,7 @@ export class GitTreeCompareProvider implements TreeDataProvider<Element>, Dispos
     private omitUnstagedChanges: boolean;
     private sortOrder: SortOrder;
     private autoReveal: boolean;
+    private showDiffStats: boolean;
 
     // Dynamic options
     private repository: Repository | undefined;
@@ -421,6 +423,7 @@ export class GitTreeCompareProvider implements TreeDataProvider<Element>, Dispos
         this.omitUnstagedChanges = config.get<boolean>('omitUnstagedChanges', false);
         this.sortOrder = config.get<SortOrder>('sortOrder', 'path');
         this.autoReveal = config.get<boolean>('autoReveal', true);
+        this.showDiffStats = config.get<boolean>('showDiffStats', false);
     }
 
     private async getStoredBaseRef(): Promise<string | undefined> {
@@ -466,7 +469,7 @@ export class GitTreeCompareProvider implements TreeDataProvider<Element>, Dispos
                 checkboxState = this.computeFolderCheckboxState(element);
             }
         }
-        return toTreeItem(element, this.openChangesOnSelect, this.iconsMinimal, this.showCollapsed, this.viewAsList, checkboxState, this.asAbsolutePath);
+        return toTreeItem(element, this.openChangesOnSelect, this.iconsMinimal, this.showCollapsed, this.viewAsList, this.showDiffStats, checkboxState, this.asAbsolutePath);
     }
 
     getParent(element: Element): Element | undefined {
@@ -653,7 +656,7 @@ export class GitTreeCompareProvider implements TreeDataProvider<Element>, Dispos
         const filesInsideTreeRoot = new Map<FolderAbsPath, IDiffStatus[]>();
         const filesOutsideTreeRoot = new Map<FolderAbsPath, IDiffStatus[]>();
 
-        const diff = await diffIndex(this.repository!, this.mergeBase, this.refreshIndex, this.findRenames, this.renameThreshold, this.omitUntrackedFiles, this.omitUnstagedChanges);
+        const diff = await diffIndex(this.repository!, this.mergeBase, this.refreshIndex, this.findRenames, this.renameThreshold, this.omitUntrackedFiles, this.omitUnstagedChanges, this.showDiffStats);
         const untrackedCount = diff.reduce((prev, cur, _) => prev + (cur.status === 'U' ? 1 : 0), 0);
         this.log(`${diff.length} diff entries (${untrackedCount} untracked)`);
 
@@ -797,7 +800,7 @@ export class GitTreeCompareProvider implements TreeDataProvider<Element>, Dispos
         // Always refresh when sorting by recently modified in list view, as file mtimes may have changed
         const needsRefreshForSorting = this.viewAsList && this.sortOrder === 'recentlyModified';
 
-        if (fireChangeEvents && (treeHasChanged || needsRefreshForSorting)) {
+        if (fireChangeEvents && (treeHasChanged || needsRefreshForSorting || this.showDiffStats)) {
             this.log('Refreshing tree')
             this.fireTreeDataChange();
         }
@@ -884,6 +887,7 @@ export class GitTreeCompareProvider implements TreeDataProvider<Element>, Dispos
         const oldOmitUntrackedFiles = this.omitUntrackedFiles;
         const oldOmitUnstagedChanges = this.omitUnstagedChanges;
         const oldSortOrder = this.sortOrder;
+        const oldShowDiffStats = this.showDiffStats;
         this.readConfig();
         if (oldTreeRootIsRepo != this.treeRootIsRepo ||
             oldInclude != this.includeFilesOutsideWorkspaceFolderRoot ||
@@ -898,7 +902,8 @@ export class GitTreeCompareProvider implements TreeDataProvider<Element>, Dispos
             oldshowCheckboxes != this.showCheckboxes ||
             oldOmitUntrackedFiles != this.omitUntrackedFiles ||
             oldOmitUnstagedChanges != this.omitUnstagedChanges ||
-            oldSortOrder != this.sortOrder) {
+            oldSortOrder != this.sortOrder ||
+            oldShowDiffStats != this.showDiffStats) {
 
             if (!this.repository) {
                 return;
@@ -916,7 +921,8 @@ export class GitTreeCompareProvider implements TreeDataProvider<Element>, Dispos
                 (!oldAutoRefresh && this.autoRefresh) ||
                 (!oldRefreshIndex && this.refreshIndex) ||
                 oldOmitUntrackedFiles != this.omitUntrackedFiles ||
-                oldOmitUnstagedChanges != this.omitUnstagedChanges) {
+                oldOmitUnstagedChanges != this.omitUnstagedChanges ||
+                oldShowDiffStats != this.showDiffStats) {
                 try {
                     await this.updateRefs(this.baseRef);
                     await this.updateDiff(false);
@@ -983,7 +989,7 @@ export class GitTreeCompareProvider implements TreeDataProvider<Element>, Dispos
                 for (const file of fileEntries) {
                     if (this.matchesFilter(file.dstAbsPath, relPathBase)) {
                         const dstRelPath = path.relative(relPathBase, file.dstAbsPath);
-                        entries.push(new FileElement(file.srcAbsPath, file.dstAbsPath, dstRelPath, file.status, file.isSubmodule));
+                        entries.push(new FileElement(file.srcAbsPath, file.dstAbsPath, dstRelPath, file.status, file.isSubmodule, file.stats));
                     }
                 }
             }
@@ -1046,7 +1052,7 @@ export class GitTreeCompareProvider implements TreeDataProvider<Element>, Dispos
             for (const file of fileEntries) {
                 if (this.matchesFilter(file.dstAbsPath, relPathBase)) {
                     const dstRelPath = path.relative(relPathBase, file.dstAbsPath);
-                    entries.push(new FileElement(file.srcAbsPath, file.dstAbsPath, dstRelPath, file.status, file.isSubmodule));
+                    entries.push(new FileElement(file.srcAbsPath, file.dstAbsPath, dstRelPath, file.status, file.isSubmodule, file.stats));
                 }
             }
         }
@@ -1772,18 +1778,37 @@ function getElementId(element: Element): string {
     }
 }
 
+function formatDiffStats(stats: IDiffStats): string {
+    if (stats.isBinary) {
+        return 'binary';
+    }
+    const parts: string[] = [];
+    if (stats.insertions !== undefined && stats.insertions > 0) {
+        parts.push(`+${stats.insertions}`);
+    }
+    if (stats.deletions !== undefined && stats.deletions > 0) {
+        parts.push(`-${stats.deletions}`);
+    }
+    return parts.join(' ');
+}
+
 function toTreeItem(element: Element, openChangesOnSelect: boolean, iconsMinimal: boolean,
-                    showCollapsed: boolean, viewAsList: boolean,
+                    showCollapsed: boolean, viewAsList: boolean, showDiffStats: boolean,
                     checkboxState: TreeItemCheckboxState | undefined,
                     asAbsolutePath: (relPath: string) => string): TreeItem {
     const gitIconRoot = asAbsolutePath('resources/git-icons');
     if (element instanceof FileElement) {
-        const item = new TreeItem(element.label);
+        const statsText = showDiffStats && element.stats ? formatDiffStats(element.stats) : '';
+        const displayLabel = statsText ? `${element.label}  ${statsText}` : element.label;
+        const item = new TreeItem(displayLabel);
         const statusText = getStatusText(element);
         item.tooltip = `${element.dstAbsPath} • ${statusText}`;
         if (element.srcAbsPath !== element.dstAbsPath) {
             item.tooltip = `${element.srcAbsPath} → ${item.tooltip}`;
         }
+        if (statsText) {
+            item.tooltip = `${item.tooltip} • ${statsText}`;
+        }
         if (viewAsList) {
             item.description = path.dirname(element.dstRelPath);
             if (item.description === '.') {