Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 16 commits into from
May 2, 2022
Merged

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

Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
4b1b1d8
Handle the error of a missing blob object
99rgosse Apr 29, 2022
df9e0f8
Show error in logs
wxiaoguang Apr 29, 2022
8583766
Merge branch 'main' into PR500_#19530
wxiaoguang Apr 29, 2022
0615b24
Merge branch 'main' into PR500_#19530
6543 Apr 29, 2022
4d9cda0
as per @zeripath
6543 May 1, 2022
c2aa980
Merge branch 'main' into PR500_#19530
6543 May 1, 2022
4534ecf
Add missing error check
wxiaoguang May 2, 2022
9b8c7c4
Add missing error check
wxiaoguang May 2, 2022
261a23a
Update compare.go
wxiaoguang May 2, 2022
d881265
Use formal code
wxiaoguang May 2, 2022
4d2be72
Update compare.go
wxiaoguang May 2, 2022
40d8e77
Merge branch 'main' into PR500_#19530
wxiaoguang May 2, 2022
88e9f56
Merge branch 'main' into PR500_#19530
6543 May 2, 2022
27321a8
Merge branch 'main' into PR500_#19530
wxiaoguang May 2, 2022
2358358
Merge branch 'main' into PR500_#19530
6543 May 2, 2022
666be24
Merge branch 'main' into PR500_#19530
techknowlogick May 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions routers/web/repo/compare.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,20 +143,29 @@ func setCsvCompareContext(ctx *context.Context) {
if err == errTooLarge {
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)
if headBlobCloser != nil {
defer headBlobCloser.Close()
}
if err == errTooLarge {
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)
if err != nil {
errMessage, err := csv_module.FormatError(err, ctx.Locale)
if err != nil {
log.Error("RenderCsvDiff failed: %v", err)
return CsvDiffResult{nil, ""}
log.Error("CreateCsvDiff FormatError failed: %v", err)
return CsvDiffResult{nil, "unknown csv diff error"}
}
return CsvDiffResult{nil, errMessage}
}
Expand Down