Retarget depending pulls when the parent branch is deleted #28686

kvaster · 2024-01-03T18:42:13Z

Sometimes you need to work on a feature which depends on another (unmerged) feature.
In this case, you may create a PR based on that feature instead of the main branch.
Currently, such PRs will be closed without the possibility to reopen in case the parent feature is merged and its branch is deleted.
Automatic target branch change make life a lot easier in such cases.
Github and Bitbucket behave in such way.

Example:
$PR_1$: main <- feature1
$PR_2$: feature1 <- feature2

Currently, merging $PR_1$ and deleting its branch leads to $PR_2$ being closed without the possibility to reopen.
This is both annoying and loses the review history when you open a new PR.

With this change, $PR_2$ will change its target branch to main ($PR_2$: main <- feature2) after $PR_1$ has been merged and its branch has been deleted.

This behavior is enabled by default but can be disabled.
For security reasons, this target branch change will not be executed when merging PRs targeting another repo.

Fixes #27062
Fixes #18408

…erged and closed, fixes go-gitea#18408

kvaster · 2024-01-03T19:40:42Z

@denyskon , my advice to review this PR.

And if you read previous thread:

I was against feature flag - it can be removed, cause such behaviour seems to be normal for any case
I'm not able to write proper unit tests right now as I was requested
Child PR's are not retargeted in case Base PR targets another repo

denyskon

I am not against making this feature optional, but definitely enabled by default. I think it is good that retarget only occurs inside the same repo, because otherwise PRs may end up somewhere they weren't supposed to.

custom/conf/app.example.ini

docs/content/administration/config-cheat-sheet.en-us.md

modules/setting/repository.go

denyskon · 2024-01-14T12:24:08Z

@kvaster If we need a test, you can add me as collaborator to your fork, then I'd try to write one.

denyskon · 2024-01-14T12:28:10Z

@kvaster Could you mention closing #27062 in PR description? It has a better description of the feature, IMO

kvaster · 2024-01-15T15:44:23Z

I am not against making this feature optional, but definitely enabled by default. I think it is good that retarget only occurs inside the same repo, because otherwise PRs may end up somewhere they weren't supposed to.

I think that making this as a feature is non usefull at all. I will remove with please feature gate if gitea authors/maintainers are ok with this. So, waiting for agreement on this.

@denyskon, adding you as a collaborator.

denyskon · 2024-01-15T15:47:51Z

It's normal for Gitea to be able to disable everything you want, so I don't see any reason not to allow it here too 😆 It is already implemented, so let's keep it, but enable by default.

I'll try to take care of the test later today

kvaster · 2024-01-15T15:49:46Z

Great. Will update PR in a few minutes.

services/pull/pull.go

Co-authored-by: delvh <dev.lh@web.de>

delvh

I've finished testing, everything behaves exactly as expected 🎉

docs/content/administration/config-cheat-sheet.en-us.md

custom/conf/app.example.ini

tests/integration/pull_merge_test.go

Co-authored-by: delvh <dev.lh@web.de>

* giteaofficial/main: Retarget depending pulls when the parent branch is deleted (go-gitea#28686) Bump `@github/relative-time-element` to 4.3.1 (go-gitea#28819) Fix reverting a merge commit failing (go-gitea#28794) Render code block in activity tab (go-gitea#28816) Remove trust model selection from repository creation on web page because it can be changed in settings later (go-gitea#28814)

…28686) Sometimes you need to work on a feature which depends on another (unmerged) feature. In this case, you may create a PR based on that feature instead of the main branch. Currently, such PRs will be closed without the possibility to reopen in case the parent feature is merged and its branch is deleted. Automatic target branch change make life a lot easier in such cases. Github and Bitbucket behave in such way. Example: $PR_1$: main <- feature1 $PR_2$: feature1 <- feature2 Currently, merging $PR_1$ and deleting its branch leads to $PR_2$ being closed without the possibility to reopen. This is both annoying and loses the review history when you open a new PR. With this change, $PR_2$ will change its target branch to main ($PR_2$: main <- feature2) after $PR_1$ has been merged and its branch has been deleted. This behavior is enabled by default but can be disabled. For security reasons, this target branch change will not be executed when merging PRs targeting another repo. Fixes go-gitea#27062 Fixes go-gitea#18408 --------- Co-authored-by: Denys Konovalov <kontakt@denyskon.de> Co-authored-by: delvh <dev.lh@web.de>

MGChecker · 2024-02-25T21:34:08Z

Maybe one should take a look how retargeting like this affects CI integrations like Drone, in particular. I remember having observed issues regarding that in the past.

delvh · 2024-02-25T21:38:38Z

What do you mean?
What sort of issues?

6543 · 2024-02-25T21:57:45Z

If there is a problem with integration with other software, just open a new issue and we see how we can address it on our side.

For your specific note, tbh. that sounds more like a bug in drone-ci ... but if it realy ocures, let us know :)

kvaster added 5 commits January 3, 2024 17:26

Try to keep branch PRs open when branch is deleted cause of it's PR m…

1fd16f9

…erged and closed, fixes go-gitea#18408

Make retarget optional, keep default behaviour without option

badb941

Cleanup error handling, add docs

79e7630

Docs and logs cleanup

edfb3a3

Rebase to main, do not load all issue atributes - repo is enough

64a2019

GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jan 3, 2024

pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jan 3, 2024

github-actions bot added modifies/api This PR adds API routes or modifies them modifies/docs labels Jan 3, 2024

kvaster mentioned this pull request Jan 3, 2024

Redirect open PRs when the target branch is deleted through merging a PR #28539

Closed

denyskon self-requested a review January 3, 2024 19:40

denyskon approved these changes Jan 14, 2024

View reviewed changes

custom/conf/app.example.ini Outdated Show resolved Hide resolved

docs/content/administration/config-cheat-sheet.en-us.md Outdated Show resolved Hide resolved

modules/setting/repository.go Outdated Show resolved Hide resolved

GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jan 14, 2024

denyskon added type/feature Completely new functionality. Can only be merged if feature freeze is not active. topic/pr Issues related to pull requests labels Jan 14, 2024

denyskon added this to the 1.22.0 milestone Jan 14, 2024

denyskon requested review from a1012112796 and delvh January 14, 2024 12:28

kvaster changed the title ~~Retarget Pulls Based on Pulls on Merge~~ Retarget Pulls Based on Pulls on Merge, fixes #27062, #18408 Jan 15, 2024

denyskon added 2 commits January 15, 2024 16:49

Update modules/setting/repository.go

d8b13f1

Update docs/content/administration/config-cheat-sheet.en-us.md

fe010bd

denyskon added 2 commits January 15, 2024 16:49

Update custom/conf/app.example.ini

e2cfe09

Merge branch 'main' into rebase-prs-onmerge

8cd0837

delvh approved these changes Jan 15, 2024

View reviewed changes

services/pull/pull.go Outdated Show resolved Hide resolved

services/pull/pull.go Show resolved Hide resolved

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 Jan 15, 2024

denyskon and others added 3 commits January 16, 2024 18:48

Update services/pull/pull.go

6a70807

Co-authored-by: delvh <dev.lh@web.de>

Merge branch 'main' into rebase-prs-onmerge

a40ecaf

add test

5b2e813

pull-request-size bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 16, 2024

make fmt

05ea478

delvh approved these changes Jan 16, 2024

View reviewed changes

docs/content/administration/config-cheat-sheet.en-us.md Outdated Show resolved Hide resolved

custom/conf/app.example.ini Outdated Show resolved Hide resolved

delvh reviewed Jan 16, 2024

View reviewed changes

tests/integration/pull_merge_test.go Show resolved Hide resolved

denyskon and others added 3 commits January 16, 2024 20:46

Update docs/content/administration/config-cheat-sheet.en-us.md

48d7451

Co-authored-by: delvh <dev.lh@web.de>

Update custom/conf/app.example.ini

ea60e58

Co-authored-by: delvh <dev.lh@web.de>

add don't retarget test

0f6cdda

denyskon approved these changes Jan 16, 2024

View reviewed changes

delvh added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jan 16, 2024

Merge branch 'main' into rebase-prs-onmerge

ca60f1d

delvh merged commit 49eb168 into go-gitea:main Jan 17, 2024
25 checks passed

GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jan 17, 2024

6543 added the type/changelog Adds the changelog for a new Gitea version label Feb 25, 2024

go-gitea locked as resolved and limited conversation to collaborators Feb 25, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Retarget depending pulls when the parent branch is deleted #28686

Retarget depending pulls when the parent branch is deleted #28686

kvaster commented Jan 3, 2024 •

edited by delvh

Loading

kvaster commented Jan 3, 2024

denyskon left a comment

denyskon commented Jan 14, 2024

denyskon commented Jan 14, 2024

kvaster commented Jan 15, 2024

denyskon commented Jan 15, 2024

kvaster commented Jan 15, 2024

delvh left a comment

MGChecker commented Feb 25, 2024

delvh commented Feb 25, 2024

6543 commented Feb 25, 2024

Retarget depending pulls when the parent branch is deleted #28686

Retarget depending pulls when the parent branch is deleted #28686

Conversation

kvaster commented Jan 3, 2024 • edited by delvh Loading

kvaster commented Jan 3, 2024

denyskon left a comment

Choose a reason for hiding this comment

denyskon commented Jan 14, 2024

denyskon commented Jan 14, 2024

kvaster commented Jan 15, 2024

denyskon commented Jan 15, 2024

kvaster commented Jan 15, 2024

delvh left a comment

Choose a reason for hiding this comment

MGChecker commented Feb 25, 2024

delvh commented Feb 25, 2024

6543 commented Feb 25, 2024

kvaster commented Jan 3, 2024 •

edited by delvh

Loading