@ -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 }
}
}