Shinonome/caelestia-cli
1
0
Fork 1
mirror of https://github.com/caelestia-dots/cli.git synced 2026-06-18 15:00:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: account for moved src

Browse Source
This commit is contained in:
2 * r + 2 * t
2026-06-17 23:56:42 +10:00
parent c09cd1a609
commit 844f6d22b3
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/caelestia/subcommands/update.py
+2
View File
@@ -46,6 +46,8 @@ class Command:
deployed = dict(state.deployed_files) deployed = dict(state.deployed_files)
for dest in (*changeset.deletes, *changeset.stale, *changeset.untracked): for dest in (*changeset.deletes, *changeset.stale, *changeset.untracked):
deployed.pop(str(dest), None) deployed.pop(str(dest), None)
for repofile, dest in changeset.remap:
deployed[str(dest)] = repofile
deployed.update(placed) deployed.update(placed)
state.deployed_files = deployed state.deployed_files = deployed
state.save() state.save()
src/caelestia/utils/dots/diff.py
+7 -1
View File
@@ -18,6 +18,7 @@ class Changeset:
stale: list[Path] = field(default_factory=list) # Upstream removed it but user modified it stale: list[Path] = field(default_factory=list) # Upstream removed it but user modified it
deleted_changed: list[tuple[str, Path]] = field(default_factory=list) # User deleted it, upstream changed -> .new deleted_changed: list[tuple[str, Path]] = field(default_factory=list) # User deleted it, upstream changed -> .new
untracked: list[Path] = field(default_factory=list) # Gone + no longer managed; drop from state untracked: list[Path] = field(default_factory=list) # Gone + no longer managed; drop from state
remap: list[tuple[str, Path]] = field(default_factory=list) # Up to date but source path moved; restate mapping
def is_empty(self) -> bool: def is_empty(self) -> bool:
return not (self.place or self.conflicts or self.deletes or self.stale or self.deleted_changed) return not (self.place or self.conflicts or self.deletes or self.stale or self.deleted_changed)
@@ -46,6 +47,7 @@ class Changeset:
stale: list[Path] = [] stale: list[Path] = []
deleted_changed: list[tuple[str, Path]] = [] deleted_changed: list[tuple[str, Path]] = []
untracked: list[Path] = [] untracked: list[Path] = []
remap: list[tuple[str, Path]] = []
# Collect all files to deploy (entry sources can be dirs so we recurse into them) # Collect all files to deploy (entry sources can be dirs so we recurse into them)
to_deploy: dict[Path, str] = {} to_deploy: dict[Path, str] = {}
@@ -95,7 +97,10 @@ class Changeset:
dest_content = dest_path.read_bytes() dest_content = dest_path.read_bytes()
if try_read(tip, new_src) == dest_content: if try_read(tip, new_src) == dest_content:
continue # File is already up to date # Already up to date; restate the mapping if the source path moved
if new_src != src:
remap.append((new_src, dest_path))
continue
# Fast-forward only when the user hasn't edited since last deploy # Fast-forward only when the user hasn't edited since last deploy
if has_base and try_read(applied_rev, src) == dest_content: if has_base and try_read(applied_rev, src) == dest_content:
@@ -127,4 +132,5 @@ class Changeset:
stale=stale, stale=stale,
deleted_changed=deleted_changed, deleted_changed=deleted_changed,
untracked=untracked, untracked=untracked,
remap=remap,
) )