OrgZephyr/west
OrgZephyr
/
west
mirror of https://github.com/zephyrproject-rtos/west.git
1
0
Fork 0
Code Issues Releases Wiki Activity

update: tweak _post_checkout_help 

Print the git commands on their own lines to make them more visible.

Suggested-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no>
This commit is contained in:
Martí Bolívar 2020-10-14 09:53:58 -07:00 committed by Marti Bolivar
parent da7668699a
commit 99482c6845
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/west/app/project.py
View File

@ -1313,16 +1313,16 @@ def _post_checkout_help(project, branch, sha, is_ancestor):
# print a message that makes it easy to get back, # print a message that makes it easy to get back,
# no matter where in the workspace os.getcwd() is. # no matter where in the workspace os.getcwd() is.
log.wrn(f'left behind {project.name} branch "{branch}"; ' log.wrn(f'left behind {project.name} branch "{branch}"; '
f'to switch back to it (fast forward), use: ' f'to switch back to it (fast forward):\n'
f'git -C {rel} checkout {branch}') f' git -C {rel} checkout {branch}')
log.dbg('(To do this automatically in the future,', log.dbg('(To do this automatically in the future,',
'use "west update --keep-descendants".)') 'use "west update --keep-descendants".)')
else: else:
# Tell the user how they could rebase by hand, and # Tell the user how they could rebase by hand, and
# point them at west update --rebase. # point them at west update --rebase.
log.wrn(f'left behind {project.name} branch "{branch}"; ' log.wrn(f'left behind {project.name} branch "{branch}"; '
f'to rebase onto the new HEAD: ' f'to rebase onto the new HEAD:\n'
f'git -C {rel} rebase {sha} {branch}') f' git -C {rel} rebase {sha} {branch}')
log.dbg('(To do this automatically in the future,', log.dbg('(To do this automatically in the future,',
'use "west update --rebase".)') 'use "west update --rebase".)')