import: just inform that output not found

dvc/dependency/repo.py

@@ -49,10 +49,10 @@ def _make_repo(self, **overrides):
 
     def status(self):
         with self._make_repo() as repo:
-            current = repo.find_out_by_path(self.def_path).info
+            current = repo.find_out_by_relpath(self.def_path).info
 
         with self._make_repo(rev_lock=None) as repo:
-            updated = repo.find_out_by_path(self.def_path).info
+            updated = repo.find_out_by_relpath(self.def_path).info
 
         if current != updated:
             return {str(self): "update available"}
@@ -71,7 +71,7 @@ def fetch(self):
         ) as repo:
             self.def_repo[self.PARAM_REV_LOCK] = repo.scm.get_rev()
 
-            out = repo.find_out_by_path(self.def_path)
+            out = repo.find_out_by_relpath(self.def_path)
             with repo.state:
                 repo.cloud.pull(out.get_used_cache())
 

dvc/exceptions.py

@@ -61,10 +61,9 @@ class OutputNotFoundError(DvcException):
 
     def __init__(self, output, repo=None):
         self.repo = repo
-        self.failed_output = output
         super(OutputNotFoundError, self).__init__(
             "unable to find DVC-file with output '{path}'".format(
-                path=relpath(self.failed_output)
+                path=relpath(output)
             )
         )
 
@@ -343,9 +342,7 @@ def __init__(self, url, cause=None):
 
 
 class NoOutputInExternalRepoError(DvcException):
-    def __init__(self, repo_url, path):
+    def __init__(self):
         super(NoOutputInExternalRepoError, self).__init__(
-            "Output '{}' not found in target repository: '{}'".format(
-                path, repo_url
-            )
+            "Output not found in target repository."
         )

dvc/external_repo.py

@@ -29,7 +29,7 @@ def external_repo(url=None, rev=None, rev_lock=None, cache_dir=None):
         raise RemoteNotSpecifiedInExternalRepoError(url, cause=exc)
     except OutputNotFoundError as exc:
         if exc.repo is repo:
-            raise NoOutputInExternalRepoError(url, exc.failed_output)
+            raise NoOutputInExternalRepoError()
         raise
     repo.close()
 

dvc/repo/__init__.py

@@ -418,13 +418,10 @@ def stages(self):
         return get_stages(self.graph)
 
     def find_outs_by_path(self, path, outs=None, recursive=False):
-        abs_path = (
-            path if os.path.isabs(path) else os.path.join(self.root_dir, path)
-        )
-
         if not outs:
             outs = [out for stage in self.stages for out in stage.outs]
 
+        abs_path = os.path.abspath(path)
         is_dir = self.tree.isdir(abs_path)
 
         def func(out):
@@ -438,15 +435,12 @@ def func(out):
 
         matched = list(filter(func, outs))
         if not matched:
-            if abs_path.startswith(self.root_dir):
-                failed_output = relpath(abs_path)
-            else:
-                failed_output = path
-            raise OutputNotFoundError(failed_output, self)
+            raise OutputNotFoundError(path, self)
 
         return matched
 
-    def find_out_by_path(self, path):
+    def find_out_by_relpath(self, relpath):
+        path = os.path.join(self.root_dir, relpath)
         out, = self.find_outs_by_path(path)
         return out
 

dvc/repo/fetch.py

@@ -81,7 +81,7 @@ def _fetch_external(self, repo_url, repo_rev, files):
                 cache = NamedCache()
                 for name in files:
                     try:
-                        out = repo.find_out_by_path(name)
+                        out = repo.find_out_by_relpath(name)
                     except OutputNotFoundError:
                         failed += 1
                         logger.exception(

dvc/repo/get.py

@@ -49,7 +49,7 @@ def get(url, path, out=None, rev=None):
             # the same cache file might be used a few times in a directory.
             repo.cache.local.cache_types = ["reflink", "hardlink", "copy"]
 
-            o = repo.find_out_by_path(path)
+            o = repo.find_out_by_relpath(path)
             with repo.state:
                 repo.cloud.pull(o.get_used_cache())
             o.path_info = PathInfo(os.path.abspath(out))

tests/func/test_import.py

@@ -8,7 +8,7 @@
 from mock import patch
 
 from dvc.config import Config
-from dvc.exceptions import DownloadError
+from dvc.exceptions import DownloadError, NoOutputInExternalRepoError
 from dvc.stage import Stage
 from dvc.system import System
 from dvc.utils import makedirs
@@ -154,3 +154,8 @@ def test_pull_non_workspace(git, dvc_repo, erepo):
     os.remove(stage.outs[0].cache_path)
     dvc_repo.fetch(all_tags=True)
     assert os.path.exists(stage.outs[0].cache_path)
+
+
+def test_import_non_existing(dvc_repo, erepo):
+    with pytest.raises(NoOutputInExternalRepoError):
+        dvc_repo.imp(erepo.root_dir, "invalid_output")