Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions dvc/repo/ls.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ def ls(url, path=None, rev=None, recursive=None, dvc_only=False):
with Repo.open(url, rev=rev, subrepos=True, uninitialized=True) as repo:
path = path or ""

ret = _ls(repo.repo_fs, path, recursive, dvc_only)

if path and not ret:
if path and not repo.repo_fs.exists(path):
raise PathMissingError(path, repo, dvc_only=dvc_only)

ret = _ls(repo.repo_fs, path, recursive, dvc_only)

ret_list = []
for path, info in ret.items():
info["path"] = path
Expand Down
13 changes: 12 additions & 1 deletion tests/func/test_ls.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,20 @@ def test_ls_repo_with_path_dir_dvc_only_empty(tmp_dir, dvc, scm):
tmp_dir.scm_gen(FS_STRUCTURE, commit="init")
tmp_dir.dvc_gen(DVC_STRUCTURE, commit="dvc")
tmp_dir.scm_gen({"folder/.keep": "content"}, commit="add .keep")
tmp_dir.scm_gen({"empty_scm_folder/": {}}, commit="add scm empty")
tmp_dir.dvc_gen({"empty_dvc_folder": {}}, commit="empty dvc folder")

with pytest.raises(PathMissingError):
Repo.ls(os.fspath(tmp_dir), path="folder", dvc_only=True)
Repo.ls(os.fspath(tmp_dir), path="not_exist_folder")

assert Repo.ls(os.fspath(tmp_dir), path="empty_scm_folder") == []

assert Repo.ls(os.fspath(tmp_dir), path="folder", dvc_only=True) == []

assert (
Repo.ls(os.fspath(tmp_dir), path="empty_dvc_folder", dvc_only=True)
== []
)


def test_ls_repo_with_path_subdir(tmp_dir, dvc, scm):
Expand Down