Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

jujutsu: fix config file location on Darwin #5544

Closed
wants to merge 1 commit into from

Conversation

Aehmlo
Copy link
Contributor

@Aehmlo Aehmlo commented Jun 16, 2024

Description

The jj tool loads its configuration from a platform-dependent location. On Darwin, it looks in ~/Library/Application Support/jj. This revision updates the programs.jujutsu module to serialize the generated configuration to the correct location.

Checklist

  • Change is backwards compatible.

  • Code formatted with ./format.

  • Code tested through nix-shell --pure tests -A run.all or nix develop --ignore-environment .#all using Flakes.

Test system information:

$ nix-shell -p nix-info --run "nix-info -m"
 - system: `"aarch64-darwin"`
 - host os: `Darwin 22.6.0, macOS 13.6.7`
 - multi-user?: `yes`
 - sandbox: `no`
 - version: `nix-env (Nix) 2.18.1`
 - channels(user): `""`
 - channels(root): `"nixpkgs-24.05"`
 - nixpkgs: `/nix/var/nix/profiles/per-user/root/channels/nixpkgs`

Maintainer CC

@shikanime

jj looks for its config file in ~/Library/Application Support/jj on
Darwin. The previous module implementation unconditionally stored the
configuration file in $XDG_CONFIG_HOME/jj. This revision now uses the
correct location on Darwin.
@huwaireb
Copy link

huwaireb commented Jun 18, 2024

Looks like a duplicate of #5416.
cc @mrnossiom

@mrnossiom
Copy link
Contributor

mrnossiom commented Jun 18, 2024

It seems to be, indeed. PR was blocked by obscure tests. Let me try to fix it right now with the info you provided.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants