mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-05-12 12:55:47 +02:00
test file
This commit is contained in:
Jesse Duffield
parent
30c4c6e576
commit
ac1fa346ac
3 changed files with 438 additions and 149 deletions
375
gui.go
375
gui.go
|
|
@ -1,3 +1,5 @@
|
|||
// lots of this has been directly ported from one of the example files, will brush up later
|
||||
|
||||
// Copyright 2014 The gocui Authors. All rights reserved.
|
||||
// Use of this source code is governed by a BSD-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
|
@ -6,95 +8,213 @@ package main
|
|||
|
||||
import (
|
||||
"fmt"
|
||||
"strings"
|
||||
// "io"
|
||||
// "io/ioutil"
|
||||
"log"
|
||||
// "strings"
|
||||
"os"
|
||||
"github.com/jroimartin/gocui"
|
||||
|
||||
"github.com/fatih/color"
|
||||
"github.com/jroimartin/gocui"
|
||||
)
|
||||
|
||||
type gitFile struct {
|
||||
Name string
|
||||
Staged bool
|
||||
type stateType struct {
|
||||
GitFiles []GitFile
|
||||
Branches []Branch
|
||||
}
|
||||
|
||||
var gitFiles []gitFile
|
||||
var state = stateType{GitFiles: make([]GitFile, 0)}
|
||||
|
||||
var cyclableViews = []string{"files", "branches"}
|
||||
|
||||
func nextView(g *gocui.Gui, v *gocui.View) error {
|
||||
if v == nil || v.Name() == "side" {
|
||||
_, err := g.SetCurrentView("main")
|
||||
var focusedViewName string
|
||||
if v == nil || v.Name() == cyclableViews[len(cyclableViews)-1] {
|
||||
focusedViewName = cyclableViews[0]
|
||||
} else {
|
||||
for i := range cyclableViews {
|
||||
if v.Name() == cyclableViews[i] {
|
||||
focusedViewName = cyclableViews[i+1]
|
||||
break
|
||||
}
|
||||
if i == len(cyclableViews)-1 {
|
||||
panic(v.Name() + " is not in the list of views")
|
||||
}
|
||||
}
|
||||
}
|
||||
focusedView, err := g.View(focusedViewName)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
return err
|
||||
}
|
||||
_, err := g.SetCurrentView("side")
|
||||
if v != nil {
|
||||
v.Highlight = false
|
||||
}
|
||||
focusedView.Highlight = true
|
||||
devLog(focusedViewName)
|
||||
_, err = g.SetCurrentView(focusedViewName)
|
||||
itemSelected(g, focusedView)
|
||||
showViewOptions(g, focusedViewName)
|
||||
return err
|
||||
}
|
||||
|
||||
func showViewOptions(g *gocui.Gui, viewName string) error {
|
||||
optionsMap := map[string]string{
|
||||
"files": "space: toggle staged, c: commit changes",
|
||||
"branches": "space: checkout",
|
||||
}
|
||||
g.Update(func(*gocui.Gui) error {
|
||||
v, err := g.View("options")
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
v.Clear()
|
||||
fmt.Fprint(v, optionsMap[viewName])
|
||||
return nil
|
||||
})
|
||||
return nil
|
||||
}
|
||||
|
||||
func getItemPosition(v *gocui.View) int {
|
||||
_, cy := v.Cursor()
|
||||
_, oy := v.Origin()
|
||||
return oy + cy
|
||||
}
|
||||
|
||||
func cursorUp(g *gocui.Gui, v *gocui.View) error {
|
||||
if v == nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
ox, oy := v.Origin()
|
||||
cx, cy := v.Cursor()
|
||||
if err := v.SetCursor(cx, cy-1); err != nil && oy > 0 {
|
||||
if err := v.SetOrigin(ox, oy-1); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
itemSelected(g, v)
|
||||
return nil
|
||||
}
|
||||
|
||||
func resetOrigin(v *gocui.View) error {
|
||||
if err := v.SetCursor(0, 0); err != nil {
|
||||
return err
|
||||
}
|
||||
return v.SetOrigin(0, 0)
|
||||
}
|
||||
|
||||
func cursorDown(g *gocui.Gui, v *gocui.View) error {
|
||||
if v != nil {
|
||||
cx, cy := v.Cursor()
|
||||
ox, oy := v.Origin()
|
||||
if cy+oy >= len(v.BufferLines())-2 {
|
||||
return nil
|
||||
}
|
||||
if err := v.SetCursor(cx, cy+1); err != nil {
|
||||
ox, oy := v.Origin()
|
||||
if err := v.SetOrigin(ox, oy+1); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// refresh main panel's text to match newly selected item
|
||||
return handleItemSelect(g, v)
|
||||
itemSelected(g, v)
|
||||
return nil
|
||||
}
|
||||
|
||||
func cursorUp(g *gocui.Gui, v *gocui.View) error {
|
||||
if v != nil {
|
||||
ox, oy := v.Origin()
|
||||
cx, cy := v.Cursor()
|
||||
if err := v.SetCursor(cx, cy-1); err != nil && oy > 0 {
|
||||
if err := v.SetOrigin(ox, oy-1); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
}
|
||||
func itemSelected(g *gocui.Gui, v *gocui.View) error {
|
||||
mainView, _ := g.View("main")
|
||||
mainView.SetOrigin(0, 0)
|
||||
|
||||
// refresh main panel's text to match newly selected item
|
||||
return handleItemSelect(g, v)
|
||||
switch v.Name() {
|
||||
case "files":
|
||||
return handleFileSelect(g, v)
|
||||
case "branches":
|
||||
return handleBranchSelect(g, v)
|
||||
default:
|
||||
panic("No view matching itemSelected switch statement")
|
||||
}
|
||||
}
|
||||
|
||||
func scrollUp(g *gocui.Gui, v *gocui.View) error {
|
||||
mainView, _ := g.View("main")
|
||||
ox, oy := mainView.Origin()
|
||||
if oy >= 1 {
|
||||
return mainView.SetOrigin(ox, oy-1)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func scrollDown(g *gocui.Gui, v *gocui.View) error {
|
||||
mainView, _ := g.View("main")
|
||||
ox, oy := mainView.Origin()
|
||||
if oy < len(mainView.BufferLines()) {
|
||||
return mainView.SetOrigin(ox, oy+1)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func devLog(s string) {
|
||||
f, _ := os.OpenFile("development.log", os.O_APPEND|os.O_WRONLY, 0644)
|
||||
f, _ := os.OpenFile("/Users/jesseduffieldduffield/go/src/github.com/jesseduffield/gitgot/development.log", os.O_APPEND|os.O_WRONLY, 0644)
|
||||
defer f.Close()
|
||||
|
||||
f.WriteString(s + "\n")
|
||||
}
|
||||
|
||||
func handleItemPress(g *gocui.Gui, v *gocui.View) error {
|
||||
item := getItem(v)
|
||||
func handleBranchPress(g *gocui.Gui, v *gocui.View) error {
|
||||
branch := getSelectedBranch(v)
|
||||
if err := gitCheckout(branch.Name, false); err != nil {
|
||||
return err
|
||||
}
|
||||
refreshBranches(v)
|
||||
refreshFiles(g)
|
||||
return nil
|
||||
}
|
||||
|
||||
if item.Staged {
|
||||
unStageFile(item.Name)
|
||||
func handleFilePress(g *gocui.Gui, v *gocui.View) error {
|
||||
file := getSelectedFile(v)
|
||||
|
||||
if file.HasUnstagedChanges {
|
||||
stageFile(file.Name)
|
||||
} else {
|
||||
stageFile(item.Name)
|
||||
unStageFile(file.Name)
|
||||
}
|
||||
|
||||
if err := refreshList(v); err != nil {
|
||||
if err := refreshFiles(g); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := handleFileSelect(g, v); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func getSelectedFile(v *gocui.View) GitFile {
|
||||
lineNumber := getItemPosition(v)
|
||||
return state.GitFiles[lineNumber]
|
||||
}
|
||||
|
||||
func getSelectedBranch(v *gocui.View) Branch {
|
||||
lineNumber := getItemPosition(v)
|
||||
return state.Branches[lineNumber]
|
||||
}
|
||||
|
||||
func handleBranchSelect(g *gocui.Gui, v *gocui.View) error {
|
||||
lineNumber := getItemPosition(v)
|
||||
branch := state.Branches[lineNumber]
|
||||
diff, _ := getBranchDiff(branch.Name, branch.BaseBranch)
|
||||
if err := renderString(g, diff); err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func getItem(v *gocui.View) gitFile {
|
||||
_, lineNumber := v.Cursor()
|
||||
if lineNumber >= len(gitFiles) {
|
||||
return gitFiles[len(gitFiles) - 1]
|
||||
}
|
||||
return gitFiles[lineNumber]
|
||||
}
|
||||
|
||||
func handleItemSelect(g *gocui.Gui, v *gocui.View) error {
|
||||
item := getItem(v)
|
||||
diff := getDiff(item.Name, item.Staged)
|
||||
devLog(diff)
|
||||
func handleFileSelect(g *gocui.Gui, v *gocui.View) error {
|
||||
item := getSelectedFile(v)
|
||||
diff := getDiff(item)
|
||||
if err := renderString(g, diff); err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
@ -102,7 +222,7 @@ func handleItemSelect(g *gocui.Gui, v *gocui.View) error {
|
|||
// maxX, maxY := g.Size()
|
||||
// if v, err := g.SetView("msg", maxX/2-30, maxY/2, maxX/2+30, maxY/2+2); err != nil {
|
||||
// if err != gocui.ErrUnknownView {
|
||||
// return err
|
||||
// return errkjhgkhj
|
||||
// }
|
||||
// fmt.Fprintln(v, l)
|
||||
// if _, err := g.SetCurrentView("msg"); err != nil {
|
||||
|
|
@ -116,7 +236,7 @@ func delMsg(g *gocui.Gui, v *gocui.View) error {
|
|||
if err := g.DeleteView("msg"); err != nil {
|
||||
return err
|
||||
}
|
||||
if _, err := g.SetCurrentView("side"); err != nil {
|
||||
if _, err := g.SetCurrentView("files"); err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
|
|
@ -127,79 +247,154 @@ func quit(g *gocui.Gui, v *gocui.View) error {
|
|||
}
|
||||
|
||||
func keybindings(g *gocui.Gui) error {
|
||||
if err := g.SetKeybinding("side", gocui.KeyCtrlSpace, gocui.ModNone, nextView); err != nil {
|
||||
for _, view := range cyclableViews {
|
||||
if err := g.SetKeybinding(view, gocui.KeyTab, gocui.ModNone, nextView); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := g.SetKeybinding(view, 'q', gocui.ModNone, quit); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := g.SetKeybinding(view, gocui.KeyCtrlC, gocui.ModNone, quit); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := g.SetKeybinding(view, gocui.KeyArrowDown, gocui.ModNone, cursorDown); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := g.SetKeybinding(view, gocui.KeyArrowUp, gocui.ModNone, cursorUp); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := g.SetKeybinding(view, gocui.KeyPgup, gocui.ModNone, scrollUp); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := g.SetKeybinding(view, gocui.KeyPgdn, gocui.ModNone, scrollDown); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
if err := g.SetKeybinding("files", gocui.KeySpace, gocui.ModNone, handleFilePress); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := g.SetKeybinding("main", gocui.KeyCtrlSpace, gocui.ModNone, nextView); err != nil {
|
||||
if err := g.SetKeybinding("branches", gocui.KeySpace, gocui.ModNone, handleBranchPress); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := g.SetKeybinding("side", gocui.KeyArrowDown, gocui.ModNone, cursorDown); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := g.SetKeybinding("side", gocui.KeyArrowUp, gocui.ModNone, cursorUp); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := g.SetKeybinding("", gocui.KeyCtrlC, gocui.ModNone, quit); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := g.SetKeybinding("", gocui.KeyEsc, gocui.ModNone, quit); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := g.SetKeybinding("side", gocui.KeySpace, gocui.ModNone, handleItemPress); err != nil {
|
||||
return err
|
||||
}
|
||||
// if err := g.SetKeybinding("msg", gocui.KeySpace, gocui.ModNone, delMsg); err != nil {
|
||||
// return err
|
||||
// }
|
||||
return nil
|
||||
}
|
||||
|
||||
func refreshList(v *gocui.View) error {
|
||||
// get files to stage
|
||||
statusString, _ := runCommand("git status")
|
||||
filesToStage := getFilesToStage(statusString)
|
||||
filesToUnstage := getFilesToUnstage(statusString)
|
||||
// v.Highlight = true
|
||||
// v.SelBgColor = gocui.ColorWhite
|
||||
// v.SelFgColor = gocui.ColorBlack
|
||||
v.Clear()
|
||||
gitFiles = make([]gitFile, 0)
|
||||
func splitLines(multilineString string) []string {
|
||||
if multilineString == "" || multilineString == "\n" {
|
||||
return make([]string, 0)
|
||||
}
|
||||
lines := strings.Split(multilineString, "\n")
|
||||
if lines[len(lines)-1] == "" {
|
||||
return lines[:len(lines)-1]
|
||||
}
|
||||
return lines
|
||||
}
|
||||
|
||||
func refreshBranches(v *gocui.View) error {
|
||||
state.Branches = getGitBranches()
|
||||
yellow := color.New(color.FgYellow)
|
||||
red := color.New(color.FgRed)
|
||||
for _, file := range filesToStage {
|
||||
gitFiles = append(gitFiles, gitFile{file, false})
|
||||
red.Fprintln(v, file)
|
||||
}
|
||||
white := color.New(color.FgWhite)
|
||||
green := color.New(color.FgGreen)
|
||||
for _, file := range filesToUnstage {
|
||||
gitFiles = append(gitFiles, gitFile{file, true})
|
||||
green.Fprintln(v, file)
|
||||
|
||||
v.Clear()
|
||||
for _, branch := range state.Branches {
|
||||
if branch.Type == "feature" {
|
||||
green.Fprintln(v, branch.DisplayString)
|
||||
continue
|
||||
}
|
||||
if branch.Type == "bugfix" {
|
||||
yellow.Fprintln(v, branch.DisplayString)
|
||||
continue
|
||||
}
|
||||
if branch.Type == "hotfix" {
|
||||
red.Fprintln(v, branch.DisplayString)
|
||||
continue
|
||||
}
|
||||
white.Fprintln(v, branch.DisplayString)
|
||||
}
|
||||
resetOrigin(v)
|
||||
return nil
|
||||
}
|
||||
|
||||
func refreshFiles(g *gocui.Gui) error {
|
||||
filesView, err := g.View("files")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// get files to stage
|
||||
gitFiles := getGitStatusFiles()
|
||||
state.GitFiles = mergeGitStatusFiles(state.GitFiles, gitFiles)
|
||||
|
||||
filesView.Clear()
|
||||
red := color.New(color.FgRed)
|
||||
green := color.New(color.FgGreen)
|
||||
for _, gitFile := range state.GitFiles {
|
||||
if !gitFile.Tracked {
|
||||
red.Fprintln(filesView, gitFile.DisplayString)
|
||||
continue
|
||||
}
|
||||
green.Fprint(filesView, gitFile.DisplayString[0:1])
|
||||
red.Fprint(filesView, gitFile.DisplayString[1:3])
|
||||
if gitFile.HasUnstagedChanges {
|
||||
red.Fprintln(filesView, gitFile.Name)
|
||||
} else {
|
||||
green.Fprintln(filesView, gitFile.Name)
|
||||
}
|
||||
}
|
||||
devLog(fmt.Sprint(gitFiles))
|
||||
return nil
|
||||
}
|
||||
|
||||
func layout(g *gocui.Gui) error {
|
||||
maxX, maxY := g.Size()
|
||||
sideView, err := g.SetView("side", -1, -1, 30, maxY)
|
||||
leftSideWidth := maxX / 3
|
||||
filesBranchesBoundary := maxY - 10
|
||||
|
||||
optionsTop := maxY - 3
|
||||
// hiding options if there's not enough space
|
||||
if maxY < 30 {
|
||||
optionsTop = maxY
|
||||
}
|
||||
|
||||
sideView, err := g.SetView("files", 0, 0, leftSideWidth, filesBranchesBoundary-1)
|
||||
if err != nil {
|
||||
if err != gocui.ErrUnknownView {
|
||||
return err
|
||||
}
|
||||
sideView.Highlight = true
|
||||
sideView.Title = "Files"
|
||||
devLog("test")
|
||||
refreshList(sideView)
|
||||
refreshFiles(g)
|
||||
}
|
||||
|
||||
if v, err := g.SetView("main", 30, -1, maxX, maxY); err != nil {
|
||||
if v, err := g.SetView("main", leftSideWidth+2, 0, maxX-1, optionsTop-1); err != nil {
|
||||
if err != gocui.ErrUnknownView {
|
||||
return err
|
||||
}
|
||||
v.Editable = true
|
||||
v.Title = "Diff"
|
||||
v.Wrap = true
|
||||
if _, err := g.SetCurrentView("side"); err != nil {
|
||||
if _, err := g.SetCurrentView("files"); err != nil {
|
||||
return err
|
||||
}
|
||||
handleItemSelect(g, sideView)
|
||||
handleFileSelect(g, sideView)
|
||||
}
|
||||
|
||||
if v, err := g.SetView("branches", 0, filesBranchesBoundary, leftSideWidth, optionsTop-1); err != nil {
|
||||
if err != gocui.ErrUnknownView {
|
||||
return err
|
||||
}
|
||||
v.Title = "Branches"
|
||||
|
||||
// these are only called once
|
||||
refreshBranches(v)
|
||||
nextView(g, nil)
|
||||
}
|
||||
|
||||
if v, err := g.SetView("options", 0, optionsTop, maxX-1, optionsTop+2); err != nil {
|
||||
if err != gocui.ErrUnknownView {
|
||||
return err
|
||||
}
|
||||
v.Title = "Options"
|
||||
}
|
||||
|
||||
return nil
|
||||
|
|
@ -226,7 +421,7 @@ func run() {
|
|||
}
|
||||
defer g.Close()
|
||||
|
||||
g.Cursor = true
|
||||
// g.Cursor = true
|
||||
|
||||
g.SetManagerFunc(layout)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue