0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-22 07:13:02 -05:00
forgejo/routers/private
Lunny Xiao eb792d9f8a
Move database operations of merging a pull request to post receive hook and add a transaction (#30805)
Merging PR may fail because of various problems. The pull request may
have a dirty state because there is no transaction when merging a pull
request. ref
https://github.com/go-gitea/gitea/pull/25741#issuecomment-2074126393

This PR moves all database update operations to post-receive handler for
merging a pull request and having a database transaction. That means if
database operations fail, then the git merging will fail, the git client
will get a fail result.

There are already many tests for pull request merging, so we don't need
to add a new one.

---------

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
(cherry picked from commit ebf0c969403d91ed80745ff5bd7dfbdb08174fc7)

Conflicts:
	modules/private/hook.go
	routers/private/hook_post_receive.go
	trivial conflicts because
	  263a716cb5 * Performance optimization for git push (#30104)
	was not cherry-picked and because of
	  998a431747 Do not update PRs based on events that happened before they existed
2024-05-12 20:03:10 +02:00
..
tests/repos Fix verifyCommits error when push a new branch (#26664) 2023-08-30 02:27:53 +00:00
actions.go Clean up log messages (#30313) 2024-04-15 20:01:35 +02:00
default_branch.go Move get/set default branch from git package to gitrepo package to hide repopath (#29126) 2024-03-11 23:36:59 +07:00
hook_post_receive.go Move database operations of merging a pull request to post receive hook and add a transaction (#30805) 2024-05-12 20:03:10 +02:00
hook_post_receive_test.go Move database operations of merging a pull request to post receive hook and add a transaction (#30805) 2024-05-12 20:03:10 +02:00
hook_pre_receive.go Add codespell support and fix a good number of typos with its help (#3270) 2024-05-09 13:49:37 +00:00
hook_proc_receive.go Move context from modules to services (#29440) 2024-03-06 12:10:43 +08:00
hook_verification.go Clean up log messages (#30313) 2024-04-15 20:01:35 +02:00
hook_verification_test.go Adjust object format interface (#28469) 2023-12-17 11:56:08 +00:00
internal.go Move context from modules to services (#29440) 2024-03-06 12:10:43 +08:00
internal_repo.go Move context from modules to services (#29440) 2024-03-06 12:10:43 +08:00
key.go Move context from modules to services (#29440) 2024-03-06 12:10:43 +08:00
mail.go Clean up log messages (#30313) 2024-04-15 20:01:35 +02:00
main_test.go make writing main test easier (#27270) 2023-09-28 01:38:53 +00:00
manager.go Move context from modules to services (#29440) 2024-03-06 12:10:43 +08:00
manager_process.go Move context from modules to services (#29440) 2024-03-06 12:10:43 +08:00
manager_unix.go Move context from modules to services (#29440) 2024-03-06 12:10:43 +08:00
manager_windows.go Move context from modules to services (#29440) 2024-03-06 12:10:43 +08:00
restore_repo.go Move context from modules to services (#29440) 2024-03-06 12:10:43 +08:00
serv.go Move context from modules to services (#29440) 2024-03-06 12:10:43 +08:00
ssh_log.go Move context from modules to services (#29440) 2024-03-06 12:10:43 +08:00