finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add route for #2846

Browse source
This commit is contained in:
Unknwon 2016-03-21 10:49:46 -04:00
parent 004fb30ebe
commit 60ae8ac3d2
5 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
routers/repo/commit.go
View file

@ -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

2
routers/repo/http.go
View file

@ -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