Fix copiedFromRemoteId bug
#4807
Merged
Conversation
This file contains hidden or 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
- correctly shows commits as rebased when changeId is missing - setting relatedTo is sufficient, no need to touch `get status()`
2 tasks
krlvi
approved these changes
Sep 1, 2024
Byron
reviewed
Sep 1, 2024
| (this.isRemote && (!this.relatedTo || this.id === this.relatedTo.id)) || | ||
| (this.copiedFromRemoteId && this.relatedTo && this.copiedFromRemoteId === this.relatedTo.id) | ||
| ) | ||
| if (this.isRemote && (!this.relatedTo || this.id === this.relatedTo.id)) |
There was a problem hiding this comment.
Wonderful, less really is more!
I also tried my use-case again, which is to create a vbranch from another branch that has no change-ids in commits, and then undid one commit, and it also just works.
I think what I wanted to accomplish is to have it show as Local and remote just as if change-ids were equal (or it's the same actual commit), but probably I misunderstood the state (or status) that such a copied commit is actually in.
And somewhat magically, it is all working even when the commit message is amended to the local commit.
|
I like this very much. Just want to note that this fixes the visuals on the workspace (1) but in the branch preview page (2) it's still borked. (1) (2) |
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.
get status()For testing I applied this branch by Pavel:
