{"header":{"message":"Re-implement change printing and parsing","description":null,"timestamp":"2021-09-12T19:01:05.958765362Z","authors":[{}]},"hash":"5FI6SBEZ6RERERUAIWQJVAY66BEZ7YQOYOUNK2DPOLRGS2X326RAC","authors":[{"key":"FHRXP5Jnb2MWLDrPrnLnkN2ryWcGCo6CRr1dXR9FW2YA"}],"deps":{"hashes":[["5FI6SBEZ6RERERUAIWQJVAY66BEZ7YQOYOUNK2DPOLRGS2X326RAC","Re-implement change printing and parsing"],["AA",null],["RUBSM5DRA4O7SGD7NO7QYFGDQ2CQL6K7SZTIQVGRWAQHGSFUBGCQC","Fixing a bug when outputting changes in text format"],["YDMAIJ5VGDZFON7VD76EHNERLCJQL3OK6EPSNU552JKQWMDVEW7AC","Fixing the format of text changes (file additions under a new directory were not always accepted by the parser)"],["V4T4SC7OL6WEZNV4XSFBSXY5HPB7VXPSXWSK4Z63QXKQD4JSFNCQC","Testing binary diff"],["LWBBN2IBFFW2UIQIP7XL3J2QOK76EJI3P4MO5D543UAATAYW66XAC","Fixing a bug with double-quotes in the text format serialisation"],["IUH7IMWES3KQTHVWA5UNHAO7QWVCC5PQJ6VLK3RC3T4F2MS74P3AC","Contributor license agreements"],["CCFJ7VO3I73FE3MZRS5RSDRYNZVW7AXC345P4BXS7JIL2TU3LQJQC","Renaming \"Record\" to \"Hunk\" in the changes"],["6YMDOZIB5LVYLFIDGN2WNT5JTHEAMS4TFPVDEZ3OWXWOKJOC5QDAC","Refactoring apply"],["73NW2X2MI767RYNTKS67ZB5QUWYEAA4SCORLD52K36ZU3JAK67AQC","Returning a parse error instead of panicking when parsing a text change"],["YTQS4ES362EJ27OE45CE5HLY7ZU57YLVKRMDRJ2OXT623VM5WOBQC","Fixing a parsing problem (related to permissions), and the associated permissions"],["Q3GU26WDEYE2HXMM4WWNEGVMSXLQAKRJBSB2EJZA6JTHPKQHXCXQC","merge with changes from sanakirja v1.1.2"],["TVVW53HZGYPODAXEQ4BFZNSPBOFG6JEDVOKIYIDZMWFAMOBKOR2QC","Conflict resolution"],["YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","Sanakirja 1.0"],["RRCSHAYZ6RLWVPNYHF2F5FSRL2KKJNPQUQRIJYLJGB23BZQQ7JLQC","Formatting"],["4DNDMC7IUZNYLDEQQYYF5K3G2QWWXGQENTEWPNTM6XKQEFPW7L3QC","Fixing a number of bugs related to encodings (extra newlines + misdetection in linux2x)"],["NE4A4WUK5IKCMMVWC7MYD6AF2NFJDCJT5EWTP64MRGLDN3WKSIIQC","Parsing of file addition metadata"],["X243Z3Y54ULINQMMRIKLHRV5T237B7VUOAHVJ7DMPOQ6A6GQXY2AC","Recording only the required metadata (can even be changed later!)"],["VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","Removing anyhow in libpijul"],["FXEDPLRI7PXLDXV634ZA6D5Q3ZWG3ESTKJTMRPJ4MAHI7PKU3M6AC","Resurrecting tests, and type cleanup (no need for Arc> anymore)"],["KJDQ2WOMIUTVDEEQ7NMJYBZAVUZ3NIVOVJ6MUCZPRAWIEWOV6TWQC","Fixing the parsing of section headers in the text change format"],["VMOYG7MKEWTUEEY2EOL256RWCVPGRD63IFOSKXHBGJ6VSRITLMOAC","text file decoding for new files"],["NYOF5766GLBTWQV2KTVRAJMGVJNJ37Z5BLJMFPZA3HG7X2Q2RXPAC","track file encoding in the record, including change text for file adds"],["65S67T3EKKLFRBCU73Z542V7A4JSMGP37OJINON6N563UIBQAITAC","Parsing \\\\ for empty additions (rare problem)"],["VYHHOEYHO67JNJEODX5L3CQFIV3DAXZBBIQUOMCWJDYF3VWICDNQC","Versions and formatting"],["I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","Various post-fire fixes"],["ZRUPLBBTT4S6S7A3LOAHG4ONYEGPA5CFO4L2XBCNFKK45MWX3BDAC","Colours in diff and change: separating concerns and dependencies"],["XSEODPNEN2Y2THBRO7L5QFPAEQVSQTLAFZFWCRMBGZ3YSRZB2UJAC","Fixing conflicts"],["IIV3EL2XYI2X7HZWKXEXQFAE3R3KC2Q7SGOT3Q332HSENMYVF32QC","Cleanup, formatting, and fixing the Git feature"],["246V5TYIUL7CFN7G5Y7A35EEM6IJPN532ROEYVSM7Q4HCQSWPDBQC","decode existing files"],["XR7MNOMU5PMOOEY2EPPUABZ7NOP432RDCWUET23ONPXTT3JQIFIAC","file encoding in updates"],["ZSF3YFZTDOXMCOC3HOT5C6MQLYLWOR7QJAOUDS2M2Z4SC2YW3GRAC","encoded file deletion"],["6CZYYOG7C7ULY5Q4WSRVVC3QVSYACV3KFEYXDCH63OXXX2QFFFBAC","Faster guessing of encoding"],["SGXOEWHUET7RVS5HANSYE7QRQAG56NIKTC56MLPZ5XBCXODEWUXQC","Adding a patched chardetng (temporarily)"],["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","Upgrading to Sanakirja 0.15 + version bump"],["SFJ3XRTFUNG6KNYDLIYKHCENZ6Y3PG33GNGDW6444LAVBMCSH2FAC","Proper escaping of UTF-8 filenames in the patch text format"],["CIEUBH465IFZXO3YDG7XYHP54NJ4TGVQD47SKNW6P5XM4X7IVNBAC","Fixing an index-out-of-bounds error when serialising bad changes"],["PDTUHOMVQ2NUN2MMFZL7F4NI3EXOK5SOBBS34DF4ACFOJCB5NQTAC","fix left over conflicts"],["NG3Z3DOKDZQDQ7UNQEOMXWX2NJKKLM7DKRWW3KIUD7QEECTNQIZQC","roundtrip text encoding when recording"],["CFNFIUJVWV2PHHZKAPBY6GLW4TCX2N66DYH2QCFU5X7D7KE5D4AQC","Parsing the correct flags for new vertices"],["6HNRL5RT76NH5YNSUN7B4FHNRZXKNLX4DROFGMO4R5P2U7JWOL2QC","detect non-utf8 text files"],["LV34DUJYQNSHJSNFALRRS3FFQWUU57HIJU26TTKNXDFWD6UWD4QAC","Formatting"],["UM5DLRPBCQZQBEDJDLDPKODOKLACUHZD6YL6S4JRNKW6JLPNUVSAC","store new non-UTF-8 files raw and decode to deplay the contents"],["3S6LU2U5TIU43WRE5RQS3IOLVJLVNCDL4W44FVK2HR3NAXZ7IDUAC","abstract out FileMetadata (de)serialistion"],["EAZ45JTF44727P34UQAMIFQQTSXFKABIG4PLBGC7C7KQ74GUSDPAC","Fixing a bug in change printing"],["KL5737GRIOFVXKSINVO5DLLWWV4EMHF7ECXMX6ZZLAZZPWDJPB2QC","Text format: correct position of encoding for deletion/undeletion"],["BZCGXVS77ZS3N4QPLIHNWZ3YFVV7H4PXQD3U6RN5ZFVOC7QL7MBQC","Fixing two bugs around conflicts on the last line, where invalid patches were produced (first bug) and applied (second bug)"],["EQLDTLXVCARE36EJE3S6SNEVTW2JJY4EYD36EX7WSIFLG2XMKKQAC","Fixing a bug with empty new files, and another one with empty replacements"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["IACED7RWM2ZQIPN3YZATA6SXTRO2C6OUGT3HSOU3LIDZ7YRMLRXAC","text_encoding module"],["SHSJ3Y5332WHVUDDQZ2P7GH6VMC7XIX5L7BDJUUMF3QCDRZP7NLQC","Fixing more tests"],["FYUDBQ3C5GWIFKITBAKEXTK4AFZXZOH7DHI7QFXQOQ3HYUIYDEVAC","Formatting changes + version bump"],["TNN56XYKX4QRHA4FWCF5F3JVG52FIAC76EEYYANDKEE4IAWQKPEQC","libpijul alpha.43"],["QJXNUQFJOAPQT3GUXRDTVKMJZCKFONSXUZMAZB7VC7OHDCGAVCOQC","Solving conflicts"]],"deps":["RUBSM5DRA4O7SGD7NO7QYFGDQ2CQL6K7SZTIQVGRWAQHGSFUBGCQC","YDMAIJ5VGDZFON7VD76EHNERLCJQL3OK6EPSNU552JKQWMDVEW7AC","V4T4SC7OL6WEZNV4XSFBSXY5HPB7VXPSXWSK4Z63QXKQD4JSFNCQC","LWBBN2IBFFW2UIQIP7XL3J2QOK76EJI3P4MO5D543UAATAYW66XAC","IUH7IMWES3KQTHVWA5UNHAO7QWVCC5PQJ6VLK3RC3T4F2MS74P3AC"],"known":["VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","KJDQ2WOMIUTVDEEQ7NMJYBZAVUZ3NIVOVJ6MUCZPRAWIEWOV6TWQC","65S67T3EKKLFRBCU73Z542V7A4JSMGP37OJINON6N563UIBQAITAC","73NW2X2MI767RYNTKS67ZB5QUWYEAA4SCORLD52K36ZU3JAK67AQC","CFNFIUJVWV2PHHZKAPBY6GLW4TCX2N66DYH2QCFU5X7D7KE5D4AQC","6YMDOZIB5LVYLFIDGN2WNT5JTHEAMS4TFPVDEZ3OWXWOKJOC5QDAC","CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","CIEUBH465IFZXO3YDG7XYHP54NJ4TGVQD47SKNW6P5XM4X7IVNBAC","NE4A4WUK5IKCMMVWC7MYD6AF2NFJDCJT5EWTP64MRGLDN3WKSIIQC","CCFJ7VO3I73FE3MZRS5RSDRYNZVW7AXC345P4BXS7JIL2TU3LQJQC","ZRUPLBBTT4S6S7A3LOAHG4ONYEGPA5CFO4L2XBCNFKK45MWX3BDAC","VYHHOEYHO67JNJEODX5L3CQFIV3DAXZBBIQUOMCWJDYF3VWICDNQC","BZCGXVS77ZS3N4QPLIHNWZ3YFVV7H4PXQD3U6RN5ZFVOC7QL7MBQC","EQLDTLXVCARE36EJE3S6SNEVTW2JJY4EYD36EX7WSIFLG2XMKKQAC","YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","IIV3EL2XYI2X7HZWKXEXQFAE3R3KC2Q7SGOT3Q332HSENMYVF32QC","X243Z3Y54ULINQMMRIKLHRV5T237B7VUOAHVJ7DMPOQ6A6GQXY2AC","YTQS4ES362EJ27OE45CE5HLY7ZU57YLVKRMDRJ2OXT623VM5WOBQC","EAZ45JTF44727P34UQAMIFQQTSXFKABIG4PLBGC7C7KQ74GUSDPAC","I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","6HNRL5RT76NH5YNSUN7B4FHNRZXKNLX4DROFGMO4R5P2U7JWOL2QC","VMOYG7MKEWTUEEY2EOL256RWCVPGRD63IFOSKXHBGJ6VSRITLMOAC","246V5TYIUL7CFN7G5Y7A35EEM6IJPN532ROEYVSM7Q4HCQSWPDBQC","NYOF5766GLBTWQV2KTVRAJMGVJNJ37Z5BLJMFPZA3HG7X2Q2RXPAC","UM5DLRPBCQZQBEDJDLDPKODOKLACUHZD6YL6S4JRNKW6JLPNUVSAC","Q3GU26WDEYE2HXMM4WWNEGVMSXLQAKRJBSB2EJZA6JTHPKQHXCXQC","PDTUHOMVQ2NUN2MMFZL7F4NI3EXOK5SOBBS34DF4ACFOJCB5NQTAC","XSEODPNEN2Y2THBRO7L5QFPAEQVSQTLAFZFWCRMBGZ3YSRZB2UJAC","XR7MNOMU5PMOOEY2EPPUABZ7NOP432RDCWUET23ONPXTT3JQIFIAC","NG3Z3DOKDZQDQ7UNQEOMXWX2NJKKLM7DKRWW3KIUD7QEECTNQIZQC","3S6LU2U5TIU43WRE5RQS3IOLVJLVNCDL4W44FVK2HR3NAXZ7IDUAC","ZSF3YFZTDOXMCOC3HOT5C6MQLYLWOR7QJAOUDS2M2Z4SC2YW3GRAC","TVVW53HZGYPODAXEQ4BFZNSPBOFG6JEDVOKIYIDZMWFAMOBKOR2QC","RRCSHAYZ6RLWVPNYHF2F5FSRL2KKJNPQUQRIJYLJGB23BZQQ7JLQC","6CZYYOG7C7ULY5Q4WSRVVC3QVSYACV3KFEYXDCH63OXXX2QFFFBAC","SGXOEWHUET7RVS5HANSYE7QRQAG56NIKTC56MLPZ5XBCXODEWUXQC","LV34DUJYQNSHJSNFALRRS3FFQWUU57HIJU26TTKNXDFWD6UWD4QAC","4DNDMC7IUZNYLDEQQYYF5K3G2QWWXGQENTEWPNTM6XKQEFPW7L3QC","KL5737GRIOFVXKSINVO5DLLWWV4EMHF7ECXMX6ZZLAZZPWDJPB2QC","FXEDPLRI7PXLDXV634ZA6D5Q3ZWG3ESTKJTMRPJ4MAHI7PKU3M6AC","SFJ3XRTFUNG6KNYDLIYKHCENZ6Y3PG33GNGDW6444LAVBMCSH2FAC"]},"hunks":[{"Replacement":{"inode":{"change":49,"pos":198172},"path":"libpijul/src/working_copy/mod.rs","line":31,"ins":{"up_context":[{"change":7,"pos":171}],"down_context":[{"change":7,"pos":905}],"flag":"BLOCK","start":0,"end":109,"inode":{"change":49,"pos":198172}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":171},"to":{"change":7,"start":0,"end":127},"introduced_by":7}],"inode":{"change":49,"pos":198172}},"ins_contents":[{"Add":" if let Some(e) = detector.get_valid(None, true, &buffer[init..]) {"},{"Add":" Ok(Some(Encoding(e)))"}],"del_contents":[{"Del":" let (encoding, score) = detector.guess_assess(None, true);\n if score {\n Ok(Some(Encoding(encoding)))\n"}]}},{"Edit":{"inode":{"change":50,"pos":19},"path":"libpijul/src/text_encoding.rs","line":5,"atom":{"NewVertex":{"up_context":[{"change":50,"pos":86}],"down_context":[{"change":50,"pos":86}],"flag":"BLOCK","start":110,"end":158,"inode":{"change":50,"pos":19}}},"contents":[{"Add":"#[cfg(test)]"},{"Add":"use quickcheck::{Arbitrary, Gen};"},{"Add":""}]}},{"Edit":{"inode":{"change":50,"pos":19},"path":"libpijul/src/text_encoding.rs","line":44,"atom":{"NewVertex":{"up_context":[{"change":50,"pos":895}],"down_context":[{"change":50,"pos":895}],"flag":"BLOCK","start":159,"end":509,"inode":{"change":50,"pos":19}}},"contents":[{"Add":"#[cfg(test)]"},{"Add":"// TODO: more encodings. This is not critical, since it is not used ATM."},{"Add":"// But the instance is needed."},{"Add":"impl Arbitrary for Encoding {"},{"Add":" fn arbitrary(g: &mut Gen) -> Self {"},{"Add":" g.choose(&["},{"Add":" Encoding(encoding_rs::UTF_8),"},{"Add":" Encoding(encoding_rs::SHIFT_JIS),"},{"Add":" ])"},{"Add":" .unwrap()"},{"Add":" .clone()"},{"Add":" }"},{"Add":"}"},{"Add":""}]}},{"FileAdd":{"meta":{"basename":"text_changes.rs","metadata":0},"context":[{"change":49,"pos":248792}],"contents":[{"Add":"use crate::change::*;"},{"Add":"use crate::changestore::*;"},{"Add":"use crate::pristine::*;"},{"Add":"use crate::record::*;"},{"Add":"use crate::working_copy::*;"},{"Add":"use crate::*;"},{"Add":"use std::io::Write;"},{"Add":""},{"Add":"use super::*;"},{"Add":""},{"Add":"fn hash_mismatch(change: &Change) -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":" use crate::change::*;"},{"Add":" let mut buf = tempfile::NamedTempFile::new()?;"},{"Add":" let mut h = change.serialize(&mut buf)?;"},{"Add":" match h {"},{"Add":" crate::pristine::Hash::Blake3(ref mut h) => h[0] = h[0].wrapping_add(1),"},{"Add":" _ => unreachable!(),"},{"Add":" }"},{"Add":" match Change::deserialize(buf.path().to_str().unwrap(), Some(&h)) {"},{"Add":" Err(ChangeError::ChangeHashMismatch { .. }) => {}"},{"Add":" _ => unreachable!(),"},{"Add":" }"},{"Add":""},{"Add":" let f = ChangeFile::open(h, buf.path().to_str().unwrap())?;"},{"Add":" assert_eq!(f.hashed(), &change.hashed);"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn hash_mism() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let contents = b\"a\\nb\\nc\\nd\\ne\\nf\\n\";"},{"Add":" let repo = working_copy::memory::Memory::new();"},{"Add":" let store = changestore::memory::Memory::new();"},{"Add":" repo.add_file(\"file\", contents.to_vec());"},{"Add":" repo.add_file(\"file2\", contents.to_vec());"},{"Add":""},{"Add":" let env = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let txn = env.arc_txn_begin().unwrap();"},{"Add":" let mut channel = txn.write().open_or_create_channel(\"main\")?;"},{"Add":" txn.write().add_file(\"file\", 0)?;"},{"Add":" txn.write().add_file(\"file2\", 0)?;"},{"Add":""},{"Add":" let mut state = Builder::new();"},{"Add":" state"},{"Add":" .record("},{"Add":" txn.clone(),"},{"Add":" Algorithm::Myers,"},{"Add":" channel.clone(),"},{"Add":" &repo,"},{"Add":" &store,"},{"Add":" \"\","},{"Add":" 0,"},{"Add":" )"},{"Add":" .unwrap();"},{"Add":" let rec = state.finish();"},{"Add":" let changes: Vec<_> = rec"},{"Add":" .actions"},{"Add":" .into_iter()"},{"Add":" .map(|rec| rec.globalize(&*txn.read()).unwrap())"},{"Add":" .collect();"},{"Add":" info!(\"changes = {:?}\", changes);"},{"Add":" let change0 = crate::change::Change::make_change("},{"Add":" &*txn.read(),"},{"Add":" &channel,"},{"Add":" changes,"},{"Add":" std::mem::take(&mut *rec.contents.lock()),"},{"Add":" crate::change::ChangeHeader {"},{"Add":" message: \"test\".to_string(),"},{"Add":" authors: vec![],"},{"Add":" description: None,"},{"Add":" timestamp: chrono::Utc::now(),"},{"Add":" },"},{"Add":" Vec::new(),"},{"Add":" )"},{"Add":" .unwrap();"},{"Add":" let hash0 = store.save_change(&change0)?;"},{"Add":" apply::apply_local_change("},{"Add":" &mut *txn.write(),"},{"Add":" &mut channel,"},{"Add":" &change0,"},{"Add":" &hash0,"},{"Add":" &rec.updatables,"},{"Add":" )?;"},{"Add":""},{"Add":" hash_mismatch(&change0)?;"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[cfg(feature = \"text-changes\")]"},{"Add":"#[test]"},{"Add":"fn text_changes() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let contents = b\"a\\nb\\nc\\nd\\ne\\nf\\n\";"},{"Add":" let repo = working_copy::memory::Memory::new();"},{"Add":" let store = changestore::memory::Memory::new();"},{"Add":" repo.add_file(\"file\", contents.to_vec());"},{"Add":" repo.add_file(\"file2\", contents.to_vec());"},{"Add":""},{"Add":" let env = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let txn = env.arc_txn_begin().unwrap();"},{"Add":" let channel = txn.write().open_or_create_channel(\"main\")?;"},{"Add":" txn.write().add_file(\"file\", 0)?;"},{"Add":" txn.write().add_file(\"file2\", 0)?;"},{"Add":" let h0 = record_all(&repo, &store, &txn, &channel, \"\")?;"},{"Add":" let change0 = store.get_change(&h0).unwrap();"},{"Add":" text_test(&store, &change0, h0);"},{"Add":""},{"Add":" write!(repo.write_file(\"file\")?, \"a\\nx\\nc\\ne\\ny\\nf\\n\")?;"},{"Add":""},{"Add":" let h1 = record_all(&repo, &store, &txn, &channel, \"\")?;"},{"Add":" let change1 = store.get_change(&h1).unwrap();"},{"Add":" text_test(&store, &change1, h1);"},{"Add":""},{"Add":" repo.remove_path(\"file2\", false)?;"},{"Add":" let h2 = record_all(&repo, &store, &txn, &channel, \"\")?;"},{"Add":" let change2 = store.get_change(&h2).unwrap();"},{"Add":" text_test(&store, &change2, h2);"},{"Add":""},{"Add":" repo.rename(\"file\", \"file3\")?;"},{"Add":" txn.write().move_file(\"file\", \"file3\", 0)?;"},{"Add":" let h3 = record_all(&repo, &store, &txn, &channel, \"\")?;"},{"Add":" let change3 = store.get_change(&h3).unwrap();"},{"Add":" text_test(&store, &change3, h3);"},{"Add":""},{"Add":" // name conflicts"},{"Add":" let env2 = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let txn2 = env2.arc_txn_begin().unwrap();"},{"Add":" let channel2 = txn2.write().open_or_create_channel(\"main\")?;"},{"Add":" let repo2 = working_copy::memory::Memory::new();"},{"Add":" apply::apply_change(&store, &mut *txn2.write(), &mut *channel2.write(), &h0)?;"},{"Add":" apply::apply_change(&store, &mut *txn2.write(), &mut *channel2.write(), &h1)?;"},{"Add":" apply::apply_change(&store, &mut *txn2.write(), &mut *channel2.write(), &h2)?;"},{"Add":" output::output_repository_no_pending(&repo2, &store, &txn2, &channel2, \"\", true, None, 1, 0)?;"},{"Add":" repo2.rename(\"file\", \"file4\")?;"},{"Add":" txn2.write().move_file(\"file\", \"file4\", 0)?;"},{"Add":" record_all(&repo2, &store, &txn2, &channel2, \"\")?;"},{"Add":""},{"Add":" apply::apply_change(&store, &mut *txn2.write(), &mut *channel2.write(), &h3)?;"},{"Add":" output::output_repository_no_pending(&repo2, &store, &txn2, &channel2, \"\", true, None, 1, 0)?;"},{"Add":" let h = record_all(&repo2, &store, &txn2, &channel2, \"\")?;"},{"Add":" let solution = store.get_change(&h).unwrap();"},{"Add":" text_test(&store, &solution, h);"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"fn text_test(c: &C, change0: &Change, h: Hash) {"},{"Add":" let mut v = Vec::new();"},{"Add":" // let channel = channel.borrow();"},{"Add":" change0.write(c, Some(h), true, &mut v).unwrap();"},{"Add":""},{"Add":" println!(\"{}\", String::from_utf8_lossy(&v));"},{"Add":""},{"Add":" for i in std::str::from_utf8(&v).unwrap().lines() {"},{"Add":" debug!(\"{}\", i);"},{"Add":" }"},{"Add":" let change1 = Change::read(std::io::Cursor::new(&v[..]), &mut HashMap::default()).unwrap();"},{"Add":" if change0.header != change1.header {"},{"Add":" error!(\"header: {:#?} != {:#?}\", change0.header, change1.header);"},{"Add":" }"},{"Add":" if change0.dependencies != change1.dependencies {"},{"Add":" error!("},{"Add":" \"deps: {:#?} != {:#?}\","},{"Add":" change0.dependencies, change1.dependencies"},{"Add":" );"},{"Add":" }"},{"Add":" if change0.extra_known != change1.extra_known {"},{"Add":" error!("},{"Add":" \"extra: {:#?} != {:#?}\","},{"Add":" change0.extra_known, change1.extra_known"},{"Add":" );"},{"Add":" }"},{"Add":" if change0.metadata != change1.metadata {"},{"Add":" error!(\"meta: {:#?} != {:#?}\", change0.metadata, change1.metadata);"},{"Add":" }"},{"Add":" if change0.changes != change1.changes {"},{"Add":" if change0.changes.len() != change1.changes.len() {"},{"Add":" trace!(\"change0.changes = {:#?}\", change0.changes);"},{"Add":" trace!(\"change1.changes = {:#?}\", change1.changes);"},{"Add":" } else {"},{"Add":" for (a, b) in change0.changes.iter().zip(change1.changes.iter()) {"},{"Add":" trace!(\"change0: {:#?}\", a);"},{"Add":" trace!(\"change1: {:#?}\", b);"},{"Add":" for (a, b) in a.iter().zip(b.iter()) {"},{"Add":" if a != b {"},{"Add":" error!(\"change0 -> {:#?}\", a);"},{"Add":" error!(\"change1 -> {:#?}\", b);"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" if change0.contents != change1.contents {"},{"Add":" error!(\"change0.contents = {:?}\", change0.contents);"},{"Add":" error!(\"change1.contents = {:?}\", change1.contents);"},{"Add":" }"},{"Add":" assert_eq!(change0, &change1);"},{"Add":"}"},{"Add":""},{"Add":"quickcheck! {"},{"Add":" fn string_roundtrip(s1: String) -> () {"},{"Add":" let mut w = Vec::new();"},{"Add":" write!(&mut w, \"{}\", Escaped(&s1)).unwrap();"},{"Add":" let utf = std::str::from_utf8(&w).unwrap();"},{"Add":" let (_, s2) = parse_string(&utf).unwrap();"},{"Add":" assert_eq!(s1, s2);"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"#[cfg(feature = \"text-changes\")]"},{"Add":"fn hunk_roundtrip_test() {"},{"Add":" fn go(hunk: PrintableHunk) {"},{"Add":" let mut w = Vec::new();"},{"Add":" hunk.write(&mut &mut w).unwrap();"},{"Add":" let s = std::str::from_utf8(&w).unwrap();"},{"Add":" match parse_hunk(&s) {"},{"Add":" Ok((_, hunk2)) => {"},{"Add":" if hunk != hunk2 {"},{"Add":" eprintln!(\"## Hunk: \\n\\n{}\", s);"},{"Add":" eprintln!(\"In: {:?}\\n\\nOut: {:?}\\n\", hunk, hunk2);"},{"Add":" panic!(\"Hunks don't match.\");"},{"Add":" }"},{"Add":" }"},{"Add":" Err(e) => {"},{"Add":" eprintln!(\"Hunk: \\n\\n{}\", s);"},{"Add":" panic!(\"Can't parse hunk. Error: {:?}\", e);"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" // Create a new thread with custom stack size"},{"Add":" std::thread::Builder::new()"},{"Add":" // frequently blown by shrinking :("},{"Add":" // You can disable shrinking by commenting out the shrink function"},{"Add":" // for PrintableHunk"},{"Add":" .stack_size(20 * 1024 * 1024)"},{"Add":" .spawn(move || {"},{"Add":" quickcheck::QuickCheck::new()"},{"Add":" .tests(1000)"},{"Add":" .gen(quickcheck::Gen::new(3))"},{"Add":" .max_tests(100000000)"},{"Add":" .quickcheck(go as fn(PrintableHunk) -> ());"},{"Add":" })"},{"Add":" .unwrap()"},{"Add":" .join()"},{"Add":" .unwrap();"},{"Add":"}"}]}},{"Edit":{"inode":{"change":49,"pos":289338},"path":"libpijul/src/tests/mod.rs","line":22,"atom":{"NewVertex":{"up_context":[{"change":51,"pos":842}],"down_context":[{"change":7,"pos":19976}],"flag":"BLOCK","start":8979,"end":8997,"inode":{"change":49,"pos":289338}}},"contents":[{"Add":"mod text_changes;"}]}},{"Edit":{"inode":{"change":49,"pos":525242},"path":"libpijul/src/pristine/vertex.rs","line":3,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":7480}],"down_context":[{"change":49,"pos":525323}],"flag":"BLOCK","start":8998,"end":9045,"inode":{"change":49,"pos":525242}}},"contents":[{"Add":"#[cfg(test)]"},{"Add":"use quickcheck::{Arbitrary, Gen};"}]}},{"Edit":{"inode":{"change":49,"pos":525242},"path":"libpijul/src/pristine/vertex.rs","line":113,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":56549}],"down_context":[{"change":7,"pos":56549}],"flag":"BLOCK","start":9046,"end":9191,"inode":{"change":49,"pos":525242}}},"contents":[{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"#[cfg(test)]"},{"Add":"impl Arbitrary for ChangePosition {"},{"Add":" fn arbitrary(g: &mut Gen) -> Self {"},{"Add":" ChangePosition(L64(u64::arbitrary(g)))"}]}},{"Edit":{"inode":{"change":49,"pos":525242},"path":"libpijul/src/pristine/vertex.rs","line":121,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":56555}],"down_context":[{"change":7,"pos":56555}],"flag":"BLOCK","start":9192,"end":9324,"inode":{"change":49,"pos":525242}}},"contents":[{"Add":" fn shrink(&self) -> Box> {"},{"Add":" Box::new(self.0 .0.shrink().map(|x| ChangePosition(L64(x))))"},{"Add":" }"}]}},{"Edit":{"inode":{"change":49,"pos":717381},"path":"libpijul/src/lib.rs","line":13,"atom":{"NewVertex":{"up_context":[{"change":49,"pos":717605}],"down_context":[{"change":49,"pos":717605}],"flag":"BLOCK","start":9325,"end":9376,"inode":{"change":49,"pos":717381}}},"contents":[{"Add":"#[cfg(test)]"},{"Add":"#[macro_use]"},{"Add":"extern crate quickcheck;"}]}},{"Edit":{"inode":{"change":7,"pos":12027},"path":"libpijul/src/chardetng/mod.rs","line":2917,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":126524}],"down_context":[{"change":7,"pos":128268}],"flag":"BLOCK","start":9377,"end":9963,"inode":{"change":7,"pos":12027}}},"contents":[{"Add":" }"},{"Add":""},{"Add":" /// Get a valid encoding. This is checked by round-tripping the encoding on `buffer`."},{"Add":" /// TODO: This is a hack. Make it better. Make it faster."},{"Add":" pub fn get_valid("},{"Add":" &self,"},{"Add":" tld: Option<&[u8]>,"},{"Add":" allow_utf8: bool,"},{"Add":" buffer: &[u8],"},{"Add":" ) -> Option<&'static Encoding> {"},{"Add":" if let (encoding, true) = self.guess_assess(tld, allow_utf8) {"},{"Add":" if let (s, e, false) = encoding.decode(buffer) {"},{"Add":" if encoding.encode(&s).0 == buffer {"},{"Add":" return Some(e);"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" None"}]}},{"Edit":{"inode":{"change":49,"pos":831311},"path":"libpijul/src/change.rs","line":11,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":36085}],"down_context":[{"change":7,"pos":36085}],"flag":"BLOCK","start":9964,"end":10056,"inode":{"change":49,"pos":831311}}},"contents":[{"Add":"#[cfg(feature = \"text-changes\")]"},{"Add":"mod parse;"},{"Add":"#[cfg(feature = \"text-changes\")]"},{"Add":"mod printable;"}]}},{"Edit":{"inode":{"change":49,"pos":831311},"path":"libpijul/src/change.rs","line":17,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":36136}],"down_context":[{"change":7,"pos":88785}],"flag":"BLOCK","start":10057,"end":10127,"inode":{"change":49,"pos":831311}}},"contents":[{"Add":"pub use parse::*; // for testing"},{"Add":"pub use printable::*; // for testing"}]}},{"Edit":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":4,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":38111},"to":{"change":7,"start":2436,"end":2458},"introduced_by":7}],"inode":{"change":7,"pos":37976}}},"contents":[{"Del":"\nuse regex::Captures;\n"}]}},{"Edit":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":6,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":1716}],"down_context":[{"change":7,"pos":1716}],"flag":"BLOCK","start":10128,"end":10190,"inode":{"change":7,"pos":37976}}},"contents":[{"Add":"use crate::change::parse::*;"},{"Add":"use crate::change::printable::*;"}]}},{"Edit":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":16,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":38280}],"down_context":[{"change":7,"pos":0}],"flag":"BLOCK","start":10191,"end":10271,"inode":{"change":7,"pos":37976}}},"contents":[{"Add":" #[error(transparent)]"},{"Add":" Nom(#[from] nom::Err>),"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":169,"ins":{"up_context":[{"change":7,"pos":43112}],"down_context":[{"change":7,"pos":122912}],"flag":"BLOCK","start":10272,"end":10351,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":43112},"to":{"change":7,"start":43112,"end":43188},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" let (mut change, extra_dependencies) = Self::read_new(r, updatables)?;"}],"del_contents":[{"Del":" let (mut change, extra_dependencies) = Self::read_(r, updatables)?;\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":182,"ins":{"up_context":[{"change":7,"pos":43584}],"down_context":[{"change":7,"pos":43626}],"flag":"BLOCK","start":10352,"end":10397,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":43584},"to":{"change":7,"start":43584,"end":43626},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" Ok(Self::read_new(r, updatables)?.0)"}],"del_contents":[{"Del":" Ok(Self::read_(r, updatables)?.0)\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":185,"ins":{"up_context":[{"change":7,"pos":43633}],"down_context":[{"change":7,"pos":43659}],"flag":"BLOCK","start":10398,"end":10427,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":43633},"to":{"change":7,"start":43633,"end":43659},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" fn read_new("}],"del_contents":[{"Del":" fn read_(\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":189,"ins":{"up_context":[{"change":7,"pos":43792}],"down_context":[{"change":7,"pos":43885}],"flag":"BLOCK","start":10428,"end":11345,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":43792},"to":{"change":7,"start":43792,"end":43885},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" // read the data"},{"Add":" // TODO: make this streaming"},{"Add":" let mut s = String::new();"},{"Add":" r.read_to_string(&mut s)?;"},{"Add":" let i = &s;"},{"Add":""},{"Add":" // parse header"},{"Add":" let (i, m_header) = parse_header(i).map_err(|e| e.to_owned())?;"},{"Add":" let header = m_header?;"},{"Add":" dbg!(&header);"},{"Add":""},{"Add":" // parse dependencies"},{"Add":" let (i, deps) = parse_dependencies(i).map_err(|e| e.to_owned())?;"},{"Add":" dbg!(&deps);"},{"Add":""},{"Add":" // parse hunks"},{"Add":" let (_, hunks) = parse_hunks(i).map_err(|e| e.to_owned())?;"},{"Add":" dbg!(&hunks);"},{"Add":""},{"Add":" Change::update(header, deps, hunks, updatables)"},{"Add":" }"},{"Add":""},{"Add":" fn update("},{"Add":" header: ChangeHeader,"},{"Add":" dependencies: Vec,"},{"Add":" hunks: Vec<(u64, PrintableHunk)>,"},{"Add":" updatables: &mut HashMap,"},{"Add":" ) -> Result<(Self, HashSet), TextDeError> {"},{"Add":" // TODO: get rid of this whole default change if possible"}],"del_contents":[{"Del":" use self::text_changes::*;\n let mut section = Section::Header(String::new());\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":222,"ins":{"up_context":[{"change":7,"pos":44023}],"down_context":[{"change":7,"pos":44256}],"flag":"BLOCK","start":11346,"end":11370,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":44023},"to":{"change":7,"start":44023,"end":44256},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" header,"}],"del_contents":[{"Del":" header: ChangeHeader {\n authors: Vec::new(),\n message: String::new(),\n description: None,\n timestamp: chrono::Utc::now(),\n },\n"}]}},{"Edit":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":231,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":44550},"to":{"change":7,"start":44550,"end":45553},"introduced_by":7}],"inode":{"change":7,"pos":37976}}},"contents":[{"Del":" };\n let conclude_section = |change: &mut Change,\n section: Section,\n contents: &mut Vec|\n -> Result<(), TextDeError> {\n match section {\n Section::Header(ref s) => {\n debug!(\"header = {:?}\", s);\n change.header = toml::de::from_str(&s)?;\n Ok(())\n }\n Section::Deps => Ok(()),\n Section::Changes {\n mut changes,\n current,\n ..\n } => {\n if has_newvertices(¤t) {\n contents.push(0)\n }\n if let Some(c) = current {\n debug!(\"next action = {:?}\", c);\n changes.push(c)\n }\n change.changes = changes;\n Ok(())\n }\n }\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":232,"ins":{"up_context":[{"change":7,"pos":45564}],"down_context":[{"change":7,"pos":89272}],"flag":"BLOCK","start":11371,"end":11404,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":45564},"to":{"change":7,"start":45564,"end":45638},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":""},{"Add":" // process dependencies"}],"del_contents":[{"Del":" let mut h = String::new();\n let mut contents = Vec::new();\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":236,"ins":{"up_context":[{"change":7,"pos":89372}],"down_context":[{"change":7,"pos":46674}],"flag":"BLOCK","start":11405,"end":11691,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":7,"pos":89372},"to":{"change":7,"start":45730,"end":45994},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":45730},"to":{"change":7,"start":45730,"end":45994},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":45994},"to":{"change":7,"start":8546,"end":8592},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":8592},"to":{"change":7,"start":46042,"end":46248},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":46042},"to":{"change":7,"start":46042,"end":46248},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":46248},"to":{"change":7,"start":89373,"end":89426},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":89426},"to":{"change":7,"start":46297,"end":46674},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":46297},"to":{"change":7,"start":46297,"end":46674},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" for dep in dependencies {"},{"Add":" let hash = Hash::from_base32(dep.hash.as_bytes()).unwrap();"},{"Add":" match dep.type_ {"},{"Add":" DepType::Numbered(n, false) => {"},{"Add":" change.hashed.dependencies.push(hash);"},{"Add":" deps.insert(n, hash);"}],"del_contents":[{"Del":" while r.read_line(&mut h)? > 0 {\n debug!(\"h = {:?}\", h);\n if h == Self::DEPS_LINE {\n let section = std::mem::replace(&mut section, Section::Deps);\n conclude_section(&mut change, section, &mut contents)?;\n"},{"Del":" } else if h == Self::HUNKS_LINE {\n"},{"Del":" let section = std::mem::replace(\n &mut section,\n Section::Changes {\n changes: Vec::new(),\n current: None,\n"},{"Del":" offsets: HashMap::default(),\n"},{"Del":" },\n );\n conclude_section(&mut change, section, &mut contents)?;\n } else {\n use regex::Regex;\n lazy_static! {\n static ref DEPS: Regex = Regex::new(r#\"\\[(\\d*|\\*)\\](\\+| ) *(\\S*)\"#).unwrap();\n static ref KNOWN: Regex = Regex::new(r#\"(\\S*)\"#).unwrap();\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":243,"ins":{"up_context":[{"change":7,"pos":46692}],"down_context":[{"change":7,"pos":48064}],"flag":"BLOCK","start":11692,"end":12013,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":46692},"to":{"change":7,"start":46692,"end":47781},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":47781},"to":{"change":7,"start":8593,"end":8689},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":8689},"to":{"change":7,"start":47879,"end":48064},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":47879},"to":{"change":7,"start":47879,"end":48064},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" DepType::Numbered(n, true) => {"},{"Add":" deps.insert(n, hash);"},{"Add":" }"},{"Add":" DepType::ExtraKnown => {"},{"Add":" change.hashed.extra_known.push(hash);"},{"Add":" }"},{"Add":" DepType::ExtraUnknown => {"},{"Add":" extra_dependencies.insert(hash);"}],"del_contents":[{"Del":" match section {\n Section::Header(ref mut s) => s.push_str(&h),\n Section::Deps => {\n if let Some(d) = DEPS.captures(&h) {\n let hash = Hash::from_base32(d[3].as_bytes()).unwrap();\n if let Ok(n) = d[1].parse() {\n if &d[2] == \" \" {\n change.hashed.dependencies.push(hash);\n }\n deps.insert(n, hash);\n } else if &d[1] == \"*\" {\n change.hashed.extra_known.push(hash);\n } else {\n extra_dependencies.insert(hash);\n }\n }\n }\n Section::Changes {\n ref mut current,\n ref mut changes,\n ref mut offsets,\n } => {\n if let Some(next) =\n"},{"Del":" Hunk::read(updatables, current, &mut contents, &deps, offsets, &h)?\n"},{"Del":" {\n debug!(\"next action = {:?}\", next);\n changes.push(next)\n }\n }\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":253,"ins":{"up_context":[{"change":7,"pos":48096}],"down_context":[{"change":7,"pos":48119}],"flag":"BLOCK","start":12014,"end":12333,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":48096},"to":{"change":7,"start":48096,"end":48119},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" }"},{"Add":""},{"Add":" // process hunks"},{"Add":" let mut contents = Vec::new();"},{"Add":" let mut offsets = HashMap::default();"},{"Add":" for (n, hunk) in hunks {"},{"Add":" let res ="},{"Add":" Hunk::from_printable(updatables, &mut contents, &deps, &mut offsets, (n, hunk))?;"},{"Add":" change.hashed.changes.push(res);"}],"del_contents":[{"Del":" h.clear();\n"}]}},{"Edit":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":263,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":48129},"to":{"change":7,"start":48129,"end":48193},"introduced_by":7}],"inode":{"change":7,"pos":37976}}},"contents":[{"Del":" conclude_section(&mut change, section, &mut contents)?;\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":273,"ins":{"up_context":[{"change":7,"pos":3140}],"down_context":[{"change":7,"pos":127}],"flag":"BLOCK","start":12334,"end":12621,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":3140},"to":{"change":7,"start":3140,"end":3177},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":"pub fn to_printable_new_vertex("},{"Add":" atom: &Atom>,"},{"Add":" hashes: &HashMap,"},{"Add":") -> PrintableNewVertex {"},{"Add":" if let PrintableAtom::NewVertex(v) = to_printable_atom(atom, hashes) {"},{"Add":" v"},{"Add":" } else {"},{"Add":" panic!(\"PrintableAtom::NewVertex expected here\")"},{"Add":" }"},{"Add":"}"}],"del_contents":[{"Del":"const BINARY_LABEL: &str = \"binary\";\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":284,"ins":{"up_context":[{"change":7,"pos":128}],"down_context":[{"change":7,"pos":157}],"flag":"BLOCK","start":12622,"end":12899,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":128},"to":{"change":7,"start":128,"end":157},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":"pub fn to_printable_edge_map("},{"Add":" atom: &Atom>,"},{"Add":" hashes: &HashMap,"},{"Add":") -> Vec {"},{"Add":" if let PrintableAtom::Edges(v) = to_printable_atom(atom, hashes) {"},{"Add":" v"},{"Add":" } else {"},{"Add":" panic!(\"PrintableAtom::Edges expected here\")"},{"Add":" }"},{"Add":"}"}],"del_contents":[{"Del":"struct Escaped<'a>(&'a str);\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":295,"ins":{"up_context":[{"change":7,"pos":158}],"down_context":[{"change":7,"pos":599}],"flag":"BLOCK","start":12900,"end":14315,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":158},"to":{"change":7,"start":158,"end":599},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":"/// Panics if the Atom is not an EdgeMap"},{"Add":"fn to_printable_atom(atom: &Atom>, hashes: &HashMap) -> PrintableAtom {"},{"Add":" match atom {"},{"Add":" Atom::NewVertex(ref new_vertex) => PrintableAtom::NewVertex(PrintableNewVertex {"},{"Add":" up_context: new_vertex"},{"Add":" .up_context"},{"Add":" .iter()"},{"Add":" .map(|c| to_printable_pos(hashes, *c))"},{"Add":" .collect(),"},{"Add":" start: new_vertex.start.0 .0,"},{"Add":" end: new_vertex.end.0 .0,"},{"Add":" down_context: new_vertex"},{"Add":" .down_context"},{"Add":" .iter()"},{"Add":" .map(|c| to_printable_pos(hashes, *c))"},{"Add":" .collect(),"},{"Add":" }),"},{"Add":" Atom::EdgeMap(ref edge_map) => PrintableAtom::Edges("},{"Add":" edge_map"},{"Add":" .edges"},{"Add":" .iter()"},{"Add":" .map(|c| PrintableEdge {"},{"Add":" previous: PrintableEdgeFlags::from(c.previous),"},{"Add":" flag: PrintableEdgeFlags::from(c.flag),"},{"Add":" from: to_printable_pos(hashes, c.from),"},{"Add":" to_start: to_printable_pos(hashes, c.to.start_pos()),"},{"Add":" to_end: c.to.end.0 .0,"},{"Add":" introduced_by: *hashes.get(&c.introduced_by.unwrap()).unwrap_or_else(|| {"},{"Add":" panic!(\"introduced_by = {:?}, not found\", c.introduced_by)"},{"Add":" }),"},{"Add":" })"},{"Add":" .collect(),"},{"Add":" ),"}],"del_contents":[{"Del":"impl<'a> std::fmt::Display for Escaped<'a> {\n fn fmt(&self, fmt: &mut std::fmt::Formatter) -> std::fmt::Result {\n write!(fmt, \"\\\"\")?;\n for c in self.0.chars() {\n if c == '\"' {\n write!(fmt, \"\\\\{}\", c)?\n } else if c == '\\\\' {\n write!(fmt, \"\\\\\\\\\")?\n } else {\n write!(fmt, \"{}\", c)?\n }\n }\n write!(fmt, \"\\\"\")?;\n Ok(())\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":331,"ins":{"up_context":[{"change":7,"pos":608}],"down_context":[{"change":7,"pos":1174}],"flag":"BLOCK","start":14316,"end":14991,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":608},"to":{"change":7,"start":608,"end":1174},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":"fn from_printable_edge_map("},{"Add":" edges: &[PrintableEdge],"},{"Add":" changes: &HashMap,"},{"Add":") -> Result>>, TextDeError> {"},{"Add":" let mut res = Vec::new();"},{"Add":" for edge in edges {"},{"Add":" let Position { change, pos } = from_printable_pos(changes, edge.to_start)?;"},{"Add":" res.push(NewEdge {"},{"Add":" previous: edge.previous.to(),"},{"Add":" flag: edge.flag.to(),"},{"Add":" from: from_printable_pos(changes, edge.from)?,"},{"Add":" to: Vertex {"},{"Add":" change,"},{"Add":" start: pos,"},{"Add":" end: ChangePosition(L64(edge.to_end)),"},{"Add":" },"},{"Add":" introduced_by: change_ref(changes, edge.introduced_by)?,"},{"Add":" })"}],"del_contents":[{"Del":"fn unescape(s: &str) -> std::borrow::Cow {\n let mut b = 0;\n let mut result = String::new();\n let mut ch = s.chars();\n while let Some(c) = ch.next() {\n if c == '\\\\' {\n if result.is_empty() {\n result = s.split_at(b).0.to_string();\n }\n if let Some(c) = ch.next() {\n result.push(c)\n }\n } else if !result.is_empty() {\n result.push(c)\n }\n b += c.len_utf8()\n }\n if result.is_empty() {\n s.into()\n } else {\n result.into()\n"}]}},{"Edit":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":350,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":1180}],"down_context":[{"change":7,"pos":1180}],"flag":"BLOCK","start":14992,"end":15004,"inode":{"change":7,"pos":37976}}},"contents":[{"Add":" Ok(res)"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":359,"ins":{"up_context":[{"change":7,"pos":48744}],"down_context":[{"change":7,"pos":48762}],"flag":"BLOCK","start":15005,"end":15024,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":48744},"to":{"change":7,"start":2690,"end":2713},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" w: &mut W,"}],"del_contents":[{"Del":" mut w: &mut W,\n"}]}},{"Edit":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":361,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":48808},"to":{"change":7,"start":1183,"end":1287},"introduced_by":7}],"inode":{"change":7,"pos":37976}}},"contents":[{"Del":"\n // let file_name = |local: &Local, _| -> String { format!(\"{}:{}\", local.path, local.line) };\n\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":367,"ins":{"up_context":[{"change":7,"pos":2757}],"down_context":[{"change":7,"pos":4770}],"flag":"BLOCK","start":15025,"end":15059,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2757},"to":{"change":7,"start":2757,"end":2798},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" metadata,"}],"del_contents":[{"Del":" metadata: perms,\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":370,"ins":{"up_context":[{"change":2,"pos":100}],"down_context":[{"change":7,"pos":49991}],"flag":"BLOCK","start":15060,"end":15578,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":2,"pos":100},"to":{"change":7,"start":1482,"end":1537},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":7,"pos":2860},"to":{"change":7,"start":1482,"end":1537},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":49359},"to":{"change":7,"start":1482,"end":1537},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1537},"to":{"change":7,"start":1288,"end":1411},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":1411},"to":{"change":7,"start":1644,"end":1944},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1644},"to":{"change":7,"start":1644,"end":1944},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":1944},"to":{"change":7,"start":49438,"end":49991},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":49438},"to":{"change":7,"start":49438,"end":49991},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" PrintableHunk::FileMoveV {"},{"Add":" path: path.to_string(),"},{"Add":" name: name.to_string(),"},{"Add":" perms: PrintablePerms::from_metadata(metadata),"},{"Add":" pos: to_printable_pos(hashes, del.inode()),"},{"Add":" up_context: to_printable_pos_vec(hashes, &add.up_context),"},{"Add":" down_context: to_printable_pos_vec(hashes, &add.down_context),"},{"Add":" del: to_printable_edge_map(del, hashes),"}],"del_contents":[{"Del":" write!(\n w,\n"},{"Del":" \"Moved: {} {} {}\",\n Escaped(&path),\n Escaped(&name),\n"},{"Del":" if perms.0 & 0o1000 == 0o1000 {\n \"+dx \"\n } else if perms.0 & 0o100 == 0o100 {\n \"+x \"\n } else {\n \"\"\n }\n )?;\n"},{"Del":" write_pos(&mut w, hashes, del.inode())?;\n writeln!(w)?;\n write_atom(&mut w, hashes, &del)?;\n\n write!(w, \"up\")?;\n for c in add.up_context.iter() {\n write!(w, \" \")?;\n write_pos(&mut w, hashes, *c)?\n }\n write!(w, \", down\")?;\n for c in add.down_context.iter() {\n write!(w, \" \")?;\n write_pos(&mut w, hashes, *c)?\n"}]}},{"Edit":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":379,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":50013},"to":{"change":7,"start":50013,"end":50054},"introduced_by":7}],"inode":{"change":7,"pos":37976}}},"contents":[{"Del":" w.write_all(b\"\\n\")?;\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":380,"ins":{"up_context":[{"change":7,"pos":50072}],"down_context":[{"change":7,"pos":50387}],"flag":"BLOCK","start":15579,"end":15891,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":50072},"to":{"change":7,"start":50072,"end":50387},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" Atom::EdgeMap(_) => PrintableHunk::FileMoveE {"},{"Add":" path: path.to_string(),"},{"Add":" pos: to_printable_pos(hashes, del.inode()),"},{"Add":" add: to_printable_edge_map(add, hashes),"},{"Add":" del: to_printable_edge_map(del, hashes),"},{"Add":" },"}],"del_contents":[{"Del":" Atom::EdgeMap(_) => {\n write!(w, \"Moved: {:?} \", path)?;\n write_pos(&mut w, hashes, del.inode())?;\n writeln!(w)?;\n write_atom(&mut w, hashes, &add)?;\n write_atom(&mut w, hashes, &del)?;\n }\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":394,"ins":{"up_context":[{"change":7,"pos":269}],"down_context":[{"change":7,"pos":110}],"flag":"BLOCK","start":15892,"end":16243,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":269},"to":{"change":7,"start":1412,"end":1477},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":1477},"to":{"change":7,"start":50578,"end":50635},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":5011},"to":{"change":7,"start":50578,"end":50635},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":105716},"to":{"change":7,"start":50578,"end":50635},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":50578},"to":{"change":7,"start":50578,"end":50635},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":50635},"to":{"change":7,"start":45,"end":110},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" let (contents_data, content_edges) = if let Some(ref c) = contents {"},{"Add":" ("},{"Add":" get_change_contents(changes, c, change_contents)?,"},{"Add":" to_printable_edge_map(c, hashes),"},{"Add":" )"},{"Add":" } else {"},{"Add":" (Vec::new(), Vec::new())"},{"Add":" };"}],"del_contents":[{"Del":" write!(w, \"File deletion: {} \", Escaped(path))?;\n"},{"Del":" write_pos(&mut w, hashes, del.inode())?;\n"},{"Del":" writeln!(w, \" {:?}\", encoding_label(encoding))?;\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":403,"ins":{"up_context":[{"change":7,"pos":111}],"down_context":[{"change":7,"pos":51012}],"flag":"BLOCK","start":16244,"end":16603,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":7,"pos":111},"to":{"change":7,"start":50665,"end":50865},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":50665},"to":{"change":7,"start":50665,"end":50865},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":50865},"to":{"change":7,"start":5012,"end":5105},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":2549},"to":{"change":7,"start":50953,"end":51012},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":2797},"to":{"change":7,"start":50953,"end":51012},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":5105},"to":{"change":7,"start":50953,"end":51012},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":50953},"to":{"change":7,"start":50953,"end":51012},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" PrintableHunk::FileDel {"},{"Add":" path: path.to_string(),"},{"Add":" pos: to_printable_pos(hashes, del.inode()),"},{"Add":" encoding: encoding.clone(),"},{"Add":" del_edges: to_printable_edge_map(del, hashes),"},{"Add":" content_edges: content_edges,"},{"Add":" contents: contents_data,"}],"del_contents":[{"Del":" write_atom(&mut w, hashes, &del)?;\n if let Some(ref contents) = contents {\n write_atom(&mut w, hashes, &contents)?;\n writeln!(w)?;\n"},{"Del":" print_change_contents(w, changes, contents, change_contents, encoding)?;\n"},{"Del":" } else {\n writeln!(w)?;\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":419,"ins":{"up_context":[{"change":7,"pos":308}],"down_context":[{"change":7,"pos":51572}],"flag":"BLOCK","start":16604,"end":16866,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":308},"to":{"change":7,"start":1478,"end":1546},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":1546},"to":{"change":7,"start":51227,"end":51286},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":5322},"to":{"change":7,"start":51227,"end":51286},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":105779},"to":{"change":7,"start":51227,"end":51286},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":51227},"to":{"change":7,"start":51227,"end":51286},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":51286},"to":{"change":7,"start":160,"end":225},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":225},"to":{"change":7,"start":51316,"end":51484},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":51316},"to":{"change":7,"start":51316,"end":51484},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":51484},"to":{"change":7,"start":5323,"end":5416},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" let (contents_data, content_edges) = if let Some(ref c) = contents {"},{"Add":" ("},{"Add":" get_change_contents(changes, c, change_contents)?,"},{"Add":" to_printable_edge_map(c, hashes),"},{"Add":" )"}],"del_contents":[{"Del":" write!(w, \"File un-deletion: {} \", Escaped(path))?;\n"},{"Del":" write_pos(&mut w, hashes, undel.inode())?;\n"},{"Del":" writeln!(w, \" {:?}\", encoding_label(encoding))?;\n"},{"Del":" write_atom(&mut w, hashes, &undel)?;\n if let Some(ref contents) = contents {\n write_atom(&mut w, hashes, &contents)?;\n"},{"Del":" print_change_contents(w, changes, contents, change_contents, encoding)?;\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":425,"ins":{"up_context":[{"change":7,"pos":51597}],"down_context":[{"change":7,"pos":51631}],"flag":"BLOCK","start":16867,"end":17299,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":51597},"to":{"change":7,"start":51597,"end":51631},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" (Vec::new(), Vec::new())"},{"Add":" };"},{"Add":""},{"Add":" PrintableHunk::FileUndel {"},{"Add":" path: path.to_string(),"},{"Add":" pos: to_printable_pos(hashes, undel.inode()),"},{"Add":" encoding: encoding.clone(),"},{"Add":" undel_edges: to_printable_edge_map(undel, hashes),"},{"Add":" content_edges: content_edges,"},{"Add":" contents: contents_data,"}],"del_contents":[{"Del":" writeln!(w)?;\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":448,"ins":{"up_context":[{"change":7,"pos":2940}],"down_context":[{"change":7,"pos":5417}],"flag":"BLOCK","start":17300,"end":17334,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2940},"to":{"change":7,"start":2940,"end":2981},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" metadata,"}],"del_contents":[{"Del":" metadata: perms,\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":451,"ins":{"up_context":[{"change":2,"pos":197}],"down_context":[{"change":7,"pos":52483}],"flag":"BLOCK","start":17335,"end":17495,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":2,"pos":197},"to":{"change":7,"start":52241,"end":52483},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":7,"pos":3043},"to":{"change":7,"start":52241,"end":52483},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":52241},"to":{"change":7,"start":52241,"end":52483},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":""},{"Add":" let contents = if let Some(Atom::NewVertex(ref n)) = contents {"},{"Add":" change_contents[n.start.us()..n.end.us()].to_vec()"}],"del_contents":[{"Del":" let parent = if let Some(p) = crate::path::parent(&path) {\n if p.is_empty() {\n \"/\"\n } else {\n p\n }\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":455,"ins":{"up_context":[{"change":7,"pos":52512}],"down_context":[{"change":7,"pos":52540}],"flag":"BLOCK","start":17496,"end":17531,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":52512},"to":{"change":7,"start":52512,"end":52540},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" Vec::new()"}],"del_contents":[{"Del":" \"/\"\n"}]}},{"Edit":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":457,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":52563},"to":{"change":7,"start":52563,"end":52618},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":52618},"to":{"change":7,"start":1547,"end":1693},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":1693},"to":{"change":7,"start":2070,"end":2320},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2070},"to":{"change":7,"start":2070,"end":2320},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2320},"to":{"change":7,"start":166,"end":193},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":193},"to":{"change":7,"start":2641,"end":2690},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":232},"to":{"change":7,"start":52730,"end":52754},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":2346},"to":{"change":7,"start":52730,"end":52754},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":2690},"to":{"change":7,"start":52730,"end":52754},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":3523},"to":{"change":7,"start":52730,"end":52754},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":52730},"to":{"change":7,"start":52730,"end":52754},"introduced_by":7}],"inode":{"change":7,"pos":37976}}},"contents":[{"Del":" write!(\n w,\n"},{"Del":" \"File addition: {} in {}{} \\\"{}\\\"\\n up\",\n Escaped(name),\n Escaped(parent),\n"},{"Del":" if perms.0 & 0o1000 == 0o1000 {\n \" +dx\"\n } else if perms.0 & 0o100 == 0o100 {\n \" +x\"\n } else {\n \"\"\n"},{"Del":" },\n"},{"Del":" encoding_label(encoding)\n"},{"Del":" )?;\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":458,"ins":{"up_context":[{"change":7,"pos":52810}],"down_context":[{"change":7,"pos":52957}],"flag":"BLOCK","start":17532,"end":18042,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":52810},"to":{"change":7,"start":52810,"end":52957},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":""},{"Add":" PrintableHunk::FileAddition {"},{"Add":" name: name.to_string(),"},{"Add":" parent: crate::path::parent(&path).unwrap_or(\"\").to_string(),"},{"Add":" perms: PrintablePerms::from_metadata(metadata),"},{"Add":" encoding: encoding.clone(),"},{"Add":" up_context: to_printable_pos_vec(hashes, &n.up_context),"},{"Add":" start: n.start.0 .0,"},{"Add":" end: n.end.0 .0,"},{"Add":" contents,"}],"del_contents":[{"Del":" for c in n.up_context.iter() {\n write!(w, \" \")?;\n write_pos(&mut w, hashes, *c)?\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":469,"ins":{"up_context":[{"change":7,"pos":52979}],"down_context":[{"change":7,"pos":53378}],"flag":"BLOCK","start":18043,"end":18200,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":52979},"to":{"change":7,"start":52979,"end":53131},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":53131},"to":{"change":7,"start":140788,"end":140860},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":140860},"to":{"change":7,"start":1177,"end":1235},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":448},"to":{"change":7,"start":53268,"end":53313},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":1235},"to":{"change":7,"start":53268,"end":53313},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":2930},"to":{"change":7,"start":53268,"end":53313},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":53268},"to":{"change":7,"start":53268,"end":53313},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":53313},"to":{"change":7,"start":123,"end":168},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":168},"to":{"change":7,"start":53356,"end":53378},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":53356},"to":{"change":7,"start":53356,"end":53378},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" } else {"},{"Add":" // TODO: should this panic?"},{"Add":" panic!(\"Invalid Hunk::FileAdd field add_name: {:?}\", add_name);"}],"del_contents":[{"Del":" writeln!(w, \", new {}:{}\", n.start.0, n.end.0)?;\n }\n if let Some(Atom::NewVertex(ref n)) = contents {\n"},{"Del":" let c = &change_contents[n.start.us()..n.end.us()];\n"},{"Del":" print_contents(w, \"+\", c, encoding)?;\n"},{"Del":" if !c.ends_with(b\"\\n\") {\n"},{"Del":" writeln!(w, \"\\n\\\\\")?\n"},{"Del":" }\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":480,"ins":{"up_context":[{"change":7,"pos":341}],"down_context":[{"change":7,"pos":53762}],"flag":"BLOCK","start":18201,"end":18605,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":341},"to":{"change":5,"start":106,"end":186},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":186},"to":{"change":7,"start":53536,"end":53596},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":7,"pos":1778},"to":{"change":7,"start":53536,"end":53596},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":53536},"to":{"change":7,"start":53536,"end":53596},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":53596},"to":{"change":7,"start":2809,"end":2872},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":2872},"to":{"change":7,"start":53596,"end":53680},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":53596},"to":{"change":7,"start":53596,"end":53680},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":53680},"to":{"change":7,"start":2873,"end":2960},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" PrintableHunk::Edit {"},{"Add":" path: local.path.clone(),"},{"Add":" line: local.line,"},{"Add":" pos: to_printable_pos(hashes, change.inode()),"},{"Add":" encoding: encoding.clone(),"},{"Add":" change: to_printable_atom(change, hashes),"},{"Add":" contents: get_change_contents(changes, change, change_contents)?,"},{"Add":" }"}],"del_contents":[{"Del":" write!(w, \"Edit in {}:{} \", Escaped(&local.path), local.line)?;\n"},{"Del":" write_pos(&mut w, hashes, change.inode())?;\n"},{"Del":" write!(w, \" {:?}\", encoding_label(encoding))?;\n"},{"Del":" writeln!(w)?;\n write_atom(&mut w, hashes, &change)?;\n"},{"Del":" print_change_contents(w, changes, change, change_contents, encoding)?;\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":496,"ins":{"up_context":[{"change":7,"pos":381}],"down_context":[{"change":7,"pos":55121}],"flag":"BLOCK","start":18606,"end":19301,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":381},"to":{"change":5,"start":187,"end":274},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":274},"to":{"change":7,"start":53990,"end":54050},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":7,"pos":1870},"to":{"change":7,"start":53990,"end":54050},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":53990},"to":{"change":7,"start":53990,"end":54050},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":54050},"to":{"change":7,"start":2988,"end":3051},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":3051},"to":{"change":7,"start":54050,"end":54193},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":54050},"to":{"change":7,"start":54050,"end":54193},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":54193},"to":{"change":7,"start":3052,"end":3231},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":3168},"to":{"change":7,"start":54362,"end":54376},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":3231},"to":{"change":7,"start":54362,"end":54376},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":54362},"to":{"change":7,"start":54362,"end":54376},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":54376},"to":{"change":7,"start":8955,"end":9011},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":9011},"to":{"change":7,"start":1871,"end":1948},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":1948},"to":{"change":7,"start":54504,"end":54753},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":54504},"to":{"change":7,"start":54504,"end":54753},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":54753},"to":{"change":7,"start":9012,"end":9070},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":9070},"to":{"change":7,"start":1949,"end":2029},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":2029},"to":{"change":7,"start":54886,"end":55121},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":54886},"to":{"change":7,"start":54886,"end":55121},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" PrintableHunk::Replace {"},{"Add":" path: local.path.clone(),"},{"Add":" line: local.line,"},{"Add":" pos: to_printable_pos(hashes, change.inode()),"},{"Add":" encoding: encoding.clone(),"},{"Add":" change: to_printable_edge_map(change, hashes),"},{"Add":" replacement: to_printable_new_vertex(replacement, hashes),"},{"Add":" change_contents: get_change_contents(changes, change, change_contents)?,"},{"Add":" replacement_contents: get_change_contents("},{"Add":" changes,"},{"Add":" replacement,"},{"Add":" change_contents,"},{"Add":" )?,"},{"Add":" }"}],"del_contents":[{"Del":" write!(w, \"Replacement in {}:{} \", Escaped(&local.path), local.line)?;\n"},{"Del":" write_pos(&mut w, hashes, change.inode())?;\n"},{"Del":" write!(w, \" {:?}\", encoding_label(encoding))?;\n"},{"Del":" writeln!(w)?;\n write_atom(&mut w, hashes, &change)?;\n write_atom(&mut w, hashes, &replacement)?;\n"},{"Del":" print_change_contents(w, changes, change, change_contents, encoding)?;\n print_change_contents(w, changes, replacement, change_contents, encoding)?;\n"},{"Del":" }\n"},{"Del":" Hunk::SolveNameConflict { name, path } => {\n"},{"Del":" write!(w, \"Solving a name conflict in {} \", Escaped(path))?;\n"},{"Del":" write_pos(&mut w, hashes, name.inode())?;\n write!(w, \": \")?;\n write_deleted_names(&mut w, changes, name)?;\n writeln!(w)?;\n write_atom(&mut w, hashes, &name)?;\n }\n"},{"Del":" Hunk::UnsolveNameConflict { name, path } => {\n"},{"Del":" write!(w, \"Un-solving a name conflict in {} \", Escaped(path))?;\n"},{"Del":" write_pos(&mut w, hashes, name.inode())?;\n write!(w, \": \")?;\n write_deleted_names(&mut w, changes, name)?;\n writeln!(w)?;\n write_atom(&mut w, hashes, &name)?;\n"}]}},{"Edit":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":511,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":55135}],"down_context":[{"change":7,"pos":9071}],"flag":"BLOCK","start":19302,"end":19944,"inode":{"change":7,"pos":37976}}},"contents":[{"Add":" Hunk::SolveNameConflict { name, path } => PrintableHunk::SolveNameConflict {"},{"Add":" path: path.clone(),"},{"Add":" pos: to_printable_pos(hashes, name.inode()),"},{"Add":" names: get_deleted_names(changes, name)?,"},{"Add":" edges: to_printable_edge_map(name, hashes),"},{"Add":" },"},{"Add":" Hunk::UnsolveNameConflict { name, path } => PrintableHunk::UnsolveNameConflict {"},{"Add":" path: path.clone(),"},{"Add":" pos: to_printable_pos(hashes, name.inode()),"},{"Add":" names: get_deleted_names(changes, name)?,"},{"Add":" edges: to_printable_edge_map(name, hashes),"},{"Add":" },"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":524,"ins":{"up_context":[{"change":7,"pos":9131}],"down_context":[{"change":7,"pos":55600}],"flag":"BLOCK","start":19945,"end":20558,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":7,"pos":9131},"to":{"change":7,"start":382,"end":430},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":55197},"to":{"change":7,"start":382,"end":430},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":430},"to":{"change":7,"start":55197,"end":55244},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":55197},"to":{"change":7,"start":55197,"end":55244},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":55244},"to":{"change":5,"start":275,"end":334},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":334},"to":{"change":7,"start":2093,"end":2167},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2093},"to":{"change":7,"start":2093,"end":2167},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":2167},"to":{"change":7,"start":55354,"end":55518},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":55354},"to":{"change":7,"start":55354,"end":55518},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":55518},"to":{"change":7,"start":3232,"end":3316},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" // TODO: pass in the encoding"},{"Add":" let contents = get_change_contents(changes, change, change_contents)?;"},{"Add":" let encoding = get_encoding(&contents);"},{"Add":" PrintableHunk::SolveOrderConflict {"},{"Add":" path: local.path.clone(),"},{"Add":" line: local.line,"},{"Add":" pos: to_printable_pos(hashes, change.inode()),"},{"Add":" encoding: encoding.clone(),"},{"Add":" change: to_printable_new_vertex(change, hashes),"},{"Add":" contents: get_change_contents(changes, change, change_contents)?,"},{"Add":" }"}],"del_contents":[{"Del":" debug!(\"solve order conflict\");\n"},{"Del":" write!(\n w,\n"},{"Del":" \"Solving an order conflict in {}:{} \",\n"},{"Del":" Escaped(&local.path),\n local.line,\n"},{"Del":" )?;\n write_pos(&mut w, hashes, change.inode())?;\n writeln!(w)?;\n write_atom(&mut w, hashes, &change)?;\n"},{"Del":" print_change_contents(w, changes, change, change_contents, &None)?;\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":537,"ins":{"up_context":[{"change":7,"pos":9194}],"down_context":[{"change":7,"pos":56084}],"flag":"BLOCK","start":20559,"end":21172,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":7,"pos":9194},"to":{"change":7,"start":431,"end":481},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":55678},"to":{"change":7,"start":431,"end":481},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":481},"to":{"change":7,"start":55678,"end":55725},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":55678},"to":{"change":7,"start":55678,"end":55725},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":55725},"to":{"change":5,"start":335,"end":397},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":397},"to":{"change":7,"start":2234,"end":2308},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2234},"to":{"change":7,"start":2234,"end":2308},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":2308},"to":{"change":7,"start":55838,"end":56002},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":55838},"to":{"change":7,"start":55838,"end":56002},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":56002},"to":{"change":7,"start":3317,"end":3401},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" // TODO: pass in the encoding"},{"Add":" let contents = get_change_contents(changes, change, change_contents)?;"},{"Add":" let encoding = get_encoding(&contents);"},{"Add":" PrintableHunk::UnsolveOrderConflict {"},{"Add":" path: local.path.clone(),"},{"Add":" line: local.line,"},{"Add":" pos: to_printable_pos(hashes, change.inode()),"},{"Add":" encoding: encoding.clone(),"},{"Add":" change: to_printable_edge_map(change, hashes),"},{"Add":" contents: get_change_contents(changes, change, change_contents)?,"},{"Add":" }"}],"del_contents":[{"Del":" debug!(\"unsolve order conflict\");\n"},{"Del":" write!(\n w,\n"},{"Del":" \"Un-solving an order conflict in {}:{} \",\n"},{"Del":" Escaped(&local.path),\n local.line,\n"},{"Del":" )?;\n write_pos(&mut w, hashes, change.inode())?;\n writeln!(w)?;\n write_atom(&mut w, hashes, &change)?;\n"},{"Del":" print_change_contents(w, changes, change, change_contents, &None)?;\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":553,"ins":{"up_context":[{"change":7,"pos":3512}],"down_context":[{"change":7,"pos":56569}],"flag":"BLOCK","start":21173,"end":21567,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":3512},"to":{"change":7,"start":3512,"end":3531},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":3531},"to":{"change":7,"start":482,"end":527},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":9253},"to":{"change":7,"start":482,"end":527},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":56158},"to":{"change":7,"start":482,"end":527},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":527},"to":{"change":7,"start":56158,"end":56205},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":56158},"to":{"change":7,"start":56158,"end":56205},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":56205},"to":{"change":7,"start":2309,"end":2368},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2368},"to":{"change":5,"start":398,"end":471},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":471},"to":{"change":7,"start":56309,"end":56389},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":7,"pos":2421},"to":{"change":7,"start":56309,"end":56389},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":56309},"to":{"change":7,"start":56309,"end":56389},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":56389},"to":{"change":7,"start":2422,"end":2487},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":2487},"to":{"change":7,"start":56389,"end":56473},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":3595},"to":{"change":7,"start":56389,"end":56473},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":56389},"to":{"change":7,"start":56389,"end":56473},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":56473},"to":{"change":7,"start":5445,"end":5532},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":3402},"to":{"change":7,"start":56555,"end":56569},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":3680},"to":{"change":7,"start":56555,"end":56569},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":5532},"to":{"change":7,"start":56555,"end":56569},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":56555},"to":{"change":7,"start":56555,"end":56569},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" } => PrintableHunk::ResurrectZombies {"},{"Add":" path: local.path.clone(),"},{"Add":" line: local.line,"},{"Add":" pos: to_printable_pos(hashes, change.inode()),"},{"Add":" encoding: encoding.clone(),"},{"Add":" change: to_printable_edge_map(change, hashes),"},{"Add":" contents: get_change_contents(changes, change, change_contents)?,"},{"Add":" },"}],"del_contents":[{"Del":" } => {\n"},{"Del":" debug!(\"resurrect zombies\");\n"},{"Del":" write!(\n w,\n"},{"Del":" \"Resurrecting zombie lines in {}:{} \",\n"},{"Del":" Escaped(&local.path),\n local.line\n"},{"Del":" )?;\n write_pos(&mut w, hashes, change.inode())?;\n"},{"Del":" write!(w, \" \\\"{}\\\"\", encoding_label(encoding))?;\n"},{"Del":" writeln!(w)?;\n write_atom(&mut w, hashes, &change)?;\n"},{"Del":" print_change_contents(w, changes, change, change_contents, encoding)?;\n"},{"Del":" }\n"}]}},{"Edit":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":562,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":56579}],"down_context":[{"change":7,"pos":56579}],"flag":"BLOCK","start":21568,"end":21588,"inode":{"change":7,"pos":37976}}},"contents":[{"Add":" .write(w)?;"}]}},{"Edit":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":567,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":3690},"to":{"change":7,"start":3690,"end":3839},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":3839},"to":{"change":7,"start":56594,"end":56603},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":56594},"to":{"change":7,"start":56594,"end":56603},"introduced_by":7}],"inode":{"change":7,"pos":37976}}},"contents":[{"Del":"fn encoding_label(encoding: &Option) -> &str {\n match encoding {\n Some(encoding) => encoding.label(),\n _ => BINARY_LABEL,\n"},{"Del":" }\n}\n\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":568,"ins":{"up_context":[{"change":7,"pos":9287}],"down_context":[{"change":7,"pos":56651}],"flag":"BLOCK","start":21589,"end":21612,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":7,"pos":9287},"to":{"change":7,"start":56638,"end":56651},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":56638},"to":{"change":7,"start":56638,"end":56651},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" fn from_printable("}],"del_contents":[{"Del":" fn read(\n"}]}},{"Edit":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":570,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":56712},"to":{"change":7,"start":56712,"end":56748},"introduced_by":7}],"inode":{"change":7,"pos":37976}}},"contents":[{"Del":" current: &mut Option,\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":573,"ins":{"up_context":[{"change":7,"pos":56877}],"down_context":[{"change":7,"pos":58878}],"flag":"BLOCK","start":21613,"end":23926,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":56877},"to":{"change":7,"start":56877,"end":57069},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":57069},"to":{"change":7,"start":2083,"end":2233},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":127},"to":{"change":7,"start":57195,"end":57232},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":286},"to":{"change":7,"start":57195,"end":57232},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":384},"to":{"change":7,"start":57195,"end":57232},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":2233},"to":{"change":7,"start":57195,"end":57232},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":2476},"to":{"change":7,"start":57195,"end":57232},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":3673},"to":{"change":7,"start":57195,"end":57232},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":3992},"to":{"change":7,"start":57195,"end":57232},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":89589},"to":{"change":7,"start":57195,"end":57232},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":57195},"to":{"change":7,"start":57195,"end":57232},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":57232},"to":{"change":7,"start":3993,"end":4103},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":216},"to":{"change":7,"start":57316,"end":57360},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":4103},"to":{"change":7,"start":57316,"end":57360},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":57316},"to":{"change":7,"start":57316,"end":57360},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":57360},"to":{"change":7,"start":4104,"end":4221},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":312},"to":{"change":7,"start":57451,"end":57497},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":4221},"to":{"change":7,"start":57451,"end":57497},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":57451},"to":{"change":7,"start":57451,"end":57497},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":57497},"to":{"change":7,"start":5533,"end":5646},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":404},"to":{"change":7,"start":57584,"end":57632},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":5646},"to":{"change":7,"start":57584,"end":57632},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":57584},"to":{"change":7,"start":57584,"end":57632},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":57632},"to":{"change":7,"start":5647,"end":5763},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":499},"to":{"change":7,"start":57722,"end":57759},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":5763},"to":{"change":7,"start":57722,"end":57759},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":57722},"to":{"change":7,"start":57722,"end":57759},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":57759},"to":{"change":7,"start":287,"end":417},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":417},"to":{"change":7,"start":627,"end":726},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":2607},"to":{"change":7,"start":627,"end":726},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":627},"to":{"change":7,"start":627,"end":726},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":726},"to":{"change":7,"start":57977,"end":58035},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":57977},"to":{"change":7,"start":57977,"end":58035},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":58035},"to":{"change":7,"start":727,"end":823},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":823},"to":{"change":7,"start":58127,"end":58223},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":58127},"to":{"change":7,"start":58127,"end":58223},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":58223},"to":{"change":7,"start":824,"end":925},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":925},"to":{"change":7,"start":58320,"end":58396},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":58320},"to":{"change":7,"start":58320,"end":58396},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":58396},"to":{"change":7,"start":4222,"end":4370},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":1052},"to":{"change":7,"start":58518,"end":58878},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":4370},"to":{"change":7,"start":58518,"end":58878},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":58518},"to":{"change":7,"start":58518,"end":58878},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" (hunk_id, hunk): (u64, PrintableHunk),"},{"Add":" ) -> Result {"},{"Add":" // TODO: should we push, or not?"},{"Add":" contents_.push(0);"},{"Add":""},{"Add":" match hunk {"},{"Add":" PrintableHunk::FileMoveV {"},{"Add":" path,"},{"Add":" name,"},{"Add":" perms,"},{"Add":" pos,"},{"Add":" up_context,"},{"Add":" down_context,"},{"Add":" del,"},{"Add":" } => {"},{"Add":" let mut add = default_newvertex();"},{"Add":" add.start = ChangePosition(contents_.len().into());"},{"Add":" add.flag = EdgeFlags::FOLDER | EdgeFlags::BLOCK;"},{"Add":" let meta = FileMetadata {"},{"Add":" metadata: InodeMetadata(match perms {"},{"Add":" // TODO: deduplicate"},{"Add":" PrintablePerms::IsDir => 0o1100,"},{"Add":" PrintablePerms::IsExecutable => 0o100,"},{"Add":" PrintablePerms::IsFile => 0,"},{"Add":" }),"},{"Add":" basename: &name,"},{"Add":" encoding: None,"},{"Add":" };"},{"Add":" meta.write(contents_);"},{"Add":" add.end = ChangePosition(contents_.len().into());"},{"Add":" add.up_context = from_printable_pos_vec_offsets(changes, offsets, &up_context)?;"},{"Add":" add.down_context = from_printable_pos_vec_offsets(changes, offsets, &down_context)?;"},{"Add":""},{"Add":" Ok(Hunk::FileMove {"},{"Add":" add: Atom::NewVertex(add),"},{"Add":" del: Atom::EdgeMap(EdgeMap {"},{"Add":" inode: from_printable_pos(changes, pos)?,"},{"Add":" edges: from_printable_edge_map(&del, changes)?,"},{"Add":" }),"},{"Add":" path,"},{"Add":" })"},{"Add":" }"},{"Add":" PrintableHunk::FileMoveE {"},{"Add":" path,"},{"Add":" pos,"},{"Add":" add,"},{"Add":" del,"},{"Add":" } => {"},{"Add":" let inode = from_printable_pos(changes, pos)?;"},{"Add":" Ok(Hunk::FileMove {"},{"Add":" add: Atom::EdgeMap(EdgeMap {"},{"Add":" inode,"},{"Add":" edges: from_printable_edge_map(&add, changes)?,"},{"Add":" }),"},{"Add":" del: Atom::EdgeMap(EdgeMap {"},{"Add":" inode,"},{"Add":" edges: from_printable_edge_map(&del, changes)?,"},{"Add":" }),"},{"Add":" path,"},{"Add":" })"}],"del_contents":[{"Del":" h: &str,\n ) -> Result, TextDeError> {\n use self::text_changes::*;\n use regex::Regex;\n lazy_static! {\n static ref FILE_ADDITION: Regex =\n"},{"Del":" Regex::new(r#\"^(?P\\d+)\\. File addition: \"(?P[^\"]*)\" in \"(?P[^\"]*)\"(?P \\S+)? \"(?P[^\"]*)\"\"#).unwrap();\n"},{"Del":" static ref EDIT: Regex =\n"},{"Del":" Regex::new(r#\"^([0-9]+)\\. Edit in ([^:]+):(\\d+) (\\d+\\.\\d+) \"(?P[^\"]*)\"\"#).unwrap();\n"},{"Del":" static ref REPLACEMENT: Regex =\n"},{"Del":" Regex::new(r#\"^([0-9]+)\\. Replacement in ([^:]+):(\\d+) (\\d+\\.\\d+) \"(?P[^\"]*)\"\"#).unwrap();\n"},{"Del":" static ref FILE_DELETION: Regex =\n"},{"Del":" Regex::new(r#\"^([0-9]+)\\. File deletion: \"([^\"]*)\" (\\d+\\.\\d+) \"(?P[^\"]*)\"\"#).unwrap();\n"},{"Del":" static ref FILE_UNDELETION: Regex =\n"},{"Del":" Regex::new(r#\"^([0-9]+)\\. File un-deletion: \"([^\"]*)\" (\\d+\\.\\d+) \"(?P[^\"]*)\"\"#).unwrap();\n"},{"Del":" static ref MOVE: Regex =\n"},{"Del":" Regex::new(r#\"^([0-9]+)\\. Moved: \"(?P[^\"]*)\" \"(?P[^\"]*)\" (?P[^ ]+ )?(?P.*)\"#).unwrap();\n"},{"Del":" static ref MOVE_: Regex = Regex::new(r#\"^([0-9]+)\\. Moved: \"([^\"]*)\" (.*)\"#).unwrap();\n"},{"Del":" static ref NAME_CONFLICT: Regex = Regex::new(\n"},{"Del":" r#\"^([0-9]+)\\. ((Solving)|(Un-solving)) a name conflict in \"([^\"]*)\" (.*): .*\"#\n"},{"Del":" )\n .unwrap();\n static ref ORDER_CONFLICT: Regex = Regex::new(\n"},{"Del":" r#\"^([0-9]+)\\. ((Solving)|(Un-solving)) an order conflict in (.*):(\\d+) (\\d+\\.\\d+)\"#\n"},{"Del":" )\n .unwrap();\n static ref ZOMBIE: Regex =\n"},{"Del":" Regex::new(r#\"^([0-9]+)\\. Resurrecting zombie lines in (?P\"[^\"]+\"):(?P\\d+) (?P\\d+\\.\\d+) \"(?P[^\"]*)\"\"#)\n"},{"Del":" .unwrap();\n static ref CONTEXT: Regex = Regex::new(\n r#\"up ((\\d+\\.\\d+ )*\\d+\\.\\d+)(, new (\\d+):(\\d+))?(, down ((\\d+\\.\\d+ )*\\d+\\.\\d+))?\"#\n )\n .unwrap();\n }\n if let Some(cap) = FILE_ADDITION.captures(h) {\n if has_newvertices(current) {\n contents_.push(0)\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":634,"ins":{"up_context":[{"change":7,"pos":58892}],"down_context":[{"change":7,"pos":2864}],"flag":"BLOCK","start":23927,"end":25963,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":58892},"to":{"change":7,"start":58892,"end":58944},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":58944},"to":{"change":7,"start":140861,"end":140930},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":140930},"to":{"change":7,"start":59013,"end":59079},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":59013},"to":{"change":7,"start":59013,"end":59079},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":59079},"to":{"change":7,"start":2488,"end":2558},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":2558},"to":{"change":7,"start":59139,"end":59326},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":59139},"to":{"change":7,"start":59139,"end":59326},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":59326},"to":{"change":7,"start":2559,"end":2642},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":2642},"to":{"change":7,"start":59391,"end":59406},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":59391},"to":{"change":7,"start":59391,"end":59406},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":59406},"to":{"change":7,"start":89590,"end":89629},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":89629},"to":{"change":7,"start":2608,"end":2670},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":59406},"to":{"change":7,"start":2608,"end":2670},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2670},"to":{"change":7,"start":418,"end":463},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":463},"to":{"change":7,"start":2714,"end":2741},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2714},"to":{"change":7,"start":2714,"end":2741},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2741},"to":{"change":7,"start":464,"end":515},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":515},"to":{"change":7,"start":2791,"end":2864},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2791},"to":{"change":7,"start":2791,"end":2864},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" PrintableHunk::FileAddition {"},{"Add":" name,"},{"Add":" parent,"},{"Add":" perms,"},{"Add":" encoding,"},{"Add":" up_context,"},{"Add":" start,"},{"Add":" end,"},{"Add":" contents,"},{"Add":" } => {"},{"Add":" let meta = FileMetadata {"},{"Add":" metadata: InodeMetadata(match perms {"},{"Add":" PrintablePerms::IsDir => 0o1100,"},{"Add":" PrintablePerms::IsExecutable => 0o100,"},{"Add":" PrintablePerms::IsFile => 0,"},{"Add":" }),"},{"Add":" basename: &name,"},{"Add":" encoding: encoding.clone(),"},{"Add":" };"},{"Add":""},{"Add":" let add_name = {"},{"Add":" let mut x = default_newvertex();"},{"Add":" x.start = ChangePosition(contents_.len().into());"},{"Add":" meta.write(contents_);"},{"Add":" x.end = ChangePosition(contents_.len().into());"},{"Add":" x.flag = EdgeFlags::FOLDER | EdgeFlags::BLOCK;"},{"Add":" x.up_context = from_printable_pos_vec_offsets(changes, offsets, &up_context)?;"},{"Add":" x"},{"Add":" };"},{"Add":""},{"Add":" let add_inode = {"},{"Add":" let mut x = default_newvertex();"},{"Add":" x.flag = EdgeFlags::FOLDER | EdgeFlags::BLOCK;"},{"Add":" x.up_context.push(Position {"},{"Add":" change: None,"},{"Add":" pos: ChangePosition(contents_.len().into()),"},{"Add":" });"},{"Add":""},{"Add":" contents_.push(0);"},{"Add":" x.start = ChangePosition(contents_.len().into());"},{"Add":" x.end = ChangePosition(contents_.len().into());"},{"Add":" contents_.push(0);"},{"Add":" x"},{"Add":" };"},{"Add":""},{"Add":" if let Entry::Occupied(mut e) = updatables.entry(hunk_id as usize) {"},{"Add":" if let crate::InodeUpdate::Add { ref mut pos, .. } = e.get_mut() {"},{"Add":" offsets.insert(pos.0.into(), add_inode.start);"},{"Add":" *pos = add_inode.start"},{"Add":" }"}],"del_contents":[{"Del":" let mut add_name = default_newvertex();\n"},{"Del":" add_name.start = ChangePosition(contents_.len().into());\n"},{"Del":" add_name.flag = EdgeFlags::FOLDER | EdgeFlags::BLOCK;\n"},{"Del":" let name = unescape(&cap.name(\"name\").unwrap().as_str());\n"},{"Del":" let path = {\n let parent = cap.name(\"parent\").unwrap().as_str();\n (if parent == \"/\" {\n String::new()\n } else {\n"},{"Del":" unescape(&parent).to_string() + \"/\"\n }) + &name\n"},{"Del":" };\n"},{"Del":" debug!(\"cap = {:?}\", cap);\n"},{"Del":" let meta = if let Some(perm) = cap.name(\"perm\") {\n"},{"Del":" if perm.as_str() == \" +dx\" {\n"},{"Del":" 0o1100\n"},{"Del":" } else if perm.as_str() == \" +x\" {\n"},{"Del":" 0o100\n } else {\n 0\n"}]}},{"Edit":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":685,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2882},"to":{"change":7,"start":2882,"end":2936},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2936},"to":{"change":7,"start":5764,"end":5887},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":5887},"to":{"change":7,"start":3044,"end":3129},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2936},"to":{"change":7,"start":3044,"end":3129},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":3129},"to":{"change":7,"start":2643,"end":2676},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":2676},"to":{"change":7,"start":5888,"end":5932},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":3161},"to":{"change":7,"start":5888,"end":5932},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":5932},"to":{"change":7,"start":3161,"end":3176},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":3161},"to":{"change":7,"start":3161,"end":3176},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":3176},"to":{"change":7,"start":2234,"end":2269},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":2269},"to":{"change":7,"start":140931,"end":140998},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":3216},"to":{"change":7,"start":140931,"end":140998},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":59747},"to":{"change":7,"start":140931,"end":140998},"introduced_by":7}],"inode":{"change":7,"pos":37976}}},"contents":[{"Del":" } else {\n 0\n };\n"},{"Del":" let n = cap.name(\"n\").unwrap().as_str().parse().unwrap();\n let encoding = encoding_from_label(cap);\n"},{"Del":" let meta = FileMetadata {\n metadata: InodeMetadata(meta),\n"},{"Del":" basename: &name,\n"},{"Del":" encoding: encoding.clone(),\n"},{"Del":" };\n"},{"Del":" meta.write(contents_);\n"},{"Del":" add_name.end = ChangePosition(contents_.len().into());\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":686,"ins":{"up_context":[{"change":7,"pos":59815}],"down_context":[{"change":7,"pos":60091}],"flag":"BLOCK","start":25964,"end":26156,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":59815},"to":{"change":7,"start":59815,"end":60014},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":60014},"to":{"change":7,"start":140999,"end":141060},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":141060},"to":{"change":7,"start":60075,"end":60091},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":60075},"to":{"change":7,"start":60075,"end":60091},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" // context"},{"Add":" offsets.insert(start, add_name.start);"},{"Add":" offsets.insert(end, add_name.end);"},{"Add":" offsets.insert(end + 1, add_name.end + 1);"}],"del_contents":[{"Del":" let mut add_inode = default_newvertex();\n add_inode.flag = EdgeFlags::FOLDER | EdgeFlags::BLOCK;\n add_inode.up_context.push(Position {\n change: None,\n"},{"Del":" pos: ChangePosition(contents_.len().into()),\n"},{"Del":" });\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":691,"ins":{"up_context":[{"change":7,"pos":60092}],"down_context":[{"change":3,"pos":67}],"flag":"BLOCK","start":26157,"end":26986,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":60092},"to":{"change":7,"start":60092,"end":60123},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":60123},"to":{"change":7,"start":141061,"end":141199},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":141199},"to":{"change":7,"start":60261,"end":60292},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":60261},"to":{"change":7,"start":60261,"end":60292},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":60362},"to":{"change":7,"start":60362,"end":60511},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":60511},"to":{"change":3,"start":0,"end":67},"introduced_by":3}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" // contents"},{"Add":" let contents_res = {"},{"Add":" let mut x = default_newvertex();"},{"Add":" // The `-1` here comes from the extra 0"},{"Add":" // padding bytes pushed onto `contents_`."},{"Add":" // TODO: verify this is correct"},{"Add":" let inode = Position {"},{"Add":" change: None,"},{"Add":" pos: ChangePosition((contents_.len() - 1).into()),"},{"Add":" };"},{"Add":" x.up_context.push(inode);"},{"Add":" x.inode = inode;"},{"Add":" x.flag = EdgeFlags::BLOCK;"},{"Add":" x.start = ChangePosition(contents_.len().into());"},{"Add":" contents_.extend(&contents);"},{"Add":" x.end = ChangePosition(contents_.len().into());"},{"Add":" x"},{"Add":" };"}],"del_contents":[{"Del":" contents_.push(0);\n"},{"Del":" add_inode.start = ChangePosition(contents_.len().into());\n add_inode.end = ChangePosition(contents_.len().into());\n"},{"Del":" contents_.push(0);\n"},{"Del":" if let Entry::Occupied(mut e) = updatables.entry(n) {\n if let crate::InodeUpdate::Add { ref mut pos, .. } = e.get_mut() {\n"},{"Del":" offsets.insert(pos.0.into(), add_inode.start);\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":710,"ins":{"up_context":[{"change":3,"pos":68}],"down_context":[{"change":7,"pos":60684}],"flag":"BLOCK","start":26987,"end":27022,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":68},"to":{"change":7,"start":60511,"end":60586},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":60511},"to":{"change":7,"start":60511,"end":60586},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":3925},"to":{"change":7,"start":60586,"end":60645},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":60586},"to":{"change":7,"start":60586,"end":60645},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":60645},"to":{"change":7,"start":9288,"end":9325},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" Ok(Hunk::FileAdd {"}],"del_contents":[{"Del":" *pos = add_inode.start\n }\n }\n"},{"Del":" Ok(std::mem::replace(\n current,\n"},{"Del":" Some(Hunk::FileAdd {\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":713,"ins":{"up_context":[{"change":7,"pos":60800}],"down_context":[{"change":7,"pos":5933}],"flag":"BLOCK","start":27023,"end":27138,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":60800},"to":{"change":7,"start":60800,"end":60862},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" contents: Some(Atom::NewVertex(contents_res)),"},{"Add":" path: parent + \"/\" + &name,"}],"del_contents":[{"Del":" contents: None,\n path,\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":716,"ins":{"up_context":[{"change":7,"pos":5963}],"down_context":[{"change":7,"pos":61026}],"flag":"BLOCK","start":27139,"end":27158,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":7,"pos":3956},"to":{"change":7,"start":60862,"end":61026},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":4427},"to":{"change":7,"start":60862,"end":61026},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":5963},"to":{"change":7,"start":60862,"end":61026},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":60862},"to":{"change":7,"start":60862,"end":61026},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" })"}],"del_contents":[{"Del":" }),\n ))\n } else if let Some(cap) = EDIT.captures(h) {\n if has_newvertices(current) {\n contents_.push(0)\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":718,"ins":{"up_context":[{"change":7,"pos":61040}],"down_context":[{"change":7,"pos":61443}],"flag":"BLOCK","start":27159,"end":27569,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":61040},"to":{"change":7,"start":61040,"end":61086},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":61086},"to":{"change":7,"start":128,"end":180},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":180},"to":{"change":7,"start":69,"end":108},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":108},"to":{"change":7,"start":61137,"end":61196},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":180},"to":{"change":7,"start":61137,"end":61196},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":61137},"to":{"change":7,"start":61137,"end":61196},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":61196},"to":{"change":7,"start":9326,"end":9360},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":9360},"to":{"change":7,"start":61232,"end":61443},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":61232},"to":{"change":7,"start":61232,"end":61443},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":61443},"to":{"change":7,"start":4428,"end":4484},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" PrintableHunk::FileDel {"},{"Add":" path,"},{"Add":" pos,"},{"Add":" encoding,"},{"Add":" del_edges,"},{"Add":" content_edges,"},{"Add":" contents: _,"},{"Add":" } => Ok(Hunk::FileDel {"},{"Add":" del: Atom::EdgeMap(EdgeMap {"},{"Add":" edges: from_printable_edge_map(&del_edges, changes)?,"},{"Add":" inode: from_printable_pos(changes, pos)?,"}],"del_contents":[{"Del":"\n let mut v = default_newvertex();\n"},{"Del":" v.inode = parse_pos(changes, &cap[4])?;\n"},{"Del":" v.flag = EdgeFlags::BLOCK;\n"},{"Del":" Ok(std::mem::replace(\n current,\n"},{"Del":" Some(Hunk::Edit {\n"},{"Del":" change: Atom::NewVertex(v),\n local: Local {\n path: cap[2].to_string(),\n line: cap[3].parse().unwrap(),\n },\n"},{"Del":" encoding: encoding_from_label(cap),\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":730,"ins":{"up_context":[{"change":7,"pos":61463}],"down_context":[{"change":7,"pos":63130}],"flag":"BLOCK","start":27570,"end":28270,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":61463},"to":{"change":7,"start":61463,"end":61673},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":61673},"to":{"change":7,"start":181,"end":233},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":233},"to":{"change":7,"start":109,"end":148},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":148},"to":{"change":7,"start":61724,"end":61783},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":233},"to":{"change":7,"start":61724,"end":61783},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":61724},"to":{"change":7,"start":61724,"end":61783},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":61783},"to":{"change":7,"start":9361,"end":9402},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":9402},"to":{"change":7,"start":61826,"end":62098},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":61826},"to":{"change":7,"start":61826,"end":62098},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":62098},"to":{"change":7,"start":4485,"end":4541},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":4541},"to":{"change":7,"start":62098,"end":62330},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":62098},"to":{"change":7,"start":62098,"end":62330},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":62330},"to":{"change":7,"start":234,"end":288},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":288},"to":{"change":7,"start":62383,"end":62442},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":62383},"to":{"change":7,"start":62383,"end":62442},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":62442},"to":{"change":7,"start":9403,"end":9440},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":9440},"to":{"change":7,"start":62481,"end":62608},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":62481},"to":{"change":7,"start":62481,"end":62608},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":62608},"to":{"change":7,"start":5964,"end":6020},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":6020},"to":{"change":7,"start":62608,"end":62844},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":62608},"to":{"change":7,"start":62608,"end":62844},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":62844},"to":{"change":7,"start":289,"end":345},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":345},"to":{"change":7,"start":62899,"end":62958},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":62899},"to":{"change":7,"start":62899,"end":62958},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":62958},"to":{"change":7,"start":9441,"end":9480},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":9480},"to":{"change":7,"start":62999,"end":63130},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":62999},"to":{"change":7,"start":62999,"end":63130},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":63130},"to":{"change":7,"start":6021,"end":6077},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" contents: Some(Atom::EdgeMap(EdgeMap {"},{"Add":" edges: from_printable_edge_map(&content_edges, changes)?,"},{"Add":" inode: from_printable_pos(changes, pos)?,"},{"Add":" })),"},{"Add":" path,"},{"Add":" encoding,"},{"Add":" }),"},{"Add":" PrintableHunk::FileUndel {"},{"Add":" path,"},{"Add":" pos,"},{"Add":" encoding,"},{"Add":" undel_edges,"},{"Add":" content_edges,"},{"Add":" contents: _,"},{"Add":" } => Ok(Hunk::FileUndel {"},{"Add":" undel: Atom::EdgeMap(EdgeMap {"},{"Add":" edges: from_printable_edge_map(&undel_edges, changes)?,"},{"Add":" inode: from_printable_pos(changes, pos)?,"}],"del_contents":[{"Del":" ))\n } else if let Some(cap) = REPLACEMENT.captures(h) {\n if has_newvertices(current) {\n contents_.push(0)\n }\n let mut v = default_newvertex();\n"},{"Del":" v.inode = parse_pos(changes, &cap[4])?;\n"},{"Del":" v.flag = EdgeFlags::BLOCK;\n"},{"Del":" Ok(std::mem::replace(\n current,\n"},{"Del":" Some(Hunk::Replacement {\n"},{"Del":" change: Atom::NewVertex(v.clone()),\n replacement: Atom::NewVertex(v),\n local: Local {\n path: cap[2].to_string(),\n line: cap[3].parse().unwrap(),\n },\n"},{"Del":" encoding: encoding_from_label(cap),\n"},{"Del":" }),\n ))\n } else if let Some(cap) = FILE_DELETION.captures(h) {\n if has_newvertices(current) {\n contents_.push(0)\n }\n let mut del = default_edgemap();\n"},{"Del":" del.inode = parse_pos(changes, &cap[3])?;\n"},{"Del":" Ok(std::mem::replace(\n current,\n"},{"Del":" Some(Hunk::FileDel {\n"},{"Del":" del: Atom::EdgeMap(del),\n contents: None,\n path: cap[2].to_string(),\n"},{"Del":" encoding: encoding_from_label(cap),\n"},{"Del":" }),\n ))\n } else if let Some(cap) = FILE_UNDELETION.captures(h) {\n if has_newvertices(current) {\n contents_.push(0)\n }\n let mut undel = default_edgemap();\n"},{"Del":" undel.inode = parse_pos(changes, &cap[3])?;\n"},{"Del":" Ok(std::mem::replace(\n current,\n"},{"Del":" Some(Hunk::FileUndel {\n"},{"Del":" undel: Atom::EdgeMap(undel),\n contents: None,\n path: cap[2].to_string(),\n"},{"Del":" encoding: encoding_from_label(cap),\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":749,"ins":{"up_context":[{"change":7,"pos":63150}],"down_context":[{"change":7,"pos":64101}],"flag":"BLOCK","start":28271,"end":29914,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":63150},"to":{"change":7,"start":63150,"end":63402},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":63402},"to":{"change":7,"start":346,"end":401},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":401},"to":{"change":7,"start":63456,"end":63557},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":63456},"to":{"change":7,"start":63456,"end":63557},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":63557},"to":{"change":7,"start":9481,"end":9532},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":9532},"to":{"change":7,"start":63610,"end":63759},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":63610},"to":{"change":7,"start":63610,"end":63759},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":63759},"to":{"change":7,"start":9533,"end":9586},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":9586},"to":{"change":7,"start":63814,"end":64101},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":63814},"to":{"change":7,"start":63814,"end":64101},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" contents: Some(Atom::EdgeMap(EdgeMap {"},{"Add":" edges: from_printable_edge_map(&content_edges, changes)?,"},{"Add":" inode: from_printable_pos(changes, pos)?,"},{"Add":" })),"},{"Add":" path,"},{"Add":" encoding,"},{"Add":" }),"},{"Add":" PrintableHunk::Edit {"},{"Add":" path,"},{"Add":" line,"},{"Add":" pos,"},{"Add":" encoding,"},{"Add":" change,"},{"Add":" contents,"},{"Add":" } => {"},{"Add":" let inode = from_printable_pos(changes, pos)?;"},{"Add":" let change = match change {"},{"Add":" PrintableAtom::NewVertex(new_vertex) => {"},{"Add":" let mut x = default_newvertex();"},{"Add":" x.inode = inode;"},{"Add":" x.flag = EdgeFlags::BLOCK;"},{"Add":" x.up_context = from_printable_pos_vec(changes, &new_vertex.up_context)?;"},{"Add":" x.down_context = from_printable_pos_vec(changes, &new_vertex.down_context)?;"},{"Add":" x.start = ChangePosition(contents_.len().into());"},{"Add":" contents_.extend(&contents);"},{"Add":" x.end = ChangePosition(contents_.len().into());"},{"Add":" Atom::NewVertex(x)"},{"Add":" }"},{"Add":" PrintableAtom::Edges(edges) => Atom::EdgeMap(EdgeMap {"},{"Add":" edges: from_printable_edge_map(&edges, changes)?,"},{"Add":" inode: inode,"},{"Add":" }),"},{"Add":" };"},{"Add":""},{"Add":" Ok(Hunk::Edit {"},{"Add":" change,"},{"Add":" local: Local { path, line },"},{"Add":" encoding,"},{"Add":" })"}],"del_contents":[{"Del":" ))\n } else if let Some(cap) = NAME_CONFLICT.captures(h) {\n if has_newvertices(current) {\n contents_.push(0)\n }\n let mut name = default_edgemap();\n debug!(\"cap = {:?}\", cap);\n"},{"Del":" name.inode = parse_pos(changes, &cap[6])?;\n"},{"Del":" Ok(std::mem::replace(\n current,\n if &cap[2] == \"Solving\" {\n"},{"Del":" Some(Hunk::SolveNameConflict {\n"},{"Del":" name: Atom::EdgeMap(name),\n path: cap[5].to_string(),\n })\n } else {\n"},{"Del":" Some(Hunk::UnsolveNameConflict {\n"},{"Del":" name: Atom::EdgeMap(name),\n path: cap[5].to_string(),\n })\n },\n ))\n } else if let Some(cap) = MOVE.captures(h) {\n if has_newvertices(current) {\n contents_.push(0)\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":789,"ins":{"up_context":[{"change":7,"pos":64115}],"down_context":[{"change":7,"pos":64748}],"flag":"BLOCK","start":29915,"end":30252,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":64115},"to":{"change":7,"start":64115,"end":64162},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":64162},"to":{"change":7,"start":141200,"end":141264},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":141264},"to":{"change":7,"start":64226,"end":64287},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":64226},"to":{"change":7,"start":64226,"end":64287},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":64287},"to":{"change":7,"start":2677,"end":2745},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":2745},"to":{"change":7,"start":2937,"end":2999},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":64345},"to":{"change":7,"start":2937,"end":2999},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2999},"to":{"change":7,"start":516,"end":615},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":615},"to":{"change":7,"start":3043,"end":3070},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":3043},"to":{"change":7,"start":3043,"end":3070},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":3070},"to":{"change":7,"start":616,"end":667},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":667},"to":{"change":7,"start":3120,"end":3265},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":3120},"to":{"change":7,"start":3120,"end":3265},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":3265},"to":{"change":7,"start":3217,"end":3302},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":3302},"to":{"change":7,"start":2746,"end":2779},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":2779},"to":{"change":7,"start":6078,"end":6110},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":3334},"to":{"change":7,"start":6078,"end":6110},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":6110},"to":{"change":7,"start":3334,"end":3349},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":3334},"to":{"change":7,"start":3334,"end":3349},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":3349},"to":{"change":7,"start":2270,"end":2305},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":2305},"to":{"change":7,"start":141265,"end":141327},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":3389},"to":{"change":7,"start":141265,"end":141327},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":64686},"to":{"change":7,"start":141265,"end":141327},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" PrintableHunk::Replace {"},{"Add":" path,"},{"Add":" line,"},{"Add":" pos,"},{"Add":" encoding,"},{"Add":" change,"},{"Add":" replacement,"},{"Add":" change_contents: _,"},{"Add":" replacement_contents,"},{"Add":" } => {"},{"Add":" let inode = from_printable_pos(changes, pos)?;"}],"del_contents":[{"Del":" let mut add = default_newvertex();\n"},{"Del":" add.start = ChangePosition(contents_.len().into());\n"},{"Del":" add.flag = EdgeFlags::FOLDER | EdgeFlags::BLOCK;\n"},{"Del":" let name = unescape(cap.name(\"new\").unwrap().as_str());\n"},{"Del":" let meta = if let Some(perm) = cap.name(\"perm\") {\n"},{"Del":" debug!(\"perm = {:?}\", perm.as_str());\n if perm.as_str() == \"+dx \" {\n"},{"Del":" 0o1100\n"},{"Del":" } else if perm.as_str() == \"+x \" {\n"},{"Del":" 0o100\n } else {\n 0\n }\n } else {\n 0\n };\n"},{"Del":" let meta = FileMetadata {\n metadata: InodeMetadata(meta),\n"},{"Del":" basename: &name,\n"},{"Del":" encoding: None,\n"},{"Del":" };\n"},{"Del":" meta.write(contents_);\n"},{"Del":" add.end = ChangePosition(contents_.len().into());\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":801,"ins":{"up_context":[{"change":7,"pos":64749}],"down_context":[{"change":7,"pos":65277}],"flag":"BLOCK","start":30253,"end":31235,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":64749},"to":{"change":7,"start":64749,"end":64794},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":64794},"to":{"change":7,"start":402,"end":484},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":484},"to":{"change":7,"start":64875,"end":64934},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":64875},"to":{"change":7,"start":64875,"end":64934},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":64934},"to":{"change":7,"start":9587,"end":9625},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":9625},"to":{"change":7,"start":64974,"end":65277},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":64974},"to":{"change":7,"start":64974,"end":65277},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" let replacement = {"},{"Add":" let mut x = default_newvertex();"},{"Add":" x.inode = inode;"},{"Add":" x.flag = EdgeFlags::BLOCK;"},{"Add":" x.up_context = from_printable_pos_vec(changes, &replacement.up_context)?;"},{"Add":" x.down_context = from_printable_pos_vec(changes, &replacement.down_context)?;"},{"Add":" x.start = ChangePosition(contents_.len().into());"},{"Add":" contents_.extend(&replacement_contents);"},{"Add":" x.end = ChangePosition(contents_.len().into());"},{"Add":" Atom::NewVertex(x)"},{"Add":" };"},{"Add":""},{"Add":" Ok(Hunk::Replacement {"},{"Add":" change: Atom::EdgeMap(EdgeMap {"},{"Add":" edges: from_printable_edge_map(&change, changes)?,"},{"Add":" inode: inode,"},{"Add":" }),"},{"Add":" replacement,"},{"Add":" local: Local { path, line },"},{"Add":" encoding,"},{"Add":" })"}],"del_contents":[{"Del":" let mut del = default_edgemap();\n"},{"Del":" del.inode = parse_pos(changes, cap.name(\"inode\").unwrap().as_str())?;\n"},{"Del":" Ok(std::mem::replace(\n current,\n"},{"Del":" Some(Hunk::FileMove {\n"},{"Del":" del: Atom::EdgeMap(del),\n add: Atom::NewVertex(add),\n path: cap[2].to_string(),\n }),\n ))\n } else if let Some(cap) = MOVE_.captures(h) {\n if has_newvertices(current) {\n contents_.push(0)\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":823,"ins":{"up_context":[{"change":7,"pos":65291}],"down_context":[{"change":7,"pos":65704}],"flag":"BLOCK","start":31236,"end":31599,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":65291},"to":{"change":7,"start":65291,"end":65381},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":65381},"to":{"change":7,"start":485,"end":539},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":539},"to":{"change":7,"start":65434,"end":65528},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":65434},"to":{"change":7,"start":65434,"end":65528},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":65528},"to":{"change":7,"start":9626,"end":9664},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":9664},"to":{"change":7,"start":65568,"end":65704},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":65568},"to":{"change":7,"start":65568,"end":65704},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" PrintableHunk::SolveNameConflict {"},{"Add":" path,"},{"Add":" pos,"},{"Add":" names: _,"},{"Add":" edges,"},{"Add":" } => Ok(Hunk::SolveNameConflict {"},{"Add":" name: Atom::EdgeMap(EdgeMap {"},{"Add":" inode: from_printable_pos(changes, pos)?,"},{"Add":" edges: from_printable_edge_map(&edges, changes)?,"}],"del_contents":[{"Del":" let mut add = default_edgemap();\n let mut del = default_edgemap();\n"},{"Del":" add.inode = parse_pos(changes, &cap[3])?;\n"},{"Del":" del.inode = add.inode;\n Ok(std::mem::replace(\n current,\n"},{"Del":" Some(Hunk::FileMove {\n"},{"Del":" del: Atom::EdgeMap(del),\n add: Atom::EdgeMap(add),\n path: cap[2].to_string(),\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":833,"ins":{"up_context":[{"change":7,"pos":65724}],"down_context":[{"change":7,"pos":65892}],"flag":"BLOCK","start":31600,"end":33104,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":65724},"to":{"change":7,"start":65724,"end":65892},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" path,"},{"Add":" }),"},{"Add":" PrintableHunk::UnsolveNameConflict {"},{"Add":" path,"},{"Add":" pos,"},{"Add":" names: _,"},{"Add":" edges,"},{"Add":" } => Ok(Hunk::UnsolveNameConflict {"},{"Add":" name: Atom::EdgeMap(EdgeMap {"},{"Add":" inode: from_printable_pos(changes, pos)?,"},{"Add":" edges: from_printable_edge_map(&edges, changes)?,"},{"Add":" }),"},{"Add":" path,"},{"Add":" }),"},{"Add":" PrintableHunk::SolveOrderConflict {"},{"Add":" path,"},{"Add":" line,"},{"Add":" pos,"},{"Add":" encoding: _,"},{"Add":" change,"},{"Add":" contents,"},{"Add":" } => {"},{"Add":" // TODO: this code block looks suspect. Check the correctness."},{"Add":" let mut c = default_newvertex();"},{"Add":" c.inode = from_printable_pos(changes, pos)?;"},{"Add":" c.up_context = from_printable_pos_vec(changes, &change.up_context)?;"},{"Add":" c.down_context = from_printable_pos_vec(changes, &change.down_context)?;"},{"Add":" // TODO: this maths is probably unnecessarily complicated"},{"Add":" c.start = ChangePosition(contents_.len().into());"},{"Add":" c.end = ChangePosition((contents_.len() as u64 + change.end - change.start).into());"},{"Add":" offsets.insert(change.end, c.end);"},{"Add":" c.start = ChangePosition(contents_.len().into());"},{"Add":" contents_.extend(&contents);"},{"Add":" c.end = ChangePosition(contents_.len().into());"}],"del_contents":[{"Del":" ))\n } else if let Some(cap) = ORDER_CONFLICT.captures(h) {\n if has_newvertices(current) {\n contents_.push(0)\n }\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":868,"ins":{"up_context":[{"change":7,"pos":65893}],"down_context":[{"change":7,"pos":67016}],"flag":"BLOCK","start":33105,"end":33267,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":65893},"to":{"change":7,"start":65893,"end":66052},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":66052},"to":{"change":7,"start":540,"end":600},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":600},"to":{"change":7,"start":9665,"end":9712},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":9712},"to":{"change":7,"start":66160,"end":66489},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":66160},"to":{"change":7,"start":66160,"end":66489},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":66489},"to":{"change":7,"start":601,"end":661},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":661},"to":{"change":7,"start":9713,"end":9762},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":9762},"to":{"change":7,"start":66599,"end":67016},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":66599},"to":{"change":7,"start":66599,"end":67016},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" Ok(Hunk::SolveOrderConflict {"},{"Add":" change: Atom::NewVertex(c),"},{"Add":" local: Local { path, line },"},{"Add":" })"}],"del_contents":[{"Del":" Ok(std::mem::replace(\n current,\n Some(if &cap[2] == \"Solving\" {\n let mut v = default_newvertex();\n"},{"Del":" v.inode = parse_pos(changes, &cap[7])?;\n"},{"Del":" Hunk::SolveOrderConflict {\n"},{"Del":" change: Atom::NewVertex(v),\n local: Local {\n path: cap[5].to_string(),\n line: cap[6].parse().unwrap(),\n },\n }\n } else {\n let mut v = default_edgemap();\n"},{"Del":" v.inode = parse_pos(changes, &cap[7])?;\n"},{"Del":" Hunk::UnsolveOrderConflict {\n"},{"Del":" change: Atom::EdgeMap(v),\n local: Local {\n path: cap[5].to_string(),\n line: cap[6].parse().unwrap(),\n },\n }\n }),\n ))\n } else if let Some(cap) = ZOMBIE.captures(h) {\n if has_newvertices(current) {\n contents_.push(0)\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":873,"ins":{"up_context":[{"change":7,"pos":67030}],"down_context":[{"change":7,"pos":67530}],"flag":"BLOCK","start":33268,"end":33695,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":67030},"to":{"change":7,"start":67030,"end":67073},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":67073},"to":{"change":7,"start":662,"end":743},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":743},"to":{"change":7,"start":67153,"end":67212},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":67153},"to":{"change":7,"start":67153,"end":67212},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":67212},"to":{"change":7,"start":9763,"end":9809},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":9809},"to":{"change":7,"start":67260,"end":67530},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":67260},"to":{"change":7,"start":67260,"end":67530},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":67530},"to":{"change":7,"start":4542,"end":4598},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" PrintableHunk::UnsolveOrderConflict {"},{"Add":" path,"},{"Add":" line,"},{"Add":" pos,"},{"Add":" encoding: _,"},{"Add":" change,"},{"Add":" contents: _,"},{"Add":" } => Ok(Hunk::UnsolveOrderConflict {"},{"Add":" change: Atom::EdgeMap(EdgeMap {"},{"Add":" edges: from_printable_edge_map(&change, changes)?,"},{"Add":" inode: from_printable_pos(changes, pos)?,"}],"del_contents":[{"Del":" let mut v = default_edgemap();\n"},{"Del":" v.inode = parse_pos(changes, &cap.name(\"inode\").unwrap().as_str())?;\n"},{"Del":" Ok(std::mem::replace(\n current,\n"},{"Del":" Some(Hunk::ResurrectZombies {\n"},{"Del":" change: Atom::EdgeMap(v),\n local: Local {\n path: cap.name(\"path\").unwrap().as_str().parse().unwrap(),\n line: cap.name(\"line\").unwrap().as_str().parse().unwrap(),\n },\n"},{"Del":" encoding: encoding_from_label(cap),\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":885,"ins":{"up_context":[{"change":7,"pos":67550}],"down_context":[{"change":7,"pos":79931}],"flag":"BLOCK","start":33696,"end":34280,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":67550},"to":{"change":7,"start":67550,"end":67610},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":67610},"to":{"change":7,"start":9810,"end":9847},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":9847},"to":{"change":7,"start":67649,"end":67725},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":67649},"to":{"change":7,"start":67649,"end":67725},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":67725},"to":{"change":7,"start":152,"end":182},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":182},"to":{"change":7,"start":67725,"end":67925},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":67725},"to":{"change":7,"start":67725,"end":67925},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":67925},"to":{"change":7,"start":141328,"end":141466},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":141466},"to":{"change":7,"start":67925,"end":68022},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":67925},"to":{"change":7,"start":67925,"end":68022},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":68022},"to":{"change":7,"start":141467,"end":141550},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":141550},"to":{"change":7,"start":68103,"end":68233},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":68103},"to":{"change":7,"start":68103,"end":68233},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":68233},"to":{"change":7,"start":17146,"end":17201},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":17201},"to":{"change":7,"start":141551,"end":141629},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":141629},"to":{"change":7,"start":68311,"end":68539},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":68311},"to":{"change":7,"start":68311,"end":68539},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":68539},"to":{"change":7,"start":183,"end":278},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":278},"to":{"change":7,"start":68624,"end":68732},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":68624},"to":{"change":7,"start":68624,"end":68732},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":68732},"to":{"change":7,"start":87,"end":216},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":216},"to":{"change":7,"start":21240,"end":21312},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":21312},"to":{"change":7,"start":141703,"end":141780},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":141703},"to":{"change":7,"start":141703,"end":141780},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":141780},"to":{"change":7,"start":378,"end":584},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":378},"to":{"change":7,"start":378,"end":584},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":584},"to":{"change":7,"start":69085,"end":69999},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":69085},"to":{"change":7,"start":69085,"end":69999},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":69999},"to":{"change":7,"start":9848,"end":9885},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":9885},"to":{"change":7,"start":70038,"end":70156},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":70038},"to":{"change":7,"start":70038,"end":70156},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":70156},"to":{"change":7,"start":744,"end":812},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":812},"to":{"change":7,"start":70223,"end":70904},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":70223},"to":{"change":7,"start":70223,"end":70904},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":70904},"to":{"change":7,"start":9886,"end":9925},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":9925},"to":{"change":7,"start":70945,"end":71065},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":70945},"to":{"change":7,"start":70945,"end":71065},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":71065},"to":{"change":7,"start":813,"end":881},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":881},"to":{"change":7,"start":71132,"end":71815},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":71132},"to":{"change":7,"start":71132,"end":71815},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":71815},"to":{"change":7,"start":9926,"end":9964},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":9964},"to":{"change":7,"start":71855,"end":71968},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":71855},"to":{"change":7,"start":71855,"end":71968},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":71968},"to":{"change":7,"start":882,"end":950},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":950},"to":{"change":7,"start":72035,"end":73304},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":72035},"to":{"change":7,"start":72035,"end":73304},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":73304},"to":{"change":7,"start":279,"end":426},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":426},"to":{"change":7,"start":73367,"end":73590},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":10026},"to":{"change":7,"start":73367,"end":73590},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":73367},"to":{"change":7,"start":73367,"end":73590},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":73590},"to":{"change":7,"start":141781,"end":141868},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":141868},"to":{"change":7,"start":73677,"end":73707},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":73677},"to":{"change":7,"start":73677,"end":73707},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":73707},"to":{"change":7,"start":427,"end":516},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":516},"to":{"change":7,"start":73786,"end":73938},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":73786},"to":{"change":7,"start":73786,"end":73938},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":73938},"to":{"change":7,"start":21313,"end":21413},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":21413},"to":{"change":7,"start":313,"end":343},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":141944},"to":{"change":7,"start":313,"end":343},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":313},"to":{"change":7,"start":313,"end":343},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":343},"to":{"change":7,"start":141945,"end":142023},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":142023},"to":{"change":7,"start":74101,"end":74748},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":74101},"to":{"change":7,"start":74101,"end":74748},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":74748},"to":{"change":7,"start":951,"end":1026},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":1026},"to":{"change":7,"start":74822,"end":75063},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":74822},"to":{"change":7,"start":74822,"end":75063},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":75063},"to":{"change":7,"start":10027,"end":10068},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":10068},"to":{"change":7,"start":75106,"end":75183},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":75106},"to":{"change":7,"start":75106,"end":75183},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":75183},"to":{"change":7,"start":517,"end":547},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":547},"to":{"change":7,"start":75183,"end":75408},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":75183},"to":{"change":7,"start":75183,"end":75408},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":75408},"to":{"change":7,"start":142024,"end":142109},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":142109},"to":{"change":7,"start":75493,"end":75523},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":75493},"to":{"change":7,"start":75493,"end":75523},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":75523},"to":{"change":7,"start":548,"end":635},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":635},"to":{"change":7,"start":75600,"end":75755},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":75600},"to":{"change":7,"start":75600,"end":75755},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":75755},"to":{"change":7,"start":21414,"end":21510},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":21510},"to":{"change":7,"start":142205,"end":142281},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":474},"to":{"change":7,"start":142205,"end":142281},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":142281},"to":{"change":7,"start":75914,"end":76569},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":75914},"to":{"change":7,"start":75914,"end":76569},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":76569},"to":{"change":7,"start":1027,"end":1102},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":1102},"to":{"change":7,"start":76643,"end":76884},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":76643},"to":{"change":7,"start":76643,"end":76884},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":76884},"to":{"change":7,"start":10069,"end":10212},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":10212},"to":{"change":7,"start":1103,"end":1171},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":77031},"to":{"change":7,"start":1103,"end":1171},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":1171},"to":{"change":7,"start":77098,"end":77334},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":77098},"to":{"change":7,"start":77098,"end":77334},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":77334},"to":{"change":7,"start":10213,"end":10288},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":10288},"to":{"change":7,"start":77411,"end":77590},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":77411},"to":{"change":7,"start":77411,"end":77590},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":77590},"to":{"change":7,"start":142282,"end":142369},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":142369},"to":{"change":7,"start":77677,"end":77707},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":77677},"to":{"change":7,"start":77677,"end":77707},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":77707},"to":{"change":7,"start":636,"end":767},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":767},"to":{"change":7,"start":77786,"end":78601},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":77786},"to":{"change":7,"start":77786,"end":78601},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":78601},"to":{"change":7,"start":142370,"end":142457},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":142457},"to":{"change":7,"start":21511,"end":21698},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":21698},"to":{"change":7,"start":78831,"end":79025},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":142565},"to":{"change":7,"start":78831,"end":79025},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":78831},"to":{"change":7,"start":78831,"end":79025},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":79025},"to":{"change":7,"start":10289,"end":10366},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":10366},"to":{"change":7,"start":1172,"end":1240},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":79104},"to":{"change":7,"start":1172,"end":1240},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":1240},"to":{"change":7,"start":79171,"end":79387},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":79171},"to":{"change":7,"start":79171,"end":79387},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":79387},"to":{"change":7,"start":10367,"end":10440},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":10440},"to":{"change":7,"start":1241,"end":1309},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":79462},"to":{"change":7,"start":1241,"end":1309},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":1309},"to":{"change":7,"start":79529,"end":79931},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":79529},"to":{"change":7,"start":79529,"end":79931},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" local: Local { path, line },"},{"Add":" }),"},{"Add":" PrintableHunk::ResurrectZombies {"},{"Add":" path,"},{"Add":" line,"},{"Add":" pos,"},{"Add":" encoding,"},{"Add":" change,"},{"Add":" contents: _,"},{"Add":" } => Ok(Hunk::ResurrectZombies {"},{"Add":" change: Atom::EdgeMap(EdgeMap {"},{"Add":" edges: from_printable_edge_map(&change, changes)?,"},{"Add":" inode: from_printable_pos(changes, pos)?,"},{"Add":" }),"},{"Add":" local: Local { path, line },"},{"Add":" encoding,"},{"Add":" }),"}],"del_contents":[{"Del":" ))\n } else {\n match current {\n"},{"Del":" Some(Hunk::FileAdd {\n"},{"Del":" ref mut contents,\n ref mut add_name,\n"},{"Del":" encoding,\n"},{"Del":" ..\n }) => {\n if h.starts_with('+') {\n if contents.is_none() {\n let mut v = default_newvertex();\n"},{"Del":" // The `-1` here comes from the extra 0\n // padding bytes pushed onto `contents_`.\n"},{"Del":" let inode = Position {\n change: None,\n"},{"Del":" pos: ChangePosition((contents_.len() - 1).into()),\n"},{"Del":" };\n v.up_context.push(inode);\n v.inode = inode;\n"},{"Del":" v.flag = EdgeFlags::BLOCK;\n"},{"Del":" v.start = ChangePosition(contents_.len().into());\n"},{"Del":" *contents = Some(Atom::NewVertex(v));\n }\n if let Some(Atom::NewVertex(ref mut contents)) = contents {\n if h.starts_with('+') {\n"},{"Del":" text_changes::parse_line_add(h, contents, contents_, encoding)\n"},{"Del":" }\n }\n } else if h.starts_with('\\\\') {\n"},{"Del":" if let Some(Atom::NewVertex(mut c)) = contents.take() {\n if c.end > c.start {\n"},{"Del":" if contents_[c.end.us() - 1] == b'\\n' {\n"},{"Del":" assert_eq!(c.end.us(), contents_.len());\n"},{"Del":" contents_.pop();\n c.end.0 -= 1;\n }\n *contents = Some(Atom::NewVertex(c))\n"},{"Del":" }\n }\n } else if let Some(cap) = CONTEXT.captures(h) {\n if let Atom::NewVertex(ref mut name) = add_name {\n name.up_context = parse_pos_vec(changes, offsets, &cap[1])?;\n if let (Some(new_start), Some(new_end)) = (cap.get(4), cap.get(5)) {\n offsets.insert(new_start.as_str().parse().unwrap(), name.start);\n offsets.insert(new_end.as_str().parse().unwrap(), name.end);\n offsets.insert(\n new_end.as_str().parse::().unwrap() + 1,\n name.end + 1,\n );\n }\n }\n }\n Ok(None)\n }\n"},{"Del":" Some(Hunk::FileDel {\n"},{"Del":" ref mut del,\n ref mut contents,\n ..\n }) => {\n"},{"Del":" if let Some(edges) = parse_edges(changes, h)? {\n"},{"Del":" if let Atom::EdgeMap(ref mut e) = del {\n if edges[0].flag.contains(EdgeFlags::FOLDER) {\n *e = EdgeMap {\n inode: e.inode,\n edges,\n }\n } else {\n *contents = Some(Atom::EdgeMap(EdgeMap {\n inode: e.inode,\n edges,\n }))\n }\n }\n }\n Ok(None)\n }\n"},{"Del":" Some(Hunk::FileUndel {\n"},{"Del":" ref mut undel,\n ref mut contents,\n ..\n }) => {\n"},{"Del":" if let Some(edges) = parse_edges(changes, h)? {\n"},{"Del":" if let Atom::EdgeMap(ref mut e) = undel {\n if edges[0].flag.contains(EdgeFlags::FOLDER) {\n *e = EdgeMap {\n inode: e.inode,\n edges,\n }\n } else {\n *contents = Some(Atom::EdgeMap(EdgeMap {\n inode: e.inode,\n edges,\n }))\n }\n }\n }\n Ok(None)\n }\n"},{"Del":" Some(Hunk::FileMove {\n"},{"Del":" ref mut del,\n ref mut add,\n ..\n }) => {\n"},{"Del":" if let Some(edges) = parse_edges(changes, h)? {\n"},{"Del":" if edges[0].flag.contains(EdgeFlags::DELETED) {\n *del = Atom::EdgeMap(EdgeMap {\n inode: del.inode(),\n edges,\n });\n return Ok(None);\n } else if let Atom::EdgeMap(ref mut add) = add {\n if add.edges.is_empty() {\n *add = EdgeMap {\n inode: add.inode,\n edges,\n };\n return Ok(None);\n }\n }\n } else if let Some(cap) = CONTEXT.captures(h) {\n if let Atom::NewVertex(ref mut c) = add {\n debug!(\"cap = {:?}\", cap);\n c.up_context = parse_pos_vec(changes, offsets, &cap[1])?;\n if let Some(cap) = cap.get(7) {\n c.down_context = parse_pos_vec(changes, offsets, cap.as_str())?;\n }\n }\n }\n Ok(None)\n }\n"},{"Del":" Some(Hunk::Edit {\n ref mut change,\n encoding,\n ..\n }) => {\n"},{"Del":" debug!(\"edit {:?}\", h);\n if h.starts_with(\"+ \") {\n if let Atom::NewVertex(ref mut change) = change {\n if change.start == change.end {\n"},{"Del":" change.start = ChangePosition(contents_.len().into());\n"},{"Del":" }\n"},{"Del":" text_changes::parse_line_add(h, change, contents_, encoding)\n"},{"Del":" }\n } else if h.starts_with('\\\\') {\n if let Atom::NewVertex(ref mut change) = change {\n"},{"Del":" if change.end > change.start && contents_[change.end.us() - 1] == b'\\n'\n"},{"Del":" {\n"},{"Del":" assert_eq!(change.end.us(), contents_.len());\n"},{"Del":" contents_.pop();\n change.end.0 -= 1;\n }\n }\n } else if let Some(cap) = CONTEXT.captures(h) {\n if let Atom::NewVertex(ref mut c) = change {\n debug!(\"cap = {:?}\", cap);\n c.up_context = parse_pos_vec(changes, offsets, &cap[1])?;\n if let Some(cap) = cap.get(7) {\n c.down_context = parse_pos_vec(changes, offsets, cap.as_str())?;\n }\n }\n"},{"Del":" } else if let Some(edges) = parse_edges(changes, h)? {\n"},{"Del":" *change = Atom::EdgeMap(EdgeMap {\n inode: change.inode(),\n edges,\n });\n }\n Ok(None)\n }\n"},{"Del":" Some(Hunk::Replacement {\n"},{"Del":" ref mut change,\n ref mut replacement,\n"},{"Del":" encoding,\n"},{"Del":" ..\n }) => {\n if h.starts_with(\"+ \") {\n if let Atom::NewVertex(ref mut repl) = replacement {\n if repl.start == repl.end {\n"},{"Del":" repl.start = ChangePosition(contents_.len().into());\n"},{"Del":" }\n"},{"Del":" text_changes::parse_line_add(h, repl, contents_, encoding)\n"},{"Del":" }\n } else if h.starts_with('\\\\') {\n if let Atom::NewVertex(ref mut repl) = replacement {\n"},{"Del":" if repl.end > repl.start && contents_[repl.end.us() - 1] == b'\\n' {\n"},{"Del":" assert_eq!(repl.end.us(), contents_.len());\n"},{"Del":" contents_.pop();\n repl.end.0 -= 1;\n }\n }\n } else if let Some(cap) = CONTEXT.captures(h) {\n debug!(\"cap = {:?}\", cap);\n if let Atom::NewVertex(ref mut repl) = replacement {\n repl.up_context = parse_pos_vec(changes, offsets, &cap[1])?;\n if let Some(cap) = cap.get(7) {\n repl.down_context = parse_pos_vec(changes, offsets, cap.as_str())?;\n }\n }\n"},{"Del":" } else if let Some(edges) = parse_edges(changes, h)? {\n"},{"Del":" *change = Atom::EdgeMap(EdgeMap {\n inode: change.inode(),\n edges,\n });\n }\n Ok(None)\n }\n"},{"Del":" Some(Hunk::SolveNameConflict { ref mut name, .. })\n | Some(Hunk::UnsolveNameConflict { ref mut name, .. }) => {\n"},{"Del":" if let Some(edges) = parse_edges(changes, h)? {\n"},{"Del":" *name = Atom::EdgeMap(EdgeMap {\n edges,\n inode: name.inode(),\n })\n }\n Ok(None)\n }\n"},{"Del":" Some(Hunk::SolveOrderConflict { ref mut change, .. }) => {\n"},{"Del":" if h.starts_with(\"+ \") {\n if let Atom::NewVertex(ref mut change) = change {\n if change.start == change.end {\n"},{"Del":" change.start = ChangePosition(contents_.len().into());\n"},{"Del":" }\n"},{"Del":" // TODO encoding\n text_changes::parse_line_add(h, change, contents_, &None)\n"},{"Del":" }\n } else if let Some(cap) = CONTEXT.captures(h) {\n debug!(\"cap = {:?}\", cap);\n if let Atom::NewVertex(ref mut change) = change {\n change.up_context = parse_pos_vec(changes, offsets, &cap[1])?;\n if let Some(cap) = cap.get(7) {\n change.down_context =\n parse_pos_vec(changes, offsets, cap.as_str())?;\n }\n if let (Some(new_start), Some(new_end)) = (cap.get(4), cap.get(5)) {\n let new_start = new_start.as_str().parse::().unwrap();\n let new_end = new_end.as_str().parse::().unwrap();\n"},{"Del":" change.start = ChangePosition(contents_.len().into());\n"},{"Del":" change.end = ChangePosition(\n (contents_.len() as u64 + new_end - new_start).into(),\n );\n"},{"Del":" offsets.insert(new_end, change.end);\n }\n }\n }\n Ok(None)\n }\n"},{"Del":" Some(Hunk::UnsolveOrderConflict { ref mut change, .. }) => {\n"},{"Del":" if let Some(edges) = parse_edges(changes, h)? {\n"},{"Del":" if let Atom::EdgeMap(ref mut change) = change {\n change.edges = edges\n }\n }\n Ok(None)\n }\n"},{"Del":" Some(Hunk::ResurrectZombies { ref mut change, .. }) => {\n"},{"Del":" if let Some(edges) = parse_edges(changes, h)? {\n"},{"Del":" if let Atom::EdgeMap(ref mut change) = change {\n change.edges = edges\n }\n }\n Ok(None)\n }\n None => {\n debug!(\"current = {:#?}\", current);\n debug!(\"h = {:?}\", h);\n Ok(None)\n }\n }\n"}]}},{"Edit":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":906,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":4608},"to":{"change":7,"start":4608,"end":4849},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":4849},"to":{"change":7,"start":79941,"end":80257},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":79941},"to":{"change":7,"start":79941,"end":80257},"introduced_by":7}],"inode":{"change":7,"pos":37976}}},"contents":[{"Del":"fn encoding_from_label(cap: Captures) -> Option {\n let encoding_label = cap.name(\"encoding\").unwrap().as_str();\n if encoding_label != BINARY_LABEL {\n Some(Encoding::for_label(encoding_label))\n } else {\n None\n"},{"Del":" }\n}\n\nlazy_static! {\n static ref POS: regex::Regex = regex::Regex::new(r#\"(\\d+)\\.(\\d+)\"#).unwrap();\n static ref EDGE: regex::Regex =\n regex::Regex::new(r#\"\\s*(?P[BFD]*):(?P[BFD]*)\\s+(?P\\d+)\\.(?P\\d+)\\s*->\\s*(?P\\d+)\\.(?P\\d+):(?P\\d+)/(?P\\d+)\\s*\"#).unwrap();\n}\n\n"}]}},{"Edit":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":913,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":80495},"to":{"change":7,"start":80495,"end":80559},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":80559},"to":{"change":7,"start":142643,"end":142684},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":142684},"to":{"change":7,"start":80595,"end":80708},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":80595},"to":{"change":7,"start":80595,"end":80708},"introduced_by":7}],"inode":{"change":7,"pos":37976}}},"contents":[{"Del":" inode: Position {\n change: Some(Hash::None),\n"},{"Del":" pos: ChangePosition(L64(0)),\n"},{"Del":" },\n }\n}\n\npub fn default_edgemap() -> EdgeMap> {\n EdgeMap {\n edges: Vec::new(),\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":920,"ins":{"up_context":[{"change":7,"pos":80828}],"down_context":[{"change":7,"pos":81102}],"flag":"BLOCK","start":34281,"end":34336,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":80828},"to":{"change":7,"start":10441,"end":10518},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":10518},"to":{"change":7,"start":80907,"end":80927},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":80907},"to":{"change":7,"start":80907,"end":80927},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":80927},"to":{"change":7,"start":10519,"end":10587},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":10587},"to":{"change":7,"start":80997,"end":81102},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":80997},"to":{"change":7,"start":80997,"end":81102},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":"// TODO: rename"},{"Add":"pub fn from_printable_pos_vec_offsets("}],"del_contents":[{"Del":"pub fn has_newvertices(current: &Option, L>>) -> bool {\n"},{"Del":" match current {\n"},{"Del":" Some(Hunk::FileAdd { contents: None, .. }) | None => false,\n"},{"Del":" Some(rec) => rec.iter().any(|e| matches!(e, Atom::NewVertex(_))),\n }\n}\n\npub fn parse_pos_vec(\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":924,"ins":{"up_context":[{"change":7,"pos":81182}],"down_context":[{"change":7,"pos":81195}],"flag":"BLOCK","start":34337,"end":34361,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":81182},"to":{"change":7,"start":81182,"end":81195},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" s: &[PrintablePos],"}],"del_contents":[{"Del":" s: &str,\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":927,"ins":{"up_context":[{"change":7,"pos":81279}],"down_context":[{"change":7,"pos":81459}],"flag":"BLOCK","start":34362,"end":34439,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":81279},"to":{"change":7,"start":81279,"end":81459},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" for PrintablePos(change, pos) in s {"},{"Add":" let pos = if *change == 0 {"}],"del_contents":[{"Del":" for pos in POS.captures_iter(s) {\n let change: usize = (&pos[1]).parse().unwrap();\n let pos: u64 = (&pos[2]).parse().unwrap();\n let pos = if change == 0 {\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":933,"ins":{"up_context":[{"change":7,"pos":81622}],"down_context":[{"change":7,"pos":81686}],"flag":"BLOCK","start":34440,"end":34504,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":81622},"to":{"change":7,"start":1310,"end":1373},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" return Err(TextDeError::MissingPosition(*pos));"}],"del_contents":[{"Del":" return Err(TextDeError::MissingPosition(pos));\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":939,"ins":{"up_context":[{"change":7,"pos":81786}],"down_context":[{"change":7,"pos":81835}],"flag":"BLOCK","start":34505,"end":34556,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":81786},"to":{"change":7,"start":1374,"end":1424},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" change: change_ref(changes, *change)?,"}],"del_contents":[{"Del":" change: change_ref(changes, change)?,\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":959,"ins":{"up_context":[{"change":7,"pos":82168}],"down_context":[{"change":7,"pos":1713}],"flag":"BLOCK","start":34557,"end":34584,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":82168},"to":{"change":7,"start":1695,"end":1713},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":"pub fn from_printable_pos("}],"del_contents":[{"Del":"pub fn parse_pos(\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":961,"ins":{"up_context":[{"change":7,"pos":1749}],"down_context":[{"change":7,"pos":1762}],"flag":"BLOCK","start":34585,"end":34608,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1749},"to":{"change":7,"start":1749,"end":1762},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" pos: PrintablePos,"}],"del_contents":[{"Del":" s: &str,\n"}]}},{"Edit":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":963,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":7,"pos":1813},"to":{"change":7,"start":82254,"end":82393},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":82254},"to":{"change":7,"start":82254,"end":82393},"introduced_by":7}],"inode":{"change":7,"pos":37976}}},"contents":[{"Del":" let pos = POS.captures(s).unwrap();\n let change: usize = (&pos[1]).parse().unwrap();\n let pos: u64 = (&pos[2]).parse().unwrap();\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":964,"ins":{"up_context":[{"change":7,"pos":1832}],"down_context":[{"change":7,"pos":1879}],"flag":"BLOCK","start":34609,"end":34703,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1832},"to":{"change":7,"start":1832,"end":1878},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1878},"to":{"change":7,"start":142773,"end":142820},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" change: change_ref(changes, pos.0)?,"},{"Add":" pos: ChangePosition(L64(pos.1.to_le())),"}],"del_contents":[{"Del":" change: change_ref(changes, change)?,\n"},{"Del":" pos: ChangePosition(L64(pos.to_le())),\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":969,"ins":{"up_context":[{"change":7,"pos":82496}],"down_context":[{"change":7,"pos":1907}],"flag":"BLOCK","start":34704,"end":34735,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":82496},"to":{"change":7,"start":1887,"end":1907},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":"pub fn from_printable_pos_vec("}],"del_contents":[{"Del":"pub fn parse_edges(\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":971,"ins":{"up_context":[{"change":7,"pos":1943}],"down_context":[{"change":7,"pos":84043}],"flag":"BLOCK","start":34736,"end":34919,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1943},"to":{"change":7,"start":1943,"end":2019},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":2019},"to":{"change":7,"start":82596,"end":83547},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":82596},"to":{"change":7,"start":82596,"end":83547},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":83547},"to":{"change":7,"start":2020,"end":2079},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2079},"to":{"change":7,"start":142821,"end":142881},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":142881},"to":{"change":7,"start":83652,"end":83700},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":83652},"to":{"change":7,"start":83652,"end":83700},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":83700},"to":{"change":7,"start":2080,"end":2139},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2139},"to":{"change":7,"start":142882,"end":143006},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":143006},"to":{"change":7,"start":83856,"end":83875},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":83856},"to":{"change":7,"start":83856,"end":83875},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":83875},"to":{"change":7,"start":2140,"end":2208},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":2208},"to":{"change":7,"start":83942,"end":84008},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":83942},"to":{"change":7,"start":83942,"end":84008},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":84008},"to":{"change":7,"start":2209,"end":2238},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":2238},"to":{"change":7,"start":84033,"end":84043},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":84033},"to":{"change":7,"start":84033,"end":84043},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" pos: &[PrintablePos],"},{"Add":") -> Result>>, TextDeError> {"},{"Add":" let mut buf = Vec::new();"},{"Add":" for p in pos {"},{"Add":" buf.push(from_printable_pos(changes, *p)?);"}],"del_contents":[{"Del":" s: &str,\n) -> Result>>>, TextDeError> {\n"},{"Del":" debug!(\"parse_edges {:?}\", s);\n let mut result = Vec::new();\n for edge in s.split(',') {\n debug!(\"parse edge {:?}\", edge);\n if let Some(cap) = EDGE.captures(edge) {\n let previous = read_flag(cap.name(\"prev\").unwrap().as_str());\n let flag = read_flag(cap.name(\"flag\").unwrap().as_str());\n let change0: usize = cap.name(\"up_c\").unwrap().as_str().parse().unwrap();\n let pos0: u64 = cap.name(\"up_l\").unwrap().as_str().parse().unwrap();\n let change1: usize = cap.name(\"c\").unwrap().as_str().parse().unwrap();\n let start1: u64 = cap.name(\"l0\").unwrap().as_str().parse().unwrap();\n let end1: u64 = cap.name(\"l1\").unwrap().as_str().parse().unwrap();\n let introduced_by: usize = cap.name(\"intro\").unwrap().as_str().parse().unwrap();\n result.push(NewEdge {\n previous,\n flag,\n from: Position {\n"},{"Del":" change: change_ref(changes, change0)?,\n"},{"Del":" pos: ChangePosition(L64(pos0.to_le())),\n"},{"Del":" },\n to: Vertex {\n"},{"Del":" change: change_ref(changes, change1)?,\n"},{"Del":" start: ChangePosition(L64(start1.to_le())),\n end: ChangePosition(L64(end1.to_le())),\n"},{"Del":" },\n"},{"Del":" introduced_by: change_ref(changes, introduced_by)?,\n"},{"Del":" })\n } else {\n debug!(\"not parsed\");\n"},{"Del":" return Ok(None);\n"},{"Del":" }\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":977,"ins":{"up_context":[{"change":7,"pos":84049}],"down_context":[{"change":7,"pos":84066}],"flag":"BLOCK","start":34920,"end":34932,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":84049},"to":{"change":7,"start":2239,"end":2260},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" Ok(buf)"}],"del_contents":[{"Del":" Ok(Some(result))\n"}]}},{"Edit":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":980,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":84069},"to":{"change":7,"start":768,"end":987},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":987},"to":{"change":7,"start":1204,"end":1262},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":1262},"to":{"change":7,"start":1033,"end":1040},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1033},"to":{"change":7,"start":1033,"end":1040},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":1040},"to":{"change":7,"start":84191,"end":84540},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":84191},"to":{"change":7,"start":84191,"end":84540},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":84540},"to":{"change":7,"start":143007,"end":143064},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":143064},"to":{"change":7,"start":84597,"end":84600},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":84597},"to":{"change":7,"start":84597,"end":84600},"introduced_by":7}],"inode":{"change":7,"pos":37976}}},"contents":[{"Del":"pub fn parse_line_add(\n h: &str,\n change: &mut NewVertex>,\n contents_: &mut Vec,\n encoding: &Option,\n) {\n let h = match encoding {\n Some(encoding) => encoding.encode(h),\n"},{"Del":" None => std::borrow::Cow::Borrowed(h.as_bytes()),\n"},{"Del":" };\n"},{"Del":" debug!(\"parse_line_add {:?} {:?}\", change.end, change.start);\n debug!(\"parse_line_add {:?}\", h);\n if h.len() > 2 {\n let h = &h[2..h.len()];\n contents_.extend(h);\n } else if h.len() > 1 {\n contents_.push(b'\\n');\n }\n debug!(\"contents_.len() = {:?}\", contents_.len());\n trace!(\"contents_ = {:?}\", contents_);\n"},{"Del":" change.end = ChangePosition(contents_.len().into());\n"},{"Del":"}\n\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":989,"ins":{"up_context":[{"change":7,"pos":1668}],"down_context":[{"change":7,"pos":3775}],"flag":"BLOCK","start":34933,"end":35011,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":7,"pos":1668},"to":{"change":7,"start":3699,"end":3775},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":3699},"to":{"change":7,"start":3699,"end":3775},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" writeln!(self, \"{}b{}\", pref, data_encoding::BASE64.encode(contents))"}],"del_contents":[{"Del":" write!(self, \"{}b{}\", pref, data_encoding::BASE64.encode(contents))\n"}]}},{"Edit":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":996,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":7,"pos":143163},"to":{"change":7,"start":3825,"end":3869},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":3825},"to":{"change":7,"start":3825,"end":3869},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":3869},"to":{"change":7,"start":84642,"end":84694},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":84642},"to":{"change":7,"start":84642,"end":84694},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":84694},"to":{"change":7,"start":449,"end":482},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":482},"to":{"change":7,"start":84694,"end":84728},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":84694},"to":{"change":7,"start":84694,"end":84728},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":84728},"to":{"change":7,"start":483,"end":522},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":522},"to":{"change":7,"start":1263,"end":1466},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":1466},"to":{"change":7,"start":1236,"end":1278},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":6169},"to":{"change":7,"start":1236,"end":1278},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":591},"to":{"change":7,"start":1236,"end":1278},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":1278},"to":{"change":7,"start":85088,"end":85206},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":3962},"to":{"change":7,"start":85088,"end":85206},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":5848},"to":{"change":7,"start":85088,"end":85206},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":85088},"to":{"change":7,"start":85088,"end":85206},"introduced_by":7}],"inode":{"change":7,"pos":37976}}},"contents":[{"Del":"\npub fn print_contents(\n"},{"Del":" w: &mut W,\n pref: &str,\n contents: &[u8],\n"},{"Del":" encoding: &Option,\n"},{"Del":") -> Result<(), std::io::Error> {\n"},{"Del":" if let Some(encoding) = encoding {\n"},{"Del":" let dec = encoding.decode(&contents);\n let dec = if dec.ends_with(\"\\n\") {\n &dec[..dec.len() - 1]\n } else {\n &dec\n };\n for a in dec.split('\\n') {\n"},{"Del":" w.write_change_line(pref, a)?\n"},{"Del":" }\n } else {\n writeln!(w, \"{}b{}\", pref, data_encoding::BASE64.encode(contents))?\n }\n Ok(())\n}\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":997,"ins":{"up_context":[{"change":7,"pos":85207}],"down_context":[{"change":7,"pos":85287}],"flag":"BLOCK","start":35012,"end":35056,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":85207},"to":{"change":7,"start":3963,"end":4029},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":4029},"to":{"change":7,"start":85272,"end":85287},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":85272},"to":{"change":7,"start":85272,"end":85287},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":"pub fn get_change_contents("}],"del_contents":[{"Del":"pub fn print_change_contents(\n"},{"Del":" w: &mut W,\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":1001,"ins":{"up_context":[{"change":7,"pos":85365}],"down_context":[{"change":7,"pos":85407}],"flag":"BLOCK","start":35057,"end":35152,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":85365},"to":{"change":7,"start":4850,"end":4883},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":4883},"to":{"change":7,"start":85365,"end":85407},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":85365},"to":{"change":7,"start":85365,"end":85407},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":85407},"to":{"change":7,"start":6170,"end":6220},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":") -> Result, TextSerError> {"},{"Add":" debug!(\"get_change_contents {:?}\", change);"}],"del_contents":[{"Del":" encoding: &Option,\n"},{"Del":") -> Result<(), TextSerError> {\n"},{"Del":" debug!(\"print_change_contents {:?}\", change);\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":1004,"ins":{"up_context":[{"change":7,"pos":85426}],"down_context":[{"change":7,"pos":85693}],"flag":"BLOCK","start":35153,"end":35331,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":85426},"to":{"change":7,"start":85426,"end":85462},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":85462},"to":{"change":7,"start":143164,"end":143228},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":143228},"to":{"change":7,"start":4884,"end":4934},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":639},"to":{"change":7,"start":85578,"end":85615},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":4934},"to":{"change":7,"start":85578,"end":85615},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":85578},"to":{"change":7,"start":85578,"end":85615},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":85615},"to":{"change":7,"start":6221,"end":6278},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":6278},"to":{"change":7,"start":169,"end":206},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":85615},"to":{"change":7,"start":169,"end":206},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":206},"to":{"change":7,"start":85650,"end":85693},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":85650},"to":{"change":7,"start":85650,"end":85693},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":85693},"to":{"change":7,"start":528,"end":623},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" Atom::NewVertex(ref n) => Ok(change_contents[n.start.us()..n.end.us()].to_vec()),"},{"Add":" Atom::EdgeMap(ref n) if n.edges.is_empty() => Err(TextSerError::InvalidChange),"}],"del_contents":[{"Del":" Atom::NewVertex(ref n) => {\n"},{"Del":" let c = &change_contents[n.start.us()..n.end.us()];\n"},{"Del":" print_contents(w, \"+\", c, encoding)?;\n"},{"Del":" if !c.ends_with(b\"\\n\") {\n"},{"Del":" debug!(\"print_change_contents {:?}\", c);\n"},{"Del":" writeln!(w, \"\\n\\\\\")?\n"},{"Del":" }\n Ok(())\n }\n"},{"Del":" Atom::EdgeMap(ref n) if n.edges.is_empty() => return Err(TextSerError::InvalidChange),\n"}]}},{"Edit":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":1007,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":85775}],"down_context":[{"change":7,"pos":85775}],"flag":"BLOCK","start":35332,"end":35383,"inode":{"change":7,"pos":37976}}},"contents":[{"Add":" // TODO: get rid of `tmp` and/or `buf`"}]}},{"Edit":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":1009,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":85813}],"down_context":[{"change":7,"pos":85813}],"flag":"BLOCK","start":35384,"end":35422,"inode":{"change":7,"pos":37976}}},"contents":[{"Add":" let mut tmp = Vec::new();"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":1015,"ins":{"up_context":[{"change":7,"pos":85978}],"down_context":[{"change":7,"pos":86007}],"flag":"BLOCK","start":35423,"end":35452,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":85978},"to":{"change":7,"start":85978,"end":86007},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" tmp.clear();"}],"del_contents":[{"Del":" buf.clear();\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":1017,"ins":{"up_context":[{"change":7,"pos":86031}],"down_context":[{"change":7,"pos":86085}],"flag":"BLOCK","start":35453,"end":35507,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":86031},"to":{"change":7,"start":86031,"end":86085},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" .get_contents_ext(e.to, &mut tmp)"}],"del_contents":[{"Del":" .get_contents_ext(e.to, &mut buf)\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":1019,"ins":{"up_context":[{"change":7,"pos":86133}],"down_context":[{"change":7,"pos":86184}],"flag":"BLOCK","start":35508,"end":35553,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":86133},"to":{"change":7,"start":4935,"end":4997},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":443},"to":{"change":7,"start":0,"end":43},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":4997},"to":{"change":7,"start":0,"end":43},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":86184},"to":{"change":7,"start":0,"end":43},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":43},"to":{"change":7,"start":6279,"end":6342},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":6342},"to":{"change":7,"start":43,"end":95},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":43},"to":{"change":7,"start":43,"end":95},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" buf.extend_from_slice(&tmp);"}],"del_contents":[{"Del":" print_contents(w, \"-\", &buf[..], &encoding)?;\n"},{"Del":" if !buf.ends_with(b\"\\n\") {\n"},{"Del":" debug!(\"print_change_contents {:?}\", buf);\n"},{"Del":" writeln!(w)?;\n }\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":1022,"ins":{"up_context":[{"change":7,"pos":86235}],"down_context":[{"change":7,"pos":86254}],"flag":"BLOCK","start":35554,"end":35574,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":86235},"to":{"change":7,"start":86235,"end":86254},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" Ok(buf)"}],"del_contents":[{"Del":" Ok(())\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":1024,"ins":{"up_context":[{"change":7,"pos":86264}],"down_context":[{"change":7,"pos":86285}],"flag":"BLOCK","start":35575,"end":35604,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":86264},"to":{"change":7,"start":86264,"end":86285},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" _ => Ok(Vec::new()),"}],"del_contents":[{"Del":" _ => Ok(()),\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":1028,"ins":{"up_context":[{"change":7,"pos":86294}],"down_context":[{"change":7,"pos":86372}],"flag":"BLOCK","start":35605,"end":35647,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":86294},"to":{"change":7,"start":86294,"end":86372},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":"pub fn get_deleted_names("}],"del_contents":[{"Del":"pub fn write_deleted_names(\n w: &mut W,\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":1031,"ins":{"up_context":[{"change":7,"pos":86419}],"down_context":[{"change":7,"pos":86461}],"flag":"BLOCK","start":35648,"end":35729,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":86419},"to":{"change":7,"start":86419,"end":86461},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":") -> Result, TextSerError> {"},{"Add":" let mut res = Vec::new();"}],"del_contents":[{"Del":") -> Result<(), TextSerError> {\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":1034,"ins":{"up_context":[{"change":7,"pos":86501}],"down_context":[{"change":7,"pos":86568}],"flag":"BLOCK","start":35730,"end":35764,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":86501},"to":{"change":7,"start":86501,"end":86568},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" let mut tmp = Vec::new();"}],"del_contents":[{"Del":" let mut buf = Vec::new();\n let mut is_first = true;\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":1036,"ins":{"up_context":[{"change":7,"pos":86602}],"down_context":[{"change":7,"pos":86627}],"flag":"BLOCK","start":35765,"end":35790,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":86602},"to":{"change":7,"start":86602,"end":86627},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" tmp.clear();"}],"del_contents":[{"Del":" buf.clear();\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":1038,"ins":{"up_context":[{"change":7,"pos":86647}],"down_context":[{"change":7,"pos":86697}],"flag":"BLOCK","start":35791,"end":35841,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":86647},"to":{"change":7,"start":86647,"end":86697},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" .get_contents_ext(d.to, &mut tmp)"}],"del_contents":[{"Del":" .get_contents_ext(d.to, &mut buf)\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":1040,"ins":{"up_context":[{"change":7,"pos":86741}],"down_context":[{"change":7,"pos":86962}],"flag":"BLOCK","start":35842,"end":36003,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":86741},"to":{"change":7,"start":86741,"end":86774},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":86774},"to":{"change":7,"start":3390,"end":3474},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":3474},"to":{"change":7,"start":86850,"end":86962},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":86850},"to":{"change":7,"start":86850,"end":86962},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" if !tmp.is_empty() {"},{"Add":" let FileMetadata { basename: name, .. } = FileMetadata::read(&tmp);"},{"Add":" res.push(name.to_string());"}],"del_contents":[{"Del":" if !buf.is_empty() {\n"},{"Del":" let FileMetadata { basename: name, .. } = FileMetadata::read(&buf);\n"},{"Del":" write!(w, \"{}{:?}\", if is_first { \"\" } else { \", \" }, name)?;\n is_first = false;\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":1046,"ins":{"up_context":[{"change":7,"pos":86992}],"down_context":[{"change":7,"pos":87003}],"flag":"BLOCK","start":36004,"end":36016,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":86992},"to":{"change":7,"start":86992,"end":87003},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" Ok(res)"}],"del_contents":[{"Del":" Ok(())\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":1049,"ins":{"up_context":[{"change":7,"pos":87006}],"down_context":[{"change":7,"pos":87812}],"flag":"BLOCK","start":36017,"end":36042,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":87006},"to":{"change":7,"start":87006,"end":87812},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":"pub fn to_printable_pos("}],"del_contents":[{"Del":"pub fn write_flag(mut w: W, flag: EdgeFlags) -> Result<(), std::io::Error> {\n if flag.contains(EdgeFlags::BLOCK) {\n w.write_all(b\"B\")?;\n }\n if flag.contains(EdgeFlags::FOLDER) {\n w.write_all(b\"F\")?;\n }\n if flag.contains(EdgeFlags::DELETED) {\n w.write_all(b\"D\")?;\n }\n assert!(!flag.contains(EdgeFlags::PARENT));\n assert!(!flag.contains(EdgeFlags::PSEUDO));\n Ok(())\n}\n\npub fn read_flag(s: &str) -> EdgeFlags {\n let mut f = EdgeFlags::empty();\n for i in s.chars() {\n match i {\n 'B' => f |= EdgeFlags::BLOCK,\n 'F' => f |= EdgeFlags::FOLDER,\n 'D' => f |= EdgeFlags::DELETED,\n c => panic!(\"read_flag: {:?}\", c),\n }\n }\n f\n}\n\npub fn write_pos(\n mut w: W,\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":1052,"ins":{"up_context":[{"change":7,"pos":87880}],"down_context":[{"change":7,"pos":87914}],"flag":"BLOCK","start":36043,"end":36063,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":87880},"to":{"change":7,"start":87880,"end":87914},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":") -> PrintablePos {"}],"del_contents":[{"Del":") -> Result<(), std::io::Error> {\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":1060,"ins":{"up_context":[{"change":7,"pos":88087}],"down_context":[{"change":7,"pos":88142}],"flag":"BLOCK","start":36064,"end":36103,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":88087},"to":{"change":7,"start":88087,"end":88142},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" PrintablePos(change, pos.pos.0 .0)"}],"del_contents":[{"Del":" write!(w, \"{}.{}\", change, pos.pos.0)?;\n Ok(())\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":1063,"ins":{"up_context":[{"change":7,"pos":88145}],"down_context":[{"change":7,"pos":88198}],"flag":"BLOCK","start":36104,"end":36133,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":88145},"to":{"change":7,"start":88145,"end":88198},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":"pub fn to_printable_pos_vec("}],"del_contents":[{"Del":"pub fn write_atom(\n w: &mut W,\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":1065,"ins":{"up_context":[{"change":7,"pos":88233}],"down_context":[{"change":7,"pos":88447}],"flag":"BLOCK","start":36134,"end":36258,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":88233},"to":{"change":7,"start":88233,"end":88447},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" pos: &[Position>],"},{"Add":") -> Vec {"},{"Add":" pos.iter().map(|c| to_printable_pos(hashes, *c)).collect()"}],"del_contents":[{"Del":" atom: &Atom>,\n) -> Result<(), std::io::Error> {\n match atom {\n Atom::NewVertex(ref n) => write_newvertex(w, hashes, n),\n Atom::EdgeMap(ref n) => write_edgemap(w, hashes, n),\n }\n"}]}},{"Edit":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":1069,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":88449},"to":{"change":7,"start":88449,"end":89960},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":89960},"to":{"change":7,"start":10588,"end":10689},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":10689},"to":{"change":7,"start":90065,"end":90121},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":90065},"to":{"change":7,"start":90065,"end":90121},"introduced_by":7}],"inode":{"change":7,"pos":37976}}},"contents":[{"Del":"\npub fn write_newvertex(\n mut w: W,\n hashes: &HashMap,\n n: &NewVertex>,\n) -> Result<(), std::io::Error> {\n write!(w, \" up\")?;\n for c in n.up_context.iter() {\n write!(w, \" \")?;\n write_pos(&mut w, hashes, *c)?\n }\n write!(w, \", new {}:{}\", n.start.0, n.end.0)?;\n if !n.down_context.is_empty() {\n write!(w, \", down\")?;\n for c in n.down_context.iter() {\n write!(w, \" \")?;\n write_pos(&mut w, hashes, *c)?\n }\n }\n w.write_all(b\"\\n\")?;\n Ok(())\n}\n\npub fn write_edgemap(\n mut w: W,\n hashes: &HashMap,\n n: &EdgeMap>,\n) -> Result<(), std::io::Error> {\n let mut is_first = true;\n for c in n.edges.iter() {\n if !is_first {\n write!(w, \", \")?;\n }\n is_first = false;\n write_flag(&mut w, c.previous)?;\n write!(w, \":\")?;\n write_flag(&mut w, c.flag)?;\n write!(w, \" \")?;\n write_pos(&mut w, hashes, c.from)?;\n write!(w, \" -> \")?;\n write_pos(&mut w, hashes, c.to.start_pos())?;\n let h = if let Some(h) = hashes.get(c.introduced_by.as_ref().unwrap()) {\n h\n } else {\n panic!(\"introduced_by = {:?}, not found\", c.introduced_by);\n };\n write!(w, \":{}/{}\", c.to.end.0, h)?;\n }\n writeln!(w)?;\n Ok(())\n}\n\n#[derive(Debug, Clone, PartialEq, Eq)]\npub enum Section {\n Header(String),\n Deps,\n Changes {\n"},{"Del":" changes: Vec, Local>>,\n current: Option, Local>>,\n"},{"Del":" offsets: HashMap,\n },\n}\n"}]}},{"FileAdd":{"meta":{"basename":"printable.rs","metadata":0},"context":[{"change":49,"pos":931000}],"contents":[{"Add":"use std::fmt;"},{"Add":""},{"Add":"#[cfg(test)]"},{"Add":"use quickcheck::{Arbitrary, Gen};"},{"Add":""},{"Add":"#[cfg(test)]"},{"Add":"use PrintableHunk::*;"},{"Add":""},{"Add":"use super::*;"},{"Add":""},{"Add":"#[derive(Debug, Clone, Copy, PartialEq, Eq)]"},{"Add":"pub enum StringFragment<'a> {"},{"Add":" Literal(&'a str),"},{"Add":" EscapedChar(char),"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Copy, Clone, Debug, Eq, PartialEq)]"},{"Add":"pub enum PrintablePerms {"},{"Add":" IsDir,"},{"Add":" IsExecutable,"},{"Add":" IsFile,"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Copy, Clone, Debug, Eq, PartialEq)]"},{"Add":"pub struct PrintableEdgeFlags {"},{"Add":" pub block: bool,"},{"Add":" pub folder: bool,"},{"Add":" pub deleted: bool,"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Clone, Debug, Eq, PartialEq)]"},{"Add":"pub struct PrintableEdge {"},{"Add":" pub previous: PrintableEdgeFlags,"},{"Add":" pub flag: PrintableEdgeFlags,"},{"Add":" pub from: PrintablePos,"},{"Add":" pub to_start: PrintablePos,"},{"Add":" pub to_end: u64,"},{"Add":" pub introduced_by: usize,"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Clone, Debug, Eq, PartialEq)]"},{"Add":"pub struct PrintableNewVertex {"},{"Add":" pub up_context: Vec,"},{"Add":" pub start: u64,"},{"Add":" pub end: u64,"},{"Add":" pub down_context: Vec,"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Clone, Debug, Eq, PartialEq)]"},{"Add":"pub enum PrintableAtom {"},{"Add":" NewVertex(PrintableNewVertex),"},{"Add":" Edges(Vec),"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Copy, Clone, Debug, Eq, PartialEq)]"},{"Add":"pub struct PrintablePos(pub usize, pub u64);"},{"Add":""},{"Add":"// TODO: Some of these are untested: I didn't know how to create them from the"},{"Add":"// command line"},{"Add":"// NOTE: contents must be valid under the chosen encoding"},{"Add":"#[derive(PartialEq, Eq, Clone, Debug)]"},{"Add":"pub enum PrintableHunk {"},{"Add":" FileMoveV {"},{"Add":" path: String,"},{"Add":" name: String,"},{"Add":" perms: PrintablePerms,"},{"Add":" pos: PrintablePos,"},{"Add":" up_context: Vec,"},{"Add":" down_context: Vec,"},{"Add":" del: Vec,"},{"Add":" },"},{"Add":" FileMoveE {"},{"Add":" path: String,"},{"Add":" pos: PrintablePos,"},{"Add":" add: Vec,"},{"Add":" del: Vec,"},{"Add":" },"},{"Add":" FileAddition {"},{"Add":" name: String,"},{"Add":" parent: String,"},{"Add":" perms: PrintablePerms,"},{"Add":" encoding: Option,"},{"Add":" up_context: Vec,"},{"Add":" start: u64,"},{"Add":" end: u64,"},{"Add":" contents: Vec,"},{"Add":" },"},{"Add":" FileDel {"},{"Add":" path: String,"},{"Add":" pos: PrintablePos,"},{"Add":" encoding: Option,"},{"Add":" del_edges: Vec,"},{"Add":" content_edges: Vec,"},{"Add":" contents: Vec,"},{"Add":" },"},{"Add":" FileUndel {"},{"Add":" path: String,"},{"Add":" pos: PrintablePos,"},{"Add":" encoding: Option,"},{"Add":" undel_edges: Vec,"},{"Add":" content_edges: Vec,"},{"Add":" contents: Vec,"},{"Add":" },"},{"Add":" Edit {"},{"Add":" path: String,"},{"Add":" line: usize,"},{"Add":" pos: PrintablePos,"},{"Add":" encoding: Option,"},{"Add":" change: PrintableAtom,"},{"Add":" contents: Vec,"},{"Add":" },"},{"Add":" Replace {"},{"Add":" path: String,"},{"Add":" line: usize,"},{"Add":" pos: PrintablePos,"},{"Add":" encoding: Option,"},{"Add":" change: Vec,"},{"Add":" replacement: PrintableNewVertex,"},{"Add":" change_contents: Vec,"},{"Add":" replacement_contents: Vec,"},{"Add":" },"},{"Add":" SolveNameConflict {"},{"Add":" path: String,"},{"Add":" pos: PrintablePos,"},{"Add":" names: Vec,"},{"Add":" edges: Vec,"},{"Add":" },"},{"Add":" UnsolveNameConflict {"},{"Add":" path: String,"},{"Add":" pos: PrintablePos,"},{"Add":" names: Vec,"},{"Add":" edges: Vec,"},{"Add":" },"},{"Add":" SolveOrderConflict {"},{"Add":" path: String,"},{"Add":" line: usize,"},{"Add":" pos: PrintablePos,"},{"Add":" encoding: Option,"},{"Add":" change: PrintableNewVertex,"},{"Add":" contents: Vec,"},{"Add":" },"},{"Add":" UnsolveOrderConflict {"},{"Add":" path: String,"},{"Add":" line: usize,"},{"Add":" pos: PrintablePos,"},{"Add":" encoding: Option,"},{"Add":" change: Vec,"},{"Add":" contents: Vec,"},{"Add":" },"},{"Add":" ResurrectZombies {"},{"Add":" path: String,"},{"Add":" line: usize,"},{"Add":" pos: PrintablePos,"},{"Add":" encoding: Option,"},{"Add":" change: Vec,"},{"Add":" contents: Vec,"},{"Add":" },"},{"Add":"}"},{"Add":""},{"Add":"#[derive(PartialEq, Eq, Clone, Debug)]"},{"Add":"pub struct PrintableDep {"},{"Add":" pub type_: DepType,"},{"Add":" pub hash: String,"},{"Add":"}"},{"Add":""},{"Add":"// TODO: make names more precise. I don't know what these should be named."},{"Add":"#[derive(PartialEq, Eq, Clone, Debug)]"},{"Add":"pub enum DepType {"},{"Add":" Numbered(usize, bool), // (number, plus-sign)"},{"Add":" ExtraKnown,"},{"Add":" ExtraUnknown,"},{"Add":"}"},{"Add":""},{"Add":"pub struct Escaped<'a>(pub &'a str);"},{"Add":""},{"Add":"impl<'a> fmt::Display for Escaped<'a> {"},{"Add":" fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {"},{"Add":" write!(fmt, \"\\\"\")?;"},{"Add":" for c in self.0.chars() {"},{"Add":" if c == '\\n' {"},{"Add":" write!(fmt, \"\\\\n\")?"},{"Add":" } else if c == '\\r' {"},{"Add":" write!(fmt, \"\\\\r\")?"},{"Add":" } else if c == '\\t' {"},{"Add":" write!(fmt, \"\\\\t\")?"},{"Add":" } else if c == '\\u{08}' {"},{"Add":" write!(fmt, \"\\\\b\")?"},{"Add":" } else if c == '\\u{0C}' {"},{"Add":" write!(fmt, \"\\\\f\")?"},{"Add":" } else if c == '\\\\' {"},{"Add":" write!(fmt, \"\\\\\\\\\")?"},{"Add":" } else if c == '\"' {"},{"Add":" write!(fmt, \"\\\\\\\"\")?"},{"Add":" } else {"},{"Add":" write!(fmt, \"{}\", c)?"},{"Add":" }"},{"Add":" }"},{"Add":" write!(fmt, \"\\\"\")?;"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl PrintablePerms {"},{"Add":" pub fn from_metadata(perms: InodeMetadata) -> Self {"},{"Add":" if perms.0 & 0o1000 == 0o1000 {"},{"Add":" PrintablePerms::IsDir"},{"Add":" } else if perms.0 & 0o100 == 0o100 {"},{"Add":" PrintablePerms::IsExecutable"},{"Add":" } else {"},{"Add":" PrintablePerms::IsFile"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" pub fn to_metadata(self) -> InodeMetadata {"},{"Add":" InodeMetadata(match self {"},{"Add":" PrintablePerms::IsDir => 0o1100,"},{"Add":" PrintablePerms::IsExecutable => 0o100,"},{"Add":" PrintablePerms::IsFile => 0o0,"},{"Add":" })"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl fmt::Display for PrintablePos {"},{"Add":" fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {"},{"Add":" write!(fmt, \"{}.{}\", self.0, self.1)"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl fmt::Display for PrintablePerms {"},{"Add":" fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {"},{"Add":" write!("},{"Add":" fmt,"},{"Add":" \"{}\","},{"Add":" match self {"},{"Add":" PrintablePerms::IsDir => \" +dx\","},{"Add":" PrintablePerms::IsExecutable => \" +x\","},{"Add":" PrintablePerms::IsFile => \"\","},{"Add":" }"},{"Add":" )"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl PrintableEdgeFlags {"},{"Add":" pub fn from(ef: EdgeFlags) -> Self {"},{"Add":" assert!(!ef.contains(EdgeFlags::PARENT));"},{"Add":" assert!(!ef.contains(EdgeFlags::PSEUDO));"},{"Add":" Self {"},{"Add":" block: ef.contains(EdgeFlags::BLOCK),"},{"Add":" folder: ef.contains(EdgeFlags::FOLDER),"},{"Add":" deleted: ef.contains(EdgeFlags::DELETED),"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" // TODO: make this nicer"},{"Add":" pub fn to(self) -> EdgeFlags {"},{"Add":" let mut f = EdgeFlags::empty();"},{"Add":" if self.block {"},{"Add":" f |= EdgeFlags::BLOCK;"},{"Add":" }"},{"Add":" if self.folder {"},{"Add":" f |= EdgeFlags::FOLDER;"},{"Add":" }"},{"Add":" if self.deleted {"},{"Add":" f |= EdgeFlags::DELETED;"},{"Add":" }"},{"Add":" f"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl fmt::Display for PrintableEdgeFlags {"},{"Add":" fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {"},{"Add":" if self.block {"},{"Add":" write!(fmt, \"B\")?;"},{"Add":" }"},{"Add":" if self.folder {"},{"Add":" write!(fmt, \"F\")?;"},{"Add":" }"},{"Add":" if self.deleted {"},{"Add":" write!(fmt, \"D\")?;"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl fmt::Display for PrintableEdge {"},{"Add":" fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {"},{"Add":" write!("},{"Add":" fmt,"},{"Add":" \"{}:{} {} -> {}:{}/{}\","},{"Add":" self.previous, self.flag, self.from, self.to_start, self.to_end, self.introduced_by"},{"Add":" )"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl fmt::Display for PrintableNewVertex {"},{"Add":" fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {"},{"Add":" write!(fmt, \" up\")?;"},{"Add":" for c in self.up_context.iter() {"},{"Add":" write!(fmt, \" {}\", c)?"},{"Add":" }"},{"Add":" write!(fmt, \", new {}:{}, down\", self.start, self.end)?;"},{"Add":" for c in self.down_context.iter() {"},{"Add":" write!(fmt, \" {}\", c)?;"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl fmt::Display for PrintableAtom {"},{"Add":" fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {"},{"Add":" match self {"},{"Add":" PrintableAtom::NewVertex(x) => write!(fmt, \"{}\", x),"},{"Add":" PrintableAtom::Edges(x) => {"},{"Add":" for (i, edge) in x.iter().enumerate() {"},{"Add":" if i > 0 {"},{"Add":" write!(fmt, \", \")?;"},{"Add":" }"},{"Add":" write!(fmt, \"{}\", edge)?;"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl PrintableHunk {"},{"Add":" pub fn write(&self, w: &mut W) -> Result<(), std::io::Error> {"},{"Add":" use PrintableHunk::*;"},{"Add":" match self {"},{"Add":" FileMoveV {"},{"Add":" path,"},{"Add":" name,"},{"Add":" perms,"},{"Add":" pos,"},{"Add":" up_context,"},{"Add":" down_context,"},{"Add":" del,"},{"Add":" } => {"},{"Add":" writeln!("},{"Add":" w,"},{"Add":" \"Moved: {} {} {} {}\","},{"Add":" Escaped(path),"},{"Add":" Escaped(name),"},{"Add":" perms,"},{"Add":" pos,"},{"Add":" )?;"},{"Add":" writeln!(w, \"{}\", PrintableAtom::Edges(del.to_vec()))?;"},{"Add":" write!(w, \"up\")?;"},{"Add":" for c in up_context.iter() {"},{"Add":" write!(w, \" {}\", c)?"},{"Add":" }"},{"Add":" write!(w, \", down\")?;"},{"Add":" for c in down_context.iter() {"},{"Add":" write!(w, \" {}\", c)?"},{"Add":" }"},{"Add":" writeln!(w)?;"},{"Add":" }"},{"Add":" FileMoveE {"},{"Add":" path,"},{"Add":" pos,"},{"Add":" add,"},{"Add":" del,"},{"Add":" } => {"},{"Add":" writeln!(w, \"Moved: {} {}\", Escaped(path), pos)?;"},{"Add":" writeln!(w, \"{}\", PrintableAtom::Edges(add.to_vec()))?;"},{"Add":" writeln!(w, \"{}\", PrintableAtom::Edges(del.to_vec()))?;"},{"Add":" }"},{"Add":" FileAddition {"},{"Add":" name,"},{"Add":" parent,"},{"Add":" perms,"},{"Add":" encoding,"},{"Add":" up_context,"},{"Add":" start,"},{"Add":" end,"},{"Add":" contents,"},{"Add":" } => {"},{"Add":" write!("},{"Add":" w,"},{"Add":" \"File addition: {} in {}{} {}\\n up\","},{"Add":" Escaped(name),"},{"Add":" Escaped(parent),"},{"Add":" perms,"},{"Add":" Escaped(encoding_label(encoding)),"},{"Add":" )?;"},{"Add":" for c in up_context.iter() {"},{"Add":" write!(w, \" {}\", c)?"},{"Add":" }"},{"Add":" writeln!(w, \", new {}:{}\", start, end)?;"},{"Add":" print_contents(w, \"+\", contents, encoding)?;"},{"Add":" }"},{"Add":" FileDel {"},{"Add":" path,"},{"Add":" pos,"},{"Add":" encoding,"},{"Add":" del_edges,"},{"Add":" content_edges,"},{"Add":" contents,"},{"Add":" } => {"},{"Add":" writeln!("},{"Add":" w,"},{"Add":" \"File deletion: {} {} {}\","},{"Add":" Escaped(path),"},{"Add":" pos,"},{"Add":" Escaped(encoding_label(encoding)),"},{"Add":" )?;"},{"Add":" writeln!(w, \"{}\", PrintableAtom::Edges(del_edges.to_vec()))?;"},{"Add":" writeln!(w, \"{}\", PrintableAtom::Edges(content_edges.to_vec()))?;"},{"Add":" print_contents(w, \"-\", contents, encoding)?;"},{"Add":" }"},{"Add":" FileUndel {"},{"Add":" path,"},{"Add":" pos,"},{"Add":" encoding,"},{"Add":" undel_edges,"},{"Add":" content_edges,"},{"Add":" contents,"},{"Add":" } => {"},{"Add":" writeln!("},{"Add":" w,"},{"Add":" \"File un-deletion: {} {} {}\","},{"Add":" Escaped(path),"},{"Add":" pos,"},{"Add":" Escaped(encoding_label(encoding)),"},{"Add":" )?;"},{"Add":" writeln!(w, \"{}\", PrintableAtom::Edges(undel_edges.to_vec()))?;"},{"Add":" writeln!(w, \"{}\", PrintableAtom::Edges(content_edges.to_vec()))?;"},{"Add":" print_contents(w, \"+\", contents, encoding)?;"},{"Add":" }"},{"Add":""},{"Add":" Edit {"},{"Add":" path,"},{"Add":" line,"},{"Add":" pos,"},{"Add":" encoding,"},{"Add":" change,"},{"Add":" contents,"},{"Add":" } => {"},{"Add":" writeln!("},{"Add":" w,"},{"Add":" \"Edit in {}:{} {} {}\","},{"Add":" Escaped(&path),"},{"Add":" line,"},{"Add":" pos,"},{"Add":" Escaped(encoding_label(encoding))"},{"Add":" )?;"},{"Add":" writeln!(w, \"{}\", change)?;"},{"Add":" print_contents(w, \"+\", contents, encoding)?;"},{"Add":" }"},{"Add":""},{"Add":" Replace {"},{"Add":" path,"},{"Add":" line,"},{"Add":" pos,"},{"Add":" encoding,"},{"Add":" change,"},{"Add":" replacement,"},{"Add":" change_contents,"},{"Add":" replacement_contents,"},{"Add":" } => {"},{"Add":" writeln!("},{"Add":" w,"},{"Add":" \"Replacement in {}:{} {} {}\","},{"Add":" Escaped(&path),"},{"Add":" line,"},{"Add":" pos,"},{"Add":" Escaped(encoding_label(encoding))"},{"Add":" )?;"},{"Add":" writeln!(w, \"{}\", PrintableAtom::Edges(change.clone()))?;"},{"Add":" writeln!(w, \"{}\", PrintableAtom::NewVertex(replacement.clone()))?;"},{"Add":" print_contents(w, \"-\", change_contents, encoding)?;"},{"Add":" print_contents(w, \"+\", replacement_contents, encoding)?;"},{"Add":" }"},{"Add":" SolveNameConflict {"},{"Add":" path,"},{"Add":" pos,"},{"Add":" names,"},{"Add":" edges,"},{"Add":" } => {"},{"Add":" write!(w, \"Solving a name conflict in {} {}: \", Escaped(path), pos,)?;"},{"Add":" write_names(w, names)?;"},{"Add":" writeln!(w)?;"},{"Add":" writeln!(w, \"{}\", PrintableAtom::Edges(edges.clone()))?;"},{"Add":" }"},{"Add":" UnsolveNameConflict {"},{"Add":" path,"},{"Add":" pos,"},{"Add":" names,"},{"Add":" edges,"},{"Add":" } => {"},{"Add":" write!("},{"Add":" w,"},{"Add":" \"Un-solving a name conflict in {} {}: \","},{"Add":" Escaped(path),"},{"Add":" pos,"},{"Add":" )?;"},{"Add":" write_names(w, names)?;"},{"Add":" writeln!(w)?;"},{"Add":" writeln!(w, \"{}\", PrintableAtom::Edges(edges.clone()))?;"},{"Add":" }"},{"Add":" SolveOrderConflict {"},{"Add":" path,"},{"Add":" line,"},{"Add":" pos,"},{"Add":" encoding,"},{"Add":" change,"},{"Add":" contents,"},{"Add":" } => {"},{"Add":" writeln!("},{"Add":" w,"},{"Add":" \"Solving an order conflict in {}:{} {} {}\","},{"Add":" Escaped(path),"},{"Add":" line,"},{"Add":" pos,"},{"Add":" Escaped(encoding_label(encoding)),"},{"Add":" )?;"},{"Add":" writeln!(w, \"{}\", change)?;"},{"Add":" print_contents(w, \"+\", contents, encoding)?;"},{"Add":" }"},{"Add":" UnsolveOrderConflict {"},{"Add":" path,"},{"Add":" line,"},{"Add":" pos,"},{"Add":" encoding,"},{"Add":" change,"},{"Add":" contents,"},{"Add":" } => {"},{"Add":" writeln!("},{"Add":" w,"},{"Add":" \"Un-solving an order conflict in {}:{} {} {}\","},{"Add":" Escaped(path),"},{"Add":" line,"},{"Add":" pos,"},{"Add":" Escaped(encoding_label(encoding))"},{"Add":" )?;"},{"Add":" writeln!(w, \"{}\", PrintableAtom::Edges(change.clone()))?;"},{"Add":" print_contents(w, \"-\", contents, encoding)?;"},{"Add":" }"},{"Add":" ResurrectZombies {"},{"Add":" path,"},{"Add":" line,"},{"Add":" pos,"},{"Add":" encoding,"},{"Add":" change,"},{"Add":" contents,"},{"Add":" } => {"},{"Add":" writeln!("},{"Add":" w,"},{"Add":" \"Resurrecting zombie lines in {}:{} {} {}\","},{"Add":" Escaped(path),"},{"Add":" line,"},{"Add":" pos,"},{"Add":" Escaped(encoding_label(encoding))"},{"Add":" )?;"},{"Add":" writeln!(w, \"{}\", PrintableAtom::Edges(change.clone()))?;"},{"Add":" print_contents(w, \"+\", contents, encoding)?;"},{"Add":" }"},{"Add":" };"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"pub fn write_names(w: &mut W, names: &[String]) -> Result<(), std::io::Error> {"},{"Add":" for (i, name) in names.iter().enumerate() {"},{"Add":" if i > 0 {"},{"Add":" write!(w, \", \")?;"},{"Add":" }"},{"Add":" write!(w, \"{}\", Escaped(name))?;"},{"Add":" }"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"pub fn get_encoding(contents: &[u8]) -> Option {"},{"Add":" let mut detector = crate::chardetng::EncodingDetector::new();"},{"Add":" detector.feed(contents, true);"},{"Add":" if let Some(e) = detector.get_valid(None, true, &contents) {"},{"Add":" Some(Encoding(e))"},{"Add":" } else {"},{"Add":" None"},{"Add":" }"},{"Add":" // let (encoding_guess, may_be_right) = detector.guess_assess(None, true);"},{"Add":" // if may_be_right {"},{"Add":" // Some(Encoding(encoding_guess))"},{"Add":" // } else {"},{"Add":" // None"},{"Add":" // }"},{"Add":"}"},{"Add":""},{"Add":"fn print_contents("},{"Add":" w: &mut W,"},{"Add":" prefix: &str,"},{"Add":" contents: &[u8],"},{"Add":" encoding: &Option,"},{"Add":") -> Result<(), std::io::Error> {"},{"Add":" if let Some(encoding) = encoding {"},{"Add":" let dec = encoding.decode(&contents);"},{"Add":" let ends_with_newline = dec.ends_with(\"\\n\");"},{"Add":" let dec = if ends_with_newline {"},{"Add":" &dec[..dec.len() - 1]"},{"Add":" } else {"},{"Add":" &dec"},{"Add":" };"},{"Add":" for a in dec.split('\\n') {"},{"Add":" writeln!(w, \"{} {}\", prefix, a)?;"},{"Add":" }"},{"Add":" if !ends_with_newline {"},{"Add":" writeln!(w, \"\\\\\")?;"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" } else {"},{"Add":" writeln!(w, \"{}b{}\", prefix, data_encoding::BASE64.encode(contents))"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"// QuickCheck instances"},{"Add":""},{"Add":"#[cfg(test)]"},{"Add":"#[rustfmt::skip]"},{"Add":"// This may be nicer if it was generated by a macro"},{"Add":"impl Arbitrary for PrintableHunk {"},{"Add":" fn arbitrary(g: &mut Gen) -> Self {"},{"Add":" fn f(g: &mut Gen) -> A {"},{"Add":" Arbitrary::arbitrary(g)"},{"Add":" }"},{"Add":""},{"Add":" fix_encoding(Gen::new(g.size()).choose(&["},{"Add":" FileMoveV {"},{"Add":" path: f(g), name: f(g), perms: f(g), pos: f(g), up_context: f(g), down_context: f(g), del: f(g),"},{"Add":" },"},{"Add":" FileMoveE {"},{"Add":" path: f(g), pos: f(g), add: f(g), del: f(g),"},{"Add":" },"},{"Add":" FileAddition {"},{"Add":" name: f(g), parent: f(g), perms: f(g), encoding: f(g), up_context: f(g), start: f(g), end: f(g), contents: f(g),"},{"Add":" },"},{"Add":" FileDel {"},{"Add":" path: f(g), pos: f(g), encoding: f(g), del_edges: f(g), content_edges: f(g), contents: f(g),"},{"Add":" },"},{"Add":" FileUndel {"},{"Add":" path: f(g), pos: f(g), encoding: f(g), undel_edges: f(g), content_edges: f(g), contents: f(g),"},{"Add":" },"},{"Add":" Edit {"},{"Add":" path: f(g), line: f(g), pos: f(g), encoding: f(g), change: f(g), contents: f(g),"},{"Add":" },"},{"Add":" Replace {"},{"Add":" path: f(g), line: f(g), pos: f(g), encoding: f(g), change: f(g), replacement: f(g), change_contents: f(g), replacement_contents: f(g),"},{"Add":" },"},{"Add":" SolveNameConflict {"},{"Add":" path: f(g), pos: f(g), names: f(g), edges: f(g),"},{"Add":" },"},{"Add":" UnsolveNameConflict {"},{"Add":" path: f(g), pos: f(g), names: f(g), edges: f(g),"},{"Add":" },"},{"Add":" SolveOrderConflict {"},{"Add":" path: f(g), line: f(g), pos: f(g), encoding: f(g), change: f(g), contents: f(g),"},{"Add":" },"},{"Add":" UnsolveOrderConflict {"},{"Add":" path: f(g), line: f(g), pos: f(g), encoding: f(g), change: f(g), contents: f(g),"},{"Add":" },"},{"Add":" ResurrectZombies {"},{"Add":" path: f(g), line: f(g), pos: f(g), encoding: f(g), change: f(g), contents: f(g),"},{"Add":" },"},{"Add":" ])"},{"Add":" .unwrap().clone())"},{"Add":" }"},{"Add":""},{"Add":" // Shrinking frequently blows stack. Investigate how to fix it."},{"Add":" // You can disable shrinking by commenting out this function."},{"Add":" // This may be best solved by switching to proptest crate"},{"Add":" /*"},{"Add":" fn shrink(&self) -> Box> {"},{"Add":" match self.clone() {"},{"Add":" FileMoveV { path, name, perms, pos, up_context, down_context, del } =>"},{"Add":" Box::new((path, name, perms, pos, up_context, down_context, del)"},{"Add":" .shrink().map(|(path, name, perms, pos, up_context, down_context, del)|"},{"Add":" fix_encoding(FileMoveV { path, name, perms, pos, up_context, down_context, del }))),"},{"Add":""},{"Add":" FileMoveE { path, pos, add, del } =>"},{"Add":" Box::new((path, pos, add, del)"},{"Add":" .shrink().map(|(path, pos, add, del)|"},{"Add":" fix_encoding(FileMoveE { path, pos, add, del }))),"},{"Add":""},{"Add":" FileAddition { name, parent, perms, encoding, up_context, start, end, contents } =>"},{"Add":" Box::new((name, parent, perms, encoding, up_context, start, end, contents)"},{"Add":" .shrink().map(|(name, parent, perms, encoding, up_context, start, end, contents)|"},{"Add":" fix_encoding(FileAddition { name, parent, perms, encoding, up_context, start, end, contents }))),"},{"Add":""},{"Add":" FileDel { path, pos, encoding, del_edges, content_edges, contents } =>"},{"Add":" Box::new((path, pos, encoding, del_edges, content_edges, contents)"},{"Add":" .shrink().map(|(path, pos, encoding, del_edges, content_edges, contents)|"},{"Add":" fix_encoding(FileDel { path, pos, encoding, del_edges, content_edges, contents }))),"},{"Add":""},{"Add":" FileUndel { path, pos, encoding, undel_edges, content_edges, contents } =>"},{"Add":" Box::new((path, pos, encoding, undel_edges, content_edges, contents)"},{"Add":" .shrink().map(|(path, pos, encoding, undel_edges, content_edges, contents)|"},{"Add":" fix_encoding(FileUndel { path, pos, encoding, undel_edges, content_edges, contents }))),"},{"Add":""},{"Add":" Edit { path, line, pos, encoding, change, contents } =>"},{"Add":" Box::new((path, line, pos, encoding, change, contents)"},{"Add":" .shrink().map(|(path, line, pos, encoding, change, contents)|"},{"Add":" fix_encoding(Edit { path, line, pos, encoding, change, contents }))),"},{"Add":""},{"Add":" Replace { path, line, pos, encoding, change, replacement, change_contents, replacement_contents } =>"},{"Add":" Box::new((path, line, pos, encoding, change, replacement, change_contents, replacement_contents)"},{"Add":" .shrink().map(|(path, line, pos, encoding, change, replacement, change_contents, replacement_contents)|"},{"Add":" fix_encoding(Replace { path, line, pos, encoding, change, replacement, change_contents, replacement_contents }))),"},{"Add":""},{"Add":" SolveNameConflict { path, pos, names, edges } =>"},{"Add":" Box::new((path, pos, names, edges)"},{"Add":" .shrink().map(|(path, pos, names, edges)|"},{"Add":" fix_encoding(SolveNameConflict { path, pos, names, edges }))),"},{"Add":""},{"Add":" UnsolveNameConflict { path, pos, names, edges } =>"},{"Add":" Box::new((path, pos, names, edges)"},{"Add":" .shrink().map(|(path, pos, names, edges)|"},{"Add":" fix_encoding(UnsolveNameConflict { path, pos, names, edges }))),"},{"Add":""},{"Add":" SolveOrderConflict { path, line, pos, encoding, change, contents } =>"},{"Add":" Box::new((path, line, pos, encoding, change, contents)"},{"Add":" .shrink().map(|(path, line, pos, encoding, change, contents)|"},{"Add":" fix_encoding(SolveOrderConflict { path, line, pos, encoding, change, contents }))),"},{"Add":""},{"Add":" UnsolveOrderConflict { path, line, pos, encoding, change, contents } =>"},{"Add":" Box::new((path, line, pos, encoding, change, contents)"},{"Add":" .shrink().map(|(path, line, pos, encoding, change, contents)|"},{"Add":" fix_encoding(UnsolveOrderConflict { path, line, pos, encoding, change, contents }))),"},{"Add":""},{"Add":" ResurrectZombies { path, line, pos, encoding, change, contents } =>"},{"Add":" Box::new((path, line, pos, encoding, change, contents)"},{"Add":" .shrink().map(|(path, line, pos, encoding, change, contents)|"},{"Add":" fix_encoding(ResurrectZombies { path, line, pos, encoding, change, contents }))),"},{"Add":" }"},{"Add":" }"},{"Add":" */"},{"Add":"}"},{"Add":""},{"Add":"#[cfg(test)]"},{"Add":"/// This is the one thing that is not normalized on PrintableHunk: encoding"},{"Add":"/// content must be valid, given the encoding. This function ensures that."},{"Add":"fn fix_encoding(mut hunk: PrintableHunk) -> PrintableHunk {"},{"Add":" // let mut h = hunk.clone();"},{"Add":" match &mut hunk {"},{"Add":" FileAddition {"},{"Add":" encoding, contents, .."},{"Add":" } => *encoding = get_encoding(contents),"},{"Add":" FileDel {"},{"Add":" encoding, contents, .."},{"Add":" } => *encoding = get_encoding(contents),"},{"Add":" FileUndel {"},{"Add":" encoding, contents, .."},{"Add":" } => *encoding = get_encoding(contents),"},{"Add":" Edit {"},{"Add":" encoding, contents, .."},{"Add":" } => *encoding = get_encoding(contents),"},{"Add":" Replace { encoding, .. } => *encoding = None,"},{"Add":" SolveOrderConflict {"},{"Add":" encoding, contents, .."},{"Add":" } => *encoding = get_encoding(contents),"},{"Add":" UnsolveOrderConflict {"},{"Add":" encoding, contents, .."},{"Add":" } => *encoding = get_encoding(contents),"},{"Add":" ResurrectZombies {"},{"Add":" encoding, contents, .."},{"Add":" } => *encoding = get_encoding(contents),"},{"Add":" _ => (),"},{"Add":" };"},{"Add":" hunk"},{"Add":"}"},{"Add":""},{"Add":"#[cfg(test)]"},{"Add":"impl Arbitrary for PrintablePerms {"},{"Add":" fn arbitrary(g: &mut Gen) -> Self {"},{"Add":" *g.choose(&["},{"Add":" PrintablePerms::IsDir,"},{"Add":" PrintablePerms::IsExecutable,"},{"Add":" PrintablePerms::IsFile,"},{"Add":" ])"},{"Add":" .unwrap()"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"#[cfg(test)]"},{"Add":"impl Arbitrary for PrintablePos {"},{"Add":" fn arbitrary(g: &mut Gen) -> Self {"},{"Add":" PrintablePos(usize::arbitrary(g), u64::arbitrary(g))"},{"Add":" }"},{"Add":" fn shrink(&self) -> Box> {"},{"Add":" Box::new("},{"Add":" self.0"},{"Add":" .shrink()"},{"Add":" .zip(self.1.shrink())"},{"Add":" .map(|(a, b)| PrintablePos(a, b)),"},{"Add":" )"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"#[cfg(test)]"},{"Add":"impl Arbitrary for PrintableEdge {"},{"Add":" fn arbitrary(g: &mut Gen) -> Self {"},{"Add":" Self {"},{"Add":" previous: Arbitrary::arbitrary(g),"},{"Add":" flag: Arbitrary::arbitrary(g),"},{"Add":" from: Arbitrary::arbitrary(g),"},{"Add":" to_start: Arbitrary::arbitrary(g),"},{"Add":" to_end: Arbitrary::arbitrary(g),"},{"Add":" introduced_by: Arbitrary::arbitrary(g),"},{"Add":" }"},{"Add":" }"},{"Add":" fn shrink(&self) -> Box> {"},{"Add":" let Self {"},{"Add":" previous,"},{"Add":" flag,"},{"Add":" from,"},{"Add":" to_start,"},{"Add":" to_end,"},{"Add":" introduced_by,"},{"Add":" } = self.clone();"},{"Add":" Box::new("},{"Add":" (previous, flag, from, to_start, to_end, introduced_by)"},{"Add":" .shrink()"},{"Add":" .map("},{"Add":" |(previous, flag, from, to_start, to_end, introduced_by)| Self {"},{"Add":" previous,"},{"Add":" flag,"},{"Add":" from,"},{"Add":" to_start,"},{"Add":" to_end,"},{"Add":" introduced_by,"},{"Add":" },"},{"Add":" ),"},{"Add":" )"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"#[cfg(test)]"},{"Add":"impl Arbitrary for PrintableNewVertex {"},{"Add":" fn arbitrary(g: &mut Gen) -> Self {"},{"Add":" Self {"},{"Add":" up_context: Arbitrary::arbitrary(g),"},{"Add":" start: Arbitrary::arbitrary(g),"},{"Add":" end: Arbitrary::arbitrary(g),"},{"Add":" down_context: Arbitrary::arbitrary(g),"},{"Add":" }"},{"Add":" }"},{"Add":" fn shrink(&self) -> Box> {"},{"Add":" let Self {"},{"Add":" up_context,"},{"Add":" start,"},{"Add":" end,"},{"Add":" down_context,"},{"Add":" } = self.clone();"},{"Add":" Box::new((up_context, start, end, down_context).shrink().map("},{"Add":" |(up_context, start, end, down_context)| Self {"},{"Add":" up_context,"},{"Add":" start,"},{"Add":" end,"},{"Add":" down_context,"},{"Add":" },"},{"Add":" ))"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"#[cfg(test)]"},{"Add":"impl Arbitrary for PrintableAtom {"},{"Add":" fn arbitrary(g: &mut Gen) -> Self {"},{"Add":" Gen::new(g.size())"},{"Add":" .choose(&["},{"Add":" PrintableAtom::NewVertex(Arbitrary::arbitrary(g)),"},{"Add":" PrintableAtom::Edges(Arbitrary::arbitrary(g)),"},{"Add":" ])"},{"Add":" .unwrap()"},{"Add":" .clone()"},{"Add":" }"},{"Add":" fn shrink(&self) -> Box> {"},{"Add":" match self {"},{"Add":" PrintableAtom::NewVertex(x) => {"},{"Add":" Box::new(x.shrink().map(|x| PrintableAtom::NewVertex(x)))"},{"Add":" }"},{"Add":" PrintableAtom::Edges(x) => Box::new(x.shrink().map(|x| PrintableAtom::Edges(x))),"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"#[cfg(test)]"},{"Add":"impl Arbitrary for PrintableEdgeFlags {"},{"Add":" fn arbitrary(g: &mut Gen) -> Self {"},{"Add":" Self {"},{"Add":" block: Arbitrary::arbitrary(g),"},{"Add":" folder: Arbitrary::arbitrary(g),"},{"Add":" deleted: Arbitrary::arbitrary(g),"},{"Add":" }"},{"Add":" }"},{"Add":" fn shrink(&self) -> Box> {"},{"Add":" Box::new((self.block, self.folder, self.deleted).shrink().map("},{"Add":" |(block, folder, deleted)| Self {"},{"Add":" block,"},{"Add":" folder,"},{"Add":" deleted,"},{"Add":" },"},{"Add":" ))"},{"Add":" }"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"parse.rs","metadata":0},"context":[{"change":49,"pos":931000}],"contents":[{"Add":"use nom::branch::alt;"},{"Add":"use nom::bytes::complete::*;"},{"Add":"use nom::character::complete::*;"},{"Add":"use nom::combinator::*;"},{"Add":"use nom::error::ParseError;"},{"Add":"use nom::multi::*;"},{"Add":"use nom::sequence::*;"},{"Add":"use nom::*;"},{"Add":""},{"Add":"use crate::change::printable::*;"},{"Add":"use PrintableHunk::*;"},{"Add":""},{"Add":"use super::*;"},{"Add":""},{"Add":"fn parse_file_move_v_hunk(i: &str) -> IResult<&str, PrintableHunk> {"},{"Add":" let (i, path) = preceded(delimited(space0, tag(\"Moved:\"), space0), parse_string)(i)?;"},{"Add":" let (i, name) = preceded(space0, parse_string)(i)?;"},{"Add":" let (i, perms) = preceded(space0, parse_perms)(i)?;"},{"Add":" let (i, pos) = preceded(space0, parse_printable_pos)(i)?;"},{"Add":" let (i, _) = tuple((space0, newline))(i)?;"},{"Add":""},{"Add":" let (i, del) = parse_edges(i)?;"},{"Add":""},{"Add":" let (i, up_context) = preceded(pair(space0, tag(\"up\")), parse_context)(i)?;"},{"Add":" let (i, down_context) = preceded(pair(space0, tag(\", down\")), parse_context)(i)?;"},{"Add":" let (i, _) = newline(i)?;"},{"Add":" Ok(("},{"Add":" i,"},{"Add":" FileMoveV {"},{"Add":" path,"},{"Add":" name,"},{"Add":" perms,"},{"Add":" pos,"},{"Add":" up_context,"},{"Add":" down_context,"},{"Add":" del,"},{"Add":" },"},{"Add":" ))"},{"Add":"}"},{"Add":""},{"Add":"fn parse_file_move_e_hunk(i: &str) -> IResult<&str, PrintableHunk> {"},{"Add":" let (i, path) = preceded(delimited(space0, tag(\"Moved:\"), space0), parse_string)(i)?;"},{"Add":" let (i, pos) = preceded(space0, parse_printable_pos)(i)?;"},{"Add":" let (i, _) = tuple((space0, newline))(i)?;"},{"Add":""},{"Add":" let (i, add) = parse_edges(i)?;"},{"Add":" let (i, del) = parse_edges(i)?;"},{"Add":" Ok(("},{"Add":" i,"},{"Add":" FileMoveE {"},{"Add":" path,"},{"Add":" pos,"},{"Add":" add,"},{"Add":" del,"},{"Add":" },"},{"Add":" ))"},{"Add":"}"},{"Add":""},{"Add":"fn parse_file_del_hunk(i: &str) -> IResult<&str, PrintableHunk> {"},{"Add":" let (i, path) = preceded("},{"Add":" delimited(space0, tag(\"File deletion:\"), space0),"},{"Add":" parse_string,"},{"Add":" )(i)?;"},{"Add":" let (i, pos) = preceded(space0, parse_printable_pos)(i)?;"},{"Add":" let (i, encoding) = preceded(space0, parse_encoding)(i)?;"},{"Add":" let (i, _) = tuple((space0, newline))(i)?;"},{"Add":" let (i, del_edges) = parse_edges(i)?;"},{"Add":" let (i, content_edges) = parse_edges(i)?;"},{"Add":" let (i, contents) = parse_contents('-', encoding.clone(), i)?;"},{"Add":" Ok(("},{"Add":" i,"},{"Add":" FileDel {"},{"Add":" path,"},{"Add":" pos,"},{"Add":" encoding,"},{"Add":" del_edges,"},{"Add":" content_edges,"},{"Add":" contents,"},{"Add":" },"},{"Add":" ))"},{"Add":"}"},{"Add":""},{"Add":"fn parse_file_undel_hunk(i: &str) -> IResult<&str, PrintableHunk> {"},{"Add":" let (i, path) = preceded("},{"Add":" delimited(space0, tag(\"File un-deletion:\"), space0),"},{"Add":" parse_string,"},{"Add":" )(i)?;"},{"Add":" let (i, pos) = preceded(space0, parse_printable_pos)(i)?;"},{"Add":" let (i, encoding) = preceded(space0, parse_encoding)(i)?;"},{"Add":" let (i, _) = tuple((space0, newline))(i)?;"},{"Add":" let (i, undel_edges) = parse_edges(i)?;"},{"Add":" let (i, content_edges) = parse_edges(i)?;"},{"Add":" let (i, contents) = parse_contents('+', encoding.clone(), i)?;"},{"Add":" Ok(("},{"Add":" i,"},{"Add":" FileUndel {"},{"Add":" path,"},{"Add":" pos,"},{"Add":" encoding,"},{"Add":" undel_edges,"},{"Add":" content_edges,"},{"Add":" contents,"},{"Add":" },"},{"Add":" ))"},{"Add":"}"},{"Add":""},{"Add":"fn parse_file_addition_hunk(i: &str) -> IResult<&str, PrintableHunk> {"},{"Add":" let (i, name) = preceded("},{"Add":" delimited(space0, tag(\"File addition:\"), space0),"},{"Add":" parse_string,"},{"Add":" )(i)?;"},{"Add":" let (i, parent) = preceded(delimited(space1, tag(\"in\"), space1), parse_string)(i)?;"},{"Add":" let (i, perms) = preceded(space0, parse_perms)(i)?;"},{"Add":" let (i, encoding) = preceded(space0, parse_encoding)(i)?;"},{"Add":" let (i, _) = tuple((space0, newline, multispace0))(i)?;"},{"Add":""},{"Add":" let (i, up_context) = preceded(tag(\"up\"), parse_context)(i)?;"},{"Add":" let (i, (start, end)) = delimited(space0, parse_start_end, pair(space0, newline))(i)?;"},{"Add":" let (i, contents) = parse_contents('+', encoding.clone(), i)?;"},{"Add":" Ok(("},{"Add":" i,"},{"Add":" FileAddition {"},{"Add":" name,"},{"Add":" parent,"},{"Add":" perms,"},{"Add":" encoding,"},{"Add":" up_context,"},{"Add":" start,"},{"Add":" end,"},{"Add":" contents,"},{"Add":" },"},{"Add":" ))"},{"Add":"}"},{"Add":""},{"Add":"/// Parse a hunk header string"},{"Add":"fn parse_edit_hunk(i: &str) -> IResult<&str, PrintableHunk> {"},{"Add":" let (i, path) = preceded(delimited(space0, tag(\"Edit in\"), space0), parse_string)(i)?;"},{"Add":" let (i, line) = preceded(char(':'), u64)(i)?;"},{"Add":" let (i, pos) = preceded(space0, parse_printable_pos)(i)?;"},{"Add":" let (i, encoding) = preceded(space0, parse_encoding)(i)?;"},{"Add":" let (i, _) = tuple((space0, newline))(i)?;"},{"Add":" let (i, change) = parse_atom(i)?;"},{"Add":" let (i, contents) = parse_contents('+', encoding.clone(), i)?;"},{"Add":" Ok(("},{"Add":" i,"},{"Add":" Edit {"},{"Add":" path,"},{"Add":" line: line as usize,"},{"Add":" pos,"},{"Add":" encoding,"},{"Add":" change,"},{"Add":" contents,"},{"Add":" },"},{"Add":" ))"},{"Add":"}"},{"Add":""},{"Add":"fn parse_replace_hunk(i: &str) -> IResult<&str, PrintableHunk> {"},{"Add":" let (i, path) = preceded("},{"Add":" delimited(space0, tag(\"Replacement in\"), space0),"},{"Add":" parse_string,"},{"Add":" )(i)?;"},{"Add":" let (i, line) = preceded(char(':'), u64)(i)?;"},{"Add":" let (i, pos) = preceded(space0, parse_printable_pos)(i)?;"},{"Add":" let (i, encoding) = preceded(space0, parse_encoding)(i)?;"},{"Add":" let (i, _) = tuple((space0, newline))(i)?;"},{"Add":" // TODO: allow newlines in between these lines"},{"Add":" let (i, change) = parse_edges(i)?;"},{"Add":" let (i, replacement) = parse_new_vertex(i)?;"},{"Add":" let (i, change_contents) = parse_contents('-', encoding.clone(), i)?;"},{"Add":" let (i, replacement_contents) = parse_contents('+', encoding.clone(), i)?;"},{"Add":" Ok(("},{"Add":" i,"},{"Add":" Replace {"},{"Add":" path,"},{"Add":" line: line as usize,"},{"Add":" pos,"},{"Add":" encoding,"},{"Add":" change,"},{"Add":" replacement,"},{"Add":" change_contents,"},{"Add":" replacement_contents,"},{"Add":" },"},{"Add":" ))"},{"Add":"}"},{"Add":""},{"Add":"fn parse_solve_name_conflict(i: &str) -> IResult<&str, PrintableHunk> {"},{"Add":" let (i, path) = preceded("},{"Add":" delimited(space0, tag(\"Solving a name conflict in\"), space0),"},{"Add":" parse_string,"},{"Add":" )(i)?;"},{"Add":" let (i, pos) = preceded(space0, parse_printable_pos)(i)?;"},{"Add":" let (i, _) = tuple((space0, char(':'), space0))(i)?;"},{"Add":" let (i, names) = separated_list0(tuple((space0, char(','), space0)), parse_string)(i)?;"},{"Add":" let (i, _) = tuple((space0, newline))(i)?;"},{"Add":" let (i, edges) = parse_edges(i)?;"},{"Add":" Ok(("},{"Add":" i,"},{"Add":" SolveNameConflict {"},{"Add":" path,"},{"Add":" pos,"},{"Add":" names,"},{"Add":" edges,"},{"Add":" },"},{"Add":" ))"},{"Add":"}"},{"Add":""},{"Add":"fn parse_unsolve_name_conflict(i: &str) -> IResult<&str, PrintableHunk> {"},{"Add":" let (i, path) = preceded("},{"Add":" delimited(space0, tag(\"Un-solving a name conflict in\"), space0),"},{"Add":" parse_string,"},{"Add":" )(i)?;"},{"Add":" let (i, pos) = preceded(space0, parse_printable_pos)(i)?;"},{"Add":" let (i, _) = tuple((space0, char(':'), space0))(i)?;"},{"Add":" let (i, names) = separated_list0(tuple((space0, char(','), space0)), parse_string)(i)?;"},{"Add":" let (i, _) = tuple((space0, newline))(i)?;"},{"Add":" let (i, edges) = parse_edges(i)?;"},{"Add":" Ok(("},{"Add":" i,"},{"Add":" UnsolveNameConflict {"},{"Add":" path,"},{"Add":" pos,"},{"Add":" names,"},{"Add":" edges,"},{"Add":" },"},{"Add":" ))"},{"Add":"}"},{"Add":""},{"Add":"fn parse_solve_order_conflict(i: &str) -> IResult<&str, PrintableHunk> {"},{"Add":" let (i, path) = preceded("},{"Add":" delimited(space0, tag(\"Solving an order conflict in\"), space0),"},{"Add":" parse_string,"},{"Add":" )(i)?;"},{"Add":" let (i, line) = preceded(char(':'), u64)(i)?;"},{"Add":" let (i, pos) = preceded(space1, parse_printable_pos)(i)?;"},{"Add":" let (i, encoding) = preceded(space0, parse_encoding)(i)?;"},{"Add":" let (i, _) = tuple((space0, newline))(i)?;"},{"Add":" let (i, change) = parse_new_vertex(i)?;"},{"Add":" let (i, contents) = parse_contents('+', encoding.clone(), i)?;"},{"Add":" Ok(("},{"Add":" i,"},{"Add":" SolveOrderConflict {"},{"Add":" path,"},{"Add":" line: line as usize,"},{"Add":" pos,"},{"Add":" encoding,"},{"Add":" change,"},{"Add":" contents,"},{"Add":" },"},{"Add":" ))"},{"Add":"}"},{"Add":""},{"Add":"fn parse_unsolve_order_conflict(i: &str) -> IResult<&str, PrintableHunk> {"},{"Add":" let (i, path) = preceded("},{"Add":" delimited(space0, tag(\"Un-solving an order conflict in\"), space0),"},{"Add":" parse_string,"},{"Add":" )(i)?;"},{"Add":" let (i, line) = preceded(char(':'), u64)(i)?;"},{"Add":" let (i, pos) = preceded(space1, parse_printable_pos)(i)?;"},{"Add":" let (i, encoding) = preceded(space0, parse_encoding)(i)?;"},{"Add":" let (i, _) = tuple((space0, newline))(i)?;"},{"Add":" let (i, change) = parse_edges(i)?;"},{"Add":" let (i, contents) = parse_contents('-', encoding.clone(), i)?;"},{"Add":" Ok(("},{"Add":" i,"},{"Add":" UnsolveOrderConflict {"},{"Add":" path,"},{"Add":" line: line as usize,"},{"Add":" pos,"},{"Add":" encoding,"},{"Add":" change,"},{"Add":" contents,"},{"Add":" },"},{"Add":" ))"},{"Add":"}"},{"Add":""},{"Add":"fn parse_resurrect_zombies(i: &str) -> IResult<&str, PrintableHunk> {"},{"Add":" let (i, path) = preceded("},{"Add":" delimited(space0, tag(\"Resurrecting zombie lines in\"), space0),"},{"Add":" parse_string,"},{"Add":" )(i)?;"},{"Add":" let (i, line) = preceded(char(':'), u64)(i)?;"},{"Add":" let (i, pos) = preceded(space0, parse_printable_pos)(i)?;"},{"Add":" let (i, encoding) = preceded(space0, parse_encoding)(i)?;"},{"Add":" let (i, _) = tuple((space0, newline))(i)?;"},{"Add":" let (i, change) = parse_edges(i)?;"},{"Add":" let (i, contents) = parse_contents('+', encoding.clone(), i)?;"},{"Add":" Ok(("},{"Add":" i,"},{"Add":" ResurrectZombies {"},{"Add":" path,"},{"Add":" line: line as usize,"},{"Add":" pos,"},{"Add":" encoding,"},{"Add":" change,"},{"Add":" contents,"},{"Add":" },"},{"Add":" ))"},{"Add":"}"},{"Add":""},{"Add":"fn parse_content_line(leading_char: char, input: &str) -> IResult<&str, String> {"},{"Add":" preceded("},{"Add":" char(leading_char),"},{"Add":" alt(("},{"Add":" map("},{"Add":" delimited(tag(\" \"), take_till(|c| c == '\\n'), newline),"},{"Add":" |s: &str| s.to_string() + \"\\n\","},{"Add":" ),"},{"Add":" map("},{"Add":" delimited(tag(\"b\"), take_till(|c| c == '\\n'), newline),"},{"Add":" |s: &str| s.to_string(),"},{"Add":" ),"},{"Add":" )),"},{"Add":" )(input)"},{"Add":"}"},{"Add":""},{"Add":"// TODO: better error handling"},{"Add":"fn parse_contents("},{"Add":" leading_char: char,"},{"Add":" encoding: Option,"},{"Add":" i: &str,"},{"Add":") -> IResult<&str, Vec> {"},{"Add":" let (i, res) = fold_many0("},{"Add":" complete(|i| parse_content_line(leading_char, i)),"},{"Add":" String::new,"},{"Add":" |s, r| s + r.as_str(),"},{"Add":" )(i)?;"},{"Add":" let (i, backslash) = opt(complete(tag(\"\\\\\\n\")))(i)?;"},{"Add":" if let Ok(mut vec) = encode(encoding, &res) {"},{"Add":" if backslash.is_some() && vec[vec.len() - 1] == b'\\n' {"},{"Add":" vec.pop();"},{"Add":" }"},{"Add":" Ok((i, vec))"},{"Add":" } else {"},{"Add":" Err(nom::Err::Error(nom::error::Error::new("},{"Add":" i,"},{"Add":" nom::error::ErrorKind::Verify,"},{"Add":" )))"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"fn encode(encoding: Option, contents: &str) -> Result, String> {"},{"Add":" if let Some(encoding) = encoding {"},{"Add":" Ok(encoding.encode(contents).to_vec())"},{"Add":" } else {"},{"Add":" data_encoding::BASE64"},{"Add":" .decode(contents.as_bytes())"},{"Add":" .map_err(|e| e.to_string())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"fn parse_encoding(input: &str) -> IResult<&str, Option> {"},{"Add":" map(parse_string, |e| {"},{"Add":" if e != BINARY_LABEL {"},{"Add":" Some(Encoding::for_label(&e))"},{"Add":" } else {"},{"Add":" None"},{"Add":" }"},{"Add":" })(input)"},{"Add":"}"},{"Add":""},{"Add":"pub fn parse_numbered_hunk(input: &str) -> IResult<&str, (u64, PrintableHunk)> {"},{"Add":" tuple((terminated(u64, char('.')), parse_hunk))(input)"},{"Add":"}"},{"Add":""},{"Add":"pub fn parse_hunk(input: &str) -> IResult<&str, PrintableHunk> {"},{"Add":" alt(("},{"Add":" parse_file_move_v_hunk,"},{"Add":" parse_file_move_e_hunk,"},{"Add":" parse_file_del_hunk,"},{"Add":" parse_file_undel_hunk,"},{"Add":" parse_file_addition_hunk,"},{"Add":" parse_edit_hunk,"},{"Add":" parse_replace_hunk,"},{"Add":" parse_solve_name_conflict,"},{"Add":" parse_unsolve_name_conflict,"},{"Add":" parse_solve_order_conflict,"},{"Add":" parse_unsolve_order_conflict,"},{"Add":" parse_resurrect_zombies,"},{"Add":" ))(input)"},{"Add":"}"},{"Add":""},{"Add":"pub fn parse_hunks(input: &str) -> IResult<&str, Vec<(u64, PrintableHunk)>> {"},{"Add":" preceded("},{"Add":" tuple((tag(\"# Hunks\"), space0, newline, multispace0)),"},{"Add":" many0(complete(terminated(parse_numbered_hunk, multispace0))),"},{"Add":" )(input)"},{"Add":"}"},{"Add":""},{"Add":"pub const BINARY_LABEL: &str = \"binary\";"},{"Add":""},{"Add":"pub fn encoding_label(encoding: &Option) -> &str {"},{"Add":" match encoding {"},{"Add":" Some(encoding) => encoding.label(),"},{"Add":" _ => BINARY_LABEL,"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"/// Parse an escaped character: \\n, \\t, \\r, etc."},{"Add":"fn parse_escaped_char(input: &str) -> IResult<&str, char> {"},{"Add":" preceded("},{"Add":" char('\\\\'),"},{"Add":" alt(("},{"Add":" value('\\n', char('n')),"},{"Add":" value('\\r', char('r')),"},{"Add":" value('\\t', char('t')),"},{"Add":" value('\\u{08}', char('b')),"},{"Add":" value('\\u{0C}', char('f')),"},{"Add":" value('\\\\', char('\\\\')),"},{"Add":" value('\"', char('\"')),"},{"Add":" )),"},{"Add":" )(input)"},{"Add":"}"},{"Add":""},{"Add":"/// Parse a non-empty block of text that doesn't include \\ or \""},{"Add":"fn parse_literal<'a, E: ParseError<&'a str>>(input: &'a str) -> IResult<&'a str, &'a str, E> {"},{"Add":" let not_quote_slash = is_not(\"\\\"\\\\\");"},{"Add":" verify(not_quote_slash, |s: &str| !s.is_empty())(input)"},{"Add":"}"},{"Add":""},{"Add":"/// Combine parse_literal and parse_escaped_char into a StringFragment."},{"Add":"fn parse_fragment(input: &str) -> IResult<&str, StringFragment> {"},{"Add":" alt(("},{"Add":" map(parse_literal, StringFragment::Literal),"},{"Add":" map(parse_escaped_char, StringFragment::EscapedChar),"},{"Add":" ))(input)"},{"Add":"}"},{"Add":""},{"Add":"/// Parse a string. Use a loop of parse_fragment and push all of the fragments"},{"Add":"/// into an output string."},{"Add":"pub fn parse_string(input: &str) -> IResult<&str, String> {"},{"Add":" let build_string = fold_many0(parse_fragment, String::new, |mut string, fragment| {"},{"Add":" match fragment {"},{"Add":" StringFragment::Literal(s) => string.push_str(s),"},{"Add":" StringFragment::EscapedChar(c) => string.push(c),"},{"Add":" }"},{"Add":" string"},{"Add":" });"},{"Add":" delimited(char('\"'), build_string, char('\"'))(input)"},{"Add":"}"},{"Add":""},{"Add":"fn parse_perms(input: &str) -> IResult<&str, PrintablePerms> {"},{"Add":" alt(("},{"Add":" value(PrintablePerms::IsDir, tag(\"+dx\")),"},{"Add":" value(PrintablePerms::IsExecutable, tag(\"+x\")),"},{"Add":" value(PrintablePerms::IsFile, tag(\"\")),"},{"Add":" ))(input)"},{"Add":"}"},{"Add":""},{"Add":"fn parse_printable_pos(input: &str) -> IResult<&str, PrintablePos> {"},{"Add":" map(separated_pair(u64, char('.'), u64), |(a, b)| {"},{"Add":" PrintablePos(a as usize, b)"},{"Add":" })(input)"},{"Add":"}"},{"Add":""},{"Add":"fn parse_context(input: &str) -> IResult<&str, Vec> {"},{"Add":" delimited(space0, separated_list0(space1, parse_printable_pos), space0)(input)"},{"Add":"}"},{"Add":""},{"Add":"fn parse_start_end(input: &str) -> IResult<&str, (u64, u64)> {"},{"Add":" preceded("},{"Add":" pair(tag(\", new\"), space1),"},{"Add":" separated_pair(u64, char(':'), u64),"},{"Add":" )(input)"},{"Add":"}"},{"Add":""},{"Add":"fn parse_edge_flags(i: &str) -> IResult<&str, PrintableEdgeFlags> {"},{"Add":" let (i, block) = map(opt(char('B')), |x| x.is_some())(i)?;"},{"Add":" let (i, folder) = map(opt(char('F')), |x| x.is_some())(i)?;"},{"Add":" let (i, deleted) = map(opt(char('D')), |x| x.is_some())(i)?;"},{"Add":" Ok(("},{"Add":" i,"},{"Add":" PrintableEdgeFlags {"},{"Add":" block,"},{"Add":" folder,"},{"Add":" deleted,"},{"Add":" },"},{"Add":" ))"},{"Add":"}"},{"Add":""},{"Add":"fn parse_new_vertex(i: &str) -> IResult<&str, PrintableNewVertex> {"},{"Add":" map("},{"Add":" tuple(("},{"Add":" space0,"},{"Add":" preceded(tag(\"up\"), parse_context),"},{"Add":" terminated(tag(\", new\"), space0),"},{"Add":" terminated(u64, char(':')),"},{"Add":" terminated(u64, space0),"},{"Add":" preceded(tag(\", down\"), parse_context),"},{"Add":" newline,"},{"Add":" )),"},{"Add":" |(_, up_context, _, start, end, down_context, _)| PrintableNewVertex {"},{"Add":" up_context,"},{"Add":" start,"},{"Add":" end,"},{"Add":" down_context,"},{"Add":" },"},{"Add":" )(i)"},{"Add":"}"},{"Add":""},{"Add":"fn parse_edge(i: &str) -> IResult<&str, PrintableEdge> {"},{"Add":" map("},{"Add":" tuple(("},{"Add":" terminated(parse_edge_flags, char(':')),"},{"Add":" terminated(parse_edge_flags, char(' ')),"},{"Add":" terminated(parse_printable_pos, tag(\" -> \")),"},{"Add":" terminated(parse_printable_pos, tag(\":\")),"},{"Add":" terminated(u64, tag(\"/\")),"},{"Add":" terminated(u64, space0),"},{"Add":" )),"},{"Add":" |(previous, flag, from, to_start, to_end, introduced_by)| PrintableEdge {"},{"Add":" previous,"},{"Add":" flag,"},{"Add":" from,"},{"Add":" to_start,"},{"Add":" to_end,"},{"Add":" introduced_by: introduced_by as usize,"},{"Add":" },"},{"Add":" )(i)"},{"Add":"}"},{"Add":""},{"Add":"fn parse_atom(i: &str) -> IResult<&str, PrintableAtom> {"},{"Add":" alt(("},{"Add":" map(parse_new_vertex, PrintableAtom::NewVertex),"},{"Add":" map(parse_edges, PrintableAtom::Edges),"},{"Add":" ))(i)"},{"Add":"}"},{"Add":""},{"Add":"fn parse_edges(input: &str) -> IResult<&str, Vec> {"},{"Add":" terminated("},{"Add":" separated_list0(delimited(space0, char(','), space0), complete(parse_edge)),"},{"Add":" pair(space0, newline),"},{"Add":" )(input)"},{"Add":"}"},{"Add":""},{"Add":"pub fn parse_header(input: &str) -> IResult<&str, Result> {"},{"Add":" map("},{"Add":" alt((take_until(\"# Dependencies\"), take_until(\"# Hunks\"))),"},{"Add":" |s| toml::de::from_str(s),"},{"Add":" )(input)"},{"Add":"}"},{"Add":""},{"Add":"pub fn parse_dependency(i: &str) -> IResult<&str, PrintableDep> {"},{"Add":" let (i, mut type_) = delimited("},{"Add":" char('['),"},{"Add":" alt(("},{"Add":" map(u64, |n| DepType::Numbered(n as usize, false)),"},{"Add":" value(DepType::ExtraKnown, char('*')),"},{"Add":" value(DepType::ExtraUnknown, take_till(|c| c != ']')),"},{"Add":" )),"},{"Add":" char(']'),"},{"Add":" )(i)?;"},{"Add":""},{"Add":" let (i, plus) = terminated("},{"Add":" alt((value(true, char('+')), value(false, char(' ')))),"},{"Add":" space0,"},{"Add":" )(i)?;"},{"Add":""},{"Add":" // TODO: get rid of this confusing mutation"},{"Add":" type_ = if let DepType::Numbered(n, _) = type_ {"},{"Add":" DepType::Numbered(n, plus)"},{"Add":" } else {"},{"Add":" type_"},{"Add":" };"},{"Add":""},{"Add":" let (i, hash) = delimited("},{"Add":" space0,"},{"Add":" take_while(|c: char| c.is_ascii_alphanumeric()),"},{"Add":" pair(space0, char('\\n')),"},{"Add":" )(i)?;"},{"Add":" Ok(("},{"Add":" i,"},{"Add":" PrintableDep {"},{"Add":" type_,"},{"Add":" hash: hash.to_string(),"},{"Add":" },"},{"Add":" ))"},{"Add":"}"},{"Add":""},{"Add":"pub fn parse_dependencies(input: &str) -> IResult<&str, Vec> {"},{"Add":" alt(("},{"Add":" preceded("},{"Add":" tuple((tag(\"# Dependencies\"), space0, char('\\n'), multispace0)),"},{"Add":" many0(terminated(parse_dependency, multispace0)),"},{"Add":" ),"},{"Add":" value(Vec::new(), multispace0),"},{"Add":" ))(input)"},{"Add":"}"}]}},{"Edit":{"inode":{"change":49,"pos":1020742},"path":"libpijul/Cargo.toml","line":118,"atom":{"NewVertex":{"up_context":[{"change":52,"pos":216}],"down_context":[{"change":7,"pos":109302}],"flag":"BLOCK","start":82164,"end":82174,"inode":{"change":49,"pos":1020742}}},"contents":[{"Add":"nom = \"7\""}]}},{"Edit":{"inode":{"change":49,"pos":1020742},"path":"libpijul/Cargo.toml","line":154,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":3715}],"down_context":[],"flag":"BLOCK","start":82175,"end":82216,"inode":{"change":49,"pos":1020742}}},"contents":[{"Add":"quickcheck = \"1\""},{"Add":"quickcheck_macros = \"1\""}]}},{"Edit":{"inode":{"change":49,"pos":1030385},"path":"Cargo.lock","line":1093,"atom":{"NewVertex":{"up_context":[{"change":53,"pos":338}],"down_context":[{"change":4,"pos":3947}],"flag":"BLOCK","start":82217,"end":82225,"inode":{"change":49,"pos":1030385}}},"contents":[{"Add":" \"nom\","}]}},{"Edit":{"inode":{"change":49,"pos":1030385},"path":"Cargo.lock","line":1098,"atom":{"NewVertex":{"up_context":[{"change":54,"pos":23364}],"down_context":[{"change":4,"pos":3964}],"flag":"BLOCK","start":82226,"end":82263,"inode":{"change":49,"pos":1030385}}},"contents":[{"Add":" \"quickcheck\","},{"Add":" \"quickcheck_macros\","}]}},{"Edit":{"inode":{"change":49,"pos":1030385},"path":"Cargo.lock","line":1233,"atom":{"NewVertex":{"up_context":[{"change":54,"pos":26734}],"down_context":[{"change":54,"pos":26734}],"flag":"BLOCK","start":82264,"end":82463,"inode":{"change":49,"pos":1030385}}},"contents":[{"Add":"name = \"minimal-lexical\""},{"Add":"version = \"0.1.3\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"0c835948974f68e0bd58636fc6c5b1fbff7b297e3046f11b3b3c18bbac012c6d\""},{"Add":""},{"Add":"[[package]]"}]}},{"Edit":{"inode":{"change":49,"pos":1030385},"path":"Cargo.lock","line":1302,"atom":{"NewVertex":{"up_context":[{"change":54,"pos":28286}],"down_context":[{"change":54,"pos":28286}],"flag":"BLOCK","start":82464,"end":82719,"inode":{"change":49,"pos":1030385}}},"contents":[{"Add":"name = \"nom\""},{"Add":"version = \"7.0.0\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"7ffd9d26838a953b4af82cbeb9f1592c6798916983959be223a7124e992742c1\""},{"Add":"dependencies = ["},{"Add":" \"memchr\","},{"Add":" \"minimal-lexical\","},{"Add":" \"version_check\","},{"Add":"]"},{"Add":""},{"Add":"[[package]]"}]}},{"Edit":{"inode":{"change":49,"pos":1030385},"path":"Cargo.lock","line":1626,"atom":{"NewVertex":{"up_context":[{"change":54,"pos":36174}],"down_context":[{"change":54,"pos":36174}],"flag":"BLOCK","start":82720,"end":82971,"inode":{"change":49,"pos":1030385}}},"contents":[{"Add":"]"},{"Add":""},{"Add":"[[package]]"},{"Add":"name = \"quickcheck\""},{"Add":"version = \"1.0.3\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6\""},{"Add":"dependencies = ["},{"Add":" \"env_logger\","},{"Add":" \"log\","},{"Add":" \"rand 0.8.4\","}]}},{"Edit":{"inode":{"change":49,"pos":1030385},"path":"Cargo.lock","line":1640,"atom":{"NewVertex":{"up_context":[{"change":54,"pos":36189}],"down_context":[{"change":54,"pos":36189}],"flag":"BLOCK","start":82972,"end":83226,"inode":{"change":49,"pos":1030385}}},"contents":[{"Add":"name = \"quickcheck_macros\""},{"Add":"version = \"1.0.0\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9\""},{"Add":"dependencies = ["},{"Add":" \"proc-macro2\","},{"Add":" \"quote\","},{"Add":" \"syn\","},{"Add":"]"},{"Add":""},{"Add":"[[package]]"}]}}],"owner":"irevoire","repo":"pijul","token":"yitvjsFuy2v2bvNr7iYsuoZpP3inkSqhoHJri8r8X4c=","login":null}

…

Dependencies

Change contents