mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2025-09-15 18:56:59 +00:00
chore(dependency): upgrade gof3 v3.10.6 (#7258)
cherry-pick from the forgefriends fork, except for the F3 API for mirroring which is a functional change that is not safe enough to introduce in Forgejo.
Refs: 3aad1f4e64
---
The motivation is to keep up-to-date with the rather large refactor of gof3. The changes are syntactic only and test is provided by the compliance suite.
Co-authored-by: limiting-factor <limiting-factor@posteo.com>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7258
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
This commit is contained in:
parent
30b438ff84
commit
316682f17b
26 changed files with 84 additions and 60 deletions
|
@ -11,6 +11,7 @@ import (
|
|||
"code.gitea.io/gitea/models/db"
|
||||
repo_model "code.gitea.io/gitea/models/repo"
|
||||
|
||||
f3_id "code.forgejo.org/f3/gof3/v3/id"
|
||||
f3_tree "code.forgejo.org/f3/gof3/v3/tree/f3"
|
||||
"code.forgejo.org/f3/gof3/v3/tree/generic"
|
||||
)
|
||||
|
@ -19,18 +20,18 @@ type projects struct {
|
|||
container
|
||||
}
|
||||
|
||||
func (o *projects) GetIDFromName(ctx context.Context, name string) generic.NodeID {
|
||||
func (o *projects) GetIDFromName(ctx context.Context, name string) f3_id.NodeID {
|
||||
owner := f3_tree.GetOwnerName(o.GetNode())
|
||||
forgejoProject, err := repo_model.GetRepositoryByOwnerAndName(ctx, owner, name)
|
||||
if repo_model.IsErrRepoNotExist(err) {
|
||||
return generic.NilID
|
||||
return f3_id.NilID
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
panic(fmt.Errorf("error GetRepositoryByOwnerAndName(%s, %s): %v", owner, name, err))
|
||||
}
|
||||
|
||||
return generic.NewNodeID(forgejoProject.ID)
|
||||
return f3_id.NewNodeID(forgejoProject.ID)
|
||||
}
|
||||
|
||||
func (o *projects) ListPage(ctx context.Context, page int) generic.ChildrenSlice {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue