Support binary merges #61
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 emerge.log line that tells us whether a merge is from a binary is between the "merge start" and "merge stop" lines, so we need to parse that new line but also need to keep a "this is a binmerge" bool state when iterating through hist events. This line contains other bits of info that we might want to use later, so I'm keeping new `Hist::MergeStep` variant flexible. This MVP just displays binary merges in a different color.
A binmerge is just treated as completely separate from a merge, and is displayed as 3 new columns. This causes a fair amount of code and unittest churn, but is straightforward.
Parse merge type in both mtimedb.json and pretend output, and then store bin vs compile times separately. This required more trial and error than for `log` and `stats`. This iteration looks good enough, but there are probably more cleanups, refactorings, tests to be done.
Improvement is under noise threshold, but this feels better.
|
I'm still unsure about how binmerges are displayed here, I'd like to find something that works well with |
* qmark: cyan -> unstyled * sync (new): unstyled -> cyan * cnt: set brightess explicitly (fixes context-dependant render) * skip: normal -> italic I wanted to future-proof the theme for distinguinshing other types of (un)merges, but there are a lot of unknowns so we'll see if/when those other types get implemented. OTOH, I might make thems configurable.
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.
Fixes #59