sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00
Code 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/gui/controllers/custom_patch_options_menu_action.go
View File

@ -44,7 +44,7 @@ func (self *CustomPatchOptionsMenuAction) Call() error {
},
}
if self.c.Git().Patch.PatchBuilder.CanRebase && self.c.Git().Status.WorkingTreeState() == enums.REBASE_MODE_NONE {
if self.c.Git().Patch.PatchBuilder.CanRebase && self.c.Git().Status.WorkingTreeState() == enums.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.REBASE_MODE_NONE {
if self.c.Git().Status.WorkingTreeState() != enums.WORKING_TREE_STATE_NONE {
return false, errors.New(self.c.Tr.CantPatchWhileRebasingError)
}
return true, nil