improve

Author: yp05327

modules/context/context_response.go

@@ -16,6 +16,7 @@ import (
 
 	user_model "code.gitea.io/gitea/models/user"
 	"code.gitea.io/gitea/modules/base"
+	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/httplib"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
@@ -136,6 +137,7 @@ func (ctx *Context) notFoundInternal(logMsg string, logErr error) {
 
 	ctx.Data["IsRepo"] = ctx.Repo.Repository != nil
 	ctx.Data["Title"] = "Page Not Found"
+	ctx.Data["IsTreeNotFound"] = git.IsErrNotExist(logErr)
 	ctx.HTML(http.StatusNotFound, base.TplName("status/404"))
 }
 

options/locale/locale_en-US.ini

@@ -1007,6 +1007,9 @@ delete_preexisting_success = Deleted unadopted files in %s
 blame_prior = View blame prior to this change
 author_search_tooltip = Shows a maximum of 30 users
 
+tree_not_found = The <span class="ui label">%s</span> branch of %s does not contain the path %s
+return_to_repository = Return to the repository
+
 transfer.accept = Accept Transfer
 transfer.accept_desc =  Transfer to "%s"
 transfer.reject = Reject Transfer

templates/status/404.tmpl

@@ -5,8 +5,13 @@
 		<p style="margin-top: 100px"><img src="{{AssetUrlPrefix}}/img/404.png" alt="404"></p>
 		<div class="divider"></div>
 		<br>
+		{{if and .IsRepo .IsTreeNotFound}}
+		<p>{{.locale.Tr "repo.tree_not_found" .BranchName .RepoName .TreePath | Safe}}</p>
+		<a class="ui button green" href="{{.Repository.Link}}/src/branch/{{.BranchName | PathEscape}}">{{.locale.Tr "repo.return_to_repository"}}</a>
+		{{else}}
 		<p>{{.locale.Tr "error404" | Safe}}</p>
 		{{if .ShowFooterVersion}}<p>{{.locale.Tr "admin.config.app_ver"}}: {{AppVer}}</p>{{end}}
+		{{end}}
 	</div>
 </div>
 {{template "base/footer" .}}