{"header":{"message":"merge with changes from sanakirja v1.1.2","description":null,"timestamp":"2021-02-26T09:42:52.620376647Z","authors":[{"email":"rohan.hart17@gmail.com","full_name":"Rohan Hart","name":"rohan"}]},"hash":"Q3GU26WDEYE2HXMM4WWNEGVMSXLQAKRJBSB2EJZA6JTHPKQHXCXQC","authors":[],"deps":{"hashes":[["Q3GU26WDEYE2HXMM4WWNEGVMSXLQAKRJBSB2EJZA6JTHPKQHXCXQC","merge with changes from sanakirja v1.1.2"],["AA",null],["IYJZVLETBAQDDELENH3FX7ZTOC3HY4UJ3AMC3MACW6O7ZCWZTR6AC","Cleaning up the literate programming bits"],["CCFJ7VO3I73FE3MZRS5RSDRYNZVW7AXC345P4BXS7JIL2TU3LQJQC","Renaming \"Record\" to \"Hunk\" in the changes"],["YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","Sanakirja 1.0"],["UM5DLRPBCQZQBEDJDLDPKODOKLACUHZD6YL6S4JRNKW6JLPNUVSAC","store new non-UTF-8 files raw and decode to deplay the contents"],["WZVCLZKY34KQBQU6YBGJLQCDADBQ67LQVDNRVCMQVY3O3C3EIWSQC","address clippy lints"],["NYOF5766GLBTWQV2KTVRAJMGVJNJ37Z5BLJMFPZA3HG7X2Q2RXPAC","track file encoding in the record, including change text for file adds"],["W4NSLQNGQVQBB4BEXLFW5OTCBD5XQ4E2BGH3WIFGKSJBCODSUIGQC","make text_encoding available to all of libpijul"],["LYTVEPH3W5UHF7MAYFWBT6NVNC42HEVKJGGMFDKUDZDNDOI33YJQC","Avoid cloning into an existing path"],["6YMDOZIB5LVYLFIDGN2WNT5JTHEAMS4TFPVDEZ3OWXWOKJOC5QDAC","Refactoring apply"],["ZRUPLBBTT4S6S7A3LOAHG4ONYEGPA5CFO4L2XBCNFKK45MWX3BDAC","Colours in diff and change: separating concerns and dependencies"],["3M7WBE24JTPTHWQOU5PO2ZJYKPKEH2F6R4M6RWIRFG334PQEA55QC","Re-adding anyhow in the tests of libpijul"],["GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC","Refactoring iterators"],["VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","Removing anyhow in libpijul"],["EQLDTLXVCARE36EJE3S6SNEVTW2JJY4EYD36EX7WSIFLG2XMKKQAC","Fixing a bug with empty new files, and another one with empty replacements"],["3AMEP2Y5J6GA4AWQONF4JVA3XSR3ASLHHKMYG44R72SOUY3UQCDAC","More convenient interface for channels"],["VMOYG7MKEWTUEEY2EOL256RWCVPGRD63IFOSKXHBGJ6VSRITLMOAC","text file decoding for new files"],["JACZWIJ6UEL5HWZRNOOXTFXUEG67XJDPC5D72LYUPCVVJ6WB7JQAC","Version bump"],["WIORLB47KYY5ZDKSAQEQ5NV2J3F3RIO5FVGD6LGF73FD5LWJLUAAC","Version bump"],["NO2QPRFLGCYUDXYJTOY3S3NZJCCLAFOQUHITKDZ7LSZLRLOV5W3QC","Adding rollback test"],["TPEH2XNBS5RO4IEVKENVF6P65AH7IX64KK2JAYMSJT3J5GXO67EAC","1.0.0-alpha.28, with Tokio 1.0"],["JRENVH5DF2F4SOV7UNJENFA7VDI3H63XK76R3LFZK6QCW7JIBLSQC","Reqwest 0.11"],["NA5I4WYNE2O3LPSHXGWXW7XL4YNYFDREEGDOP6LJ5HJXTQDXM7BAC","Fixing the inverse of conflict resolutions"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["6HNRL5RT76NH5YNSUN7B4FHNRZXKNLX4DROFGMO4R5P2U7JWOL2QC","detect non-utf8 text files"],["BZSC7VMYSFRXDHDDAMCDR6X67FN5VWIBOSE76BQLX7OCVOJFUA3AC","address clippy lints"],["246V5TYIUL7CFN7G5Y7A35EEM6IJPN532ROEYVSM7Q4HCQSWPDBQC","decode existing files"],["SAGSYAPXQ2T6GC3B3TNRPNFTZMS7UMME6YQGSF5MOIM66S5NKB2QC","Various version bumps"],["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","Upgrading to Sanakirja 0.15 + version bump"],["ZHABNS3S6FSINO74FOI5KHYXYDTBPO4FQTTYTUS7NNKEVVNLYC4AC","Canonicalize all paths"]],"deps":["IYJZVLETBAQDDELENH3FX7ZTOC3HY4UJ3AMC3MACW6O7ZCWZTR6AC","CCFJ7VO3I73FE3MZRS5RSDRYNZVW7AXC345P4BXS7JIL2TU3LQJQC","YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","UM5DLRPBCQZQBEDJDLDPKODOKLACUHZD6YL6S4JRNKW6JLPNUVSAC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","SAGSYAPXQ2T6GC3B3TNRPNFTZMS7UMME6YQGSF5MOIM66S5NKB2QC","WIORLB47KYY5ZDKSAQEQ5NV2J3F3RIO5FVGD6LGF73FD5LWJLUAAC","BZSC7VMYSFRXDHDDAMCDR6X67FN5VWIBOSE76BQLX7OCVOJFUA3AC","WZVCLZKY34KQBQU6YBGJLQCDADBQ67LQVDNRVCMQVY3O3C3EIWSQC","VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","JACZWIJ6UEL5HWZRNOOXTFXUEG67XJDPC5D72LYUPCVVJ6WB7JQAC","3M7WBE24JTPTHWQOU5PO2ZJYKPKEH2F6R4M6RWIRFG334PQEA55QC","NA5I4WYNE2O3LPSHXGWXW7XL4YNYFDREEGDOP6LJ5HJXTQDXM7BAC","6YMDOZIB5LVYLFIDGN2WNT5JTHEAMS4TFPVDEZ3OWXWOKJOC5QDAC","CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC","TPEH2XNBS5RO4IEVKENVF6P65AH7IX64KK2JAYMSJT3J5GXO67EAC","NO2QPRFLGCYUDXYJTOY3S3NZJCCLAFOQUHITKDZ7LSZLRLOV5W3QC","LYTVEPH3W5UHF7MAYFWBT6NVNC42HEVKJGGMFDKUDZDNDOI33YJQC","JRENVH5DF2F4SOV7UNJENFA7VDI3H63XK76R3LFZK6QCW7JIBLSQC","3AMEP2Y5J6GA4AWQONF4JVA3XSR3ASLHHKMYG44R72SOUY3UQCDAC","ZRUPLBBTT4S6S7A3LOAHG4ONYEGPA5CFO4L2XBCNFKK45MWX3BDAC","EQLDTLXVCARE36EJE3S6SNEVTW2JJY4EYD36EX7WSIFLG2XMKKQAC","6HNRL5RT76NH5YNSUN7B4FHNRZXKNLX4DROFGMO4R5P2U7JWOL2QC","VMOYG7MKEWTUEEY2EOL256RWCVPGRD63IFOSKXHBGJ6VSRITLMOAC","246V5TYIUL7CFN7G5Y7A35EEM6IJPN532ROEYVSM7Q4HCQSWPDBQC","NYOF5766GLBTWQV2KTVRAJMGVJNJ37Z5BLJMFPZA3HG7X2Q2RXPAC","W4NSLQNGQVQBB4BEXLFW5OTCBD5XQ4E2BGH3WIFGKSJBCODSUIGQC"]},"hunks":[{"ResurrectZombie":{"inode":{"change":6,"pos":198172},"path":"\"libpijul/src/working_copy/mod.rs\"","line":1,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"","from":{"change":6,"pos":15},"to":{"change":6,"start":0,"end":33},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK","from":{"change":6,"pos":198228},"to":{"change":6,"start":0,"end":33},"introduced_by":6},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":6,"pos":198228},"to":{"change":6,"start":0,"end":33},"introduced_by":2}],"inode":{"change":6,"pos":198172}}},"contents":[{"Add":"use chardetng::EncodingDetector;\n"}]}},{"ResurrectZombie":{"inode":{"change":6,"pos":198172},"path":"\"libpijul/src/working_copy/mod.rs\"","line":2,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"","from":{"change":6,"pos":66},"to":{"change":6,"start":63,"end":64},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK","from":{"change":6,"pos":63},"to":{"change":6,"start":63,"end":64},"introduced_by":6},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":6,"pos":63},"to":{"change":6,"start":63,"end":64},"introduced_by":2}],"inode":{"change":6,"pos":198172}}},"contents":[{"Add":"\n"}]}},{"ResurrectZombie":{"inode":{"change":6,"pos":198172},"path":"\"libpijul/src/working_copy/mod.rs\"","line":3,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK","from":{"change":6,"pos":64},"to":{"change":6,"start":0,"end":63},"introduced_by":6},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":6,"pos":64},"to":{"change":6,"start":0,"end":63},"introduced_by":2}],"inode":{"change":6,"pos":198172}}},"contents":[{"Add":"use crate::{pristine::InodeMetadata, text_encoding::Encoding};\n"}]}},{"FileUndel":{"undel_names":[{"basename":"text.rs","metadata":420},{"basename":"text.rs","metadata":493},{"basename":"text.rs","metadata":420}],"undel":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER","from":{"change":6,"pos":248792},"to":{"change":6,"start":0,"end":9},"introduced_by":5},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER","from":{"change":6,"pos":248792},"to":{"change":6,"start":2008,"end":2017},"introduced_by":5},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER","from":{"change":6,"pos":9},"to":{"change":6,"start":10,"end":10},"introduced_by":6},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER","from":{"change":6,"pos":2017},"to":{"change":6,"start":10,"end":10},"introduced_by":6},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER","from":{"change":6,"pos":9},"to":{"change":6,"start":10,"end":10},"introduced_by":6},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER","from":{"change":6,"pos":2017},"to":{"change":6,"start":10,"end":10},"introduced_by":6},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER","from":{"change":5,"pos":375},"to":{"change":6,"start":10,"end":10},"introduced_by":5},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER","from":{"change":6,"pos":248792},"to":{"change":5,"start":366,"end":375},"introduced_by":5}],"inode":{"change":6,"pos":248792}}},"content_edges":null,"content":[]}},{"Edit":{"inode":{"change":6,"pos":10},"path":"libpijul/src/tests/text.rs","line":2,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":25},"to":{"change":6,"start":25,"end":47},"introduced_by":6}],"inode":{"change":6,"pos":10}}},"contents":[{"Del":"use crate::change::*;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":10},"path":"libpijul/src/tests/text.rs","line":21,"ins":{"up_context":[{"change":6,"pos":669}],"down_context":[{"change":6,"pos":751}],"flag":"BLOCK","start":0,"end":89,"inode":{"change":6,"pos":10}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":669},"to":{"change":6,"start":669,"end":751},"introduced_by":6}],"inode":{"change":6,"pos":10}},"ins_contents":[{"Add":" let (h, change) = record_all_change(&mut repo, &store, &mut txn, &mut channel, \"\")?;"}],"del_contents":[{"Del":" let (h, change) = record_all(&mut repo, &store, &mut txn, &mut channel, \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":10},"path":"libpijul/src/tests/text.rs","line":77,"ins":{"up_context":[{"change":6,"pos":2456}],"down_context":[{"change":6,"pos":2540}],"flag":"BLOCK","start":90,"end":181,"inode":{"change":6,"pos":10}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2456},"to":{"change":6,"start":2456,"end":2540},"introduced_by":6}],"inode":{"change":6,"pos":10}},"ins_contents":[{"Add":" let (h1, change1) = record_all_change(&mut repo, &store, &mut txn, &mut channel, \"\")?;"}],"del_contents":[{"Del":" let (h1, change1) = record_all(&mut repo, &store, &mut txn, &mut channel, \"\")?;\n"}]}},{"Edit":{"inode":{"change":6,"pos":10},"path":"libpijul/src/tests/text.rs","line":105,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3149},"to":{"change":6,"start":3149,"end":4356},"introduced_by":6}],"inode":{"change":6,"pos":10}}},"contents":[{"Del":"\nfn record_all(\n repo: &mut R,\n store: &P,\n txn: &mut T,\n channel: &mut ChannelRef,\n prefix: &str,\n) -> Result<(Hash, Change), anyhow::Error>\nwhere\n R::Error: Send + Sync + 'static,\n{\n let mut state = Builder::new();\n state.record(txn, Algorithm::default(), channel, repo, store, prefix)?;\n\n let rec = state.finish();\n let changes = rec\n .actions\n .into_iter()\n .map(|rec| rec.globalize(txn))\n .collect();\n let change0 = crate::change::Change::make_change(\n txn,\n &channel,\n changes,\n rec.contents,\n crate::change::ChangeHeader {\n message: \"test\".to_string(),\n authors: vec![],\n description: None,\n // Beware of changing the following line: two changes\n // doing the same thing will be equal. Sometimes we don't\n // want that, as in tests::unrecord::unrecord_double.\n timestamp: chrono::Utc::now(),\n },\n Vec::new(),\n );\n let hash = store.save_change(&change0)?;\n apply::apply_local_change(txn, channel, &change0, hash, &rec.updatables)?;\n Ok((hash, change0))\n}\n"}]}},{"Edit":{"inode":{"change":6,"pos":289338},"path":"libpijul/src/tests/mod.rs","line":1,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":289338}],"down_context":[{"change":6,"pos":289394}],"flag":"BLOCK","start":182,"end":223,"inode":{"change":6,"pos":289338}}},"contents":[{"Add":"use crate::change::{Local, LocalChange};"}]}},{"SolveOrderConflict":{"inode":{"change":6,"pos":289338},"path":"libpijul/src/tests/mod.rs","line":20,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":14}],"down_context":[{"change":6,"pos":4357}],"flag":"","start":224,"end":224,"inode":{"change":6,"pos":289338}}},"contents":[]}},{"Replacement":{"inode":{"change":6,"pos":289338},"path":"libpijul/src/tests/mod.rs","line":23,"ins":{"up_context":[{"change":6,"pos":289730}],"down_context":[{"change":6,"pos":289795}],"flag":"BLOCK","start":225,"end":291,"inode":{"change":6,"pos":289338}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":289730},"to":{"change":6,"start":1788,"end":1847},"introduced_by":6}],"inode":{"change":6,"pos":289338}},"ins_contents":[{"Add":"fn record_all_change("}],"del_contents":[{"Del":"fn record_all(\n"}]}},{"Replacement":{"inode":{"change":6,"pos":289338},"path":"libpijul/src/tests/mod.rs","line":29,"ins":{"up_context":[{"change":6,"pos":289896}],"down_context":[{"change":6,"pos":1661}],"flag":"BLOCK","start":292,"end":347,"inode":{"change":6,"pos":289338}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":289896},"to":{"change":6,"start":1628,"end":1661},"introduced_by":6}],"inode":{"change":6,"pos":289338}},"ins_contents":[{"Add":") -> Result<(Hash, LocalChange), anyhow::Error>"}],"del_contents":[{"Del":") -> Result\n"}]}},{"Edit":{"inode":{"change":6,"pos":289338},"path":"libpijul/src/tests/mod.rs","line":79,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":25832}],"down_context":[{"change":6,"pos":291146}],"flag":"BLOCK","start":348,"end":691,"inode":{"change":6,"pos":289338}}},"contents":[{"Add":" Ok((hash, change0))"},{"Add":"}"},{"Add":""},{"Add":"fn record_all("},{"Add":" repo: &mut R,"},{"Add":" store: &P,"},{"Add":" txn: &mut T,"},{"Add":" channel: &mut ChannelRef,"},{"Add":" prefix: &str,"},{"Add":") -> Result"},{"Add":"where"},{"Add":" R::Error: Send + Sync + 'static,"},{"Add":"{"},{"Add":" let Ok((hash, _)) = record_all_change(repo, store, txn, channel, prefix);"}]}},{"Edit":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":2,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":488937},"to":{"change":6,"start":571,"end":613},"introduced_by":6},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":6,"pos":488937},"to":{"change":6,"start":571,"end":613},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":677},"to":{"change":6,"start":677,"end":678},"introduced_by":6},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":6,"pos":677},"to":{"change":6,"start":677,"end":678},"introduced_by":3}],"inode":{"change":6,"pos":488880}}},"contents":[{"Del":"use std::collections::{HashMap, HashSet};\n"},{"Del":"\n"}]}},{"Edit":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":11,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":489199}],"down_context":[{"change":6,"pos":11033}],"flag":"BLOCK","start":692,"end":734,"inode":{"change":6,"pos":488880}}},"contents":[{"Add":"use std::collections::{HashMap, HashSet};"}]}},{"ResurrectZombie":{"inode":{"change":6,"pos":488880},"path":"\"libpijul/src/record.rs\"","line":273,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK","from":{"change":6,"pos":496480},"to":{"change":4,"start":49402,"end":49474},"introduced_by":4},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":6,"pos":496480},"to":{"change":4,"start":49402,"end":49474},"introduced_by":6},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":6,"pos":496480},"to":{"change":4,"start":49402,"end":49474},"introduced_by":6}],"inode":{"change":6,"pos":488880}}},"contents":[{"Add":" let start = ChangePosition(self.rec.contents.len().into());\n"}]}},{"Edit":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":273,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":496437}],"down_context":[{"change":4,"pos":49402}],"flag":"BLOCK","start":735,"end":885,"inode":{"change":6,"pos":488880}}},"contents":[{"Add":" let (contents, encoding) = if meta.is_file() {"},{"Add":" let encoding = working_copy.decode_file(&item.full_path, &mut self.rec.contents)?;"}]}},{"ResurrectZombie":{"inode":{"change":6,"pos":488880},"path":"\"libpijul/src/record.rs\"","line":276,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK","from":{"change":6,"pos":496630},"to":{"change":4,"start":49475,"end":49643},"introduced_by":4},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":6,"pos":496630},"to":{"change":4,"start":49475,"end":49643},"introduced_by":6},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":6,"pos":496630},"to":{"change":4,"start":49475,"end":49643},"introduced_by":6}],"inode":{"change":6,"pos":488880}}},"contents":[{"Add":" let end = ChangePosition(self.rec.contents.len().into());\n self.rec.largest_file = self.rec.largest_file.max(end.0.as_u64() - start.0.as_u64());\n"}]}},{"Edit":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":276,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":49474}],"down_context":[{"change":4,"pos":49475}],"flag":"BLOCK","start":886,"end":947,"inode":{"change":6,"pos":488880}}},"contents":[{"Add":" self.rec.has_binary_files |= encoding.is_none();"}]}},{"Edit":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":279,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":496823},"to":{"change":4,"start":49644,"end":49750},"introduced_by":4},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":6,"pos":496823},"to":{"change":4,"start":49644,"end":49750},"introduced_by":6},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":6,"pos":496823},"to":{"change":4,"start":49644,"end":49750},"introduced_by":6}],"inode":{"change":6,"pos":488880}}},"contents":[{"Del":" let s = start.0.into();\n let e = end.0.as_usize().min(s + CHECK_UTF8 + 4);\n"}]}},{"ResurrectZombie":{"inode":{"change":6,"pos":488880},"path":"\"libpijul/src/record.rs\"","line":280,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK","from":{"change":6,"pos":497247},"to":{"change":6,"start":0,"end":29},"introduced_by":6},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":6,"pos":497247},"to":{"change":6,"start":0,"end":29},"introduced_by":6}],"inode":{"change":6,"pos":488880}}},"contents":[{"Add":" if end > start {\n"}]}},{"Edit":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":281,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":497606},"to":{"change":6,"start":6231,"end":6275},"introduced_by":6},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":6,"pos":497606},"to":{"change":6,"start":6231,"end":6275},"introduced_by":6}],"inode":{"change":6,"pos":488880}}},"contents":[{"Del":" flag: EdgeFlags::BLOCK,\n"}]}},{"ResurrectZombie":{"inode":{"change":6,"pos":488880},"path":"\"libpijul/src/record.rs\"","line":281,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK","from":{"change":6,"pos":497313},"to":{"change":6,"start":2232,"end":2575},"introduced_by":6},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":6,"pos":497313},"to":{"change":6,"start":2232,"end":2575},"introduced_by":6}],"inode":{"change":6,"pos":488880}}},"contents":[{"Add":" (\n Some(Atom::NewVertex(NewVertex {\n up_context: vec![Position {\n change: None,\n pos: inode_pos,\n }],\n down_context: vec![],\n start,\n end,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":290,"ins":{"up_context":[{"change":6,"pos":2575}],"down_context":[{"change":6,"pos":2625}],"flag":"BLOCK","start":948,"end":996,"inode":{"change":6,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2575},"to":{"change":6,"start":2575,"end":2625},"introduced_by":6},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":6,"pos":2575},"to":{"change":6,"start":2575,"end":2625},"introduced_by":6}],"inode":{"change":6,"pos":488880}},"ins_contents":[{"Add":" flag: EdgeFlags::BLOCK,"}],"del_contents":[{"Del":" flag: EdgeFlags::empty(),\n"}]}},{"Edit":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":1142,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":496437},"to":{"change":6,"start":2018,"end":2073},"introduced_by":6},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":6,"pos":496437},"to":{"change":6,"start":2018,"end":2073},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":496780},"to":{"change":6,"start":2170,"end":2231},"introduced_by":6},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":6,"pos":496780},"to":{"change":6,"start":2170,"end":2231},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":496552},"to":{"change":6,"start":2074,"end":2169},"introduced_by":6},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":6,"pos":496552},"to":{"change":6,"start":2074,"end":2169},"introduced_by":4}],"inode":{"change":6,"pos":488880}}},"contents":[{"Del":" let (contents, encoding) = if meta.is_file() {\n"},{"Del":" self.rec.has_binary_files |= encoding.is_none();\n"},{"Del":" let encoding = working_copy.decode_file(&item.full_path, &mut self.rec.contents)?;\n"}]}},{"FileUndel":{"undel_names":[{"basename":"mod.rs","metadata":493},{"basename":"mod.rs","metadata":420},{"basename":"mod.rs","metadata":420}],"undel":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER","from":{"change":6,"pos":768883},"to":{"change":6,"start":2937,"end":2945},"introduced_by":5},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER","from":{"change":6,"pos":768883},"to":{"change":6,"start":793238,"end":793246},"introduced_by":5},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER","from":{"change":6,"pos":2945},"to":{"change":6,"start":793247,"end":793247},"introduced_by":6},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER","from":{"change":6,"pos":793246},"to":{"change":6,"start":793247,"end":793247},"introduced_by":6},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER","from":{"change":6,"pos":793246},"to":{"change":6,"start":793247,"end":793247},"introduced_by":6},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER","from":{"change":5,"pos":384},"to":{"change":6,"start":793247,"end":793247},"introduced_by":5},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER","from":{"change":6,"pos":768883},"to":{"change":5,"start":376,"end":384},"introduced_by":5},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER","from":{"change":6,"pos":2945},"to":{"change":6,"start":793247,"end":793247},"introduced_by":6}],"inode":{"change":6,"pos":768883}}},"content_edges":null,"content":[]}},{"Edit":{"inode":{"change":6,"pos":793247},"path":"libpijul/src/diff/mod.rs","line":64,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":5921},"to":{"change":6,"start":6675,"end":6760},"introduced_by":6},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":6,"pos":5921},"to":{"change":6,"start":6675,"end":6760},"introduced_by":6}],"inode":{"change":6,"pos":793247}}},"contents":[{"Del":" self.diff_binary(changes, txn, txn.graph(channel), path, inode, a, &b)?;\n"}]}},{"ResurrectZombie":{"inode":{"change":6,"pos":793247},"path":"\"libpijul/src/diff/mod.rs\"","line":64,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK","from":{"change":6,"pos":794648},"to":{"change":6,"start":4948,"end":5212},"introduced_by":6},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":6,"pos":794648},"to":{"change":6,"start":4948,"end":5212},"introduced_by":6}],"inode":{"change":6,"pos":793247}}},"contents":[{"Add":" let mime_a = tree_magic_mini::from_u8(&d.contents_a);\n let mime_b = tree_magic_mini::from_u8(&b);\n debug!(\"mimes = {:?}, {:?}\", mime_a, mime_b);\n if (!mime_a.starts_with(\"text/\") || !mime_b.starts_with(\"text/\")) && d.contents_a != b {\n"}]}},{"Edit":{"inode":{"change":6,"pos":793247},"path":"libpijul/src/diff/mod.rs","line":64,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":794648}],"down_context":[{"change":6,"pos":4948}],"flag":"BLOCK","start":997,"end":1063,"inode":{"change":6,"pos":793247}}},"contents":[{"Add":" // TODO pass through the encodings and use that to decide"}]}},{"Edit":{"inode":{"change":6,"pos":793247},"path":"libpijul/src/diff/mod.rs","line":69,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":5212}],"down_context":[{"change":6,"pos":5994}],"flag":"BLOCK","start":1064,"end":1149,"inode":{"change":6,"pos":793247}}},"contents":[{"Add":" self.diff_binary(changes, txn, txn.graph(channel), path, inode, a, &b)?;"}]}},{"Edit":{"inode":{"change":6,"pos":831311},"path":"libpijul/src/change.rs","line":1118,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":865376}],"down_context":[{"change":3,"pos":7972}],"flag":"BLOCK","start":1150,"end":1176,"inode":{"change":6,"pos":831311}}},"contents":[{"Add":" encoding,"}]}},{"Edit":{"inode":{"change":6,"pos":831311},"path":"libpijul/src/change.rs","line":1120,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":865376},"to":{"change":6,"start":3085,"end":3111},"introduced_by":6},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":6,"pos":865376},"to":{"change":6,"start":3085,"end":3111},"introduced_by":3}],"inode":{"change":6,"pos":831311}}},"contents":[{"Del":" encoding,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":434,"ins":{"up_context":[{"change":4,"pos":140860}],"down_context":[{"change":6,"pos":53268}],"flag":"BLOCK","start":1177,"end":1235,"inode":{"change":6,"pos":37976}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":140860},"to":{"change":6,"start":2882,"end":2930},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":53215},"to":{"change":6,"start":2882,"end":2930},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":53215},"to":{"change":5,"start":385,"end":448},"introduced_by":5},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":6,"pos":53215},"to":{"change":5,"start":385,"end":448},"introduced_by":4}],"inode":{"change":6,"pos":37976}},"ins_contents":[{"Add":" print_contents(w, \"+\", c, encoding)?;"}],"del_contents":[{"Del":" print_contents(w, \"+\", c)?;\n"},{"Del":" print_contents(&mut w, \"+\", c, encoding)?;\n"}]}},{"Edit":{"inode":{"change":6,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":1226,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":84951},"to":{"change":6,"start":3870,"end":3912},"introduced_by":6},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":6,"pos":84951},"to":{"change":6,"start":3870,"end":3912},"introduced_by":6},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":6,"pos":84951},"to":{"change":6,"start":3870,"end":3912},"introduced_by":6}],"inode":{"change":6,"pos":37976}}},"contents":[{"Del":" w.write_change_line(pref, a)?\n"}]}},{"Replacement":{"inode":{"change":6,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":1228,"ins":{"up_context":[{"change":5,"pos":591}],"down_context":[{"change":6,"pos":85088}],"flag":"BLOCK","start":1236,"end":1278,"inode":{"change":6,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":85037},"to":{"change":6,"start":3913,"end":3962},"introduced_by":6},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":6,"pos":85037},"to":{"change":6,"start":3913,"end":3962},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":5,"pos":591},"to":{"change":6,"start":5804,"end":5848},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":6,"pos":1861},"to":{"change":6,"start":5804,"end":5848},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":5804},"to":{"change":6,"start":5804,"end":5848},"introduced_by":6}],"inode":{"change":6,"pos":37976}},"ins_contents":[{"Add":" w.write_change_line(pref, a)?"}],"del_contents":[{"Del":" w.write_change_line(pref, contents)?\n"},{"Del":" writeln!(w, \"{} {}\", pref, a)?;\n"}]}},{"ResurrectZombie":{"inode":{"change":6,"pos":37976},"path":"\"libpijul/src/change/text_changes.rs\"","line":1244,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK","from":{"change":6,"pos":85462},"to":{"change":4,"start":143164,"end":143228},"introduced_by":4},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":6,"pos":85462},"to":{"change":4,"start":143164,"end":143228},"introduced_by":5}],"inode":{"change":6,"pos":37976}}},"contents":[{"Add":" let c = &change_contents[n.start.us()..n.end.us()];\n"}]}},{"ResurrectZombie":{"inode":{"change":6,"pos":37976},"path":"\"libpijul/src/change/text_changes.rs\"","line":1245,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK","from":{"change":6,"pos":85538},"to":{"change":5,"start":592,"end":639},"introduced_by":5},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":6,"pos":85538},"to":{"change":5,"start":592,"end":639},"introduced_by":4}],"inode":{"change":6,"pos":37976}}},"contents":[{"Add":" print_contents(w, \"+\", c, &None)?;\n"}]}},{"ResurrectZombie":{"inode":{"change":6,"pos":1020742},"path":"\"libpijul/Cargo.toml\"","line":116,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK","from":{"change":6,"pos":1023338},"to":{"change":6,"start":5871,"end":5941},"introduced_by":6},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":6,"pos":1023338},"to":{"change":6,"start":5871,"end":5941},"introduced_by":6}],"inode":{"change":6,"pos":1020742}}},"contents":[{"Add":"tree_magic_mini = \"1.0.0\"\nchardetng = \"0.1.10\"\nencoding_rs = \"0.8.26\"\n"}]}},{"SolveOrderConflict":{"inode":{"change":6,"pos":1030385},"path":"Cargo.lock","line":986,"atom":{"NewVertex":{"up_context":[{"change":31,"pos":3328}],"down_context":[{"change":6,"pos":6687}],"flag":"","start":1279,"end":1279,"inode":{"change":6,"pos":1030385}}},"contents":[]}},{"Edit":{"inode":{"change":6,"pos":1030385},"path":"Cargo.lock","line":1183,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":6,"pos":961},"to":{"change":6,"start":2863,"end":3071},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2863},"to":{"change":6,"start":2863,"end":3071},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3071},"to":{"change":6,"start":1451,"end":1462},"introduced_by":6}],"inode":{"change":6,"pos":1030385}}},"contents":[{"Del":"]\n\n[[package]]\nname = \"ntapi\"\nversion = \"0.3.6\"\nsource = \"registry+https://github.com/rust-lang/crates.io-index\"\nchecksum = \"3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44\"\ndependencies = [\n"},{"Del":" \"winapi\",\n"}]}},{"ResurrectZombie":{"inode":{"change":6,"pos":1030385},"path":"\"Cargo.lock\"","line":1183,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK","from":{"change":6,"pos":1060297},"to":{"change":6,"start":6740,"end":6992},"introduced_by":6},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":6,"pos":1060297},"to":{"change":6,"start":6740,"end":6992},"introduced_by":6}],"inode":{"change":6,"pos":1030385}}},"contents":[{"Add":"]\n\n[[package]]\nname = \"nom\"\nversion = \"5.1.2\"\nsource = \"registry+https://github.com/rust-lang/crates.io-index\"\nchecksum = \"ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af\"\ndependencies = [\n \"lexical-core\",\n \"memchr\",\n \"version_check\",\n"}]}},{"Edit":{"inode":{"change":6,"pos":1030385},"path":"Cargo.lock","line":1194,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":6992}],"down_context":[{"change":6,"pos":1060297}],"flag":"BLOCK","start":1280,"end":1499,"inode":{"change":6,"pos":1030385}}},"contents":[{"Add":"]"},{"Add":""},{"Add":"[[package]]"},{"Add":"name = \"ntapi\""},{"Add":"version = \"0.3.6\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44\""},{"Add":"dependencies = ["},{"Add":" \"winapi\","}]}}],"owner":"irevoire","repo":"pijul","token":"TJ79FvePCvX+OmlvdYOEg6jcWZeWcWBT8YZbYFtotTY=","login":null}

…

Dependencies

Change contents