darkkirb/harness-drone
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #824 from orjanbruland/master

Browse source 
Use Slug instead of Name for Bitbucket repos.
This commit is contained in:
Brad Rydzewski 2015-01-16 21:22:39 -08:00
commit 11e7ea7e15
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugin/remote/bitbucket/bitbucket.go
View file

@ -155,16 +155,16 @@ func (r *Bitbucket) GetRepos(user *model.User) ([]*model.Repo, error) {
// these are the urls required to clone the repository // these are the urls required to clone the repository
// TODO use the bitbucketurl.Host and bitbucketurl.Scheme instead of hardcoding // TODO use the bitbucketurl.Host and bitbucketurl.Scheme instead of hardcoding
// so that we can support Stash. // so that we can support Stash.
var html = fmt.Sprintf("https://bitbucket.org/%s/%s", item.Owner, item.Name) var html = fmt.Sprintf("https://bitbucket.org/%s/%s", item.Owner, item.Slug)
var clone = fmt.Sprintf("https://bitbucket.org/%s/%s.git", item.Owner, item.Name) var clone = fmt.Sprintf("https://bitbucket.org/%s/%s.git", item.Owner, item.Slug)
var ssh = fmt.Sprintf("git@bitbucket.org:%s/%s.git", item.Owner, item.Name) var ssh = fmt.Sprintf("git@bitbucket.org:%s/%s.git", item.Owner, item.Slug)
var repo = model.Repo{ var repo = model.Repo{
UserID: user.ID, UserID: user.ID,
Remote: remote, Remote: remote,
Host: hostname, Host: hostname,
Owner: item.Owner, Owner: item.Owner,
Name: item.Name, Name: item.Slug,
Private: item.Private, Private: item.Private,
URL: html, URL: html,
CloneURL: clone, CloneURL: clone,
@ -261,7 +261,7 @@ func (r *Bitbucket) ParseHook(req *http.Request) (*model.Hook, error) {
return &model.Hook{ return &model.Hook{
Owner: hook.Repo.Owner, Owner: hook.Repo.Owner,
Repo: hook.Repo.Name, Repo: hook.Repo.Slug,
Sha: hook.Commits[len(hook.Commits)-1].Hash, Sha: hook.Commits[len(hook.Commits)-1].Hash,
Branch: hook.Commits[len(hook.Commits)-1].Branch, Branch: hook.Commits[len(hook.Commits)-1].Branch,
Author: author, Author: author,