From 99482c684528cdf76a843e04b83c34e49a2d8cf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=AD=20Bol=C3=ADvar?= Date: Wed, 14 Oct 2020 09:53:58 -0700 Subject: [PATCH] update: tweak _post_checkout_help MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Print the git commands on their own lines to make them more visible. Suggested-by: Joakim Andersson Signed-off-by: Martí Bolívar --- src/west/app/project.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/west/app/project.py b/src/west/app/project.py index 7de5054..a555307 100644 --- a/src/west/app/project.py +++ b/src/west/app/project.py @@ -1313,16 +1313,16 @@ def _post_checkout_help(project, branch, sha, is_ancestor): # print a message that makes it easy to get back, # no matter where in the workspace os.getcwd() is. log.wrn(f'left behind {project.name} branch "{branch}"; ' - f'to switch back to it (fast forward), use: ' - f'git -C {rel} checkout {branch}') + f'to switch back to it (fast forward):\n' + f' git -C {rel} checkout {branch}') log.dbg('(To do this automatically in the future,', 'use "west update --keep-descendants".)') else: # Tell the user how they could rebase by hand, and # point them at west update --rebase. log.wrn(f'left behind {project.name} branch "{branch}"; ' - f'to rebase onto the new HEAD: ' - f'git -C {rel} rebase {sha} {branch}') + f'to rebase onto the new HEAD:\n' + f' git -C {rel} rebase {sha} {branch}') log.dbg('(To do this automatically in the future,', 'use "west update --rebase".)')