go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-11-29 22:48:24 +02:00
Code Issues Releases Activity

more cherry picking stuff, mostly around the reflog

Browse Source
This commit is contained in:
Jesse Duffield
2020-08-22 11:57:44 +10:00
parent c2b154acad
commit 442f6cd854
5 changed files with 67 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/gui/cherry_picking.go
View File

@@ -55,7 +55,7 @@ func (gui *Gui) handleCopyCommit() error {
return context.HandleRender()
}
func (gui *Gui) CherryPickedCommitShaMap() map[string]bool {
func (gui *Gui) cherryPickedCommitShaMap() map[string]bool {
commitShaMap := map[string]bool{}
for _, commit := range gui.State.Modes.CherryPicking.CherryPickedCommits {
commitShaMap[commit.Sha] = true
@@ -84,7 +84,7 @@ func (gui *Gui) commitsListForContext() []*commands.Commit {
}
func (gui *Gui) addCommitToCherryPickedCommits(index int) {
commitShaMap := gui.CherryPickedCommitShaMap()
commitShaMap := gui.cherryPickedCommitShaMap()
commitsList := gui.commitsListForContext()
commitShaMap[commitsList[index].Sha] = true
@@ -110,7 +110,9 @@ func (gui *Gui) handleCopyCommitRange() error {
return nil
}
gui.resetCherryPickingIfNecessary(context)
if err := gui.resetCherryPickingIfNecessary(context); err != nil {
return err
}
commit, ok := context.SelectedItem().(*commands.Commit)
if !ok {
@@ -120,7 +122,7 @@ func (gui *Gui) handleCopyCommitRange() error {
return nil
}
commitShaMap := gui.CherryPickedCommitShaMap()
commitShaMap := gui.cherryPickedCommitShaMap()
// find the last commit that is copied that's above our position
// if there are none, startIndex = 0
@@ -135,7 +137,7 @@ func (gui *Gui) handleCopyCommitRange() error {
gui.addCommitToCherryPickedCommits(index)
}
return gui.Contexts.BranchCommits.Context.HandleRender()
return context.HandleRender()
}
// HandlePasteCommits begins a cherry-pick rebase with the commits the user has copied