Add search commits

3 files changed, 75 insertions, 1 deletions

diff --git a/routers/api/v1/repositories.go b/routers/api/v1/repositories.go
new file mode 100644
index 0000000000..4d05c1a77a
--- /dev/null
+++ b/routers/api/v1/repositories.go
@@ -0,0 +1,32 @@
+// Copyright 2014 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package v1
+
+import (
+	"github.com/gogits/gogs/models"
+	"github.com/gogits/gogs/modules/middleware"
+)
+
+func SearchCommits(ctx *middleware.Context) {
+	userName := ctx.Query("username")
+	repoName := ctx.Query("reponame")
+	branch := ctx.Query("branch")
+	keyword := ctx.Query("q")
+	if len(keyword) == 0 {
+		ctx.Render.JSON(404, nil)
+		return
+	}
+
+	commits, err := models.SearchCommits(models.RepoPath(userName, repoName), branch, keyword)
+	if err != nil {
+		ctx.Render.JSON(200, map[string]interface{}{"ok": false})
+		return
+	}
+
+	ctx.Render.JSON(200, map[string]interface{}{
+		"ok":      true,
+		"commits": commits,
+	})
+}
diff --git a/routers/repo/commit.go b/routers/repo/commit.go
index d29c40e67e..5e4cc63f11 100644
--- a/routers/repo/commit.go
+++ b/routers/repo/commit.go
@@ -22,7 +22,7 @@ func Commits(ctx *middleware.Context, params martini.Params) {
 
 	brs, err := models.GetBranches(userName, repoName)
 	if err != nil {
-		ctx.Handle(200, "repo.Commits", err)
+		ctx.Handle(500, "repo.Commits", err)
 		return
 	} else if len(brs) == 0 {
 		ctx.Handle(404, "repo.Commits", nil)
@@ -90,3 +90,41 @@ func Diff(ctx *middleware.Context, params martini.Params) {
 	ctx.Data["RawPath"] = "/" + path.Join(userName, repoName, "raw", commitId)
 	ctx.HTML(200, "repo/diff")
 }
+
+func SearchCommits(ctx *middleware.Context, params martini.Params) {
+	keyword := ctx.Query("q")
+	if len(keyword) == 0 {
+		ctx.Redirect(ctx.Repo.RepoLink + "/commits/" + ctx.Repo.BranchName)
+		return
+	}
+
+	userName := params["username"]
+	repoName := params["reponame"]
+	branchName := params["branchname"]
+
+	brs, err := models.GetBranches(userName, repoName)
+	if err != nil {
+		ctx.Handle(500, "repo.SearchCommits(GetBranches)", err)
+		return
+	} else if len(brs) == 0 {
+		ctx.Handle(404, "repo.SearchCommits(GetBranches)", nil)
+		return
+	}
+
+	var commits *list.List
+	if !models.IsBranchExist(userName, repoName, branchName) {
+		ctx.Handle(404, "repo.SearchCommits(IsBranchExist)", err)
+		return
+	} else if commits, err = models.SearchCommits(models.RepoPath(userName, repoName), branchName, keyword); err != nil {
+		ctx.Handle(500, "repo.SearchCommits(SearchCommits)", err)
+		return
+	}
+
+	ctx.Data["Keyword"] = keyword
+	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")
+}
diff --git a/routers/repo/repo.go b/routers/repo/repo.go
index 1ae4a3740a..3859b43e87 100644
--- a/routers/repo/repo.go
+++ b/routers/repo/repo.go
@@ -425,3 +425,7 @@ func Action(ctx *middleware.Context, params martini.Params) {
 		"ok": true,
 	})
 }
+
+func Import(ctx *middleware.Context, params martini.Params) {
+	ctx.ResponseWriter.Write([]byte("not done yet"))
+}