Skip to content

Fix diffpatch API endpoint #35610

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
Merged
merged 7 commits into from
Oct 9, 2025
Merged

Fix diffpatch API endpoint #35610

merged 7 commits into from
Oct 9, 2025
+143 −3

Conversation

surya-purohit
Copy link
Contributor

Updates the swagger documentation for the diffpatch API endpoint.

The request body is corrected from the outdated UpdateFileOptions to the current ApplyDiffPatchOptions to match the code implementation.

Closes issue#35602

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Oct 9, 2025
@github-actions github-actions bot added modifies/api This PR adds API routes or modifies them modifies/go Pull requests that update Go code labels Oct 9, 2025
@surya-purohit surya-purohit changed the base branch from main to release/v1.25 October 9, 2025 08:31
@surya-purohit surya-purohit changed the base branch from release/v1.25 to main October 9, 2025 08:32
@surya-purohit surya-purohit changed the title fix(swagger): Update diffpatch endpoint to use ApplyDiffPatchOptions instead of UpdateFileOptions Fixes [issue#35602](https://github.com/go-gitea/gitea/issues/35602) Oct 9, 2025
@surya-purohit surya-purohit changed the title Fixes [issue#35602](https://github.com/go-gitea/gitea/issues/35602) Fixes issue#35602: Update diffpatch endpoint to use ApplyDiffPatchOptions for body instead of UpdateFileOptions Oct 9, 2025
@wxiaoguang
Copy link
Contributor

Thank you very much!

I think I made a mistake in "Refactor "change file" API (#34855)", the "diffpatch" shouldn't be in "/contents". Will make some new changes.

@wxiaoguang
Copy link
Contributor

It should be right now: fbbb1ba

@wxiaoguang wxiaoguang added this to the 1.26.0 milestone Oct 9, 2025
@wxiaoguang wxiaoguang changed the title Fixes issue#35602: Update diffpatch endpoint to use ApplyDiffPatchOptions for body instead of UpdateFileOptions Fix diffpatch API endpoint Oct 9, 2025
@surya-purohit
Copy link
Contributor Author

surya-purohit commented Oct 9, 2025 •
edited
Loading

It should be right now: fbbb1ba

Thanks for the quick reply! Glad to see this is fixed.
This change will be very helpful for us once released, as we need to apply patches to multiple files 🙂.

@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Oct 9, 2025
lunny
lunny reviewed Oct 9, 2025
View reviewed changes
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Oct 9, 2025
@wxiaoguang wxiaoguang merged commit b8e5e2a into go-gitea:main Oct 9, 2025
26 checks passed
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Oct 10, 2025
@surya-purohit @wxiaoguang @GiteaBot
Fix diffpatch API endpoint (go-gitea#35610)
48027a0 
Fix the swagger documentation for the `diffpatch` API endpoint,
and fix the wrong API path caused by a refactoring change.

Closes go-gitea#35602

---------

Co-authored-by: wxiaoguang <[email protected]>
@GiteaBot GiteaBot mentioned this pull request Oct 10, 2025
Merged
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label Oct 10, 2025
lunny added a commit that referenced this pull request Oct 10, 2025
@GiteaBot @surya-purohit
@wxiaoguang @lunny
Fix diffpatch API endpoint (#35610) (#35613)
b7bb0fa 
Backport #35610 by @surya-purohit

Updates the swagger documentation for the `diffpatch` API endpoint.

The request body is corrected from the outdated `UpdateFileOptions` to
the current `ApplyDiffPatchOptions` to match the code implementation.

Closes [issue#35602](#35602)

---------

Co-authored-by: Surya Purohit <[email protected]>
Co-authored-by: wxiaoguang <[email protected]>
Co-authored-by: Lunny Xiao <[email protected]>
zjjhot added a commit to zjjhot/gitea that referenced this pull request Oct 13, 2025
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
d15f230 
* giteaofficial/main:
  [skip ci] Updated translations via Crowdin
  Update JS deps, misc tweaks (go-gitea#35643)
  Bump actions/checkout to v5 (go-gitea#35644)
  nix flake update (go-gitea#35639)
  Cleanup ActionRun creation (go-gitea#35624)
  bump archives&rar dep (go-gitea#35637)
  Fix merge panic (go-gitea#35606)
  Bump happy-dom from 19.0.2 to 20.0.0 (go-gitea#35625)
  Refactor ActionRunJob parsing into a reusable function (go-gitea#35623)
  Fix code tag style problem and LFS view bug (go-gitea#35628)
  Support Actions `concurrency` syntax (go-gitea#32751)
  The status icon of the Action step is consistent with GitHub (go-gitea#35618)
  Mock external service in hcaptcha TestCaptcha (go-gitea#35604)
  Fix inputing review comment will remove reviewer (go-gitea#35591)
  [skip ci] Updated translations via Crowdin
  Fix diffpatch API endpoint (go-gitea#35610)
  Print PR-Title into tooltip for actions (go-gitea#35579)
@surya-purohit
Copy link
Contributor Author

@wxiaoguang Are we gonna do a rc release, so that the diffpatch API can be used? Or it'll become a breaking change. Currently we use 1.25.0-rc0 which has contents/diffpatch

@wxiaoguang
Copy link
Contributor

@wxiaoguang Are we gonna do a rc release, so that the diffpatch API can be used? Or it'll become a breaking change. Currently we use 1.25.0-rc0 which has contents/diffpatch

It has been backported to 1.25 by " Fix diffpatch API endpoint #35613 ", but I think it isn't in the RC.

You can use 1.25-nightly (newer than RC, should be stable enough, and will be 1.25.0 soon)

@surya-purohit
Copy link
Contributor Author

@wxiaoguang Are we gonna do a rc release, so that the diffpatch API can be used? Or it'll become a breaking change. Currently we use 1.25.0-rc0 which has contents/diffpatch

It has been backported to 1.25 by " Fix diffpatch API endpoint #35613 ", but I think it isn't in the RC.

You can use 1.25-nightly (newer than RC, should be stable enough, and will be 1.25.0 soon)

Thanks, that worked for now 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@wxiaoguang wxiaoguang wxiaoguang approved these changes

@lunny lunny lunny approved these changes

Assignees

No one assigned

Labels

backport/done All backports for this PR have been created backport/v1.25 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/api This PR adds API routes or modifies them modifies/go Pull requests that update Go code type/bug

Projects

None yet

Milestone

1.26.0

Development

Successfully merging this pull request may close these issues.

diffpatch api doesn't accept patch for multiple files

4 participants

@surya-purohit @wxiaoguang @lunny @GiteaBot