Skip to content
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.

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

SCM - Delete scmInputBoxActionButton proposal #199018

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion extensions/git/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
"tabInputTextMerge",
"timeline",
"contribMergeEditorMenus",
"scmInputBoxActionButton",
"scmInputBoxValueProvider"
],
"categories": [
Expand Down
20 changes: 0 additions & 20 deletions extensions/git/src/commands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3631,26 +3631,6 @@ export class CommandCenter {
}
}

@command('git.generateCommitMessage', { repository: true })
async generateCommitMessage(repository: Repository): Promise<void> {
if (!repository || !this.model.commitMessageProvider) {
return;
}

await window.withProgress({ location: ProgressLocation.SourceControl }, async () => {
await repository.generateCommitMessage();
});
}

@command('git.generateCommitMessageCancel', { repository: true })
generateCommitMessageCancel(repository: Repository): void {
if (!repository || !this.model.commitMessageProvider) {
return;
}

repository.generateCommitMessageCancel();
}

@command('git.viewChanges', { repository: true })
viewChanges(repository: Repository): void {
this._viewChanges('Git: Changes', repository.workingTreeGroup.resourceStates);
Expand Down
188 changes: 0 additions & 188 deletions extensions/git/src/commitMessageProvider.ts

This file was deleted.

25 changes: 3 additions & 22 deletions extensions/git/src/model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,13 @@ import { Git } from './git';
import * as path from 'path';
import * as fs from 'fs';
import { fromGitUri } from './uri';
import { APIState as State, CredentialsProvider, PushErrorHandler, PublishEvent, RemoteSourcePublisher, PostCommitCommandsProvider, BranchProtectionProvider, CommitMessageProvider } from './api/git';
import { APIState as State, CredentialsProvider, PushErrorHandler, PublishEvent, RemoteSourcePublisher, PostCommitCommandsProvider, BranchProtectionProvider } from './api/git';
import { Askpass } from './askpass';
import { IPushErrorHandlerRegistry } from './pushError';
import { ApiRepository } from './api/api1';
import { IRemoteSourcePublisherRegistry } from './remotePublisher';
import { IPostCommitCommandsProviderRegistry } from './postCommitCommands';
import { IBranchProtectionProviderRegistry } from './branchProtection';
import { ICommitMessageProviderRegistry } from './commitMessageProvider';

class RepositoryPick implements QuickPickItem {
@memoize get label(): string {
Expand Down Expand Up @@ -171,7 +170,7 @@ class UnsafeRepositoriesManager {
}
}

export class Model implements IRepositoryResolver, IBranchProtectionProviderRegistry, ICommitMessageProviderRegistry, IRemoteSourcePublisherRegistry, IPostCommitCommandsProviderRegistry, IPushErrorHandlerRegistry {
export class Model implements IRepositoryResolver, IBranchProtectionProviderRegistry, IRemoteSourcePublisherRegistry, IPostCommitCommandsProviderRegistry, IPushErrorHandlerRegistry {

private _onDidOpenRepository = new EventEmitter<Repository>();
readonly onDidOpenRepository: Event<Repository> = this._onDidOpenRepository.event;
Expand Down Expand Up @@ -238,14 +237,6 @@ export class Model implements IRepositoryResolver, IBranchProtectionProviderRegi

private pushErrorHandlers = new Set<PushErrorHandler>();

private _commitMessageProvider: CommitMessageProvider | undefined;
get commitMessageProvider(): CommitMessageProvider | undefined {
return this._commitMessageProvider;
}

private _onDidChangeCommitMessageProvider = new EventEmitter<void>();
readonly onDidChangeCommitMessageProvider = this._onDidChangeCommitMessageProvider.event;

private _unsafeRepositoriesManager: UnsafeRepositoriesManager;
get unsafeRepositories(): string[] {
return this._unsafeRepositoriesManager.repositories;
Expand Down Expand Up @@ -587,7 +578,7 @@ export class Model implements IRepositoryResolver, IBranchProtectionProviderRegi

// Open repository
const [dotGit, repositoryRootRealPath] = await Promise.all([this.git.getRepositoryDotGit(repositoryRoot), this.getRepositoryRootRealPath(repositoryRoot)]);
const repository = new Repository(this.git.open(repositoryRoot, repositoryRootRealPath, dotGit, this.logger), this, this, this, this, this, this, this.globalState, this.logger, this.telemetryReporter);
const repository = new Repository(this.git.open(repositoryRoot, repositoryRootRealPath, dotGit, this.logger), this, this, this, this, this, this.globalState, this.logger, this.telemetryReporter);

this.open(repository);
this._closedRepositoriesManager.deleteRepository(repository.root);
Expand Down Expand Up @@ -948,16 +939,6 @@ export class Model implements IRepositoryResolver, IBranchProtectionProviderRegi
return toDisposable(() => this.pushErrorHandlers.delete(handler));
}

registerCommitMessageProvider(provider: CommitMessageProvider): Disposable {
this._commitMessageProvider = provider;
this._onDidChangeCommitMessageProvider.fire();

return toDisposable(() => {
this._commitMessageProvider = undefined;
this._onDidChangeCommitMessageProvider.fire();
});
}

getPushErrorHandlers(): PushErrorHandler[] {
return [...this.pushErrorHandlers];
}
Expand Down