nix/2.home-manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

mergiraf: add 'enable{Git,Jujutsus}Integration'

Browse source
This commit is contained in:
Bruno BELANYI 2026-03-12 03:52:41 +01:00 • committed by GitHub
parent 32f78141a9
commit d7ef0034e3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 142 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tests/modules/programs/mergiraf/default.nix
View file

@ -1,4 +1,5 @@
{
mergiraf-basic-configuration = ./basic-configuration.nix;
mergiraf-git-integration = ./git-integration.nix;
mergiraf-jujutsu-integration = ./jujutsu-integration.nix;
mergiraf-legacy-warnings = ./legacy-warnings.nix;
}

7
tests/modules/programs/mergiraf/basic-configuration.nix → tests/modules/programs/mergiraf/git-integration.nix
View file

@ -1,6 +1,11 @@
{
programs.git.enable = true;
programs.mergiraf.enable = true;
programs.mergiraf = {
enable = true;
enableGitIntegration = true;
# Do not warn about default value
enableJujutsuIntegration = false;
};
nmt.script = ''
assertFileContent "home-files/.config/git/config" ${./mergiraf-git.conf}

10
tests/modules/programs/mergiraf/jujutsu-integration.nix
View file

@ -20,12 +20,20 @@ in
enable = true;
package = config.lib.test.mkStubPackage { };
};
programs.mergiraf.enable = true;
programs.mergiraf = {
enable = true;
enableJujutsuIntegration = true;
# Do not warn about default value
enableGitIntegration = false;
};
nmt.script = ''
assertFileExists 'home-files/${configDir}/jj/config.toml'
assertFileContent 'home-files/${configDir}/jj/config.toml' \
${builtins.toFile "expected.toml" ''
[merge-tools.mergiraf]
program = "@mergiraf@/bin/mergiraf"
[ui]
merge-editor = "mergiraf"
''}

20
tests/modules/programs/mergiraf/legacy-warnings.nix Normal file
View file

@ -0,0 +1,20 @@
{
programs.mergiraf = {
enable = true;
};
test.asserts.warnings.expected = [
''
The default value of `programs.mergiraf.enableGitIntegration` will change in future versions.
You are currently using the legacy default (true) because `home.stateVersion` is less than "26.05".
To silence this warning set:
programs.mergiraf.enableGitIntegration = true;
''
''
The default value of `programs.mergiraf.enableJujutsuIntegration` will change in future versions.
You are currently using the legacy default (true) because `home.stateVersion` is less than "26.05".
To silence this warning set:
programs.mergiraf.enableJujutsuIntegration = true;
''
];
}