Add agit flow support in gitea #14295

a1012112796 · 2021-01-10T15:53:46Z

ref: https://git-repo.info/en/2020/03/agit-flow-and-git-repo/

examle:

NOTICE: All existed repositories will not have the new hooks, you have to rewrite the hooks via admin panel.

ref: https://git-repo.info/en/2020/03/agit-flow-and-git-repo/ example: ```Bash git checkout -b test echo "test" >> README.md git commit -m "test" git push origin HEAD:refs/for/master -o topic=test ``` Signed-off-by: a1012112796 <1012112796@qq.com>

* master: [skip ci] Updated licenses and gitignores

codecov-io · 2021-02-07T09:08:06Z

Codecov Report

Merging #14295 (5140fd7) into master (487f2ee) will decrease coverage by 0.18%.
The diff coverage is 13.10%.

@@            Coverage Diff             @@
##           master   #14295      +/-   ##
==========================================
- Coverage   42.21%   42.03%   -0.19%     
==========================================
  Files         767      768       +1     
  Lines       81624    82118     +494     
==========================================
+ Hits        34458    34515      +57     
- Misses      41531    41944     +413     
- Partials     5635     5659      +24

Impacted Files	Coverage Δ
cmd/serv.go	`2.53% <0.00%> (-0.10%)`	⬇️
models/migrations/migrations.go	`2.59% <ø> (ø)`
models/migrations/v172.go	`0.00% <0.00%> (ø)`
modules/git/repo_branch.go	`67.50% <0.00%> (-6.48%)`	⬇️
modules/private/hook.go	`0.00% <0.00%> (ø)`
modules/repository/hooks.go	`18.80% <0.00%> (-0.84%)`	⬇️
routers/repo/http.go	`40.86% <0.00%> (-0.21%)`	⬇️
routers/repo/issue.go	`38.37% <0.00%> (-0.03%)`	⬇️
routers/routes/web.go	`89.98% <0.00%> (-1.26%)`	⬇️
services/pull/commit_status.go	`4.10% <0.00%> (-0.37%)`	⬇️
... and 21 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 487f2ee...5140fd7. Read the comment docs.

lunny · 2021-02-08T01:49:10Z

@jiangxin Could we ask you to help to review this PR?

models/pull.go

* master: Fixed irritating error message related to go version (go-gitea#14611) Use OldRef instead of CommitSHA for DeleteBranch comments (go-gitea#14604) Add information on how to build statically (go-gitea#14594) [skip ci] Updated translations via Crowdin Exclude the current dump file from the dump (go-gitea#14606) Remove spurious DataAsync Error logging (go-gitea#14599) [API] Add delete release by tag & fix unreleased inconsistency (go-gitea#14563) Fix rate limit bug when downloading assets on migrating from github (go-gitea#14564) [API] Add affected files of commits to commit struct (go-gitea#14579)

* master: Add support for ref parameter to get raw file API (go-gitea#14602)

cmd/hook.go

jiangxin · 2021-02-09T02:27:39Z

cmd/hook.go

+
+	const VersionHead string = "version=1"
+
+	if !strings.HasPrefix(rs.Data, VersionHead) {


You should split rs.Data by the NUL character ('\0'). Part one is version, and part two is capabilities.

jiangxin · 2021-02-09T02:28:41Z

cmd/hook.go

+
+	hasPushOptions := false
+	response := []byte(VersionHead)
+	if strings.Contains(rs.Data, "push-options") {


You should split capabilities using space character, and try to match each capability.
If there is a new capability called "push-options-v2", using string.Contains is wrong.

cmd/hook.go

jiangxin · 2021-02-09T02:39:02Z

It's not good to have a merge commit for others to review, so please rebase your topic.

a1012112796 · 2021-02-09T05:21:35Z

@jiangxin Thanks for your carefully check, I will change them soon.

a1012112796 · 2021-02-09T09:33:38Z

@jiangxin Another question, I know your designed style to create pull request is git push origin HEAD:refs/for/<target-branch>/<session>, But the <target-branch> also maybe contain /.
I wonder.... (now I have to change it to git push origin HEAD:refs/for/<target-branch> -o topic=<session>).
Can you tell me reason? Thanks.

lunny · 2021-07-25T12:24:35Z

When push to an empty repository, an error returned remote: error: cannot find hook 'proc-receive'.

lunny · 2021-07-25T12:53:54Z

Another two problems:

The branch link under the title should be disabled because there is no branch created.
Documentations should be updated.

a1012112796 · 2021-07-25T15:16:08Z

When push to an empty repository, an error returned remote: error: cannot find hook 'proc-receive'.

If a repo created before this pull request, should run Resynchronize pre-receive, update and post-receive hooks of all repositories.. or if create new repo, It will response other error message example view:

I will add more check to response a more better error message.

lunny · 2021-07-25T15:26:58Z

Maybe you should rewrite the gitea hooks on migrations if git version matched.

a1012112796 · 2021-07-25T15:46:56Z

Maybe you should rewrite the gitea hooks on migrations if git version matched.

I think just add a note on blog is enough

6543 · 2021-07-25T20:30:11Z

@a1012112796 well since we check for the git version and assume if it is high enough we do recive proc-receive.
thats why we skip some checks on post - if there are no proc hooks in place, can this be used to pass code into a repo without permissions to do so?

a1012112796 · 2021-07-26T00:22:52Z

@a1012112796 well since we check for the git version and assume if it is high enough we do recive proc-receive.
thats why we skip some checks on post - if there are no proc hooks in place, can this be used to pass code into a repo without permissions to do so?

Willn't, Because will check permission in pre-receive hook.

models/migrations/v190.go

lunny

Please change more PullRequestStyle to PullRequestFlow, otherwise LGTM

lunny · 2021-07-28T09:42:33Z

make L-G-T-M work.

wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf · 2021-07-28T10:44:11Z

🚀

@jiangxin

* feature: add agit flow support ref: https://git-repo.info/en/2020/03/agit-flow-and-git-repo/ example: ```Bash git checkout -b test echo "test" >> README.md git commit -m "test" git push origin HEAD:refs/for/master -o topic=test ``` Signed-off-by: a1012112796 <1012112796@qq.com> * fix lint * simplify code add fix some nits * update merge help message * Apply suggestions from code review. Thanks @jiangxin * add forced-update message * fix lint * splite writePktLine * add refs/for/<target-branch>/<topic-branch> support also * Add test code add fix api * fix lint * fix test * skip test if git version < 2.29 * try test with git 2.30.1 * fix permission check bug * fix some nit * logic implify and test code update * fix bug * apply suggestions from code review * prepare for merge Signed-off-by: Andrew Thornton <art27@cantab.net> * fix permission check bug - test code update - apply suggestions from code review @zeripath Signed-off-by: a1012112796 <1012112796@qq.com> * fix bug when target branch isn't exist * prevent some special push and fix some nits * fix lint * try splite * Apply suggestions from code review - fix permission check - handle user rename * fix version negotiation * remane * fix template * handle empty repo * ui: fix branch link under the title * fix nits Co-authored-by: Andrew Thornton <art27@cantab.net> Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>

…ndard refs There was an inadvertent breaking change in go-gitea#15629 meaning that notes refs and other git extension refs will be automatically rejected. Further following go-gitea#14295 and go-gitea#15629 the pre-recieve hook code is untenably long and too complex. This PR refactors the hook code and removes the incorrect forced rejection of non-standard refs. Fix go-gitea#16688 Signed-off-by: Andrew Thornton <art27@cantab.net>

…ndard refs (#16705) * Clean-up HookPreReceive and restore functionality for pushing non-standard refs There was an inadvertent breaking change in #15629 meaning that notes refs and other git extension refs will be automatically rejected. Further following #14295 and #15629 the pre-recieve hook code is untenably long and too complex. This PR refactors the hook code and removes the incorrect forced rejection of non-standard refs. Fix #16688 Signed-off-by: Andrew Thornton <art27@cantab.net>

a1012112796 added type/proposal The new feature has not been accepted yet but needs to be discussed first. pr/wip This PR is not ready for review labels Jan 10, 2021

a1012112796 mentioned this pull request Jan 13, 2021

reply issue by email #13585

Closed

1 task

a1012112796 mentioned this pull request Jan 27, 2021

Discussion of v1.15.x Roadmap #14477

Closed

12 tasks

a1012112796 added 3 commits February 7, 2021 16:27

feature: add agit flow support

36c77da

ref: https://git-repo.info/en/2020/03/agit-flow-and-git-repo/ example: ```Bash git checkout -b test echo "test" >> README.md git commit -m "test" git push origin HEAD:refs/for/master -o topic=test ``` Signed-off-by: a1012112796 <1012112796@qq.com>

Merge branch 'master' into git_simple_pr

b8784f9

* master: [skip ci] Updated licenses and gitignores

fix lint

a757ed5

a1012112796 force-pushed the git_simple_pr branch from 736f1b8 to a757ed5 Compare February 7, 2021 08:34

a1012112796 changed the title ~~WIP: try add agit flow support in gitea~~ add agit flow support in gitea Feb 7, 2021

a1012112796 added type/feature Completely new functionality. Can only be merged if feature freeze is not active. and removed type/proposal The new feature has not been accepted yet but needs to be discussed first. pr/wip This PR is not ready for review labels Feb 7, 2021

a1012112796 marked this pull request as ready for review February 7, 2021 08:39

GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Feb 7, 2021

lunny added this to the 1.15.0 milestone Feb 8, 2021

lunny reviewed Feb 8, 2021

View reviewed changes

models/pull.go Outdated Show resolved Hide resolved

lunny reviewed Feb 8, 2021

View reviewed changes

models/pull.go Outdated Show resolved Hide resolved

a1012112796 added 4 commits February 8, 2021 23:19

simplify code add fix some nits

f96e9e7

update merge help message

7294bfa

Merge branch 'master' into git_simple_pr

c1291fa

* master: Add support for ref parameter to get raw file API (go-gitea#14602)

jiangxin suggested changes Feb 9, 2021

View reviewed changes

a1012112796 added 3 commits February 9, 2021 16:41

Apply suggestions from code review. Thanks @jiangxin

0d9442e

add forced-update message

86acbe1

fix lint

95ca26a

a1012112796 and others added 3 commits July 21, 2021 23:24

fix template

fe505de

Merge branch 'main' into git_simple_pr

5a840ac

Merge branch 'main' into git_simple_pr

a86ee55

handle empty repo

25c4b5c

ui: fix branch link under the title

b42ebdd

6543 changed the title ~~add agit flow support in gitea~~ Add agit flow support in gitea Jul 25, 2021

lunny reviewed Jul 28, 2021

View reviewed changes

models/migrations/v190.go Outdated Show resolved Hide resolved

lunny approved these changes Jul 28, 2021

View reviewed changes

GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jul 28, 2021

lunny and others added 2 commits July 28, 2021 11:34

Merge branch 'main' into git_simple_pr

3b6594a

fix nits

f351805

lunny merged commit 3705168 into go-gitea:main Jul 28, 2021

a1012112796 deleted the git_simple_pr branch July 29, 2021 03:36

wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf mentioned this pull request Aug 12, 2021

agit flow hook refuses forced pushes #16679

Open

3 tasks

zeripath mentioned this pull request Aug 16, 2021

Clean-up HookPreReceive and restore functionality for pushing non-standard refs #16705

Merged

go-gitea locked and limited conversation to collaborators Oct 19, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add agit flow support in gitea #14295

Add agit flow support in gitea #14295

a1012112796 commented Jan 10, 2021 •

edited by lunny

Loading

codecov-io commented Feb 7, 2021 •

edited

Loading

lunny commented Feb 8, 2021

jiangxin Feb 9, 2021

jiangxin Feb 9, 2021

jiangxin commented Feb 9, 2021

a1012112796 commented Feb 9, 2021

a1012112796 commented Feb 9, 2021

lunny commented Jul 25, 2021

lunny commented Jul 25, 2021 •

edited

Loading

a1012112796 commented Jul 25, 2021

lunny commented Jul 25, 2021

a1012112796 commented Jul 25, 2021

6543 commented Jul 25, 2021

a1012112796 commented Jul 26, 2021

lunny left a comment

lunny commented Jul 28, 2021

wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf commented Jul 28, 2021


		const VersionHead string = "version=1"

		if !strings.HasPrefix(rs.Data, VersionHead) {

Add agit flow support in gitea #14295

Add agit flow support in gitea #14295

Conversation

a1012112796 commented Jan 10, 2021 • edited by lunny Loading

codecov-io commented Feb 7, 2021 • edited Loading

Codecov Report

lunny commented Feb 8, 2021

jiangxin Feb 9, 2021

Choose a reason for hiding this comment

jiangxin Feb 9, 2021

Choose a reason for hiding this comment

jiangxin commented Feb 9, 2021

a1012112796 commented Feb 9, 2021

a1012112796 commented Feb 9, 2021

lunny commented Jul 25, 2021

lunny commented Jul 25, 2021 • edited Loading

a1012112796 commented Jul 25, 2021

lunny commented Jul 25, 2021

a1012112796 commented Jul 25, 2021

6543 commented Jul 25, 2021

a1012112796 commented Jul 26, 2021

lunny left a comment

Choose a reason for hiding this comment

lunny commented Jul 28, 2021

wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf commented Jul 28, 2021

a1012112796 commented Jan 10, 2021 •

edited by lunny

Loading

codecov-io commented Feb 7, 2021 •

edited

Loading

lunny commented Jul 25, 2021 •

edited

Loading