Browse Source

Use 'stashed changes' terminology

main
Eric Amodio 7 years ago
parent
commit
0686c882c8
3 changed files with 6 additions and 6 deletions
  1. +3
    -3
      src/commands/showQuickStashList.ts
  2. +2
    -2
      src/quickPicks/commitDetails.ts
  3. +1
    -1
      src/quickPicks/stashList.ts

+ 3
- 3
src/commands/showQuickStashList.ts View File

@ -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`);
}
}
}

+ 2
- 2
src/quickPicks/commitDetails.ts View File

@ -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]));
}

+ 1
- 1
src/quickPicks/stashList.ts View File

@ -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);

Loading…
Cancel
Save