Skip to content

Commit

Permalink
Revert "dvc ls: not raise PathMissingError on empty dir."
Browse files Browse the repository at this point in the history
This reverts commit 09afd2a.
  • Loading branch information
karajan1001 authored and efiop committed May 11, 2022
1 parent 09afd2a commit 45a01c6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 15 deletions.
6 changes: 3 additions & 3 deletions dvc/repo/ls.py
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 ""

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)

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

ret_list = []
for path, info in ret.items():
info["path"] = path
Expand Down
13 changes: 1 addition & 12 deletions tests/func/test_ls.py
Expand Up @@ -150,20 +150,9 @@ 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="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)
== []
)
Repo.ls(os.fspath(tmp_dir), path="folder", dvc_only=True)


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

0 comments on commit 45a01c6

Please sign in to comment.