浏览代码

Removes some commands when dealing with a stash

main
Eric Amodio 7 年前
父节点
当前提交
9aadf73407
共有 2 个文件被更改,包括 14 次插入11 次删除
  1. +7
    -6
      src/quickPicks/commitDetails.ts
  2. +7
    -5
      src/quickPicks/commitFileDetails.ts

+ 7
- 6
src/quickPicks/commitDetails.ts 查看文件

@ -73,7 +73,6 @@ export class CommitDetailsQuickPick {
const items: (CommitWithFileStatusQuickPickItem | CommandQuickPickItem)[] = commit.fileStatuses.map(fs => new CommitWithFileStatusQuickPickItem(commit, fs));
const stash = commit.type === 'stash';
const type = stash ? 'Stash' : 'Commit';
let index = 0;
@ -89,13 +88,15 @@ export class CommitDetailsQuickPick {
}, Commands.StashDelete, [commit as GitStashCommit, true]));
}
items.splice(index++, 0, new CommandQuickPickItem({
label: `$(clippy) Copy ${type} Sha to Clipboard`,
description: `\u00a0 \u2014 \u00a0\u00a0 ${commit.shortSha}`
}, Commands.CopyShaToClipboard, [uri, commit.sha]));
if (!stash) {
items.splice(index++, 0, new CommandQuickPickItem({
label: `$(clippy) Copy Commit Sha to Clipboard`,
description: `\u00a0 \u2014 \u00a0\u00a0 ${commit.shortSha}`
}, Commands.CopyShaToClipboard, [uri, commit.sha]));
}
items.splice(index++, 0, new CommandQuickPickItem({
label: `$(clippy) Copy ${type} Message to Clipboard`,
label: `$(clippy) Copy Message to Clipboard`,
description: `\u00a0 \u2014 \u00a0\u00a0 ${commit.message}`
}, Commands.CopyMessageToClipboard, [uri, commit.sha, commit.message]));

+ 7
- 5
src/quickPicks/commitFileDetails.ts 查看文件

@ -74,7 +74,7 @@ export class CommitFileDetailsQuickPick {
}, Commands.CopyShaToClipboard, [uri, commit.sha]));
items.push(new CommandQuickPickItem({
label: `$(clippy) Copy Commit Message to Clipboard`,
label: `$(clippy) Copy Message to Clipboard`,
description: `\u00a0 \u2014 \u00a0\u00a0 ${commit.message}`
}, Commands.CopyMessageToClipboard, [uri, commit.sha, commit.message]));
}
@ -102,10 +102,12 @@ export class CommitFileDetailsQuickPick {
}, Commands.ShowQuickFileHistory, [Uri.file(path.resolve(commit.repoPath, commit.workingFileName)), undefined, undefined, currentCommand, fileLog]));
}
items.push(new CommandQuickPickItem({
label: `$(history) Show ${commit.workingFileName ? 'Previous ' : ''}File History`,
description: `\u00a0 \u2014 \u00a0\u00a0 of ${path.basename(commit.fileName)} \u00a0\u2022\u00a0 from \u00a0$(git-commit) ${commit.shortSha}`
}, Commands.ShowQuickFileHistory, [new GitUri(commit.uri, commit), undefined, undefined, currentCommand]));
if (!stash) {
items.push(new CommandQuickPickItem({
label: `$(history) Show ${commit.workingFileName ? 'Previous ' : ''}File History`,
description: `\u00a0 \u2014 \u00a0\u00a0 of ${path.basename(commit.fileName)} \u00a0\u2022\u00a0 from \u00a0$(git-commit) ${commit.shortSha}`
}, Commands.ShowQuickFileHistory, [new GitUri(commit.uri, commit), undefined, undefined, currentCommand]));
}
if (goBackCommand) {
items.splice(0, 0, goBackCommand);

正在加载...
取消
保存