go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-02-09 13:47:11 +02:00
Code Issues Releases Activity

Use WillBeAppliedReverse (and git apply --reverse) in the staging panel too

Browse Source 
It's simpler to have only one way of reversing a patch.
This commit is contained in:
Stefan Haller 2023-03-07 08:55:48 +01:00
parent bf6e9a1bd3
commit e4659145e8
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/gui/controllers/staging_controller.go
View File

@ -182,7 +182,7 @@ func (self *StagingController) applySelection(reverse bool) error {
firstLineIdx, lastLineIdx := state.SelectedRange() firstLineIdx, lastLineIdx := state.SelectedRange()
patch := patch.ModifiedPatchForRange(self.c.Log, path, state.GetDiff(), firstLineIdx, lastLineIdx, patch := patch.ModifiedPatchForRange(self.c.Log, path, state.GetDiff(), firstLineIdx, lastLineIdx,
patch.PatchOptions{Reverse: reverse, KeepOriginalHeader: false}) patch.PatchOptions{Reverse: false, WillBeAppliedReverse: reverse, KeepOriginalHeader: false})
if patch == "" { if patch == "" {
return nil return nil
@ -191,6 +191,9 @@ func (self *StagingController) applySelection(reverse bool) error {
// apply the patch then refresh this panel // apply the patch then refresh this panel
// create a new temp file with the patch, then call git apply with that patch // create a new temp file with the patch, then call git apply with that patch
applyFlags := []string{} applyFlags := []string{}
if reverse {
applyFlags = append(applyFlags, "reverse")
}
if !reverse || self.staged { if !reverse || self.staged {
applyFlags = append(applyFlags, "cached") applyFlags = append(applyFlags, "cached")
} }
@ -229,7 +232,7 @@ func (self *StagingController) editHunk() error {
hunk := state.CurrentHunk() hunk := state.CurrentHunk()
patchText := patch.ModifiedPatchForRange( patchText := patch.ModifiedPatchForRange(
self.c.Log, path, state.GetDiff(), hunk.FirstLineIdx, hunk.LastLineIdx(), self.c.Log, path, state.GetDiff(), hunk.FirstLineIdx, hunk.LastLineIdx(),
patch.PatchOptions{Reverse: self.staged, KeepOriginalHeader: false}, patch.PatchOptions{Reverse: false, WillBeAppliedReverse: self.staged, KeepOriginalHeader: false},
) )
patchFilepath, err := self.git.WorkingTree.SaveTemporaryPatch(patchText) patchFilepath, err := self.git.WorkingTree.SaveTemporaryPatch(patchText)
if err != nil { if err != nil {
@ -254,7 +257,12 @@ func (self *StagingController) editHunk() error {
self.c.Log, path, editedPatchText, 0, lineCount, self.c.Log, path, editedPatchText, 0, lineCount,
patch.PatchOptions{Reverse: false, KeepOriginalHeader: false}, patch.PatchOptions{Reverse: false, KeepOriginalHeader: false},
) )
if err := self.git.WorkingTree.ApplyPatch(newPatchText, "cached"); err != nil {
applyFlags := []string{"cached"}
if self.staged {
applyFlags = append(applyFlags, "reverse")
}
if err := self.git.WorkingTree.ApplyPatch(newPatchText, applyFlags...); err != nil {
return self.c.Error(err) return self.c.Error(err)
} }