Stone_Red/dvc
1
0
Fork 0
mirror of https://github.com/Stone-Red-Code/dvc.git synced 2026-11-02 07:18:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

data status: handle path joining properly for tree leaves/items (#8107)

Browse Source
This commit is contained in:
skshetry
2022-08-09 09:34:15 +05:45
committed by GitHub
parent b7c0c41262
commit 7c1e339650
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dvc/repo/data.py
+6 -2
View File
@@ -68,13 +68,17 @@ def _granular_diff(
from dvc_data.diff import diff as odiff
from dvc_data.objects.tree import Tree
drop_root = False
trees = isinstance(old_obj, Tree) or isinstance(new_obj, Tree)
if trees:
drop_root = not with_dirs
def path_join(root: str, *paths: str) -> str:
if not isinstance(new_obj, Tree):
if not trees and paths == ROOT:
return root
return os.path.sep.join([root, *paths])
diff_data = odiff(old_obj, new_obj, cache)
drop_root = not with_dirs and isinstance(new_obj, Tree)
output: Dict[str, List[str]] = defaultdict(list)
for state in ("added", "deleted", "modified", "unchanged"):