Skip to content

Commit eb87664

Browse files
S. Guliaevdevsagul
authored andcommitted
use lists for args in bazaar and subversion
1 parent 8051eb4 commit eb87664

File tree

3 files changed

+8
-13
lines changed

3 files changed

+8
-13
lines changed
File renamed without changes.

src/pip/_internal/vcs/bazaar.py

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,14 @@ def fetch_new(
4444
display_path(dest),
4545
)
4646
if verbosity <= 0:
47-
flags: Tuple[str, ...] = ("--quiet",)
47+
flags = ["--quiet"]
4848
elif verbosity == 1:
49-
flags = ()
49+
flags = []
5050
else:
51-
<<<<<<< HEAD
52-
flags = ("-{'v'*verbosity}",)
53-
cmd_args = make_command(
54-
"checkout", "--lightweight", *flags, rev_options.to_args(), url, dest
55-
)
56-
=======
57-
flags = (f"-{'v'*verbosity}",)
58-
cmd_args = make_command("branch", *flags, rev_options.to_args(), url, dest)
59-
>>>>>>> 57d0a77e3 (fix typo)
51+
flags = [f"-{'v'*verbosity}"]
52+
cmd_args = make_command(
53+
"checkout", "--lightweight", *flags, rev_options.to_args(), url, dest
54+
)
6055
self.run_command(cmd_args)
6156

6257
def switch(self, dest: str, url: HiddenText, rev_options: RevOptions) -> None:

src/pip/_internal/vcs/subversion.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,9 +288,9 @@ def fetch_new(
288288
display_path(dest),
289289
)
290290
if verbosity <= 0:
291-
flags: Tuple[str, ...] = ("--quiet",)
291+
flags = ["--quiet"]
292292
else:
293-
flags = ()
293+
flags = []
294294
cmd_args = make_command(
295295
"checkout",
296296
*flags,

0 commit comments

Comments
 (0)