diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-03-28 12:08:13 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-03-28 13:19:35 +1100 |
| commit | a9559a5c8738d6938f8750f0729f077e0842800e (patch) | |
| tree | 6bf8ae15c80891325227261d46880d5f2e553c0b /pkg/gui/status_panel.go | |
| parent | 814ee24c8d13ae554925530ec68f325394ddfe6d (diff) | |
move working tree state function into git.go
Diffstat (limited to 'pkg/gui/status_panel.go')
| -rw-r--r-- | pkg/gui/status_panel.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkg/gui/status_panel.go b/pkg/gui/status_panel.go index 207e493bb..6a21f2926 100644 --- a/pkg/gui/status_panel.go +++ b/pkg/gui/status_panel.go @@ -33,8 +33,8 @@ func (gui *Gui) refreshStatus() { status = utils.ColoredString(fmt.Sprintf("ā%sā%s ", currentBranch.Pushables, currentBranch.Pullables), trackColor) } - if gui.workingTreeState() != "normal" { - status += utils.ColoredString(fmt.Sprintf("(%s) ", gui.workingTreeState()), color.FgYellow) + if gui.GitCommand.WorkingTreeState() != "normal" { + status += utils.ColoredString(fmt.Sprintf("(%s) ", gui.GitCommand.WorkingTreeState()), color.FgYellow) } name := utils.ColoredString(currentBranch.Name, presentation.GetBranchColor(currentBranch.Name)) @@ -66,9 +66,9 @@ func (gui *Gui) handleStatusClick(g *gocui.Gui, v *gocui.View) error { cx, _ := v.Cursor() upstreamStatus := fmt.Sprintf("ā%sā%s", currentBranch.Pushables, currentBranch.Pullables) repoName := utils.GetCurrentRepoName() - switch gui.workingTreeState() { + switch gui.GitCommand.WorkingTreeState() { case "rebasing", "merging": - workingTreeStatus := fmt.Sprintf("(%s)", gui.workingTreeState()) + workingTreeStatus := fmt.Sprintf("(%s)", gui.GitCommand.WorkingTreeState()) if cursorInSubstring(cx, upstreamStatus+" ", workingTreeStatus) { return gui.handleCreateRebaseOptionsMenu(gui.g, v) } |