Near ready

This commit is contained in:
Antoine GIRARD 2016-01-15 19:24:03 +01:00
parent 566163ab82
commit c11c3b6c11
5 changed files with 134 additions and 1 deletions

43
models/branch.go Normal file
View File

@ -0,0 +1,43 @@
package models
import (
"github.com/gogits/git-module"
)
type Branch struct {
Path string
Name string
}
func GetBranchesByPath(path string) ([]*Branch, error) {
gitRepo, err := git.OpenRepository(path)
if err != nil {
return nil, err
}
brs, err := gitRepo.GetBranches()
if err != nil {
return nil, err
}
Branches := make([]*Branch, len(brs))
for i := range brs {
Branches[i] = &Branch{
Path: path,
Name: brs[i],
}
}
return Branches, nil
}
func GetBranchesByRepo(user,repo string) ([]*Branch, error) {
return GetBranchesByPath(RepoPath(user, repo))
}
func (br *Branch) GetCommit() (*git.Commit, error) {
gitRepo, err := git.OpenRepository(br.Path)
if err != nil {
return nil, err
}
return gitRepo.GetBranchCommit(br.Name)
}

View File

@ -288,6 +288,20 @@ func (repo *Repository) GetMirror() (err error) {
return err return err
} }
func (repo *Repository) GetBranch(br string) (_ *Branch, err error) {
if(!git.IsBranchExist(repo.RepoPath(), br)){
return nil, errors.New("Branch do not exist");
}
return &Branch{
Path: repo.RepoPath(),
Name: br,
},nil
}
func (repo *Repository) GetBranches() (_ []*Branch, err error) {
return GetBranchesByPath(repo.RepoPath())
}
func (repo *Repository) GetBaseRepo() (err error) { func (repo *Repository) GetBaseRepo() (err error) {
if !repo.IsFork { if !repo.IsFork {
return nil return nil

View File

@ -183,7 +183,10 @@ func RegisterRoutes(m *macaron.Macaron) {
m.Patch("/hooks/:id:int", bind(api.EditHookOption{}), repo.EditHook) m.Patch("/hooks/:id:int", bind(api.EditHookOption{}), repo.EditHook)
m.Get("/raw/*", middleware.RepoRef(), repo.GetRawFile) m.Get("/raw/*", middleware.RepoRef(), repo.GetRawFile)
m.Get("/archive/*", repo.GetArchive) m.Get("/archive/*", repo.GetArchive)
m.Group("/branches", func() {
m.Get("",repo.ListBranches)
m.Get("/:id",repo.GetBranch)
})
m.Group("/keys", func() { m.Group("/keys", func() {
m.Combo("").Get(repo.ListDeployKeys). m.Combo("").Get(repo.ListDeployKeys).
Post(bind(api.CreateKeyOption{}), repo.CreateDeployKey) Post(bind(api.CreateKeyOption{}), repo.CreateDeployKey)

View File

@ -10,11 +10,32 @@ import (
"github.com/Unknwon/com" "github.com/Unknwon/com"
api "github.com/gogits/go-gogs-client" api "github.com/gogits/go-gogs-client"
"github.com/gogits/git-module"
"github.com/gogits/gogs/models" "github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/setting" "github.com/gogits/gogs/modules/setting"
) )
// ToApiBranch converts user to its API format.
func ToApiBranch(b *models.Branch,c *git.Commit) *api.Branch {
return &api.Branch{
Name: b.Name,
Commit: ToApiCommit(c),
}
}
// ToApiCommit converts user to its API format.
func ToApiCommit(c *git.Commit) *api.PayloadCommit {
return &api.PayloadCommit{
ID: c.ID.String(),
Message: c.Message(),
URL: "Not implemented",
Author: &api.PayloadAuthor{
Name: c.Committer.Name,
Email: c.Committer.Email,
/* UserName: c.Committer.UserName, */
},
}
}
// ToApiUser converts user to its API format. // ToApiUser converts user to its API format.
func ToApiUser(u *models.User) *api.User { func ToApiUser(u *models.User) *api.User {
return &api.User{ return &api.User{

View File

@ -0,0 +1,52 @@
// 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 repo
import (
//TODO change for merge
api "github.com/gogits/go-gogs-client"
"github.com/gogits/gogs/modules/middleware"
"github.com/gogits/gogs/routers/api/v1/convert"
)
//TODO add to github.com/gogits/go-gogs-client
// https://github.com/gogits/go-gogs-client/wiki/Repositories#get-branch
func GetBranch(ctx *middleware.Context) {
branch, err := ctx.Repo.Repository.GetBranch(ctx.Params(":id"))
if err != nil {
//TODO handle error
return
}
c, err := branch.GetCommit()
if err != nil {
//TODO handle error
return
}
ctx.JSON(200, convert.ToApiBranch(branch,c))
}
//TODO add to github.com/gogits/go-gogs-client
// https://github.com/gogits/go-gogs-client/wiki/Repositories#list-branches
func ListBranches(ctx *middleware.Context) {
Branches, err := ctx.Repo.Repository.GetBranches()
if err != nil {
//TODO handle error
return
}
apiBranches := make([]*api.Branch, len(Branches))
for i := range Branches {
c, err := Branches[i].GetCommit()
if err != nil {
//TODO handle error
continue
}
apiBranches[i] = convert.ToApiBranch(Branches[i],c)
}
ctx.JSON(200, &apiBranches)
}