diff --git a/dvc/exceptions.py b/dvc/exceptions.py index 1ab9390116..4af6111080 100644 --- a/dvc/exceptions.py +++ b/dvc/exceptions.py @@ -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=None): - msg = msg or ( - "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): diff --git a/dvc/repo/__init__.py b/dvc/repo/__init__.py index a7a79ffb2b..16062042fd 100644 --- a/dvc/repo/__init__.py +++ b/dvc/repo/__init__.py @@ -129,10 +129,10 @@ def __repr__(self): @classmethod def find_root(cls, root=None): - root_dir = os.path.abspath(os.path.realpath(root or os.getcwd())) + root_dir = os.path.realpath(root or os.curdir) if not os.path.isdir(root_dir): - raise NotDvcRepoError(root, msg="folder {} does not exist") + raise NotDvcRepoError("directory '{}' does not exist".format(root)) while True: dvc_dir = os.path.join(root_dir, cls.DVC_DIR) @@ -141,7 +141,12 @@ def find_root(cls, root=None): if os.path.ismount(root_dir): break root_dir = os.path.dirname(root_dir) - raise NotDvcRepoError(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):