0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-03-03 10:15:47 -05:00
forgejo/modules
zeripath 8598356df1
Refactor and tidy-up the merge/update branch code (#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: techknowlogick <techknowlogick@gitea.io>
Co-authored-by: delvh <dev.lh@web.de>
2023-03-07 15:07:35 -05:00
..
actions
activitypub
analyze
auth Fix various bugs for "install" page (#23194) 2023-03-04 10:12:02 +08:00
avatar Use minio/sha256-simd for accelerated SHA256 (#23052) 2023-02-22 14:21:46 -05:00
base Use minio/sha256-simd for accelerated SHA256 (#23052) 2023-02-22 14:21:46 -05:00
cache Add context cache as a request level cache (#22294) 2023-02-15 21:37:34 +08:00
charset
container
context Use minio/sha256-simd for accelerated SHA256 (#23052) 2023-02-22 14:21:46 -05:00
csv Add context when rendering labels or emojis (#23281) 2023-03-05 22:59:05 +01:00
doctor Refactor setting.Database.UseXXX to methods (#23354) 2023-03-07 18:51:06 +08:00
emoji
eventsource
generate
git Refactor and tidy-up the merge/update branch code (#22568) 2023-03-07 15:07:35 -05:00
gitgraph Add context cache as a request level cache (#22294) 2023-02-15 21:37:34 +08:00
graceful
hcaptcha
highlight Refactor the setting to make unit test easier (#22405) 2023-02-20 00:12:01 +08:00
hostmatcher
html
httpcache
httplib
indexer Refactor the setting to make unit test easier (#22405) 2023-02-20 00:12:01 +08:00
issue/template
json
label Add loading yaml label template files (#22976) 2023-03-02 01:44:23 +02:00
lfs Use minio/sha256-simd for accelerated SHA256 (#23052) 2023-02-22 14:21:46 -05:00
log
markup Add context when rendering labels or emojis (#23281) 2023-03-05 22:59:05 +01:00
mcaptcha
metrics
migration Scoped labels (#22585) 2023-02-18 21:17:39 +02:00
mirror
nosql
notification
options Add loading yaml label template files (#22976) 2023-03-02 01:44:23 +02:00
packages
paginator
pprof
private
process
proxy Use proxy for pull mirror (#22771) 2023-02-11 08:39:50 +08:00
proxyprotocol
public
queue Properly flush unique queues on startup (#23154) 2023-02-28 17:55:43 -05:00
recaptcha
references
regexplru
repository Add loading yaml label template files (#22976) 2023-03-02 01:44:23 +02:00
secret Use minio/sha256-simd for accelerated SHA256 (#23052) 2023-02-22 14:21:46 -05:00
session
setting Refactor setting.Database.UseXXX to methods (#23354) 2023-03-07 18:51:06 +08:00
sitemap
ssh
storage Add InsecureSkipVerify to Minio Client for Storage (#23166) 2023-02-27 16:26:13 +00:00
structs Add scopes to API to create token and display them (#22989) 2023-02-20 15:28:44 -06:00
svg
sync
system
templates Add context when rendering labels or emojis (#23281) 2023-03-05 22:59:05 +01:00
test Rename repo.GetOwner to repo.LoadOwner (#22967) 2023-02-18 20:11:03 +08:00
timeutil
translation
turnstile
typesniffer Fix various ImageDiff/SVG bugs (#23312) 2023-03-07 20:11:24 +08:00
updatechecker
upload
uri
user
util Use minio/sha256-simd for accelerated SHA256 (#23052) 2023-02-22 14:21:46 -05:00
validation
watcher
web
webhook