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

Pass todo flag to EditRebaseTodo

Browse source 
Not used yet, we pass an empty string everywhere, to match the previous
behavior. Just extracting this into a separate commit to make the next one
smaller.
This commit is contained in:
Stefan Haller 2025-04-29 15:53:47 +02:00
parent 70e3df1fa7
commit 24cb221aec
5 changed files with 23 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

1
pkg/app/daemon/daemon.go
View file

@ -201,6 +201,7 @@ func (self *ChangeTodoActionsInstruction) run(common *common.Common) error {
return utils.TodoChange{ return utils.TodoChange{
Hash: c.Hash, Hash: c.Hash,
NewAction: c.NewAction, NewAction: c.NewAction,
NewFlag: c.NewFlag,
} }
}) })

1
pkg/app/daemon/rebase.go
View file

@ -37,6 +37,7 @@ func TodoLinesToString(todoLines []TodoLine) string {
type ChangeTodoAction struct { type ChangeTodoAction struct {
Hash string Hash string
NewAction todo.TodoCommand NewAction todo.TodoCommand
NewFlag string
} }
func handleInteractiveRebase(common *common.Common, f func(path string) error) error { func handleInteractiveRebase(common *common.Common, f func(path string) error) error {

6
pkg/commands/git_commands/rebase.go
View file

@ -137,7 +137,7 @@ func (self *RebaseCommands) MoveCommitsUp(commits []*models.Commit, startIdx int
}).Run() }).Run()
} }
func (self *RebaseCommands) InteractiveRebase(commits []*models.Commit, startIdx int, endIdx int, action todo.TodoCommand) error { func (self *RebaseCommands) InteractiveRebase(commits []*models.Commit, startIdx int, endIdx int, action todo.TodoCommand, flag string) error {
baseIndex := endIdx + 1 baseIndex := endIdx + 1
if action == todo.Squash || action == todo.Fixup { if action == todo.Squash || action == todo.Fixup {
baseIndex++ baseIndex++
@ -149,6 +149,7 @@ func (self *RebaseCommands) InteractiveRebase(commits []*models.Commit, startIdx
return daemon.ChangeTodoAction{ return daemon.ChangeTodoAction{
Hash: commit.Hash(), Hash: commit.Hash(),
NewAction: action, NewAction: action,
NewFlag: flag,
}, !commit.IsMerge() }, !commit.IsMerge()
}) })
@ -331,11 +332,12 @@ func todoFromCommit(commit *models.Commit) utils.Todo {
} }
// Sets the action for the given commits in the git-rebase-todo file // Sets the action for the given commits in the git-rebase-todo file
func (self *RebaseCommands) EditRebaseTodo(commits []*models.Commit, action todo.TodoCommand) error { func (self *RebaseCommands) EditRebaseTodo(commits []*models.Commit, action todo.TodoCommand, flag string) error {
commitsWithAction := lo.Map(commits, func(commit *models.Commit, _ int) utils.TodoChange { commitsWithAction := lo.Map(commits, func(commit *models.Commit, _ int) utils.TodoChange {
return utils.TodoChange{ return utils.TodoChange{
Hash: commit.Hash(), Hash: commit.Hash(),
NewAction: action, NewAction: action,
NewFlag: flag,
} }
}) })

30
pkg/gui/controllers/local_commits_controller.go
View file

@ -322,7 +322,7 @@ func secondaryPatchPanelUpdateOpts(c *ControllerCommon) *types.ViewUpdateOpts {
func (self *LocalCommitsController) squashDown(selectedCommits []*models.Commit, startIdx int, endIdx int) error { func (self *LocalCommitsController) squashDown(selectedCommits []*models.Commit, startIdx int, endIdx int) error {
if self.isRebasing() { if self.isRebasing() {
return self.updateTodos(todo.Squash, selectedCommits) return self.updateTodos(todo.Squash, "", selectedCommits)
} }
self.c.Confirm(types.ConfirmOpts{ self.c.Confirm(types.ConfirmOpts{
@ -331,7 +331,7 @@ func (self *LocalCommitsController) squashDown(selectedCommits []*models.Commit,
HandleConfirm: func() error { HandleConfirm: func() error {
return self.c.WithWaitingStatus(self.c.Tr.SquashingStatus, func(gocui.Task) error { return self.c.WithWaitingStatus(self.c.Tr.SquashingStatus, func(gocui.Task) error {
self.c.LogAction(self.c.Tr.Actions.SquashCommitDown) self.c.LogAction(self.c.Tr.Actions.SquashCommitDown)
return self.interactiveRebase(todo.Squash, startIdx, endIdx) return self.interactiveRebase(todo.Squash, "", startIdx, endIdx)
}) })
}, },
}) })
@ -341,7 +341,7 @@ func (self *LocalCommitsController) squashDown(selectedCommits []*models.Commit,
func (self *LocalCommitsController) fixup(selectedCommits []*models.Commit, startIdx int, endIdx int) error { func (self *LocalCommitsController) fixup(selectedCommits []*models.Commit, startIdx int, endIdx int) error {
if self.isRebasing() { if self.isRebasing() {
return self.updateTodos(todo.Fixup, selectedCommits) return self.updateTodos(todo.Fixup, "", selectedCommits)
} }
self.c.Confirm(types.ConfirmOpts{ self.c.Confirm(types.ConfirmOpts{
@ -350,7 +350,7 @@ func (self *LocalCommitsController) fixup(selectedCommits []*models.Commit, star
HandleConfirm: func() error { HandleConfirm: func() error {
return self.c.WithWaitingStatus(self.c.Tr.FixingStatus, func(gocui.Task) error { return self.c.WithWaitingStatus(self.c.Tr.FixingStatus, func(gocui.Task) error {
self.c.LogAction(self.c.Tr.Actions.FixupCommit) self.c.LogAction(self.c.Tr.Actions.FixupCommit)
return self.interactiveRebase(todo.Fixup, startIdx, endIdx) return self.interactiveRebase(todo.Fixup, "", startIdx, endIdx)
}) })
}, },
}) })
@ -485,14 +485,14 @@ func (self *LocalCommitsController) drop(selectedCommits []*models.Commit, start
self.context().SetSelectionRangeAndMode(selectedIdx, rangeStartIdx, rangeSelectMode) self.context().SetSelectionRangeAndMode(selectedIdx, rangeStartIdx, rangeSelectMode)
return self.updateTodos(todo.Drop, nonUpdateRefTodos) return self.updateTodos(todo.Drop, "", nonUpdateRefTodos)
}, },
}) })
return nil return nil
} }
return self.updateTodos(todo.Drop, selectedCommits) return self.updateTodos(todo.Drop, "", selectedCommits)
} }
isMerge := selectedCommits[0].IsMerge() isMerge := selectedCommits[0].IsMerge()
@ -506,7 +506,7 @@ func (self *LocalCommitsController) drop(selectedCommits []*models.Commit, start
if isMerge { if isMerge {
return self.dropMergeCommit(startIdx) return self.dropMergeCommit(startIdx)
} }
return self.interactiveRebase(todo.Drop, startIdx, endIdx) return self.interactiveRebase(todo.Drop, "", startIdx, endIdx)
}) })
}, },
}) })
@ -521,13 +521,13 @@ func (self *LocalCommitsController) dropMergeCommit(commitIdx int) error {
func (self *LocalCommitsController) edit(selectedCommits []*models.Commit, startIdx int, endIdx int) error { func (self *LocalCommitsController) edit(selectedCommits []*models.Commit, startIdx int, endIdx int) error {
if self.isRebasing() { if self.isRebasing() {
return self.updateTodos(todo.Edit, selectedCommits) return self.updateTodos(todo.Edit, "", selectedCommits)
} }
commits := self.c.Model().Commits commits := self.c.Model().Commits
if !commits[endIdx].IsMerge() { if !commits[endIdx].IsMerge() {
selectionRangeAndMode := self.getSelectionRangeAndMode() selectionRangeAndMode := self.getSelectionRangeAndMode()
err := self.c.Git().Rebase.InteractiveRebase(commits, startIdx, endIdx, todo.Edit) err := self.c.Git().Rebase.InteractiveRebase(commits, startIdx, endIdx, todo.Edit, "")
return self.c.Helpers().MergeAndRebase.CheckMergeOrRebaseWithRefreshOptions( return self.c.Helpers().MergeAndRebase.CheckMergeOrRebaseWithRefreshOptions(
err, err,
types.RefreshOptions{ types.RefreshOptions{
@ -568,7 +568,7 @@ func (self *LocalCommitsController) startInteractiveRebaseWithEdit(
} }
} }
if len(todos) > 0 { if len(todos) > 0 {
err := self.updateTodos(todo.Edit, todos) err := self.updateTodos(todo.Edit, "", todos)
if err != nil { if err != nil {
return err return err
} }
@ -628,7 +628,7 @@ func (self *LocalCommitsController) findCommitForQuickStartInteractiveRebase() (
func (self *LocalCommitsController) pick(selectedCommits []*models.Commit) error { func (self *LocalCommitsController) pick(selectedCommits []*models.Commit) error {
if self.isRebasing() { if self.isRebasing() {
return self.updateTodos(todo.Pick, selectedCommits) return self.updateTodos(todo.Pick, "", selectedCommits)
} }
// at this point we aren't actually rebasing so we will interpret this as an // at this point we aren't actually rebasing so we will interpret this as an
@ -636,14 +636,14 @@ func (self *LocalCommitsController) pick(selectedCommits []*models.Commit) error
return self.pullFiles() return self.pullFiles()
} }
func (self *LocalCommitsController) interactiveRebase(action todo.TodoCommand, startIdx int, endIdx int) error { func (self *LocalCommitsController) interactiveRebase(action todo.TodoCommand, flag string, startIdx int, endIdx int) error {
// When performing an action that will remove the selected commits, we need to select the // When performing an action that will remove the selected commits, we need to select the
// next commit down (which will end up at the start index after the action is performed) // next commit down (which will end up at the start index after the action is performed)
if action == todo.Drop || action == todo.Fixup || action == todo.Squash { if action == todo.Drop || action == todo.Fixup || action == todo.Squash {
self.context().SetSelection(startIdx) self.context().SetSelection(startIdx)
} }
err := self.c.Git().Rebase.InteractiveRebase(self.c.Model().Commits, startIdx, endIdx, action) err := self.c.Git().Rebase.InteractiveRebase(self.c.Model().Commits, startIdx, endIdx, action, flag)
return self.c.Helpers().MergeAndRebase.CheckMergeOrRebase(err) return self.c.Helpers().MergeAndRebase.CheckMergeOrRebase(err)
} }
@ -651,8 +651,8 @@ func (self *LocalCommitsController) interactiveRebase(action todo.TodoCommand, s
// updateTodos sees if the selected commit is in fact a rebasing // updateTodos sees if the selected commit is in fact a rebasing
// commit meaning you are trying to edit the todo file rather than actually // commit meaning you are trying to edit the todo file rather than actually
// begin a rebase. It then updates the todo file with that action // begin a rebase. It then updates the todo file with that action
func (self *LocalCommitsController) updateTodos(action todo.TodoCommand, selectedCommits []*models.Commit) error { func (self *LocalCommitsController) updateTodos(action todo.TodoCommand, flag string, selectedCommits []*models.Commit) error {
if err := self.c.Git().Rebase.EditRebaseTodo(selectedCommits, action); err != nil { if err := self.c.Git().Rebase.EditRebaseTodo(selectedCommits, action, flag); err != nil {
return err return err
} }

2
pkg/utils/rebase_todo.go
View file

@ -19,6 +19,7 @@ type Todo struct {
type TodoChange struct { type TodoChange struct {
Hash string Hash string
NewAction todo.TodoCommand NewAction todo.TodoCommand
NewFlag string
} }
// Read a git-rebase-todo file, change the actions for the given commits, // Read a git-rebase-todo file, change the actions for the given commits,
@ -37,6 +38,7 @@ func EditRebaseTodo(filePath string, changes []TodoChange, commentChar byte) err
if equalHash(t.Commit, change.Hash) { if equalHash(t.Commit, change.Hash) {
matchCount++ matchCount++
t.Command = change.NewAction t.Command = change.NewAction
t.Flag = change.NewFlag
} }
} }
} }