mirror of
https://github.com/Microsoft/vscode
synced 2024-08-27 04:49:35 +00:00
#54204 add commands to apply stash
This commit is contained in:
parent
8b9495d494
commit
c56219e13d
|
@ -329,6 +329,16 @@
|
|||
"command": "git.stashPopLatest",
|
||||
"title": "%command.stashPopLatest%",
|
||||
"category": "Git"
|
||||
},
|
||||
{
|
||||
"command": "git.stashApply",
|
||||
"title": "%command.stashApply%",
|
||||
"category": "Git"
|
||||
},
|
||||
{
|
||||
"command": "git.stashApplyLatest",
|
||||
"title": "%command.stashApplyLatest%",
|
||||
"category": "Git"
|
||||
}
|
||||
],
|
||||
"menus": {
|
||||
|
@ -536,6 +546,14 @@
|
|||
{
|
||||
"command": "git.stashPopLatest",
|
||||
"when": "config.git.enabled && gitOpenRepositoryCount != 0"
|
||||
},
|
||||
{
|
||||
"command": "git.stashApply",
|
||||
"when": "config.git.enabled && gitOpenRepositoryCount != 0"
|
||||
},
|
||||
{
|
||||
"command": "git.stashApplyLatest",
|
||||
"when": "config.git.enabled && gitOpenRepositoryCount != 0"
|
||||
}
|
||||
],
|
||||
"scm/title": [
|
||||
|
@ -664,6 +682,16 @@
|
|||
"group": "5_stash",
|
||||
"when": "scmProvider == git"
|
||||
},
|
||||
{
|
||||
"command": "git.stashApply",
|
||||
"group": "5_stash",
|
||||
"when": "scmProvider == git"
|
||||
},
|
||||
{
|
||||
"command": "git.stashApplyLatest",
|
||||
"group": "5_stash",
|
||||
"when": "scmProvider == git"
|
||||
},
|
||||
{
|
||||
"command": "git.showOutput",
|
||||
"group": "7_repository",
|
||||
|
|
|
@ -50,6 +50,8 @@
|
|||
"command.stash": "Stash",
|
||||
"command.stashPop": "Pop Stash...",
|
||||
"command.stashPopLatest": "Pop Latest Stash",
|
||||
"command.stashApply": "Apply Stash...",
|
||||
"command.stashApplyLatest": "Apply Latest Stash",
|
||||
"config.enabled": "Whether git is enabled",
|
||||
"config.path": "Path to the git executable",
|
||||
"config.autoRepositoryDetection": "Configures when repositories should be automatically detected.",
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
'use strict';
|
||||
|
||||
import { Uri, commands, Disposable, window, workspace, QuickPickItem, OutputChannel, Range, WorkspaceEdit, Position, LineChange, SourceControlResourceState, TextDocumentShowOptions, ViewColumn, ProgressLocation, TextEditor, MessageOptions } from 'vscode';
|
||||
import { Ref, RefType, Git, GitErrorCodes, Branch } from './git';
|
||||
import { Ref, RefType, Git, GitErrorCodes, Branch, Stash } from './git';
|
||||
import { Repository, Resource, Status, CommitOptions, ResourceGroupType } from './repository';
|
||||
import { Model } from './model';
|
||||
import { toGitUri, fromGitUri } from './uri';
|
||||
|
@ -1627,16 +1627,8 @@ export class CommandCenter {
|
|||
|
||||
@command('git.stashPop', { repository: true })
|
||||
async stashPop(repository: Repository): Promise<void> {
|
||||
const stashes = await repository.getStashes();
|
||||
|
||||
if (stashes.length === 0) {
|
||||
window.showInformationMessage(localize('no stashes', "There are no stashes to restore."));
|
||||
return;
|
||||
}
|
||||
|
||||
const picks = stashes.map(r => ({ label: `#${r.index}: ${r.description}`, description: '', details: '', id: r.index }));
|
||||
const placeHolder = localize('pick stash to pop', "Pick a stash to pop");
|
||||
const choice = await window.showQuickPick(picks, { placeHolder });
|
||||
const choice = await this.pickStash(repository, placeHolder);
|
||||
|
||||
if (!choice) {
|
||||
return;
|
||||
|
@ -1649,14 +1641,58 @@ export class CommandCenter {
|
|||
async stashPopLatest(repository: Repository): Promise<void> {
|
||||
const stashes = await repository.getStashes();
|
||||
|
||||
if (stashes.length === 0) {
|
||||
window.showInformationMessage(localize('no stashes', "There are no stashes to restore."));
|
||||
if (!this.anyStashesAvailableToRestore(stashes)) {
|
||||
return;
|
||||
}
|
||||
|
||||
await repository.popStash();
|
||||
}
|
||||
|
||||
@command('git.stashApply', { repository: true })
|
||||
async stashApply(repository: Repository): Promise<void> {
|
||||
const placeHolder = localize('pick stash to apply', "Pick a stash to apply");
|
||||
const choice = await this.pickStash(repository, placeHolder);
|
||||
|
||||
if (!choice) {
|
||||
return;
|
||||
}
|
||||
|
||||
await repository.applyStash(choice.id);
|
||||
}
|
||||
|
||||
@command('git.stashApplyLatest', { repository: true })
|
||||
async stashApplyLatest(repository: Repository): Promise<void> {
|
||||
const stashes = await repository.getStashes();
|
||||
|
||||
if (!this.anyStashesAvailableToRestore(stashes)) {
|
||||
return;
|
||||
}
|
||||
|
||||
await repository.applyStash();
|
||||
}
|
||||
|
||||
private anyStashesAvailableToRestore(stashes: Stash[]): boolean {
|
||||
const stashesAvailable = stashes.length > 0;
|
||||
|
||||
if (!stashesAvailable) {
|
||||
window.showInformationMessage(localize('no stashes', "There are no stashes to restore."));
|
||||
}
|
||||
|
||||
return stashesAvailable;
|
||||
}
|
||||
|
||||
private async pickStash(repository: Repository, placeHolder: string) {
|
||||
const stashes = await repository.getStashes();
|
||||
|
||||
if (!this.anyStashesAvailableToRestore(stashes)) {
|
||||
return;
|
||||
}
|
||||
|
||||
const picks = stashes.map(r => ({ label: `#${r.index}: ${r.description}`, description: '', details: '', id: r.index }));
|
||||
return await window.showQuickPick(picks, { placeHolder });
|
||||
}
|
||||
|
||||
|
||||
private createCommand(id: string, key: string, method: Function, options: CommandOptions): (...args: any[]) => any {
|
||||
const result = (...args: any[]) => {
|
||||
let result: Promise<any>;
|
||||
|
|
|
@ -1194,9 +1194,17 @@ export class Repository {
|
|||
}
|
||||
|
||||
async popStash(index?: number): Promise<void> {
|
||||
try {
|
||||
const args = ['stash', 'pop'];
|
||||
const args = ['stash', 'pop'];
|
||||
this.popOrApplyStash(args, index);
|
||||
}
|
||||
|
||||
async applyStash(index?: number): Promise<void> {
|
||||
const args = ['stash', 'apply'];
|
||||
this.popOrApplyStash(args, index);
|
||||
}
|
||||
|
||||
private async popOrApplyStash(args: string[], index?: number): Promise<void> {
|
||||
try {
|
||||
if (typeof index === 'number') {
|
||||
args.push(`stash@{${index}}`);
|
||||
}
|
||||
|
@ -1213,6 +1221,7 @@ export class Repository {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
getStatus(limit = 5000): Promise<{ status: IFileStatus[]; didHitLimit: boolean; }> {
|
||||
return new Promise<{ status: IFileStatus[]; didHitLimit: boolean; }>((c, e) => {
|
||||
const parser = new GitStatusParser();
|
||||
|
|
|
@ -922,6 +922,10 @@ export class Repository implements Disposable {
|
|||
return await this.run(Operation.Stash, () => this.repository.popStash(index));
|
||||
}
|
||||
|
||||
async applyStash(index?: number): Promise<void> {
|
||||
return await this.run(Operation.Stash, () => this.repository.applyStash(index));
|
||||
}
|
||||
|
||||
async getCommitTemplate(): Promise<string> {
|
||||
return await this.run(Operation.GetCommitTemplate, async () => this.repository.getCommitTemplate());
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue