go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-21 22:43:27 +02:00
Code Issues Releases Activity

relax limit on commit list and reset on branch change

Browse Source
This commit is contained in:
Jesse Duffield 2020-03-26 21:12:12 +11:00
parent 91a404d033
commit 21b7d41845
4 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/commands/commit_list_builder.go
View File

@ -299,18 +299,11 @@ func (c *CommitListBuilder) getUnpushedCommits() map[string]bool {
} }
// getLog gets the git log. // getLog gets the git log.
func (c *CommitListBuilder) getLog(limit bool) string { func (c *CommitListBuilder) getLogCmd(limit bool) *exec.Cmd {
limitFlag := "" limitFlag := ""
if limit { if limit {
limitFlag = "-30" limitFlag = "-300"
} }
result, err := c.OSCommand.RunCommandWithOutput(fmt.Sprintf("git log --oneline --pretty=format:\"%%H%s%%ar%s%%aN%s%%d%s%%s\" %s --abbrev=%d", SEPARATION_CHAR, SEPARATION_CHAR, SEPARATION_CHAR, SEPARATION_CHAR, limitFlag, 20)) return c.OSCommand.ExecutableFromString(fmt.Sprintf("git log --oneline --pretty=format:\"%%H%s%%ar%s%%aN%s%%d%s%%s\" %s --abbrev=%d", SEPARATION_CHAR, SEPARATION_CHAR, SEPARATION_CHAR, SEPARATION_CHAR, limitFlag, 20))
if err != nil {
// assume if there is an error there are no commits yet for this branch
return ""
}
return result
} }

17
pkg/gui/branches_panel.go
View File

@ -156,6 +156,13 @@ func (gui *Gui) handleCheckoutRef(ref string, options handleCheckoutRefOptions)
cmdOptions := commands.CheckoutOptions{Force: false, EnvVars: options.EnvVars} cmdOptions := commands.CheckoutOptions{Force: false, EnvVars: options.EnvVars}
onSuccess := func() {
gui.State.Panels.Branches.SelectedLine = 0
gui.State.Panels.Commits.SelectedLine = 0
// loading a heap of commits is slow so we limit them whenever doing a reset
gui.State.Panels.Commits.LimitCommits = true
}
return gui.WithWaitingStatus(waitingStatus, func() error { return gui.WithWaitingStatus(waitingStatus, func() error {
if err := gui.GitCommand.Checkout(ref, cmdOptions); err != nil { if err := gui.GitCommand.Checkout(ref, cmdOptions); err != nil {
// note, this will only work for english-language git commands. If we force git to use english, and the error isn't this one, then the user will receive an english command they may not understand. I'm not sure what the best solution to this is. Running the command once in english and a second time in the native language is one option // note, this will only work for english-language git commands. If we force git to use english, and the error isn't this one, then the user will receive an english command they may not understand. I'm not sure what the best solution to this is. Running the command once in english and a second time in the native language is one option
@ -171,8 +178,7 @@ func (gui *Gui) handleCheckoutRef(ref string, options handleCheckoutRefOptions)
return gui.createErrorPanel(g, err.Error()) return gui.createErrorPanel(g, err.Error())
} }
// checkout successful so we select the new branch onSuccess()
gui.State.Panels.Branches.SelectedLine = 0
if err := gui.GitCommand.StashDo(0, "pop"); err != nil { if err := gui.GitCommand.StashDo(0, "pop"); err != nil {
if err := gui.refreshSidePanels(g); err != nil { if err := gui.refreshSidePanels(g); err != nil {
@ -189,8 +195,8 @@ func (gui *Gui) handleCheckoutRef(ref string, options handleCheckoutRefOptions)
} }
} }
gui.State.Panels.Branches.SelectedLine = 0 onSuccess()
gui.State.Panels.Commits.SelectedLine = 0
return gui.refreshSidePanels(gui.g) return gui.refreshSidePanels(gui.g)
}) })
} }
@ -492,5 +498,8 @@ func (gui *Gui) handleRenameBranch(g *gocui.Gui, v *gocui.View) error {
} }
func (gui *Gui) currentBranch() *commands.Branch { func (gui *Gui) currentBranch() *commands.Branch {
if len(gui.State.Branches) == 0 {
return nil
}
return gui.State.Branches[0] return gui.State.Branches[0]
} }

2
pkg/gui/commits_panel.go
View File

@ -35,7 +35,7 @@ func (gui *Gui) handleCommitSelect(g *gocui.Gui, v *gocui.View) error {
} }
state := gui.State.Panels.Commits state := gui.State.Panels.Commits
if state.SelectedLine > 20 && state.LimitCommits { if state.SelectedLine > 290 && state.LimitCommits {
state.LimitCommits = false state.LimitCommits = false
go func() { go func() {
if err := gui.refreshCommitsWithLimit(); err != nil { if err := gui.refreshCommitsWithLimit(); err != nil {

2
pkg/gui/reset_menu_panel.go
View File

@ -18,6 +18,8 @@ func (gui *Gui) resetToRef(ref string, strength string, options commands.RunComm
gui.State.Panels.Commits.SelectedLine = 0 gui.State.Panels.Commits.SelectedLine = 0
gui.State.Panels.ReflogCommits.SelectedLine = 0 gui.State.Panels.ReflogCommits.SelectedLine = 0
// loading a heap of commits is slow so we limit them whenever doing a reset
gui.State.Panels.Commits.LimitCommits = true
if err := gui.refreshCommits(gui.g); err != nil { if err := gui.refreshCommits(gui.g); err != nil {
return err return err