mirror of
https://github.com/go-gitea/gitea
synced 2024-12-24 03:35:55 +01:00
Corrections following recommendations
This commit is contained in:
parent
81e5722bcc
commit
b7b30cd85e
@ -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())
|
||||
}
|
||||
|
||||
|
@ -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 {
|
@ -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).
|
||||
|
@ -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{
|
||||
|
@ -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.
|
||||
|
||||
@ -15,7 +15,7 @@ import (
|
||||
// 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"))
|
||||
branch, err := ctx.Repo.Repository.GetBranch(ctx.Params(":branchname"))
|
||||
if err != nil {
|
||||
ctx.APIError(500, "Repository.GetBranch", err)
|
||||
return
|
||||
|
Loading…
Reference in New Issue
Block a user