Merge pull request #10 from Davilink/feature/addSourceBranch

Added the ability to specify a branch
jlandersen · Jun 6, 2017 · 28867ba · 28867ba
2 parents cbc2810 + a3db169
commit 28867ba
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/src/vstsbuildrestclient.ts b/src/vstsbuildrestclient.ts
@@ -21,6 +21,7 @@ export interface BuildDefinition {
     id: number;
     name: string;
     revision: number;
+    sourceBranch?: string;
 }
 
 export interface BuildLog {
@@ -143,6 +144,10 @@ class VstsBuildRestClientImpl implements VstsBuildRestClient {
             }
         };
 
+        if(definition.sourceBranch) {
+            body['sourceBranch'] = definition.sourceBranch;
+        }
+
         return this.post<QueueBuildResult>(url, body);
     }
 

diff --git a/src/vstsbuildstatus.ts b/src/vstsbuildstatus.ts
@@ -140,14 +140,29 @@ export class VstsBuildStatus {
     public openQueueBuildSelection(): void {
         this.getBuildDefinitionByQuickPick("Select a build definition").then(result => {
             if (!result) {
-                return;
+                return Promise.reject(null);
             }
 
-            return this.restClient.queueBuild(result);
+            return window.showInputBox({prompt: "Branch (leave empty to use default) ?"}).then(branch => {
+                if(branch !== undefined) {
+                    if(branch.length !== 0) {
+                        result.sourceBranch = branch;
+                    }
+
+                    return this.restClient.queueBuild(result);
+                }
+                else {
+                    // The user has cancel the input box
+                    return Promise.reject(null);
+                }
+            });
         }).then(result => {
             window.showInformationMessage(`Build has been queued for ${result.value.definition.name}`);
         }, error => {
-            this.handleError();
+            if(error) {
+                this.handleError();
+            }
+            // Otherwise has been cancelled by the user
         });
     }