thepaperpilot/forgejo
1
0
Fork 0
Code Issues Pull requests Releases Activity Actions 3
forgejo/cmd
History
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
..
forgejo [REFACTOR] cli: prepareWorkPathAndCustomConf is not just for actions 2024-02-25 09:54:25 +01:00
actions.go [BRANDING] cosmetic s/Gitea/Forgejo/ in logs, messages, etc. 2024-02-05 16:02:14 +01:00
admin.go Simplify how git repositories are opened (#28937) 2024-01-27 21:09:51 +01:00
admin_auth.go chore: use errors.New to replace fmt.Errorf with no parameters will much better (#30621) 2024-04-28 15:39:00 +02:00
admin_auth_ldap.go Penultimate round of db.DefaultContext refactor (#27414) 2023-10-11 04:24:07 +00:00
admin_auth_ldap_test.go Penultimate round of db.DefaultContext refactor (#27414) 2023-10-11 04:24:07 +00:00
admin_auth_oauth.go chore: use errors.New to replace fmt.Errorf with no parameters will much better (#30621) 2024-04-28 15:39:00 +02:00
admin_auth_stmp.go chore: use errors.New to replace fmt.Errorf with no parameters will much better (#30621) 2024-04-28 15:39:00 +02:00
admin_regenerate.go Revert "[BUG] Initalize Git for hook regeneration" 2024-02-26 22:30:25 +01:00
admin_user.go Refactor to use urfave/cli/v2 (#25959) 2023-07-21 17:28:19 +08:00
admin_user_change_password.go Improve "must-change-password" logic and document (#30472) 2024-04-21 11:29:08 +02:00
admin_user_create.go fix(cli): admin user create first user never require a password change 2024-04-24 15:43:27 +02:00
admin_user_delete.go chore: use errors.New to replace fmt.Errorf with no parameters will much better (#30621) 2024-04-28 15:39:00 +02:00
admin_user_generate_access_token.go chore: use errors.New to replace fmt.Errorf with no parameters will much better (#30621) 2024-04-28 15:39:00 +02:00
admin_user_list.go Reduce usage of db.DefaultContext (#27073) 2023-09-14 17:09:32 +00:00
admin_user_must_change_password.go Refactor to use urfave/cli/v2 (#25959) 2023-07-21 17:28:19 +08:00
cert.go [BRANDING] cosmetic s/Gitea/Forgejo/ in logs, messages, etc. 2024-02-05 16:02:14 +01:00
cmd.go Refactor to use urfave/cli/v2 (#25959) 2023-07-21 17:28:19 +08:00
docs.go [BRANDING] cosmetic s/Gitea/Forgejo/ in logs, messages, etc. 2024-02-05 16:02:14 +01:00
doctor.go [BRANDING] cosmetic s/Gitea/Forgejo/ in logs, messages, etc. 2024-02-05 16:02:14 +01:00
doctor_convert.go [CHORE] Remove Microsoft SQL Server Support 2024-04-05 23:37:36 +02:00
doctor_test.go Move doctor package from modules to services (#28856) 2024-01-20 10:07:31 +08:00
dump.go [CHORE] Remove Microsoft SQL Server Support 2024-04-05 23:37:36 +02:00
dump_repo.go Refactor to use urfave/cli/v2 (#25959) 2023-07-21 17:28:19 +08:00
dump_test.go [BUG] Allow to exclude files in dump 2024-03-29 13:25:11 +01:00
embedded.go chore: use errors.New to replace fmt.Errorf with no parameters will much better (#30621) 2024-04-28 15:39:00 +02:00
generate.go [GITEA] Refactor generation of JWT secret 2024-02-05 16:54:44 +01:00
hook.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_test.go Add unit tests for update git hook 2024-04-06 17:01:33 +02:00
keys.go Refactor cmd setup and remove deadcode (#29313) 2024-02-26 22:30:25 +01:00
mailer.go Return responseText instead of string in some functions (#28836) 2024-01-19 10:45:23 +08:00
main.go [BRANDING] alias {FORGEJO,GITEA}_{CUSTOM,WORK_DIR} 2024-02-05 16:05:01 +01:00
main_test.go make writing main test easier (#27270) 2023-09-28 01:38:53 +00:00
manager.go [BRANDING] cosmetic s/Gitea/Forgejo/ in logs, messages, etc. 2024-02-05 16:02:14 +01:00
manager_logging.go chore: use errors.New to replace fmt.Errorf with no parameters will much better (#30621) 2024-04-28 15:39:00 +02:00
migrate.go Refactor to use urfave/cli/v2 (#25959) 2023-07-21 17:28:19 +08:00
migrate_storage.go Fix missing migrate actions artifacts (#30874) 2024-05-12 20:03:10 +02:00
migrate_storage_test.go Another round of db.DefaultContext refactor (#27103) 2023-09-25 13:17:37 +00:00
restore_repo.go Refactor to use urfave/cli/v2 (#25959) 2023-07-21 17:28:19 +08:00
serv.go [CHORE] Remove println 2024-04-12 13:36:31 +02:00
web.go Clean up log messages (#30313) 2024-04-15 20:01:35 +02:00
web_acme.go
web_graceful.go
web_https.go