From: Adrian Neftali Sanchez <lutgaru@gmail.com>
To: tools@linux.kernel.org
Cc: konstantin@linuxfoundation.org,
Adrian Neftali Sanchez <lutgaru@gmail.com>
Subject: [RFC PATCH 08/13] tui: The _suspend_to_shell function assumes a POSIX environment, relying on $SHELL and shell-specific arguments (e.g., --rcfile) that are invalid on Windows.
Date: Sat, 25 Apr 2026 12:49:36 -0700 [thread overview]
Message-ID: <20260425194943.1499-9-lutgaru@gmail.com> (raw)
In-Reply-To: <20260425194943.1499-1-lutgaru@gmail.com>
Refactor the execution flow to branch on sys.platform. On Windows,
launch the native interpreter via COMSPEC (defaulting to cmd.exe).
Move the existing POSIX-specific logic for bash/zsh into an explicit
else-block to ensure clean separation of platform execution paths.
This enables Windows support while preventing POSIX shell configuration
side effects on non-POSIX systems.
Signed-off-by: Adrian Neftali Sanchez <lutgaru@gmail.com>
---
src/b4/tui/_common.py | 58 ++++++++++++++++++++++++-------------------
1 file changed, 32 insertions(+), 26 deletions(-)
diff --git a/src/b4/tui/_common.py b/src/b4/tui/_common.py
index cdd3818..6c8042c 100644
--- a/src/b4/tui/_common.py
+++ b/src/b4/tui/_common.py
@@ -10,6 +10,7 @@ __author__ = 'Konstantin Ryabitsev <konstantin@linuxfoundation.org>'
import email.utils
import os
import subprocess
+import sys
import tempfile
import unicodedata
from collections import defaultdict
@@ -198,36 +199,41 @@ def _suspend_to_shell(hint: str = 'b4', cwd: Optional[str] = None) -> None:
logger.info('When done, Ctrl-d to return to review UI.')
logger.info('---')
- shell = os.environ.get('SHELL', '/bin/sh')
- shellname = os.path.basename(shell)
env = os.environ.copy()
env['B4_REVIEW'] = hint
- if shellname == 'bash':
- bashrc = os.path.expanduser('~/.bashrc')
- source = f'[ -f {bashrc} ] && . {bashrc}\n'
- source += f'PS1="({hint}) $PS1"\n'
- with tempfile.NamedTemporaryFile(
- mode='w', prefix='b4-shell-', suffix='.sh', delete=False
- ) as rcf:
- rcf.write(source)
- rcfile = rcf.name
- try:
- subprocess.run([shell, '--rcfile', rcfile], env=env, cwd=cwd)
- finally:
- os.unlink(rcfile)
- elif shellname == 'zsh':
- real_zdotdir = os.environ.get('ZDOTDIR', os.path.expanduser('~'))
- with tempfile.TemporaryDirectory(prefix='b4-shell-') as tmpdir:
- zshrc = os.path.join(tmpdir, '.zshrc')
- with open(zshrc, 'w') as f:
- f.write(f'ZDOTDIR="{real_zdotdir}"\n')
- f.write('[ -f "$ZDOTDIR/.zshrc" ] && . "$ZDOTDIR/.zshrc"\n')
- f.write(f'PS1="({hint}) $PS1"\n')
- env['ZDOTDIR'] = tmpdir
- subprocess.run([shell], env=env, cwd=cwd)
- else:
+ if sys.platform == 'win32':
+ shell = os.environ.get('COMSPEC', 'cmd.exe')
subprocess.run([shell], env=env, cwd=cwd)
+ else:
+ shell = os.environ.get('SHELL', '/bin/sh')
+ shellname = os.path.basename(shell)
+
+ if shellname == 'bash':
+ bashrc = os.path.expanduser('~/.bashrc')
+ source = f'[ -f {bashrc} ] && . {bashrc}\n'
+ source += f'PS1="({hint}) $PS1"\n'
+ with tempfile.NamedTemporaryFile(
+ mode='w', prefix='b4-shell-', suffix='.sh', delete=False
+ ) as rcf:
+ rcf.write(source)
+ rcfile = rcf.name
+ try:
+ subprocess.run([shell, '--rcfile', rcfile], env=env, cwd=cwd)
+ finally:
+ os.unlink(rcfile)
+ elif shellname == 'zsh':
+ real_zdotdir = os.environ.get('ZDOTDIR', os.path.expanduser('~'))
+ with tempfile.TemporaryDirectory(prefix='b4-shell-') as tmpdir:
+ zshrc = os.path.join(tmpdir, '.zshrc')
+ with open(zshrc, 'w') as f:
+ f.write(f'ZDOTDIR="{real_zdotdir}"\n')
+ f.write('[ -f "$ZDOTDIR/.zshrc" ] && . "$ZDOTDIR/.zshrc"\n')
+ f.write(f'PS1="({hint}) $PS1"\n')
+ env['ZDOTDIR'] = tmpdir
+ subprocess.run([shell], env=env, cwd=cwd)
+ else:
+ subprocess.run([shell], env=env, cwd=cwd)
def _addrs_to_lines(header_str: str) -> str:
--
2.45.0.windows.1
next prev parent reply other threads:[~2026-04-25 19:50 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-25 19:49 [RFC PATCH 00/13] b4: add native Windows support Adrian Neftali Sanchez
2026-04-25 19:49 ` [RFC PATCH 01/13] tests: specify UTF-8 encoding when opening files in text mode Adrian Neftali Sanchez
2026-04-25 19:49 ` [RFC PATCH 02/13] tests: use os.path.join/normpath for portable path assertions Adrian Neftali Sanchez
2026-04-25 19:49 ` [RFC PATCH 03/13] b4: add cross-platform username resolution in _setup_user_config Adrian Neftali Sanchez
2026-04-25 19:49 ` [RFC PATCH 04/13] b4: resolve platform-native data and cache directories Adrian Neftali Sanchez
2026-04-25 19:49 ` [RFC PATCH 05/13] b4: normalise git-reported absolute paths with os.path.normpath Adrian Neftali Sanchez
2026-04-25 19:49 ` [RFC PATCH 06/13] b4: select platform-appropriate default pager Adrian Neftali Sanchez
2026-04-25 19:49 ` [RFC PATCH 07/13] ez: use portable uid/gid accessors in write_to_tar Adrian Neftali Sanchez
2026-04-25 19:49 ` Adrian Neftali Sanchez [this message]
2026-04-25 19:49 ` [RFC PATCH 09/13] tests: replace NamedTemporaryFile with tmp_path in patatt fixture Adrian Neftali Sanchez
2026-04-25 19:49 ` [RFC PATCH 10/13] pyproject: add Windows operating-system classifier Adrian Neftali Sanchez
2026-04-25 19:49 ` [RFC PATCH 11/13] ci: add ci.ps1 for running the quality-gate pipeline on Windows Adrian Neftali Sanchez
2026-04-25 19:49 ` [RFC PATCH 12/13] review_tui: write git tracking commit before updating DB Adrian Neftali Sanchez
2026-04-25 19:49 ` [RFC PATCH 13/13] review_tui: guard against unmounted diff-viewer In certain asynchronous contexts or during rapid UI transitions, _show_content may be invoked before the diff-viewer widget has been fully mounted in the DOM. This is particularly reproducible in headless test environments and on platforms with slower console I/O initialization Adrian Neftali Sanchez
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260425194943.1499-9-lutgaru@gmail.com \
--to=lutgaru@gmail.com \
--cc=konstantin@linuxfoundation.org \
--cc=tools@linux.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox