feat: support git rebase statuses

Author: NonLogicalDev

cmd/goprompt/cmdQuery.go

@@ -6,6 +6,7 @@ import (
 	"os"
 	"os/signal"
 	"os/user"
+	"path/filepath"
 	"strings"
 	"syscall"
 	"time"
@@ -74,6 +75,9 @@ const (
 	_partVcsStgTop   = "vcs_git_stg_top"
 	_partVcsStgDirty = "vcs_git_stg_dirty"
 
+	_partVcsGitRebaseOp    = "vcs_git_rebase_op"
+	_partVcsGitRebaseLeft  = "vcs_git_rebase_op_left"
+
 	_partVcsGitIdxTotal    = "vcs_git_idx_total"
 	_partVcsGitIdxIncluded = "vcs_git_idx_incl"
 	_partVcsGitIdxExcluded = "vcs_git_idx_excl"
@@ -273,24 +277,43 @@ func cmdQueryRun(_ *cobra.Command, _ []string) error {
 			printPart(_partVcs, "git")
 		} else {
 			return nil
+
 		}
 
+		gitDir, _ := stringExec("git", "rev-parse", "--path-format=absolute", "--git-dir")
+
 		subTasks.Go(func(ctx context.Context) error {
-			if branch, err := stringExec("git", "branch", "--show-current"); err == nil {
-				branch = trim(branch)
-				if len(branch) > 0 {
-					printPart(_partVcsBranch, trim(branch))
-					return nil
+
+
+
+			headRef := ""
+			if cherryHeadB, _ := os.ReadFile(filepath.Join(gitDir, "CHERRY_PICK_HEAD")); len(cherryHeadB) > 0 {
+				headRef = trim(string(cherryHeadB))
+				printPart(_partVcsGitRebaseOp, "cherry")
+			} else if mergeHeadB, _ := os.ReadFile(filepath.Join(gitDir, "MERGE_HEAD")); len(mergeHeadB) > 0 {
+				headRef = trim(string(mergeHeadB))
+				printPart(_partVcsGitRebaseOp, "merge")
+			} else if rebaseHeadB, _ := os.ReadFile(filepath.Join(gitDir, "rebase-merge", "orig-head")); len(rebaseHeadB) > 0 {
+				headRef = trim(string(rebaseHeadB))
+				printPart(_partVcsGitRebaseOp, "rebase")
+
+				actionsLeftB, _ := os.ReadFile(filepath.Join(gitDir, "rebase-merge", "git-rebase-todo"))
+				actionsLeft := trim(string(actionsLeftB))
+				if len(actionsLeftB) == 0 {
+					printPart(_partVcsGitRebaseLeft, 1)
+				} else {
+					printPart(_partVcsGitRebaseLeft, len(strings.Split(string(actionsLeft), "\n"))+1)
 				}
 			}
 
-			if branch, err := stringExec("git", "name-rev", "--name-only", "HEAD"); err == nil {
-				branch = trim(branch)
-				if len(branch) > 0 {
-					printPart(_partVcsBranch, trim(branch))
-					return nil
-				}
+			branch := ""
+
+			if len(headRef) != 0 {
+				branch, _ = stringExec("git", "name-rev", "--name-only", headRef)
+			} else {
+				branch, _ = stringExec("git", "branch", "--show-current")
 			}
+			printPart(_partVcsBranch, branch)
 
 			return nil
 		})

cmd/goprompt/cmdRender.go

@@ -125,6 +125,15 @@ func cmdRenderRun(_ *cobra.Command, _ []string) error {
 			distanceMarks = fmt.Sprintf("[+%v:-%v]", distanceAhead, distanceBehind)
 		}
 
+		rebaseOp := ""
+		rebaseOpC := redC
+		if len(p[_partVcsGitRebaseOp]) != 0 {
+			rebaseOp = p[_partVcsGitRebaseOp]
+			if p[_partVcsGitRebaseLeft] != "" {
+				rebaseOp += fmt.Sprintf("(%v)", p[_partVcsGitRebaseLeft])
+			}
+		}
+
 		gitParts = append(gitParts, gitMarkC(gitMark))
 		gitParts = append(gitParts, gitBranchC(gitBranch))
 		if len(gitDirtyMarks) > 0 {
@@ -133,6 +142,9 @@ func cmdRenderRun(_ *cobra.Command, _ []string) error {
 		if len(distanceMarks) > 0 {
 			gitParts = append(gitParts, distanceMarksC(distanceMarks))
 		}
+		if len(rebaseOp) > 0 {
+			gitParts = append(gitParts, rebaseOpC(rebaseOp))
+		}
 
 		partsTop = append(partsTop, fmt.Sprintf("{%v}", strings.Join(gitParts, ":")))
 	}
@@ -152,23 +164,11 @@ func cmdRenderRun(_ *cobra.Command, _ []string) error {
 			saplDirtyMarks = "&"
 		}
 
-		// distanceMarks := ""
-		// distanceMarksC := magentaC
-
-		// distanceAhead := strInt(p[_partVcsLogAhead])
-		// distanceBehind := strInt(p[_partVcsLogBehind])
-		// if distanceAhead > 0 || distanceBehind > 0 {
-		// 	distanceMarks = fmt.Sprintf("[+%v:-%v]", distanceAhead, distanceBehind)
-		// }
-
 		saplParts = append(saplParts, saplMarkC(saplMark))
 		saplParts = append(saplParts, saplBookmarkC(saplBookmark))
 		if len(saplDirtyMarks) > 0 {
 			saplParts = append(saplParts, saplDirtyMarksC(saplDirtyMarks))
 		}
-		// if len(distanceMarks) > 0 {
-		// 	saplParts = append(saplParts, distanceMarksC(distanceMarks))
-		// }
 
 		partsTop = append(partsTop, fmt.Sprintf("{%v}", strings.Join(saplParts, ":")))
 	}