Fix advance green-edge detection when parent is behind remote#1751
Open
PawelLipski wants to merge 2 commits into
Open
Fix advance green-edge detection when parent is behind remote#1751PawelLipski wants to merge 2 commits into
PawelLipski wants to merge 2 commits into
Conversation
Extract shared is_connected_with_green_edge() so advance recognizes the same green-edge children as status (the 3.41.0 parent-behind-remote fix).
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## develop #1751 +/- ##
===========================================
- Coverage 98.77% 98.67% -0.10%
===========================================
Files 45 45
Lines 5372 5378 +6
Branches 981 983 +2
===========================================
+ Hits 5306 5307 +1
- Misses 41 44 +3
- Partials 25 27 +2 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
Cover overridden fork point and parent-without-remote branches that were missing from patch coverage.
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
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.
Summary
is_connected_with_green_edge()onMacheteClientsoadvanceandstatususe the same green-edge criteria.statusalready renders a green edge butadvanceonly considered children whose fork point equals the parent's local tip.Test plan
tox -e py -- tests/test_advance.pytox -e py -- tests/test_advance.py tests/test_status.py -k "advance_when_parent_behind_remote or no_yellow_edge_when_parent_behind_remote"tox -e mypyrules_scala:advance -yonmasternow sees both green-edge children (ambiguous advance) instead of only the one whose fork point equals localmaster.