fix: remove last usage of vbranches.commits
#5704
Merged
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
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
1 Skipped Deployment
|
ndom91
force-pushed
the
remove-vbranch-commits-usage
branch
from
b922666
to
b4bcf22
Compare
ndom91
force-pushed
the
remove-vbranch-commits-usage
branch
from
eabf796
to
3bd8c47
Compare
ndom91
force-pushed
the
remove-vbranch-commits-usage
branch
from
e757819
to
9911832
Compare
ndom91
force-pushed
the
remove-vbranch-commits-usage
branch
from
9911832
to
c97c197
Compare
ndom91
force-pushed
the
remove-vbranch-commits-usage
branch
from
c97c197
to
edd000f
Compare
ndom91
force-pushed
the
remove-vbranch-commits-usage
branch
from
ac2b644
to
5f9b10f
Compare
ndom91
force-pushed
the
remove-vbranch-commits-usage
branch
from
5f9b10f
to
5782cc8
Compare
ndom91
force-pushed
the
remove-vbranch-commits-usage
branch
from
5782cc8
to
4fef90d
Compare
estib-vega
reviewed
Nov 28, 2024
|
|
||
| get ancestorMostConflictedCommit(): DetailedCommit | undefined { | ||
| const commits = [...this.upstreamPatches, ...this.patches].sort((a, b) => { | ||
| if (a.createdAt > b.createdAt) { |
There was a problem hiding this comment.
I wonder how this works with commits that were created in the middle of the series.
I believe this is only used to check if this is the 'first' conflicted from the bottom, so in order to avoid having to sort them, I think we can assume that there are no upstreamPatches that are also conflicted.
Maybe we can update that horrible name I gave this getter and make it even worse: ancestorMostConflictedLocalCommit
There was a problem hiding this comment.
Haha okay yeah I cleaned this up a bit. In terms of naming, I thought about it for a minute, but seeing as we want to avoid "top"/"bottom" I coudln't think of anything better 😂
estib-vega
approved these changes
Nov 28, 2024
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.
☕️ Reasoning
vbranches.commits🧢 Changes
localCommits/localAndRemoteCommits, etc. contexts -BranchLaneused to setcommitStore/localCommits/localAndRemoteCommitscontexts for the entire lane and all its childrenCurrentSeriesBranchFileslist. This one needs a list of all patches / upstreamPatches in the lane in order to build the "I'm locked to ..." tooltip on uncommited files potentially.