mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-08-07 22:02:56 +03:00
Remove unused cherry-picking code in daemon
This commit is contained in:
@@ -8,7 +8,6 @@ import (
|
|||||||
"os/exec"
|
"os/exec"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
|
||||||
"github.com/jesseduffield/lazygit/pkg/commands/models"
|
|
||||||
"github.com/jesseduffield/lazygit/pkg/common"
|
"github.com/jesseduffield/lazygit/pkg/common"
|
||||||
"github.com/jesseduffield/lazygit/pkg/utils"
|
"github.com/jesseduffield/lazygit/pkg/utils"
|
||||||
"github.com/samber/lo"
|
"github.com/samber/lo"
|
||||||
@@ -33,7 +32,6 @@ const (
|
|||||||
|
|
||||||
DaemonKindExitImmediately
|
DaemonKindExitImmediately
|
||||||
DaemonKindRemoveUpdateRefsForCopiedBranch
|
DaemonKindRemoveUpdateRefsForCopiedBranch
|
||||||
DaemonKindCherryPick
|
|
||||||
DaemonKindMoveTodosUp
|
DaemonKindMoveTodosUp
|
||||||
DaemonKindMoveTodosDown
|
DaemonKindMoveTodosDown
|
||||||
DaemonKindInsertBreak
|
DaemonKindInsertBreak
|
||||||
@@ -56,7 +54,6 @@ func getInstruction() Instruction {
|
|||||||
mapping := map[DaemonKind]func(string) Instruction{
|
mapping := map[DaemonKind]func(string) Instruction{
|
||||||
DaemonKindExitImmediately: deserializeInstruction[*ExitImmediatelyInstruction],
|
DaemonKindExitImmediately: deserializeInstruction[*ExitImmediatelyInstruction],
|
||||||
DaemonKindRemoveUpdateRefsForCopiedBranch: deserializeInstruction[*RemoveUpdateRefsForCopiedBranchInstruction],
|
DaemonKindRemoveUpdateRefsForCopiedBranch: deserializeInstruction[*RemoveUpdateRefsForCopiedBranchInstruction],
|
||||||
DaemonKindCherryPick: deserializeInstruction[*CherryPickCommitsInstruction],
|
|
||||||
DaemonKindChangeTodoActions: deserializeInstruction[*ChangeTodoActionsInstruction],
|
DaemonKindChangeTodoActions: deserializeInstruction[*ChangeTodoActionsInstruction],
|
||||||
DaemonKindDropMergeCommit: deserializeInstruction[*DropMergeCommitInstruction],
|
DaemonKindDropMergeCommit: deserializeInstruction[*DropMergeCommitInstruction],
|
||||||
DaemonKindMoveFixupCommitDown: deserializeInstruction[*MoveFixupCommitDownInstruction],
|
DaemonKindMoveFixupCommitDown: deserializeInstruction[*MoveFixupCommitDownInstruction],
|
||||||
@@ -180,39 +177,6 @@ func NewRemoveUpdateRefsForCopiedBranchInstruction() Instruction {
|
|||||||
return &RemoveUpdateRefsForCopiedBranchInstruction{}
|
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 {
|
type ChangeTodoActionsInstruction struct {
|
||||||
Changes []ChangeTodoAction
|
Changes []ChangeTodoAction
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user