Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge #3188

lafriks · 2017-12-13T23:12:53Z

Fixes #712

Add Pull Request merge options:

Ignore whitespaces when checking conflicts
Allow merge
Allow rebase
Allow squash

Tasks:

Add config to Pull Request unit
Add migration to set defaults
Add UI and functionality in Settings section
Add ignore whitespace functionality
UI changes for merge PR button
Add rebase functionality
Add squash functionality
Add tests
~~Fix wrong display of merged PR commits and changes~~ - should be implemented as separate PR (issue Keep merged PR info in hidden branch #3222)

Screenshots:

codecov-io · 2017-12-13T23:22:18Z

Codecov Report

Merging #3188 into master will increase coverage by 0.24%.
The diff coverage is 34.89%.

@@            Coverage Diff             @@
##           master    #3188      +/-   ##
==========================================
+ Coverage   34.62%   34.86%   +0.24%     
==========================================
  Files         277      278       +1     
  Lines       40298    40506     +208     
==========================================
+ Hits        13952    14122     +170     
- Misses      24298    24299       +1     
- Partials     2048     2085      +37

Impacted Files	Coverage Δ
models/migrations/migrations.go	`2.89% <ø> (ø)`	⬆️
models/error.go	`32.43% <0%> (-0.6%)`	⬇️
models/repo.go	`43.19% <0%> (-0.01%)`	⬇️
routers/api/v1/repo/pull.go	`6.33% <0%> (-0.23%)`	⬇️
routers/repo/setting.go	`4.67% <0%> (-0.06%)`	⬇️
models/migrations/v54.go	`0% <0%> (ø)`
routers/routes/routes.go	`87.08% <100%> (ø)`	⬆️
routers/api/v1/api.go	`75.24% <100%> (ø)`	⬆️
modules/auth/repo_form.go	`33.76% <100%> (+1.76%)`	⬆️
routers/repo/issue.go	`32.74% <42.1%> (+0.15%)`	⬆️
... and 11 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a192f30...8abe208. Read the comment docs.

lunny

And maybe splited two PRs for quick review.

lunny · 2017-12-13T23:41:41Z

models/migrations/v54.go

+	sess := x.NewSession()
+	defer sess.Close()
+
+	//Updating existing issue units


Need sess.Begin()

lafriks · 2017-12-13T23:47:57Z

@lunny how do you mean to split them?

lafriks · 2017-12-13T23:49:06Z

@lunny fixed

ethantkoenig · 2017-12-14T05:46:29Z

Fair and early notice: please add tests (at some point, I understand it's a WIP right now)

ethantkoenig · 2017-12-17T21:27:30Z

@lafriks When I do a squash, the author of the squashed commit is [email protected], even though the author of all of the original commits was [email protected].

Perhaps we should include authorship check in our tests?

lafriks · 2017-12-17T21:30:08Z

@ethantkoenig when squashing author is set as PR poster (as theoretically there could be multiple commit authors)

ethantkoenig · 2017-12-17T21:35:43Z

@lafriks [email protected] was also the poster.

ethantkoenig · 2017-12-17T21:37:44Z

Tried again, same thing happened. Let me know if you aren't able to reproduce

lafriks · 2017-12-17T21:39:35Z

@ethantkoenig it is same as currently with merge commit. It uses NewGitSig function to get data (name/user). This function uses getEmail function to get user email:

// getEmail returns an noreply email, if the user has set to keep his
// email address private, otherwise the primary email address.

So you have probably set for user to keep email address private.

ethantkoenig · 2017-12-17T21:44:17Z

You're right, good catch

lafriks · 2017-12-17T21:48:16Z

I'm out of ideas how to preserve commit info in PR when merged with squash or rebase :( As there is no merge commit to reference. Especially for squash merge as original commits are lost completely when PR head branch is deleted.
Any ideas are more than welcome...

lafriks · 2017-12-17T23:23:02Z

Looks like github does that by keeping commit info in refs/pull/x/head. But that should probably be made as different PR as this one is already too big.

lafriks · 2017-12-17T23:33:38Z

I think it is ready for review now, please test it and comment :)

lafriks · 2017-12-17T23:42:24Z

Automatically adding all commit messages to extended commit message for squash should be implemented as other PR to not make this PR even bigger

ethantkoenig

Generally looks good, mostly nits

ethantkoenig · 2017-12-18T05:22:37Z

integrations/pull_merge_test.go

@@ -16,16 +16,17 @@ import (
 	"github.com/stretchr/testify/assert"
 )

-func testPullMerge(t *testing.T, session *TestSession, user, repo, pullnum string) *httptest.ResponseRecorder {
+func testPullMerge(t *testing.T, session *TestSession, user, repo, pullnum, mergeStyle string) *httptest.ResponseRecorder {


nit: use models.MergeStyle

ethantkoenig · 2017-12-18T05:25:16Z

models/pull.go

+
+// GetDefaultSquashMessage returns default message used when squash and merging pull request
+func (pr *PullRequest) GetDefaultSquashMessage() string {
+	if pr.Issue == nil {


nit: This check is unnecessary, pr.LoadIssue() already does it

ethantkoenig · 2017-12-18T05:28:15Z

models/pull.go

+
+const (
+	// MergeStyleRegular create merge commit
+	MergeStyleRegular MergeStyle = "merge"


Maybe MergeStyleMerge would be better?

ethantkoenig · 2017-12-18T05:30:02Z

options/locale/locale_en-US.ini

@@ -755,7 +755,12 @@ pulls.is_checking = "The conflict checking is still in progress; please refresh
 pulls.can_auto_merge_desc = This pull request can be merged automatically.
 pulls.cannot_auto_merge_desc = This pull request cannot be merged automatically because there are conflicts.
 pulls.cannot_auto_merge_helper = Please merge manually in order to resolve the conflicts.
+pulls.no_merge_desc = This pull request can not be merged as no merge options enabled.


This pull request can not be merged as no merge options are enabled.

ethantkoenig · 2017-12-18T05:32:20Z

routers/api/v1/repo/pull.go

+		form.Do = "merge"
+	}
+
+	if models.MergeStyle(form.Do) != models.MergeStyleRegular &&


nit: This is check unnecessary, since pr.Merge already checks the provided mergeStyle.

ethantkoenig · 2017-12-18T05:35:10Z

models/pull.go

 	if err = pr.GetHeadRepo(); err != nil {
 		return fmt.Errorf("GetHeadRepo: %v", err)
 	} else if err = pr.GetBaseRepo(); err != nil {
 		return fmt.Errorf("GetBaseRepo: %v", err)
 	}

+	pullsConfig := pr.BaseRepo.MustGetUnit(UnitTypePullRequests).PullRequestsConfig()


Please use .GetUnit(..), so we don't unnecessarily ignore an error.

ethantkoenig · 2017-12-18T05:36:30Z

options/locale/locale_en-US.ini

 pulls.merge_pull_request = Merge Pull Request
+pulls.rebase_merge_pull_request = Rebase and Merge
+pulls.squash_merge_pull_request = Squash and Merge
+pulls.invalid_merge_option = You can not use this merge option for this Pull Request


nit: Pull Request -> pull request

ethantkoenig · 2017-12-18T05:36:49Z

options/locale/locale_en-US.ini

@@ -894,6 +899,10 @@ settings.tracker_url_format_desc = You can use placeholder <code>{user} {repo} {
 settings.enable_timetracker = Enable time tracker
 settings.allow_only_contributors_to_track_time = Allow only contributors to track time
 settings.pulls_desc = Enable pull requests to accept public contributions
+settings.pulls.ignore_whitespace = Ignore changes in whitespaces when checking conflicts


nit: whitespaces -> whitespace

ethantkoenig · 2017-12-18T05:50:05Z

models/pull.go

@@ -109,6 +109,22 @@ func (pr *PullRequest) loadIssue(e Engine) (err error) {
 	return err
 }

+// GetDefaultMergeMessage returns default message used when merging pull request
+func (pr *PullRequest) GetDefaultMergeMessage() string {
+	return fmt.Sprintf("Merge branch '%s' of %s/%s into %s", pr.HeadBranch, pr.HeadUserName, pr.HeadRepo.Name, pr.BaseBranch)


pr.HeadRepo may not always loaded, I think that is why CI is failing.

ethantkoenig · 2017-12-18T05:52:01Z

integrations/pull_merge_test.go

@@ -58,7 +59,34 @@ func TestPullMerge(t *testing.T) {

 	elem := strings.Split(test.RedirectURL(resp), "/")
 	assert.EqualValues(t, "pulls", elem[3])
-	testPullMerge(t, session, elem[1], elem[2], elem[4])
+	testPullMerge(t, session, elem[1], elem[2], elem[4], "merge")


If it's not too hard, could we check that the merge itself was successful, (that a commit was created, that correct merge style was used, etc.)?

@lafriks Is this doable?

strk · 2017-12-18T11:01:16Z

models/pull.go

+			fmt.Sprintf("PullRequest.Merge (git merge --no-ff --no-commit): %s", tmpBasePath),
+			"git", "merge", "--no-ff", "--no-commit", "head_repo/"+pr.HeadBranch); err != nil {
+			return fmt.Errorf("git merge --no-ff --no-commit [%s]: %v - %s", tmpBasePath, err, stderr)
+		}


I know this is not the right place, but shouldn't this functionality be moved to the "git" module ?

Probably that would be better place but as it was there already that should be done in other PR

lafriks · 2017-12-31T16:32:02Z

@ethantkoenig can I merge? as now approvals also count as LG-TM :)

ethantkoenig · 2017-12-31T16:42:04Z

@lafriks #3188 (comment)

lafriks · 2017-12-31T17:29:25Z

@ethantkoenig oh, ok will add that next year :))

lunny · 2018-01-01T02:31:39Z

@lafriks is there one still waiting a change?

lafriks · 2018-01-01T10:08:34Z

@lunny yes @ethantkoenig wants more tests

lunny · 2018-01-05T11:45:00Z

@lafriks @ethantkoenig I think we can merge this and @lafriks could take another PR to add tests.

ethantkoenig · 2018-01-05T17:44:51Z

okay

lafriks · 2018-01-05T18:42:04Z

@lunny @ethantkoenig ok, I will improve tests in other PR

lafriks added type/feature Completely new functionality. Can only be merged if feature freeze is not active. pr/wip This PR is not ready for review labels Dec 13, 2017

lafriks added this to the 1.x.x milestone Dec 13, 2017

lunny mentioned this pull request Dec 13, 2017

Gitea hosted Gitea #1029

Open

20 tasks

tboerger added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Dec 13, 2017

lunny requested changes Dec 13, 2017

View reviewed changes

lunny approved these changes Dec 14, 2017

View reviewed changes

lafriks removed the pr/wip This PR is not ready for review label Dec 17, 2017

lafriks modified the milestones: 1.x.x, 1.4.0 Dec 17, 2017

lafriks force-pushed the feat/add_pr_merge_options branch 4 times, most recently from aab0620 to f53d612 Compare December 18, 2017 01:49

ethantkoenig suggested changes Dec 18, 2017

View reviewed changes

strk reviewed Dec 18, 2017

View reviewed changes

lafriks added 14 commits December 31, 2017 17:27

Fix settings if pull requests are disabled

2f290af

Fix migration transaction

9cceefc

Merge with Rebase functionality

640fc93

UI changes and related functionality for pull request merging button

8524896

Implement squash functionality

204f042

Fix rebase merging

db1cf2f

Fix pull request merge tests

d90ebd6

Add squash and rebase tests

ee9995b

Fix API method to reuse default message functions

b0ab68a

Some refactoring and small fixes

0e99ba9

Remove more hardcoded values from tests

ea5691b

Remove unneeded check from API method

82a747c

Fix variable name and comment typo

552530d

Fix reset commit count after PR merge

60b2092

lafriks force-pushed the feat/add_pr_merge_options branch from 03bfe37 to 60b2092 Compare December 31, 2017 15:28

Merge branch 'master' into feat/add_pr_merge_options

8abe208

lafriks merged commit 8ac1501 into go-gitea:master Jan 5, 2018

lafriks deleted the feat/add_pr_merge_options branch January 5, 2018 18:56

lafriks mentioned this pull request Jan 12, 2018

Add draft blog post for 1.4.0 release go-gitea/blog#54

Merged

InExtremaRes mentioned this pull request Apr 23, 2018

Add "Rebase AND merge commit" (--no-ff) to Pull Request #3844

Closed

go-gitea locked and limited conversation to collaborators Nov 23, 2020

Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge #3188

Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge #3188

Conversation

lafriks commented Dec 13, 2017 • edited Loading

codecov-io commented Dec 13, 2017 • edited Loading

Codecov Report

lunny left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lafriks commented Dec 13, 2017

lafriks commented Dec 13, 2017

ethantkoenig commented Dec 14, 2017

ethantkoenig commented Dec 17, 2017 • edited Loading

lafriks commented Dec 17, 2017

ethantkoenig commented Dec 17, 2017

ethantkoenig commented Dec 17, 2017

lafriks commented Dec 17, 2017 • edited Loading

ethantkoenig commented Dec 17, 2017

lafriks commented Dec 17, 2017

lafriks commented Dec 17, 2017

lafriks commented Dec 17, 2017

lafriks commented Dec 17, 2017

ethantkoenig left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ethantkoenig Dec 18, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lafriks commented Dec 31, 2017

ethantkoenig commented Dec 31, 2017

lafriks commented Dec 31, 2017

lunny commented Jan 1, 2018

lafriks commented Jan 1, 2018

lunny commented Jan 5, 2018

ethantkoenig commented Jan 5, 2018

lafriks commented Jan 5, 2018

lafriks commented Dec 13, 2017 •

edited

Loading

codecov-io commented Dec 13, 2017 •

edited

Loading

ethantkoenig commented Dec 17, 2017 •

edited

Loading

lafriks commented Dec 17, 2017 •

edited

Loading

ethantkoenig Dec 18, 2017 •

edited

Loading