Skip to content

repo: raise exception if root_dir is not a directory path #3295

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.

Sign up for GitHub

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

Merged
efiop merged 2 commits into from
Feb 10, 2020
Merged

repo: raise exception if root_dir is not a directory path #3295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55cb677
repo: throw if root_dir in Repo.__init__() is not a directory path
skshetry Feb 10, 2020
648785d
repo: set message from raise for NotDvcRepoError
skshetry Feb 10, 2020
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
13 changes: 1 addition & 12 deletions dvc/exceptions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,18 +112,7 @@ def __init__(self, path):


class NotDvcRepoError(DvcException):
"""Thrown if a directory is not a DVC repo.

Args:
root (str): path to the directory.
"""

def __init__(self, root):
msg = (
"you are not inside of a DVC repository "
"(checked up to mount point '{}')"
)
super().__init__(msg.format(root))
"""Thrown if a directory is not a DVC repo"""


class DvcParserError(DvcException):
Expand Down
23 changes: 14 additions & 9 deletions dvc/repo/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,19 +129,24 @@ def __repr__(self):

@classmethod
def find_root(cls, root=None):
if root is None:
root = os.getcwd()
else:
root = os.path.abspath(os.path.realpath(root))
root_dir = os.path.realpath(root or os.curdir)

if not os.path.isdir(root_dir):
raise NotDvcRepoError("directory '{}' does not exist".format(root))

while True:
dvc_dir = os.path.join(root, cls.DVC_DIR)
dvc_dir = os.path.join(root_dir, cls.DVC_DIR)
if os.path.isdir(dvc_dir):
return root
if os.path.ismount(root):
return root_dir
if os.path.ismount(root_dir):
break
root = os.path.dirname(root)
raise NotDvcRepoError(root)
root_dir = os.path.dirname(root_dir)

message = (
"you are not inside of a DVC repository "
"(checked up to mount point '{}')"
).format(root_dir)
raise NotDvcRepoError(message)

@classmethod
def find_dvc_dir(cls, root=None):
Expand Down