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/cmd | |
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/cmd')
-rw-r--r-- | internal/cmd/hook.go | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/internal/cmd/hook.go b/internal/cmd/hook.go index 1d103d47..de95a57d 100644 --- a/internal/cmd/hook.go +++ b/internal/cmd/hook.go @@ -9,6 +9,7 @@ import ( "bytes" "crypto/tls" "fmt" + "net/url" "os" "os/exec" "path/filepath" @@ -25,7 +26,6 @@ import ( "gogs.io/gogs/internal/db/errors" "gogs.io/gogs/internal/email" "gogs.io/gogs/internal/httplib" - "gogs.io/gogs/internal/template" ) var ( @@ -87,7 +87,7 @@ func runHookPreReceive(c *cli.Context) error { } oldCommitID := string(fields[0]) newCommitID := string(fields[1]) - branchName := strings.TrimPrefix(string(fields[2]), git.BRANCH_PREFIX) + branchName := git.RefShortName(string(fields[2])) // Branch protection repoID := com.StrTo(os.Getenv(db.ENV_REPO_ID)).MustInt64() @@ -121,7 +121,7 @@ func runHookPreReceive(c *cli.Context) error { } // check and deletion - if newCommitID == git.EMPTY_SHA { + if newCommitID == git.EmptyID { fail(fmt.Sprintf("Branch '%s' is protected from deletion", branchName), "") } @@ -221,7 +221,7 @@ func runHookPostReceive(c *cli.Context) error { options := db.PushUpdateOptions{ OldCommitID: string(fields[0]), NewCommitID: string(fields[1]), - RefFullName: string(fields[2]), + FullRefspec: string(fields[2]), PusherID: com.StrTo(os.Getenv(db.ENV_AUTH_USER_ID)).MustInt64(), PusherName: os.Getenv(db.ENV_AUTH_USER_NAME), RepoUserName: os.Getenv(db.ENV_REPO_OWNER_NAME), @@ -232,19 +232,20 @@ func runHookPostReceive(c *cli.Context) error { } // Ask for running deliver hook and test pull request tasks - reqURL := conf.Server.LocalRootURL + options.RepoUserName + "/" + options.RepoName + "/tasks/trigger?branch=" + - template.EscapePound(strings.TrimPrefix(options.RefFullName, git.BRANCH_PREFIX)) + - "&secret=" + os.Getenv(db.ENV_REPO_OWNER_SALT_MD5) + - "&pusher=" + os.Getenv(db.ENV_AUTH_USER_ID) + q := make(url.Values) + q.Add("branch", git.RefShortName(options.FullRefspec)) + q.Add("secret", os.Getenv(db.ENV_REPO_OWNER_SALT_MD5)) + q.Add("pusher", os.Getenv(db.ENV_AUTH_USER_ID)) + reqURL := fmt.Sprintf("%s%s/%s/tasks/trigger?%s", conf.Server.LocalRootURL, options.RepoUserName, options.RepoName, q.Encode()) log.Trace("Trigger task: %s", reqURL) resp, err := httplib.Head(reqURL).SetTLSClientConfig(&tls.Config{ InsecureSkipVerify: true, }).Response() if err == nil { - resp.Body.Close() + _ = resp.Body.Close() if resp.StatusCode/100 != 2 { - log.Error("Failed to trigger task: not 2xx response code") + log.Error("Failed to trigger task: unsuccessful response code %d", resp.StatusCode) } } else { log.Error("Failed to trigger task: %v", err) |