Nulo/gitea
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

Use *PushUpdateOptions as receiver (#17724)

Browse source
This commit is contained in:
Gusted 2021-11-24 09:08:13 +00:00 committed by GitHub
parent c97d66d23c
commit 4e7ca946da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
modules/repository/push.go
View file

@ -23,67 +23,67 @@ type PushUpdateOptions struct {
} }
// IsNewRef return true if it's a first-time push to a branch, tag or etc. // IsNewRef return true if it's a first-time push to a branch, tag or etc.
func (opts PushUpdateOptions) IsNewRef() bool { func (opts *PushUpdateOptions) IsNewRef() bool {
return opts.OldCommitID == git.EmptySHA return opts.OldCommitID == git.EmptySHA
} }
// IsDelRef return true if it's a deletion to a branch or tag // IsDelRef return true if it's a deletion to a branch or tag
func (opts PushUpdateOptions) IsDelRef() bool { func (opts *PushUpdateOptions) IsDelRef() bool {
return opts.NewCommitID == git.EmptySHA return opts.NewCommitID == git.EmptySHA
} }
// IsUpdateRef return true if it's an update operation // IsUpdateRef return true if it's an update operation
func (opts PushUpdateOptions) IsUpdateRef() bool { func (opts *PushUpdateOptions) IsUpdateRef() bool {
return !opts.IsNewRef() && !opts.IsDelRef() return !opts.IsNewRef() && !opts.IsDelRef()
} }
// IsTag return true if it's an operation to a tag // IsTag return true if it's an operation to a tag
func (opts PushUpdateOptions) IsTag() bool { func (opts *PushUpdateOptions) IsTag() bool {
return strings.HasPrefix(opts.RefFullName, git.TagPrefix) return strings.HasPrefix(opts.RefFullName, git.TagPrefix)
} }
// IsNewTag return true if it's a creation to a tag // IsNewTag return true if it's a creation to a tag
func (opts PushUpdateOptions) IsNewTag() bool { func (opts *PushUpdateOptions) IsNewTag() bool {
return opts.IsTag() && opts.IsNewRef() return opts.IsTag() && opts.IsNewRef()
} }
// IsDelTag return true if it's a deletion to a tag // IsDelTag return true if it's a deletion to a tag
func (opts PushUpdateOptions) IsDelTag() bool { func (opts *PushUpdateOptions) IsDelTag() bool {
return opts.IsTag() && opts.IsDelRef() return opts.IsTag() && opts.IsDelRef()
} }
// IsBranch return true if it's a push to branch // IsBranch return true if it's a push to branch
func (opts PushUpdateOptions) IsBranch() bool { func (opts *PushUpdateOptions) IsBranch() bool {
return strings.HasPrefix(opts.RefFullName, git.BranchPrefix) return strings.HasPrefix(opts.RefFullName, git.BranchPrefix)
} }
// IsNewBranch return true if it's the first-time push to a branch // IsNewBranch return true if it's the first-time push to a branch
func (opts PushUpdateOptions) IsNewBranch() bool { func (opts *PushUpdateOptions) IsNewBranch() bool {
return opts.IsBranch() && opts.IsNewRef() return opts.IsBranch() && opts.IsNewRef()
} }
// IsUpdateBranch return true if it's not the first push to a branch // IsUpdateBranch return true if it's not the first push to a branch
func (opts PushUpdateOptions) IsUpdateBranch() bool { func (opts *PushUpdateOptions) IsUpdateBranch() bool {
return opts.IsBranch() && opts.IsUpdateRef() return opts.IsBranch() && opts.IsUpdateRef()
} }
// IsDelBranch return true if it's a deletion to a branch // IsDelBranch return true if it's a deletion to a branch
func (opts PushUpdateOptions) IsDelBranch() bool { func (opts *PushUpdateOptions) IsDelBranch() bool {
return opts.IsBranch() && opts.IsDelRef() return opts.IsBranch() && opts.IsDelRef()
} }
// TagName returns simple tag name if it's an operation to a tag // TagName returns simple tag name if it's an operation to a tag
func (opts PushUpdateOptions) TagName() string { func (opts *PushUpdateOptions) TagName() string {
return opts.RefFullName[len(git.TagPrefix):] return opts.RefFullName[len(git.TagPrefix):]
} }
// BranchName returns simple branch name if it's an operation to branch // BranchName returns simple branch name if it's an operation to branch
func (opts PushUpdateOptions) BranchName() string { func (opts *PushUpdateOptions) BranchName() string {
return opts.RefFullName[len(git.BranchPrefix):] return opts.RefFullName[len(git.BranchPrefix):]
} }
// RefName returns simple name for ref // RefName returns simple name for ref
func (opts PushUpdateOptions) RefName() string { func (opts *PushUpdateOptions) RefName() string {
if strings.HasPrefix(opts.RefFullName, git.TagPrefix) { if strings.HasPrefix(opts.RefFullName, git.TagPrefix) {
return opts.RefFullName[len(git.TagPrefix):] return opts.RefFullName[len(git.TagPrefix):]
} else if strings.HasPrefix(opts.RefFullName, git.BranchPrefix) { } else if strings.HasPrefix(opts.RefFullName, git.BranchPrefix) {
@ -93,7 +93,7 @@ func (opts PushUpdateOptions) RefName() string {
} }
// RepoFullName returns repo full name // RepoFullName returns repo full name
func (opts PushUpdateOptions) RepoFullName() string { func (opts *PushUpdateOptions) RepoFullName() string {
return opts.RepoUserName + "/" + opts.RepoName return opts.RepoUserName + "/" + opts.RepoName
} }

6
routers/private/hook_post_receive.go
View file

@ -57,7 +57,7 @@ func HookPostReceive(ctx *gitea_context.PrivateContext) {
wasEmpty = repo.IsEmpty wasEmpty = repo.IsEmpty
} }
option := repo_module.PushUpdateOptions{ option := &repo_module.PushUpdateOptions{
RefFullName: refFullName, RefFullName: refFullName,
OldCommitID: opts.OldCommitIDs[i], OldCommitID: opts.OldCommitIDs[i],
NewCommitID: opts.NewCommitIDs[i], NewCommitID: opts.NewCommitIDs[i],
@ -66,11 +66,11 @@ func HookPostReceive(ctx *gitea_context.PrivateContext) {
RepoUserName: ownerName, RepoUserName: ownerName,
RepoName: repoName, RepoName: repoName,
} }
updates = append(updates, &option) updates = append(updates, option)
if repo.IsEmpty && option.IsBranch() && (option.BranchName() == "master" || option.BranchName() == "main") { if repo.IsEmpty && option.IsBranch() && (option.BranchName() == "master" || option.BranchName() == "main") {
// put the master/main branch first // put the master/main branch first
copy(updates[1:], updates) copy(updates[1:], updates)
updates[0] = &option updates[0] = option
} }
} }
} }