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

push/fetch: support dirs in worktree remotes

Browse Source
This commit is contained in:
Peter Rowlands
2022-09-15 13:13:31 +03:00
committed by Ruslan Kuprieiev
parent c29e721823
commit 95ae018ed8
2 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dvc/repo/fetch.py
+2 -2
View File
@@ -34,8 +34,8 @@ def _fetch_worktree(repo, remote):
if not out.is_in_repo:
continue
key = repo.fs.path.relparts(out.fs_path, repo.root_dir)
entry = repo.index.data["repo"][key]
workspace, key = out.index_key
entry = repo.index.data[workspace][key]
out.hash_info = entry.hash_info
out.meta = entry.meta
dvc/repo/push.py
+29 -8
View File
@@ -10,11 +10,14 @@ if TYPE_CHECKING:
def _push_worktree(repo, remote):
from dvc_data.index import build, checkout
from dvc_data.hashfile.tree import tree_from_index
from dvc_data.index import build, checkout, collect
index = repo.index.data["repo"]
checkout(index, remote.path, remote.fs)
checkout(index, remote.path, remote.fs, force=True)
build(index, remote.path, remote.fs)
if any(out.isdir() for out in repo.index.outs):
collect(index, remote.path, remote.fs)
for stage in repo.index.stages:
for out in stage.outs:
@@ -24,12 +27,30 @@ def _push_worktree(repo, remote):
if not out.is_in_repo:
continue
key = repo.fs.path.relparts(out.fs_path, repo.root_dir)
entry = repo.index.data["repo"][key]
out.hash_info = entry.hash_info
out.meta = entry.meta
stage.dvcfile.dump(stage)
workspace, key = out.index_key
index = repo.index.data[workspace]
entry = index[key]
if out.isdir():
old_tree = out.get_obj()
entry.hash_info = old_tree.hash_info
entry.meta = out.meta
for subkey, entry in index.iteritems(key):
if entry.meta.isdir:
continue
fs_path = repo.fs.path.join(repo.root_dir, *subkey)
_, hash_info = old_tree.get(
repo.fs.path.relparts(fs_path, out.fs_path)
)
entry.hash_info = hash_info
tree_meta, new_tree = tree_from_index(index, key)
new_tree.digest()
out.obj = new_tree
out.hash_info = new_tree.hash_info
out.meta = tree_meta
else:
out.hash_info = entry.hash_info
out.meta = entry.meta
stage.dvcfile.dump(stage, with_files=True)
return len(index)