refactor to return error when deletion fails

Author: neel1996

docker-compose.yml

@@ -0,0 +1,31 @@
+services:
+  gitconvex:
+    container_name: gitconvex
+    entrypoint:
+    - go run /opt/workroom/gitconvex/dist/gitconvex-server
+    environment:
+      NODE_ENV: production
+    expose:
+    - 9001
+    healthcheck:
+      interval: 1m30s
+      retries: 3
+      test:
+      - CMD
+      - curl
+      - -f
+      - http://localhost
+      timeout: 10s
+    hostname: gitconvex-container
+    image: itassistors/gitconvex
+    labels:
+      generated: by 8gwifi.org
+    ports:
+    - '9001'
+    volumes:
+    - primary:/opt
+    working_dir: /opt/workroom/gitconvex
+version: '3'
+volumes:
+  primary: null
+

git/git_branch_checkout.go

@@ -3,38 +3,55 @@ package git
 import (
 	"fmt"
 	"github.com/go-git/go-git/v5"
+	"github.com/go-git/go-git/v5/config"
 	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/neel1996/gitconvex-server/global"
 	"strings"
 )
 
 // CheckoutBranch checks out the branchName received as argument
 func CheckoutBranch(repo *git.Repository, branchName string) string {
+	var isRemoteBranch bool
 	logger := global.Logger{}
+	w, _ := repo.Worktree()
 
 	if strings.Contains(branchName, "remotes/") {
 		splitRef := strings.Split(branchName, "/")
 		branchName = "refs/heads/" + splitRef[len(splitRef)-1]
+		isRemoteBranch = true
 	} else {
 		branchName = "refs/heads/" + branchName
 	}
 
-	w, _ := repo.Worktree()
+	// If the branch is a remote branch then a remote fetch will be performed and then the branch checkout will be initiated
+	if isRemoteBranch {
+		logger.Log(fmt.Sprintf("Branch - %s is a remote branch\nTrying with intermediate remote fetch!", branchName), global.StatusWarning)
+		fetchErr := repo.Fetch(&git.FetchOptions{
+			RefSpecs: []config.RefSpec{config.RefSpec(branchName + ":" + branchName)},
+		})
+		if fetchErr != nil {
+			logger.Log("Remote fetch failed -> "+fetchErr.Error(), global.StatusWarning)
+		}
+
+		checkoutErr := w.Checkout(&git.CheckoutOptions{
+			Branch: plumbing.ReferenceName(branchName),
+			Force:  true,
+		})
+		if checkoutErr != nil {
+			logger.Log(checkoutErr.Error(), global.StatusError)
+			return "CHECKOUT_FAILED"
+		}
+	}
+
 	checkoutErr := w.Checkout(&git.CheckoutOptions{
 		Branch: plumbing.ReferenceName(branchName),
 		Keep:   true,
 	})
 	if checkoutErr != nil {
-		logger.Log(fmt.Sprintf("Failed to checkout branch - %s --> %v\nRetrying with new branch creation!", branchName, checkoutErr.Error()), global.StatusWarning)
-		err := w.Checkout(&git.CheckoutOptions{
-			Branch: plumbing.ReferenceName(branchName),
-			Create: true,
-			Keep:   true,
-		})
-		if err != nil {
-			return "CHECKOUT_FAILED"
-		}
+		logger.Log(checkoutErr.Error(), global.StatusError)
+		return "CHECKOUT_FAILED"
 	}
+
 	logger.Log(fmt.Sprintf("Current branch checked out to -> %s", branchName), global.StatusInfo)
 	return fmt.Sprintf("Head checked out to branch - %v", branchName)
 }

git/git_branch_delete.go

@@ -24,7 +24,8 @@ func DeleteBranch(repo *git.Repository, branchName string, forceFlag bool) *mode
 	} else {
 		b, bErr := repo.Branch(branchName)
 		if bErr != nil {
-			fmt.Println(bErr.Error())
+			logger.Log(fmt.Sprintf("Failed to delete branch %s -> %v", branchName, bErr.Error()), global.StatusError)
+			return &model.BranchDeleteStatus{Status: global.BranchDeleteError}
 		} else {
 			logger.Log("Deleting branch "+b.Name, global.StatusInfo)
 			branchErr = repo.Storer.RemoveReference(ref.Name())

git/git_pull.go

@@ -30,9 +30,17 @@ func windowsPull(repoPath string, remoteName string, branch string) *model.PullR
 			PulledItems: nil,
 		}
 	} else {
+		if strings.Contains(string(cmdStr), "Already up to date") {
+			logger.Log(fmt.Sprintf("No new changes available -> %s", cmdStr), global.StatusInfo)
+
+			msg := "No changes to pull from " + remoteName
+			return &model.PullResult{
+				Status:      "NEW CHANGES ABSENT",
+				PulledItems: []*string{&msg},
+			}
+		}
 		msg := "New Items Pulled from remote " + remoteName
 		logger.Log(fmt.Sprintf("Changes pulled from remote -> %s", cmdStr), global.StatusInfo)
-
 		return &model.PullResult{
 			Status:      "PULL SUCCESS",
 			PulledItems: []*string{&msg},