Skip to content

Commit ad13de5

Browse files
lunnylunny
committed
Fix error comments
1 parent 22731a2 commit ad13de5

File tree

12 files changed

+29
-42
lines changed

12 files changed

+29
-42
lines changed

‎models/org_team.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func addAllRepositories(ctx context.Context, t *organization.Team) error {
6666
for _, repo := range orgRepos {
6767
if !organization.HasTeamRepo(ctx, t.OrgID, t.ID, repo.ID) {
6868
if err := AddRepository(ctx, t, repo); err != nil {
69-
return fmt.Errorf("addRepository: %v", err)
69+
return fmt.Errorf("AddRepository: %v", err)
7070
}
7171
}
7272
}

‎models/organization/mini_org.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ import (
1616
"xorm.io/builder"
1717
)
1818

19-
// MinimalOrg represents a simple orgnization with only needed columns
19+
// MinimalOrg represents a simple organization with only the needed columns
2020
type MinimalOrg = Organization
2121

22-
// GetUserOrgsList returns one user's all orgs list
22+
// GetUserOrgsList returns all organizations the given user has access to
2323
func GetUserOrgsList(user *user_model.User) ([]*MinimalOrg, error) {
2424
schema, err := db.TableInfo(new(user_model.User))
2525
if err != nil {

‎models/organization/org_repo.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
repo_model "code.gitea.io/gitea/models/repo"
1212
)
1313

14+
// GetOrgRepositories get repos belonging to the given organization
1415
func GetOrgRepositories(ctx context.Context, orgID int64) ([]*repo_model.Repository, error) {
1516
var orgRepos []*repo_model.Repository
1617
return orgRepos, db.GetEngine(ctx).Where("owner_id = ?", orgID).Find(&orgRepos)

‎models/organization/team.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,7 @@ func GetRepoTeams(ctx context.Context, repo *repo_model.Repository) (teams []*Te
360360
Find(&teams)
361361
}
362362

363+
// IncrTeamRepoNum increases the number of repos for the given team by 1
363364
func IncrTeamRepoNum(ctx context.Context, teamID int64) error {
364365
_, err := db.GetEngine(ctx).Incr("num_repos").ID(teamID).Update(new(Team))
365366
return err

‎models/perm/access/repo_permission.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ func CheckRepoUnitUser(ctx context.Context, repo *repo_model.Repository, user *u
438438
}
439439
perm, err := GetUserRepoPermission(ctx, repo, user)
440440
if err != nil {
441-
log.Error("GetUserRepoPermission(): %v", err)
441+
log.Error("GetUserRepoPermission: %w", err)
442442
return false
443443
}
444444

‎models/repo_transfer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ func TransferOwnership(doer *user_model.User, newOwnerName string, repo *repo_mo
328328
for _, t := range teams {
329329
if t.IncludesAllRepositories {
330330
if err := AddRepository(ctx, t, repo); err != nil {
331-
return fmt.Errorf("addRepository: %v", err)
331+
return fmt.Errorf("AddRepository: %v", err)
332332
}
333333
}
334334
}

‎modules/context/repo.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ type CanCommitToBranchResults struct {
119119

120120
// CanCommitToBranch returns true if repository is editable and user has proper access level
121121
//
122-
// and branch is not protected for push
122+
// and branch is not protected for push
123123
func (r *Repository) CanCommitToBranch(ctx context.Context, doer *user_model.User) (CanCommitToBranchResults, error) {
124124
protectedBranch, err := git_model.GetProtectedBranchBy(ctx, r.Repository.ID, r.BranchName)
125125
if err != nil {

‎modules/repository/collaborator.go

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,7 @@ func addCollaborator(ctx context.Context, repo *repo_model.Repository, u *user_m
3737

3838
// AddCollaborator adds new collaboration to a repository with default access mode.
3939
func AddCollaborator(repo *repo_model.Repository, u *user_model.User) error {
40-
ctx, committer, err := db.TxContext()
41-
if err != nil {
42-
return err
43-
}
44-
defer committer.Close()
45-
46-
if err := addCollaborator(ctx, repo, u); err != nil {
47-
return err
48-
}
49-
50-
return committer.Commit()
40+
return db.WithTx(func(ctx context.Context) error {
41+
return addCollaborator(ctx, repo, u)
42+
})
5143
}

‎modules/repository/create.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -101,52 +101,52 @@ func CreateRepositoryByExample(ctx context.Context, doer, u *user_model.User, re
101101
// Remember visibility preference.
102102
u.LastRepoVisibility = repo.IsPrivate
103103
if err = user_model.UpdateUserCols(ctx, u, "last_repo_visibility"); err != nil {
104-
return fmt.Errorf("updateUser: %v", err)
104+
return fmt.Errorf("UpdateUserCols: %v", err)
105105
}
106106

107107
if err = user_model.IncrUserRepoNum(ctx, u.ID); err != nil {
108-
return fmt.Errorf("increment user total_repos: %v", err)
108+
return fmt.Errorf("IncrUserRepoNum: %v", err)
109109
}
110110
u.NumRepos++
111111

112112
// Give access to all members in teams with access to all repositories.
113113
if u.IsOrganization() {
114114
teams, err := organization.FindOrgTeams(ctx, u.ID)
115115
if err != nil {
116-
return fmt.Errorf("loadTeams: %v", err)
116+
return fmt.Errorf("FindOrgTeams: %v", err)
117117
}
118118
for _, t := range teams {
119119
if t.IncludesAllRepositories {
120120
if err := models.AddRepository(ctx, t, repo); err != nil {
121-
return fmt.Errorf("addRepository: %v", err)
121+
return fmt.Errorf("AddRepository: %v", err)
122122
}
123123
}
124124
}
125125

126126
if isAdmin, err := access_model.IsUserRepoAdmin(ctx, repo, doer); err != nil {
127-
return fmt.Errorf("IsUserRepoAdminCtx: %v", err)
127+
return fmt.Errorf("IsUserRepoAdmin: %v", err)
128128
} else if !isAdmin {
129129
// Make creator repo admin if it wasn't assigned automatically
130130
if err = addCollaborator(ctx, repo, doer); err != nil {
131-
return fmt.Errorf("AddCollaborator: %v", err)
131+
return fmt.Errorf("addCollaborator: %v", err)
132132
}
133133
if err = repo_model.ChangeCollaborationAccessModeCtx(ctx, repo, doer.ID, perm.AccessModeAdmin); err != nil {
134-
return fmt.Errorf("ChangeCollaborationAccessMode: %v", err)
134+
return fmt.Errorf("ChangeCollaborationAccessModeCtx: %v", err)
135135
}
136136
}
137137
} else if err = access_model.RecalculateAccesses(ctx, repo); err != nil {
138-
// Organization automatically called this in addRepository method.
139-
return fmt.Errorf("recalculateAccesses: %v", err)
138+
// Organization automatically called this in AddRepository method.
139+
return fmt.Errorf("RecalculateAccesses: %v", err)
140140
}
141141

142142
if setting.Service.AutoWatchNewRepos {
143143
if err = repo_model.WatchRepo(ctx, doer.ID, repo.ID, true); err != nil {
144-
return fmt.Errorf("watchRepo: %v", err)
144+
return fmt.Errorf("WatchRepo: %v", err)
145145
}
146146
}
147147

148148
if err = webhook.CopyDefaultWebhooksToRepo(ctx, repo.ID); err != nil {
149-
return fmt.Errorf("copyDefaultWebhooksToRepo: %v", err)
149+
return fmt.Errorf("CopyDefaultWebhooksToRepo: %v", err)
150150
}
151151

152152
return nil

‎routers/api/v1/org/team.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -658,7 +658,7 @@ func AddTeamRepository(ctx *context.APIContext) {
658658
return
659659
}
660660
if err := org_service.TeamAddRepository(ctx.Org.Team, repo); err != nil {
661-
ctx.Error(http.StatusInternalServerError, "AddRepository", err)
661+
ctx.Error(http.StatusInternalServerError, "TeamAddRepository", err)
662662
return
663663
}
664664
ctx.Status(http.StatusNoContent)

‎routers/web/repo/setting.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -991,7 +991,7 @@ func AddTeamPost(ctx *context.Context) {
991991
}
992992

993993
if err = org_service.TeamAddRepository(team, ctx.Repo.Repository); err != nil {
994-
ctx.ServerError("team.AddRepository", err)
994+
ctx.ServerError("TeamAddRepository", err)
995995
return
996996
}
997997

‎services/org/repo.go

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
package org
66

77
import (
8+
"context"
89
"errors"
910

1011
"code.gitea.io/gitea/models"
@@ -16,20 +17,12 @@ import (
1617
// TeamAddRepository adds new repository to team of organization.
1718
func TeamAddRepository(t *organization.Team, repo *repo_model.Repository) (err error) {
1819
if repo.OwnerID != t.OrgID {
19-
return errors.New("Repository does not belong to organization")
20+
return errors.New("repository does not belong to organization")
2021
} else if models.HasRepository(t, repo.ID) {
2122
return nil
2223
}
2324

24-
ctx, committer, err := db.TxContext()
25-
if err != nil {
26-
return err
27-
}
28-
defer committer.Close()
29-
30-
if err = models.AddRepository(ctx, t, repo); err != nil {
31-
return err
32-
}
33-
34-
return committer.Commit()
25+
return db.WithTx(func(ctx context.Context) error {
26+
return models.AddRepository(ctx, t, repo)
27+
})
3528
}

0 commit comments

Comments
 (0)