Add apply-patch, basic revert and cherry-pick functionality #17902
Conversation
This file contains 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
zeripath
added
the
type/feature
|
This PR is essentially a rebase of the very old WIP. One thing that this PR isn't currently doing is ensuring that the protect file paths are checked but as far as I understand these will be checked in the post-receive of the ultimate push so I think this should be fine. |
GiteaBot
added
the
lgtm/need 2
This code adds a simple endpoint to apply patches to repositories and branches on gitea. Signed-off-by: Andrew Thornton <art27@cantab.net>
|
imho it's missing golang view tmpl file 😉 |
Signed-off-by: Andrew Thornton <art27@cantab.net>
What do you mean? |
|
Sorry, GitHub wasn't showing templates/repo/editor/patch.tmpl file in diff previously somehow for me 😅 |
lunny
reviewed
Dec 4, 2021
lunny
reviewed
Dec 4, 2021
silverwind
reviewed
Dec 6, 2021
Co-authored-by: silverwind <me@silverwind.io>
Signed-off-by: Andrew Thornton <art27@cantab.net>
Signed-off-by: Andrew Thornton <art27@cantab.net>
zeripath
changed the title
Signed-off-by: Andrew Thornton <art27@cantab.net>
|
This PR provides a very basic implementation of #3880 |
|
Could you post some screentshots? |
Signed-off-by: Andrew Thornton <art27@cantab.net>
Signed-off-by: Andrew Thornton <art27@cantab.net>
Signed-off-by: Andrew Thornton <art27@cantab.net>
wxiaoguang
reviewed
Feb 8, 2022
wxiaoguang
reviewed
Feb 8, 2022
wxiaoguang
reviewed
Feb 8, 2022
wxiaoguang
reviewed
Feb 8, 2022
wxiaoguang
reviewed
Feb 8, 2022
silverwind
reviewed
Feb 8, 2022
silverwind
reviewed
Feb 8, 2022
Signed-off-by: Andrew Thornton <art27@cantab.net>
wxiaoguang
approved these changes
Feb 9, 2022
GiteaBot
added
lgtm/done
|
🚀 |
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Feb 10, 2022
* giteaofficial/main: Fix issue with docker-rootless shimming script (go-gitea#18690) tests: remove redundant comparison in repo dump/restore (go-gitea#18660) [skip ci] Updated translations via Crowdin Disable unnecessary OpenID/OAuth2 elements (go-gitea#18491) Add apply-patch, basic revert and cherry-pick functionality (go-gitea#17902) C preprocessor colors improvement (go-gitea#18671) Update object repo with the migrated repository (go-gitea#18684)
Chianina
pushed a commit
to Chianina/gitea
that referenced
this pull request
Mar 28, 2022
…#17902) This code adds a simple endpoint to apply patches to repositories and branches on gitea. This is then used along with the conflicting checking code in go-gitea#18004 to provide a basic implementation of cherry-pick revert. Now because the buttons necessary for cherry-pick and revert have required us to create a dropdown next to the Browse Source button I've also implemented Create Branch and Create Tag operations. Fix go-gitea#3880 Fix go-gitea#17986 Signed-off-by: Andrew Thornton <art27@cantab.net>
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.
This code adds a simple endpoint to apply patches to repositories and
branches on gitea. This is then used along with the conflicting checking
code in #18004 to provide a basic implementation of cherry-pick revert.
Now because the buttons necessary for cherry-pick and revert have
required us to create a dropdown next to the Browse Source button
I've also implemented Create Branch and Create Tag operations.
Fix #3880
Fix #17986
Signed-off-by: Andrew Thornton art27@cantab.net
Screenshots
Apply Patch
Cherry Pick/Revert
The commit message will be prefilled with the commit message being cherry-picked.
If the cherry-pick/revert fails then the results will pass back to the apply-patch screen to adjust the patch.