package git_commands import ( "fmt" "github.com/fsmiamoto/git-todo-parser/todo" "github.com/go-errors/errors" "github.com/jesseduffield/lazygit/pkg/app/daemon" "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/commands/patch" "github.com/jesseduffield/lazygit/pkg/commands/types/enums" ) type PatchCommands struct { *GitCommon rebase *RebaseCommands commit *CommitCommands status *StatusCommands stash *StashCommands PatchBuilder *patch.PatchBuilder } func NewPatchCommands( gitCommon *GitCommon, rebase *RebaseCommands, commit *CommitCommands, status *StatusCommands, stash *StashCommands, patchBuilder *patch.PatchBuilder, ) *PatchCommands { return &PatchCommands{ GitCommon: gitCommon, rebase: rebase, commit: commit, status: status, stash: stash, PatchBuilder: patchBuilder, } } // DeletePatchesFromCommit applies a patch in reverse for a commit func (self *PatchCommands) DeletePatchesFromCommit(commits []*models.Commit, commitIndex int) error { if err := self.rebase.BeginInteractiveRebaseForCommit(commits, commitIndex); err != nil { return err } // apply each patch in reverse if err := self.PatchBuilder.ApplyPatches(true); err != nil { _ = self.rebase.AbortRebase() return err } // time to amend the selected commit if err := self.commit.AmendHead(); err != nil { return err } self.rebase.onSuccessfulContinue = func() error { self.PatchBuilder.Reset() return nil } // continue return self.rebase.ContinueRebase() } func (self *PatchCommands) MovePatchToSelectedCommit(commits []*models.Commit, sourceCommitIdx int, destinationCommitIdx int) error { if sourceCommitIdx < destinationCommitIdx { if err := self.rebase.BeginInteractiveRebaseForCommit(commits, destinationCommitIdx); err != nil { return err } // apply each patch forward if err := self.PatchBuilder.ApplyPatches(false); err != nil { // Don't abort the rebase here; this might cause conflicts, so give // the user a chance to resolve them return err } // amend the destination commit if err := self.commit.AmendHead(); err != nil { return err } self.rebase.onSuccessfulContinue = func() error { self.PatchBuilder.Reset() return nil } // continue return self.rebase.ContinueRebase() } if len(commits)-1 < sourceCommitIdx { return errors.New("index outside of range of commits") } // we can make this GPG thing possible it just means we need to do this in two parts: // one where we handle the possibility of a credential request, and the other // where we continue the rebase if self.config.UsingGpg() { return errors.New(self.Tr.DisabledForGPG) } baseIndex := sourceCommitIdx + 1 err := self.rebase.PrepareInteractiveRebaseCommand(PrepareInteractiveRebaseCommandOpts{ baseShaOrRoot: commits[baseIndex].Sha, overrideEditor: true, instruction: ChangeTodoActionsInstruction{ actions: []daemon.ChangeTodoAction{ {Sha: commits[sourceCommitIdx].Sha, NewAction: todo.Edit}, {Sha: commits[destinationCommitIdx].Sha, NewAction: todo.Edit}, }, }, }).Run() if err != nil { return err } // apply each patch in reverse if err := self.PatchBuilder.ApplyPatches(true); err != nil { _ = self.rebase.AbortRebase() return err } // amend the source commit if err := self.commit.AmendHead(); err != nil { return err } patch, err := self.diffHeadAgainstCommit(commits[sourceCommitIdx]) if err != nil { _ = self.rebase.AbortRebase() return err } if self.rebase.onSuccessfulContinue != nil { return errors.New("You are midway through another rebase operation. Please abort to start again") } self.rebase.onSuccessfulContinue = func() error { // now we should be up to the destination, so let's apply forward these patches to that. // ideally we would ensure we're on the right commit but I'm not sure if that check is necessary if err := self.rebase.workingTree.ApplyPatch(patch, "index", "3way"); err != nil { // Don't abort the rebase here; this might cause conflicts, so give // the user a chance to resolve them return err } // amend the destination commit if err := self.commit.AmendHead(); err != nil { return err } self.rebase.onSuccessfulContinue = func() error { self.PatchBuilder.Reset() return nil } return self.rebase.ContinueRebase() } return self.rebase.ContinueRebase() } func (self *PatchCommands) MovePatchIntoIndex(commits []*models.Commit, commitIdx int, stash bool) error { if stash { if err := self.stash.Save(self.Tr.StashPrefix + commits[commitIdx].Sha); err != nil { return err } } if err := self.rebase.BeginInteractiveRebaseForCommit(commits, commitIdx); err != nil { return err } if err := self.PatchBuilder.ApplyPatches(true); err != nil { if self.status.WorkingTreeState() == enums.REBASE_MODE_REBASING { _ = self.rebase.AbortRebase() } return err } // amend the commit if err := self.commit.AmendHead(); err != nil { return err } patch, err := self.diffHeadAgainstCommit(commits[commitIdx]) if err != nil { _ = self.rebase.AbortRebase() return err } if self.rebase.onSuccessfulContinue != nil { return errors.New("You are midway through another rebase operation. Please abort to start again") } self.rebase.onSuccessfulContinue = func() error { // add patches to index if err := self.rebase.workingTree.ApplyPatch(patch, "index", "3way"); err != nil { if self.status.WorkingTreeState() == enums.REBASE_MODE_REBASING { _ = self.rebase.AbortRebase() } return err } if stash { if err := self.stash.Apply(0); err != nil { return err } } self.PatchBuilder.Reset() return nil } return self.rebase.ContinueRebase() } func (self *PatchCommands) PullPatchIntoNewCommit(commits []*models.Commit, commitIdx int) error { if err := self.rebase.BeginInteractiveRebaseForCommit(commits, commitIdx); err != nil { return err } if err := self.PatchBuilder.ApplyPatches(true); err != nil { _ = self.rebase.AbortRebase() return err } // amend the commit if err := self.commit.AmendHead(); err != nil { return err } patch, err := self.diffHeadAgainstCommit(commits[commitIdx]) if err != nil { _ = self.rebase.AbortRebase() return err } if err := self.rebase.workingTree.ApplyPatch(patch, "index", "3way"); err != nil { _ = self.rebase.AbortRebase() return err } head_message, _ := self.commit.GetHeadCommitMessage() new_message := fmt.Sprintf("Split from \"%s\"", head_message) if err := self.commit.CommitCmdObj(new_message).Run(); err != nil { return err } if self.rebase.onSuccessfulContinue != nil { return errors.New("You are midway through another rebase operation. Please abort to start again") } self.PatchBuilder.Reset() return self.rebase.ContinueRebase() } // We have just applied a patch in reverse to discard it from a commit; if we // now try to apply the patch again to move it to a later commit, or to the // index, then this would conflict "with itself" in case the patch contained // only some lines of a range of adjacent added lines. To solve this, we // get the diff of HEAD and the original commit and then apply that. func (self *PatchCommands) diffHeadAgainstCommit(commit *models.Commit) (string, error) { return self.cmd.New(fmt.Sprintf("git diff HEAD..%s", commit.Sha)).RunWithOutput() }