Skip to content

Commit a1cc2e6

Browse files
authored
Merge pull request #2821 from kaiogu/master
remote: fix remote default call with no arguments
2 parents 424931f + 82a535b commit a1cc2e6

File tree

3 files changed

+19
-3
lines changed

3 files changed

+19
-3
lines changed

dvc/command/remote.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,13 @@ def run(self):
4848

4949
class CmdRemoteDefault(CmdRemoteConfig):
5050
def run(self):
51-
self.remote_config.set_default(
52-
self.args.name, unset=self.args.unset, level=self.args.level
53-
)
51+
if self.args.name is None and not self.args.unset:
52+
name = self.remote_config.get_default(level=self.args.level)
53+
print(name)
54+
else:
55+
self.remote_config.set_default(
56+
self.args.name, unset=self.args.unset, level=self.args.level
57+
)
5458
return 0
5559

5660

dvc/remote/config.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,3 +151,8 @@ def set_default(self, name, unset=False, level=None):
151151
self.config.set(
152152
Config.SECTION_CORE, Config.SECTION_CORE_REMOTE, name, level=level
153153
)
154+
155+
def get_default(self, level=None):
156+
return self.config.get(
157+
Config.SECTION_CORE, Config.SECTION_CORE_REMOTE, level=level
158+
)

tests/func/test_remote.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,13 @@ def test(self):
145145
self.assertEqual(default, None)
146146

147147

148+
def test_show_default(dvc_repo, capsys):
149+
assert main(["remote", "default", "foo"]) == 0
150+
assert main(["remote", "default"]) == 0
151+
out, _ = capsys.readouterr()
152+
assert out == "foo\n"
153+
154+
148155
class TestRemoteShouldHandleUppercaseRemoteName(TestDvc):
149156
upper_case_remote_name = "UPPERCASEREMOTE"
150157

0 commit comments

Comments
 (0)