Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit88b857c

Browse files
committed
simplify
1 parent659c7d1 commit88b857c

File tree

13 files changed

+45
-48
lines changed

13 files changed

+45
-48
lines changed

‎modules/git/commit_info_gogit.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
)
1717

1818
// GetCommitsInfo gets information of all commits that are corresponding to these entries
19-
func (tesEntries)GetCommitsInfo(ctx context.Context,commit*Commit,treePathstring) ([]CommitInfo,*Commit,error) {
19+
func (tesEntries)GetCommitsInfo(ctx context.Context,repoLinkstring,commit*Commit,treePathstring) ([]CommitInfo,*Commit,error) {
2020
entryPaths:=make([]string,len(tes)+1)
2121
// Get the commit for the treePath itself
2222
entryPaths[0]=""
@@ -85,7 +85,7 @@ func (tes Entries) GetCommitsInfo(ctx context.Context, commit *Commit, treePath
8585
}elseifsubModule!=nil {
8686
subModuleURL=subModule.URL
8787
}
88-
subModuleFile:=NewCommitSubmoduleFile(fullPath,subModuleURL,entry.ID.String())
88+
subModuleFile:=NewCommitSubmoduleFile(repoLink,fullPath,subModuleURL,entry.ID.String())
8989
commitsInfo[i].SubmoduleFile=subModuleFile
9090
}
9191
}

‎modules/git/commit_info_nogogit.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
)
1616

1717
// GetCommitsInfo gets information of all commits that are corresponding to these entries
18-
func (tesEntries)GetCommitsInfo(ctx context.Context,commit*Commit,treePathstring) ([]CommitInfo,*Commit,error) {
18+
func (tesEntries)GetCommitsInfo(ctx context.Context,repoLinkstring,commit*Commit,treePathstring) ([]CommitInfo,*Commit,error) {
1919
entryPaths:=make([]string,len(tes)+1)
2020
// Get the commit for the treePath itself
2121
entryPaths[0]=""
@@ -76,7 +76,7 @@ func (tes Entries) GetCommitsInfo(ctx context.Context, commit *Commit, treePath
7676
}elseifsubModule!=nil {
7777
subModuleURL=subModule.URL
7878
}
79-
subModuleFile:=NewCommitSubmoduleFile(fullPath,subModuleURL,entry.ID.String())
79+
subModuleFile:=NewCommitSubmoduleFile(repoLink,fullPath,subModuleURL,entry.ID.String())
8080
commitsInfo[i].SubmoduleFile=subModuleFile
8181
}
8282
}

‎modules/git/commit_info_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ func testGetCommitsInfo(t *testing.T, repo1 *Repository) {
8282
}
8383

8484
// FIXME: Context.TODO() - if graceful has started we should use its Shutdown context otherwise use install signals in TestMain.
85-
commitsInfo,treeCommit,err:=entries.GetCommitsInfo(t.Context(),commit,testCase.Path)
85+
commitsInfo,treeCommit,err:=entries.GetCommitsInfo(t.Context(),"/any/repo-link",commit,testCase.Path)
8686
assert.NoError(t,err,"Unable to get commit information for entries of subtree: %s in commit: %s from testcase due to error: %v",testCase.Path,testCase.CommitID,err)
8787
iferr!=nil {
8888
t.FailNow()
@@ -159,7 +159,7 @@ func BenchmarkEntries_GetCommitsInfo(b *testing.B) {
159159
b.ResetTimer()
160160
b.Run(benchmark.name,func(b*testing.B) {
161161
forb.Loop() {
162-
_,_,err:=entries.GetCommitsInfo(b.Context(),commit,"")
162+
_,_,err:=entries.GetCommitsInfo(b.Context(),"/any/repo-link",commit,"")
163163
iferr!=nil {
164164
b.Fatal(err)
165165
}

‎modules/git/commit_submodule_file.go‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414

1515
// CommitSubmoduleFile represents a file with submodule type.
1616
typeCommitSubmoduleFilestruct {
17+
repoLinkstring
1718
fullPathstring
1819
refURLstring
1920
refIDstring
@@ -23,20 +24,20 @@ type CommitSubmoduleFile struct {
2324
}
2425

2526
// NewCommitSubmoduleFile create a new submodule file
26-
funcNewCommitSubmoduleFile(fullPath,refURL,refIDstring)*CommitSubmoduleFile {
27-
return&CommitSubmoduleFile{fullPath:fullPath,refURL:refURL,refID:refID}
27+
funcNewCommitSubmoduleFile(repoLink,fullPath,refURL,refIDstring)*CommitSubmoduleFile {
28+
return&CommitSubmoduleFile{repoLink:repoLink,fullPath:fullPath,refURL:refURL,refID:refID}
2829
}
2930

3031
func (sf*CommitSubmoduleFile)RefID()string {
3132
returnsf.refID
3233
}
3334

34-
func (sf*CommitSubmoduleFile)getWebLinkInTargetRepo(ctx context.Context,currentRepoHomeLink,moreLinkPathstring)*SubmoduleWebLink {
35+
func (sf*CommitSubmoduleFile)getWebLinkInTargetRepo(ctx context.Context,moreLinkPathstring)*SubmoduleWebLink {
3536
ifsf==nil {
3637
returnnil
3738
}
3839
ifstrings.HasPrefix(sf.refURL,"../") {
39-
targetLink:=path.Join(currentRepoHomeLink,path.Dir(sf.fullPath),sf.refURL)
40+
targetLink:=path.Join(sf.repoLink,path.Dir(sf.fullPath),sf.refURL)
4041
return&SubmoduleWebLink{RepoWebLink:targetLink,CommitWebLink:targetLink+moreLinkPath}
4142
}
4243
if!sf.parsed {
@@ -51,11 +52,11 @@ func (sf *CommitSubmoduleFile) getWebLinkInTargetRepo(ctx context.Context, curre
5152
}
5253

5354
// SubmoduleWebLinkTree tries to make the submodule's tree link in its own repo, it also works on "nil" receiver
54-
func (sf*CommitSubmoduleFile)SubmoduleWebLinkTree(ctx context.Context,currentRepoHomeLink,refCommitIDstring)*SubmoduleWebLink {
55-
returnsf.getWebLinkInTargetRepo(ctx,currentRepoHomeLink,"/tree/"+refCommitID)
55+
func (sf*CommitSubmoduleFile)SubmoduleWebLinkTree(ctx context.Context,refCommitIDstring)*SubmoduleWebLink {
56+
returnsf.getWebLinkInTargetRepo(ctx,"/tree/"+refCommitID)
5657
}
5758

5859
// SubmoduleWebLinkCompare tries to make the submodule's compare link in its own repo, it also works on "nil" receiver
59-
func (sf*CommitSubmoduleFile)SubmoduleWebLinkCompare(ctx context.Context,currentRepoHomeLink,commitID1,commitID2string)*SubmoduleWebLink {
60-
returnsf.getWebLinkInTargetRepo(ctx,currentRepoHomeLink,"/compare/"+commitID1+"..."+commitID2)
60+
func (sf*CommitSubmoduleFile)SubmoduleWebLinkCompare(ctx context.Context,commitID1,commitID2string)*SubmoduleWebLink {
61+
returnsf.getWebLinkInTargetRepo(ctx,"/compare/"+commitID1+"..."+commitID2)
6162
}

‎modules/git/commit_submodule_file_test.go‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,30 +10,28 @@ import (
1010
)
1111

1212
funcTestCommitSubmoduleLink(t*testing.T) {
13-
assert.Nil(t, (*CommitSubmoduleFile)(nil).SubmoduleWebLinkTree(t.Context(),"",""))
14-
assert.Nil(t, (*CommitSubmoduleFile)(nil).SubmoduleWebLinkCompare(t.Context(),"","",""))
13+
assert.Nil(t, (*CommitSubmoduleFile)(nil).SubmoduleWebLinkTree(t.Context(),""))
14+
assert.Nil(t, (*CommitSubmoduleFile)(nil).SubmoduleWebLinkCompare(t.Context(),"",""))
1515

1616
t.Run("GitHubRepo",func(t*testing.T) {
17-
curRepoLink:="/any/repo-home-link"
18-
sf:=NewCommitSubmoduleFile("full-path","git@github.com:user/repo.git","aaaa")
19-
wl:=sf.SubmoduleWebLinkTree(t.Context(),curRepoLink,sf.RefID())
17+
sf:=NewCommitSubmoduleFile("/any/repo-link","full-path","git@github.com:user/repo.git","aaaa")
18+
wl:=sf.SubmoduleWebLinkTree(t.Context(),sf.RefID())
2019
assert.Equal(t,"https://github.com/user/repo",wl.RepoWebLink)
2120
assert.Equal(t,"https://github.com/user/repo/tree/aaaa",wl.CommitWebLink)
2221

23-
wl=sf.SubmoduleWebLinkCompare(t.Context(),curRepoLink,"1111","2222")
22+
wl=sf.SubmoduleWebLinkCompare(t.Context(),"1111","2222")
2423
assert.Equal(t,"https://github.com/user/repo",wl.RepoWebLink)
2524
assert.Equal(t,"https://github.com/user/repo/compare/1111...2222",wl.CommitWebLink)
2625
})
2726

2827
t.Run("RelativePath",func(t*testing.T) {
29-
curRepoLink:="/subpath/any/repo-home-link"
30-
sf:=NewCommitSubmoduleFile("full-path","../../user/repo","aaaa")
31-
wl:=sf.SubmoduleWebLinkTree(t.Context(),curRepoLink,sf.RefID())
28+
sf:=NewCommitSubmoduleFile("/subpath/any/repo-home-link","full-path","../../user/repo","aaaa")
29+
wl:=sf.SubmoduleWebLinkTree(t.Context(),sf.RefID())
3230
assert.Equal(t,"/subpath/user/repo",wl.RepoWebLink)
3331
assert.Equal(t,"/subpath/user/repo/tree/aaaa",wl.CommitWebLink)
3432

35-
sf=NewCommitSubmoduleFile("dir/submodule","../../../user/repo","aaaa")
36-
wl=sf.SubmoduleWebLinkCompare(t.Context(),curRepoLink,"1111","2222")
33+
sf=NewCommitSubmoduleFile("/subpath/any/repo-home-link","dir/submodule","../../../user/repo","aaaa")
34+
wl=sf.SubmoduleWebLinkCompare(t.Context(),"1111","2222")
3735
assert.Equal(t,"/subpath/user/repo",wl.RepoWebLink)
3836
assert.Equal(t,"/subpath/user/repo/compare/1111...2222",wl.CommitWebLink)
3937
})

‎routers/web/repo/view.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ func renderDirectoryFiles(ctx *context.Context, timeout time.Duration) git.Entri
305305
defercancel()
306306
}
307307

308-
files,latestCommit,err:=allEntries.GetCommitsInfo(commitInfoCtx,ctx.Repo.Commit,ctx.Repo.TreePath)
308+
files,latestCommit,err:=allEntries.GetCommitsInfo(commitInfoCtx,ctx.Repo.RepoLink,ctx.Repo.Commit,ctx.Repo.TreePath)
309309
iferr!=nil {
310310
ctx.ServerError("GetCommitsInfo",err)
311311
returnnil

‎routers/web/repo/wiki.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ package repo
66

77
import (
88
"bytes"
9-
gocontext"context"
109
"html/template"
1110
"io"
1211
"net/http"
@@ -569,7 +568,7 @@ func WikiPages(ctx *context.Context) {
569568
}
570569
allEntries.CustomSort(base.NaturalSortLess)
571570

572-
entries,_,err:=allEntries.GetCommitsInfo(gocontext.Context(ctx),commit,treePath)
571+
entries,_,err:=allEntries.GetCommitsInfo(ctx,ctx.Repo.RepoLink,commit,treePath)
573572
iferr!=nil {
574573
ctx.ServerError("GetCommitsInfo",err)
575574
return

‎services/gitdiff/gitdiff.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1185,7 +1185,7 @@ func GetDiffForAPI(ctx context.Context, gitRepo *git.Repository, opts *DiffOptio
11851185
returndiff,err
11861186
}
11871187

1188-
funcGetDiffForRender(ctx context.Context,repoHomeLinkstring,gitRepo*git.Repository,opts*DiffOptions,files...string) (*Diff,error) {
1188+
funcGetDiffForRender(ctx context.Context,repoLinkstring,gitRepo*git.Repository,opts*DiffOptions,files...string) (*Diff,error) {
11891189
diff,beforeCommit,afterCommit,err:=getDiffBasic(ctx,gitRepo,opts,files...)
11901190
iferr!=nil {
11911191
returnnil,err
@@ -1211,7 +1211,7 @@ func GetDiffForRender(ctx context.Context, repoHomeLink string, gitRepo *git.Rep
12111211

12121212
// Populate Submodule URLs
12131213
ifdiffFile.SubmoduleDiffInfo!=nil {
1214-
diffFile.SubmoduleDiffInfo.PopulateURL(repoHomeLink,diffFile,beforeCommit,afterCommit)
1214+
diffFile.SubmoduleDiffInfo.PopulateURL(repoLink,diffFile,beforeCommit,afterCommit)
12151215
}
12161216

12171217
if!isVendored.Has() {

‎services/gitdiff/submodule.go‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,14 @@ import (
1414
)
1515

1616
typeSubmoduleDiffInfostruct {
17-
RepoHomeLinkstring
1817
SubmoduleNamestring
1918
SubmoduleFile*git.CommitSubmoduleFile// it might be nil if the submodule is not found or unable to parse
2019
NewRefIDstring
2120
PreviousRefIDstring
2221
}
2322

24-
func (si*SubmoduleDiffInfo)PopulateURL(repoHomeLinkstring,diffFile*DiffFile,leftCommit,rightCommit*git.Commit) {
25-
si.RepoHomeLink,si.SubmoduleName=repoHomeLink,diffFile.Name
23+
func (si*SubmoduleDiffInfo)PopulateURL(repoLinkstring,diffFile*DiffFile,leftCommit,rightCommit*git.Commit) {
24+
si.SubmoduleName=diffFile.Name
2625
submoduleCommit:=rightCommit// If the submodule is added or updated, check at the right commit
2726
ifdiffFile.IsDeleted {
2827
submoduleCommit=leftCommit// If the submodule is deleted, check at the left commit
@@ -38,28 +37,28 @@ func (si *SubmoduleDiffInfo) PopulateURL(repoHomeLink string, diffFile *DiffFile
3837
return// ignore the error, do not cause 500 errors for end users
3938
}
4039
ifsubmodule!=nil {
41-
si.SubmoduleFile=git.NewCommitSubmoduleFile(submoduleFullPath,submodule.URL,submoduleCommit.ID.String())
40+
si.SubmoduleFile=git.NewCommitSubmoduleFile(repoLink,submoduleFullPath,submodule.URL,submoduleCommit.ID.String())
4241
}
4342
}
4443

4544
func (si*SubmoduleDiffInfo)CommitRefIDLinkHTML(ctx context.Context,commitIDstring) template.HTML {
46-
webLink:=si.SubmoduleFile.SubmoduleWebLinkTree(ctx,si.RepoHomeLink,commitID)
45+
webLink:=si.SubmoduleFile.SubmoduleWebLinkTree(ctx,commitID)
4746
ifwebLink==nil {
4847
returnhtmlutil.HTMLFormat("%s",base.ShortSha(commitID))
4948
}
5049
returnhtmlutil.HTMLFormat(`<a href="%s">%s</a>`,webLink.CommitWebLink,base.ShortSha(commitID))
5150
}
5251

5352
func (si*SubmoduleDiffInfo)CompareRefIDLinkHTML(ctx context.Context) template.HTML {
54-
webLink:=si.SubmoduleFile.SubmoduleWebLinkCompare(ctx,si.RepoHomeLink,si.PreviousRefID,si.NewRefID)
53+
webLink:=si.SubmoduleFile.SubmoduleWebLinkCompare(ctx,si.PreviousRefID,si.NewRefID)
5554
ifwebLink==nil {
5655
returnhtmlutil.HTMLFormat("%s...%s",base.ShortSha(si.PreviousRefID),base.ShortSha(si.NewRefID))
5756
}
5857
returnhtmlutil.HTMLFormat(`<a href="%s">%s...%s</a>`,webLink.CommitWebLink,base.ShortSha(si.PreviousRefID),base.ShortSha(si.NewRefID))
5958
}
6059

6160
func (si*SubmoduleDiffInfo)SubmoduleRepoLinkHTML(ctx context.Context) template.HTML {
62-
webLink:=si.SubmoduleFile.SubmoduleWebLinkTree(ctx,si.RepoHomeLink,si.SubmoduleFile.RefID())
61+
webLink:=si.SubmoduleFile.SubmoduleWebLinkTree(ctx,si.SubmoduleFile.RefID())
6362
ifwebLink==nil {
6463
returnhtmlutil.HTMLFormat("%s",si.SubmoduleName)
6564
}

‎services/gitdiff/submodule_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ func TestSubmoduleInfo(t *testing.T) {
227227
assert.EqualValues(t,"aaaa...bbbb",sdi.CompareRefIDLinkHTML(ctx))
228228
assert.EqualValues(t,"name",sdi.SubmoduleRepoLinkHTML(ctx))
229229

230-
sdi.SubmoduleFile=git.NewCommitSubmoduleFile("fullpath","https://github.com/owner/repo","1234")
230+
sdi.SubmoduleFile=git.NewCommitSubmoduleFile("/any/repo-link","fullpath","https://github.com/owner/repo","1234")
231231
assert.EqualValues(t,`<a href="https://github.com/owner/repo/tree/1111">1111</a>`,sdi.CommitRefIDLinkHTML(ctx,"1111"))
232232
assert.EqualValues(t,`<a href="https://github.com/owner/repo/compare/aaaa...bbbb">aaaa...bbbb</a>`,sdi.CompareRefIDLinkHTML(ctx))
233233
assert.EqualValues(t,`<a href="https://github.com/owner/repo">name</a>`,sdi.SubmoduleRepoLinkHTML(ctx))

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp