Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

status: --recursive flag #3726

Merged
merged 2 commits into from
May 3, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
8 changes: 8 additions & 0 deletions dvc/command/data_sync.py
Original file line number Diff line number Diff line change
Expand Up @@ -334,4 +334,12 @@ def add_parser(subparsers, _parent_parser):
default=False,
help="Show status for all dependencies of the specified target.",
)
status_parser.add_argument(
"-R",
"--recursive",
action="store_true",
default=False,
help="Show status of all stages in the specified directory.",
)

status_parser.set_defaults(func=CmdDataStatus)
1 change: 1 addition & 0 deletions dvc/command/status.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ def run(self):
all_tags=self.args.all_tags,
all_commits=self.args.all_commits,
with_deps=self.args.with_deps,
recursive=self.args.recursive,
)
if st:
if self.args.quiet:
Expand Down
17 changes: 13 additions & 4 deletions dvc/repo/status.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,14 @@ def _joint_status(stages):
return status


def _local_status(self, targets=None, with_deps=False):
def _local_status(self, targets=None, with_deps=False, recursive=False):
if targets:
stages = cat(self.collect(t, with_deps=with_deps) for t in targets)
stages = cat(
self.collect(t, with_deps=with_deps, recursive=recursive)
for t in targets
)
else:
stages = self.collect(None, with_deps=with_deps)
stages = self.collect(None, with_deps=with_deps, recursive=recursive)

return _joint_status(stages)

Expand All @@ -42,6 +45,7 @@ def _cloud_status(
all_branches=False,
with_deps=False,
all_tags=False,
recursive=False,
all_commits=False,
):
"""Returns a dictionary with the files that are new or deleted.
Expand Down Expand Up @@ -81,6 +85,7 @@ def _cloud_status(
force=True,
remote=remote,
jobs=jobs,
recursive=recursive,
)

ret = {}
Expand Down Expand Up @@ -109,6 +114,7 @@ def status(
with_deps=False,
all_tags=False,
all_commits=False,
recursive=False,
):
if cloud or remote:
return _cloud_status(
Expand All @@ -120,6 +126,7 @@ def status(
remote=remote,
all_tags=all_tags,
all_commits=all_commits,
recursive=True,
)

ignored = list(
Expand All @@ -132,4 +139,6 @@ def status(
msg = "The following options are meaningless for local status: {}"
raise InvalidArgumentError(msg.format(", ".join(ignored)))

return _local_status(self, targets, with_deps=with_deps)
return _local_status(
self, targets, with_deps=with_deps, recursive=recursive
)
14 changes: 14 additions & 0 deletions tests/func/test_status.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,3 +93,17 @@ def test_status_on_pipeline_stages(tmp_dir, dvc, run_copy):
"changed command",
],
}


def test_status_recursive(tmp_dir, dvc):
tmp_dir.gen({"dir": {"file": "text1", "subdir": {"file2": "text2"}}})
stages = dvc.add("dir", recursive=True, no_commit=True)

assert len(stages) == 2

assert dvc.status(targets=["dir"], recursive=True) == {
"dir/file.dvc": [{"changed outs": {"dir/file": "not in cache"}}],
efiop marked this conversation as resolved.
Show resolved Hide resolved
"dir/subdir/file2.dvc": [
{"changed outs": {"dir/subdir/file2": "not in cache"}}
],
}
2 changes: 2 additions & 0 deletions tests/unit/command/test_status.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ def test_cloud_status(mocker):
"--all-tags",
"--all-commits",
"--with-deps",
"--recursive",
]
)
assert cli_args.func == CmdDataStatus
Expand All @@ -35,4 +36,5 @@ def test_cloud_status(mocker):
all_tags=True,
all_commits=True,
with_deps=True,
recursive=True,
)