Fix update verbosity #382
Merged
Fix update verbosity #382
Conversation
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
Nobody is using the MANIFEST variable. Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no>
Make the 'west update' output more helpful: - If --keep-descendants is given, also run 'git status' to highlight a dirty tree, etc. Also make the west output prefixed by 'west update'; it's clear what project is being worked on due to the earlier banner. - if --rebase is given, do the same change to just use 'west update' as an output prefix. - if neither is given, remove --quiet and the small_banner() call. This also shows information about a dirty tree. Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no>
carlescufi
approved these changes
Feb 14, 2020
|
LGTM, thanks. This is enough for the time being. |
|
Forgot to say, tested both with local uncommitted changes and with an extra commit on a detached HEAD. |
tejlmand
reviewed
Feb 14, 2020
| if take_stats: | ||
| start = perf_counter() | ||
| project.git('checkout --detach --quiet ' + sha) | ||
| project.git('checkout --detach ' + sha) |
There was a problem hiding this comment.
unsure if this could become too noisy to some users.
But, only one way to find out.
Alternative could be to do this when -v is given.
There was a problem hiding this comment.
It's the same number of lines of output when the tree is clean
tejlmand
approved these changes
Feb 14, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
Fixes: #380
I've tested the following matrix of west updates:
{descendant branch checked out + dirty tree,
detached head + dirty tree,
branch checked out + clean tree,
detached descendant HEAD + clean tree}
x
{default behavior,
--keep-descendants,
--rebase}
And the output always warns when something surprising happens. The win is mostly due to removing the --quiet from the 'git checkout --detach' and letting git do the work for us.
I want to backport these changes to 0.7.2, so I'm intentionally preserving the existing --keep-descendants behavior. We can defer changes to that to 0.8.0 pending resolution of #381.