test1234/gitea
1
0
Fork 0
forked from gitea/gitea
Code Pull Requests Activity

Corrections following recommendations

Browse Source
This commit is contained in:
Antoine GIRARD 2016-01-28 20:49:05 +01:00
parent 81e5722bcc
commit b7b30cd85e
5 changed files with 39 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
models/repo.go
View File

@ -288,9 +288,9 @@ func (repo *Repository) GetMirror() (err error) {
return err
}
func (repo *Repository) GetBranch(br string) (_ *Branch, err error) {
func (repo *Repository) GetBranch(br string) (*Branch, error) {
if(!git.IsBranchExist(repo.RepoPath(), br)){
return nil, errors.New("Branch do not exist");
return nil, fmt.Errorf("Branch does not exist: %s", br);
}
return &Branch{
Path: repo.RepoPath(),
@ -298,7 +298,7 @@ func (repo *Repository) GetBranch(br string) (_ *Branch, err error) {
},nil
}
func (repo *Repository) GetBranches() (_ []*Branch, err error) {
func (repo *Repository) GetBranches() ([]*Branch, error) {
return GetBranchesByPath(repo.RepoPath())
}

8
models/branch.go → models/repo_branch.go
View File

@ -1,3 +1,7 @@
// Copyright 2016 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 models
import (
@ -30,10 +34,6 @@ func GetBranchesByPath(path string) ([]*Branch, error) {
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 {

2
routers/api/v1/api.go
View File

@ -185,7 +185,7 @@ func RegisterRoutes(m *macaron.Macaron) {
m.Get("/archive/*", repo.GetArchive)
m.Group("/branches", func() {
m.Get("",repo.ListBranches)
m.Get("/:id",repo.GetBranch)
m.Get("/:branchname",repo.GetBranch)
})
m.Group("/keys", func() {
m.Combo("").Get(repo.ListDeployKeys).

42
routers/api/v1/convert/convert.go
View File

@ -16,26 +16,6 @@ import (
"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.
func ToApiUser(u *models.User) *api.User {
return &api.User{
@ -71,6 +51,28 @@ func ToApiRepository(owner *models.User, repo *models.Repository, permission api
}
}
// 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, */
},
}
}
// ToApiPublicKey converts public key to its API format.
func ToApiPublicKey(apiLink string, key *models.PublicKey) *api.PublicKey {
return &api.PublicKey{

18
routers/api/v1/repo/branch.go
View File

@ -1,4 +1,4 @@
// Copyright 2014 The Gogs Authors. All rights reserved.
// Copyright 2016 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.
@ -14,32 +14,32 @@ import (
// Temporary: https://gist.github.com/sapk/df64347ff218baf4a277#get-a-branch
// https://github.com/gogits/go-gogs-client/wiki/Repositories-Branches#get-a-branch
func GetBranch(ctx *middleware.Context) {
//Getting the branch requested
branch, err := ctx.Repo.Repository.GetBranch(ctx.Params(":id"))
// Getting the branch requested
branch, err := ctx.Repo.Repository.GetBranch(ctx.Params(":branchname"))
if err != nil {
ctx.APIError(500, "Repository.GetBranch", err)
return
}
//Getting the last commit of the branch
// Getting the last commit of the branch
c, err := branch.GetCommit()
if err != nil {
ctx.APIError(500, "Branch.GetCommit", err)
return
}
//Converting to API format and send payload
// Converting to API format and send payload
ctx.JSON(200, convert.ToApiBranch(branch,c))
}
// Temporary: https://gist.github.com/sapk/df64347ff218baf4a277#list-branches
// https://github.com/gogits/go-gogs-client/wiki/Repositories-Branches#list-branches
func ListBranches(ctx *middleware.Context) {
//Listing of branches
// Listing of branches
Branches, err := ctx.Repo.Repository.GetBranches()
if err != nil {
ctx.APIError(500, "Repository.GetBranches", err)
return
}
//Getting the last commit of each branch
// Getting the last commit of each branch
apiBranches := make([]*api.Branch, len(Branches))
for i := range Branches {
c, err := Branches[i].GetCommit()
@ -47,9 +47,9 @@ func ListBranches(ctx *middleware.Context) {
ctx.APIError(500, "Branch.GetCommit", err)
return
}
//Converting to API format
// Converting to API format
apiBranches[i] = convert.ToApiBranch(Branches[i],c)
}
//Sending the payload
// Sending the payload
ctx.JSON(200, &apiBranches)
}