mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-12 12:55:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

handling file edit

Browse source
This commit is contained in:
Jesse Duffield 2018-08-06 23:29:00 +10:00
parent 6e585c54a2
commit 9067c3be3e
3 changed files with 59 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

56
gitcommands.go
View file

@ -11,11 +11,12 @@ import (
"time"
"github.com/fatih/color"
"github.com/jesseduffield/gocui"
)
var (
// ErrNoCheckedOutBranch : When we have no checked out branch
ErrNoCheckedOutBranch = errors.New("No currently checked out branch")
// ErrNoCheckedOutBranch : When we have no checked out branch
ErrNoCheckedOutBranch = errors.New("No currently checked out branch")
)
// GitFile : A staged/unstaged file
@ -308,18 +309,57 @@ func runCommand(command string) (string, error) {
return string(cmdOut), err
}
func openFile(filename string) (string, error) {
return runCommand("open " + filename)
}
func vsCodeOpenFile(filename string) (string, error) {
func vsCodeOpenFile(g *gocui.Gui, filename string) (string, error) {
return runCommand("code -r " + filename)
}
func sublimeOpenFile(filename string) (string, error) {
func sublimeOpenFile(g *gocui.Gui, filename string) (string, error) {
return runCommand("subl " + filename)
}
func openFile(g *gocui.Gui, filename string) (string, error) {
cmdName, cmdTrail := getOpenCommand()
return runCommand(cmdName + " " + cmdTrail)
}
func editFile(g *gocui.Gui, filename string) (string, error) {
editor := os.Getenv("VISUAL")
if editor == "" {
editor = os.Getenv("EDITOR")
}
if editor == "" {
editor = "vi"
}
runSubProcess(g, editor, filename)
return "", nil
}
func getOpenCommand() (string, string) {
//NextStep open equivalents: xdg-open (linux), cygstart (cygwin), open (OSX)
trailMap := map[string]string{
"xdg-open": "&>/dev/null &",
"cygstart": "",
}
for name, trail := range trailMap {
if out, _ := runCommand("which " + name); out != "" {
return name, trail
}
}
return "open", ""
}
func runSubProcess(g *gocui.Gui, cmdName string, commandArgs ...string) {
// TODO: find a way to wait for the subprocess without having to
// close and reinitialize the gui
// g.Close() // TODO: find a way to make close properly after uncommenting
cmd := exec.Command(cmdName, commandArgs...)
cmd.Stdin = os.Stdin
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
cmd.Run()
run() // start another Gui
}
func getBranchDiff(branch string, baseBranch string) (string, error) {
return runCommand("git log -p -30 --color --no-merges " + branch)