Merge pull request #691 from johntrimble/690-fix-nested-contexts

Fix nested contexts duplicating commands
amoffat · Aug 7, 2023 · 8512ec8 · 8512ec8
2 parents 4941fe0 + c24b7f0
commit 8512ec8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/sh.py b/sh.py
@@ -1425,7 +1425,10 @@ def __call__(self, *args, **kwargs):
             pcall_args.pop("with", None)
 
             call_args.update(pcall_args)
-            cmd.extend(prepend.cmd)
+            # we do not prepend commands used as a 'with' context as they will
+            # be prepended to any nested commands
+            if not kwargs.get("_with", False):
+                cmd.extend(prepend.cmd)
 
         cmd.append(self._path)
 

diff --git a/tests/test.py b/tests/test.py
@@ -1101,6 +1101,13 @@ def test_with_context_args(self):
             out = whoami()
         self.assertEqual(out.strip(), "")
 
+    def test_with_context_nested(self):
+        echo_path = sh.echo._path
+        with sh.echo.bake("test1", _with=True):
+            with sh.echo.bake("test2", _with=True):
+                out = sh.echo("test3")
+        self.assertEqual(out.strip(), f"test1 {echo_path} test2 {echo_path} test3")
+
     def test_binary_input(self):
         py = create_tmp_test(
             """