Add push commits history comment on PR time-line #11167

a1012112796 · 2020-04-21T09:53:54Z

Add push commits history comment on PR time-line
Add notify by email and ui of this comment type also

view:

email

* Add notify by email and ui of this comment type also Signed-off-by: a1012112796 <[email protected]>

fix lint

6543 · 2020-04-21T09:58:31Z

@a1012112796 didn't looked at the code jet ... so question: Do a ForcePush delete old comments to commits who are gone now?

a1012112796 · 2020-04-21T10:12:31Z

@a1012112796 didn't looked at the code jet ... so question: Do a ForcePush delete old comments to commits who are gone now?

I haven't do it now. first I have no idea now, Then I think keep old commits comment is usefull if you want find out previous commit that you has delted.
I will fix code lint and do some ui change this night.

a1012112796 · 2020-04-21T16:47:14Z

The reason why this PR is marked as draft again is that I found the force-push judgment is wrong and I need to find other strategies. Thanks.

6543 · 2020-04-21T17:48:28Z

take your time :)

fix wrong force-push judgement

guillep2k

I think this requires some integration tests.

models/issue_comment.go

modules/git/commit.go

services/pull/pull.go

* Remove commit number check * add own notify fun * fix some typo Co-authored-by: guillep2k <[email protected]>

models/issue_comment.go

modules/notification/base/null.go

a1012112796 · 2020-04-26T02:32:02Z

@guillep2k How about this way? ebde1d3

a1012112796 · 2020-05-11T15:20:09Z

I would actually prefer that json would be used to content so there would be no need for such parsing

@lafriks But I have no ideal about how to transform a commit into a json struct, It have many different type value and many sub struct .... 😢

gitea/modules/git/commit.go

Lines 25 to 39 in a1f11a0

// Commit represents a git commit.

type Commit struct {

Branch string // Branch this commit belongs to

Tree

ID SHA1 // The ID of this commit object

Author *Signature

Committer *Signature

CommitMessage string

Signature *CommitGPGSignature

Parents []SHA1 // SHA1 strings

submoduleCache *ObjectCache

}

Need help about json, Thanks

lafriks · 2020-05-17T15:56:55Z

What I meant about json it to have comment Content field value saved in json using structure like:

type PushActionContent struct {
    IsForcePush bool
    Commits     []string
}

this way IsForcePush would not need to be saved to database and no migration would be needed

modules/git/commit.go

* save commit ids and isForce push by json * simplify GetBranchName

guillep2k · 2020-05-20T00:42:44Z

@lafriks your review is required. 😁

guillep2k · 2020-05-20T12:46:41Z

Ping LG-TM

6543 · 2020-05-21T12:22:02Z

sadly I found a "bug" #11536

Fix: template: issue/default:20:17: executing "issue/default" at <.Comment.Type>: nil pointer evaluating interface {}.Type Introduced in go-gitea#11167

* Fix nil pointer in default issue mail template Fix: template: issue/default:20:17: executing "issue/default" at <.Comment.Type>: nil pointer evaluating interface {}.Type Introduced in #11167 * another one Co-authored-by: zeripath <[email protected]>

* Add push commits history comment on PR time-line * Add notify by email and ui of this comment type also Signed-off-by: a1012112796 <[email protected]> * Add migrations for IsForcePush * fix wrong force-push judgement * Apply suggestions from code review * Remove commit number check * add own notify fun * fix some typo Co-authored-by: guillep2k <[email protected]> * fix lint * fix style again, I forgot something before * Change email notify way * fix api * add number check if It's force-push * Add repo commit link fuction remove unnecessary check skip show push commits comment which not have commits alive * Update issue_comment.go * Apply suggestions from code review Co-authored-by: mrsdizzie <[email protected]> * Apply suggestions from code review * fix ui view Co-authored-by: silverwind <[email protected]> * fix height * remove unnecessary style define * simplify GetBranchName * Apply suggestions from code review * save commit ids and isForce push by json * simplify GetBranchName * fix bug Co-authored-by: guillep2k <[email protected]> Co-authored-by: mrsdizzie <[email protected]> Co-authored-by: Lauris BH <[email protected]> Co-authored-by: silverwind <[email protected]>

* Fix nil pointer in default issue mail template Fix: template: issue/default:20:17: executing "issue/default" at <.Comment.Type>: nil pointer evaluating interface {}.Type Introduced in go-gitea#11167 * another one Co-authored-by: zeripath <[email protected]>

a1012112796 added 3 commits April 21, 2020 16:34

Add push commits history comment on PR time-line

71bc5ab

* Add notify by email and ui of this comment type also Signed-off-by: a1012112796 <[email protected]>

Merge branch 'master' into commits_comment

2bcb94c

Add migrations for IsForcePush

fcedbcf

fix lint

GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 21, 2020

lunny 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 Apr 21, 2020

a1012112796 marked this pull request as draft April 21, 2020 16:42

a1012112796 added 5 commits April 22, 2020 21:27

fix code lint

cc37c83

fix wrong force-push judgement

Merge branch 'master' into commits_comment

6a713d9

fix rpo error

89b67a9

fix lint

a9563d9

fix typo

4ea2b3a

a1012112796 marked this pull request as ready for review April 23, 2020 00:07

Merge branch 'master' into commits_comment

03b0992

guillep2k removed the pr/wip This PR is not ready for review label Apr 23, 2020

guillep2k reviewed Apr 24, 2020

View reviewed changes

a1012112796 and others added 4 commits April 25, 2020 09:29

Apply suggestions from code review

cce92bd

* Remove commit number check * add own notify fun * fix some typo Co-authored-by: guillep2k <[email protected]>

Merge branch 'master' into commits_comment

f0c7aa3

fix lint

9a698d4

fix style again, I forgot something before

bd363e5

guillep2k reviewed Apr 25, 2020

View reviewed changes

models/issue_comment.go Outdated Show resolved Hide resolved

models/issue_comment.go Show resolved Hide resolved

6543 reviewed Apr 25, 2020

View reviewed changes

modules/notification/base/null.go Show resolved Hide resolved

a1012112796 added 2 commits April 26, 2020 10:27

Change email notify way

ebde1d3

Merge branch 'master' into commits_comment

69729ec

fix api

712a0cc

Merge branch 'master' into commits_comment

92eb002

lafriks modified the milestones: 1.12.0, 1.13.0 May 16, 2020

zeripath reviewed May 17, 2020

View reviewed changes

modules/git/commit.go Outdated Show resolved Hide resolved

zeripath reviewed May 17, 2020

View reviewed changes

modules/git/commit.go Outdated Show resolved Hide resolved

a1012112796 added 4 commits May 18, 2020 23:47

Apply suggestions from code review

2ca5230

* save commit ids and isForce push by json * simplify GetBranchName

Merge branch 'master' into commits_comment

c1bfcad

fix bug

d8e414b

Merge branch 'master' into commits_comment

1b1aed6

a1012112796 marked this pull request as ready for review May 19, 2020 15:46

lafriks approved these changes May 20, 2020

View reviewed changes

Merge branch 'master' into commits_comment

c4f9fec

guillep2k merged commit 0903b1a into go-gitea:master May 20, 2020

6543 mentioned this pull request May 21, 2020

[Bug] commits history comment on PR show unrelated after merge #11536

Closed

CirnoT mentioned this pull request May 23, 2020

Fix styling and padding for commit list on PR view #11588

Merged

6543 mentioned this pull request Jun 2, 2020

Detect and show force pushes in PR #9549

Closed

mrsdizzie mentioned this pull request Jun 12, 2020

Fix nil pointer in default issue mail template #11862

Merged

lafriks added the type/changelog Adds the changelog for a new Gitea version label Jun 12, 2020

a1012112796 deleted the commits_comment branch September 12, 2020 02:24

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

delvh removed the type/changelog Adds the changelog for a new Gitea version label Oct 7, 2023

Uh oh!

Add push commits history comment on PR time-line #11167

Add push commits history comment on PR time-line #11167

Uh oh!

Conversation

a1012112796 commented Apr 21, 2020

Uh oh!

6543 commented Apr 21, 2020

Uh oh!

a1012112796 commented Apr 21, 2020

Uh oh!

a1012112796 commented Apr 21, 2020

Uh oh!

6543 commented Apr 21, 2020

Uh oh!

guillep2k left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

a1012112796 commented Apr 26, 2020

Uh oh!

a1012112796 commented May 11, 2020

Uh oh!

lafriks commented May 17, 2020

Uh oh!

Uh oh!

Uh oh!

guillep2k commented May 20, 2020

Uh oh!

guillep2k commented May 20, 2020

Uh oh!

6543 commented May 21, 2020

Uh oh!

Uh oh!