Archives/TheLocehiliosan_yadm
1
0
Fork 0
mirror of https://github.com/TheLocehiliosan/yadm synced 2025-12-05 14:12:19 +00:00
Code Issues Releases Wiki Activity

Merge eea75a4bed into bbb58e6625

Browse Source
This commit is contained in:
slowsage 2025-10-03 19:33:28 +00:00 committed by GitHub
commit cd22f8f688
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 41 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
test/test_alt.py
View File

@ -442,3 +442,34 @@ def setup_standard_yadm_dir(paths):
std_yadm_data.join("repo.git").mksymlinkto(paths.repo, absolute=1)
std_yadm_dir.join("encrypt").mksymlinkto(paths.encrypt, absolute=1)
return std_yadm_dir, std_yadm_data
@pytest.mark.usefixtures("ds1_copy")
def test_alt_preserves_user_symlink_when_no_alt_tracked(runner, paths):
"""Issue #236: User symlinks preserved when no yadm alternate is tracked."""
yadm_dir, yadm_data = setup_standard_yadm_dir(paths)
user_target = paths.work.join("user_target")
user_target.write("user-data")
link_file = paths.work.join(utils.ALT_FILE1)
link_file.mksymlinkto(user_target)
# now test-file -> user_target
alt_file = yadm_dir.join("alt").join(f"{utils.ALT_FILE1}##default")
alt_file.write("alt-data", ensure=True)
run = runner([paths.pgm, "-Y", yadm_dir, "--yadm-data", yadm_data, "alt"])
assert run.success
assert os.path.realpath(str(link_file)) == str(user_target)
assert link_file.read() == "user-data"
@pytest.mark.usefixtures("ds1_copy")
def test_alt_skips_correct_symlink_without_touching(runner, paths):
"""Optimization: yadm alt skips already-correct symlinks (no filesystem ops)."""
yadm_dir, yadm_data = setup_standard_yadm_dir(paths)
alt_file = yadm_dir.join("alt").join(f"{utils.ALT_FILE1}##default")
alt_file.write("alt-data", ensure=True)
runner([paths.pgm, "-Y", yadm_dir, "--yadm-data", yadm_data, "add", alt_file])
runner([paths.pgm, "-Y", yadm_dir, "--yadm-data", yadm_data, "alt"])
link_file = paths.work.join(utils.ALT_FILE1)
mtime_before = link_file.lstat().mtime
runner([paths.pgm, "-Y", yadm_dir, "--yadm-data", yadm_data, "alt"])
assert link_file.lstat().mtime == mtime_before

14
yadm
View File

@ -603,12 +603,12 @@ function alt() {
target="$target$suffix"
fi
# Remove target if it's a symlink pointing at source
if [ -L "$target" ] && [ "$target" -ef "$source" ]; then
score_file "$source" "$target" "$conditions"
# Remove target if it's a symlink pointing at source with score 0 (stale)
if [ -L "$target" ] && [ "$target" -ef "$source" ] && [ "$score" -eq 0 ]; then
rm -f "$target"
fi
score_file "$source" "$target" "$conditions"
done
local alt_linked=()
@ -705,6 +705,12 @@ function alt_linking() {
local source="${alt_sources[$index]}"
local template_processor="${alt_template_processors[$index]}"
if [ -L "$target" ] && [ "$target" -ef "$source" ] && [ "$do_copy" -eq 0 ]; then
$log "Keeping $target; already linked to $source"
exclude+=("${target#"$YADM_WORK"}")
continue
fi
if [ -L "$target" ]; then
rm -f "$target"
elif [ -d "$target" ]; then