Merge branch 'master' of github.com:gogits/gogs

release/v1.15
Unknown 2014-03-13 02:55:18 -04:00
commit adedd9181c
3 changed files with 18 additions and 9 deletions

View File

@ -267,13 +267,21 @@ const (
)
type RepoFile struct {
Type int
Name string
Type int
Name string
Message string
Created time.Time
}
func GetReposFiles(userName, reposName, treeName, rpath string) ([]RepoFile, error) {
func (f *RepoFile) IsFile() bool {
return f.Type == git.FilemodeBlob || f.Type == git.FilemodeBlobExecutable
}
func (f *RepoFile) IsDir() bool {
return f.Type == git.FilemodeTree
}
func GetReposFiles(userName, reposName, treeName, rpath string) ([]*RepoFile, error) {
f := RepoPath(userName, reposName)
repo, err := git.OpenRepository(f)
if err != nil {
@ -285,7 +293,7 @@ func GetReposFiles(userName, reposName, treeName, rpath string) ([]RepoFile, err
return nil, err
}
lastCommit := obj.(*git.Commit)
var repofiles []RepoFile
var repofiles []*RepoFile
tree, err := lastCommit.Tree()
if err != nil {
return nil, err
@ -293,10 +301,12 @@ func GetReposFiles(userName, reposName, treeName, rpath string) ([]RepoFile, err
var i uint64 = 0
for ; i < tree.EntryCount(); i++ {
entry := tree.EntryByIndex(i)
repofiles = append(repofiles, RepoFile{
repofiles = append(repofiles, &RepoFile{
entry.Filemode,
entry.Name,
time.Now(),
lastCommit.Message(),
lastCommit.Committer().When,
})
}

View File

@ -23,7 +23,6 @@ func Single(params martini.Params, r render.Render, data base.TmplData) {
}
data["IsRepoToolbarSource"] = true
data["Files"] = files
r.HTML(200, "repo/single", data)

View File

@ -6,7 +6,7 @@
<h4>Source Files:</h4>
<ul>
{{range .Files}}
<li>{{.Name}} - {{.Type}}</li>
<li>{{.Name}} - {{.Message}} - {{.Created}} - {{.IsFile}} - {{.IsDir}}</li>
{{end}}
</ul>
</div>