{"header":{"message":"Implement tests for `pijul-config`","description":"Only notable change is moving the configuration logic loading into `Config::load_with()`, so that the tests can override configuration files without touching the filesystem. Ideally this should eventually be merged back together, and the filesystem be mocked using `libpijul::working_copy::memory::Memory`.","timestamp":"2025-08-01T10:31:27.433937547Z","authors":[{}]},"hash":"IWN4G7PCFKVK7IN5HMXS5NFCSIT5HFDLSUJ4ULP4QOZTBYFCFWDAC","authors":[{"login":"finchie","key":"6WCsL9cxQoPBLLwR1PUvmFBJi6wGTGFAxcxMovPQCwTZ"}],"deps":{"hashes":[["IWN4G7PCFKVK7IN5HMXS5NFCSIT5HFDLSUJ4ULP4QOZTBYFCFWDAC","Implement tests for `pijul-config`"],["AA",null],["FIMDS32ZN6OCZUBWYNKDHZJ6FNKUC7NRUC37Q45HXQRBSTDM4YSQC","Use subcommand-specific repository config paths"],["2ZKE4XMJ3Z3IBFJCJCXQ6E76T3QEVBB2VEZCY7ZD4EMRJ2BHKBTQC","Replace `pijul_repository::init_dot_ignore` with `pijul_config::Config::dot_ignore_contents`"],["Z4PPQZUGHT5F5VFFBQBIW2J3OLHP4SF33QMT6POFCX6JS7L6G7GQC","Refactor `pijul-config` to support layered configuration"],["FVQYZQFL7WHSC3UUPJ4IWTP7SKTDQ4K6K5HY4EDK3JKXG3CQNZEAC","Create dialoguer themes based on global config"],["VL7ZYKHBPKLNY5SA5QBW56SJ7LBBCKCGV5UAYLVF75KY6PPBOD4AC","Running hooks through shell on Windows and Unix"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["Y6EVFMTA6FOH3OQH6QCSWMI3F6SYZT2FSHO6GF4M3ICENDCWFM4QC","Don't output files if they aren't in the current channel"],["HGJETVANHD25AZLOPYYEXCMLZHZWZ2NAKI33XQ7F43XM3UZVQNOQC","Create `pijul_config::global_config_directory()`"],["HM6QW3CYVZVXOM2K3OT7SQFQGJG3GCDLNYIYAUDEVSJCVCSUZ4CQC","Handle missing configurations in `pijul_config`"],["H4AU6QRPRDRFW3V7NN5CJ6DHLEUBYGNLRZ5GYV6ULBGRMOPCJQXQC","New config for HTTP remotes"],["VQPAUKBQ2POZKL7CZFAZK5ZQKEBYL27XZYZWYUSH5AH25KK6DWKAC","channel switch as an alias to reset"],["7UU3TV5W23QA7LLRBSBXEYPRMIVXPW4FNENEEE7ZEJYXDLXHVX4AC","Refactor `pijul::config` into new crate"],["OWO4EWK7YVHW544XJTTXAYO553GQKWGXIWNECDPWPFOGNJ6KHWAAC","Add global `--config` argument to override configuration values"]],"deps":["FIMDS32ZN6OCZUBWYNKDHZJ6FNKUC7NRUC37Q45HXQRBSTDM4YSQC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","VQPAUKBQ2POZKL7CZFAZK5ZQKEBYL27XZYZWYUSH5AH25KK6DWKAC","VL7ZYKHBPKLNY5SA5QBW56SJ7LBBCKCGV5UAYLVF75KY6PPBOD4AC","Y6EVFMTA6FOH3OQH6QCSWMI3F6SYZT2FSHO6GF4M3ICENDCWFM4QC","FVQYZQFL7WHSC3UUPJ4IWTP7SKTDQ4K6K5HY4EDK3JKXG3CQNZEAC","H4AU6QRPRDRFW3V7NN5CJ6DHLEUBYGNLRZ5GYV6ULBGRMOPCJQXQC","Z4PPQZUGHT5F5VFFBQBIW2J3OLHP4SF33QMT6POFCX6JS7L6G7GQC","HM6QW3CYVZVXOM2K3OT7SQFQGJG3GCDLNYIYAUDEVSJCVCSUZ4CQC","HGJETVANHD25AZLOPYYEXCMLZHZWZ2NAKI33XQ7F43XM3UZVQNOQC","2ZKE4XMJ3Z3IBFJCJCXQ6E76T3QEVBB2VEZCY7ZD4EMRJ2BHKBTQC"]},"hunks":[{"FileAdd":{"meta":{"basename":"tests","metadata":576},"context":[{"change":14,"pos":24}],"contents":[]}},{"FileAdd":{"meta":{"basename":"parse_config_arg.rs","metadata":0},"context":[{"change":0,"pos":17}],"contents":[{"Add":"use pijul_config::parse_config_arg;"},{"Add":""},{"Add":"#[test]"},{"Add":"fn top_level() -> Result<(), anyhow::Error> {"},{"Add":" let (key, value) = parse_config_arg(\"unrecord_changes=1\")?;"},{"Add":""},{"Add":" assert_eq!(key, \"unrecord_changes\");"},{"Add":" assert_eq!(value, \"1\");"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn nested() -> Result<(), anyhow::Error> {"},{"Add":" let (key, value) = parse_config_arg(\"author.username=Ferris\")?;"},{"Add":""},{"Add":" assert_eq!(key, \"author.username\");"},{"Add":" assert_eq!(value, \"Ferris\");"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn missing_equals_sign() {"},{"Add":" parse_config_arg(\"unrecord_changes1\").unwrap_err();"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn empty_argument() {"},{"Add":" parse_config_arg(\"\").unwrap_err();"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"layering.rs","metadata":0},"context":[{"change":0,"pos":17}],"contents":[{"Add":"use pijul_config::{Choice, Config};"},{"Add":"use std::path::PathBuf;"},{"Add":""},{"Add":"const GLOBAL_CONFIG: &str = r#\""},{"Add":"colors = \"never\""},{"Add":"pager = \"never\""},{"Add":"reset_overwrites_changes = \"never\""},{"Add":"\"#;"},{"Add":""},{"Add":"const LOCAL_CONFIG: &str = r#\""},{"Add":"colors = \"always\""},{"Add":"pager = \"always\""},{"Add":"reset_overwrites_changes = \"always\""},{"Add":"\"#;"},{"Add":""},{"Add":"const CONFIG_OVERRIDES: [(&str, &str); 3] = ["},{"Add":" (\"colors\", \"auto\"),"},{"Add":" (\"pager\", \"auto\"),"},{"Add":" (\"reset_overwrites_changes\", \"auto\"),"},{"Add":"];"},{"Add":""},{"Add":"fn check_config_fields(config: &Config, choice: Choice) {"},{"Add":" assert_eq!(config.colors, choice);"},{"Add":" assert_eq!(config.pager, choice);"},{"Add":" assert_eq!(config.reset_overwrites_changes, choice);"},{"Add":"}"},{"Add":""},{"Add":"/// Default config values should be Choice::Auto"},{"Add":"#[test]"},{"Add":"fn default() -> Result<(), anyhow::Error> {"},{"Add":" let default_config = Config::load(None, Vec::new())?;"},{"Add":""},{"Add":" // Double-check that the defaults still use Choice::Auto"},{"Add":" check_config_fields(&default_config, Choice::Auto);"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"/// Global config values should override defaults"},{"Add":"#[test]"},{"Add":"fn global() -> Result<(), anyhow::Error> {"},{"Add":" let global_config = Config::load_with("},{"Add":" Some((PathBuf::new(), String::from(GLOBAL_CONFIG))),"},{"Add":" None,"},{"Add":" Vec::new(),"},{"Add":" )?;"},{"Add":""},{"Add":" // Make sure the global config overrides these fields"},{"Add":" check_config_fields(&global_config, Choice::Never);"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"/// Local config values should override defaults and global config"},{"Add":"#[test]"},{"Add":"fn local() -> Result<(), anyhow::Error> {"},{"Add":" let local_config = Config::load_with("},{"Add":" Some((PathBuf::new(), String::from(GLOBAL_CONFIG))),"},{"Add":" Some((PathBuf::new(), String::from(LOCAL_CONFIG))),"},{"Add":" Vec::new(),"},{"Add":" )?;"},{"Add":""},{"Add":" // Make sure the local config overrides these fields"},{"Add":" check_config_fields(&local_config, Choice::Always);"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"/// Config overrides should override everything"},{"Add":"#[test]"},{"Add":"fn overrides() -> Result<(), anyhow::Error> {"},{"Add":" let override_config = Config::load_with("},{"Add":" Some((PathBuf::new(), String::from(GLOBAL_CONFIG))),"},{"Add":" Some((PathBuf::new(), String::from(LOCAL_CONFIG))),"},{"Add":" CONFIG_OVERRIDES"},{"Add":" .iter()"},{"Add":" .map(|(key, value)| (key.to_string(), value.to_string()))"},{"Add":" .collect(),"},{"Add":" )?;"},{"Add":""},{"Add":" // Make sure the overrides apply to these fields"},{"Add":" check_config_fields(&override_config, Choice::Auto);"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"/// Different layers merge correctly"},{"Add":"#[test]"},{"Add":"fn merging() -> Result<(), anyhow::Error> {"},{"Add":" let layered_config = Config::load_with("},{"Add":" Some((PathBuf::new(), String::from(r#\"colors = \"never\"\"#))),"},{"Add":" Some((PathBuf::new(), String::from(r#\"pager = \"always\"\"#))),"},{"Add":" vec![("},{"Add":" String::from(\"reset_overwrites_changes\"),"},{"Add":" String::from(\"never\"),"},{"Add":" )],"},{"Add":" )?;"},{"Add":""},{"Add":" // Make sure the layers merge correctly"},{"Add":" assert_eq!(layered_config.colors, Choice::Never);"},{"Add":" assert_eq!(layered_config.pager, Choice::Always);"},{"Add":" assert_eq!(layered_config.reset_overwrites_changes, Choice::Never);"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"config.rs","metadata":0},"context":[{"change":0,"pos":17}],"contents":[{"Add":"use pijul_config::Config;"},{"Add":"use std::path::PathBuf;"},{"Add":""},{"Add":"#[test]"},{"Add":"fn load_simple() -> Result<(), anyhow::Error> {"},{"Add":" Config::load(None, Vec::new())?;"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn load_defaults() -> Result<(), anyhow::Error> {"},{"Add":" Config::load_with(None, None, Vec::new())?;"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn empty_global_config() -> Result<(), anyhow::Error> {"},{"Add":" let empty_config = Some((PathBuf::new(), String::new()));"},{"Add":" Config::load_with(empty_config, None, Vec::new())?;"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn empty_local_config() -> Result<(), anyhow::Error> {"},{"Add":" let empty_config = Some((PathBuf::new(), String::new()));"},{"Add":" Config::load_with(None, empty_config, Vec::new())?;"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"}]}},{"Edit":{"inode":{"change":3,"pos":89866},"path":"pijul-config/src/lib.rs","line":50,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":5257}],"down_context":[{"change":3,"pos":5257}],"flag":"BLOCK","start":4312,"end":4334,"inode":{"change":3,"pos":89866}}},"contents":[{"Add":" #[serde(default)]"}]}},{"Edit":{"inode":{"change":3,"pos":89866},"path":"pijul-config/src/lib.rs","line":74,"atom":{"NewVertex":{"up_context":[{"change":15,"pos":137}],"down_context":[{"change":3,"pos":6162}],"flag":"BLOCK","start":4335,"end":5747,"inode":{"change":3,"pos":89866}}},"contents":[{"Add":" let global_config = match Global::config_file() {"},{"Add":" Some(global_config_path) => match Global::read_contents(&global_config_path) {"},{"Add":" Ok(contents) => Some((global_config_path, contents)),"},{"Add":" Err(error) => {"},{"Add":" warn!(\"Unable to read global config file: {error:#?}\");"},{"Add":" None"},{"Add":" }"},{"Add":" },"},{"Add":" None => {"},{"Add":" warn!(\"Unable to find global configuration path\");"},{"Add":" None"},{"Add":" }"},{"Add":" };"},{"Add":""},{"Add":" let local_config = match repository_path {"},{"Add":" Some(repository_path) => match Local::read_contents(&repository_path) {"},{"Add":" Ok(contents) => Some((repository_path.to_path_buf(), contents)),"},{"Add":" Err(error) => {"},{"Add":" warn!(\"Unable to read global config file: {error:#?}\");"},{"Add":" None"},{"Add":" }"},{"Add":" },"},{"Add":" None => {"},{"Add":" info!("},{"Add":" \"Skipping local configuration path - repository path was not supplied by caller\""},{"Add":" );"},{"Add":" None"},{"Add":" }"},{"Add":" };"},{"Add":""},{"Add":" Self::load_with(global_config, local_config, config_overrides)"},{"Add":" }"},{"Add":""},{"Add":" pub fn load_with("},{"Add":" global_config_file: Option<(PathBuf, String)>,"},{"Add":" local_config_file: Option<(PathBuf, String)>,"},{"Add":" config_overrides: Vec<(String, String)>,"},{"Add":" ) -> Result {"}]}},{"Replacement":{"inode":{"change":3,"pos":89866},"path":"pijul-config/src/lib.rs","line":131,"ins":{"up_context":[{"change":3,"pos":667}],"down_context":[{"change":3,"pos":475}],"flag":"BLOCK","start":5748,"end":6109,"inode":{"change":3,"pos":89866}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":667},"to":{"change":3,"start":332,"end":811},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":86},"to":{"change":3,"start":332,"end":811},"introduced_by":3}],"inode":{"change":3,"pos":89866}},"ins_contents":[{"Add":" let global_config = match global_config_file {"},{"Add":" Some((path, contents)) => {"},{"Add":" // Parse the config (and make sure it's valid!)"},{"Add":" let global_config = Global::parse_contents(&path, &contents)?;"},{"Add":" // Add the configuration layer as a string"},{"Add":" layers = layers.merge(Toml::string(&contents));"}],"del_contents":[{"Del":" let global_config = match Global::config_file() {\n Some(global_config_path) => match Global::read_contents(&global_config_path) {\n Ok(contents) => {\n // Parse the config (and make sure it's valid!)\n let global_config = Global::parse_contents(&global_config_path, &contents)?;\n // Add the configuration layer as a string\n layers = layers.merge(Toml::string(&contents));\n"}]}},{"Replacement":{"inode":{"change":3,"pos":89866},"path":"pijul-config/src/lib.rs","line":138,"ins":{"up_context":[{"change":3,"pos":476}],"down_context":[{"change":3,"pos":647}],"flag":"BLOCK","start":6110,"end":6146,"inode":{"change":3,"pos":89866}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":476},"to":{"change":3,"start":812,"end":1125},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":1125},"to":{"change":3,"start":626,"end":647},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":626},"to":{"change":3,"start":626,"end":647},"introduced_by":3}],"inode":{"change":3,"pos":89866}},"ins_contents":[{"Add":" Some(global_config)"}],"del_contents":[{"Del":" Some(global_config)\n }\n Err(error) => {\n warn!(\"Unable to read global config file: {error:#?}\");\n None\n }\n },\n None => {\n warn!(\"Unable to find global configuration path\");\n"},{"Del":" None\n"}]}},{"Edit":{"inode":{"change":3,"pos":89866},"path":"pijul-config/src/lib.rs","line":140,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":661}],"down_context":[{"change":3,"pos":661}],"flag":"BLOCK","start":6147,"end":6173,"inode":{"change":3,"pos":89866}}},"contents":[{"Add":" None => None,"}]}},{"Replacement":{"inode":{"change":3,"pos":89866},"path":"pijul-config/src/lib.rs","line":144,"ins":{"up_context":[{"change":3,"pos":695}],"down_context":[{"change":3,"pos":1083}],"flag":"BLOCK","start":6174,"end":6532,"inode":{"change":3,"pos":89866}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":695},"to":{"change":2,"start":65,"end":525},"introduced_by":2}],"inode":{"change":3,"pos":89866}},"ins_contents":[{"Add":" let local_config = match local_config_file {"},{"Add":" Some((path, contents)) => {"},{"Add":" // Parse the config (and make sure it's valid!)"},{"Add":" let global_config = Local::parse_contents(&path, &contents)?;"},{"Add":" // Add the configuration layer as a string"},{"Add":" layers = layers.merge(Toml::string(&contents));"}],"del_contents":[{"Del":" let local_config = match repository_path {\n Some(repository_path) => match Local::read_contents(&repository_path) {\n Ok(contents) => {\n // Parse the config (and make sure it's valid!)\n let local_config = Local::parse_contents(&repository_path, &contents)?;\n // Add the configuration layer as a string\n layers = layers.merge(Toml::string(&contents));\n"}]}},{"Replacement":{"inode":{"change":3,"pos":89866},"path":"pijul-config/src/lib.rs","line":151,"ins":{"up_context":[{"change":3,"pos":1084}],"down_context":[{"change":3,"pos":1253}],"flag":"BLOCK","start":6533,"end":6569,"inode":{"change":3,"pos":89866}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1084},"to":{"change":2,"start":526,"end":914},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":914},"to":{"change":3,"start":1232,"end":1253},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1232},"to":{"change":3,"start":1232,"end":1253},"introduced_by":3}],"inode":{"change":3,"pos":89866}},"ins_contents":[{"Add":" Some(global_config)"}],"del_contents":[{"Del":" Some(local_config)\n }\n Err(error) => {\n warn!(\"Unable to read global config file: {error:#?}\");\n None\n }\n },\n None => {\n info!(\n \"Skipping local configuration path - repository path was not supplied by caller\"\n );\n"},{"Del":" None\n"}]}},{"Edit":{"inode":{"change":3,"pos":89866},"path":"pijul-config/src/lib.rs","line":153,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":1267}],"down_context":[{"change":3,"pos":1267}],"flag":"BLOCK","start":6570,"end":6596,"inode":{"change":3,"pos":89866}}},"contents":[{"Add":" None => None,"}]}},{"Replacement":{"inode":{"change":3,"pos":89866},"path":"pijul-config/src/lib.rs","line":225,"ins":{"up_context":[{"change":3,"pos":35}],"down_context":[{"change":3,"pos":8268}],"flag":"BLOCK","start":6597,"end":6675,"inode":{"change":3,"pos":89866}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":35},"to":{"change":3,"start":8205,"end":8268},"introduced_by":3}],"inode":{"change":3,"pos":89866}},"ins_contents":[{"Add":"#[derive(Debug, Clone, Copy, PartialEq, Eq, Default, Serialize, Deserialize)]"}],"del_contents":[{"Del":"#[derive(Debug, Clone, Copy, Default, Serialize, Deserialize)]\n"}]}}],"owner":"hardy7cc","repo":"pijul","token":"DGTnZkigZPY2g5CAvlikoieRTRZrCVTh559SEe7wIQs=","login":null}

…

Dependencies

Change contents