{"header":{"message":"Fixing a conflict","description":null,"timestamp":"2026-01-30T19:29:08.121332414Z","authors":[{}]},"hash":"7JTKP74VPC3DMOE3TFNGBQ5JPIHYOMELOR5FSSIZJPX22JL4MDJAC","authors":[{"login":"pmeunier","key":"FZQ2g7VfnzLYM4mtTVDk9HAZjA8Jk9ndkwN1icgbtWUr"}],"deps":{"hashes":[["7JTKP74VPC3DMOE3TFNGBQ5JPIHYOMELOR5FSSIZJPX22JL4MDJAC","Fixing a conflict"],["AA",null],["CRLBACYQMGJVAV5VV3PA6PDSV4R3K2EUE2DGV5QZXJVOKZCRE25AC","Fixing conflicts"],["AZM7VL5ZYNM2T2QOF2W24SALXGNYOVKNJJ4IQIFCMAWKG4V52IHAC","Support for sub-transactions"],["C55NBE2RT5SLH7FONHVYJACAPJ6D6DCN2AZMINFODPJ2MIDCM76AC","Version bump"],["MBIKZPCCFYLEX25CKRWTHTVIZX5WYTZYNIIQIZTVHOROJW7KIE4AC","Add flags to disable the use of the system keyring, asking to prompt the key password directly instead"],["HGJETVANHD25AZLOPYYEXCMLZHZWZ2NAKI33XQ7F43XM3UZVQNOQC","Create `pijul_config::global_config_directory()`"],["HJVWPKWVSL5ZXALZOT4BOQUWWNGH62OU6YLSZQQEIOB37QQGHK6AC","Migrate crates to edition 2024"],["YW6NICQV5LF4V2G77F2RG2ICODTQ2CKIEVBFIQEDATL5I5PFVRKQC","Migrate codebase to refactored `pijul_config` crate"],["67GIAQEUQG3KUD7YTYNUWK33BKWPFVNT4YPQMZ3RCALOZ2STDLRQC","Handle named remotes in pijul remote and remote delete"],["FDEVV5NGUMTEULP25EFYFZEVICWYLGV7XMED25PNKD36DL4NA46AC","Tag check"],["A3RM526Y7LUXNYW4TL56YKQ5GVOK2R5D7JJVTSQ6TT5MEXIR6YAAC","Integrating identity malleability"],["N26HD5PFUNVDSEXAQVOTMSMNPWFHQSZ5PHMGEF2ACC23OWFHTGQQC","Replace `chrono` with `jiff`"],["4KJ45IJLTIE35KQZUSFMFS67RNENG4P2FZMKMULJLGGYMKJUVRSQC","Implement new identity management"],["5Z2Y7VGVHJ7A6UPSEAPFVMIB5J7YHSI6WWHUUUYVLDJ56XSNCXKQC","Migrate `pijul::identity::Complete::prove` to `pijul::remote::prove`"],["44RUBHREQUNI4B36WSV7CUK5CVVIKG2AQOQJQZ7HU3BHY6W6AUEQC","Only re-prove identity when credentials change"],["EVDH2ECTA45JYYLA2UKTDSXCUJYMPT6R3IBKX7LIXW252BELCUAAC","Migrate from `pijul::identity` to `pijul_identity`"],["BV4PLHOVPSA5UKF43TL6EC57I7XHYWKZWV6LXI7YTGS2K3SQMY2AC","Remove dependency on `once_cell`"],["4OJWMSOWWNT5N4W4FDMKBZB5UARCLGV3SRZVKGR4EFAYFUMUHM7AC","Fully replace crate::Identity"],["QL6K2ZM35B3NIXEMMCJWUSFXOBQHAGXRDMO7ID5DCKTJH4QJVY7QC","Tags"],["WTPFQPO5C3OWNOEIZQSIMAR7O6URYJJNUJSWDZUTWFDDAMNFMTLQC","Add global `no_prompt` flag"],["KKNMDXAIU7P44JOSAM23T4RUMLBHWGHTQQS4NXS4FIX5IN6OTXPAC","Tweak identity subcommand"],["DWSAYGVEOR4D2EKIICEZUWCRGJTUXQQLOUWMYIFV7XN62K44F4FAC","Update codebase to use new identity management"],["YJXRCXOSO2J5BFFR6QKFDVV3RJ5J3QXB4UZ3DVQZLYTF5RJ4TNJAC","Disallow overwriting existing identities via `pijul id edit`"],["Q7LEDPIWGV5LJE3LYXLT74RBKOHEHLL4EJY6N4FDR3B6ZPX3V2UAC","Refactor tag command's handling of repo and channel"],["EEBKW7VTILH6AGGV57ZIJ3DJGYHDSYBWGU3C7Q4WWAKSVNUGIYMQC","Keys and identities"],["DOEG3V7UAVYBKLIPHSNWWONYDORKNJEZL2LD4EWGGUDB2SK6BOFQC","Only re-write identity data when changed"],["4RV7T4SRYIQLBW3EZFWBO5G65QAVG2GHPI4KMDDZERCX65KQWSPQC","Migrate from `pijul::config` to `pijul-config`"],["HKHMES6TWN5F7VTIC6GRV7ZBUCZ7KQUCSCKIA7PV2T5HKK4FD2FAC","Solving conflicts"],["5WERCJKLLWCWYBVGR7BP4XUPU4EAIN3U73GWVNPNDMEKYTKLBPAAC","Check if any identities exist before removal"],["32G3GOK752NTSULBH6KYGD3ZC2YC4B2X7O73G7BT3AJVMIUIFHXQC","Migrate from `dialoguer` to `pijul-interaction`"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["XYTAZR367K6JFO7BHY46SIWZQ4J2XU2J2PIQ467E3PG4MQ5Y5ZFAC","Solving conflicts"]],"deps":["CRLBACYQMGJVAV5VV3PA6PDSV4R3K2EUE2DGV5QZXJVOKZCRE25AC","AZM7VL5ZYNM2T2QOF2W24SALXGNYOVKNJJ4IQIFCMAWKG4V52IHAC","C55NBE2RT5SLH7FONHVYJACAPJ6D6DCN2AZMINFODPJ2MIDCM76AC","MBIKZPCCFYLEX25CKRWTHTVIZX5WYTZYNIIQIZTVHOROJW7KIE4AC","HGJETVANHD25AZLOPYYEXCMLZHZWZ2NAKI33XQ7F43XM3UZVQNOQC"],"known":["QL6K2ZM35B3NIXEMMCJWUSFXOBQHAGXRDMO7ID5DCKTJH4QJVY7QC","EEBKW7VTILH6AGGV57ZIJ3DJGYHDSYBWGU3C7Q4WWAKSVNUGIYMQC","A3RM526Y7LUXNYW4TL56YKQ5GVOK2R5D7JJVTSQ6TT5MEXIR6YAAC","FDEVV5NGUMTEULP25EFYFZEVICWYLGV7XMED25PNKD36DL4NA46AC","4KJ45IJLTIE35KQZUSFMFS67RNENG4P2FZMKMULJLGGYMKJUVRSQC","DWSAYGVEOR4D2EKIICEZUWCRGJTUXQQLOUWMYIFV7XN62K44F4FAC","4OJWMSOWWNT5N4W4FDMKBZB5UARCLGV3SRZVKGR4EFAYFUMUHM7AC","KKNMDXAIU7P44JOSAM23T4RUMLBHWGHTQQS4NXS4FIX5IN6OTXPAC","YJXRCXOSO2J5BFFR6QKFDVV3RJ5J3QXB4UZ3DVQZLYTF5RJ4TNJAC","DOEG3V7UAVYBKLIPHSNWWONYDORKNJEZL2LD4EWGGUDB2SK6BOFQC","5WERCJKLLWCWYBVGR7BP4XUPU4EAIN3U73GWVNPNDMEKYTKLBPAAC","44RUBHREQUNI4B36WSV7CUK5CVVIKG2AQOQJQZ7HU3BHY6W6AUEQC","BV4PLHOVPSA5UKF43TL6EC57I7XHYWKZWV6LXI7YTGS2K3SQMY2AC","4RV7T4SRYIQLBW3EZFWBO5G65QAVG2GHPI4KMDDZERCX65KQWSPQC","32G3GOK752NTSULBH6KYGD3ZC2YC4B2X7O73G7BT3AJVMIUIFHXQC","5Z2Y7VGVHJ7A6UPSEAPFVMIB5J7YHSI6WWHUUUYVLDJ56XSNCXKQC","WTPFQPO5C3OWNOEIZQSIMAR7O6URYJJNUJSWDZUTWFDDAMNFMTLQC","EVDH2ECTA45JYYLA2UKTDSXCUJYMPT6R3IBKX7LIXW252BELCUAAC","HKHMES6TWN5F7VTIC6GRV7ZBUCZ7KQUCSCKIA7PV2T5HKK4FD2FAC","HJVWPKWVSL5ZXALZOT4BOQUWWNGH62OU6YLSZQQEIOB37QQGHK6AC","N26HD5PFUNVDSEXAQVOTMSMNPWFHQSZ5PHMGEF2ACC23OWFHTGQQC","67GIAQEUQG3KUD7YTYNUWK33BKWPFVNT4YPQMZ3RCALOZ2STDLRQC","Q7LEDPIWGV5LJE3LYXLT74RBKOHEHLL4EJY6N4FDR3B6ZPX3V2UAC","YW6NICQV5LF4V2G77F2RG2ICODTQ2CKIEVBFIQEDATL5I5PFVRKQC"]},"hunks":[{"Replacement":{"inode":{"change":32,"pos":52474},"path":"pijul-remote/src/lib.rs","line":104,"ins":{"up_context":[{"change":7,"pos":1130}],"down_context":[{"change":7,"pos":1257}],"flag":"BLOCK","start":0,"end":172,"inode":{"change":32,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1130},"to":{"change":7,"start":1130,"end":1222},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1222},"to":{"change":5,"start":24,"end":72},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1222},"to":{"change":7,"start":1814,"end":1857},"introduced_by":7}],"inode":{"change":32,"pos":52474}},"ins_contents":[{"Add":" let (key, _password) ="},{"Add":" identity"},{"Add":" .credentials"},{"Add":" .clone()"},{"Add":" .unwrap()"},{"Add":" .decrypt(config, &identity.name, use_keyring)?;"}],"del_contents":[{"Del":" let (key, _password) = identity\n .credentials\n .clone()\n .unwrap()\n"},{"Del":" .decrypt(&identity.name, use_keyring)?;\n"},{"Del":" .decrypt(config, &identity.name)?;\n"}]}},{"Replacement":{"inode":{"change":7,"pos":56},"path":"pijul-identity/src/repair.rs","line":42,"ins":{"up_context":[{"change":7,"pos":3347}],"down_context":[{"change":6,"pos":0}],"flag":"BLOCK","start":173,"end":293,"inode":{"change":7,"pos":56}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":3347},"to":{"change":5,"start":73,"end":151},"introduced_by":5},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":3347},"to":{"change":5,"start":73,"end":151},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":3347},"to":{"change":7,"start":2724,"end":2814},"introduced_by":7}],"inode":{"change":7,"pos":56}},"ins_contents":[{"Add":"pub async fn fix_identities("},{"Add":" config: &pijul_config::Config,"},{"Add":" use_keyring: bool,"},{"Add":") -> Result<(), anyhow::Error> {"}],"del_contents":[{"Del":"pub async fn fix_identities(use_keyring: bool) -> Result<(), anyhow::Error> {\n"},{"Del":"pub async fn fix_identities(config: &pijul_config::Config) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":7,"pos":56},"path":"pijul-identity/src/repair.rs","line":57,"ins":{"up_context":[{"change":7,"pos":3880}],"down_context":[{"change":7,"pos":3945}],"flag":"BLOCK","start":294,"end":374,"inode":{"change":7,"pos":56}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":3880},"to":{"change":5,"start":152,"end":224},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":3880},"to":{"change":7,"start":2933,"end":3000},"introduced_by":7}],"inode":{"change":7,"pos":56}},"ins_contents":[{"Add":" let extraction_result = Complete::from_old_format(config, use_keyring);"}],"del_contents":[{"Del":" let extraction_result = Complete::from_old_format(use_keyring);\n"},{"Del":" let extraction_result = Complete::from_old_format(config);\n"}]}},{"Replacement":{"inode":{"change":7,"pos":56},"path":"pijul-identity/src/repair.rs","line":67,"ins":{"up_context":[{"change":7,"pos":4220}],"down_context":[{"change":7,"pos":4889}],"flag":"BLOCK","start":375,"end":517,"inode":{"change":7,"pos":56}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":4220},"to":{"change":5,"start":225,"end":296},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":4220},"to":{"change":7,"start":3001,"end":3067},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":69},"to":{"change":7,"start":4888,"end":4889},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":5,"pos":296},"to":{"change":7,"start":4888,"end":4889},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":7,"pos":458},"to":{"change":7,"start":4888,"end":4889},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":3067},"to":{"change":7,"start":4888,"end":4889},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":4888},"to":{"change":7,"start":4888,"end":4889},"introduced_by":7}],"inode":{"change":7,"pos":56}},"ins_contents":[{"Add":" old_identity"},{"Add":" .clone()"},{"Add":" .create(config, true, use_keyring)"},{"Add":" .await?;"}],"del_contents":[{"Del":" old_identity.clone().create(true, use_keyring).await?;\n"},{"Del":" old_identity.clone().create(config, true).await?;\n"},{"Del":"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":56},"path":"pijul-identity/src/repair.rs","line":95,"ins":{"up_context":[{"change":7,"pos":6256}],"down_context":[{"change":7,"pos":6333}],"flag":"BLOCK","start":518,"end":669,"inode":{"change":7,"pos":56}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":6256},"to":{"change":5,"start":297,"end":376},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":6256},"to":{"change":7,"start":3068,"end":3148},"introduced_by":7}],"inode":{"change":7,"pos":56}},"ins_contents":[{"Add":" Complete::default(config)?"},{"Add":" .create(config, true, use_keyring)"},{"Add":" .await?;"}],"del_contents":[{"Del":" Complete::default()?.create(true, use_keyring).await?;\n"},{"Del":" Complete::default(config)?.create(config, true).await?;\n"}]}},{"Replacement":{"inode":{"change":7,"pos":56},"path":"pijul-identity/src/repair.rs","line":109,"ins":{"up_context":[{"change":7,"pos":6618}],"down_context":[{"change":7,"pos":6650}],"flag":"BLOCK","start":670,"end":721,"inode":{"change":7,"pos":56}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":6618},"to":{"change":5,"start":377,"end":420},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":6618},"to":{"change":7,"start":3149,"end":3187},"introduced_by":7}],"inode":{"change":7,"pos":56}},"ins_contents":[{"Add":" identity.valid_keys(config, use_keyring)?;"}],"del_contents":[{"Del":" identity.valid_keys(use_keyring)?;\n"},{"Del":" identity.valid_keys(config)?;\n"}]}},{"Replacement":{"inode":{"change":7,"pos":56},"path":"pijul-identity/src/repair.rs","line":117,"ins":{"up_context":[{"change":7,"pos":6735}],"down_context":[{"change":7,"pos":520}],"flag":"BLOCK","start":722,"end":861,"inode":{"change":7,"pos":56}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":6735},"to":{"change":5,"start":421,"end":498},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":6735},"to":{"change":7,"start":3188,"end":3277},"introduced_by":7}],"inode":{"change":7,"pos":56}},"ins_contents":[{"Add":" fn valid_keys("},{"Add":" &self,"},{"Add":" config: &pijul_config::Config,"},{"Add":" use_keyring: bool,"},{"Add":" ) -> Result {"}],"del_contents":[{"Del":" fn valid_keys(&self, use_keyring: bool) -> Result {\n"},{"Del":" fn valid_keys(&self, config: &pijul_config::Config) -> Result {\n"}]}},{"Replacement":{"inode":{"change":7,"pos":56},"path":"pijul-identity/src/repair.rs","line":123,"ins":{"up_context":[{"change":7,"pos":563}],"down_context":[{"change":7,"pos":7160}],"flag":"BLOCK","start":862,"end":947,"inode":{"change":7,"pos":56}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":563},"to":{"change":5,"start":499,"end":576},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":563},"to":{"change":7,"start":3278,"end":3350},"introduced_by":7}],"inode":{"change":7,"pos":56}},"ins_contents":[{"Add":" let decryped_public_key = self.decrypt(config, use_keyring)?.0.public_key();"}],"del_contents":[{"Del":" let decryped_public_key = self.decrypt(use_keyring)?.0.public_key();\n"},{"Del":" let decryped_public_key = self.decrypt(config)?.0.public_key();\n"}]}},{"Replacement":{"inode":{"change":7,"pos":56},"path":"pijul-identity/src/repair.rs","line":186,"ins":{"up_context":[{"change":7,"pos":9995}],"down_context":[{"change":6,"pos":69}],"flag":"BLOCK","start":948,"end":1082,"inode":{"change":7,"pos":56}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":9995},"to":{"change":5,"start":577,"end":657},"introduced_by":5},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":9995},"to":{"change":5,"start":577,"end":657},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":9995},"to":{"change":7,"start":3437,"end":3529},"introduced_by":7}],"inode":{"change":7,"pos":56}},"ins_contents":[{"Add":" fn from_old_format("},{"Add":" config: &pijul_config::Config,"},{"Add":" use_keyring: bool,"},{"Add":" ) -> Result {"}],"del_contents":[{"Del":" fn from_old_format(use_keyring: bool) -> Result {\n"},{"Del":" fn from_old_format(config: &pijul_config::Config) -> Result {\n"}]}},{"Replacement":{"inode":{"change":7,"pos":56},"path":"pijul-identity/src/repair.rs","line":304,"ins":{"up_context":[{"change":7,"pos":15446}],"down_context":[{"change":7,"pos":15482}],"flag":"BLOCK","start":1083,"end":1138,"inode":{"change":7,"pos":56}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":15446},"to":{"change":5,"start":658,"end":705},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":15446},"to":{"change":7,"start":4139,"end":4181},"introduced_by":7}],"inode":{"change":7,"pos":56}},"ins_contents":[{"Add":" if identity.valid_keys(config, use_keyring)? {"}],"del_contents":[{"Del":" if identity.valid_keys(use_keyring)? {\n"},{"Del":" if identity.valid_keys(config)? {\n"}]}},{"Replacement":{"inode":{"change":7,"pos":22387},"path":"pijul-identity/src/load.rs","line":68,"ins":{"up_context":[{"change":7,"pos":24577}],"down_context":[{"change":7,"pos":24663}],"flag":"BLOCK","start":1139,"end":1269,"inode":{"change":7,"pos":22387}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":24577},"to":{"change":5,"start":706,"end":794},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":24577},"to":{"change":7,"start":4564,"end":4664},"introduced_by":7}],"inode":{"change":7,"pos":22387}},"ins_contents":[{"Add":"pub async fn choose_identity_name("},{"Add":" config: &pijul_config::Config,"},{"Add":" use_keyring: bool,"},{"Add":") -> Result {"}],"del_contents":[{"Del":"pub async fn choose_identity_name(use_keyring: bool) -> Result {\n"},{"Del":"pub async fn choose_identity_name(config: &pijul_config::Config) -> Result {\n"}]}},{"Replacement":{"inode":{"change":7,"pos":22387},"path":"pijul-identity/src/load.rs","line":78,"ins":{"up_context":[{"change":7,"pos":24848}],"down_context":[{"change":7,"pos":24890}],"flag":"BLOCK","start":1270,"end":1322,"inode":{"change":7,"pos":22387}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":24848},"to":{"change":5,"start":795,"end":839},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":24848},"to":{"change":7,"start":4665,"end":4704},"introduced_by":7}],"inode":{"change":7,"pos":22387}},"ins_contents":[{"Add":" fix_identities(config, use_keyring).await?;"}],"del_contents":[{"Del":" fix_identities(use_keyring).await?;\n"},{"Del":" fix_identities(config).await?;\n"}]}},{"Edit":{"inode":{"change":7,"pos":15627},"path":"pijul-identity/src/lib.rs","line":105,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":879}],"down_context":[{"change":5,"pos":879}],"flag":"BLOCK","start":1323,"end":1362,"inode":{"change":7,"pos":15627}}},"contents":[{"Add":" config: &pijul_config::Config,"}]}},{"Edit":{"inode":{"change":7,"pos":15627},"path":"pijul-identity/src/lib.rs","line":109,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":3255},"to":{"change":7,"start":5059,"end":5214},"introduced_by":7}],"inode":{"change":7,"pos":15627}}},"contents":[{"Del":" pub fn decrypt(\n &mut self,\n config: &pijul_config::Config,\n name: &str,\n ) -> Result<(SKey, Option), anyhow::Error> {\n"}]}},{"SolveOrderConflict":{"inode":{"change":7,"pos":15627},"path":"pijul-identity/src/lib.rs","line":109,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":983}],"down_context":[{"change":7,"pos":3348}],"flag":"","start":1363,"end":1363,"inode":{"change":7,"pos":15627}}},"contents":[]}},{"Edit":{"inode":{"change":7,"pos":15627},"path":"pijul-identity/src/lib.rs","line":251,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":6972},"to":{"change":5,"start":1223,"end":1433},"introduced_by":5}],"inode":{"change":7,"pos":15627}}},"contents":[{"Del":" pub fn decrypt(&self, use_keyring: bool) -> Result<(SKey, Option), anyhow::Error> {\n self.credentials\n .clone()\n .unwrap()\n .decrypt(&self.name, use_keyring)\n"}]}},{"Edit":{"inode":{"change":7,"pos":15627},"path":"pijul-identity/src/lib.rs","line":254,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":6110}],"down_context":[{"change":7,"pos":6110}],"flag":"BLOCK","start":1364,"end":1392,"inode":{"change":7,"pos":15627}}},"contents":[{"Add":""},{"Add":" use_keyring: bool,"}]}},{"Replacement":{"inode":{"change":7,"pos":15627},"path":"pijul-identity/src/lib.rs","line":260,"ins":{"up_context":[{"change":7,"pos":6235}],"down_context":[{"change":7,"pos":7111}],"flag":"BLOCK","start":1393,"end":1447,"inode":{"change":7,"pos":15627}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":6235},"to":{"change":7,"start":6235,"end":6276},"introduced_by":7}],"inode":{"change":7,"pos":15627}},"ins_contents":[{"Add":" .decrypt(config, &self.name, use_keyring)"}],"del_contents":[{"Del":" .decrypt(config, &self.name)\n"}]}},{"Replacement":{"inode":{"change":7,"pos":15627},"path":"pijul-identity/src/lib.rs","line":263,"ins":{"up_context":[{"change":7,"pos":7118}],"down_context":[{"change":7,"pos":7232}],"flag":"BLOCK","start":1448,"end":1662,"inode":{"change":7,"pos":15627}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":7118},"to":{"change":5,"start":1434,"end":1578},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":7118},"to":{"change":7,"start":6277,"end":6428},"introduced_by":7}],"inode":{"change":7,"pos":15627}},"ins_contents":[{"Add":" fn change_password("},{"Add":" &mut self,"},{"Add":" config: &pijul_config::Config,"},{"Add":" use_keyring: bool,"},{"Add":" ) -> Result<(), anyhow::Error> {"},{"Add":" let (decryped_key, _) = self.decrypt(config, use_keyring)?;"}],"del_contents":[{"Del":" fn change_password(&mut self, use_keyring: bool) -> Result<(), anyhow::Error> {\n let (decryped_key, _) = self.decrypt(use_keyring)?;\n"},{"Del":" fn change_password(&mut self, config: &pijul_config::Config) -> Result<(), anyhow::Error> {\n let (decryped_key, _) = self.decrypt(config)?;\n"}]}},{"Replacement":{"inode":{"change":7,"pos":28175},"path":"pijul-identity/src/create.rs","line":98,"ins":{"up_context":[{"change":7,"pos":10379}],"down_context":[{"change":7,"pos":10424}],"flag":"BLOCK","start":1663,"end":1727,"inode":{"change":7,"pos":28175}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":10379},"to":{"change":5,"start":1607,"end":1663},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":10379},"to":{"change":7,"start":6825,"end":6876},"introduced_by":7}],"inode":{"change":7,"pos":28175}},"ins_contents":[{"Add":" new_identity.change_password(config, use_keyring)?;"}],"del_contents":[{"Del":" new_identity.change_password(use_keyring)?;\n"},{"Del":" new_identity.change_password(config)?;\n"}]}},{"Edit":{"inode":{"change":7,"pos":28175},"path":"pijul-identity/src/create.rs","line":272,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":38529},"to":{"change":5,"start":1664,"end":1764},"introduced_by":5}],"inode":{"change":7,"pos":28175}}},"contents":[{"Del":" pub async fn create(&self, link_remote: bool, use_keyring: bool) -> Result<(), anyhow::Error> {\n"}]}},{"Edit":{"inode":{"change":7,"pos":28175},"path":"pijul-identity/src/create.rs","line":276,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":7866}],"down_context":[{"change":7,"pos":7866}],"flag":"BLOCK","start":1728,"end":1755,"inode":{"change":7,"pos":28175}}},"contents":[{"Add":" use_keyring: bool,"}]}},{"Replacement":{"inode":{"change":7,"pos":28175},"path":"pijul-identity/src/create.rs","line":279,"ins":{"up_context":[{"change":7,"pos":14076}],"down_context":[{"change":7,"pos":1007}],"flag":"BLOCK","start":1756,"end":1883,"inode":{"change":7,"pos":28175}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":14076},"to":{"change":5,"start":1765,"end":1858},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":14076},"to":{"change":7,"start":7904,"end":7992},"introduced_by":7}],"inode":{"change":7,"pos":28175}},"ins_contents":[{"Add":" let confirmed_identity = self"},{"Add":" .prompt_changes(config, None, link_remote, use_keyring)"},{"Add":" .await?;"}],"del_contents":[{"Del":" let confirmed_identity = self.prompt_changes(None, link_remote, use_keyring).await?;\n"},{"Del":" let confirmed_identity = self.prompt_changes(config, None, link_remote).await?;\n"}]}},{"Replacement":{"inode":{"change":7,"pos":74},"path":"pijul/src/commands/tag.rs","line":119,"ins":{"up_context":[{"change":7,"pos":2976}],"down_context":[{"change":7,"pos":1031}],"flag":"BLOCK","start":1884,"end":2008,"inode":{"change":7,"pos":74}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2976},"to":{"change":5,"start":1952,"end":2048},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2976},"to":{"change":7,"start":9665,"end":9756},"introduced_by":7}],"inode":{"change":7,"pos":74}},"ins_contents":[{"Add":" let header ="},{"Add":" header(config, author.as_deref(), message, timestamp, !no_keyring).await?;"}],"del_contents":[{"Del":" let header = header(author.as_deref(), message, timestamp, !no_keyring).await?;\n"},{"Del":" let header = header(config, author.as_deref(), message, timestamp).await?;\n"}]}},{"Replacement":{"inode":{"change":7,"pos":74},"path":"pijul/src/commands/tag.rs","line":255,"ins":{"up_context":[{"change":7,"pos":13668}],"down_context":[{"change":7,"pos":9832}],"flag":"BLOCK","start":2009,"end":2144,"inode":{"change":7,"pos":74}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":788},"to":{"change":5,"start":2073,"end":2189},"introduced_by":5}],"inode":{"change":7,"pos":74}},"ins_contents":[{"Add":" let k = pijul_identity::public_key("},{"Add":" &pijul_identity::choose_identity_name(config, use_keyring).await?,"},{"Add":" )?;"}],"del_contents":[{"Del":" let k =\n pijul_identity::public_key(&pijul_identity::choose_identity_name(use_keyring).await?)?;\n"}]}},{"Replacement":{"inode":{"change":7,"pos":74},"path":"pijul/src/commands/tag.rs","line":259,"ins":{"up_context":[{"change":7,"pos":9845}],"down_context":[{"change":7,"pos":9926}],"flag":"BLOCK","start":2145,"end":2239,"inode":{"change":7,"pos":74}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":9845},"to":{"change":7,"start":9845,"end":9926},"introduced_by":7}],"inode":{"change":7,"pos":74}},"ins_contents":[{"Add":" let identity_name = pijul_identity::choose_identity_name(config, use_keyring).await?;"}],"del_contents":[{"Del":" let identity_name = pijul_identity::choose_identity_name(config).await?;\n"}]}},{"Replacement":{"inode":{"change":32,"pos":101759},"path":"pijul/src/commands/record.rs","line":148,"ins":{"up_context":[{"change":5,"pos":2365}],"down_context":[{"change":5,"pos":2441}],"flag":"BLOCK","start":2240,"end":2324,"inode":{"change":32,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":2365},"to":{"change":5,"start":2365,"end":2441},"introduced_by":5}],"inode":{"change":32,"pos":101759}},"ins_contents":[{"Add":" &pijul_identity::choose_identity_name(config, !self.no_keyring).await?,"}],"del_contents":[{"Del":" &pijul_identity::choose_identity_name(!self.no_keyring).await?,\n"}]}},{"Edit":{"inode":{"change":32,"pos":101759},"path":"pijul/src/commands/record.rs","line":150,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":75},"to":{"change":7,"start":10497,"end":10596},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":75},"to":{"change":7,"start":10497,"end":10596},"introduced_by":5}],"inode":{"change":32,"pos":101759}}},"contents":[{"Del":" pijul_identity::Complete::load(&pijul_identity::choose_identity_name(config).await?)?;\n"}]}},{"SolveOrderConflict":{"inode":{"change":32,"pos":101759},"path":"pijul/src/commands/record.rs","line":150,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":2453}],"down_context":[{"change":7,"pos":168}],"flag":"","start":2325,"end":2325,"inode":{"change":32,"pos":101759}}},"contents":[]}},{"Replacement":{"inode":{"change":32,"pos":101759},"path":"pijul/src/commands/record.rs","line":151,"ins":{"up_context":[{"change":7,"pos":169}],"down_context":[{"change":7,"pos":1910}],"flag":"BLOCK","start":2326,"end":2397,"inode":{"change":32,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":169},"to":{"change":5,"start":2454,"end":2517},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":169},"to":{"change":7,"start":10597,"end":10650},"introduced_by":7}],"inode":{"change":32,"pos":101759}},"ins_contents":[{"Add":" let (secret, _) = complete.decrypt(config, !self.no_keyring)?;"}],"del_contents":[{"Del":" let (secret, _) = complete.decrypt(!self.no_keyring)?;\n"},{"Del":" let (secret, _) = complete.decrypt(config)?;\n"}]}},{"Replacement":{"inode":{"change":32,"pos":101759},"path":"pijul/src/commands/record.rs","line":222,"ins":{"up_context":[{"change":7,"pos":387}],"down_context":[{"change":7,"pos":462}],"flag":"BLOCK","start":2398,"end":2497,"inode":{"change":32,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":387},"to":{"change":5,"start":2518,"end":2609},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":387},"to":{"change":7,"start":10751,"end":10832},"introduced_by":7}],"inode":{"change":32,"pos":101759}},"ins_contents":[{"Add":" .unwrap_or(pijul_identity::choose_identity_name(config, !self.no_keyring).await?);"}],"del_contents":[{"Del":" .unwrap_or(pijul_identity::choose_identity_name(!self.no_keyring).await?);\n"},{"Del":" .unwrap_or(pijul_identity::choose_identity_name(config).await?);\n"}]}},{"Edit":{"inode":{"change":32,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":312,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":8269}],"down_context":[{"change":3,"pos":1464}],"flag":"BLOCK","start":2498,"end":2565,"inode":{"change":32,"pos":111631}}},"contents":[{"Add":" local_config: &mut pijul_config::local::Local,"}]}},{"Edit":{"inode":{"change":32,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":314,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":8269},"to":{"change":7,"start":11798,"end":11865},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":8269},"to":{"change":7,"start":11798,"end":11865},"introduced_by":3}],"inode":{"change":32,"pos":111631}}},"contents":[{"Del":" local_config: &mut pijul_config::local::Local,\n"}]}},{"SolveOrderConflict":{"inode":{"change":32,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":314,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":1505}],"down_context":[{"change":7,"pos":8354}],"flag":"","start":2566,"end":2566,"inode":{"change":32,"pos":111631}}},"contents":[]}},{"Replacement":{"inode":{"change":7,"pos":40825},"path":"pijul/src/commands/identity.rs","line":275,"ins":{"up_context":[{"change":5,"pos":3099}],"down_context":[{"change":5,"pos":3166}],"flag":"BLOCK","start":2567,"end":2642,"inode":{"change":7,"pos":40825}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":3099},"to":{"change":5,"start":3099,"end":3166},"introduced_by":5}],"inode":{"change":7,"pos":40825}},"ins_contents":[{"Add":" .create(config, !options.no_link, !options.no_keyring)"}],"del_contents":[{"Del":" .create(!options.no_link, !options.no_keyring)\n"}]}},{"Edit":{"inode":{"change":7,"pos":40825},"path":"pijul/src/commands/identity.rs","line":277,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":49307},"to":{"change":7,"start":13749,"end":13815},"introduced_by":7}],"inode":{"change":7,"pos":40825}}},"contents":[{"Del":" identity.create(config, !options.no_link).await?;\n"}]}},{"SolveOrderConflict":{"inode":{"change":7,"pos":40825},"path":"pijul/src/commands/identity.rs","line":277,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":3195}],"down_context":[{"change":7,"pos":1971}],"flag":"","start":2643,"end":2643,"inode":{"change":7,"pos":40825}}},"contents":[]}},{"Replacement":{"inode":{"change":7,"pos":40825},"path":"pijul/src/commands/identity.rs","line":278,"ins":{"up_context":[{"change":7,"pos":1972}],"down_context":[{"change":5,"pos":3326}],"flag":"BLOCK","start":2644,"end":2898,"inode":{"change":7,"pos":40825}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1972},"to":{"change":5,"start":3196,"end":3326},"introduced_by":5}],"inode":{"change":7,"pos":40825}},"ins_contents":[{"Add":" if let Err(_) = remote::prove("},{"Add":" config,"},{"Add":" &identity,"},{"Add":" None,"},{"Add":" self.no_cert_check,"},{"Add":" !options.no_keyring,"},{"Add":" )"},{"Add":" .await"}],"del_contents":[{"Del":" if let Err(_) =\n remote::prove(&identity, None, self.no_cert_check, !options.no_keyring).await\n"}]}},{"Edit":{"inode":{"change":7,"pos":40825},"path":"pijul/src/commands/identity.rs","line":287,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1972},"to":{"change":7,"start":13816,"end":13915},"introduced_by":7}],"inode":{"change":7,"pos":40825}}},"contents":[{"Del":" if let Err(_) = remote::prove(config, &identity, None, self.no_cert_check).await {\n"}]}},{"SolveOrderConflict":{"inode":{"change":7,"pos":40825},"path":"pijul/src/commands/identity.rs","line":287,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":3344}],"down_context":[{"change":7,"pos":4055}],"flag":"","start":2899,"end":2899,"inode":{"change":7,"pos":40825}}},"contents":[]}},{"Replacement":{"inode":{"change":7,"pos":40825},"path":"pijul/src/commands/identity.rs","line":295,"ins":{"up_context":[{"change":7,"pos":49398}],"down_context":[{"change":7,"pos":49480}],"flag":"BLOCK","start":2900,"end":2993,"inode":{"change":7,"pos":40825}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":49398},"to":{"change":5,"start":3345,"end":3430},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":49398},"to":{"change":7,"start":13916,"end":13981},"introduced_by":7}],"inode":{"change":7,"pos":40825}},"ins_contents":[{"Add":" SubCommand::Repair { no_keyring } => fix_identities(config, !no_keyring).await?,"}],"del_contents":[{"Del":" SubCommand::Repair { no_keyring } => fix_identities(!no_keyring).await?,\n"},{"Del":" SubCommand::Repair => fix_identities(config).await?,\n"}]}},{"Edit":{"inode":{"change":7,"pos":40825},"path":"pijul/src/commands/identity.rs","line":302,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":3496},"to":{"change":5,"start":3496,"end":3584},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":49589},"to":{"change":7,"start":13982,"end":14081},"introduced_by":7}],"inode":{"change":7,"pos":40825}}},"contents":[{"Del":" &identity_name.unwrap_or(choose_identity_name(!no_keyring).await?);\n"},{"Del":" let identity_name = &identity_name.unwrap_or(choose_identity_name(config).await?);\n"}]}},{"SolveOrderConflict":{"inode":{"change":7,"pos":40825},"path":"pijul/src/commands/identity.rs","line":302,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":3496}],"down_context":[],"flag":"","start":2994,"end":2994,"inode":{"change":7,"pos":40825}}},"contents":[]}},{"Edit":{"inode":{"change":7,"pos":40825},"path":"pijul/src/commands/identity.rs","line":302,"atom":{"NewVertex":{"up_context":[{"change":0,"pos":2994}],"down_context":[{"change":7,"pos":2656}],"flag":"BLOCK","start":2995,"end":3091,"inode":{"change":7,"pos":40825}}},"contents":[{"Add":" &identity_name.unwrap_or(choose_identity_name(config, !no_keyring).await?);"}]}},{"Edit":{"inode":{"change":7,"pos":40825},"path":"pijul/src/commands/identity.rs","line":305,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":3616}],"down_context":[{"change":5,"pos":3616}],"flag":"BLOCK","start":3092,"end":3120,"inode":{"change":7,"pos":40825}}},"contents":[{"Add":" config,"}]}},{"Edit":{"inode":{"change":7,"pos":40825},"path":"pijul/src/commands/identity.rs","line":312,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2726},"to":{"change":7,"start":14082,"end":14301},"introduced_by":7}],"inode":{"change":7,"pos":40825}}},"contents":[{"Del":" remote::prove(\n config,\n &loaded_identity,\n server.as_deref(),\n self.no_cert_check,\n )\n .await?;\n"}]}},{"SolveOrderConflict":{"inode":{"change":7,"pos":40825},"path":"pijul/src/commands/identity.rs","line":312,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":3809}],"down_context":[{"change":7,"pos":49763}],"flag":"","start":3121,"end":3121,"inode":{"change":7,"pos":40825}}},"contents":[]}},{"Replacement":{"inode":{"change":7,"pos":40825},"path":"pijul/src/commands/identity.rs","line":426,"ins":{"up_context":[{"change":7,"pos":54509}],"down_context":[{"change":7,"pos":54576}],"flag":"BLOCK","start":3122,"end":3199,"inode":{"change":7,"pos":40825}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":54509},"to":{"change":5,"start":3810,"end":3879},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":54509},"to":{"change":7,"start":14302,"end":14358},"introduced_by":7}],"inode":{"change":7,"pos":40825}},"ins_contents":[{"Add":" choose_identity_name(config, !options.no_keyring).await?"}],"del_contents":[{"Del":" choose_identity_name(!options.no_keyring).await?\n"},{"Del":" choose_identity_name(config).await?\n"}]}},{"Edit":{"inode":{"change":7,"pos":40825},"path":"pijul/src/commands/identity.rs","line":448,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":3921}],"down_context":[{"change":5,"pos":3921}],"flag":"BLOCK","start":3200,"end":3236,"inode":{"change":7,"pos":40825}}},"contents":[{"Add":" config,"}]}},{"Edit":{"inode":{"change":7,"pos":40825},"path":"pijul/src/commands/identity.rs","line":453,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1054},"to":{"change":7,"start":14388,"end":14487},"introduced_by":7}],"inode":{"change":7,"pos":40825}}},"contents":[{"Del":" .prompt_changes(config, Some(old_identity.name.clone()), !options.no_link)\n"}]}},{"SolveOrderConflict":{"inode":{"change":7,"pos":40825},"path":"pijul/src/commands/identity.rs","line":453,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":4103}],"down_context":[{"change":7,"pos":1138}],"flag":"","start":3237,"end":3237,"inode":{"change":7,"pos":40825}}},"contents":[]}},{"Edit":{"inode":{"change":7,"pos":40825},"path":"pijul/src/commands/identity.rs","line":466,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":4162}],"down_context":[{"change":5,"pos":4162}],"flag":"BLOCK","start":3238,"end":3274,"inode":{"change":7,"pos":40825}}},"contents":[{"Add":" config,"}]}},{"Edit":{"inode":{"change":7,"pos":40825},"path":"pijul/src/commands/identity.rs","line":473,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":3303},"to":{"change":7,"start":14488,"end":14586},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":3303},"to":{"change":7,"start":14488,"end":14586},"introduced_by":5}],"inode":{"change":7,"pos":40825}}},"contents":[{"Del":" remote::prove(config, &new_identity, None, self.no_cert_check).await;\n"}]}},{"SolveOrderConflict":{"inode":{"change":7,"pos":40825},"path":"pijul/src/commands/identity.rs","line":473,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":4394}],"down_context":[{"change":7,"pos":3393}],"flag":"","start":3275,"end":3275,"inode":{"change":7,"pos":40825}}},"contents":[]}},{"ResurrectZombie":{"inode":{"change":7,"pos":40825},"path":"pijul/src/commands/identity.rs","line":498,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":176},"to":{"change":5,"start":4424,"end":4471},"introduced_by":5},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":176},"to":{"change":5,"start":4424,"end":4471},"introduced_by":7}],"inode":{"change":7,"pos":40825}}},"contents":[{"Add":" let identity = Complete::load(\n"}]}},{"Replacement":{"inode":{"change":7,"pos":40825},"path":"pijul/src/commands/identity.rs","line":499,"ins":{"up_context":[{"change":5,"pos":4471}],"down_context":[{"change":5,"pos":4559}],"flag":"BLOCK","start":3276,"end":3372,"inode":{"change":7,"pos":40825}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":4471},"to":{"change":5,"start":4471,"end":4559},"introduced_by":5},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":5,"pos":4471},"to":{"change":5,"start":4471,"end":4559},"introduced_by":7}],"inode":{"change":7,"pos":40825}},"ins_contents":[{"Add":" &identity_name.unwrap_or(choose_identity_name(config, !no_keyring).await?),"}],"del_contents":[{"Del":" &identity_name.unwrap_or(choose_identity_name(!no_keyring).await?),\n"}]}},{"Edit":{"inode":{"change":7,"pos":40825},"path":"pijul/src/commands/identity.rs","line":501,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1375},"to":{"change":7,"start":14587,"end":14687},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":1375},"to":{"change":7,"start":14587,"end":14687},"introduced_by":5}],"inode":{"change":7,"pos":40825}}},"contents":[{"Del":" Complete::load(&identity_name.unwrap_or(choose_identity_name(config).await?))?;\n"}]}},{"ResurrectZombie":{"inode":{"change":7,"pos":40825},"path":"pijul/src/commands/identity.rs","line":501,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":14687},"to":{"change":6,"start":1954,"end":2021},"introduced_by":6},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":14687},"to":{"change":6,"start":1954,"end":2021},"introduced_by":5},{"previous":"","flag":"","from":{"change":6,"pos":2021},"to":{"change":7,"start":14736,"end":14766},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":14736},"to":{"change":7,"start":14736,"end":14766},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":14736},"to":{"change":7,"start":14736,"end":14766},"introduced_by":5}],"inode":{"change":7,"pos":40825}}},"contents":[{"Add":" let path = pijul_config::global_config_directory()\n"},{"Add":" .unwrap()\n"}]}},{"SolveOrderConflict":{"inode":{"change":7,"pos":40825},"path":"pijul/src/commands/identity.rs","line":501,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":4579}],"down_context":[{"change":6,"pos":1954}],"flag":"","start":3373,"end":3373,"inode":{"change":7,"pos":40825}}},"contents":[]}},{"Edit":{"inode":{"change":32,"pos":1030385},"path":"Cargo.lock","line":115,"atom":{"NewVertex":{"up_context":[{"change":33,"pos":3302}],"down_context":[{"change":33,"pos":3302}],"flag":"BLOCK","start":3374,"end":3596,"inode":{"change":32,"pos":1030385}}},"contents":[{"Add":""},{"Add":"[[package]]"},{"Add":"name = \"atomic\""},{"Add":"version = \"0.6.1\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"a89cbf775b137e9b968e67227ef7f775587cde3fd31b0d8599dbd0f598a48340\""},{"Add":"dependencies = ["},{"Add":" \"bytemuck\","},{"Add":"]"}]}},{"Edit":{"inode":{"change":32,"pos":1030385},"path":"Cargo.lock","line":286,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":196}],"down_context":[{"change":33,"pos":7536}],"flag":"BLOCK","start":3597,"end":3790,"inode":{"change":32,"pos":1030385}}},"contents":[{"Add":""},{"Add":"[[package]]"},{"Add":"name = \"bytemuck\""},{"Add":"version = \"1.24.0\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4\""}]}},{"Edit":{"inode":{"change":32,"pos":1030385},"path":"Cargo.lock","line":900,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":1200}],"down_context":[{"change":33,"pos":21860}],"flag":"BLOCK","start":3791,"end":4070,"inode":{"change":32,"pos":1030385}}},"contents":[{"Add":""},{"Add":"[[package]]"},{"Add":"name = \"figment\""},{"Add":"version = \"0.10.19\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"8cb01cd46b0cf372153850f4c6c272d9cbea2da513e07538405148f95bd789f3\""},{"Add":"dependencies = ["},{"Add":" \"atomic\","},{"Add":" \"serde\","},{"Add":" \"toml 0.8.23\","},{"Add":" \"uncased\","},{"Add":" \"version_check\","},{"Add":"]"}]}},{"Edit":{"inode":{"change":32,"pos":1030385},"path":"Cargo.lock","line":2251,"atom":{"NewVertex":{"up_context":[{"change":33,"pos":57752}],"down_context":[{"change":33,"pos":57752}],"flag":"BLOCK","start":4071,"end":4083,"inode":{"change":32,"pos":1030385}}},"contents":[{"Add":" \"figment\","}]}},{"Edit":{"inode":{"change":32,"pos":1030385},"path":"Cargo.lock","line":2292,"atom":{"NewVertex":{"up_context":[{"change":33,"pos":58287}],"down_context":[{"change":33,"pos":58287}],"flag":"BLOCK","start":4084,"end":4109,"inode":{"change":32,"pos":1030385}}},"contents":[{"Add":" \"figment\","},{"Add":" \"libpijul\","}]}},{"Edit":{"inode":{"change":32,"pos":1030385},"path":"Cargo.lock","line":3506,"atom":{"NewVertex":{"up_context":[{"change":33,"pos":85478}],"down_context":[{"change":33,"pos":85478}],"flag":"BLOCK","start":4110,"end":4339,"inode":{"change":32,"pos":1030385}}},"contents":[{"Add":""},{"Add":"[[package]]"},{"Add":"name = \"uncased\""},{"Add":"version = \"0.9.10\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"e1b88fcfe09e89d3866a5c11019378088af2d24c3fbd4f0543f96b479ec90697\""},{"Add":"dependencies = ["},{"Add":" \"version_check\","},{"Add":"]"}]}}],"owner":"pijul","repo":"pijul","token":"WKE2blqSyrga6C2HUfkoa6AtTw2ZcIkZEvzz6UMiJjo=","login":null}

…

Dependencies

Change contents