Skip to content

Git - show staged type changes in the Source Control view #326350

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
soreavis wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Git - show staged type changes in the Source Control view #326350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions extensions/git/src/api/api1.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,6 +545,7 @@ function getStatus(status: Status): string {
case Status.INTENT_TO_ADD: return 'INTENT_TO_ADD';
case Status.INTENT_TO_RENAME: return 'INTENT_TO_RENAME';
case Status.TYPE_CHANGED: return 'TYPE_CHANGED';
case Status.INDEX_TYPE_CHANGED: return 'INDEX_TYPE_CHANGED';
case Status.ADDED_BY_US: return 'ADDED_BY_US';
case Status.ADDED_BY_THEM: return 'ADDED_BY_THEM';
case Status.DELETED_BY_US: return 'DELETED_BY_US';
Expand Down
2 changes: 2 additions & 0 deletions extensions/git/src/api/git.constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ export const Status = Object.freeze({
BOTH_ADDED: 16,
BOTH_DELETED: 17,
BOTH_MODIFIED: 18,

INDEX_TYPE_CHANGED: 19,
}) satisfies typeof git.Status;

export const GitErrorCodes = Object.freeze({
Expand Down
4 changes: 3 additions & 1 deletion extensions/git/src/api/git.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,9 @@ export const enum Status {
DELETED_BY_THEM,
BOTH_ADDED,
BOTH_DELETED,
BOTH_MODIFIED
BOTH_MODIFIED,

INDEX_TYPE_CHANGED
}

export interface Change {
Expand Down
9 changes: 9 additions & 0 deletions extensions/git/src/repository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ export class Resource implements SourceControlResourceState {
case Status.INTENT_TO_RENAME:
return 'R';
case Status.TYPE_CHANGED:
case Status.INDEX_TYPE_CHANGED:
return 'T';
case Status.UNTRACKED:
return 'U';
Expand Down Expand Up @@ -104,6 +105,7 @@ export class Resource implements SourceControlResourceState {
case Status.INTENT_TO_ADD: return l10n.t('Intent to Add');
case Status.INTENT_TO_RENAME: return l10n.t('Intent to Rename');
case Status.TYPE_CHANGED: return l10n.t('Type Changed');
case Status.INDEX_TYPE_CHANGED: return l10n.t('Index Type Changed');
case Status.BOTH_DELETED: return l10n.t('Conflict: Both Deleted');
case Status.ADDED_BY_US: return l10n.t('Conflict: Added By Us');
case Status.DELETED_BY_THEM: return l10n.t('Conflict: Deleted By Them');
Expand All @@ -118,6 +120,7 @@ export class Resource implements SourceControlResourceState {
static getStatusColor(type: Status): ThemeColor {
switch (type) {
case Status.INDEX_MODIFIED:
case Status.INDEX_TYPE_CHANGED:
return new ThemeColor('gitDecoration.stageModifiedResourceForeground');
case Status.MODIFIED:
case Status.TYPE_CHANGED:
Expand Down Expand Up @@ -230,6 +233,7 @@ export class Resource implements SourceControlResourceState {
case Status.INTENT_TO_ADD: return Resource.Icons[theme].Added;
case Status.INTENT_TO_RENAME: return Resource.Icons[theme].Renamed;
case Status.TYPE_CHANGED: return Resource.Icons[theme].TypeChanged;
case Status.INDEX_TYPE_CHANGED: return Resource.Icons[theme].TypeChanged;
case Status.BOTH_DELETED: return Resource.Icons[theme].Conflict;
case Status.ADDED_BY_US: return Resource.Icons[theme].Conflict;
case Status.DELETED_BY_THEM: return Resource.Icons[theme].Conflict;
Expand Down Expand Up @@ -289,6 +293,7 @@ export class Resource implements SourceControlResourceState {
case Status.MODIFIED:
case Status.INDEX_COPIED:
case Status.TYPE_CHANGED:
case Status.INDEX_TYPE_CHANGED:
return 2;
case Status.IGNORED:
return 3;
Expand Down Expand Up @@ -593,6 +598,7 @@ class ResourceCommandResolver {
case Status.INDEX_RENAMED:
case Status.INTENT_TO_RENAME:
case Status.TYPE_CHANGED:
case Status.INDEX_TYPE_CHANGED:
return { original: toGitUri(resource.original, 'HEAD') };

case Status.MODIFIED:
Expand All @@ -611,6 +617,7 @@ class ResourceCommandResolver {
case Status.INDEX_ADDED:
case Status.INDEX_COPIED:
case Status.INDEX_RENAMED:
case Status.INDEX_TYPE_CHANGED:
return { modified: toGitUri(resource.resourceUri, '') };

case Status.INDEX_DELETED:
Expand Down Expand Up @@ -653,6 +660,7 @@ class ResourceCommandResolver {
case Status.INDEX_MODIFIED:
case Status.INDEX_RENAMED:
case Status.INDEX_ADDED:
case Status.INDEX_TYPE_CHANGED:
return l10n.t('{0} (Index)', basename);

case Status.MODIFIED:
Expand Down Expand Up @@ -3074,6 +3082,7 @@ export class Repository implements Disposable {
case 'D': indexGroup.push(new Resource(this.resourceCommandResolver, ResourceGroupType.Index, uri, Status.INDEX_DELETED, useIcons, undefined, this.kind)); break;
case 'R': indexGroup.push(new Resource(this.resourceCommandResolver, ResourceGroupType.Index, uri, Status.INDEX_RENAMED, useIcons, renameUri, this.kind)); break;
case 'C': indexGroup.push(new Resource(this.resourceCommandResolver, ResourceGroupType.Index, uri, Status.INDEX_COPIED, useIcons, renameUri, this.kind)); break;
case 'T': indexGroup.push(new Resource(this.resourceCommandResolver, ResourceGroupType.Index, uri, Status.INDEX_TYPE_CHANGED, useIcons, undefined, this.kind)); break;
}

switch (raw.y) {
Expand Down
30 changes: 30 additions & 0 deletions extensions/git/src/test/smoke.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,36 @@ suite('git smoke test', function () {
assert.strictEqual(repository.state.indexChanges.length, 0);
});

test('reflects type changes', async function () {
if (process.platform === 'win32') {
this.skip(); // symlinks require elevated privileges on Windows
}

const link = file('link');
fs.symlinkSync('newfile.txt', link);
cp.execSync('git add link', { cwd });
cp.execSync('git commit -m "add symlink"', { cwd });

// Replace the symlink with a regular file
fs.unlinkSync(link);
fs.writeFileSync(link, 'no longer a symlink', 'utf8');
await repository.status();

assert.strictEqual(repository.state.workingTreeChanges.length, 1);
assert.strictEqual(repository.state.workingTreeChanges[0].uri.path, uri('link').path);
assert.strictEqual(repository.state.workingTreeChanges[0].status, Status.TYPE_CHANGED);

await repository.add([link]);

assert.strictEqual(repository.state.indexChanges.length, 1);
assert.strictEqual(repository.state.indexChanges[0].uri.path, uri('link').path);
assert.strictEqual(repository.state.indexChanges[0].status, Status.INDEX_TYPE_CHANGED);

await repository.commit('replace symlink with file');
assert.strictEqual(repository.state.workingTreeChanges.length, 0);
assert.strictEqual(repository.state.indexChanges.length, 0);
});

test('rename/delete conflict', async function () {
await commands.executeCommand('workbench.view.scm');

Expand Down
2 changes: 2 additions & 0 deletions extensions/github/src/typings/git.constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ export const Status = Object.freeze({
BOTH_ADDED: 16,
BOTH_DELETED: 17,
BOTH_MODIFIED: 18,

INDEX_TYPE_CHANGED: 19,
}) satisfies typeof git.Status;

export const GitErrorCodes = Object.freeze({
Expand Down
4 changes: 3 additions & 1 deletion extensions/github/src/typings/git.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,9 @@ export const enum Status {
DELETED_BY_THEM,
BOTH_ADDED,
BOTH_DELETED,
BOTH_MODIFIED
BOTH_MODIFIED,

INDEX_TYPE_CHANGED
}

export interface Change {
Expand Down