From b7ac0605e148a8d8808eeddd2e03e0ca6822cb5c Mon Sep 17 00:00:00 2001 From: Konstantin Ryabitsev Date: Fri, 17 Jun 2022 10:36:35 -0400 Subject: Add ability to exit before git-merge is invoked It may be useful for the maintainer to review b4 retrieval/validation output before git-merge is invoked, so add a pause requiring an Enter or Ctrl-C. Signed-off-by: Konstantin Ryabitsev --- b4/mbox.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'b4/mbox.py') diff --git a/b4/mbox.py b/b4/mbox.py index 277df89..1cc58c7 100644 --- a/b4/mbox.py +++ b/b4/mbox.py @@ -379,8 +379,16 @@ def make_am(msgs, cmdargs, msgid): thanks_record_am(lser, cherrypick=cherrypick) if cmdargs.merge: + if not cmdargs.no_interactive: + logger.info('Will exec: %s', ' '.join(mergecmd)) + try: + input('Press Enter to continue or Ctrl-C to abort') + except KeyboardInterrupt: + logger.info('') + sys.exit(130) + else: + logger.info('Invoking: %s', ' '.join(mergecmd)) # We exec git-merge and let it take over - logger.info('Invoking: %s', ' '.join(mergecmd)) os.execvp(mergecmd[0], mergecmd) logger.info('You can now merge or checkout FETCH_HEAD') -- cgit v1.2.3