From 27825eba9eb38fd0008976d5bb669c16ea3dfa87 Mon Sep 17 00:00:00 2001 From: Stefan Haller Date: Tue, 18 Jun 2024 19:34:29 +0200 Subject: [PATCH] Remove unused cherry-picking code in daemon --- pkg/app/daemon/daemon.go | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/pkg/app/daemon/daemon.go b/pkg/app/daemon/daemon.go index 782df5f1f..16b9bf5e5 100644 --- a/pkg/app/daemon/daemon.go +++ b/pkg/app/daemon/daemon.go @@ -8,7 +8,6 @@ import ( "os/exec" "strconv" - "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/common" "github.com/jesseduffield/lazygit/pkg/utils" "github.com/samber/lo" @@ -33,7 +32,6 @@ const ( DaemonKindExitImmediately DaemonKindRemoveUpdateRefsForCopiedBranch - DaemonKindCherryPick DaemonKindMoveTodosUp DaemonKindMoveTodosDown DaemonKindInsertBreak @@ -56,7 +54,6 @@ func getInstruction() Instruction { mapping := map[DaemonKind]func(string) Instruction{ DaemonKindExitImmediately: deserializeInstruction[*ExitImmediatelyInstruction], DaemonKindRemoveUpdateRefsForCopiedBranch: deserializeInstruction[*RemoveUpdateRefsForCopiedBranchInstruction], - DaemonKindCherryPick: deserializeInstruction[*CherryPickCommitsInstruction], DaemonKindChangeTodoActions: deserializeInstruction[*ChangeTodoActionsInstruction], DaemonKindDropMergeCommit: deserializeInstruction[*DropMergeCommitInstruction], DaemonKindMoveFixupCommitDown: deserializeInstruction[*MoveFixupCommitDownInstruction], @@ -180,39 +177,6 @@ func NewRemoveUpdateRefsForCopiedBranchInstruction() Instruction { return &RemoveUpdateRefsForCopiedBranchInstruction{} } -type CherryPickCommitsInstruction struct { - Todo string -} - -func NewCherryPickCommitsInstruction(commits []*models.Commit) Instruction { - todoLines := lo.Map(commits, func(commit *models.Commit, _ int) TodoLine { - return TodoLine{ - Action: "pick", - Commit: commit, - } - }) - - todo := TodoLinesToString(todoLines) - - return &CherryPickCommitsInstruction{ - Todo: todo, - } -} - -func (self *CherryPickCommitsInstruction) Kind() DaemonKind { - return DaemonKindCherryPick -} - -func (self *CherryPickCommitsInstruction) SerializedInstructions() string { - return serializeInstruction(self) -} - -func (self *CherryPickCommitsInstruction) run(common *common.Common) error { - return handleInteractiveRebase(common, func(path string) error { - return utils.PrependStrToTodoFile(path, []byte(self.Todo)) - }) -} - type ChangeTodoActionsInstruction struct { Changes []ChangeTodoAction }