cli: remove: fix error message for the case when file is not under control (#4497)

[DiPaolo]

Partially fix #4497

• ❗ I have followed the Contributing to DVC checklist.

• 📖 If this PR requires documentation updates, I have created a separate PR (or issue, at least) in dvc.org and linked it here.

Thank you for the contribution - we'll try to review it as soon as possible. 🙏

[skshetry]

ping @DiPaolo, is there anything that we could do to move this PR forward?

[DiPaolo]

@skshetry I made fixes according to your notes. I've improved error message for the user in that specific case, because IMHO it makes sense to provide the user more information. The text has been taken from your reply in the issue itself. Now it looks like:
ERROR: failed to remove 'data/description.json'. Make sure the target is either a .dvc file or a name of the stage

[skshetry]

@DiPaolo, we need to support file as a target in the remove, so I am not sure if this new error message makes sense.

We do need to clean up the message, especially the "failed to remove" one. So, either we need to add support for it, or just do the cleanup in this PR.

Regarding the support for files, the change should be pretty trivial, we just need collect_granular here, similar to what's in the repo.commit:

dvc/dvc/repo/commit.py

Line 44 in 228b3b1

stages_info = self.stage.collect_granular(

[DiPaolo]

@skshetry let me give it another try... I prefer the second option you've suggested - just to clean-up the message. Adding support of files as a target is out of the scope of this issue. So, to track it correctly, I will create a separate issue once the PR is accepted, if you don't mind.

[skshetry]

Looks good, thanks @DiPaolo. 🙂

[DiPaolo]

@skshetry let me give it another try... I prefer the second option you've suggested - just to clean-up the message. Adding support of files as a target is out of the scope of this issue. So, to track it correctly, I will create a separate issue once the PR is accepted, if you don't mind.

Here it is #5288