log: properly render elided roots in reversed mode#9153
Open
CGamesPlay wants to merge 2 commits intojj-vcs:mainfrom
Open
log: properly render elided roots in reversed mode#9153CGamesPlay wants to merge 2 commits intojj-vcs:mainfrom
CGamesPlay wants to merge 2 commits intojj-vcs:mainfrom
Conversation
5f158a9 to
82eb888
Compare
Author
|
(differences between stable and nightly rustfmt are driving me crazy) |
notable changes: - the vertical line now always goes to the end of a multi-line node before showing the ~ - the extra blank lines that were forced around ~ lines disappear, but disconnected components ALWAYS get a blank line separating them - merges where multiple parents are elided now show multiple ~ nodes (the number of parents is preserved) Related issues: - Properly resolves jj-vcs#9149 - Resolves jj-vcs#5937 by no longer using Ancestor::Anonymous nodes - Related but unfixed jj-vcs#1092 because this is a limitation of sapling renderdag.
82eb888 to
032609f
Compare
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.
This is my first contribution to jj. I experimented with several approaches to this problem and this one is the best approach I could come up with.
This properly addresses #9149, which was incorrectly marked as a duplicate of #1092. Although the two issues are related, this does NOT resolve the latter but does fix the correctness issue shown in the former.
Related issues:
jj log#5937 by no longer using Ancestor::Anonymous nodesjj log --reversedwith sapling #1092 because this is a limitation of sapling renderdag.Notable changes:
To address potential concerns:
jj log --reversedwith sapling #1092, but it's complicated. We walk commits from leafs to root because that's how the database is set up, and this assumption is baked into renderdag, so it can perform online rendering of the graph in O(N) space.Checklist
If applicable:
CHANGELOG.mdREADME.md,docs/,demos/)cli/src/config-schema.json)how it works, how it's organized), including any code drafted by an LLM.
an eye towards deleting anything that is irrelevant, clarifying anything
that is confusing, and adding details that are relevant. This includes,
for example, commit descriptions, PR descriptions, and code comments.