Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

compare: always prefix git status output with manifest-rev #672

Merged
merged 1 commit into from
Sep 1, 2023
Merged

compare: always prefix git status output with manifest-rev #672

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions src/west/app/project.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,8 +704,7 @@ def compare(self, project):

def print_rev_info(self, project):
# For non-manifest repositories, print HEAD's and
# manifest-rev's SHAs and commit titles, but only if they are
# different.
# manifest-rev's SHAs and commit titles.
#
# We force git not to print in color so west's colored
# banner() separators stand out more in the output.
Expand All @@ -729,9 +728,8 @@ def rev_info(rev):
head_info = rev_info('HEAD')
# If manifest-rev is missing, we already failed earlier.
manifest_rev_info = rev_info('manifest-rev')
if head_info != manifest_rev_info:
self.small_banner(f'manifest-rev: {manifest_rev_info}')
self.inf(f' HEAD: {head_info}')
self.small_banner(f'manifest-rev: {manifest_rev_info}')
self.inf(f' HEAD: {head_info}')
mbolivar-ampere marked this conversation as resolved.
Show resolved Hide resolved

def print_status(self, project):
# `git status` shows `manifest-rev` "sometimes", see #643.
Expand Down
Loading