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

Rename RebaseMode to WorkingTreeState

Browse Source 
We're about to add more possible values (reverting and cherry-picking), so
working tree state seems like a more suitable name.
This commit is contained in:
Stefan Haller
2024-06-10 17:36:34 +02:00
parent 1a73697546
commit cd36e95a82
17 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/commands/git_commands/commit_loader.go
View File

@ -31,7 +31,7 @@ type CommitLoader struct {
*common.Common
cmd oscommands.ICmdObjBuilder
getWorkingTreeState func() enums.RebaseMode
getWorkingTreeState func() enums.WorkingTreeState
readFile func(filename string) ([]byte, error)
walkFiles func(root string, fn filepath.WalkFunc) error
dotGitDir string
@ -42,7 +42,7 @@ type CommitLoader struct {
func NewCommitLoader(
cmn *common.Common,
cmd oscommands.ICmdObjBuilder,
getWorkingTreeState func() enums.RebaseMode,
getWorkingTreeState func() enums.WorkingTreeState,
gitCommon *GitCommon,
) *CommitLoader {
return &CommitLoader{

4
pkg/commands/git_commands/commit_loader_test.go
View File

@ -304,7 +304,7 @@ func TestGetCommits(t *testing.T) {
builder := &CommitLoader{
Common: common,
cmd: cmd,
getWorkingTreeState: func() enums.RebaseMode { return enums.REBASE_MODE_NONE },
getWorkingTreeState: func() enums.WorkingTreeState { return enums.WORKING_TREE_STATE_NONE },
dotGitDir: ".git",
readFile: func(filename string) ([]byte, error) {
return []byte(""), nil
@ -487,7 +487,7 @@ func TestCommitLoader_getConflictedCommitImpl(t *testing.T) {
builder := &CommitLoader{
Common: common,
cmd: oscommands.NewDummyCmdObjBuilder(oscommands.NewFakeRunner(t)),
getWorkingTreeState: func() enums.RebaseMode { return enums.REBASE_MODE_REBASING },
getWorkingTreeState: func() enums.WorkingTreeState { return enums.WORKING_TREE_STATE_REBASING },
dotGitDir: ".git",
readFile: func(filename string) ([]byte, error) {
return []byte(""), nil

4
pkg/commands/git_commands/patch.go
View File

@ -229,7 +229,7 @@ func (self *PatchCommands) MovePatchIntoIndex(commits []*models.Commit, commitId
}
if err := self.ApplyCustomPatch(true, true); err != nil {
if self.status.WorkingTreeState() == enums.REBASE_MODE_REBASING {
if self.status.WorkingTreeState() == enums.WORKING_TREE_STATE_REBASING {
_ = self.rebase.AbortRebase()
}
return err
@ -253,7 +253,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.REBASE_MODE_REBASING {
if self.status.WorkingTreeState() == enums.WORKING_TREE_STATE_REBASING {
_ = self.rebase.AbortRebase()
}
return err

8
pkg/commands/git_commands/status.go
View File

@ -20,16 +20,16 @@ func NewStatusCommands(
}
}
func (self *StatusCommands) WorkingTreeState() enums.RebaseMode {
func (self *StatusCommands) WorkingTreeState() enums.WorkingTreeState {
isInRebase, _ := self.IsInRebase()
if isInRebase {
return enums.REBASE_MODE_REBASING
return enums.WORKING_TREE_STATE_REBASING
}
merging, _ := self.IsInMergeState()
if merging {
return enums.REBASE_MODE_MERGING
return enums.WORKING_TREE_STATE_MERGING
}
return enums.REBASE_MODE_NONE
return enums.WORKING_TREE_STATE_NONE
}
func (self *StatusCommands) IsBareRepo() bool {