diff --git a/pkg/app/daemon/rebase.go b/pkg/app/daemon/rebase.go index 1cb3b844f..e7cf1f57b 100644 --- a/pkg/app/daemon/rebase.go +++ b/pkg/app/daemon/rebase.go @@ -5,34 +5,12 @@ import ( "path/filepath" "strings" - "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/common" "github.com/jesseduffield/lazygit/pkg/env" "github.com/jesseduffield/lazygit/pkg/utils" - "github.com/samber/lo" "github.com/stefanhaller/git-todo-parser/todo" ) -type TodoLine struct { - Action string - Commit *models.Commit -} - -func (self *TodoLine) ToString() string { - if self.Action == "break" { - return self.Action + "\n" - } - return self.Action + " " + self.Commit.Hash() + " " + self.Commit.Name + "\n" -} - -func TodoLinesToString(todoLines []TodoLine) string { - lines := lo.Map(todoLines, func(todoLine TodoLine, _ int) string { - return todoLine.ToString() - }) - - return strings.Join(lo.Reverse(lines), "") -} - type ChangeTodoAction struct { Hash string NewAction todo.TodoCommand diff --git a/pkg/commands/oscommands/cmd_obj_builder.go b/pkg/commands/oscommands/cmd_obj_builder.go index 8e1789733..fde642582 100644 --- a/pkg/commands/oscommands/cmd_obj_builder.go +++ b/pkg/commands/oscommands/cmd_obj_builder.go @@ -79,9 +79,6 @@ func (self *CmdObjBuilder) CloneWithNewRunner(decorate func(ICmdObjRunner) ICmdO } } -const CHARS_REQUIRING_QUOTES = "\"\\$` " - -// If you update this method, be sure to update CHARS_REQUIRING_QUOTES func (self *CmdObjBuilder) Quote(message string) string { var quote string if self.platform.OS == "windows" { diff --git a/pkg/gui/context_config.go b/pkg/gui/context_config.go index e1b35c492..841ca4e60 100644 --- a/pkg/gui/context_config.go +++ b/pkg/gui/context_config.go @@ -13,14 +13,6 @@ func (gui *Gui) contextTree() *context.ContextTree { return context.NewContextTree(contextCommon) } -// using this wrapper for when an onFocus function doesn't care about any potential -// props that could be passed -func OnFocusWrapper(f func() error) func(opts types.OnFocusOpts) error { - return func(opts types.OnFocusOpts) error { - return f() - } -} - func (gui *Gui) defaultSideContext() types.Context { if gui.State.Modes.Filtering.Active() { return gui.State.Contexts.LocalCommits