add commits

diff --git a/models/repo2.go b/models/repo2.go
index 91c057808b1e1693da9f1cbc139fc0a1ecebaa18..8356c52de4fd2f6fee2f9f183c807b5012d2810b 100644 (file)
--- a/models/repo2.go
+++ b/models/repo2.go
@@ -191,3 +191,15 @@ func GetLastestCommit(userName, repoName string) (*Commit, error) {
        }
        return commit, nil
 }
+
+func GetCommits(userName, reposName, branchname string) ([]*git.Commit, error) {
+       repo, err := git.OpenRepository(RepoPath(userName, reposName))
+       if err != nil {
+               return nil, err
+       }
+       r, err := repo.LookupReference(fmt.Sprintf("refs/heads/%s", branchname))
+       if err != nil {
+               return nil, err
+       }
+       return r.AllCommits()
+}

diff --git a/routers/repo/single.go b/routers/repo/single.go
index cf64cc6b529d0a2ac15c3b87c277ec5e6c396841..eda71f29251dcf97a026f7379dbbb813d6eae18f 100644 (file)
--- a/routers/repo/single.go
+++ b/routers/repo/single.go
@@ -131,8 +131,15 @@ func Setting(ctx *middleware.Context, params martini.Params) {
        ctx.Render.HTML(200, "repo/setting", ctx.Data)
 }
 
-func Commits(ctx *middleware.Context) {
+func Commits(ctx *middleware.Context, params martini.Params) {
        ctx.Data["IsRepoToolbarCommits"] = true
+       commits, err := models.GetCommits(params["username"],
+               params["reponame"], params["branchname"])
+       if err != nil {
+               ctx.Render.Error(404)
+               return
+       }
+       ctx.Data["Commits"] = commits
        ctx.Render.HTML(200, "repo/commits", ctx.Data)
 }
 

diff --git a/templates/repo/commits.tmpl b/templates/repo/commits.tmpl
index 7ebe68b6a0675ca09da69f924c2c567da708a797..9190a030a34066107ecb665c9fc70fb54b884c93 100644 (file)
--- a/templates/repo/commits.tmpl
+++ b/templates/repo/commits.tmpl
@@ -4,6 +4,11 @@
 {{template "repo/toolbar" .}}
 <div id="gogs-body" class="container">
     <div id="gogs-commits">
+    <ul>
+    {{range .Commits}}
+    <li>{{.Committer.Name}} - {{.Id}} - {{.Message}} - {{.Committer.When}}</li>
+    {{end}}
+    </ul>
     </div>
 </div>
 {{template "base/footer" .}}
\ No newline at end of file

diff --git a/web.go b/web.go
index b1399953b1eaa80c2bb547c411f168e5864dba1e..2177d5662f9b7d0f1185ed0615eb48e81dc2e6de 100644 (file)
--- a/web.go
+++ b/web.go
@@ -74,7 +74,7 @@ func runWeb(*cli.Context) {
        m.Post("/:username/:reponame/settings", middleware.SignInRequire(true), middleware.RepoAssignment(true), repo.SettingPost)
        m.Get("/:username/:reponame/settings", middleware.SignInRequire(true), middleware.RepoAssignment(true), repo.Setting)
 
-       m.Get("/:username/:reponame/commits", middleware.SignInRequire(false), middleware.RepoAssignment(true), repo.Commits)
+       m.Get("/:username/:reponame/commits/:branchname", middleware.SignInRequire(false), middleware.RepoAssignment(true), repo.Commits)
        m.Get("/:username/:reponame/issues", middleware.SignInRequire(false), middleware.RepoAssignment(true), repo.Issues)
        m.Get("/:username/:reponame/pulls", middleware.SignInRequire(false), middleware.RepoAssignment(true), repo.Pulls)
        m.Get("/:username/:reponame/branches", middleware.SignInRequire(false), middleware.RepoAssignment(true), repo.Branches)