Merge pull request #11051 from devsagul/fix/svn-fails-with-verbose

fix svn and bazaar failing to checkout in verbose mode

Author: pfmoore

news/11050.bugfix.rst

@@ -0,0 +1 @@
+Fix error on checkout for subversion and bazaar with verbose mode on.

src/pip/_internal/vcs/bazaar.py

@@ -44,13 +44,13 @@ def fetch_new(
             display_path(dest),
         )
         if verbosity <= 0:
-            flag = "--quiet"
+            flags = ["--quiet"]
         elif verbosity == 1:
-            flag = ""
+            flags = []
         else:
-            flag = f"-{'v'*verbosity}"
+            flags = [f"-{'v'*verbosity}"]
         cmd_args = make_command(
-            "checkout", "--lightweight", flag, rev_options.to_args(), url, dest
+            "checkout", "--lightweight", *flags, rev_options.to_args(), url, dest
         )
         self.run_command(cmd_args)
 

src/pip/_internal/vcs/subversion.py

@@ -288,12 +288,12 @@ def fetch_new(
             display_path(dest),
         )
         if verbosity <= 0:
-            flag = "--quiet"
+            flags = ["--quiet"]
         else:
-            flag = ""
+            flags = []
         cmd_args = make_command(
             "checkout",
-            flag,
+            *flags,
             self.get_remote_call_options(),
             rev_options.to_args(),
             url,

tests/unit/test_vcs.py

@@ -777,6 +777,22 @@ def assert_call_args(self, args: CommandArgs) -> None:
         assert self.call_subprocess_mock.call_args[0][0] == args
 
     def test_obtain(self) -> None:
+        self.svn.obtain(self.dest, hide_url(self.url), verbosity=1)
+        self.assert_call_args(
+            [
+                "svn",
+                "checkout",
+                "--non-interactive",
+                "--username",
+                "username",
+                "--password",
+                hide_value("password"),
+                hide_url("http://svn.example.com/"),
+                "/tmp/test",
+            ]
+        )
+
+    def test_obtain_quiet(self) -> None:
         self.svn.obtain(self.dest, hide_url(self.url), verbosity=0)
         self.assert_call_args(
             [
@@ -794,6 +810,18 @@ def test_obtain(self) -> None:
         )
 
     def test_fetch_new(self) -> None:
+        self.svn.fetch_new(self.dest, hide_url(self.url), self.rev_options, verbosity=1)
+        self.assert_call_args(
+            [
+                "svn",
+                "checkout",
+                "--non-interactive",
+                hide_url("svn+http://username:[email protected]/"),
+                "/tmp/test",
+            ]
+        )
+
+    def test_fetch_new_quiet(self) -> None:
         self.svn.fetch_new(self.dest, hide_url(self.url), self.rev_options, verbosity=0)
         self.assert_call_args(
             [
@@ -807,6 +835,21 @@ def test_fetch_new(self) -> None:
         )
 
     def test_fetch_new_revision(self) -> None:
+        rev_options = RevOptions(Subversion, "123")
+        self.svn.fetch_new(self.dest, hide_url(self.url), rev_options, verbosity=1)
+        self.assert_call_args(
+            [
+                "svn",
+                "checkout",
+                "--non-interactive",
+                "-r",
+                "123",
+                hide_url("svn+http://username:[email protected]/"),
+                "/tmp/test",
+            ]
+        )
+
+    def test_fetch_new_revision_quiet(self) -> None:
         rev_options = RevOptions(Subversion, "123")
         self.svn.fetch_new(self.dest, hide_url(self.url), rev_options, verbosity=0)
         self.assert_call_args(