data cloud: pull: trust remotes md5 on proper flag

dvc/command/data_sync.py

@@ -66,6 +66,7 @@ class CmdDataFetch(CmdDataBase):
                 all_tags=self.args.all_tags,
                 with_deps=self.args.with_deps,
                 recursive=self.args.recursive,
+                trust_remote=self.args.trust_remote,
             )
         except DvcException:
             logger.exception("failed to fetch data from the cloud")
@@ -231,6 +232,12 @@ def add_parser(subparsers, _parent_parser):
         default=False,
         help="Fetch cache for subdirectories of specified directory.",
     )
+    fetch_parser.add_argument(
+        "--trust-remote",
+        action="store_true",
+        default=False,
+        help="Trust remote cache checksums upon fetching.",
+    )
     fetch_parser.set_defaults(func=CmdDataFetch)
 
     # Status

dvc/data_cloud.py

@@ -62,7 +62,14 @@ class DataCloud(object):
             show_checksums=show_checksums,
         )
 
-    def pull(self, cache, jobs=None, remote=None, show_checksums=False):
+    def pull(
+        self,
+        cache,
+        jobs=None,
+        remote=None,
+        show_checksums=False,
+        trust_remote=False,
+    ):
         """Pull data items in a cloud-agnostic way.
 
         Args:
@@ -73,12 +80,20 @@ class DataCloud(object):
             show_checksums (bool): show checksums instead of file names in
                 information messages.
         """
-        return self.repo.cache.local.pull(
+        downloaded_items_num = self.repo.cache.local.pull(
             cache,
             jobs=jobs,
             remote=self.get_remote(remote, "pull"),
             show_checksums=show_checksums,
         )
+        if trust_remote:
+            for checksum in cache["local"].keys():
+                cache_file = self.repo.cache.local.checksum_to_path_info(
+                    checksum
+                )
+                if self.repo.cache.local.exists(cache_file):
+                    self.repo.state.save(cache_file, checksum)
+        return downloaded_items_num
 
     def status(self, cache, jobs=None, remote=None, show_checksums=False):
         """Check status of data items in a cloud-agnostic way.

dvc/output/base.py

@@ -340,7 +340,12 @@ class OutputBase(object):
             self.remote.unprotect(self.path_info)
 
     def _collect_used_dir_cache(
-        self, remote=None, force=False, jobs=None, filter_info=None
+        self,
+        remote=None,
+        force=False,
+        jobs=None,
+        filter_info=None,
+        trust_remote=False,
     ):
         """Get a list of `info`s related to the given directory.
 
@@ -370,6 +375,7 @@ class OutputBase(object):
                     jobs=jobs,
                     remote=remote,
                     show_checksums=False,
+                    trust_remote=trust_remote,
                 )
             except DvcException:
                 logger.debug("failed to pull cache for '{}'".format(self))

dvc/repo/__init__.py

@@ -223,6 +223,7 @@ class Repo(object):
         force=False,
         jobs=None,
         recursive=False,
+        trust_remote=False,
     ):
         """Get the stages related to the given target and collect
         the `info` of its outputs.
@@ -262,6 +263,7 @@ class Repo(object):
                     force=force,
                     jobs=jobs,
                     filter_info=filter_info,
+                    trust_remote=trust_remote,
                 )
                 cache.update(used_cache, suffix=suffix)
 

dvc/repo/fetch.py

@@ -20,6 +20,7 @@ def _fetch(
     with_deps=False,
     all_tags=False,
     recursive=False,
+    trust_remote=False,
 ):
     """Download data items from a cloud and imported repositories
 
@@ -42,6 +43,7 @@ def _fetch(
         remote=remote,
         jobs=jobs,
         recursive=recursive,
+        trust_remote=trust_remote,
     )
 
     downloaded = 0
@@ -49,7 +51,11 @@ def _fetch(
 
     try:
         downloaded += self.cloud.pull(
-            used, jobs, remote=remote, show_checksums=show_checksums
+            used,
+            jobs,
+            remote=remote,
+            show_checksums=show_checksums,
+            trust_remote=trust_remote,
         )
     except NoRemoteError:
         if not used.external and used["local"]:

dvc/repo/pull.py

@@ -17,6 +17,7 @@ def pull(
     all_tags=False,
     force=False,
     recursive=False,
+    trust_remote=False,
 ):
     processed_files_count = self._fetch(
         targets,
@@ -26,6 +27,7 @@ def pull(
         all_tags=all_tags,
         with_deps=with_deps,
         recursive=recursive,
+        trust_remote=trust_remote,
     )
     self._checkout(
         targets=targets, with_deps=with_deps, force=force, recursive=recursive

tests/func/test_remote.py

@@ -6,6 +6,7 @@ import configobj
 import pytest
 from mock import patch
 
+from dvc import remote
 from dvc.config import Config, ConfigError
 from dvc.exceptions import DownloadError, UploadError
 from dvc.main import main
@@ -13,6 +14,8 @@ from dvc.path_info import PathInfo
 from dvc.remote import RemoteLOCAL, RemoteConfig
 from dvc.remote.base import RemoteBASE
 from dvc.compat import fspath
+from dvc.scm import Git
+from dvc.utils import file_md5
 from tests.basic_env import TestDvc
 from tests.remotes import Local
 
@@ -257,3 +260,71 @@ def test_modify_missing_remote(dvc):
 
     with pytest.raises(ConfigError, match=r"unable to find remote section"):
         remote_config.modify("myremote", "gdrive_client_id", "xxx")
+
+
+def test_trust_remote_checksums(tmp_dir, mocker, tmp_path_factory, erepo_dir):
+    with erepo_dir.chdir():
+
+        erepo_dir.dvc_gen({"file": "file content"}, commit="add dir")
+
+    Git.clone(fspath(erepo_dir), fspath(tmp_dir))
+
+    from dvc.repo import Repo
+
+    dvc = Repo(fspath(tmp_dir))
+
+    from tests.utils import spy
+
+    file_md5_spy = spy(file_md5)
+    mocker.patch.object(remote.local, "file_md5", file_md5_spy)
+
+    dvc.pull(trust_remote=True)
+
+    assert len(file_md5_spy.mock.call_args_list) == 1
+
+
+def test_trust_remote_checksums_dir(
+    tmp_dir, mocker, tmp_path_factory, erepo_dir
+):
+    with erepo_dir.chdir():
+        erepo_dir.dvc_gen({"dir": {"file": "file content"}}, commit="add dir")
+
+    Git.clone(fspath(erepo_dir), fspath(tmp_dir))
+
+    from dvc.repo import Repo
+
+    dvc = Repo(fspath(tmp_dir))
+
+    from tests.utils import spy
+
+    file_md5_spy = spy(file_md5)
+    mocker.patch.object(remote.local, "file_md5", file_md5_spy)
+
+    dvc.pull(trust_remote=True)
+
+    assert len(file_md5_spy.mock.call_args_list) == 1
+
+
+def test_trust_remote_checksums_external_dep(
+    tmp_dir, mocker, tmp_path_factory, erepo_dir
+):
+    external_path = tmp_path_factory.mktemp("external_dep") / "file"
+    external_path.write_text("file content")
+
+    with erepo_dir.chdir():
+        erepo_dir.dvc_add(fspath(external_path), commit="add external file")
+
+    Git.clone(fspath(erepo_dir), fspath(tmp_dir))
+
+    from dvc.repo import Repo
+
+    dvc = Repo(fspath(tmp_dir))
+
+    from tests.utils import spy
+
+    file_md5_spy = spy(file_md5)
+    mocker.patch.object(remote.local, "file_md5", file_md5_spy)
+
+    dvc.pull(trust_remote=True)
+
+    assert len(file_md5_spy.mock.call_args_list) == 1