mirror of
https://github.com/ItsDrike/dotfiles.git
synced 2024-12-26 05:04:34 +00:00
Show diff as systemfile replacing dotfile
This commit is contained in:
parent
6aeff61f59
commit
55a70492a2
2
sync.py
2
sync.py
|
@ -348,7 +348,7 @@ def show_diffs(diffs: Iterable[FileDiff], ask_show_diff: bool, apply_fix_prompt:
|
||||||
continue
|
continue
|
||||||
case DiffStatus.CONTENT_DIFFERS:
|
case DiffStatus.CONTENT_DIFFERS:
|
||||||
if ask_show_diff is False or yes_no(f"Show diff for {diff.sys_file}?"):
|
if ask_show_diff is False or yes_no(f"Show diff for {diff.sys_file}?"):
|
||||||
subprocess.run(["git", "diff", str(diff.sys_file), str(diff.dot_file)])
|
subprocess.run(["git", "diff", str(diff.dot_file), str(diff.sys_file)])
|
||||||
case _:
|
case _:
|
||||||
_str_status = diff.status.name.replace("_", " ")
|
_str_status = diff.status.name.replace("_", " ")
|
||||||
print(f"Skipping {diff.sys_file} diff for status: {_str_status}")
|
print(f"Skipping {diff.sys_file} diff for status: {_str_status}")
|
||||||
|
|
Loading…
Reference in a new issue