Skip to content

Commit 226231e

Browse files
wxiaoguangwxiaoguang
authored
Fix some pending problems (#29985)
These changes are quite independent and trivial, so I don't want to open too many PRs. * #29882 (comment) * the `f.Close` should be called properly * the error message could be more meaningful (#29882 (review)) * #29859 (review) * the new translation strings don't take arguments * #28710 (comment) * stale for long time * #28140 * a form was forgotten to be changed to work with backend code
1 parent 2f060c5 commit 226231e

File tree

12 files changed

+37
-47
lines changed

12 files changed

+37
-47
lines changed

‎models/asymkey/ssh_key_authorized_keys.go

+4-5
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,8 @@ func RegeneratePublicKeys(ctx context.Context, t io.StringWriter) error {
139139
if err != nil {
140140
return err
141141
}
142+
defer f.Close()
143+
142144
scanner := bufio.NewScanner(f)
143145
for scanner.Scan() {
144146
line := scanner.Text()
@@ -148,15 +150,12 @@ func RegeneratePublicKeys(ctx context.Context, t io.StringWriter) error {
148150
}
149151
_, err = t.WriteString(line + "\n")
150152
if err != nil {
151-
f.Close()
152153
return err
153154
}
154155
}
155-
err = scanner.Err()
156-
if err != nil {
157-
return fmt.Errorf("scan: %w", err)
156+
if err = scanner.Err(); err != nil {
157+
return fmt.Errorf("RegeneratePublicKeys scan: %w", err)
158158
}
159-
f.Close()
160159
}
161160
return nil
162161
}

‎modules/actions/log.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ func ReadLogs(ctx context.Context, inStorage bool, filename string, offset, limi
100100
}
101101

102102
if err := scanner.Err(); err != nil {
103-
return nil, fmt.Errorf("scan: %w", err)
103+
return nil, fmt.Errorf("ReadLogs scan: %w", err)
104104
}
105105

106106
return rows, nil

‎modules/git/commit.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -397,9 +397,8 @@ func (c *Commit) GetSubModules() (*ObjectCache, error) {
397397
}
398398
}
399399
}
400-
err = scanner.Err()
401-
if err != nil {
402-
return nil, fmt.Errorf("scan: %w", err)
400+
if err = scanner.Err(); err != nil {
401+
return nil, fmt.Errorf("GetSubModules scan: %w", err)
403402
}
404403

405404
return c.submoduleCache, nil

‎modules/git/repo_stats.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@ func (repo *Repository) GetCodeActivityStats(fromTime time.Time, branch string)
124124
}
125125
}
126126
}
127-
err = scanner.Err()
128-
if err != nil {
129-
return fmt.Errorf("scan: %w", err)
127+
if err = scanner.Err(); err != nil {
128+
_ = stdoutReader.Close()
129+
return fmt.Errorf("GetCodeActivityStats scan: %w", err)
130130
}
131131
a := make([]*CodeActivityAuthor, 0, len(authors))
132132
for _, v := range authors {

‎modules/markup/csv/csv.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,8 @@ func (Renderer) fallbackRender(input io.Reader, tmpBlock *bufio.Writer) error {
124124
return err
125125
}
126126
}
127-
err = scan.Err()
128-
if err != nil {
129-
return fmt.Errorf("scan: %w", err)
127+
if err = scan.Err(); err != nil {
128+
return fmt.Errorf("fallbackRender scan: %w", err)
130129
}
131130

132131
_, err = tmpBlock.WriteString("</pre>")

‎routers/web/repo/compare.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -980,9 +980,8 @@ func getExcerptLines(commit *git.Commit, filePath string, idxLeft, idxRight, chu
980980
}
981981
diffLines = append(diffLines, diffLine)
982982
}
983-
err = scanner.Err()
984-
if err != nil {
985-
return nil, fmt.Errorf("scan: %w", err)
983+
if err = scanner.Err(); err != nil {
984+
return nil, fmt.Errorf("getExcerptLines scan: %w", err)
986985
}
987986
return diffLines, nil
988987
}

‎routers/web/repo/editor.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -333,9 +333,9 @@ func editFilePost(ctx *context.Context, form forms.EditRepoFileForm, isNewFile b
333333
ctx.Error(http.StatusInternalServerError, err.Error())
334334
}
335335
} else if models.IsErrCommitIDDoesNotMatch(err) {
336-
ctx.RenderWithErr(ctx.Tr("repo.editor.commit_id_not_matching", ctx.Repo.RepoLink+"/compare/"+util.PathEscapeSegments(form.LastCommit)+"..."+util.PathEscapeSegments(ctx.Repo.CommitID)), tplEditFile, &form)
336+
ctx.RenderWithErr(ctx.Tr("repo.editor.commit_id_not_matching"), tplEditFile, &form)
337337
} else if git.IsErrPushOutOfDate(err) {
338-
ctx.RenderWithErr(ctx.Tr("repo.editor.push_out_of_date", ctx.Repo.RepoLink+"/compare/"+util.PathEscapeSegments(form.LastCommit)+"..."+util.PathEscapeSegments(form.NewBranchName)), tplEditFile, &form)
338+
ctx.RenderWithErr(ctx.Tr("repo.editor.push_out_of_date"), tplEditFile, &form)
339339
} else if git.IsErrPushRejected(err) {
340340
errPushRej := err.(*git.ErrPushRejected)
341341
if len(errPushRej.Message) == 0 {

‎services/asymkey/ssh_key_authorized_principals.go

+4-5
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,8 @@ func regeneratePrincipalKeys(ctx context.Context, t io.StringWriter) error {
109109
if err != nil {
110110
return err
111111
}
112+
defer f.Close()
113+
112114
scanner := bufio.NewScanner(f)
113115
for scanner.Scan() {
114116
line := scanner.Text()
@@ -118,15 +120,12 @@ func regeneratePrincipalKeys(ctx context.Context, t io.StringWriter) error {
118120
}
119121
_, err = t.WriteString(line + "\n")
120122
if err != nil {
121-
f.Close()
122123
return err
123124
}
124125
}
125-
err = scanner.Err()
126-
if err != nil {
127-
return fmt.Errorf("scan: %w", err)
126+
if err = scanner.Err(); err != nil {
127+
return fmt.Errorf("regeneratePrincipalKeys scan: %w", err)
128128
}
129-
f.Close()
130129
}
131130
return nil
132131
}

‎services/doctor/authorizedkeys.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ func checkAuthorizedKeys(ctx context.Context, logger log.Logger, autofix bool) e
5151
}
5252
linesInAuthorizedKeys.Add(line)
5353
}
54-
err = scanner.Err()
55-
if err != nil {
54+
if err = scanner.Err(); err != nil {
5655
return fmt.Errorf("scan: %w", err)
5756
}
58-
f.Close()
57+
// although there is a "defer close" above, here close explicitly before the generating, because it needs to open the file for writing again
58+
_ = f.Close()
5959

6060
// now we regenerate and check if there are any lines missing
6161
regenerated := &bytes.Buffer{}

‎templates/repo/issue/view_content/pull.tmpl

+9-11
Original file line numberDiff line numberDiff line change
@@ -374,17 +374,15 @@
374374
*/}}
375375
{{if and $.StillCanManualMerge (not $showGeneralMergeForm)}}
376376
<div class="divider"></div>
377-
<div class="ui form">
378-
<form action="{{.Link}}/merge" method="post">
379-
{{.CsrfTokenHtml}}
380-
<div class="field">
381-
<input type="text" name="merge_commit_id" placeholder="{{ctx.Locale.Tr "repo.pulls.merge_commit_id"}}">
382-
</div>
383-
<button class="ui red button" type="submit" name="do" value="manually-merged">
384-
{{ctx.Locale.Tr "repo.pulls.merge_manually"}}
385-
</button>
386-
</form>
387-
</div>
377+
<form class="ui form form-fetch-action" action="{{.Link}}/merge" method="post">{{/* another similar form is in PullRequestMergeForm.vue*/}}
378+
{{.CsrfTokenHtml}}
379+
<div class="field">
380+
<input type="text" name="merge_commit_id" placeholder="{{ctx.Locale.Tr "repo.pulls.merge_commit_id"}}">
381+
</div>
382+
<button class="ui red button" type="submit" name="do" value="manually-merged">
383+
{{ctx.Locale.Tr "repo.pulls.merge_manually"}}
384+
</button>
385+
</form>
388386
{{end}}
389387

390388
{{if and .Issue.PullRequest.HeadRepo (not .Issue.PullRequest.HasMerged) (not .Issue.IsClosed)}}

‎templates/status/404.tmpl

+4-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
{{template "base/head" .}}
2-
<div role="main" aria-label="{{.Title}}" class="page-content ui container center tw-w-screen {{if .IsRepo}}repository{{end}}">
2+
<div role="main" aria-label="{{.Title}}" class="page-content {{if .IsRepo}}repository{{end}}">
33
{{if .IsRepo}}{{template "repo/header" .}}{{end}}
4-
<div class="ui container center">
5-
<p style="margin-top: 100px"><img src="{{AssetUrlPrefix}}/img/404.png" alt="404"></p>
4+
<div class="ui container tw-text-center">
5+
<img class="tw-max-w-[80vw] tw-py-16" src="{{AssetUrlPrefix}}/img/404.png" alt="404">
66
<p>{{if .NotFoundPrompt}}{{.NotFoundPrompt}}{{else}}{{ctx.Locale.Tr "error404"}}{{end}}</p>
7-
{{if .NotFoundGoBackURL}}<a class="ui button green" href="{{.NotFoundGoBackURL}}">{{ctx.Locale.Tr "go_back"}}</a>{{end}}
8-
9-
<div class="divider"></div>
10-
<br>
11-
{{if .ShowFooterVersion}}<p>{{ctx.Locale.Tr "admin.config.app_ver"}}: {{AppVer}}</p>{{end}}
7+
{{if .NotFoundGoBackURL}}<a class="ui button" href="{{.NotFoundGoBackURL}}">{{ctx.Locale.Tr "go_back"}}</a>{{end}}
128
</div>
139
</div>
1410
{{template "base/footer" .}}

‎web_src/js/components/PullRequestMergeForm.vue

+1
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ export default {
9494
<!-- eslint-disable-next-line vue/no-v-html -->
9595
<div v-if="mergeForm.hasPendingPullRequestMerge" v-html="mergeForm.hasPendingPullRequestMergeTip" class="ui info message"/>
9696
97+
<!-- another similar form is in pull.tmpl (manual merge)-->
9798
<form class="ui form form-fetch-action" v-if="showActionForm" :action="mergeForm.baseLink+'/merge'" method="post">
9899
<input type="hidden" name="_csrf" :value="csrfToken">
99100
<input type="hidden" name="head_commit_id" v-model="mergeForm.pullHeadCommitID">

0 commit comments

Comments
 (0)