chn/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager.git synced 2026-01-12 01:59:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

difftastic: migrate to lib.cli.toCommandLineShellGNU

Browse Source 
Migrates from the deprecated toCommandLineShell to toCommandLineShellGNU.

This changes the output format to use GNU-style concatenated options
(--color=always) with shell escaping for git config values. Both formats
were verified to work correctly with difftastic.

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
This commit is contained in:
Austin Horstman
2026-01-08 10:34:49 -06:00
parent fb6a8404ee
commit 92394f9dea
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/programs/difftastic.nix
View File

@@ -129,7 +129,7 @@ in
enable = lib.mkDefault true; enable = lib.mkDefault true;
iniContent = iniContent =
let let
difftCommand = "${lib.getExe cfg.package} ${lib.cli.toGNUCommandLineShell { } cfg.options}"; difftCommand = "${lib.getExe cfg.package} ${lib.cli.toCommandLineShellGNU { } cfg.options}";
in in
mkMerge [ mkMerge [
{ {

2
tests/modules/programs/difftastic/difftastic-migration.nix
View File

@@ -26,6 +26,6 @@
# Git config should contain difftastic configuration (backward compatibility) # Git config should contain difftastic configuration (backward compatibility)
assertFileExists home-files/.config/git/config assertFileExists home-files/.config/git/config
assertFileContains home-files/.config/git/config '[diff]' assertFileContains home-files/.config/git/config '[diff]'
assertFileRegex home-files/.config/git/config 'external = .*/difft.*--color.*--display' assertFileContains home-files/.config/git/config "external = \"@difftastic@/bin/difft '--color=always' '--display=side-by-side'\""
''; '';
} }

6
tests/modules/programs/difftastic/difftastic-with-git-difftool.nix
View File

@@ -17,9 +17,9 @@
assertFileExists home-files/.config/git/config assertFileExists home-files/.config/git/config
assertFileContains home-files/.config/git/config '[diff]' assertFileContains home-files/.config/git/config '[diff]'
# Should have BOTH diff.external AND difftool config when diffToolMode is true # Should have BOTH diff.external AND difftool config when diffToolMode is true
assertFileRegex home-files/.config/git/config 'external = .*/difft.*--color.*--display' assertFileContains home-files/.config/git/config "external = \"@difftastic@/bin/difft '--color=always' '--display=side-by-side'\""
assertFileRegex home-files/.config/git/config 'tool = "difftastic"' assertFileContains home-files/.config/git/config 'tool = "difftastic"'
assertFileContains home-files/.config/git/config '[difftool "difftastic"]' assertFileContains home-files/.config/git/config '[difftool "difftastic"]'
assertFileRegex home-files/.config/git/config 'cmd = .*/difft.*--color.*--display.*\$LOCAL \$REMOTE' assertFileContains home-files/.config/git/config "cmd = \"@difftastic@/bin/difft '--color=always' '--display=side-by-side' \$LOCAL \$REMOTE\""
''; '';
} }

2
tests/modules/programs/difftastic/difftastic-with-git-external-diff.nix
View File

@@ -17,7 +17,7 @@
assertFileExists home-files/.config/git/config assertFileExists home-files/.config/git/config
assertFileContains home-files/.config/git/config '[diff]' assertFileContains home-files/.config/git/config '[diff]'
# Should have diff.external set # Should have diff.external set
assertFileRegex home-files/.config/git/config 'external = .*/difft.*--color.*--display' assertFileContains home-files/.config/git/config "external = \"@difftastic@/bin/difft '--color=always' '--display=side-by-side'\""
# Should NOT have difftool config when diffToolMode is explicitly false # Should NOT have difftool config when diffToolMode is explicitly false
assertFileNotRegex home-files/.config/git/config 'tool = "difftastic"' assertFileNotRegex home-files/.config/git/config 'tool = "difftastic"'
assertFileNotRegex home-files/.config/git/config '\[difftool "difftastic"\]' assertFileNotRegex home-files/.config/git/config '\[difftool "difftastic"\]'

2
tests/modules/programs/difftastic/difftastic-with-git-integration.nix
View File

@@ -14,7 +14,7 @@
assertFileExists home-files/.config/git/config assertFileExists home-files/.config/git/config
assertFileContains home-files/.config/git/config '[diff]' assertFileContains home-files/.config/git/config '[diff]'
# Should have diff.external set # Should have diff.external set
assertFileRegex home-files/.config/git/config 'external = .*/difft.*--color.*--display' assertFileContains home-files/.config/git/config "external = \"@difftastic@/bin/difft '--color=always' '--display=side-by-side'\""
# Should NOT have difftool config since diffToolMode is false # Should NOT have difftool config since diffToolMode is false
assertFileNotRegex home-files/.config/git/config 'tool = "difftastic"' assertFileNotRegex home-files/.config/git/config 'tool = "difftastic"'
assertFileNotRegex home-files/.config/git/config '\[difftool "difftastic"\]' assertFileNotRegex home-files/.config/git/config '\[difftool "difftastic"\]'