Add route for #2846
This commit is contained in:
parent
004fb30ebe
commit
60ae8ac3d2
5 changed files with 17 additions and 6 deletions
|
@ -520,9 +520,10 @@ func runWeb(ctx *cli.Context) {
|
|||
m.Get("/src/*", repo.Home)
|
||||
m.Get("/raw/*", repo.SingleDownload)
|
||||
m.Get("/commits/*", repo.RefCommits)
|
||||
m.Get("/commit/*", repo.Diff)
|
||||
m.Get("/commit/:sha([a-z0-9]{40})$", repo.Diff)
|
||||
m.Get("/forks", repo.Forks)
|
||||
}, context.RepoRef())
|
||||
m.Get("/commit/:sha([a-z0-9]{40})\\.:ext(patch|diff)", repo.RawDiff)
|
||||
|
||||
m.Get("/compare/:before([a-z0-9]{40})\\.\\.\\.:after([a-z0-9]{40})", repo.CompareDiff)
|
||||
}, ignSignIn, context.RepoAssignment(), repo.MustBeNotBare)
|
||||
|
|
2
gogs.go
2
gogs.go
|
@ -17,7 +17,7 @@ import (
|
|||
"github.com/gogits/gogs/modules/setting"
|
||||
)
|
||||
|
||||
const APP_VER = "0.9.13.0319"
|
||||
const APP_VER = "0.9.13.0321"
|
||||
|
||||
func init() {
|
||||
runtime.GOMAXPROCS(runtime.NumCPU())
|
||||
|
|
|
@ -148,9 +148,14 @@ func Diff(ctx *context.Context) {
|
|||
|
||||
userName := ctx.Repo.Owner.Name
|
||||
repoName := ctx.Repo.Repository.Name
|
||||
commitID := ctx.Repo.CommitID
|
||||
commitID := ctx.Params(":sha")
|
||||
|
||||
commit, err := ctx.Repo.GitRepo.GetCommit(commitID)
|
||||
if err != nil {
|
||||
ctx.Handle(500, "Repo.GitRepo.GetCommit", err)
|
||||
return
|
||||
}
|
||||
|
||||
commit := ctx.Repo.Commit
|
||||
diff, err := models.GetDiffCommit(models.RepoPath(userName, repoName),
|
||||
commitID, setting.Git.MaxGitDiffLines)
|
||||
if err != nil {
|
||||
|
@ -168,6 +173,7 @@ func Diff(ctx *context.Context) {
|
|||
}
|
||||
}
|
||||
|
||||
ctx.Data["CommitID"] = commitID
|
||||
ctx.Data["IsSplitStyle"] = ctx.Query("style") == "split"
|
||||
ctx.Data["Username"] = userName
|
||||
ctx.Data["Reponame"] = repoName
|
||||
|
@ -187,6 +193,10 @@ func Diff(ctx *context.Context) {
|
|||
ctx.HTML(200, DIFF)
|
||||
}
|
||||
|
||||
func RawDiff(ctx *context.Context) {
|
||||
panic("not implemented")
|
||||
}
|
||||
|
||||
func CompareDiff(ctx *context.Context) {
|
||||
ctx.Data["IsRepoToolbarCommits"] = true
|
||||
ctx.Data["IsDiffCompare"] = true
|
||||
|
|
|
@ -511,7 +511,7 @@ func gitCommand(gitBinPath, dir string, args ...string) []byte {
|
|||
out, err := command.Output()
|
||||
|
||||
if err != nil {
|
||||
log.GitLogger.Error(4, err.Error())
|
||||
log.GitLogger.Error(4, fmt.Sprintf("%v - %s", err, out))
|
||||
}
|
||||
|
||||
return out
|
||||
|
|
|
@ -1 +1 @@
|
|||
0.9.13.0319
|
||||
0.9.13.0321
|
Reference in a new issue