go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-27 00:51:18 +02:00
Code Issues Releases Activity

Remove parameters that are no longer needed

Browse Source 
All callers in this file now use reverseOnGenerate=false and
keepOriginalHeader=true, so hard-code that in the call to ModifiedPatchForLines
and get rid of the parameters.
This commit is contained in:
Stefan Haller
2023-02-23 18:50:53 +01:00
parent 5d692e8961
commit 6bd1c1d068
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/commands/patch/patch_manager.go
View File

@ -162,7 +162,7 @@ func (p *PatchManager) RemoveFileLineRange(filename string, firstLineIdx, lastLi
return nil return nil
} }
func (p *PatchManager) renderPlainPatchForFile(filename string, reverse bool, willBeAppliedReverse bool, keepOriginalHeader bool) string { func (p *PatchManager) renderPlainPatchForFile(filename string, willBeAppliedReverse bool) string {
info, err := p.getFileInfo(filename) info, err := p.getFileInfo(filename)
if err != nil { if err != nil {
p.Log.Error(err) p.Log.Error(err)
@ -178,17 +178,17 @@ func (p *PatchManager) renderPlainPatchForFile(filename string, reverse bool, wi
// generate a new diff with just the selected lines // generate a new diff with just the selected lines
return ModifiedPatchForLines(p.Log, filename, info.diff, info.includedLineIndices, return ModifiedPatchForLines(p.Log, filename, info.diff, info.includedLineIndices,
PatchOptions{ PatchOptions{
Reverse: reverse, Reverse: false,
WillBeAppliedReverse: willBeAppliedReverse, WillBeAppliedReverse: willBeAppliedReverse,
KeepOriginalHeader: keepOriginalHeader, KeepOriginalHeader: true,
}) })
default: default:
return "" return ""
} }
} }
func (p *PatchManager) RenderPatchForFile(filename string, plain bool, reverse bool, willBeAppliedReverse bool, keepOriginalHeader bool) string { func (p *PatchManager) RenderPatchForFile(filename string, plain bool, willBeAppliedReverse bool) string {
patch := p.renderPlainPatchForFile(filename, reverse, willBeAppliedReverse, keepOriginalHeader) patch := p.renderPlainPatchForFile(filename, willBeAppliedReverse)
if plain { if plain {
return patch return patch
} }
@ -204,7 +204,7 @@ func (p *PatchManager) renderEachFilePatch(plain bool) []string {
sort.Strings(filenames) sort.Strings(filenames)
patches := slices.Map(filenames, func(filename string) string { patches := slices.Map(filenames, func(filename string) string {
return p.RenderPatchForFile(filename, plain, false, false, true) return p.RenderPatchForFile(filename, plain, false)
}) })
output := slices.Filter(patches, func(patch string) bool { output := slices.Filter(patches, func(patch string) bool {
return patch != "" return patch != ""
@ -255,7 +255,7 @@ func (p *PatchManager) ApplyPatches(reverse bool) error {
continue continue
} }
patch := p.RenderPatchForFile(filename, true, false, reverse, true) patch := p.RenderPatchForFile(filename, true, reverse)
if patch != "" { if patch != "" {
err := p.applyPatch(patch, applyFlags...) err := p.applyPatch(patch, applyFlags...)
if err != nil { if err != nil {

2
pkg/gui/refresh.go
View File

@ -672,7 +672,7 @@ func (gui *Gui) refreshPatchBuildingPanel(opts types.OnFocusOpts) error {
return err return err
} }
secondaryDiff := gui.git.Patch.PatchManager.RenderPatchForFile(path, false, false, false, true) secondaryDiff := gui.git.Patch.PatchManager.RenderPatchForFile(path, false, false)
if err != nil { if err != nil {
return err return err
} }