Merge commit 'refs/pull/76342/head' of github.com:microsoft/vscode into pr/76342

joaomoreno · joaomoreno · commit 980fb4b0ffc3 · 2019-10-25T11:32:15.000+02:00
diff --git a/extensions/git/package.json b/extensions/git/package.json
@@ -401,6 +401,11 @@
         "command": "git.stashApplyLatest",
         "title": "%command.stashApplyLatest%",
         "category": "Git"
+      },
+      {
+        "command": "git.stashDrop",
+        "title": "%command.stashDrop%",
+        "category": "Git"
       }
     ],
     "menus": {
@@ -660,6 +665,10 @@
         {
           "command": "git.stashApplyLatest",
           "when": "config.git.enabled && gitOpenRepositoryCount != 0"
+        },
+        {
+          "command": "git.stashDrop",
+          "when": "config.get.enabled && gitOpenRepositoryCount != 0"
         }
       ],
       "scm/title": [
@@ -813,6 +822,11 @@
           "group": "6_stash",
           "when": "scmProvider == git"
         },
+        {
+          "command": "git.stashDrop",
+          "group": "6_stash",
+          "when": "scmProvider == git"
+        },
         {
           "command": "git.showOutput",
           "group": "7_repository",
diff --git a/extensions/git/package.nls.json b/extensions/git/package.nls.json
@@ -64,6 +64,7 @@
 	"command.stashPopLatest": "Pop Latest Stash",
 	"command.stashApply": "Apply Stash...",
 	"command.stashApplyLatest": "Apply Latest Stash",
+	"command.stashDrop": "Drop Stash...",
 	"config.enabled": "Whether git is enabled.",
 	"config.path": "Path and filename of the git executable, e.g. `C:\\Program Files\\Git\\bin\\git.exe` (Windows).",
 	"config.autoRepositoryDetection": "Configures when repositories should be automatically detected.",
diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts
@@ -2241,6 +2241,18 @@ export class CommandCenter {
 		await repository.applyStash();
 	}
 
+	@command('git.stashDrop', { repository: true })
+	async stashDrop(repository: Repository): Promise<void> {
+		const placeHolder = localize('pick stash to drop', "Pick a stash to drop");
+		const stash = await this.pickStash(repository, placeHolder);
+
+		if (!stash) {
+			return;
+		}
+
+		await repository.dropStash(stash.index);
+	}
+
 	private async pickStash(repository: Repository, placeHolder: string): Promise<Stash | undefined> {
 		const stashes = await repository.getStashes();
 
diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts
@@ -1597,6 +1597,24 @@ export class Repository {
 		}
 	}
 
+	async dropStash(index: number): Promise<void> {
+		const args = ['stash', 'drop'];
+
+		if (typeof index === 'number') {
+			args.push(`stash@{${index}}`);
+
+			try {
+				await this.run(args);
+			}
+		} catch (err) {
+			if (/No stash found/.test(err.stderr || '')) {
+				err.gitErrorCode = GitErrorCodes.NoStashFound;
+			}
+
+			throw err;
+		}
+	}
+
 	getStatus(limit = 5000): Promise<{ status: IFileStatus[]; didHitLimit: boolean; }> {
 		return new Promise<{ status: IFileStatus[]; didHitLimit: boolean; }>((c, e) => {
 			const parser = new GitStatusParser();
diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
@@ -1254,6 +1254,10 @@ export class Repository implements Disposable {
 		return await this.run(Operation.Stash, () => this.repository.popStash(index));
 	}
 
+	async dropStash(index?: number): Promise<void> {
+		return await this.run(Operation.Stash, () => this.repository.dropStash(index));
+	}
+
 	async applyStash(index?: number): Promise<void> {
 		return await this.run(Operation.Stash, () => this.repository.applyStash(index));
 	}

Original file line number	Diff line number	Diff line change
`@@ -1254,6 +1254,10 @@ export class Repository implements Disposable {`
`1254`	`1254`	`return await this.run(Operation.Stash, () => this.repository.popStash(index));`
`1255`	`1255`	`}`
`1256`	`1256`
	`1257`	`+ async dropStash(index?: number): Promise<void> {`
	`1258`	`+ return await this.run(Operation.Stash, () => this.repository.dropStash(index));`
	`1259`	`+ }`
	`1260`	`+`
`1257`	`1261`	`async applyStash(index?: number): Promise<void> {`
`1258`	`1262`	`return await this.run(Operation.Stash, () => this.repository.applyStash(index));`
`1259`	`1263`	`}`