Use hunk dependency code for computing inter-commit dependencies #5393
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 ↗︎
|
mtsgrd
commented
Nov 1, 2024
Comment on lines
58
to
60
| data.into_iter() | ||
| .fold(HashMap::new(), |mut acc, (commit_id, dependencies)| { | ||
| acc.entry(*commit_id) | ||
| .and_modify(|existing_dependencies| existing_dependencies.extend(dependencies)) | ||
| .or_insert(dependencies.clone()); | ||
| acc | ||
| }) |
There was a problem hiding this comment.
Just noticed, we declared the data variable for debugging, so we can drop that, skip the .collect_vec() and just return the concatenated the iter steps.
estib-vega
force-pushed
the
commit-dependencies
branch
from
3922d1f
to
c9555d4
Compare
|
@mtsgrd Since your changes I've done a couple of things: 1. We iterate over all files and commits when calculating the dependency graphs.Before, we would only iterate over files that were present both in commits and in uncommitted changes because we were only interested on where the uncommitted files belonged. 2. I added a third hash-map that maps commit IDs to uncommitted hunks that depend on itThis enables to quickly check if a commit can't be moved because uncommitted hunks depend on it 3. Stack and Commits track dependency informationEvery time we call Missing: TestsI'll start adding some tests |
estib-vega
force-pushed
the
commit-dependencies
branch
from
c9555d4
to
90bb67b
Compare
estib-vega
force-pushed
the
commit-dependencies
branch
2 times, most recently
from
b133fd9
to
bf254b6
Compare
estib-vega
force-pushed
the
commit-dependencies
branch
from
bf254b6
to
27ab858
Compare
estib-vega
force-pushed
the
commit-dependencies
branch
2 times, most recently
from
caf4c28
to
e222389
Compare
estib-vega
force-pushed
the
commit-dependencies
branch
from
e222389
to
ebf11d0
Compare
Closed
estib-vega
force-pushed
the
commit-dependencies
branch
from
ebf11d0
to
cca3ccc
Compare
estib-vega
force-pushed
the
commit-dependencies
branch
2 times, most recently
from
d9ebc9f
to
dc53da3
Compare
estib-vega
force-pushed
the
commit-dependencies
branch
from
dc53da3
to
0618b80
Compare
estib-vega
force-pushed
the
commit-dependencies
branch
from
4c417c3
to
22922bc
Compare
estib-vega
force-pushed
the
commit-dependencies
branch
from
22922bc
to
0b889fa
Compare
estib-vega
force-pushed
the
commit-dependencies
branch
from
0b889fa
to
c9c0476
Compare
estib-vega
force-pushed
the
commit-dependencies
branch
from
c9c0476
to
49eed92
Compare
estib-vega
force-pushed
the
commit-dependencies
branch
2 times, most recently
from
2f70aaf
to
2318577
Compare
estib-vega
force-pushed
the
commit-dependencies
branch
from
2318577
to
8a42bc5
Compare
estib-vega
force-pushed
the
commit-dependencies
branch
from
8a42bc5
to
9e04f52
Compare
Move fully to the new Hunk Locking algorithm, remove the references to that flag and the settings UI
Stack keeps a map of commit and uncommitted chanegs inter-dependencies
Propagate information about commit and uncommited change inter-dependencies to the commits for the FE to access
Re-implement the algorithm so that it takes account of different scenarios when comparing input diffs. Those changes include: - Awareness of change type - Detection of "special" diffs, like file deletion and file recreation - Correctly calculate the commit dependency graph between commits Also add and update unit and integration tests
Track what's the index of: - The next hunk range to visit - The index of the the first hunk range to shift after adding an incoming hunk. Also, calculate correctly the lines of the hunk ranges that are trimmed at the top in the following cases: - Incomming hunk is only deleting lines - Incomming hunk is only adding lines Add special handling for intersections with hunks that only add lines
estib-vega
force-pushed
the
commit-dependencies
branch
from
9e04f52
to
d68dcb2
Compare
Add some high-level docs on the way the dependency graph is calculated
estib-vega
force-pushed
the
commit-dependencies
branch
from
d68dcb2
to
0c1b127
Compare
estib-vega
force-pushed
the
commit-dependencies
branch
from
0c1b127
to
bb86ef9
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.
Implementation for computing dependencies and inverse dependencies between commits.
@estib-vega:
The scope of this PR escalated a bit.
Through implementing this extra functionality we discovered a couple of bugs with the new dependency calculation algorithm.
This PR reimplements parts of it to account for different (less frequent but possible) use-cases and tests to ensure that that works.
Changes