fix: keep block order when printing the diff - #645
Merged
Conversation
The previous fix (#643) made the patch follow the config, but the diff is printed through a second pass that regroups the rows again. `annet diff` does not render the diff tree: gen_sort_diff() pushes it back through make_pre() and prints it with gen_pre_as_diff(), which walked the buckets rule by rule - all rows of one rulebook rule, then all rows of the next - exactly the walk _iterate_over_patch() did before #643. An acl whose rows are matched by a `permit`, a `deny` and a `remark` rule came out of the printer grouped by kind, no matter what the generator produced, while the patch built from the same diff was in the right order. and taught the patch side to walk the groups in that order; the printer never got the same treatment. Let it walk the same helper - renamed to iterate_over_pre() and extended to yield the raw rule, which the printer needs for %show_rules. Fixes #638 Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
denballakh
approved these changes
Aug 14, 2026
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
2 participants
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.
The previous fix (#643) made the patch follow the config, but the diff is printed through a second pass that regroups the rows again.
annet diffdoes not render the diff tree: gen_sort_diff() pushes it back through make_pre() and prints it with gen_pre_as_diff(), which walked the buckets rule by rule - all rows of one rulebook rule, then all rows of the next - exactly the walk _iterate_over_patch() did before #643. An acl whose rows are matched by apermit, adenyand aremarkrule came out of the printer grouped by kind, no matter what the generator produced, while the patch built from the same diff was in the right order.Fixes #638