diff options
author | ᴜɴᴋɴᴡᴏɴ <u@gogs.io> | 2020-03-08 19:09:31 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-08 19:09:31 +0800 |
commit | 6437d0180b97a26319b50c2e22927dac7c94fcdd (patch) | |
tree | 3d0d097e7f498e4b970065096e7500876d365a8b /internal/db/repo_branch.go | |
parent | c65b5b9f84dee21dc362311b299694e8e00f6ac6 (diff) |
git: migrate to github.com/gogs/git-module@v1.0.0 (#5958)
* WIP
* Finish `internal/db/git_diff.go`
* FInish internal/db/mirror.go
* Finish internal/db/pull.go
* Finish internal/db/release.go
* Finish internal/db/repo.go
* Finish internal/db/repo_branch.go
* Finish internal/db/repo_editor.go
* Finish internal/db/update.go
* Save my work
* Add license header
* Compile!
* Merge master
* Finish internal/cmd/hook.go
* Finish internal/conf/static.go
* Finish internal/context/repo.go
* Finish internal/db/action.go
* Finish internal/db/git_diff.go
* Fix submodule URL inferring
* Finish internal/db/mirror.go
* Updat to beta.4
* css: update fonts
* Finish internal/db/pull.go
* Finish internal/db/release.go
* Finish internal/db/repo_branch.go
* Finish internal/db/wiki.go
* gitutil: enhance infer submodule UR
* Finish internal/route/api/v1/repo/commits.go
* mirror: only collect branch commits after sync
* mirror: fix tag support
* Finish internal/db/repo.go
* Finish internal/db/repo_editor.go
* Finish internal/db/update.go
* Finish internal/gitutil/pull_request.go
* Make it compile
* Finish internal/route/repo/setting.go
* Finish internal/route/repo/branch.go
* Finish internal/route/api/v1/repo/file.go
* Finish internal/route/repo/download.go
* Finish internal/route/repo/editor.go
* Use helper
* Finish internal/route/repo/issue.go
* Finish internal/route/repo/pull.go
* Finish internal/route/repo/release.go
* Finish internal/route/repo/repo.go
* Finish internal/route/repo/wiki.go
* Finish internal/route/repo/commit.go
* Finish internal/route/repo/view.go
* Finish internal/gitutil/tag.go
* go.sum
Diffstat (limited to 'internal/db/repo_branch.go')
-rw-r--r-- | internal/db/repo_branch.go | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/internal/db/repo_branch.go b/internal/db/repo_branch.go index 94313101..a4d38ecb 100644 --- a/internal/db/repo_branch.go +++ b/internal/db/repo_branch.go @@ -24,33 +24,33 @@ type Branch struct { } func GetBranchesByPath(path string) ([]*Branch, error) { - gitRepo, err := git.OpenRepository(path) + gitRepo, err := git.Open(path) if err != nil { - return nil, err + return nil, fmt.Errorf("open repository: %v", err) } - brs, err := gitRepo.GetBranches() + names, err := gitRepo.Branches() if err != nil { - return nil, err + return nil, fmt.Errorf("list branches") } - branches := make([]*Branch, len(brs)) - for i := range brs { + branches := make([]*Branch, len(names)) + for i := range names { branches[i] = &Branch{ RepoPath: path, - Name: brs[i], + Name: names[i], } } return branches, nil } -func (repo *Repository) GetBranch(br string) (*Branch, error) { - if !git.IsBranchExist(repo.RepoPath(), br) { - return nil, errors.ErrBranchNotExist{Name: br} +func (repo *Repository) GetBranch(name string) (*Branch, error) { + if !git.RepoHasBranch(repo.RepoPath(), name) { + return nil, errors.ErrBranchNotExist{Name: name} } return &Branch{ RepoPath: repo.RepoPath(), - Name: br, + Name: name, }, nil } @@ -59,11 +59,11 @@ func (repo *Repository) GetBranches() ([]*Branch, error) { } func (br *Branch) GetCommit() (*git.Commit, error) { - gitRepo, err := git.OpenRepository(br.RepoPath) + gitRepo, err := git.Open(br.RepoPath) if err != nil { - return nil, err + return nil, fmt.Errorf("open repository: %v", err) } - return gitRepo.GetBranchCommit(br.Name) + return gitRepo.BranchCommit(br.Name) } type ProtectBranchWhitelist struct { |