go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-29 23:17:32 +02:00
Code Issues Releases Activity

show graph when selecting branch in branch panel

Browse Source
This commit is contained in:
Jesse Duffield 2018-08-06 21:13:52 +10:00
parent 3ee9687540
commit a02d3a0c4e
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
branches_panel.go
View File

@ -90,7 +90,7 @@ func handleBranchSelect(g *gocui.Gui, v *gocui.View) error {
} }
go func() { go func() {
branch := getSelectedBranch(v) branch := getSelectedBranch(v)
diff, _ := getBranchDiff(branch.Name, branch.BaseBranch) diff, _ := getBranchGraph(branch.Name, branch.BaseBranch)
renderString(g, "main", diff) renderString(g, "main", diff)
}() }()
return nil return nil

11
gitcommands.go
View File

@ -327,10 +327,15 @@ func sublimeOpenFile(filename string) (string, error) {
return runCommand("subl " + filename) return runCommand("subl " + filename)
} }
func getBranchDiff(branch string, baseBranch string) (string, error) { func getBranchGraph(branch string, baseBranch string) (string, error) {
return runCommand("git log -p -30 --color --no-merges " + branch) return runCommand("git log --graph --color --abbrev-commit --decorate --date=relative --pretty=medium " + branch)
// return runCommand("git diff --color " + baseBranch + "..." + branch)
// return runCommand("git log --color --graph --oneline " + branch)
// Leaving this guy commented out in case there's backlash from the design
// change and I want to make this configurable
// return runCommand("git log -p -30 --color --no-merges " + branch)
} }
func verifyInGitRepo() { func verifyInGitRepo() {