feat: display content on main panel from left panels

Signed-off-by: Ayush <mail@ayuch.dev>

Author: bakayu

internal/git/commit.go

@@ -42,7 +42,7 @@ func (g *GitCommands) ShowCommit(commitHash string) (string, error) {
 		commitHash = "HEAD"
 	}
 
-	cmd := exec.Command("git", "show", commitHash)
+	cmd := exec.Command("git", "show", "--color=always", commitHash)
 	output, err := cmd.CombinedOutput()
 	if err != nil {
 		return string(output), fmt.Errorf("failed to show commit: %v", err)

internal/git/diff.go

@@ -11,18 +11,27 @@ type DiffOptions struct {
 	Commit2 string
 	Cached  bool
 	Stat    bool
+	Color   bool
 }
 
 // ShowDiff shows changes between commits, commit and working tree, etc.
 func (g *GitCommands) ShowDiff(options DiffOptions) (string, error) {
 	args := []string{"diff"}
 
+	if options.Color {
+		args = append(args, "--color=always")
+	}
 	if options.Cached {
 		args = append(args, "--cached")
 	}
 	if options.Stat {
 		args = append(args, "--stat")
 	}
+
+	if options.Commit1 != "" || options.Commit2 != "" {
+		args = append(args, "--")
+	}
+
 	if options.Commit1 != "" {
 		args = append(args, options.Commit1)
 	}

internal/git/log.go

@@ -24,6 +24,7 @@ type LogOptions struct {
 	MaxCount int
 	Format   string
 	Color    string
+	Branch   string
 }
 
 // GetCommitLogsGraph fetches the git log with a graph format and returns it as a
@@ -67,6 +68,9 @@ func (g *GitCommands) ShowLog(options LogOptions) (string, error) {
 	if options.Color != "" {
 		args = append(args, fmt.Sprintf("--color=%s", options.Color))
 	}
+	if options.Branch != "" {
+		args = append(args, options.Branch)
+	}
 
 	cmd := ExecCommand("git", args...)
 	output, err := cmd.CombinedOutput()

internal/git/repo.go

@@ -34,3 +34,13 @@ func (g *GitCommands) GetGitRepoPath() (repoPath string, err error) {
 	repoPath = strings.TrimSpace(string(repoPathBytes))
 	return repoPath, nil
 }
+
+// GetUserName returns the user's name from the git config.
+func (g *GitCommands) GetUserName() (string, error) {
+	cmd := ExecCommand("git", "config", "user.name")
+	output, err := cmd.Output()
+	if err != nil {
+		return "", err
+	}
+	return strings.TrimSpace(string(output)), nil
+}

internal/git/stash.go

@@ -84,7 +84,7 @@ func (g *GitCommands) Stash(options StashOptions) (string, error) {
 	} else if options.List {
 		args = []string{"stash", "list"}
 	} else if options.Show {
-		args = []string{"stash", "show"}
+		args = []string{"stash", "show", "--color=always"}
 		if options.StashID != "" {
 			args = append(args, options.StashID)
 		}
@@ -98,6 +98,10 @@ func (g *GitCommands) Stash(options StashOptions) (string, error) {
 	cmd := exec.Command("git", args...)
 	output, err := cmd.CombinedOutput()
 	if err != nil {
+		// The command fails if there's no stash.
+		if strings.Contains(string(output), "No stash entries found") || strings.Contains(string(output), "No stash found") {
+			return "No stashes found.", nil
+		}
 		return string(output), fmt.Errorf("stash operation failed: %v", err)
 	}
 

internal/tui/filetree.go

@@ -18,7 +18,7 @@ type Node struct {
 
 // BuildTree parses the output of `git status --porcelain` to construct a file tree.
 func BuildTree(gitStatus string) *Node {
-	root := &Node{name: repoRootNodeName}
+	root := &Node{name: repoRootNodeName, path: "."}
 
 	lines := strings.Split(gitStatus, "\n")
 	if len(lines) == 1 && lines[0] == "" {
@@ -30,30 +30,35 @@ func BuildTree(gitStatus string) *Node {
 			continue
 		}
 		status := line[:2]
-		path := strings.TrimSpace(line[porcelainStatusPrefixLength:])
+		fullPath := strings.TrimSpace(line[porcelainStatusPrefixLength:])
 		isRenamed := false
 
 		if status[0] == 'R' || status[0] == 'C' {
-			parts := strings.Split(path, gitRenameDelimiter)
+			parts := strings.Split(fullPath, gitRenameDelimiter)
 			if len(parts) == 2 {
-				path = parts[1]
+				fullPath = parts[1]
 				isRenamed = true
 			}
 		}
 
-		parts := strings.Split(path, string(filepath.Separator))
+		parts := strings.Split(fullPath, string(filepath.Separator))
 		currentNode := root
 		for i, part := range parts {
 			childNode := currentNode.findChild(part)
 			if childNode == nil {
-				childNode = &Node{name: part}
+				// Construct path for the new node based on its parent
+				nodePath := filepath.Join(currentNode.path, part)
+				if currentNode.path == "." {
+					nodePath = part
+				}
+				childNode = &Node{name: part, path: nodePath}
 				currentNode.children = append(currentNode.children, childNode)
 			}
 			currentNode = childNode
 
-			if i == len(parts)-1 {
+			if i == len(parts)-1 { // Leaf node (file)
 				currentNode.status = status
-				currentNode.path = path
+				currentNode.path = fullPath // Overwrite with the full path from git
 				currentNode.isRenamed = isRenamed
 			}
 		}
@@ -119,6 +124,7 @@ func (n *Node) compact() {
 	for len(n.children) == 1 && len(n.children[0].children) > 0 {
 		child := n.children[0]
 		n.name = filepath.Join(n.name, child.name)
+		n.path = child.path
 		n.children = child.children
 	}
 }
@@ -132,14 +138,14 @@ func (n *Node) renderRecursive(prefix string, theme Theme) []string {
 
 		if len(child.children) > 0 { // It's a directory
 			displayName := dirExpandedIcon + child.name
-			lines = append(lines, fmt.Sprintf("%s\t\t%s", prefix, displayName))
+			lines = append(lines, fmt.Sprintf("%s\t\t%s\t%s", prefix, displayName, child.path))
 			lines = append(lines, child.renderRecursive(newPrefix, theme)...)
 		} else { // It's a file.
 			displayName := child.name
 			if child.isRenamed {
 				displayName = child.path
 			}
-			lines = append(lines, fmt.Sprintf("%s\t%s\t%s", prefix, child.status, displayName))
+			lines = append(lines, fmt.Sprintf("%s\t%s\t%s\t%s", prefix, child.status, displayName, child.path))
 		}
 	}
 	return lines

internal/tui/model.go

@@ -10,21 +10,22 @@ import (
 
 // Model represents the state of the TUI.
 type Model struct {
-	width        int
-	height       int
-	panels       []panel
-	panelHeights []int
-	focusedPanel Panel
-	theme        Theme
-	themeNames   []string
-	themeIndex   int
-	help         help.Model
-	helpViewport viewport.Model
-	helpContent  string
-	showHelp     bool
-	git          *git.GitCommands
-	repoName     string
-	branchName   string
+	width             int
+	height            int
+	panels            []panel
+	panelHeights      []int
+	focusedPanel      Panel
+	activeSourcePanel Panel
+	theme             Theme
+	themeNames        []string
+	themeIndex        int
+	help              help.Model
+	helpViewport      viewport.Model
+	helpContent       string
+	showHelp          bool
+	git               *git.GitCommands
+	repoName          string
+	branchName        string
 }
 
 // initialModel creates the initial state of the application.
@@ -46,17 +47,18 @@ func initialModel() Model {
 	}
 
 	return Model{
-		theme:        Themes[themeNames[0]],
-		themeNames:   themeNames,
-		themeIndex:   0,
-		focusedPanel: StatusPanel,
-		help:         help.New(),
-		helpViewport: viewport.New(0, 0),
-		showHelp:     false,
-		git:          gc,
-		repoName:     repoName,
-		branchName:   branchName,
-		panels:       panels,
+		theme:             Themes[themeNames[0]],
+		themeNames:        themeNames,
+		themeIndex:        0,
+		focusedPanel:      StatusPanel,
+		activeSourcePanel: StatusPanel,
+		help:              help.New(),
+		helpViewport:      viewport.New(0, 0),
+		showHelp:          false,
+		git:               gc,
+		repoName:          repoName,
+		branchName:        branchName,
+		panels:            panels,
 	}
 }
 
@@ -69,8 +71,8 @@ func (m Model) Init() tea.Cmd {
 		m.fetchPanelContent(BranchesPanel),
 		m.fetchPanelContent(CommitsPanel),
 		m.fetchPanelContent(StashPanel),
-		m.fetchPanelContent(MainPanel),
 		m.fetchPanelContent(SecondaryPanel),
+		m.updateMainPanel(),
 	)
 }