From 405dfde23f064d953a3f4e67d2f4ccc496257858 Mon Sep 17 00:00:00 2001 From: "Mr. Outis" Date: Tue, 23 Jul 2019 15:44:22 -0500 Subject: [PATCH] use set instead of list for deduplication --- dvc/repo/scm_context.py | 2 +- dvc/scm/git/__init__.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dvc/repo/scm_context.py b/dvc/repo/scm_context.py index 6f189c597..c0b0ffb5b 100644 --- a/dvc/repo/scm_context.py +++ b/dvc/repo/scm_context.py @@ -2,9 +2,9 @@ def scm_context(method): def run(repo, *args, **kw): try: result = method(repo, *args, **kw) - repo.scm.reset_tracked_files() repo.scm.reset_ignores() repo.scm.remind_to_track() + repo.scm.reset_tracked_files() return result except Exception: repo.scm.cleanup_ignores() diff --git a/dvc/scm/git/__init__.py b/dvc/scm/git/__init__.py index 04b42747d..5dd043ee0 100644 --- a/dvc/scm/git/__init__.py +++ b/dvc/scm/git/__init__.py @@ -54,7 +54,7 @@ class Git(Base): self.git.git.update_environment(LD_LIBRARY_PATH=libpath) self.ignored_paths = [] - self.files_to_track = [] + self.files_to_track = set() @staticmethod def is_repo(root_dir): @@ -246,7 +246,7 @@ class Git(Base): self.ignored_paths = [] def reset_tracked_files(self): - self.files_to_track = [] + self.files_to_track = set() def remind_to_track(self): if not self.files_to_track: @@ -260,7 +260,7 @@ class Git(Base): ) def track_file(self, path): - self.files_to_track.append(path) + self.files_to_track.update(set(path)) def belongs_to_scm(self, path): basename = os.path.basename(path)