summaryrefslogtreecommitdiffstats
path: root/pkg/gui/context
diff options
context:
space:
mode:
Diffstat (limited to 'pkg/gui/context')
-rw-r--r--pkg/gui/context/branches_context.go19
-rw-r--r--pkg/gui/context/local_commits_context.go20
-rw-r--r--pkg/gui/context/reflog_commits_context.go20
-rw-r--r--pkg/gui/context/remote_branches_context.go19
-rw-r--r--pkg/gui/context/stash_context.go20
-rw-r--r--pkg/gui/context/sub_commits_context.go22
-rw-r--r--pkg/gui/context/tags_context.go19
7 files changed, 14 insertions, 125 deletions
diff --git a/pkg/gui/context/branches_context.go b/pkg/gui/context/branches_context.go
index 302f0c1d9..e64a83137 100644
--- a/pkg/gui/context/branches_context.go
+++ b/pkg/gui/context/branches_context.go
@@ -57,21 +57,6 @@ func (self *BranchesContext) GetSelectedItemId() string {
return item.ID()
}
-func (self *BranchesContext) GetSelectedRefName() string {
- item := self.GetSelected()
- if item == nil {
- return ""
- }
-
- return item.RefName()
-}
-
-func (self *BranchesContext) GetSelectedDescription() string {
- item := self.GetSelected()
-
- if item == nil {
- return ""
- }
-
- return item.Description()
+func (self *BranchesContext) GetSelectedRef() types.Ref {
+ return self.GetSelected()
}
diff --git a/pkg/gui/context/local_commits_context.go b/pkg/gui/context/local_commits_context.go
index 0d7cc2f54..c5fcc769a 100644
--- a/pkg/gui/context/local_commits_context.go
+++ b/pkg/gui/context/local_commits_context.go
@@ -83,24 +83,8 @@ func (self *LocalCommitsContext) CanRebase() bool {
return true
}
-func (self *LocalCommitsContext) GetSelectedRefName() string {
- item := self.GetSelected()
-
- if item == nil {
- return ""
- }
-
- return item.RefName()
-}
-
-func (self *LocalCommitsViewModel) GetSelectedDescription() string {
- item := self.GetSelected()
-
- if item == nil {
- return ""
- }
-
- return item.Description()
+func (self *LocalCommitsContext) GetSelectedRef() types.Ref {
+ return self.GetSelected()
}
func (self *LocalCommitsViewModel) SetLimitCommits(value bool) {
diff --git a/pkg/gui/context/reflog_commits_context.go b/pkg/gui/context/reflog_commits_context.go
index 0274a921e..33c162aaf 100644
--- a/pkg/gui/context/reflog_commits_context.go
+++ b/pkg/gui/context/reflog_commits_context.go
@@ -61,26 +61,10 @@ func (self *ReflogCommitsContext) CanRebase() bool {
return false
}
-func (self *ReflogCommitsContext) GetSelectedRefName() string {
- item := self.GetSelected()
-
- if item == nil {
- return ""
- }
-
- return item.RefName()
+func (self *ReflogCommitsContext) GetSelectedRef() types.Ref {
+ return self.GetSelected()
}
func (self *ReflogCommitsContext) GetCommits() []*models.Commit {
return self.getModel()
}
-
-func (self *ReflogCommitsContext) GetSelectedDescription() string {
- item := self.GetSelected()
-
- if item == nil {
- return ""
- }
-
- return item.Description()
-}
diff --git a/pkg/gui/context/remote_branches_context.go b/pkg/gui/context/remote_branches_context.go
index 52217ef11..affcedf97 100644
--- a/pkg/gui/context/remote_branches_context.go
+++ b/pkg/gui/context/remote_branches_context.go
@@ -60,21 +60,6 @@ func (self *RemoteBranchesContext) GetSelectedItemId() string {
return item.ID()
}
-func (self *RemoteBranchesContext) GetSelectedRefName() string {
- item := self.GetSelected()
- if item == nil {
- return ""
- }
-
- return item.RefName()
-}
-
-func (self *RemoteBranchesContext) GetSelectedDescription() string {
- item := self.GetSelected()
-
- if item == nil {
- return ""
- }
-
- return item.Description()
+func (self *RemoteBranchesContext) GetSelectedRef() types.Ref {
+ return self.GetSelected()
}
diff --git a/pkg/gui/context/stash_context.go b/pkg/gui/context/stash_context.go
index ef443846f..53d854669 100644
--- a/pkg/gui/context/stash_context.go
+++ b/pkg/gui/context/stash_context.go
@@ -61,22 +61,6 @@ func (self *StashContext) CanRebase() bool {
return false
}
-func (self *StashContext) GetSelectedRefName() string {
- item := self.GetSelected()
-
- if item == nil {
- return ""
- }
-
- return item.RefName()
-}
-
-func (self *StashContext) GetSelectedDescription() string {
- item := self.GetSelected()
-
- if item == nil {
- return ""
- }
-
- return item.Description()
+func (self *StashContext) GetSelectedRef() types.Ref {
+ return self.GetSelected()
}
diff --git a/pkg/gui/context/sub_commits_context.go b/pkg/gui/context/sub_commits_context.go
index ffc053267..d9a1e7c6b 100644
--- a/pkg/gui/context/sub_commits_context.go
+++ b/pkg/gui/context/sub_commits_context.go
@@ -82,16 +82,8 @@ func (self *SubCommitsContext) CanRebase() bool {
return false
}
-// not to be confused with the refName in the view model. This is the ref name of
-// the selected commit
-func (self *SubCommitsContext) GetSelectedRefName() string {
- item := self.GetSelected()
-
- if item == nil {
- return ""
- }
-
- return item.RefName()
+func (self *SubCommitsContext) GetSelectedRef() types.Ref {
+ return self.GetSelected()
}
func (self *SubCommitsContext) GetCommits() []*models.Commit {
@@ -101,13 +93,3 @@ func (self *SubCommitsContext) GetCommits() []*models.Commit {
func (self *SubCommitsContext) Title() string {
return fmt.Sprintf(self.c.Tr.SubCommitsDynamicTitle, utils.TruncateWithEllipsis(self.refName, 50))
}
-
-func (self *SubCommitsContext) GetSelectedDescription() string {
- item := self.GetSelected()
-
- if item == nil {
- return ""
- }
-
- return item.Description()
-}
diff --git a/pkg/gui/context/tags_context.go b/pkg/gui/context/tags_context.go
index d6f8d78ac..09285aa76 100644
--- a/pkg/gui/context/tags_context.go
+++ b/pkg/gui/context/tags_context.go
@@ -57,21 +57,6 @@ func (self *TagsContext) GetSelectedItemId() string {
return item.ID()
}
-func (self *TagsContext) GetSelectedRefName() string {
- item := self.GetSelected()
- if item == nil {
- return ""
- }
-
- return item.RefName()
-}
-
-func (self *TagsContext) GetSelectedDescription() string {
- item := self.GetSelected()
-
- if item == nil {
- return ""
- }
-
- return item.Description()
+func (self *TagsContext) GetSelectedRef() types.Ref {
+ return self.GetSelected()
}