@@ -143,20 +143,29 @@ func setCsvCompareContext(ctx *context.Context) {
143
143
if err == errTooLarge {
144
144
return CsvDiffResult {nil , err .Error ()}
145
145
}
146
+ if err != nil {
147
+ 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 )
148
+ return CsvDiffResult {nil , "unable to load file from base commit" }
149
+ }
150
+
146
151
headReader , headBlobCloser , err := csvReaderFromCommit (& markup.RenderContext {Ctx : ctx , Filename : diffFile .Name }, headCommit )
147
152
if headBlobCloser != nil {
148
153
defer headBlobCloser .Close ()
149
154
}
150
155
if err == errTooLarge {
151
156
return CsvDiffResult {nil , err .Error ()}
152
157
}
158
+ if err != nil {
159
+ 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 )
160
+ return CsvDiffResult {nil , "unable to load file from head commit" }
161
+ }
153
162
154
163
sections , err := gitdiff .CreateCsvDiff (diffFile , baseReader , headReader )
155
164
if err != nil {
156
165
errMessage , err := csv_module .FormatError (err , ctx .Locale )
157
166
if err != nil {
158
- log .Error ("RenderCsvDiff failed: %v" , err )
159
- return CsvDiffResult {nil , "" }
167
+ log .Error ("CreateCsvDiff FormatError failed: %v" , err )
168
+ return CsvDiffResult {nil , "unknown csv diff error " }
160
169
}
161
170
return CsvDiffResult {nil , errMessage }
162
171
}
0 commit comments