remove --clear-index

Author: pmrowla

dvc/command/data_sync.py

@@ -30,7 +30,6 @@ def run(self):
                 with_deps=self.args.with_deps,
                 force=self.args.force,
                 recursive=self.args.recursive,
-                clear_index=self.args.clear_index,
             )
             log_summary(stats)
         except (CheckoutError, DvcException) as exc:
@@ -54,7 +53,6 @@ def run(self):
                 all_commits=self.args.all_commits,
                 with_deps=self.args.with_deps,
                 recursive=self.args.recursive,
-                clear_index=self.args.clear_index,
             )
         except DvcException:
             logger.exception("failed to push data to the cloud")
@@ -164,12 +162,6 @@ def add_parser(subparsers, _parent_parser):
         default=False,
         help="Pull cache for subdirectories of the specified directory.",
     )
-    pull_parser.add_argument(
-        "--clear-index",
-        action="store_true",
-        default=False,
-        help="Clear local index for the specified remote.",
-    )
     pull_parser.set_defaults(func=CmdDataPull)
 
     # Push
@@ -219,12 +211,6 @@ def add_parser(subparsers, _parent_parser):
         default=False,
         help="Push cache for subdirectories of specified directory.",
     )
-    push_parser.add_argument(
-        "--clear-index",
-        action="store_true",
-        default=False,
-        help="Clear local index for the remote.",
-    )
     push_parser.set_defaults(func=CmdDataPush)
 
     # Fetch
@@ -348,10 +334,4 @@ def add_parser(subparsers, _parent_parser):
         default=False,
         help="Show status for all dependencies of the specified target.",
     )
-    status_parser.add_argument(
-        "--clear-index",
-        action="store_true",
-        default=False,
-        help="Clear local index for the remote.",
-    )
     status_parser.set_defaults(func=CmdDataStatus)

dvc/command/status.py

@@ -49,7 +49,6 @@ def run(self):
                 all_tags=self.args.all_tags,
                 all_commits=self.args.all_commits,
                 with_deps=self.args.with_deps,
-                clear_index=self.args.clear_index,
             )
             if st:
                 if self.args.quiet:

dvc/data_cloud.py

@@ -48,14 +48,7 @@ def get_remote(self, remote=None, command="<command>"):
     def _init_remote(self, remote):
         return Remote(self.repo, name=remote)
 
-    def push(
-        self,
-        cache,
-        jobs=None,
-        remote=None,
-        show_checksums=False,
-        clear_index=False,
-    ):
+    def push(self, cache, jobs=None, remote=None, show_checksums=False):
         """Push data items in a cloud-agnostic way.
 
         Args:
@@ -65,24 +58,15 @@ def push(
                 By default remote from core.remote config option is used.
             show_checksums (bool): show checksums instead of file names in
                 information messages.
-            clear_index (bool): clear local index for the remote
         """
         return self.repo.cache.local.push(
             cache,
             jobs=jobs,
             remote=self.get_remote(remote, "push"),
             show_checksums=show_checksums,
-            clear_index=clear_index,
         )
 
-    def pull(
-        self,
-        cache,
-        jobs=None,
-        remote=None,
-        show_checksums=False,
-        clear_index=False,
-    ):
+    def pull(self, cache, jobs=None, remote=None, show_checksums=False):
         """Pull data items in a cloud-agnostic way.
 
         Args:
@@ -92,15 +76,10 @@ def pull(
                 By default remote from core.remote config option is used.
             show_checksums (bool): show checksums instead of file names in
                 information messages.
-            clear_index (bool): clear local index for the remote
         """
         remote = self.get_remote(remote, "pull")
         downloaded_items_num = self.repo.cache.local.pull(
-            cache,
-            jobs=jobs,
-            remote=remote,
-            show_checksums=show_checksums,
-            clear_index=clear_index,
+            cache, jobs=jobs, remote=remote, show_checksums=show_checksums
         )
 
         if not remote.verify:
@@ -118,14 +97,7 @@ def _save_pulled_checksums(self, cache):
                 # (see `RemoteBASE.download()`)
                 self.repo.state.save(cache_file, checksum)
 
-    def status(
-        self,
-        cache,
-        jobs=None,
-        remote=None,
-        show_checksums=False,
-        clear_index=False,
-    ):
+    def status(self, cache, jobs=None, remote=None, show_checksums=False):
         """Check status of data items in a cloud-agnostic way.
 
         Args:
@@ -136,13 +108,8 @@ def status(
                 is used.
             show_checksums (bool): show checksums instead of file names in
                 information messages.
-            clear_index (bool): clear local index for the remote
         """
         remote = self.get_remote(remote, "status")
         return self.repo.cache.local.status(
-            cache,
-            jobs=jobs,
-            remote=remote,
-            show_checksums=show_checksums,
-            clear_index=clear_index,
+            cache, jobs=jobs, remote=remote, show_checksums=show_checksums
         )

dvc/remote/local.py

@@ -265,7 +265,6 @@ def status(
         jobs=None,
         show_checksums=False,
         download=False,
-        clear_index=False,
     ):
         # Return flattened dict containing all status info
         dir_status, file_status, _ = self._status(
@@ -274,7 +273,6 @@ def status(
             jobs=jobs,
             show_checksums=show_checksums,
             download=download,
-            clear_index=clear_index,
         )
         return dict(dir_status, **file_status)
 
@@ -285,7 +283,6 @@ def _status(
         jobs=None,
         show_checksums=False,
         download=False,
-        clear_index=False,
     ):
         """Return a tuple of (dir_status_info, file_status_info, dir_mapping).
 
@@ -313,9 +310,6 @@ def _status(
         else:
             logger.debug("Collecting information from remote cache...")
             remote_exists = set()
-            if clear_index:
-                logger.debug("--clear-index used, clearing remote index")
-                remote.index.clear()
             dir_md5s = set(named_cache.dir_keys(self.scheme))
             if dir_md5s:
                 remote_exists.update(
@@ -438,7 +432,6 @@ def _process(
         jobs=None,
         show_checksums=False,
         download=False,
-        clear_index=False,
     ):
         logger.debug(
             "Preparing to {} '{}'".format(
@@ -467,7 +460,6 @@ def _process(
             jobs=jobs,
             show_checksums=show_checksums,
             download=download,
-            clear_index=clear_index,
         )
 
         dir_plans = self._get_plans(download, remote, dir_status, status)
@@ -551,39 +543,23 @@ def _dir_upload(func, futures, from_info, to_info, name):
         return func(from_info, to_info, name)
 
     @index_locked
-    def push(
-        self,
-        named_cache,
-        remote,
-        jobs=None,
-        show_checksums=False,
-        clear_index=False,
-    ):
+    def push(self, named_cache, remote, jobs=None, show_checksums=False):
         return self._process(
             named_cache,
             remote,
             jobs=jobs,
             show_checksums=show_checksums,
             download=False,
-            clear_index=clear_index,
         )
 
     @index_locked
-    def pull(
-        self,
-        named_cache,
-        remote,
-        jobs=None,
-        show_checksums=False,
-        clear_index=False,
-    ):
+    def pull(self, named_cache, remote, jobs=None, show_checksums=False):
         return self._process(
             named_cache,
             remote,
             jobs=jobs,
             show_checksums=show_checksums,
             download=True,
-            clear_index=clear_index,
         )
 
     @staticmethod

dvc/repo/fetch.py

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

dvc/repo/pull.py

@@ -18,7 +18,6 @@ def pull(
     force=False,
     recursive=False,
     all_commits=False,
-    clear_index=False,
 ):
     processed_files_count = self._fetch(
         targets,
@@ -29,7 +28,6 @@ def pull(
         all_commits=all_commits,
         with_deps=with_deps,
         recursive=recursive,
-        clear_index=clear_index,
     )
     stats = self._checkout(
         targets=targets, with_deps=with_deps, force=force, recursive=recursive

dvc/repo/push.py

@@ -12,7 +12,6 @@ def push(
     all_tags=False,
     recursive=False,
     all_commits=False,
-    clear_index=False,
 ):
     used = self.used_cache(
         targets,
@@ -25,4 +24,4 @@ def push(
         jobs=jobs,
         recursive=recursive,
     )
-    return self.cloud.push(used, jobs, remote=remote, clear_index=clear_index)
+    return self.cloud.push(used, jobs, remote=remote)

dvc/repo/status.py

@@ -45,7 +45,6 @@ def _cloud_status(
     with_deps=False,
     all_tags=False,
     all_commits=False,
-    clear_index=False,
 ):
     """Returns a dictionary with the files that are new or deleted.
 
@@ -87,9 +86,7 @@ def _cloud_status(
     )
 
     ret = {}
-    status_info = self.cloud.status(
-        used, jobs, remote=remote, clear_index=clear_index
-    )
+    status_info = self.cloud.status(used, jobs, remote=remote)
     for info in status_info.values():
         name = info["name"]
         status = info["status"]
@@ -114,7 +111,6 @@ def status(
     with_deps=False,
     all_tags=False,
     all_commits=False,
-    clear_index=False,
 ):
     if cloud or remote:
         return _cloud_status(
@@ -126,7 +122,6 @@ def status(
             remote=remote,
             all_tags=all_tags,
             all_commits=all_commits,
-            clear_index=clear_index,
         )
 
     ignored = list(

scripts/completion/dvc.bash

@@ -51,9 +51,9 @@ _dvc_pipeline='list show'
 _dvc_pipeline_list=''
 _dvc_pipeline_show='-c --commands -o --outs --ascii --dot --tree -l --locked'
 _dvc_pipeline_show_COMPGEN=_dvc_compgen_DVCFiles
-_dvc_pull='-j --jobs -r --remote -a --all-branches -T --all-tags -f --force -d --with-deps -R --recursive --clear-index'
+_dvc_pull='-j --jobs -r --remote -a --all-branches -T --all-tags -f --force -d --with-deps -R --recursive'
 _dvc_pull_COMPGEN=_dvc_compgen_DVCFiles
-_dvc_push='-j --jobs -r --remote -a --all-branches -T --all-tags -d --with-deps -R --recursive --clear-index'
+_dvc_push='-j --jobs -r --remote -a --all-branches -T --all-tags -d --with-deps -R --recursive'
 _dvc_push_COMPGEN=_dvc_compgen_DVCFiles
 _dvc_remote='add default list modify remove'
 _dvc_remote_add='--global --system --local -d --default -f --force'
@@ -68,7 +68,7 @@ _dvc_repro_COMPGEN=_dvc_compgen_DVCFiles
 _dvc_root=''
 _dvc_run='--no-exec -f --file -d --deps -o --outs -O --outs-no-cache --outs-persist --outs-persist-no-cache -m --metrics -M --metrics-no-cache --overwrite-dvcfile --ignore-build-cache --no-commit -w --wdir'
 _dvc_run_COMPGEN=_dvc_compgen_DVCFiles
-_dvc_status='-j --jobs -r --remote -a --all-branches -T --all-tags -d --with-deps -c --cloud --clear-index'
+_dvc_status='-j --jobs -r --remote -a --all-branches -T --all-tags -d --with-deps -c --cloud'
 _dvc_status_COMPGEN=_dvc_compgen_DVCFiles
 _dvc_unlock_COMPGEN=_dvc_compgen_DVCFiles
 _dvc_unprotect_COMPGEN=_dvc_compgen_files

scripts/completion/dvc.zsh

@@ -193,7 +193,6 @@ _dvc_pull=(
   {-d,--with-deps}"[Fetch cache for all dependencies of the specified target.]"
   {-f,--force}"[Do not prompt when removing working directory files.]"
   {-R,--recursive}"[Pull cache for subdirectories of the specified directory.]"
-  {--clear-index}"[Clear local index for the remote.]"
   "*:Stages:_files -g '(*.dvc|Dvcfile)'"
 )
 
@@ -204,7 +203,6 @@ _dvc_push=(
   {-T,--all-tags}"[Push cache for all tags.]"
   {-d,--with-deps}"[Push cache for all dependencies of the specified target.]"
   {-R,--recursive}"[Push cache for subdirectories of specified directory.]"
-  {--clear-index}"[Clear local index for the remote.]"
   "*:Stages:_files -g '(*.dvc|Dvcfile)'"
 )
 
@@ -265,7 +263,6 @@ _dvc_status=(
   {-a,--all-branches}"[Show status of a local cache compared to a remote repository for all branches.]"
   {-T,--all-tags}"[Show status of a local cache compared to a remote repository for all tags.]"
   {-d,--with-deps}"[Show status for all dependencies of the specified target.]"
-  {--clear-index}"[Clear local index for the remote.]"
   "*:Stages:_files -g '(*.dvc|Dvcfile)'"
 )
 

tests/func/remote/test_index.py

@@ -63,12 +63,6 @@ def test_indexed_dir_missing(tmp_dir, dvc, tmp_path_factory, remote):
         assert not list(remote.index.checksums())
 
 
-def test_clear_index(tmp_dir, dvc, tmp_path_factory, remote, mocker):
-    mocked_clear = mocker.patch.object(remote.INDEX_CLS, "clear")
-    dvc.status(cloud=True, clear_index=True)
-    mocked_clear.assert_called_with()
-
-
 def test_clear_on_gc(tmp_dir, dvc, tmp_path_factory, remote, mocker):
     (foo,) = tmp_dir.dvc_gen({"foo": "foo content"})
     dvc.push()