{"header":{"message":"Removing anyhow in libpijul","description":null,"timestamp":"2020-12-06T11:09:51.851882747Z","authors":[{"full_name":"Pierre-Étienne Meunier","name":"pmeunier"}]},"hash":"VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","authors":[],"deps":{"hashes":[["VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","Removing anyhow in libpijul"],["AA",null],["Q45QHPO4HDTEZF2W4UDZSYYQ46BPEIWSW4GJILZR5HTJNLKXJABQC","Feedback on network stuff"],["62XVBWPYCBULZ2IUWF36JVHAPMKCGQC53PQQ53AAGZGC2KT7VQRQC","remove redundant Clap attributes"],["5DVRL6MFXQOCPOZMYSKBERMRRVUTYRL2SRGRTU2MH4IEOFCDKM3QC","Hard-unrecord"],["LCERQSWMA2YKOPAPNZUSOQ7FLBGDHBZR33OHLYX7T4KTKULRMJDQC","Cleanup"],["GVQ7YSEDDCYYYWDJ5JUVFSBWA5EZVOZJI63KK6E46N6Y2B6LP72AC","Checking for dependencies even for a local change"],["ZXTHL45OYLOICXTXXEQ6AMNSLMQFZ6BFUJWMO6LZOSDK7ERROC5AC","address clippy lints"],["DNQHXWRZF6EWII3RGQ6HPGFD47BOOFH4FCQHSCACBS3RLQO3DNIQC","address clippy hard errors"],["3YDPHBANMNSK7Z5SCG745VLTP4BBQWIXCJTQOSDI6UJGYR6S45EQC","address non-controversial clippy lints"],["V2MDXX622MAXHXGLX7ERVKGYZVZDCYJIFET3TGGIK455XIADYJUAC","Channel rename: do not leave the old name behind"],["JP3BYVXXWFBVQ23MEHJ3LE36AN26P6OCZALKUXMNLHS2TSTM3NKAC","Fixing file paths on Windows"],["6T5ULULMRGU5GJ3JQTEH2QFQN5IMP53TYFFXUT5UE6FA6WWFFMFAC","Fixing conflicts with the changes from discussion #143"],["4OCC6D42GZYRDLH3NSKXMJTRKXP7UZ6Z3YNGCNUT7NT6WBDBCBIAC","Recursive add"],["7A2TSC4PAKK3WOH3DMAJASCEC6D5JLJWNFWJTEEBE4CVS4K76PPQC","Conflict solving code (FOLDER edges)"],["FYVZZNRQ4ZCJN7EJ7LRN4A6TYTWUG4YHRVMD4KAFYJALEBLZOBDQC","Parsing UTF-8 in changes (bytes vs chars)"],["QNJBR73KCSCCF6FTHGZDF2K7PZQL3EFKZFOBT77KYZBMALTTW6OQC","don't return Result for infallible functions"],["43AJ37IXON6PMMYRZM6OB2MJXPYCNIWW2XBDVNBXIRH5DD7JDTVQC","Getting rid of edge validation, which does not work for zombie conflicts"],["N35L72XV5OWBWMEZBKZIKK5K6RMUYQOKGQEQ62N5NJ5N3UCHHWYQC","Versions in Cargo.lock"],["UBCBQ5FGH2KASHEUPDLIKGLVVX3GSRQ4F4P2JEJZL2NX2DUSYARAC","Removing pijul/src/commands/checkout.rs (unused file), as well as litorg comments"],["SAGSYAPXQ2T6GC3B3TNRPNFTZMS7UMME6YQGSF5MOIM66S5NKB2QC","Various version bumps"],["O4DNWMPDUWI6SKYOZTQKCSX6MSR73CTGCUSM65TSQYVOUSAAS6KAC","Cleaunp and proofreading of libpijul::record"],["WIORLB47KYY5ZDKSAQEQ5NV2J3F3RIO5FVGD6LGF73FD5LWJLUAAC","Version bump"],["OXMYGLW2563T6VA75532P7N7CZBHVJL4VI5CQBJ6X4MOX4RKL4GAC","Printing the actual lines rather than str::lines + \\n"],["NLGQAH4H35XC5XTH26BRXVFWGPPAMA4MDN3MHMGCOYE6ZZQMQ4AAC","Credit and reset relative to current directory instead of the root"],["AEPEFS7O3YT7CRRFYQVJWUXUUSRGJ6K6XZQVK62B6N74UXOIFWYAC","Write help for each argument"],["H23LO7U7MNB5GTLOUIFYAJ6DP57DM3VFBR4IBOAVPMHS356AYFPQC","a few more clippy lints addressed"],["BZSC7VMYSFRXDHDDAMCDR6X67FN5VWIBOSE76BQLX7OCVOJFUA3AC","address clippy lints"],["ISQJRA3OJJRDMYVQX7XNYGJNMR6CPWIVAIFOS2NCIZH2ZAPDTC5QC","Fixing the parsing of zombie resurrection in the change text format"],["4H2XTVJ2BNXDNHQ3RQTMOG3I4NRGZT7JDLC2GRINS56TIYTYTO4QC","Fix some mistakes in the docs"],["UNZXTNSJI4YRY3EQ3M4HMBKQDNYDTY6B7IZRBNYGDJXTA2UKYWRAC","Change text format: order dependencies in the order they were on the channel at record time"],["7PM25EXLNQ6JUUIZNTAOQYNNIZNG6TJREEBUSAIC3FIOE7FHETSAC","Recursive apply was written a little too fast…"],["G6YZ7U65AW42M4RSWPXOCJH62XZ5OKVGOQ2UEB6SBNKNJEWYBAEQC","Version bump"],["KDF6FJRVF72L274BEUJCTUKRFMNL6BDZMTVKDPEYGFX4TC3YOVSQC","bigger clippy refactors"],["NX5I5H53IWX76GA3MTXTWZXU2HKUDL4ENED7LTGHMPWLHSAHYEAQC","New published versions"],["74HX2XZDHFRE7FIQ6LQZALIIKED2ABSGGBQ34ULYZ5ZBKK7UTHQQC","Cleanup and debugging"],["WZVCLZKY34KQBQU6YBGJLQCDADBQ67LQVDNRVCMQVY3O3C3EIWSQC","address clippy lints"],["BXD3IQYNMKMI5BTANCF6NZHZP4CKPWADGJMBT2R3WTMKVKONT5QAC","Fixing --features git"],["OCBM7IFE7CL3PM5KPYTRTKTHYKC76NTFK5C4VA4JFAKQUA6GC7FAC","New release: pijul-1.0.0-alpha.8"],["KVBLRDOUFRYB6BPOQJDD7OVBYMTTPDAUX7CJ5DC3U7WFRI5OLWRAC","Concatenating edits with order conflict resolutions (if relevant), and parsing the text format of the result"],["RJMQSZER3DDPF7ANVKDPMR3KZZ7DKM5ASAOVPBQBAPDLJNL6BJ5AC","External commands"],["CVAT6LN3SYYLREM6NLM4IUPFI5EX3BL6MRPFTY24ROJFSB3J5OOQC","Fixing git import, and adding more useful feedback (with `RUST_LOG=\"pijul=info\"`)"],["SNZ3OAMCPUGFYON5SZHQQQK46ZZMVMJECJYEUCMG657UVLY2PNBQC","use native external subcommand support instead of hand-rolled one"],["OUWD436ATBTZJR53B6XDSI5SXRRNZV7YGRUEA5ACHZC2RUDP7G5QC","Version bump"],["R3H7D42UZ446V5TO2574BMAQQAYYJPEIMSZVDPAGVIYU2COJSWBAC","Debugging `pijul git`: proper error reporting"],["5BRU2RRWOQBMS2V3RQM7PRFR5UILYZ73GISHAKJA6KIZGC5M2MFAC","Cleanup (debugging a crash related to trees/inodes)"],["ERV3644QELKOHAVNMZGRWYCPPN3XELTAH4PPFR6QKGWW73XBOOKQC","Adding the block module"],["KWAMD2KR5UYRHHPZWL7GY2KQKNXNVS4BYBVK3FXDI23NQMWA3U4QC","A few fixes in the documentation comments"],["GURIBVW66JDQK3SJZRGVJ2MQLMT7JD4KLI5QPQZGPAL7WH3T6T4AC","Fixing the pager"],["2K7JLB4Z7BS5VFNWD4DO3MKYU7VNPA5MTVHVSDI3FQZ5ICM6XM6QC","No pager on Windows"],["7UPL3Y2A5QOBU6VIUHNWEFGSGQ5CMWGDGOVLRZ53UARXG3TDGLMAC","Unrecord: don't restore the same unrecorded file deletion twice in the inodes and tree tables"],["JWTT77WJIGJOZVLLZBADUDZIMSEAR7ZLYLWISOXFJJCNWJGJPWQQC","Add help on subcommands"],["PJ7T2VFLV5PYG3CV23GC2GIQETXKGC6CO74JBGREV3JC3LG5OXUAC","Do not hang on locked repositories"],["L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","pijul/*: reorganize imports and remove extern crate"],["I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","Massive cleanup, and simplification"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."]],"deps":["Q45QHPO4HDTEZF2W4UDZSYYQ46BPEIWSW4GJILZR5HTJNLKXJABQC","62XVBWPYCBULZ2IUWF36JVHAPMKCGQC53PQQ53AAGZGC2KT7VQRQC","5DVRL6MFXQOCPOZMYSKBERMRRVUTYRL2SRGRTU2MH4IEOFCDKM3QC","LCERQSWMA2YKOPAPNZUSOQ7FLBGDHBZR33OHLYX7T4KTKULRMJDQC","GVQ7YSEDDCYYYWDJ5JUVFSBWA5EZVOZJI63KK6E46N6Y2B6LP72AC","ZXTHL45OYLOICXTXXEQ6AMNSLMQFZ6BFUJWMO6LZOSDK7ERROC5AC","DNQHXWRZF6EWII3RGQ6HPGFD47BOOFH4FCQHSCACBS3RLQO3DNIQC","3YDPHBANMNSK7Z5SCG745VLTP4BBQWIXCJTQOSDI6UJGYR6S45EQC","V2MDXX622MAXHXGLX7ERVKGYZVZDCYJIFET3TGGIK455XIADYJUAC","JP3BYVXXWFBVQ23MEHJ3LE36AN26P6OCZALKUXMNLHS2TSTM3NKAC","6T5ULULMRGU5GJ3JQTEH2QFQN5IMP53TYFFXUT5UE6FA6WWFFMFAC","4OCC6D42GZYRDLH3NSKXMJTRKXP7UZ6Z3YNGCNUT7NT6WBDBCBIAC","7A2TSC4PAKK3WOH3DMAJASCEC6D5JLJWNFWJTEEBE4CVS4K76PPQC","FYVZZNRQ4ZCJN7EJ7LRN4A6TYTWUG4YHRVMD4KAFYJALEBLZOBDQC","QNJBR73KCSCCF6FTHGZDF2K7PZQL3EFKZFOBT77KYZBMALTTW6OQC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","CVAT6LN3SYYLREM6NLM4IUPFI5EX3BL6MRPFTY24ROJFSB3J5OOQC","JWTT77WJIGJOZVLLZBADUDZIMSEAR7ZLYLWISOXFJJCNWJGJPWQQC","OUWD436ATBTZJR53B6XDSI5SXRRNZV7YGRUEA5ACHZC2RUDP7G5QC","PJ7T2VFLV5PYG3CV23GC2GIQETXKGC6CO74JBGREV3JC3LG5OXUAC","L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","UBCBQ5FGH2KASHEUPDLIKGLVVX3GSRQ4F4P2JEJZL2NX2DUSYARAC","NLGQAH4H35XC5XTH26BRXVFWGPPAMA4MDN3MHMGCOYE6ZZQMQ4AAC","7UPL3Y2A5QOBU6VIUHNWEFGSGQ5CMWGDGOVLRZ53UARXG3TDGLMAC","74HX2XZDHFRE7FIQ6LQZALIIKED2ABSGGBQ34ULYZ5ZBKK7UTHQQC","NX5I5H53IWX76GA3MTXTWZXU2HKUDL4ENED7LTGHMPWLHSAHYEAQC","UNZXTNSJI4YRY3EQ3M4HMBKQDNYDTY6B7IZRBNYGDJXTA2UKYWRAC","ISQJRA3OJJRDMYVQX7XNYGJNMR6CPWIVAIFOS2NCIZH2ZAPDTC5QC","GURIBVW66JDQK3SJZRGVJ2MQLMT7JD4KLI5QPQZGPAL7WH3T6T4AC","I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","43AJ37IXON6PMMYRZM6OB2MJXPYCNIWW2XBDVNBXIRH5DD7JDTVQC","ERV3644QELKOHAVNMZGRWYCPPN3XELTAH4PPFR6QKGWW73XBOOKQC","BXD3IQYNMKMI5BTANCF6NZHZP4CKPWADGJMBT2R3WTMKVKONT5QAC","N35L72XV5OWBWMEZBKZIKK5K6RMUYQOKGQEQ62N5NJ5N3UCHHWYQC","OCBM7IFE7CL3PM5KPYTRTKTHYKC76NTFK5C4VA4JFAKQUA6GC7FAC","AEPEFS7O3YT7CRRFYQVJWUXUUSRGJ6K6XZQVK62B6N74UXOIFWYAC","4H2XTVJ2BNXDNHQ3RQTMOG3I4NRGZT7JDLC2GRINS56TIYTYTO4QC","KWAMD2KR5UYRHHPZWL7GY2KQKNXNVS4BYBVK3FXDI23NQMWA3U4QC","KVBLRDOUFRYB6BPOQJDD7OVBYMTTPDAUX7CJ5DC3U7WFRI5OLWRAC","O4DNWMPDUWI6SKYOZTQKCSX6MSR73CTGCUSM65TSQYVOUSAAS6KAC","7PM25EXLNQ6JUUIZNTAOQYNNIZNG6TJREEBUSAIC3FIOE7FHETSAC","RJMQSZER3DDPF7ANVKDPMR3KZZ7DKM5ASAOVPBQBAPDLJNL6BJ5AC","SNZ3OAMCPUGFYON5SZHQQQK46ZZMVMJECJYEUCMG657UVLY2PNBQC","R3H7D42UZ446V5TO2574BMAQQAYYJPEIMSZVDPAGVIYU2COJSWBAC","5BRU2RRWOQBMS2V3RQM7PRFR5UILYZ73GISHAKJA6KIZGC5M2MFAC","2K7JLB4Z7BS5VFNWD4DO3MKYU7VNPA5MTVHVSDI3FQZ5ICM6XM6QC","SAGSYAPXQ2T6GC3B3TNRPNFTZMS7UMME6YQGSF5MOIM66S5NKB2QC","WIORLB47KYY5ZDKSAQEQ5NV2J3F3RIO5FVGD6LGF73FD5LWJLUAAC","OXMYGLW2563T6VA75532P7N7CZBHVJL4VI5CQBJ6X4MOX4RKL4GAC","BZSC7VMYSFRXDHDDAMCDR6X67FN5VWIBOSE76BQLX7OCVOJFUA3AC","H23LO7U7MNB5GTLOUIFYAJ6DP57DM3VFBR4IBOAVPMHS356AYFPQC","WZVCLZKY34KQBQU6YBGJLQCDADBQ67LQVDNRVCMQVY3O3C3EIWSQC","KDF6FJRVF72L274BEUJCTUKRFMNL6BDZMTVKDPEYGFX4TC3YOVSQC","G6YZ7U65AW42M4RSWPXOCJH62XZ5OKVGOQ2UEB6SBNKNJEWYBAEQC"]},"hunks":[{"Replacement":{"inode":{"change":17,"pos":445},"path":"pijul-macros/src/lib.rs","line":511,"ins":{"up_context":[{"change":17,"pos":18449}],"down_context":[{"change":17,"pos":18491}],"flag":"","start":0,"end":40,"inode":{"change":17,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":18449},"to":{"change":17,"start":18449,"end":18491},"introduced_by":17}],"inode":{"change":17,"pos":445}},"ins_contents":[{"Add":" ) -> Result;"}],"del_contents":[{"Del":" ) -> Result;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":445},"path":"pijul-macros/src/lib.rs","line":517,"ins":{"up_context":[{"change":17,"pos":18606}],"down_context":[{"change":17,"pos":18648}],"flag":"","start":41,"end":81,"inode":{"change":17,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":18606},"to":{"change":17,"start":18606,"end":18648},"introduced_by":17}],"inode":{"change":17,"pos":445}},"ins_contents":[{"Add":" ) -> Result;"}],"del_contents":[{"Del":" ) -> Result;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":445},"path":"pijul-macros/src/lib.rs","line":546,"ins":{"up_context":[{"change":17,"pos":19827}],"down_context":[{"change":17,"pos":19874}],"flag":"","start":82,"end":127,"inode":{"change":17,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":19827},"to":{"change":17,"start":19827,"end":19874},"introduced_by":17}],"inode":{"change":17,"pos":445}},"ins_contents":[{"Add":" ) -> Result {"}],"del_contents":[{"Del":" ) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":445},"path":"pijul-macros/src/lib.rs","line":554,"ins":{"up_context":[{"change":17,"pos":20095}],"down_context":[{"change":17,"pos":20142}],"flag":"","start":128,"end":173,"inode":{"change":17,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":20095},"to":{"change":17,"start":20095,"end":20142},"introduced_by":17}],"inode":{"change":17,"pos":445}},"ins_contents":[{"Add":" ) -> Result {"}],"del_contents":[{"Del":" ) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":445},"path":"pijul-macros/src/lib.rs","line":565,"ins":{"up_context":[{"change":17,"pos":20426}],"down_context":[{"change":17,"pos":20473}],"flag":"","start":174,"end":219,"inode":{"change":17,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":20426},"to":{"change":17,"start":20426,"end":20473},"introduced_by":17}],"inode":{"change":17,"pos":445}},"ins_contents":[{"Add":" ) -> Result {"}],"del_contents":[{"Del":" ) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":445},"path":"pijul-macros/src/lib.rs","line":575,"ins":{"up_context":[{"change":17,"pos":20764}],"down_context":[{"change":17,"pos":20811}],"flag":"","start":220,"end":265,"inode":{"change":17,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":20764},"to":{"change":17,"start":20764,"end":20811},"introduced_by":17}],"inode":{"change":17,"pos":445}},"ins_contents":[{"Add":" ) -> Result {"}],"del_contents":[{"Del":" ) -> Result {\n"}]}},{"Edit":{"inode":{"change":17,"pos":83981},"path":"pijul/src/main.rs","line":108,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":85778},"to":{"change":3,"start":159,"end":203},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":203},"to":{"change":17,"start":85845,"end":85867},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":17,"pos":866},"to":{"change":17,"start":85845,"end":85867},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":85845},"to":{"change":17,"start":85845,"end":85867},"introduced_by":17}],"inode":{"change":17,"pos":83981}}},"contents":[{"Del":"\n #[clap(setting = AppSettings::Hidden)]\n"},{"Del":" Upgrade(Upgrade),\n"}]}},{"Edit":{"inode":{"change":17,"pos":83981},"path":"pijul/src/main.rs","line":241,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":89650},"to":{"change":17,"start":89650,"end":89705},"introduced_by":17}],"inode":{"change":17,"pos":83981}}},"contents":[{"Del":" SubCommand::Upgrade(upgrade) => upgrade.run(),\n"}]}},{"FileDel":{"deleted_names":[{"basename":"upgrade.rs","metadata":420}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":17,"pos":93386},"to":{"change":17,"start":93387,"end":93399},"introduced_by":17},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":17,"pos":93399},"to":{"change":17,"start":93400,"end":93400},"introduced_by":17}],"inode":{"change":17,"pos":93400}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":93400},"to":{"change":17,"start":1022,"end":1105},"introduced_by":17},{"previous":"","flag":"BLOCK | DELETED","from":{"change":17,"pos":1105},"to":{"change":17,"start":93436,"end":93476},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":93436},"to":{"change":17,"start":93436,"end":93476},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":93476},"to":{"change":17,"start":1752,"end":1810},"introduced_by":17},{"previous":"","flag":"BLOCK | DELETED","from":{"change":17,"pos":1810},"to":{"change":17,"start":1106,"end":1142},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":93560},"to":{"change":17,"start":1106,"end":1142},"introduced_by":17},{"previous":"","flag":"BLOCK | DELETED","from":{"change":17,"pos":1142},"to":{"change":17,"start":93626,"end":93671},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":93626},"to":{"change":17,"start":93626,"end":93671},"introduced_by":17},{"previous":"","flag":"BLOCK | DELETED","from":{"change":17,"pos":150},"to":{"change":17,"start":93671,"end":94167},"introduced_by":17},{"previous":"","flag":"BLOCK | DELETED","from":{"change":17,"pos":149},"to":{"change":17,"start":93671,"end":94167},"introduced_by":17},{"previous":"","flag":"BLOCK | DELETED","from":{"change":17,"pos":149},"to":{"change":17,"start":93671,"end":94167},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":93671},"to":{"change":17,"start":93671,"end":94167},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":94167},"to":{"change":17,"start":454,"end":537},"introduced_by":17},{"previous":"","flag":"BLOCK | DELETED","from":{"change":17,"pos":537},"to":{"change":17,"start":94247,"end":95615},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":94247},"to":{"change":17,"start":94247,"end":95615},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":93671},"to":{"change":17,"start":0,"end":150},"introduced_by":17}],"inode":{"change":17,"pos":93400}},"content":[{"Del":"use std::collections::{HashMap, HashSet};\nuse std::path::PathBuf;\n\nuse clap::Clap;\n"},{"Del":"use libpijul::changestore::ChangeStore;\n"},{"Del":"use libpijul::{Hash, MutTxnT, MutTxnTExt, TxnT, TxnTExt};\n"},{"Del":"\nuse crate::repository::Repository;\n"},{"Del":"\n#[derive(Clap, Debug)]\npub struct Upgrade {\n"},{"Del":" #[clap(long = \"repository\")]\n repo_path: Option,\n}\n\nimpl Upgrade {\n pub fn run(self) -> Result<(), anyhow::Error> {\n let mut channels = HashMap::new();\n {\n let repo = Repository::find_root(self.repo_path.clone())?;\n let txn = repo.pristine.txn_begin()?;\n let mut hashes = HashSet::new();\n for channel in txn.iter_channels(\"\") {\n let channel = channel.borrow();\n let name = channel.name();\n"},{"Del":" let e = channels.entry(name.to_string()).or_insert_with(Vec::new);\n"},{"Del":" hashes.clear();\n for (_, (h, _)) in txn.reverse_log(&channel, None) {\n if !hashes.insert(h) {\n continue;\n }\n let path = repo.changes.filename(&h);\n let change = libpijul::change::v3::LocalChange3::deserialize(\n path.to_str().unwrap(),\n Some(&h),\n )\n .unwrap();\n e.push((h, change))\n }\n }\n std::fs::rename(repo.path.join(\".pijul\"), repo.path.join(\".pijul.old\"))?;\n }\n let repo2 = Repository::init(self.repo_path)?;\n let mut txn2 = repo2.pristine.mut_txn_begin();\n let mut translations = HashMap::new();\n translations.insert(None, None);\n translations.insert(Some(Hash::None), Some(Hash::None));\n for (channel_name, mut changes) in channels {\n let mut channel = txn2.open_or_create_channel(&channel_name)?;\n while let Some((old_h, c)) = changes.pop() {\n let h = repo2.changes.save_change(&c.to_v4(&translations))?;\n translations.insert(Some(old_h), Some(h));\n txn2.apply_change(&repo2.changes, &mut channel, h)?;\n }\n }\n txn2.commit()?;\n Ok(())\n }\n}\n"},{"Del":" /// Set the repository where this command should run. Defaults to the first ancestor of the current directory that contains a `.pijul` directory.\n"}]}},{"Edit":{"inode":{"change":17,"pos":133619},"path":"pijul/src/commands/mod.rs","line":59,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":134333},"to":{"change":17,"start":134333,"end":134366},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":134366},"to":{"change":4,"start":1575,"end":1576},"introduced_by":4}],"inode":{"change":17,"pos":133619}}},"contents":[{"Del":"mod upgrade;\npub use upgrade::*;\n"},{"Del":"\n"}]}},{"Replacement":{"inode":{"change":17,"pos":137210},"path":"pijul/src/commands/git.rs","line":648,"ins":{"up_context":[{"change":17,"pos":159258}],"down_context":[{"change":17,"pos":159611}],"flag":"","start":266,"end":524,"inode":{"change":17,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":159258},"to":{"change":17,"start":159258,"end":159611},"introduced_by":17}],"inode":{"change":17,"pos":137210}},"ins_contents":[{"Add":" Err(libpijul::LocalApplyError::ChangeAlreadyOnChannel { hash }) => {"},{"Add":" error!(\"change already on channel: {:?}\", hash);"},{"Add":" return Ok(txn.current_state(&channel.borrow()).unwrap());"},{"Add":" }"},{"Add":" Err(e) => return Err(e.into()),"}],"del_contents":[{"Del":" Err(e) => match e.downcast() {\n Ok(libpijul::Error::ChangeAlreadyOnChannel { hash }) => {\n error!(\"change already on channel: {:?}\", hash);\n return Ok(txn.current_state(&channel.borrow()).unwrap());\n }\n Ok(e) => return Err(e.into()),\n Err(e) => return Err(e),\n },\n"}]}},{"Replacement":{"inode":{"change":17,"pos":137210},"path":"pijul/src/commands/git.rs","line":692,"ins":{"up_context":[{"change":17,"pos":160679}],"down_context":[{"change":17,"pos":160829}],"flag":"","start":525,"end":646,"inode":{"change":17,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":160679},"to":{"change":17,"start":3959,"end":4047},"introduced_by":17}],"inode":{"change":17,"pos":137210}},"ins_contents":[{"Add":") -> Result<"},{"Add":" (usize, Option, Option),"},{"Add":" libpijul::LocalApplyError,"},{"Add":"> {"}],"del_contents":[{"Del":") -> Result<(usize, Option, Option), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":137210},"path":"pijul/src/commands/git.rs","line":699,"ins":{"up_context":[{"change":17,"pos":317}],"down_context":[{"change":17,"pos":535}],"flag":"","start":647,"end":969,"inode":{"change":17,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":317},"to":{"change":17,"start":317,"end":535},"introduced_by":17}],"inode":{"change":17,"pos":137210}},"ins_contents":[{"Add":" use libpijul::working_copy::filesystem::*;"},{"Add":" match result {"},{"Add":" Ok(_) => {}"},{"Add":" Err(Error::Add(AddError::Fs(FsError::NotFound(_)))) => {}"},{"Add":" Err(Error::Add(AddError::Fs(FsError::AlreadyInRepo(_)))) => {}"},{"Add":" Err(e) => {"},{"Add":" error!(\"While adding {:?}: {}\", p, e);"}],"del_contents":[{"Del":" if let Err(e) = result {\n match e.downcast() {\n Ok(libpijul::Error::FileNotInRepo { .. }) => {}\n Ok(e) => return Err(e.into()),\n Err(e) => return Err(e),\n"}]}},{"Replacement":{"inode":{"change":17,"pos":178684},"path":"pijul/src/commands/credit.rs","line":88,"ins":{"up_context":[{"change":17,"pos":6159}],"down_context":[{"change":17,"pos":181121}],"flag":"","start":970,"end":1035,"inode":{"change":17,"pos":178684}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":17,"pos":6159},"to":{"change":17,"start":181047,"end":181121},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":181047},"to":{"change":17,"start":181047,"end":181121},"introduced_by":17}],"inode":{"change":17,"pos":178684}},"ins_contents":[{"Add":" fn output_line) -> Result<(), E>>("}],"del_contents":[{"Del":" fn output_line) -> Result<(), anyhow::Error>>(\n"}]}},{"Replacement":{"inode":{"change":17,"pos":178684},"path":"pijul/src/commands/credit.rs","line":92,"ins":{"up_context":[{"change":17,"pos":181183}],"down_context":[{"change":17,"pos":181220}],"flag":"","start":1036,"end":1108,"inode":{"change":17,"pos":178684}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":181183},"to":{"change":17,"start":181183,"end":181220},"introduced_by":17}],"inode":{"change":17,"pos":178684}},"ins_contents":[{"Add":" ) -> Result<(), E>"},{"Add":" where"},{"Add":" E: From,"},{"Add":" {"}],"del_contents":[{"Del":" ) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":178684},"path":"pijul/src/commands/credit.rs","line":142,"ins":{"up_context":[{"change":17,"pos":182632}],"down_context":[{"change":17,"pos":182713}],"flag":"","start":1109,"end":1191,"inode":{"change":17,"pos":178684}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":182632},"to":{"change":17,"start":182632,"end":182713},"introduced_by":17}],"inode":{"change":17,"pos":178684}},"ins_contents":[{"Add":" fn output_conflict_marker(&mut self, s: &str) -> Result<(), std::io::Error> {"}],"del_contents":[{"Del":" fn output_conflict_marker(&mut self, s: &str) -> Result<(), anyhow::Error> {\n"}]}},{"Edit":{"inode":{"change":17,"pos":198172},"path":"libpijul/src/working_copy/mod.rs","line":11,"atom":{"NewVertex":{"up_context":[{"change":17,"pos":198424}],"down_context":[{"change":17,"pos":198424}],"flag":"","start":1192,"end":1367,"inode":{"change":17,"pos":198172}}},"contents":[{"Add":""},{"Add":"#[derive(Debug, Error)]"},{"Add":"pub enum WriteError {"},{"Add":" #[error(transparent)]"},{"Add":" E(E),"},{"Add":" #[error(transparent)]"},{"Add":" Io(#[from] std::io::Error),"},{"Add":"}"}]}},{"Replacement":{"inode":{"change":17,"pos":198172},"path":"libpijul/src/working_copy/mod.rs","line":21,"ins":{"up_context":[{"change":17,"pos":198449}],"down_context":[{"change":17,"pos":199114}],"flag":"","start":1368,"end":2064,"inode":{"change":17,"pos":198172}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":198449},"to":{"change":17,"start":198449,"end":199114},"introduced_by":17}],"inode":{"change":17,"pos":198172}},"ins_contents":[{"Add":" type Error: std::error::Error;"},{"Add":" fn create_dir_all(&mut self, path: &str) -> Result<(), Self::Error>;"},{"Add":" fn file_metadata(&self, file: &str) -> Result;"},{"Add":" fn read_file(&self, file: &str, buffer: &mut Vec) -> Result<(), Self::Error>;"},{"Add":" fn modified_time(&self, file: &str) -> Result;"},{"Add":" fn remove_path(&mut self, name: &str) -> Result<(), Self::Error>;"},{"Add":" fn rename(&mut self, former: &str, new: &str) -> Result<(), Self::Error>;"},{"Add":" fn set_permissions(&mut self, name: &str, permissions: u16) -> Result<(), Self::Error>;"},{"Add":" fn write_file Result>("}],"del_contents":[{"Del":" fn create_dir_all(&mut self, path: &str) -> Result<(), anyhow::Error>;\n fn file_metadata(&self, file: &str) -> Result;\n fn read_file(&self, file: &str, buffer: &mut Vec) -> Result<(), anyhow::Error>;\n fn modified_time(&self, file: &str) -> Result;\n fn remove_path(&mut self, name: &str) -> Result<(), anyhow::Error>;\n fn rename(&mut self, former: &str, new: &str) -> Result<(), anyhow::Error>;\n fn set_permissions(&mut self, name: &str, permissions: u16) -> Result<(), anyhow::Error>;\n fn write_file Result>(\n"}]}},{"Replacement":{"inode":{"change":17,"pos":198172},"path":"libpijul/src/working_copy/mod.rs","line":33,"ins":{"up_context":[{"change":17,"pos":199172}],"down_context":[{"change":17,"pos":199207}],"flag":"","start":2065,"end":2100,"inode":{"change":17,"pos":198172}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":199172},"to":{"change":17,"start":199172,"end":199207},"introduced_by":17}],"inode":{"change":17,"pos":198172}},"ins_contents":[{"Add":" ) -> Result>;"}],"del_contents":[{"Del":" ) -> Result;\n"}]}},{"Edit":{"inode":{"change":17,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":197,"atom":{"NewVertex":{"up_context":[{"change":17,"pos":205401}],"down_context":[{"change":17,"pos":205401}],"flag":"","start":2101,"end":2215,"inode":{"change":17,"pos":199222}}},"contents":[{"Add":"}"},{"Add":""},{"Add":"#[derive(Debug, Error)]"},{"Add":"pub enum Error {"},{"Add":" #[error(\"Path not found: {path}\")]"},{"Add":" NotFound { path: String },"}]}},{"Replacement":{"inode":{"change":17,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":206,"ins":{"up_context":[{"change":17,"pos":205434}],"down_context":[{"change":17,"pos":205510}],"flag":"","start":2216,"end":2314,"inode":{"change":17,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":205434},"to":{"change":17,"start":205434,"end":205510},"introduced_by":17}],"inode":{"change":17,"pos":199222}},"ins_contents":[{"Add":" type Error = Error;"},{"Add":" fn create_dir_all(&mut self, file: &str) -> Result<(), Self::Error> {"}],"del_contents":[{"Del":" fn create_dir_all(&mut self, file: &str) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":223,"ins":{"up_context":[{"change":17,"pos":205959}],"down_context":[{"change":17,"pos":206041}],"flag":"","start":2315,"end":2395,"inode":{"change":17,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":205959},"to":{"change":17,"start":205959,"end":206041},"introduced_by":17}],"inode":{"change":17,"pos":199222}},"ins_contents":[{"Add":" fn file_metadata(&self, file: &str) -> Result {"}],"del_contents":[{"Del":" fn file_metadata(&self, file: &str) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":227,"ins":{"up_context":[{"change":17,"pos":206196}],"down_context":[{"change":17,"pos":206250}],"flag":"","start":2396,"end":2438,"inode":{"change":17,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":206196},"to":{"change":17,"start":206196,"end":206250},"introduced_by":17}],"inode":{"change":17,"pos":199222}},"ins_contents":[{"Add":" None => Err(Error::NotFound {"}],"del_contents":[{"Del":" None => Err((crate::Error::FileNotFound {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":229,"ins":{"up_context":[{"change":17,"pos":206290}],"down_context":[{"change":17,"pos":206327}],"flag":"","start":2439,"end":2455,"inode":{"change":17,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":206290},"to":{"change":17,"start":206290,"end":206327},"introduced_by":17}],"inode":{"change":17,"pos":199222}},"ins_contents":[{"Add":" }),"}],"del_contents":[{"Del":" })\n .into()),\n"}]}},{"Replacement":{"inode":{"change":17,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":232,"ins":{"up_context":[{"change":17,"pos":206343}],"down_context":[{"change":17,"pos":206432}],"flag":"","start":2456,"end":2543,"inode":{"change":17,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":206343},"to":{"change":17,"start":206343,"end":206432},"introduced_by":17}],"inode":{"change":17,"pos":199222}},"ins_contents":[{"Add":" fn read_file(&self, file: &str, buffer: &mut Vec) -> Result<(), Self::Error> {"}],"del_contents":[{"Del":" fn read_file(&self, file: &str, buffer: &mut Vec) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":239,"ins":{"up_context":[{"change":17,"pos":206862}],"down_context":[{"change":17,"pos":240}],"flag":"","start":2544,"end":2586,"inode":{"change":17,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":206862},"to":{"change":17,"start":186,"end":240},"introduced_by":17}],"inode":{"change":17,"pos":199222}},"ins_contents":[{"Add":" None => Err(Error::NotFound {"}],"del_contents":[{"Del":" None => Err((crate::Error::FileNotFound {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":241,"ins":{"up_context":[{"change":17,"pos":280}],"down_context":[{"change":17,"pos":206862}],"flag":"","start":2587,"end":2603,"inode":{"change":17,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":280},"to":{"change":17,"start":280,"end":317},"introduced_by":17}],"inode":{"change":17,"pos":199222}},"ins_contents":[{"Add":" }),"}],"del_contents":[{"Del":" })\n .into()),\n"}]}},{"Replacement":{"inode":{"change":17,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":244,"ins":{"up_context":[{"change":17,"pos":206878}],"down_context":[{"change":17,"pos":206969}],"flag":"","start":2604,"end":2693,"inode":{"change":17,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":206878},"to":{"change":17,"start":206878,"end":206969},"introduced_by":17}],"inode":{"change":17,"pos":199222}},"ins_contents":[{"Add":" fn modified_time(&self, _file: &str) -> Result {"}],"del_contents":[{"Del":" fn modified_time(&self, _file: &str) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":248,"ins":{"up_context":[{"change":17,"pos":207007}],"down_context":[{"change":17,"pos":207080}],"flag":"","start":2694,"end":2765,"inode":{"change":17,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":207007},"to":{"change":17,"start":207007,"end":207080},"introduced_by":17}],"inode":{"change":17,"pos":199222}},"ins_contents":[{"Add":" fn remove_path(&mut self, path: &str) -> Result<(), Self::Error> {"}],"del_contents":[{"Del":" fn remove_path(&mut self, path: &str) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":253,"ins":{"up_context":[{"change":17,"pos":207135}],"down_context":[{"change":17,"pos":207213}],"flag":"","start":2766,"end":2842,"inode":{"change":17,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":207135},"to":{"change":17,"start":207135,"end":207213},"introduced_by":17}],"inode":{"change":17,"pos":199222}},"ins_contents":[{"Add":" fn rename(&mut self, old: &str, new: &str) -> Result<(), Self::Error> {"}],"del_contents":[{"Del":" fn rename(&mut self, old: &str, new: &str) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":260,"ins":{"up_context":[{"change":17,"pos":207386}],"down_context":[{"change":17,"pos":207481}],"flag":"","start":2843,"end":2936,"inode":{"change":17,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":207386},"to":{"change":17,"start":207386,"end":207481},"introduced_by":17}],"inode":{"change":17,"pos":199222}},"ins_contents":[{"Add":" fn set_permissions(&mut self, file: &str, permissions: u16) -> Result<(), Self::Error> {"}],"del_contents":[{"Del":" fn set_permissions(&mut self, file: &str, permissions: u16) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":273,"ins":{"up_context":[{"change":17,"pos":207946}],"down_context":[{"change":17,"pos":208032}],"flag":"","start":2937,"end":3033,"inode":{"change":17,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":207946},"to":{"change":17,"start":207946,"end":208032},"introduced_by":17}],"inode":{"change":17,"pos":199222}},"ins_contents":[{"Add":" fn write_file Result>("}],"del_contents":[{"Del":" fn write_file Result>(\n"}]}},{"Replacement":{"inode":{"change":17,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":277,"ins":{"up_context":[{"change":17,"pos":208090}],"down_context":[{"change":17,"pos":208126}],"flag":"","start":3034,"end":3070,"inode":{"change":17,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":208090},"to":{"change":17,"start":208090,"end":208126},"introduced_by":17}],"inode":{"change":17,"pos":199222}},"ins_contents":[{"Add":" ) -> Result> {"}],"del_contents":[{"Del":" ) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":283,"ins":{"up_context":[{"change":17,"pos":208288}],"down_context":[{"change":17,"pos":208321}],"flag":"","start":3071,"end":3127,"inode":{"change":17,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":208288},"to":{"change":17,"start":208288,"end":208321},"introduced_by":17}],"inode":{"change":17,"pos":199222}},"ins_contents":[{"Add":" writer(contents).map_err(WriteError::E)"}],"del_contents":[{"Del":" writer(contents)\n"}]}},{"Replacement":{"inode":{"change":17,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":288,"ins":{"up_context":[{"change":17,"pos":208459}],"down_context":[{"change":17,"pos":208507}],"flag":"","start":3128,"end":3199,"inode":{"change":17,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":208459},"to":{"change":17,"start":208459,"end":208507},"introduced_by":17}],"inode":{"change":17,"pos":199222}},"ins_contents":[{"Add":" let a = writer(&mut contents).map_err(WriteError::E)?;"}],"del_contents":[{"Del":" let a = writer(&mut contents)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":32,"ins":{"up_context":[{"change":17,"pos":209178}],"down_context":[{"change":17,"pos":209226}],"flag":"","start":3200,"end":3249,"inode":{"change":17,"pos":208900}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":209178},"to":{"change":17,"start":209178,"end":209226},"introduced_by":17}],"inode":{"change":17,"pos":208900}},"ins_contents":[{"Add":") -> Result<(PathBuf, String), std::io::Error> {"}],"del_contents":[{"Del":") -> Result<(PathBuf, String), anyhow::Error> {\n"}]}},{"Edit":{"inode":{"change":17,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":56,"atom":{"NewVertex":{"up_context":[{"change":17,"pos":209915}],"down_context":[{"change":17,"pos":209915}],"flag":"","start":3250,"end":3513,"inode":{"change":17,"pos":208900}}},"contents":[{"Add":"}"},{"Add":""},{"Add":"#[derive(Debug, Error)]"},{"Add":"pub enum AddError {"},{"Add":" #[error(transparent)]"},{"Add":" Ignore(#[from] ignore::Error),"},{"Add":" #[error(transparent)]"},{"Add":" Io(#[from] std::io::Error),"},{"Add":" #[error(transparent)]"},{"Add":" Fs(#[from] crate::fs::FsError),"}]}},{"Edit":{"inode":{"change":17,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":68,"atom":{"NewVertex":{"up_context":[{"change":17,"pos":209918}],"down_context":[{"change":17,"pos":209918}],"flag":"","start":3514,"end":3774,"inode":{"change":17,"pos":208900}}},"contents":[{"Add":"#[derive(Debug, Error)]"},{"Add":"pub enum Error {"},{"Add":" #[error(transparent)]"},{"Add":" Add(#[from] AddError),"},{"Add":" #[error(transparent)]"},{"Add":" Record(#[from] crate::record::RecordError),"},{"Add":"}"},{"Add":""}]}},{"Replacement":{"inode":{"change":17,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":95,"ins":{"up_context":[{"change":17,"pos":210434}],"down_context":[{"change":17,"pos":210471}],"flag":"","start":3775,"end":3824,"inode":{"change":17,"pos":208900}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":210434},"to":{"change":17,"start":210434,"end":210471},"introduced_by":17}],"inode":{"change":17,"pos":208900}},"ins_contents":[{"Add":" ) -> Result<(), Error> {"}],"del_contents":[{"Del":" ) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":111,"ins":{"up_context":[{"change":13,"pos":1792}],"down_context":[{"change":13,"pos":1829}],"flag":"","start":3825,"end":3867,"inode":{"change":17,"pos":208900}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":13,"pos":1792},"to":{"change":13,"start":1792,"end":1829},"introduced_by":13}],"inode":{"change":17,"pos":208900}},"ins_contents":[{"Add":" ) -> Result<(), AddError> {"}],"del_contents":[{"Del":" ) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":168,"ins":{"up_context":[{"change":17,"pos":211282}],"down_context":[{"change":17,"pos":211425}],"flag":"","start":3868,"end":3917,"inode":{"change":17,"pos":208900}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":211282},"to":{"change":17,"start":211282,"end":211319},"introduced_by":17}],"inode":{"change":17,"pos":208900}},"ins_contents":[{"Add":" ) -> Result<(), Error> {"}],"del_contents":[{"Del":" ) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":193,"ins":{"up_context":[{"change":17,"pos":213953}],"down_context":[{"change":11,"pos":159}],"flag":"","start":3918,"end":4025,"inode":{"change":17,"pos":208900}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":213953},"to":{"change":17,"start":213953,"end":214029},"introduced_by":17}],"inode":{"change":17,"pos":208900}},"ins_contents":[{"Add":" type Error = std::io::Error;"},{"Add":" fn create_dir_all(&mut self, file: &str) -> Result<(), Self::Error> {"}],"del_contents":[{"Del":" fn create_dir_all(&mut self, file: &str) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":197,"ins":{"up_context":[{"change":17,"pos":214095}],"down_context":[{"change":11,"pos":215}],"flag":"","start":4026,"end":4106,"inode":{"change":17,"pos":208900}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":214095},"to":{"change":17,"start":214095,"end":214177},"introduced_by":17}],"inode":{"change":17,"pos":208900}},"ins_contents":[{"Add":" fn file_metadata(&self, file: &str) -> Result {"}],"del_contents":[{"Del":" fn file_metadata(&self, file: &str) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":203,"ins":{"up_context":[{"change":17,"pos":214426}],"down_context":[{"change":17,"pos":214515}],"flag":"","start":4107,"end":4194,"inode":{"change":17,"pos":208900}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":214426},"to":{"change":17,"start":214426,"end":214515},"introduced_by":17}],"inode":{"change":17,"pos":208900}},"ins_contents":[{"Add":" fn read_file(&self, file: &str, buffer: &mut Vec) -> Result<(), Self::Error> {"}],"del_contents":[{"Del":" fn read_file(&self, file: &str, buffer: &mut Vec) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":209,"ins":{"up_context":[{"change":17,"pos":214660}],"down_context":[{"change":11,"pos":334}],"flag":"","start":4195,"end":4283,"inode":{"change":17,"pos":208900}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":214660},"to":{"change":17,"start":214660,"end":214750},"introduced_by":17}],"inode":{"change":17,"pos":208900}},"ins_contents":[{"Add":" fn modified_time(&self, file: &str) -> Result {"}],"del_contents":[{"Del":" fn modified_time(&self, file: &str) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":214,"ins":{"up_context":[{"change":17,"pos":214848}],"down_context":[{"change":11,"pos":392}],"flag":"","start":4284,"end":4355,"inode":{"change":17,"pos":208900}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":214848},"to":{"change":17,"start":214848,"end":214921},"introduced_by":17}],"inode":{"change":17,"pos":208900}},"ins_contents":[{"Add":" fn remove_path(&mut self, path: &str) -> Result<(), Self::Error> {"}],"del_contents":[{"Del":" fn remove_path(&mut self, path: &str) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":227,"ins":{"up_context":[{"change":17,"pos":215297}],"down_context":[{"change":11,"pos":429}],"flag":"","start":4356,"end":4435,"inode":{"change":17,"pos":208900}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":215297},"to":{"change":17,"start":215297,"end":215378},"introduced_by":17}],"inode":{"change":17,"pos":208900}},"ins_contents":[{"Add":" fn rename(&mut self, former: &str, new: &str) -> Result<(), Self::Error> {"}],"del_contents":[{"Del":" fn rename(&mut self, former: &str, new: &str) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":239,"ins":{"up_context":[{"change":17,"pos":215737}],"down_context":[{"change":17,"pos":215832}],"flag":"","start":4436,"end":4529,"inode":{"change":17,"pos":208900}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":215737},"to":{"change":17,"start":215737,"end":215832},"introduced_by":17}],"inode":{"change":17,"pos":208900}},"ins_contents":[{"Add":" fn set_permissions(&mut self, name: &str, permissions: u16) -> Result<(), Self::Error> {"}],"del_contents":[{"Del":" fn set_permissions(&mut self, name: &str, permissions: u16) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":254,"ins":{"up_context":[{"change":17,"pos":216332}],"down_context":[{"change":17,"pos":216429}],"flag":"","start":4530,"end":4625,"inode":{"change":17,"pos":208900}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":216332},"to":{"change":17,"start":216332,"end":216429},"introduced_by":17}],"inode":{"change":17,"pos":208900}},"ins_contents":[{"Add":" fn set_permissions(&mut self, _name: &str, _permissions: u16) -> Result<(), Self::Error> {"}],"del_contents":[{"Del":" fn set_permissions(&mut self, _name: &str, _permissions: u16) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":257,"ins":{"up_context":[{"change":17,"pos":216450}],"down_context":[{"change":17,"pos":216536}],"flag":"","start":4626,"end":4722,"inode":{"change":17,"pos":208900}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":216450},"to":{"change":17,"start":216450,"end":216536},"introduced_by":17}],"inode":{"change":17,"pos":208900}},"ins_contents":[{"Add":" fn write_file Result>("}],"del_contents":[{"Del":" fn write_file Result>(\n"}]}},{"Replacement":{"inode":{"change":17,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":261,"ins":{"up_context":[{"change":17,"pos":216594}],"down_context":[{"change":11,"pos":541}],"flag":"","start":4723,"end":4759,"inode":{"change":17,"pos":208900}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":216594},"to":{"change":17,"start":216594,"end":216630},"introduced_by":17}],"inode":{"change":17,"pos":208900}},"ins_contents":[{"Add":" ) -> Result> {"}],"del_contents":[{"Del":" ) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":264,"ins":{"up_context":[{"change":17,"pos":216712}],"down_context":[{"change":17,"pos":216752}],"flag":"","start":4760,"end":4824,"inode":{"change":17,"pos":208900}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":216712},"to":{"change":17,"start":216712,"end":216752},"introduced_by":17}],"inode":{"change":17,"pos":208900}},"ins_contents":[{"Add":" std::fs::create_dir_all(p).map_err(WriteError::Io)?"}],"del_contents":[{"Del":" std::fs::create_dir_all(p)?\n"}]}},{"Replacement":{"inode":{"change":17,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":267,"ins":{"up_context":[{"change":17,"pos":216813}],"down_context":[{"change":17,"pos":216918}],"flag":"","start":4825,"end":4989,"inode":{"change":17,"pos":208900}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":216813},"to":{"change":17,"start":216813,"end":216918},"introduced_by":17}],"inode":{"change":17,"pos":208900}},"ins_contents":[{"Add":" let mut file ="},{"Add":" std::io::BufWriter::new(std::fs::File::create(&path).map_err(WriteError::Io)?);"},{"Add":" writer(&mut file).map_err(WriteError::E)"}],"del_contents":[{"Del":" let mut file = std::io::BufWriter::new(std::fs::File::create(&path)?);\n writer(&mut file)\n"}]}},{"Replacement":{"inode":{"change":17,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":15,"ins":{"up_context":[{"change":17,"pos":217771}],"down_context":[{"change":17,"pos":217952}],"flag":"","start":4990,"end":5172,"inode":{"change":17,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":217771},"to":{"change":17,"start":217771,"end":217952},"introduced_by":17}],"inode":{"change":17,"pos":217202}},"ins_contents":[{"Add":" fn output_line(&mut self, key: Vertex, contents: F) -> Result<(), E>"},{"Add":" where"},{"Add":" E: From,"},{"Add":" F: FnOnce(&mut Vec) -> Result<(), E>;"}],"del_contents":[{"Del":" fn output_line) -> Result<(), anyhow::Error>>(\n &mut self,\n key: Vertex,\n contents: F,\n ) -> Result<(), anyhow::Error>;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":20,"ins":{"up_context":[{"change":17,"pos":217953}],"down_context":[{"change":17,"pos":218097}],"flag":"","start":5173,"end":5319,"inode":{"change":17,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":217953},"to":{"change":17,"start":217953,"end":218097},"introduced_by":17}],"inode":{"change":17,"pos":217202}},"ins_contents":[{"Add":" fn output_conflict_marker(&mut self, s: &str) -> Result<(), std::io::Error>;"},{"Add":" fn begin_conflict(&mut self) -> Result<(), std::io::Error> {"}],"del_contents":[{"Del":" fn output_conflict_marker(&mut self, s: &str) -> Result<(), anyhow::Error>;\n fn begin_conflict(&mut self) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":24,"ins":{"up_context":[{"change":17,"pos":218153}],"down_context":[{"change":17,"pos":218224}],"flag":"","start":5320,"end":5392,"inode":{"change":17,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":218153},"to":{"change":17,"start":218153,"end":218224},"introduced_by":17}],"inode":{"change":17,"pos":217202}},"ins_contents":[{"Add":" fn begin_zombie_conflict(&mut self) -> Result<(), std::io::Error> {"}],"del_contents":[{"Del":" fn begin_zombie_conflict(&mut self) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":27,"ins":{"up_context":[{"change":17,"pos":218260}],"down_context":[{"change":17,"pos":218331}],"flag":"","start":5393,"end":5465,"inode":{"change":17,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":218260},"to":{"change":17,"start":218260,"end":218331},"introduced_by":17}],"inode":{"change":17,"pos":217202}},"ins_contents":[{"Add":" fn begin_cyclic_conflict(&mut self) -> Result<(), std::io::Error> {"}],"del_contents":[{"Del":" fn begin_cyclic_conflict(&mut self) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":30,"ins":{"up_context":[{"change":17,"pos":218367}],"down_context":[{"change":17,"pos":218430}],"flag":"","start":5466,"end":5530,"inode":{"change":17,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":218367},"to":{"change":17,"start":218367,"end":218430},"introduced_by":17}],"inode":{"change":17,"pos":217202}},"ins_contents":[{"Add":" fn conflict_next(&mut self) -> Result<(), std::io::Error> {"}],"del_contents":[{"Del":" fn conflict_next(&mut self) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":33,"ins":{"up_context":[{"change":17,"pos":218483}],"down_context":[{"change":17,"pos":218545}],"flag":"","start":5531,"end":5594,"inode":{"change":17,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":218483},"to":{"change":17,"start":218483,"end":218545},"introduced_by":17}],"inode":{"change":17,"pos":217202}},"ins_contents":[{"Add":" fn end_conflict(&mut self) -> Result<(), std::io::Error> {"}],"del_contents":[{"Del":" fn end_conflict(&mut self) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":36,"ins":{"up_context":[{"change":17,"pos":218599}],"down_context":[{"change":17,"pos":218668}],"flag":"","start":5595,"end":5665,"inode":{"change":17,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":218599},"to":{"change":17,"start":218599,"end":218668},"introduced_by":17}],"inode":{"change":17,"pos":217202}},"ins_contents":[{"Add":" fn end_zombie_conflict(&mut self) -> Result<(), std::io::Error> {"}],"del_contents":[{"Del":" fn end_zombie_conflict(&mut self) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":39,"ins":{"up_context":[{"change":17,"pos":218722}],"down_context":[{"change":17,"pos":218791}],"flag":"","start":5666,"end":5736,"inode":{"change":17,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":218722},"to":{"change":17,"start":218722,"end":218791},"introduced_by":17}],"inode":{"change":17,"pos":217202}},"ins_contents":[{"Add":" fn end_cyclic_conflict(&mut self) -> Result<(), std::io::Error> {"}],"del_contents":[{"Del":" fn end_cyclic_conflict(&mut self) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":80,"ins":{"up_context":[{"change":17,"pos":219820}],"down_context":[{"change":17,"pos":219993}],"flag":"","start":5737,"end":5916,"inode":{"change":17,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":219820},"to":{"change":17,"start":219820,"end":219993},"introduced_by":17}],"inode":{"change":17,"pos":217202}},"ins_contents":[{"Add":" fn output_line(&mut self, _: Vertex, c: C) -> Result<(), E>"},{"Add":" where"},{"Add":" E: From,"},{"Add":" C: FnOnce(&mut Vec) -> Result<(), E>,"},{"Add":" {"}],"del_contents":[{"Del":" fn output_line) -> Result<(), anyhow::Error>>(\n &mut self,\n _: Vertex,\n c: C,\n ) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":98,"ins":{"up_context":[{"change":17,"pos":220451}],"down_context":[{"change":17,"pos":220532}],"flag":"","start":5917,"end":5999,"inode":{"change":17,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":220451},"to":{"change":17,"start":220451,"end":220532},"introduced_by":17}],"inode":{"change":17,"pos":217202}},"ins_contents":[{"Add":" fn output_conflict_marker(&mut self, s: &str) -> Result<(), std::io::Error> {"}],"del_contents":[{"Del":" fn output_conflict_marker(&mut self, s: &str) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":112,"ins":{"up_context":[{"change":17,"pos":220895}],"down_context":[{"change":17,"pos":220959}],"flag":"","start":6000,"end":6065,"inode":{"change":17,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":220895},"to":{"change":17,"start":220895,"end":220959},"introduced_by":17}],"inode":{"change":17,"pos":217202}},"ins_contents":[{"Add":" fn begin_conflict(&mut self) -> Result<(), std::io::Error> {"}],"del_contents":[{"Del":" fn begin_conflict(&mut self) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":119,"ins":{"up_context":[{"change":17,"pos":221159}],"down_context":[{"change":17,"pos":221230}],"flag":"","start":6066,"end":6138,"inode":{"change":17,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":221159},"to":{"change":17,"start":221159,"end":221230},"introduced_by":17}],"inode":{"change":17,"pos":217202}},"ins_contents":[{"Add":" fn begin_zombie_conflict(&mut self) -> Result<(), std::io::Error> {"}],"del_contents":[{"Del":" fn begin_zombie_conflict(&mut self) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":126,"ins":{"up_context":[{"change":17,"pos":221431}],"down_context":[{"change":17,"pos":221502}],"flag":"","start":6139,"end":6211,"inode":{"change":17,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":221431},"to":{"change":17,"start":221431,"end":221502},"introduced_by":17}],"inode":{"change":17,"pos":217202}},"ins_contents":[{"Add":" fn begin_cyclic_conflict(&mut self) -> Result<(), std::io::Error> {"}],"del_contents":[{"Del":" fn begin_cyclic_conflict(&mut self) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":168,"ins":{"up_context":[{"change":17,"pos":222360}],"down_context":[{"change":17,"pos":222533}],"flag":"","start":6212,"end":6391,"inode":{"change":17,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":222360},"to":{"change":17,"start":222360,"end":222533},"introduced_by":17}],"inode":{"change":17,"pos":217202}},"ins_contents":[{"Add":" fn output_line(&mut self, _: Vertex, c: C) -> Result<(), E>"},{"Add":" where"},{"Add":" E: From,"},{"Add":" C: FnOnce(&mut Vec) -> Result<(), E>,"},{"Add":" {"}],"del_contents":[{"Del":" fn output_line) -> Result<(), anyhow::Error>>(\n &mut self,\n _: Vertex,\n c: C,\n ) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":185,"ins":{"up_context":[{"change":17,"pos":222923}],"down_context":[{"change":17,"pos":223004}],"flag":"","start":6392,"end":6474,"inode":{"change":17,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":222923},"to":{"change":17,"start":222923,"end":223004},"introduced_by":17}],"inode":{"change":17,"pos":217202}},"ins_contents":[{"Add":" fn output_conflict_marker(&mut self, s: &str) -> Result<(), std::io::Error> {"}],"del_contents":[{"Del":" fn output_conflict_marker(&mut self, s: &str) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":196,"ins":{"up_context":[{"change":17,"pos":223279}],"down_context":[{"change":17,"pos":223343}],"flag":"","start":6475,"end":6540,"inode":{"change":17,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":223279},"to":{"change":17,"start":223279,"end":223343},"introduced_by":17}],"inode":{"change":17,"pos":217202}},"ins_contents":[{"Add":" fn begin_conflict(&mut self) -> Result<(), std::io::Error> {"}],"del_contents":[{"Del":" fn begin_conflict(&mut self) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":199,"ins":{"up_context":[{"change":17,"pos":223399}],"down_context":[{"change":17,"pos":223470}],"flag":"","start":6541,"end":6613,"inode":{"change":17,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":223399},"to":{"change":17,"start":223399,"end":223470},"introduced_by":17}],"inode":{"change":17,"pos":217202}},"ins_contents":[{"Add":" fn begin_zombie_conflict(&mut self) -> Result<(), std::io::Error> {"}],"del_contents":[{"Del":" fn begin_zombie_conflict(&mut self) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":202,"ins":{"up_context":[{"change":17,"pos":223526}],"down_context":[{"change":17,"pos":223597}],"flag":"","start":6614,"end":6686,"inode":{"change":17,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":223526},"to":{"change":17,"start":223526,"end":223597},"introduced_by":17}],"inode":{"change":17,"pos":217202}},"ins_contents":[{"Add":" fn begin_cyclic_conflict(&mut self) -> Result<(), std::io::Error> {"}],"del_contents":[{"Del":" fn begin_cyclic_conflict(&mut self) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":10,"ins":{"up_context":[{"change":17,"pos":226275}],"down_context":[{"change":17,"pos":226308}],"flag":"","start":6687,"end":6715,"inode":{"change":17,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":226275},"to":{"change":17,"start":226275,"end":226308},"introduced_by":17}],"inode":{"change":17,"pos":225940}},"ins_contents":[{"Add":") -> Result<(), T::Error> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":29,"ins":{"up_context":[{"change":17,"pos":226907}],"down_context":[{"change":17,"pos":226940}],"flag":"","start":6716,"end":6776,"inode":{"change":17,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":226907},"to":{"change":17,"start":226907,"end":226940},"introduced_by":17}],"inode":{"change":17,"pos":225940}},"ins_contents":[{"Add":") -> Result<(), super::UnrecordError> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":47,"ins":{"up_context":[{"change":17,"pos":227588}],"down_context":[{"change":17,"pos":227621}],"flag":"","start":6777,"end":6837,"inode":{"change":17,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":227588},"to":{"change":17,"start":227588,"end":227621},"introduced_by":17}],"inode":{"change":17,"pos":225940}},"ins_contents":[{"Add":") -> Result<(), super::UnrecordError> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":67,"ins":{"up_context":[{"change":17,"pos":228382}],"down_context":[{"change":17,"pos":228471}],"flag":"","start":6838,"end":6928,"inode":{"change":17,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":228382},"to":{"change":17,"start":228382,"end":228471},"introduced_by":17}],"inode":{"change":17,"pos":225940}},"ins_contents":[{"Add":" return_value = Some(restore_inode(txn, changes, source, dest, Inode::ROOT)?);"}],"del_contents":[{"Del":" return_value = Some(restore_inode(txn, changes, source, dest, Inode::ROOT)?)\n"}]}},{"Replacement":{"inode":{"change":17,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":69,"ins":{"up_context":[{"change":17,"pos":228548}],"down_context":[{"change":17,"pos":228631}],"flag":"","start":6929,"end":7013,"inode":{"change":17,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":228548},"to":{"change":17,"start":228548,"end":228631},"introduced_by":17}],"inode":{"change":17,"pos":225940}},"ins_contents":[{"Add":" return_value = Some(restore_inode(txn, changes, source, dest, inode)?);"}],"del_contents":[{"Del":" return_value = Some(restore_inode(txn, changes, source, dest, inode)?)\n"}]}},{"Replacement":{"inode":{"change":17,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":85,"ins":{"up_context":[{"change":17,"pos":229088}],"down_context":[{"change":17,"pos":229174}],"flag":"","start":7014,"end":7077,"inode":{"change":17,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":229088},"to":{"change":17,"start":229088,"end":229124},"introduced_by":17}],"inode":{"change":17,"pos":225940}},"ins_contents":[{"Add":") -> Result> {"}],"del_contents":[{"Del":") -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":87,"ins":{"up_context":[{"change":17,"pos":229205}],"down_context":[{"change":17,"pos":229297}],"flag":"","start":7078,"end":7231,"inode":{"change":17,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":229205},"to":{"change":17,"start":229205,"end":229297},"introduced_by":17}],"inode":{"change":17,"pos":225940}},"ins_contents":[{"Add":" let (_, basename) = changes"},{"Add":" .get_file_name(|h| txn.get_external(h), source, &mut name)"},{"Add":" .map_err(super::UnrecordError::Changestore)?;"}],"del_contents":[{"Del":" let (_, basename) = changes.get_file_name(|h| txn.get_external(h), source, &mut name)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":99,"ins":{"up_context":[{"change":17,"pos":152}],"down_context":[{"change":17,"pos":338}],"flag":"","start":7232,"end":7412,"inode":{"change":17,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":152},"to":{"change":17,"start":405,"end":467},"introduced_by":17},{"previous":"","flag":"DELETED","from":{"change":17,"pos":467},"to":{"change":17,"start":1571,"end":1619},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":259},"to":{"change":17,"start":1571,"end":1619},"introduced_by":17}],"inode":{"change":17,"pos":225940}},"ins_contents":[{"Add":" put_tree_with_rev(txn, file_id.as_file_id(), inode).map_err(super::UnrecordError::Txn)?;"},{"Add":" put_inodes_with_rev(txn, inode, dest).map_err(super::UnrecordError::Txn)?;"}],"del_contents":[{"Del":" put_tree_with_rev(txn, file_id.as_file_id(), inode)?;\n"},{"Del":" put_inodes_with_rev(txn, inode, dest)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":109,"ins":{"up_context":[{"change":17,"pos":229781}],"down_context":[{"change":17,"pos":229827}],"flag":"","start":7413,"end":7457,"inode":{"change":17,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":229781},"to":{"change":17,"start":229781,"end":229827},"introduced_by":17}],"inode":{"change":17,"pos":225940}},"ins_contents":[{"Add":") -> Result, BlockError> {"}],"del_contents":[{"Del":") -> Result, crate::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":140,"ins":{"up_context":[{"change":17,"pos":230739}],"down_context":[{"change":17,"pos":230836}],"flag":"","start":7458,"end":7516,"inode":{"change":17,"pos":225940}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":17,"pos":366},"to":{"change":17,"start":230794,"end":230836},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":230794},"to":{"change":17,"start":230794,"end":230836},"introduced_by":17}],"inode":{"change":17,"pos":225940}},"ins_contents":[{"Add":"pub fn undo_file_reinsertion("}],"del_contents":[{"Del":"pub fn undo_file_reinsertion(\n"}]}},{"Replacement":{"inode":{"change":17,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":144,"ins":{"up_context":[{"change":17,"pos":230916}],"down_context":[{"change":17,"pos":230949}],"flag":"","start":7517,"end":7577,"inode":{"change":17,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":230916},"to":{"change":17,"start":230916,"end":230949},"introduced_by":17}],"inode":{"change":17,"pos":225940}},"ins_contents":[{"Add":") -> Result<(), super::UnrecordError> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":150,"ins":{"up_context":[{"change":17,"pos":231296}],"down_context":[{"change":17,"pos":231440}],"flag":"","start":7578,"end":7673,"inode":{"change":17,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":231296},"to":{"change":17,"start":468,"end":528},"introduced_by":17}],"inode":{"change":17,"pos":225940}},"ins_contents":[{"Add":" del_inodes_with_rev(txn, inode, position).map_err(super::UnrecordError::Txn)?;"}],"del_contents":[{"Del":" del_inodes_with_rev(txn, inode, position)?;\n"}]}},{"Edit":{"inode":{"change":17,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":1,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":231493},"to":{"change":17,"start":231494,"end":231549},"introduced_by":17}],"inode":{"change":17,"pos":231493}}},"contents":[{"Del":"// org id IuiCX9taX7EZv/Aqz/UZc5r7v/fH7MJn3/QIj46oHwc=\n"}]}},{"Edit":{"inode":{"change":17,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":6,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":231671},"to":{"change":17,"start":231671,"end":231689},"introduced_by":17}],"inode":{"change":17,"pos":231493}}},"contents":[{"Del":"use crate::Error;\n"}]}},{"Edit":{"inode":{"change":17,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":11,"atom":{"NewVertex":{"up_context":[{"change":17,"pos":231752}],"down_context":[{"change":17,"pos":231752}],"flag":"","start":7674,"end":8614,"inode":{"change":17,"pos":231493}}},"contents":[{"Add":"#[derive(Debug, Error)]"},{"Add":"pub enum UnrecordError<"},{"Add":" ChangestoreError: std::error::Error + 'static,"},{"Add":" TxnError: std::error::Error + 'static,"},{"Add":"> {"},{"Add":" #[error(\"Changestore error: {0}\")]"},{"Add":" Changestore(ChangestoreError),"},{"Add":" #[error(transparent)]"},{"Add":" Txn(TxnError),"},{"Add":" #[error(transparent)]"},{"Add":" Block(#[from] crate::pristine::BlockError),"},{"Add":" #[error(transparent)]"},{"Add":" InconsistentChange(#[from] crate::pristine::InconsistentChange),"},{"Add":" #[error(\"Change not in channel: {}\", hash.to_base32())]"},{"Add":" ChangeNotInChannel { hash: ChangeId },"},{"Add":" #[error(\"Change not in channel: {}\", change_id.to_base32())]"},{"Add":" ChangeIsDependedUpon { change_id: ChangeId },"},{"Add":" #[error(transparent)]"},{"Add":" Missing(#[from] crate::missing_context::MissingError),"},{"Add":" #[error(transparent)]"},{"Add":" LocalApply(#[from] crate::apply::LocalApplyError),"},{"Add":" #[error(transparent)]"},{"Add":" Apply(#[from] crate::apply::ApplyError),"},{"Add":"}"},{"Add":""}]}},{"Replacement":{"inode":{"change":17,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":41,"ins":{"up_context":[{"change":17,"pos":231881}],"down_context":[{"change":17,"pos":231960}],"flag":"","start":8615,"end":8768,"inode":{"change":17,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":231881},"to":{"change":17,"start":231881,"end":231960},"introduced_by":17}],"inode":{"change":17,"pos":231493}},"ins_contents":[{"Add":") -> Result> {"},{"Add":" let change = changes"},{"Add":" .get_change(hash)"},{"Add":" .map_err(UnrecordError::Changestore)?;"}],"del_contents":[{"Del":") -> Result {\n let change = changes.get_change(hash)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":53,"ins":{"up_context":[{"change":17,"pos":232195}],"down_context":[{"change":17,"pos":232251}],"flag":"","start":8769,"end":8833,"inode":{"change":17,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":232195},"to":{"change":17,"start":232195,"end":232251},"introduced_by":17}],"inode":{"change":17,"pos":231493}},"ins_contents":[{"Add":" del_channel_changes::(txn, &mut channel, change_id)?;"}],"del_contents":[{"Del":" del_channel_changes(txn, &mut channel, change_id)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":59,"ins":{"up_context":[{"change":17,"pos":232391}],"down_context":[{"change":17,"pos":232522}],"flag":"","start":8834,"end":9062,"inode":{"change":17,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":232391},"to":{"change":17,"start":232391,"end":232522},"introduced_by":17}],"inode":{"change":17,"pos":231493}},"ins_contents":[{"Add":" while txn.del_dep(change_id, None).map_err(UnrecordError::Txn)? {}"},{"Add":" txn.del_external(change_id, None)"},{"Add":" .map_err(UnrecordError::Txn)?;"},{"Add":" txn.del_internal(*hash, None).map_err(UnrecordError::Txn)?;"}],"del_contents":[{"Del":" while txn.del_dep(change_id, None)? {}\n txn.del_external(change_id, None)?;\n txn.del_internal(*hash, None)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":65,"ins":{"up_context":[{"change":17,"pos":232625}],"down_context":[{"change":17,"pos":232676}],"flag":"","start":9063,"end":9159,"inode":{"change":17,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":232625},"to":{"change":17,"start":232625,"end":232676},"introduced_by":17}],"inode":{"change":17,"pos":231493}},"ins_contents":[{"Add":" txn.del_revdep(dep, Some(change_id))"},{"Add":" .map_err(UnrecordError::Txn)?;"}],"del_contents":[{"Del":" txn.del_revdep(dep, Some(change_id))?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":73,"ins":{"up_context":[{"change":17,"pos":232742}],"down_context":[{"change":17,"pos":232833}],"flag":"","start":9160,"end":9213,"inode":{"change":17,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":232742},"to":{"change":17,"start":232742,"end":232833},"introduced_by":17}],"inode":{"change":17,"pos":231493}},"ins_contents":[{"Add":""},{"Add":"fn del_channel_changes("}],"del_contents":[{"Del":"// org id 4kyMdTywL4dWm7Vw3kXLcabNNGbFzSP3FTUptNMLPwg=\nfn del_channel_changes(\n"}]}},{"Replacement":{"inode":{"change":17,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":78,"ins":{"up_context":[{"change":17,"pos":232905}],"down_context":[{"change":17,"pos":232938}],"flag":"","start":9214,"end":9267,"inode":{"change":17,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":232905},"to":{"change":17,"start":232905,"end":232938},"introduced_by":17}],"inode":{"change":17,"pos":231493}},"ins_contents":[{"Add":") -> Result<(), UnrecordError> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":82,"ins":{"up_context":[{"change":17,"pos":233055}],"down_context":[{"change":17,"pos":233125}],"flag":"","start":9268,"end":9343,"inode":{"change":17,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":233055},"to":{"change":17,"start":233055,"end":233125},"introduced_by":17}],"inode":{"change":17,"pos":231493}},"ins_contents":[{"Add":" return Err(UnrecordError::ChangeNotInChannel { hash: change_id });"}],"del_contents":[{"Del":" return Err((Error::ChangeNotOnChannel { change_id }).into());\n"}]}},{"Replacement":{"inode":{"change":17,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":92,"ins":{"up_context":[{"change":17,"pos":233360}],"down_context":[{"change":17,"pos":233436}],"flag":"","start":9344,"end":9419,"inode":{"change":17,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":233360},"to":{"change":17,"start":233360,"end":233436},"introduced_by":17}],"inode":{"change":17,"pos":231493}},"ins_contents":[{"Add":" return Err(UnrecordError::ChangeIsDependedUpon { change_id });"}],"del_contents":[{"Del":" return Err((Error::ChangeIsDependedUpon { change_id }).into());\n"}]}},{"Replacement":{"inode":{"change":17,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":96,"ins":{"up_context":[{"change":17,"pos":233453}],"down_context":[{"change":17,"pos":233506}],"flag":"","start":9420,"end":9510,"inode":{"change":17,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":233453},"to":{"change":17,"start":233453,"end":233506},"introduced_by":17}],"inode":{"change":17,"pos":231493}},"ins_contents":[{"Add":" txn.del_changes(channel, change_id, timestamp)"},{"Add":" .map_err(UnrecordError::Txn)?;"}],"del_contents":[{"Del":" txn.del_changes(channel, change_id, timestamp)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":100,"ins":{"up_context":[{"change":17,"pos":233519}],"down_context":[{"change":17,"pos":233574}],"flag":"","start":9511,"end":9512,"inode":{"change":17,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":233519},"to":{"change":17,"start":233519,"end":233574},"introduced_by":17}],"inode":{"change":17,"pos":231493}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":"// org id F70s1W/0AmTkJZfg47g3+OXxINmwCgXU7G5j5QZkvh8=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":115,"ins":{"up_context":[{"change":17,"pos":233982}],"down_context":[{"change":17,"pos":234037}],"flag":"","start":9513,"end":9514,"inode":{"change":17,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":233982},"to":{"change":17,"start":233982,"end":234037},"introduced_by":17}],"inode":{"change":17,"pos":231493}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":"// org id UmzPcrZozUPTljK9LrlZa2FIXJwwvHpPmfRQ9uV4qTs=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":122,"ins":{"up_context":[{"change":17,"pos":234187}],"down_context":[{"change":17,"pos":234220}],"flag":"","start":9515,"end":9568,"inode":{"change":17,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":234187},"to":{"change":17,"start":234187,"end":234220},"introduced_by":17}],"inode":{"change":17,"pos":231493}},"ins_contents":[{"Add":") -> Result<(), UnrecordError> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":136,"ins":{"up_context":[{"change":17,"pos":7506}],"down_context":[{"change":17,"pos":234862}],"flag":"","start":9569,"end":9642,"inode":{"change":17,"pos":231493}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":17,"pos":7506},"to":{"change":17,"start":234838,"end":234862},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":234838},"to":{"change":17,"start":234838,"end":234862},"introduced_by":17}],"inode":{"change":17,"pos":231493}},"ins_contents":[{"Add":" )"},{"Add":" .map_err(UnrecordError::Txn)?;"}],"del_contents":[{"Del":" )?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":139,"ins":{"up_context":[{"change":17,"pos":234880}],"down_context":[{"change":17,"pos":234960}],"flag":"","start":9643,"end":9731,"inode":{"change":17,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":234880},"to":{"change":17,"start":234880,"end":234960},"introduced_by":17}],"inode":{"change":17,"pos":231493}},"ins_contents":[{"Add":" unapply_newvertex::(txn, channel, change_id, &mut ws, newvertex)?"}],"del_contents":[{"Del":" unapply_newvertex(txn, channel, change_id, &mut ws, newvertex)?\n"}]}},{"Replacement":{"inode":{"change":17,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":143,"ins":{"up_context":[{"change":17,"pos":234990}],"down_context":[{"change":17,"pos":235104}],"flag":"","start":9732,"end":9795,"inode":{"change":17,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":234990},"to":{"change":17,"start":234990,"end":235104},"introduced_by":17}],"inode":{"change":17,"pos":231493}},"ins_contents":[{"Add":" repair_newvertex_contexts::(txn, channel, &mut ws)?;"}],"del_contents":[{"Del":" repair_newvertex_contexts(txn, channel, &mut ws)?;\n // org id zX78t6A+99OopoXmY9luuPGgXMHwzPEPT8sYitaxNyc=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":146,"ins":{"up_context":[{"change":17,"pos":2017}],"down_context":[{"change":17,"pos":2074}],"flag":"","start":9796,"end":9861,"inode":{"change":17,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":2017},"to":{"change":17,"start":2017,"end":2074},"introduced_by":17}],"inode":{"change":17,"pos":231493}},"ins_contents":[{"Add":" remove_zombies::(txn, channel, change_id, n)?;"}],"del_contents":[{"Del":" remove_zombies(txn, channel, change_id, n)?;\n"}]}},{"Edit":{"inode":{"change":17,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":162,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":235718},"to":{"change":17,"start":235718,"end":235773},"introduced_by":17}],"inode":{"change":17,"pos":231493}}},"contents":[{"Del":"// org id ysIZl8M4RTRZyISrNO1VOKOsKxkQsZFux9RvLLl192Y=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":181,"ins":{"up_context":[{"change":17,"pos":236205}],"down_context":[{"change":17,"pos":236239}],"flag":"","start":9862,"end":9912,"inode":{"change":17,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":236205},"to":{"change":17,"start":236205,"end":236239},"introduced_by":17}],"inode":{"change":17,"pos":231493}},"ins_contents":[{"Add":"fn unapply_newvertex("}],"del_contents":[{"Del":"fn unapply_newvertex(\n"}]}},{"Replacement":{"inode":{"change":17,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":187,"ins":{"up_context":[{"change":17,"pos":236377}],"down_context":[{"change":17,"pos":236410}],"flag":"","start":9913,"end":9966,"inode":{"change":17,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":236377},"to":{"change":17,"start":236377,"end":236410},"introduced_by":17}],"inode":{"change":17,"pos":231493}},"ins_contents":[{"Add":") -> Result<(), UnrecordError> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":246,"ins":{"up_context":[{"change":17,"pos":8203}],"down_context":[{"change":17,"pos":238504}],"flag":"","start":9967,"end":10024,"inode":{"change":17,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":8203},"to":{"change":17,"start":8203,"end":8219},"introduced_by":17}],"inode":{"change":17,"pos":231493}},"ins_contents":[{"Add":" )"},{"Add":" .map_err(UnrecordError::Txn)?;"}],"del_contents":[{"Del":" )?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":258,"ins":{"up_context":[{"change":17,"pos":238829}],"down_context":[{"change":17,"pos":238914}],"flag":"","start":10025,"end":10124,"inode":{"change":17,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":238829},"to":{"change":17,"start":2496,"end":2567},"introduced_by":17}],"inode":{"change":17,"pos":231493}},"ins_contents":[{"Add":" working_copy::undo_file_addition(txn, change_id, new_vertex).map_err(UnrecordError::Txn)?;"}],"del_contents":[{"Del":" working_copy::undo_file_addition(txn, change_id, new_vertex)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":263,"ins":{"up_context":[{"change":17,"pos":238934}],"down_context":[{"change":17,"pos":238976}],"flag":"","start":10125,"end":10183,"inode":{"change":17,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":238934},"to":{"change":17,"start":238934,"end":238976},"introduced_by":17}],"inode":{"change":17,"pos":231493}},"ins_contents":[{"Add":"fn repair_newvertex_contexts("}],"del_contents":[{"Del":"fn repair_newvertex_contexts(\n"}]}},{"Replacement":{"inode":{"change":17,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":267,"ins":{"up_context":[{"change":17,"pos":239047}],"down_context":[{"change":17,"pos":239080}],"flag":"","start":10184,"end":10237,"inode":{"change":17,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":239047},"to":{"change":17,"start":239047,"end":239080},"introduced_by":17}],"inode":{"change":17,"pos":231493}},"ins_contents":[{"Add":") -> Result<(), UnrecordError> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":312,"ins":{"up_context":[{"change":17,"pos":240305}],"down_context":[{"change":17,"pos":240360}],"flag":"","start":10238,"end":10239,"inode":{"change":17,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":240305},"to":{"change":17,"start":240305,"end":240360},"introduced_by":17}],"inode":{"change":17,"pos":231493}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":"// org id TtkPh63N/jM5q98a/9yDp97cHPAUzouetXVib5fpVnY=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":320,"ins":{"up_context":[{"change":17,"pos":240557}],"down_context":[{"change":17,"pos":240590}],"flag":"","start":10240,"end":10293,"inode":{"change":17,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":240557},"to":{"change":17,"start":240557,"end":240590},"introduced_by":17}],"inode":{"change":17,"pos":231493}},"ins_contents":[{"Add":") -> Result<(), UnrecordError> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":357,"ins":{"up_context":[{"change":17,"pos":241870}],"down_context":[{"change":17,"pos":241945}],"flag":"","start":10294,"end":10377,"inode":{"change":17,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":241870},"to":{"change":17,"start":241870,"end":241945},"introduced_by":17}],"inode":{"change":17,"pos":231493}},"ins_contents":[{"Add":" working_copy::undo_file_reinsertion::(txn, change_id, newedges)?"}],"del_contents":[{"Del":" working_copy::undo_file_reinsertion(txn, change_id, newedges)?\n"}]}},{"Replacement":{"inode":{"change":17,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":371,"ins":{"up_context":[{"change":17,"pos":242168}],"down_context":[{"change":17,"pos":242203}],"flag":"","start":10378,"end":10444,"inode":{"change":17,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":242168},"to":{"change":17,"start":242168,"end":242203},"introduced_by":17}],"inode":{"change":17,"pos":231493}},"ins_contents":[{"Add":") -> Result> {"}],"del_contents":[{"Del":") -> Result {\n"}]}},{"Edit":{"inode":{"change":17,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":395,"atom":{"NewVertex":{"up_context":[{"change":17,"pos":243261}],"down_context":[{"change":17,"pos":243261}],"flag":"","start":10445,"end":10501,"inode":{"change":17,"pos":231493}}},"contents":[{"Add":" .map_err(crate::apply::ApplyError::Changestore)"}]}},{"Replacement":{"inode":{"change":17,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":404,"ins":{"up_context":[{"change":17,"pos":243431}],"down_context":[{"change":17,"pos":243466}],"flag":"","start":10502,"end":10532,"inode":{"change":17,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":243431},"to":{"change":17,"start":243431,"end":243466},"introduced_by":17}],"inode":{"change":17,"pos":231493}},"ins_contents":[{"Add":") -> Result {"}],"del_contents":[{"Del":") -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":422,"ins":{"up_context":[{"change":17,"pos":243938}],"down_context":[{"change":17,"pos":243969}],"flag":"","start":10533,"end":10580,"inode":{"change":17,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":243938},"to":{"change":17,"start":243938,"end":243969},"introduced_by":17}],"inode":{"change":17,"pos":231493}},"ins_contents":[{"Add":"fn remove_zombies("}],"del_contents":[{"Del":"fn remove_zombies(\n"}]}},{"Replacement":{"inode":{"change":17,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":427,"ins":{"up_context":[{"change":17,"pos":244079}],"down_context":[{"change":17,"pos":244112}],"flag":"","start":10581,"end":10634,"inode":{"change":17,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":244079},"to":{"change":17,"start":244079,"end":244112},"introduced_by":17}],"inode":{"change":17,"pos":231493}},"ins_contents":[{"Add":") -> Result<(), UnrecordError> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":473,"ins":{"up_context":[{"change":17,"pos":9353}],"down_context":[{"change":17,"pos":9373}],"flag":"","start":10635,"end":10700,"inode":{"change":17,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":9353},"to":{"change":17,"start":9353,"end":9373},"introduced_by":17}],"inode":{"change":17,"pos":231493}},"ins_contents":[{"Add":" )"},{"Add":" .map_err(UnrecordError::Txn)?;"}],"del_contents":[{"Del":" )?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":490,"ins":{"up_context":[{"change":17,"pos":246511}],"down_context":[{"change":17,"pos":246584}],"flag":"","start":10701,"end":10828,"inode":{"change":17,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":246511},"to":{"change":17,"start":9726,"end":9800},"introduced_by":17}],"inode":{"change":17,"pos":231493}},"ins_contents":[{"Add":" put_graph_with_rev(txn, channel, f, u, v, u.change)"},{"Add":" .map_err(UnrecordError::Txn)?;"}],"del_contents":[{"Del":" put_graph_with_rev(txn, channel, f, u, v, u.change)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":495,"ins":{"up_context":[{"change":17,"pos":9860}],"down_context":[{"change":17,"pos":246762}],"flag":"","start":10829,"end":10960,"inode":{"change":17,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":9860},"to":{"change":17,"start":9860,"end":9942},"introduced_by":17}],"inode":{"change":17,"pos":231493}},"ins_contents":[{"Add":" del_graph_with_rev(txn, channel, e.flag, v, w, e.introduced_by)"},{"Add":" .map_err(UnrecordError::Txn)?;"}],"del_contents":[{"Del":" del_graph_with_rev(txn, channel, e.flag, v, w, e.introduced_by)?;\n"}]}},{"Edit":{"inode":{"change":17,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":503,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":246806},"to":{"change":17,"start":246806,"end":246861},"introduced_by":17}],"inode":{"change":17,"pos":231493}}},"contents":[{"Del":"// org id 4dFFHO4v8n5FooqRmC0cyb1+9EjtjPMqW7wdJCUIRsU=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":510,"ins":{"up_context":[{"change":17,"pos":247082}],"down_context":[{"change":17,"pos":247115}],"flag":"","start":10961,"end":11014,"inode":{"change":17,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":247082},"to":{"change":17,"start":247082,"end":247115},"introduced_by":17}],"inode":{"change":17,"pos":231493}},"ins_contents":[{"Add":") -> Result<(), UnrecordError> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Edit":{"inode":{"change":17,"pos":488880},"path":"libpijul/src/record.rs","line":5,"atom":{"NewVertex":{"up_context":[{"change":17,"pos":489024}],"down_context":[{"change":17,"pos":489024}],"flag":"","start":11015,"end":11032,"inode":{"change":17,"pos":488880}}},"contents":[{"Add":"use crate::diff;"}]}},{"Edit":{"inode":{"change":17,"pos":488880},"path":"libpijul/src/record.rs","line":11,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":489199},"to":{"change":17,"start":489199,"end":489225},"introduced_by":17}],"inode":{"change":17,"pos":488880}}},"contents":[{"Del":"use crate::{diff, Error};\n"}]}},{"Edit":{"inode":{"change":17,"pos":488880},"path":"libpijul/src/record.rs","line":12,"atom":{"NewVertex":{"up_context":[{"change":17,"pos":489267}],"down_context":[{"change":17,"pos":489267}],"flag":"","start":11033,"end":11630,"inode":{"change":17,"pos":488880}}},"contents":[{"Add":""},{"Add":"#[derive(Debug, Error)]"},{"Add":"pub enum RecordError<"},{"Add":" C: std::error::Error + 'static,"},{"Add":" W: std::error::Error,"},{"Add":" T: std::error::Error + 'static,"},{"Add":"> {"},{"Add":" #[error(\"Changestore error: {0}\")]"},{"Add":" Changestore(C),"},{"Add":" #[error(\"Working copy error: {0}\")]"},{"Add":" WorkingCopy(W),"},{"Add":" #[error(\"System time error: {0}\")]"},{"Add":" SystemTimeError(#[from] std::time::SystemTimeError),"},{"Add":" #[error(transparent)]"},{"Add":" Txn(T),"},{"Add":" #[error(transparent)]"},{"Add":" Diff(#[from] diff::DiffError),"},{"Add":" #[error(\"Path not in repository: {0}\")]"},{"Add":" PathNotInRepo(String),"},{"Add":" #[error(transparent)]"},{"Add":" Io(#[from] std::io::Error),"},{"Add":"}"}]}},{"Replacement":{"inode":{"change":17,"pos":488880},"path":"libpijul/src/record.rs","line":162,"ins":{"up_context":[{"change":17,"pos":492891}],"down_context":[{"change":17,"pos":492928}],"flag":"","start":11631,"end":11696,"inode":{"change":17,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":492891},"to":{"change":17,"start":492891,"end":492928},"introduced_by":17}],"inode":{"change":17,"pos":488880}},"ins_contents":[{"Add":" ) -> Result<(), RecordError> {"}],"del_contents":[{"Del":" ) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":488880},"path":"libpijul/src/record.rs","line":207,"ins":{"up_context":[{"change":17,"pos":495237}],"down_context":[{"change":17,"pos":495269}],"flag":"","start":11697,"end":11740,"inode":{"change":17,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":495237},"to":{"change":17,"start":495237,"end":495269},"introduced_by":17}],"inode":{"change":17,"pos":488880}},"ins_contents":[{"Add":" self.push_children::<_, _, C>("}],"del_contents":[{"Del":" self.push_children(\n"}]}},{"Replacement":{"inode":{"change":17,"pos":488880},"path":"libpijul/src/record.rs","line":225,"ins":{"up_context":[{"change":17,"pos":495726}],"down_context":[{"change":17,"pos":495795}],"flag":"","start":11741,"end":11805,"inode":{"change":17,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":495726},"to":{"change":17,"start":495726,"end":495795},"introduced_by":17}],"inode":{"change":17,"pos":488880}},"ins_contents":[{"Add":" ) -> Result>>, W::Error> {"}],"del_contents":[{"Del":" ) -> Result>>, anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":488880},"path":"libpijul/src/record.rs","line":323,"ins":{"up_context":[{"change":17,"pos":499681}],"down_context":[{"change":17,"pos":499718}],"flag":"","start":11806,"end":11871,"inode":{"change":17,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":499681},"to":{"change":17,"start":499681,"end":499718},"introduced_by":17}],"inode":{"change":17,"pos":488880}},"ins_contents":[{"Add":" ) -> Result<(), RecordError> {"}],"del_contents":[{"Del":" ) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":488880},"path":"libpijul/src/record.rs","line":344,"ins":{"up_context":[{"change":17,"pos":500570}],"down_context":[{"change":17,"pos":500652}],"flag":"","start":11872,"end":12022,"inode":{"change":17,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":500570},"to":{"change":17,"start":500570,"end":500652},"introduced_by":17}],"inode":{"change":17,"pos":488880}},"ins_contents":[{"Add":" changes"},{"Add":" .get_contents(|p| txn.get_external(p), name_dest, &mut name)"},{"Add":" .map_err(RecordError::Changestore)?;"}],"del_contents":[{"Del":" changes.get_contents(|p| txn.get_external(p), name_dest, &mut name)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":488880},"path":"libpijul/src/record.rs","line":383,"ins":{"up_context":[{"change":17,"pos":502254}],"down_context":[{"change":17,"pos":502273}],"flag":"","start":12023,"end":12093,"inode":{"change":17,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":502254},"to":{"change":17,"start":502254,"end":502273},"introduced_by":17}],"inode":{"change":17,"pos":488880}},"ins_contents":[{"Add":" )"},{"Add":" .map_err(RecordError::Changestore)?"}],"del_contents":[{"Del":" )?\n"}]}},{"Replacement":{"inode":{"change":17,"pos":488880},"path":"libpijul/src/record.rs","line":392,"ins":{"up_context":[{"change":17,"pos":502569}],"down_context":[{"change":17,"pos":502635}],"flag":"","start":12094,"end":12236,"inode":{"change":17,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":502569},"to":{"change":17,"start":502569,"end":502635},"introduced_by":17}],"inode":{"change":17,"pos":488880}},"ins_contents":[{"Add":" working_copy"},{"Add":" .read_file(&item.full_path, &mut b)"},{"Add":" .map_err(RecordError::WorkingCopy)?;"}],"del_contents":[{"Del":" working_copy.read_file(&item.full_path, &mut b)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":488880},"path":"libpijul/src/record.rs","line":455,"ins":{"up_context":[{"change":17,"pos":504647}],"down_context":[{"change":17,"pos":504701}],"flag":"","start":12237,"end":12307,"inode":{"change":17,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":504647},"to":{"change":17,"start":504647,"end":504701},"introduced_by":17}],"inode":{"change":17,"pos":488880}},"ins_contents":[{"Add":" fn push_children<'a, T: MutTxnT, W: WorkingCopy, C: ChangeStore>("}],"del_contents":[{"Del":" fn push_children<'a, T: MutTxnT, W: WorkingCopy>(\n"}]}},{"Replacement":{"inode":{"change":17,"pos":488880},"path":"libpijul/src/record.rs","line":464,"ins":{"up_context":[{"change":17,"pos":504935}],"down_context":[{"change":17,"pos":504972}],"flag":"","start":12308,"end":12373,"inode":{"change":17,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":504935},"to":{"change":17,"start":504935,"end":504972},"introduced_by":17}],"inode":{"change":17,"pos":488880}},"ins_contents":[{"Add":" ) -> Result<(), RecordError> {"}],"del_contents":[{"Del":" ) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":488880},"path":"libpijul/src/record.rs","line":507,"ins":{"up_context":[{"change":17,"pos":1661}],"down_context":[{"change":17,"pos":506821}],"flag":"","start":12374,"end":12446,"inode":{"change":17,"pos":488880}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":17,"pos":1661},"to":{"change":17,"start":506695,"end":506821},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":506695},"to":{"change":17,"start":506695,"end":506821},"introduced_by":17}],"inode":{"change":17,"pos":488880}},"ins_contents":[{"Add":" return Err(RecordError::PathNotInRepo(prefix.to_string()));"}],"del_contents":[{"Del":" return Err((Error::FileNotInRepo {\n path: prefix.to_string(),\n })\n .into());\n"}]}},{"Replacement":{"inode":{"change":17,"pos":488880},"path":"libpijul/src/record.rs","line":517,"ins":{"up_context":[{"change":17,"pos":507032}],"down_context":[{"change":17,"pos":507067}],"flag":"","start":12447,"end":12495,"inode":{"change":17,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":507032},"to":{"change":17,"start":507032,"end":507067},"introduced_by":17}],"inode":{"change":17,"pos":488880}},"ins_contents":[{"Add":") -> Result {"}],"del_contents":[{"Del":") -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":488880},"path":"libpijul/src/record.rs","line":546,"ins":{"up_context":[{"change":17,"pos":507905}],"down_context":[{"change":17,"pos":507942}],"flag":"","start":12496,"end":12528,"inode":{"change":17,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":507905},"to":{"change":17,"start":507905,"end":507942},"introduced_by":17}],"inode":{"change":17,"pos":488880}},"ins_contents":[{"Add":" ) -> Result<(), C::Error> {"}],"del_contents":[{"Del":" ) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":488880},"path":"libpijul/src/record.rs","line":549,"ins":{"up_context":[{"change":17,"pos":508141}],"down_context":[{"change":17,"pos":508195}],"flag":"","start":12529,"end":12591,"inode":{"change":17,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":508141},"to":{"change":17,"start":508141,"end":508195},"introduced_by":17}],"inode":{"change":17,"pos":488880}},"ins_contents":[{"Add":" item.metadata.write(&mut self.rec.contents).unwrap();"}],"del_contents":[{"Del":" item.metadata.write(&mut self.rec.contents)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":488880},"path":"libpijul/src/record.rs","line":628,"ins":{"up_context":[{"change":17,"pos":511024}],"down_context":[{"change":17,"pos":511065}],"flag":"","start":12592,"end":12628,"inode":{"change":17,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":511024},"to":{"change":17,"start":511024,"end":511065},"introduced_by":17}],"inode":{"change":17,"pos":488880}},"ins_contents":[{"Add":") -> Result {"}],"del_contents":[{"Del":") -> Result {\n"}]}},{"Edit":{"inode":{"change":17,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":19,"atom":{"NewVertex":{"up_context":[{"change":17,"pos":531485}],"down_context":[{"change":17,"pos":531485}],"flag":"","start":12629,"end":12927,"inode":{"change":17,"pos":531056}}},"contents":[{"Add":"#[derive(Debug, Error)]"},{"Add":"pub enum SanakirjaError {"},{"Add":" #[error(transparent)]"},{"Add":" Sanakirja(#[from] ::sanakirja::Error),"},{"Add":" #[error(\"Pristine locked\")]"},{"Add":" PristineLocked,"},{"Add":" #[error(\"Pristine corrupt\")]"},{"Add":" PristineCorrupt,"},{"Add":" #[error(transparent)]"},{"Add":" Borrow(#[from] std::cell::BorrowError),"},{"Add":"}"},{"Add":""}]}},{"Replacement":{"inode":{"change":17,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":32,"ins":{"up_context":[{"change":17,"pos":531501}],"down_context":[{"change":17,"pos":531574}],"flag":"","start":12928,"end":13002,"inode":{"change":17,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":531501},"to":{"change":17,"start":531501,"end":531574},"introduced_by":17}],"inode":{"change":17,"pos":531056}},"ins_contents":[{"Add":" pub fn new>(name: P) -> Result {"}],"del_contents":[{"Del":" pub fn new>(name: P) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":35,"ins":{"up_context":[{"change":17,"pos":531623}],"down_context":[{"change":17,"pos":531710}],"flag":"","start":13003,"end":13091,"inode":{"change":17,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":531623},"to":{"change":17,"start":531623,"end":531710},"introduced_by":17}],"inode":{"change":17,"pos":531056}},"ins_contents":[{"Add":" pub unsafe fn new_nolock>(name: P) -> Result {"}],"del_contents":[{"Del":" pub unsafe fn new_nolock>(name: P) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":38,"ins":{"up_context":[{"change":17,"pos":531766}],"down_context":[{"change":17,"pos":83}],"flag":"","start":13092,"end":13187,"inode":{"change":17,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":531766},"to":{"change":17,"start":531766,"end":531860},"introduced_by":17}],"inode":{"change":17,"pos":531056}},"ins_contents":[{"Add":" pub fn new_with_size>(name: P, size: u64) -> Result {"}],"del_contents":[{"Del":" pub fn new_with_size>(name: P, size: u64) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":44,"ins":{"up_context":[{"change":17,"pos":331}],"down_context":[{"change":17,"pos":392}],"flag":"","start":13188,"end":13244,"inode":{"change":17,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":331},"to":{"change":17,"start":331,"end":392},"introduced_by":17}],"inode":{"change":17,"pos":531056}},"ins_contents":[{"Add":" Err(SanakirjaError::PristineLocked)"}],"del_contents":[{"Del":" Err(crate::Error::PristineLocked.into())\n"}]}},{"Replacement":{"inode":{"change":17,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":46,"ins":{"up_context":[{"change":17,"pos":417}],"down_context":[{"change":17,"pos":451}],"flag":"","start":13245,"end":13321,"inode":{"change":17,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":417},"to":{"change":17,"start":417,"end":451},"introduced_by":17}],"inode":{"change":17,"pos":531056}},"ins_contents":[{"Add":" Err(SanakirjaError::Sanakirja(sanakirja::Error::IO(e)))"}],"del_contents":[{"Del":" Err(e.into())\n"}]}},{"Replacement":{"inode":{"change":17,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":49,"ins":{"up_context":[{"change":17,"pos":483}],"down_context":[{"change":17,"pos":519}],"flag":"","start":13322,"end":13379,"inode":{"change":17,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":483},"to":{"change":17,"start":36470,"end":36507},"introduced_by":17}],"inode":{"change":17,"pos":531056}},"ins_contents":[{"Add":" Err(e) => Err(SanakirjaError::Sanakirja(e)),"}],"del_contents":[{"Del":" Err(e) => Err(e.into()),\n"}]}},{"Replacement":{"inode":{"change":17,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":55,"ins":{"up_context":[{"change":17,"pos":532052}],"down_context":[{"change":17,"pos":532091}],"flag":"","start":13380,"end":13420,"inode":{"change":17,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":532052},"to":{"change":17,"start":532052,"end":532091},"introduced_by":17}],"inode":{"change":17,"pos":531056}},"ins_contents":[{"Add":" ) -> Result {"}],"del_contents":[{"Del":" ) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":60,"ins":{"up_context":[{"change":17,"pos":532198}],"down_context":[{"change":17,"pos":532253}],"flag":"","start":13421,"end":13477,"inode":{"change":17,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":532198},"to":{"change":17,"start":532198,"end":532253},"introduced_by":17}],"inode":{"change":17,"pos":531056}},"ins_contents":[{"Add":" pub fn new_anon() -> Result {"}],"del_contents":[{"Del":" pub fn new_anon() -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":63,"ins":{"up_context":[{"change":17,"pos":532301}],"down_context":[{"change":17,"pos":532375}],"flag":"","start":13478,"end":13553,"inode":{"change":17,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":532301},"to":{"change":17,"start":532301,"end":532375},"introduced_by":17}],"inode":{"change":17,"pos":531056}},"ins_contents":[{"Add":" pub fn new_anon_with_size(size: u64) -> Result {"}],"del_contents":[{"Del":" pub fn new_anon_with_size(size: u64) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":89,"ins":{"up_context":[{"change":17,"pos":532743}],"down_context":[{"change":17,"pos":532803}],"flag":"","start":13554,"end":13615,"inode":{"change":17,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":532743},"to":{"change":17,"start":532743,"end":532803},"introduced_by":17}],"inode":{"change":17,"pos":531056}},"ins_contents":[{"Add":" pub fn txn_begin(&self) -> Result {"}],"del_contents":[{"Del":" pub fn txn_begin(&self) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":120,"ins":{"up_context":[{"change":17,"pos":534054}],"down_context":[{"change":17,"pos":534108}],"flag":"","start":13616,"end":13665,"inode":{"change":17,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":534054},"to":{"change":17,"start":534054,"end":534108},"introduced_by":17}],"inode":{"change":17,"pos":531056}},"ins_contents":[{"Add":" Err(SanakirjaError::PristineCorrupt)"}],"del_contents":[{"Del":" Err(crate::Error::PristineCorrupt.into())\n"}]}},{"Edit":{"inode":{"change":17,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":331,"atom":{"NewVertex":{"up_context":[{"change":17,"pos":542281}],"down_context":[{"change":17,"pos":542300}],"flag":"","start":13666,"end":13699,"inode":{"change":17,"pos":531056}}},"contents":[{"Add":" type Error = SanakirjaError;"}]}},{"Replacement":{"inode":{"change":17,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":352,"ins":{"up_context":[{"change":17,"pos":542895}],"down_context":[{"change":17,"pos":542980}],"flag":"","start":13700,"end":13794,"inode":{"change":17,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":542895},"to":{"change":17,"start":542895,"end":542980},"introduced_by":17}],"inode":{"change":17,"pos":531056}},"ins_contents":[{"Add":" fn hash_from_prefix(&self, s: &str) -> Result<(Hash, ChangeId), super::HashPrefixError> {"}],"del_contents":[{"Del":" fn hash_from_prefix(&self, s: &str) -> Result<(Hash, ChangeId), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":356,"ins":{"up_context":[{"change":17,"pos":543067}],"down_context":[{"change":17,"pos":543147}],"flag":"","start":13795,"end":13865,"inode":{"change":17,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":543067},"to":{"change":17,"start":543067,"end":543147},"introduced_by":17}],"inode":{"change":17,"pos":531056}},"ins_contents":[{"Add":" return Err(super::HashPrefixError::Parse(s.to_string()));"}],"del_contents":[{"Del":" return Err((crate::Error::ParseError { s: s.to_string() }).into());\n"}]}},{"Replacement":{"inode":{"change":17,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":373,"ins":{"up_context":[{"change":17,"pos":543716}],"down_context":[{"change":17,"pos":543884}],"flag":"","start":13866,"end":13948,"inode":{"change":17,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":543716},"to":{"change":17,"start":543716,"end":543884},"introduced_by":17}],"inode":{"change":17,"pos":531056}},"ins_contents":[{"Add":" return Err(super::HashPrefixError::Ambiguous(s.to_string()));"}],"del_contents":[{"Del":" return Err((crate::Error::AmbiguousHashPrefix {\n prefix: s.to_string(),\n })\n .into());\n"}]}},{"Replacement":{"inode":{"change":17,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":380,"ins":{"up_context":[{"change":17,"pos":544005}],"down_context":[{"change":17,"pos":544126}],"flag":"","start":13949,"end":14014,"inode":{"change":17,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":544005},"to":{"change":17,"start":544005,"end":544126},"introduced_by":17}],"inode":{"change":17,"pos":531056}},"ins_contents":[{"Add":" Err(super::HashPrefixError::NotFound(s.to_string()))"}],"del_contents":[{"Del":" Err((crate::Error::ChangeNotFound {\n hash: s.to_string(),\n })\n .into())\n"}]}},{"Replacement":{"inode":{"change":17,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":388,"ins":{"up_context":[{"change":17,"pos":544252}],"down_context":[{"change":17,"pos":544291}],"flag":"","start":14015,"end":14063,"inode":{"change":17,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":544252},"to":{"change":17,"start":544252,"end":544291},"introduced_by":17}],"inode":{"change":17,"pos":531056}},"ins_contents":[{"Add":" ) -> Result {"}],"del_contents":[{"Del":" ) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":393,"ins":{"up_context":[{"change":17,"pos":544416}],"down_context":[{"change":17,"pos":544496}],"flag":"","start":14064,"end":14134,"inode":{"change":17,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":544416},"to":{"change":17,"start":544416,"end":544496},"introduced_by":17}],"inode":{"change":17,"pos":531056}},"ins_contents":[{"Add":" return Err(super::HashPrefixError::Parse(s.to_string()));"}],"del_contents":[{"Del":" return Err((crate::Error::ParseError { s: s.to_string() }).into());\n"}]}},{"Replacement":{"inode":{"change":17,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":410,"ins":{"up_context":[{"change":17,"pos":545049}],"down_context":[{"change":17,"pos":545217}],"flag":"","start":14135,"end":14217,"inode":{"change":17,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":545049},"to":{"change":17,"start":545049,"end":545217},"introduced_by":17}],"inode":{"change":17,"pos":531056}},"ins_contents":[{"Add":" return Err(super::HashPrefixError::Ambiguous(s.to_string()));"}],"del_contents":[{"Del":" return Err((crate::Error::AmbiguousHashPrefix {\n prefix: s.to_string(),\n })\n .into());\n"}]}},{"Replacement":{"inode":{"change":17,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":417,"ins":{"up_context":[{"change":17,"pos":545338}],"down_context":[{"change":17,"pos":545459}],"flag":"","start":14218,"end":14283,"inode":{"change":17,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":545338},"to":{"change":17,"start":545338,"end":545459},"introduced_by":17}],"inode":{"change":17,"pos":531056}},"ins_contents":[{"Add":" Err(super::HashPrefixError::NotFound(s.to_string()))"}],"del_contents":[{"Del":" Err((crate::Error::ChangeNotFound {\n hash: s.to_string(),\n })\n .into())\n"}]}},{"Replacement":{"inode":{"change":17,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":812,"ins":{"up_context":[{"change":17,"pos":559008}],"down_context":[{"change":17,"pos":559047}],"flag":"","start":14284,"end":14321,"inode":{"change":17,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":559008},"to":{"change":17,"start":559008,"end":559047},"introduced_by":17}],"inode":{"change":17,"pos":531056}},"ins_contents":[{"Add":" ) -> Result {"}],"del_contents":[{"Del":" ) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":821,"ins":{"up_context":[{"change":17,"pos":559250}],"down_context":[{"change":17,"pos":559289}],"flag":"","start":14322,"end":14359,"inode":{"change":17,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":559250},"to":{"change":17,"start":559250,"end":559289},"introduced_by":17}],"inode":{"change":17,"pos":531056}},"ins_contents":[{"Add":" ) -> Result {"}],"del_contents":[{"Del":" ) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":826,"ins":{"up_context":[{"change":17,"pos":559395}],"down_context":[{"change":17,"pos":559510}],"flag":"","start":14360,"end":14454,"inode":{"change":17,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":559414},"to":{"change":17,"start":559414,"end":559510},"introduced_by":17}],"inode":{"change":17,"pos":531056}},"ins_contents":[{"Add":" fn put_partials(&mut self, k: &str, e: Position) -> Result {"}],"del_contents":[{"Del":" fn put_partials(&mut self, k: &str, e: Position) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":840,"ins":{"up_context":[{"change":17,"pos":559846}],"down_context":[{"change":17,"pos":559885}],"flag":"","start":14455,"end":14492,"inode":{"change":17,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":559846},"to":{"change":17,"start":559846,"end":559885},"introduced_by":17}],"inode":{"change":17,"pos":531056}},"ins_contents":[{"Add":" ) -> Result {"}],"del_contents":[{"Del":" ) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":856,"ins":{"up_context":[{"change":17,"pos":560268}],"down_context":[{"change":17,"pos":560317}],"flag":"","start":14493,"end":14540,"inode":{"change":17,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":560268},"to":{"change":17,"start":560268,"end":560317},"introduced_by":17}],"inode":{"change":17,"pos":531056}},"ins_contents":[{"Add":" ) -> Result, Self::Error> {"}],"del_contents":[{"Del":" ) -> Result, anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":884,"ins":{"up_context":[{"change":17,"pos":561234}],"down_context":[{"change":17,"pos":561273}],"flag":"","start":14541,"end":14578,"inode":{"change":17,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":561234},"to":{"change":17,"start":561234,"end":561273},"introduced_by":17}],"inode":{"change":17,"pos":531056}},"ins_contents":[{"Add":" ) -> Result {"}],"del_contents":[{"Del":" ) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":918,"ins":{"up_context":[{"change":17,"pos":562319}],"down_context":[{"change":17,"pos":562358}],"flag":"","start":14579,"end":14616,"inode":{"change":17,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":562319},"to":{"change":17,"start":562319,"end":562358},"introduced_by":17}],"inode":{"change":17,"pos":531056}},"ins_contents":[{"Add":" ) -> Result {"}],"del_contents":[{"Del":" ) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":925,"ins":{"up_context":[{"change":17,"pos":562607}],"down_context":[{"change":17,"pos":562707}],"flag":"","start":14617,"end":14715,"inode":{"change":17,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":562607},"to":{"change":17,"start":562607,"end":562707},"introduced_by":17}],"inode":{"change":17,"pos":531056}},"ins_contents":[{"Add":" fn del_remote(&mut self, remote: &mut RemoteRef, k: u64) -> Result {"}],"del_contents":[{"Del":" fn del_remote(&mut self, remote: &mut RemoteRef, k: u64) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":936,"ins":{"up_context":[{"change":17,"pos":563092}],"down_context":[{"change":17,"pos":563190}],"flag":"","start":14716,"end":14812,"inode":{"change":17,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":563092},"to":{"change":17,"start":563092,"end":563190},"introduced_by":17}],"inode":{"change":17,"pos":531056}},"ins_contents":[{"Add":" fn open_or_create_channel(&mut self, name: &str) -> Result, Self::Error> {"}],"del_contents":[{"Del":" fn open_or_create_channel(&mut self, name: &str) -> Result, anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":993,"ins":{"up_context":[{"change":17,"pos":565222}],"down_context":[{"change":17,"pos":565273}],"flag":"","start":14813,"end":14873,"inode":{"change":17,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":565222},"to":{"change":17,"start":565222,"end":565273},"introduced_by":17}],"inode":{"change":17,"pos":531056}},"ins_contents":[{"Add":" ) -> Result, ForkError> {"}],"del_contents":[{"Del":" ) -> Result, anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1007,"ins":{"up_context":[{"change":17,"pos":565672}],"down_context":[{"change":17,"pos":565984}],"flag":"","start":14874,"end":15638,"inode":{"change":17,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":565672},"to":{"change":17,"start":565672,"end":565984},"introduced_by":17}],"inode":{"change":17,"pos":531056}},"ins_contents":[{"Add":" graph: self"},{"Add":" .txn"},{"Add":" .fork(&mut self.rng, &channel.graph)"},{"Add":" .map_err(|e| ForkError::Txn(e.into()))?,"},{"Add":" changes: self"},{"Add":" .txn"},{"Add":" .fork(&mut self.rng, &channel.changes)"},{"Add":" .map_err(|e| ForkError::Txn(e.into()))?,"},{"Add":" revchanges: self"},{"Add":" .txn"},{"Add":" .fork(&mut self.rng, &channel.revchanges)"},{"Add":" .map_err(|e| ForkError::Txn(e.into()))?,"},{"Add":" states: self"},{"Add":" .txn"},{"Add":" .fork(&mut self.rng, &channel.states)"},{"Add":" .map_err(|e| ForkError::Txn(e.into()))?,"}],"del_contents":[{"Del":" graph: self.txn.fork(&mut self.rng, &channel.graph)?,\n changes: self.txn.fork(&mut self.rng, &channel.changes)?,\n revchanges: self.txn.fork(&mut self.rng, &channel.revchanges)?,\n states: self.txn.fork(&mut self.rng, &channel.states)?,\n"}]}},{"Replacement":{"inode":{"change":17,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1031,"ins":{"up_context":[{"change":17,"pos":566324}],"down_context":[{"change":17,"pos":566455}],"flag":"","start":15639,"end":15714,"inode":{"change":17,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":566324},"to":{"change":17,"start":566324,"end":566455},"introduced_by":17}],"inode":{"change":17,"pos":531056}},"ins_contents":[{"Add":" Err(super::ForkError::ChannelNameExists(new_name.to_string()))"}],"del_contents":[{"Del":" Err((crate::Error::ChannelNameExists {\n name: new_name.to_string(),\n })\n .into())\n"}]}},{"Replacement":{"inode":{"change":17,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1039,"ins":{"up_context":[{"change":17,"pos":566578}],"down_context":[{"change":17,"pos":566615}],"flag":"","start":15715,"end":15761,"inode":{"change":17,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":566578},"to":{"change":17,"start":566578,"end":566615},"introduced_by":17}],"inode":{"change":17,"pos":531056}},"ins_contents":[{"Add":" ) -> Result<(), ForkError> {"}],"del_contents":[{"Del":" ) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1050,"ins":{"up_context":[{"change":17,"pos":566888}],"down_context":[{"change":17,"pos":566888}],"flag":"","start":15762,"end":16071,"inode":{"change":17,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":566888},"to":{"change":10,"start":0,"end":217},"introduced_by":10}],"inode":{"change":17,"pos":531056}},"ins_contents":[{"Add":" self.txn"},{"Add":" .del("},{"Add":" &mut self.rng,"},{"Add":" &mut self.channels,"},{"Add":" UnsafeSmallStr::from_small_str(channel.borrow().name.as_small_str()),"},{"Add":" None,"},{"Add":" )"},{"Add":" .map_err(|e| ForkError::Txn(e.into()))?;"}],"del_contents":[{"Del":" self.txn.del(\n &mut self.rng,\n &mut self.channels,\n UnsafeSmallStr::from_small_str(channel.borrow().name.as_small_str()),\n None,\n )?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1071,"ins":{"up_context":[{"change":17,"pos":567356}],"down_context":[{"change":17,"pos":567487}],"flag":"","start":16072,"end":16140,"inode":{"change":17,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":567356},"to":{"change":17,"start":567356,"end":567487},"introduced_by":17}],"inode":{"change":17,"pos":531056}},"ins_contents":[{"Add":" Err(ForkError::ChannelNameExists(new_name.to_string()))"}],"del_contents":[{"Del":" Err((crate::Error::ChannelNameExists {\n name: new_name.to_string(),\n })\n .into())\n"}]}},{"Replacement":{"inode":{"change":17,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1075,"ins":{"up_context":[{"change":17,"pos":567504}],"down_context":[{"change":17,"pos":567580}],"flag":"","start":16141,"end":16215,"inode":{"change":17,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":567504},"to":{"change":17,"start":567504,"end":567580},"introduced_by":17}],"inode":{"change":17,"pos":531056}},"ins_contents":[{"Add":" fn drop_channel(&mut self, name: &str) -> Result {"}],"del_contents":[{"Del":" fn drop_channel(&mut self, name: &str) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1089,"ins":{"up_context":[{"change":17,"pos":567999}],"down_context":[{"change":17,"pos":568095}],"flag":"","start":16216,"end":16310,"inode":{"change":17,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":567999},"to":{"change":17,"start":567999,"end":568095},"introduced_by":17}],"inode":{"change":17,"pos":531056}},"ins_contents":[{"Add":" fn open_or_create_remote(&mut self, name: &str) -> Result, Self::Error> {"}],"del_contents":[{"Del":" fn open_or_create_remote(&mut self, name: &str) -> Result, anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1129,"ins":{"up_context":[{"change":17,"pos":569566}],"down_context":[{"change":17,"pos":569654}],"flag":"","start":16311,"end":16397,"inode":{"change":17,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":569566},"to":{"change":17,"start":569566,"end":569654},"introduced_by":17}],"inode":{"change":17,"pos":531056}},"ins_contents":[{"Add":" fn drop_remote(&mut self, remote: RemoteRef) -> Result {"}],"del_contents":[{"Del":" fn drop_remote(&mut self, remote: RemoteRef) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1142,"ins":{"up_context":[{"change":17,"pos":570030}],"down_context":[{"change":17,"pos":570111}],"flag":"","start":16398,"end":16477,"inode":{"change":17,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":570030},"to":{"change":17,"start":570030,"end":570111},"introduced_by":17}],"inode":{"change":17,"pos":531056}},"ins_contents":[{"Add":" fn drop_named_remote(&mut self, name: &str) -> Result {"}],"del_contents":[{"Del":" fn drop_named_remote(&mut self, name: &str) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1155,"ins":{"up_context":[{"change":17,"pos":570478}],"down_context":[{"change":17,"pos":570533}],"flag":"","start":16478,"end":16531,"inode":{"change":17,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":570478},"to":{"change":17,"start":570478,"end":570533},"introduced_by":17}],"inode":{"change":17,"pos":531056}},"ins_contents":[{"Add":" fn commit(mut self) -> Result<(), Self::Error> {"}],"del_contents":[{"Del":" fn commit(mut self) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1217,"ins":{"up_context":[{"change":17,"pos":572784}],"down_context":[{"change":17,"pos":572872}],"flag":"","start":16532,"end":16621,"inode":{"change":17,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":572784},"to":{"change":17,"start":572784,"end":572872},"introduced_by":17}],"inode":{"change":17,"pos":531056}},"ins_contents":[{"Add":" fn put_channel(&mut self, channel: ChannelRef) -> Result<(), SanakirjaError> {"}],"del_contents":[{"Del":" fn put_channel(&mut self, channel: ChannelRef) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1258,"ins":{"up_context":[{"change":17,"pos":574502}],"down_context":[{"change":17,"pos":574593}],"flag":"","start":16622,"end":16714,"inode":{"change":17,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":574502},"to":{"change":17,"start":574502,"end":574593},"introduced_by":17}],"inode":{"change":17,"pos":531056}},"ins_contents":[{"Add":" fn commit_channel(&mut self, channel: ChannelRef) -> Result<(), SanakirjaError> {"}],"del_contents":[{"Del":" fn commit_channel(&mut self, channel: ChannelRef) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1269,"ins":{"up_context":[{"change":17,"pos":574894}],"down_context":[{"change":17,"pos":574980}],"flag":"","start":16715,"end":16806,"inode":{"change":17,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":574894},"to":{"change":17,"start":574894,"end":574980},"introduced_by":17}],"inode":{"change":17,"pos":531056}},"ins_contents":[{"Add":" fn put_remotes(&mut self, remote: RemoteRef) -> Result<(), ::sanakirja::Error> {"}],"del_contents":[{"Del":" fn put_remotes(&mut self, remote: RemoteRef) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1293,"ins":{"up_context":[{"change":17,"pos":575835}],"down_context":[{"change":17,"pos":575923}],"flag":"","start":16807,"end":16900,"inode":{"change":17,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":575835},"to":{"change":17,"start":575835,"end":575923},"introduced_by":17}],"inode":{"change":17,"pos":531056}},"ins_contents":[{"Add":" fn commit_remote(&mut self, remote: RemoteRef) -> Result<(), ::sanakirja::Error> {"}],"del_contents":[{"Del":" fn commit_remote(&mut self, remote: RemoteRef) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":114,"ins":{"up_context":[{"change":17,"pos":589085}],"down_context":[{"change":17,"pos":589140}],"flag":"","start":16901,"end":17347,"inode":{"change":17,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":589085},"to":{"change":17,"start":589085,"end":589140},"introduced_by":17}],"inode":{"change":17,"pos":586748}},"ins_contents":[{"Add":"#[derive(Debug, Error)]"},{"Add":"pub enum HashPrefixError {"},{"Add":" #[error(\"Failed to parse hash prefix: {0}\")]"},{"Add":" Parse(String),"},{"Add":" #[error(\"Ambiguous hash prefix: {0}\")]"},{"Add":" Ambiguous(String),"},{"Add":" #[error(\"Change not found: {0}\")]"},{"Add":" NotFound(String),"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Debug, Error)]"},{"Add":"pub enum ForkError {"},{"Add":" #[error(\"Channel name already exists: {0}\")]"},{"Add":" ChannelNameExists(String),"},{"Add":" #[error(transparent)]"},{"Add":" Txn(T),"},{"Add":"}"},{"Add":""}],"del_contents":[{"Del":"// org id Zm7WF9q4bHktcCg0LXmmKlQP7XVt4IkPEDuF9pREDw4=\n"}]}},{"Edit":{"inode":{"change":17,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":134,"atom":{"NewVertex":{"up_context":[{"change":17,"pos":589205}],"down_context":[{"change":17,"pos":589205}],"flag":"","start":17348,"end":17407,"inode":{"change":17,"pos":586748}}},"contents":[{"Add":" type Error: std::error::Error + Send + Sync + 'static;"}]}},{"Replacement":{"inode":{"change":17,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":195,"ins":{"up_context":[{"change":17,"pos":591137}],"down_context":[{"change":17,"pos":591226}],"flag":"","start":17408,"end":17499,"inode":{"change":17,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":591137},"to":{"change":17,"start":591137,"end":591226},"introduced_by":17}],"inode":{"change":17,"pos":586748}},"ins_contents":[{"Add":" fn hash_from_prefix(&self, prefix: &str) -> Result<(Hash, ChangeId), HashPrefixError>;"}],"del_contents":[{"Del":" fn hash_from_prefix(&self, prefix: &str) -> Result<(Hash, ChangeId), anyhow::Error>;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":200,"ins":{"up_context":[{"change":17,"pos":591329}],"down_context":[{"change":17,"pos":591367}],"flag":"","start":17500,"end":17540,"inode":{"change":17,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":591329},"to":{"change":17,"start":591329,"end":591367},"introduced_by":17}],"inode":{"change":17,"pos":586748}},"ins_contents":[{"Add":" ) -> Result;"}],"del_contents":[{"Del":" ) -> Result;\n"}]}},{"Edit":{"inode":{"change":17,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":346,"atom":{"NewVertex":{"up_context":[{"change":17,"pos":354}],"down_context":[{"change":17,"pos":38850}],"flag":"","start":17541,"end":17631,"inode":{"change":17,"pos":586748}}},"contents":[{"Add":"#[derive(Error, Debug)]"},{"Add":"#[error(\"Inconsistent change\")]"},{"Add":"pub struct InconsistentChange {}"},{"Add":""}]}},{"Replacement":{"inode":{"change":17,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":354,"ins":{"up_context":[{"change":17,"pos":38959}],"down_context":[{"change":16,"pos":0}],"flag":"","start":17632,"end":17686,"inode":{"change":17,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":38959},"to":{"change":17,"start":38959,"end":39007},"introduced_by":17}],"inode":{"change":17,"pos":586748}},"ins_contents":[{"Add":") -> Result, InconsistentChange> {"}],"del_contents":[{"Del":") -> Result, crate::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":359,"ins":{"up_context":[{"change":17,"pos":39254}],"down_context":[{"change":16,"pos":167}],"flag":"","start":17687,"end":17734,"inode":{"change":17,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":39254},"to":{"change":16,"start":109,"end":167},"introduced_by":16}],"inode":{"change":17,"pos":586748}},"ins_contents":[{"Add":" return Err(InconsistentChange {});"}],"del_contents":[{"Del":" return Err(crate::Error::InconsistentChange);\n"}]}},{"Replacement":{"inode":{"change":17,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":513,"ins":{"up_context":[{"change":17,"pos":43431}],"down_context":[{"change":17,"pos":43464}],"flag":"","start":17735,"end":17769,"inode":{"change":17,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":43431},"to":{"change":17,"start":43431,"end":43464},"introduced_by":17}],"inode":{"change":17,"pos":586748}},"ins_contents":[{"Add":") -> Result<(), std::io::Error> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Edit":{"inode":{"change":17,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":536,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":609461},"to":{"change":17,"start":43975,"end":44030},"introduced_by":17}],"inode":{"change":17,"pos":586748}}},"contents":[{"Del":"// org id oGZWRYu9yo9VKkz4S9hipd5OpFx6kQiF5q/T9jSqp5A=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":543,"ins":{"up_context":[{"change":17,"pos":44289}],"down_context":[{"change":17,"pos":44324}],"flag":"","start":17770,"end":17806,"inode":{"change":17,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":44289},"to":{"change":17,"start":44289,"end":44324},"introduced_by":17}],"inode":{"change":17,"pos":586748}},"ins_contents":[{"Add":") -> Result {"}],"del_contents":[{"Del":") -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":557,"ins":{"up_context":[{"change":17,"pos":44669}],"down_context":[{"change":17,"pos":44702}],"flag":"","start":17807,"end":17841,"inode":{"change":17,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":44669},"to":{"change":17,"start":44669,"end":44702},"introduced_by":17}],"inode":{"change":17,"pos":586748}},"ins_contents":[{"Add":") -> Result<(), std::io::Error> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":597,"ins":{"up_context":[{"change":17,"pos":45440}],"down_context":[{"change":8,"pos":294}],"flag":"","start":17842,"end":17878,"inode":{"change":17,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":45440},"to":{"change":17,"start":45440,"end":45475},"introduced_by":17}],"inode":{"change":17,"pos":586748}},"ins_contents":[{"Add":") -> Result {"}],"del_contents":[{"Del":") -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":719,"ins":{"up_context":[{"change":17,"pos":49172}],"down_context":[{"change":17,"pos":49205}],"flag":"","start":17879,"end":17913,"inode":{"change":17,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":49172},"to":{"change":17,"start":49172,"end":49205},"introduced_by":17}],"inode":{"change":17,"pos":586748}},"ins_contents":[{"Add":") -> Result<(), std::io::Error> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1079,"ins":{"up_context":[{"change":17,"pos":629258}],"down_context":[{"change":17,"pos":629296}],"flag":"","start":17914,"end":17950,"inode":{"change":17,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":629258},"to":{"change":17,"start":629258,"end":629296},"introduced_by":17}],"inode":{"change":17,"pos":586748}},"ins_contents":[{"Add":" ) -> Result;"}],"del_contents":[{"Del":" ) -> Result;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1087,"ins":{"up_context":[{"change":17,"pos":629546}],"down_context":[{"change":17,"pos":629584}],"flag":"","start":17951,"end":17987,"inode":{"change":17,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":629546},"to":{"change":17,"start":629546,"end":629584},"introduced_by":17}],"inode":{"change":17,"pos":586748}},"ins_contents":[{"Add":" ) -> Result;"}],"del_contents":[{"Del":" ) -> Result;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1096,"ins":{"up_context":[{"change":17,"pos":629939}],"down_context":[{"change":17,"pos":629987}],"flag":"","start":17988,"end":18034,"inode":{"change":17,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":629939},"to":{"change":17,"start":629939,"end":629987},"introduced_by":17}],"inode":{"change":17,"pos":586748}},"ins_contents":[{"Add":" ) -> Result, Self::Error>;"}],"del_contents":[{"Del":" ) -> Result, anyhow::Error>;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1104,"ins":{"up_context":[{"change":17,"pos":630240}],"down_context":[{"change":17,"pos":630278}],"flag":"","start":18035,"end":18071,"inode":{"change":17,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":630240},"to":{"change":17,"start":630240,"end":630278},"introduced_by":17}],"inode":{"change":17,"pos":586748}},"ins_contents":[{"Add":" ) -> Result;"}],"del_contents":[{"Del":" ) -> Result;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1116,"ins":{"up_context":[{"change":17,"pos":631045}],"down_context":[{"change":17,"pos":631142}],"flag":"","start":18072,"end":18167,"inode":{"change":17,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":631045},"to":{"change":17,"start":631045,"end":631142},"introduced_by":17}],"inode":{"change":17,"pos":586748}},"ins_contents":[{"Add":" fn open_or_create_channel(&mut self, name: &str) -> Result, Self::Error>;"}],"del_contents":[{"Del":" fn open_or_create_channel(&mut self, name: &str) -> Result, anyhow::Error>;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1122,"ins":{"up_context":[{"change":17,"pos":631231}],"down_context":[{"change":17,"pos":631281}],"flag":"","start":18168,"end":18227,"inode":{"change":17,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":631231},"to":{"change":17,"start":631231,"end":631281},"introduced_by":17}],"inode":{"change":17,"pos":586748}},"ins_contents":[{"Add":" ) -> Result, ForkError>;"}],"del_contents":[{"Del":" ) -> Result, anyhow::Error>;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1128,"ins":{"up_context":[{"change":17,"pos":631384}],"down_context":[{"change":17,"pos":631420}],"flag":"","start":18228,"end":18273,"inode":{"change":17,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":631384},"to":{"change":17,"start":631384,"end":631420},"introduced_by":17}],"inode":{"change":17,"pos":586748}},"ins_contents":[{"Add":" ) -> Result<(), ForkError>;"}],"del_contents":[{"Del":" ) -> Result<(), anyhow::Error>;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1130,"ins":{"up_context":[{"change":17,"pos":631421}],"down_context":[{"change":17,"pos":631496}],"flag":"","start":18274,"end":18347,"inode":{"change":17,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":631421},"to":{"change":17,"start":631421,"end":631496},"introduced_by":17}],"inode":{"change":17,"pos":586748}},"ins_contents":[{"Add":" fn drop_channel(&mut self, name: &str) -> Result;"}],"del_contents":[{"Del":" fn drop_channel(&mut self, name: &str) -> Result;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1133,"ins":{"up_context":[{"change":17,"pos":631530}],"down_context":[{"change":17,"pos":636462}],"flag":"","start":18348,"end":18396,"inode":{"change":17,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":631530},"to":{"change":17,"start":631530,"end":631580},"introduced_by":17}],"inode":{"change":17,"pos":586748}},"ins_contents":[{"Add":" fn commit(self) -> Result<(), Self::Error>;"}],"del_contents":[{"Del":" fn commit(self) -> Result<(), anyhow::Error>;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1135,"ins":{"up_context":[{"change":17,"pos":636463}],"down_context":[{"change":17,"pos":637989}],"flag":"","start":18397,"end":18490,"inode":{"change":17,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":637894},"to":{"change":17,"start":637894,"end":637989},"introduced_by":17}],"inode":{"change":17,"pos":586748}},"ins_contents":[{"Add":" fn put_partials(&mut self, k: &str, e: Position) -> Result;"}],"del_contents":[{"Del":" fn put_partials(&mut self, k: &str, e: Position) -> Result;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1137,"ins":{"up_context":[{"change":17,"pos":637990}],"down_context":[{"change":17,"pos":638143}],"flag":"","start":18491,"end":18600,"inode":{"change":17,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":638009},"to":{"change":17,"start":638009,"end":638105},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":638105},"to":{"change":17,"start":638105,"end":638143},"introduced_by":17}],"inode":{"change":17,"pos":586748}},"ins_contents":[{"Add":" fn del_partials(&mut self, k: &str, e: Option>)"},{"Add":" -> Result;"}],"del_contents":[{"Del":" fn del_partials(\n &mut self,\n k: &str,\n e: Option>,\n"},{"Del":" ) -> Result;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1140,"ins":{"up_context":[{"change":17,"pos":638144}],"down_context":[{"change":17,"pos":638239}],"flag":"","start":18601,"end":18694,"inode":{"change":17,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":638144},"to":{"change":17,"start":638144,"end":638239},"introduced_by":17}],"inode":{"change":17,"pos":586748}},"ins_contents":[{"Add":" fn open_or_create_remote(&mut self, name: &str) -> Result, Self::Error>;"}],"del_contents":[{"Del":" fn open_or_create_remote(&mut self, name: &str) -> Result, anyhow::Error>;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1147,"ins":{"up_context":[{"change":17,"pos":638359}],"down_context":[{"change":17,"pos":638397}],"flag":"","start":18695,"end":18731,"inode":{"change":17,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":638359},"to":{"change":17,"start":638359,"end":638397},"introduced_by":17}],"inode":{"change":17,"pos":586748}},"ins_contents":[{"Add":" ) -> Result;"}],"del_contents":[{"Del":" ) -> Result;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1149,"ins":{"up_context":[{"change":17,"pos":638398}],"down_context":[{"change":17,"pos":638497}],"flag":"","start":18732,"end":18829,"inode":{"change":17,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":638398},"to":{"change":17,"start":638398,"end":638497},"introduced_by":17}],"inode":{"change":17,"pos":586748}},"ins_contents":[{"Add":" fn del_remote(&mut self, remote: &mut RemoteRef, k: u64) -> Result;"}],"del_contents":[{"Del":" fn del_remote(&mut self, remote: &mut RemoteRef, k: u64) -> Result;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1151,"ins":{"up_context":[{"change":17,"pos":638498}],"down_context":[{"change":17,"pos":638585}],"flag":"","start":18830,"end":18915,"inode":{"change":17,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":638498},"to":{"change":17,"start":638498,"end":638585},"introduced_by":17}],"inode":{"change":17,"pos":586748}},"ins_contents":[{"Add":" fn drop_remote(&mut self, remote: RemoteRef) -> Result;"}],"del_contents":[{"Del":" fn drop_remote(&mut self, remote: RemoteRef) -> Result;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1153,"ins":{"up_context":[{"change":17,"pos":638586}],"down_context":[{"change":17,"pos":50088}],"flag":"","start":18916,"end":18996,"inode":{"change":17,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":638586},"to":{"change":17,"start":638586,"end":638668},"introduced_by":17}],"inode":{"change":17,"pos":586748}},"ins_contents":[{"Add":" fn drop_named_remote(&mut self, remote: &str) -> Result;"}],"del_contents":[{"Del":" fn drop_named_remote(&mut self, remote: &str) -> Result;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1160,"ins":{"up_context":[{"change":17,"pos":50207}],"down_context":[{"change":17,"pos":50240}],"flag":"","start":18997,"end":19025,"inode":{"change":17,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":50207},"to":{"change":17,"start":50207,"end":50240},"introduced_by":17}],"inode":{"change":17,"pos":586748}},"ins_contents":[{"Add":") -> Result<(), T::Error> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1170,"ins":{"up_context":[{"change":17,"pos":1646}],"down_context":[{"change":17,"pos":1681}],"flag":"","start":19026,"end":19056,"inode":{"change":17,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1646},"to":{"change":17,"start":1646,"end":1681},"introduced_by":17}],"inode":{"change":17,"pos":586748}},"ins_contents":[{"Add":") -> Result {"}],"del_contents":[{"Del":") -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1183,"ins":{"up_context":[{"change":17,"pos":1947}],"down_context":[{"change":17,"pos":1980}],"flag":"","start":19057,"end":19085,"inode":{"change":17,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1947},"to":{"change":17,"start":1947,"end":1980},"introduced_by":17}],"inode":{"change":17,"pos":586748}},"ins_contents":[{"Add":") -> Result<(), T::Error> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1193,"ins":{"up_context":[{"change":17,"pos":2155}],"down_context":[{"change":17,"pos":2190}],"flag":"","start":19086,"end":19116,"inode":{"change":17,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":2155},"to":{"change":17,"start":2155,"end":2190},"introduced_by":17}],"inode":{"change":17,"pos":586748}},"ins_contents":[{"Add":") -> Result {"}],"del_contents":[{"Del":") -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1211,"ins":{"up_context":[{"change":17,"pos":50582}],"down_context":[{"change":17,"pos":50615}],"flag":"","start":19117,"end":19145,"inode":{"change":17,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":50582},"to":{"change":17,"start":50582,"end":50615},"introduced_by":17}],"inode":{"change":17,"pos":586748}},"ins_contents":[{"Add":") -> Result<(), T::Error> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1270,"ins":{"up_context":[{"change":17,"pos":52349}],"down_context":[{"change":17,"pos":52384}],"flag":"","start":19146,"end":19176,"inode":{"change":17,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":52349},"to":{"change":17,"start":52349,"end":52384},"introduced_by":17}],"inode":{"change":17,"pos":586748}},"ins_contents":[{"Add":") -> Result {"}],"del_contents":[{"Del":") -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1311,"ins":{"up_context":[{"change":17,"pos":53375}],"down_context":[{"change":17,"pos":53410}],"flag":"","start":19177,"end":19207,"inode":{"change":17,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":53375},"to":{"change":17,"start":53375,"end":53410},"introduced_by":17}],"inode":{"change":17,"pos":586748}},"ins_contents":[{"Add":") -> Result {"}],"del_contents":[{"Del":") -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1353,"ins":{"up_context":[{"change":17,"pos":54432}],"down_context":[{"change":17,"pos":54465}],"flag":"","start":19208,"end":19236,"inode":{"change":17,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":54432},"to":{"change":17,"start":54432,"end":54465},"introduced_by":17}],"inode":{"change":17,"pos":586748}},"ins_contents":[{"Add":") -> Result<(), T::Error> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1432,"ins":{"up_context":[{"change":17,"pos":2138}],"down_context":[{"change":17,"pos":2171}],"flag":"","start":19237,"end":19271,"inode":{"change":17,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":2138},"to":{"change":17,"start":2138,"end":2171},"introduced_by":17}],"inode":{"change":17,"pos":586748}},"ins_contents":[{"Add":") -> Result<(), std::io::Error> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Edit":{"inode":{"change":17,"pos":650052},"path":"libpijul/src/pristine/channel_dump.rs","line":3,"atom":{"NewVertex":{"up_context":[{"change":17,"pos":650093}],"down_context":[{"change":17,"pos":650093}],"flag":"","start":19272,"end":19477,"inode":{"change":17,"pos":650052}}},"contents":[{"Add":""},{"Add":"#[derive(Debug, Error)]"},{"Add":"pub enum ChannelDumpError {"},{"Add":" #[error(transparent)]"},{"Add":" Txn(T),"},{"Add":" #[error(\"Channel name already exists: {0}\")]"},{"Add":" ChannelNameExists(String),"},{"Add":"}"}]}},{"Replacement":{"inode":{"change":17,"pos":650052},"path":"libpijul/src/pristine/channel_dump.rs","line":309,"ins":{"up_context":[{"change":17,"pos":661301}],"down_context":[{"change":17,"pos":661375}],"flag":"","start":19478,"end":19547,"inode":{"change":17,"pos":650052}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":661301},"to":{"change":17,"start":661301,"end":661375},"introduced_by":17}],"inode":{"change":17,"pos":650052}},"ins_contents":[{"Add":" pub fn read(&mut self, bytes: &[u8]) -> Result {"}],"del_contents":[{"Del":" pub fn read(&mut self, bytes: &[u8]) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":650052},"path":"libpijul/src/pristine/channel_dump.rs","line":395,"ins":{"up_context":[{"change":17,"pos":665110}],"down_context":[{"change":17,"pos":665143}],"flag":"","start":19548,"end":19576,"inode":{"change":17,"pos":650052}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":665110},"to":{"change":17,"start":665110,"end":665143},"introduced_by":17}],"inode":{"change":17,"pos":650052}},"ins_contents":[{"Add":") -> Result<(), T::Error> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Edit":{"inode":{"change":17,"pos":11},"path":"libpijul/src/pristine/block.rs","line":2,"atom":{"NewVertex":{"up_context":[{"change":17,"pos":26}],"down_context":[{"change":17,"pos":26}],"flag":"","start":19577,"end":19696,"inode":{"change":17,"pos":11}}},"contents":[{"Add":""},{"Add":"#[derive(Debug, Error)]"},{"Add":"#[error(\"Block error: {:?}\", block)]"},{"Add":"pub struct BlockError {"},{"Add":" block: Position,"},{"Add":"}"}]}},{"Replacement":{"inode":{"change":17,"pos":11},"path":"libpijul/src/pristine/block.rs","line":14,"ins":{"up_context":[{"change":17,"pos":191}],"down_context":[{"change":17,"pos":237}],"flag":"","start":19697,"end":19741,"inode":{"change":17,"pos":11}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":191},"to":{"change":17,"start":191,"end":237},"introduced_by":17}],"inode":{"change":17,"pos":11}},"ins_contents":[{"Add":") -> Result, BlockError> {"}],"del_contents":[{"Del":") -> Result, crate::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":11},"path":"libpijul/src/pristine/block.rs","line":28,"ins":{"up_context":[{"change":17,"pos":621}],"down_context":[{"change":17,"pos":680}],"flag":"","start":19742,"end":19787,"inode":{"change":17,"pos":11}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":621},"to":{"change":17,"start":621,"end":680},"introduced_by":17}],"inode":{"change":17,"pos":11}},"ins_contents":[{"Add":" return Err(BlockError { block: p });"}],"del_contents":[{"Del":" return Err(crate::Error::WrongBlock { block: p });\n"}]}},{"Replacement":{"inode":{"change":17,"pos":11},"path":"libpijul/src/pristine/block.rs","line":50,"ins":{"up_context":[{"change":17,"pos":1526}],"down_context":[{"change":17,"pos":1589}],"flag":"","start":19788,"end":19837,"inode":{"change":17,"pos":11}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1526},"to":{"change":17,"start":1526,"end":1589},"introduced_by":17}],"inode":{"change":17,"pos":11}},"ins_contents":[{"Add":" return Err(BlockError { block: p });"}],"del_contents":[{"Del":" return Err(crate::Error::WrongBlock { block: p });\n"}]}},{"Replacement":{"inode":{"change":17,"pos":11},"path":"libpijul/src/pristine/block.rs","line":59,"ins":{"up_context":[{"change":17,"pos":1789}],"down_context":[{"change":17,"pos":1836}],"flag":"","start":19838,"end":19871,"inode":{"change":17,"pos":11}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1789},"to":{"change":17,"start":1789,"end":1836},"introduced_by":17}],"inode":{"change":17,"pos":11}},"ins_contents":[{"Add":" Err(BlockError { block: p })"}],"del_contents":[{"Del":" Err(crate::Error::WrongBlock { block: p })\n"}]}},{"Replacement":{"inode":{"change":17,"pos":11},"path":"libpijul/src/pristine/block.rs","line":67,"ins":{"up_context":[{"change":17,"pos":2008}],"down_context":[{"change":17,"pos":2054}],"flag":"","start":19872,"end":19916,"inode":{"change":17,"pos":11}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":2008},"to":{"change":17,"start":2008,"end":2054},"introduced_by":17}],"inode":{"change":17,"pos":11}},"ins_contents":[{"Add":") -> Result, BlockError> {"}],"del_contents":[{"Del":") -> Result, crate::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":11},"path":"libpijul/src/pristine/block.rs","line":81,"ins":{"up_context":[{"change":17,"pos":2477}],"down_context":[{"change":17,"pos":2536}],"flag":"","start":19917,"end":19962,"inode":{"change":17,"pos":11}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":2477},"to":{"change":17,"start":2477,"end":2536},"introduced_by":17}],"inode":{"change":17,"pos":11}},"ins_contents":[{"Add":" return Err(BlockError { block: p });"}],"del_contents":[{"Del":" return Err(crate::Error::WrongBlock { block: p });\n"}]}},{"Replacement":{"inode":{"change":17,"pos":11},"path":"libpijul/src/pristine/block.rs","line":118,"ins":{"up_context":[{"change":17,"pos":3968}],"down_context":[{"change":17,"pos":4019}],"flag":"","start":19963,"end":20000,"inode":{"change":17,"pos":11}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":3968},"to":{"change":17,"start":3968,"end":4019},"introduced_by":17}],"inode":{"change":17,"pos":11}},"ins_contents":[{"Add":" Err(BlockError { block: p })"}],"del_contents":[{"Del":" Err(crate::Error::WrongBlock { block: p })\n"}]}},{"Edit":{"inode":{"change":17,"pos":671807},"path":"libpijul/src/output/output.rs","line":1,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":671807},"to":{"change":17,"start":671808,"end":671863},"introduced_by":17}],"inode":{"change":17,"pos":671807}}},"contents":[{"Del":"// org id YWj26SRzNLfGg2Qeglz9QVnhMTU+0+RMuMvr6DwSA38=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":671807},"path":"libpijul/src/output/output.rs","line":3,"ins":{"up_context":[{"change":17,"pos":671995}],"down_context":[{"change":17,"pos":672038}],"flag":"","start":20001,"end":20078,"inode":{"change":17,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":671995},"to":{"change":17,"start":671995,"end":672038},"introduced_by":17}],"inode":{"change":17,"pos":671807}},"ins_contents":[{"Add":"use super::{collect_children, OutputError, OutputItem, PristineOutputError};"}],"del_contents":[{"Del":"use super::{collect_children, OutputItem};\n"}]}},{"Edit":{"inode":{"change":17,"pos":671807},"path":"libpijul/src/output/output.rs","line":14,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":672377},"to":{"change":17,"start":672377,"end":672432},"introduced_by":17}],"inode":{"change":17,"pos":671807}}},"contents":[{"Del":"// org id LRtRE+PMuzBEsI/KgD1sy2W/K0f0HAN70rZlknlfCWs=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":671807},"path":"libpijul/src/output/output.rs","line":24,"ins":{"up_context":[{"change":17,"pos":672755}],"down_context":[{"change":17,"pos":672810}],"flag":"","start":20079,"end":20080,"inode":{"change":17,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":672755},"to":{"change":17,"start":672755,"end":672810},"introduced_by":17}],"inode":{"change":17,"pos":671807}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":"// org id 0ve7DFbo4xqHFBVPHbChT6lFMPwRxbNcxRs4Yzsb6rs=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":671807},"path":"libpijul/src/output/output.rs","line":37,"ins":{"up_context":[{"change":17,"pos":673225}],"down_context":[{"change":17,"pos":673269}],"flag":"","start":20081,"end":20153,"inode":{"change":17,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":673225},"to":{"change":17,"start":673225,"end":673269},"introduced_by":17}],"inode":{"change":17,"pos":671807}},"ins_contents":[{"Add":") -> Result, OutputError> {"}],"del_contents":[{"Del":") -> Result, anyhow::Error> {\n"}]}},{"Edit":{"inode":{"change":17,"pos":671807},"path":"libpijul/src/output/output.rs","line":49,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":673483},"to":{"change":17,"start":673483,"end":673538},"introduced_by":17}],"inode":{"change":17,"pos":671807}}},"contents":[{"Del":"// org id MpMlEfciwimf8weu0yPEV+/uIP9ErgimOTSV8nipLRA=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":671807},"path":"libpijul/src/output/output.rs","line":63,"ins":{"up_context":[{"change":17,"pos":673828}],"down_context":[{"change":17,"pos":673931}],"flag":"","start":20154,"end":20226,"inode":{"change":17,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":673828},"to":{"change":17,"start":673828,"end":673931},"introduced_by":17}],"inode":{"change":17,"pos":671807}},"ins_contents":[{"Add":") -> Result, OutputError> {"}],"del_contents":[{"Del":") -> Result, anyhow::Error> {\n // org id lpPIIMEW5CckD8tHjyvaRg/qw+G7csmIRQ9jxvSlOrk=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":671807},"path":"libpijul/src/output/output.rs","line":82,"ins":{"up_context":[{"change":17,"pos":674493}],"down_context":[{"change":17,"pos":674537}],"flag":"","start":20227,"end":20282,"inode":{"change":17,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":674493},"to":{"change":17,"start":674493,"end":674537},"introduced_by":17}],"inode":{"change":17,"pos":671807}},"ins_contents":[{"Add":" kill_dead_files::(txn, repo, &dead)?;"}],"del_contents":[{"Del":" kill_dead_files(txn, repo, &dead)?;\n"}]}},{"Edit":{"inode":{"change":17,"pos":671807},"path":"libpijul/src/output/output.rs","line":91,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":674858},"to":{"change":17,"start":674858,"end":674917},"introduced_by":17}],"inode":{"change":17,"pos":671807}}},"contents":[{"Del":" // org id gsYVU8LjyrWgVuIqAeIYTdCP2GY2jK+dVUaY5EM8DZU=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":671807},"path":"libpijul/src/output/output.rs","line":147,"ins":{"up_context":[{"change":17,"pos":677310}],"down_context":[{"change":17,"pos":677425}],"flag":"","start":20283,"end":20338,"inode":{"change":17,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":677310},"to":{"change":17,"start":677310,"end":677425},"introduced_by":17}],"inode":{"change":17,"pos":671807}},"ins_contents":[{"Add":" let inode = move_or_create::("}],"del_contents":[{"Del":" // org id 17m71heSzJMzN/R3aNLLqJlxXhZYglRTUOrHQjDCwVs=\n let inode = move_or_create(\n"}]}},{"Replacement":{"inode":{"change":17,"pos":671807},"path":"libpijul/src/output/output.rs","line":158,"ins":{"up_context":[{"change":17,"pos":677856}],"down_context":[{"change":17,"pos":677912}],"flag":"","start":20339,"end":20406,"inode":{"change":17,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":677856},"to":{"change":17,"start":677856,"end":677912},"introduced_by":17}],"inode":{"change":17,"pos":671807}},"ins_contents":[{"Add":" kill_dead_files::(txn, repo, &dead)?;"}],"del_contents":[{"Del":" kill_dead_files(txn, repo, &dead)?;\n"}]}},{"Edit":{"inode":{"change":17,"pos":671807},"path":"libpijul/src/output/output.rs","line":161,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":677973},"to":{"change":17,"start":677973,"end":678044},"introduced_by":17}],"inode":{"change":17,"pos":671807}}},"contents":[{"Del":" // org id 3dDmtOVITWsw6WH+WZ2gvHHNSFGeGJOf7xMvsclLv0M=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":671807},"path":"libpijul/src/output/output.rs","line":162,"ins":{"up_context":[{"change":17,"pos":678091}],"down_context":[{"change":17,"pos":678140}],"flag":"","start":20407,"end":20515,"inode":{"change":17,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":678091},"to":{"change":17,"start":678091,"end":678140},"introduced_by":17}],"inode":{"change":17,"pos":671807}},"ins_contents":[{"Add":" repo.create_dir_all(&path)"},{"Add":" .map_err(OutputError::WorkingCopy)?;"}],"del_contents":[{"Del":" repo.create_dir_all(&path)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":671807},"path":"libpijul/src/output/output.rs","line":176,"ins":{"up_context":[{"change":17,"pos":678585}],"down_context":[{"change":17,"pos":678702}],"flag":"","start":20516,"end":20886,"inode":{"change":17,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":678585},"to":{"change":17,"start":678585,"end":678702},"introduced_by":17}],"inode":{"change":17,"pos":671807}},"ins_contents":[{"Add":" output_file::<_, _, R>("},{"Add":" txn,"},{"Add":" channel,"},{"Add":" changes,"},{"Add":" &output_item,"},{"Add":" &mut conflicts,"},{"Add":" w,"},{"Add":" )"},{"Add":" })"},{"Add":" .map_err(OutputError::from)?"}],"del_contents":[{"Del":" output_file(txn, channel, changes, &output_item, &mut conflicts, w)\n })?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":671807},"path":"libpijul/src/output/output.rs","line":192,"ins":{"up_context":[{"change":17,"pos":678910}],"down_context":[{"change":17,"pos":679059}],"flag":"","start":20887,"end":21020,"inode":{"change":17,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":678910},"to":{"change":17,"start":678910,"end":679059},"introduced_by":17}],"inode":{"change":17,"pos":671807}},"ins_contents":[{"Add":" repo.set_permissions(&path, output_item.meta.permissions())"},{"Add":" .map_err(OutputError::WorkingCopy)?;"}],"del_contents":[{"Del":" // org id 2XIp9np3LpR5M9OuJWMtiEOx57jFCeckeuAd61x3hKU=\n repo.set_permissions(&path, output_item.meta.permissions())?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":671807},"path":"libpijul/src/output/output.rs","line":199,"ins":{"up_context":[{"change":17,"pos":679182}],"down_context":[{"change":17,"pos":679209}],"flag":"","start":21021,"end":21082,"inode":{"change":17,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":679182},"to":{"change":17,"start":679182,"end":679209},"introduced_by":17}],"inode":{"change":17,"pos":671807}},"ins_contents":[{"Add":" repo.rename(a, b).map_err(OutputError::WorkingCopy)?"}],"del_contents":[{"Del":" repo.rename(a, b)?\n"}]}},{"Edit":{"inode":{"change":17,"pos":671807},"path":"libpijul/src/output/output.rs","line":204,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":679236},"to":{"change":17,"start":679236,"end":679291},"introduced_by":17}],"inode":{"change":17,"pos":671807}}},"contents":[{"Del":"// org id zB9X/hdfYcIVLvilzZg7Z+hMNTdYgDxn8Yv0ibiwW9s=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":671807},"path":"libpijul/src/output/output.rs","line":214,"ins":{"up_context":[{"change":17,"pos":679630}],"down_context":[{"change":17,"pos":679732}],"flag":"","start":21083,"end":21147,"inode":{"change":17,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":679630},"to":{"change":17,"start":679630,"end":679732},"introduced_by":17}],"inode":{"change":17,"pos":671807}},"ins_contents":[{"Add":""},{"Add":"fn move_or_create("}],"del_contents":[{"Del":"// org id xBUt7AHfxqCxXNwSBliMDFiMWRNF3c0qpG6MYcEiSH4=\nfn move_or_create(\n"}]}},{"Replacement":{"inode":{"change":17,"pos":671807},"path":"libpijul/src/output/output.rs","line":222,"ins":{"up_context":[{"change":17,"pos":679880}],"down_context":[{"change":17,"pos":679916}],"flag":"","start":21148,"end":21212,"inode":{"change":17,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":679880},"to":{"change":17,"start":679880,"end":679916},"introduced_by":17}],"inode":{"change":17,"pos":671807}},"ins_contents":[{"Add":") -> Result> {"}],"del_contents":[{"Del":") -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":671807},"path":"libpijul/src/output/output.rs","line":229,"ins":{"up_context":[{"change":17,"pos":680136}],"down_context":[{"change":17,"pos":680195}],"flag":"","start":21213,"end":21214,"inode":{"change":17,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":680136},"to":{"change":17,"start":680136,"end":680195},"introduced_by":17}],"inode":{"change":17,"pos":671807}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":" // org id xS/j7ZPMIOAF9NgL2r1xaKrwJI6haZ2eBL0EQyNBgyo=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":671807},"path":"libpijul/src/output/output.rs","line":239,"ins":{"up_context":[{"change":17,"pos":680701}],"down_context":[{"change":17,"pos":680852}],"flag":"","start":21215,"end":21339,"inode":{"change":17,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":680701},"to":{"change":17,"start":2406,"end":2475},"introduced_by":17}],"inode":{"change":17,"pos":671807}},"ins_contents":[{"Add":" del_tree_with_rev(txn, parent.as_file_id(), inode)"},{"Add":" .map_err(PristineOutputError::Txn)?;"}],"del_contents":[{"Del":" del_tree_with_rev(txn, parent.as_file_id(), inode)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":671807},"path":"libpijul/src/output/output.rs","line":251,"ins":{"up_context":[{"change":17,"pos":681223}],"down_context":[{"change":17,"pos":681279}],"flag":"","start":21340,"end":21451,"inode":{"change":17,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":681223},"to":{"change":17,"start":681223,"end":681279},"introduced_by":17}],"inode":{"change":17,"pos":671807}},"ins_contents":[{"Add":" repo.rename(¤t_name, &tmp_path)"},{"Add":" .map_err(OutputError::WorkingCopy)?;"}],"del_contents":[{"Del":" repo.rename(¤t_name, &tmp_path)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":671807},"path":"libpijul/src/output/output.rs","line":258,"ins":{"up_context":[{"change":17,"pos":681523}],"down_context":[{"change":17,"pos":681602}],"flag":"","start":21452,"end":21589,"inode":{"change":17,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":681523},"to":{"change":17,"start":681523,"end":681602},"introduced_by":17}],"inode":{"change":17,"pos":671807}},"ins_contents":[{"Add":" crate::fs::rec_delete(txn, file_id.clone(), inode, true)"},{"Add":" .map_err(PristineOutputError::Fs)?;"}],"del_contents":[{"Del":" crate::fs::rec_delete(txn, file_id.clone(), inode, true)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":671807},"path":"libpijul/src/output/output.rs","line":261,"ins":{"up_context":[{"change":17,"pos":681620}],"down_context":[{"change":17,"pos":681836}],"flag":"","start":21590,"end":21804,"inode":{"change":17,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":681620},"to":{"change":17,"start":1662,"end":1729},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1729},"to":{"change":17,"start":2476,"end":2534},"introduced_by":17}],"inode":{"change":17,"pos":671807}},"ins_contents":[{"Add":" put_inodes_with_rev(txn, inode, output_item.pos)"},{"Add":" .map_err(PristineOutputError::Txn)?;"},{"Add":" put_tree_with_rev(txn, file_id_, inode).map_err(PristineOutputError::Txn)?;"}],"del_contents":[{"Del":" put_inodes_with_rev(txn, inode, output_item.pos)?;\n"},{"Del":" put_tree_with_rev(txn, file_id_, inode)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":671807},"path":"libpijul/src/output/output.rs","line":268,"ins":{"up_context":[{"change":17,"pos":682008}],"down_context":[{"change":17,"pos":682083}],"flag":"","start":21805,"end":21934,"inode":{"change":17,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":682008},"to":{"change":17,"start":682008,"end":682083},"introduced_by":17}],"inode":{"change":17,"pos":671807}},"ins_contents":[{"Add":" crate::fs::rec_delete(txn, file_id.clone(), inode, true)"},{"Add":" .map_err(PristineOutputError::Fs)?;"}],"del_contents":[{"Del":" crate::fs::rec_delete(txn, file_id.clone(), inode, true)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":671807},"path":"libpijul/src/output/output.rs","line":271,"ins":{"up_context":[{"change":17,"pos":682097}],"down_context":[{"change":17,"pos":682297}],"flag":"","start":21935,"end":22120,"inode":{"change":17,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":682097},"to":{"change":17,"start":1730,"end":1793},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1793},"to":{"change":17,"start":2535,"end":2589},"introduced_by":17}],"inode":{"change":17,"pos":671807}},"ins_contents":[{"Add":" put_inodes_with_rev(txn, inode, output_item.pos).map_err(PristineOutputError::Txn)?;"},{"Add":" put_tree_with_rev(txn, file_id_, inode).map_err(PristineOutputError::Txn)?;"}],"del_contents":[{"Del":" put_inodes_with_rev(txn, inode, output_item.pos)?;\n"},{"Del":" put_tree_with_rev(txn, file_id_, inode)?;\n"}]}},{"Edit":{"inode":{"change":17,"pos":671807},"path":"libpijul/src/output/output.rs","line":275,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":682325},"to":{"change":17,"start":682325,"end":682384},"introduced_by":17}],"inode":{"change":17,"pos":671807}}},"contents":[{"Del":" // org id uwWMiVIILtuAREerIsrWeLRjSBFCxhZtjJRLJ1BhHqQ=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":671807},"path":"libpijul/src/output/output.rs","line":277,"ins":{"up_context":[{"change":17,"pos":682457}],"down_context":[{"change":17,"pos":682528}],"flag":"","start":22121,"end":22242,"inode":{"change":17,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":682457},"to":{"change":17,"start":682457,"end":682528},"introduced_by":17}],"inode":{"change":17,"pos":671807}},"ins_contents":[{"Add":" crate::fs::rec_delete(txn, file_id.clone(), inode, true)"},{"Add":" .map_err(PristineOutputError::Fs)?;"}],"del_contents":[{"Del":" crate::fs::rec_delete(txn, file_id.clone(), inode, true)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":671807},"path":"libpijul/src/output/output.rs","line":285,"ins":{"up_context":[{"change":17,"pos":682701}],"down_context":[{"change":17,"pos":682885}],"flag":"","start":22243,"end":22420,"inode":{"change":17,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":682701},"to":{"change":17,"start":1794,"end":1853},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1853},"to":{"change":17,"start":2590,"end":2640},"introduced_by":17}],"inode":{"change":17,"pos":671807}},"ins_contents":[{"Add":" put_inodes_with_rev(txn, inode, output_item.pos).map_err(PristineOutputError::Txn)?;"},{"Add":" put_tree_with_rev(txn, file_id_, inode).map_err(PristineOutputError::Txn)?;"}],"del_contents":[{"Del":" put_inodes_with_rev(txn, inode, output_item.pos)?;\n"},{"Del":" put_tree_with_rev(txn, file_id_, inode)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":671807},"path":"libpijul/src/output/output.rs","line":290,"ins":{"up_context":[{"change":17,"pos":682911}],"down_context":[{"change":17,"pos":683010}],"flag":"","start":22421,"end":22482,"inode":{"change":17,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":682911},"to":{"change":17,"start":682911,"end":683010},"introduced_by":17}],"inode":{"change":17,"pos":671807}},"ins_contents":[{"Add":""},{"Add":"fn output_file("}],"del_contents":[{"Del":"// org id GN2HnMRazrBbQEPBgPOj2kiaHsrz9CfnCmvfQnMs+gU=\nfn output_file(\n"}]}},{"Replacement":{"inode":{"change":17,"pos":671807},"path":"libpijul/src/output/output.rs","line":298,"ins":{"up_context":[{"change":17,"pos":683171}],"down_context":[{"change":17,"pos":683204}],"flag":"","start":22483,"end":22544,"inode":{"change":17,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":683171},"to":{"change":17,"start":683171,"end":683204},"introduced_by":17}],"inode":{"change":17,"pos":671807}},"ins_contents":[{"Add":") -> Result<(), OutputError> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":671807},"path":"libpijul/src/output/output.rs","line":302,"ins":{"up_context":[{"change":17,"pos":683381}],"down_context":[{"change":17,"pos":683460}],"flag":"","start":22545,"end":22668,"inode":{"change":17,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":683381},"to":{"change":17,"start":683381,"end":683460},"introduced_by":17}],"inode":{"change":17,"pos":671807}},"ins_contents":[{"Add":" alive::output_graph(changes, txn, channel, &mut f, &mut l, &mut forward)"},{"Add":" .map_err(PristineOutputError::from)?;"}],"del_contents":[{"Del":" alive::output_graph(changes, txn, channel, &mut f, &mut l, &mut forward)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":671807},"path":"libpijul/src/output/output.rs","line":308,"ins":{"up_context":[{"change":17,"pos":683698}],"down_context":[{"change":17,"pos":683785}],"flag":"","start":22669,"end":22804,"inode":{"change":17,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":683698},"to":{"change":17,"start":55840,"end":55928},"introduced_by":17}],"inode":{"change":17,"pos":671807}},"ins_contents":[{"Add":" del_graph_with_rev(txn, channel, edge.flag, vertex, dest, edge.introduced_by)"},{"Add":" .map_err(PristineOutputError::Txn)?;"}],"del_contents":[{"Del":" del_graph_with_rev(txn, channel, edge.flag, vertex, dest, edge.introduced_by)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":671807},"path":"libpijul/src/output/output.rs","line":313,"ins":{"up_context":[{"change":17,"pos":683804}],"down_context":[{"change":17,"pos":683859}],"flag":"","start":22805,"end":22806,"inode":{"change":17,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":683804},"to":{"change":17,"start":683804,"end":683859},"introduced_by":17}],"inode":{"change":17,"pos":671807}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":"// org id 4uIws8SX4Pc6k8n8Gg5W8ukCH1XvjAWIViBruFTA6rg=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":671807},"path":"libpijul/src/output/output.rs","line":357,"ins":{"up_context":[{"change":17,"pos":685348}],"down_context":[{"change":17,"pos":685451}],"flag":"","start":22807,"end":22872,"inode":{"change":17,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":685348},"to":{"change":17,"start":685348,"end":685451},"introduced_by":17}],"inode":{"change":17,"pos":671807}},"ins_contents":[{"Add":""},{"Add":"fn kill_dead_files("}],"del_contents":[{"Del":"// org id qtncQESQX2X6uNqryalEkYZlRV7d5PeDxHnU2aIx/XA=\nfn kill_dead_files(\n"}]}},{"Replacement":{"inode":{"change":17,"pos":671807},"path":"libpijul/src/output/output.rs","line":362,"ins":{"up_context":[{"change":17,"pos":685544}],"down_context":[{"change":17,"pos":685577}],"flag":"","start":22873,"end":22934,"inode":{"change":17,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":685544},"to":{"change":17,"start":685544,"end":685577},"introduced_by":17}],"inode":{"change":17,"pos":671807}},"ins_contents":[{"Add":") -> Result<(), OutputError> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":671807},"path":"libpijul/src/output/output.rs","line":365,"ins":{"up_context":[{"change":17,"pos":685693}],"down_context":[{"change":17,"pos":685885}],"flag":"","start":22935,"end":23031,"inode":{"change":17,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":685693},"to":{"change":17,"start":2641,"end":2703},"introduced_by":17}],"inode":{"change":17,"pos":671807}},"ins_contents":[{"Add":" del_tree_with_rev(txn, fileid.as_file_id(), *inode).map_err(PristineOutputError::Txn)?;"}],"del_contents":[{"Del":" del_tree_with_rev(txn, fileid.as_file_id(), *inode)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":671807},"path":"libpijul/src/output/output.rs","line":368,"ins":{"up_context":[{"change":17,"pos":2768}],"down_context":[{"change":17,"pos":686069}],"flag":"","start":23032,"end":23121,"inode":{"change":17,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":2768},"to":{"change":17,"start":2768,"end":2823},"introduced_by":17}],"inode":{"change":17,"pos":671807}},"ins_contents":[{"Add":" del_inodes_with_rev(txn, *inode, vertex).map_err(PristineOutputError::Txn)?;"}],"del_contents":[{"Del":" del_inodes_with_rev(txn, *inode, vertex)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":671807},"path":"libpijul/src/output/output.rs","line":371,"ins":{"up_context":[{"change":17,"pos":686114}],"down_context":[{"change":17,"pos":686151}],"flag":"","start":23122,"end":23193,"inode":{"change":17,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":686114},"to":{"change":17,"start":686114,"end":686151},"introduced_by":17}],"inode":{"change":17,"pos":671807}},"ins_contents":[{"Add":" repo.remove_path(&name).map_err(OutputError::WorkingCopy)?"}],"del_contents":[{"Del":" repo.remove_path(&name)?\n"}]}},{"Edit":{"inode":{"change":17,"pos":686190},"path":"libpijul/src/output/mod.rs","line":11,"atom":{"NewVertex":{"up_context":[{"change":17,"pos":686366}],"down_context":[{"change":17,"pos":686366}],"flag":"","start":23194,"end":24779,"inode":{"change":17,"pos":686190}}},"contents":[{"Add":"#[derive(Debug, Error)]"},{"Add":"pub enum OutputError<"},{"Add":" ChangestoreError: std::error::Error + 'static,"},{"Add":" Txn: std::error::Error + 'static,"},{"Add":" W: std::error::Error + 'static,"},{"Add":"> {"},{"Add":" #[error(\"Working copy error: {0}\")]"},{"Add":" WorkingCopy(W),"},{"Add":" #[error(transparent)]"},{"Add":" Pristine(#[from] PristineOutputError),"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Debug, Error)]"},{"Add":"pub enum PristineOutputError"},{"Add":"{"},{"Add":" #[error(transparent)]"},{"Add":" Txn(Txn),"},{"Add":" #[error(\"Changestore error: {0}\")]"},{"Add":" Changestore(ChangestoreError),"},{"Add":" #[error(transparent)]"},{"Add":" Io(#[from] std::io::Error),"},{"Add":" #[error(transparent)]"},{"Add":" Fs(#[from] crate::fs::FsError),"},{"Add":"}"},{"Add":""},{"Add":"use crate::working_copy::WriteError;"},{"Add":""},{"Add":"impl"},{"Add":" OutputError"},{"Add":"{"},{"Add":" fn from(e: WriteError) -> Self {"},{"Add":" match e {"},{"Add":" WriteError::Io(e) => OutputError::Pristine(PristineOutputError::Io(e)),"},{"Add":" WriteError::E(e) => e,"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Debug, Error)]"},{"Add":"pub enum FileError {"},{"Add":" #[error(transparent)]"},{"Add":" Changestore(ChangestoreError),"},{"Add":" #[error(transparent)]"},{"Add":" Io(#[from] std::io::Error),"},{"Add":"}"},{"Add":""},{"Add":"impl From>"},{"Add":" for PristineOutputError"},{"Add":"{"},{"Add":" fn from(e: FileError) -> Self {"},{"Add":" match e {"},{"Add":" FileError::Changestore(e) => PristineOutputError::Changestore(e),"},{"Add":" FileError::Io(e) => PristineOutputError::Io(e),"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""}]}},{"Replacement":{"inode":{"change":17,"pos":686190},"path":"libpijul/src/output/mod.rs","line":87,"ins":{"up_context":[{"change":17,"pos":686842}],"down_context":[{"change":17,"pos":686875}],"flag":"","start":24780,"end":24839,"inode":{"change":17,"pos":686190}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":686842},"to":{"change":17,"start":686842,"end":686875},"introduced_by":17}],"inode":{"change":17,"pos":686190}},"ins_contents":[{"Add":") -> Result<(), PristineOutputError> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Edit":{"inode":{"change":17,"pos":686190},"path":"libpijul/src/output/mod.rs","line":105,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":687287},"to":{"change":17,"start":687287,"end":687350},"introduced_by":17}],"inode":{"change":17,"pos":686190}}},"contents":[{"Del":" // org id Gb4FgVTFFkCPgh6xtUjeL/ntA6wAsIKhRiiX/8b4Jy8=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":686190},"path":"libpijul/src/output/mod.rs","line":108,"ins":{"up_context":[{"change":17,"pos":687519}],"down_context":[{"change":17,"pos":687603}],"flag":"","start":24840,"end":24999,"inode":{"change":17,"pos":686190}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":687519},"to":{"change":17,"start":687519,"end":687603},"introduced_by":17}],"inode":{"change":17,"pos":686190}},"ins_contents":[{"Add":" changes"},{"Add":" .get_contents(|h| txn.get_external(h), name_vertex, &mut name_buf)"},{"Add":" .map_err(|e| PristineOutputError::Changestore(e))?;"}],"del_contents":[{"Del":" changes.get_contents(|h| txn.get_external(h), name_vertex, &mut name_buf)?;\n"}]}},{"Edit":{"inode":{"change":17,"pos":686190},"path":"libpijul/src/output/mod.rs","line":124,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":688082},"to":{"change":17,"start":688082,"end":688145},"introduced_by":17}],"inode":{"change":17,"pos":686190}}},"contents":[{"Del":" // org id RFCdVpFfGZuILPerwkNtNS2jmRrxrMOGl0kh7aVMVmM=\n"}]}},{"Edit":{"inode":{"change":17,"pos":690044},"path":"libpijul/src/output/archive.rs","line":9,"atom":{"NewVertex":{"up_context":[{"change":17,"pos":690250}],"down_context":[{"change":17,"pos":690250}],"flag":"","start":25000,"end":25035,"inode":{"change":17,"pos":690044}}},"contents":[{"Add":" type Error: std::error::Error;"}]}},{"Replacement":{"inode":{"change":17,"pos":690044},"path":"libpijul/src/output/archive.rs","line":11,"ins":{"up_context":[{"change":17,"pos":690318}],"down_context":[{"change":17,"pos":690392}],"flag":"","start":25036,"end":25108,"inode":{"change":17,"pos":690044}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":690318},"to":{"change":17,"start":690318,"end":690392},"introduced_by":17}],"inode":{"change":17,"pos":690044}},"ins_contents":[{"Add":" fn close_file(&mut self, f: Self::File) -> Result<(), Self::Error>;"}],"del_contents":[{"Del":" fn close_file(&mut self, f: Self::File) -> Result<(), anyhow::Error>;\n"}]}},{"Edit":{"inode":{"change":17,"pos":690044},"path":"libpijul/src/output/archive.rs","line":53,"atom":{"NewVertex":{"up_context":[{"change":17,"pos":691376}],"down_context":[{"change":17,"pos":691376}],"flag":"","start":25109,"end":25142,"inode":{"change":17,"pos":690044}}},"contents":[{"Add":" type Error = std::io::Error;"}]}},{"Replacement":{"inode":{"change":17,"pos":690044},"path":"libpijul/src/output/archive.rs","line":66,"ins":{"up_context":[{"change":17,"pos":691768}],"down_context":[{"change":17,"pos":691846}],"flag":"","start":25143,"end":25219,"inode":{"change":17,"pos":690044}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":691768},"to":{"change":17,"start":691768,"end":691846},"introduced_by":17}],"inode":{"change":17,"pos":690044}},"ins_contents":[{"Add":" fn close_file(&mut self, file: Self::File) -> Result<(), Self::Error> {"}],"del_contents":[{"Del":" fn close_file(&mut self, file: Self::File) -> Result<(), anyhow::Error> {\n"}]}},{"Edit":{"inode":{"change":17,"pos":690044},"path":"libpijul/src/output/archive.rs","line":76,"atom":{"NewVertex":{"up_context":[{"change":17,"pos":692166}],"down_context":[{"change":17,"pos":692166}],"flag":"","start":25220,"end":25879,"inode":{"change":17,"pos":690044}}},"contents":[{"Add":"}"},{"Add":""},{"Add":"#[derive(Debug, Error)]"},{"Add":"pub enum ArchiveError<"},{"Add":" P: std::error::Error + 'static,"},{"Add":" T: std::error::Error + 'static,"},{"Add":" A: std::error::Error + 'static,"},{"Add":"> {"},{"Add":" #[error(transparent)]"},{"Add":" A(A),"},{"Add":" #[error(transparent)]"},{"Add":" Txn(T),"},{"Add":" #[error(transparent)]"},{"Add":" Unrecord(#[from] crate::unrecord::UnrecordError),"},{"Add":" #[error(transparent)]"},{"Add":" Apply(#[from] crate::apply::ApplyError),"},{"Add":" #[error(\"State not found: {:?}\", state)]"},{"Add":" StateNotFound { state: crate::pristine::Merkle },"},{"Add":" #[error(transparent)]"},{"Add":" File(#[from] crate::output::FileError

),"},{"Add":" #[error(transparent)]"},{"Add":" Output(#[from] crate::output::PristineOutputError),"}]}},{"Replacement":{"inode":{"change":17,"pos":690044},"path":"libpijul/src/output/archive.rs","line":106,"ins":{"up_context":[{"change":17,"pos":692359}],"down_context":[{"change":17,"pos":692403}],"flag":"","start":25880,"end":25953,"inode":{"change":17,"pos":690044}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":692359},"to":{"change":17,"start":692359,"end":692403},"introduced_by":17}],"inode":{"change":17,"pos":690044}},"ins_contents":[{"Add":") -> Result, ArchiveError> {"}],"del_contents":[{"Del":") -> Result, anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":690044},"path":"libpijul/src/output/archive.rs","line":203,"ins":{"up_context":[{"change":17,"pos":696086}],"down_context":[{"change":17,"pos":696127}],"flag":"","start":25954,"end":26020,"inode":{"change":17,"pos":690044}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":696086},"to":{"change":17,"start":696086,"end":696127},"introduced_by":17}],"inode":{"change":17,"pos":690044}},"ins_contents":[{"Add":" arch.close_file(f).map_err(ArchiveError::A)?;"}],"del_contents":[{"Del":" arch.close_file(f)?;\n"}]}},{"Edit":{"inode":{"change":17,"pos":696460},"path":"libpijul/src/missing_context.rs","line":1,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":696460},"to":{"change":17,"start":696461,"end":696516},"introduced_by":17}],"inode":{"change":17,"pos":696460}}},"contents":[{"Del":"// org id 58v3AKimretz5he0vs+xqV3r0G0SNrO0HFWAzfAI/50=\n"}]}},{"Edit":{"inode":{"change":17,"pos":696460},"path":"libpijul/src/missing_context.rs","line":7,"atom":{"NewVertex":{"up_context":[{"change":17,"pos":696706}],"down_context":[{"change":17,"pos":696706}],"flag":"","start":26021,"end":26285,"inode":{"change":17,"pos":696460}}},"contents":[{"Add":""},{"Add":"#[derive(Debug, Error)]"},{"Add":"pub enum MissingError {"},{"Add":" #[error(transparent)]"},{"Add":" Txn(TxnError),"},{"Add":" #[error(transparent)]"},{"Add":" Block(#[from] BlockError),"},{"Add":" #[error(transparent)]"},{"Add":" Inconsistent(#[from] InconsistentChange),"},{"Add":"}"}]}},{"Replacement":{"inode":{"change":17,"pos":696460},"path":"libpijul/src/missing_context.rs","line":24,"ins":{"up_context":[{"change":17,"pos":696868}],"down_context":[{"change":17,"pos":696955}],"flag":"","start":26286,"end":26379,"inode":{"change":17,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":696868},"to":{"change":17,"start":696868,"end":696955},"introduced_by":17}],"inode":{"change":17,"pos":696460}},"ins_contents":[{"Add":" ) -> Result, VertexId>)>, InconsistentChange> {"}],"del_contents":[{"Del":" ) -> Result, VertexId>)>, crate::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":696460},"path":"libpijul/src/missing_context.rs","line":33,"ins":{"up_context":[{"change":17,"pos":697325}],"down_context":[{"change":17,"pos":697406}],"flag":"","start":26380,"end":26443,"inode":{"change":17,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":697325},"to":{"change":17,"start":566,"end":640},"introduced_by":17}],"inode":{"change":17,"pos":696460}},"ins_contents":[{"Add":" return Err(InconsistentChange {});"}],"del_contents":[{"Del":" return Err(crate::Error::InconsistentChange);\n"}]}},{"Replacement":{"inode":{"change":17,"pos":696460},"path":"libpijul/src/missing_context.rs","line":51,"ins":{"up_context":[{"change":17,"pos":697950}],"down_context":[{"change":17,"pos":698005}],"flag":"","start":26444,"end":26445,"inode":{"change":17,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":697950},"to":{"change":17,"start":697950,"end":698005},"introduced_by":17}],"inode":{"change":17,"pos":696460}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":"// org id CwY6M+Aa91RfVAJkIYG3StPNDxg5S2/Q0RJB2eWlhFg=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":696460},"path":"libpijul/src/missing_context.rs","line":64,"ins":{"up_context":[{"change":17,"pos":698287}],"down_context":[{"change":17,"pos":698320}],"flag":"","start":26446,"end":26488,"inode":{"change":17,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":698287},"to":{"change":17,"start":698287,"end":698320},"introduced_by":17}],"inode":{"change":17,"pos":696460}},"ins_contents":[{"Add":") -> Result<(), MissingError> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":696460},"path":"libpijul/src/missing_context.rs","line":103,"ins":{"up_context":[{"change":17,"pos":699639}],"down_context":[{"change":17,"pos":699655}],"flag":"","start":26489,"end":26545,"inode":{"change":17,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":699639},"to":{"change":17,"start":699639,"end":699655},"introduced_by":17}],"inode":{"change":17,"pos":696460}},"ins_contents":[{"Add":" )"},{"Add":" .map_err(MissingError::Txn)?;"}],"del_contents":[{"Del":" )?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":696460},"path":"libpijul/src/missing_context.rs","line":114,"ins":{"up_context":[{"change":17,"pos":699886}],"down_context":[{"change":17,"pos":699902}],"flag":"","start":26546,"end":26602,"inode":{"change":17,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":699886},"to":{"change":17,"start":699886,"end":699902},"introduced_by":17}],"inode":{"change":17,"pos":696460}},"ins_contents":[{"Add":" )"},{"Add":" .map_err(MissingError::Txn)?;"}],"del_contents":[{"Del":" )?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":696460},"path":"libpijul/src/missing_context.rs","line":126,"ins":{"up_context":[{"change":17,"pos":700095}],"down_context":[{"change":17,"pos":700128}],"flag":"","start":26603,"end":26645,"inode":{"change":17,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":700095},"to":{"change":17,"start":700095,"end":700128},"introduced_by":17}],"inode":{"change":17,"pos":696460}},"ins_contents":[{"Add":") -> Result<(), MissingError> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":696460},"path":"libpijul/src/missing_context.rs","line":142,"ins":{"up_context":[{"change":17,"pos":700557}],"down_context":[{"change":17,"pos":700569}],"flag":"","start":26646,"end":26694,"inode":{"change":17,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":700557},"to":{"change":17,"start":700557,"end":700569},"introduced_by":17}],"inode":{"change":17,"pos":696460}},"ins_contents":[{"Add":" )"},{"Add":" .map_err(MissingError::Txn)?;"}],"del_contents":[{"Del":" )?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":696460},"path":"libpijul/src/missing_context.rs","line":147,"ins":{"up_context":[{"change":17,"pos":700588}],"down_context":[{"change":17,"pos":700643}],"flag":"","start":26695,"end":26696,"inode":{"change":17,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":700588},"to":{"change":17,"start":700588,"end":700643},"introduced_by":17}],"inode":{"change":17,"pos":696460}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":"// org id 33iwKoFwpXhCt1MdikUmkOn7apYc7yMUk23JBOUn5mg=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":696460},"path":"libpijul/src/missing_context.rs","line":159,"ins":{"up_context":[{"change":17,"pos":700904}],"down_context":[{"change":17,"pos":700937}],"flag":"","start":26697,"end":26739,"inode":{"change":17,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":700904},"to":{"change":17,"start":700904,"end":700937},"introduced_by":17}],"inode":{"change":17,"pos":696460}},"ins_contents":[{"Add":") -> Result<(), MissingError> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":696460},"path":"libpijul/src/missing_context.rs","line":189,"ins":{"up_context":[{"change":17,"pos":57371}],"down_context":[{"change":17,"pos":701825}],"flag":"","start":26740,"end":26796,"inode":{"change":17,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":57371},"to":{"change":17,"start":57371,"end":57387},"introduced_by":17}],"inode":{"change":17,"pos":696460}},"ins_contents":[{"Add":" )"},{"Add":" .map_err(MissingError::Txn)?;"}],"del_contents":[{"Del":" )?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":696460},"path":"libpijul/src/missing_context.rs","line":195,"ins":{"up_context":[{"change":17,"pos":701854}],"down_context":[{"change":17,"pos":701909}],"flag":"","start":26797,"end":26798,"inode":{"change":17,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":701854},"to":{"change":17,"start":701854,"end":701909},"introduced_by":17}],"inode":{"change":17,"pos":696460}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":"// org id GMesFpbMkVsOgAOjes5yxc060bclzWVMLh5KLd/KQc8=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":696460},"path":"libpijul/src/missing_context.rs","line":204,"ins":{"up_context":[{"change":17,"pos":702145}],"down_context":[{"change":17,"pos":702176}],"flag":"","start":26799,"end":26839,"inode":{"change":17,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":702145},"to":{"change":17,"start":702145,"end":702176},"introduced_by":17}],"inode":{"change":17,"pos":696460}},"ins_contents":[{"Add":") -> Result<(), MissingError>"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error>\n"}]}},{"Edit":{"inode":{"change":17,"pos":696460},"path":"libpijul/src/missing_context.rs","line":296,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":705750},"to":{"change":17,"start":705750,"end":705805},"introduced_by":17}],"inode":{"change":17,"pos":696460}}},"contents":[{"Del":"// org id OfylSf5taky9lfC0119yeNkCZSw55LxD7HNIT7E0TO8=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":696460},"path":"libpijul/src/missing_context.rs","line":304,"ins":{"up_context":[{"change":17,"pos":706038}],"down_context":[{"change":17,"pos":706069}],"flag":"","start":26840,"end":26880,"inode":{"change":17,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":706038},"to":{"change":17,"start":706038,"end":706069},"introduced_by":17}],"inode":{"change":17,"pos":696460}},"ins_contents":[{"Add":") -> Result<(), MissingError>"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error>\n"}]}},{"Replacement":{"inode":{"change":17,"pos":696460},"path":"libpijul/src/missing_context.rs","line":322,"ins":{"up_context":[{"change":17,"pos":706666}],"down_context":[{"change":17,"pos":706721}],"flag":"","start":26881,"end":26882,"inode":{"change":17,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":706666},"to":{"change":17,"start":706666,"end":706721},"introduced_by":17}],"inode":{"change":17,"pos":696460}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":"// org id ueoLxafjHlJdBaAESsgdkbWhSKPGMpMkuFiROTxbrSM=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":696460},"path":"libpijul/src/missing_context.rs","line":424,"ins":{"up_context":[{"change":17,"pos":709559}],"down_context":[{"change":17,"pos":709590}],"flag":"","start":26883,"end":26923,"inode":{"change":17,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":709559},"to":{"change":17,"start":709559,"end":709590},"introduced_by":17}],"inode":{"change":17,"pos":696460}},"ins_contents":[{"Add":") -> Result<(), MissingError>"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error>\n"}]}},{"Edit":{"inode":{"change":17,"pos":696460},"path":"libpijul/src/missing_context.rs","line":428,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":709626},"to":{"change":17,"start":709626,"end":709685},"introduced_by":17}],"inode":{"change":17,"pos":696460}}},"contents":[{"Del":" // org id HPoxuN+RIwX+UvJZERkZAFK6+F5MEAFM39nnpnXs9YY=\n"}]}},{"Edit":{"inode":{"change":17,"pos":696460},"path":"libpijul/src/missing_context.rs","line":439,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":710193},"to":{"change":17,"start":710193,"end":710260},"introduced_by":17}],"inode":{"change":17,"pos":696460}}},"contents":[{"Del":" // org id izc8DKE2hSSCYLTpux0cTTOqoMvRdn35r2Hfrdyq82w=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":696460},"path":"libpijul/src/missing_context.rs","line":447,"ins":{"up_context":[{"change":17,"pos":710515}],"down_context":[{"change":17,"pos":710531}],"flag":"","start":26924,"end":26980,"inode":{"change":17,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":710515},"to":{"change":17,"start":710515,"end":710531},"introduced_by":17}],"inode":{"change":17,"pos":696460}},"ins_contents":[{"Add":" )"},{"Add":" .map_err(MissingError::Txn)?;"}],"del_contents":[{"Del":" )?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":696460},"path":"libpijul/src/missing_context.rs","line":460,"ins":{"up_context":[{"change":17,"pos":710962}],"down_context":[{"change":17,"pos":710986}],"flag":"","start":26981,"end":27053,"inode":{"change":17,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":710962},"to":{"change":17,"start":710962,"end":710986},"introduced_by":17}],"inode":{"change":17,"pos":696460}},"ins_contents":[{"Add":" )"},{"Add":" .map_err(MissingError::Txn)?;"}],"del_contents":[{"Del":" )?;\n"}]}},{"Edit":{"inode":{"change":17,"pos":696460},"path":"libpijul/src/missing_context.rs","line":468,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":711106},"to":{"change":17,"start":711106,"end":711169},"introduced_by":17}],"inode":{"change":17,"pos":696460}}},"contents":[{"Del":" // org id Hux8KrdJakJleVXFgumk9t/dqB3Cl95Q0HD49nlsmD4=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":696460},"path":"libpijul/src/missing_context.rs","line":484,"ins":{"up_context":[{"change":17,"pos":711811}],"down_context":[{"change":17,"pos":711844}],"flag":"","start":27054,"end":27096,"inode":{"change":17,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":711811},"to":{"change":17,"start":711811,"end":711844},"introduced_by":17}],"inode":{"change":17,"pos":696460}},"ins_contents":[{"Add":") -> Result<(), MissingError> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":696460},"path":"libpijul/src/missing_context.rs","line":502,"ins":{"up_context":[{"change":17,"pos":712486}],"down_context":[{"change":17,"pos":712510}],"flag":"","start":27097,"end":27169,"inode":{"change":17,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":712486},"to":{"change":17,"start":712486,"end":712510},"introduced_by":17}],"inode":{"change":17,"pos":696460}},"ins_contents":[{"Add":" )"},{"Add":" .map_err(MissingError::Txn)?;"}],"del_contents":[{"Del":" )?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":696460},"path":"libpijul/src/missing_context.rs","line":509,"ins":{"up_context":[{"change":17,"pos":59363}],"down_context":[{"change":17,"pos":712749}],"flag":"","start":27170,"end":27318,"inode":{"change":17,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":59363},"to":{"change":17,"start":59363,"end":59459},"introduced_by":17}],"inode":{"change":17,"pos":696460}},"ins_contents":[{"Add":" del_graph_with_rev(txn, channel, e.flag, dest_vertex, p, e.introduced_by)"},{"Add":" .map_err(MissingError::Txn)?;"}],"del_contents":[{"Del":" del_graph_with_rev(txn, channel, e.flag, dest_vertex, p, e.introduced_by)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":696460},"path":"libpijul/src/missing_context.rs","line":526,"ins":{"up_context":[{"change":17,"pos":713044}],"down_context":[{"change":17,"pos":713075}],"flag":"","start":27319,"end":27359,"inode":{"change":17,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":713044},"to":{"change":17,"start":713044,"end":713075},"introduced_by":17}],"inode":{"change":17,"pos":696460}},"ins_contents":[{"Add":") -> Result<(), MissingError>"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error>\n"}]}},{"Replacement":{"inode":{"change":17,"pos":696460},"path":"libpijul/src/missing_context.rs","line":579,"ins":{"up_context":[{"change":17,"pos":714609}],"down_context":[{"change":17,"pos":714642}],"flag":"","start":27360,"end":27402,"inode":{"change":17,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":714609},"to":{"change":17,"start":714609,"end":714642},"introduced_by":17}],"inode":{"change":17,"pos":696460}},"ins_contents":[{"Add":") -> Result<(), MissingError> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":696460},"path":"libpijul/src/missing_context.rs","line":596,"ins":{"up_context":[{"change":17,"pos":715820}],"down_context":[{"change":17,"pos":715840}],"flag":"","start":27403,"end":27467,"inode":{"change":17,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":715820},"to":{"change":17,"start":715820,"end":715840},"introduced_by":17}],"inode":{"change":17,"pos":696460}},"ins_contents":[{"Add":" )"},{"Add":" .map_err(MissingError::Txn)?;"}],"del_contents":[{"Del":" )?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":696460},"path":"libpijul/src/missing_context.rs","line":622,"ins":{"up_context":[{"change":17,"pos":716619}],"down_context":[{"change":17,"pos":716698}],"flag":"","start":27468,"end":27592,"inode":{"change":17,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":716619},"to":{"change":17,"start":60144,"end":60224},"introduced_by":17}],"inode":{"change":17,"pos":696460}},"ins_contents":[{"Add":" put_graph_with_rev(txn, channel, flag, parent_dest, v, change_id)"},{"Add":" .map_err(MissingError::Txn)?;"}],"del_contents":[{"Del":" put_graph_with_rev(txn, channel, flag, parent_dest, v, change_id)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":696460},"path":"libpijul/src/missing_context.rs","line":633,"ins":{"up_context":[{"change":17,"pos":716852}],"down_context":[{"change":17,"pos":716885}],"flag":"","start":27593,"end":27635,"inode":{"change":17,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":716852},"to":{"change":17,"start":716852,"end":716885},"introduced_by":17}],"inode":{"change":17,"pos":696460}},"ins_contents":[{"Add":") -> Result<(), MissingError> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":717381},"path":"libpijul/src/lib.rs","line":94,"ins":{"up_context":[{"change":17,"pos":720137}],"down_context":[{"change":17,"pos":720177}],"flag":"","start":27636,"end":27740,"inode":{"change":17,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":720137},"to":{"change":17,"start":720137,"end":720177},"introduced_by":17}],"inode":{"change":17,"pos":717381}},"ins_contents":[{"Add":"pub use crate::apply::{ApplyError, LocalApplyError};"},{"Add":"pub use crate::fs::{FsError, WorkingCopyIterator};"}],"del_contents":[{"Del":"pub use crate::fs::WorkingCopyIterator;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":717381},"path":"libpijul/src/lib.rs","line":116,"ins":{"up_context":[{"change":17,"pos":720799}],"down_context":[{"change":17,"pos":720857}],"flag":"","start":27741,"end":27833,"inode":{"change":17,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":720799},"to":{"change":17,"start":720799,"end":720857},"introduced_by":17}],"inode":{"change":17,"pos":717381}},"ins_contents":[{"Add":" ) -> Result<(u64, pristine::Merkle), crate::apply::ApplyError> {"}],"del_contents":[{"Del":" ) -> Result<(u64, pristine::Merkle), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":717381},"path":"libpijul/src/lib.rs","line":126,"ins":{"up_context":[{"change":17,"pos":721167}],"down_context":[{"change":17,"pos":721204}],"flag":"","start":27834,"end":27905,"inode":{"change":17,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":721167},"to":{"change":17,"start":721167,"end":721204},"introduced_by":17}],"inode":{"change":17,"pos":717381}},"ins_contents":[{"Add":" ) -> Result<(), crate::apply::ApplyError> {"}],"del_contents":[{"Del":" ) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":717381},"path":"libpijul/src/lib.rs","line":135,"ins":{"up_context":[{"change":17,"pos":721471}],"down_context":[{"change":17,"pos":721529}],"flag":"","start":27906,"end":27998,"inode":{"change":17,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":721471},"to":{"change":17,"start":721471,"end":721529},"introduced_by":17}],"inode":{"change":17,"pos":717381}},"ins_contents":[{"Add":" ) -> Result<(u64, pristine::Merkle), crate::apply::ApplyError> {"}],"del_contents":[{"Del":" ) -> Result<(u64, pristine::Merkle), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":717381},"path":"libpijul/src/lib.rs","line":144,"ins":{"up_context":[{"change":17,"pos":721775}],"down_context":[{"change":17,"pos":721812}],"flag":"","start":27999,"end":28070,"inode":{"change":17,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":721775},"to":{"change":17,"start":721775,"end":721812},"introduced_by":17}],"inode":{"change":17,"pos":717381}},"ins_contents":[{"Add":" ) -> Result<(), crate::apply::ApplyError> {"}],"del_contents":[{"Del":" ) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":717381},"path":"libpijul/src/lib.rs","line":153,"ins":{"up_context":[{"change":17,"pos":722067}],"down_context":[{"change":17,"pos":722104}],"flag":"","start":28071,"end":28142,"inode":{"change":17,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":722067},"to":{"change":17,"start":722067,"end":722104},"introduced_by":17}],"inode":{"change":17,"pos":717381}},"ins_contents":[{"Add":" ) -> Result<(), crate::apply::ApplyError> {"}],"del_contents":[{"Del":" ) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":717381},"path":"libpijul/src/lib.rs","line":164,"ins":{"up_context":[{"change":17,"pos":722441}],"down_context":[{"change":17,"pos":722499}],"flag":"","start":28143,"end":28230,"inode":{"change":17,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":722441},"to":{"change":17,"start":722441,"end":722499},"introduced_by":17}],"inode":{"change":17,"pos":717381}},"ins_contents":[{"Add":" ) -> Result<(u64, pristine::Merkle), crate::apply::LocalApplyError> {"}],"del_contents":[{"Del":" ) -> Result<(u64, pristine::Merkle), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":717381},"path":"libpijul/src/lib.rs","line":174,"ins":{"up_context":[{"change":17,"pos":722831}],"down_context":[{"change":17,"pos":722889}],"flag":"","start":28231,"end":28318,"inode":{"change":17,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":722831},"to":{"change":17,"start":722831,"end":722889},"introduced_by":17}],"inode":{"change":17,"pos":717381}},"ins_contents":[{"Add":" ) -> Result<(u64, pristine::Merkle), crate::apply::LocalApplyError> {"}],"del_contents":[{"Del":" ) -> Result<(u64, pristine::Merkle), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":717381},"path":"libpijul/src/lib.rs","line":186,"ins":{"up_context":[{"change":17,"pos":723283}],"down_context":[{"change":17,"pos":723320}],"flag":"","start":28319,"end":28402,"inode":{"change":17,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":723283},"to":{"change":17,"start":723283,"end":723320},"introduced_by":17}],"inode":{"change":17,"pos":717381}},"ins_contents":[{"Add":" ) -> Result<(), crate::record::RecordError> {"}],"del_contents":[{"Del":" ) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":717381},"path":"libpijul/src/lib.rs","line":197,"ins":{"up_context":[{"change":17,"pos":723681}],"down_context":[{"change":17,"pos":723732}],"flag":"","start":28403,"end":28500,"inode":{"change":17,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":723681},"to":{"change":17,"start":723681,"end":723732},"introduced_by":17}],"inode":{"change":17,"pos":717381}},"ins_contents":[{"Add":" ) -> Result> {"}],"del_contents":[{"Del":" ) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":717381},"path":"libpijul/src/lib.rs","line":208,"ins":{"up_context":[{"change":17,"pos":724094}],"down_context":[{"change":17,"pos":724183}],"flag":"","start":28501,"end":28584,"inode":{"change":17,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":724094},"to":{"change":17,"start":724094,"end":724143},"introduced_by":17}],"inode":{"change":17,"pos":717381}},"ins_contents":[{"Add":" ) -> Result> {"}],"del_contents":[{"Del":" ) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":717381},"path":"libpijul/src/lib.rs","line":232,"ins":{"up_context":[{"change":17,"pos":725022}],"down_context":[{"change":7,"pos":380}],"flag":"","start":28585,"end":28705,"inode":{"change":17,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":725022},"to":{"change":17,"start":725022,"end":725076},"introduced_by":17}],"inode":{"change":17,"pos":717381}},"ins_contents":[{"Add":" let hash = changestore"},{"Add":" .save_change(&change)"},{"Add":" .map_err(apply::ApplyError::Changestore)?;"}],"del_contents":[{"Del":" let hash = changestore.save_change(&change)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":717381},"path":"libpijul/src/lib.rs","line":244,"ins":{"up_context":[{"change":17,"pos":725363}],"down_context":[{"change":17,"pos":725402}],"flag":"","start":28706,"end":28778,"inode":{"change":17,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":725363},"to":{"change":17,"start":725363,"end":725402},"introduced_by":17}],"inode":{"change":17,"pos":717381}},"ins_contents":[{"Add":" ) -> Result> {"}],"del_contents":[{"Del":" ) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":717381},"path":"libpijul/src/lib.rs","line":255,"ins":{"up_context":[{"change":17,"pos":725733}],"down_context":[{"change":17,"pos":725789}],"flag":"","start":28779,"end":28874,"inode":{"change":17,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":725733},"to":{"change":17,"start":725733,"end":725789},"introduced_by":17}],"inode":{"change":17,"pos":717381}},"ins_contents":[{"Add":" ) -> Result, output::OutputError> {"}],"del_contents":[{"Del":" ) -> Result, anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":717381},"path":"libpijul/src/lib.rs","line":269,"ins":{"up_context":[{"change":17,"pos":726194}],"down_context":[{"change":17,"pos":726264}],"flag":"","start":28875,"end":28956,"inode":{"change":17,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":726194},"to":{"change":17,"start":726194,"end":726264},"introduced_by":17}],"inode":{"change":17,"pos":717381}},"ins_contents":[{"Add":" fn add_file(&mut self, path: &str) -> Result<(), fs::FsError> {"}],"del_contents":[{"Del":" fn add_file(&mut self, path: &str) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":717381},"path":"libpijul/src/lib.rs","line":277,"ins":{"up_context":[{"change":17,"pos":726545}],"down_context":[{"change":17,"pos":726614}],"flag":"","start":28957,"end":29037,"inode":{"change":17,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":726545},"to":{"change":17,"start":726545,"end":726614},"introduced_by":17}],"inode":{"change":17,"pos":717381}},"ins_contents":[{"Add":" fn add_dir(&mut self, path: &str) -> Result<(), fs::FsError> {"}],"del_contents":[{"Del":" fn add_dir(&mut self, path: &str) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":717381},"path":"libpijul/src/lib.rs","line":284,"ins":{"up_context":[{"change":17,"pos":726871}],"down_context":[{"change":17,"pos":726950}],"flag":"","start":29038,"end":29128,"inode":{"change":17,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":726871},"to":{"change":17,"start":726871,"end":726950},"introduced_by":17}],"inode":{"change":17,"pos":717381}},"ins_contents":[{"Add":" fn add(&mut self, path: &str, is_dir: bool) -> Result<(), fs::FsError> {"}],"del_contents":[{"Del":" fn add(&mut self, path: &str, is_dir: bool) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":717381},"path":"libpijul/src/lib.rs","line":288,"ins":{"up_context":[{"change":17,"pos":727005}],"down_context":[{"change":17,"pos":727082}],"flag":"","start":29129,"end":29217,"inode":{"change":17,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":727005},"to":{"change":17,"start":727005,"end":727082},"introduced_by":17}],"inode":{"change":17,"pos":717381}},"ins_contents":[{"Add":" fn move_file(&mut self, a: &str, b: &str) -> Result<(), fs::FsError> {"}],"del_contents":[{"Del":" fn move_file(&mut self, a: &str, b: &str) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":717381},"path":"libpijul/src/lib.rs","line":292,"ins":{"up_context":[{"change":17,"pos":727123}],"down_context":[{"change":17,"pos":727193}],"flag":"","start":29218,"end":29299,"inode":{"change":17,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":727123},"to":{"change":17,"start":727123,"end":727193},"introduced_by":17}],"inode":{"change":17,"pos":717381}},"ins_contents":[{"Add":" fn remove_file(&mut self, a: &str) -> Result<(), fs::FsError> {"}],"del_contents":[{"Del":" fn remove_file(&mut self, a: &str) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":717381},"path":"libpijul/src/lib.rs","line":300,"ins":{"up_context":[{"change":17,"pos":727334}],"down_context":[{"change":17,"pos":727418}],"flag":"","start":29300,"end":29486,"inode":{"change":17,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":727334},"to":{"change":17,"start":727334,"end":727418},"introduced_by":17}],"inode":{"change":17,"pos":717381}},"ins_contents":[{"Add":" ) -> Result<"},{"Add":" pristine::channel_dump::ChannelFromDump<'a, Self>,"},{"Add":" pristine::channel_dump::ChannelDumpError,"},{"Add":" > {"},{"Add":" use pristine::channel_dump::*;"}],"del_contents":[{"Del":" ) -> Result, anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":717381},"path":"libpijul/src/lib.rs","line":306,"ins":{"up_context":[{"change":17,"pos":727465}],"down_context":[{"change":17,"pos":727603}],"flag":"","start":29487,"end":29669,"inode":{"change":17,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":727465},"to":{"change":17,"start":60362,"end":60444},"introduced_by":17},{"previous":"","flag":"DELETED","from":{"change":17,"pos":60444},"to":{"change":17,"start":727527,"end":727603},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":727527},"to":{"change":17,"start":727527,"end":727603},"introduced_by":17}],"inode":{"change":17,"pos":717381}},"ins_contents":[{"Add":" let channel = pristine::MutTxnT::open_or_create_channel(self, name)"},{"Add":" .map_err(ChannelDumpError::Txn)?;"},{"Add":" Ok(ChannelFromDump::new(self, channel))"}],"del_contents":[{"Del":" let channel = pristine::MutTxnT::open_or_create_channel(self, name)?;\n"},{"Del":" Ok(pristine::channel_dump::ChannelFromDump::new(self, channel))\n"}]}},{"Replacement":{"inode":{"change":17,"pos":717381},"path":"libpijul/src/lib.rs","line":310,"ins":{"up_context":[{"change":17,"pos":727620}],"down_context":[{"change":17,"pos":727740}],"flag":"","start":29670,"end":29741,"inode":{"change":17,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":727620},"to":{"change":17,"start":727620,"end":727664},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":727664},"to":{"change":17,"start":727664,"end":727719},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":727719},"to":{"change":17,"start":727719,"end":727740},"introduced_by":17}],"inode":{"change":17,"pos":717381}},"ins_contents":[{"Add":" Err(ChannelDumpError::ChannelNameExists(name.to_string()))"}],"del_contents":[{"Del":" Err((Error::ChannelNameExists {\n"},{"Del":" name: name.to_string(),\n })\n"},{"Del":" .into())\n"}]}},{"Replacement":{"inode":{"change":17,"pos":717381},"path":"libpijul/src/lib.rs","line":321,"ins":{"up_context":[{"change":17,"pos":728008}],"down_context":[{"change":17,"pos":728064}],"flag":"","start":29742,"end":29838,"inode":{"change":17,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":728008},"to":{"change":17,"start":728008,"end":728064},"introduced_by":17}],"inode":{"change":17,"pos":717381}},"ins_contents":[{"Add":" ) -> Result, output::ArchiveError> {"}],"del_contents":[{"Del":" ) -> Result, anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":717381},"path":"libpijul/src/lib.rs","line":348,"ins":{"up_context":[{"change":17,"pos":728757}],"down_context":[{"change":17,"pos":728813}],"flag":"","start":29839,"end":29935,"inode":{"change":17,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":728757},"to":{"change":17,"start":728757,"end":728813},"introduced_by":17}],"inode":{"change":17,"pos":717381}},"ins_contents":[{"Add":" ) -> Result, output::ArchiveError> {"}],"del_contents":[{"Del":" ) -> Result, anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":717381},"path":"libpijul/src/lib.rs","line":370,"ins":{"up_context":[{"change":17,"pos":729545}],"down_context":[{"change":17,"pos":729602}],"flag":"","start":29936,"end":29999,"inode":{"change":17,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":729545},"to":{"change":17,"start":729545,"end":729602},"introduced_by":17}],"inode":{"change":17,"pos":717381}},"ins_contents":[{"Add":" Err(output::ArchiveError::StateNotFound { state })"}],"del_contents":[{"Del":" Err((Error::StateNotFound { state }).into())\n"}]}},{"Replacement":{"inode":{"change":17,"pos":717381},"path":"libpijul/src/lib.rs","line":501,"ins":{"up_context":[{"change":17,"pos":731981}],"down_context":[{"change":17,"pos":732030}],"flag":"","start":30000,"end":30044,"inode":{"change":17,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":731981},"to":{"change":17,"start":731981,"end":732030},"introduced_by":17}],"inode":{"change":17,"pos":717381}},"ins_contents":[{"Add":" ) -> Result<(String, bool), C::Error> {"}],"del_contents":[{"Del":" ) -> Result<(String, bool), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":717381},"path":"libpijul/src/lib.rs","line":514,"ins":{"up_context":[{"change":17,"pos":732453}],"down_context":[{"change":17,"pos":732502}],"flag":"","start":30045,"end":30089,"inode":{"change":17,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":732453},"to":{"change":17,"start":732453,"end":732502},"introduced_by":17}],"inode":{"change":17,"pos":717381}},"ins_contents":[{"Add":" ) -> Result<(String, bool), C::Error> {"}],"del_contents":[{"Del":" ) -> Result<(String, bool), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":717381},"path":"libpijul/src/lib.rs","line":527,"ins":{"up_context":[{"change":17,"pos":732890}],"down_context":[{"change":17,"pos":732971}],"flag":"","start":30090,"end":30179,"inode":{"change":17,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":732890},"to":{"change":17,"start":732890,"end":732971},"introduced_by":17}],"inode":{"change":17,"pos":717381}},"ins_contents":[{"Add":" ) -> Result<(pristine::Position, bool), fs::FsError> {"}],"del_contents":[{"Del":" ) -> Result<(pristine::Position, bool), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":717381},"path":"libpijul/src/lib.rs","line":537,"ins":{"up_context":[{"change":17,"pos":733275}],"down_context":[{"change":17,"pos":733312}],"flag":"","start":30180,"end":30231,"inode":{"change":17,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":733275},"to":{"change":17,"start":733275,"end":733312},"introduced_by":17}],"inode":{"change":17,"pos":717381}},"ins_contents":[{"Add":" ) -> Result<(), output::FileError> {"}],"del_contents":[{"Del":" ) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":717381},"path":"libpijul/src/lib.rs","line":550,"ins":{"up_context":[{"change":17,"pos":733724}],"down_context":[{"change":17,"pos":733780}],"flag":"","start":30232,"end":30328,"inode":{"change":17,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":733724},"to":{"change":17,"start":733724,"end":733780},"introduced_by":17}],"inode":{"change":17,"pos":717381}},"ins_contents":[{"Add":" ) -> Result, output::ArchiveError> {"}],"del_contents":[{"Del":" ) -> Result, anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":717381},"path":"libpijul/src/lib.rs","line":560,"ins":{"up_context":[{"change":17,"pos":734091}],"down_context":[{"change":17,"pos":734147}],"flag":"","start":30329,"end":30425,"inode":{"change":17,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":734091},"to":{"change":17,"start":734091,"end":734147},"introduced_by":17}],"inode":{"change":17,"pos":717381}},"ins_contents":[{"Add":" ) -> Result, output::ArchiveError> {"}],"del_contents":[{"Del":" ) -> Result, anyhow::Error> {\n"}]}},{"Edit":{"inode":{"change":17,"pos":737429},"path":"libpijul/src/fs.rs","line":1,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":737429},"to":{"change":17,"start":737430,"end":737485},"introduced_by":17}],"inode":{"change":17,"pos":737429}}},"contents":[{"Del":"// org id GEhwQUzK6088geMhP32RRVZ2gKcVn8vpgw30CsBQVAw=\n"}]}},{"Edit":{"inode":{"change":17,"pos":737429},"path":"libpijul/src/fs.rs","line":20,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":738443},"to":{"change":17,"start":738443,"end":738461},"introduced_by":17}],"inode":{"change":17,"pos":737429}}},"contents":[{"Del":"use crate::Error;\n"}]}},{"Edit":{"inode":{"change":17,"pos":737429},"path":"libpijul/src/fs.rs","line":22,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":1}],"down_context":[{"change":17,"pos":738541}],"flag":"","start":30426,"end":30675,"inode":{"change":17,"pos":737429}}},"contents":[{"Add":"#[derive(Debug, Error)]"},{"Add":"pub enum FsError {"},{"Add":" #[error(\"Path not found: {0}\")]"},{"Add":" NotFound(String),"},{"Add":" #[error(\"File already in repository: {0}\")]"},{"Add":" AlreadyInRepo(String),"},{"Add":" #[error(transparent)]"},{"Add":" Txn(T),"},{"Add":"}"},{"Add":""}]}},{"Replacement":{"inode":{"change":17,"pos":737429},"path":"libpijul/src/fs.rs","line":103,"ins":{"up_context":[{"change":5,"pos":7}],"down_context":[{"change":17,"pos":740814}],"flag":"","start":30676,"end":30823,"inode":{"change":17,"pos":737429}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":7},"to":{"change":17,"start":740636,"end":740814},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":740636},"to":{"change":17,"start":740636,"end":740814},"introduced_by":17}],"inode":{"change":17,"pos":737429}},"ins_contents":[{"Add":"/// Find the inode corresponding to that path, if it exists."},{"Add":"pub fn find_inode(txn: &T, path: &str) -> Result> {"}],"del_contents":[{"Del":"/// Find the inode corresponding to that path, or return an error if\n/// there's no such inode.\npub fn find_inode(txn: &T, path: &str) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":737429},"path":"libpijul/src/fs.rs","line":110,"ins":{"up_context":[{"change":17,"pos":741040}],"down_context":[{"change":17,"pos":741140}],"flag":"","start":30824,"end":30873,"inode":{"change":17,"pos":737429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":741040},"to":{"change":17,"start":741040,"end":741140},"introduced_by":17}],"inode":{"change":17,"pos":737429}},"ins_contents":[{"Add":" Err(FsError::NotFound(path.to_string()))"}],"del_contents":[{"Del":" Err((Error::FileNotInRepo {\n path: path.to_string(),\n })\n .into())\n"}]}},{"Replacement":{"inode":{"change":17,"pos":737429},"path":"libpijul/src/fs.rs","line":162,"ins":{"up_context":[{"change":17,"pos":742759}],"down_context":[{"change":17,"pos":742795}],"flag":"","start":30874,"end":30914,"inode":{"change":17,"pos":737429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":742759},"to":{"change":17,"start":742759,"end":742795},"introduced_by":17}],"inode":{"change":17,"pos":737429}},"ins_contents":[{"Add":") -> Result> {"}],"del_contents":[{"Del":") -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":737429},"path":"libpijul/src/fs.rs","line":175,"ins":{"up_context":[{"change":17,"pos":743256}],"down_context":[{"change":17,"pos":743414}],"flag":"","start":30915,"end":31009,"inode":{"change":17,"pos":737429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":743256},"to":{"change":17,"start":2824,"end":2896},"introduced_by":17}],"inode":{"change":17,"pos":737429}},"ins_contents":[{"Add":" del_tree_with_rev(txn, parent_id.as_file_id(), inode).map_err(FsError::Txn)?;"}],"del_contents":[{"Del":" del_tree_with_rev(txn, parent_id.as_file_id(), inode)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":737429},"path":"libpijul/src/fs.rs","line":177,"ins":{"up_context":[{"change":17,"pos":743482}],"down_context":[{"change":17,"pos":743619}],"flag":"","start":31010,"end":31094,"inode":{"change":17,"pos":737429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":743482},"to":{"change":17,"start":2897,"end":2959},"introduced_by":17}],"inode":{"change":17,"pos":737429}},"ins_contents":[{"Add":" del_inodes_with_rev(txn, inode, vertex).map_err(FsError::Txn)?;"}],"del_contents":[{"Del":" del_inodes_with_rev(txn, inode, vertex)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":737429},"path":"libpijul/src/fs.rs","line":179,"ins":{"up_context":[{"change":17,"pos":743637}],"down_context":[{"change":17,"pos":743764}],"flag":"","start":31095,"end":31189,"inode":{"change":17,"pos":737429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":743637},"to":{"change":17,"start":2960,"end":3032},"introduced_by":17}],"inode":{"change":17,"pos":737429}},"ins_contents":[{"Add":" put_tree_with_rev(txn, parent_id.as_file_id(), child).map_err(FsError::Txn)?;"}],"del_contents":[{"Del":" put_tree_with_rev(txn, parent_id.as_file_id(), child)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":737429},"path":"libpijul/src/fs.rs","line":183,"ins":{"up_context":[{"change":17,"pos":743821}],"down_context":[{"change":17,"pos":743945}],"flag":"","start":31190,"end":31252,"inode":{"change":17,"pos":737429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":743821},"to":{"change":17,"start":743821,"end":743945},"introduced_by":17}],"inode":{"change":17,"pos":737429}},"ins_contents":[{"Add":" Err(FsError::AlreadyInRepo(filename.to_string()))"}],"del_contents":[{"Del":" Err((Error::FileAlreadyInRepo {\n path: filename.to_string(),\n })\n .into())\n"}]}},{"Replacement":{"inode":{"change":17,"pos":737429},"path":"libpijul/src/fs.rs","line":191,"ins":{"up_context":[{"change":17,"pos":744222}],"down_context":[{"change":17,"pos":744345}],"flag":"","start":31253,"end":31345,"inode":{"change":17,"pos":737429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":744222},"to":{"change":17,"start":3033,"end":3103},"introduced_by":17}],"inode":{"change":17,"pos":737429}},"ins_contents":[{"Add":" put_tree_with_rev(txn, parent_id.as_file_id(), child_inode).map_err(FsError::Txn)?;"}],"del_contents":[{"Del":" put_tree_with_rev(txn, parent_id.as_file_id(), child_inode)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":737429},"path":"libpijul/src/fs.rs","line":198,"ins":{"up_context":[{"change":17,"pos":744509}],"down_context":[{"change":17,"pos":744570}],"flag":"","start":31346,"end":31446,"inode":{"change":17,"pos":737429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":744509},"to":{"change":17,"start":744509,"end":744570},"introduced_by":17}],"inode":{"change":17,"pos":737429}},"ins_contents":[{"Add":" txn.put_tree(dir_id.as_file_id(), child_inode)"},{"Add":" .map_err(FsError::Txn)?;"}],"del_contents":[{"Del":" txn.put_tree(dir_id.as_file_id(), child_inode)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":737429},"path":"libpijul/src/fs.rs","line":210,"ins":{"up_context":[{"change":17,"pos":744782}],"down_context":[{"change":17,"pos":744815}],"flag":"","start":31447,"end":31484,"inode":{"change":17,"pos":737429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":744782},"to":{"change":17,"start":744782,"end":744815},"introduced_by":17}],"inode":{"change":17,"pos":737429}},"ins_contents":[{"Add":") -> Result<(), FsError> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":737429},"path":"libpijul/src/fs.rs","line":236,"ins":{"up_context":[{"change":17,"pos":745846}],"down_context":[{"change":17,"pos":745879}],"flag":"","start":31485,"end":31522,"inode":{"change":17,"pos":737429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":745846},"to":{"change":17,"start":745846,"end":745879},"introduced_by":17}],"inode":{"change":17,"pos":737429}},"ins_contents":[{"Add":") -> Result<(), FsError> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":737429},"path":"libpijul/src/fs.rs","line":246,"ins":{"up_context":[{"change":17,"pos":746112}],"down_context":[{"change":17,"pos":746145}],"flag":"","start":31523,"end":31560,"inode":{"change":17,"pos":737429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":746112},"to":{"change":17,"start":746112,"end":746145},"introduced_by":17}],"inode":{"change":17,"pos":737429}},"ins_contents":[{"Add":") -> Result<(), FsError> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":737429},"path":"libpijul/src/fs.rs","line":249,"ins":{"up_context":[{"change":17,"pos":746252}],"down_context":[{"change":17,"pos":746499}],"flag":"","start":31561,"end":31641,"inode":{"change":17,"pos":737429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":746252},"to":{"change":17,"start":3104,"end":3162},"introduced_by":17}],"inode":{"change":17,"pos":737429}},"ins_contents":[{"Add":" del_tree_with_rev(txn, fileref.as_file_id(), inode).map_err(FsError::Txn)?;"}],"del_contents":[{"Del":" del_tree_with_rev(txn, fileref.as_file_id(), inode)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":737429},"path":"libpijul/src/fs.rs","line":270,"ins":{"up_context":[{"change":17,"pos":747046}],"down_context":[{"change":17,"pos":747079}],"flag":"","start":31642,"end":31679,"inode":{"change":17,"pos":737429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":747046},"to":{"change":17,"start":747046,"end":747079},"introduced_by":17}],"inode":{"change":17,"pos":737429}},"ins_contents":[{"Add":") -> Result<(), FsError> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":737429},"path":"libpijul/src/fs.rs","line":298,"ins":{"up_context":[{"change":12,"pos":67}],"down_context":[{"change":17,"pos":748177}],"flag":"","start":31680,"end":31795,"inode":{"change":17,"pos":737429}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":12,"pos":67},"to":{"change":17,"start":3163,"end":3230},"introduced_by":12},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":747947},"to":{"change":17,"start":3163,"end":3230},"introduced_by":12}],"inode":{"change":17,"pos":737429}},"ins_contents":[{"Add":" assert!(txn"},{"Add":" .del_tree(file_id.as_file_id(), Some(inode))"},{"Add":" .map_err(FsError::Txn)?);"}],"del_contents":[{"Del":" assert!(txn.del_tree(file_id.as_file_id(), Some(inode))?);\n"}]}},{"Replacement":{"inode":{"change":17,"pos":737429},"path":"libpijul/src/fs.rs","line":302,"ins":{"up_context":[{"change":17,"pos":748183}],"down_context":[{"change":17,"pos":3292}],"flag":"","start":31796,"end":31879,"inode":{"change":17,"pos":737429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":748183},"to":{"change":17,"start":3231,"end":3292},"introduced_by":17}],"inode":{"change":17,"pos":737429}},"ins_contents":[{"Add":" if del_tree_with_rev(txn, parent.as_file_id(), inode).map_err(FsError::Txn)? {"}],"del_contents":[{"Del":" if del_tree_with_rev(txn, parent.as_file_id(), inode)? {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":737429},"path":"libpijul/src/fs.rs","line":304,"ins":{"up_context":[{"change":17,"pos":3352}],"down_context":[{"change":17,"pos":748543}],"flag":"","start":31880,"end":31956,"inode":{"change":17,"pos":737429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":3352},"to":{"change":17,"start":3352,"end":3406},"introduced_by":17}],"inode":{"change":17,"pos":737429}},"ins_contents":[{"Add":" del_inodes_with_rev(txn, inode, vertex).map_err(FsError::Txn)?;"}],"del_contents":[{"Del":" del_inodes_with_rev(txn, inode, vertex)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":737429},"path":"libpijul/src/fs.rs","line":317,"ins":{"up_context":[{"change":17,"pos":748753}],"down_context":[{"change":17,"pos":748840}],"flag":"","start":31957,"end":32048,"inode":{"change":17,"pos":737429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":748753},"to":{"change":17,"start":748753,"end":748840},"introduced_by":17}],"inode":{"change":17,"pos":737429}},"ins_contents":[{"Add":"pub fn remove_file(txn: &mut T, path: &str) -> Result<(), FsError> {"}],"del_contents":[{"Del":"pub fn remove_file(txn: &mut T, path: &str) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":737429},"path":"libpijul/src/fs.rs","line":614,"ins":{"up_context":[{"change":17,"pos":759162}],"down_context":[{"change":17,"pos":759219}],"flag":"","start":32049,"end":32110,"inode":{"change":17,"pos":737429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":759162},"to":{"change":17,"start":759162,"end":759219},"introduced_by":17}],"inode":{"change":17,"pos":737429}},"ins_contents":[{"Add":") -> Result<(Position, bool), FsError> {"}],"del_contents":[{"Del":") -> Result<(Position, bool), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":737429},"path":"libpijul/src/fs.rs","line":629,"ins":{"up_context":[{"change":17,"pos":759848}],"down_context":[{"change":17,"pos":759934}],"flag":"","start":32111,"end":32253,"inode":{"change":17,"pos":737429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":759848},"to":{"change":17,"start":759848,"end":759934},"introduced_by":17}],"inode":{"change":17,"pos":737429}},"ins_contents":[{"Add":" changes"},{"Add":" .get_contents(|h| txn.get_external(h), name_dest, &mut name_buf)"},{"Add":" .map_err(FsError::Txn)?;"}],"del_contents":[{"Del":" changes.get_contents(|h| txn.get_external(h), name_dest, &mut name_buf)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":737429},"path":"libpijul/src/fs.rs","line":654,"ins":{"up_context":[{"change":17,"pos":760725}],"down_context":[{"change":17,"pos":760849}],"flag":"","start":32254,"end":32315,"inode":{"change":17,"pos":737429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":760725},"to":{"change":17,"start":760725,"end":760849},"introduced_by":17}],"inode":{"change":17,"pos":737429}},"ins_contents":[{"Add":" return Err(FsError::NotFound(path.to_string()));"}],"del_contents":[{"Del":" return Err((Error::FileNotInRepo {\n path: path.to_string(),\n })\n .into());\n"}]}},{"Replacement":{"inode":{"change":17,"pos":737429},"path":"libpijul/src/fs.rs","line":666,"ins":{"up_context":[{"change":17,"pos":761102}],"down_context":[{"change":17,"pos":761147}],"flag":"","start":32316,"end":32356,"inode":{"change":17,"pos":737429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":761102},"to":{"change":17,"start":761102,"end":761147},"introduced_by":17}],"inode":{"change":17,"pos":737429}},"ins_contents":[{"Add":") -> Result<(String, bool), C::Error> {"}],"del_contents":[{"Del":") -> Result<(String, bool), anyhow::Error> {\n"}]}},{"Edit":{"inode":{"change":17,"pos":763306},"path":"libpijul/src/find_alive.rs","line":1,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":763306},"to":{"change":17,"start":763307,"end":763362},"introduced_by":17}],"inode":{"change":17,"pos":763306}}},"contents":[{"Del":"// org id MEBHKxb8oK7gGUqwl4XgvF1rhw0vYcS2SvEcXbaqMok=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":763306},"path":"libpijul/src/find_alive.rs","line":3,"ins":{"up_context":[{"change":17,"pos":763466}],"down_context":[{"change":17,"pos":763521}],"flag":"","start":32357,"end":32358,"inode":{"change":17,"pos":763306}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":763466},"to":{"change":17,"start":763466,"end":763521},"introduced_by":17}],"inode":{"change":17,"pos":763306}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":"// org id 7GC7Q2pCnb0s8d1hQ5JvScuZvi24ZElhM713+gpHgeY=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":763306},"path":"libpijul/src/find_alive.rs","line":8,"ins":{"up_context":[{"change":17,"pos":763631}],"down_context":[{"change":17,"pos":763686}],"flag":"","start":32359,"end":32412,"inode":{"change":17,"pos":763306}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":763631},"to":{"change":17,"start":763631,"end":763686},"introduced_by":17}],"inode":{"change":17,"pos":763306}},"ins_contents":[{"Add":") -> Result>, BlockError> {"}],"del_contents":[{"Del":") -> Result>, crate::Error> {\n"}]}},{"Edit":{"inode":{"change":17,"pos":763306},"path":"libpijul/src/find_alive.rs","line":16,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":763908},"to":{"change":17,"start":763908,"end":763967},"introduced_by":17}],"inode":{"change":17,"pos":763306}}},"contents":[{"Del":" // org id naTw4q63bu2EvVqiMcyTpsR2XgGPIlo+Xg0pAHxty50=\n"}]}},{"Edit":{"inode":{"change":17,"pos":763306},"path":"libpijul/src/find_alive.rs","line":23,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":764231},"to":{"change":17,"start":764231,"end":764294},"introduced_by":17}],"inode":{"change":17,"pos":763306}}},"contents":[{"Del":" // org id rATmHVXe7ujnLJm9BtP1kGj7iFT2vIEqTj1NygT3jKg=\n"}]}},{"Edit":{"inode":{"change":17,"pos":763306},"path":"libpijul/src/find_alive.rs","line":27,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":764479},"to":{"change":17,"start":764479,"end":764546},"introduced_by":17}],"inode":{"change":17,"pos":763306}}},"contents":[{"Del":" // org id zyrR2nOtEiDH3D+9lWuTt+nzSRQoz8jgKSCV9Pn6rBE=\n"}]}},{"Edit":{"inode":{"change":17,"pos":763306},"path":"libpijul/src/find_alive.rs","line":41,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":765010},"to":{"change":17,"start":765010,"end":765077},"introduced_by":17}],"inode":{"change":17,"pos":763306}}},"contents":[{"Del":" // org id uQvQHlOvPqlL+IP8xnqczr279XI5bz+CUrzAi0CkA+c=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":763306},"path":"libpijul/src/find_alive.rs","line":46,"ins":{"up_context":[{"change":17,"pos":765135}],"down_context":[{"change":17,"pos":765190}],"flag":"","start":32413,"end":32414,"inode":{"change":17,"pos":763306}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":765135},"to":{"change":17,"start":765135,"end":765190},"introduced_by":17}],"inode":{"change":17,"pos":763306}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":"// org id Pw320u7FKY4pwoQyoNx3dm1mLfOcikfMt+ObiMN9njo=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":763306},"path":"libpijul/src/find_alive.rs","line":51,"ins":{"up_context":[{"change":17,"pos":765298}],"down_context":[{"change":17,"pos":765386}],"flag":"","start":32415,"end":32501,"inode":{"change":17,"pos":763306}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":765298},"to":{"change":17,"start":765298,"end":765386},"introduced_by":17}],"inode":{"change":17,"pos":763306}},"ins_contents":[{"Add":") -> Result<(HashSet>, Vec<(Vertex, Edge)>), BlockError> {"}],"del_contents":[{"Del":") -> Result<(HashSet>, Vec<(Vertex, Edge)>), crate::Error> {\n"}]}},{"Edit":{"inode":{"change":17,"pos":763306},"path":"libpijul/src/find_alive.rs","line":60,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":765638},"to":{"change":17,"start":765638,"end":765697},"introduced_by":17}],"inode":{"change":17,"pos":763306}}},"contents":[{"Del":" // org id 4NHenXps5de4P2CKb7tHKFazsveVGn9JlzWwLKcaDfY=\n"}]}},{"Edit":{"inode":{"change":17,"pos":763306},"path":"libpijul/src/find_alive.rs","line":70,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":766044},"to":{"change":17,"start":766044,"end":766107},"introduced_by":17}],"inode":{"change":17,"pos":763306}}},"contents":[{"Del":" // org id yUDemNuncRZ3JF72y4FgQuPPYbQhsyj+3Dw9xom4PyQ=\n"}]}},{"Edit":{"inode":{"change":17,"pos":763306},"path":"libpijul/src/find_alive.rs","line":76,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":766414},"to":{"change":17,"start":766414,"end":766481},"introduced_by":17}],"inode":{"change":17,"pos":763306}}},"contents":[{"Del":" // org id wquayIcqrmfRuMmqB4vd/wlbkHCGqWHFKFrwWY7st9g=\n"}]}},{"Edit":{"inode":{"change":17,"pos":763306},"path":"libpijul/src/find_alive.rs","line":105,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":767543},"to":{"change":17,"start":767543,"end":767610},"introduced_by":17}],"inode":{"change":17,"pos":763306}}},"contents":[{"Del":" // org id S8/CnGSbU1qxCbYJGuK142RZkxIMPWg2k8LfVRnevOY=\n"}]}},{"Edit":{"inode":{"change":17,"pos":768903},"path":"libpijul/src/diff/vertex_buffer.rs","line":1,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":768903},"to":{"change":17,"start":768904,"end":768959},"introduced_by":17}],"inode":{"change":17,"pos":768903}}},"contents":[{"Del":"// org id CuLytHOw5MhIUxraqhZp3RiCvAXraOTYajmAlakyEYY=\n"}]}},{"Edit":{"inode":{"change":17,"pos":768903},"path":"libpijul/src/diff/vertex_buffer.rs","line":4,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":769051},"to":{"change":17,"start":769051,"end":769106},"introduced_by":17}],"inode":{"change":17,"pos":768903}}},"contents":[{"Del":"// org id JJDR/iA4tUvr8bHYeAudspj8wfK5zy20N2fayiMztIQ=\n"}]}},{"Edit":{"inode":{"change":17,"pos":768903},"path":"libpijul/src/diff/vertex_buffer.rs","line":6,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":769153},"to":{"change":17,"start":769153,"end":769212},"introduced_by":17}],"inode":{"change":17,"pos":768903}}},"contents":[{"Del":" // org id O4woWVifU6a3TB5v+SW/IS06RN6LDal4OOyCtAcxrLg=\n"}]}},{"Edit":{"inode":{"change":17,"pos":768903},"path":"libpijul/src/diff/vertex_buffer.rs","line":8,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":769277},"to":{"change":17,"start":769277,"end":769336},"introduced_by":17}],"inode":{"change":17,"pos":768903}}},"contents":[{"Del":" // org id znv/E/xSBDaD0tw5tDrdhOrfa00e2i6hoX4Y0P0M1yU=\n"}]}},{"Edit":{"inode":{"change":17,"pos":768903},"path":"libpijul/src/diff/vertex_buffer.rs","line":10,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":769393},"to":{"change":17,"start":769393,"end":769452},"introduced_by":17}],"inode":{"change":17,"pos":768903}}},"contents":[{"Del":" // org id VrcGilQ4pnxnCqaZ30f0AYxuMW5/PAjPKYEV0W8OS3o=\n"}]}},{"Edit":{"inode":{"change":17,"pos":768903},"path":"libpijul/src/diff/vertex_buffer.rs","line":11,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":769489},"to":{"change":17,"start":769489,"end":769548},"introduced_by":17}],"inode":{"change":17,"pos":768903}}},"contents":[{"Del":" // org id tHKWG2wUrgq0sWiE8x5vHspQufWcVCF0VBQMdJ/E6PI=\n"}]}},{"Edit":{"inode":{"change":17,"pos":768903},"path":"libpijul/src/diff/vertex_buffer.rs","line":12,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":769596},"to":{"change":17,"start":769596,"end":769655},"introduced_by":17}],"inode":{"change":17,"pos":768903}}},"contents":[{"Del":" // org id RtX+AmeBXlMmux4krn3hr2TC5YAQ4dUD0aQ9cG0WmPE=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":768903},"path":"libpijul/src/diff/vertex_buffer.rs","line":17,"ins":{"up_context":[{"change":17,"pos":769828}],"down_context":[{"change":17,"pos":769883}],"flag":"","start":32502,"end":32503,"inode":{"change":17,"pos":768903}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":769828},"to":{"change":17,"start":769828,"end":769883},"introduced_by":17}],"inode":{"change":17,"pos":768903}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":"// org id BJp9ZUxNcNZGXbeuELu/m0hxjcCh0Lrworivp2DNz/I=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":768903},"path":"libpijul/src/diff/vertex_buffer.rs","line":32,"ins":{"up_context":[{"change":17,"pos":770115}],"down_context":[{"change":17,"pos":770170}],"flag":"","start":32504,"end":32505,"inode":{"change":17,"pos":768903}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":770115},"to":{"change":17,"start":770115,"end":770170},"introduced_by":17}],"inode":{"change":17,"pos":768903}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":"// org id x2fKAxT97bw7IkKwnYnx5G3Ys3zfwC7SQzd3J/n1vPU=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":768903},"path":"libpijul/src/diff/vertex_buffer.rs","line":40,"ins":{"up_context":[{"change":17,"pos":770318}],"down_context":[{"change":17,"pos":770373}],"flag":"","start":32506,"end":32507,"inode":{"change":17,"pos":768903}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":770318},"to":{"change":17,"start":770318,"end":770373},"introduced_by":17}],"inode":{"change":17,"pos":768903}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":"// org id CBYn0QVUhTLd+1DPhJGxeuxcQPrCqfoCj5QdyKDc7Hg=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":768903},"path":"libpijul/src/diff/vertex_buffer.rs","line":47,"ins":{"up_context":[{"change":17,"pos":770463}],"down_context":[{"change":17,"pos":770518}],"flag":"","start":32508,"end":32509,"inode":{"change":17,"pos":768903}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":770463},"to":{"change":17,"start":770463,"end":770518},"introduced_by":17}],"inode":{"change":17,"pos":768903}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":"// org id a0AuyLQJdOXmDjcbzuLKji89Suyb79UP94XH0DGe0rs=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":768903},"path":"libpijul/src/diff/vertex_buffer.rs","line":55,"ins":{"up_context":[{"change":17,"pos":770684}],"down_context":[{"change":17,"pos":770739}],"flag":"","start":32510,"end":32511,"inode":{"change":17,"pos":768903}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":770684},"to":{"change":17,"start":770684,"end":770739},"introduced_by":17}],"inode":{"change":17,"pos":768903}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":"// org id pMXpkacg64vkNGPaLA/BBNw5jtn7ZI+FySQGEkPivNo=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":768903},"path":"libpijul/src/diff/vertex_buffer.rs","line":86,"ins":{"up_context":[{"change":17,"pos":771665}],"down_context":[{"change":17,"pos":771720}],"flag":"","start":32512,"end":32513,"inode":{"change":17,"pos":768903}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":771665},"to":{"change":17,"start":771665,"end":771720},"introduced_by":17}],"inode":{"change":17,"pos":768903}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":"// org id NnHmVJ1BuujNsYVWbu4O4GAsabVxPG61uPjBjwLDGXY=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":768903},"path":"libpijul/src/diff/vertex_buffer.rs","line":114,"ins":{"up_context":[{"change":17,"pos":772640}],"down_context":[{"change":17,"pos":772695}],"flag":"","start":32514,"end":32515,"inode":{"change":17,"pos":768903}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":772640},"to":{"change":17,"start":772640,"end":772695},"introduced_by":17}],"inode":{"change":17,"pos":768903}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":"// org id Pk25wSBAZ0t4Oeyx6ZTm1xqxX4h54qK8APBYvN+cjoo=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":768903},"path":"libpijul/src/diff/vertex_buffer.rs","line":140,"ins":{"up_context":[{"change":17,"pos":773473}],"down_context":[{"change":17,"pos":773663}],"flag":"","start":32516,"end":32712,"inode":{"change":17,"pos":768903}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":773473},"to":{"change":17,"start":773473,"end":773663},"introduced_by":17}],"inode":{"change":17,"pos":768903}},"ins_contents":[{"Add":" fn output_line(&mut self, v: crate::pristine::Vertex, c: C) -> Result<(), E>"},{"Add":" where"},{"Add":" E: From,"},{"Add":" C: FnOnce(&mut Vec) -> Result<(), E>,"},{"Add":" {"}],"del_contents":[{"Del":" fn output_line) -> Result<(), anyhow::Error>>(\n &mut self,\n v: crate::pristine::Vertex,\n c: C,\n ) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":768903},"path":"libpijul/src/diff/vertex_buffer.rs","line":159,"ins":{"up_context":[{"change":17,"pos":774078}],"down_context":[{"change":17,"pos":774201}],"flag":"","start":32713,"end":32779,"inode":{"change":17,"pos":768903}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":774078},"to":{"change":17,"start":774078,"end":774201},"introduced_by":17}],"inode":{"change":17,"pos":768903}},"ins_contents":[{"Add":""},{"Add":" fn begin_conflict(&mut self) -> Result<(), std::io::Error> {"}],"del_contents":[{"Del":" // org id 0I3Htm1AUtdNytI0fsyZC9DaKebRuVAOWnCAp1eM4As=\n fn begin_conflict(&mut self) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":768903},"path":"libpijul/src/diff/vertex_buffer.rs","line":165,"ins":{"up_context":[{"change":17,"pos":774324}],"down_context":[{"change":17,"pos":774395}],"flag":"","start":32780,"end":32852,"inode":{"change":17,"pos":768903}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":774324},"to":{"change":17,"start":774324,"end":774395},"introduced_by":17}],"inode":{"change":17,"pos":768903}},"ins_contents":[{"Add":" fn begin_cyclic_conflict(&mut self) -> Result<(), std::io::Error> {"}],"del_contents":[{"Del":" fn begin_cyclic_conflict(&mut self) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":768903},"path":"libpijul/src/diff/vertex_buffer.rs","line":172,"ins":{"up_context":[{"change":17,"pos":774613}],"down_context":[{"change":17,"pos":774684}],"flag":"","start":32853,"end":32925,"inode":{"change":17,"pos":768903}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":774613},"to":{"change":17,"start":774613,"end":774684},"introduced_by":17}],"inode":{"change":17,"pos":768903}},"ins_contents":[{"Add":" fn begin_zombie_conflict(&mut self) -> Result<(), std::io::Error> {"}],"del_contents":[{"Del":" fn begin_zombie_conflict(&mut self) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":768903},"path":"libpijul/src/diff/vertex_buffer.rs","line":176,"ins":{"up_context":[{"change":17,"pos":774807}],"down_context":[{"change":17,"pos":774928}],"flag":"","start":32926,"end":32990,"inode":{"change":17,"pos":768903}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":774807},"to":{"change":17,"start":774807,"end":774928},"introduced_by":17}],"inode":{"change":17,"pos":768903}},"ins_contents":[{"Add":""},{"Add":" fn end_conflict(&mut self) -> Result<(), std::io::Error> {"}],"del_contents":[{"Del":" // org id zJgaktpjBecKJlgqzyViT+wt457sbkOEgjcJ7OGLOcU=\n fn end_conflict(&mut self) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":768903},"path":"libpijul/src/diff/vertex_buffer.rs","line":193,"ins":{"up_context":[{"change":17,"pos":775540}],"down_context":[{"change":17,"pos":775609}],"flag":"","start":32991,"end":33061,"inode":{"change":17,"pos":768903}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":775540},"to":{"change":17,"start":775540,"end":775609},"introduced_by":17}],"inode":{"change":17,"pos":768903}},"ins_contents":[{"Add":" fn end_cyclic_conflict(&mut self) -> Result<(), std::io::Error> {"}],"del_contents":[{"Del":" fn end_cyclic_conflict(&mut self) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":768903},"path":"libpijul/src/diff/vertex_buffer.rs","line":199,"ins":{"up_context":[{"change":17,"pos":775781}],"down_context":[{"change":17,"pos":775903}],"flag":"","start":33062,"end":33127,"inode":{"change":17,"pos":768903}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":775781},"to":{"change":17,"start":775781,"end":775903},"introduced_by":17}],"inode":{"change":17,"pos":768903}},"ins_contents":[{"Add":""},{"Add":" fn conflict_next(&mut self) -> Result<(), std::io::Error> {"}],"del_contents":[{"Del":" // org id W0ejcsiNdGBeNc6omb0+BUSF8MKjBtY+mLMyyqcvPBU=\n fn conflict_next(&mut self) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":768903},"path":"libpijul/src/diff/vertex_buffer.rs","line":212,"ins":{"up_context":[{"change":17,"pos":776342}],"down_context":[{"change":17,"pos":776487}],"flag":"","start":33128,"end":33216,"inode":{"change":17,"pos":768903}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":776342},"to":{"change":17,"start":776342,"end":776487},"introduced_by":17}],"inode":{"change":17,"pos":768903}},"ins_contents":[{"Add":""},{"Add":" fn output_conflict_marker(&mut self, marker: &str) -> Result<(), std::io::Error> {"}],"del_contents":[{"Del":" // org id kwhiQGVdomF6A7ajQbYvVGPQrMY24ay2R9148GsaXPw=\n fn output_conflict_marker(&mut self, marker: &str) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":768903},"path":"libpijul/src/diff/vertex_buffer.rs","line":243,"ins":{"up_context":[{"change":17,"pos":777384}],"down_context":[{"change":17,"pos":777439}],"flag":"","start":33217,"end":33218,"inode":{"change":17,"pos":768903}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":777384},"to":{"change":17,"start":777384,"end":777439},"introduced_by":17}],"inode":{"change":17,"pos":768903}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":"// org id JBb+2glaECLGIRa7HRodwcjfm5JxXetKLaq3zZ/Nmlk=\n"}]}},{"Edit":{"inode":{"change":17,"pos":793247},"path":"libpijul/src/diff/mod.rs","line":32,"atom":{"NewVertex":{"up_context":[{"change":17,"pos":794100}],"down_context":[{"change":17,"pos":794100}],"flag":"","start":33219,"end":33374,"inode":{"change":17,"pos":793247}}},"contents":[{"Add":""},{"Add":"#[derive(Debug, Error)]"},{"Add":"pub enum DiffError {"},{"Add":" #[error(transparent)]"},{"Add":" Output(#[from] crate::output::FileError

),"},{"Add":"}"}]}},{"Replacement":{"inode":{"change":17,"pos":793247},"path":"libpijul/src/diff/mod.rs","line":50,"ins":{"up_context":[{"change":17,"pos":794388}],"down_context":[{"change":17,"pos":794425}],"flag":"","start":33375,"end":33418,"inode":{"change":17,"pos":793247}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":794388},"to":{"change":17,"start":794388,"end":794425},"introduced_by":17}],"inode":{"change":17,"pos":793247}},"ins_contents":[{"Add":" ) -> Result<(), DiffError> {"}],"del_contents":[{"Del":" ) -> Result<(), anyhow::Error> {\n"}]}},{"Edit":{"inode":{"change":17,"pos":817216},"path":"libpijul/src/changestore/mod.rs","line":20,"atom":{"NewVertex":{"up_context":[{"change":17,"pos":818010}],"down_context":[{"change":17,"pos":818010}],"flag":"","start":33419,"end":33607,"inode":{"change":17,"pos":817216}}},"contents":[{"Add":" type Error: std::error::Error"},{"Add":" + std::fmt::Debug"},{"Add":" + Send"},{"Add":" + Sync"},{"Add":" + From"},{"Add":" + From"},{"Add":" + 'static;"}]}},{"Replacement":{"inode":{"change":17,"pos":817216},"path":"libpijul/src/changestore/mod.rs","line":33,"ins":{"up_context":[{"change":17,"pos":818231}],"down_context":[{"change":17,"pos":818346}],"flag":"","start":33608,"end":33719,"inode":{"change":17,"pos":817216}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":818231},"to":{"change":17,"start":818231,"end":818346},"introduced_by":17}],"inode":{"change":17,"pos":817216}},"ins_contents":[{"Add":" ) -> Result;"},{"Add":" fn get_header(&self, h: &Hash) -> Result {"}],"del_contents":[{"Del":" ) -> Result;\n fn get_header(&self, h: &Hash) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":817216},"path":"libpijul/src/changestore/mod.rs","line":41,"ins":{"up_context":[{"change":17,"pos":818500}],"down_context":[{"change":17,"pos":818626}],"flag":"","start":33720,"end":33837,"inode":{"change":17,"pos":817216}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":818500},"to":{"change":17,"start":818500,"end":818539},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":818539},"to":{"change":17,"start":84,"end":166},"introduced_by":17}],"inode":{"change":17,"pos":817216}},"ins_contents":[{"Add":" ) -> Result;"},{"Add":" fn get_dependencies(&self, hash: &Hash) -> Result, Self::Error> {"}],"del_contents":[{"Del":" ) -> Result;\n"},{"Del":" fn get_dependencies(&self, hash: &Hash) -> Result, anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":817216},"path":"libpijul/src/changestore/mod.rs","line":45,"ins":{"up_context":[{"change":17,"pos":818687}],"down_context":[{"change":17,"pos":818773}],"flag":"","start":33838,"end":33917,"inode":{"change":17,"pos":817216}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":818687},"to":{"change":17,"start":167,"end":248},"introduced_by":17}],"inode":{"change":17,"pos":817216}},"ins_contents":[{"Add":" fn get_extra_known(&self, hash: &Hash) -> Result, Self::Error> {"}],"del_contents":[{"Del":" fn get_extra_known(&self, hash: &Hash) -> Result, anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":817216},"path":"libpijul/src/changestore/mod.rs","line":48,"ins":{"up_context":[{"change":17,"pos":818833}],"down_context":[{"change":17,"pos":818914}],"flag":"","start":33918,"end":33997,"inode":{"change":17,"pos":817216}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":818833},"to":{"change":17,"start":818833,"end":818914},"introduced_by":17}],"inode":{"change":17,"pos":817216}},"ins_contents":[{"Add":" fn knows(&self, hash0: &Hash, hash1: &Hash) -> Result {"}],"del_contents":[{"Del":" fn knows(&self, hash0: &Hash, hash1: &Hash) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":817216},"path":"libpijul/src/changestore/mod.rs","line":57,"ins":{"up_context":[{"change":17,"pos":819140}],"down_context":[{"change":17,"pos":819179}],"flag":"","start":33998,"end":34035,"inode":{"change":17,"pos":817216}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":819140},"to":{"change":17,"start":819140,"end":819179},"introduced_by":17}],"inode":{"change":17,"pos":817216}},"ins_contents":[{"Add":" ) -> Result {"}],"del_contents":[{"Del":" ) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":817216},"path":"libpijul/src/changestore/mod.rs","line":66,"ins":{"up_context":[{"change":17,"pos":819448}],"down_context":[{"change":17,"pos":819697}],"flag":"","start":34036,"end":34277,"inode":{"change":17,"pos":817216}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":819448},"to":{"change":17,"start":819448,"end":819697},"introduced_by":17}],"inode":{"change":17,"pos":817216}},"ins_contents":[{"Add":" ) -> Result, Self::Error>;"},{"Add":" fn save_change(&self, p: &Change) -> Result;"},{"Add":" fn del_change(&self, h: &Hash) -> Result;"},{"Add":" fn get_change(&self, h: &Hash) -> Result;"}],"del_contents":[{"Del":" ) -> Result, anyhow::Error>;\n fn save_change(&self, p: &Change) -> Result;\n fn del_change(&self, h: &Hash) -> Result;\n fn get_change(&self, h: &Hash) -> Result;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":817216},"path":"libpijul/src/changestore/mod.rs","line":75,"ins":{"up_context":[{"change":17,"pos":819852}],"down_context":[{"change":17,"pos":819911}],"flag":"","start":34278,"end":34335,"inode":{"change":17,"pos":817216}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":819852},"to":{"change":17,"start":819852,"end":819911},"introduced_by":17}],"inode":{"change":17,"pos":817216}},"ins_contents":[{"Add":" ) -> Result<(InodeMetadata, &'a str), Self::Error> {"}],"del_contents":[{"Del":" ) -> Result<(InodeMetadata, &'a str), anyhow::Error> {\n"}]}},{"Edit":{"inode":{"change":17,"pos":820702},"path":"libpijul/src/changestore/memory.rs","line":5,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":820846},"to":{"change":17,"start":820846,"end":820864},"introduced_by":17}],"inode":{"change":17,"pos":820702}}},"contents":[{"Del":"use crate::Error;\n"}]}},{"Edit":{"inode":{"change":17,"pos":820702},"path":"libpijul/src/changestore/memory.rs","line":22,"atom":{"NewVertex":{"up_context":[{"change":17,"pos":821211}],"down_context":[{"change":17,"pos":821211}],"flag":"","start":34336,"end":34727,"inode":{"change":17,"pos":820702}}},"contents":[{"Add":"#[derive(Debug, Error)]"},{"Add":"pub enum Error {"},{"Add":" #[error(transparent)]"},{"Add":" Io(#[from] std::io::Error),"},{"Add":" #[error(transparent)]"},{"Add":" Utf8(#[from] std::str::Utf8Error),"},{"Add":" #[error(transparent)]"},{"Add":" Change(#[from] crate::change::ChangeError),"},{"Add":" #[error(\"Change not found: {:?}\", hash)]"},{"Add":" ChangeNotFound { hash: crate::Hash },"},{"Add":" #[error(transparent)]"},{"Add":" Bincode(#[from] bincode::Error),"},{"Add":"}"},{"Add":""}]}},{"Edit":{"inode":{"change":17,"pos":820702},"path":"libpijul/src/changestore/memory.rs","line":37,"atom":{"NewVertex":{"up_context":[{"change":17,"pos":821241}],"down_context":[{"change":17,"pos":821241}],"flag":"","start":34728,"end":34752,"inode":{"change":17,"pos":820702}}},"contents":[{"Add":" type Error = Error;"}]}},{"Replacement":{"inode":{"change":17,"pos":820702},"path":"libpijul/src/changestore/memory.rs","line":48,"ins":{"up_context":[{"change":17,"pos":821589}],"down_context":[{"change":17,"pos":821629}],"flag":"","start":34753,"end":34791,"inode":{"change":17,"pos":820702}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":821589},"to":{"change":17,"start":821589,"end":821629},"introduced_by":17}],"inode":{"change":17,"pos":820702}},"ins_contents":[{"Add":" ) -> Result {"}],"del_contents":[{"Del":" ) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":820702},"path":"libpijul/src/changestore/memory.rs","line":65,"ins":{"up_context":[{"change":17,"pos":822154}],"down_context":[{"change":17,"pos":822194}],"flag":"","start":34792,"end":34830,"inode":{"change":17,"pos":820702}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":822154},"to":{"change":17,"start":822154,"end":822194},"introduced_by":17}],"inode":{"change":17,"pos":820702}},"ins_contents":[{"Add":" ) -> Result {"}],"del_contents":[{"Del":" ) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":820702},"path":"libpijul/src/changestore/memory.rs","line":87,"ins":{"up_context":[{"change":17,"pos":822890}],"down_context":[{"change":17,"pos":822934}],"flag":"","start":34831,"end":34873,"inode":{"change":17,"pos":820702}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":822890},"to":{"change":17,"start":822890,"end":822934},"introduced_by":17}],"inode":{"change":17,"pos":820702}},"ins_contents":[{"Add":" ) -> Result, Self::Error> {"}],"del_contents":[{"Del":" ) -> Result, anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":820702},"path":"libpijul/src/changestore/memory.rs","line":98,"ins":{"up_context":[{"change":17,"pos":823259}],"down_context":[{"change":17,"pos":823330}],"flag":"","start":34874,"end":34943,"inode":{"change":17,"pos":820702}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":823259},"to":{"change":17,"start":823259,"end":823330},"introduced_by":17}],"inode":{"change":17,"pos":820702}},"ins_contents":[{"Add":" fn save_change(&self, p: &Change) -> Result {"}],"del_contents":[{"Del":" fn save_change(&self, p: &Change) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":820702},"path":"libpijul/src/changestore/memory.rs","line":104,"ins":{"up_context":[{"change":17,"pos":823469}],"down_context":[{"change":17,"pos":823537}],"flag":"","start":34944,"end":35010,"inode":{"change":17,"pos":820702}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":823469},"to":{"change":17,"start":823469,"end":823537},"introduced_by":17}],"inode":{"change":17,"pos":820702}},"ins_contents":[{"Add":" fn del_change(&self, h: &Hash) -> Result {"}],"del_contents":[{"Del":" fn del_change(&self, h: &Hash) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":820702},"path":"libpijul/src/changestore/memory.rs","line":108,"ins":{"up_context":[{"change":17,"pos":823628}],"down_context":[{"change":17,"pos":823698}],"flag":"","start":35011,"end":35079,"inode":{"change":17,"pos":820702}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":823628},"to":{"change":17,"start":823628,"end":823698},"introduced_by":17}],"inode":{"change":17,"pos":820702}},"ins_contents":[{"Add":" fn get_change(&self, h: &Hash) -> Result {"}],"del_contents":[{"Del":" fn get_change(&self, h: &Hash) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":820702},"path":"libpijul/src/changestore/memory.rs","line":113,"ins":{"up_context":[{"change":17,"pos":823823}],"down_context":[{"change":17,"pos":823978}],"flag":"","start":35080,"end":35132,"inode":{"change":17,"pos":820702}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":823823},"to":{"change":17,"start":823823,"end":823978},"introduced_by":17}],"inode":{"change":17,"pos":820702}},"ins_contents":[{"Add":" Err(Error::ChangeNotFound { hash: *h })"}],"del_contents":[{"Del":" use crate::pristine::Base32;\n Err((Error::ChangeNotFound {\n hash: h.to_base32(),\n })\n .into())\n"}]}},{"Edit":{"inode":{"change":17,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":17,"atom":{"NewVertex":{"up_context":[{"change":17,"pos":824519}],"down_context":[{"change":17,"pos":824519}],"flag":"","start":35133,"end":35449,"inode":{"change":17,"pos":824013}}},"contents":[{"Add":"}"},{"Add":""},{"Add":"#[derive(Debug, Error)]"},{"Add":"pub enum Error {"},{"Add":" #[error(transparent)]"},{"Add":" Io(#[from] std::io::Error),"},{"Add":" #[error(transparent)]"},{"Add":" Utf8(#[from] std::str::Utf8Error),"},{"Add":" #[error(transparent)]"},{"Add":" ChangeFile(#[from] crate::change::ChangeError),"},{"Add":" #[error(transparent)]"},{"Add":" Persist(#[from] tempfile::PersistError),"}]}},{"Replacement":{"inode":{"change":17,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":79,"ins":{"up_context":[{"change":17,"pos":826098}],"down_context":[{"change":17,"pos":826121}],"flag":"","start":35450,"end":35486,"inode":{"change":17,"pos":824013}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":826098},"to":{"change":17,"start":826098,"end":826121},"introduced_by":17}],"inode":{"change":17,"pos":824013}},"ins_contents":[{"Add":" crate::change::ChangeError,"}],"del_contents":[{"Del":" anyhow::Error,\n"}]}},{"Replacement":{"inode":{"change":17,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":96,"ins":{"up_context":[{"change":17,"pos":826612}],"down_context":[{"change":17,"pos":826649}],"flag":"","start":35487,"end":35537,"inode":{"change":17,"pos":824013}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":826612},"to":{"change":17,"start":826612,"end":826649},"introduced_by":17}],"inode":{"change":17,"pos":824013}},"ins_contents":[{"Add":" ) -> Result<(), crate::change::ChangeError> {"}],"del_contents":[{"Del":" ) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":98,"ins":{"up_context":[{"change":17,"pos":826696}],"down_context":[{"change":17,"pos":826755}],"flag":"","start":35538,"end":35614,"inode":{"change":17,"pos":824013}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":826696},"to":{"change":17,"start":826696,"end":826755},"introduced_by":17}],"inode":{"change":17,"pos":824013}},"ins_contents":[{"Add":" self.save_from_buf_unchecked(buf, hash, change_id)?;"},{"Add":" Ok(())"}],"del_contents":[{"Del":" self.save_from_buf_unchecked(buf, hash, change_id)\n"}]}},{"Replacement":{"inode":{"change":17,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":107,"ins":{"up_context":[{"change":17,"pos":826891}],"down_context":[{"change":17,"pos":826928}],"flag":"","start":35615,"end":35653,"inode":{"change":17,"pos":824013}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":826891},"to":{"change":17,"start":826891,"end":826928},"introduced_by":17}],"inode":{"change":17,"pos":824013}},"ins_contents":[{"Add":" ) -> Result<(), std::io::Error> {"}],"del_contents":[{"Del":" ) -> Result<(), anyhow::Error> {\n"}]}},{"Edit":{"inode":{"change":17,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":124,"atom":{"NewVertex":{"up_context":[{"change":17,"pos":827463}],"down_context":[{"change":17,"pos":827463}],"flag":"","start":35654,"end":35678,"inode":{"change":17,"pos":824013}}},"contents":[{"Add":" type Error = Error;"}]}},{"Replacement":{"inode":{"change":17,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":148,"ins":{"up_context":[{"change":17,"pos":828230}],"down_context":[{"change":17,"pos":828306}],"flag":"","start":35679,"end":35753,"inode":{"change":17,"pos":824013}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":828230},"to":{"change":17,"start":828230,"end":828306},"introduced_by":17}],"inode":{"change":17,"pos":824013}},"ins_contents":[{"Add":" fn get_header(&self, h: &Hash) -> Result {"}],"del_contents":[{"Del":" fn get_header(&self, h: &Hash) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":159,"ins":{"up_context":[{"change":17,"pos":828611}],"down_context":[{"change":17,"pos":828651}],"flag":"","start":35754,"end":35792,"inode":{"change":17,"pos":824013}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":828611},"to":{"change":17,"start":828611,"end":828651},"introduced_by":17}],"inode":{"change":17,"pos":824013}},"ins_contents":[{"Add":" ) -> Result {"}],"del_contents":[{"Del":" ) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":174,"ins":{"up_context":[{"change":17,"pos":829117}],"down_context":[{"change":17,"pos":829157}],"flag":"","start":35793,"end":35831,"inode":{"change":17,"pos":824013}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":829117},"to":{"change":17,"start":829117,"end":829157},"introduced_by":17}],"inode":{"change":17,"pos":824013}},"ins_contents":[{"Add":" ) -> Result {"}],"del_contents":[{"Del":" ) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":193,"ins":{"up_context":[{"change":17,"pos":829768}],"down_context":[{"change":17,"pos":829812}],"flag":"","start":35832,"end":35874,"inode":{"change":17,"pos":824013}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":829768},"to":{"change":17,"start":829768,"end":829812},"introduced_by":17}],"inode":{"change":17,"pos":824013}},"ins_contents":[{"Add":" ) -> Result, Self::Error> {"}],"del_contents":[{"Del":" ) -> Result, anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":205,"ins":{"up_context":[{"change":17,"pos":830156}],"down_context":[{"change":17,"pos":830227}],"flag":"","start":35875,"end":35944,"inode":{"change":17,"pos":824013}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":830156},"to":{"change":17,"start":830156,"end":830227},"introduced_by":17}],"inode":{"change":17,"pos":824013}},"ins_contents":[{"Add":" fn save_change(&self, p: &Change) -> Result {"}],"del_contents":[{"Del":" fn save_change(&self, p: &Change) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":217,"ins":{"up_context":[{"change":17,"pos":830625}],"down_context":[{"change":17,"pos":830696}],"flag":"","start":35945,"end":36014,"inode":{"change":17,"pos":824013}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":830625},"to":{"change":17,"start":830625,"end":830696},"introduced_by":17}],"inode":{"change":17,"pos":824013}},"ins_contents":[{"Add":" fn del_change(&self, hash: &Hash) -> Result {"}],"del_contents":[{"Del":" fn del_change(&self, hash: &Hash) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":224,"ins":{"up_context":[{"change":17,"pos":831024}],"down_context":[{"change":17,"pos":831094}],"flag":"","start":36015,"end":36083,"inode":{"change":17,"pos":824013}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":831024},"to":{"change":17,"start":831024,"end":831094},"introduced_by":17}],"inode":{"change":17,"pos":824013}},"ins_contents":[{"Add":" fn get_change(&self, h: &Hash) -> Result {"}],"del_contents":[{"Del":" fn get_change(&self, h: &Hash) -> Result {\n"}]}},{"Edit":{"inode":{"change":17,"pos":831311},"path":"libpijul/src/change.rs","line":1,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":831311},"to":{"change":17,"start":831312,"end":831385},"introduced_by":17}],"inode":{"change":17,"pos":831311}}},"contents":[{"Del":"// org id 4+w2sTG9zBScwyjzB8qqUXj0dCYZg3xGYPeKsGKua2k=\nuse super::Error;\n"}]}},{"Edit":{"inode":{"change":17,"pos":831311},"path":"libpijul/src/change.rs","line":4,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":831481},"to":{"change":17,"start":831481,"end":831519},"introduced_by":17}],"inode":{"change":17,"pos":831311}}},"contents":[{"Del":"\n#[cfg(feature = \"zstd\")]\npub mod v3;\n"}]}},{"Edit":{"inode":{"change":17,"pos":831311},"path":"libpijul/src/change.rs","line":7,"atom":{"NewVertex":{"up_context":[{"change":17,"pos":831565}],"down_context":[{"change":17,"pos":831565}],"flag":"","start":36084,"end":37142,"inode":{"change":17,"pos":831311}}},"contents":[{"Add":""},{"Add":"#[cfg(feature = \"text-changes\")]"},{"Add":"mod text_changes;"},{"Add":""},{"Add":"mod change_file;"},{"Add":"pub use change_file::*;"},{"Add":""},{"Add":"#[derive(Debug, Error)]"},{"Add":"pub enum ChangeError {"},{"Add":" #[error(\"Version mismatch\")]"},{"Add":" VersionMismatch,"},{"Add":" #[error(transparent)]"},{"Add":" Io(#[from] std::io::Error),"},{"Add":" #[error(transparent)]"},{"Add":" Bincode(#[from] bincode::Error),"},{"Add":" #[error(transparent)]"},{"Add":" Zstd(#[from] zstd_seekable::Error),"},{"Add":" #[error(transparent)]"},{"Add":" TomlDe(#[from] toml::de::Error),"},{"Add":" #[error(transparent)]"},{"Add":" TomlSer(#[from] toml::ser::Error),"},{"Add":" #[error(\"Missing contents for change {:?}\", hash)]"},{"Add":" MissingContents { hash: crate::pristine::Hash },"},{"Add":" #[error(\"Change hash mismatch, claimed {:?}, computed {:?}\", claimed, computed)]"},{"Add":" ChangeHashMismatch {"},{"Add":" claimed: crate::pristine::Hash,"},{"Add":" computed: crate::pristine::Hash,"},{"Add":" },"},{"Add":" #[error("},{"Add":" \"Change contents hash mismatch, claimed {:?}, computed {:?}\","},{"Add":" claimed,"},{"Add":" computed"},{"Add":" )]"},{"Add":" ContentsHashMismatch {"},{"Add":" claimed: crate::pristine::Hash,"},{"Add":" computed: crate::pristine::Hash,"},{"Add":" },"},{"Add":"}"}]}},{"Replacement":{"inode":{"change":17,"pos":831311},"path":"libpijul/src/change.rs","line":1169,"ins":{"up_context":[{"change":17,"pos":868798}],"down_context":[{"change":17,"pos":868875}],"flag":"","start":37143,"end":37218,"inode":{"change":17,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":868798},"to":{"change":17,"start":868798,"end":868875},"introduced_by":17}],"inode":{"change":17,"pos":831311}},"ins_contents":[{"Add":"fn compress(input: &[u8], mut w: W) -> Result<(), ChangeError> {"}],"del_contents":[{"Del":"fn compress(input: &[u8], mut w: W) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":831311},"path":"libpijul/src/change.rs","line":1190,"ins":{"up_context":[{"change":17,"pos":869478}],"down_context":[{"change":17,"pos":869516}],"flag":"","start":37219,"end":37255,"inode":{"change":17,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":869478},"to":{"change":17,"start":869478,"end":869516},"introduced_by":17}],"inode":{"change":17,"pos":831311}},"ins_contents":[{"Add":" ) -> Result {"}],"del_contents":[{"Del":" ) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":831311},"path":"libpijul/src/change.rs","line":1196,"ins":{"up_context":[{"change":17,"pos":869757}],"down_context":[{"change":17,"pos":869812}],"flag":"","start":37256,"end":37310,"inode":{"change":17,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":869757},"to":{"change":17,"start":869757,"end":869812},"introduced_by":17}],"inode":{"change":17,"pos":831311}},"ins_contents":[{"Add":" return Err(ChangeError::VersionMismatch);"}],"del_contents":[{"Del":" return Err(Error::VersionMismatch.into());\n"}]}},{"Replacement":{"inode":{"change":17,"pos":831311},"path":"libpijul/src/change.rs","line":1206,"ins":{"up_context":[{"change":17,"pos":870081}],"down_context":[{"change":17,"pos":870244}],"flag":"","start":37311,"end":37390,"inode":{"change":17,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":870081},"to":{"change":17,"start":870081,"end":870162},"introduced_by":17}],"inode":{"change":17,"pos":831311}},"ins_contents":[{"Add":" pub fn serialize(&self, mut w: W) -> Result {"}],"del_contents":[{"Del":" pub fn serialize(&self, mut w: W) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":831311},"path":"libpijul/src/change.rs","line":1254,"ins":{"up_context":[{"change":17,"pos":871761}],"down_context":[{"change":17,"pos":871846}],"flag":"","start":37391,"end":37474,"inode":{"change":17,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":871761},"to":{"change":17,"start":871761,"end":871846},"introduced_by":17}],"inode":{"change":17,"pos":831311}},"ins_contents":[{"Add":" pub fn check_from_buffer(buf: &[u8], hash: &Hash) -> Result<(), ChangeError> {"}],"del_contents":[{"Del":" pub fn check_from_buffer(buf: &[u8], hash: &Hash) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":831311},"path":"libpijul/src/change.rs","line":1257,"ins":{"up_context":[{"change":17,"pos":871982}],"down_context":[{"change":17,"pos":872037}],"flag":"","start":37475,"end":37529,"inode":{"change":17,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":871982},"to":{"change":17,"start":871982,"end":872037},"introduced_by":17}],"inode":{"change":17,"pos":831311}},"ins_contents":[{"Add":" return Err(ChangeError::VersionMismatch);"}],"del_contents":[{"Del":" return Err(Error::VersionMismatch.into());\n"}]}},{"Replacement":{"inode":{"change":17,"pos":831311},"path":"libpijul/src/change.rs","line":1273,"ins":{"up_context":[{"change":17,"pos":872645}],"down_context":[{"change":17,"pos":872697}],"flag":"","start":37530,"end":37588,"inode":{"change":17,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":872645},"to":{"change":17,"start":872645,"end":872697},"introduced_by":17}],"inode":{"change":17,"pos":831311}},"ins_contents":[{"Add":" return Err((ChangeError::ChangeHashMismatch {"}],"del_contents":[{"Del":" return Err((Error::ChangeHashMismatch {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":831311},"path":"libpijul/src/change.rs","line":1295,"ins":{"up_context":[{"change":17,"pos":873489}],"down_context":[{"change":17,"pos":873543}],"flag":"","start":37589,"end":37648,"inode":{"change":17,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":873489},"to":{"change":17,"start":873489,"end":873543},"introduced_by":17}],"inode":{"change":17,"pos":831311}},"ins_contents":[{"Add":" return Err(ChangeError::ContentsHashMismatch {"}],"del_contents":[{"Del":" return Err((Error::ContentsHashMismatch {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":831311},"path":"libpijul/src/change.rs","line":1298,"ins":{"up_context":[{"change":17,"pos":873631}],"down_context":[{"change":17,"pos":873668}],"flag":"","start":37649,"end":37665,"inode":{"change":17,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":873631},"to":{"change":17,"start":873631,"end":873668},"introduced_by":17}],"inode":{"change":17,"pos":831311}},"ins_contents":[{"Add":" });"}],"del_contents":[{"Del":" })\n .into());\n"}]}},{"Replacement":{"inode":{"change":17,"pos":831311},"path":"libpijul/src/change.rs","line":1305,"ins":{"up_context":[{"change":17,"pos":873795}],"down_context":[{"change":17,"pos":873884}],"flag":"","start":37666,"end":37753,"inode":{"change":17,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":873795},"to":{"change":17,"start":873795,"end":873884},"introduced_by":17}],"inode":{"change":17,"pos":831311}},"ins_contents":[{"Add":" pub fn deserialize(file: &str, hash: Option<&Hash>) -> Result {"}],"del_contents":[{"Del":" pub fn deserialize(file: &str, hash: Option<&Hash>) -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":831311},"path":"libpijul/src/change.rs","line":1312,"ins":{"up_context":[{"change":17,"pos":874154}],"down_context":[{"change":17,"pos":874209}],"flag":"","start":37754,"end":37808,"inode":{"change":17,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":874154},"to":{"change":17,"start":874154,"end":874209},"introduced_by":17}],"inode":{"change":17,"pos":831311}},"ins_contents":[{"Add":" return Err(ChangeError::VersionMismatch);"}],"del_contents":[{"Del":" return Err(Error::VersionMismatch.into());\n"}]}},{"Replacement":{"inode":{"change":17,"pos":831311},"path":"libpijul/src/change.rs","line":1329,"ins":{"up_context":[{"change":17,"pos":874826}],"down_context":[{"change":17,"pos":874886}],"flag":"","start":37809,"end":37874,"inode":{"change":17,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":874826},"to":{"change":17,"start":874826,"end":874886},"introduced_by":17}],"inode":{"change":17,"pos":831311}},"ins_contents":[{"Add":" return Err(ChangeError::ChangeHashMismatch {"}],"del_contents":[{"Del":" return Err((Error::ChangeHashMismatch {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":831311},"path":"libpijul/src/change.rs","line":1332,"ins":{"up_context":[{"change":17,"pos":874975}],"down_context":[{"change":17,"pos":875028}],"flag":"","start":37875,"end":37899,"inode":{"change":17,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":874975},"to":{"change":17,"start":874975,"end":875028},"introduced_by":17}],"inode":{"change":17,"pos":831311}},"ins_contents":[{"Add":" });"}],"del_contents":[{"Del":" })\n .into());\n"}]}},{"Replacement":{"inode":{"change":17,"pos":831311},"path":"libpijul/src/change.rs","line":1374,"ins":{"up_context":[{"change":17,"pos":876440}],"down_context":[{"change":17,"pos":876496}],"flag":"","start":37900,"end":37957,"inode":{"change":17,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":876440},"to":{"change":17,"start":876440,"end":876496},"introduced_by":17}],"inode":{"change":17,"pos":831311}},"ins_contents":[{"Add":" pub fn hash(&self) -> Result {"}],"del_contents":[{"Del":" pub fn hash(&self) -> Result {\n"}]}},{"Edit":{"inode":{"change":17,"pos":831311},"path":"libpijul/src/change.rs","line":1381,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":876662},"to":{"change":17,"start":876662,"end":878745},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":878745},"to":{"change":17,"start":878745,"end":878841},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":878841},"to":{"change":17,"start":878841,"end":878977},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":878977},"to":{"change":17,"start":878977,"end":880955},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":880955},"to":{"change":17,"start":880955,"end":881040},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":881040},"to":{"change":17,"start":881040,"end":882461},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":882461},"to":{"change":17,"start":1240,"end":1323},"introduced_by":17},{"previous":"","flag":"DELETED","from":{"change":17,"pos":1323},"to":{"change":17,"start":882554,"end":885299},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":882554},"to":{"change":17,"start":882554,"end":885299},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":885299},"to":{"change":17,"start":1324,"end":1399},"introduced_by":17},{"previous":"","flag":"DELETED","from":{"change":17,"pos":1399},"to":{"change":17,"start":885376,"end":885517},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":885376},"to":{"change":17,"start":885376,"end":885517},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":885517},"to":{"change":17,"start":1400,"end":1470},"introduced_by":17},{"previous":"","flag":"DELETED","from":{"change":17,"pos":1470},"to":{"change":17,"start":885589,"end":886662},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":885589},"to":{"change":17,"start":885589,"end":886662},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":886662},"to":{"change":17,"start":886662,"end":886733},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":886733},"to":{"change":17,"start":886733,"end":886865},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":886865},"to":{"change":17,"start":886865,"end":887016},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":887016},"to":{"change":17,"start":887016,"end":887744},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":887744},"to":{"change":9,"start":418,"end":452},"introduced_by":9},{"previous":"","flag":"DELETED","from":{"change":9,"pos":452},"to":{"change":17,"start":887782,"end":888474},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":887782},"to":{"change":17,"start":887782,"end":888474},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":888474},"to":{"change":9,"start":453,"end":487},"introduced_by":9},{"previous":"","flag":"DELETED","from":{"change":9,"pos":487},"to":{"change":17,"start":888512,"end":888888},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":888512},"to":{"change":17,"start":888512,"end":888888},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":888888},"to":{"change":9,"start":488,"end":518},"introduced_by":9},{"previous":"","flag":"DELETED","from":{"change":9,"pos":518},"to":{"change":17,"start":888922,"end":889088},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":888922},"to":{"change":17,"start":888922,"end":889088},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":889088},"to":{"change":9,"start":519,"end":553},"introduced_by":9},{"previous":"","flag":"DELETED","from":{"change":9,"pos":553},"to":{"change":17,"start":889126,"end":889214},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":889126},"to":{"change":17,"start":889126,"end":889214},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":889214},"to":{"change":17,"start":889214,"end":889239},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":889239},"to":{"change":9,"start":554,"end":588},"introduced_by":9},{"previous":"","flag":"DELETED","from":{"change":9,"pos":588},"to":{"change":17,"start":889277,"end":889551},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":889277},"to":{"change":17,"start":889277,"end":889551},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":889551},"to":{"change":9,"start":589,"end":619},"introduced_by":9},{"previous":"","flag":"DELETED","from":{"change":9,"pos":619},"to":{"change":17,"start":889585,"end":889753},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":889585},"to":{"change":17,"start":889585,"end":889753},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":889753},"to":{"change":17,"start":889753,"end":889841},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":889841},"to":{"change":17,"start":889841,"end":889866},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":889866},"to":{"change":9,"start":620,"end":654},"introduced_by":9},{"previous":"","flag":"DELETED","from":{"change":9,"pos":654},"to":{"change":17,"start":889904,"end":891488},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":889904},"to":{"change":17,"start":889904,"end":891488},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":891488},"to":{"change":17,"start":891488,"end":891541},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":891541},"to":{"change":17,"start":891541,"end":891869},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":891869},"to":{"change":17,"start":618,"end":648},"introduced_by":17},{"previous":"","flag":"DELETED","from":{"change":17,"pos":648},"to":{"change":17,"start":891903,"end":891957},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":891903},"to":{"change":17,"start":891903,"end":891957},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":891957},"to":{"change":17,"start":891957,"end":892039},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":892039},"to":{"change":17,"start":892039,"end":892327},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":892327},"to":{"change":17,"start":649,"end":679},"introduced_by":17},{"previous":"","flag":"DELETED","from":{"change":17,"pos":679},"to":{"change":17,"start":892361,"end":892474},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":892361},"to":{"change":17,"start":892361,"end":892474},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":892474},"to":{"change":17,"start":892474,"end":892643},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":892643},"to":{"change":17,"start":892643,"end":892938},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":892938},"to":{"change":9,"start":655,"end":685},"introduced_by":9},{"previous":"","flag":"DELETED","from":{"change":9,"pos":685},"to":{"change":17,"start":892972,"end":893324},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":892972},"to":{"change":17,"start":892972,"end":893324},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":893324},"to":{"change":9,"start":686,"end":716},"introduced_by":9},{"previous":"","flag":"DELETED","from":{"change":9,"pos":716},"to":{"change":17,"start":893358,"end":893723},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":893358},"to":{"change":17,"start":893358,"end":893723},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":893723},"to":{"change":17,"start":680,"end":710},"introduced_by":17},{"previous":"","flag":"DELETED","from":{"change":17,"pos":710},"to":{"change":17,"start":893757,"end":893811},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":893757},"to":{"change":17,"start":893757,"end":893811},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":893811},"to":{"change":17,"start":1210,"end":1292},"introduced_by":17},{"previous":"","flag":"DELETED","from":{"change":17,"pos":1292},"to":{"change":17,"start":893811,"end":894129},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":893811},"to":{"change":17,"start":893811,"end":894129},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":894129},"to":{"change":17,"start":711,"end":741},"introduced_by":17},{"previous":"","flag":"DELETED","from":{"change":17,"pos":741},"to":{"change":17,"start":894163,"end":894217},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":894163},"to":{"change":17,"start":894163,"end":894217},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":894217},"to":{"change":17,"start":1293,"end":1375},"introduced_by":17},{"previous":"","flag":"DELETED","from":{"change":17,"pos":1375},"to":{"change":17,"start":894217,"end":894291},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":894217},"to":{"change":17,"start":894217,"end":894291},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":894291},"to":{"change":17,"start":66822,"end":66993},"introduced_by":17},{"previous":"","flag":"DELETED","from":{"change":17,"pos":93},"to":{"change":17,"start":894369,"end":894429},"introduced_by":17},{"previous":"","flag":"DELETED","from":{"change":17,"pos":66993},"to":{"change":17,"start":894369,"end":894429},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":894369},"to":{"change":17,"start":894369,"end":894429},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":894429},"to":{"change":17,"start":742,"end":772},"introduced_by":17},{"previous":"","flag":"DELETED","from":{"change":17,"pos":128},"to":{"change":17,"start":894486,"end":894540},"introduced_by":17},{"previous":"","flag":"DELETED","from":{"change":17,"pos":772},"to":{"change":17,"start":894486,"end":894540},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":894486},"to":{"change":17,"start":894486,"end":894540},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":894540},"to":{"change":17,"start":1376,"end":1458},"introduced_by":17},{"previous":"","flag":"DELETED","from":{"change":17,"pos":1458},"to":{"change":17,"start":894540,"end":896408},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":894540},"to":{"change":17,"start":894540,"end":896408},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":896408},"to":{"change":17,"start":129,"end":251},"introduced_by":17},{"previous":"","flag":"DELETED","from":{"change":17,"pos":251},"to":{"change":17,"start":896503,"end":904855},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":896503},"to":{"change":17,"start":896503,"end":904855},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":904855},"to":{"change":17,"start":252,"end":912},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":912},"to":{"change":17,"start":66994,"end":67014},"introduced_by":17},{"previous":"","flag":"DELETED","from":{"change":17,"pos":931},"to":{"change":17,"start":904855,"end":905077},"introduced_by":17},{"previous":"","flag":"DELETED","from":{"change":17,"pos":67014},"to":{"change":17,"start":904855,"end":905077},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":904855},"to":{"change":17,"start":904855,"end":905077},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":905077},"to":{"change":17,"start":6772,"end":6816},"introduced_by":17},{"previous":"","flag":"DELETED","from":{"change":17,"pos":6816},"to":{"change":17,"start":905121,"end":905792},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":905121},"to":{"change":17,"start":905121,"end":905792},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":905792},"to":{"change":17,"start":6817,"end":6869},"introduced_by":17},{"previous":"","flag":"DELETED","from":{"change":17,"pos":6869},"to":{"change":17,"start":905844,"end":905985},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":905844},"to":{"change":17,"start":905844,"end":905985},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":905985},"to":{"change":17,"start":6870,"end":6922},"introduced_by":17},{"previous":"","flag":"DELETED","from":{"change":17,"pos":6922},"to":{"change":17,"start":906037,"end":910672},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":906037},"to":{"change":17,"start":906037,"end":910672},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":910672},"to":{"change":2,"start":4331,"end":4375},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":4375},"to":{"change":17,"start":910672,"end":911073},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":910672},"to":{"change":17,"start":910672,"end":911073},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":911073},"to":{"change":17,"start":6923,"end":6975},"introduced_by":17},{"previous":"","flag":"DELETED","from":{"change":17,"pos":6975},"to":{"change":17,"start":911125,"end":912754},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":911125},"to":{"change":17,"start":911125,"end":912754},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":912917},"to":{"change":17,"start":912917,"end":912947},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":912947},"to":{"change":17,"start":1459,"end":1536},"introduced_by":17},{"previous":"","flag":"DELETED","from":{"change":17,"pos":1536},"to":{"change":17,"start":912947,"end":912973},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":912947},"to":{"change":17,"start":912947,"end":912973},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":912973},"to":{"change":17,"start":6976,"end":7028},"introduced_by":17},{"previous":"","flag":"DELETED","from":{"change":17,"pos":7028},"to":{"change":17,"start":913025,"end":914758},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":913025},"to":{"change":17,"start":913025,"end":914758},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":914758},"to":{"change":17,"start":1537,"end":2006},"introduced_by":17},{"previous":"","flag":"DELETED","from":{"change":17,"pos":2006},"to":{"change":17,"start":914819,"end":915263},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":914819},"to":{"change":17,"start":914819,"end":915263},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":915263},"to":{"change":17,"start":2007,"end":2613},"introduced_by":17},{"previous":"","flag":"DELETED","from":{"change":17,"pos":2613},"to":{"change":17,"start":915427,"end":917686},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":915427},"to":{"change":17,"start":915427,"end":917686},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":917686},"to":{"change":17,"start":7029,"end":7107},"introduced_by":17},{"previous":"","flag":"DELETED","from":{"change":17,"pos":7107},"to":{"change":17,"start":917890,"end":918425},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":917890},"to":{"change":17,"start":917890,"end":918425},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":918425},"to":{"change":2,"start":4376,"end":4450},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":4450},"to":{"change":17,"start":918425,"end":919617},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":918425},"to":{"change":17,"start":918425,"end":919617},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":919617},"to":{"change":17,"start":7108,"end":7143},"introduced_by":17},{"previous":"","flag":"DELETED","from":{"change":17,"pos":7143},"to":{"change":17,"start":919652,"end":921737},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":919652},"to":{"change":17,"start":919652,"end":921737},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":921737},"to":{"change":17,"start":921737,"end":921783},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":921783},"to":{"change":17,"start":921783,"end":921847},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":921847},"to":{"change":17,"start":921847,"end":921884},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":921884},"to":{"change":17,"start":0,"end":67},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":67},"to":{"change":15,"start":0,"end":87},"introduced_by":15},{"previous":"","flag":"DELETED","from":{"change":15,"pos":87},"to":{"change":17,"start":142,"end":380},"introduced_by":15},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":142},"to":{"change":17,"start":142,"end":380},"introduced_by":17},{"previous":"","flag":"DELETED","from":{"change":17,"pos":380},"to":{"change":17,"start":922035,"end":922066},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":922035},"to":{"change":17,"start":922035,"end":922066},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":922066},"to":{"change":17,"start":922066,"end":922146},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":922146},"to":{"change":17,"start":922146,"end":922156},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":922156},"to":{"change":17,"start":922156,"end":922178},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":922178},"to":{"change":17,"start":922178,"end":922247},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":922247},"to":{"change":17,"start":922247,"end":922356},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":922356},"to":{"change":17,"start":922356,"end":922536},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":922536},"to":{"change":17,"start":922536,"end":922580},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":922580},"to":{"change":17,"start":922580,"end":923124},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":923124},"to":{"change":17,"start":923124,"end":923179},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":923179},"to":{"change":17,"start":923179,"end":927244},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":927244},"to":{"change":9,"start":717,"end":739},"introduced_by":9},{"previous":"","flag":"DELETED","from":{"change":9,"pos":739},"to":{"change":17,"start":927270,"end":930990},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":927270},"to":{"change":17,"start":927270,"end":930990},"introduced_by":17}],"inode":{"change":17,"pos":831311}}},"contents":[{"Del":"// org id SY0PPKJcw1SQ8DEsOkicihzeXjmhMRxFEiBeypeSfTY=\nuse crate::changestore::*;\nuse std::collections::hash_map::Entry;\nuse std::collections::HashMap;\nuse std::io::BufRead;\n\n#[cfg(feature = \"text-changes\")]\nimpl LocalChange {\n const DEPS_LINE: &'static str = \"# Dependencies\\n\";\n const CHANGES_LINE: &'static str = \"# Changes\\n\";\n\n pub fn write_all_deps Result<(), anyhow::Error>>(\n &self,\n mut f: F,\n ) -> Result<(), anyhow::Error> {\n for c in self.changes.iter() {\n for c in c.iter() {\n match *c {\n Atom::NewVertex(ref n) => {\n for change in n\n .up_context\n .iter()\n .chain(n.down_context.iter())\n .map(|c| c.change)\n .chain(std::iter::once(n.inode.change))\n {\n if let Some(change) = change {\n if let Hash::None = change {\n continue;\n }\n f(change)?\n }\n }\n }\n Atom::EdgeMap(ref e) => {\n for edge in e.edges.iter() {\n for change in &[\n edge.from.change,\n edge.to.change,\n edge.introduced_by,\n e.inode.change,\n ] {\n if let Some(change) = *change {\n if let Hash::None = change {\n continue;\n }\n f(change)?\n }\n }\n }\n }\n }\n }\n }\n Ok(())\n }\n\n"},{"Del":" pub fn write>) -> String>(\n"},{"Del":" &self,\n changes: &C,\n hash: Option,\n mut file_name: F,\n write_header: bool,\n mut w: W,\n"},{"Del":" ) -> Result<(), anyhow::Error> {\n if let Some(h) = hash {\n // Check if we have the full contents\n let mut hasher = Hasher::default();\n hasher.update(&self.contents);\n let hash = hasher.finish();\n if hash != self.contents_hash {\n return Err((Error::MissingContents {\n hash: h.to_base32(),\n })\n .into());\n }\n }\n\n if write_header {\n w.write_all(toml::ser::to_string_pretty(&self.header)?.as_bytes())?;\n w.write_all(b\"\\n\")?;\n }\n let mut hashes = HashMap::new();\n let mut i = 2;\n let mut needs_newline = false;\n if !self.dependencies.is_empty() {\n w.write_all(Self::DEPS_LINE.as_bytes())?;\n needs_newline = true;\n for dep in self.dependencies.iter() {\n hashes.insert(*dep, i);\n writeln!(w, \"[{}] {}\", i, dep.to_base32())?;\n i += 1;\n }\n }\n\n self.write_all_deps(|change| {\n if let Entry::Vacant(e) = hashes.entry(change) {\n e.insert(i);\n if !needs_newline {\n w.write_all(Self::DEPS_LINE.as_bytes())?;\n needs_newline = true;\n }\n writeln!(w, \"[{}]+{}\", i, change.to_base32())?;\n i += 1;\n }\n Ok(())\n })?;\n\n if !self.extra_known.is_empty() {\n needs_newline = true;\n for dep in self.extra_known.iter() {\n writeln!(w, \"[*] {}\", dep.to_base32())?;\n i += 1;\n }\n }\n\n if !self.changes.is_empty() {\n if needs_newline {\n w.write_all(b\"\\n\")?\n }\n w.write_all(Self::CHANGES_LINE.as_bytes())?;\n for (n, rec) in self.changes.iter().enumerate() {\n write!(w, \"\\n{}. \", n + 1)?;\n"},{"Del":" rec.write(changes, &mut file_name, &hashes, &self.contents, &mut w)?\n"},{"Del":" }\n }\n Ok(())\n }\n}\n\nimpl Change {\n pub fn read_and_deps(\n r: R,\n updatables: &mut HashMap,\n txn: &T,\n channel: &ChannelRef,\n ) -> Result {\n let (mut change, extra_dependencies) = Self::read_(r, updatables)?;\n let (mut deps, extra) = dependencies(txn, channel, change.hashed.changes.iter());\n deps.extend(extra_dependencies.into_iter());\n change.hashed.dependencies = deps;\n change.hashed.extra_known = extra;\n Ok(change)\n }\n\n pub fn read(\n r: R,\n updatables: &mut HashMap,\n ) -> Result {\n Ok(Self::read_(r, updatables)?.0)\n }\n\n fn read_(\n mut r: R,\n updatables: &mut HashMap,\n ) -> Result<(Self, HashSet), anyhow::Error> {\n use self::text_changes::*;\n let mut section = Section::Header(String::new());\n let mut change = Change {\n offsets: Offsets::default(),\n hashed: Hashed {\n version: VERSION,\n header: ChangeHeader {\n authors: Vec::new(),\n message: String::new(),\n description: None,\n timestamp: chrono::Utc::now(),\n },\n"},{"Del":" dependencies: Vec::new(),\n extra_known: Vec::new(),\n"},{"Del":" metadata: Vec::new(),\n changes: Vec::new(),\n contents_hash: Hasher::default().finish(),\n },\n unhashed: None,\n contents: Vec::new(),\n };\n let conclude_section = |change: &mut Change,\n section: Section,\n contents: &mut Vec|\n -> Result<(), anyhow::Error> {\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 };\n let mut h = String::new();\n let mut contents = Vec::new();\n let mut deps = HashMap::new();\n let mut extra_dependencies = HashSet::new();\n 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 } else if h == Self::CHANGES_LINE {\n let section = std::mem::replace(\n &mut section,\n Section::Changes {\n changes: Vec::new(),\n current: None,\n offsets: HashMap::new(),\n },\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 }\n 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"},{"Del":" change.hashed.dependencies.push(hash);\n"},{"Del":" }\n deps.insert(n, hash);\n } else if &d[1] == \"*\" {\n"},{"Del":" change.hashed.extra_known.push(hash);\n"},{"Del":" } 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 Record::read(updatables, current, &mut contents, &deps, offsets, &h)?\n {\n debug!(\"next action = {:?}\", next);\n changes.push(next)\n }\n }\n }\n }\n h.clear();\n }\n conclude_section(&mut change, section, &mut contents)?;\n change.contents = contents;\n change.contents_hash = {\n let mut hasher = Hasher::default();\n hasher.update(&change.contents);\n hasher.finish()\n };\n Ok((change, extra_dependencies))\n }\n"},{"Del":"}\n\n#[cfg(feature = \"text-changes\")]\nimpl Record, Local> {\n"},{"Del":" fn write<\n W: std::io::Write,\n C: ChangeStore,\n F: FnMut(&Local, Position>) -> String,\n >(\n"},{"Del":" &self,\n changes: &C,\n mut file_name: F,\n hashes: &HashMap,\n change_contents: &[u8],\n mut w: W,\n"},{"Del":" ) -> Result<(), anyhow::Error> {\n use self::text_changes::*;\n match self {\n Record::FileMove { del, add, path } => match add {\n Atom::NewVertex(ref add) => {\n let name = std::str::from_utf8(\n &change_contents[add.start.0 as usize + 2..add.end.0 as usize],\n )\n .unwrap();\n let perms = crate::pristine::InodeMetadata::from_basename(\n &change_contents[add.start.0 as usize..add.start.0 as usize + 2],\n );\n\n write!(w, \"Moved: {:?} {:?} {:o} \", path, name, perms.0)?;\n write_pos(&mut w, hashes, del.inode())?;\n"},{"Del":" writeln!(w)?;\n"},{"Del":" 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 }\n w.write_all(b\"\\n\")?;\n }\n Atom::EdgeMap(_) => {\n write!(w, \"Moved: {:?} \", path)?;\n write_pos(&mut w, hashes, del.inode())?;\n"},{"Del":" writeln!(w)?;\n"},{"Del":" write_atom(&mut w, hashes, &add)?;\n write_atom(&mut w, hashes, &del)?;\n }\n },\n Record::FileDel {\n del,\n contents,\n path,\n } => {\n write!(w, \"File deletion: {:?} \", path)?;\n write_pos(&mut w, hashes, del.inode())?;\n"},{"Del":" writeln!(w)?;\n"},{"Del":" write_atom(&mut w, hashes, &del)?;\n if let Some(ref contents) = contents {\n write_atom(&mut w, hashes, &contents)?;\n"},{"Del":" writeln!(w)?;\n"},{"Del":" print_change_contents(&mut w, changes, contents, change_contents)?;\n"},{"Del":" } else {\n"},{"Del":" writeln!(w)?;\n"},{"Del":" }\n }\n Record::FileUndel {\n undel,\n contents,\n path,\n } => {\n write!(w, \"File un-deletion: {:?} \", path)?;\n write_pos(&mut w, hashes, undel.inode())?;\n"},{"Del":" writeln!(w)?;\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(&mut w, changes, contents, change_contents)?;\n"},{"Del":" } else {\n"},{"Del":" writeln!(w)?;\n"},{"Del":" }\n }\n Record::FileAdd {\n add_name,\n contents,\n path,\n ..\n } => {\n if let Atom::NewVertex(ref n) = add_name {\n let name = std::str::from_utf8(\n &change_contents[n.start.0 as usize + 2..n.end.0 as usize],\n )\n .unwrap();\n let perms = crate::pristine::InodeMetadata::from_basename(\n &change_contents[n.start.0 as usize..n.start.0 as usize + 2],\n );\n let parent = if let Some(p) = crate::path::parent(&path) {\n if p.is_empty() {\n \"/\"\n } else {\n p\n }\n } else {\n \"/\"\n };\n write!(\n w,\n \"File addition: {:?} in {:?} {:o}\\n up\",\n name, parent, perms.0\n )?;\n assert!(n.down_context.is_empty());\n for c in n.up_context.iter() {\n write!(w, \" \")?;\n write_pos(&mut w, hashes, *c)?\n }\n writeln!(w, \", new {}:{}\", n.start.0, n.end.0)?;\n }\n if let Some(Atom::NewVertex(ref n)) = contents {\n let c = &change_contents[n.start.0 as usize..n.end.0 as usize];\n"},{"Del":" print_contents(&mut w, \"+\", c)?;\n"},{"Del":" if !c.ends_with(b\"\\n\") {\n writeln!(w, \"\\\\\")?\n }\n }\n }\n Record::Edit { change, local } => {\n write!(w, \"Edit in {} \", file_name(&local, change.inode()))?;\n write_pos(&mut w, hashes, change.inode())?;\n"},{"Del":" writeln!(w)?;\n"},{"Del":" write_atom(&mut w, hashes, &change)?;\n"},{"Del":" print_change_contents(&mut w, changes, change, change_contents)?;\n"},{"Del":" }\n Record::Replacement {\n change,\n replacement,\n local,\n } => {\n write!(w, \"Replacement in {} \", file_name(&local, change.inode()))?;\n write_pos(&mut w, hashes, change.inode())?;\n"},{"Del":" writeln!(w)?;\n"},{"Del":" write_atom(&mut w, hashes, &change)?;\n write_atom(&mut w, hashes, &replacement)?;\n"},{"Del":" print_change_contents(&mut w, changes, change, change_contents)?;\n print_change_contents(&mut w, changes, replacement, change_contents)?;\n"},{"Del":" }\n Record::SolveNameConflict { name, path } => {\n write!(w, \"Solving a name conflict in {:?} \", path)?;\n write_pos(&mut w, hashes, name.inode())?;\n write!(w, \": \")?;\n write_deleted_names(&mut w, changes, name)?;\n"},{"Del":" writeln!(w)?;\n"},{"Del":" write_atom(&mut w, hashes, &name)?;\n }\n Record::UnsolveNameConflict { name, path } => {\n write!(w, \"Un-solving a name conflict in {:?} \", path)?;\n write_pos(&mut w, hashes, name.inode())?;\n write!(w, \": \")?;\n write_deleted_names(&mut w, changes, name)?;\n"},{"Del":" writeln!(w)?;\n"},{"Del":" write_atom(&mut w, hashes, &name)?;\n }\n Record::SolveOrderConflict { change, local } => {\n write!(\n w,\n \"Solving an order conflict in {} \",\n file_name(&local, change.inode())\n )?;\n write_pos(&mut w, hashes, change.inode())?;\n"},{"Del":" writeln!(w)?;\n"},{"Del":" write_atom(&mut w, hashes, &change)?;\n"},{"Del":" print_change_contents(&mut w, changes, change, change_contents)?;\n"},{"Del":" }\n Record::UnsolveOrderConflict { change, local } => {\n write!(\n w,\n \"Un-solving an order conflict in {} \",\n file_name(&local, change.inode())\n )?;\n write_pos(&mut w, hashes, change.inode())?;\n"},{"Del":" writeln!(w)?;\n"},{"Del":" write_atom(&mut w, hashes, &change)?;\n"},{"Del":" print_change_contents(&mut w, changes, change, change_contents)?;\n"},{"Del":" }\n Record::ResurrectZombies { change, local } => {\n"},{"Del":" write!(\n w,\n \"Resurrecting zombie lines in {:?}:{} \",\n local.path, local.line\n )?;\n"},{"Del":" write_pos(&mut w, hashes, change.inode())?;\n"},{"Del":" writeln!(w)?;\n"},{"Del":" write_atom(&mut w, hashes, &change)?;\n"},{"Del":" print_change_contents(&mut w, changes, change, change_contents)?;\n"},{"Del":" }\n }\n Ok(())\n }\n}\n\n#[cfg(feature = \"text-changes\")]\nimpl Record, Local> {\n fn read(\n updatables: &mut HashMap,\n current: &mut Option,\n mut contents_: &mut Vec,\n changes: &HashMap,\n offsets: &mut HashMap,\n h: &str,\n ) -> Result, Error> {\n use self::text_changes::*;\n use regex::Regex;\n lazy_static! {\n static ref FILE_ADDITION: Regex =\n Regex::new(r#\"(?P\\d+)\\. File addition: \"(?P[^\"]*)\" in \"(?P[^\"]*)\" (?P\\d+)\"#).unwrap();\n static ref EDIT: Regex =\n Regex::new(r#\"(\\d+)\\. Edit in ([^:]+):(\\d+) (\\d+\\.\\d+)\"#).unwrap();\n static ref REPLACEMENT: Regex =\n Regex::new(r#\"(\\d+)\\. Replacement in ([^:]+):(\\d+) (\\d+\\.\\d+)\"#).unwrap();\n static ref FILE_DELETION: Regex =\n Regex::new(r#\"(\\d+)\\. File deletion: \"([^\"]*)\" (\\d+\\.\\d+)\"#).unwrap();\n static ref FILE_UNDELETION: Regex =\n Regex::new(r#\"(\\d+)\\. File un-deletion: \"([^\"]*)\" (\\d+\\.\\d+)\"#).unwrap();\n static ref MOVE: Regex =\n Regex::new(r#\"(\\d+)\\. Moved: \"(?P[^\"]*)\" \"(?P[^\"]*)\" (?P\\d+) (?P.*)\"#).unwrap();\n static ref MOVE_: Regex = Regex::new(r#\"(\\d+)\\. Moved: \"([^\"]*)\" (.*)\"#).unwrap();\n static ref NAME_CONFLICT: Regex = Regex::new(\n r#\"(\\d+)\\. ((Solving)|(Un-solving)) a name conflict in \"([^\"]*)\" (.*): .*\"#\n )\n .unwrap();\n static ref ORDER_CONFLICT: Regex = Regex::new(\n r#\"(\\d+)\\. ((Solving)|(Un-solving)) an order conflict in (.*):(\\d+) (\\d+\\.\\d+)\"#\n )\n .unwrap();\n static ref ZOMBIE: Regex =\n"},{"Del":" Regex::new(r#\"(\\d+)\\. Resurrecting zombie lines in (?P\"[^\"]+\"):(?P\\d+) (?P\\d+\\.\\d+)\"#)\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 }\n let mut add_name = default_newvertex();\n add_name.start = ChangePosition(contents_.len() as u64);\n add_name.flag = EdgeFlags::FOLDER | EdgeFlags::BLOCK;\n let name = &cap.name(\"name\").unwrap().as_str();\n let path = {\n let parent = cap.name(\"parent\").unwrap().as_str();\n (if parent == \"/\" {\n String::new()\n } else {\n parent.to_string()\n }) + name\n };\n let meta = cap\n .name(\"perm\")\n .unwrap()\n .as_str()\n .chars()\n .fold(0, |x, c| x * 8 + (c as u16 - b'0' as u16));\n let meta = InodeMetadata(meta);\n meta.write(&mut contents_).unwrap();\n contents_.extend(name.as_bytes());\n add_name.end = ChangePosition(contents_.len() as u64);\n\n 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 pos: ChangePosition(contents_.len() as u64),\n });\n\n contents_.push(0);\n add_inode.start = ChangePosition(contents_.len() as u64);\n add_inode.end = ChangePosition(contents_.len() as u64);\n contents_.push(0);\n let n = cap.name(\"n\").unwrap().as_str().parse().unwrap();\n if let Entry::Occupied(mut e) = updatables.entry(n) {\n if let crate::InodeUpdate::Add { ref mut pos, .. } = e.get_mut() {\n *pos = add_inode.start\n }\n }\n Ok(std::mem::replace(\n current,\n Some(Record::FileAdd {\n add_name: Atom::NewVertex(add_name),\n add_inode: Atom::NewVertex(add_inode),\n contents: None,\n path,\n }),\n ))\n } else if let Some(cap) = EDIT.captures(h) {\n if has_newvertices(current) {\n contents_.push(0)\n }\n\n let mut v = default_newvertex();\n v.inode = parse_pos(changes, &cap[4]);\n Ok(std::mem::replace(\n current,\n Some(Record::Edit {\n change: Atom::NewVertex(v),\n local: Local {\n path: cap[2].to_string(),\n line: cap[3].parse().unwrap(),\n },\n }),\n ))\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 v.inode = parse_pos(changes, &cap[4]);\n Ok(std::mem::replace(\n current,\n Some(Record::Replacement {\n 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 }),\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.inode = parse_pos(changes, &cap[3]);\n Ok(std::mem::replace(\n current,\n Some(Record::FileDel {\n del: Atom::EdgeMap(del),\n contents: None,\n path: cap[2].to_string(),\n }),\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 undel.inode = parse_pos(changes, &cap[3]);\n Ok(std::mem::replace(\n current,\n Some(Record::FileUndel {\n undel: Atom::EdgeMap(undel),\n contents: None,\n path: cap[2].to_string(),\n }),\n ))\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 name.inode = parse_pos(changes, &cap[6]);\n Ok(std::mem::replace(\n current,\n if &cap[2] == \"Solving\" {\n Some(Record::SolveNameConflict {\n name: Atom::EdgeMap(name),\n path: cap[5].to_string(),\n })\n } else {\n Some(Record::UnsolveNameConflict {\n 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 }\n let mut add = default_newvertex();\n add.start = ChangePosition(contents_.len() as u64);\n add.flag = EdgeFlags::FOLDER | EdgeFlags::BLOCK;\n let name = cap.name(\"new\").unwrap().as_str();\n let meta = cap\n .name(\"perm\")\n .unwrap()\n .as_str()\n .chars()\n .fold(0, |x, c| x * 8 + (c as u16 - b'0' as u16));\n let meta = InodeMetadata(meta);\n meta.write(&mut contents_).unwrap();\n contents_.extend(name.as_bytes());\n add.end = ChangePosition(contents_.len() as u64);\n\n let mut del = default_edgemap();\n del.inode = parse_pos(changes, cap.name(\"inode\").unwrap().as_str());\n Ok(std::mem::replace(\n current,\n Some(Record::FileMove {\n 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 }\n let mut add = default_edgemap();\n let mut del = default_edgemap();\n add.inode = parse_pos(changes, &cap[3]);\n del.inode = add.inode;\n Ok(std::mem::replace(\n current,\n Some(Record::FileMove {\n del: Atom::EdgeMap(del),\n add: Atom::EdgeMap(add),\n path: cap[2].to_string(),\n }),\n ))\n } else if let Some(cap) = ORDER_CONFLICT.captures(h) {\n if has_newvertices(current) {\n contents_.push(0)\n }\n\n Ok(std::mem::replace(\n current,\n Some(if &cap[2] == \"Solving\" {\n let mut v = default_newvertex();\n v.inode = parse_pos(changes, &cap[7]);\n Record::SolveOrderConflict {\n 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 v.inode = parse_pos(changes, &cap[7]);\n Record::UnsolveOrderConflict {\n change: Atom::EdgeMap(v),\n local: Local {\n path: cap[5].to_string(),\n line: cap[6].parse().unwrap(),\n },\n }\n }),\n"},{"Del":" ))\n } else if let Some(cap) = ZOMBIE.captures(h) {\n if has_newvertices(current) {\n contents_.push(0)\n }\n let mut v = default_edgemap();\n v.inode = parse_pos(changes, &cap.name(\"inode\").unwrap().as_str());\n Ok(std::mem::replace(\n current,\n Some(Record::ResurrectZombies {\n 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":" }),\n"},{"Del":" ))\n } else {\n match current {\n Some(Record::FileAdd {\n ref mut contents,\n ref mut add_name,\n ..\n }) => {\n"},{"Del":" if h.starts_with('+') {\n"},{"Del":" if contents.is_none() {\n let mut v = default_newvertex();\n let inode = Position {\n change: None,\n pos: ChangePosition(contents_.len() as u64 - 1),\n };\n v.up_context.push(inode);\n v.inode = inode;\n v.start = ChangePosition(contents_.len() as u64);\n *contents = Some(Atom::NewVertex(v));\n }\n if let Some(Atom::NewVertex(ref mut contents)) = contents {\n"},{"Del":" if h.starts_with('+') {\n"},{"Del":" text_changes::parse_line_add(h, contents, contents_)\n }\n }\n"},{"Del":" } else if h.starts_with('\\\\') {\n"},{"Del":" if let Some(Atom::NewVertex(ref mut contents)) = contents {\n if contents_[contents.end.0 as usize - 1] == b'\\n' {\n assert_eq!(contents.end.0 as usize, contents_.len());\n contents_.pop();\n contents.end.0 -= 1;\n }\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 Some(Record::FileDel {\n ref mut del,\n ref mut contents,\n ..\n }) => {\n if let Some(edges) = parse_edges(changes, h) {\n 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 Some(Record::FileUndel {\n ref mut undel,\n ref mut contents,\n ..\n }) => {\n if let Some(edges) = parse_edges(changes, h) {\n 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 Some(Record::FileMove {\n ref mut del,\n ref mut add,\n ..\n }) => {\n if let Some(edges) = parse_edges(changes, h) {\n 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 Some(Record::Edit { ref mut change, .. }) => {\n"},{"Del":" debug!(\"edit {:?}\", h);\n"},{"Del":" if h.starts_with(\"+ \") {\n if let Atom::NewVertex(ref mut change) = change {\n if change.start == change.end {\n change.start = ChangePosition(contents_.len() as u64);\n }\n text_changes::parse_line_add(h, change, contents_)\n }\n"},{"Del":" } else if h.starts_with('\\\\') {\n"},{"Del":" if let Atom::NewVertex(ref mut change) = change {\n if contents_[change.end.0 as usize - 1] == b'\\n' {\n assert_eq!(change.end.0 as usize, contents_.len());\n 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 } else if let Some(edges) = parse_edges(changes, h) {\n *change = Atom::EdgeMap(EdgeMap {\n inode: change.inode(),\n edges,\n });\n }\n Ok(None)\n }\n Some(Record::Replacement {\n ref mut change,\n ref mut replacement,\n ..\n }) => {\n if h.starts_with(\"+ \") {\n if let Atom::NewVertex(ref mut repl) = replacement {\n if repl.start == repl.end {\n repl.start = ChangePosition(contents_.len() as u64);\n"},{"Del":" }\n"},{"Del":" text_changes::parse_line_add(h, repl, contents_)\n"},{"Del":" }\n"},{"Del":" } else if h.starts_with('\\\\') {\n"},{"Del":" if let Atom::NewVertex(ref mut repl) = replacement {\n if contents_[repl.end.0 as usize - 1] == b'\\n' {\n assert_eq!(repl.end.0 as usize, contents_.len());\n 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 } else if let Some(edges) = parse_edges(changes, h) {\n *change = Atom::EdgeMap(EdgeMap {\n inode: change.inode(),\n edges,\n });\n }\n Ok(None)\n }\n Some(Record::SolveNameConflict { ref mut name, .. })\n | Some(Record::UnsolveNameConflict { ref mut name, .. }) => {\n if let Some(edges) = parse_edges(changes, h) {\n *name = Atom::EdgeMap(EdgeMap {\n edges,\n inode: name.inode(),\n })\n }\n Ok(None)\n }\n Some(Record::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 change.start = ChangePosition(contents_.len() as u64);\n }\n text_changes::parse_line_add(h, change, contents_)\n }\n } else if let Some(cap) = CONTEXT.captures(h) {\n"},{"Del":" 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"},{"Del":" 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 change.start = ChangePosition(contents_.len() as u64);\n change.end =\n ChangePosition(contents_.len() as u64 + new_end - new_start);\n offsets.insert(new_end, change.end);\n }\n"},{"Del":" }\n }\n Ok(None)\n }\n Some(Record::UnsolveOrderConflict { ref mut change, .. }) => {\n if let Some(edges) = parse_edges(changes, h) {\n if let Atom::EdgeMap(ref mut change) = change {\n change.edges = edges\n }\n }\n Ok(None)\n }\n Some(Record::ResurrectZombies { ref mut change, .. }) => {\n if let Some(edges) = parse_edges(changes, h) {\n 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 }\n }\n}\n\n#[cfg(feature = \"text-changes\")]\nmod text_changes {\n\n use super::*;\n\n lazy_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 pub fn default_newvertex() -> NewVertex> {\n NewVertex {\n start: ChangePosition(0),\n end: ChangePosition(0),\n flag: EdgeFlags::empty(),\n up_context: Vec::new(),\n down_context: Vec::new(),\n inode: Position {\n change: Some(Hash::None),\n pos: ChangePosition(0),\n },\n }\n }\n\n pub fn default_edgemap() -> EdgeMap> {\n EdgeMap {\n edges: Vec::new(),\n inode: Position {\n change: Some(Hash::None),\n pos: ChangePosition(0),\n },\n }\n }\n\n pub fn has_newvertices(current: &Option, L>>) -> bool {\n match current {\n Some(Record::FileAdd { contents: None, .. }) | None => false,\n"},{"Del":" Some(rec) => rec.iter().any(|e| matches!(e, Atom::NewVertex(_))),\n"},{"Del":" }\n }\n\n pub fn parse_pos_vec(\n changes: &HashMap,\n offsets: &HashMap,\n s: &str,\n ) -> Result>>, Error> {\n let mut v = Vec::new();\n 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 if let Some(&pos) = offsets.get(&pos) {\n pos\n } else {\n"},{"Del":" debug!(\"inconsistent change: {:?} {:?}\", s, offsets);\n"},{"Del":" return Err(Error::InconsistentChange);\n }\n } else {\n ChangePosition(pos)\n };\n v.push(Position {\n change: change_ref(changes, change),\n pos,\n })\n }\n Ok(v)\n }\n\n fn change_ref(changes: &HashMap, change: usize) -> Option {\n debug!(\"change_ref {:?} {:?}\", changes, change);\n if change == 0 {\n None\n } else if change == 1 {\n Some(Hash::None)\n } else {\n Some(*changes.get(&change).unwrap())\n }\n }\n\n pub fn parse_pos(changes: &HashMap, s: &str) -> Position> {\n let pos = POS.captures(s).unwrap();\n let change: usize = (&pos[1]).parse().unwrap();\n let pos: u64 = (&pos[2]).parse().unwrap();\n Position {\n change: change_ref(changes, change),\n pos: ChangePosition(pos),\n }\n }\n\n pub fn parse_edges(\n changes: &HashMap,\n s: &str,\n ) -> Option>>> {\n debug!(\"parse_edges {:?}\", s);\n let mut result = Vec::new();\n"},{"Del":" for edge in s.split(',') {\n"},{"Del":" 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 change: change_ref(changes, change0),\n pos: ChangePosition(pos0),\n },\n to: Vertex {\n change: change_ref(changes, change1),\n start: ChangePosition(start1),\n end: ChangePosition(end1),\n },\n introduced_by: change_ref(changes, introduced_by),\n })\n } else {\n debug!(\"not parsed\");\n return None;\n }\n }\n Some(result)\n }\n\n pub fn parse_line_add(h: &str, change: &mut NewVertex>, contents_: &mut Vec) {\n let h = h.as_bytes();\n 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 change.end = ChangePosition(contents_.len() as u64);\n }\n\n"},{"Del":" pub fn print_contents(\n"},{"Del":" w: &mut W,\n pref: &str,\n contents: &[u8],\n"},{"Del":" ) -> Result<(), anyhow::Error> {\n"},{"Del":" if let Ok(mut contents) = std::str::from_utf8(&contents) {\n"},{"Del":" while let Some(n) = contents.as_bytes().iter().position(|&c| c == b'\\n') {\n"},{"Del":" let (a, b) = contents.split_at(n + 1);\n contents = b;\n write!(w, \"{} {}\", pref, a)?;\n }\n if !contents.is_empty() {\n writeln!(w, \"{} {}\", pref, contents)?;\n"},{"Del":" }\n } else {\n"},{"Del":" writeln!(w, \"{}b{}\", pref, data_encoding::BASE64.encode(contents))?\n"},{"Del":" }\n"},{"Del":" Ok(())\n }\n\n"},{"Del":" pub fn print_change_contents(\n"},{"Del":" w: &mut W,\n changes: &C,\n change: &Atom>,\n change_contents: &[u8],\n"},{"Del":" ) -> Result<(), anyhow::Error> {\n match change {\n Atom::NewVertex(ref n) => {\n let c = &change_contents[n.start.0 as usize..n.end.0 as usize];\n"},{"Del":" print_contents(w, \"+\", c)?;\n"},{"Del":" if !c.ends_with(b\"\\n\") {\n writeln!(w, \"\\\\\")?\n }\n Ok(())\n }\n Atom::EdgeMap(ref n) if n.edges[0].flag.contains(EdgeFlags::DELETED) => {\n let mut buf = Vec::new();\n let mut current = None;\n for e in n.edges.iter() {\n if Some(e.to) == current {\n continue;\n }\n buf.clear();\n changes.get_contents_ext(e.to, &mut buf)?;\n"},{"Del":" print_contents(w, \"-\", &buf[..])?;\n"},{"Del":" current = Some(e.to)\n }\n Ok(())\n }\n _ => Ok(()),\n }\n }\n\n pub fn write_deleted_names(\n w: &mut W,\n changes: &C,\n del: &Atom>,\n ) -> Result<(), anyhow::Error> {\n if let Atom::EdgeMap(ref e) = del {\n let mut buf = Vec::new();\n let mut is_first = true;\n for d in e.edges.iter() {\n buf.clear();\n changes.get_contents_ext(d.to, &mut buf)?;\n if !buf.is_empty() {\n let name = std::str::from_utf8(buf.split_at(2).1).unwrap();\n write!(w, \"{}{:?}\", if is_first { \"\" } else { \", \" }, name)?;\n is_first = false;\n }\n }\n }\n Ok(())\n }\n\n pub fn write_flag(mut w: W, flag: EdgeFlags) -> Result<(), anyhow::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\n pub 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\n pub fn write_pos(\n mut w: W,\n hashes: &HashMap,\n pos: Position>,\n ) -> Result<(), anyhow::Error> {\n let change = if let Some(Hash::None) = pos.change {\n 1\n } else if let Some(ref c) = pos.change {\n *hashes.get(c).unwrap()\n } else {\n 0\n };\n write!(w, \"{}.{}\", change, pos.pos.0)?;\n Ok(())\n }\n\n pub fn write_atom(\n w: &mut W,\n hashes: &HashMap,\n atom: &Atom>,\n ) -> Result<(), anyhow::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 }\n\n pub fn write_newvertex(\n mut w: W,\n hashes: &HashMap,\n n: &NewVertex>,\n ) -> Result<(), anyhow::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\n pub fn write_edgemap(\n mut w: W,\n hashes: &HashMap,\n n: &EdgeMap>,\n ) -> Result<(), anyhow::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"},{"Del":" writeln!(w)?;\n"},{"Del":" Ok(())\n }\n\n #[cfg(feature = \"text-changes\")]\n #[derive(Debug, Clone, PartialEq, Eq)]\n pub enum Section {\n Header(String),\n Deps,\n Changes {\n changes: Vec, Local>>,\n current: Option, Local>>,\n offsets: HashMap,\n },\n }\n}\n// org id XDu/0rcMPSdaCWLiWWDiw32Rl45EX9uwvy9vprRXJbg=\n/// An open, seekable change file.\n#[cfg(feature = \"zstd\")]\npub struct ChangeFile<'a> {\n s: Option>,\n hashed: Hashed,\n hash: Hash,\n unhashed: Option,\n}\n\nstruct OffFile {\n f: std::fs::File,\n start: u64,\n}\n\nunsafe impl Send for OffFile {}\n\nimpl std::io::Read for OffFile {\n fn read(&mut self, buf: &mut [u8]) -> Result {\n self.f.read(buf)\n }\n}\n\nimpl std::io::Seek for OffFile {\n fn seek(&mut self, from: std::io::SeekFrom) -> Result {\n use std::io::SeekFrom;\n let from = match from {\n SeekFrom::Start(s) => SeekFrom::Start(s + self.start),\n c => c,\n };\n self.f.seek(from)\n }\n}\n\n#[cfg(feature = \"zstd\")]\nimpl<'a> ChangeFile<'a> {\n /// Open a change file from a path.\n pub fn open(hash: Hash, path: &str) -> Result {\n use std::io::Read;\n let mut r = std::fs::File::open(path)?;\n let mut buf = Vec::new();\n buf.resize(Change::OFFSETS_SIZE as usize, 0);\n r.read_exact(&mut buf)?;\n let offsets: Offsets = bincode::deserialize(&buf)?;\n if offsets.version != VERSION {\n return Err(Error::VersionMismatch.into());\n }\n\n buf.clear();\n buf.resize((offsets.unhashed_off - Change::OFFSETS_SIZE) as usize, 0);\n r.read_exact(&mut buf)?;\n let mut buf2 = vec![0u8; offsets.hashed_len as usize];\n let hashed: Hashed = {\n let mut s = zstd_seekable::Seekable::init_buf(&buf)?;\n s.decompress(&mut buf2, 0)?;\n bincode::deserialize(&buf2)?\n };\n\n buf.resize((offsets.contents_off - offsets.unhashed_off) as usize, 0);\n let unhashed = if buf.is_empty() {\n None\n } else {\n r.read_exact(&mut buf)?;\n let mut s = zstd_seekable::Seekable::init_buf(&buf)?;\n buf2.resize(offsets.unhashed_len as usize, 0);\n s.decompress(&mut buf2, 0)?;\n Some(toml::de::from_slice(&buf2)?)\n };\n\n let m = r.metadata()?;\n let s = if offsets.contents_off >= m.len() {\n None\n } else {\n Some(zstd_seekable::Seekable::init(Box::new(OffFile {\n f: r,\n start: offsets.contents_off,\n }))?)\n };\n Ok(ChangeFile {\n s,\n hashed,\n hash,\n unhashed,\n })\n }\n\n pub fn has_contents(&self) -> bool {\n self.s.is_some()\n }\n\n /// Reads the contents at an offset into `buf`, and returns the\n /// number of bytes read. The bounds of the change's \"contents\"\n /// section are not checked.\n pub fn read_contents(&mut self, offset: u64, buf: &mut [u8]) -> Result {\n debug!(\"read_contents {:?} {:?}\", offset, buf.len());\n if let Some(ref mut s) = self.s {\n Ok(s.decompress(buf, offset)?)\n } else {\n Err((Error::MissingContents {\n hash: self.hash.to_base32(),\n })\n .into())\n }\n }\n\n pub fn hashed(&self) -> &Hashed {\n &self.hashed\n }\n\n pub fn unhashed(&self) -> &Option {\n &self.unhashed\n }\n}\n"}]}},{"FileDel":{"deleted_names":[{"basename":"v3.rs","metadata":420}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":17,"pos":931000},"to":{"change":17,"start":931001,"end":931008},"introduced_by":17},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":17,"pos":931008},"to":{"change":17,"start":931009,"end":931009},"introduced_by":17}],"inode":{"change":17,"pos":931009}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":931009},"to":{"change":17,"start":931010,"end":944077},"introduced_by":17}],"inode":{"change":17,"pos":931009}},"content":[{"Del":"use super::*;\n\n#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]\nenum Atom3 {\n NewVertex(NewVertex),\n EdgeMap(EdgeMap3),\n}\n\nimpl Atom3> {\n fn to_v4(self, translation: &HashMap, Option>) -> Atom> {\n match self {\n Atom3::NewVertex(n) => Atom::NewVertex(NewVertex {\n up_context: n\n .up_context\n .into_iter()\n .map(|x| Position {\n change: *translation.get(&x.change).unwrap(),\n ..x\n })\n .collect(),\n down_context: n\n .down_context\n .into_iter()\n .map(|x| Position {\n change: *translation.get(&x.change).unwrap(),\n ..x\n })\n .collect(),\n flag: n.flag,\n start: n.start,\n end: n.end,\n inode: Position {\n change: *translation.get(&n.inode.change).unwrap(),\n ..n.inode\n },\n }),\n Atom3::EdgeMap(e) => Atom::EdgeMap(e.to_v4(translation)),\n }\n }\n}\n\n#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]\nstruct EdgeMap3 {\n pub previous: EdgeFlags,\n pub flag: EdgeFlags,\n pub edges: Vec>,\n pub inode: Position,\n}\n\nimpl EdgeMap3> {\n fn to_v4(self, translations: &HashMap, Option>) -> EdgeMap> {\n let flag = self.flag;\n let previous = self.previous;\n EdgeMap {\n inode: Position {\n change: *translations.get(&self.inode.change).unwrap(),\n ..self.inode\n },\n edges: self\n .edges\n .into_iter()\n .map(|e| NewEdge {\n previous,\n flag,\n from: Position {\n change: *translations.get(&e.from.change).unwrap(),\n ..e.from\n },\n to: Vertex {\n change: *translations.get(&e.to.change).unwrap(),\n ..e.to\n },\n introduced_by: *translations.get(&e.introduced_by).unwrap(),\n })\n .collect(),\n }\n }\n}\n\n#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]\nstruct NewEdge3 {\n pub from: Position,\n pub to: Vertex,\n pub introduced_by: Change,\n}\n\n#[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize)]\nenum Record3 {\n FileMove {\n del: Atom3,\n add: Atom3,\n confirm: Option>,\n path: String,\n },\n FileDel {\n del: Atom3,\n confirm: Option>,\n contents: Option>,\n path: String,\n },\n FileUndel {\n undel: Atom3,\n confirm: Option>,\n contents: Option>,\n path: String,\n },\n FileAdd {\n add_name: Atom3,\n add_inode: Atom3,\n contents: Option>,\n path: String,\n },\n SolveNameConflict {\n name: Atom3,\n confirm: Option>,\n path: String,\n },\n UnsolveNameConflict {\n name: Atom3,\n confirm: Option>,\n path: String,\n },\n Edit {\n change: Atom3,\n local: Local,\n },\n Replacement {\n change: Atom3,\n replacement: Atom3,\n local: Local,\n },\n SolveOrderConflict {\n change: Atom3,\n local: Local,\n },\n UnsolveOrderConflict {\n change: Atom3,\n local: Local,\n },\n ResurrectZombies {\n alive: Atom3,\n dead: Atom3,\n local: Local,\n },\n}\n\nimpl Record3, Local> {\n fn to_v4(\n self,\n translation: &HashMap, Option>,\n ) -> Record, Local> {\n match self {\n Record3::FileMove {\n del,\n add,\n confirm,\n path,\n } => {\n let mut del = del.to_v4(translation);\n if let Atom::EdgeMap(ref mut e) = del {\n if let Some(Atom3::EdgeMap(c)) = confirm {\n let c = c.to_v4(translation);\n e.edges.extend(c.edges.into_iter())\n }\n }\n let add = add.to_v4(translation);\n Record::FileMove { del, add, path }\n }\n Record3::FileDel {\n del,\n confirm,\n contents,\n path,\n } => {\n let mut del = del.to_v4(translation);\n if let Atom::EdgeMap(ref mut e) = del {\n if let Some(Atom3::EdgeMap(c)) = confirm {\n let c = c.to_v4(translation);\n e.edges.extend(c.edges.into_iter())\n }\n }\n let contents = contents.map(|c| c.to_v4(translation));\n Record::FileDel {\n del,\n contents,\n path,\n }\n }\n Record3::FileUndel {\n undel,\n confirm,\n contents,\n path,\n } => {\n let mut undel = undel.to_v4(translation);\n if let Atom::EdgeMap(ref mut e) = undel {\n if let Some(Atom3::EdgeMap(c)) = confirm {\n let c = c.to_v4(translation);\n e.edges.extend(c.edges.into_iter())\n }\n }\n let contents = contents.map(|c| c.to_v4(translation));\n Record::FileUndel {\n undel,\n contents,\n path,\n }\n }\n Record3::FileAdd {\n add_name,\n add_inode,\n contents,\n path,\n } => Record::FileAdd {\n add_name: add_name.to_v4(translation),\n add_inode: add_inode.to_v4(translation),\n contents: contents.map(|c| c.to_v4(translation)),\n path,\n },\n Record3::SolveNameConflict {\n name,\n confirm,\n path,\n } => {\n let mut name = name.to_v4(translation);\n if let Atom::EdgeMap(ref mut e) = name {\n if let Some(Atom3::EdgeMap(c)) = confirm {\n let c = c.to_v4(translation);\n e.edges.extend(c.edges.into_iter())\n }\n }\n Record::SolveNameConflict { name, path }\n }\n Record3::UnsolveNameConflict {\n name,\n confirm,\n path,\n } => {\n let mut name = name.to_v4(translation);\n if let Atom::EdgeMap(ref mut e) = name {\n if let Some(Atom3::EdgeMap(c)) = confirm {\n let c = c.to_v4(translation);\n e.edges.extend(c.edges.into_iter())\n }\n }\n Record::UnsolveNameConflict { name, path }\n }\n Record3::Edit { change, local } => Record::Edit {\n change: change.to_v4(translation),\n local,\n },\n Record3::Replacement {\n change,\n replacement,\n local,\n } => Record::Replacement {\n change: change.to_v4(translation),\n replacement: replacement.to_v4(translation),\n local,\n },\n Record3::SolveOrderConflict { change, local } => Record::SolveOrderConflict {\n change: change.to_v4(translation),\n local,\n },\n Record3::UnsolveOrderConflict { change, local } => Record::UnsolveOrderConflict {\n change: change.to_v4(translation),\n local,\n },\n Record3::ResurrectZombies { alive, dead, local } => {\n let mut change = alive.to_v4(translation);\n if let Atom::EdgeMap(ref mut e) = change {\n if let Atom3::EdgeMap(c) = dead {\n let c = c.to_v4(translation);\n e.edges.extend(c.edges.into_iter())\n }\n }\n Record::ResurrectZombies { change, local }\n }\n }\n }\n}\n\n#[derive(Clone, Debug, PartialEq)]\npub struct LocalChange3 {\n offsets: Offsets,\n hashed: Hashed3,\n unhashed: Option,\n contents: Vec,\n}\n\nconst VERSION: u64 = 3;\n\n#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]\nstruct Hashed3 {\n version: u64,\n header: ChangeHeader,\n dependencies: BTreeSet,\n extra_known: BTreeSet,\n metadata: Vec,\n changes: Vec, Local>>,\n contents_hash: Hash,\n}\n\nimpl Hashed3 {\n fn to_v4(self, translation: &HashMap, Option>) -> Hashed {\n Hashed {\n version: 4,\n header: self.header,\n dependencies: self\n .dependencies\n .into_iter()\n .map(|x| translation.get(&Some(x)).unwrap().unwrap())\n .collect(),\n extra_known: self\n .extra_known\n .into_iter()\n .filter_map(|x| translation.get(&Some(x)).map(|x| x.unwrap()))\n .collect(),\n metadata: self.metadata,\n contents_hash: self.contents_hash,\n changes: self\n .changes\n .into_iter()\n .map(|x| x.to_v4(translation))\n .collect(),\n }\n }\n}\n\nimpl LocalChange3 {\n const OFFSETS_SIZE: u64 = 56;\n pub fn deserialize(file: &str, hash: Option<&Hash>) -> Result {\n use std::io::Read;\n let mut r = std::fs::File::open(file)?;\n let mut buf = vec![0u8; Self::OFFSETS_SIZE as usize];\n r.read_exact(&mut buf)?;\n let offsets: Offsets = bincode::deserialize(&buf)?;\n if offsets.version != VERSION {\n return Err(Error::VersionMismatch.into());\n }\n debug!(\"offsets = {:?}\", offsets);\n buf.clear();\n buf.resize((offsets.unhashed_off - Self::OFFSETS_SIZE) as usize, 0);\n r.read_exact(&mut buf)?;\n\n let hashed: Hashed3 = {\n let mut s = zstd_seekable::Seekable::init_buf(&buf[..])?;\n\n let mut out = vec![0u8; offsets.hashed_len as usize];\n s.decompress(&mut out[..], 0)?;\n let mut hasher = Hasher::default();\n hasher.update(&out);\n let computed_hash = hasher.finish();\n if let Some(hash) = hash {\n if &computed_hash != hash {\n return Err((Error::ChangeHashMismatch {\n claimed: *hash,\n computed: computed_hash,\n })\n .into());\n }\n }\n bincode::deserialize_from(&out[..])?\n };\n buf.clear();\n buf.resize((offsets.contents_off - offsets.unhashed_off) as usize, 0);\n let unhashed = if buf.is_empty() {\n None\n } else {\n r.read_exact(&mut buf)?;\n let mut s = zstd_seekable::Seekable::init_buf(&buf[..])?;\n let mut out = vec![0u8; offsets.unhashed_len as usize];\n s.decompress(&mut out[..], 0)?;\n Some(toml::de::from_slice(&out)?)\n };\n debug!(\"unhashed = {:?}\", unhashed);\n\n buf.clear();\n buf.resize((offsets.total - offsets.contents_off) as usize, 0);\n let contents = if r.read_exact(&mut buf).is_ok() {\n let mut s = zstd_seekable::Seekable::init_buf(&buf[..])?;\n let mut contents = vec![0u8; offsets.contents_len as usize];\n s.decompress(&mut contents[..], 0)?;\n contents\n } else {\n Vec::new()\n };\n debug!(\"contents = {:?}\", contents);\n\n Ok(LocalChange3 {\n offsets,\n hashed,\n unhashed,\n contents,\n })\n }\n\n pub fn to_v4(self, translation: &HashMap, Option>) -> LocalChange {\n LocalChange {\n offsets: self.offsets,\n hashed: self.hashed.to_v4(translation),\n unhashed: self.unhashed,\n contents: self.contents,\n }\n }\n}\n"}]}},{"FileAdd":{"meta":{"basename":"text_changes.rs","metadata":420},"context":[{"change":17,"pos":931000}],"contents":[{"Add":"use super::*;"},{"Add":""},{"Add":"use crate::changestore::*;"},{"Add":"use std::collections::hash_map::Entry;"},{"Add":"use std::collections::HashMap;"},{"Add":"use std::io::BufRead;"},{"Add":""},{"Add":"#[derive(Debug, Error)]"},{"Add":"pub enum TextDeError {"},{"Add":" #[error(transparent)]"},{"Add":" Io(#[from] std::io::Error),"},{"Add":" #[error(transparent)]"},{"Add":" TomlDe(#[from] toml::de::Error),"},{"Add":" #[error(\"Missing change [{0}]\")]"},{"Add":" MissingChange(usize),"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Debug, Error)]"},{"Add":"pub enum TextSerError {"},{"Add":" #[error(transparent)]"},{"Add":" C(C),"},{"Add":" #[error(transparent)]"},{"Add":" Io(#[from] std::io::Error),"},{"Add":" #[error(transparent)]"},{"Add":" TomlSer(#[from] toml::ser::Error),"},{"Add":" #[error(\"Missing contents in change {:?}\", h)]"},{"Add":" MissingContents { h: Hash },"},{"Add":" #[error(transparent)]"},{"Add":" Change(#[from] ChangeError),"},{"Add":"}"},{"Add":""},{"Add":"impl LocalChange {"},{"Add":" const DEPS_LINE: &'static str = \"# Dependencies\\n\";"},{"Add":" const CHANGES_LINE: &'static str = \"# Changes\\n\";"},{"Add":""},{"Add":" pub fn write_all_deps Result<(), ChangeError>>("},{"Add":" &self,"},{"Add":" mut f: F,"},{"Add":" ) -> Result<(), ChangeError> {"},{"Add":" for c in self.changes.iter() {"},{"Add":" for c in c.iter() {"},{"Add":" match *c {"},{"Add":" Atom::NewVertex(ref n) => {"},{"Add":" for change in n"},{"Add":" .up_context"},{"Add":" .iter()"},{"Add":" .chain(n.down_context.iter())"},{"Add":" .map(|c| c.change)"},{"Add":" .chain(std::iter::once(n.inode.change))"},{"Add":" {"},{"Add":" if let Some(change) = change {"},{"Add":" if let Hash::None = change {"},{"Add":" continue;"},{"Add":" }"},{"Add":" f(change)?"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Atom::EdgeMap(ref e) => {"},{"Add":" for edge in e.edges.iter() {"},{"Add":" for change in &["},{"Add":" edge.from.change,"},{"Add":" edge.to.change,"},{"Add":" edge.introduced_by,"},{"Add":" e.inode.change,"},{"Add":" ] {"},{"Add":" if let Some(change) = *change {"},{"Add":" if let Hash::None = change {"},{"Add":" continue;"},{"Add":" }"},{"Add":" f(change)?"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":""},{"Add":" pub fn write>) -> String>("},{"Add":" &self,"},{"Add":" changes: &C,"},{"Add":" hash: Option,"},{"Add":" mut file_name: F,"},{"Add":" write_header: bool,"},{"Add":" mut w: W,"},{"Add":" ) -> Result<(), TextSerError> {"},{"Add":" if let Some(h) = hash {"},{"Add":" // Check if we have the full contents"},{"Add":" let mut hasher = Hasher::default();"},{"Add":" hasher.update(&self.contents);"},{"Add":" let hash = hasher.finish();"},{"Add":" if hash != self.contents_hash {"},{"Add":" return Err((TextSerError::MissingContents { h }).into());"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" if write_header {"},{"Add":" w.write_all(toml::ser::to_string_pretty(&self.header)?.as_bytes())?;"},{"Add":" w.write_all(b\"\\n\")?;"},{"Add":" }"},{"Add":" let mut hashes = HashMap::new();"},{"Add":" let mut i = 2;"},{"Add":" let mut needs_newline = false;"},{"Add":" if !self.dependencies.is_empty() {"},{"Add":" w.write_all(Self::DEPS_LINE.as_bytes())?;"},{"Add":" needs_newline = true;"},{"Add":" for dep in self.dependencies.iter() {"},{"Add":" hashes.insert(*dep, i);"},{"Add":" writeln!(w, \"[{}] {}\", i, dep.to_base32())?;"},{"Add":" i += 1;"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" self.write_all_deps(|change| {"},{"Add":" if let Entry::Vacant(e) = hashes.entry(change) {"},{"Add":" e.insert(i);"},{"Add":" if !needs_newline {"},{"Add":" w.write_all(Self::DEPS_LINE.as_bytes())?;"},{"Add":" needs_newline = true;"},{"Add":" }"},{"Add":" writeln!(w, \"[{}]+{}\", i, change.to_base32())?;"},{"Add":" i += 1;"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":""},{"Add":" if !self.extra_known.is_empty() {"},{"Add":" needs_newline = true;"},{"Add":" for dep in self.extra_known.iter() {"},{"Add":" writeln!(w, \"[*] {}\", dep.to_base32())?;"},{"Add":" i += 1;"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" if !self.changes.is_empty() {"},{"Add":" if needs_newline {"},{"Add":" w.write_all(b\"\\n\")?"},{"Add":" }"},{"Add":" w.write_all(Self::CHANGES_LINE.as_bytes())?;"},{"Add":" for (n, rec) in self.changes.iter().enumerate() {"},{"Add":" write!(w, \"\\n{}. \", n + 1)?;"},{"Add":" rec.write(changes, &mut file_name, &hashes, &self.contents, &mut w)?"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl Change {"},{"Add":" pub fn read_and_deps("},{"Add":" r: R,"},{"Add":" updatables: &mut HashMap,"},{"Add":" txn: &T,"},{"Add":" channel: &ChannelRef,"},{"Add":" ) -> Result {"},{"Add":" let (mut change, extra_dependencies) = Self::read_(r, updatables)?;"},{"Add":" let (mut deps, extra) = dependencies(txn, channel, change.hashed.changes.iter());"},{"Add":" deps.extend(extra_dependencies.into_iter());"},{"Add":" change.hashed.dependencies = deps;"},{"Add":" change.hashed.extra_known = extra;"},{"Add":" Ok(change)"},{"Add":" }"},{"Add":""},{"Add":" pub fn read("},{"Add":" r: R,"},{"Add":" updatables: &mut HashMap,"},{"Add":" ) -> Result {"},{"Add":" Ok(Self::read_(r, updatables)?.0)"},{"Add":" }"},{"Add":""},{"Add":" fn read_("},{"Add":" mut r: R,"},{"Add":" updatables: &mut HashMap,"},{"Add":" ) -> Result<(Self, HashSet), TextDeError> {"},{"Add":" use self::text_changes::*;"},{"Add":" let mut section = Section::Header(String::new());"},{"Add":" let mut change = Change {"},{"Add":" offsets: Offsets::default(),"},{"Add":" hashed: Hashed {"},{"Add":" version: VERSION,"},{"Add":" header: ChangeHeader {"},{"Add":" authors: Vec::new(),"},{"Add":" message: String::new(),"},{"Add":" description: None,"},{"Add":" timestamp: chrono::Utc::now(),"},{"Add":" },"},{"Add":" dependencies: Vec::new(),"},{"Add":" extra_known: Vec::new(),"},{"Add":" metadata: Vec::new(),"},{"Add":" changes: Vec::new(),"},{"Add":" contents_hash: Hasher::default().finish(),"},{"Add":" },"},{"Add":" unhashed: None,"},{"Add":" contents: Vec::new(),"},{"Add":" };"},{"Add":" let conclude_section = |change: &mut Change,"},{"Add":" section: Section,"},{"Add":" contents: &mut Vec|"},{"Add":" -> Result<(), TextDeError> {"},{"Add":" match section {"},{"Add":" Section::Header(ref s) => {"},{"Add":" debug!(\"header = {:?}\", s);"},{"Add":" change.header = toml::de::from_str(&s)?;"},{"Add":" Ok(())"},{"Add":" }"},{"Add":" Section::Deps => Ok(()),"},{"Add":" Section::Changes {"},{"Add":" mut changes,"},{"Add":" current,"},{"Add":" .."},{"Add":" } => {"},{"Add":" if has_newvertices(¤t) {"},{"Add":" contents.push(0)"},{"Add":" }"},{"Add":" if let Some(c) = current {"},{"Add":" debug!(\"next action = {:?}\", c);"},{"Add":" changes.push(c)"},{"Add":" }"},{"Add":" change.changes = changes;"},{"Add":" Ok(())"},{"Add":" }"},{"Add":" }"},{"Add":" };"},{"Add":" let mut h = String::new();"},{"Add":" let mut contents = Vec::new();"},{"Add":" let mut deps = HashMap::new();"},{"Add":" let mut extra_dependencies = HashSet::new();"},{"Add":" while r.read_line(&mut h)? > 0 {"},{"Add":" debug!(\"h = {:?}\", h);"},{"Add":" if h == Self::DEPS_LINE {"},{"Add":" let section = std::mem::replace(&mut section, Section::Deps);"},{"Add":" conclude_section(&mut change, section, &mut contents)?;"},{"Add":" } else if h == Self::CHANGES_LINE {"},{"Add":" let section = std::mem::replace("},{"Add":" &mut section,"},{"Add":" Section::Changes {"},{"Add":" changes: Vec::new(),"},{"Add":" current: None,"},{"Add":" offsets: HashMap::new(),"},{"Add":" },"},{"Add":" );"},{"Add":" conclude_section(&mut change, section, &mut contents)?;"},{"Add":" } else {"},{"Add":" use regex::Regex;"},{"Add":" lazy_static! {"},{"Add":" static ref DEPS: Regex = Regex::new(r#\"\\[(\\d*|\\*)\\](\\+| ) *(\\S*)\"#).unwrap();"},{"Add":" static ref KNOWN: Regex = Regex::new(r#\"(\\S*)\"#).unwrap();"},{"Add":" }"},{"Add":" match section {"},{"Add":" Section::Header(ref mut s) => s.push_str(&h),"},{"Add":" Section::Deps => {"},{"Add":" if let Some(d) = DEPS.captures(&h) {"},{"Add":" let hash = Hash::from_base32(d[3].as_bytes()).unwrap();"},{"Add":" if let Ok(n) = d[1].parse() {"},{"Add":" if &d[2] == \" \" {"},{"Add":" change.hashed.dependencies.push(hash);"},{"Add":" }"},{"Add":" deps.insert(n, hash);"},{"Add":" } else if &d[1] == \"*\" {"},{"Add":" change.hashed.extra_known.push(hash);"},{"Add":" } else {"},{"Add":" extra_dependencies.insert(hash);"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Section::Changes {"},{"Add":" ref mut current,"},{"Add":" ref mut changes,"},{"Add":" ref mut offsets,"},{"Add":" } => {"},{"Add":" if let Some(next) ="},{"Add":" Record::read(updatables, current, &mut contents, &deps, offsets, &h)?"},{"Add":" {"},{"Add":" debug!(\"next action = {:?}\", next);"},{"Add":" changes.push(next)"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" h.clear();"},{"Add":" }"},{"Add":" conclude_section(&mut change, section, &mut contents)?;"},{"Add":" change.contents = contents;"},{"Add":" change.contents_hash = {"},{"Add":" let mut hasher = Hasher::default();"},{"Add":" hasher.update(&change.contents);"},{"Add":" hasher.finish()"},{"Add":" };"},{"Add":" Ok((change, extra_dependencies))"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl Record, Local> {"},{"Add":" fn write<"},{"Add":" W: std::io::Write,"},{"Add":" C: ChangeStore,"},{"Add":" F: FnMut(&Local, Position>) -> String,"},{"Add":" >("},{"Add":" &self,"},{"Add":" changes: &C,"},{"Add":" mut file_name: F,"},{"Add":" hashes: &HashMap,"},{"Add":" change_contents: &[u8],"},{"Add":" mut w: W,"},{"Add":" ) -> Result<(), TextSerError> {"},{"Add":" use self::text_changes::*;"},{"Add":" match self {"},{"Add":" Record::FileMove { del, add, path } => match add {"},{"Add":" Atom::NewVertex(ref add) => {"},{"Add":" let name = std::str::from_utf8("},{"Add":" &change_contents[add.start.0 as usize + 2..add.end.0 as usize],"},{"Add":" )"},{"Add":" .unwrap();"},{"Add":" let perms = crate::pristine::InodeMetadata::from_basename("},{"Add":" &change_contents[add.start.0 as usize..add.start.0 as usize + 2],"},{"Add":" );"},{"Add":""},{"Add":" write!(w, \"Moved: {:?} {:?} {:o} \", path, name, perms.0)?;"},{"Add":" write_pos(&mut w, hashes, del.inode())?;"},{"Add":" writeln!(w)?;"},{"Add":" write_atom(&mut w, hashes, &del)?;"},{"Add":""},{"Add":" write!(w, \"up\")?;"},{"Add":" for c in add.up_context.iter() {"},{"Add":" write!(w, \" \")?;"},{"Add":" write_pos(&mut w, hashes, *c)?"},{"Add":" }"},{"Add":" write!(w, \", down\")?;"},{"Add":" for c in add.down_context.iter() {"},{"Add":" write!(w, \" \")?;"},{"Add":" write_pos(&mut w, hashes, *c)?"},{"Add":" }"},{"Add":" w.write_all(b\"\\n\")?;"},{"Add":" }"},{"Add":" Atom::EdgeMap(_) => {"},{"Add":" write!(w, \"Moved: {:?} \", path)?;"},{"Add":" write_pos(&mut w, hashes, del.inode())?;"},{"Add":" writeln!(w)?;"},{"Add":" write_atom(&mut w, hashes, &add)?;"},{"Add":" write_atom(&mut w, hashes, &del)?;"},{"Add":" }"},{"Add":" },"},{"Add":" Record::FileDel {"},{"Add":" del,"},{"Add":" contents,"},{"Add":" path,"},{"Add":" } => {"},{"Add":" write!(w, \"File deletion: {:?} \", path)?;"},{"Add":" write_pos(&mut w, hashes, del.inode())?;"},{"Add":" writeln!(w)?;"},{"Add":" write_atom(&mut w, hashes, &del)?;"},{"Add":" if let Some(ref contents) = contents {"},{"Add":" write_atom(&mut w, hashes, &contents)?;"},{"Add":" writeln!(w)?;"},{"Add":" print_change_contents(&mut w, changes, contents, change_contents)?;"},{"Add":" } else {"},{"Add":" writeln!(w)?;"},{"Add":" }"},{"Add":" }"},{"Add":" Record::FileUndel {"},{"Add":" undel,"},{"Add":" contents,"},{"Add":" path,"},{"Add":" } => {"},{"Add":" write!(w, \"File un-deletion: {:?} \", path)?;"},{"Add":" write_pos(&mut w, hashes, undel.inode())?;"},{"Add":" writeln!(w)?;"},{"Add":" write_atom(&mut w, hashes, &undel)?;"},{"Add":" if let Some(ref contents) = contents {"},{"Add":" write_atom(&mut w, hashes, &contents)?;"},{"Add":" print_change_contents(&mut w, changes, contents, change_contents)?;"},{"Add":" } else {"},{"Add":" writeln!(w)?;"},{"Add":" }"},{"Add":" }"},{"Add":" Record::FileAdd {"},{"Add":" add_name,"},{"Add":" contents,"},{"Add":" path,"},{"Add":" .."},{"Add":" } => {"},{"Add":" if let Atom::NewVertex(ref n) = add_name {"},{"Add":" let name = std::str::from_utf8("},{"Add":" &change_contents[n.start.0 as usize + 2..n.end.0 as usize],"},{"Add":" )"},{"Add":" .unwrap();"},{"Add":" let perms = crate::pristine::InodeMetadata::from_basename("},{"Add":" &change_contents[n.start.0 as usize..n.start.0 as usize + 2],"},{"Add":" );"},{"Add":" let parent = if let Some(p) = crate::path::parent(&path) {"},{"Add":" if p.is_empty() {"},{"Add":" \"/\""},{"Add":" } else {"},{"Add":" p"},{"Add":" }"},{"Add":" } else {"},{"Add":" \"/\""},{"Add":" };"},{"Add":" write!("},{"Add":" w,"},{"Add":" \"File addition: {:?} in {:?} {:o}\\n up\","},{"Add":" name, parent, perms.0"},{"Add":" )?;"},{"Add":" assert!(n.down_context.is_empty());"},{"Add":" for c in n.up_context.iter() {"},{"Add":" write!(w, \" \")?;"},{"Add":" write_pos(&mut w, hashes, *c)?"},{"Add":" }"},{"Add":" writeln!(w, \", new {}:{}\", n.start.0, n.end.0)?;"},{"Add":" }"},{"Add":" if let Some(Atom::NewVertex(ref n)) = contents {"},{"Add":" let c = &change_contents[n.start.0 as usize..n.end.0 as usize];"},{"Add":" print_contents(&mut w, \"+\", c)?;"},{"Add":" if !c.ends_with(b\"\\n\") {"},{"Add":" writeln!(w, \"\\\\\")?"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Record::Edit { change, local } => {"},{"Add":" write!(w, \"Edit in {} \", file_name(&local, change.inode()))?;"},{"Add":" write_pos(&mut w, hashes, change.inode())?;"},{"Add":" writeln!(w)?;"},{"Add":" write_atom(&mut w, hashes, &change)?;"},{"Add":" print_change_contents(&mut w, changes, change, change_contents)?;"},{"Add":" }"},{"Add":" Record::Replacement {"},{"Add":" change,"},{"Add":" replacement,"},{"Add":" local,"},{"Add":" } => {"},{"Add":" write!(w, \"Replacement in {} \", file_name(&local, change.inode()))?;"},{"Add":" write_pos(&mut w, hashes, change.inode())?;"},{"Add":" writeln!(w)?;"},{"Add":" write_atom(&mut w, hashes, &change)?;"},{"Add":" write_atom(&mut w, hashes, &replacement)?;"},{"Add":" print_change_contents(&mut w, changes, change, change_contents)?;"},{"Add":" print_change_contents(&mut w, changes, replacement, change_contents)?;"},{"Add":" }"},{"Add":" Record::SolveNameConflict { name, path } => {"},{"Add":" write!(w, \"Solving a name conflict in {:?} \", path)?;"},{"Add":" write_pos(&mut w, hashes, name.inode())?;"},{"Add":" write!(w, \": \")?;"},{"Add":" write_deleted_names(&mut w, changes, name)?;"},{"Add":" writeln!(w)?;"},{"Add":" write_atom(&mut w, hashes, &name)?;"},{"Add":" }"},{"Add":" Record::UnsolveNameConflict { name, path } => {"},{"Add":" write!(w, \"Un-solving a name conflict in {:?} \", path)?;"},{"Add":" write_pos(&mut w, hashes, name.inode())?;"},{"Add":" write!(w, \": \")?;"},{"Add":" write_deleted_names(&mut w, changes, name)?;"},{"Add":" writeln!(w)?;"},{"Add":" write_atom(&mut w, hashes, &name)?;"},{"Add":" }"},{"Add":" Record::SolveOrderConflict { change, local } => {"},{"Add":" write!("},{"Add":" w,"},{"Add":" \"Solving an order conflict in {} \","},{"Add":" file_name(&local, change.inode())"},{"Add":" )?;"},{"Add":" write_pos(&mut w, hashes, change.inode())?;"},{"Add":" writeln!(w)?;"},{"Add":" write_atom(&mut w, hashes, &change)?;"},{"Add":" print_change_contents(&mut w, changes, change, change_contents)?;"},{"Add":" }"},{"Add":" Record::UnsolveOrderConflict { change, local } => {"},{"Add":" write!("},{"Add":" w,"},{"Add":" \"Un-solving an order conflict in {} \","},{"Add":" file_name(&local, change.inode())"},{"Add":" )?;"},{"Add":" write_pos(&mut w, hashes, change.inode())?;"},{"Add":" writeln!(w)?;"},{"Add":" write_atom(&mut w, hashes, &change)?;"},{"Add":" print_change_contents(&mut w, changes, change, change_contents)?;"},{"Add":" }"},{"Add":" Record::ResurrectZombies { change, local } => {"},{"Add":" write!("},{"Add":" w,"},{"Add":" \"Resurrecting zombie lines in {:?}:{} \","},{"Add":" local.path, local.line"},{"Add":" )?;"},{"Add":" write_pos(&mut w, hashes, change.inode())?;"},{"Add":" writeln!(w)?;"},{"Add":" write_atom(&mut w, hashes, &change)?;"},{"Add":" print_change_contents(&mut w, changes, change, change_contents)?;"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl Record, Local> {"},{"Add":" fn read("},{"Add":" updatables: &mut HashMap,"},{"Add":" current: &mut Option,"},{"Add":" mut contents_: &mut Vec,"},{"Add":" changes: &HashMap,"},{"Add":" offsets: &mut HashMap,"},{"Add":" h: &str,"},{"Add":" ) -> Result, TextDeError> {"},{"Add":" use self::text_changes::*;"},{"Add":" use regex::Regex;"},{"Add":" lazy_static! {"},{"Add":" static ref FILE_ADDITION: Regex ="},{"Add":" Regex::new(r#\"(?P\\d+)\\. File addition: \"(?P[^\"]*)\" in \"(?P[^\"]*)\" (?P\\d+)\"#).unwrap();"},{"Add":" static ref EDIT: Regex ="},{"Add":" Regex::new(r#\"(\\d+)\\. Edit in ([^:]+):(\\d+) (\\d+\\.\\d+)\"#).unwrap();"},{"Add":" static ref REPLACEMENT: Regex ="},{"Add":" Regex::new(r#\"(\\d+)\\. Replacement in ([^:]+):(\\d+) (\\d+\\.\\d+)\"#).unwrap();"},{"Add":" static ref FILE_DELETION: Regex ="},{"Add":" Regex::new(r#\"(\\d+)\\. File deletion: \"([^\"]*)\" (\\d+\\.\\d+)\"#).unwrap();"},{"Add":" static ref FILE_UNDELETION: Regex ="},{"Add":" Regex::new(r#\"(\\d+)\\. File un-deletion: \"([^\"]*)\" (\\d+\\.\\d+)\"#).unwrap();"},{"Add":" static ref MOVE: Regex ="},{"Add":" Regex::new(r#\"(\\d+)\\. Moved: \"(?P[^\"]*)\" \"(?P[^\"]*)\" (?P\\d+) (?P.*)\"#).unwrap();"},{"Add":" static ref MOVE_: Regex = Regex::new(r#\"(\\d+)\\. Moved: \"([^\"]*)\" (.*)\"#).unwrap();"},{"Add":" static ref NAME_CONFLICT: Regex = Regex::new("},{"Add":" r#\"(\\d+)\\. ((Solving)|(Un-solving)) a name conflict in \"([^\"]*)\" (.*): .*\"#"},{"Add":" )"},{"Add":" .unwrap();"},{"Add":" static ref ORDER_CONFLICT: Regex = Regex::new("},{"Add":" r#\"(\\d+)\\. ((Solving)|(Un-solving)) an order conflict in (.*):(\\d+) (\\d+\\.\\d+)\"#"},{"Add":" )"},{"Add":" .unwrap();"},{"Add":" static ref ZOMBIE: Regex ="},{"Add":" Regex::new(r#\"(\\d+)\\. Resurrecting zombie lines in (?P\"[^\"]+\"):(?P\\d+) (?P\\d+\\.\\d+)\"#)"},{"Add":" .unwrap();"},{"Add":" static ref CONTEXT: Regex = Regex::new("},{"Add":" r#\"up ((\\d+\\.\\d+ )*\\d+\\.\\d+)(, new (\\d+):(\\d+))?(, down ((\\d+\\.\\d+ )*\\d+\\.\\d+))?\"#"},{"Add":" )"},{"Add":" .unwrap();"},{"Add":" }"},{"Add":" if let Some(cap) = FILE_ADDITION.captures(h) {"},{"Add":" if has_newvertices(current) {"},{"Add":" contents_.push(0)"},{"Add":" }"},{"Add":" let mut add_name = default_newvertex();"},{"Add":" add_name.start = ChangePosition(contents_.len() as u64);"},{"Add":" add_name.flag = EdgeFlags::FOLDER | EdgeFlags::BLOCK;"},{"Add":" let name = &cap.name(\"name\").unwrap().as_str();"},{"Add":" let path = {"},{"Add":" let parent = cap.name(\"parent\").unwrap().as_str();"},{"Add":" (if parent == \"/\" {"},{"Add":" String::new()"},{"Add":" } else {"},{"Add":" parent.to_string()"},{"Add":" }) + name"},{"Add":" };"},{"Add":" let meta = cap"},{"Add":" .name(\"perm\")"},{"Add":" .unwrap()"},{"Add":" .as_str()"},{"Add":" .chars()"},{"Add":" .fold(0, |x, c| x * 8 + (c as u16 - b'0' as u16));"},{"Add":" let meta = InodeMetadata(meta);"},{"Add":" meta.write(&mut contents_).unwrap();"},{"Add":" contents_.extend(name.as_bytes());"},{"Add":" add_name.end = ChangePosition(contents_.len() as u64);"},{"Add":""},{"Add":" let mut add_inode = default_newvertex();"},{"Add":" add_inode.flag = EdgeFlags::FOLDER | EdgeFlags::BLOCK;"},{"Add":" add_inode.up_context.push(Position {"},{"Add":" change: None,"},{"Add":" pos: ChangePosition(contents_.len() as u64),"},{"Add":" });"},{"Add":""},{"Add":" contents_.push(0);"},{"Add":" add_inode.start = ChangePosition(contents_.len() as u64);"},{"Add":" add_inode.end = ChangePosition(contents_.len() as u64);"},{"Add":" contents_.push(0);"},{"Add":" let n = cap.name(\"n\").unwrap().as_str().parse().unwrap();"},{"Add":" if let Entry::Occupied(mut e) = updatables.entry(n) {"},{"Add":" if let crate::InodeUpdate::Add { ref mut pos, .. } = e.get_mut() {"},{"Add":" *pos = add_inode.start"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(std::mem::replace("},{"Add":" current,"},{"Add":" Some(Record::FileAdd {"},{"Add":" add_name: Atom::NewVertex(add_name),"},{"Add":" add_inode: Atom::NewVertex(add_inode),"},{"Add":" contents: None,"},{"Add":" path,"},{"Add":" }),"},{"Add":" ))"},{"Add":" } else if let Some(cap) = EDIT.captures(h) {"},{"Add":" if has_newvertices(current) {"},{"Add":" contents_.push(0)"},{"Add":" }"},{"Add":""},{"Add":" let mut v = default_newvertex();"},{"Add":" v.inode = parse_pos(changes, &cap[4]);"},{"Add":" Ok(std::mem::replace("},{"Add":" current,"},{"Add":" Some(Record::Edit {"},{"Add":" change: Atom::NewVertex(v),"},{"Add":" local: Local {"},{"Add":" path: cap[2].to_string(),"},{"Add":" line: cap[3].parse().unwrap(),"},{"Add":" },"},{"Add":" }),"},{"Add":" ))"},{"Add":" } else if let Some(cap) = REPLACEMENT.captures(h) {"},{"Add":" if has_newvertices(current) {"},{"Add":" contents_.push(0)"},{"Add":" }"},{"Add":" let mut v = default_newvertex();"},{"Add":" v.inode = parse_pos(changes, &cap[4]);"},{"Add":" Ok(std::mem::replace("},{"Add":" current,"},{"Add":" Some(Record::Replacement {"},{"Add":" change: Atom::NewVertex(v.clone()),"},{"Add":" replacement: Atom::NewVertex(v),"},{"Add":" local: Local {"},{"Add":" path: cap[2].to_string(),"},{"Add":" line: cap[3].parse().unwrap(),"},{"Add":" },"},{"Add":" }),"},{"Add":" ))"},{"Add":" } else if let Some(cap) = FILE_DELETION.captures(h) {"},{"Add":" if has_newvertices(current) {"},{"Add":" contents_.push(0)"},{"Add":" }"},{"Add":" let mut del = default_edgemap();"},{"Add":" del.inode = parse_pos(changes, &cap[3]);"},{"Add":" Ok(std::mem::replace("},{"Add":" current,"},{"Add":" Some(Record::FileDel {"},{"Add":" del: Atom::EdgeMap(del),"},{"Add":" contents: None,"},{"Add":" path: cap[2].to_string(),"},{"Add":" }),"},{"Add":" ))"},{"Add":" } else if let Some(cap) = FILE_UNDELETION.captures(h) {"},{"Add":" if has_newvertices(current) {"},{"Add":" contents_.push(0)"},{"Add":" }"},{"Add":" let mut undel = default_edgemap();"},{"Add":" undel.inode = parse_pos(changes, &cap[3]);"},{"Add":" Ok(std::mem::replace("},{"Add":" current,"},{"Add":" Some(Record::FileUndel {"},{"Add":" undel: Atom::EdgeMap(undel),"},{"Add":" contents: None,"},{"Add":" path: cap[2].to_string(),"},{"Add":" }),"},{"Add":" ))"},{"Add":" } else if let Some(cap) = NAME_CONFLICT.captures(h) {"},{"Add":" if has_newvertices(current) {"},{"Add":" contents_.push(0)"},{"Add":" }"},{"Add":" let mut name = default_edgemap();"},{"Add":" debug!(\"cap = {:?}\", cap);"},{"Add":" name.inode = parse_pos(changes, &cap[6]);"},{"Add":" Ok(std::mem::replace("},{"Add":" current,"},{"Add":" if &cap[2] == \"Solving\" {"},{"Add":" Some(Record::SolveNameConflict {"},{"Add":" name: Atom::EdgeMap(name),"},{"Add":" path: cap[5].to_string(),"},{"Add":" })"},{"Add":" } else {"},{"Add":" Some(Record::UnsolveNameConflict {"},{"Add":" name: Atom::EdgeMap(name),"},{"Add":" path: cap[5].to_string(),"},{"Add":" })"},{"Add":" },"},{"Add":" ))"},{"Add":" } else if let Some(cap) = MOVE.captures(h) {"},{"Add":" if has_newvertices(current) {"},{"Add":" contents_.push(0)"},{"Add":" }"},{"Add":" let mut add = default_newvertex();"},{"Add":" add.start = ChangePosition(contents_.len() as u64);"},{"Add":" add.flag = EdgeFlags::FOLDER | EdgeFlags::BLOCK;"},{"Add":" let name = cap.name(\"new\").unwrap().as_str();"},{"Add":" let meta = cap"},{"Add":" .name(\"perm\")"},{"Add":" .unwrap()"},{"Add":" .as_str()"},{"Add":" .chars()"},{"Add":" .fold(0, |x, c| x * 8 + (c as u16 - b'0' as u16));"},{"Add":" let meta = InodeMetadata(meta);"},{"Add":" meta.write(&mut contents_).unwrap();"},{"Add":" contents_.extend(name.as_bytes());"},{"Add":" add.end = ChangePosition(contents_.len() as u64);"},{"Add":""},{"Add":" let mut del = default_edgemap();"},{"Add":" del.inode = parse_pos(changes, cap.name(\"inode\").unwrap().as_str());"},{"Add":" Ok(std::mem::replace("},{"Add":" current,"},{"Add":" Some(Record::FileMove {"},{"Add":" del: Atom::EdgeMap(del),"},{"Add":" add: Atom::NewVertex(add),"},{"Add":" path: cap[2].to_string(),"},{"Add":" }),"},{"Add":" ))"},{"Add":" } else if let Some(cap) = MOVE_.captures(h) {"},{"Add":" if has_newvertices(current) {"},{"Add":" contents_.push(0)"},{"Add":" }"},{"Add":" let mut add = default_edgemap();"},{"Add":" let mut del = default_edgemap();"},{"Add":" add.inode = parse_pos(changes, &cap[3]);"},{"Add":" del.inode = add.inode;"},{"Add":" Ok(std::mem::replace("},{"Add":" current,"},{"Add":" Some(Record::FileMove {"},{"Add":" del: Atom::EdgeMap(del),"},{"Add":" add: Atom::EdgeMap(add),"},{"Add":" path: cap[2].to_string(),"},{"Add":" }),"},{"Add":" ))"},{"Add":" } else if let Some(cap) = ORDER_CONFLICT.captures(h) {"},{"Add":" if has_newvertices(current) {"},{"Add":" contents_.push(0)"},{"Add":" }"},{"Add":""},{"Add":" Ok(std::mem::replace("},{"Add":" current,"},{"Add":" Some(if &cap[2] == \"Solving\" {"},{"Add":" let mut v = default_newvertex();"},{"Add":" v.inode = parse_pos(changes, &cap[7]);"},{"Add":" Record::SolveOrderConflict {"},{"Add":" change: Atom::NewVertex(v),"},{"Add":" local: Local {"},{"Add":" path: cap[5].to_string(),"},{"Add":" line: cap[6].parse().unwrap(),"},{"Add":" },"},{"Add":" }"},{"Add":" } else {"},{"Add":" let mut v = default_edgemap();"},{"Add":" v.inode = parse_pos(changes, &cap[7]);"},{"Add":" Record::UnsolveOrderConflict {"},{"Add":" change: Atom::EdgeMap(v),"},{"Add":" local: Local {"},{"Add":" path: cap[5].to_string(),"},{"Add":" line: cap[6].parse().unwrap(),"},{"Add":" },"},{"Add":" }"},{"Add":" }),"},{"Add":" ))"},{"Add":" } else if let Some(cap) = ZOMBIE.captures(h) {"},{"Add":" if has_newvertices(current) {"},{"Add":" contents_.push(0)"},{"Add":" }"},{"Add":" let mut v = default_edgemap();"},{"Add":" v.inode = parse_pos(changes, &cap.name(\"inode\").unwrap().as_str());"},{"Add":" Ok(std::mem::replace("},{"Add":" current,"},{"Add":" Some(Record::ResurrectZombies {"},{"Add":" change: Atom::EdgeMap(v),"},{"Add":" local: Local {"},{"Add":" path: cap.name(\"path\").unwrap().as_str().parse().unwrap(),"},{"Add":" line: cap.name(\"line\").unwrap().as_str().parse().unwrap(),"},{"Add":" },"},{"Add":" }),"},{"Add":" ))"},{"Add":" } else {"},{"Add":" match current {"},{"Add":" Some(Record::FileAdd {"},{"Add":" ref mut contents,"},{"Add":" ref mut add_name,"},{"Add":" .."},{"Add":" }) => {"},{"Add":" if h.starts_with('+') {"},{"Add":" if contents.is_none() {"},{"Add":" let mut v = default_newvertex();"},{"Add":" let inode = Position {"},{"Add":" change: None,"},{"Add":" pos: ChangePosition(contents_.len() as u64 - 1),"},{"Add":" };"},{"Add":" v.up_context.push(inode);"},{"Add":" v.inode = inode;"},{"Add":" v.start = ChangePosition(contents_.len() as u64);"},{"Add":" *contents = Some(Atom::NewVertex(v));"},{"Add":" }"},{"Add":" if let Some(Atom::NewVertex(ref mut contents)) = contents {"},{"Add":" if h.starts_with('+') {"},{"Add":" text_changes::parse_line_add(h, contents, contents_)"},{"Add":" }"},{"Add":" }"},{"Add":" } else if h.starts_with('\\\\') {"},{"Add":" if let Some(Atom::NewVertex(ref mut contents)) = contents {"},{"Add":" if contents_[contents.end.0 as usize - 1] == b'\\n' {"},{"Add":" assert_eq!(contents.end.0 as usize, contents_.len());"},{"Add":" contents_.pop();"},{"Add":" contents.end.0 -= 1;"},{"Add":" }"},{"Add":" }"},{"Add":" } else if let Some(cap) = CONTEXT.captures(h) {"},{"Add":" if let Atom::NewVertex(ref mut name) = add_name {"},{"Add":" name.up_context = parse_pos_vec(changes, offsets, &cap[1])?;"},{"Add":" if let (Some(new_start), Some(new_end)) = (cap.get(4), cap.get(5)) {"},{"Add":" offsets.insert(new_start.as_str().parse().unwrap(), name.start);"},{"Add":" offsets.insert(new_end.as_str().parse().unwrap(), name.end);"},{"Add":" offsets.insert("},{"Add":" new_end.as_str().parse::().unwrap() + 1,"},{"Add":" name.end + 1,"},{"Add":" );"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(None)"},{"Add":" }"},{"Add":" Some(Record::FileDel {"},{"Add":" ref mut del,"},{"Add":" ref mut contents,"},{"Add":" .."},{"Add":" }) => {"},{"Add":" if let Some(edges) = parse_edges(changes, h) {"},{"Add":" if let Atom::EdgeMap(ref mut e) = del {"},{"Add":" if edges[0].flag.contains(EdgeFlags::FOLDER) {"},{"Add":" *e = EdgeMap {"},{"Add":" inode: e.inode,"},{"Add":" edges,"},{"Add":" }"},{"Add":" } else {"},{"Add":" *contents = Some(Atom::EdgeMap(EdgeMap {"},{"Add":" inode: e.inode,"},{"Add":" edges,"},{"Add":" }))"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(None)"},{"Add":" }"},{"Add":" Some(Record::FileUndel {"},{"Add":" ref mut undel,"},{"Add":" ref mut contents,"},{"Add":" .."},{"Add":" }) => {"},{"Add":" if let Some(edges) = parse_edges(changes, h) {"},{"Add":" if let Atom::EdgeMap(ref mut e) = undel {"},{"Add":" if edges[0].flag.contains(EdgeFlags::FOLDER) {"},{"Add":" *e = EdgeMap {"},{"Add":" inode: e.inode,"},{"Add":" edges,"},{"Add":" }"},{"Add":" } else {"},{"Add":" *contents = Some(Atom::EdgeMap(EdgeMap {"},{"Add":" inode: e.inode,"},{"Add":" edges,"},{"Add":" }))"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(None)"},{"Add":" }"},{"Add":" Some(Record::FileMove {"},{"Add":" ref mut del,"},{"Add":" ref mut add,"},{"Add":" .."},{"Add":" }) => {"},{"Add":" if let Some(edges) = parse_edges(changes, h) {"},{"Add":" if edges[0].flag.contains(EdgeFlags::DELETED) {"},{"Add":" *del = Atom::EdgeMap(EdgeMap {"},{"Add":" inode: del.inode(),"},{"Add":" edges,"},{"Add":" });"},{"Add":" return Ok(None);"},{"Add":" } else if let Atom::EdgeMap(ref mut add) = add {"},{"Add":" if add.edges.is_empty() {"},{"Add":" *add = EdgeMap {"},{"Add":" inode: add.inode,"},{"Add":" edges,"},{"Add":" };"},{"Add":" return Ok(None);"},{"Add":" }"},{"Add":" }"},{"Add":" } else if let Some(cap) = CONTEXT.captures(h) {"},{"Add":" if let Atom::NewVertex(ref mut c) = add {"},{"Add":" debug!(\"cap = {:?}\", cap);"},{"Add":" c.up_context = parse_pos_vec(changes, offsets, &cap[1])?;"},{"Add":" if let Some(cap) = cap.get(7) {"},{"Add":" c.down_context = parse_pos_vec(changes, offsets, cap.as_str())?;"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(None)"},{"Add":" }"},{"Add":" Some(Record::Edit { ref mut change, .. }) => {"},{"Add":" debug!(\"edit {:?}\", h);"},{"Add":" if h.starts_with(\"+ \") {"},{"Add":" if let Atom::NewVertex(ref mut change) = change {"},{"Add":" if change.start == change.end {"},{"Add":" change.start = ChangePosition(contents_.len() as u64);"},{"Add":" }"},{"Add":" text_changes::parse_line_add(h, change, contents_)"},{"Add":" }"},{"Add":" } else if h.starts_with('\\\\') {"},{"Add":" if let Atom::NewVertex(ref mut change) = change {"},{"Add":" if contents_[change.end.0 as usize - 1] == b'\\n' {"},{"Add":" assert_eq!(change.end.0 as usize, contents_.len());"},{"Add":" contents_.pop();"},{"Add":" change.end.0 -= 1;"},{"Add":" }"},{"Add":" }"},{"Add":" } else if let Some(cap) = CONTEXT.captures(h) {"},{"Add":" if let Atom::NewVertex(ref mut c) = change {"},{"Add":" debug!(\"cap = {:?}\", cap);"},{"Add":" c.up_context = parse_pos_vec(changes, offsets, &cap[1])?;"},{"Add":" if let Some(cap) = cap.get(7) {"},{"Add":" c.down_context = parse_pos_vec(changes, offsets, cap.as_str())?;"},{"Add":" }"},{"Add":" }"},{"Add":" } else if let Some(edges) = parse_edges(changes, h) {"},{"Add":" *change = Atom::EdgeMap(EdgeMap {"},{"Add":" inode: change.inode(),"},{"Add":" edges,"},{"Add":" });"},{"Add":" }"},{"Add":" Ok(None)"},{"Add":" }"},{"Add":" Some(Record::Replacement {"},{"Add":" ref mut change,"},{"Add":" ref mut replacement,"},{"Add":" .."},{"Add":" }) => {"},{"Add":" if h.starts_with(\"+ \") {"},{"Add":" if let Atom::NewVertex(ref mut repl) = replacement {"},{"Add":" if repl.start == repl.end {"},{"Add":" repl.start = ChangePosition(contents_.len() as u64);"},{"Add":" }"},{"Add":" text_changes::parse_line_add(h, repl, contents_)"},{"Add":" }"},{"Add":" } else if h.starts_with('\\\\') {"},{"Add":" if let Atom::NewVertex(ref mut repl) = replacement {"},{"Add":" if contents_[repl.end.0 as usize - 1] == b'\\n' {"},{"Add":" assert_eq!(repl.end.0 as usize, contents_.len());"},{"Add":" contents_.pop();"},{"Add":" repl.end.0 -= 1;"},{"Add":" }"},{"Add":" }"},{"Add":" } else if let Some(cap) = CONTEXT.captures(h) {"},{"Add":" debug!(\"cap = {:?}\", cap);"},{"Add":" if let Atom::NewVertex(ref mut repl) = replacement {"},{"Add":" repl.up_context = parse_pos_vec(changes, offsets, &cap[1])?;"},{"Add":" if let Some(cap) = cap.get(7) {"},{"Add":" repl.down_context = parse_pos_vec(changes, offsets, cap.as_str())?;"},{"Add":" }"},{"Add":" }"},{"Add":" } else if let Some(edges) = parse_edges(changes, h) {"},{"Add":" *change = Atom::EdgeMap(EdgeMap {"},{"Add":" inode: change.inode(),"},{"Add":" edges,"},{"Add":" });"},{"Add":" }"},{"Add":" Ok(None)"},{"Add":" }"},{"Add":" Some(Record::SolveNameConflict { ref mut name, .. })"},{"Add":" | Some(Record::UnsolveNameConflict { ref mut name, .. }) => {"},{"Add":" if let Some(edges) = parse_edges(changes, h) {"},{"Add":" *name = Atom::EdgeMap(EdgeMap {"},{"Add":" edges,"},{"Add":" inode: name.inode(),"},{"Add":" })"},{"Add":" }"},{"Add":" Ok(None)"},{"Add":" }"},{"Add":" Some(Record::SolveOrderConflict { ref mut change, .. }) => {"},{"Add":" if h.starts_with(\"+ \") {"},{"Add":" if let Atom::NewVertex(ref mut change) = change {"},{"Add":" if change.start == change.end {"},{"Add":" change.start = ChangePosition(contents_.len() as u64);"},{"Add":" }"},{"Add":" text_changes::parse_line_add(h, change, contents_)"},{"Add":" }"},{"Add":" } else if let Some(cap) = CONTEXT.captures(h) {"},{"Add":" debug!(\"cap = {:?}\", cap);"},{"Add":" if let Atom::NewVertex(ref mut change) = change {"},{"Add":" change.up_context = parse_pos_vec(changes, offsets, &cap[1])?;"},{"Add":" if let Some(cap) = cap.get(7) {"},{"Add":" change.down_context ="},{"Add":" parse_pos_vec(changes, offsets, cap.as_str())?;"},{"Add":" }"},{"Add":" if let (Some(new_start), Some(new_end)) = (cap.get(4), cap.get(5)) {"},{"Add":" let new_start = new_start.as_str().parse::().unwrap();"},{"Add":" let new_end = new_end.as_str().parse::().unwrap();"},{"Add":" change.start = ChangePosition(contents_.len() as u64);"},{"Add":" change.end ="},{"Add":" ChangePosition(contents_.len() as u64 + new_end - new_start);"},{"Add":" offsets.insert(new_end, change.end);"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(None)"},{"Add":" }"},{"Add":" Some(Record::UnsolveOrderConflict { ref mut change, .. }) => {"},{"Add":" if let Some(edges) = parse_edges(changes, h) {"},{"Add":" if let Atom::EdgeMap(ref mut change) = change {"},{"Add":" change.edges = edges"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(None)"},{"Add":" }"},{"Add":" Some(Record::ResurrectZombies { ref mut change, .. }) => {"},{"Add":" if let Some(edges) = parse_edges(changes, h) {"},{"Add":" if let Atom::EdgeMap(ref mut change) = change {"},{"Add":" change.edges = edges"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(None)"},{"Add":" }"},{"Add":" None => {"},{"Add":" debug!(\"current = {:#?}\", current);"},{"Add":" debug!(\"h = {:?}\", h);"},{"Add":" Ok(None)"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"lazy_static! {"},{"Add":" static ref POS: regex::Regex = regex::Regex::new(r#\"(\\d+)\\.(\\d+)\"#).unwrap();"},{"Add":" static ref EDGE: regex::Regex ="},{"Add":" 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();"},{"Add":"}"},{"Add":""},{"Add":"pub fn default_newvertex() -> NewVertex> {"},{"Add":" NewVertex {"},{"Add":" start: ChangePosition(0),"},{"Add":" end: ChangePosition(0),"},{"Add":" flag: EdgeFlags::empty(),"},{"Add":" up_context: Vec::new(),"},{"Add":" down_context: Vec::new(),"},{"Add":" inode: Position {"},{"Add":" change: Some(Hash::None),"},{"Add":" pos: ChangePosition(0),"},{"Add":" },"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"pub fn default_edgemap() -> EdgeMap> {"},{"Add":" EdgeMap {"},{"Add":" edges: Vec::new(),"},{"Add":" inode: Position {"},{"Add":" change: Some(Hash::None),"},{"Add":" pos: ChangePosition(0),"},{"Add":" },"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"pub fn has_newvertices(current: &Option, L>>) -> bool {"},{"Add":" match current {"},{"Add":" Some(Record::FileAdd { contents: None, .. }) | None => false,"},{"Add":" Some(rec) => rec.iter().any(|e| matches!(e, Atom::NewVertex(_))),"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"pub fn parse_pos_vec("},{"Add":" changes: &HashMap,"},{"Add":" offsets: &HashMap,"},{"Add":" s: &str,"},{"Add":") -> Result>>, TextDeError> {"},{"Add":" let mut v = Vec::new();"},{"Add":" for pos in POS.captures_iter(s) {"},{"Add":" let change: usize = (&pos[1]).parse().unwrap();"},{"Add":" let pos: u64 = (&pos[2]).parse().unwrap();"},{"Add":" let pos = if change == 0 {"},{"Add":" if let Some(&pos) = offsets.get(&pos) {"},{"Add":" pos"},{"Add":" } else {"},{"Add":" debug!(\"inconsistent change: {:?} {:?}\", s, offsets);"},{"Add":" return Err(TextDeError::MissingChange(change));"},{"Add":" }"},{"Add":" } else {"},{"Add":" ChangePosition(pos)"},{"Add":" };"},{"Add":" v.push(Position {"},{"Add":" change: change_ref(changes, change),"},{"Add":" pos,"},{"Add":" })"},{"Add":" }"},{"Add":" Ok(v)"},{"Add":"}"},{"Add":""},{"Add":"fn change_ref(changes: &HashMap, change: usize) -> Option {"},{"Add":" debug!(\"change_ref {:?} {:?}\", changes, change);"},{"Add":" if change == 0 {"},{"Add":" None"},{"Add":" } else if change == 1 {"},{"Add":" Some(Hash::None)"},{"Add":" } else {"},{"Add":" Some(*changes.get(&change).unwrap())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"pub fn parse_pos(changes: &HashMap, s: &str) -> Position> {"},{"Add":" let pos = POS.captures(s).unwrap();"},{"Add":" let change: usize = (&pos[1]).parse().unwrap();"},{"Add":" let pos: u64 = (&pos[2]).parse().unwrap();"},{"Add":" Position {"},{"Add":" change: change_ref(changes, change),"},{"Add":" pos: ChangePosition(pos),"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"pub fn parse_edges(changes: &HashMap, s: &str) -> Option>>> {"},{"Add":" debug!(\"parse_edges {:?}\", s);"},{"Add":" let mut result = Vec::new();"},{"Add":" for edge in s.split(',') {"},{"Add":" debug!(\"parse edge {:?}\", edge);"},{"Add":" if let Some(cap) = EDGE.captures(edge) {"},{"Add":" let previous = read_flag(cap.name(\"prev\").unwrap().as_str());"},{"Add":" let flag = read_flag(cap.name(\"flag\").unwrap().as_str());"},{"Add":" let change0: usize = cap.name(\"up_c\").unwrap().as_str().parse().unwrap();"},{"Add":" let pos0: u64 = cap.name(\"up_l\").unwrap().as_str().parse().unwrap();"},{"Add":" let change1: usize = cap.name(\"c\").unwrap().as_str().parse().unwrap();"},{"Add":" let start1: u64 = cap.name(\"l0\").unwrap().as_str().parse().unwrap();"},{"Add":" let end1: u64 = cap.name(\"l1\").unwrap().as_str().parse().unwrap();"},{"Add":" let introduced_by: usize = cap.name(\"intro\").unwrap().as_str().parse().unwrap();"},{"Add":" result.push(NewEdge {"},{"Add":" previous,"},{"Add":" flag,"},{"Add":" from: Position {"},{"Add":" change: change_ref(changes, change0),"},{"Add":" pos: ChangePosition(pos0),"},{"Add":" },"},{"Add":" to: Vertex {"},{"Add":" change: change_ref(changes, change1),"},{"Add":" start: ChangePosition(start1),"},{"Add":" end: ChangePosition(end1),"},{"Add":" },"},{"Add":" introduced_by: change_ref(changes, introduced_by),"},{"Add":" })"},{"Add":" } else {"},{"Add":" debug!(\"not parsed\");"},{"Add":" return None;"},{"Add":" }"},{"Add":" }"},{"Add":" Some(result)"},{"Add":"}"},{"Add":""},{"Add":"pub fn parse_line_add(h: &str, change: &mut NewVertex>, contents_: &mut Vec) {"},{"Add":" let h = h.as_bytes();"},{"Add":" debug!(\"parse_line_add {:?} {:?}\", change.end, change.start);"},{"Add":" debug!(\"parse_line_add {:?}\", h);"},{"Add":" if h.len() > 2 {"},{"Add":" let h = &h[2..h.len()];"},{"Add":" contents_.extend(h);"},{"Add":" } else if h.len() > 1 {"},{"Add":" contents_.push(b'\\n');"},{"Add":" }"},{"Add":" debug!(\"contents_.len() = {:?}\", contents_.len());"},{"Add":" trace!(\"contents_ = {:?}\", contents_);"},{"Add":" change.end = ChangePosition(contents_.len() as u64);"},{"Add":"}"},{"Add":""},{"Add":"pub fn print_contents("},{"Add":" w: &mut W,"},{"Add":" pref: &str,"},{"Add":" contents: &[u8],"},{"Add":") -> Result<(), std::io::Error> {"},{"Add":" if let Ok(mut contents) = std::str::from_utf8(&contents) {"},{"Add":" while let Some(n) = contents.as_bytes().iter().position(|&c| c == b'\\n') {"},{"Add":" let (a, b) = contents.split_at(n + 1);"},{"Add":" contents = b;"},{"Add":" write!(w, \"{} {}\", pref, a)?;"},{"Add":" }"},{"Add":" if !contents.is_empty() {"},{"Add":" writeln!(w, \"{} {}\", pref, contents)?;"},{"Add":" }"},{"Add":" } else {"},{"Add":" writeln!(w, \"{}b{}\", pref, data_encoding::BASE64.encode(contents))?"},{"Add":" }"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"pub fn print_change_contents("},{"Add":" w: &mut W,"},{"Add":" changes: &C,"},{"Add":" change: &Atom>,"},{"Add":" change_contents: &[u8],"},{"Add":") -> Result<(), TextSerError> {"},{"Add":" match change {"},{"Add":" Atom::NewVertex(ref n) => {"},{"Add":" let c = &change_contents[n.start.0 as usize..n.end.0 as usize];"},{"Add":" print_contents(w, \"+\", c)?;"},{"Add":" if !c.ends_with(b\"\\n\") {"},{"Add":" writeln!(w, \"\\\\\")?"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":" Atom::EdgeMap(ref n) if n.edges[0].flag.contains(EdgeFlags::DELETED) => {"},{"Add":" let mut buf = Vec::new();"},{"Add":" let mut current = None;"},{"Add":" for e in n.edges.iter() {"},{"Add":" if Some(e.to) == current {"},{"Add":" continue;"},{"Add":" }"},{"Add":" buf.clear();"},{"Add":" changes"},{"Add":" .get_contents_ext(e.to, &mut buf)"},{"Add":" .map_err(TextSerError::C)?;"},{"Add":" print_contents(w, \"-\", &buf[..])?;"},{"Add":" current = Some(e.to)"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":" _ => Ok(()),"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"pub fn write_deleted_names("},{"Add":" w: &mut W,"},{"Add":" changes: &C,"},{"Add":" del: &Atom>,"},{"Add":") -> Result<(), TextSerError> {"},{"Add":" if let Atom::EdgeMap(ref e) = del {"},{"Add":" let mut buf = Vec::new();"},{"Add":" let mut is_first = true;"},{"Add":" for d in e.edges.iter() {"},{"Add":" buf.clear();"},{"Add":" changes"},{"Add":" .get_contents_ext(d.to, &mut buf)"},{"Add":" .map_err(TextSerError::C)?;"},{"Add":" if !buf.is_empty() {"},{"Add":" let name = std::str::from_utf8(buf.split_at(2).1).unwrap();"},{"Add":" write!(w, \"{}{:?}\", if is_first { \"\" } else { \", \" }, name)?;"},{"Add":" is_first = false;"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"pub fn write_flag(mut w: W, flag: EdgeFlags) -> Result<(), std::io::Error> {"},{"Add":" if flag.contains(EdgeFlags::BLOCK) {"},{"Add":" w.write_all(b\"B\")?;"},{"Add":" }"},{"Add":" if flag.contains(EdgeFlags::FOLDER) {"},{"Add":" w.write_all(b\"F\")?;"},{"Add":" }"},{"Add":" if flag.contains(EdgeFlags::DELETED) {"},{"Add":" w.write_all(b\"D\")?;"},{"Add":" }"},{"Add":" assert!(!flag.contains(EdgeFlags::PARENT));"},{"Add":" assert!(!flag.contains(EdgeFlags::PSEUDO));"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"pub fn read_flag(s: &str) -> EdgeFlags {"},{"Add":" let mut f = EdgeFlags::empty();"},{"Add":" for i in s.chars() {"},{"Add":" match i {"},{"Add":" 'B' => f |= EdgeFlags::BLOCK,"},{"Add":" 'F' => f |= EdgeFlags::FOLDER,"},{"Add":" 'D' => f |= EdgeFlags::DELETED,"},{"Add":" c => panic!(\"read_flag: {:?}\", c),"},{"Add":" }"},{"Add":" }"},{"Add":" f"},{"Add":"}"},{"Add":""},{"Add":"pub fn write_pos("},{"Add":" mut w: W,"},{"Add":" hashes: &HashMap,"},{"Add":" pos: Position>,"},{"Add":") -> Result<(), std::io::Error> {"},{"Add":" let change = if let Some(Hash::None) = pos.change {"},{"Add":" 1"},{"Add":" } else if let Some(ref c) = pos.change {"},{"Add":" *hashes.get(c).unwrap()"},{"Add":" } else {"},{"Add":" 0"},{"Add":" };"},{"Add":" write!(w, \"{}.{}\", change, pos.pos.0)?;"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"pub fn write_atom("},{"Add":" w: &mut W,"},{"Add":" hashes: &HashMap,"},{"Add":" atom: &Atom>,"},{"Add":") -> Result<(), std::io::Error> {"},{"Add":" match atom {"},{"Add":" Atom::NewVertex(ref n) => write_newvertex(w, hashes, n),"},{"Add":" Atom::EdgeMap(ref n) => write_edgemap(w, hashes, n),"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"pub fn write_newvertex("},{"Add":" mut w: W,"},{"Add":" hashes: &HashMap,"},{"Add":" n: &NewVertex>,"},{"Add":") -> Result<(), std::io::Error> {"},{"Add":" write!(w, \" up\")?;"},{"Add":" for c in n.up_context.iter() {"},{"Add":" write!(w, \" \")?;"},{"Add":" write_pos(&mut w, hashes, *c)?"},{"Add":" }"},{"Add":" write!(w, \", new {}:{}\", n.start.0, n.end.0)?;"},{"Add":" if !n.down_context.is_empty() {"},{"Add":" write!(w, \", down\")?;"},{"Add":" for c in n.down_context.iter() {"},{"Add":" write!(w, \" \")?;"},{"Add":" write_pos(&mut w, hashes, *c)?"},{"Add":" }"},{"Add":" }"},{"Add":" w.write_all(b\"\\n\")?;"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"pub fn write_edgemap("},{"Add":" mut w: W,"},{"Add":" hashes: &HashMap,"},{"Add":" n: &EdgeMap>,"},{"Add":") -> Result<(), std::io::Error> {"},{"Add":" let mut is_first = true;"},{"Add":" for c in n.edges.iter() {"},{"Add":" if !is_first {"},{"Add":" write!(w, \", \")?;"},{"Add":" }"},{"Add":" is_first = false;"},{"Add":" write_flag(&mut w, c.previous)?;"},{"Add":" write!(w, \":\")?;"},{"Add":" write_flag(&mut w, c.flag)?;"},{"Add":" write!(w, \" \")?;"},{"Add":" write_pos(&mut w, hashes, c.from)?;"},{"Add":" write!(w, \" -> \")?;"},{"Add":" write_pos(&mut w, hashes, c.to.start_pos())?;"},{"Add":" let h = if let Some(h) = hashes.get(c.introduced_by.as_ref().unwrap()) {"},{"Add":" h"},{"Add":" } else {"},{"Add":" panic!(\"introduced_by = {:?}, not found\", c.introduced_by);"},{"Add":" };"},{"Add":" write!(w, \":{}/{}\", c.to.end.0, h)?;"},{"Add":" }"},{"Add":" writeln!(w)?;"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Debug, Clone, PartialEq, Eq)]"},{"Add":"pub enum Section {"},{"Add":" Header(String),"},{"Add":" Deps,"},{"Add":" Changes {"},{"Add":" changes: Vec, Local>>,"},{"Add":" current: Option, Local>>,"},{"Add":" offsets: HashMap,"},{"Add":" },"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"change_file.rs","metadata":420},"context":[{"change":17,"pos":931000}],"contents":[{"Add":"use super::*;"},{"Add":""},{"Add":"/// An open, seekable change file."},{"Add":"#[cfg(feature = \"zstd\")]"},{"Add":"pub struct ChangeFile<'a> {"},{"Add":" s: Option>,"},{"Add":" hashed: Hashed,"},{"Add":" hash: Hash,"},{"Add":" unhashed: Option,"},{"Add":"}"},{"Add":""},{"Add":"struct OffFile {"},{"Add":" f: std::fs::File,"},{"Add":" start: u64,"},{"Add":"}"},{"Add":""},{"Add":"unsafe impl Send for OffFile {}"},{"Add":""},{"Add":"impl std::io::Read for OffFile {"},{"Add":" fn read(&mut self, buf: &mut [u8]) -> Result {"},{"Add":" self.f.read(buf)"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl std::io::Seek for OffFile {"},{"Add":" fn seek(&mut self, from: std::io::SeekFrom) -> Result {"},{"Add":" use std::io::SeekFrom;"},{"Add":" let from = match from {"},{"Add":" SeekFrom::Start(s) => SeekFrom::Start(s + self.start),"},{"Add":" c => c,"},{"Add":" };"},{"Add":" self.f.seek(from)"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"#[cfg(feature = \"zstd\")]"},{"Add":"impl<'a> ChangeFile<'a> {"},{"Add":" /// Open a change file from a path."},{"Add":" pub fn open(hash: Hash, path: &str) -> Result {"},{"Add":" use std::io::Read;"},{"Add":" let mut r = std::fs::File::open(path)?;"},{"Add":" let mut buf = Vec::new();"},{"Add":" buf.resize(Change::OFFSETS_SIZE as usize, 0);"},{"Add":" r.read_exact(&mut buf)?;"},{"Add":" let offsets: Offsets = bincode::deserialize(&buf)?;"},{"Add":" if offsets.version != VERSION {"},{"Add":" return Err(ChangeError::VersionMismatch);"},{"Add":" }"},{"Add":""},{"Add":" buf.clear();"},{"Add":" buf.resize((offsets.unhashed_off - Change::OFFSETS_SIZE) as usize, 0);"},{"Add":" r.read_exact(&mut buf)?;"},{"Add":" let mut buf2 = vec![0u8; offsets.hashed_len as usize];"},{"Add":" let hashed: Hashed = {"},{"Add":" let mut s = zstd_seekable::Seekable::init_buf(&buf)?;"},{"Add":" s.decompress(&mut buf2, 0)?;"},{"Add":" bincode::deserialize(&buf2)?"},{"Add":" };"},{"Add":""},{"Add":" buf.resize((offsets.contents_off - offsets.unhashed_off) as usize, 0);"},{"Add":" let unhashed = if buf.is_empty() {"},{"Add":" None"},{"Add":" } else {"},{"Add":" r.read_exact(&mut buf)?;"},{"Add":" let mut s = zstd_seekable::Seekable::init_buf(&buf)?;"},{"Add":" buf2.resize(offsets.unhashed_len as usize, 0);"},{"Add":" s.decompress(&mut buf2, 0)?;"},{"Add":" Some(toml::de::from_slice(&buf2)?)"},{"Add":" };"},{"Add":""},{"Add":" let m = r.metadata()?;"},{"Add":" let s = if offsets.contents_off >= m.len() {"},{"Add":" None"},{"Add":" } else {"},{"Add":" Some(zstd_seekable::Seekable::init(Box::new(OffFile {"},{"Add":" f: r,"},{"Add":" start: offsets.contents_off,"},{"Add":" }))?)"},{"Add":" };"},{"Add":" Ok(ChangeFile {"},{"Add":" s,"},{"Add":" hashed,"},{"Add":" hash,"},{"Add":" unhashed,"},{"Add":" })"},{"Add":" }"},{"Add":""},{"Add":" pub fn has_contents(&self) -> bool {"},{"Add":" self.s.is_some()"},{"Add":" }"},{"Add":""},{"Add":" /// Reads the contents at an offset into `buf`, and returns the"},{"Add":" /// number of bytes read. The bounds of the change's \"contents\""},{"Add":" /// section are not checked."},{"Add":" pub fn read_contents(&mut self, offset: u64, buf: &mut [u8]) -> Result {"},{"Add":" debug!(\"read_contents {:?} {:?}\", offset, buf.len());"},{"Add":" if let Some(ref mut s) = self.s {"},{"Add":" Ok(s.decompress(buf, offset)?)"},{"Add":" } else {"},{"Add":" Err(ChangeError::MissingContents { hash: self.hash })"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" pub fn hashed(&self) -> &Hashed {"},{"Add":" &self.hashed"},{"Add":" }"},{"Add":""},{"Add":" pub fn unhashed(&self) -> &Option {"},{"Add":" &self.unhashed"},{"Add":" }"},{"Add":"}"}]}},{"Edit":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":1,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":944089},"to":{"change":17,"start":944090,"end":944145},"introduced_by":17}],"inode":{"change":17,"pos":944089}}},"contents":[{"Del":"// org id g5piHODDo9cz2FFDRisMQw4h8fj1SqTfQ3I/i2p+EGc=\n"}]}},{"Edit":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":7,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":944344},"to":{"change":17,"start":944344,"end":944362},"introduced_by":17}],"inode":{"change":17,"pos":944089}}},"contents":[{"Del":"use crate::Error;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":8,"ins":{"up_context":[{"change":17,"pos":944404}],"down_context":[{"change":17,"pos":944459}],"flag":"","start":93395,"end":94637,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":944404},"to":{"change":17,"start":944404,"end":944459},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":"use thiserror::Error;"},{"Add":""},{"Add":"#[derive(Debug, Error)]"},{"Add":"pub enum ApplyError {"},{"Add":" #[error(\"Changestore error: {0}\")]"},{"Add":" Changestore(ChangestoreError),"},{"Add":" #[error(\"Local change error: {err}\")]"},{"Add":" LocalChange {"},{"Add":" #[from]"},{"Add":" err: LocalApplyError,"},{"Add":" },"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Debug, Error)]"},{"Add":"pub enum LocalApplyError {"},{"Add":" #[error(\"Dependency missing: {:?}\", hash)]"},{"Add":" DependencyMissing { hash: crate::pristine::Hash },"},{"Add":" #[error(\"Change already on channel: {:?}\", hash)]"},{"Add":" ChangeAlreadyOnChannel { hash: crate::pristine::Hash },"},{"Add":" #[error(\"Transaction error: {0}\")]"},{"Add":" Txn(TxnError),"},{"Add":" #[error(transparent)]"},{"Add":" Block(#[from] crate::pristine::BlockError),"},{"Add":" #[error(transparent)]"},{"Add":" InconsistentChange(#[from] crate::pristine::InconsistentChange),"},{"Add":"}"},{"Add":""},{"Add":"impl LocalApplyError {"},{"Add":" fn from_missing(err: MissingError) -> Self {"},{"Add":" match err {"},{"Add":" MissingError::Txn(e) => LocalApplyError::Txn(e),"},{"Add":" MissingError::Block(e) => LocalApplyError::Block(e),"},{"Add":" MissingError::Inconsistent(e) => LocalApplyError::InconsistentChange(e),"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""}],"del_contents":[{"Del":"// org id Fn0IzU5GRCA4xymOneQzYPhm7xvcbR8viQt+xz5AzSU=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":55,"ins":{"up_context":[{"change":17,"pos":944880}],"down_context":[{"change":17,"pos":944924}],"flag":"","start":94638,"end":94699,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":944880},"to":{"change":17,"start":944880,"end":944924},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":") -> Result<(u64, Merkle), ApplyError> {"}],"del_contents":[{"Del":") -> Result<(u64, Merkle), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":59,"ins":{"up_context":[{"change":17,"pos":945044}],"down_context":[{"change":17,"pos":945089}],"flag":"","start":94700,"end":94778,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":945044},"to":{"change":17,"start":945044,"end":945089},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" let change = changes.get_change(&hash).map_err(ApplyError::Changestore)?;"}],"del_contents":[{"Del":" let change = changes.get_change(&hash)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":70,"ins":{"up_context":[{"change":17,"pos":945379}],"down_context":[{"change":17,"pos":945443}],"flag":"","start":94779,"end":94853,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":945379},"to":{"change":17,"start":945379,"end":945443},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" return Err((LocalApplyError::DependencyMissing { hash }).into());"}],"del_contents":[{"Del":" return Err((Error::DependencyMissing { hash }).into());\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":77,"ins":{"up_context":[{"change":17,"pos":67075}],"down_context":[{"change":17,"pos":945648}],"flag":"","start":94854,"end":94940,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":67075},"to":{"change":17,"start":67075,"end":67131},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" register_change(txn, internal, hash, &change).map_err(LocalApplyError::Txn)?;"}],"del_contents":[{"Del":" register_change(txn, internal, hash, &change)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":81,"ins":{"up_context":[{"change":17,"pos":945713}],"down_context":[{"change":17,"pos":945917}],"flag":"","start":94941,"end":95085,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":945713},"to":{"change":17,"start":0,"end":84},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" Ok(apply_change_to_channel("},{"Add":" txn,"},{"Add":" &mut channel,"},{"Add":" internal,"},{"Add":" &hash,"},{"Add":" &change,"},{"Add":" workspace,"},{"Add":" )?)"}],"del_contents":[{"Del":" apply_change_to_channel(txn, &mut channel, internal, &hash, &change, workspace)\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":98,"ins":{"up_context":[{"change":17,"pos":946111}],"down_context":[{"change":17,"pos":946144}],"flag":"","start":95086,"end":95136,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":946111},"to":{"change":17,"start":946111,"end":946144},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":") -> Result<(), ApplyError> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":106,"ins":{"up_context":[{"change":17,"pos":946391}],"down_context":[{"change":17,"pos":946440}],"flag":"","start":95137,"end":95219,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":946391},"to":{"change":17,"start":946391,"end":946440},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" let change = changes.get_change(&hash).map_err(ApplyError::Changestore)?;"}],"del_contents":[{"Del":" let change = changes.get_change(&hash)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":138,"ins":{"up_context":[{"change":17,"pos":67204}],"down_context":[{"change":17,"pos":947248}],"flag":"","start":95220,"end":95318,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":67204},"to":{"change":17,"start":67204,"end":67272},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" register_change(txn, internal, hash, &change).map_err(LocalApplyError::Txn)?;"}],"del_contents":[{"Del":" register_change(txn, internal, hash, &change)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":156,"ins":{"up_context":[{"change":17,"pos":947938}],"down_context":[{"change":17,"pos":947982}],"flag":"","start":95319,"end":95380,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":947938},"to":{"change":17,"start":947938,"end":947982},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":") -> Result<(u64, Merkle), ApplyError> {"}],"del_contents":[{"Del":") -> Result<(u64, Merkle), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":167,"ins":{"up_context":[{"change":17,"pos":948278}],"down_context":[{"change":17,"pos":948311}],"flag":"","start":95381,"end":95431,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":948278},"to":{"change":17,"start":948278,"end":948311},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":") -> Result<(), ApplyError> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":186,"ins":{"up_context":[{"change":17,"pos":948861}],"down_context":[{"change":17,"pos":948905}],"flag":"","start":95432,"end":95488,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":948861},"to":{"change":17,"start":948861,"end":948905},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":") -> Result<(u64, Merkle), LocalApplyError> {"}],"del_contents":[{"Del":") -> Result<(u64, Merkle), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":189,"ins":{"up_context":[{"change":17,"pos":948963}],"down_context":[{"change":17,"pos":949195}],"flag":"","start":95489,"end":95750,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":948963},"to":{"change":17,"start":948963,"end":948980},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":948980},"to":{"change":17,"start":948980,"end":949073},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":949073},"to":{"change":17,"start":949073,"end":949104},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":949104},"to":{"change":17,"start":949104,"end":949184},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":949184},"to":{"change":17,"start":949184,"end":949195},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" let merkle = if let Some(m) = txn"},{"Add":" .put_changes(channel, change_id, channel.apply_counter, hash)"},{"Add":" .map_err(LocalApplyError::Txn)?"},{"Add":" {"},{"Add":" m"},{"Add":" } else {"},{"Add":" return Err(LocalApplyError::ChangeAlreadyOnChannel { hash: *hash });"},{"Add":" };"}],"del_contents":[{"Del":" let merkle =\n"},{"Del":" if let Some(m) = txn.put_changes(channel, change_id, channel.apply_counter, hash)? {\n"},{"Del":" m\n } else {\n"},{"Del":" return Err((Error::ChangeAlreadyOnChannel { hash: *hash }).into());\n"},{"Del":" };\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":214,"ins":{"up_context":[{"change":17,"pos":950014}],"down_context":[{"change":17,"pos":950069}],"flag":"","start":95751,"end":95841,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":950014},"to":{"change":17,"start":950014,"end":950069},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" |_, _, _, _| Ok::>(true),"}],"del_contents":[{"Del":" |_, _, _, _| Ok(true),\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":229,"ins":{"up_context":[{"change":17,"pos":981}],"down_context":[{"change":17,"pos":1018}],"flag":"","start":95842,"end":95914,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":981},"to":{"change":17,"start":981,"end":1018},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" Ok::>(true)"}],"del_contents":[{"Del":" Ok(true)\n"}]}},{"Edit":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":231,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1047},"to":{"change":17,"start":1047,"end":1126},"introduced_by":17}],"inode":{"change":17,"pos":944089}}},"contents":[{"Del":" // org id aNVimxa4oSqbTYJ033w2QbZTCVMG/+tO2ymc1QSWPH0=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":239,"ins":{"up_context":[{"change":17,"pos":1481}],"down_context":[{"change":17,"pos":951533}],"flag":"","start":95915,"end":96006,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1481},"to":{"change":17,"start":1481,"end":1508},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1508},"to":{"change":17,"start":1508,"end":1587},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" )"},{"Add":" .map_err(LocalApplyError::from_missing)?"}],"del_contents":[{"Del":" )?\n"},{"Del":" // org id hXW9eN25ZM8EQ5B2Ew8NMra+xi7hFv6CN8no+qg8GpY=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":254,"ins":{"up_context":[{"change":17,"pos":951945}],"down_context":[{"change":17,"pos":952082}],"flag":"","start":96007,"end":96184,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":951945},"to":{"change":17,"start":951945,"end":952082},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" if let Ok(duration) ="},{"Add":" std::time::SystemTime::now().duration_since(std::time::SystemTime::UNIX_EPOCH)"},{"Add":" {"},{"Add":" channel.last_modified = duration.as_secs();"},{"Add":" }"}],"del_contents":[{"Del":" channel.last_modified = std::time::SystemTime::now()\n .duration_since(std::time::SystemTime::UNIX_EPOCH)?\n .as_secs();\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":274,"ins":{"up_context":[{"change":17,"pos":952657}],"down_context":[{"change":17,"pos":952760}],"flag":"","start":96185,"end":96241,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":952657},"to":{"change":17,"start":952657,"end":952701},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":") -> Result<(u64, Merkle), LocalApplyError> {"}],"del_contents":[{"Del":") -> Result<(u64, Merkle), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":287,"ins":{"up_context":[{"change":6,"pos":290}],"down_context":[{"change":6,"pos":354}],"flag":"","start":96242,"end":96316,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":290},"to":{"change":6,"start":290,"end":354},"introduced_by":6}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" return Err((LocalApplyError::DependencyMissing { hash }).into());"}],"del_contents":[{"Del":" return Err((Error::DependencyMissing { hash }).into());\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":290,"ins":{"up_context":[{"change":6,"pos":361}],"down_context":[{"change":17,"pos":227}],"flag":"","start":96317,"end":96399,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":6,"pos":361},"to":{"change":17,"start":67329,"end":67381},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":67329},"to":{"change":17,"start":67329,"end":67381},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" register_change(txn, internal, hash, &change).map_err(LocalApplyError::Txn)?;"}],"del_contents":[{"Del":" register_change(txn, internal, hash, &change)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":306,"ins":{"up_context":[{"change":17,"pos":953616}],"down_context":[{"change":17,"pos":953660}],"flag":"","start":96400,"end":96456,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":953616},"to":{"change":17,"start":953616,"end":953660},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":") -> Result<(u64, Merkle), LocalApplyError> {"}],"del_contents":[{"Del":") -> Result<(u64, Merkle), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":322,"ins":{"up_context":[{"change":17,"pos":953986}],"down_context":[{"change":17,"pos":954019}],"flag":"","start":96457,"end":96502,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":953986},"to":{"change":17,"start":953986,"end":954019},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":") -> Result<(), LocalApplyError> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":335,"ins":{"up_context":[{"change":17,"pos":954497}],"down_context":[{"change":17,"pos":954554}],"flag":"","start":96503,"end":96591,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":954497},"to":{"change":17,"start":67382,"end":67440},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" put_inodes_with_rev(txn, inode, vertex).map_err(LocalApplyError::Txn)?;"}],"del_contents":[{"Del":" put_inodes_with_rev(txn, inode, vertex)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":342,"ins":{"up_context":[{"change":17,"pos":954864}],"down_context":[{"change":17,"pos":954997}],"flag":"","start":96592,"end":96691,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":954864},"to":{"change":17,"start":3409,"end":3478},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" del_tree_with_rev(txn, parent.as_file_id(), inode).map_err(LocalApplyError::Txn)?;"}],"del_contents":[{"Del":" del_tree_with_rev(txn, parent.as_file_id(), inode)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":352,"ins":{"up_context":[{"change":17,"pos":955259}],"down_context":[{"change":17,"pos":955275}],"flag":"","start":96692,"end":96751,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":955259},"to":{"change":17,"start":955259,"end":955275},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" )"},{"Add":" .map_err(LocalApplyError::Txn)?;"}],"del_contents":[{"Del":" )?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":355,"ins":{"up_context":[{"change":17,"pos":955339}],"down_context":[{"change":17,"pos":955450}],"flag":"","start":96752,"end":96840,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":955339},"to":{"change":17,"start":3532,"end":3590},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" del_inodes_with_rev(txn, inode, vertex).map_err(LocalApplyError::Txn)?;"}],"del_contents":[{"Del":" del_inodes_with_rev(txn, inode, vertex)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":369,"ins":{"up_context":[{"change":17,"pos":955721}],"down_context":[{"change":17,"pos":955754}],"flag":"","start":96841,"end":96886,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":955721},"to":{"change":17,"start":955721,"end":955754},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":") -> Result<(), LocalApplyError> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":395,"ins":{"up_context":[{"change":17,"pos":956626}],"down_context":[{"change":17,"pos":956703}],"flag":"","start":96887,"end":97016,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":956626},"to":{"change":17,"start":67545,"end":67623},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" put_graph_with_rev(txn, channel, flag, up, vertex, *change)"},{"Add":" .map_err(LocalApplyError::Txn)?;"}],"del_contents":[{"Del":" put_graph_with_rev(txn, channel, flag, up, vertex, *change)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":405,"ins":{"up_context":[{"change":14,"pos":354}],"down_context":[{"change":17,"pos":956816}],"flag":"","start":97017,"end":97116,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":14,"pos":354},"to":{"change":14,"start":354,"end":423},"introduced_by":14}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" put_graph_with_rev(txn, channel, flag, up, vertex, change).map_err(LocalApplyError::Txn)?;"}],"del_contents":[{"Del":" put_graph_with_rev(txn, channel, flag, up, vertex, change)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":418,"ins":{"up_context":[{"change":17,"pos":68059}],"down_context":[{"change":17,"pos":957404}],"flag":"","start":97117,"end":97176,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":68059},"to":{"change":17,"start":68059,"end":68075},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" )"},{"Add":" .map_err(LocalApplyError::Txn)?;"}],"del_contents":[{"Del":" )?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":428,"ins":{"up_context":[{"change":17,"pos":68267}],"down_context":[{"change":17,"pos":957497}],"flag":"","start":97177,"end":97236,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":68267},"to":{"change":17,"start":68267,"end":68283},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" )"},{"Add":" .map_err(LocalApplyError::Txn)?;"}],"del_contents":[{"Del":" )?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":443,"ins":{"up_context":[{"change":17,"pos":957790}],"down_context":[{"change":17,"pos":957823}],"flag":"","start":97237,"end":97282,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":957790},"to":{"change":17,"start":957790,"end":957823},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":") -> Result<(), LocalApplyError> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":459,"ins":{"up_context":[{"change":17,"pos":958453}],"down_context":[{"change":17,"pos":958502}],"flag":"","start":97283,"end":97363,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":958453},"to":{"change":17,"start":68336,"end":68386},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" split_block(txn, channel, k, up.pos).map_err(LocalApplyError::Txn)?"}],"del_contents":[{"Del":" split_block(txn, channel, k, up.pos)?\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":498,"ins":{"up_context":[{"change":17,"pos":959448}],"down_context":[{"change":17,"pos":69263}],"flag":"","start":97364,"end":97423,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":959448},"to":{"change":17,"start":959448,"end":959495},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":") -> Result, LocalApplyError> {"}],"del_contents":[{"Del":") -> Result, anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":515,"ins":{"up_context":[{"change":17,"pos":960068}],"down_context":[{"change":17,"pos":960115}],"flag":"","start":97424,"end":97502,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":960068},"to":{"change":17,"start":69310,"end":69358},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" split_block(txn, channel, k, down.pos).map_err(LocalApplyError::Txn)?"}],"del_contents":[{"Del":" split_block(txn, channel, k, down.pos)?\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":590,"ins":{"up_context":[{"change":17,"pos":962677}],"down_context":[{"change":17,"pos":962794}],"flag":"","start":97503,"end":97540,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":962677},"to":{"change":17,"start":962677,"end":962732},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":962732},"to":{"change":17,"start":322,"end":355},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":""},{"Add":"pub(crate) fn put_newedge("}],"del_contents":[{"Del":"// org id wwZDqGk+qPaB9Oabmhr4ziOpXgWClHLLbxpCOAo1zpI=\n"},{"Del":"pub(crate) fn put_newedge(\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":599,"ins":{"up_context":[{"change":17,"pos":962973}],"down_context":[{"change":17,"pos":963004}],"flag":"","start":97541,"end":97560,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":962973},"to":{"change":17,"start":962973,"end":963004},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":") -> Result<(), E>"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error>\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":602,"ins":{"up_context":[{"change":17,"pos":963026}],"down_context":[{"change":17,"pos":963317}],"flag":"","start":97561,"end":97692,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":963175},"to":{"change":17,"start":963175,"end":963279},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":963279},"to":{"change":17,"start":963279,"end":963317},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" E: From>,"},{"Add":" F: Fn(&mut T, &mut Channel, Vertex, Vertex) -> Result,"}],"del_contents":[{"Del":" F: Fn(\n &mut T,\n &mut Channel,\n Vertex,\n Vertex,\n"},{"Del":" ) -> Result,\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":606,"ins":{"up_context":[{"change":17,"pos":963364}],"down_context":[{"change":17,"pos":963425}],"flag":"","start":97693,"end":97825,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":963364},"to":{"change":17,"start":963364,"end":963425},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" ws.missing_context"},{"Add":" .load_graph(txn, channel, inode)"},{"Add":" .map_err(LocalApplyError::InconsistentChange)?;"}],"del_contents":[{"Del":" ws.missing_context.load_graph(txn, channel, inode)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":617,"ins":{"up_context":[{"change":17,"pos":963660}],"down_context":[{"change":17,"pos":963721}],"flag":"","start":97826,"end":97953,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":963660},"to":{"change":17,"start":963660,"end":963721},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" return Err("},{"Add":" LocalApplyError::InconsistentChange(crate::pristine::InconsistentChange {}).into(),"},{"Add":" );"}],"del_contents":[{"Del":" return Err(crate::Error::InconsistentChange.into());\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":646,"ins":{"up_context":[{"change":17,"pos":964639}],"down_context":[{"change":17,"pos":964696}],"flag":"","start":97954,"end":98042,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":964639},"to":{"change":17,"start":69742,"end":69800},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" split_block(txn, channel, target, n.to.end).map_err(LocalApplyError::Txn)?;"}],"del_contents":[{"Del":" split_block(txn, channel, target, n.to.end)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":659,"ins":{"up_context":[{"change":17,"pos":965101}],"down_context":[{"change":17,"pos":965198}],"flag":"","start":98043,"end":98184,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":965101},"to":{"change":17,"start":69801,"end":69899},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" let del = del_graph_with_rev(txn, channel, n.previous, source, target, n_introduced_by)"},{"Add":" .map_err(LocalApplyError::Txn)?;"}],"del_contents":[{"Del":" let del = del_graph_with_rev(txn, channel, n.previous, source, target, n_introduced_by)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":665,"ins":{"up_context":[{"change":17,"pos":965798}],"down_context":[{"change":17,"pos":965876}],"flag":"","start":98185,"end":98311,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":965798},"to":{"change":17,"start":69900,"end":69979},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" put_graph_with_rev(txn, channel, n.flag, source, target, change)"},{"Add":" .map_err(LocalApplyError::Txn)?;"}],"del_contents":[{"Del":" put_graph_with_rev(txn, channel, n.flag, source, target, change)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":675,"ins":{"up_context":[{"change":17,"pos":966024}],"down_context":[{"change":17,"pos":966085}],"flag":"","start":98312,"end":98406,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":966024},"to":{"change":17,"start":69980,"end":70042},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" target = find_block(txn, channel, target.end_pos()).map_err(LocalApplyError::Block)?;"}],"del_contents":[{"Del":" target = find_block(txn, channel, target.end_pos())?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":690,"ins":{"up_context":[{"change":17,"pos":966415}],"down_context":[{"change":17,"pos":966462}],"flag":"","start":98407,"end":98466,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":966415},"to":{"change":17,"start":966415,"end":966462},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":") -> Result, LocalApplyError> {"}],"del_contents":[{"Del":") -> Result, anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":714,"ins":{"up_context":[{"change":17,"pos":967280}],"down_context":[{"change":17,"pos":967333}],"flag":"","start":98467,"end":98551,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":967280},"to":{"change":17,"start":70132,"end":70186},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" split_block(txn, channel, source, from.pos).map_err(LocalApplyError::Txn)?;"}],"del_contents":[{"Del":" split_block(txn, channel, source, from.pos)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":728,"ins":{"up_context":[{"change":17,"pos":967603}],"down_context":[{"change":17,"pos":70187}],"flag":"","start":98552,"end":98611,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":967603},"to":{"change":17,"start":967603,"end":967650},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":") -> Result, LocalApplyError> {"}],"del_contents":[{"Del":") -> Result, anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":753,"ins":{"up_context":[{"change":17,"pos":968473}],"down_context":[{"change":17,"pos":968526}],"flag":"","start":98612,"end":98696,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":968473},"to":{"change":17,"start":70307,"end":70361},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" split_block(txn, channel, target, to.start).map_err(LocalApplyError::Txn)?;"}],"del_contents":[{"Del":" split_block(txn, channel, target, to.start)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":765,"ins":{"up_context":[{"change":17,"pos":968808}],"down_context":[{"change":17,"pos":70362}],"flag":"","start":98697,"end":98742,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":968808},"to":{"change":17,"start":968808,"end":968841},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":") -> Result<(), LocalApplyError> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":798,"ins":{"up_context":[{"change":17,"pos":969811}],"down_context":[{"change":17,"pos":969844}],"flag":"","start":98743,"end":98788,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":969811},"to":{"change":17,"start":969811,"end":969844},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":") -> Result<(), LocalApplyError> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":820,"ins":{"up_context":[{"change":17,"pos":970375}],"down_context":[{"change":17,"pos":970436}],"flag":"","start":98789,"end":98841,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":970375},"to":{"change":17,"start":970375,"end":970436},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" return Err((InconsistentChange {}).into());"}],"del_contents":[{"Del":" return Err(crate::Error::InconsistentChange.into());\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":842,"ins":{"up_context":[{"change":17,"pos":70659}],"down_context":[{"change":17,"pos":971153}],"flag":"","start":98842,"end":98986,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":70659},"to":{"change":17,"start":70659,"end":70752},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" put_graph_with_rev(txn, channel, EdgeFlags::PSEUDO, p, *c, ChangeId::ROOT)"},{"Add":" .map_err(LocalApplyError::Txn)?;"}],"del_contents":[{"Del":" put_graph_with_rev(txn, channel, EdgeFlags::PSEUDO, p, *c, ChangeId::ROOT)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":854,"ins":{"up_context":[{"change":17,"pos":971377}],"down_context":[{"change":17,"pos":971410}],"flag":"","start":98987,"end":99032,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":971377},"to":{"change":17,"start":971377,"end":971410},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":") -> Result<(), LocalApplyError> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":885,"ins":{"up_context":[{"change":17,"pos":973164}],"down_context":[{"change":17,"pos":973185}],"flag":"","start":99033,"end":99117,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":973164},"to":{"change":17,"start":973164,"end":973185},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" )"},{"Add":" .map_err(LocalApplyError::Txn)?"},{"Add":" {"}],"del_contents":[{"Del":" )? {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":896,"ins":{"up_context":[{"change":17,"pos":973501}],"down_context":[{"change":17,"pos":973524}],"flag":"","start":99118,"end":99201,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":973501},"to":{"change":17,"start":973501,"end":973524},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" )"},{"Add":" .map_err(LocalApplyError::from_missing)?"}],"del_contents":[{"Del":" )?\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":909,"ins":{"up_context":[{"change":17,"pos":71255}],"down_context":[{"change":17,"pos":973739}],"flag":"","start":99202,"end":99274,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":71255},"to":{"change":17,"start":71255,"end":71272},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" )"},{"Add":" .map_err(LocalApplyError::Txn)?"},{"Add":" {"}],"del_contents":[{"Del":" )? {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":921,"ins":{"up_context":[{"change":17,"pos":974075}],"down_context":[{"change":17,"pos":974094}],"flag":"","start":99275,"end":99350,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":974075},"to":{"change":17,"start":974075,"end":974094},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" )"},{"Add":" .map_err(LocalApplyError::from_missing)?"}],"del_contents":[{"Del":" )?\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":932,"ins":{"up_context":[{"change":17,"pos":71466}],"down_context":[{"change":17,"pos":974222}],"flag":"","start":99351,"end":99410,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":71466},"to":{"change":17,"start":71466,"end":71482},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" )"},{"Add":" .map_err(LocalApplyError::Txn)?;"}],"del_contents":[{"Del":" )?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":945,"ins":{"up_context":[{"change":17,"pos":974463}],"down_context":[{"change":17,"pos":974496}],"flag":"","start":99411,"end":99456,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":974463},"to":{"change":17,"start":974463,"end":974496},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":") -> Result<(), LocalApplyError> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":947,"ins":{"up_context":[{"change":17,"pos":974537}],"down_context":[{"change":17,"pos":974632}],"flag":"","start":99457,"end":99600,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":974537},"to":{"change":17,"start":974537,"end":974632},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" crate::missing_context::repair_parents_of_deleted(txn, channel, &mut ws.missing_context)"},{"Add":" .map_err(LocalApplyError::from_missing)?;"}],"del_contents":[{"Del":" crate::missing_context::repair_parents_of_deleted(txn, channel, &mut ws.missing_context)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":971,"ins":{"up_context":[{"change":17,"pos":975617}],"down_context":[{"change":17,"pos":975644}],"flag":"","start":99601,"end":99692,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":975617},"to":{"change":17,"start":975617,"end":975644},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" )"},{"Add":" .map_err(LocalApplyError::from_missing)?"}],"del_contents":[{"Del":" )?\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":996,"ins":{"up_context":[{"change":17,"pos":976780}],"down_context":[{"change":17,"pos":976811}],"flag":"","start":99693,"end":99792,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":976780},"to":{"change":17,"start":976780,"end":976811},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" )"},{"Add":" .map_err(LocalApplyError::from_missing)?"}],"del_contents":[{"Del":" )?\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":1016,"ins":{"up_context":[{"change":17,"pos":977570}],"down_context":[{"change":17,"pos":977597}],"flag":"","start":99793,"end":99884,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":977570},"to":{"change":17,"start":977570,"end":977597},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" )"},{"Add":" .map_err(LocalApplyError::from_missing)?"}],"del_contents":[{"Del":" )?\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":1036,"ins":{"up_context":[{"change":17,"pos":7639}],"down_context":[{"change":17,"pos":978338}],"flag":"","start":99885,"end":99968,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":7639},"to":{"change":17,"start":7639,"end":7662},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" )"},{"Add":" .map_err(LocalApplyError::from_missing)?"}],"del_contents":[{"Del":" )?\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":1042,"ins":{"up_context":[{"change":17,"pos":978406}],"down_context":[{"change":17,"pos":978495}],"flag":"","start":99969,"end":100106,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":978406},"to":{"change":17,"start":978406,"end":978495},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" crate::missing_context::delete_pseudo_edges(txn, channel, &mut ws.missing_context)"},{"Add":" .map_err(LocalApplyError::from_missing)?;"}],"del_contents":[{"Del":" crate::missing_context::delete_pseudo_edges(txn, channel, &mut ws.missing_context)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":1054,"ins":{"up_context":[{"change":17,"pos":978783}],"down_context":[{"change":17,"pos":978816}],"flag":"","start":100107,"end":100152,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":978783},"to":{"change":17,"start":978783,"end":978816},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":") -> Result<(), LocalApplyError> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":1076,"ins":{"up_context":[{"change":17,"pos":979642}],"down_context":[{"change":17,"pos":979675}],"flag":"","start":100153,"end":100198,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":979642},"to":{"change":17,"start":979642,"end":979675},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":") -> Result<(), LocalApplyError> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":1087,"ins":{"up_context":[{"change":17,"pos":979933}],"down_context":[{"change":17,"pos":979998}],"flag":"","start":100199,"end":100272,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":979933},"to":{"change":17,"start":979933,"end":979998},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" return Err((crate::pristine::InconsistentChange {}).into());"}],"del_contents":[{"Del":" return Err(crate::Error::InconsistentChange.into());\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":1112,"ins":{"up_context":[{"change":17,"pos":980783}],"down_context":[{"change":17,"pos":980795}],"flag":"","start":100273,"end":100324,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":980783},"to":{"change":17,"start":980783,"end":980795},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":" )"},{"Add":" .map_err(LocalApplyError::Txn)?;"}],"del_contents":[{"Del":" )?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":944089},"path":"libpijul/src/apply.rs","line":1123,"ins":{"up_context":[{"change":17,"pos":980926}],"down_context":[{"change":17,"pos":980960}],"flag":"","start":100325,"end":100372,"inode":{"change":17,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":980926},"to":{"change":17,"start":980926,"end":980960},"introduced_by":17}],"inode":{"change":17,"pos":944089}},"ins_contents":[{"Add":") -> Result> {"}],"del_contents":[{"Del":") -> Result {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":984582},"path":"libpijul/src/alive/retrieve.rs","line":113,"ins":{"up_context":[{"change":17,"pos":987781}],"down_context":[{"change":17,"pos":987814}],"flag":"","start":100373,"end":100401,"inode":{"change":17,"pos":984582}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":987781},"to":{"change":17,"start":987781,"end":987814},"introduced_by":17}],"inode":{"change":17,"pos":984582}},"ins_contents":[{"Add":") -> Result<(), T::Error> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Edit":{"inode":{"change":17,"pos":988425},"path":"libpijul/src/alive/output.rs","line":1,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":988425},"to":{"change":17,"start":988426,"end":988481},"introduced_by":17}],"inode":{"change":17,"pos":988425}}},"contents":[{"Del":"// org id rugGQSda+7h3fgWnFg5o6rrh0FxPthevqf1C7yFpDXo=\n"}]}},{"Edit":{"inode":{"change":17,"pos":988425},"path":"libpijul/src/alive/output.rs","line":4,"atom":{"NewVertex":{"up_context":[{"change":17,"pos":988592}],"down_context":[{"change":17,"pos":988592}],"flag":"","start":100402,"end":100432,"inode":{"change":17,"pos":988425}}},"contents":[{"Add":"use crate::output::FileError;"}]}},{"Replacement":{"inode":{"change":17,"pos":988425},"path":"libpijul/src/alive/output.rs","line":8,"ins":{"up_context":[{"change":17,"pos":988685}],"down_context":[{"change":17,"pos":988740}],"flag":"","start":100433,"end":100434,"inode":{"change":17,"pos":988425}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":988685},"to":{"change":17,"start":988685,"end":988740},"introduced_by":17}],"inode":{"change":17,"pos":988425}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":"// org id 83qmEYXouVuMdaYiRx+rqfb1HtaYFvovt7XmeQIpuuI=\n"}]}},{"Edit":{"inode":{"change":17,"pos":988425},"path":"libpijul/src/alive/output.rs","line":15,"atom":{"NewVertex":{"up_context":[{"change":17,"pos":988843}],"down_context":[{"change":17,"pos":988843}],"flag":"","start":100435,"end":100436,"inode":{"change":17,"pos":988425}}},"contents":[{"Add":""}]}},{"Replacement":{"inode":{"change":17,"pos":988425},"path":"libpijul/src/alive/output.rs","line":24,"ins":{"up_context":[{"change":17,"pos":989052}],"down_context":[{"change":17,"pos":989085}],"flag":"","start":100437,"end":100476,"inode":{"change":17,"pos":988425}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":989052},"to":{"change":17,"start":989052,"end":989085},"introduced_by":17}],"inode":{"change":17,"pos":988425}},"ins_contents":[{"Add":") -> Result<(), FileError> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Edit":{"inode":{"change":17,"pos":988425},"path":"libpijul/src/alive/output.rs","line":32,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":989290},"to":{"change":17,"start":989290,"end":989353},"introduced_by":17}],"inode":{"change":17,"pos":988425}}},"contents":[{"Del":" // org id OQlVwkimOiJb/Ruz+/oEO0Pz1khIxRkvwN+/W8om9Nc=\n"}]}},{"Edit":{"inode":{"change":17,"pos":988425},"path":"libpijul/src/alive/output.rs","line":34,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":989451},"to":{"change":17,"start":989451,"end":989518},"introduced_by":17}],"inode":{"change":17,"pos":988425}}},"contents":[{"Del":" // org id roGnEVojWYAOJ0zF3ObAAA8Kuqfjs3on9NNRV0mgRIc=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":988425},"path":"libpijul/src/alive/output.rs","line":50,"ins":{"up_context":[{"change":17,"pos":990056}],"down_context":[{"change":17,"pos":990119}],"flag":"","start":100477,"end":100478,"inode":{"change":17,"pos":988425}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":990056},"to":{"change":17,"start":990056,"end":990119},"introduced_by":17}],"inode":{"change":17,"pos":988425}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":" // org id GmZmOnTyQotgknRlrewBJc6+O1mQfhuF2lNOYlgkys4=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":988425},"path":"libpijul/src/alive/output.rs","line":77,"ins":{"up_context":[{"change":17,"pos":991141}],"down_context":[{"change":17,"pos":991204}],"flag":"","start":100479,"end":100480,"inode":{"change":17,"pos":988425}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":991141},"to":{"change":17,"start":991141,"end":991204},"introduced_by":17}],"inode":{"change":17,"pos":988425}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":" // org id TAF52f6cZFJyHIBx5wfYk6RR2l7NG8tOHboIyrGFakc=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":988425},"path":"libpijul/src/alive/output.rs","line":89,"ins":{"up_context":[{"change":17,"pos":991435}],"down_context":[{"change":17,"pos":991490}],"flag":"","start":100481,"end":100482,"inode":{"change":17,"pos":988425}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":991435},"to":{"change":17,"start":991435,"end":991490},"introduced_by":17}],"inode":{"change":17,"pos":988425}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":"// org id U/M8FDWU06DAEBXf7bvPvuN33e6GPJLmgvUK84CFuJg=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":988425},"path":"libpijul/src/alive/output.rs","line":131,"ins":{"up_context":[{"change":17,"pos":992880}],"down_context":[{"change":17,"pos":992935}],"flag":"","start":100483,"end":100484,"inode":{"change":17,"pos":988425}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":992880},"to":{"change":17,"start":992880,"end":992935},"introduced_by":17}],"inode":{"change":17,"pos":988425}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":"// org id 4fCwUx872WHp3z4W0/WwwMhX1cFRa2iPigNaXNpaEpA=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":988425},"path":"libpijul/src/alive/output.rs","line":138,"ins":{"up_context":[{"change":17,"pos":993081}],"down_context":[{"change":17,"pos":993114}],"flag":"","start":100485,"end":100524,"inode":{"change":17,"pos":988425}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":993081},"to":{"change":17,"start":993081,"end":993114},"introduced_by":17}],"inode":{"change":17,"pos":988425}},"ins_contents":[{"Add":") -> Result<(), FileError> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":988425},"path":"libpijul/src/alive/output.rs","line":140,"ins":{"up_context":[{"change":17,"pos":993137}],"down_context":[{"change":17,"pos":993175}],"flag":"","start":100525,"end":100564,"inode":{"change":17,"pos":988425}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":993137},"to":{"change":17,"start":993137,"end":993175},"introduced_by":17}],"inode":{"change":17,"pos":988425}},"ins_contents":[{"Add":" vbuf.begin_cyclic_conflict()?;"}],"del_contents":[{"Del":" vbuf.begin_cyclic_conflict()?\n"}]}},{"Edit":{"inode":{"change":17,"pos":988425},"path":"libpijul/src/alive/output.rs","line":151,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":993466},"to":{"change":17,"start":993466,"end":993511},"introduced_by":17}],"inode":{"change":17,"pos":988425}}},"contents":[{"Del":" let now = std::time::Instant::now();\n"}]}},{"Replacement":{"inode":{"change":17,"pos":988425},"path":"libpijul/src/alive/output.rs","line":152,"ins":{"up_context":[{"change":17,"pos":993560}],"down_context":[{"change":17,"pos":993652}],"flag":"","start":100565,"end":100888,"inode":{"change":17,"pos":988425}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":993560},"to":{"change":17,"start":993560,"end":993652},"introduced_by":17}],"inode":{"change":17,"pos":988425}},"ins_contents":[{"Add":" let now = std::time::Instant::now();"},{"Add":" let result = changes"},{"Add":" .get_contents(|p| txn.get_external(p), vertex, buf)"},{"Add":" .map(|_| ())"},{"Add":" .map_err(FileError::Changestore);"},{"Add":" crate::TIMERS.lock().unwrap().alive_contents += now.elapsed();"},{"Add":" result"}],"del_contents":[{"Del":" changes.get_contents(|p| txn.get_external(p), vertex, buf)?;\n Ok(())\n"}]}},{"Edit":{"inode":{"change":17,"pos":988425},"path":"libpijul/src/alive/output.rs","line":160,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":993663},"to":{"change":17,"start":993663,"end":993734},"introduced_by":17}],"inode":{"change":17,"pos":988425}}},"contents":[{"Del":" crate::TIMERS.lock().unwrap().alive_contents += now.elapsed();\n"}]}},{"Replacement":{"inode":{"change":17,"pos":988425},"path":"libpijul/src/alive/output.rs","line":176,"ins":{"up_context":[{"change":17,"pos":994226}],"down_context":[{"change":17,"pos":994281}],"flag":"","start":100889,"end":100890,"inode":{"change":17,"pos":988425}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":994226},"to":{"change":17,"start":994226,"end":994281},"introduced_by":17}],"inode":{"change":17,"pos":988425}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":"// org id RA5o6M3qAtAD3/CSapAI6tIWd7yWNmsb/uCKXtvMf6c=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":988425},"path":"libpijul/src/alive/output.rs","line":184,"ins":{"up_context":[{"change":17,"pos":994494}],"down_context":[{"change":17,"pos":994527}],"flag":"","start":100891,"end":100945,"inode":{"change":17,"pos":988425}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":994494},"to":{"change":17,"start":994494,"end":994527},"introduced_by":17}],"inode":{"change":17,"pos":988425}},"ins_contents":[{"Add":") -> Result<(), crate::output::FileError> {"}],"del_contents":[{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Edit":{"inode":{"change":17,"pos":995164},"path":"libpijul/src/alive/mod.rs","line":1,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":995164},"to":{"change":17,"start":995165,"end":995220},"introduced_by":17}],"inode":{"change":17,"pos":995164}}},"contents":[{"Del":"// org id ae+cN7ii/nf6mJV7ygVX+QzaT1iUIKfCuf/x9VMpjjQ=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":995164},"path":"libpijul/src/alive/mod.rs","line":10,"ins":{"up_context":[{"change":17,"pos":995384}],"down_context":[{"change":17,"pos":995439}],"flag":"","start":100946,"end":100947,"inode":{"change":17,"pos":995164}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":995384},"to":{"change":17,"start":995384,"end":995439},"introduced_by":17}],"inode":{"change":17,"pos":995164}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":"// org id ccK061RVWq8mU8p92w938EIRcX5xf53Y/5klJaCYV5c=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":995164},"path":"libpijul/src/alive/mod.rs","line":29,"ins":{"up_context":[{"change":17,"pos":995775}],"down_context":[{"change":17,"pos":995830}],"flag":"","start":100948,"end":100949,"inode":{"change":17,"pos":995164}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":995775},"to":{"change":17,"start":995775,"end":995830},"introduced_by":17}],"inode":{"change":17,"pos":995164}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":"// org id vnQ9DifkEHpAgUd3zjGq5N9u+oBkZGdVua6BJxF9jTg=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":995164},"path":"libpijul/src/alive/mod.rs","line":75,"ins":{"up_context":[{"change":17,"pos":996870}],"down_context":[{"change":17,"pos":996925}],"flag":"","start":100950,"end":100951,"inode":{"change":17,"pos":995164}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":996870},"to":{"change":17,"start":996870,"end":996925},"introduced_by":17}],"inode":{"change":17,"pos":995164}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":"// org id SzNAy0qgvhYjwiibrE05FzjomcwRYrc00kLuPE6TWsA=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":995164},"path":"libpijul/src/alive/mod.rs","line":86,"ins":{"up_context":[{"change":17,"pos":997255}],"down_context":[{"change":17,"pos":997310}],"flag":"","start":100952,"end":100953,"inode":{"change":17,"pos":995164}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":997255},"to":{"change":17,"start":997255,"end":997310},"introduced_by":17}],"inode":{"change":17,"pos":995164}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":"// org id IhdHg3+NO19nL+0XTy56j0KXgReFfEe/3TjQW3vU47s=\n"}]}},{"Edit":{"inode":{"change":17,"pos":995164},"path":"libpijul/src/alive/mod.rs","line":128,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":998481},"to":{"change":17,"start":998481,"end":998536},"introduced_by":17}],"inode":{"change":17,"pos":995164}}},"contents":[{"Del":"// org id YjNtUksz6F4FDjsnoWIdFtsnyqrhhwGB81kMPoQh1y0=\n"}]}},{"Edit":{"inode":{"change":17,"pos":1000429},"path":"libpijul/src/alive/dfs.rs","line":1,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1000429},"to":{"change":17,"start":1000430,"end":1000485},"introduced_by":17}],"inode":{"change":17,"pos":1000429}}},"contents":[{"Del":"// org id FN4X/UQj4sOrdr1L/34stLjMnN7aRX6dGB8ovnXm4g4=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":1000429},"path":"libpijul/src/alive/dfs.rs","line":5,"ins":{"up_context":[{"change":17,"pos":1000599}],"down_context":[{"change":17,"pos":1000654}],"flag":"","start":100954,"end":100955,"inode":{"change":17,"pos":1000429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1000599},"to":{"change":17,"start":1000599,"end":1000654},"introduced_by":17}],"inode":{"change":17,"pos":1000429}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":"// org id a6g8r8xMc72herurxBoGK09TlqlNFesqMxOlGye7+wU=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":1000429},"path":"libpijul/src/alive/dfs.rs","line":28,"ins":{"up_context":[{"change":17,"pos":1001042}],"down_context":[{"change":17,"pos":1001097}],"flag":"","start":100956,"end":100957,"inode":{"change":17,"pos":1000429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1001042},"to":{"change":17,"start":1001042,"end":1001097},"introduced_by":17}],"inode":{"change":17,"pos":1000429}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":"// org id Evvo1XwskiRIPyqRTa8pr3UJx6bL0a0ky0UqCjDbj7k=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":1000429},"path":"libpijul/src/alive/dfs.rs","line":48,"ins":{"up_context":[{"change":17,"pos":1001397}],"down_context":[{"change":17,"pos":1001452}],"flag":"","start":100958,"end":100959,"inode":{"change":17,"pos":1000429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1001397},"to":{"change":17,"start":1001397,"end":1001452},"introduced_by":17}],"inode":{"change":17,"pos":1000429}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":"// org id rs9ua+JLr5uzyFxLi79zXVVGmVsbPAbn4+J7Pz+itfQ=\n"}]}},{"Edit":{"inode":{"change":17,"pos":1000429},"path":"libpijul/src/alive/dfs.rs","line":52,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1001502},"to":{"change":17,"start":1001502,"end":1001561},"introduced_by":17}],"inode":{"change":17,"pos":1000429}}},"contents":[{"Del":" // org id 1jLjvnQC+CzGcbSN/yGdM+O7tiu5ytCDkvQ7ddM/K8s=\n"}]}},{"Edit":{"inode":{"change":17,"pos":1000429},"path":"libpijul/src/alive/dfs.rs","line":53,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1001602},"to":{"change":17,"start":1001602,"end":1001661},"introduced_by":17}],"inode":{"change":17,"pos":1000429}}},"contents":[{"Del":" // org id ops5Ku702mQyuAsCratzGLyafN90+9XdMoqHYonqqiY=\n"}]}},{"Edit":{"inode":{"change":17,"pos":1000429},"path":"libpijul/src/alive/dfs.rs","line":54,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1001685},"to":{"change":17,"start":1001685,"end":1001744},"introduced_by":17}],"inode":{"change":17,"pos":1000429}}},"contents":[{"Del":" // org id I6sttXHyuv42p25LtpQ6rm+GHXz6XX3RSkXdPtw++rs=\n"}]}},{"Edit":{"inode":{"change":17,"pos":1000429},"path":"libpijul/src/alive/dfs.rs","line":55,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1001773},"to":{"change":17,"start":1001773,"end":1001832},"introduced_by":17}],"inode":{"change":17,"pos":1000429}}},"contents":[{"Del":" // org id tLdXR6Nj0fAJXI2MuYhja197v7oPjfGj5UsZwSsPFfc=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":1000429},"path":"libpijul/src/alive/dfs.rs","line":57,"ins":{"up_context":[{"change":17,"pos":1001864}],"down_context":[{"change":17,"pos":1001919}],"flag":"","start":100960,"end":100961,"inode":{"change":17,"pos":1000429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1001864},"to":{"change":17,"start":1001864,"end":1001919},"introduced_by":17}],"inode":{"change":17,"pos":1000429}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":"// org id ZKZCQZOOiAuzQ2hplUivR12avMGPrw2HbcBPp1dM96U=\n"}]}},{"Edit":{"inode":{"change":17,"pos":1000429},"path":"libpijul/src/alive/dfs.rs","line":148,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1004414},"to":{"change":17,"start":1004414,"end":1004477},"introduced_by":17}],"inode":{"change":17,"pos":1000429}}},"contents":[{"Del":" // org id fTBj4yfBA4uziK5nATQHePJ03VSVY5lNtqx3jpU4djc=\n"}]}},{"Edit":{"inode":{"change":17,"pos":1000429},"path":"libpijul/src/alive/dfs.rs","line":156,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1004833},"to":{"change":17,"start":1004833,"end":1004900},"introduced_by":17}],"inode":{"change":17,"pos":1000429}}},"contents":[{"Del":" // org id GWpsS0aAAfDTvTAz0PS0OxCQeAXMwg/YHlEzPlHN6OA=\n"}]}},{"Edit":{"inode":{"change":17,"pos":1000429},"path":"libpijul/src/alive/dfs.rs","line":185,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1006337},"to":{"change":17,"start":1006337,"end":1006404},"introduced_by":17}],"inode":{"change":17,"pos":1000429}}},"contents":[{"Del":" // org id +IS4jNPNEDK5HDBm4U7DLoNFfhwvHzn40JAm4tKnBHk=\n"}]}},{"Edit":{"inode":{"change":17,"pos":1000429},"path":"libpijul/src/alive/dfs.rs","line":199,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1006964},"to":{"change":17,"start":1006964,"end":1007027},"introduced_by":17}],"inode":{"change":17,"pos":1000429}}},"contents":[{"Del":" // org id FHiJPM0yAi0g9oxzzog93HBlJMVO+zkyPcyOIqCcvwI=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":1000429},"path":"libpijul/src/alive/dfs.rs","line":202,"ins":{"up_context":[{"change":17,"pos":1007094}],"down_context":[{"change":17,"pos":1007149}],"flag":"","start":100962,"end":100963,"inode":{"change":17,"pos":1000429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1007094},"to":{"change":17,"start":1007094,"end":1007149},"introduced_by":17}],"inode":{"change":17,"pos":1000429}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":"// org id iFf2gT1lTCyh5S5G9chCOQSV/yv6LUhW94o0G2+xy8s=\n"}]}},{"Edit":{"inode":{"change":17,"pos":1000429},"path":"libpijul/src/alive/dfs.rs","line":210,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1007315},"to":{"change":17,"start":1007315,"end":1007374},"introduced_by":17}],"inode":{"change":17,"pos":1000429}}},"contents":[{"Del":" // org id +ptaxUWOVF6qdFxwHAnI2hr3kJfCBRh7am0SWZ+zdOg=\n"}]}},{"Edit":{"inode":{"change":17,"pos":1000429},"path":"libpijul/src/alive/dfs.rs","line":213,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1007495},"to":{"change":17,"start":1007495,"end":1007554},"introduced_by":17}],"inode":{"change":17,"pos":1000429}}},"contents":[{"Del":" // org id gf22ooM9FpFRowUF1cPE6ISPMkymBIWZOjPS3Y1ktgQ=\n"}]}},{"Edit":{"inode":{"change":17,"pos":1000429},"path":"libpijul/src/alive/dfs.rs","line":218,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1007703},"to":{"change":17,"start":1007703,"end":1007762},"introduced_by":17}],"inode":{"change":17,"pos":1000429}}},"contents":[{"Del":" // org id I/pQaV+bTryz+byZO/sdFhxqPD1EYTVf6PbC+JNJFTM=\n"}]}},{"Edit":{"inode":{"change":17,"pos":1000429},"path":"libpijul/src/alive/dfs.rs","line":225,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1008050},"to":{"change":17,"start":1008050,"end":1008181},"introduced_by":17}],"inode":{"change":17,"pos":1000429}}},"contents":[{"Del":" // let mut f = std::fs::File::create(\"debug_alive\").unwrap();\n // graph.debug_raw(&mut f).unwrap();\n"}]}},{"Edit":{"inode":{"change":17,"pos":1000429},"path":"libpijul/src/alive/dfs.rs","line":238,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1008690},"to":{"change":17,"start":1008690,"end":1008749},"introduced_by":17}],"inode":{"change":17,"pos":1000429}}},"contents":[{"Del":" // org id tppibf8fu/NgBP2gA4yEeGMCsZjARmQ3FsU1mfY8/VY=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":1000429},"path":"libpijul/src/alive/dfs.rs","line":246,"ins":{"up_context":[{"change":17,"pos":1008973}],"down_context":[{"change":17,"pos":1009028}],"flag":"","start":100964,"end":100965,"inode":{"change":17,"pos":1000429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1008973},"to":{"change":17,"start":1008973,"end":1009028},"introduced_by":17}],"inode":{"change":17,"pos":1000429}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":"// org id PAb27lKMvw3ODopZ9ed0R1+VLBapBvGicfts0Qfgoyk=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":1000429},"path":"libpijul/src/alive/dfs.rs","line":263,"ins":{"up_context":[{"change":17,"pos":1009549}],"down_context":[{"change":17,"pos":1009604}],"flag":"","start":100966,"end":100967,"inode":{"change":17,"pos":1000429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1009549},"to":{"change":17,"start":1009549,"end":1009604},"introduced_by":17}],"inode":{"change":17,"pos":1000429}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":"// org id +EtEUqu55ysMiPbQtSxlpzsP1Ghbgr/qJg/w1dYu0Tw=\n"}]}},{"Edit":{"inode":{"change":17,"pos":1000429},"path":"libpijul/src/alive/dfs.rs","line":273,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1009932},"to":{"change":17,"start":1009932,"end":1009991},"introduced_by":17}],"inode":{"change":17,"pos":1000429}}},"contents":[{"Del":" // org id UnhSWIMI7GsPiN8g1SS8LsKzx++g5mrRn7+M1c+VfV4=\n"}]}},{"Edit":{"inode":{"change":17,"pos":1000429},"path":"libpijul/src/alive/dfs.rs","line":274,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1010050},"to":{"change":17,"start":1010050,"end":1010109},"introduced_by":17}],"inode":{"change":17,"pos":1000429}}},"contents":[{"Del":" // org id Bd49Fx5qUr95VSDjZvf4LiwAmliSU/tlBb1NId/a1H8=\n"}]}},{"Edit":{"inode":{"change":17,"pos":1000429},"path":"libpijul/src/alive/dfs.rs","line":280,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1010253},"to":{"change":17,"start":1010253,"end":1010312},"introduced_by":17}],"inode":{"change":17,"pos":1000429}}},"contents":[{"Del":" // org id Kh9EOwJWoqxbWMdM/TBylYAtuhQKoDTzX9am56rGfAU=\n"}]}},{"Edit":{"inode":{"change":17,"pos":1000429},"path":"libpijul/src/alive/dfs.rs","line":283,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1010446},"to":{"change":17,"start":1010446,"end":1010509},"introduced_by":17}],"inode":{"change":17,"pos":1000429}}},"contents":[{"Del":" // org id eDtZjLZ89YmK+LQZwf0JXAHwC8hahJ+UmZGJJY9FPyw=\n"}]}},{"Edit":{"inode":{"change":17,"pos":1000429},"path":"libpijul/src/alive/dfs.rs","line":293,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1010778},"to":{"change":17,"start":1010778,"end":1010841},"introduced_by":17}],"inode":{"change":17,"pos":1000429}}},"contents":[{"Del":" // org id X+Vkv6E9j5wcfbqV6wd0zJcU5h4pk/xoB0fNy+jTt1w=\n"}]}},{"Edit":{"inode":{"change":17,"pos":1000429},"path":"libpijul/src/alive/dfs.rs","line":300,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1011077},"to":{"change":17,"start":1011077,"end":1011140},"introduced_by":17}],"inode":{"change":17,"pos":1000429}}},"contents":[{"Del":" // org id Jzso6NctQ7yQrJvt+kp4n6+R+C/j21VYuljDPYbovE0=\n"}]}},{"Edit":{"inode":{"change":17,"pos":1000429},"path":"libpijul/src/alive/dfs.rs","line":302,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1011221},"to":{"change":17,"start":1011221,"end":1011280},"introduced_by":17}],"inode":{"change":17,"pos":1000429}}},"contents":[{"Del":" // org id XJWvAQc9UuYzztlyavXZtb9f5v+8Q3s9dKVWBgc9Cnc=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":1000429},"path":"libpijul/src/alive/dfs.rs","line":315,"ins":{"up_context":[{"change":17,"pos":1011573}],"down_context":[{"change":17,"pos":1011628}],"flag":"","start":100968,"end":100969,"inode":{"change":17,"pos":1000429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1011573},"to":{"change":17,"start":1011573,"end":1011628},"introduced_by":17}],"inode":{"change":17,"pos":1000429}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":"// org id 99XChhgQdUuM9P0XMZXaiLSvZkshZYwisljAQKwv5ZA=\n"}]}},{"Edit":{"inode":{"change":17,"pos":1000429},"path":"libpijul/src/alive/dfs.rs","line":327,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1012008},"to":{"change":17,"start":1012008,"end":1012067},"introduced_by":17}],"inode":{"change":17,"pos":1000429}}},"contents":[{"Del":" // org id t4p2vXw81IHi1A61czKB1ySau+YllpLXCs+03dU030Q=\n"}]}},{"Edit":{"inode":{"change":17,"pos":1000429},"path":"libpijul/src/alive/dfs.rs","line":330,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1012236},"to":{"change":17,"start":1012236,"end":1012295},"introduced_by":17}],"inode":{"change":17,"pos":1000429}}},"contents":[{"Del":" // org id XkcQPnFnid03vRjpdNnv8fkp8TtbYYOh0VE3JOtW6xw=\n"}]}},{"Edit":{"inode":{"change":17,"pos":1000429},"path":"libpijul/src/alive/dfs.rs","line":345,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1012726},"to":{"change":17,"start":1012726,"end":1012785},"introduced_by":17}],"inode":{"change":17,"pos":1000429}}},"contents":[{"Del":" // org id qQ8ru9vhgn8xaCAW63XcBxFqrHy0K6dYJZQWCeoXNMA=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":1000429},"path":"libpijul/src/alive/dfs.rs","line":357,"ins":{"up_context":[{"change":17,"pos":1013072}],"down_context":[{"change":17,"pos":1013127}],"flag":"","start":100970,"end":100971,"inode":{"change":17,"pos":1000429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1013072},"to":{"change":17,"start":1013072,"end":1013127},"introduced_by":17}],"inode":{"change":17,"pos":1000429}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":"// org id LsKadSAjaUm19infXAsCqtTnGC1RMQq6d6h3WfZwioo=\n"}]}},{"Edit":{"inode":{"change":17,"pos":1000429},"path":"libpijul/src/alive/dfs.rs","line":374,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1013695},"to":{"change":17,"start":1013695,"end":1013774},"introduced_by":17}],"inode":{"change":17,"pos":1000429}}},"contents":[{"Del":" // org id duMgQ0jpJDLTmJMPqpgkKy6QBJyDJpNZzOsgqHhs/EI=\n"}]}},{"Edit":{"inode":{"change":17,"pos":1014531},"path":"libpijul/src/alive/debug.rs","line":1,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1014531},"to":{"change":17,"start":1014532,"end":1014587},"introduced_by":17}],"inode":{"change":17,"pos":1014531}}},"contents":[{"Del":"// org id rTQeEfoXKaEkHQXFyQtWhOFf2crR1lhKU0pRUjLxfb0=\n"}]}},{"Replacement":{"inode":{"change":17,"pos":1014531},"path":"libpijul/src/alive/debug.rs","line":18,"ins":{"up_context":[{"change":17,"pos":1015080}],"down_context":[{"change":17,"pos":1015117}],"flag":"","start":100972,"end":101010,"inode":{"change":17,"pos":1014531}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1015080},"to":{"change":17,"start":1015080,"end":1015117},"introduced_by":17}],"inode":{"change":17,"pos":1014531}},"ins_contents":[{"Add":" ) -> Result<(), std::io::Error> {"}],"del_contents":[{"Del":" ) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":17,"pos":1014531},"path":"libpijul/src/alive/debug.rs","line":35,"ins":{"up_context":[{"change":17,"pos":1015654}],"down_context":[{"change":17,"pos":1015737}],"flag":"","start":101011,"end":101136,"inode":{"change":17,"pos":1014531}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1015654},"to":{"change":17,"start":1015654,"end":1015737},"introduced_by":17}],"inode":{"change":17,"pos":1014531}},"ins_contents":[{"Add":" changes"},{"Add":" .get_contents(|h| txn.get_external(h), line.vertex, &mut buf)"},{"Add":" .unwrap();"}],"del_contents":[{"Del":" changes.get_contents(|h| txn.get_external(h), line.vertex, &mut buf)?;\n"}]}},{"Replacement":{"inode":{"change":17,"pos":1014531},"path":"libpijul/src/alive/debug.rs","line":136,"ins":{"up_context":[{"change":17,"pos":1019545}],"down_context":[{"change":17,"pos":1019624}],"flag":"","start":101137,"end":101217,"inode":{"change":17,"pos":1014531}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1019545},"to":{"change":17,"start":1019545,"end":1019624},"introduced_by":17}],"inode":{"change":17,"pos":1014531}},"ins_contents":[{"Add":" pub fn debug_raw(&self, mut w: W) -> Result<(), std::io::Error> {"}],"del_contents":[{"Del":" pub fn debug_raw(&self, mut w: W) -> Result<(), anyhow::Error> {\n"}]}},{"Edit":{"inode":{"change":17,"pos":1020742},"path":"libpijul/Cargo.toml","line":99,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":1023083},"to":{"change":17,"start":1023083,"end":1023098},"introduced_by":17}],"inode":{"change":17,"pos":1020742}}},"contents":[{"Del":"anyhow = \"1.0\"\n"}]}},{"Edit":{"inode":{"change":17,"pos":1030385},"path":"Cargo.lock","line":968,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":17,"pos":746},"to":{"change":17,"start":746,"end":757},"introduced_by":17}],"inode":{"change":17,"pos":1030385}}},"contents":[{"Del":" \"anyhow\",\n"}]}}],"owner":"irevoire","repo":"pijul","token":"g76xsM6949UGORmX8wN+ioHDEqqzqKZcEEn750wbUks=","login":null}