From e36f0e9d856592b4fc08d8da15cb6faa1f8b98bd Mon Sep 17 00:00:00 2001 From: Ivan Shcheklein Date: Sun, 11 Dec 2022 16:21:27 -0800 Subject: [PATCH] reset all indecies of brancher switch --- dvc/repo/__init__.py | 9 +++++++-- dvc/repo/brancher.py | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dvc/repo/__init__.py b/dvc/repo/__init__.py index d590045fb..93452910f 100644 --- a/dvc/repo/__init__.py +++ b/dvc/repo/__init__.py @@ -536,11 +536,16 @@ class Repo: self.scm.close() self.state.close() + def _reset_cached_indecies(self): + self.__dict__.pop("index", None) + self.__dict__.pop("dvcignore", None) + self.__dict__.pop("dvcfs", None) + self.__dict__.pop("datafs", None) + def _reset(self): self.state.close() self.scm._reset() # pylint: disable=protected-access - self.__dict__.pop("index", None) - self.__dict__.pop("dvcignore", None) + self._reset_cached_indecies() def __enter__(self): return self diff --git a/dvc/repo/brancher.py b/dvc/repo/brancher.py index a07cf56e1..9a9a71871 100644 --- a/dvc/repo/brancher.py +++ b/dvc/repo/brancher.py @@ -77,7 +77,7 @@ def brancher( # noqa: E302 from dvc.fs import GitFileSystem for sha, names in found_revs.items(): - self.__dict__.pop("index", None) + self._reset_cached_indecies() # pylint: disable=W0212 self.fs = GitFileSystem(scm=scm, rev=sha) self.root_dir = self.fs.path.join("/", *repo_root_parts)