Skip to content

Commit 435b3d3

Browse files
committed
quick pick
1 parent c7873c9 commit 435b3d3

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,21 @@ All basic operations you need to do in a single place.
3636

3737
Multiple folder workspace was long waited feature of VS Code by many people. It would be a shame not to support it.
3838

39-
![ext](https://raw.githubusercontent.com/Serhioromano/vscode-gitflow/main/resources/media/mfw.png)
39+
![Gitflow multiple folder workspace](https://raw.githubusercontent.com/Serhioromano/vscode-gitflow/main/resources/media/mfw.png)
4040

4141
#### Quick Pick
4242

4343
Quick Pick is a popup with essential Git Flow commands, like create new flow branch or apply actions to currently selected flow brunch. You can call it with `Shift`+`Alt`+`d` short key. Note this command is available only if extension was initialized successfully.
4444

45-
![ext](https://raw.githubusercontent.com/Serhioromano/vscode-gitflow/main/resources/media/qp.png)
45+
![Git flow quick pik](https://raw.githubusercontent.com/Serhioromano/vscode-gitflow/main/resources/media/qp.png)
4646

4747
## Roadmap
4848

4949
< 30 February 2022
5050

5151
- Multiple folder workspace [done]
5252
- Flow "support" [done]
53+
- Quick Pick [done]
5354
- Status bar button to finish current branch
5455

5556
## How to work with Support

resources/media/mfw.png

0 Bytes
Loading

src/ViewBranches.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ export class TreeViewBranches implements vscode.TreeDataProvider<Flow> {
4848
if (!this.util.check()) {
4949
return Promise.resolve([]);
5050
}
51-
console.log("Start tree");
5251

5352
let tree: Flow[] = [];
5453

@@ -198,6 +197,8 @@ export class TreeViewBranches implements vscode.TreeDataProvider<Flow> {
198197
return;
199198
}
200199

200+
201+
201202
let option: string | undefined = "";
202203
let list: string[];
203204
let base: string | undefined = "";

src/extension.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ export function activate(context: vscode.ExtensionContext) {
7575
if (action === undefined) {
7676
return;
7777
}
78-
if (action.label.search("new") !== -1) {
79-
vscode.commands.executeCommand(`gitflow.${action.id}`);
78+
if (action.id.search("new") !== -1) {
79+
await viewBranches.general('start', action.id.replace("new","").toLowerCase());
8080
} else {
81-
viewBranches.general(action.id, action.description);
81+
await viewBranches.general(action.id, action.description);
8282
}
8383
vscode.commands.executeCommand("workbench.view.scm");
8484

src/lib/Util.ts

-2
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ export class Util {
7777
}
7878

7979
public exec(cmd: string, progress: boolean, cb: (s: string) => void): void {
80-
console.log(cmd);
8180
if (progress) {
8281
this.progress(cmd, cb);
8382
} else {
@@ -94,7 +93,6 @@ export class Util {
9493
}
9594
}
9695
private execCb(cmd: string, cb: (s: string) => void, resolve?: any): void {
97-
console.log(this.workspaceRoot);
9896
exec(cmd, {
9997
cwd: this.workspaceRoot
10098
}, (err, stdout, stderr) => {

0 commit comments

Comments
 (0)