diff --git a/package.json b/package.json index c757945..af55bde 100644 --- a/package.json +++ b/package.json @@ -854,7 +854,7 @@ }, { "command": "gitlens.showFileHistory", - "title": "Show File History in Explorer", + "title": "Open File History Explorer", "category": "GitLens" }, { @@ -898,11 +898,6 @@ "category": "GitLens" }, { - "command": "gitlens.showStashList", - "title": "Show Stashed Changes in Explorer", - "category": "GitLens" - }, - { "command": "gitlens.copyShaToClipboard", "title": "Copy Commit ID to Clipboard", "category": "GitLens" @@ -1082,10 +1077,6 @@ "when": "gitlens:enabled" }, { - "command": "gitlens.showStashList", - "when": "gitlens:enabled" - }, - { "command": "gitlens.copyShaToClipboard", "when": "gitlens:isBlameable" }, @@ -1476,10 +1467,6 @@ "views": { "explorer": [ { - "id": "gitlens.gitExplorer", - "name": "GitLens Explorer" - }, - { "id": "gitlens.stashExplorer", "name": "Git Stashes" } diff --git a/src/commands.ts b/src/commands.ts index 90a2cbf..b46c171 100644 --- a/src/commands.ts +++ b/src/commands.ts @@ -32,7 +32,6 @@ export * from './commands/showQuickCurrentBranchHistory'; export * from './commands/showQuickFileHistory'; export * from './commands/showQuickRepoStatus'; export * from './commands/showQuickStashList'; -export * from './commands/showStashList'; export * from './commands/stashApply'; export * from './commands/stashDelete'; export * from './commands/stashSave'; diff --git a/src/commands/common.ts b/src/commands/common.ts index 0781185..3e497ab 100644 --- a/src/commands/common.ts +++ b/src/commands/common.ts @@ -35,7 +35,6 @@ export type Commands = 'gitlens.closeUnchangedFiles' | 'gitlens.showQuickRepoHistory' | 'gitlens.showQuickRepoStatus' | 'gitlens.showQuickStashList' | - 'gitlens.showStashList' | 'gitlens.stashApply' | 'gitlens.stashDelete' | 'gitlens.stashSave' | @@ -75,7 +74,6 @@ export const Commands = { ShowQuickCurrentBranchHistory: 'gitlens.showQuickRepoHistory' as Commands, ShowQuickRepoStatus: 'gitlens.showQuickRepoStatus' as Commands, ShowQuickStashList: 'gitlens.showQuickStashList' as Commands, - ShowStashList: 'gitlens.showStashList' as Commands, StashApply: 'gitlens.stashApply' as Commands, StashDelete: 'gitlens.stashDelete' as Commands, StashSave: 'gitlens.stashSave' as Commands, diff --git a/src/commands/openCommitInRemote.ts b/src/commands/openCommitInRemote.ts index d99d7fe..707b005 100644 --- a/src/commands/openCommitInRemote.ts +++ b/src/commands/openCommitInRemote.ts @@ -6,7 +6,7 @@ import { GitBlameCommit, GitService, GitUri } from '../gitService'; import { Logger } from '../logger'; import { Messages } from '../messages'; import { OpenInRemoteCommandArgs } from './openInRemote'; -import { CommitNode } from '../views/gitExplorer'; +import { CommitNode } from '../views/explorerNodes'; export interface OpenCommitInRemoteCommandArgs { sha?: string; diff --git a/src/commands/showStashList.ts b/src/commands/showStashList.ts deleted file mode 100644 index 5567fd5..0000000 --- a/src/commands/showStashList.ts +++ /dev/null @@ -1,30 +0,0 @@ -'use strict'; -import { TextEditor, TextEditorEdit, Uri, window } from 'vscode'; -import { Commands, EditorCommand, getCommandUri } from './common'; -import { StashExplorer } from '../views/stashExplorer'; -import { GitService, GitUri } from '../gitService'; -import { Messages } from '../messages'; -import { Logger } from '../logger'; - -export class ShowStashListCommand extends EditorCommand { - - constructor(private git: GitService, private explorer: StashExplorer) { - super(Commands.ShowStashList); - } - - async execute(editor: TextEditor, edit: TextEditorEdit, uri?: Uri) { - uri = getCommandUri(uri, editor); - - try { - const repoPath = await this.git.getRepoPathFromUri(uri); - if (!repoPath) return Messages.showNoRepositoryWarningMessage(`Unable to show stashed changes`); - - this.explorer.update(new GitUri(uri, { repoPath: repoPath, fileName: uri!.fsPath })); - return undefined; - } - catch (ex) { - Logger.error(ex, 'ShowStashListCommand'); - return window.showErrorMessage(`Unable to show stash list. See output channel for more details`); - } - } -} \ No newline at end of file diff --git a/src/extension.ts b/src/extension.ts index e73d05f..f4fcd62 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -12,14 +12,14 @@ import { ShowBlameHistoryCommand, ShowFileHistoryCommand } from './commands'; import { ShowLastQuickPickCommand } from './commands'; import { ShowQuickBranchHistoryCommand, ShowQuickCurrentBranchHistoryCommand, ShowQuickFileHistoryCommand } from './commands'; import { ShowCommitSearchCommand, ShowQuickCommitDetailsCommand, ShowQuickCommitFileDetailsCommand } from './commands'; -import { ShowQuickRepoStatusCommand, ShowQuickStashListCommand, ShowStashListCommand } from './commands'; +import { ShowQuickRepoStatusCommand, ShowQuickStashListCommand } from './commands'; import { StashApplyCommand, StashDeleteCommand, StashSaveCommand } from './commands'; import { ToggleCodeLensCommand } from './commands'; import { CodeLensLocations, IConfig, LineHighlightLocations } from './configuration'; import { ApplicationInsightsKey, CommandContext, ExtensionKey, QualifiedExtensionId, setCommandContext, WorkspaceState } from './constants'; import { CurrentLineController, LineAnnotationType } from './currentLineController'; import { GitContentProvider } from './gitContentProvider'; -import { GitExplorer } from './views/gitExplorer'; +// import { GitExplorer } from './views/gitExplorer'; import { StashExplorer } from './views/stashExplorer'; import { GitRevisionCodeLensProvider } from './gitRevisionCodeLensProvider'; import { GitContextTracker, GitService } from './gitService'; @@ -89,16 +89,16 @@ export async function activate(context: ExtensionContext) { context.subscriptions.push(new Keyboard()); - let explorer: GitExplorer | undefined = undefined; - if (cfg.insiders) { - explorer = new GitExplorer(context, git); - context.subscriptions.push(window.registerTreeDataProvider('gitlens.gitExplorer', explorer)); - } + // let explorer: GitExplorer | undefined = undefined; + // if (cfg.insiders) { + // explorer = new GitExplorer(context, git); + // context.subscriptions.push(window.registerTreeDataProvider('gitlens.gitExplorer', explorer)); + // } + let stashExplorer; if (cfg.insiders) { stashExplorer = new StashExplorer(context, git); context.subscriptions.push(window.registerTreeDataProvider('gitlens.stashExplorer', stashExplorer)); - context.subscriptions.push(new ShowStashListCommand(git, stashExplorer!)); } context.subscriptions.push(new CloseUnchangedFilesCommand(git)); @@ -125,7 +125,7 @@ export async function activate(context: ExtensionContext) { context.subscriptions.push(new ToggleLineBlameCommand(currentLineController)); context.subscriptions.push(new ResetSuppressedWarningsCommand(context)); context.subscriptions.push(new ShowBlameHistoryCommand(git)); - context.subscriptions.push(new ShowFileHistoryCommand(git, explorer)); + context.subscriptions.push(new ShowFileHistoryCommand(git)); context.subscriptions.push(new ShowLastQuickPickCommand()); context.subscriptions.push(new ShowQuickBranchHistoryCommand(git)); context.subscriptions.push(new ShowQuickCurrentBranchHistoryCommand(git));