mirror of
https://github.com/Stone-Red-Code/dvc.git
synced 2026-11-19 23:11:44 +01:00
worktree: use view instead of full index in push/fetch
This commit is contained in:
committed by
Peter Rowlands (변기호)
parent
a01bc2918e
commit
dae500d7c7
+1
-1
@@ -45,7 +45,7 @@ def fetch(
|
||||
remote is configured
|
||||
"""
|
||||
from dvc.repo.imports import save_imports
|
||||
from dvc.repo.worktree import fetch as fetch_worktree
|
||||
from dvc.repo.worktree import fetch_worktree
|
||||
from dvc_data.hashfile.transfer import TransferResult
|
||||
|
||||
if isinstance(targets, str):
|
||||
|
||||
+1
-1
@@ -152,7 +152,7 @@ class Index:
|
||||
|
||||
def targets_view(
|
||||
self,
|
||||
targets: "TargetType",
|
||||
targets: Optional["TargetType"],
|
||||
stage_filter: Optional[Callable[["Stage"], bool]] = None,
|
||||
outs_filter: Optional[Callable[["Output"], bool]] = None,
|
||||
**kwargs: Any,
|
||||
|
||||
+1
-1
@@ -26,7 +26,7 @@ def push(
|
||||
odb: Optional["ObjectDB"] = None,
|
||||
include_imports=False,
|
||||
):
|
||||
from dvc.repo.worktree import push as push_worktree
|
||||
from dvc.repo.worktree import push_worktree
|
||||
|
||||
_remote = self.cloud.get_remote(name=remote)
|
||||
if _remote.worktree:
|
||||
|
||||
+45
-6
@@ -1,14 +1,52 @@
|
||||
from typing import TYPE_CHECKING
|
||||
from typing import TYPE_CHECKING, Optional
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from dvc.cloud import Remote
|
||||
from dvc.index import Index, IndexView
|
||||
from dvc.output import Output
|
||||
from dvc.repo import Repo
|
||||
from dvc.stage import Stage
|
||||
from dvc.types import TargetType
|
||||
|
||||
|
||||
def fetch(repo: "Repo", remote: "Remote") -> int:
|
||||
def worktree_view(
|
||||
index: "Index",
|
||||
targets: Optional["TargetType"] = None,
|
||||
push: bool = False,
|
||||
**kwargs,
|
||||
) -> "IndexView":
|
||||
"""Return view of data that can be stored in worktree remotes.
|
||||
|
||||
Args:
|
||||
targets: Optional targets.
|
||||
push: Whether the view should be restricted to pushable data only.
|
||||
|
||||
Additional kwargs will be passed into target collection.
|
||||
"""
|
||||
|
||||
def stage_filter(stage: "Stage") -> bool:
|
||||
if push and stage.is_repo_import:
|
||||
return False
|
||||
return True
|
||||
|
||||
def outs_filter(out: "Output") -> bool:
|
||||
if not out.is_in_repo or (push and not out.can_push):
|
||||
return False
|
||||
return True
|
||||
|
||||
return index.targets_view(
|
||||
targets,
|
||||
stage_filter=stage_filter,
|
||||
outs_filter=outs_filter,
|
||||
**kwargs,
|
||||
)
|
||||
|
||||
|
||||
def fetch_worktree(repo: "Repo", remote: "Remote") -> int:
|
||||
from dvc_data.index import save
|
||||
|
||||
index = repo.index.data["repo"]
|
||||
view = worktree_view(repo.index)
|
||||
index = view.data["repo"]
|
||||
for key, entry in index.iteritems():
|
||||
entry.fs = remote.fs
|
||||
entry.path = remote.fs.path.join(
|
||||
@@ -19,14 +57,15 @@ def fetch(repo: "Repo", remote: "Remote") -> int:
|
||||
return len(index)
|
||||
|
||||
|
||||
def push(repo: "Repo", remote: "Remote") -> int:
|
||||
def push_worktree(repo: "Repo", remote: "Remote") -> int:
|
||||
from dvc_data.index import checkout
|
||||
from dvc_data.index.save import build_tree
|
||||
|
||||
index = repo.index.data["repo"]
|
||||
view = worktree_view(repo.index, push=True)
|
||||
index = view.data["repo"]
|
||||
checkout(index, remote.path, remote.fs)
|
||||
|
||||
for stage in repo.index.stages:
|
||||
for stage in view.stages:
|
||||
for out in stage.outs:
|
||||
if not out.use_cache:
|
||||
continue
|
||||
|
||||
Reference in New Issue
Block a user