sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-31 14:24:25 +03:00
Code Activity

Extract variables

Browse Source 
Besides being a useful cleanup on its own, it will make it easier to support a
multiselection of branches.
This commit is contained in:
Stefan Haller
2024-11-23 12:01:07 +01:00
parent 2ffd52acd1
commit e98cc4d016
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/gui/controllers/branches_controller.go
View File

@ -534,6 +534,8 @@ func (self *BranchesController) localAndRemoteDelete(branch *models.Branch) erro
func (self *BranchesController) delete(branch *models.Branch) error { func (self *BranchesController) delete(branch *models.Branch) error {
checkedOutBranch := self.c.Helpers().Refs.GetCheckedOutRef() checkedOutBranch := self.c.Helpers().Refs.GetCheckedOutRef()
isBranchCheckedOut := checkedOutBranch.Name == branch.Name
hasUpstream := branch.IsTrackingRemote() && !branch.UpstreamGone
localDeleteItem := &types.MenuItem{ localDeleteItem := &types.MenuItem{
Label: self.c.Tr.DeleteLocalBranch, Label: self.c.Tr.DeleteLocalBranch,
@ -542,7 +544,7 @@ func (self *BranchesController) delete(branch *models.Branch) error {
return self.localDelete(branch) return self.localDelete(branch)
}, },
} }
if checkedOutBranch.Name == branch.Name { if isBranchCheckedOut {
localDeleteItem.DisabledReason = &types.DisabledReason{Text: self.c.Tr.CantDeleteCheckOutBranch} localDeleteItem.DisabledReason = &types.DisabledReason{Text: self.c.Tr.CantDeleteCheckOutBranch}
} }
@ -553,7 +555,7 @@ func (self *BranchesController) delete(branch *models.Branch) error {
return self.remoteDelete(branch) return self.remoteDelete(branch)
}, },
} }
if !branch.IsTrackingRemote() || branch.UpstreamGone { if !hasUpstream {
remoteDeleteItem.DisabledReason = &types.DisabledReason{Text: self.c.Tr.UpstreamNotSetError} remoteDeleteItem.DisabledReason = &types.DisabledReason{Text: self.c.Tr.UpstreamNotSetError}
} }
@ -564,9 +566,9 @@ func (self *BranchesController) delete(branch *models.Branch) error {
return self.localAndRemoteDelete(branch) return self.localAndRemoteDelete(branch)
}, },
} }
if checkedOutBranch.Name == branch.Name { if isBranchCheckedOut {
deleteBothItem.DisabledReason = &types.DisabledReason{Text: self.c.Tr.CantDeleteCheckOutBranch} deleteBothItem.DisabledReason = &types.DisabledReason{Text: self.c.Tr.CantDeleteCheckOutBranch}
} else if !branch.IsTrackingRemote() || branch.UpstreamGone { } else if !hasUpstream {
deleteBothItem.DisabledReason = &types.DisabledReason{Text: self.c.Tr.UpstreamNotSetError} deleteBothItem.DisabledReason = &types.DisabledReason{Text: self.c.Tr.UpstreamNotSetError}
} }