mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-04-25 12:24:47 +02:00
It is a bad idea to read a git-rebase-todo file, remove some update-ref todos, and write it back out behind git's back. This will cause git to actually remove the branches referenced by those update-ref todos when the rebase is continued. The reason is that git remembers the refs affected by update-ref todos at the beginning of the rebase, and remembers information about them in the file .git/rebase-merge/update-refs. Then, whenever the user performs a "git rebase --edit-todo" command, it updates that file based on whether update-ref todos were added or removed by that edit. If we rewrite the git-rebase-todo file behind git's back, this updating doesn't happen. Fix this by not updating the git-rebase-todo file directly in this case, but performing a "git rebase --edit-todo" command where we set ourselves as the editor and change the file in there. This makes git update the bookkeeping information properly. Ideally we would use this method for all cases where we change the git-rebase-todo file (e.g. moving todos up/down, or changing the type of a todo); this would be cleaner because we wouldn't mess with git's private implementation details. I tried this, but unfortunately it isn't fast enough. Right now, moving a todo up or down takes between 1 and 2ms on my machine; changing it to do a "git rebase --edit-todo" slows it down to over 100ms, which is unacceptable.
270 lines
7.5 KiB
Go
270 lines
7.5 KiB
Go
package utils
|
|
|
|
import (
|
|
"bytes"
|
|
"fmt"
|
|
"os"
|
|
"strings"
|
|
|
|
"github.com/fsmiamoto/git-todo-parser/todo"
|
|
"github.com/samber/lo"
|
|
)
|
|
|
|
type Todo struct {
|
|
Sha string // for todos that have one, e.g. pick, drop, fixup, etc.
|
|
Ref string // for update-ref todos
|
|
Action todo.TodoCommand
|
|
}
|
|
|
|
// In order to change a TODO in git-rebase-todo, we need to specify the old action,
|
|
// because sometimes the same sha appears multiple times in the file (e.g. in a pick
|
|
// and later in a merge)
|
|
type TodoChange struct {
|
|
Sha string
|
|
OldAction todo.TodoCommand
|
|
NewAction todo.TodoCommand
|
|
}
|
|
|
|
// Read a git-rebase-todo file, change the actions for the given commits,
|
|
// and write it back
|
|
func EditRebaseTodo(filePath string, changes []TodoChange, commentChar byte) error {
|
|
todos, err := ReadRebaseTodoFile(filePath, commentChar)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
matchCount := 0
|
|
for i := range todos {
|
|
t := &todos[i]
|
|
// This is a nested loop, but it's ok because the number of todos should be small
|
|
for _, change := range changes {
|
|
if t.Command == change.OldAction && equalShas(t.Commit, change.Sha) {
|
|
matchCount++
|
|
t.Command = change.NewAction
|
|
}
|
|
}
|
|
}
|
|
|
|
if matchCount < len(changes) {
|
|
// Should never get here
|
|
return fmt.Errorf("Some todos not found in git-rebase-todo")
|
|
}
|
|
|
|
return WriteRebaseTodoFile(filePath, todos, commentChar)
|
|
}
|
|
|
|
func equalShas(a, b string) bool {
|
|
return strings.HasPrefix(a, b) || strings.HasPrefix(b, a)
|
|
}
|
|
|
|
func findTodo(todos []todo.Todo, todoToFind Todo) (int, bool) {
|
|
_, idx, ok := lo.FindIndexOf(todos, func(t todo.Todo) bool {
|
|
// Comparing just the sha is not enough; we need to compare both the
|
|
// action and the sha, as the sha could appear multiple times (e.g. in a
|
|
// pick and later in a merge). For update-ref todos we also must compare
|
|
// the Ref.
|
|
return t.Command == todoToFind.Action &&
|
|
equalShas(t.Commit, todoToFind.Sha) &&
|
|
t.Ref == todoToFind.Ref
|
|
})
|
|
return idx, ok
|
|
}
|
|
|
|
func ReadRebaseTodoFile(fileName string, commentChar byte) ([]todo.Todo, error) {
|
|
f, err := os.Open(fileName)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
todos, err := todo.Parse(f, commentChar)
|
|
err2 := f.Close()
|
|
if err == nil {
|
|
err = err2
|
|
}
|
|
return todos, err
|
|
}
|
|
|
|
func WriteRebaseTodoFile(fileName string, todos []todo.Todo, commentChar byte) error {
|
|
f, err := os.Create(fileName)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
err = todo.Write(f, todos, commentChar)
|
|
err2 := f.Close()
|
|
if err == nil {
|
|
err = err2
|
|
}
|
|
return err
|
|
}
|
|
|
|
func todosToString(todos []todo.Todo, commentChar byte) ([]byte, error) {
|
|
buffer := bytes.Buffer{}
|
|
err := todo.Write(&buffer, todos, commentChar)
|
|
return buffer.Bytes(), err
|
|
}
|
|
|
|
func PrependStrToTodoFile(filePath string, linesToPrepend []byte) error {
|
|
existingContent, err := os.ReadFile(filePath)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
linesToPrepend = append(linesToPrepend, existingContent...)
|
|
return os.WriteFile(filePath, linesToPrepend, 0o644)
|
|
}
|
|
|
|
// Unlike the other functions in this file, which write the changed todos file
|
|
// back to disk, this one returns the new content as a byte slice. This is
|
|
// because when deleting update-ref todos, we must perform a "git rebase
|
|
// --edit-todo" command to pass the changed todos to git so that it can do some
|
|
// housekeeping around the deleted todos. This can only be done by our caller.
|
|
func DeleteTodos(fileName string, todosToDelete []Todo, commentChar byte) ([]byte, error) {
|
|
todos, err := ReadRebaseTodoFile(fileName, commentChar)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
rearrangedTodos, err := deleteTodos(todos, todosToDelete)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return todosToString(rearrangedTodos, commentChar)
|
|
}
|
|
|
|
func deleteTodos(todos []todo.Todo, todosToDelete []Todo) ([]todo.Todo, error) {
|
|
for _, todoToDelete := range todosToDelete {
|
|
idx, ok := findTodo(todos, todoToDelete)
|
|
|
|
if !ok {
|
|
// Should never happen
|
|
return []todo.Todo{}, fmt.Errorf("Todo %s not found in git-rebase-todo", todoToDelete.Sha)
|
|
}
|
|
|
|
todos = Remove(todos, idx)
|
|
}
|
|
|
|
return todos, nil
|
|
}
|
|
|
|
func MoveTodosDown(fileName string, todosToMove []Todo, commentChar byte) error {
|
|
todos, err := ReadRebaseTodoFile(fileName, commentChar)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
rearrangedTodos, err := moveTodosDown(todos, todosToMove)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return WriteRebaseTodoFile(fileName, rearrangedTodos, commentChar)
|
|
}
|
|
|
|
func MoveTodosUp(fileName string, todosToMove []Todo, commentChar byte) error {
|
|
todos, err := ReadRebaseTodoFile(fileName, commentChar)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
rearrangedTodos, err := moveTodosUp(todos, todosToMove)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return WriteRebaseTodoFile(fileName, rearrangedTodos, commentChar)
|
|
}
|
|
|
|
func moveTodoDown(todos []todo.Todo, todoToMove Todo) ([]todo.Todo, error) {
|
|
rearrangedTodos, err := moveTodoUp(lo.Reverse(todos), todoToMove)
|
|
return lo.Reverse(rearrangedTodos), err
|
|
}
|
|
|
|
func moveTodosDown(todos []todo.Todo, todosToMove []Todo) ([]todo.Todo, error) {
|
|
rearrangedTodos, err := moveTodosUp(lo.Reverse(todos), lo.Reverse(todosToMove))
|
|
return lo.Reverse(rearrangedTodos), err
|
|
}
|
|
|
|
func moveTodoUp(todos []todo.Todo, todoToMove Todo) ([]todo.Todo, error) {
|
|
sourceIdx, ok := findTodo(todos, todoToMove)
|
|
|
|
if !ok {
|
|
// Should never happen
|
|
return []todo.Todo{}, fmt.Errorf("Todo %s not found in git-rebase-todo", todoToMove.Sha)
|
|
}
|
|
|
|
// The todos are ordered backwards compared to our model commits, so
|
|
// actually move the commit _down_ in the todos slice (i.e. towards
|
|
// the end of the slice)
|
|
|
|
// Find the next todo that we show in lazygit's commits view (skipping the rest)
|
|
_, skip, ok := lo.FindIndexOf(todos[sourceIdx+1:], isRenderedTodo)
|
|
|
|
if !ok {
|
|
// We expect callers to guard against this
|
|
return []todo.Todo{}, fmt.Errorf("Destination position for moving todo is out of range")
|
|
}
|
|
|
|
destinationIdx := sourceIdx + 1 + skip
|
|
|
|
rearrangedTodos := MoveElement(todos, sourceIdx, destinationIdx)
|
|
|
|
return rearrangedTodos, nil
|
|
}
|
|
|
|
func moveTodosUp(todos []todo.Todo, todosToMove []Todo) ([]todo.Todo, error) {
|
|
for _, todoToMove := range todosToMove {
|
|
var newTodos []todo.Todo
|
|
newTodos, err := moveTodoUp(todos, todoToMove)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
todos = newTodos
|
|
}
|
|
|
|
return todos, nil
|
|
}
|
|
|
|
func MoveFixupCommitDown(fileName string, originalSha string, fixupSha string, commentChar byte) error {
|
|
todos, err := ReadRebaseTodoFile(fileName, commentChar)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
newTodos, err := moveFixupCommitDown(todos, originalSha, fixupSha)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return WriteRebaseTodoFile(fileName, newTodos, commentChar)
|
|
}
|
|
|
|
func moveFixupCommitDown(todos []todo.Todo, originalSha string, fixupSha string) ([]todo.Todo, error) {
|
|
isOriginal := func(t todo.Todo) bool {
|
|
return t.Command == todo.Pick && equalShas(t.Commit, originalSha)
|
|
}
|
|
|
|
isFixup := func(t todo.Todo) bool {
|
|
return t.Command == todo.Pick && equalShas(t.Commit, fixupSha)
|
|
}
|
|
|
|
originalShaCount := lo.CountBy(todos, isOriginal)
|
|
if originalShaCount != 1 {
|
|
return nil, fmt.Errorf("Expected exactly one original SHA, found %d", originalShaCount)
|
|
}
|
|
|
|
fixupShaCount := lo.CountBy(todos, isFixup)
|
|
if fixupShaCount != 1 {
|
|
return nil, fmt.Errorf("Expected exactly one fixup SHA, found %d", fixupShaCount)
|
|
}
|
|
|
|
_, fixupIndex, _ := lo.FindIndexOf(todos, isFixup)
|
|
_, originalIndex, _ := lo.FindIndexOf(todos, isOriginal)
|
|
|
|
newTodos := MoveElement(todos, fixupIndex, originalIndex+1)
|
|
|
|
newTodos[originalIndex+1].Command = todo.Fixup
|
|
|
|
return newTodos, nil
|
|
}
|
|
|
|
// We render a todo in the commits view if it's a commit or if it's an
|
|
// update-ref. We don't render label, reset, or comment lines.
|
|
func isRenderedTodo(t todo.Todo) bool {
|
|
return t.Commit != "" || t.Command == todo.UpdateRef
|
|
}
|