Improved Moved
#141
Merged
Improved Moved
#141
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
In some cases a moved file can also be modified and in these cases there will be a diff as well as new Oid's for the two sides of the diff. Add DiffFile to the Moved type, changing the insert_moved method to accept the DiffFile's and the DiffContent. When serializing a Moved, if the old and the new are the same then the serialization of the diff files and content are skipped -- same as the old behaviour. Otherwise, the two sides are serialized along with the content. Signed-off-by: Fintan Halpenny <fintan.halpenny@gmail.com> X-Clacks-Overhead: GNU Terry Pratchett
|
Thanks @FintanH for the heads up, as far as I can see we would need to adapt the I'll add a issue on |
sebastinez
approved these changes
Aug 31, 2023
That's great! Thanks for confirming that :) |
sebastinez
added a commit
to radicle-dev/radicle-interface
that referenced
this pull request
Aug 31, 2023
- Adds support for modified moved files see radicle-dev/radicle-git#141 Signed-off-by: Sebastian Martinez <me@sebastinez.dev>
Merged
3 tasks
sebastinez
added a commit
to radicle-dev/radicle-interface
that referenced
this pull request
Sep 18, 2023
- Adds support for modified moved files see radicle-dev/radicle-git#141 Signed-off-by: Sebastian Martinez <me@sebastinez.dev>
rudolfs
pushed a commit
to radicle-dev/radicle-interface
that referenced
this pull request
Sep 19, 2023
- Adds support for modified moved files see radicle-dev/radicle-git#141 Signed-off-by: Sebastian Martinez <me@sebastinez.dev>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
In some cases a moved file can also be modified and in these cases there will be a diff as well as new Oid's for the two sides of the diff.
Add DiffFile to the Moved type, changing the insert_moved method to accept the DiffFile's and the DiffContent.
When serializing a Moved, if the old and the new are the same then the serialization of the diff files and content are skipped -- same as the old behaviour. Otherwise, the two sides are serialized along with the content.
Fixed #140
cc @sebastinez how will this affect radicle-interface/radicle-httpd for showing diffs for moved files?