gitutil: infer submodule with baseURL when it is a relative path (#6337)

CHANGELOG.md

@@ -17,6 +17,7 @@ All notable changes to Gogs are documented in this file.
 ### Fixed
 
 - _Regression:_ Pages are correctly rendered when requesting `?go-get=1` for subdirectories. [#6314](https://github.com/gogs/gogs/issues/6314)
+- _Regression:_ Submodule with a relative path is linked correctly. [#6319](https://github.com/gogs/gogs/issues/6319)
 
 ### Removed
 

internal/assets/templates/templates_gen.go

@@ -111,7 +111,7 @@
 // ../../../templates/repo/settings/webhook/slack.tmpl (1.48kB)
 // ../../../templates/repo/user_cards.tmpl (1.927kB)
 // ../../../templates/repo/view_file.tmpl (5.187kB)
-// ../../../templates/repo/view_list.tmpl (2.249kB)
+// ../../../templates/repo/view_list.tmpl (2.26kB)
 // ../../../templates/repo/watchers.tmpl (161B)
 // ../../../templates/repo/wiki/new.tmpl (1.265kB)
 // ../../../templates/repo/wiki/pages.tmpl (776B)
@@ -2437,7 +2437,7 @@ func repoView_fileTmpl() (*asset, error) {
 	return a, nil
 }
 
-var _repoView_listTmpl = "\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x9c\x56\x4d\x6f\xe3\x36\x10\x3d\xdb\xbf\x62\x20\xf8\x6a\x09\xbb\xbd\xd2\x42\xd3\x6d\x8a\x04\x70\x8a\xc0\x4e\xd0\x63\x31\x96\xc6\x12\xbb\xfc\x10\x48\x7a\x13\x43\xd5\x7f\x2f\x48\x7d\x58\x52\xbc\xdb\x64\x4f\xb2\xcd\xe1\xcc\x9b\x37\x6f\x9e\xc5\x1c\x1e\x04\x01\xcf\x37\x91\xa1\x4a\xaf\x8f\x5c\x90\x5d\x87\x1f\x23\xc8\x04\x5a\xbb\x89\x4e\x1c\x4e\xca\x3a\xcc\xbe\x86\xd8\x23\x7f\xa5\x1c\x2c\x57\x85\x20\x10\x5c\x11\xb4\xe1\xe9\x72\xc1\x5c\x49\x98\xa7\xcb\xc5\x82\x39\xe3\x1f\xfe\x97\x3e\xcd\x51\x9f\x0c\xbc\xf0\x3c\x44\x2e\x16\x8b\xba\xe6\x47\x88\xb7\xe8\xc8\xba\x2f\x5a\x4a\xee\x9e\x2d\x99\xa6\x09\x87\x0b\xc6\x65\x31\x02\x80\xdf\xd0\xa1\x01\x2e\xb1\x20\xe0\xb2\x58\x7f\xfa\x1c\x81\x35\xd9\x26\xaa\xeb\x37\x39\xe2\x1d\x89\x9b\x70\x61\xcb\xd5\xd7\xa6\x89\x20\x49\xbb\xac\x08\xa5\xa1\xa3\xbf\x75\x53\x55\xfb\xd3\xe1\x79\xb7\x6d\x9a\xe4\x5a\x8e\x3f\x51\x52\xd3\x44\x29\xb3\xce\x68\x55\xa4\xb3\x98\xf8\xe6\xe4\x4a\xdd\x87\xb1\xa4\x8b\x62\x09\xf6\xdd\x91\xb0\xf4\x13\xdd\x5c\x80\xc3\xd5\x82\xb7\x12\xb9\x98\xf4\xf4\x21\x80\x3d\x38\x95\x77\xd8\x18\x82\x21\xb1\x89\x94\x3e\x6a\x21\xf4\xcb\x78\xec\xb6\x44\x10\x78\x20\x11\x0d\xb4\xc5\x3b\xaa\x74\x4b\x6b\x92\x85\x42\x73\xf6\xe2\xfb\xdf\x3d\xbc\x69\xd2\xb4\xae\xf7\xa5\x36\x6e\x7f\x77\xf3\x09\xe6\xe1\xf1\xde\x19\xae\x0a\x8f\xb2\x63\x8f\xd9\x0a\x55\x0f\xa4\x30\x74\x86\x12\xed\x9a\xa4\xfe\x87\xfb\x54\x3b\x52\x39\x99\xf6\xfe\x03\x59\xeb\x69\x3c\xa2\xb0\x34\x4b\xbd\x3f\x49\x89\xe6\x0c\x03\x68\x58\x85\x8f\x96\x3b\x6d\xce\xf1\x17\x2d\x2b\x6d\xe9\x81\x1c\x5a\xf8\x17\xf6\xce\x7c\xbe\x7b\x7a\xd8\x06\xb6\x2a\x54\xad\x80\x13\x57\xce\x95\xac\xbc\xe8\x2f\x4a\xbe\x16\xe2\x4a\x43\x6d\x0c\x38\x7a\x75\x10\x7a\x30\xbc\x28\x1d\x60\x41\xbe\x87\x27\x2e\x69\xcf\x55\x36\xc7\xdc\x8d\xed\xaf\x92\x14\xac\xe2\x2d\xb6\xbc\xb4\x15\x58\x12\xd6\xca\x7f\x6d\xf7\x8c\xb9\x83\xce\xcf\xfe\xa8\xdd\xa6\x3b\xb4\x8f\x68\x48\xb9\x47\x74\x65\x3b\x60\xe6\x4c\x0f\xca\x73\x58\x85\xe3\x6e\x05\x99\xcb\x21\xd3\xc2\x37\xbb\x89\x7e\x89\x52\xc6\xfb\x50\x9d\x39\x9e\x69\x05\xdd\x73\xed\x45\xb7\x36\x54\x89\x73\x94\xb2\x84\xa7\xa3\x45\xba\xb5\x19\x56\xf4\xa8\x4f\x2a\x87\xf8\x37\x83\x2a\x2b\x5b\x7d\xd4\x75\x3c\x06\x13\xa5\x71\xec\x07\xcc\x12\x97\xf7\xbc\x99\x16\x7a\xaf\xc6\xba\x36\xa8\x0a\x82\xf8\x0f\x6f\x43\x03\xfe\xb1\x5f\xec\x4f\x07\xa9\xf3\x93\xb8\xac\x56\x97\x6d\xae\x9a\x79\x07\xde\xd9\xd6\xb6\xbf\xed\xbb\x18\x66\x3c\x35\x86\x7b\x75\x24\x33\x94\x79\xde\x6d\x27\x45\xfd\xe8\xe2\x5b\xe5\xcc\xb9\xdb\x2c\xf8\x15\x26\xda\x1e\x62\xe3\x76\xa0\x23\x55\x2f\x86\xd6\xe7\xf6\xe0\xe7\xd0\x69\x0b\x65\x6f\x90\x7d\xcb\x6d\xb5\x7b\xbb\x3f\x4b\x11\x88\xed\x4e\xdf\xd3\x6f\x7b\x25\x7c\x99\xb7\x3c\x85\xf0\x9e\x6c\x01\x8e\x36\x17\x44\x4f\x86\xa8\x69\x72\x6e\x28\xf3\x0b\xd5\x67\xf4\x8a\xef\x86\x7a\xa5\xe8\xe0\x3c\x13\xd6\xc7\x2a\x5a\xc5\x3e\x71\x67\x32\x33\x81\x8d\xa9\x7f\x33\x8b\xef\x30\x7d\xf1\xba\x0b\xcf\xb2\xb3\x8d\x4c\x0b\x81\x95\xff\x37\x1b\x5b\xcc\xf0\x6f\xf1\x11\x6b\x5c\x5d\xf7\xc6\xb1\x2b\x4e\x6d\xf0\x07\x06\xb8\xf8\xa1\xc9\xcd\xec\x6d\xf5\x51\x7f\x5b\x4e\x29\x1a\xd1\xf2\xff\x66\xd5\xd5\x6e\x1f\x8e\xde\x3a\xd5\x77\x96\x9b\x25\x9d\x57\xb1\x24\xbc\x2f\xa4\xcb\x20\x27\xf4\x43\xdd\x11\xe6\x92\x6e\x5f\xb9\x75\xe0\x65\x45\xaf\xce\x3b\x80\xbf\x56\xd7\x8e\x64\x25\xd0\x11\x84\x37\x94\xe4\x1b\xa7\x97\xbf\x83\x9e\x21\x6e\x9a\x65\x9f\xff\xbf\x00\x00\x00\xff\xff\x05\x86\xd9\x5e\xc9\x08\x00\x00"
+var _repoView_listTmpl = "\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x9c\x56\x4d\x6f\xe3\x36\x10\x3d\xdb\xbf\x62\x20\xf8\x6a\x09\xbb\xbd\xd2\x42\xd3\x6d\x8a\x04\x70\x8a\xc0\x4e\xd0\x63\x31\x96\xc6\x12\xbb\xfc\x10\x48\x6a\x13\x43\xd5\x7f\x2f\x48\x7d\x58\x56\xbc\xdb\x64\x4f\xb2\xcd\xe1\xcc\x9b\x37\x6f\x9e\xc5\x1c\x1e\x04\x01\xcf\x37\x91\xa1\x4a\xaf\x8f\x5c\x90\x5d\x87\x1f\x23\xc8\x04\x5a\xbb\x89\x6a\x0e\xb5\xb2\x0e\xb3\xaf\x21\xf6\xc8\x5f\x29\x07\xcb\x55\x21\x08\x04\x57\x04\x5d\x78\xba\x5c\x30\x57\x12\xe6\xe9\x72\xb1\x60\xce\xf8\x87\xff\x65\x48\x73\xd4\xb5\x81\x17\x9e\x87\xc8\xc5\x62\xd1\x34\xfc\x08\xf1\x16\x1d\x59\xf7\x45\x4b\xc9\xdd\xb3\x25\xd3\xb6\xe1\x70\xc1\xb8\x2c\x26\x00\xf0\x1b\x3a\x34\xc0\x25\x16\x04\x5c\x16\xeb\x4f\x9f\x23\xb0\x26\xdb\x44\x4d\xf3\x26\x47\xbc\x23\x71\x13\x2e\x6c\xb9\xfa\xda\xb6\x11\x24\x69\x9f\x15\xa1\x34\x74\xf4\xb7\x6e\xaa\x6a\x5f\x1f\x9e\x77\xdb\xb6\x4d\xae\xe5\xf8\x13\x25\xb5\x6d\x94\x32\xeb\x8c\x56\x45\x3a\x8b\x89\x6f\x6a\x57\xea\x21\x8c\x25\x7d\x14\x4b\x70\xe8\x8e\x84\xa5\x9f\xe8\xe6\x0c\x1c\xae\x16\xbc\x95\xc8\xc5\x45\x4f\x1f\x02\x38\x80\x53\x79\x8f\x8d\x21\x18\x12\x9b\x48\xe9\xa3\x16\x42\xbf\x4c\xc7\x6e\x4b\x04\x81\x07\x12\xd1\x48\x5b\xbc\xa3\x4a\x77\xb4\x26\x59\x28\x34\x67\x2f\xbe\xff\xdd\xc3\xbb\x4c\x9a\x36\xcd\xbe\xd4\xc6\xed\xef\x6e\x3e\xc1\x3c\x3c\xde\x3b\xc3\x55\xe1\x51\xf6\xec\x31\x5b\xa1\x1a\x80\x14\x86\x4e\x50\xa2\x5d\x93\xd4\xff\x70\x9f\x6a\x47\x2a\x27\xd3\xdd\x7f\x20\x6b\x3d\x8d\x47\x14\x96\x66\xa9\xf7\xb5\x94\x68\x4e\x30\x82\x86\x55\xf8\x68\xb9\xd3\xe6\x14\x7f\xd1\xb2\xd2\x96\x1e\xc8\xa1\x85\x7f\x61\xef\xcc\xe7\xbb\xa7\x87\x6d\x60\xab\x42\xd5\x09\x38\x71\xe5\x5c\xc9\xca\x8b\xfe\xac\xe4\x6b\x21\xae\x34\xd4\xc5\x80\xa3\x57\x07\xa1\x07\xc3\x8b\xd2\x01\x16\xe4\x7b\x78\xe2\x92\xf6\x5c\x65\x73\xcc\xfd\xd8\xfe\x2a\x49\xc1\x2a\xde\x62\xc7\x4b\x57\x81\x25\x61\xad\xfc\xd7\x6e\xcf\x98\x3b\xe8\xfc\xe4\x8f\xba\x6d\xba\x43\xfb\x88\x86\x94\x7b\x44\x57\x76\x03\x66\xce\x0c\xa0\x3c\x87\x55\x38\xee\x57\x90\xb9\x1c\x32\x2d\x7c\xb3\x9b\xe8\x97\x28\x65\x7c\x08\xd5\x99\xe3\x99\x56\xd0\x3f\xd7\x5e\x74\x6b\x43\x95\x38\x45\x29\x4b\x78\x3a\x59\xa4\x5b\x9b\x61\x45\x8f\xba\x56\x39\xc4\xbf\x19\x54\x59\xd9\xe9\xa3\x69\xe2\x29\x98\x28\x8d\x63\x3f\x60\x96\xb8\x7c\xe0\xcd\x74\xd0\x07\x35\x36\x8d\x41\x55\x10\xc4\x7f\x78\x1b\x1a\xf1\x4f\xfd\x62\x5f\x1f\xa4\xce\x6b\x71\x5e\xad\x3e\xdb\x5c\x35\xf3\x0e\xbc\xb3\xad\xed\x70\xdb\x77\x31\xce\xf8\xd2\x18\xee\xd5\x91\xcc\x58\xe6\x79\xb7\xed\x45\xd3\xad\xe4\xa4\xbe\x9f\x62\x7c\xab\x9c\x39\xf5\x4b\x06\xbf\xc2\x85\xcc\xc7\xd8\xb8\x9b\xed\x44\xe0\x8b\x91\x85\xb9\x53\xf8\x91\xf4\x32\x43\x39\x78\xe5\xd0\x7d\x57\xed\xde\xee\x4f\x52\x04\x8e\xfb\xd3\xf7\xb4\xde\x5d\x09\x5f\xe6\xdd\x5f\x42\x78\x4f\xb6\x00\x47\x9b\x33\xa2\x27\x43\xd4\xb6\x39\x37\x94\xf9\xdd\x1a\x32\x7a\xf1\xf7\xf3\xbd\x52\x74\x34\xa1\x8b\x01\x4c\x05\xb5\x8a\x7d\xe2\xde\x6f\x66\x5a\x9b\x52\xff\x66\x16\xdf\x61\xfa\x6c\x7b\x67\x9e\x65\xef\x20\x99\x16\x02\x2b\xff\xc7\x36\x75\x9b\xf1\x8f\xe3\x23\x2e\xb9\xba\x6e\x93\x53\x83\xbc\x74\xc4\x1f\x78\xe1\xe2\x87\x7e\x37\x73\xba\xd5\x47\xad\x6e\x79\x49\xd1\x84\x96\xff\xf7\xad\xbe\x76\xf7\x70\xf4\xd6\xb4\xbe\xb3\xe7\x2c\xe9\x6d\x8b\x25\xe1\xd5\x21\x5d\x06\x39\xa1\x1f\xea\x8e\x30\x97\x74\xfb\xca\xad\x03\x2f\x2b\x7a\x75\xde\x0c\xfc\xb5\xa6\x71\x24\x2b\x81\x8e\x20\xbc\xac\x24\xdf\x38\xbd\xfc\x1d\xf4\x0c\x71\xdb\x2e\x87\xfc\xff\x05\x00\x00\xff\xff\xc4\x06\x3f\x3f\xd4\x08\x00\x00"
 
 func repoView_listTmplBytes() ([]byte, error) {
 	return bindataRead(
@@ -2452,8 +2452,8 @@ func repoView_listTmpl() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "repo/view_list.tmpl", size: 2249, mode: os.FileMode(0644), modTime: time.Unix(1599160113, 0)}
-	a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x7b, 0x8a, 0xbf, 0x31, 0x45, 0x11, 0x49, 0x61, 0x98, 0x8b, 0xeb, 0x72, 0x24, 0x1f, 0xf1, 0xd5, 0xd5, 0x22, 0x56, 0xf6, 0x7c, 0xd7, 0xc4, 0x6, 0x80, 0x89, 0x1c, 0x5c, 0x49, 0xb0, 0x7b, 0xc0}}
+	info := bindataFileInfo{name: "repo/view_list.tmpl", size: 2260, mode: os.FileMode(0644), modTime: time.Unix(1600414964, 0)}
+	a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x3b, 0x3e, 0x9a, 0x96, 0xf, 0x66, 0x32, 0xcc, 0x6c, 0x6e, 0x49, 0x83, 0x4c, 0x40, 0x73, 0x46, 0x2c, 0xfe, 0xd7, 0xd, 0x15, 0x6f, 0x91, 0x16, 0x9e, 0x6e, 0xda, 0x9a, 0xf1, 0x21, 0x1, 0xd4}}
 	return a, nil
 }
 

internal/conf/testdata/TestInit.golden.ini

@@ -78,7 +78,7 @@ LOGIN_STATUS_COOKIE_NAME=login_status
 
 [email]
 ENABLED=true
-SUBJECT_PREFIX=[Testing] 
+SUBJECT_PREFIX="[Testing] "
 HOST=smtp.mailgun.org:587
 FROM=noreply@gogs.localhost
 USER=noreply@gogs.localhost

internal/gitutil/submodule.go

@@ -17,10 +17,21 @@ import (
 var scpSyntax = lazyregexp.New(`^([a-zA-Z0-9_]+@)?([a-zA-Z0-9._-]+):(.*)$`)
 
 // InferSubmoduleURL returns the inferred external URL of the submodule at best effort.
-func InferSubmoduleURL(mod *git.Submodule) string {
+// The `baseURL` should be the URL of the current repository. If the submodule URL looks
+// like a relative path, it assumes that the submodule is another repository on the same
+// Gogs instance by appending it to the `baseURL` with the commit.
+func InferSubmoduleURL(baseURL string, mod *git.Submodule) string {
+	if !strings.HasSuffix(baseURL, "/") {
+		baseURL += "/"
+	}
+
 	raw := strings.TrimSuffix(mod.URL, "/")
 	raw = strings.TrimSuffix(raw, ".git")
 
+	if strings.HasPrefix(raw, "../") {
+		return fmt.Sprintf("%s%s/commit/%s", baseURL, raw, mod.Commit)
+	}
+
 	parsed, err := url.Parse(raw)
 	if err != nil {
 		// Try parse as SCP syntax again

internal/gitutil/submodule_test.go

@@ -41,6 +41,14 @@ func TestInferSubmoduleURL(t *testing.T) {
 			},
 			expURL: "http://github.com/gogs/docs-api/commit/6b08f76a5313fa3d26859515b30aa17a5faa2807",
 		},
+		{
+			name: "relative path",
+			submodule: &git.Submodule{
+				URL:    "../repo2.git",
+				Commit: "6b08f76a5313fa3d26859515b30aa17a5faa2807",
+			},
+			expURL: "https://gogs.example.com/user/repo/../repo2/commit/6b08f76a5313fa3d26859515b30aa17a5faa2807",
+		},
 		{
 			name: "bad URL",
 			submodule: &git.Submodule{
@@ -52,7 +60,7 @@ func TestInferSubmoduleURL(t *testing.T) {
 	}
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			assert.Equal(t, test.expURL, InferSubmoduleURL(test.submodule))
+			assert.Equal(t, test.expURL, InferSubmoduleURL("https://gogs.example.com/user/repo", test.submodule))
 		})
 	}
 }

templates/repo/view_list.tmpl

@@ -28,7 +28,7 @@
 				{{if .Submodule}}
 					<td>
 						<span class="octicon octicon-file-submodule"></span>
-						<a href="{{InferSubmoduleURL .Submodule}}">{{.Entry.Name}} @ {{ShortSHA1 .Submodule.Commit}}</a>
+						<a href="{{InferSubmoduleURL $.RepoLink .Submodule}}">{{.Entry.Name}} @ {{ShortSHA1 .Submodule.Commit}}</a>
 					</td>
 				{{else}}
 					<td class="name">