Fix CSV diff for added/deleted files #21189
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
wxiaoguang
approved these changes
Sep 16, 2022
lafriks
approved these changes
Sep 16, 2022
delvh
reviewed
Sep 16, 2022
Comment on lines
+153
to
+162
| headReader, headBlobCloser, err := csvReaderFromCommit(&markup.RenderContext{Ctx: ctx, RelativePath: diffFile.Name}, headBlob) | ||
| 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"} | ||
| if err == errTooLarge { | ||
| return CsvDiffResult{nil, err.Error()} | ||
| } | ||
| log.Error("error whilst creating csv.Reader from file %s in head commit %s in %s: %v", diffFile.Name, headBlob.ID.String(), ctx.Repo.Repository.Name, err) | ||
| return CsvDiffResult{nil, "unable to load file"} |
There was a problem hiding this comment.
I think it might be beneficial to extract this block into one common function taking
ctx context.Context, relativePath string, blob *git.blob, commitType string,
and then calling it once with
ctx, diffFile.OldName, baseBlob, "base"
and once with
ctx, diffFile.Name, headBlob, "head"
There was a problem hiding this comment.
As a bug fix, I think current approach is also clear and readable.
wxiaoguang
pushed a commit
to wxiaoguang/gitea
that referenced
this pull request
Sep 17, 2022
Fixes go-gitea#21184 Regression of go-gitea#19552 Instead of using `GetBlobByPath` I use the already existing instances. We need more information from go-gitea#19530 if that error is still present.
|
Backport for 1.17: |
wxiaoguang
added a commit
that referenced
this pull request
Sep 17, 2022
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Sep 19, 2022
* upstream/main: Fix typo (go-gitea#21201) Remove unnecessary length check for repo's Description & Website (go-gitea#21194) Treat git object mode 40755 as directory (go-gitea#21195) Fix reaction of issues (go-gitea#21185) Fix CSV diff for added/deleted files (go-gitea#21189) Show label description in comments section (go-gitea#21156) Limit length of repo description and repo url input fields (go-gitea#21119)
vanhoang1107
added a commit
to vanhoang1107/gitea
that referenced
this pull request
Oct 31, 2022
* src/release/v1.17: (26 commits) Fix reaction of issues (go-gitea#21185) (go-gitea#21196) Fix CSV diff for added/deleted files (go-gitea#21189) (go-gitea#21193) Fix pagination limit parameter problem (go-gitea#21111) Add MD5 back to template helper functions to avoid breaking (go-gitea#21102) Add changelog for v1.17.2 (go-gitea#21089) Fix sub folder in repository missing add file dropdown (go-gitea#21069) (go-gitea#21083) Fix hard-coded timeout and error panic in API archive download endpoint (go-gitea#20925) (go-gitea#21051) Fix delete user missed some comments (go-gitea#21067) (go-gitea#21068) Delete unreferenced packages when deleting a package version (go-gitea#20977) (go-gitea#21060) Redirect if user does not exist on admin pages (go-gitea#20981) (go-gitea#21059) Set uploadpack.allowFilter etc on gitea serv to enable partial clones with ssh (go-gitea#20902) (go-gitea#21058) Fix 500 on time in timeline API (go-gitea#21052) (go-gitea#21057) Fill the specified ref in webhook test payload (go-gitea#20961) (go-gitea#21055) Add another index for Action table on postgres (go-gitea#21033) (go-gitea#21054) fix broken insecureskipverify handling in rediss connection uris (go-gitea#20967) (go-gitea#21053) Add more checks in migration code (go-gitea#21011) (go-gitea#21050) Add Dev, Peer and Optional dependencies to npm PackageMetadataVersion (go-gitea#21017) (go-gitea#21044) Improve arc-green code theme (go-gitea#21039) (go-gitea#21042) Add down key check has tribute container (go-gitea#21016) (go-gitea#21038) Do not add links to Posters or Assignees with ID < 0 (go-gitea#20577) (go-gitea#21037) ...
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #21184
Regression of #19552
Instead of using
GetBlobByPathI use the already existing instances.We need more information from #19530 if that error is still present.