From 0686c882c8a77def702741401da9e319f23b6e9e Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Wed, 29 Mar 2017 00:14:28 -0400 Subject: [PATCH] Use 'stashed changes' terminology --- src/commands/showQuickStashList.ts | 6 +++--- src/quickPicks/commitDetails.ts | 4 ++-- src/quickPicks/stashList.ts | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/commands/showQuickStashList.ts b/src/commands/showQuickStashList.ts index e320768..21adc1b 100644 --- a/src/commands/showQuickStashList.ts +++ b/src/commands/showQuickStashList.ts @@ -18,7 +18,7 @@ export class ShowQuickStashListCommand extends ActiveEditorCachedCommand { try { const repoPath = await this.git.getRepoPathFromUri(uri, this.git.repoPath); - if (!repoPath) return window.showWarningMessage(`Unable to show stash list`); + if (!repoPath) return window.showWarningMessage(`Unable to show stashed changes`); const stash = await this.git.getStashList(repoPath); const pick = await StashListQuickPick.show(stash, undefined, goBackCommand); @@ -31,12 +31,12 @@ export class ShowQuickStashListCommand extends ActiveEditorCachedCommand { return commands.executeCommand(Commands.ShowQuickCommitDetails, new GitUri(pick.commit.uri, pick.commit), pick.commit.sha, pick.commit, new CommandQuickPickItem({ label: `go back \u21A9`, - description: `\u00a0 \u2014 \u00a0\u00a0 to the stash list` + description: `\u00a0 \u2014 \u00a0\u00a0 to stashed changes` }, Commands.ShowQuickStashList, [uri, goBackCommand])); } catch (ex) { Logger.error(ex, 'ShowQuickStashListCommand'); - return window.showErrorMessage(`Unable to show stash list. See output channel for more details`); + return window.showErrorMessage(`Unable to show stashed changes. See output channel for more details`); } } } \ No newline at end of file diff --git a/src/quickPicks/commitDetails.ts b/src/quickPicks/commitDetails.ts index 0350bf8..38eb5a2 100644 --- a/src/quickPicks/commitDetails.ts +++ b/src/quickPicks/commitDetails.ts @@ -79,12 +79,12 @@ export class CommitDetailsQuickPick { if (stash && git.config.insiders) { items.splice(index++, 0, new CommandQuickPickItem({ - label: `$(repo-forked) Apply Stash`, + label: `$(repo-forked) Apply Stashed Changes`, description: `\u00a0 \u2014 \u00a0\u00a0 ${commit.message}` }, Commands.StashApply, [commit as GitStashCommit, true, false])); items.splice(index++, 0, new CommandQuickPickItem({ - label: `$(x) Delete Stash`, + label: `$(x) Delete Stashed Changes`, description: `\u00a0 \u2014 \u00a0\u00a0 ${commit.message}` }, Commands.StashDelete, [commit as GitStashCommit, true])); } diff --git a/src/quickPicks/stashList.ts b/src/quickPicks/stashList.ts index 374f0cf..b2de4a8 100644 --- a/src/quickPicks/stashList.ts +++ b/src/quickPicks/stashList.ts @@ -18,7 +18,7 @@ export class StashListQuickPick { const pick = await window.showQuickPick(items, { matchOnDescription: true, - placeHolder: placeHolder || `stash list \u2014 search by message, filename, or sha`, + placeHolder: placeHolder || `stashed changes \u2014 search by message, filename, or sha`, ignoreFocusOut: getQuickPickIgnoreFocusOut() // onDidSelectItem: (item: QuickPickItem) => { // scope.setKeyCommand('right', item);