Merge pull request #18 from neel1996/branchlist-enhance

Author: neel1996

git/gitBranchDeleteApi.js

@@ -0,0 +1,48 @@
+const { exec } = require("child_process");
+const fs = require("fs");
+const util = require("util");
+const execPromised = util.promisify(exec);
+
+const fetchRepopath = require("../global/fetchGitRepoPath");
+
+const gitDeleteBranchApi = async (repoId, branchName, forceFlag) => {
+  let commandString = "";
+  if (forceFlag) {
+    commandString = `git branch -D ${branchName}`;
+  } else {
+    commandString = `git branch -d ${branchName}`;
+  }
+
+  return execPromised(commandString, {
+    cwd: fetchRepopath.getRepoPath(repoId),
+    windowsHide: true,
+  })
+    .then(({ stdout, stderr }) => {
+      if (stdout && !stderr) {
+        console.log(stdout);
+        return {
+          status: "BRANCH_DELETE_SUCCESS",
+          deletionResponse: stdout.trim().split("\n"),
+        };
+      } else {
+        console.log(stderr);
+        if (stderr.includes("Error")) {
+          return {
+            status: "BRANCH_DELETE_FAILED",
+          };
+        } else {
+          return {
+            status: "BRANCH_DELETE_SUCCESS",
+          };
+        }
+      }
+    })
+    .catch((err) => {
+      console.log(err);
+      return {
+        status: "BRANCH_DELETE_FAILED",
+      };
+    });
+};
+
+module.exports.gitDeleteBranchApi = gitDeleteBranchApi;

git/gitRepoStatus.js

@@ -17,6 +17,7 @@ const getGitStatus = async (repoPath) => {
   let gitLatestCommit = "";
   let gitTrackedFiles = "";
   let gitTotalTrackedFiles = 0;
+  let gitAllBranchList = [];
 
   const gitRemoteReference = [
     "github",
@@ -97,6 +98,31 @@ const getGitStatus = async (repoPath) => {
     gitRemoteHost = "No Remote Host Set";
   }
 
+  //Module to get all branch list
+  gitAllBranchList =
+    isGitLogAvailable &&
+    (await execPromised(`git branch --all`, {
+      cwd: repoPath,
+      windowsHide: true,
+    })
+      .then((res) => {
+        const { stdout, stderr } = res;
+        if (stdout && !stderr) {
+          let localBranchList = stdout.trim().split("\n");
+          localBranchList = localBranchList.map((branch) => {
+            return branch;
+          });
+          return localBranchList;
+        } else {
+          console.log(stderr);
+          return [];
+        }
+      })
+      .catch((err) => {
+        console.log(err);
+        return [];
+      }));
+
   // Module to get all available branches
   gitBranchList =
     isGitLogAvailable &&
@@ -163,7 +189,7 @@ const getGitStatus = async (repoPath) => {
   //Module to get latest git commit
 
   isGitLogAvailable &&
-    (await execPromised(`git log -1 --oneline`, {
+    (await execPromised(`git log -1 --oneline --pretty=format:"%s"`, {
       cwd: repoPath,
       windowsHide: true,
     }).then((res) => {
@@ -282,6 +308,7 @@ const getGitStatus = async (repoPath) => {
     gitTrackedFiles,
     gitFileBasedCommit,
     gitTotalTrackedFiles,
+    gitAllBranchList,
   };
 
   console.log(gitRepoDetails);

global/globalAPIHandler.js

@@ -49,6 +49,7 @@ const {
   settingsGetPortDetails,
   settingsUpdatePortDetail,
   gitAddRemoteRepoApi,
+  gitDeleteBranchApi,
 } = require("./globalFunctionStore");
 
 app.use(
@@ -154,6 +155,10 @@ app.use(
         const { repoId, remoteName, remoteUrl } = args;
         return gitAddRemoteRepoApi(repoId, remoteName, remoteUrl);
       },
+      deleteBranch: (args) => {
+        const { repoId, branchName, forceFlag } = args;
+        return gitDeleteBranchApi(repoId, branchName, forceFlag);
+      },
     },
   })
 );

global/globalFunctionStore.js

@@ -13,6 +13,7 @@ const { gitCommitChangesApi } = require("../git/gitCommitChangesAPI");
 const { gitPushToRemoteApi } = require("../git/gitPushToRemoteAPI");
 const { gitStageItem } = require("../git/gitStageItem");
 const { gitAddRemoteApi } = require("../git/gitAddRemoteApi");
+const { gitDeleteBranchApi } = require("../git/gitBranchDeleteApi");
 const {
   fetchDatabaseFile,
   fetchRepoDetails,
@@ -245,12 +246,15 @@ module.exports.gitPullFromRemote = gitPullFromRemote = async (
   return await gitPullApi(repoId, remoteUrl, remoteBranch);
 };
 
-module.exports.deleteRepo = deleteRepo = async (
+module.exports.gitDeleteBranchApi = gitDeleteBranchFunction = async (
   repoId,
-  name,
-  pathName,
-  time
+  branchName,
+  forceFlag
 ) => {
+  return gitDeleteBranchApi(repoId, branchName, forceFlag);
+};
+
+module.exports.deleteRepo = deleteRepo = async (repoId) => {
   return await deleteRepoApi(repoId);
 };
 

global/gqlGlobalAPISchema.js

@@ -57,6 +57,7 @@ const globalAPISchema = new buildSchema(
             gitRemoteData: String
             gitRepoName: String
             gitBranchList: [String]
+            gitAllBranchList: [String]
             gitCurrentBranch: String
             gitRemoteHost: String
             gitTotalCommits: Int
@@ -108,6 +109,7 @@ const globalAPISchema = new buildSchema(
             updateRepoDataFile(newDbFile: String!): String!
             deleteRepo(repoId: String!): deleteRepoStatus!
             addRemoteRepo(repoId: String!, remoteName: String!, remoteUrl: String!): String!
+            deleteBranch(repoId: String!, branchName: String!, forceFlag: Boolean!): deleteBranchStatus!
         }
 
         type gitFetchStatus{
@@ -125,6 +127,11 @@ const globalAPISchema = new buildSchema(
             repoId: String
         }
 
+        type deleteBranchStatus{
+            status: String!,
+            deletionResponse: String
+        }
+
         schema{
             query: GitConvexAPI
             mutation: GitConvexMutation