rename patch manager to patch builder

12 files changed, 42 insertions, 42 deletions

diff --git a/pkg/gui/commits_panel.go b/pkg/gui/commits_panel.go
index b56b3af2b..8b8c74eec 100644
--- a/pkg/gui/commits_panel.go
+++ b/pkg/gui/commits_panel.go
@@ -51,8 +51,8 @@ func (gui *Gui) branchCommitsRenderToMain() error {
 }
 
 func (gui *Gui) secondaryPatchPanelUpdateOpts() *types.ViewUpdateOpts {
-	if gui.git.Patch.PatchManager.Active() {
-		patch := gui.git.Patch.PatchManager.RenderAggregatedPatch(false)
+	if gui.git.Patch.PatchBuilder.Active() {
+		patch := gui.git.Patch.PatchBuilder.RenderAggregatedPatch(false)
 
 		return &types.ViewUpdateOpts{
 			Task:  types.NewRenderStringWithoutScrollTask(patch),
diff --git a/pkg/gui/context_config.go b/pkg/gui/context_config.go
index 063690ff5..b19824237 100644
--- a/pkg/gui/context_config.go
+++ b/pkg/gui/context_config.go
@@ -150,15 +150,15 @@ func (gui *Gui) contextTree() *context.ContextTree {
 			func(opts types.OnFocusLostOpts) error {
 				gui.Views.PatchBuilding.Wrap = true
 
-				if gui.git.Patch.PatchManager.IsEmpty() {
-					gui.git.Patch.PatchManager.Reset()
+				if gui.git.Patch.PatchBuilder.IsEmpty() {
+					gui.git.Patch.PatchBuilder.Reset()
 				}
 
 				return nil
 			},
 			func() []int {
 				filename := gui.State.Contexts.CommitFiles.GetSelectedPath()
-				includedLineIndices, err := gui.git.Patch.PatchManager.GetFileIncLineIndices(filename)
+				includedLineIndices, err := gui.git.Patch.PatchBuilder.GetFileIncLineIndices(filename)
 				if err != nil {
 					gui.Log.Error(err)
 					return nil
diff --git a/pkg/gui/controllers/commits_files_controller.go b/pkg/gui/controllers/commits_files_controller.go
index f11005cd4..a5c5e667d 100644
--- a/pkg/gui/controllers/commits_files_controller.go
+++ b/pkg/gui/controllers/commits_files_controller.go
@@ -157,8 +157,8 @@ func (self *CommitFilesController) edit(node *filetree.CommitFileNode) error {
 func (self *CommitFilesController) toggleForPatch(node *filetree.CommitFileNode) error {
 	toggle := func() error {
 		return self.c.WithWaitingStatus(self.c.Tr.LcUpdatingPatch, func() error {
-			if !self.git.Patch.PatchManager.Active() {
-				if err := self.startPatchManager(); err != nil {
+			if !self.git.Patch.PatchBuilder.Active() {
+				if err := self.startPatchBuilder(); err != nil {
 					return err
 				}
 			}
@@ -166,34 +166,34 @@ func (self *CommitFilesController) toggleForPatch(node *filetree.CommitFileNode)
 			// if there is any file that hasn't been fully added we'll fully add everything,
 			// otherwise we'll remove everything
 			adding := node.SomeFile(func(file *models.CommitFile) bool {
-				return self.git.Patch.PatchManager.GetFileStatus(file.Name, self.context().GetRef().RefName()) != patch.WHOLE
+				return self.git.Patch.PatchBuilder.GetFileStatus(file.Name, self.context().GetRef().RefName()) != patch.WHOLE
 			})
 
 			err := node.ForEachFile(func(file *models.CommitFile) error {
 				if adding {
-					return self.git.Patch.PatchManager.AddFileWhole(file.Name)
+					return self.git.Patch.PatchBuilder.AddFileWhole(file.Name)
 				} else {
-					return self.git.Patch.PatchManager.RemoveFile(file.Name)
+					return self.git.Patch.PatchBuilder.RemoveFile(file.Name)
 				}
 			})
 			if err != nil {
 				return self.c.Error(err)
 			}
 
-			if self.git.Patch.PatchManager.IsEmpty() {
-				self.git.Patch.PatchManager.Reset()
+			if self.git.Patch.PatchBuilder.IsEmpty() {
+				self.git.Patch.PatchBuilder.Reset()
 			}
 
 			return self.c.PostRefreshUpdate(self.context())
 		})
 	}
 
-	if self.git.Patch.PatchManager.Active() && self.git.Patch.PatchManager.To != self.context().GetRef().RefName() {
+	if self.git.Patch.PatchBuilder.Active() && self.git.Patch.PatchBuilder.To != self.context().GetRef().RefName() {
 		return self.c.Confirm(types.ConfirmOpts{
 			Title:  self.c.Tr.DiscardPatch,
 			Prompt: self.c.Tr.DiscardPatchConfirm,
 			HandleConfirm: func() error {
-				self.git.Patch.PatchManager.Reset()
+				self.git.Patch.PatchBuilder.Reset()
 				return toggle()
 			},
 		})
@@ -207,7 +207,7 @@ func (self *CommitFilesController) toggleAllForPatch(_ *filetree.CommitFileNode)
 	return self.toggleForPatch(root)
 }
 
-func (self *CommitFilesController) startPatchManager() error {
+func (self *CommitFilesController) startPatchBuilder() error {
 	commitFilesContext := self.context()
 
 	canRebase := commitFilesContext.GetCanRebase()
@@ -215,7 +215,7 @@ func (self *CommitFilesController) startPatchManager() error {
 	to := ref.RefName()
 	from, reverse := self.modes.Diffing.GetFromAndReverseArgsForDiff(ref.ParentRefName())
 
-	self.git.Patch.PatchManager.Start(from, to, reverse, canRebase)
+	self.git.Patch.PatchBuilder.Start(from, to, reverse, canRebase)
 	return nil
 }
 
@@ -229,8 +229,8 @@ func (self *CommitFilesController) enterCommitFile(node *filetree.CommitFileNode
 	}
 
 	enterTheFile := func() error {
-		if !self.git.Patch.PatchManager.Active() {
-			if err := self.startPatchManager(); err != nil {
+		if !self.git.Patch.PatchBuilder.Active() {
+			if err := self.startPatchBuilder(); err != nil {
 				return err
 			}
 		}
@@ -238,12 +238,12 @@ func (self *CommitFilesController) enterCommitFile(node *filetree.CommitFileNode
 		return self.c.PushContext(self.contexts.CustomPatchBuilder, opts)
 	}
 
-	if self.git.Patch.PatchManager.Active() && self.git.Patch.PatchManager.To != self.context().GetRef().RefName() {
+	if self.git.Patch.PatchBuilder.Active() && self.git.Patch.PatchBuilder.To != self.context().GetRef().RefName() {
 		return self.c.Confirm(types.ConfirmOpts{
 			Title:  self.c.Tr.DiscardPatch,
 			Prompt: self.c.Tr.DiscardPatchConfirm,
 			HandleConfirm: func() error {
-				self.git.Patch.PatchManager.Reset()
+				self.git.Patch.PatchBuilder.Reset()
 				return enterTheFile()
 			},
 		})
diff --git a/pkg/gui/controllers/context_lines_controller.go b/pkg/gui/controllers/context_lines_controller.go
index c90bd9c9f..5a4fb291b 100644
--- a/pkg/gui/controllers/context_lines_controller.go
+++ b/pkg/gui/controllers/context_lines_controller.go
@@ -101,7 +101,7 @@ func (self *ContextLinesController) applyChange() error {
 }
 
 func (self *ContextLinesController) checkCanChangeContext() error {
-	if self.git.Patch.PatchManager.Active() {
+	if self.git.Patch.PatchBuilder.Active() {
 		return errors.New(self.c.Tr.CantChangeContextSizeError)
 	}
 
diff --git a/pkg/gui/controllers/helpers/patch_building_helper.go b/pkg/gui/controllers/helpers/patch_building_helper.go
index 646a8f167..59de50b99 100644
--- a/pkg/gui/controllers/helpers/patch_building_helper.go
+++ b/pkg/gui/controllers/helpers/patch_building_helper.go
@@ -43,7 +43,7 @@ func (self *PatchBuildingHelper) Escape() error {
 
 // kills the custom patch and returns us back to the commit files panel if needed
 func (self *PatchBuildingHelper) Reset() error {
-	self.git.Patch.PatchManager.Reset()
+	self.git.Patch.PatchBuilder.Reset()
 
 	if self.c.CurrentStaticContext().GetKind() != types.SIDE_CONTEXT {
 		if err := self.Escape(); err != nil {
diff --git a/pkg/gui/controllers/patch_building_controller.go b/pkg/gui/controllers/patch_building_controller.go
index b2d60b770..abbb4bdd1 100644
--- a/pkg/gui/controllers/patch_building_controller.go
+++ b/pkg/gui/controllers/patch_building_controller.go
@@ -106,7 +106,7 @@ func (self *PatchBuildingController) toggleSelection() error {
 	self.context().GetMutex().Lock()
 	defer self.context().GetMutex().Unlock()
 
-	toggleFunc := self.git.Patch.PatchManager.AddFileLineRange
+	toggleFunc := self.git.Patch.PatchBuilder.AddFileLineRange
 	filename := self.contexts.CommitFiles.GetSelectedPath()
 	if filename == "" {
 		return nil
@@ -114,13 +114,13 @@ func (self *PatchBuildingController) toggleSelection() error {
 
 	state := self.context().GetState()
 
-	includedLineIndices, err := self.git.Patch.PatchManager.GetFileIncLineIndices(filename)
+	includedLineIndices, err := self.git.Patch.PatchBuilder.GetFileIncLineIndices(filename)
 	if err != nil {
 		return err
 	}
 	currentLineIsStaged := lo.Contains(includedLineIndices, state.GetSelectedLineIdx())
 	if currentLineIsStaged {
-		toggleFunc = self.git.Patch.PatchManager.RemoveFileLineRange
+		toggleFunc = self.git.Patch.PatchBuilder.RemoveFileLineRange
 	}
 
 	// add range of lines to those set for the file
diff --git a/pkg/gui/custom_patch_options_panel.go b/pkg/gui/custom_patch_options_panel.go
index 2dfcf4e1e..a25fc9580 100644
--- a/pkg/gui/custom_patch_options_panel.go
+++ b/pkg/gui/custom_patch_options_panel.go
@@ -8,7 +8,7 @@ import (
 )
 
 func (gui *Gui) handleCreatePatchOptionsMenu() error {
-	if !gui.git.Patch.PatchManager.Active() {
+	if !gui.git.Patch.PatchBuilder.Active() {
 		return gui.c.ErrorMsg(gui.c.Tr.NoPatchError)
 	}
 
@@ -30,10 +30,10 @@ func (gui *Gui) handleCreatePatchOptionsMenu() error {
 		},
 	}
 
-	if gui.git.Patch.PatchManager.CanRebase && gui.git.Status.WorkingTreeState() == enums.REBASE_MODE_NONE {
+	if gui.git.Patch.PatchBuilder.CanRebase && gui.git.Status.WorkingTreeState() == enums.REBASE_MODE_NONE {
 		menuItems = append(menuItems, []*types.MenuItem{
 			{
-				Label:   fmt.Sprintf("remove patch from original commit (%s)", gui.git.Patch.PatchManager.To),
+				Label:   fmt.Sprintf("remove patch from original commit (%s)", gui.git.Patch.PatchBuilder.To),
 				OnPress: gui.handleDeletePatchFromCommit,
 				Key:     'd',
 			},
@@ -51,7 +51,7 @@ func (gui *Gui) handleCreatePatchOptionsMenu() error {
 
 		if gui.currentContext().GetKey() == gui.State.Contexts.LocalCommits.GetKey() {
 			selectedCommit := gui.getSelectedLocalCommit()
-			if selectedCommit != nil && gui.git.Patch.PatchManager.To != selectedCommit.Sha {
+			if selectedCommit != nil && gui.git.Patch.PatchBuilder.To != selectedCommit.Sha {
 				// adding this option to index 1
 				menuItems = append(
 					menuItems[:1],
@@ -82,7 +82,7 @@ func (gui *Gui) handleCreatePatchOptionsMenu() error {
 
 func (gui *Gui) getPatchCommitIndex() int {
 	for index, commit := range gui.State.Model.Commits {
-		if commit.Sha == gui.git.Patch.PatchManager.To {
+		if commit.Sha == gui.git.Patch.PatchBuilder.To {
 			return index
 		}
 	}
@@ -195,14 +195,14 @@ func (gui *Gui) handleApplyPatch(reverse bool) error {
 		action = "Apply patch in reverse"
 	}
 	gui.c.LogAction(action)
-	if err := gui.git.Patch.PatchManager.ApplyPatches(reverse); err != nil {
+	if err := gui.git.Patch.PatchBuilder.ApplyPatches(reverse); err != nil {
 		return gui.c.Error(err)
 	}
 	return gui.c.Refresh(types.RefreshOptions{Mode: types.ASYNC})
 }
 
 func (gui *Gui) copyPatchToClipboard() error {
-	patch := gui.git.Patch.PatchManager.RenderAggregatedPatch(true)
+	patch := gui.git.Patch.PatchBuilder.RenderAggregatedPatch(true)
 
 	gui.c.LogAction(gui.c.Tr.Actions.CopyPatchToClipboard)
 	if err := gui.os.CopyToClipboard(patch); err != nil {
diff --git a/pkg/gui/list_context_config.go b/pkg/gui/list_context_config.go
index a6cc8c42b..7969c4d20 100644
--- a/pkg/gui/list_context_config.go
+++ b/pkg/gui/list_context_config.go
@@ -243,7 +243,7 @@ func (gui *Gui) commitFilesListContext() *context.CommitFilesContext {
 				return [][]string{{style.FgRed.Sprint("(none)")}}
 			}
 
-			lines := presentation.RenderCommitFileTree(gui.State.Contexts.CommitFiles.CommitFileTreeViewModel, gui.State.Modes.Diffing.Ref, gui.git.Patch.PatchManager)
+			lines := presentation.RenderCommitFileTree(gui.State.Contexts.CommitFiles.CommitFileTreeViewModel, gui.State.Modes.Diffing.Ref, gui.git.Patch.PatchBuilder)
 			return slices.Map(lines, func(line string) []string {
 				return []string{line}
 			})
diff --git a/pkg/gui/modes.go b/pkg/gui/modes.go
index 70d403db2..750d1ad92 100644
--- a/pkg/gui/modes.go
+++ b/pkg/gui/modes.go
@@ -30,7 +30,7 @@ func (gui *Gui) modeStatuses() []modeStatus {
 			reset: gui.exitDiffMode,
 		},
 		{
-			isActive: gui.git.Patch.PatchManager.Active,
+			isActive: gui.git.Patch.PatchBuilder.Active,
 			description: func() string {
 				return gui.withResetButton(gui.c.Tr.LcBuildingPatch, style.FgYellow.SetBold())
 			},
diff --git a/pkg/gui/presentation/files.go b/pkg/gui/presentation/files.go
index a941314c7..5180264e3 100644
--- a/pkg/gui/presentation/files.go
+++ b/pkg/gui/presentation/files.go
@@ -40,7 +40,7 @@ func RenderFileTree(
 func RenderCommitFileTree(
 	tree *filetree.CommitFileTreeViewModel,
 	diffName string,
-	patchManager *patch.PatchManager,
+	patchBuilder *patch.PatchBuilder,
 ) []string {
 	return renderAux(tree.GetRoot().Raw(), tree.CollapsedPaths(), "", -1, func(node *filetree.Node[models.CommitFile], depth int) string {
 		// This is a little convoluted because we're dealing with either a leaf or a non-leaf.
@@ -49,11 +49,11 @@ func RenderCommitFileTree(
 		// based on the leaves of that subtree
 		var status patch.PatchStatus
 		if node.EveryFile(func(file *models.CommitFile) bool {
-			return patchManager.GetFileStatus(file.Name, tree.GetRef().RefName()) == patch.WHOLE
+			return patchBuilder.GetFileStatus(file.Name, tree.GetRef().RefName()) == patch.WHOLE
 		}) {
 			status = patch.WHOLE
 		} else if node.EveryFile(func(file *models.CommitFile) bool {
-			return patchManager.GetFileStatus(file.Name, tree.GetRef().RefName()) == patch.UNSELECTED
+			return patchBuilder.GetFileStatus(file.Name, tree.GetRef().RefName()) == patch.UNSELECTED
 		}) {
 			status = patch.UNSELECTED
 		} else {
diff --git a/pkg/gui/presentation/files_test.go b/pkg/gui/presentation/files_test.go
index 729d0d8cf..025def566 100644
--- a/pkg/gui/presentation/files_test.go
+++ b/pkg/gui/presentation/files_test.go
@@ -134,15 +134,15 @@ M file1
 			for _, path := range s.collapsedPaths {
 				viewModel.ToggleCollapsed(path)
 			}
-			patchManager := patch.NewPatchManager(
+			patchBuilder := patch.NewPatchBuilder(
 				utils.NewDummyLog(),
 				func(patch string, flags ...string) error { return nil },
 				func(from string, to string, reverse bool, filename string, plain bool) (string, error) {
 					return "", nil
 				},
 			)
-			patchManager.Start("from", "to", false, false)
-			result := RenderCommitFileTree(viewModel, "", patchManager)
+			patchBuilder.Start("from", "to", false, false)
+			result := RenderCommitFileTree(viewModel, "", patchBuilder)
 			assert.EqualValues(t, s.expected, result)
 		})
 	}
diff --git a/pkg/gui/refresh.go b/pkg/gui/refresh.go
index 0c6315767..2926152ed 100644
--- a/pkg/gui/refresh.go
+++ b/pkg/gui/refresh.go
@@ -653,7 +653,7 @@ func (gui *Gui) refreshPatchBuildingPanel(opts types.OnFocusOpts) error {
 		selectedLineIdx = opts.ClickedViewLineIdx
 	}
 
-	if !gui.git.Patch.PatchManager.Active() {
+	if !gui.git.Patch.PatchBuilder.Active() {
 		return gui.helpers.PatchBuilding.Escape()
 	}
 
@@ -672,7 +672,7 @@ func (gui *Gui) refreshPatchBuildingPanel(opts types.OnFocusOpts) error {
 		return err
 	}
 
-	secondaryDiff := gui.git.Patch.PatchManager.RenderPatchForFile(path, false, false)
+	secondaryDiff := gui.git.Patch.PatchBuilder.RenderPatchForFile(path, false, false)
 	if err != nil {
 		return err
 	}