Pass todo flag to EditRebaseTodo

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.

Author: stefanhaller

pkg/app/daemon/daemon.go

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

pkg/app/daemon/rebase.go

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

pkg/commands/git_commands/rebase.go

@@ -137,7 +137,7 @@ func (self *RebaseCommands) MoveCommitsUp(commits []*models.Commit, startIdx int
 	}).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
 	if action == todo.Squash || action == todo.Fixup {
 		baseIndex++
@@ -149,6 +149,7 @@ func (self *RebaseCommands) InteractiveRebase(commits []*models.Commit, startIdx
 		return daemon.ChangeTodoAction{
 			Hash:      commit.Hash(),
 			NewAction: action,
+			NewFlag:   flag,
 		}, !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
-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 {
 		return utils.TodoChange{
 			Hash:      commit.Hash(),
 			NewAction: action,
+			NewFlag:   flag,
 		}
 	})
 

pkg/gui/controllers/local_commits_controller.go

@@ -314,7 +314,7 @@ func secondaryPatchPanelUpdateOpts(c *ControllerCommon) *types.ViewUpdateOpts {
 
 func (self *LocalCommitsController) squashDown(selectedCommits []*models.Commit, startIdx int, endIdx int) error {
 	if self.isRebasing() {
-		return self.updateTodos(todo.Squash, selectedCommits)
+		return self.updateTodos(todo.Squash, "", selectedCommits)
 	}
 
 	self.c.Confirm(types.ConfirmOpts{
@@ -323,7 +323,7 @@ func (self *LocalCommitsController) squashDown(selectedCommits []*models.Commit,
 		HandleConfirm: func() error {
 			return self.c.WithWaitingStatus(self.c.Tr.SquashingStatus, func(gocui.Task) error {
 				self.c.LogAction(self.c.Tr.Actions.SquashCommitDown)
-				return self.interactiveRebase(todo.Squash, startIdx, endIdx)
+				return self.interactiveRebase(todo.Squash, "", startIdx, endIdx)
 			})
 		},
 	})
@@ -333,7 +333,7 @@ func (self *LocalCommitsController) squashDown(selectedCommits []*models.Commit,
 
 func (self *LocalCommitsController) fixup(selectedCommits []*models.Commit, startIdx int, endIdx int) error {
 	if self.isRebasing() {
-		return self.updateTodos(todo.Fixup, selectedCommits)
+		return self.updateTodos(todo.Fixup, "", selectedCommits)
 	}
 
 	self.c.Confirm(types.ConfirmOpts{
@@ -342,7 +342,7 @@ func (self *LocalCommitsController) fixup(selectedCommits []*models.Commit, star
 		HandleConfirm: func() error {
 			return self.c.WithWaitingStatus(self.c.Tr.FixingStatus, func(gocui.Task) error {
 				self.c.LogAction(self.c.Tr.Actions.FixupCommit)
-				return self.interactiveRebase(todo.Fixup, startIdx, endIdx)
+				return self.interactiveRebase(todo.Fixup, "", startIdx, endIdx)
 			})
 		},
 	})
@@ -477,14 +477,14 @@ func (self *LocalCommitsController) drop(selectedCommits []*models.Commit, start
 
 					self.context().SetSelectionRangeAndMode(selectedIdx, rangeStartIdx, rangeSelectMode)
 
-					return self.updateTodos(todo.Drop, nonUpdateRefTodos)
+					return self.updateTodos(todo.Drop, "", nonUpdateRefTodos)
 				},
 			})
 
 			return nil
 		}
 
-		return self.updateTodos(todo.Drop, selectedCommits)
+		return self.updateTodos(todo.Drop, "", selectedCommits)
 	}
 
 	isMerge := selectedCommits[0].IsMerge()
@@ -498,7 +498,7 @@ func (self *LocalCommitsController) drop(selectedCommits []*models.Commit, start
 				if isMerge {
 					return self.dropMergeCommit(startIdx)
 				}
-				return self.interactiveRebase(todo.Drop, startIdx, endIdx)
+				return self.interactiveRebase(todo.Drop, "", startIdx, endIdx)
 			})
 		},
 	})
@@ -513,13 +513,13 @@ func (self *LocalCommitsController) dropMergeCommit(commitIdx int) error {
 
 func (self *LocalCommitsController) edit(selectedCommits []*models.Commit, startIdx int, endIdx int) error {
 	if self.isRebasing() {
-		return self.updateTodos(todo.Edit, selectedCommits)
+		return self.updateTodos(todo.Edit, "", selectedCommits)
 	}
 
 	commits := self.c.Model().Commits
 	if !commits[endIdx].IsMerge() {
 		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(
 			err,
 			types.RefreshOptions{
@@ -560,7 +560,7 @@ func (self *LocalCommitsController) startInteractiveRebaseWithEdit(
 					}
 				}
 				if len(todos) > 0 {
-					err := self.updateTodos(todo.Edit, todos)
+					err := self.updateTodos(todo.Edit, "", todos)
 					if err != nil {
 						return err
 					}
@@ -620,31 +620,31 @@ func (self *LocalCommitsController) findCommitForQuickStartInteractiveRebase() (
 
 func (self *LocalCommitsController) pick(selectedCommits []*models.Commit) error {
 	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
 	// attempt to pull. We might revoke this later after enabling configurable keybindings
 	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
 	// 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 {
 		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)
 }
 
 // updateTodos sees if the selected commit is in fact a rebasing
 // 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
-func (self *LocalCommitsController) updateTodos(action todo.TodoCommand, selectedCommits []*models.Commit) error {
-	if err := self.c.Git().Rebase.EditRebaseTodo(selectedCommits, action); err != nil {
+func (self *LocalCommitsController) updateTodos(action todo.TodoCommand, flag string, selectedCommits []*models.Commit) error {
+	if err := self.c.Git().Rebase.EditRebaseTodo(selectedCommits, action, flag); err != nil {
 		return err
 	}
 

pkg/utils/rebase_todo.go

@@ -19,6 +19,7 @@ type Todo struct {
 type TodoChange struct {
 	Hash      string
 	NewAction todo.TodoCommand
+	NewFlag   string
 }
 
 // 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) {
 				matchCount++
 				t.Command = change.NewAction
+				t.Flag = change.NewFlag
 			}
 		}
 	}