Move types/enums/enums.go to working_tree_state.go

stefanhaller · stefanhaller · commit dceb1960f026 · 2025-04-07T14:42:17.000+02:00
It looks like enums.go was supposed to be file that collects a bunch of enums,
but actually there's only one in there, and since it has methods, it deserves to
be in a file of its own, named after the type.
diff --git a/pkg/commands/git_commands/commit_loader.go b/pkg/commands/git_commands/commit_loader.go
@@ -13,7 +13,6 @@ import (
 
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
-	"github.com/jesseduffield/lazygit/pkg/commands/types/enums"
 	"github.com/jesseduffield/lazygit/pkg/common"
 	"github.com/jesseduffield/lazygit/pkg/utils"
 	"github.com/samber/lo"
@@ -31,7 +30,7 @@ type CommitLoader struct {
 	*common.Common
 	cmd oscommands.ICmdObjBuilder
 
-	getWorkingTreeState func() enums.WorkingTreeState
+	getWorkingTreeState func() models.WorkingTreeState
 	readFile            func(filename string) ([]byte, error)
 	walkFiles           func(root string, fn filepath.WalkFunc) error
 	dotGitDir           string
@@ -42,7 +41,7 @@ type CommitLoader struct {
 func NewCommitLoader(
 	cmn *common.Common,
 	cmd oscommands.ICmdObjBuilder,
-	getWorkingTreeState func() enums.WorkingTreeState,
+	getWorkingTreeState func() models.WorkingTreeState,
 	gitCommon *GitCommon,
 ) *CommitLoader {
 	return &CommitLoader{
diff --git a/pkg/commands/git_commands/commit_loader_test.go b/pkg/commands/git_commands/commit_loader_test.go
@@ -8,7 +8,6 @@ import (
 	"github.com/go-errors/errors"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
-	"github.com/jesseduffield/lazygit/pkg/commands/types/enums"
 	"github.com/jesseduffield/lazygit/pkg/config"
 	"github.com/jesseduffield/lazygit/pkg/utils"
 	"github.com/stefanhaller/git-todo-parser/todo"
@@ -304,7 +303,7 @@ func TestGetCommits(t *testing.T) {
 			builder := &CommitLoader{
 				Common:              common,
 				cmd:                 cmd,
-				getWorkingTreeState: func() enums.WorkingTreeState { return enums.WORKING_TREE_STATE_NONE },
+				getWorkingTreeState: func() models.WorkingTreeState { return models.WORKING_TREE_STATE_NONE },
 				dotGitDir:           ".git",
 				readFile: func(filename string) ([]byte, error) {
 					return []byte(""), nil
@@ -487,7 +486,7 @@ func TestCommitLoader_getConflictedCommitImpl(t *testing.T) {
 			builder := &CommitLoader{
 				Common:              common,
 				cmd:                 oscommands.NewDummyCmdObjBuilder(oscommands.NewFakeRunner(t)),
-				getWorkingTreeState: func() enums.WorkingTreeState { return enums.WORKING_TREE_STATE_REBASING },
+				getWorkingTreeState: func() models.WorkingTreeState { return models.WORKING_TREE_STATE_REBASING },
 				dotGitDir:           ".git",
 				readFile: func(filename string) ([]byte, error) {
 					return []byte(""), nil
diff --git a/pkg/commands/git_commands/patch.go b/pkg/commands/git_commands/patch.go
@@ -8,7 +8,6 @@ import (
 	"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"
 	"github.com/stefanhaller/git-todo-parser/todo"
 )
 
@@ -229,7 +228,7 @@ func (self *PatchCommands) MovePatchIntoIndex(commits []*models.Commit, commitId
 	}
 
 	if err := self.ApplyCustomPatch(true, true); err != nil {
-		if self.status.WorkingTreeState() == enums.WORKING_TREE_STATE_REBASING {
+		if self.status.WorkingTreeState() == models.WORKING_TREE_STATE_REBASING {
 			_ = self.rebase.AbortRebase()
 		}
 		return err
@@ -253,7 +252,7 @@ func (self *PatchCommands) MovePatchIntoIndex(commits []*models.Commit, commitId
 	self.rebase.onSuccessfulContinue = func() error {
 		// add patches to index
 		if err := self.ApplyPatch(patch, ApplyPatchOpts{Index: true, ThreeWay: true}); err != nil {
-			if self.status.WorkingTreeState() == enums.WORKING_TREE_STATE_REBASING {
+			if self.status.WorkingTreeState() == models.WORKING_TREE_STATE_REBASING {
 				_ = self.rebase.AbortRebase()
 			}
 			return err
diff --git a/pkg/commands/git_commands/status.go b/pkg/commands/git_commands/status.go
@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/jesseduffield/lazygit/pkg/commands/types/enums"
+	"github.com/jesseduffield/lazygit/pkg/commands/models"
 )
 
 type StatusCommands struct {
@@ -20,16 +20,16 @@ func NewStatusCommands(
 	}
 }
 
-func (self *StatusCommands) WorkingTreeState() enums.WorkingTreeState {
+func (self *StatusCommands) WorkingTreeState() models.WorkingTreeState {
 	isInRebase, _ := self.IsInRebase()
 	if isInRebase {
-		return enums.WORKING_TREE_STATE_REBASING
+		return models.WORKING_TREE_STATE_REBASING
 	}
 	merging, _ := self.IsInMergeState()
 	if merging {
-		return enums.WORKING_TREE_STATE_MERGING
+		return models.WORKING_TREE_STATE_MERGING
 	}
-	return enums.WORKING_TREE_STATE_NONE
+	return models.WORKING_TREE_STATE_NONE
 }
 
 func (self *StatusCommands) IsBareRepo() bool {
diff --git a/pkg/commands/models/working_tree_state.go b/pkg/commands/models/working_tree_state.go
@@ -1,4 +1,4 @@
-package enums
+package models
 
 import "github.com/jesseduffield/lazygit/pkg/i18n"
 
diff --git a/pkg/gui/context/local_commits_context.go b/pkg/gui/context/local_commits_context.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
-	"github.com/jesseduffield/lazygit/pkg/commands/types/enums"
 	"github.com/jesseduffield/lazygit/pkg/gui/presentation"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 	"github.com/samber/lo"
@@ -41,7 +40,7 @@ func NewLocalCommitsContext(c *ContextCommon) *LocalCommitsContext {
 			}
 		}
 
-		showYouAreHereLabel := c.Model().WorkingTreeStateAtLastCommitRefresh == enums.WORKING_TREE_STATE_REBASING
+		showYouAreHereLabel := c.Model().WorkingTreeStateAtLastCommitRefresh == models.WORKING_TREE_STATE_REBASING
 		hasRebaseUpdateRefsConfig := c.Git().Config.GetRebaseUpdateRefs()
 
 		return presentation.GetCommitListDisplayStrings(
diff --git a/pkg/gui/controllers/custom_patch_options_menu_action.go b/pkg/gui/controllers/custom_patch_options_menu_action.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/jesseduffield/gocui"
-	"github.com/jesseduffield/lazygit/pkg/commands/types/enums"
+	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 )
@@ -44,7 +44,7 @@ func (self *CustomPatchOptionsMenuAction) Call() error {
 		},
 	}
 
-	if self.c.Git().Patch.PatchBuilder.CanRebase && self.c.Git().Status.WorkingTreeState() == enums.WORKING_TREE_STATE_NONE {
+	if self.c.Git().Patch.PatchBuilder.CanRebase && self.c.Git().Status.WorkingTreeState() == models.WORKING_TREE_STATE_NONE {
 		menuItems = append(menuItems, []*types.MenuItem{
 			{
 				Label:   fmt.Sprintf(self.c.Tr.RemovePatchFromOriginalCommit, self.c.Git().Patch.PatchBuilder.To),
@@ -115,7 +115,7 @@ func (self *CustomPatchOptionsMenuAction) getPatchCommitIndex() int {
 }
 
 func (self *CustomPatchOptionsMenuAction) validateNormalWorkingTreeState() (bool, error) {
-	if self.c.Git().Status.WorkingTreeState() != enums.WORKING_TREE_STATE_NONE {
+	if self.c.Git().Status.WorkingTreeState() != models.WORKING_TREE_STATE_NONE {
 		return false, errors.New(self.c.Tr.CantPatchWhileRebasingError)
 	}
 	return true, nil
diff --git a/pkg/gui/controllers/helpers/merge_and_rebase_helper.go b/pkg/gui/controllers/helpers/merge_and_rebase_helper.go
@@ -10,7 +10,6 @@ import (
 	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
-	"github.com/jesseduffield/lazygit/pkg/commands/types/enums"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 	"github.com/jesseduffield/lazygit/pkg/utils"
 	"github.com/samber/lo"
@@ -51,7 +50,7 @@ func (self *MergeAndRebaseHelper) CreateRebaseOptionsMenu() error {
 		{option: REBASE_OPTION_ABORT, key: 'a'},
 	}
 
-	if self.c.Git().Status.WorkingTreeState() == enums.WORKING_TREE_STATE_REBASING {
+	if self.c.Git().Status.WorkingTreeState() == models.WORKING_TREE_STATE_REBASING {
 		options = append(options, optionAndKey{
 			option: REBASE_OPTION_SKIP, key: 's',
 		})
@@ -78,12 +77,12 @@ func (self *MergeAndRebaseHelper) ContinueRebase() error {
 func (self *MergeAndRebaseHelper) genericMergeCommand(command string) error {
 	status := self.c.Git().Status.WorkingTreeState()
 
-	if status != enums.WORKING_TREE_STATE_MERGING && status != enums.WORKING_TREE_STATE_REBASING {
+	if status != models.WORKING_TREE_STATE_MERGING && status != models.WORKING_TREE_STATE_REBASING {
 		return errors.New(self.c.Tr.NotMergingOrRebasing)
 	}
 
 	self.c.LogAction(fmt.Sprintf("Merge/Rebase: %s", command))
-	if status == enums.WORKING_TREE_STATE_REBASING {
+	if status == models.WORKING_TREE_STATE_REBASING {
 		todoFile, err := os.ReadFile(
 			filepath.Join(self.c.Git().RepoPaths.WorktreeGitDirPath(), "rebase-merge/git-rebase-todo"),
 		)
@@ -102,10 +101,10 @@ func (self *MergeAndRebaseHelper) genericMergeCommand(command string) error {
 	// we should end up with a command like 'git merge --continue'
 
 	// it's impossible for a rebase to require a commit so we'll use a subprocess only if it's a merge
-	needsSubprocess := (status == enums.WORKING_TREE_STATE_MERGING && command != REBASE_OPTION_ABORT && self.c.UserConfig().Git.Merging.ManualCommit) ||
+	needsSubprocess := (status == models.WORKING_TREE_STATE_MERGING && command != REBASE_OPTION_ABORT && self.c.UserConfig().Git.Merging.ManualCommit) ||
 		// but we'll also use a subprocess if we have exec todos; those are likely to be lengthy build
 		// tasks whose output the user will want to see in the terminal
-		(status == enums.WORKING_TREE_STATE_REBASING && command != REBASE_OPTION_ABORT && self.hasExecTodos())
+		(status == models.WORKING_TREE_STATE_REBASING && command != REBASE_OPTION_ABORT && self.hasExecTodos())
 
 	if needsSubprocess {
 		// TODO: see if we should be calling more of the code from self.Git.Rebase.GenericMergeOrRebaseAction
diff --git a/pkg/gui/controllers/helpers/mode_helper.go b/pkg/gui/controllers/helpers/mode_helper.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/jesseduffield/lazygit/pkg/commands/types/enums"
+	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/gui/style"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 	"github.com/samber/lo"
@@ -115,7 +115,7 @@ func (self *ModeHelper) Statuses() []ModeStatus {
 		},
 		{
 			IsActive: func() bool {
-				return !self.suppressRebasingMode && self.c.Git().Status.WorkingTreeState() != enums.WORKING_TREE_STATE_NONE
+				return !self.suppressRebasingMode && self.c.Git().Status.WorkingTreeState() != models.WORKING_TREE_STATE_NONE
 			},
 			Description: func() string {
 				workingTreeState := self.c.Git().Status.WorkingTreeState()
diff --git a/pkg/gui/controllers/helpers/patch_building_helper.go b/pkg/gui/controllers/helpers/patch_building_helper.go
@@ -3,8 +3,8 @@ package helpers
 import (
 	"errors"
 
+	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/commands/patch"
-	"github.com/jesseduffield/lazygit/pkg/commands/types/enums"
 	"github.com/jesseduffield/lazygit/pkg/gui/patch_exploring"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 )
@@ -26,7 +26,7 @@ func NewPatchBuildingHelper(
 }
 
 func (self *PatchBuildingHelper) ValidateNormalWorkingTreeState() (bool, error) {
-	if self.c.Git().Status.WorkingTreeState() != enums.WORKING_TREE_STATE_NONE {
+	if self.c.Git().Status.WorkingTreeState() != models.WORKING_TREE_STATE_NONE {
 		return false, errors.New(self.c.Tr.CantPatchWhileRebasingError)
 	}
 	return true, nil
diff --git a/pkg/gui/controllers/helpers/refresh_helper.go b/pkg/gui/controllers/helpers/refresh_helper.go
@@ -9,7 +9,6 @@ import (
 	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
-	"github.com/jesseduffield/lazygit/pkg/commands/types/enums"
 	"github.com/jesseduffield/lazygit/pkg/gui/context"
 	"github.com/jesseduffield/lazygit/pkg/gui/filetree"
 	"github.com/jesseduffield/lazygit/pkg/gui/mergeconflicts"
@@ -583,7 +582,7 @@ func (self *RefreshHelper) refreshStateFiles() error {
 		}
 	}
 
-	if self.c.Git().Status.WorkingTreeState() != enums.WORKING_TREE_STATE_NONE && conflictFileCount == 0 && prevConflictFileCount > 0 {
+	if self.c.Git().Status.WorkingTreeState() != models.WORKING_TREE_STATE_NONE && conflictFileCount == 0 && prevConflictFileCount > 0 {
 		self.c.OnUIThread(func() error { return self.mergeAndRebaseHelper.PromptToContinueRebase() })
 	}
 
diff --git a/pkg/gui/controllers/local_commits_controller.go b/pkg/gui/controllers/local_commits_controller.go
@@ -8,7 +8,6 @@ import (
 	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
-	"github.com/jesseduffield/lazygit/pkg/commands/types/enums"
 	"github.com/jesseduffield/lazygit/pkg/gui/context"
 	"github.com/jesseduffield/lazygit/pkg/gui/context/traits"
 	"github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers"
@@ -681,7 +680,7 @@ func (self *LocalCommitsController) rewordEnabled(commit *models.Commit) *types.
 }
 
 func (self *LocalCommitsController) isRebasing() bool {
-	return self.c.Model().WorkingTreeStateAtLastCommitRefresh != enums.WORKING_TREE_STATE_NONE
+	return self.c.Model().WorkingTreeStateAtLastCommitRefresh != models.WORKING_TREE_STATE_NONE
 }
 
 func (self *LocalCommitsController) moveDown(selectedCommits []*models.Commit, startIdx int, endIdx int) error {
@@ -975,7 +974,7 @@ func (self *LocalCommitsController) moveFixupCommitToOwnerStackedBranch(targetCo
 		return nil
 	}
 
-	if self.c.Git().Status.WorkingTreeState() != enums.WORKING_TREE_STATE_NONE {
+	if self.c.Git().Status.WorkingTreeState() != models.WORKING_TREE_STATE_NONE {
 		// Can't move commits while rebasing
 		return nil
 	}
diff --git a/pkg/gui/controllers/status_controller.go b/pkg/gui/controllers/status_controller.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/jesseduffield/gocui"
-	"github.com/jesseduffield/lazygit/pkg/commands/types/enums"
+	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/constants"
 	"github.com/jesseduffield/lazygit/pkg/gui/presentation"
 	"github.com/jesseduffield/lazygit/pkg/gui/style"
@@ -110,7 +110,7 @@ func (self *StatusController) onClick(opts gocui.ViewMouseBindingOpts) error {
 	repoName := self.c.Git().RepoPaths.RepoName()
 	workingTreeState := self.c.Git().Status.WorkingTreeState()
 	switch workingTreeState {
-	case enums.WORKING_TREE_STATE_REBASING, enums.WORKING_TREE_STATE_MERGING:
+	case models.WORKING_TREE_STATE_REBASING, models.WORKING_TREE_STATE_MERGING:
 		workingTreeStatus := fmt.Sprintf("(%s)", workingTreeState.LowerCaseTitle(self.c.Tr))
 		if cursorInSubstring(opts.X, upstreamStatus+" ", workingTreeStatus) {
 			return self.c.Helpers().MergeAndRebase.CreateRebaseOptionsMenu()
diff --git a/pkg/gui/controllers/undo_controller.go b/pkg/gui/controllers/undo_controller.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/jesseduffield/gocui"
-	"github.com/jesseduffield/lazygit/pkg/commands/types/enums"
+	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 	"github.com/jesseduffield/lazygit/pkg/utils"
 )
@@ -78,7 +78,7 @@ func (self *UndoController) reflogUndo() error {
 	undoEnvVars := []string{"GIT_REFLOG_ACTION=[lazygit undo]"}
 	undoingStatus := self.c.Tr.UndoingStatus
 
-	if self.c.Git().Status.WorkingTreeState() == enums.WORKING_TREE_STATE_REBASING {
+	if self.c.Git().Status.WorkingTreeState() == models.WORKING_TREE_STATE_REBASING {
 		return errors.New(self.c.Tr.CantUndoWhileRebasing)
 	}
 
@@ -142,7 +142,7 @@ func (self *UndoController) reflogRedo() error {
 	redoEnvVars := []string{"GIT_REFLOG_ACTION=[lazygit redo]"}
 	redoingStatus := self.c.Tr.RedoingStatus
 
-	if self.c.Git().Status.WorkingTreeState() == enums.WORKING_TREE_STATE_REBASING {
+	if self.c.Git().Status.WorkingTreeState() == models.WORKING_TREE_STATE_REBASING {
 		return errors.New(self.c.Tr.CantRedoWhileRebasing)
 	}
 
diff --git a/pkg/gui/presentation/status.go b/pkg/gui/presentation/status.go
@@ -5,7 +5,6 @@ import (
 	"time"
 
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
-	"github.com/jesseduffield/lazygit/pkg/commands/types/enums"
 	"github.com/jesseduffield/lazygit/pkg/config"
 	"github.com/jesseduffield/lazygit/pkg/gui/presentation/icons"
 	"github.com/jesseduffield/lazygit/pkg/gui/style"
@@ -18,7 +17,7 @@ func FormatStatus(
 	currentBranch *models.Branch,
 	itemOperation types.ItemOperation,
 	linkedWorktreeName string,
-	workingTreeState enums.WorkingTreeState,
+	workingTreeState models.WorkingTreeState,
 	tr *i18n.TranslationSet,
 	userConfig *config.UserConfig,
 ) string {
@@ -31,7 +30,7 @@ func FormatStatus(
 		}
 	}
 
-	if workingTreeState != enums.WORKING_TREE_STATE_NONE {
+	if workingTreeState != models.WORKING_TREE_STATE_NONE {
 		status += style.FgYellow.Sprintf("(%s) ", workingTreeState.LowerCaseTitle(tr))
 	}
 
diff --git a/pkg/gui/types/common.go b/pkg/gui/types/common.go
@@ -6,7 +6,6 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
-	"github.com/jesseduffield/lazygit/pkg/commands/types/enums"
 	"github.com/jesseduffield/lazygit/pkg/common"
 	"github.com/jesseduffield/lazygit/pkg/config"
 	"github.com/jesseduffield/lazygit/pkg/utils"
@@ -288,7 +287,7 @@ type Model struct {
 	ReflogCommits []*models.Commit
 
 	BisectInfo                          *git_commands.BisectInfo
-	WorkingTreeStateAtLastCommitRefresh enums.WorkingTreeState
+	WorkingTreeStateAtLastCommitRefresh models.WorkingTreeState
 	RemoteBranches                      []*models.RemoteBranch
 	Tags                                []*models.Tag
 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ import (`
`8`	`8`	`"github.com/jesseduffield/lazygit/pkg/app/daemon"`
`9`	`9`	`"github.com/jesseduffield/lazygit/pkg/commands/models"`
`10`	`10`	`"github.com/jesseduffield/lazygit/pkg/commands/patch"`
`11`		`- "github.com/jesseduffield/lazygit/pkg/commands/types/enums"`
`12`	`11`	`"github.com/stefanhaller/git-todo-parser/todo"`
`13`	`12`	`)`
`14`	`13`
`@@ -229,7 +228,7 @@ func (self PatchCommands) MovePatchIntoIndex(commits []models.Commit, commitId`
`229`	`228`	`}`
`230`	`229`
`231`	`230`	`if err := self.ApplyCustomPatch(true, true); err != nil {`
`232`		`- if self.status.WorkingTreeState() == enums.WORKING_TREE_STATE_REBASING {`
	`231`	`+ if self.status.WorkingTreeState() == models.WORKING_TREE_STATE_REBASING {`
`233`	`232`	`_ = self.rebase.AbortRebase()`
`234`	`233`	`}`
`235`	`234`	`return err`
`@@ -253,7 +252,7 @@ func (self PatchCommands) MovePatchIntoIndex(commits []models.Commit, commitId`
`253`	`252`	`self.rebase.onSuccessfulContinue = func() error {`
`254`	`253`	`// add patches to index`
`255`	`254`	`if err := self.ApplyPatch(patch, ApplyPatchOpts{Index: true, ThreeWay: true}); err != nil {`
`256`		`- if self.status.WorkingTreeState() == enums.WORKING_TREE_STATE_REBASING {`
	`255`	`+ if self.status.WorkingTreeState() == models.WORKING_TREE_STATE_REBASING {`
`257`	`256`	`_ = self.rebase.AbortRebase()`
`258`	`257`	`}`
`259`	`258`	`return err`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"path/filepath"`
`6`	`6`	`"strings"`
`7`	`7`
`8`		`- "github.com/jesseduffield/lazygit/pkg/commands/types/enums"`
	`8`	`+ "github.com/jesseduffield/lazygit/pkg/commands/models"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`type StatusCommands struct {`
`@@ -20,16 +20,16 @@ func NewStatusCommands(`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`
`23`		`-func (self *StatusCommands) WorkingTreeState() enums.WorkingTreeState {`
	`23`	`+func (self *StatusCommands) WorkingTreeState() models.WorkingTreeState {`
`24`	`24`	`isInRebase, _ := self.IsInRebase()`
`25`	`25`	`if isInRebase {`
`26`		`- return enums.WORKING_TREE_STATE_REBASING`
	`26`	`+ return models.WORKING_TREE_STATE_REBASING`
`27`	`27`	`}`
`28`	`28`	`merging, _ := self.IsInMergeState()`
`29`	`29`	`if merging {`
`30`		`- return enums.WORKING_TREE_STATE_MERGING`
	`30`	`+ return models.WORKING_TREE_STATE_MERGING`
`31`	`31`	`}`
`32`		`- return enums.WORKING_TREE_STATE_NONE`
	`32`	`+ return models.WORKING_TREE_STATE_NONE`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`func (self *StatusCommands) IsBareRepo() bool {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package enums`
	`1`	`+package models`
`2`	`2`
`3`	`3`	`import "github.com/jesseduffield/lazygit/pkg/i18n"`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@ import (`
`7`	`7`
`8`	`8`	`"github.com/jesseduffield/gocui"`
`9`	`9`	`"github.com/jesseduffield/lazygit/pkg/commands/models"`
`10`		`- "github.com/jesseduffield/lazygit/pkg/commands/types/enums"`
`11`	`10`	`"github.com/jesseduffield/lazygit/pkg/gui/presentation"`
`12`	`11`	`"github.com/jesseduffield/lazygit/pkg/gui/types"`
`13`	`12`	`"github.com/samber/lo"`
`@@ -41,7 +40,7 @@ func NewLocalCommitsContext(c ContextCommon) LocalCommitsContext {`
`41`	`40`	`}`
`42`	`41`	`}`
`43`	`42`
`44`		`- showYouAreHereLabel := c.Model().WorkingTreeStateAtLastCommitRefresh == enums.WORKING_TREE_STATE_REBASING`
	`43`	`+ showYouAreHereLabel := c.Model().WorkingTreeStateAtLastCommitRefresh == models.WORKING_TREE_STATE_REBASING`
`45`	`44`	`hasRebaseUpdateRefsConfig := c.Git().Config.GetRebaseUpdateRefs()`
`46`	`45`
`47`	`46`	`return presentation.GetCommitListDisplayStrings(`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"fmt"`
`6`	`6`
`7`	`7`	`"github.com/jesseduffield/gocui"`
`8`		`- "github.com/jesseduffield/lazygit/pkg/commands/types/enums"`
	`8`	`+ "github.com/jesseduffield/lazygit/pkg/commands/models"`
`9`	`9`	`"github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers"`
`10`	`10`	`"github.com/jesseduffield/lazygit/pkg/gui/types"`
`11`	`11`	`)`
`@@ -44,7 +44,7 @@ func (self *CustomPatchOptionsMenuAction) Call() error {`
`44`	`44`	`},`
`45`	`45`	`}`
`46`	`46`
`47`		`- if self.c.Git().Patch.PatchBuilder.CanRebase && self.c.Git().Status.WorkingTreeState() == enums.WORKING_TREE_STATE_NONE {`
	`47`	`+ if self.c.Git().Patch.PatchBuilder.CanRebase && self.c.Git().Status.WorkingTreeState() == models.WORKING_TREE_STATE_NONE {`
`48`	`48`	`menuItems = append(menuItems, []*types.MenuItem{`
`49`	`49`	`{`
`50`	`50`	`Label: fmt.Sprintf(self.c.Tr.RemovePatchFromOriginalCommit, self.c.Git().Patch.PatchBuilder.To),`
`@@ -115,7 +115,7 @@ func (self *CustomPatchOptionsMenuAction) getPatchCommitIndex() int {`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`func (self *CustomPatchOptionsMenuAction) validateNormalWorkingTreeState() (bool, error) {`
`118`		`- if self.c.Git().Status.WorkingTreeState() != enums.WORKING_TREE_STATE_NONE {`
	`118`	`+ if self.c.Git().Status.WorkingTreeState() != models.WORKING_TREE_STATE_NONE {`
`119`	`119`	`return false, errors.New(self.c.Tr.CantPatchWhileRebasingError)`
`120`	`120`	`}`
`121`	`121`	`return true, nil`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@ package helpers`
`3`	`3`	`import (`
`4`	`4`	`"errors"`
`5`	`5`
	`6`	`+ "github.com/jesseduffield/lazygit/pkg/commands/models"`
`6`	`7`	`"github.com/jesseduffield/lazygit/pkg/commands/patch"`
`7`		`- "github.com/jesseduffield/lazygit/pkg/commands/types/enums"`
`8`	`8`	`"github.com/jesseduffield/lazygit/pkg/gui/patch_exploring"`
`9`	`9`	`"github.com/jesseduffield/lazygit/pkg/gui/types"`
`10`	`10`	`)`
`@@ -26,7 +26,7 @@ func NewPatchBuildingHelper(`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`func (self *PatchBuildingHelper) ValidateNormalWorkingTreeState() (bool, error) {`
`29`		`- if self.c.Git().Status.WorkingTreeState() != enums.WORKING_TREE_STATE_NONE {`
	`29`	`+ if self.c.Git().Status.WorkingTreeState() != models.WORKING_TREE_STATE_NONE {`
`30`	`30`	`return false, errors.New(self.c.Tr.CantPatchWhileRebasingError)`
`31`	`31`	`}`
`32`	`32`	`return true, nil`