surf: Add DiffFile to FileDiff::Copied and FileDiff::Moved
#143
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
2 tasks
sebastinez
force-pushed
the
sebastinez/add-current-oid-to-filediff
branch
from
e4454d1
to
194721e
Compare
FintanH
reviewed
Sep 21, 2023
radicle-surf/src/diff/git.rs
Outdated
|
|
||
| diff.insert_copied(old.to_path_buf(), new.to_path_buf()); | ||
| diff.insert_copied(old.to_path_buf(), new.to_path_buf(), copy); |
There was a problem hiding this comment.
I feel like this logic should be the same as
radicle-git/radicle-surf/src/diff/git.rs
Lines 346 to 352 in 194721e
There was a problem hiding this comment.
My goal with this PR was to add an oid to the copied files, which currently just had old and new path.
There could also be a diff be part of a copied file, as is with a moved file, so I think I'll add your suggestion, adapted for copied files.
There was a problem hiding this comment.
Ya, I think it's good that they would have the same behaviour 👍 Thanks!
sebastinez
force-pushed
the
sebastinez/add-current-oid-to-filediff
branch
from
ffe91f1
to
a60343e
Compare
This allows us to know the blob oid of a moved or copied file, even when no diff is available. Also changes the structure of a copied file to be the same as a moved or renamed file. Signed-off-by: Sebastian Martinez <me@sebastinez.dev>
sebastinez
force-pushed
the
sebastinez/add-current-oid-to-filediff
branch
from
a60343e
to
9582160
Compare
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.
This allows us to know the blob oid of a moved or copied file, even when no diff is available.