Backport #11098 Fix #11002 Signed-off-by: Andrew Thornton <art27@cantab.net>tags/v1.11.5
"fmt" | "fmt" | ||||
"net" | "net" | ||||
"net/url" | "net/url" | ||||
"path" | |||||
"regexp" | "regexp" | ||||
"strings" | "strings" | ||||
) | ) | ||||
} | } | ||||
} | } | ||||
func getRefURL(refURL, urlPrefix, parentPath string) string { | |||||
func getRefURL(refURL, urlPrefix, repoFullName string) string { | |||||
if refURL == "" { | if refURL == "" { | ||||
return "" | return "" | ||||
} | } | ||||
urlPrefixHostname = prefixURL.Host | urlPrefixHostname = prefixURL.Host | ||||
} | } | ||||
// FIXME: Need to consider branch - which will require changes in modules/git/commit.go:GetSubModules | |||||
// Relative url prefix check (according to git submodule documentation) | // Relative url prefix check (according to git submodule documentation) | ||||
if strings.HasPrefix(refURI, "./") || strings.HasPrefix(refURI, "../") { | if strings.HasPrefix(refURI, "./") || strings.HasPrefix(refURI, "../") { | ||||
// ...construct and return correct submodule url here... | |||||
idx := strings.Index(parentPath, "/src/") | |||||
if idx == -1 { | |||||
return refURI | |||||
} | |||||
return strings.TrimSuffix(urlPrefix, "/") + parentPath[:idx] + "/" + refURI | |||||
return urlPrefix + path.Clean(path.Join(repoFullName, refURI)) | |||||
} | } | ||||
if !strings.Contains(refURI, "://") { | if !strings.Contains(refURI, "://") { | ||||
m := match[0] | m := match[0] | ||||
refHostname := m[2] | refHostname := m[2] | ||||
path := m[3] | |||||
pth := m[3] | |||||
if !strings.HasPrefix(path, "/") { | |||||
path = "/" + path | |||||
if !strings.HasPrefix(pth, "/") { | |||||
pth = "/" + pth | |||||
} | } | ||||
if urlPrefixHostname == refHostname { | if urlPrefixHostname == refHostname { | ||||
return prefixURL.Scheme + "://" + urlPrefixHostname + path | |||||
return prefixURL.Scheme + "://" + urlPrefixHostname + path.Join(prefixURL.Path, path.Clean(pth)) | |||||
} | } | ||||
return "http://" + refHostname + path | |||||
return "http://" + refHostname + pth | |||||
} | } | ||||
} | } | ||||
for _, scheme := range supportedSchemes { | for _, scheme := range supportedSchemes { | ||||
if ref.Scheme == scheme { | if ref.Scheme == scheme { | ||||
if urlPrefixHostname == refHostname { | if urlPrefixHostname == refHostname { | ||||
return prefixURL.Scheme + "://" + prefixURL.Host + ref.Path | |||||
return prefixURL.Scheme + "://" + prefixURL.Host + path.Join(prefixURL.Path, ref.Path) | |||||
} else if ref.Scheme == "http" || ref.Scheme == "https" { | } else if ref.Scheme == "http" || ref.Scheme == "https" { | ||||
if len(ref.User.Username()) > 0 { | if len(ref.User.Username()) > 0 { | ||||
return ref.Scheme + "://" + fmt.Sprintf("%v", ref.User) + "@" + ref.Host + ref.Path | return ref.Scheme + "://" + fmt.Sprintf("%v", ref.User) + "@" + ref.Host + ref.Path | ||||
} | } | ||||
// RefURL guesses and returns reference URL. | // RefURL guesses and returns reference URL. | ||||
func (sf *SubModuleFile) RefURL(urlPrefix string, parentPath string) string { | |||||
return getRefURL(sf.refURL, urlPrefix, parentPath) | |||||
func (sf *SubModuleFile) RefURL(urlPrefix string, repoFullName string) string { | |||||
return getRefURL(sf.refURL, urlPrefix, repoFullName) | |||||
} | } | ||||
// RefID returns reference ID. | // RefID returns reference ID. |
parentPath string | parentPath string | ||||
expect string | expect string | ||||
}{ | }{ | ||||
{"git://github.com/user1/repo1", "/", "/", "http://github.com/user1/repo1"}, | |||||
{"https://localhost/user1/repo1.git", "/", "/", "https://localhost/user1/repo1"}, | |||||
{"http://localhost/user1/repo1.git", "/", "/", "http://localhost/user1/repo1"}, | |||||
{"git@github.com:user1/repo1.git", "/", "/", "http://github.com/user1/repo1"}, | |||||
{"ssh://git@git.zefie.net:2222/zefie/lge_g6_kernel_scripts.git", "/", "/", "http://git.zefie.net/zefie/lge_g6_kernel_scripts"}, | |||||
{"git@git.zefie.net:2222/zefie/lge_g6_kernel_scripts.git", "/", "/", "http://git.zefie.net/2222/zefie/lge_g6_kernel_scripts"}, | |||||
{"git@try.gitea.io:go-gitea/gitea", "https://try.gitea.io/go-gitea/gitea", "/", "https://try.gitea.io/go-gitea/gitea"}, | |||||
{"ssh://git@try.gitea.io:9999/go-gitea/gitea", "https://try.gitea.io/go-gitea/gitea", "/", "https://try.gitea.io/go-gitea/gitea"}, | |||||
{"git://git@try.gitea.io:9999/go-gitea/gitea", "https://try.gitea.io/go-gitea/log", "/", "https://try.gitea.io/go-gitea/gitea"}, | |||||
{"ssh://git@127.0.0.1:9999/go-gitea/gitea", "https://127.0.0.1:3000/go-gitea/log", "/", "https://127.0.0.1:3000/go-gitea/gitea"}, | |||||
{"https://gitea.com:3000/user1/repo1.git", "https://127.0.0.1:3000/go-gitea/gitea", "/", "https://gitea.com:3000/user1/repo1"}, | |||||
{"https://username:password@github.com/username/repository.git", "/", "/", "https://username:password@github.com/username/repository"}, | |||||
{"git://github.com/user1/repo1", "/", "user1/repo2", "http://github.com/user1/repo1"}, | |||||
{"https://localhost/user1/repo1.git", "/", "user1/repo2", "https://localhost/user1/repo1"}, | |||||
{"http://localhost/user1/repo1.git", "/", "owner/reponame", "http://localhost/user1/repo1"}, | |||||
{"git@github.com:user1/repo1.git", "/", "owner/reponame", "http://github.com/user1/repo1"}, | |||||
{"ssh://git@git.zefie.net:2222/zefie/lge_g6_kernel_scripts.git", "/", "zefie/lge_g6_kernel", "http://git.zefie.net/zefie/lge_g6_kernel_scripts"}, | |||||
{"git@git.zefie.net:2222/zefie/lge_g6_kernel_scripts.git", "/", "zefie/lge_g6_kernel", "http://git.zefie.net/2222/zefie/lge_g6_kernel_scripts"}, | |||||
{"git@try.gitea.io:go-gitea/gitea", "https://try.gitea.io/", "go-gitea/sdk", "https://try.gitea.io/go-gitea/gitea"}, | |||||
{"ssh://git@try.gitea.io:9999/go-gitea/gitea", "https://try.gitea.io/", "go-gitea/sdk", "https://try.gitea.io/go-gitea/gitea"}, | |||||
{"git://git@try.gitea.io:9999/go-gitea/gitea", "https://try.gitea.io/", "go-gitea/sdk", "https://try.gitea.io/go-gitea/gitea"}, | |||||
{"ssh://git@127.0.0.1:9999/go-gitea/gitea", "https://127.0.0.1:3000/", "go-gitea/sdk", "https://127.0.0.1:3000/go-gitea/gitea"}, | |||||
{"https://gitea.com:3000/user1/repo1.git", "https://127.0.0.1:3000/", "user/repo2", "https://gitea.com:3000/user1/repo1"}, | |||||
{"https://username:password@github.com/username/repository.git", "/", "username/repository2", "https://username:password@github.com/username/repository"}, | |||||
{"somethingbad", "https://127.0.0.1:3000/go-gitea/gitea", "/", ""}, | {"somethingbad", "https://127.0.0.1:3000/go-gitea/gitea", "/", ""}, | ||||
{"git@localhost:user/repo", "https://localhost/user/repo2", "/", "https://localhost/user/repo"}, | |||||
{"../path/to/repo.git/", "https://localhost/user/repo2/src/branch/master/test", "/", "../path/to/repo.git/"}, | |||||
{"git@localhost:user/repo", "https://localhost/", "user2/repo1", "https://localhost/user/repo"}, | |||||
{"../path/to/repo.git/", "https://localhost/", "user/repo2", "https://localhost/user/path/to/repo.git"}, | |||||
} | } | ||||
for _, kase := range kases { | for _, kase := range kases { |
<td> | <td> | ||||
<span class="truncate"> | <span class="truncate"> | ||||
<span class="octicon octicon-file-submodule"></span> | <span class="octicon octicon-file-submodule"></span> | ||||
{{$refURL := $commit.RefURL AppUrl $.BranchLink}} | |||||
{{$refURL := $commit.RefURL AppUrl $.Repository.FullName}} | |||||
{{if $refURL}} | {{if $refURL}} | ||||
<a href="{{$refURL}}">{{$entry.Name}}</a> @ <a href="{{$refURL}}/commit/{{$commit.RefID}}">{{ShortSha $commit.RefID}}</a> | <a href="{{$refURL}}">{{$entry.Name}}</a> @ <a href="{{$refURL}}/commit/{{$commit.RefID}}">{{ShortSha $commit.RefID}}</a> | ||||
{{else}} | {{else}} |