peter/go-gitea
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rename MergeStyleRebaseMergeCommit to MergeStyleRebaseMerge

Browse Source 
as requested by @lafriks
This commit is contained in:
Julian Tölle 2018-07-23 19:19:29 +02:00
parent 801decda01
commit 9a4aefa076
12 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
integrations/pull_merge_test.go
View File

@ -76,7 +76,7 @@ func TestPullRebase(t *testing.T) {
testPullMerge(t, session, elem[1], elem[2], elem[4], models.MergeStyleRebase) testPullMerge(t, session, elem[1], elem[2], elem[4], models.MergeStyleRebase)
} }
func TestPullRebaseMergeCommit(t *testing.T) { func TestPullRebaseMerge(t *testing.T) {
// TODO // TODO
prepareTestEnv(t) prepareTestEnv(t)
session := loginUser(t, "user1") session := loginUser(t, "user1")
@ -87,7 +87,7 @@ func TestPullRebaseMergeCommit(t *testing.T) {
elem := strings.Split(test.RedirectURL(resp), "/") elem := strings.Split(test.RedirectURL(resp), "/")
assert.EqualValues(t, "pulls", elem[3]) assert.EqualValues(t, "pulls", elem[3])
testPullMerge(t, session, elem[1], elem[2], elem[4], models.MergeStyleRebaseMergeCommit) testPullMerge(t, session, elem[1], elem[2], elem[4], models.MergeStyleRebaseMerge)
} }
func TestPullSquash(t *testing.T) { func TestPullSquash(t *testing.T) {

4
models/fixtures/repo_unit.yml
View File

@ -30,7 +30,7 @@
id: 5 id: 5
repo_id: 1 repo_id: 1
type: 3 type: 3
config: "{\"IgnoreWhitespaceConflicts\":false,\"AllowMerge\":true,\"AllowRebase\":true,\"AllowRebaseMergeCommit\":true,\"AllowSquash\":true}" config: "{\"IgnoreWhitespaceConflicts\":false,\"AllowMerge\":true,\"AllowRebase\":true,\"AllowRebaseMerge\":true,\"AllowSquash\":true}"
created_unix: 946684810 created_unix: 946684810
- -
@ -51,7 +51,7 @@
id: 8 id: 8
repo_id: 3 repo_id: 3
type: 3 type: 3
config: "{\"IgnoreWhitespaceConflicts\":true,\"AllowMerge\":true,\"AllowRebase\":false,\"AllowRebaseMergeCommit\":true,\"AllowSquash\":false}" config: "{\"IgnoreWhitespaceConflicts\":true,\"AllowMerge\":true,\"AllowRebase\":false,\"AllowRebaseMerge\":true,\"AllowSquash\":false}"
created_unix: 946684810 created_unix: 946684810
- -

2
models/migrations/migrations.go
View File

@ -195,7 +195,7 @@ var migrations = []Migration{
// v70 -> v71 // v70 -> v71
NewMigration("add issue_dependencies", addIssueDependencies), NewMigration("add issue_dependencies", addIssueDependencies),
// v71 -> v72 // v71 -> v72
NewMigration("add pull request rebase with merge commit", addPullRequestRebaseWithMergeCommit), NewMigration("add pull request rebase with merge commit", addPullRequestRebaseWithMerge),
} }
// Migrate database to current version // Migrate database to current version

6
models/migrations/v71.go
View File

@ -12,7 +12,7 @@ import (
"github.com/go-xorm/xorm" "github.com/go-xorm/xorm"
) )
func addPullRequestRebaseWithMergeCommit(x *xorm.Engine) error { func addPullRequestRebaseWithMerge(x *xorm.Engine) error {
// RepoUnit describes all units of a repository // RepoUnit describes all units of a repository
type RepoUnit struct { type RepoUnit struct {
ID int64 ID int64
@ -37,8 +37,8 @@ func addPullRequestRebaseWithMergeCommit(x *xorm.Engine) error {
if unit.Config == nil { if unit.Config == nil {
unit.Config = make(map[string]interface{}) unit.Config = make(map[string]interface{})
} }
if _, ok := unit.Config["AllowRebaseMergeCommit"]; !ok { if _, ok := unit.Config["AllowRebaseMerge"]; !ok {
unit.Config["AllowRebaseMergeCommit"] = true unit.Config["AllowRebaseMerge"] = true
} }
if _, err := sess.ID(unit.ID).Cols("config").Update(unit); err != nil { if _, err := sess.ID(unit.ID).Cols("config").Update(unit); err != nil {
return err return err

6
models/pull.go
View File

@ -270,8 +270,8 @@ const (
MergeStyleMerge MergeStyle = "merge" MergeStyleMerge MergeStyle = "merge"
// MergeStyleRebase rebase before merging // MergeStyleRebase rebase before merging
MergeStyleRebase MergeStyle = "rebase" MergeStyleRebase MergeStyle = "rebase"
// MergeStyleRebaseMergeCommit rebase before merging with merge commit (--no-ff) // MergeStyleRebaseMerge rebase before merging with merge commit (--no-ff)
MergeStyleRebaseMergeCommit MergeStyle = "rebase-merge-commit" MergeStyleRebaseMerge MergeStyle = "rebase-merge"
// MergeStyleSquash squash commits into single commit before merging // MergeStyleSquash squash commits into single commit before merging
MergeStyleSquash MergeStyle = "squash" MergeStyleSquash MergeStyle = "squash"
) )
@ -409,7 +409,7 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository, mergeStyle
"git", "merge", "--ff-only", "-q", "head_repo_"+pr.HeadBranch); err != nil { "git", "merge", "--ff-only", "-q", "head_repo_"+pr.HeadBranch); err != nil {
return fmt.Errorf("git merge --ff-only [%s -> %s]: %s", headRepoPath, tmpBasePath, stderr) return fmt.Errorf("git merge --ff-only [%s -> %s]: %s", headRepoPath, tmpBasePath, stderr)
} }
case MergeStyleRebaseMergeCommit: case MergeStyleRebaseMerge:
// Checkout head branch // Checkout head branch
if _, stderr, err = process.GetManager().ExecDir(-1, tmpBasePath, if _, stderr, err = process.GetManager().ExecDir(-1, tmpBasePath,
fmt.Sprintf("PullRequest.Merge (git checkout): %s", tmpBasePath), fmt.Sprintf("PullRequest.Merge (git checkout): %s", tmpBasePath),

4
models/repo_unit.go
View File

@ -91,7 +91,7 @@ type PullRequestsConfig struct {
IgnoreWhitespaceConflicts bool IgnoreWhitespaceConflicts bool
AllowMerge bool AllowMerge bool
AllowRebase bool AllowRebase bool
AllowRebaseMergeCommit bool AllowRebaseMerge bool
AllowSquash bool AllowSquash bool
} }
@ -109,7 +109,7 @@ func (cfg *PullRequestsConfig) ToDB() ([]byte, error) {
func (cfg *PullRequestsConfig) IsMergeStyleAllowed(mergeStyle MergeStyle) bool { func (cfg *PullRequestsConfig) IsMergeStyleAllowed(mergeStyle MergeStyle) bool {
return mergeStyle == MergeStyleMerge && cfg.AllowMerge || return mergeStyle == MergeStyleMerge && cfg.AllowMerge ||
mergeStyle == MergeStyleRebase && cfg.AllowRebase || mergeStyle == MergeStyleRebase && cfg.AllowRebase ||
mergeStyle == MergeStyleRebaseMergeCommit && cfg.AllowRebaseMergeCommit || mergeStyle == MergeStyleRebaseMerge && cfg.AllowRebaseMerge ||
mergeStyle == MergeStyleSquash && cfg.AllowSquash mergeStyle == MergeStyleSquash && cfg.AllowSquash
} }

4
modules/auth/repo_form.go
View File

@ -110,7 +110,7 @@ type RepoSettingForm struct {
PullsIgnoreWhitespace bool PullsIgnoreWhitespace bool
PullsAllowMerge bool PullsAllowMerge bool
PullsAllowRebase bool PullsAllowRebase bool
PullsAllowRebaseMergeCommit bool PullsAllowRebaseMerge bool
PullsAllowSquash bool PullsAllowSquash bool
EnableTimetracker bool EnableTimetracker bool
AllowOnlyContributorsToTrackTime bool AllowOnlyContributorsToTrackTime bool
@ -354,7 +354,7 @@ func (f *InitializeLabelsForm) Validate(ctx *macaron.Context, errs binding.Error
// MergePullRequestForm form for merging Pull Request // MergePullRequestForm form for merging Pull Request
type MergePullRequestForm struct { type MergePullRequestForm struct {
Do string `binding:"Required;In(merge,rebase,rebase-merge-commit,squash)"` Do string `binding:"Required;In(merge,rebase,rebase-merge,squash)"`
MergeTitleField string MergeTitleField string
MergeMessageField string MergeMessageField string
} }

4
routers/repo/issue.go
View File

@ -777,8 +777,8 @@ func ViewIssue(ctx *context.Context) {
ctx.Data["MergeStyle"] = models.MergeStyleMerge ctx.Data["MergeStyle"] = models.MergeStyleMerge
} else if prConfig.AllowRebase { } else if prConfig.AllowRebase {
ctx.Data["MergeStyle"] = models.MergeStyleRebase ctx.Data["MergeStyle"] = models.MergeStyleRebase
} else if prConfig.AllowRebaseMergeCommit { } else if prConfig.AllowRebaseMerge {
ctx.Data["MergeStyle"] = models.MergeStyleRebaseMergeCommit ctx.Data["MergeStyle"] = models.MergeStyleRebaseMerge
} else if prConfig.AllowSquash { } else if prConfig.AllowSquash {
ctx.Data["MergeStyle"] = models.MergeStyleSquash ctx.Data["MergeStyle"] = models.MergeStyleSquash
} else { } else {

2
routers/repo/pull.go
View File

@ -512,7 +512,7 @@ func MergePullRequest(ctx *context.Context, form auth.MergePullRequestForm) {
if models.MergeStyle(form.Do) == models.MergeStyleMerge { if models.MergeStyle(form.Do) == models.MergeStyleMerge {
message = pr.GetDefaultMergeMessage() message = pr.GetDefaultMergeMessage()
} }
if models.MergeStyle(form.Do) == models.MergeStyleRebaseMergeCommit { if models.MergeStyle(form.Do) == models.MergeStyleRebaseMerge {
message = pr.GetDefaultMergeMessage() message = pr.GetDefaultMergeMessage()
} }
if models.MergeStyle(form.Do) == models.MergeStyleSquash { if models.MergeStyle(form.Do) == models.MergeStyleSquash {

2
routers/repo/setting.go
View File

@ -216,7 +216,7 @@ func SettingsPost(ctx *context.Context, form auth.RepoSettingForm) {
IgnoreWhitespaceConflicts: form.PullsIgnoreWhitespace, IgnoreWhitespaceConflicts: form.PullsIgnoreWhitespace,
AllowMerge: form.PullsAllowMerge, AllowMerge: form.PullsAllowMerge,
AllowRebase: form.PullsAllowRebase, AllowRebase: form.PullsAllowRebase,
AllowRebaseMergeCommit: form.PullsAllowRebaseMergeCommit, AllowRebaseMerge: form.PullsAllowRebaseMerge,
AllowSquash: form.PullsAllowSquash, AllowSquash: form.PullsAllowSquash,
}, },
}) })

14
templates/repo/issue/view_content/pull.tmpl
View File

@ -39,7 +39,7 @@
</div> </div>
{{if .AllowMerge}} {{if .AllowMerge}}
{{$prUnit := .Repository.MustGetUnit $.UnitTypePullRequests}} {{$prUnit := .Repository.MustGetUnit $.UnitTypePullRequests}}
{{if or $prUnit.PullRequestsConfig.AllowMerge $prUnit.PullRequestsConfig.AllowRebase $prUnit.PullRequestsConfig.AllowRebaseMergeCommit $prUnit.PullRequestsConfig.AllowSquash}} {{if or $prUnit.PullRequestsConfig.AllowMerge $prUnit.PullRequestsConfig.AllowRebase $prUnit.PullRequestsConfig.AllowRebaseMerge $prUnit.PullRequestsConfig.AllowSquash}}
<div class="ui divider"></div> <div class="ui divider"></div>
{{if $prUnit.PullRequestsConfig.AllowMerge}} {{if $prUnit.PullRequestsConfig.AllowMerge}}
<div class="ui form merge-fields" style="display: none"> <div class="ui form merge-fields" style="display: none">
@ -73,11 +73,11 @@
</form> </form>
</div> </div>
{{end}} {{end}}
{{if $prUnit.PullRequestsConfig.AllowRebaseMergeCommit}} {{if $prUnit.PullRequestsConfig.AllowRebaseMerge}}
<div class="ui form rebase-merge-commit-fields" style="display: none"> <div class="ui form rebase-merge-fields" style="display: none">
<form action="{{.Link}}/merge" method="post"> <form action="{{.Link}}/merge" method="post">
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
<button class="ui green button" type="submit" name="do" value="rebase-merge-commit"> <button class="ui green button" type="submit" name="do" value="rebase-merge">
{{$.i18n.Tr "repo.pulls.rebase_merge_commit_pull_request"}} {{$.i18n.Tr "repo.pulls.rebase_merge_commit_pull_request"}}
</button> </button>
<button class="ui button merge-cancel"> <button class="ui button merge-cancel">
@ -115,7 +115,7 @@
{{if eq .MergeStyle "rebase"}} {{if eq .MergeStyle "rebase"}}
{{$.i18n.Tr "repo.pulls.rebase_merge_pull_request"}} {{$.i18n.Tr "repo.pulls.rebase_merge_pull_request"}}
{{end}} {{end}}
{{if eq .MergeStyle "rebase-merge-commit"}} {{if eq .MergeStyle "rebase-merge"}}
{{$.i18n.Tr "repo.pulls.rebase_merge_commit_pull_request"}} {{$.i18n.Tr "repo.pulls.rebase_merge_commit_pull_request"}}
{{end}} {{end}}
{{if eq .MergeStyle "squash"}} {{if eq .MergeStyle "squash"}}
@ -132,8 +132,8 @@
{{if $prUnit.PullRequestsConfig.AllowRebase}} {{if $prUnit.PullRequestsConfig.AllowRebase}}
<div class="item{{if eq .MergeStyle "rebase"}} active selected{{end}}" data-do="rebase">{{$.i18n.Tr "repo.pulls.rebase_merge_pull_request"}}</div> <div class="item{{if eq .MergeStyle "rebase"}} active selected{{end}}" data-do="rebase">{{$.i18n.Tr "repo.pulls.rebase_merge_pull_request"}}</div>
{{end}} {{end}}
{{if $prUnit.PullRequestsConfig.AllowRebaseMergeCommit}} {{if $prUnit.PullRequestsConfig.AllowRebaseMerge}}
<div class="item{{if eq .MergeStyle "rebase-merge-commit"}} active selected{{end}}" data-do="rebase-merge-commit">{{$.i18n.Tr "repo.pulls.rebase_merge_commit_pull_request"}}</div> <div class="item{{if eq .MergeStyle "rebase-merge"}} active selected{{end}}" data-do="rebase-merge">{{$.i18n.Tr "repo.pulls.rebase_merge_commit_pull_request"}}</div>
{{end}} {{end}}
{{if $prUnit.PullRequestsConfig.AllowSquash}} {{if $prUnit.PullRequestsConfig.AllowSquash}}
<div class="item{{if eq .MergeStyle "squash"}} active selected{{end}}" data-do="squash">{{$.i18n.Tr "repo.pulls.squash_merge_pull_request"}}</div> <div class="item{{if eq .MergeStyle "squash"}} active selected{{end}}" data-do="squash">{{$.i18n.Tr "repo.pulls.squash_merge_pull_request"}}</div>

2
templates/repo/settings/options.tmpl
View File

@ -229,7 +229,7 @@
</div> </div>
<div class="field"> <div class="field">
<div class="ui checkbox"> <div class="ui checkbox">
<input name="pulls_allow_rebase_merge_commit" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.AllowRebaseMergeCommit)}}checked{{end}}> <input name="pulls_allow_rebase_merge" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.AllowRebaseMerge)}}checked{{end}}>
<label>{{.i18n.Tr "repo.settings.pulls.allow_rebase_merge_commit"}}</label> <label>{{.i18n.Tr "repo.settings.pulls.allow_rebase_merge_commit"}}</label>
</div> </div>
</div> </div>