diff options
author | Konstantin Ryabitsev <konstantin@linuxfoundation.org> | 2022-06-17 10:36:35 -0400 |
---|---|---|
committer | Konstantin Ryabitsev <konstantin@linuxfoundation.org> | 2022-06-17 10:36:35 -0400 |
commit | b7ac0605e148a8d8808eeddd2e03e0ca6822cb5c (patch) | |
tree | e7a8b272a24845c5e39ab6f74f66029dc2cfff8d /b4 | |
parent | 797fc250c7dd64550f2283bdc749eda7555e3fa3 (diff) | |
download | b4-b7ac0605e148a8d8808eeddd2e03e0ca6822cb5c.tar.gz |
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 <konstantin@linuxfoundation.org>
Diffstat (limited to 'b4')
-rw-r--r-- | b4/command.py | 2 | ||||
-rw-r--r-- | b4/mbox.py | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/b4/command.py b/b4/command.py index 4f69231..92ffd65 100644 --- a/b4/command.py +++ b/b4/command.py @@ -117,6 +117,8 @@ def cmd(): help='Add more debugging info to the output') parser.add_argument('-q', '--quiet', action='store_true', default=False, help='Output critical information only') + parser.add_argument('-n', '--no-interactive', action='store_true', default=False, + help='Do not ask any interactive questions') subparsers = parser.add_subparsers(help='sub-command help', dest='subcmd') @@ -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') |