Clarify and fix when an inline diff view is historical, when it is dynamic, and when interactive #1888
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
We used `is_historical_diff` diff here to decide if the shown
`actual_line` can be used directly. This is incorrect as it is also
true when only the `base_commit` is not None. In that case we actually
have a dynamic diff that compares against the working dir
("<base_commit>..WORKING DIR") and we need to fix the `actual_line`
accordingly.
It is, on contraire, when `target_commit` is set, that the underlying
diff of the "inline_diff"-view already has the correct value.
Note that we also start the line history from `commit_hash` so there
is a simple match here.
Note that `is_historical_diff` was also wrong as for a "historical" diff it is enough that `target_commit` is set. If only `base_commit` is set we still have the comparison "<base_commit>..WORKING DIR" which is obviously a dynamic diff that merges or combines a range of revisions. The notion "historical" usually refers to a static, cacheable(!) "<commit>~1..<commit>" diff. E.g. it matches what `show_file_at_commit` shows with the help of the gutter marks.
`is_interactive_diff` refers to a view for which staging and unstaging is applicable. Basically it captures the functionality of the inline diff *before* we introduced the "historical" feature in d6af915 (Implement historical "inline diff", June 2020). But a diff is always dynamic just if `target_commit` is not set as it then essentially compares against the working dir. Fix that here!
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.
No description provided.