From 8a9033dd0a6401d0fba34d36a6cc0145d7d179e1 Mon Sep 17 00:00:00 2001 From: skshetry <18718008+skshetry@users.noreply.github.com> Date: Tue, 13 Aug 2024 08:50:57 +0545 Subject: [PATCH] meta.from_info: use positional args (#558) --- src/dvc_data/hashfile/checkout.py | 2 +- src/dvc_data/hashfile/meta.py | 27 ++++++++++++++------------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/dvc_data/hashfile/checkout.py b/src/dvc_data/hashfile/checkout.py index 884b291e..132b1754 100644 --- a/src/dvc_data/hashfile/checkout.py +++ b/src/dvc_data/hashfile/checkout.py @@ -368,7 +368,7 @@ def checkout( # noqa: PLR0913 except CheckoutError as exc: failed.extend(exc.paths) - if diff and state: + if (diff or relink) and state: state.save_link(path, fs) if failed or not diff: diff --git a/src/dvc_data/hashfile/meta.py b/src/dvc_data/hashfile/meta.py index bb7b47b0..ce4800b8 100644 --- a/src/dvc_data/hashfile/meta.py +++ b/src/dvc_data/hashfile/meta.py @@ -64,19 +64,20 @@ def from_info(cls, info: dict[str, Any], protocol: Optional[str] = None) -> "Met version_id = info.get("generation") return Meta( - isdir=info["type"] == "directory", - size=info.get("size"), - isexec=is_exec(info.get("mode", 0)), - version_id=version_id, - etag=etag, - checksum=checksum, - md5=info.get("md5"), - inode=info.get("ino"), - mtime=info.get("mtime"), - remote=info.get("remote"), - is_link=info.get("islink", False), - nlink=info.get("nlink", 1), - destination=info.get("destination"), + info["type"] == "directory", + info.get("size"), + None, + is_exec(info.get("mode", 0)), + version_id, + etag, + checksum, + info.get("md5"), + info.get("ino"), + info.get("mtime"), + info.get("remote"), + info.get("islink", False), + info.get("destination"), + info.get("nlink", 1), ) @classmethod