summaryrefslogtreecommitdiffstats
path: root/routers/api/v1/repo
diff options
context:
space:
mode:
Diffstat (limited to 'routers/api/v1/repo')
-rw-r--r--routers/api/v1/repo/branch.go18
1 files changed, 12 insertions, 6 deletions
diff --git a/routers/api/v1/repo/branch.go b/routers/api/v1/repo/branch.go
index 7b745de5ff..2f4c36f751 100644
--- a/routers/api/v1/repo/branch.go
+++ b/routers/api/v1/repo/branch.go
@@ -14,36 +14,42 @@ 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"))
if err != nil {
- //TODO handle error
+ ctx.APIError(500, "Repository.GetBranch", err)
return
}
+ //Getting the last commit of the branch
c, err := branch.GetCommit()
if err != nil {
- //TODO handle error
+ ctx.APIError(500, "Branch.GetCommit", err)
return
}
+ //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
Branches, err := ctx.Repo.Repository.GetBranches()
if err != nil {
- //TODO handle error
+ ctx.APIError(500, "Repository.GetBranches", err)
return
}
+ //Getting the last commit of each branch
apiBranches := make([]*api.Branch, len(Branches))
for i := range Branches {
c, err := Branches[i].GetCommit()
if err != nil {
- //TODO handle error
- continue
+ ctx.APIError(500, "Branch.GetCommit", err)
+ return
}
+ //Converting to API format
apiBranches[i] = convert.ToApiBranch(Branches[i],c)
}
-
+ //Sending the payload
ctx.JSON(200, &apiBranches)
}