Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-22 19:29:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

SCM - use subject as the title of the multi-file diff editor (#269347)

Browse Source
This commit is contained in:
Ladislau Szomoru
2025-10-01 16:55:05 +02:00
committed by GitHub
parent d51431eb17
commit 597148770d
5 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
extensions/git/src/commands.ts
View File

@@ -14,7 +14,7 @@ import { Model } from './model';
import { GitResourceGroup, Repository, Resource, ResourceGroupType } from './repository';
import { DiffEditorSelectionHunkToolbarContext, LineChange, applyLineChanges, getIndexDiffInformation, getModifiedRange, getWorkingTreeDiffInformation, intersectDiffWithRange, invertLineChange, toLineChanges, toLineRanges, compareLineChanges } from './staging';
import { fromGitUri, toGitUri, isGitUri, toMergeUris, toMultiFileDiffEditorUris } from './uri';
import { DiagnosticSeverityConfig, dispose, fromNow, grep, isDefined, isDescendant, isLinuxSnap, isRemote, isWindows, pathEquals, relativePath, toDiagnosticSeverity, truncate } from './util';
import { DiagnosticSeverityConfig, dispose, fromNow, grep, isDefined, isDescendant, isLinuxSnap, isRemote, isWindows, pathEquals, relativePath, subject, toDiagnosticSeverity, truncate } from './util';
import { GitTimelineItem } from './timelineProvider';
import { ApiRepository } from './api/api1';
import { getRemoteSourceActions, pickRemoteSource } from './remoteSource';
@@ -4906,7 +4906,7 @@ export class CommandCenter {
const changes = await repository.diffTrees(commitParentId, commit.hash);
const resources = changes.map(c => toMultiFileDiffEditorUris(c, commitParentId, commit.hash));
const title = `${item.shortRef} - ${truncate(commit.message)}`;
const title = `${item.shortRef} - ${subject(commit.message)}`;
const multiDiffSourceUri = Uri.from({ scheme: 'scm-history-item', path: `${repository.root}/${commitParentId}..${commit.hash}` });
const reveal = { modifiedUri: toGitUri(uri, commit.hash) };
@@ -5172,7 +5172,7 @@ export class CommandCenter {
const commitShortHashLength = config.get<number>('commitShortHashLength', 7);
const commit = await repository.getCommit(historyItemId);
const title = `${truncate(historyItemId, commitShortHashLength, false)} - ${truncate(commit.message)}`;
const title = `${truncate(historyItemId, commitShortHashLength, false)} - ${subject(commit.message)}`;
const historyItemParentId = commit.parents.length > 0 ? commit.parents[0] : await repository.getEmptyTree();
const multiDiffSourceUri = Uri.from({ scheme: 'scm-history-item', path: `${repository.root}/${historyItemParentId}..${historyItemId}` });