From 0f68930892bc49966769f8931e9a531b37dacb3b Mon Sep 17 00:00:00 2001
From: Unknown <joe2010xtmf@163.com>
Date: Mon, 17 Mar 2014 00:57:18 -0400
Subject: [PATCH] Add latest commit in repo viewer

---
 gogs.go                    |  2 +-
 models/repo2.go            | 41 ++++++++++++++++++++++++++++++++++++++
 modules/base/template.go   |  1 +
 modules/base/tool.go       |  5 +++++
 routers/repo/single.go     |  7 +++++++
 templates/repo/single.tmpl |  4 ++--
 6 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/gogs.go b/gogs.go
index 2d5283f3a..6b587993a 100644
--- a/gogs.go
+++ b/gogs.go
@@ -20,7 +20,7 @@ import (
 // Test that go1.1 tag above is included in builds. main.go refers to this definition.
 const go11tag = true
 
-const APP_VER = "0.0.9.0316.1"
+const APP_VER = "0.0.9.0317.1"
 
 func init() {
 	base.AppVer = APP_VER
diff --git a/models/repo2.go b/models/repo2.go
index a8dbc44db..0c17a5833 100644
--- a/models/repo2.go
+++ b/models/repo2.go
@@ -6,11 +6,22 @@ package models
 
 import (
 	"path"
+	"strings"
 	"time"
 
+	"github.com/Unknwon/com"
+
 	"github.com/gogits/git"
 )
 
+type Commit struct {
+	Author  string
+	Email   string
+	Date    time.Time
+	SHA     string
+	Message string
+}
+
 type RepoFile struct {
 	*git.TreeEntry
 	Path    string
@@ -85,3 +96,33 @@ func GetReposFiles(userName, reposName, branchName, rpath string) ([]*RepoFile,
 
 	return append(repodirs, repofiles...), nil
 }
+
+func GetLastestCommit(userName, repoName string) (*Commit, error) {
+	stdout, _, err := com.ExecCmd("git", "--git-dir="+RepoPath(userName, repoName), "log", "-1")
+	if err != nil {
+		return nil, err
+	}
+
+	commit := new(Commit)
+	for _, line := range strings.Split(stdout, "\n") {
+		if len(line) == 0 {
+			continue
+		}
+		switch {
+		case line[0] == 'c':
+			commit.SHA = line[7:]
+		case line[0] == 'A':
+			infos := strings.SplitN(line, " ", 3)
+			commit.Author = infos[1]
+			commit.Email = infos[2][1 : len(infos[2])-1]
+		case line[0] == 'D':
+			commit.Date, err = time.Parse("Mon Jan 02 15:04:05 2006 -0700", line[8:])
+			if err != nil {
+				return nil, err
+			}
+		case line[:4] == "    ":
+			commit.Message = line[4:]
+		}
+	}
+	return commit, nil
+}
diff --git a/modules/base/template.go b/modules/base/template.go
index b38ab140c..1a0b5977e 100644
--- a/modules/base/template.go
+++ b/modules/base/template.go
@@ -19,6 +19,7 @@ var TemplateFuncs template.FuncMap = map[string]interface{}{
 	"AppVer": func() string {
 		return AppVer
 	},
+	"AvatarLink": AvatarLink,
 	"str2html":   Str2html,
 	"TimeSince":  TimeSince,
 	"FileSize":   FileSize,
diff --git a/modules/base/tool.go b/modules/base/tool.go
index 10b3fee37..046b2c517 100644
--- a/modules/base/tool.go
+++ b/modules/base/tool.go
@@ -22,6 +22,11 @@ func EncodeMd5(str string) string {
 	return hex.EncodeToString(m.Sum(nil))
 }
 
+// AvatarLink returns avatar link by given e-mail.
+func AvatarLink(email string) string {
+	return "http://1.gravatar.com/avatar/" + EncodeMd5(email)
+}
+
 // Seconds-based time units
 const (
 	Minute = 60
diff --git a/routers/repo/single.go b/routers/repo/single.go
index fd4d52903..10b2ae810 100644
--- a/routers/repo/single.go
+++ b/routers/repo/single.go
@@ -50,6 +50,13 @@ func Single(ctx *middleware.Context, params martini.Params) {
 		}
 	}
 
+	commit, err := models.GetLastestCommit(params["username"], params["reponame"])
+	if err != nil {
+		ctx.Handle(200, "repo.Single", err)
+		return
+	}
+	ctx.Data["LatestCommit"] = commit
+
 	ctx.Data["Paths"] = Paths
 	ctx.Data["Treenames"] = treenames
 	ctx.Data["IsRepoToolbarSource"] = true
diff --git a/templates/repo/single.tmpl b/templates/repo/single.tmpl
index e1fb05bd0..4c6c7dd94 100644
--- a/templates/repo/single.tmpl
+++ b/templates/repo/single.tmpl
@@ -36,10 +36,10 @@
         </div>
         <div class="panel panel-default info-box">
             <div class="panel-heading info-head">
-                Merge branch 'release/1.1.1'
+                <a href="/{{$username}}/{{$reponame}}/commit/{{.LatestCommit.SHA}}">{{.LatestCommit.Message}}</a>
             </div>
             <div class="panel-body info-content">
-                slene authored 4 days ago
+                <a href="/user/{{.LatestCommit.Author}}">{{.LatestCommit.Author}}</a> <span class="text-muted">{{TimeSince .LatestCommit.Date}}</span>
             </div>
             <table class="panel-footer table file-list">
                 <thead class="hidden">