forgejo/services
Giteabot e9991b1f06
Refactor and tidy-up the merge/update branch code (#22568) (#23365)
Backport #22568

The merge and update branch code was previously a little tangled and had
some very long functions. The functions were not very clear in their
reasoning and there were deficiencies in their logging and at least one
bug in the handling of LFS for update by rebase.

This PR substantially refactors this code and splits things out to into
separate functions. It also attempts to tidy up the calls by wrapping
things in "context"s. There are also attempts to improve logging when
there are errors.

Signed-off-by: Andrew Thornton <art27@cantab.net>

Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Co-authored-by: delvh <dev.lh@web.de>
2023-03-09 22:15:39 -05:00
..
actions Avoid panic caused by broken payload when creating commit status (#23216) (#23294) 2023-03-04 14:23:49 +00:00
agit Rename almost all Ctx functions (#22071) 2022-12-10 10:46:31 +08:00
asymkey Add context cache as a request level cache (#22294) 2023-02-15 21:37:34 +08:00
attachment Add API management for issue/pull and comment attachments (#21783) 2022-12-09 14:35:56 +08:00
auth Add context cache as a request level cache (#22294) 2023-02-15 21:37:34 +08:00
automerge Add force_merge to merge request and fix checking mergable (#23010) 2023-02-21 08:42:07 -06:00
context Support org/user level projects (#22235) 2023-01-20 19:42:33 +08:00
convert Fix SyncOnCommit always return false in API of push_mirrors (#23088) (#23100) 2023-02-24 14:36:25 +08:00
cron Add Cargo package registry (#21888) 2023-02-05 18:12:31 +08:00
externalaccount Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
forms Add force_merge to merge request and fix checking mergable (#23010) 2023-02-21 08:42:07 -06:00
gitdiff Fix broken code editor diff preview (#23307) (#23320) 2023-03-06 12:05:35 -06:00
issue Webhooks: for issue close/reopen action, add commit ID that caused it (#22583) 2023-01-24 23:47:53 -05:00
lfs Use context parameter in models/git (#22367) 2023-01-09 11:50:54 +08:00
mailer fix permission check for creating comment while mail (#22524) 2023-01-28 17:28:55 +08:00
markup Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
migrations Add loading yaml label template files (#22976) (#23232) 2023-03-01 21:57:34 -05:00
mirror Fill head commit to in payload when notifying push commits for mirroring (#23215) (#23292) 2023-03-04 19:02:50 +01:00
org Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
packages Use import of OCI structs (#22765) 2023-02-06 10:07:09 +00:00
pull Refactor and tidy-up the merge/update branch code (#22568) (#23365) 2023-03-09 22:15:39 -05:00
release Add context cache as a request level cache (#22294) 2023-02-15 21:37:34 +08:00
repository Return empty url for submodule tree entries (#23043) 2023-02-21 12:31:17 -05:00
task Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
user Add context cache as a request level cache (#22294) 2023-02-15 21:37:34 +08:00
webhook Fix intermittent panic in notify issue change content (#23019) 2023-02-20 19:15:49 -05:00
wiki Improve utils of slices (#22379) 2023-01-11 13:31:16 +08:00