From 6fbdf1b5b0cca058e4444b1979f408a60ce5142f Mon Sep 17 00:00:00 2001
From: Andrew Grigorev <andrew@ei-grad.ru>
Date: Fri, 22 Mar 2019 19:41:48 +0300
Subject: [PATCH] dvc.repo.tree -> dvc.scm.tree

Tree objects are used as `Repo().tree`, so it seemed logical to put them
inside `dvc/repo/tree.py`. But what is more important - `dvc.repo.Repo`
depends on `dvc.scm` and it is not convinient to use `dvc.repo.tree` in
`dvc.scm.git`.

Fix #1769
---
 dvc/repo/__init__.py      | 2 +-
 dvc/repo/brancher.py      | 2 +-
 dvc/scm/git/tree.py       | 2 +-
 dvc/{repo => scm}/tree.py | 0
 tests/test_repo.py        | 2 +-
 tests/test_tree.py        | 2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename dvc/{repo => scm}/tree.py (100%)

diff --git a/dvc/repo/__init__.py b/dvc/repo/__init__.py
index ac55cb255..7f1653be2 100644
--- a/dvc/repo/__init__.py
+++ b/dvc/repo/__init__.py
@@ -38,7 +38,7 @@ class Repo(object):
         from dvc.data_cloud import DataCloud
         from dvc.updater import Updater
         from dvc.repo.metrics import Metrics
-        from dvc.repo.tree import WorkingTree
+        from dvc.scm.tree import WorkingTree
 
         root_dir = self.find_root(root_dir)
 
diff --git a/dvc/repo/brancher.py b/dvc/repo/brancher.py
index 6a4cfca13..bc4f3e38a 100644
--- a/dvc/repo/brancher.py
+++ b/dvc/repo/brancher.py
@@ -25,7 +25,7 @@ def brancher(  # noqa: E302
     scm = self.scm
 
     if self.scm.is_dirty():
-        from dvc.repo.tree import WorkingTree
+        from dvc.scm.tree import WorkingTree
 
         self.tree = WorkingTree()
         yield "Working Tree"
diff --git a/dvc/scm/git/tree.py b/dvc/scm/git/tree.py
index d9c56293e..d6aff9151 100644
--- a/dvc/scm/git/tree.py
+++ b/dvc/scm/git/tree.py
@@ -3,7 +3,7 @@ import os
 
 from dvc.utils.compat import StringIO
 
-from dvc.repo.tree import BaseTree
+from dvc.scm.tree import BaseTree
 
 
 # see git-fast-import(1)
diff --git a/dvc/repo/tree.py b/dvc/scm/tree.py
similarity index 100%
rename from dvc/repo/tree.py
rename to dvc/scm/tree.py
diff --git a/tests/test_repo.py b/tests/test_repo.py
index 0a99533af..aa3306301 100644
--- a/tests/test_repo.py
+++ b/tests/test_repo.py
@@ -1,7 +1,7 @@
 from tests.basic_env import TestDvc
 
 from dvc.scm.git import GitTree
-from dvc.repo.tree import WorkingTree
+from dvc.scm.tree import WorkingTree
 
 
 class TestCollect(TestDvc):
diff --git a/tests/test_tree.py b/tests/test_tree.py
index de81f8093..6f6ec1153 100644
--- a/tests/test_tree.py
+++ b/tests/test_tree.py
@@ -6,7 +6,7 @@ from os.path import join
 
 from dvc.scm import SCM
 from dvc.scm.git import GitTree
-from dvc.repo.tree import WorkingTree
+from dvc.scm.tree import WorkingTree
 
 from tests.basic_env import TestDir, TestGit