From 9a4aefa07670e158abcea2b237a0c934554cea2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20T=C3=B6lle?= Date: Mon, 23 Jul 2018 19:19:29 +0200 Subject: [PATCH] rename MergeStyleRebaseMergeCommit to MergeStyleRebaseMerge as requested by @lafriks --- integrations/pull_merge_test.go | 4 ++-- models/fixtures/repo_unit.yml | 4 ++-- models/migrations/migrations.go | 2 +- models/migrations/v71.go | 6 +++--- models/pull.go | 6 +++--- models/repo_unit.go | 4 ++-- modules/auth/repo_form.go | 4 ++-- routers/repo/issue.go | 4 ++-- routers/repo/pull.go | 2 +- routers/repo/setting.go | 2 +- templates/repo/issue/view_content/pull.tmpl | 14 +++++++------- templates/repo/settings/options.tmpl | 2 +- 12 files changed, 27 insertions(+), 27 deletions(-) diff --git a/integrations/pull_merge_test.go b/integrations/pull_merge_test.go index 14fd97653..8c62c31ab 100644 --- a/integrations/pull_merge_test.go +++ b/integrations/pull_merge_test.go @@ -76,7 +76,7 @@ func TestPullRebase(t *testing.T) { testPullMerge(t, session, elem[1], elem[2], elem[4], models.MergeStyleRebase) } -func TestPullRebaseMergeCommit(t *testing.T) { +func TestPullRebaseMerge(t *testing.T) { // TODO prepareTestEnv(t) session := loginUser(t, "user1") @@ -87,7 +87,7 @@ func TestPullRebaseMergeCommit(t *testing.T) { elem := strings.Split(test.RedirectURL(resp), "/") 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) { diff --git a/models/fixtures/repo_unit.yml b/models/fixtures/repo_unit.yml index e8aaf7293..4c874bd0d 100644 --- a/models/fixtures/repo_unit.yml +++ b/models/fixtures/repo_unit.yml @@ -30,7 +30,7 @@ id: 5 repo_id: 1 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 - @@ -51,7 +51,7 @@ id: 8 repo_id: 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 - diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index ef966405d..631b126c5 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -195,7 +195,7 @@ var migrations = []Migration{ // v70 -> v71 NewMigration("add issue_dependencies", addIssueDependencies), // 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 diff --git a/models/migrations/v71.go b/models/migrations/v71.go index 3270a0f5a..8bf59418f 100644 --- a/models/migrations/v71.go +++ b/models/migrations/v71.go @@ -12,7 +12,7 @@ import ( "github.com/go-xorm/xorm" ) -func addPullRequestRebaseWithMergeCommit(x *xorm.Engine) error { +func addPullRequestRebaseWithMerge(x *xorm.Engine) error { // RepoUnit describes all units of a repository type RepoUnit struct { ID int64 @@ -37,8 +37,8 @@ func addPullRequestRebaseWithMergeCommit(x *xorm.Engine) error { if unit.Config == nil { unit.Config = make(map[string]interface{}) } - if _, ok := unit.Config["AllowRebaseMergeCommit"]; !ok { - unit.Config["AllowRebaseMergeCommit"] = true + if _, ok := unit.Config["AllowRebaseMerge"]; !ok { + unit.Config["AllowRebaseMerge"] = true } if _, err := sess.ID(unit.ID).Cols("config").Update(unit); err != nil { return err diff --git a/models/pull.go b/models/pull.go index c75c901e6..03261f586 100644 --- a/models/pull.go +++ b/models/pull.go @@ -270,8 +270,8 @@ const ( MergeStyleMerge MergeStyle = "merge" // MergeStyleRebase rebase before merging MergeStyleRebase MergeStyle = "rebase" - // MergeStyleRebaseMergeCommit rebase before merging with merge commit (--no-ff) - MergeStyleRebaseMergeCommit MergeStyle = "rebase-merge-commit" + // MergeStyleRebaseMerge rebase before merging with merge commit (--no-ff) + MergeStyleRebaseMerge MergeStyle = "rebase-merge" // MergeStyleSquash squash commits into single commit before merging 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 { return fmt.Errorf("git merge --ff-only [%s -> %s]: %s", headRepoPath, tmpBasePath, stderr) } - case MergeStyleRebaseMergeCommit: + case MergeStyleRebaseMerge: // Checkout head branch if _, stderr, err = process.GetManager().ExecDir(-1, tmpBasePath, fmt.Sprintf("PullRequest.Merge (git checkout): %s", tmpBasePath), diff --git a/models/repo_unit.go b/models/repo_unit.go index e8f9ab665..235fde0fd 100644 --- a/models/repo_unit.go +++ b/models/repo_unit.go @@ -91,7 +91,7 @@ type PullRequestsConfig struct { IgnoreWhitespaceConflicts bool AllowMerge bool AllowRebase bool - AllowRebaseMergeCommit bool + AllowRebaseMerge bool AllowSquash bool } @@ -109,7 +109,7 @@ func (cfg *PullRequestsConfig) ToDB() ([]byte, error) { func (cfg *PullRequestsConfig) IsMergeStyleAllowed(mergeStyle MergeStyle) bool { return mergeStyle == MergeStyleMerge && cfg.AllowMerge || mergeStyle == MergeStyleRebase && cfg.AllowRebase || - mergeStyle == MergeStyleRebaseMergeCommit && cfg.AllowRebaseMergeCommit || + mergeStyle == MergeStyleRebaseMerge && cfg.AllowRebaseMerge || mergeStyle == MergeStyleSquash && cfg.AllowSquash } diff --git a/modules/auth/repo_form.go b/modules/auth/repo_form.go index eb610255f..58ea143b6 100644 --- a/modules/auth/repo_form.go +++ b/modules/auth/repo_form.go @@ -110,7 +110,7 @@ type RepoSettingForm struct { PullsIgnoreWhitespace bool PullsAllowMerge bool PullsAllowRebase bool - PullsAllowRebaseMergeCommit bool + PullsAllowRebaseMerge bool PullsAllowSquash bool EnableTimetracker bool AllowOnlyContributorsToTrackTime bool @@ -354,7 +354,7 @@ func (f *InitializeLabelsForm) Validate(ctx *macaron.Context, errs binding.Error // MergePullRequestForm form for merging Pull Request 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 MergeMessageField string } diff --git a/routers/repo/issue.go b/routers/repo/issue.go index e8fafeb69..bf3a5ccc2 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -777,8 +777,8 @@ func ViewIssue(ctx *context.Context) { ctx.Data["MergeStyle"] = models.MergeStyleMerge } else if prConfig.AllowRebase { ctx.Data["MergeStyle"] = models.MergeStyleRebase - } else if prConfig.AllowRebaseMergeCommit { - ctx.Data["MergeStyle"] = models.MergeStyleRebaseMergeCommit + } else if prConfig.AllowRebaseMerge { + ctx.Data["MergeStyle"] = models.MergeStyleRebaseMerge } else if prConfig.AllowSquash { ctx.Data["MergeStyle"] = models.MergeStyleSquash } else { diff --git a/routers/repo/pull.go b/routers/repo/pull.go index 4ff66ee61..62080ef90 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -512,7 +512,7 @@ func MergePullRequest(ctx *context.Context, form auth.MergePullRequestForm) { if models.MergeStyle(form.Do) == models.MergeStyleMerge { message = pr.GetDefaultMergeMessage() } - if models.MergeStyle(form.Do) == models.MergeStyleRebaseMergeCommit { + if models.MergeStyle(form.Do) == models.MergeStyleRebaseMerge { message = pr.GetDefaultMergeMessage() } if models.MergeStyle(form.Do) == models.MergeStyleSquash { diff --git a/routers/repo/setting.go b/routers/repo/setting.go index d50d891cd..b62d81d1f 100644 --- a/routers/repo/setting.go +++ b/routers/repo/setting.go @@ -216,7 +216,7 @@ func SettingsPost(ctx *context.Context, form auth.RepoSettingForm) { IgnoreWhitespaceConflicts: form.PullsIgnoreWhitespace, AllowMerge: form.PullsAllowMerge, AllowRebase: form.PullsAllowRebase, - AllowRebaseMergeCommit: form.PullsAllowRebaseMergeCommit, + AllowRebaseMerge: form.PullsAllowRebaseMerge, AllowSquash: form.PullsAllowSquash, }, }) diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index d3abc1e5f..e5a8570c9 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -39,7 +39,7 @@ {{if .AllowMerge}} {{$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}}
{{if $prUnit.PullRequestsConfig.AllowMerge}} {{end}} - {{if $prUnit.PullRequestsConfig.AllowRebaseMergeCommit}} -