Add latest commit in repo viewer
This commit is contained in:
parent
664bbe4f54
commit
0f68930892
2
gogs.go
2
gogs.go
@ -20,7 +20,7 @@ import (
|
|||||||
// Test that go1.1 tag above is included in builds. main.go refers to this definition.
|
// Test that go1.1 tag above is included in builds. main.go refers to this definition.
|
||||||
const go11tag = true
|
const go11tag = true
|
||||||
|
|
||||||
const APP_VER = "0.0.9.0316.1"
|
const APP_VER = "0.0.9.0317.1"
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
base.AppVer = APP_VER
|
base.AppVer = APP_VER
|
||||||
|
@ -6,11 +6,22 @@ package models
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"path"
|
"path"
|
||||||
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/Unknwon/com"
|
||||||
|
|
||||||
"github.com/gogits/git"
|
"github.com/gogits/git"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
type Commit struct {
|
||||||
|
Author string
|
||||||
|
Email string
|
||||||
|
Date time.Time
|
||||||
|
SHA string
|
||||||
|
Message string
|
||||||
|
}
|
||||||
|
|
||||||
type RepoFile struct {
|
type RepoFile struct {
|
||||||
*git.TreeEntry
|
*git.TreeEntry
|
||||||
Path string
|
Path string
|
||||||
@ -85,3 +96,33 @@ func GetReposFiles(userName, reposName, branchName, rpath string) ([]*RepoFile,
|
|||||||
|
|
||||||
return append(repodirs, repofiles...), nil
|
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
|
||||||
|
}
|
||||||
|
@ -19,6 +19,7 @@ var TemplateFuncs template.FuncMap = map[string]interface{}{
|
|||||||
"AppVer": func() string {
|
"AppVer": func() string {
|
||||||
return AppVer
|
return AppVer
|
||||||
},
|
},
|
||||||
|
"AvatarLink": AvatarLink,
|
||||||
"str2html": Str2html,
|
"str2html": Str2html,
|
||||||
"TimeSince": TimeSince,
|
"TimeSince": TimeSince,
|
||||||
"FileSize": FileSize,
|
"FileSize": FileSize,
|
||||||
|
@ -22,6 +22,11 @@ func EncodeMd5(str string) string {
|
|||||||
return hex.EncodeToString(m.Sum(nil))
|
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
|
// Seconds-based time units
|
||||||
const (
|
const (
|
||||||
Minute = 60
|
Minute = 60
|
||||||
|
@ -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["Paths"] = Paths
|
||||||
ctx.Data["Treenames"] = treenames
|
ctx.Data["Treenames"] = treenames
|
||||||
ctx.Data["IsRepoToolbarSource"] = true
|
ctx.Data["IsRepoToolbarSource"] = true
|
||||||
|
@ -36,10 +36,10 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="panel panel-default info-box">
|
<div class="panel panel-default info-box">
|
||||||
<div class="panel-heading info-head">
|
<div class="panel-heading info-head">
|
||||||
Merge branch 'release/1.1.1'
|
<a href="/{{$username}}/{{$reponame}}/commit/{{.LatestCommit.SHA}}">{{.LatestCommit.Message}}</a>
|
||||||
</div>
|
</div>
|
||||||
<div class="panel-body info-content">
|
<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>
|
</div>
|
||||||
<table class="panel-footer table file-list">
|
<table class="panel-footer table file-list">
|
||||||
<thead class="hidden">
|
<thead class="hidden">
|
||||||
|
Loading…
Reference in New Issue
Block a user