fix read commit source

1 files changed, 24 insertions, 7 deletions

diff --git a/routers/repo/commit.go b/routers/repo/commit.go
index 3d00f8d7..11aab67c 100644
--- a/routers/repo/commit.go
+++ b/routers/repo/commit.go
@@ -5,13 +5,22 @@
 package repo
 
 import (
+	"container/list"
+	"fmt"
+	"path"
+
 	"github.com/codegangsta/martini"
+
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/modules/middleware"
 )
 
 func Commits(ctx *middleware.Context, params martini.Params) {
-	brs, err := models.GetBranches(params["username"], params["reponame"])
+	userName := params["username"]
+	repoName := params["reponame"]
+	branchName := params["branchname"]
+
+	brs, err := models.GetBranches(userName, repoName)
 	if err != nil {
 		ctx.Handle(200, "repo.Commits", err)
 		return
@@ -20,21 +29,28 @@ func Commits(ctx *middleware.Context, params martini.Params) {
 		return
 	}
 
-	ctx.Data["IsRepoToolbarCommits"] = true
-	commits, err := models.GetCommits(params["username"],
-		params["reponame"], params["branchname"])
+	var commits *list.List
+	if models.IsBranchExist(userName, repoName, branchName) {
+		commits, err = models.GetCommitsByBranch(userName, repoName, branchName)
+	} else {
+		commits, err = models.GetCommitsByCommitId(userName, repoName, branchName)
+	}
+
 	if err != nil {
 		ctx.Handle(404, "repo.Commits", nil)
 		return
 	}
-	ctx.Data["Username"] = params["username"]
-	ctx.Data["Reponame"] = params["reponame"]
+
+	ctx.Data["Username"] = userName
+	ctx.Data["Reponame"] = repoName
 	ctx.Data["CommitCount"] = commits.Len()
 	ctx.Data["Commits"] = commits
+	ctx.Data["IsRepoToolbarCommits"] = true
 	ctx.HTML(200, "repo/commits")
 }
 
 func Diff(ctx *middleware.Context, params martini.Params) {
+	fmt.Println(params["branchname"])
 	commit, err := models.GetCommit(params["username"], params["reponame"], params["branchname"], params["commitid"])
 	if err != nil {
 		ctx.Handle(404, "repo.Diff", err)
@@ -47,11 +63,12 @@ func Diff(ctx *middleware.Context, params martini.Params) {
 		return
 	}
 
-	shortSha := params["commitid"][:7]
+	shortSha := params["commitid"][:10]
 	ctx.Data["Title"] = commit.Message() + " · " + shortSha
 	ctx.Data["Commit"] = commit
 	ctx.Data["ShortSha"] = shortSha
 	ctx.Data["Diff"] = diff
 	ctx.Data["IsRepoToolbarCommits"] = true
+	ctx.Data["SourcePath"] = "/" + path.Join(params["username"], params["reponame"], "src", params["commitid"])
 	ctx.HTML(200, "repo/diff")
 }