Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 19:18:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Git - fix regression with commits that contain addition/deletion/rename (#238349)

Browse Source 
* Git - fix regression with commits that contain addition/deletion/rename

* Fix compilation error
This commit is contained in:
Ladislau Szomoru
2025-01-21 11:44:21 +01:00
committed by GitHub
parent 98f16e88ef
commit 959d01a2a5
8 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
extensions/git/src/historyProvider.ts
View File

@@ -7,7 +7,7 @@
import { Disposable, Event, EventEmitter, FileDecoration, FileDecorationProvider, SourceControlHistoryItem, SourceControlHistoryItemChange, SourceControlHistoryOptions, SourceControlHistoryProvider, ThemeIcon, Uri, window, LogOutputChannel, SourceControlHistoryItemRef, l10n, SourceControlHistoryItemRefsChangeEvent } from 'vscode';
import { Repository, Resource } from './repository';
import { IDisposable, deltaHistoryItemRefs, dispose, filterEvent, getCommitShortHash } from './util';
import { toGitUri } from './uri';
import { toMultiFileDiffEditorUris } from './uri';
import { AvatarQuery, AvatarQueryCommit, Branch, LogOptions, Ref, RefType } from './api/git';
import { emojify, ensureEmojis } from './emoji';
import { Commit } from './git';
@@ -333,10 +333,8 @@ export class GitHistoryProvider implements SourceControlHistoryProvider, FileDec
// History item change
historyItemChanges.push({
uri: historyItemUri,
originalUri: toGitUri(change.originalUri, historyItemParentId),
modifiedUri: toGitUri(change.uri, historyItemId),
renameUri: change.renameUri,
});
...toMultiFileDiffEditorUris(change, historyItemParentId, historyItemId)
} satisfies SourceControlHistoryItemChange);
// History item change decoration
const letter = Resource.getStatusLetter(change.status);