simplify

wxiaoguang · wxiaoguang · commit 67ffb1a50c49 · 2025-07-12T10:48:12.000+08:00
diff --git a/modules/git/commit_info_gogit.go b/modules/git/commit_info_gogit.go
@@ -16,7 +16,7 @@ import (
 )
 
 // GetCommitsInfo gets information of all commits that are corresponding to these entries
-func (tes Entries) GetCommitsInfo(ctx context.Context, commit *Commit, treePath string) ([]CommitInfo, *Commit, error) {
+func (tes Entries) GetCommitsInfo(ctx context.Context, repoLink string, commit *Commit, treePath string) ([]CommitInfo, *Commit, error) {
 	entryPaths := make([]string, len(tes)+1)
 	// Get the commit for the treePath itself
 	entryPaths[0] = ""
diff --git a/modules/git/commit_info_nogogit.go b/modules/git/commit_info_nogogit.go
@@ -15,7 +15,7 @@ import (
 )
 
 // GetCommitsInfo gets information of all commits that are corresponding to these entries
-func (tes Entries) GetCommitsInfo(ctx context.Context, commit *Commit, treePath string) ([]CommitInfo, *Commit, error) {
+func (tes Entries) GetCommitsInfo(ctx context.Context, repoLink string, commit *Commit, treePath string) ([]CommitInfo, *Commit, error) {
 	entryPaths := make([]string, len(tes)+1)
 	// Get the commit for the treePath itself
 	entryPaths[0] = ""
@@ -76,7 +76,7 @@ func (tes Entries) GetCommitsInfo(ctx context.Context, commit *Commit, treePath
 			} else if subModule != nil {
 				subModuleURL = subModule.URL
 			}
-			subModuleFile := NewCommitSubmoduleFile(fullPath, subModuleURL, entry.ID.String())
+			subModuleFile := NewCommitSubmoduleFile(repoLink, fullPath, subModuleURL, entry.ID.String())
 			commitsInfo[i].SubmoduleFile = subModuleFile
 		}
 	}
diff --git a/modules/git/commit_info_test.go b/modules/git/commit_info_test.go
@@ -82,7 +82,7 @@ func testGetCommitsInfo(t *testing.T, repo1 *Repository) {
 		}
 
 		// FIXME: Context.TODO() - if graceful has started we should use its Shutdown context otherwise use install signals in TestMain.
-		commitsInfo, treeCommit, err := entries.GetCommitsInfo(t.Context(), commit, testCase.Path)
+		commitsInfo, treeCommit, err := entries.GetCommitsInfo(t.Context(), "/any/repo-link", commit, testCase.Path)
 		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)
 		if err != nil {
 			t.FailNow()
@@ -159,7 +159,7 @@ func BenchmarkEntries_GetCommitsInfo(b *testing.B) {
 		b.ResetTimer()
 		b.Run(benchmark.name, func(b *testing.B) {
 			for b.Loop() {
-				_, _, err := entries.GetCommitsInfo(b.Context(), commit, "")
+				_, _, err := entries.GetCommitsInfo(b.Context(), "/any/repo-link", commit, "")
 				if err != nil {
 					b.Fatal(err)
 				}
diff --git a/modules/git/commit_submodule_file.go b/modules/git/commit_submodule_file.go
@@ -14,6 +14,7 @@ import (
 
 // CommitSubmoduleFile represents a file with submodule type.
 type CommitSubmoduleFile struct {
+	repoLink string
 	fullPath string
 	refURL   string
 	refID    string
@@ -23,20 +24,20 @@ type CommitSubmoduleFile struct {
 }
 
 // NewCommitSubmoduleFile create a new submodule file
-func NewCommitSubmoduleFile(fullPath, refURL, refID string) *CommitSubmoduleFile {
-	return &CommitSubmoduleFile{fullPath: fullPath, refURL: refURL, refID: refID}
+func NewCommitSubmoduleFile(repoLink, fullPath, refURL, refID string) *CommitSubmoduleFile {
+	return &CommitSubmoduleFile{repoLink: repoLink, fullPath: fullPath, refURL: refURL, refID: refID}
 }
 
 func (sf *CommitSubmoduleFile) RefID() string {
 	return sf.refID
 }
 
-func (sf *CommitSubmoduleFile) getWebLinkInTargetRepo(ctx context.Context, currentRepoHomeLink, moreLinkPath string) *SubmoduleWebLink {
+func (sf *CommitSubmoduleFile) getWebLinkInTargetRepo(ctx context.Context, moreLinkPath string) *SubmoduleWebLink {
 	if sf == nil {
 		return nil
 	}
 	if strings.HasPrefix(sf.refURL, "../") {
-		targetLink := path.Join(currentRepoHomeLink, path.Dir(sf.fullPath), sf.refURL)
+		targetLink := path.Join(sf.repoLink, path.Dir(sf.fullPath), sf.refURL)
 		return &SubmoduleWebLink{RepoWebLink: targetLink, CommitWebLink: targetLink + moreLinkPath}
 	}
 	if !sf.parsed {
@@ -51,11 +52,11 @@ func (sf *CommitSubmoduleFile) getWebLinkInTargetRepo(ctx context.Context, curre
 }
 
 // SubmoduleWebLinkTree tries to make the submodule's tree link in its own repo, it also works on "nil" receiver
-func (sf *CommitSubmoduleFile) SubmoduleWebLinkTree(ctx context.Context, currentRepoHomeLink, refCommitID string) *SubmoduleWebLink {
-	return sf.getWebLinkInTargetRepo(ctx, currentRepoHomeLink, "/tree/"+refCommitID)
+func (sf *CommitSubmoduleFile) SubmoduleWebLinkTree(ctx context.Context, refCommitID string) *SubmoduleWebLink {
+	return sf.getWebLinkInTargetRepo(ctx, "/tree/"+refCommitID)
 }
 
 // SubmoduleWebLinkCompare tries to make the submodule's compare link in its own repo, it also works on "nil" receiver
-func (sf *CommitSubmoduleFile) SubmoduleWebLinkCompare(ctx context.Context, currentRepoHomeLink, commitID1, commitID2 string) *SubmoduleWebLink {
-	return sf.getWebLinkInTargetRepo(ctx, currentRepoHomeLink, "/compare/"+commitID1+"..."+commitID2)
+func (sf *CommitSubmoduleFile) SubmoduleWebLinkCompare(ctx context.Context, commitID1, commitID2 string) *SubmoduleWebLink {
+	return sf.getWebLinkInTargetRepo(ctx, "/compare/"+commitID1+"..."+commitID2)
 }
diff --git a/modules/git/commit_submodule_file_test.go b/modules/git/commit_submodule_file_test.go
@@ -10,30 +10,28 @@ import (
 )
 
 func TestCommitSubmoduleLink(t *testing.T) {
-	assert.Nil(t, (*CommitSubmoduleFile)(nil).SubmoduleWebLinkTree(t.Context(), "", ""))
-	assert.Nil(t, (*CommitSubmoduleFile)(nil).SubmoduleWebLinkCompare(t.Context(), "", "", ""))
+	assert.Nil(t, (*CommitSubmoduleFile)(nil).SubmoduleWebLinkTree(t.Context(), ""))
+	assert.Nil(t, (*CommitSubmoduleFile)(nil).SubmoduleWebLinkCompare(t.Context(), "", ""))
 
 	t.Run("GitHubRepo", func(t *testing.T) {
-		curRepoLink := "/any/repo-home-link"
-		sf := NewCommitSubmoduleFile("full-path", "git@github.com:user/repo.git", "aaaa")
-		wl := sf.SubmoduleWebLinkTree(t.Context(), curRepoLink, sf.RefID())
+		sf := NewCommitSubmoduleFile("/any/repo-ink", "full-path", "git@github.com:user/repo.git", "aaaa")
+		wl := sf.SubmoduleWebLinkTree(t.Context(), sf.RefID())
 		assert.Equal(t, "https://github.com/user/repo", wl.RepoWebLink)
 		assert.Equal(t, "https://github.com/user/repo/tree/aaaa", wl.CommitWebLink)
 
-		wl = sf.SubmoduleWebLinkCompare(t.Context(), curRepoLink, "1111", "2222")
+		wl = sf.SubmoduleWebLinkCompare(t.Context(), "1111", "2222")
 		assert.Equal(t, "https://github.com/user/repo", wl.RepoWebLink)
 		assert.Equal(t, "https://github.com/user/repo/compare/1111...2222", wl.CommitWebLink)
 	})
 
 	t.Run("RelativePath", func(t *testing.T) {
-		curRepoLink := "/subpath/any/repo-home-link"
-		sf := NewCommitSubmoduleFile("full-path", "../../user/repo", "aaaa")
-		wl := sf.SubmoduleWebLinkTree(t.Context(), curRepoLink, sf.RefID())
+		sf := NewCommitSubmoduleFile("/subpath/any/repo-home-link", "full-path", "../../user/repo", "aaaa")
+		wl := sf.SubmoduleWebLinkTree(t.Context(), sf.RefID())
 		assert.Equal(t, "/subpath/user/repo", wl.RepoWebLink)
 		assert.Equal(t, "/subpath/user/repo/tree/aaaa", wl.CommitWebLink)
 
-		sf = NewCommitSubmoduleFile("dir/submodule", "../../../user/repo", "aaaa")
-		wl = sf.SubmoduleWebLinkCompare(t.Context(), curRepoLink, "1111", "2222")
+		sf = NewCommitSubmoduleFile("/subpath/any/repo-home-link", "dir/submodule", "../../../user/repo", "aaaa")
+		wl = sf.SubmoduleWebLinkCompare(t.Context(), "1111", "2222")
 		assert.Equal(t, "/subpath/user/repo", wl.RepoWebLink)
 		assert.Equal(t, "/subpath/user/repo/compare/1111...2222", wl.CommitWebLink)
 	})
diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go
@@ -305,7 +305,7 @@ func renderDirectoryFiles(ctx *context.Context, timeout time.Duration) git.Entri
 		defer cancel()
 	}
 
-	files, latestCommit, err := allEntries.GetCommitsInfo(commitInfoCtx, ctx.Repo.Commit, ctx.Repo.TreePath)
+	files, latestCommit, err := allEntries.GetCommitsInfo(commitInfoCtx, ctx.Repo.RepoLink, ctx.Repo.Commit, ctx.Repo.TreePath)
 	if err != nil {
 		ctx.ServerError("GetCommitsInfo", err)
 		return nil
diff --git a/routers/web/repo/wiki.go b/routers/web/repo/wiki.go
@@ -6,7 +6,6 @@ package repo
 
 import (
 	"bytes"
-	gocontext "context"
 	"html/template"
 	"io"
 	"net/http"
@@ -569,7 +568,7 @@ func WikiPages(ctx *context.Context) {
 	}
 	allEntries.CustomSort(base.NaturalSortLess)
 
-	entries, _, err := allEntries.GetCommitsInfo(gocontext.Context(ctx), commit, treePath)
+	entries, _, err := allEntries.GetCommitsInfo(ctx, ctx.Repo.RepoLink, commit, treePath)
 	if err != nil {
 		ctx.ServerError("GetCommitsInfo", err)
 		return
diff --git a/services/gitdiff/submodule.go b/services/gitdiff/submodule.go
@@ -14,15 +14,14 @@ import (
 )
 
 type SubmoduleDiffInfo struct {
-	RepoHomeLink  string
 	SubmoduleName string
 	SubmoduleFile *git.CommitSubmoduleFile // it might be nil if the submodule is not found or unable to parse
 	NewRefID      string
 	PreviousRefID string
 }
 
-func (si *SubmoduleDiffInfo) PopulateURL(repoHomeLink string, diffFile *DiffFile, leftCommit, rightCommit *git.Commit) {
-	si.RepoHomeLink, si.SubmoduleName = repoHomeLink, diffFile.Name
+func (si *SubmoduleDiffInfo) PopulateURL(repoLink string, diffFile *DiffFile, leftCommit, rightCommit *git.Commit) {
+	si.SubmoduleName = diffFile.Name
 	submoduleCommit := rightCommit // If the submodule is added or updated, check at the right commit
 	if diffFile.IsDeleted {
 		submoduleCommit = leftCommit // If the submodule is deleted, check at the left commit
@@ -38,28 +37,28 @@ func (si *SubmoduleDiffInfo) PopulateURL(repoHomeLink string, diffFile *DiffFile
 		return // ignore the error, do not cause 500 errors for end users
 	}
 	if submodule != nil {
-		si.SubmoduleFile = git.NewCommitSubmoduleFile(submoduleFullPath, submodule.URL, submoduleCommit.ID.String())
+		si.SubmoduleFile = git.NewCommitSubmoduleFile(repoLink, submoduleFullPath, submodule.URL, submoduleCommit.ID.String())
 	}
 }
 
 func (si *SubmoduleDiffInfo) CommitRefIDLinkHTML(ctx context.Context, commitID string) template.HTML {
-	webLink := si.SubmoduleFile.SubmoduleWebLinkTree(ctx, si.RepoHomeLink, commitID)
+	webLink := si.SubmoduleFile.SubmoduleWebLinkTree(ctx, commitID)
 	if webLink == nil {
 		return htmlutil.HTMLFormat("%s", base.ShortSha(commitID))
 	}
 	return htmlutil.HTMLFormat(`<a href="%s">%s</a>`, webLink.CommitWebLink, base.ShortSha(commitID))
 }
 
 func (si *SubmoduleDiffInfo) CompareRefIDLinkHTML(ctx context.Context) template.HTML {
-	webLink := si.SubmoduleFile.SubmoduleWebLinkCompare(ctx, si.RepoHomeLink, si.PreviousRefID, si.NewRefID)
+	webLink := si.SubmoduleFile.SubmoduleWebLinkCompare(ctx, si.PreviousRefID, si.NewRefID)
 	if webLink == nil {
 		return htmlutil.HTMLFormat("%s...%s", base.ShortSha(si.PreviousRefID), base.ShortSha(si.NewRefID))
 	}
 	return htmlutil.HTMLFormat(`<a href="%s">%s...%s</a>`, webLink.CommitWebLink, base.ShortSha(si.PreviousRefID), base.ShortSha(si.NewRefID))
 }
 
 func (si *SubmoduleDiffInfo) SubmoduleRepoLinkHTML(ctx context.Context) template.HTML {
-	webLink := si.SubmoduleFile.SubmoduleWebLinkTree(ctx, si.RepoHomeLink, si.SubmoduleFile.RefID())
+	webLink := si.SubmoduleFile.SubmoduleWebLinkTree(ctx, si.SubmoduleFile.RefID())
 	if webLink == nil {
 		return htmlutil.HTMLFormat("%s", si.SubmoduleName)
 	}
diff --git a/services/gitdiff/submodule_test.go b/services/gitdiff/submodule_test.go
@@ -227,7 +227,7 @@ func TestSubmoduleInfo(t *testing.T) {
 	assert.EqualValues(t, "aaaa...bbbb", sdi.CompareRefIDLinkHTML(ctx))
 	assert.EqualValues(t, "name", sdi.SubmoduleRepoLinkHTML(ctx))
 
-	sdi.SubmoduleFile = git.NewCommitSubmoduleFile("fullpath", "https://github.com/owner/repo", "1234")
+	sdi.SubmoduleFile = git.NewCommitSubmoduleFile("/any/repo-link", "fullpath", "https://github.com/owner/repo", "1234")
 	assert.EqualValues(t, `<a href="https://github.com/owner/repo/tree/1111">1111</a>`, sdi.CommitRefIDLinkHTML(ctx, "1111"))
 	assert.EqualValues(t, `<a href="https://github.com/owner/repo/compare/aaaa...bbbb">aaaa...bbbb</a>`, sdi.CompareRefIDLinkHTML(ctx))
 	assert.EqualValues(t, `<a href="https://github.com/owner/repo">name</a>`, sdi.SubmoduleRepoLinkHTML(ctx))
diff --git a/services/repository/files/tree.go b/services/repository/files/tree.go
@@ -154,7 +154,7 @@ func (node *TreeViewNode) sortLevel() int {
 	return util.Iif(node.EntryMode == "tree" || node.EntryMode == "commit", 0, 1)
 }
 
-func newTreeViewNodeFromEntry(ctx context.Context, repoHomeLink string, renderedIconPool *fileicon.RenderedIconPool, commit *git.Commit, parentDir string, entry *git.TreeEntry) *TreeViewNode {
+func newTreeViewNodeFromEntry(ctx context.Context, repoLink string, renderedIconPool *fileicon.RenderedIconPool, commit *git.Commit, parentDir string, entry *git.TreeEntry) *TreeViewNode {
 	node := &TreeViewNode{
 		EntryName: entry.Name(),
 		EntryMode: entryModeString(entry.Mode()),
@@ -172,8 +172,8 @@ func newTreeViewNodeFromEntry(ctx context.Context, repoHomeLink string, rendered
 		if subModule, err := commit.GetSubModule(node.FullPath); err != nil {
 			log.Error("GetSubModule: %v", err)
 		} else if subModule != nil {
-			submoduleFile := git.NewCommitSubmoduleFile(node.FullPath, subModule.URL, entry.ID.String())
-			webLink := submoduleFile.SubmoduleWebLinkTree(ctx, repoHomeLink, submoduleFile.RefID())
+			submoduleFile := git.NewCommitSubmoduleFile(repoLink, node.FullPath, subModule.URL, entry.ID.String())
+			webLink := submoduleFile.SubmoduleWebLinkTree(ctx, submoduleFile.RefID())
 			node.SubmoduleURL = webLink.CommitWebLink
 		}
 	}
diff --git a/services/repository/files/tree_test.go b/services/repository/files/tree_test.go
@@ -64,7 +64,7 @@ func TestGetTreeViewNodes(t *testing.T) {
 	contexttest.LoadGitRepo(t, ctx)
 	defer ctx.Repo.GitRepo.Close()
 
-	curRepoLink := "/any/repo-home-link"
+	curRepoLink := "/any/repo-ink"
 	renderedIconPool := fileicon.NewRenderedIconPool()
 	mockIconForFile := func(id string) template.HTML {
 		return template.HTML(`<svg class="svg git-entry-icon octicon-file" width="16" height="16" aria-hidden="true"><use xlink:href="#` + id + `"></use></svg>`)
diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl
@@ -18,7 +18,7 @@
 			<div class="repo-file-cell name muted-links {{if not $commit}}notready{{end}}">
 				{{index $.FileIcons $entry.Name}}
 				{{if $entry.IsSubModule}}
-					{{$submoduleLink := $submoduleFile.SubmoduleWebLinkTree ctx $.RepoLink $submoduleFile.RefID}}
+					{{$submoduleLink := $submoduleFile.SubmoduleWebLinkTree ctx $submoduleFile.RefID}}
 					{{if $submoduleLink}}
 						<a class="entry-name" href="{{$submoduleLink.RepoWebLink}}" title="{{$entry.Name}}">{{$entry.Name}}</a>
 						@ <a class="text primary" href="{{$submoduleLink.CommitWebLink}}">{{ShortSha $submoduleFile.RefID}}</a>

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ import (`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`// GetCommitsInfo gets information of all commits that are corresponding to these entries`
`19`		`-func (tes Entries) GetCommitsInfo(ctx context.Context, commit Commit, treePath string) ([]CommitInfo, Commit, error) {`
	`19`	`+func (tes Entries) GetCommitsInfo(ctx context.Context, repoLink string, commit Commit, treePath string) ([]CommitInfo, Commit, error) {`
`20`	`20`	`entryPaths := make([]string, len(tes)+1)`
`21`	`21`	`// Get the commit for the treePath itself`
`22`	`22`	`entryPaths[0] = ""`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ import (`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`// GetCommitsInfo gets information of all commits that are corresponding to these entries`
`18`		`-func (tes Entries) GetCommitsInfo(ctx context.Context, commit Commit, treePath string) ([]CommitInfo, Commit, error) {`
	`18`	`+func (tes Entries) GetCommitsInfo(ctx context.Context, repoLink string, commit Commit, treePath string) ([]CommitInfo, Commit, error) {`
`19`	`19`	`entryPaths := make([]string, len(tes)+1)`
`20`	`20`	`// Get the commit for the treePath itself`
`21`	`21`	`entryPaths[0] = ""`
`@@ -76,7 +76,7 @@ func (tes Entries) GetCommitsInfo(ctx context.Context, commit *Commit, treePath`
`76`	`76`	`} else if subModule != nil {`
`77`	`77`	`subModuleURL = subModule.URL`
`78`	`78`	`}`
`79`		`- subModuleFile := NewCommitSubmoduleFile(fullPath, subModuleURL, entry.ID.String())`
	`79`	`+ subModuleFile := NewCommitSubmoduleFile(repoLink, fullPath, subModuleURL, entry.ID.String())`
`80`	`80`	`commitsInfo[i].SubmoduleFile = subModuleFile`
`81`	`81`	`}`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ import (`
`14`	`14`
`15`	`15`	`// CommitSubmoduleFile represents a file with submodule type.`
`16`	`16`	`type CommitSubmoduleFile struct {`
	`17`	`+ repoLink string`
`17`	`18`	`fullPath string`
`18`	`19`	`refURL string`
`19`	`20`	`refID string`
`@@ -23,20 +24,20 @@ type CommitSubmoduleFile struct {`
`23`	`24`	`}`
`24`	`25`
`25`	`26`	`// NewCommitSubmoduleFile create a new submodule file`
`26`		`-func NewCommitSubmoduleFile(fullPath, refURL, refID string) *CommitSubmoduleFile {`
`27`		`- return &CommitSubmoduleFile{fullPath: fullPath, refURL: refURL, refID: refID}`
	`27`	`+func NewCommitSubmoduleFile(repoLink, fullPath, refURL, refID string) *CommitSubmoduleFile {`
	`28`	`+ return &CommitSubmoduleFile{repoLink: repoLink, fullPath: fullPath, refURL: refURL, refID: refID}`
`28`	`29`	`}`
`29`	`30`
`30`	`31`	`func (sf *CommitSubmoduleFile) RefID() string {`
`31`	`32`	`return sf.refID`
`32`	`33`	`}`
`33`	`34`
`34`		`-func (sf CommitSubmoduleFile) getWebLinkInTargetRepo(ctx context.Context, currentRepoHomeLink, moreLinkPath string) SubmoduleWebLink {`
	`35`	`+func (sf CommitSubmoduleFile) getWebLinkInTargetRepo(ctx context.Context, moreLinkPath string) SubmoduleWebLink {`
`35`	`36`	`if sf == nil {`
`36`	`37`	`return nil`
`37`	`38`	`}`
`38`	`39`	`if strings.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)`
`40`	`41`	`return &SubmoduleWebLink{RepoWebLink: targetLink, CommitWebLink: targetLink + moreLinkPath}`
`41`	`42`	`}`
`42`	`43`	`if !sf.parsed {`
`@@ -51,11 +52,11 @@ func (sf *CommitSubmoduleFile) getWebLinkInTargetRepo(ctx context.Context, curre`
`51`	`52`	`}`
`52`	`53`
`53`	`54`	`// 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, refCommitID string) SubmoduleWebLink {`
`55`		`- return sf.getWebLinkInTargetRepo(ctx, currentRepoHomeLink, "/tree/"+refCommitID)`
	`55`	`+func (sf CommitSubmoduleFile) SubmoduleWebLinkTree(ctx context.Context, refCommitID string) SubmoduleWebLink {`
	`56`	`+ return sf.getWebLinkInTargetRepo(ctx, "/tree/"+refCommitID)`
`56`	`57`	`}`
`57`	`58`
`58`	`59`	`// 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, commitID2 string) SubmoduleWebLink {`
`60`		`- return sf.getWebLinkInTargetRepo(ctx, currentRepoHomeLink, "/compare/"+commitID1+"..."+commitID2)`
	`60`	`+func (sf CommitSubmoduleFile) SubmoduleWebLinkCompare(ctx context.Context, commitID1, commitID2 string) SubmoduleWebLink {`
	`61`	`+ return sf.getWebLinkInTargetRepo(ctx, "/compare/"+commitID1+"..."+commitID2)`
`61`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -305,7 +305,7 @@ func renderDirectoryFiles(ctx *context.Context, timeout time.Duration) git.Entri`
`305`	`305`	`defer cancel()`
`306`	`306`	`}`
`307`	`307`
`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)`
`309`	`309`	`if err != nil {`
`310`	`310`	`ctx.ServerError("GetCommitsInfo", err)`
`311`	`311`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -14,15 +14,14 @@ import (`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`type SubmoduleDiffInfo struct {`
`17`		`- RepoHomeLink string`
`18`	`17`	`SubmoduleName string`
`19`	`18`	`SubmoduleFile *git.CommitSubmoduleFile // it might be nil if the submodule is not found or unable to parse`
`20`	`19`	`NewRefID string`
`21`	`20`	`PreviousRefID string`
`22`	`21`	`}`
`23`	`22`
`24`		`-func (si SubmoduleDiffInfo) PopulateURL(repoHomeLink string, diffFile DiffFile, leftCommit, rightCommit *git.Commit) {`
`25`		`- si.RepoHomeLink, si.SubmoduleName = repoHomeLink, diffFile.Name`
	`23`	`+func (si SubmoduleDiffInfo) PopulateURL(repoLink string, diffFile DiffFile, leftCommit, rightCommit *git.Commit) {`
	`24`	`+ si.SubmoduleName = diffFile.Name`
`26`	`25`	`submoduleCommit := rightCommit // If the submodule is added or updated, check at the right commit`
`27`	`26`	`if diffFile.IsDeleted {`
`28`	`27`	`submoduleCommit = leftCommit // If the submodule is deleted, check at the left commit`
`@@ -38,28 +37,28 @@ func (si SubmoduleDiffInfo) PopulateURL(repoHomeLink string, diffFile DiffFile`
`38`	`37`	`return // ignore the error, do not cause 500 errors for end users`
`39`	`38`	`}`
`40`	`39`	`if submodule != nil {`
`41`		`- si.SubmoduleFile = git.NewCommitSubmoduleFile(submoduleFullPath, submodule.URL, submoduleCommit.ID.String())`
	`40`	`+ si.SubmoduleFile = git.NewCommitSubmoduleFile(repoLink, submoduleFullPath, submodule.URL, submoduleCommit.ID.String())`
`42`	`41`	`}`
`43`	`42`	`}`
`44`	`43`
`45`	`44`	`func (si *SubmoduleDiffInfo) CommitRefIDLinkHTML(ctx context.Context, commitID string) template.HTML {`
`46`		`- webLink := si.SubmoduleFile.SubmoduleWebLinkTree(ctx, si.RepoHomeLink, commitID)`
	`45`	`+ webLink := si.SubmoduleFile.SubmoduleWebLinkTree(ctx, commitID)`
`47`	`46`	`if webLink == nil {`
`48`	`47`	`return htmlutil.HTMLFormat("%s", base.ShortSha(commitID))`
`49`	`48`	`}`
`50`	`49`	return htmlutil.HTMLFormat(`<a href="%s">%s</a>`, webLink.CommitWebLink, base.ShortSha(commitID))
`51`	`50`	`}`
`52`	`51`
`53`	`52`	`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)`
`55`	`54`	`if webLink == nil {`
`56`	`55`	`return htmlutil.HTMLFormat("%s...%s", base.ShortSha(si.PreviousRefID), base.ShortSha(si.NewRefID))`
`57`	`56`	`}`
`58`	`57`	return htmlutil.HTMLFormat(`<a href="%s">%s...%s</a>`, webLink.CommitWebLink, base.ShortSha(si.PreviousRefID), base.ShortSha(si.NewRefID))
`59`	`58`	`}`
`60`	`59`
`61`	`60`	`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())`
`63`	`62`	`if webLink == nil {`
`64`	`63`	`return htmlutil.HTMLFormat("%s", si.SubmoduleName)`
`65`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ func (node *TreeViewNode) sortLevel() int {`
`154`	`154`	`return util.Iif(node.EntryMode == "tree" \|\| node.EntryMode == "commit", 0, 1)`
`155`	`155`	`}`
`156`	`156`
`157`		`-func newTreeViewNodeFromEntry(ctx context.Context, repoHomeLink string, renderedIconPool fileicon.RenderedIconPool, commit git.Commit, parentDir string, entry git.TreeEntry) TreeViewNode {`
	`157`	`+func newTreeViewNodeFromEntry(ctx context.Context, repoLink string, renderedIconPool fileicon.RenderedIconPool, commit git.Commit, parentDir string, entry git.TreeEntry) TreeViewNode {`
`158`	`158`	`node := &TreeViewNode{`
`159`	`159`	`EntryName: entry.Name(),`
`160`	`160`	`EntryMode: entryModeString(entry.Mode()),`
`@@ -172,8 +172,8 @@ func newTreeViewNodeFromEntry(ctx context.Context, repoHomeLink string, rendered`
`172`	`172`	`if subModule, err := commit.GetSubModule(node.FullPath); err != nil {`
`173`	`173`	`log.Error("GetSubModule: %v", err)`
`174`	`174`	`} else if subModule != nil {`
`175`		`- submoduleFile := git.NewCommitSubmoduleFile(node.FullPath, subModule.URL, entry.ID.String())`
`176`		`- webLink := submoduleFile.SubmoduleWebLinkTree(ctx, repoHomeLink, submoduleFile.RefID())`
	`175`	`+ submoduleFile := git.NewCommitSubmoduleFile(repoLink, node.FullPath, subModule.URL, entry.ID.String())`
	`176`	`+ webLink := submoduleFile.SubmoduleWebLinkTree(ctx, submoduleFile.RefID())`
`177`	`177`	`node.SubmoduleURL = webLink.CommitWebLink`
`178`	`178`	`}`
`179`	`179`	`}`