add option for git info

Author: parthlambdatest

src/commander/mergeBranch.ts

@@ -5,6 +5,7 @@ import auth from '../tasks/auth.js';
 import ctxInit from '../lib/ctx.js';
 import fetchBranchInfo from '../tasks/fetchBranchInfo.js'
 import mergeBuilds from '../tasks/mergeBuilds.js'
+import getGitInfo from '../tasks/getGitInfo.js'
 
 const command = new Command();
 
@@ -34,6 +35,7 @@ command
         let tasks = new Listr<Context>(
             [
                 auth(ctx),
+                getGitInfo(ctx),
                 fetchBranchInfo(ctx),
                 mergeBuilds(ctx),
             ],

src/commander/mergeBuild.ts

@@ -5,6 +5,7 @@ import auth from '../tasks/auth.js';
 import ctxInit from '../lib/ctx.js';
 import fetchBuildInfo from '../tasks/fetchBuildInfo.js'
 import mergeBuilds from '../tasks/mergeBuilds.js'
+import getGitInfo from '../tasks/getGitInfo.js'
 
 const command = new Command();
 
@@ -34,6 +35,7 @@ command
         let tasks = new Listr<Context>(
             [
                 auth(ctx),
+                getGitInfo(ctx),
                 fetchBuildInfo(ctx),
                 mergeBuilds(ctx),
             ],

src/lib/httpClient.ts

@@ -581,7 +581,10 @@ export default class httpClient {
         }, ctx.log)
     }
 
-    mergeBuildsByBuildId(source: string, target: string, byBranch: boolean, byBuildName: boolean, sourceBranchName: string, targetBranchName: string, sourceBuildName: string, targetBuildName: string, ctx: Context) {
+    mergeBuildsByBuildId(source: string, target: string, byBranch: boolean, byBuildName: boolean, sourceBranchName: string, targetBranchName: string, sourceBuildName: string, targetBuildName: string, git: Git, ctx: Context) {
+        if (byBranch) {
+            git.branch = targetBranchName
+        }
         return this.request({
             url: `/mergeBuilds`,
             method: 'POST',
@@ -593,7 +596,8 @@ export default class httpClient {
                 sourceBranchName,
                 targetBranchName,
                 sourceBuildName,
-                targetBuildName
+                targetBuildName,
+                git
             }
         }, ctx.log)
     }

src/tasks/fetchBranchInfo.ts

@@ -10,6 +10,10 @@ export default (ctx: Context): ListrTask<Context, ListrRendererFactory, ListrRen
             updateLogContext({task: 'fetchBranchInfo'});
 
             try {
+                if (ctx.mergeBranchSource === ctx.mergeBranchTarget) {
+                    ctx.log.error(`Merging two similar branch is not possible`)
+                    throw new Error(`Merging two similar branch is not possible`);
+                }
                 let resp = await ctx.client.fetchBranchInfo(ctx.mergeBranchSource, ctx.mergeBranchTarget, ctx);
                 if (resp && resp.data && resp.data.source && resp.data.target) {
                     ctx.mergeBuildSourceId = resp.data.source

src/tasks/fetchBuildInfo.ts

@@ -11,6 +11,10 @@ export default (ctx: Context): ListrTask<Context, ListrRendererFactory, ListrRen
             updateLogContext({task: 'fetchBuildInfo'});
 
             try {
+                if (ctx.mergeBuildSource === ctx.mergeBuildTarget) {
+                    ctx.log.error(`Merging two similar build is not possible`)
+                    throw new Error(`Merging two similar build is not possible`);
+                }
                 let resp = await ctx.client.fetchBuildInfo(ctx.mergeBuildSource, ctx.mergeBuildTarget, ctx);
                 if (resp && resp.data && resp.data.source && resp.data.target) {
                     ctx.mergeBuildSourceId = resp.data.source

src/tasks/mergeBuilds.ts

@@ -12,16 +12,22 @@ export default (ctx: Context): ListrTask<Context, ListrRendererFactory, ListrRen
             try {
                 let resp
                 if (ctx.mergeByBranch) {
-                    resp = await ctx.client.mergeBuildsByBuildId(ctx.mergeBuildSourceId, ctx.mergeBuildTargetId, ctx.mergeByBranch, ctx.mergeByBuild, ctx.mergeBranchSource, ctx.mergeBranchTarget, '', '', ctx);
+                    resp = await ctx.client.mergeBuildsByBuildId(ctx.mergeBuildSourceId, ctx.mergeBuildTargetId, ctx.mergeByBranch, ctx.mergeByBuild, ctx.mergeBranchSource, ctx.mergeBranchTarget, '', '', ctx.git, ctx);
                 } else {
-                    resp = await ctx.client.mergeBuildsByBuildId(ctx.mergeBuildSourceId, ctx.mergeBuildTargetId, ctx.mergeByBranch, ctx.mergeByBuild, '', '', ctx.mergeBuildSource, ctx.mergeBuildTarget, ctx);
+                    resp = await ctx.client.mergeBuildsByBuildId(ctx.mergeBuildSourceId, ctx.mergeBuildTargetId, ctx.mergeByBranch, ctx.mergeByBuild, '', '', ctx.mergeBuildSource, ctx.mergeBuildTarget, ctx.git, ctx);
                 }
-                
-                task.title = 'Merging smartui branch initiated';
+                if (resp && resp.data && resp.data.message) {
+                    ctx.log.debug(`${resp.data.message}`)
+                } else {
+                    ctx.log.error(`Error while initiating merging process: ${resp.error.message}`)
+                    throw new Error(`Error while initiating merging process: ${resp.error.message}`);
+                }
+                task.title = 'Merging SmartUI builds initiated';
+                task.output = chalk.gray(`${resp.data.message}`);
             } catch (error: any) {
                 ctx.log.debug(error);
                 task.output = chalk.gray(error.message);
-                throw new Error('Merging smartui branch failed');
+                throw new Error('Merging SmartUI build failed');
             }
         },
         rendererOptions: { persistentOutput: true }