Add error if file could not be retrieved

Author: denyskon

routers/api/v1/repo/file.go

@@ -1049,7 +1049,12 @@ func GetFiles(ctx *context.APIContext) {
 
 	filesResponse, err := files_service.GetContentsListFromTrees(ctx, ctx.Repo.Repository, ref, files)
 	if err != nil {
-		ctx.APIError(http.StatusRequestEntityTooLarge, err.Error())
+		if err.Error() == "the combined size of the requested blobs exceeds the per-request limit set by the server administrator" {
+			ctx.APIError(http.StatusRequestEntityTooLarge, err.Error())
+		} else {
+			ctx.APIErrorNotFound("GetFiles")
+		}
+		return
 	}
 
 	ctx.SetTotalCountHeader(int64(count))

services/repository/files/file.go

@@ -22,7 +22,10 @@ func GetContentsListFromTrees(ctx context.Context, repo *repo_model.Repository,
 	files := []*api.ContentsResponse{}
 	var size int64 = 0
 	for _, file := range treeNames {
-		fileContents, _ := GetContents(ctx, repo, file, branch, false) // ok if fails, then will be nil
+		fileContents, err := GetContents(ctx, repo, file, branch, false)
+		if err != nil {
+			return nil, err
+		}
 		if *fileContents.Content != "" {
 			size += fileContents.Size // if content isn't empty (e. g. due to the single blob being too large), add file size to response size
 		}