Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-27 12:04:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'refs/pull/54300/head' of github.com:Microsoft/vscode into pr/54300

Browse Source
This commit is contained in:
Joao Moreno
2018-09-13 15:55:04 +02:00
parent 44f8dfb5ce c56219e13d
commit 9c06533ace
5 changed files with 93 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
extensions/git/src/git.ts
View File

@@ -1255,9 +1255,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}}`);
}
@@ -1274,6 +1282,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();