Corrections following recommendations

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

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)
}