ckaczor/vscode-gitlens
1
0
Fork 0
mirror of https://github.com/ckaczor/vscode-gitlens.git synced 2026-02-16 10:58:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use 'stashed changes' terminology

Browse Source
This commit is contained in:
Eric Amodio
2017-03-29 00:14:28 -04:00
parent 0dda92cf8d
commit 0686c882c8
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/commands/showQuickStashList.ts
View File

@@ -18,7 +18,7 @@ export class ShowQuickStashListCommand extends ActiveEditorCachedCommand {
try { try {
const repoPath = await this.git.getRepoPathFromUri(uri, this.git.repoPath); 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 stash = await this.git.getStashList(repoPath);
const pick = await StashListQuickPick.show(stash, undefined, goBackCommand); 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, return commands.executeCommand(Commands.ShowQuickCommitDetails, new GitUri(pick.commit.uri, pick.commit), pick.commit.sha, pick.commit,
new CommandQuickPickItem({ new CommandQuickPickItem({
label: `go back \u21A9`, 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])); }, Commands.ShowQuickStashList, [uri, goBackCommand]));
} }
catch (ex) { catch (ex) {
Logger.error(ex, 'ShowQuickStashListCommand'); 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`);
} }
} }
} }

4
src/quickPicks/commitDetails.ts
View File

@@ -79,12 +79,12 @@ export class CommitDetailsQuickPick {
if (stash && git.config.insiders) { if (stash && git.config.insiders) {
items.splice(index++, 0, new CommandQuickPickItem({ items.splice(index++, 0, new CommandQuickPickItem({
label: `$(repo-forked) Apply Stash`, label: `$(repo-forked) Apply Stashed Changes`,
description: `\u00a0 \u2014 \u00a0\u00a0 ${commit.message}` description: `\u00a0 \u2014 \u00a0\u00a0 ${commit.message}`
}, Commands.StashApply, [commit as GitStashCommit, true, false])); }, Commands.StashApply, [commit as GitStashCommit, true, false]));
items.splice(index++, 0, new CommandQuickPickItem({ items.splice(index++, 0, new CommandQuickPickItem({
label: `$(x) Delete Stash`, label: `$(x) Delete Stashed Changes`,
description: `\u00a0 \u2014 \u00a0\u00a0 ${commit.message}` description: `\u00a0 \u2014 \u00a0\u00a0 ${commit.message}`
}, Commands.StashDelete, [commit as GitStashCommit, true])); }, Commands.StashDelete, [commit as GitStashCommit, true]));
} }

2
src/quickPicks/stashList.ts
View File

@@ -18,7 +18,7 @@ export class StashListQuickPick {
const pick = await window.showQuickPick(items, { const pick = await window.showQuickPick(items, {
matchOnDescription: true, 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() ignoreFocusOut: getQuickPickIgnoreFocusOut()
// onDidSelectItem: (item: QuickPickItem) => { // onDidSelectItem: (item: QuickPickItem) => {
// scope.setKeyCommand('right', item); // scope.setKeyCommand('right', item);