gh-96894: Do not turn echo off for subsequent commands in batch activators (GH-96895)

diff --git a/Lib/venv/scripts/nt/activate.bat b/Lib/venv/scripts/nt/activate.bat
index 35533e4b551155a166724e9ee498ed15ec6c75d9..06f4753d73b7aed7775e9420fbe8f0546383e9fd 100644 (file)
--- a/Lib/venv/scripts/nt/activate.bat
+++ b/Lib/venv/scripts/nt/activate.bat
@@ -1,34 +1,32 @@
-@echo off
-
-rem This file is UTF-8 encoded, so we need to update the current code page while executing it
-for /f "tokens=2 delims=:." %%a in ('"%SystemRoot%\System32\chcp.com"') do (
-    set _OLD_CODEPAGE=%%a
+@rem This file is UTF-8 encoded, so we need to update the current code page while executing it
+@for /f "tokens=2 delims=:." %%a in ('"%SystemRoot%\System32\chcp.com"') do @(
+    @set _OLD_CODEPAGE=%%a
 )
-if defined _OLD_CODEPAGE (
-    "%SystemRoot%\System32\chcp.com" 65001 > nul
+@if defined _OLD_CODEPAGE (
+    @"%SystemRoot%\System32\chcp.com" 65001 > nul
 )
 
-set "VIRTUAL_ENV=__VENV_DIR__"
+@set "VIRTUAL_ENV=__VENV_DIR__"
 
-if not defined PROMPT set PROMPT=$P$G
+@if not defined PROMPT @set PROMPT=$P$G
 
-if defined _OLD_VIRTUAL_PROMPT set PROMPT=%_OLD_VIRTUAL_PROMPT%
-if defined _OLD_VIRTUAL_PYTHONHOME set PYTHONHOME=%_OLD_VIRTUAL_PYTHONHOME%
+@if defined _OLD_VIRTUAL_PROMPT @set PROMPT=%_OLD_VIRTUAL_PROMPT%
+@if defined _OLD_VIRTUAL_PYTHONHOME @set PYTHONHOME=%_OLD_VIRTUAL_PYTHONHOME%
 
-set "_OLD_VIRTUAL_PROMPT=%PROMPT%"
-set "PROMPT=(__VENV_PROMPT__) %PROMPT%"
+@set "_OLD_VIRTUAL_PROMPT=%PROMPT%"
+@set "PROMPT=(__VENV_PROMPT__) %PROMPT%"
 
-if defined PYTHONHOME set _OLD_VIRTUAL_PYTHONHOME=%PYTHONHOME%
-set PYTHONHOME=
+@if defined PYTHONHOME @set _OLD_VIRTUAL_PYTHONHOME=%PYTHONHOME%
+@set PYTHONHOME=
 
-if defined _OLD_VIRTUAL_PATH set PATH=%_OLD_VIRTUAL_PATH%
-if not defined _OLD_VIRTUAL_PATH set _OLD_VIRTUAL_PATH=%PATH%
+@if defined _OLD_VIRTUAL_PATH @set PATH=%_OLD_VIRTUAL_PATH%
+@if not defined _OLD_VIRTUAL_PATH @set _OLD_VIRTUAL_PATH=%PATH%
 
-set "PATH=%VIRTUAL_ENV%\__VENV_BIN_NAME__;%PATH%"
-set "VIRTUAL_ENV_PROMPT=__VENV_PROMPT__"
+@set "PATH=%VIRTUAL_ENV%\__VENV_BIN_NAME__;%PATH%"
+@set "VIRTUAL_ENV_PROMPT=__VENV_PROMPT__"
 
 :END
-if defined _OLD_CODEPAGE (
-    "%SystemRoot%\System32\chcp.com" %_OLD_CODEPAGE% > nul
-    set _OLD_CODEPAGE=
+@if defined _OLD_CODEPAGE (
+    @"%SystemRoot%\System32\chcp.com" %_OLD_CODEPAGE% > nul
+    @set _OLD_CODEPAGE=
 )

diff --git a/Lib/venv/scripts/nt/deactivate.bat b/Lib/venv/scripts/nt/deactivate.bat
index 62a39a7584f4d7c5fbc31758e3e9e7eff700276d..4a04fb7c0bed44bd5a5d42b3f49ef6ad4f6d6e97 100644 (file)
--- a/Lib/venv/scripts/nt/deactivate.bat
+++ b/Lib/venv/scripts/nt/deactivate.bat
@@ -1,22 +1,20 @@
-@echo off
-
-if defined _OLD_VIRTUAL_PROMPT (
-    set "PROMPT=%_OLD_VIRTUAL_PROMPT%"
+@if defined _OLD_VIRTUAL_PROMPT (
+    @set "PROMPT=%_OLD_VIRTUAL_PROMPT%"
 )
-set _OLD_VIRTUAL_PROMPT=
+@set _OLD_VIRTUAL_PROMPT=
 
-if defined _OLD_VIRTUAL_PYTHONHOME (
-    set "PYTHONHOME=%_OLD_VIRTUAL_PYTHONHOME%"
-    set _OLD_VIRTUAL_PYTHONHOME=
+@if defined _OLD_VIRTUAL_PYTHONHOME (
+    @set "PYTHONHOME=%_OLD_VIRTUAL_PYTHONHOME%"
+    @set _OLD_VIRTUAL_PYTHONHOME=
 )
 
-if defined _OLD_VIRTUAL_PATH (
-    set "PATH=%_OLD_VIRTUAL_PATH%"
+@if defined _OLD_VIRTUAL_PATH (
+    @set "PATH=%_OLD_VIRTUAL_PATH%"
 )
 
-set _OLD_VIRTUAL_PATH=
+@set _OLD_VIRTUAL_PATH=
 
-set VIRTUAL_ENV=
-set VIRTUAL_ENV_PROMPT=
+@set VIRTUAL_ENV=
+@set VIRTUAL_ENV_PROMPT=
 
 :END

diff --git a/Misc/ACKS b/Misc/ACKS
index d7762f8c875fa9b16872d90fa94760907970bb9e..234d0d2d0a2a1642413a30fb707ba861f398888b 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1891,6 +1891,7 @@ John Szakmeister
 Piotr Szczepaniak
 Amir Szekely
 David Szotten
+Paweł Szramowski
 Maciej Szulik
 Joel Taddei
 Arfrever Frehtes Taifersar Arahesis

diff --git a/Misc/NEWS.d/next/Library/2022-09-17-20-20-01.gh-issue-96894.t7my0A.rst b/Misc/NEWS.d/next/Library/2022-09-17-20-20-01.gh-issue-96894.t7my0A.rst
new file mode 100644 (file)
index 0000000..546d47b
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-09-17-20-20-01.gh-issue-96894.t7my0A.rst
@@ -0,0 +1,2 @@
+Do not turn echo off for subsequent commands in batch activators
+(``activate.bat`` and ``deactivate.bat``) of :mod:`venv`.