From b7b30cd85e5cabd9d643013ffb10dafd133b18ea Mon Sep 17 00:00:00 2001
From: Antoine GIRARD <sapk@sapk.fr>
Date: Thu, 28 Jan 2016 20:49:05 +0100
Subject: Corrections following recommendations

---
 models/branch.go      | 43 -------------------------------------------
 models/repo.go        |  6 +++---
 models/repo_branch.go | 43 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 46 deletions(-)
 delete mode 100644 models/branch.go
 create mode 100644 models/repo_branch.go

(limited to 'models')

diff --git a/models/branch.go b/models/branch.go
deleted file mode 100644
index 08b5b7c3..00000000
--- a/models/branch.go
+++ /dev/null
@@ -1,43 +0,0 @@
-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)
-}
diff --git a/models/repo.go b/models/repo.go
index 82fea00a..a0074a29 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -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())
 }
 
diff --git a/models/repo_branch.go b/models/repo_branch.go
new file mode 100644
index 00000000..b784f7d5
--- /dev/null
+++ b/models/repo_branch.go
@@ -0,0 +1,43 @@
+// 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 (
+	"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 (br *Branch) GetCommit() (*git.Commit, error) {
+	gitRepo, err := git.OpenRepository(br.Path)
+	if err != nil {
+		return nil, err
+	}
+	return gitRepo.GetBranchCommit(br.Name)
+}
-- 
cgit v1.2.3