Skip to content

Commit 4b9921d

Browse files
committed
Move the Ref interface from gui/types to models
This is a type that can be useful for model/backend stuff, so move it there. We are going to use it in the API of the commit loader.
1 parent cc0b5a2 commit 4b9921d

15 files changed

+35
-30
lines changed
Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package types
1+
package models
22

33
type Ref interface {
44
FullRefName() string
@@ -7,8 +7,3 @@ type Ref interface {
77
ParentRefName() string
88
Description() string
99
}
10-
11-
type RefRange struct {
12-
From Ref
13-
To Ref
14-
}

pkg/gui/context/branches_context.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func NewBranchesContext(c *ContextCommon) *BranchesContext {
5959
return self
6060
}
6161

62-
func (self *BranchesContext) GetSelectedRef() types.Ref {
62+
func (self *BranchesContext) GetSelectedRef() models.Ref {
6363
branch := self.GetSelected()
6464
if branch == nil {
6565
return nil

pkg/gui/context/commit_files_context.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ func (self *CommitFilesContext) ModelSearchResults(searchStr string, caseSensiti
9696
return nil
9797
}
9898

99-
func (self *CommitFilesContext) ReInit(ref types.Ref, refRange *types.RefRange) {
99+
func (self *CommitFilesContext) ReInit(ref models.Ref, refRange *types.RefRange) {
100100
self.SetRef(ref)
101101
self.SetRefRange(refRange)
102102
if refRange != nil {

pkg/gui/context/local_commits_context.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ func (self *LocalCommitsContext) CanRebase() bool {
164164
return true
165165
}
166166

167-
func (self *LocalCommitsContext) GetSelectedRef() types.Ref {
167+
func (self *LocalCommitsContext) GetSelectedRef() models.Ref {
168168
commit := self.GetSelected()
169169
if commit == nil {
170170
return nil

pkg/gui/context/reflog_commits_context.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func (self *ReflogCommitsContext) CanRebase() bool {
6363
return false
6464
}
6565

66-
func (self *ReflogCommitsContext) GetSelectedRef() types.Ref {
66+
func (self *ReflogCommitsContext) GetSelectedRef() models.Ref {
6767
commit := self.GetSelected()
6868
if commit == nil {
6969
return nil

pkg/gui/context/remote_branches_context.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,18 @@ func NewRemoteBranchesContext(
5454
}
5555
}
5656

57-
func (self *RemoteBranchesContext) GetSelectedRef() types.Ref {
57+
func (self *RemoteBranchesContext) GetSelectedRef() models.Ref {
5858
remoteBranch := self.GetSelected()
5959
if remoteBranch == nil {
6060
return nil
6161
}
6262
return remoteBranch
6363
}
6464

65-
func (self *RemoteBranchesContext) GetSelectedRefs() ([]types.Ref, int, int) {
65+
func (self *RemoteBranchesContext) GetSelectedRefs() ([]models.Ref, int, int) {
6666
items, startIdx, endIdx := self.GetSelectedItems()
6767

68-
refs := lo.Map(items, func(item *models.RemoteBranch, _ int) types.Ref {
68+
refs := lo.Map(items, func(item *models.RemoteBranch, _ int) models.Ref {
6969
return item
7070
})
7171

pkg/gui/context/stash_context.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func (self *StashContext) CanRebase() bool {
5353
return false
5454
}
5555

56-
func (self *StashContext) GetSelectedRef() types.Ref {
56+
func (self *StashContext) GetSelectedRef() models.Ref {
5757
stash := self.GetSelected()
5858
if stash == nil {
5959
return nil

pkg/gui/context/sub_commits_context.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,19 +141,19 @@ func NewSubCommitsContext(
141141

142142
type SubCommitsViewModel struct {
143143
// name of the ref that the sub-commits are shown for
144-
ref types.Ref
144+
ref models.Ref
145145
refToShowDivergenceFrom string
146146
*ListViewModel[*models.Commit]
147147

148148
limitCommits bool
149149
showBranchHeads bool
150150
}
151151

152-
func (self *SubCommitsViewModel) SetRef(ref types.Ref) {
152+
func (self *SubCommitsViewModel) SetRef(ref models.Ref) {
153153
self.ref = ref
154154
}
155155

156-
func (self *SubCommitsViewModel) GetRef() types.Ref {
156+
func (self *SubCommitsViewModel) GetRef() models.Ref {
157157
return self.ref
158158
}
159159

@@ -177,7 +177,7 @@ func (self *SubCommitsContext) CanRebase() bool {
177177
return false
178178
}
179179

180-
func (self *SubCommitsContext) GetSelectedRef() types.Ref {
180+
func (self *SubCommitsContext) GetSelectedRef() models.Ref {
181181
commit := self.GetSelected()
182182
if commit == nil {
183183
return nil

pkg/gui/context/tags_context.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ func NewTagsContext(
5252
}
5353
}
5454

55-
func (self *TagsContext) GetSelectedRef() types.Ref {
55+
func (self *TagsContext) GetSelectedRef() models.Ref {
5656
tag := self.GetSelected()
5757
if tag == nil {
5858
return nil

pkg/gui/controllers/helpers/diff_helper.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ func (self *DiffHelper) IgnoringWhitespaceSubTitle() string {
174174
return ""
175175
}
176176

177-
func (self *DiffHelper) OpenDiffToolForRef(selectedRef types.Ref) error {
177+
func (self *DiffHelper) OpenDiffToolForRef(selectedRef models.Ref) error {
178178
to := selectedRef.RefName()
179179
from, reverse := self.c.Modes().Diffing.GetFromAndReverseArgsForDiff("")
180180
_, err := self.c.RunSubprocess(self.c.Git().Diff.OpenDiffToolCmdObj(

0 commit comments

Comments
 (0)