fedi/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-01 16:38:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle the error of a missing blob object fix #19530 (#19552)

Browse source 
* Handle the error of a missing blob object

* Show error in logs

* as per @zeripath

* Add missing error check

* Add missing error check

* Update compare.go

* Use formal code

* Update compare.go

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
This commit is contained in:
99rgosse 2022-05-02 18:46:50 +02:00 committed by GitHub
parent c18d8d6968
commit 438646e0b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
routers/web/repo/compare.go
View file

@ -143,6 +143,11 @@ func setCsvCompareContext(ctx *context.Context) {
if err == errTooLarge { if err == errTooLarge {
return CsvDiffResult{nil, err.Error()} return CsvDiffResult{nil, err.Error()}
} }
if err != nil {
log.Error("CreateCsvDiff error whilst creating baseReader from file %s in commit %s in %s: %v", diffFile.Name, baseCommit.ID.String(), ctx.Repo.Repository.Name, err)
return CsvDiffResult{nil, "unable to load file from base commit"}
}
headReader, headBlobCloser, err := csvReaderFromCommit(&markup.RenderContext{Ctx: ctx, Filename: diffFile.Name}, headCommit) headReader, headBlobCloser, err := csvReaderFromCommit(&markup.RenderContext{Ctx: ctx, Filename: diffFile.Name}, headCommit)
if headBlobCloser != nil { if headBlobCloser != nil {
defer headBlobCloser.Close() defer headBlobCloser.Close()
@ -150,13 +155,17 @@ func setCsvCompareContext(ctx *context.Context) {
if err == errTooLarge { if err == errTooLarge {
return CsvDiffResult{nil, err.Error()} return CsvDiffResult{nil, err.Error()}
} }
if err != nil {
log.Error("CreateCsvDiff error whilst creating headReader from file %s in commit %s in %s: %v", diffFile.Name, headCommit.ID.String(), ctx.Repo.Repository.Name, err)
return CsvDiffResult{nil, "unable to load file from head commit"}
}
sections, err := gitdiff.CreateCsvDiff(diffFile, baseReader, headReader) sections, err := gitdiff.CreateCsvDiff(diffFile, baseReader, headReader)
if err != nil { if err != nil {
errMessage, err := csv_module.FormatError(err, ctx.Locale) errMessage, err := csv_module.FormatError(err, ctx.Locale)
if err != nil { if err != nil {
log.Error("RenderCsvDiff failed: %v", err) log.Error("CreateCsvDiff FormatError failed: %v", err)
return CsvDiffResult{nil, ""} return CsvDiffResult{nil, "unknown csv diff error"}
} }
return CsvDiffResult{nil, errMessage} return CsvDiffResult{nil, errMessage}
} }