{"header":{"message":"Cleanup, formatting, and fixing the Git feature","description":null,"timestamp":"2021-02-25T22:29:27.624349275Z","authors":[{"full_name":"Pierre-Étienne Meunier","name":"pmeunier"}]},"hash":"IIV3EL2XYI2X7HZWKXEXQFAE3R3KC2Q7SGOT3Q332HSENMYVF32QC","authors":[],"deps":{"hashes":[["IIV3EL2XYI2X7HZWKXEXQFAE3R3KC2Q7SGOT3Q332HSENMYVF32QC","Cleanup, formatting, and fixing the Git feature"],["AA",null],["YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","Sanakirja 1.0"],["G65S7FAW4OHBGC6ROVPPZ6PPACKOFEM4KSMAWMYKNQF5OLVDJR2QC","Version bump and cleanup"],["3WIQYEISUMGOL5FY4LCWOJS55CTTQA7WMJZXAE3Q4GQUTBFLAE7QC","Fixing conflicts in Cargo.lock"],["EQLDTLXVCARE36EJE3S6SNEVTW2JJY4EYD36EX7WSIFLG2XMKKQAC","Fixing a bug with empty new files, and another one with empty replacements"],["2BKYJ2JM5PTXWO6HTVBKFQANWWSCJ4UHJYKAXWGTVZB35AZJ76CQC","Fixing a bug introduced by the recent refactoring"],["L2LPPKD4CL7RQFGNJFCRVRBKHUJY7ZIQCLDGPTTOCJB3PVT7CS2AC","Fixing the Git feature"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["SAGSYAPXQ2T6GC3B3TNRPNFTZMS7UMME6YQGSF5MOIM66S5NKB2QC","Various version bumps"],["A3DMBJJAPLS6ASSZ7JVVVULRQNZCF2WKYTRUD7EY7PKVYABSATFAC","Upgrading the `git` subcommand to the latest Sanakirja and Libpijul"],["SN7AGY6SLIWVKLBHQQ2MZ7VYY4BBFKROC5F3M6FVVFIGT25QNX7AC","Making `pijul lock` robust to kill signals"],["BJOZ25EUUCRNS5K4RVPA6Z7C2QEQXZOJDIQR2PGQZQ5ZV544OVQQC","Deterministic Git import"],["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","Upgrading to Sanakirja 0.15 + version bump"],["7A2TSC4PAKK3WOH3DMAJASCEC6D5JLJWNFWJTEEBE4CVS4K76PPQC","Conflict solving code (FOLDER edges)"],["BT2ZHPY4LTECZDNPNLX5IUAEA6CYB4RRBGVBXUNK3ARHMWQK7KHAC","Version bumps"],["NO2QPRFLGCYUDXYJTOY3S3NZJCCLAFOQUHITKDZ7LSZLRLOV5W3QC","Adding rollback test"],["3AMEP2Y5J6GA4AWQONF4JVA3XSR3ASLHHKMYG44R72SOUY3UQCDAC","More convenient interface for channels"],["KUMJITTFBIAA7MFVPE6O7ZKIRSX553JNM72LF3KQJ6U3CXZI6MMQC","Version bump in the lockfiles"],["23LVKATNTT74YKHG7KJM6SBO2IVZEV24TQ46ZJIHQ2IXONWNVXJAC","Use pager crate for log output"],["OCBM7IFE7CL3PM5KPYTRTKTHYKC76NTFK5C4VA4JFAKQUA6GC7FAC","New release: pijul-1.0.0-alpha.8"],["NX5I5H53IWX76GA3MTXTWZXU2HKUDL4ENED7LTGHMPWLHSAHYEAQC","New published versions"],["3M7WBE24JTPTHWQOU5PO2ZJYKPKEH2F6R4M6RWIRFG334PQEA55QC","Re-adding anyhow in the tests of libpijul"],["GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC","Refactoring iterators"],["3S4DR77ZU3XFGGDE6XSCUK6TN76IXNOQIKQSLDBM7KUHNILWHS3QC","Version updates"],["HQ56ADNSNBCCEBNK5PE5ZVBKKBGWY3ATGFWEYPXJKJBJDUJ2XKQQC","Formatting, and version bump"],["YX3VCEOM36NOK6757SD4SZX4FHB7FBAVRKFJH2QFPCYILC4SBRNAC","Version bump"],["XL6Y64UPFLIVRV3YVJMTTMZU7VL6SUXVE6BKL6K7DYRKVJ4X727AC","Fixing a panic when iterating over the basenames of a file"],["CXM5CBS27BL35Z6TRCI7OS4AHWVJ4VFND7HECGAUC74ZQ5KFZXLAC","Fixing `pijul remove` when files are not deleted"],["HSVGP2G4D2F56DS3YKZLSYPS4A5BNGH4NTAXAOZ57OCXFM3E5AYAC","Version bump + formatting"],["CUHXXBDZJRSAQD5USKGQACUQL4O7KYDT2T4SB3USCFO3IKMYKFDQC","Fixing a bug in replacements, recently introduced during a fix of a graph corruption bug"],["3YDPHBANMNSK7Z5SCG745VLTP4BBQWIXCJTQOSDI6UJGYR6S45EQC","address non-controversial clippy lints"],["B5Z4IMEUYAEJPOU5EIAXI7VYZVUM6CWKV7CTSOXK3F4GXTNNMMAAC","Generating Cargo.nix for pijul 1.0.0-alpha.6"],["JL4WKA5PBKXRNAMETYO4I52QKASQ3COYHH2JKGA7W5YLIRZZH53AC","Implement the Sanakirja concurrency model in a cross-process way"],["PJ7T2VFLV5PYG3CV23GC2GIQETXKGC6CO74JBGREV3JC3LG5OXUAC","Do not hang on locked repositories"],["5BRU2RRWOQBMS2V3RQM7PRFR5UILYZ73GISHAKJA6KIZGC5M2MFAC","Cleanup (debugging a crash related to trees/inodes)"],["H23LO7U7MNB5GTLOUIFYAJ6DP57DM3VFBR4IBOAVPMHS356AYFPQC","a few more clippy lints addressed"],["N35L72XV5OWBWMEZBKZIKK5K6RMUYQOKGQEQ62N5NJ5N3UCHHWYQC","Versions in Cargo.lock"],["6RVT5X4LTRP5XHVDESXMIC2DHMT5MUQ24ZDWEBJ4XYTF6LJXK7CAC","Current state: return zero instead of an Option if there is no change on the channel"],["V2MDXX622MAXHXGLX7ERVKGYZVZDCYJIFET3TGGIK455XIADYJUAC","Channel rename: do not leave the old name behind"],["6DOXSHWGKJIMIPFCNLASGKBAJCJMJULW5HFRZAZ67EYSMXXGJ3KAC","Cleanup, and version bump"],["IYJZVLETBAQDDELENH3FX7ZTOC3HY4UJ3AMC3MACW6O7ZCWZTR6AC","Cleaning up the literate programming bits"],["UCQD3JDHULGTUSKWPD3I4FQHA2DX37X7MMHRCOPGQVOT65JWWCIQC","Fix build errors caused by sanakirja 0.14"],["SPA2OL5ITFMLB5P2WL342QAU2FXPKSFS4XHAMW6HYWOGSGLO2MJAC","keep-changes feature (default) to avoid deleting problematic changes"],["I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","Massive cleanup, and simplification"],["G6YZ7U65AW42M4RSWPXOCJH62XZ5OKVGOQ2UEB6SBNKNJEWYBAEQC","Version bump"],["CCFJ7VO3I73FE3MZRS5RSDRYNZVW7AXC345P4BXS7JIL2TU3LQJQC","Renaming \"Record\" to \"Hunk\" in the changes"],["WKX5S4Z4DOB5S6A6X5V6ECZFCHQUMWRGX5XT4FBOG57P6HPWK7CAC","remove unneccesary explicit lifetimes"],["B3QWIGDERNMB3M6P5WTWP5CN2DB3KCS7MVTEPC2XVJ237ZXVQGMAC","Fixing the Git features with the latest Pijul (+ conflicts in Cargo.toml)"],["65S67T3EKKLFRBCU73Z542V7A4JSMGP37OJINON6N563UIBQAITAC","Parsing \\\\ for empty additions (rare problem)"],["Q45QHPO4HDTEZF2W4UDZSYYQ46BPEIWSW4GJILZR5HTJNLKXJABQC","Feedback on network stuff"],["GMGTWOWOPYCGOD3QEQAF5PSQVZWURAIVU6S6URXNHDAGQSC4P3EAC","Fixing a corruption error in channel rename (the channel was being deallocated in Sanakirja, but still referenced by the transaction)"],["H565UUPCG3M3BQNQPC4DUYJN2GO3DYTODYSHQYIZ2FT6JVSHBE3AC","Use correct pattern for workspace interdependencies"],["HKEOO4QJ5EACX37IJG76GEUMNSZMFW4VRKA4IVBCGR52ZQSYTN6QC","Version bump"],["VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","Removing anyhow in libpijul"],["5YDI33C4QRHATA6H3HHMBYFOBLAMXLLHWSDGJAH57DR6AMWO7AAQC","Fixing pager on OSX"],["HW5Q7GGYDMCQQYDBFLDAWCTNQQMIQHJ77UOSPN5BHMSD3KMO2O3AC","Version bump"],["UFCZKKLXVYQYQBYENCAFHY3ZPPSDAJJAIREZSYNQM4QNXV6G6RXAC","Upgrading to the latest Sanakirja/Rand"],["XWETQ4DE4KL2GQWSEBE5NENLTSLIDF7RIWOCCVWJFQOVQJE5P33AC","Upgrading versions"],["6YMDOZIB5LVYLFIDGN2WNT5JTHEAMS4TFPVDEZ3OWXWOKJOC5QDAC","Refactoring apply"],["HR3WK6A7KKILCHI2CD2BZSZQJUS44MJIT2K3WPKJBHUXGRKAQDRQC","When lock times out, check that there are no more clients before quitting"],["R3H7D42UZ446V5TO2574BMAQQAYYJPEIMSZVDPAGVIYU2COJSWBAC","Debugging `pijul git`: proper error reporting"],["BZSC7VMYSFRXDHDDAMCDR6X67FN5VWIBOSE76BQLX7OCVOJFUA3AC","address clippy lints"],["OUWD436ATBTZJR53B6XDSI5SXRRNZV7YGRUEA5ACHZC2RUDP7G5QC","Version bump"],["ZAEUSICJC3YOWGF6NZEQCQ34PHPRSBCJEP7FIWE6VIWJGVU734HQC","File deletions were not shown with their names in the metadata during record"],["CT6FBU57Y4NOFK3ABLTYMXJNW67EJ6MG53FRMPIVXTR7GTRU4HXQC","SDPX license + version bump"],["VYHHOEYHO67JNJEODX5L3CQFIV3DAXZBBIQUOMCWJDYF3VWICDNQC","Versions and formatting"],["WI5BS6BSRA7T3BCDF6EGB2JZHTZRX4SLT5EG4D67PVRBTZH5YIXAC","New published versions"],["ZQXP3HNAQ3LKXJVLEO63OEGZIEVNHUQUW3NT7JLCB25OCAZ5ZVIQC","Version bump"],["WZVCLZKY34KQBQU6YBGJLQCDADBQ67LQVDNRVCMQVY3O3C3EIWSQC","address clippy lints"],["WIORLB47KYY5ZDKSAQEQ5NV2J3F3RIO5FVGD6LGF73FD5LWJLUAAC","Version bump"],["JRENVH5DF2F4SOV7UNJENFA7VDI3H63XK76R3LFZK6QCW7JIBLSQC","Reqwest 0.11"],["BXD3IQYNMKMI5BTANCF6NZHZP4CKPWADGJMBT2R3WTMKVKONT5QAC","Fixing --features git"],["7MNTFTDF62XHPRL56GJLTGRVB6QOLYDRYGY2XOKDO745RXOCBB4QC","Exit with an error when a change could not be signed"],["XAY4DYRRPDEQY7XUWJ3OWSXPCEPZ6VFQ6273JPLE3FEGJQAGV6YQC","Version bump"],["TPEH2XNBS5RO4IEVKENVF6P65AH7IX64KK2JAYMSJT3J5GXO67EAC","1.0.0-alpha.28, with Tokio 1.0"],["QMTANHVNRPQ5IX66FYQBFRBDCTN6YKMNCO6OHTQ6QCUASPWWXJKAC","Reset: only output changed files"],["ZTVNGFNTYSZKPNWG7PGXTWVXKUM4KL2NKEUSMCUQYLCE4CYA6RVQC","Version bump"],["JACZWIJ6UEL5HWZRNOOXTFXUEG67XJDPC5D72LYUPCVVJ6WB7JQAC","Version bump"]],"deps":["YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","G65S7FAW4OHBGC6ROVPPZ6PPACKOFEM4KSMAWMYKNQF5OLVDJR2QC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","3S4DR77ZU3XFGGDE6XSCUK6TN76IXNOQIKQSLDBM7KUHNILWHS3QC","XWETQ4DE4KL2GQWSEBE5NENLTSLIDF7RIWOCCVWJFQOVQJE5P33AC","OUWD436ATBTZJR53B6XDSI5SXRRNZV7YGRUEA5ACHZC2RUDP7G5QC","PJ7T2VFLV5PYG3CV23GC2GIQETXKGC6CO74JBGREV3JC3LG5OXUAC","UCQD3JDHULGTUSKWPD3I4FQHA2DX37X7MMHRCOPGQVOT65JWWCIQC","NX5I5H53IWX76GA3MTXTWZXU2HKUDL4ENED7LTGHMPWLHSAHYEAQC","B5Z4IMEUYAEJPOU5EIAXI7VYZVUM6CWKV7CTSOXK3F4GXTNNMMAAC","23LVKATNTT74YKHG7KJM6SBO2IVZEV24TQ46ZJIHQ2IXONWNVXJAC","3WIQYEISUMGOL5FY4LCWOJS55CTTQA7WMJZXAE3Q4GQUTBFLAE7QC","I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","WI5BS6BSRA7T3BCDF6EGB2JZHTZRX4SLT5EG4D67PVRBTZH5YIXAC","BXD3IQYNMKMI5BTANCF6NZHZP4CKPWADGJMBT2R3WTMKVKONT5QAC","N35L72XV5OWBWMEZBKZIKK5K6RMUYQOKGQEQ62N5NJ5N3UCHHWYQC","OCBM7IFE7CL3PM5KPYTRTKTHYKC76NTFK5C4VA4JFAKQUA6GC7FAC","Q45QHPO4HDTEZF2W4UDZSYYQ46BPEIWSW4GJILZR5HTJNLKXJABQC","R3H7D42UZ446V5TO2574BMAQQAYYJPEIMSZVDPAGVIYU2COJSWBAC","5BRU2RRWOQBMS2V3RQM7PRFR5UILYZ73GISHAKJA6KIZGC5M2MFAC","BJOZ25EUUCRNS5K4RVPA6Z7C2QEQXZOJDIQR2PGQZQ5ZV544OVQQC","SAGSYAPXQ2T6GC3B3TNRPNFTZMS7UMME6YQGSF5MOIM66S5NKB2QC","WIORLB47KYY5ZDKSAQEQ5NV2J3F3RIO5FVGD6LGF73FD5LWJLUAAC","BT2ZHPY4LTECZDNPNLX5IUAEA6CYB4RRBGVBXUNK3ARHMWQK7KHAC","V2MDXX622MAXHXGLX7ERVKGYZVZDCYJIFET3TGGIK455XIADYJUAC","3YDPHBANMNSK7Z5SCG745VLTP4BBQWIXCJTQOSDI6UJGYR6S45EQC","H23LO7U7MNB5GTLOUIFYAJ6DP57DM3VFBR4IBOAVPMHS356AYFPQC","BZSC7VMYSFRXDHDDAMCDR6X67FN5VWIBOSE76BQLX7OCVOJFUA3AC","WZVCLZKY34KQBQU6YBGJLQCDADBQ67LQVDNRVCMQVY3O3C3EIWSQC","7A2TSC4PAKK3WOH3DMAJASCEC6D5JLJWNFWJTEEBE4CVS4K76PPQC","WKX5S4Z4DOB5S6A6X5V6ECZFCHQUMWRGX5XT4FBOG57P6HPWK7CAC","G6YZ7U65AW42M4RSWPXOCJH62XZ5OKVGOQ2UEB6SBNKNJEWYBAEQC","VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","JACZWIJ6UEL5HWZRNOOXTFXUEG67XJDPC5D72LYUPCVVJ6WB7JQAC","XL6Y64UPFLIVRV3YVJMTTMZU7VL6SUXVE6BKL6K7DYRKVJ4X727AC","GMGTWOWOPYCGOD3QEQAF5PSQVZWURAIVU6S6URXNHDAGQSC4P3EAC","3M7WBE24JTPTHWQOU5PO2ZJYKPKEH2F6R4M6RWIRFG334PQEA55QC","XAY4DYRRPDEQY7XUWJ3OWSXPCEPZ6VFQ6273JPLE3FEGJQAGV6YQC","65S67T3EKKLFRBCU73Z542V7A4JSMGP37OJINON6N563UIBQAITAC","SPA2OL5ITFMLB5P2WL342QAU2FXPKSFS4XHAMW6HYWOGSGLO2MJAC","6RVT5X4LTRP5XHVDESXMIC2DHMT5MUQ24ZDWEBJ4XYTF6LJXK7CAC","IYJZVLETBAQDDELENH3FX7ZTOC3HY4UJ3AMC3MACW6O7ZCWZTR6AC","ZTVNGFNTYSZKPNWG7PGXTWVXKUM4KL2NKEUSMCUQYLCE4CYA6RVQC","YX3VCEOM36NOK6757SD4SZX4FHB7FBAVRKFJH2QFPCYILC4SBRNAC","5YDI33C4QRHATA6H3HHMBYFOBLAMXLLHWSDGJAH57DR6AMWO7AAQC","UFCZKKLXVYQYQBYENCAFHY3ZPPSDAJJAIREZSYNQM4QNXV6G6RXAC","6DOXSHWGKJIMIPFCNLASGKBAJCJMJULW5HFRZAZ67EYSMXXGJ3KAC","6YMDOZIB5LVYLFIDGN2WNT5JTHEAMS4TFPVDEZ3OWXWOKJOC5QDAC","CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","ZAEUSICJC3YOWGF6NZEQCQ34PHPRSBCJEP7FIWE6VIWJGVU734HQC","GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC","TPEH2XNBS5RO4IEVKENVF6P65AH7IX64KK2JAYMSJT3J5GXO67EAC","KUMJITTFBIAA7MFVPE6O7ZKIRSX553JNM72LF3KQJ6U3CXZI6MMQC","ZQXP3HNAQ3LKXJVLEO63OEGZIEVNHUQUW3NT7JLCB25OCAZ5ZVIQC","NO2QPRFLGCYUDXYJTOY3S3NZJCCLAFOQUHITKDZ7LSZLRLOV5W3QC","CT6FBU57Y4NOFK3ABLTYMXJNW67EJ6MG53FRMPIVXTR7GTRU4HXQC","A3DMBJJAPLS6ASSZ7JVVVULRQNZCF2WKYTRUD7EY7PKVYABSATFAC","H565UUPCG3M3BQNQPC4DUYJN2GO3DYTODYSHQYIZ2FT6JVSHBE3AC","B3QWIGDERNMB3M6P5WTWP5CN2DB3KCS7MVTEPC2XVJ237ZXVQGMAC","2BKYJ2JM5PTXWO6HTVBKFQANWWSCJ4UHJYKAXWGTVZB35AZJ76CQC","JRENVH5DF2F4SOV7UNJENFA7VDI3H63XK76R3LFZK6QCW7JIBLSQC","HKEOO4QJ5EACX37IJG76GEUMNSZMFW4VRKA4IVBCGR52ZQSYTN6QC","CCFJ7VO3I73FE3MZRS5RSDRYNZVW7AXC345P4BXS7JIL2TU3LQJQC","QMTANHVNRPQ5IX66FYQBFRBDCTN6YKMNCO6OHTQ6QCUASPWWXJKAC","CXM5CBS27BL35Z6TRCI7OS4AHWVJ4VFND7HECGAUC74ZQ5KFZXLAC","3AMEP2Y5J6GA4AWQONF4JVA3XSR3ASLHHKMYG44R72SOUY3UQCDAC","VYHHOEYHO67JNJEODX5L3CQFIV3DAXZBBIQUOMCWJDYF3VWICDNQC","HW5Q7GGYDMCQQYDBFLDAWCTNQQMIQHJ77UOSPN5BHMSD3KMO2O3AC","L2LPPKD4CL7RQFGNJFCRVRBKHUJY7ZIQCLDGPTTOCJB3PVT7CS2AC","JL4WKA5PBKXRNAMETYO4I52QKASQ3COYHH2JKGA7W5YLIRZZH53AC","SN7AGY6SLIWVKLBHQQ2MZ7VYY4BBFKROC5F3M6FVVFIGT25QNX7AC","HSVGP2G4D2F56DS3YKZLSYPS4A5BNGH4NTAXAOZ57OCXFM3E5AYAC","HR3WK6A7KKILCHI2CD2BZSZQJUS44MJIT2K3WPKJBHUXGRKAQDRQC","7MNTFTDF62XHPRL56GJLTGRVB6QOLYDRYGY2XOKDO745RXOCBB4QC","HQ56ADNSNBCCEBNK5PE5ZVBKKBGWY3ATGFWEYPXJKJBJDUJ2XKQQC","CUHXXBDZJRSAQD5USKGQACUQL4O7KYDT2T4SB3USCFO3IKMYKFDQC","EQLDTLXVCARE36EJE3S6SNEVTW2JJY4EYD36EX7WSIFLG2XMKKQAC"]},"hunks":[{"Replacement":{"inode":{"change":4,"pos":445},"path":"pijul-macros/src/lib.rs","line":177,"ins":{"up_context":[{"change":4,"pos":6112}],"down_context":[{"change":4,"pos":6151}],"flag":"BLOCK","start":0,"end":39,"inode":{"change":4,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":6112},"to":{"change":2,"start":2306,"end":2377},"introduced_by":2}],"inode":{"change":4,"pos":445}},"ins_contents":[{"Add":" Some(e) => result.push(e),"}],"del_contents":[{"Del":" Some(e) => {\n result.push(e)\n },\n"}]}},{"Replacement":{"inode":{"change":4,"pos":21011},"path":"pijul-macros/Cargo.toml","line":4,"ins":{"up_context":[{"change":4,"pos":21091}],"down_context":[{"change":4,"pos":21109}],"flag":"BLOCK","start":40,"end":58,"inode":{"change":4,"pos":21011}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":21091},"to":{"change":3,"start":0,"end":18},"introduced_by":3}],"inode":{"change":4,"pos":21011}},"ins_contents":[{"Add":"version = \"0.3.0\""}],"del_contents":[{"Del":"version = \"0.4.0\"\n"}]}},{"Edit":{"inode":{"change":4,"pos":101759},"path":"pijul/src/commands/record.rs","line":148,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":105115},"to":{"change":2,"start":10167,"end":10252},"introduced_by":2}],"inode":{"change":4,"pos":101759}}},"contents":[{"Del":" ::sanakirja::debug::debug(&txn.txn, &[&txn.internal], \"internal\", true);\n"}]}},{"Edit":{"inode":{"change":4,"pos":133619},"path":"pijul/src/commands/mod.rs","line":54,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":134253}],"down_context":[{"change":4,"pos":134253}],"flag":"BLOCK","start":59,"end":91,"inode":{"change":4,"pos":133619}}},"contents":[{"Add":"// mod tag;"},{"Add":"// pub use tag::*;"},{"Add":""}]}},{"Edit":{"inode":{"change":4,"pos":137210},"path":"pijul/src/commands/git.rs","line":36,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":138034}],"down_context":[{"change":4,"pos":138034}],"flag":"BLOCK","start":92,"end":252,"inode":{"change":4,"pos":137210}}},"contents":[{"Add":"#[derive(Debug, Clone, PartialOrd, Ord, PartialEq, Eq)]"},{"Add":"struct Oid(git2::Oid);"},{"Add":""},{"Add":"use ::sanakirja::{Storable, UnsizedStorable};"},{"Add":""},{"Add":"::sanakirja::direct_repr!(Oid);"},{"Add":""}]}},{"Replacement":{"inode":{"change":4,"pos":137210},"path":"pijul/src/commands/git.rs","line":57,"ins":{"up_context":[{"change":4,"pos":138584}],"down_context":[{"change":4,"pos":138654}],"flag":"BLOCK","start":253,"end":326,"inode":{"change":4,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":138584},"to":{"change":4,"start":138584,"end":138654},"introduced_by":4}],"inode":{"change":4,"pos":137210}},"ins_contents":[{"Add":" let mut env_git = ::sanakirja::Env::new(&path_git, 1 << 15, 2)?;"}],"del_contents":[{"Del":" let mut env_git = ::sanakirja::Env::new(&path_git, 1 << 15)?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":137210},"path":"pijul/src/commands/git.rs","line":91,"ins":{"up_context":[{"change":4,"pos":139643}],"down_context":[{"change":4,"pos":139683}],"flag":"BLOCK","start":327,"end":367,"inode":{"change":4,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":139643},"to":{"change":4,"start":0,"end":64},"introduced_by":4}],"inode":{"change":4,"pos":137210}},"ins_contents":[{"Add":" env_git: &mut ::sanakirja::Env,"}],"del_contents":[{"Del":" env_git: &mut ::sanakirja::Env<::sanakirja::Exclusive>,\n"}]}},{"Edit":{"inode":{"change":4,"pos":137210},"path":"pijul/src/commands/git.rs","line":93,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":139722},"to":{"change":4,"start":139722,"end":139760},"introduced_by":4}],"inode":{"change":4,"pos":137210}}},"contents":[{"Del":" use ::sanakirja::Transaction;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":137210},"path":"pijul/src/commands/git.rs","line":102,"ins":{"up_context":[{"change":4,"pos":140110}],"down_context":[{"change":4,"pos":45}],"flag":"BLOCK","start":368,"end":654,"inode":{"change":4,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":140110},"to":{"change":4,"start":3510,"end":3685},"introduced_by":4}],"inode":{"change":4,"pos":137210}},"ins_contents":[{"Add":" let db: ::sanakirja::btree::UDb ="},{"Add":" if let Some(db) = txn_git.root(0) {"},{"Add":" ::sanakirja::btree::UDb::from_page(db)"},{"Add":" } else {"},{"Add":" ::sanakirja::btree::create_db_(&mut txn_git)?"},{"Add":" };"}],"del_contents":[{"Del":" let db: ::sanakirja::Db = if let Some(db) = txn_git.root(0) {\n db\n } else {\n txn_git.create_db()?\n };\n"}]}},{"Replacement":{"inode":{"change":4,"pos":137210},"path":"pijul/src/commands/git.rs","line":109,"ins":{"up_context":[{"change":4,"pos":86}],"down_context":[{"change":4,"pos":63}],"flag":"BLOCK","start":655,"end":721,"inode":{"change":4,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":86},"to":{"change":4,"start":19,"end":63},"introduced_by":4}],"inode":{"change":4,"pos":137210}},"ins_contents":[{"Add":" for x in ::sanakirja::btree::iter(&txn_git, &db, None)? {"}],"del_contents":[{"Del":" for x in txn_git.iter(&db, None)? {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":137210},"path":"pijul/src/commands/git.rs","line":111,"ins":{"up_context":[{"change":4,"pos":100}],"down_context":[{"change":4,"pos":140459}],"flag":"BLOCK","start":722,"end":770,"inode":{"change":4,"pos":137210}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":100},"to":{"change":4,"start":140419,"end":140459},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":140419},"to":{"change":4,"start":140419,"end":140459},"introduced_by":4}],"inode":{"change":4,"pos":137210}},"ins_contents":[{"Add":" state.insert(commit, merk.clone());"}],"del_contents":[{"Del":" state.insert(commit, merk);\n"}]}},{"Replacement":{"inode":{"change":4,"pos":137210},"path":"pijul/src/commands/git.rs","line":115,"ins":{"up_context":[{"change":4,"pos":140555}],"down_context":[{"change":4,"pos":140674}],"flag":"BLOCK","start":771,"end":901,"inode":{"change":4,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":140555},"to":{"change":4,"start":140555,"end":140674},"introduced_by":4}],"inode":{"change":4,"pos":137210}},"ins_contents":[{"Add":" if let Some(state) = state.get(&Oid(commit.id())) {"},{"Add":" dag.root.push((commit.id(), Some(state.into())));"}],"del_contents":[{"Del":" if let Some(state) = state.get(&commit.id()) {\n dag.root.push((commit.id(), Some(*state)));\n"}]}},{"Replacement":{"inode":{"change":4,"pos":137210},"path":"pijul/src/commands/git.rs","line":139,"ins":{"up_context":[{"change":4,"pos":141382}],"down_context":[{"change":4,"pos":141415}],"flag":"BLOCK","start":902,"end":938,"inode":{"change":4,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":141382},"to":{"change":4,"start":141382,"end":141415},"introduced_by":4}],"inode":{"change":4,"pos":137210}},"ins_contents":[{"Add":" txn_git.set_root(0, db.db);"}],"del_contents":[{"Del":" txn_git.set_root(0, db);\n"}]}},{"Replacement":{"inode":{"change":4,"pos":137210},"path":"pijul/src/commands/git.rs","line":228,"ins":{"up_context":[{"change":4,"pos":143869}],"down_context":[{"change":4,"pos":143905}],"flag":"BLOCK","start":939,"end":975,"inode":{"change":4,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":143869},"to":{"change":4,"start":65,"end":125},"introduced_by":4}],"inode":{"change":4,"pos":137210}},"ins_contents":[{"Add":" env_git: &mut ::sanakirja::Env,"}],"del_contents":[{"Del":" env_git: &mut ::sanakirja::Env<::sanakirja::Exclusive>,\n"}]}},{"Replacement":{"inode":{"change":4,"pos":137210},"path":"pijul/src/commands/git.rs","line":240,"ins":{"up_context":[{"change":4,"pos":162}],"down_context":[{"change":4,"pos":163}],"flag":"BLOCK","start":976,"end":1005,"inode":{"change":4,"pos":137210}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":162},"to":{"change":4,"start":144297,"end":144337},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":144297},"to":{"change":4,"start":144297,"end":144337},"introduced_by":4}],"inode":{"change":4,"pos":137210}},"ins_contents":[{"Add":" let (_, p) = txn"}],"del_contents":[{"Del":" let (_, (_, merkle_)) = txn\n"}]}},{"Edit":{"inode":{"change":4,"pos":137210},"path":"pijul/src/commands/git.rs","line":244,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":256}],"down_context":[{"change":4,"pos":144447}],"flag":"BLOCK","start":1006,"end":1065,"inode":{"change":4,"pos":137210}}},"contents":[{"Add":" let merkle_: libpijul::Merkle = (&p.b).into();"}]}},{"Edit":{"inode":{"change":4,"pos":137210},"path":"pijul/src/commands/git.rs","line":320,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":147539},"to":{"change":4,"start":14525,"end":14569},"introduced_by":4}],"inode":{"change":4,"pos":137210}}},"contents":[{"Del":" repo.repo.lock.commit().await?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":137210},"path":"pijul/src/commands/git.rs","line":327,"ins":{"up_context":[{"change":4,"pos":147614}],"down_context":[{"change":4,"pos":147646}],"flag":"BLOCK","start":1066,"end":1098,"inode":{"change":4,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":147614},"to":{"change":4,"start":126,"end":182},"introduced_by":4}],"inode":{"change":4,"pos":137210}},"ins_contents":[{"Add":" git: &mut ::sanakirja::Env,"}],"del_contents":[{"Del":" git: &mut ::sanakirja::Env<::sanakirja::Exclusive>,\n"}]}},{"Replacement":{"inode":{"change":4,"pos":137210},"path":"pijul/src/commands/git.rs","line":331,"ins":{"up_context":[{"change":4,"pos":147739}],"down_context":[{"change":4,"pos":147783}],"flag":"BLOCK","start":1099,"end":1128,"inode":{"change":4,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":147739},"to":{"change":4,"start":147739,"end":147783},"introduced_by":4}],"inode":{"change":4,"pos":137210}},"ins_contents":[{"Add":" use ::sanakirja::Commit;"}],"del_contents":[{"Del":" use ::sanakirja::{Commit, Transaction};\n"}]}},{"Replacement":{"inode":{"change":4,"pos":137210},"path":"pijul/src/commands/git.rs","line":333,"ins":{"up_context":[{"change":4,"pos":147840}],"down_context":[{"change":4,"pos":148111}],"flag":"BLOCK","start":1129,"end":1491,"inode":{"change":4,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":147840},"to":{"change":4,"start":3716,"end":3867},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":3867},"to":{"change":4,"start":148025,"end":148111},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":148025},"to":{"change":4,"start":148025,"end":148111},"introduced_by":4}],"inode":{"change":4,"pos":137210}},"ins_contents":[{"Add":" let mut db: ::sanakirja::btree::UDb ="},{"Add":" if let Some(db) = txn.root(0) {"},{"Add":" ::sanakirja::btree::UDb::from_page(db)"},{"Add":" } else {"},{"Add":" ::sanakirja::btree::create_db_(&mut txn)?"},{"Add":" };"},{"Add":" ::sanakirja::btree::put(&mut txn, &mut db, &Oid(*oid), &state.into())?;"},{"Add":" txn.set_root(0, db.db);"}],"del_contents":[{"Del":" let mut db: ::sanakirja::Db = if let Some(db) = txn.root(0) {\n db\n } else {\n txn.create_db()?\n };\n"},{"Del":" txn.put(&mut rand::thread_rng(), &mut db, *oid, state)?;\n txn.set_root(0, db);\n"}]}},{"Replacement":{"inode":{"change":4,"pos":137210},"path":"pijul/src/commands/git.rs","line":371,"ins":{"up_context":[{"change":4,"pos":632}],"down_context":[{"change":4,"pos":149236}],"flag":"BLOCK","start":1492,"end":1603,"inode":{"change":4,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":632},"to":{"change":4,"start":632,"end":692},"introduced_by":4}],"inode":{"change":4,"pos":137210}},"ins_contents":[{"Add":" let h: libpijul::Hash = h.into();"},{"Add":" if txn.has_change(&channel, &h)?.is_none() {"}],"del_contents":[{"Del":" if txn.has_change(&channel, h)?.is_none() {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":137210},"path":"pijul/src/commands/git.rs","line":410,"ins":{"up_context":[{"change":4,"pos":887}],"down_context":[{"change":4,"pos":150456}],"flag":"BLOCK","start":1604,"end":1670,"inode":{"change":4,"pos":137210}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":887},"to":{"change":4,"start":150389,"end":150456},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":150389},"to":{"change":4,"start":150389,"end":150456},"introduced_by":4}],"inode":{"change":4,"pos":137210}},"ins_contents":[{"Add":" txn.apply_change_ws(&repo.repo.changes, channel, h, ws)?;"}],"del_contents":[{"Del":" txn.apply_change_ws(&repo.repo.changes, channel, *h, ws)?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":137210},"path":"pijul/src/commands/git.rs","line":527,"ins":{"up_context":[{"change":4,"pos":154693}],"down_context":[{"change":4,"pos":154875}],"flag":"BLOCK","start":1671,"end":1857,"inode":{"change":4,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":154693},"to":{"change":4,"start":675,"end":859},"introduced_by":4}],"inode":{"change":4,"pos":137210}},"ins_contents":[{"Add":" if let Some(inode) = txn.get_revinodes(&vertex, None)? {"},{"Add":" if let Some(old_path) = libpijul::fs::inode_filename(txn, *inode)? {"}],"del_contents":[{"Del":" if let Some(inode) = txn.get_revinodes(vertex, None)? {\n if let Some(old_path) = libpijul::fs::inode_filename(txn, inode)? {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":137210},"path":"pijul/src/commands/git.rs","line":739,"ins":{"up_context":[{"change":4,"pos":161721}],"down_context":[{"change":4,"pos":169}],"flag":"BLOCK","start":1858,"end":1942,"inode":{"change":4,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":161721},"to":{"change":4,"start":161721,"end":161804},"introduced_by":4}],"inode":{"change":4,"pos":137210}},"ins_contents":[{"Add":" let (_, m) = txn.apply_local_change(channel, &change, &hash, &rec.updatables)?;"}],"del_contents":[{"Del":" let (_, m) = txn.apply_local_change(channel, &change, hash, &rec.updatables)?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":196374},"path":"pijul/Cargo.toml","line":4,"ins":{"up_context":[{"change":4,"pos":196462}],"down_context":[{"change":4,"pos":196488}],"flag":"BLOCK","start":1943,"end":1970,"inode":{"change":4,"pos":196374}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":196462},"to":{"change":3,"start":19,"end":46},"introduced_by":3}],"inode":{"change":4,"pos":196374}},"ins_contents":[{"Add":"version = \"1.0.0-alpha.41\""}],"del_contents":[{"Del":"version = \"1.0.0-alpha.39\"\n"}]}},{"Edit":{"inode":{"change":4,"pos":196374},"path":"pijul/Cargo.toml","line":32,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":197171}],"down_context":[{"change":2,"pos":14538}],"flag":"BLOCK","start":1971,"end":1995,"inode":{"change":4,"pos":196374}}},"contents":[{"Add":"\"src/commands/lock.rs\","}]}},{"Edit":{"inode":{"change":4,"pos":196374},"path":"pijul/Cargo.toml","line":36,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":197209}],"down_context":[{"change":4,"pos":197209}],"flag":"BLOCK","start":1996,"end":2059,"inode":{"change":4,"pos":196374}}},"contents":[{"Add":"\"src/repository/unix_lock.rs\","},{"Add":"\"src/repository/basic_lock.rs\","}]}},{"Replacement":{"inode":{"change":4,"pos":196374},"path":"pijul/Cargo.toml","line":54,"ins":{"up_context":[{"change":4,"pos":197438}],"down_context":[{"change":4,"pos":197523}],"flag":"BLOCK","start":2060,"end":2150,"inode":{"change":4,"pos":196374}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":197438},"to":{"change":3,"start":47,"end":137},"introduced_by":3}],"inode":{"change":4,"pos":196374}},"ins_contents":[{"Add":"libpijul = { path = \"../libpijul\", version = \"1.0.0-alpha.34\", features = [ \"tarball\" ] }"}],"del_contents":[{"Del":"libpijul = { path = \"../libpijul\", version = \"1.0.0-alpha.35\", features = [ \"tarball\" ] }\n"}]}},{"Replacement":{"inode":{"change":4,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":105,"ins":{"up_context":[{"change":4,"pos":7110}],"down_context":[{"change":4,"pos":7177}],"flag":"BLOCK","start":2151,"end":2291,"inode":{"change":4,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":7110},"to":{"change":2,"start":15053,"end":15146},"introduced_by":2}],"inode":{"change":4,"pos":225940}},"ins_contents":[{"Add":" .get_file_name("},{"Add":" |h| txn.get_external(&h).unwrap().map(From::from),"},{"Add":" source,"},{"Add":" &mut name,"},{"Add":" )"}],"del_contents":[{"Del":" .get_file_name(|h| txn.get_external(&h).unwrap().map(From::from), source, &mut name)\n"}]}},{"Replacement":{"inode":{"change":4,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":489,"ins":{"up_context":[{"change":4,"pos":3349}],"down_context":[{"change":4,"pos":3447}],"flag":"BLOCK","start":2292,"end":2406,"inode":{"change":4,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":3349},"to":{"change":2,"start":18859,"end":18961},"introduced_by":2}],"inode":{"change":4,"pos":231493}},"ins_contents":[{"Add":" if !(e.introduced_by() == change_id || e.flag() & EdgeFlags::bp() == EdgeFlags::PARENT)"},{"Add":" {"}],"del_contents":[{"Del":" if !(e.introduced_by() == change_id || e.flag() & EdgeFlags::bp() == EdgeFlags::PARENT) {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":138,"ins":{"up_context":[{"change":4,"pos":252788}],"down_context":[{"change":4,"pos":252886}],"flag":"BLOCK","start":2407,"end":2574,"inode":{"change":4,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":252788},"to":{"change":2,"start":19472,"end":19576},"introduced_by":2}],"inode":{"change":4,"pos":248807}},"ins_contents":[{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" None,"},{"Add":" )?;"}],"del_contents":[{"Del":" output::output_repository_no_pending(&mut repo, &changes, &mut txn, &mut channel, \"\", true, None)?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":200,"ins":{"up_context":[{"change":2,"pos":19841}],"down_context":[{"change":2,"pos":19948}],"flag":"BLOCK","start":2575,"end":2745,"inode":{"change":4,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":19841},"to":{"change":2,"start":19841,"end":19948},"introduced_by":2}],"inode":{"change":4,"pos":248807}},"ins_contents":[{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo2,"},{"Add":" &changes,"},{"Add":" &mut txn2,"},{"Add":" &mut channel2,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" None,"},{"Add":" )?;"}],"del_contents":[{"Del":" output::output_repository_no_pending(&mut repo2, &changes, &mut txn2, &mut channel2, \"\", true, None)?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":210,"ins":{"up_context":[{"change":2,"pos":20015}],"down_context":[{"change":4,"pos":254611}],"flag":"BLOCK","start":2746,"end":2916,"inode":{"change":4,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":20015},"to":{"change":2,"start":20015,"end":20122},"introduced_by":2}],"inode":{"change":4,"pos":248807}},"ins_contents":[{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo3,"},{"Add":" &changes,"},{"Add":" &mut txn3,"},{"Add":" &mut channel3,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" None,"},{"Add":" )?;"}],"del_contents":[{"Del":" output::output_repository_no_pending(&mut repo3, &changes, &mut txn3, &mut channel3, \"\", true, None)?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":252,"ins":{"up_context":[{"change":2,"pos":20253}],"down_context":[{"change":4,"pos":255737}],"flag":"BLOCK","start":2917,"end":3084,"inode":{"change":4,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":20253},"to":{"change":2,"start":20253,"end":20357},"introduced_by":2}],"inode":{"change":4,"pos":248807}},"ins_contents":[{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" None,"},{"Add":" )?;"}],"del_contents":[{"Del":" output::output_repository_no_pending(&mut repo, &changes, &mut txn, &mut channel, \"\", true, None)?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":300,"ins":{"up_context":[{"change":2,"pos":20425}],"down_context":[{"change":4,"pos":257007}],"flag":"BLOCK","start":3085,"end":3255,"inode":{"change":4,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":20425},"to":{"change":2,"start":20425,"end":20532},"introduced_by":2}],"inode":{"change":4,"pos":248807}},"ins_contents":[{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo2,"},{"Add":" &changes,"},{"Add":" &mut txn2,"},{"Add":" &mut channel2,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" None,"},{"Add":" )?;"}],"del_contents":[{"Del":" output::output_repository_no_pending(&mut repo2, &changes, &mut txn2, &mut channel2, \"\", true, None)?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":418,"ins":{"up_context":[{"change":4,"pos":260186}],"down_context":[{"change":4,"pos":260284}],"flag":"BLOCK","start":3256,"end":3423,"inode":{"change":4,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":260186},"to":{"change":2,"start":20697,"end":20801},"introduced_by":2}],"inode":{"change":4,"pos":248807}},"ins_contents":[{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" None,"},{"Add":" )?;"}],"del_contents":[{"Del":" output::output_repository_no_pending(&mut repo, &changes, &mut txn, &mut channel, \"\", true, None)?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":526,"ins":{"up_context":[{"change":4,"pos":263374}],"down_context":[{"change":2,"pos":20921}],"flag":"BLOCK","start":3424,"end":3591,"inode":{"change":4,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":263374},"to":{"change":2,"start":20817,"end":20921},"introduced_by":2}],"inode":{"change":4,"pos":248807}},"ins_contents":[{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" None,"},{"Add":" )?;"}],"del_contents":[{"Del":" output::output_repository_no_pending(&mut repo, &changes, &mut txn, &mut channel, \"\", true, None)?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":27,"ins":{"up_context":[{"change":4,"pos":820}],"down_context":[{"change":2,"pos":22578}],"flag":"BLOCK","start":3592,"end":3614,"inode":{"change":4,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":820},"to":{"change":2,"start":22561,"end":22578},"introduced_by":2}],"inode":{"change":4,"pos":14}},"ins_contents":[{"Add":" })"},{"Add":" .unwrap();"}],"del_contents":[{"Del":" }).unwrap();\n"}]}},{"Replacement":{"inode":{"change":4,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":34,"ins":{"up_context":[{"change":4,"pos":1015}],"down_context":[{"change":2,"pos":22725}],"flag":"BLOCK","start":3615,"end":3637,"inode":{"change":4,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1015},"to":{"change":2,"start":22708,"end":22725},"introduced_by":2}],"inode":{"change":4,"pos":14}},"ins_contents":[{"Add":" })"},{"Add":" .unwrap();"}],"del_contents":[{"Del":" }).unwrap();\n"}]}},{"Replacement":{"inode":{"change":4,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":44,"ins":{"up_context":[{"change":4,"pos":1345}],"down_context":[{"change":4,"pos":1444}],"flag":"BLOCK","start":3638,"end":3819,"inode":{"change":4,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1345},"to":{"change":2,"start":23088,"end":23201},"introduced_by":2}],"inode":{"change":4,"pos":14}},"ins_contents":[{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channela,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" None,"},{"Add":" )"},{"Add":" .unwrap();"}],"del_contents":[{"Del":" output::output_repository_no_pending(&mut repo, &changes, &mut txn, &mut channela, \"\", true, None).unwrap();\n"}]}},{"Replacement":{"inode":{"change":4,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":65,"ins":{"up_context":[{"change":4,"pos":1845}],"down_context":[{"change":4,"pos":1854}],"flag":"BLOCK","start":3820,"end":3842,"inode":{"change":4,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1845},"to":{"change":2,"start":23375,"end":23392},"introduced_by":2}],"inode":{"change":4,"pos":14}},"ins_contents":[{"Add":" })"},{"Add":" .unwrap();"}],"del_contents":[{"Del":" }).unwrap();\n"}]}},{"Replacement":{"inode":{"change":4,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":127,"ins":{"up_context":[{"change":4,"pos":3860}],"down_context":[{"change":4,"pos":3959}],"flag":"BLOCK","start":3843,"end":4011,"inode":{"change":4,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":3860},"to":{"change":2,"start":23922,"end":24027},"introduced_by":2}],"inode":{"change":4,"pos":14}},"ins_contents":[{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channela,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" None,"},{"Add":" )?;"}],"del_contents":[{"Del":" output::output_repository_no_pending(&mut repo, &changes, &mut txn, &mut channela, \"\", true, None)?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":118,"ins":{"up_context":[{"change":2,"pos":24800}],"down_context":[{"change":4,"pos":281708}],"flag":"BLOCK","start":4012,"end":4181,"inode":{"change":4,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":24800},"to":{"change":2,"start":24800,"end":24953},"introduced_by":2}],"inode":{"change":4,"pos":278146}},"ins_contents":[{"Add":" ::sanakirja::debug::debug("},{"Add":" &txn.txn,"},{"Add":" &[txn.graph(&channel.borrow()), txn.graph(&channel2.borrow())],"},{"Add":" \"debug_sanakirja\","},{"Add":" true,"},{"Add":" );"}],"del_contents":[{"Del":" ::sanakirja::debug::debug(&txn.txn, &[\n txn.graph(&channel.borrow()),\n txn.graph(&channel2.borrow()),\n ], \"debug_sanakirja\", true);\n"}]}},{"Edit":{"inode":{"change":4,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":125,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":281709},"to":{"change":2,"start":24954,"end":24955},"introduced_by":2}],"inode":{"change":4,"pos":278146}}},"contents":[{"Del":"\n"}]}},{"Replacement":{"inode":{"change":4,"pos":300430},"path":"libpijul/src/tests/filesystem.rs","line":27,"ins":{"up_context":[{"change":2,"pos":26979}],"down_context":[{"change":4,"pos":301485}],"flag":"BLOCK","start":4182,"end":4362,"inode":{"change":4,"pos":300430}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":26979},"to":{"change":2,"start":26979,"end":27081},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":27081},"to":{"change":4,"start":301466,"end":301485},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":301466},"to":{"change":4,"start":301466,"end":301485},"introduced_by":4}],"inode":{"change":4,"pos":300430}},"ins_contents":[{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" None,"},{"Add":" )"},{"Add":" .unwrap();"}],"del_contents":[{"Del":" output::output_repository_no_pending(&mut repo, &changes, &mut txn, &mut channel, \"\", true, None)\n"},{"Del":" .unwrap();\n"}]}},{"Replacement":{"inode":{"change":4,"pos":300430},"path":"libpijul/src/tests/filesystem.rs","line":73,"ins":{"up_context":[{"change":2,"pos":27225}],"down_context":[{"change":4,"pos":302815}],"flag":"BLOCK","start":4363,"end":4543,"inode":{"change":4,"pos":300430}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":27225},"to":{"change":2,"start":27225,"end":27327},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":27327},"to":{"change":4,"start":302796,"end":302815},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":302796},"to":{"change":4,"start":302796,"end":302815},"introduced_by":4}],"inode":{"change":4,"pos":300430}},"ins_contents":[{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" None,"},{"Add":" )"},{"Add":" .unwrap();"}],"del_contents":[{"Del":" output::output_repository_no_pending(&mut repo, &changes, &mut txn, &mut channel, \"\", true, None)\n"},{"Del":" .unwrap();\n"}]}},{"Replacement":{"inode":{"change":4,"pos":300430},"path":"libpijul/src/tests/filesystem.rs","line":116,"ins":{"up_context":[{"change":2,"pos":27471}],"down_context":[{"change":4,"pos":304078}],"flag":"BLOCK","start":4544,"end":4724,"inode":{"change":4,"pos":300430}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":27471},"to":{"change":2,"start":27471,"end":27573},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":27573},"to":{"change":4,"start":304059,"end":304078},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":304059},"to":{"change":4,"start":304059,"end":304078},"introduced_by":4}],"inode":{"change":4,"pos":300430}},"ins_contents":[{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" None,"},{"Add":" )"},{"Add":" .unwrap();"}],"del_contents":[{"Del":" output::output_repository_no_pending(&mut repo, &changes, &mut txn, &mut channel, \"\", true, None)\n"},{"Del":" .unwrap();\n"}]}},{"Replacement":{"inode":{"change":4,"pos":300430},"path":"libpijul/src/tests/filesystem.rs","line":162,"ins":{"up_context":[{"change":2,"pos":27717}],"down_context":[{"change":4,"pos":305444}],"flag":"BLOCK","start":4725,"end":4905,"inode":{"change":4,"pos":300430}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":27717},"to":{"change":2,"start":27717,"end":27819},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":27819},"to":{"change":4,"start":305425,"end":305444},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":305425},"to":{"change":4,"start":305425,"end":305444},"introduced_by":4}],"inode":{"change":4,"pos":300430}},"ins_contents":[{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" None,"},{"Add":" )"},{"Add":" .unwrap();"}],"del_contents":[{"Del":" output::output_repository_no_pending(&mut repo, &changes, &mut txn, &mut channel, \"\", true, None)\n"},{"Del":" .unwrap();\n"}]}},{"Replacement":{"inode":{"change":4,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1223,"ins":{"up_context":[{"change":2,"pos":31819}],"down_context":[{"change":4,"pos":342329}],"flag":"BLOCK","start":4906,"end":5047,"inode":{"change":4,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":31819},"to":{"change":2,"start":31819,"end":31916},"introduced_by":2}],"inode":{"change":4,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change("},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" &bob_resolution,"},{"Add":" )"},{"Add":" .unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &bob_resolution).unwrap();\n"}]}},{"Replacement":{"inode":{"change":4,"pos":446445},"path":"libpijul/src/tests/change.rs","line":177,"ins":{"up_context":[{"change":2,"pos":42783}],"down_context":[{"change":4,"pos":451888}],"flag":"BLOCK","start":5048,"end":5216,"inode":{"change":4,"pos":446445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":42783},"to":{"change":2,"start":42783,"end":42888},"introduced_by":2}],"inode":{"change":4,"pos":446445}},"ins_contents":[{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo2,"},{"Add":" &store,"},{"Add":" &mut txn2,"},{"Add":" &mut channel2,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" None,"},{"Add":" )?;"}],"del_contents":[{"Del":" output::output_repository_no_pending(&mut repo2, &store, &mut txn2, &mut channel2, \"\", true, None)?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":446445},"path":"libpijul/src/tests/change.rs","line":191,"ins":{"up_context":[{"change":2,"pos":42954}],"down_context":[{"change":4,"pos":452206}],"flag":"BLOCK","start":5217,"end":5385,"inode":{"change":4,"pos":446445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":42954},"to":{"change":2,"start":42954,"end":43059},"introduced_by":2}],"inode":{"change":4,"pos":446445}},"ins_contents":[{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo2,"},{"Add":" &store,"},{"Add":" &mut txn2,"},{"Add":" &mut channel2,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" None,"},{"Add":" )?;"}],"del_contents":[{"Del":" output::output_repository_no_pending(&mut repo2, &store, &mut txn2, &mut channel2, \"\", true, None)?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":181,"ins":{"up_context":[{"change":4,"pos":3977}],"down_context":[{"change":4,"pos":4076}],"flag":"BLOCK","start":5386,"end":5554,"inode":{"change":4,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":3977},"to":{"change":2,"start":44275,"end":44380},"introduced_by":2}],"inode":{"change":4,"pos":454125}},"ins_contents":[{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo2,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" None,"},{"Add":" )?;"}],"del_contents":[{"Del":" output::output_repository_no_pending(&mut repo2, &changes, &mut txn, &mut channel, \"\", true, None)?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":480474},"path":"libpijul/src/small_string.rs","line":14,"ins":{"up_context":[{"change":2,"pos":45486}],"down_context":[{"change":4,"pos":480895}],"flag":"BLOCK","start":5555,"end":5571,"inode":{"change":4,"pos":480474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":45486},"to":{"change":2,"start":45486,"end":45501},"introduced_by":2}],"inode":{"change":4,"pos":480474}},"ins_contents":[{"Add":" _str: [u8],"}],"del_contents":[{"Del":" _str: [u8]\n"}]}},{"Replacement":{"inode":{"change":4,"pos":480474},"path":"libpijul/src/small_string.rs","line":41,"ins":{"up_context":[{"change":2,"pos":45753}],"down_context":[{"change":2,"pos":45856}],"flag":"BLOCK","start":5572,"end":5722,"inode":{"change":4,"pos":480474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":45753},"to":{"change":2,"start":45753,"end":45856},"introduced_by":2}],"inode":{"change":4,"pos":480474}},"ins_contents":[{"Add":" std::mem::transmute(std::slice::from_raw_parts("},{"Add":" self as *const Self as *const u8,"},{"Add":" 1 + len,"},{"Add":" ))"}],"del_contents":[{"Del":" std::mem::transmute(std::slice::from_raw_parts(self as *const Self as *const u8, 1 + len))\n"}]}},{"Replacement":{"inode":{"change":4,"pos":480474},"path":"libpijul/src/small_string.rs","line":53,"ins":{"up_context":[{"change":2,"pos":46004}],"down_context":[{"change":2,"pos":46107}],"flag":"BLOCK","start":5723,"end":5873,"inode":{"change":4,"pos":480474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":46004},"to":{"change":2,"start":46004,"end":46107},"introduced_by":2}],"inode":{"change":4,"pos":480474}},"ins_contents":[{"Add":" std::mem::transmute(std::slice::from_raw_parts("},{"Add":" self as *const Self as *const u8,"},{"Add":" 1 + len,"},{"Add":" ))"}],"del_contents":[{"Del":" std::mem::transmute(std::slice::from_raw_parts(self as *const Self as *const u8, 1 + len))\n"}]}},{"Replacement":{"inode":{"change":4,"pos":480474},"path":"libpijul/src/small_string.rs","line":65,"ins":{"up_context":[{"change":2,"pos":46263}],"down_context":[{"change":2,"pos":46366}],"flag":"BLOCK","start":5874,"end":6024,"inode":{"change":4,"pos":480474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":46263},"to":{"change":2,"start":46263,"end":46366},"introduced_by":2}],"inode":{"change":4,"pos":480474}},"ins_contents":[{"Add":" std::mem::transmute(std::slice::from_raw_parts_mut("},{"Add":" self as *mut Self as *mut u8,"},{"Add":" 1 + len,"},{"Add":" ))"}],"del_contents":[{"Del":" std::mem::transmute(std::slice::from_raw_parts_mut(self as *mut Self as *mut u8, 1 + len))\n"}]}},{"Replacement":{"inode":{"change":4,"pos":480474},"path":"libpijul/src/small_string.rs","line":77,"ins":{"up_context":[{"change":2,"pos":46532}],"down_context":[{"change":2,"pos":46635}],"flag":"BLOCK","start":6025,"end":6175,"inode":{"change":4,"pos":480474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":46532},"to":{"change":2,"start":46532,"end":46635},"introduced_by":2}],"inode":{"change":4,"pos":480474}},"ins_contents":[{"Add":" std::mem::transmute(std::slice::from_raw_parts_mut("},{"Add":" self as *mut Self as *mut u8,"},{"Add":" 1 + len,"},{"Add":" ))"}],"del_contents":[{"Del":" std::mem::transmute(std::slice::from_raw_parts_mut(self as *mut Self as *mut u8, 1 + len))\n"}]}},{"Replacement":{"inode":{"change":4,"pos":480474},"path":"libpijul/src/small_string.rs","line":309,"ins":{"up_context":[{"change":2,"pos":47657}],"down_context":[{"change":2,"pos":47741}],"flag":"BLOCK","start":6176,"end":6296,"inode":{"change":4,"pos":480474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":47657},"to":{"change":2,"start":47657,"end":47741},"introduced_by":2}],"inode":{"change":4,"pos":480474}},"ins_contents":[{"Add":" debug!("},{"Add":" \"writing {:?}\","},{"Add":" std::slice::from_raw_parts(p, 1 + self.len as usize)"},{"Add":" );"}],"del_contents":[{"Del":" debug!(\"writing {:?}\", std::slice::from_raw_parts(p, 1+self.len as usize));\n"}]}},{"Replacement":{"inode":{"change":4,"pos":480474},"path":"libpijul/src/small_string.rs","line":319,"ins":{"up_context":[{"change":2,"pos":47937}],"down_context":[{"change":2,"pos":48020}],"flag":"BLOCK","start":6297,"end":6416,"inode":{"change":4,"pos":480474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":47937},"to":{"change":2,"start":47937,"end":48020},"introduced_by":2}],"inode":{"change":4,"pos":480474}},"ins_contents":[{"Add":" debug!("},{"Add":" \"onpage_size {:?}\","},{"Add":" std::slice::from_raw_parts(p, 1 + len as usize)"},{"Add":" );"}],"del_contents":[{"Del":" debug!(\"onpage_size {:?}\", std::slice::from_raw_parts(p, 1+len as usize));\n"}]}},{"Replacement":{"inode":{"change":4,"pos":488880},"path":"libpijul/src/record.rs","line":392,"ins":{"up_context":[{"change":4,"pos":500452}],"down_context":[{"change":4,"pos":500531}],"flag":"BLOCK","start":6417,"end":6542,"inode":{"change":4,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":500452},"to":{"change":2,"start":49953,"end":50044},"introduced_by":2}],"inode":{"change":4,"pos":488880}},"ins_contents":[{"Add":" let name_dest = txn"},{"Add":" .find_block_end(txn.graph(channel), name_.dest())"},{"Add":" .unwrap();"}],"del_contents":[{"Del":" let name_dest = txn.find_block_end(txn.graph(channel), name_.dest()).unwrap();\n"}]}},{"Replacement":{"inode":{"change":4,"pos":488880},"path":"libpijul/src/record.rs","line":397,"ins":{"up_context":[{"change":4,"pos":11892}],"down_context":[{"change":4,"pos":11969}],"flag":"BLOCK","start":6543,"end":6726,"inode":{"change":4,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":11892},"to":{"change":2,"start":50045,"end":50149},"introduced_by":2}],"inode":{"change":4,"pos":488880}},"ins_contents":[{"Add":" .get_contents("},{"Add":" |p| txn.get_external(&p).unwrap().map(From::from),"},{"Add":" *name_dest,"},{"Add":" &mut name,"},{"Add":" )"}],"del_contents":[{"Del":" .get_contents(|p| txn.get_external(&p).unwrap().map(From::from), *name_dest, &mut name)\n"}]}},{"Replacement":{"inode":{"change":4,"pos":488880},"path":"libpijul/src/record.rs","line":544,"ins":{"up_context":[{"change":4,"pos":281}],"down_context":[{"change":4,"pos":371}],"flag":"BLOCK","start":6727,"end":6946,"inode":{"change":4,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":281},"to":{"change":2,"start":50704,"end":50812},"introduced_by":2}],"inode":{"change":4,"pos":488880}},"ins_contents":[{"Add":" .get_contents("},{"Add":" |p| txn.get_external(&p).unwrap().map(From::from),"},{"Add":" *child,"},{"Add":" &mut name,"},{"Add":" )"}],"del_contents":[{"Del":" .get_contents(|p| txn.get_external(&p).unwrap().map(From::from), *child, &mut name)\n"}]}},{"Replacement":{"inode":{"change":4,"pos":488880},"path":"libpijul/src/record.rs","line":631,"ins":{"up_context":[{"change":4,"pos":35616}],"down_context":[{"change":4,"pos":506617}],"flag":"BLOCK","start":6947,"end":7168,"inode":{"change":4,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":35616},"to":{"change":2,"start":50949,"end":51051},"introduced_by":2}],"inode":{"change":4,"pos":488880}},"ins_contents":[{"Add":" self.record_deleted_file("},{"Add":" txn,"},{"Add":" txn.graph(channel),"},{"Add":" working_copy,"},{"Add":" &full_path,"},{"Add":" *vertex,"},{"Add":" )?"}],"del_contents":[{"Del":" self.record_deleted_file(txn, txn.graph(channel), working_copy, &full_path, *vertex)?\n"}]}},{"Replacement":{"inode":{"change":4,"pos":488880},"path":"libpijul/src/record.rs","line":791,"ins":{"up_context":[{"change":4,"pos":36364}],"down_context":[{"change":4,"pos":36438}],"flag":"BLOCK","start":7169,"end":7279,"inode":{"change":4,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":36364},"to":{"change":2,"start":51420,"end":51496},"introduced_by":2}],"inode":{"change":4,"pos":488880}},"ins_contents":[{"Add":" if !parent"},{"Add":" .flag()"},{"Add":" .contains(EdgeFlags::FOLDER | EdgeFlags::PARENT)"},{"Add":" {"}],"del_contents":[{"Del":" if !parent.flag().contains(EdgeFlags::FOLDER | EdgeFlags::PARENT) {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":488880},"path":"libpijul/src/record.rs","line":994,"ins":{"up_context":[{"change":2,"pos":54032}],"down_context":[{"change":4,"pos":520235}],"flag":"BLOCK","start":7280,"end":7463,"inode":{"change":4,"pos":488880}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":2,"pos":54032},"to":{"change":4,"start":3965,"end":4030},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":3965},"to":{"change":4,"start":3965,"end":4030},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":4030},"to":{"change":2,"start":54033,"end":54130},"introduced_by":2}],"inode":{"change":4,"pos":488880}},"ins_contents":[{"Add":" self.rec.updatables.insert("},{"Add":" self.rec.actions.len(),"},{"Add":" InodeUpdate::Deleted { inode: *inode },"},{"Add":" );"}],"del_contents":[{"Del":" self.rec\n .updatables\n"},{"Del":" .insert(self.rec.actions.len(), InodeUpdate::Deleted { inode: *inode });\n"}]}},{"Edit":{"inode":{"change":4,"pos":525242},"path":"libpijul/src/pristine/vertex.rs","line":1,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":525242},"to":{"change":2,"start":55896,"end":55912},"introduced_by":2}],"inode":{"change":4,"pos":525242}}},"contents":[{"Del":"use super::L64;\n"}]}},{"Edit":{"inode":{"change":4,"pos":525242},"path":"libpijul/src/pristine/vertex.rs","line":2,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":525323}],"down_context":[{"change":4,"pos":525323}],"flag":"BLOCK","start":7464,"end":7480,"inode":{"change":4,"pos":525242}}},"contents":[{"Add":"use super::L64;"}]}},{"Replacement":{"inode":{"change":4,"pos":525242},"path":"libpijul/src/pristine/vertex.rs","line":19,"ins":{"up_context":[{"change":2,"pos":56127}],"down_context":[{"change":2,"pos":56212}],"flag":"BLOCK","start":7481,"end":7636,"inode":{"change":4,"pos":525242}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":56127},"to":{"change":2,"start":56127,"end":56212},"introduced_by":2}],"inode":{"change":4,"pos":525242}},"ins_contents":[{"Add":" write!("},{"Add":" fmt,"},{"Add":" \"V({:?}[{}:{}])\","},{"Add":" self.change,"},{"Add":" (self.start.0).0,"},{"Add":" (self.end.0).0"},{"Add":" )"}],"del_contents":[{"Del":" write!(fmt, \"V({:?}[{}:{}])\", self.change, (self.start.0).0, (self.end.0).0)\n"}]}},{"Edit":{"inode":{"change":4,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":190,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":536203},"to":{"change":4,"start":536203,"end":536204},"introduced_by":4}],"inode":{"change":4,"pos":531056}}},"contents":[{"Del":"\n"}]}},{"Replacement":{"inode":{"change":4,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":265,"ins":{"up_context":[{"change":2,"pos":62787}],"down_context":[{"change":2,"pos":62893}],"flag":"BLOCK","start":7637,"end":7759,"inode":{"change":4,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":62787},"to":{"change":2,"start":62787,"end":62893},"introduced_by":2}],"inode":{"change":4,"pos":531056}},"ins_contents":[{"Add":" let revchanges: UDb> ="},{"Add":" UDb::from_page(tup.0[2].into());"}],"del_contents":[{"Del":" let revchanges: UDb> = UDb::from_page(tup.0[2].into());\n"}]}},{"Replacement":{"inode":{"change":4,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":321,"ins":{"up_context":[{"change":4,"pos":36940}],"down_context":[{"change":2,"pos":65489}],"flag":"BLOCK","start":7760,"end":7887,"inode":{"change":4,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":36940},"to":{"change":2,"start":65385,"end":65489},"introduced_by":2}],"inode":{"change":4,"pos":531056}},"ins_contents":[{"Add":" fn get_internal("},{"Add":" &self,"},{"Add":" p: &SerializedHash,"},{"Add":" ) -> Result, TxnErr> {"}],"del_contents":[{"Del":" fn get_internal(&self, p: &SerializedHash) -> Result, TxnErr> {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":430,"ins":{"up_context":[{"change":2,"pos":67285}],"down_context":[{"change":2,"pos":67393}],"flag":"BLOCK","start":7888,"end":8018,"inode":{"change":4,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":67285},"to":{"change":2,"start":67285,"end":67393},"introduced_by":2}],"inode":{"change":4,"pos":531056}},"ins_contents":[{"Add":" let mut k = if let Some((k, _)) = cursor"},{"Add":" .set(txn, &key, None)"},{"Add":" .map_err(|x| BlockError::Txn(x.into()))?"},{"Add":" {"}],"del_contents":[{"Del":" let mut k = if let Some((k, _)) = cursor.set(txn, &key, None).map_err(|x| BlockError::Txn(x.into()))? {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":632,"ins":{"up_context":[{"change":2,"pos":71161}],"down_context":[{"change":2,"pos":71176}],"flag":"BLOCK","start":8019,"end":8033,"inode":{"change":4,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":71161},"to":{"change":2,"start":71161,"end":71176},"introduced_by":2}],"inode":{"change":4,"pos":531056}},"ins_contents":[{"Add":" }"}],"del_contents":[{"Del":" },\n"}]}},{"Replacement":{"inode":{"change":4,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":778,"ins":{"up_context":[{"change":2,"pos":74103}],"down_context":[{"change":2,"pos":74129}],"flag":"BLOCK","start":8034,"end":8061,"inode":{"change":4,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":74103},"to":{"change":2,"start":74103,"end":74129},"introduced_by":2}],"inode":{"change":4,"pos":531056}},"ins_contents":[{"Add":" _ => Ok(None),"}],"del_contents":[{"Del":" _ => Ok(None)\n"}]}},{"Replacement":{"inode":{"change":4,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":873,"ins":{"up_context":[{"change":2,"pos":74969}],"down_context":[{"change":2,"pos":75069}],"flag":"BLOCK","start":8062,"end":8154,"inode":{"change":4,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":74969},"to":{"change":2,"start":74969,"end":75069},"introduced_by":2}],"inode":{"change":4,"pos":531056}},"ins_contents":[{"Add":" type TreeCursor = ::sanakirja::btree::cursor::Cursor>;"}],"del_contents":[{"Del":" type TreeCursor =\n ::sanakirja::btree::cursor::Cursor>;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":875,"ins":{"up_context":[{"change":2,"pos":75112}],"down_context":[{"change":2,"pos":75215}],"flag":"BLOCK","start":8155,"end":8250,"inode":{"change":4,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":75112},"to":{"change":2,"start":75112,"end":75215},"introduced_by":2}],"inode":{"change":4,"pos":531056}},"ins_contents":[{"Add":" type RevtreeCursor = ::sanakirja::btree::cursor::Cursor>;"}],"del_contents":[{"Del":" type RevtreeCursor =\n ::sanakirja::btree::cursor::Cursor>;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1058,"ins":{"up_context":[{"change":4,"pos":550501}],"down_context":[{"change":2,"pos":78508}],"flag":"BLOCK","start":8251,"end":9200,"inode":{"change":4,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":550501},"to":{"change":4,"start":550501,"end":550535},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":550535},"to":{"change":2,"start":77511,"end":78508},"introduced_by":2}],"inode":{"change":4,"pos":531056}},"ins_contents":[{"Add":" Entry::Vacant(v) => match btree::get(&self.txn, &self.remotes, &name, None)? {"},{"Add":" Some((name_, remote)) if name.as_ref() == name_ => {"},{"Add":" debug!(\"load_remote: {:?} {:?}\", name_, remote);"},{"Add":" let r = Remote {"},{"Add":" remote: UDb::from_page(remote.0[0].into()),"},{"Add":" rev: UDb::from_page(remote.0[1].into()),"},{"Add":" states: UDb::from_page(remote.0[2].into()),"},{"Add":" };"},{"Add":" for x in btree::iter(&self.txn, &r.remote, None).unwrap() {"},{"Add":" debug!(\"remote -> {:?}\", x);"},{"Add":" }"},{"Add":" for x in btree::iter(&self.txn, &r.rev, None).unwrap() {"},{"Add":" debug!(\"rev -> {:?}\", x);"},{"Add":" }"},{"Add":" for x in btree::iter(&self.txn, &r.states, None).unwrap() {"},{"Add":" debug!(\"states -> {:?}\", x);"},{"Add":" }"}],"del_contents":[{"Del":" Entry::Vacant(v) => {\n"},{"Del":" match btree::get(&self.txn, &self.remotes, &name, None)? {\n Some((name_, remote)) if name.as_ref() == name_ => {\n debug!(\"load_remote: {:?} {:?}\", name_, remote);\n let r = Remote {\n remote: UDb::from_page(remote.0[0].into()),\n rev: UDb::from_page(remote.0[1].into()),\n states: UDb::from_page(remote.0[2].into()),\n };\n for x in btree::iter(&self.txn, &r.remote, None).unwrap() {\n debug!(\"remote -> {:?}\", x);\n }\n for x in btree::iter(&self.txn, &r.rev, None).unwrap() {\n debug!(\"rev -> {:?}\", x);\n }\n for x in btree::iter(&self.txn, &r.states, None).unwrap() {\n debug!(\"states -> {:?}\", x);\n }\n"}]}},{"Replacement":{"inode":{"change":4,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1076,"ins":{"up_context":[{"change":2,"pos":78509}],"down_context":[{"change":2,"pos":78894}],"flag":"BLOCK","start":9201,"end":9320,"inode":{"change":4,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":78509},"to":{"change":2,"start":78509,"end":78894},"introduced_by":2}],"inode":{"change":4,"pos":531056}},"ins_contents":[{"Add":" for x in self.iter_remote(&r.remote, 0).unwrap() {"},{"Add":" debug!(\"ITER {:?}\", x);"}],"del_contents":[{"Del":" for x in self.iter_remote(&r.remote, 0).unwrap() {\n debug!(\"ITER {:?}\", x);\n }\n\n let r = RemoteRef {\n db: Rc::new(RefCell::new(r)),\n name: name.clone(),\n };\n Ok(Some(v.insert(r).clone()))\n"}]}},{"Replacement":{"inode":{"change":4,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1079,"ins":{"up_context":[{"change":2,"pos":78916}],"down_context":[{"change":4,"pos":551161}],"flag":"BLOCK","start":9321,"end":9533,"inode":{"change":4,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":78916},"to":{"change":2,"start":78916,"end":78957},"introduced_by":2}],"inode":{"change":4,"pos":531056}},"ins_contents":[{"Add":""},{"Add":" let r = RemoteRef {"},{"Add":" db: Rc::new(RefCell::new(r)),"},{"Add":" name: name.clone(),"},{"Add":" };"},{"Add":" Ok(Some(v.insert(r).clone()))"}],"del_contents":[{"Del":" _ => return Ok(None)\n"}]}},{"Replacement":{"inode":{"change":4,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1086,"ins":{"up_context":[{"change":4,"pos":551179}],"down_context":[{"change":4,"pos":45322}],"flag":"BLOCK","start":9534,"end":9587,"inode":{"change":4,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":551179},"to":{"change":4,"start":551179,"end":551193},"introduced_by":4}],"inode":{"change":4,"pos":531056}},"ins_contents":[{"Add":" _ => return Ok(None),"},{"Add":" },"}],"del_contents":[{"Del":" }\n"}]}},{"Edit":{"inode":{"change":4,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1119,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":940},"to":{"change":4,"start":115,"end":115},"introduced_by":4},{"previous":"DELETED","flag":"DELETED","from":{"change":4,"pos":940},"to":{"change":4,"start":115,"end":115},"introduced_by":4}],"inode":{"change":4,"pos":531056}}},"contents":[{"Del":""}]}},{"Replacement":{"inode":{"change":4,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1170,"ins":{"up_context":[{"change":4,"pos":555427}],"down_context":[{"change":4,"pos":556087}],"flag":"BLOCK","start":9588,"end":10188,"inode":{"change":4,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":555427},"to":{"change":4,"start":555427,"end":555461},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":555461},"to":{"change":2,"start":80696,"end":81384},"introduced_by":2}],"inode":{"change":4,"pos":531056}},"ins_contents":[{"Add":" Entry::Vacant(v) => match btree::get(&self.txn, &self.remotes, &name, None)? {"},{"Add":" Some((name_, remote)) if name_ == name.as_ref() => {"},{"Add":" let r = RemoteRef {"},{"Add":" db: Rc::new(RefCell::new(Remote {"},{"Add":" remote: UDb::from_page(remote.0[0].into()),"},{"Add":" rev: UDb::from_page(remote.0[1].into()),"},{"Add":" states: UDb::from_page(remote.0[2].into()),"},{"Add":" })),"},{"Add":" name: name.clone(),"},{"Add":" };"},{"Add":" v.insert(r);"}],"del_contents":[{"Del":" Entry::Vacant(v) => {\n"},{"Del":" match btree::get(&self.txn, &self.remotes, &name, None)? {\n Some((name_, remote)) if name_ == name.as_ref() => {\n let r = RemoteRef {\n db: Rc::new(RefCell::new(Remote {\n remote: UDb::from_page(remote.0[0].into()),\n rev: UDb::from_page(remote.0[1].into()),\n states: UDb::from_page(remote.0[2].into()),\n })),\n name: name.clone(),\n };\n v.insert(r);\n }\n _ => return Ok(None),\n"}]}},{"Replacement":{"inode":{"change":4,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1182,"ins":{"up_context":[{"change":4,"pos":556105}],"down_context":[{"change":4,"pos":556119}],"flag":"BLOCK","start":10189,"end":10242,"inode":{"change":4,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":556105},"to":{"change":4,"start":556105,"end":556119},"introduced_by":4}],"inode":{"change":4,"pos":531056}},"ins_contents":[{"Add":" _ => return Ok(None),"},{"Add":" },"}],"del_contents":[{"Del":" }\n"}]}},{"Replacement":{"inode":{"change":4,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1225,"ins":{"up_context":[{"change":2,"pos":82118}],"down_context":[{"change":2,"pos":82145}],"flag":"BLOCK","start":10243,"end":10271,"inode":{"change":4,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":82118},"to":{"change":2,"start":82118,"end":82145},"introduced_by":2}],"inode":{"change":4,"pos":531056}},"ins_contents":[{"Add":" _ => Ok(false),"}],"del_contents":[{"Del":" _ => Ok(false)\n"}]}},{"Replacement":{"inode":{"change":4,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1235,"ins":{"up_context":[{"change":2,"pos":82311}],"down_context":[{"change":2,"pos":82338}],"flag":"BLOCK","start":10272,"end":10300,"inode":{"change":4,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":82311},"to":{"change":2,"start":82311,"end":82338},"introduced_by":2}],"inode":{"change":4,"pos":531056}},"ins_contents":[{"Add":" _ => Ok(false),"}],"del_contents":[{"Del":" _ => Ok(false)\n"}]}},{"Replacement":{"inode":{"change":4,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1521,"ins":{"up_context":[{"change":4,"pos":563385}],"down_context":[{"change":2,"pos":88506}],"flag":"BLOCK","start":10301,"end":11079,"inode":{"change":4,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":563385},"to":{"change":2,"start":86819,"end":88506},"introduced_by":2}],"inode":{"change":4,"pos":531056}},"ins_contents":[{"Add":" let r = match btree::get(&self.txn, &self.channels, &name, None)? {"},{"Add":" Some((name_, b)) => {"},{"Add":" assert_eq!(name_, name.as_ref());"},{"Add":" ChannelRef {"},{"Add":" r: Rc::new(RefCell::new(Channel {"},{"Add":" graph: Db::from_page(b.0[0].into()),"},{"Add":" changes: Db::from_page(b.0[1].into()),"},{"Add":" revchanges: UDb::from_page(b.0[2].into()),"},{"Add":" states: UDb::from_page(b.0[3].into()),"},{"Add":" apply_counter: b.0[4].into(),"},{"Add":" name: name.clone(),"},{"Add":" last_modified: b.0[5].into(),"},{"Add":" })),"}],"del_contents":[{"Del":" let r =\n match btree::get(&self.txn, &self.channels, &name, None)? {\n Some((name_, b)) => {\n assert_eq!(name_, name.as_ref());\n ChannelRef {\n r: Rc::new(RefCell::new(Channel {\n graph: Db::from_page(b.0[0].into()),\n changes: Db::from_page(b.0[1].into()),\n revchanges: UDb::from_page(b.0[2].into()),\n states: UDb::from_page(b.0[3].into()),\n apply_counter: b.0[4].into(),\n name: name.clone(),\n last_modified: b.0[5].into(),\n })),\n }\n }\n _ => {\n let br = ChannelRef {\n r: Rc::new(RefCell::new(Channel {\n graph: btree::create_db_(&mut self.txn)?,\n changes: btree::create_db_(&mut self.txn)?,\n revchanges: btree::create_db_(&mut self.txn)?,\n states: btree::create_db_(&mut self.txn)?,\n apply_counter: 0,\n name: name.clone(),\n last_modified: 0,\n })),\n };\n commit = Some(br.clone());\n br\n"}]}},{"Replacement":{"inode":{"change":4,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1535,"ins":{"up_context":[{"change":2,"pos":88532}],"down_context":[{"change":4,"pos":48488}],"flag":"BLOCK","start":11080,"end":11872,"inode":{"change":4,"pos":531056}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":2,"pos":88532},"to":{"change":4,"start":564757,"end":564780},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":564757},"to":{"change":4,"start":564757,"end":564780},"introduced_by":4}],"inode":{"change":4,"pos":531056}},"ins_contents":[{"Add":" }"},{"Add":" _ => {"},{"Add":" let br = ChannelRef {"},{"Add":" r: Rc::new(RefCell::new(Channel {"},{"Add":" graph: btree::create_db_(&mut self.txn)?,"},{"Add":" changes: btree::create_db_(&mut self.txn)?,"},{"Add":" revchanges: btree::create_db_(&mut self.txn)?,"},{"Add":" states: btree::create_db_(&mut self.txn)?,"},{"Add":" apply_counter: 0,"},{"Add":" name: name.clone(),"},{"Add":" last_modified: 0,"},{"Add":" })),"},{"Add":" };"},{"Add":" commit = Some(br.clone());"},{"Add":" br"},{"Add":" }"},{"Add":" };"}],"del_contents":[{"Del":" };\n"}]}},{"Replacement":{"inode":{"change":4,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1572,"ins":{"up_context":[{"change":4,"pos":565588}],"down_context":[{"change":2,"pos":88737}],"flag":"BLOCK","start":11873,"end":12026,"inode":{"change":4,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":565588},"to":{"change":2,"start":88599,"end":88737},"introduced_by":2}],"inode":{"change":4,"pos":531056}},"ins_contents":[{"Add":" Some((name_, _)) if name_ == name.as_ref() => {"},{"Add":" Err(super::ForkError::ChannelNameExists(new_name.to_string()))"},{"Add":" }"}],"del_contents":[{"Del":" Some((name_, _)) if name_ == name.as_ref() =>\n Err(super::ForkError::ChannelNameExists(new_name.to_string())),\n"}]}},{"Replacement":{"inode":{"change":4,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1606,"ins":{"up_context":[{"change":4,"pos":566888}],"down_context":[{"change":2,"pos":89976}],"flag":"BLOCK","start":12027,"end":12180,"inode":{"change":4,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":566888},"to":{"change":2,"start":89838,"end":89976},"introduced_by":2}],"inode":{"change":4,"pos":531056}},"ins_contents":[{"Add":" Some((name_, _)) if name_ == name.as_ref() => {"},{"Add":" Err(super::ForkError::ChannelNameExists(new_name.to_string()))"},{"Add":" }"}],"del_contents":[{"Del":" Some((name_, _)) if name_ == name.as_ref() =>\n Err(super::ForkError::ChannelNameExists(new_name.to_string())),\n"}]}},{"Replacement":{"inode":{"change":4,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1616,"ins":{"up_context":[{"change":4,"pos":16014}],"down_context":[{"change":2,"pos":90204}],"flag":"BLOCK","start":12181,"end":12238,"inode":{"change":4,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":16014},"to":{"change":2,"start":90143,"end":90204},"introduced_by":2}],"inode":{"change":4,"pos":531056}},"ins_contents":[{"Add":" .map_err(|e| ForkError::Txn(e.into()))?;"}],"del_contents":[{"Del":" .map_err(|e| ForkError::Txn(e.into()))?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1623,"ins":{"up_context":[{"change":2,"pos":90423}],"down_context":[{"change":4,"pos":566916}],"flag":"BLOCK","start":12239,"end":12376,"inode":{"change":4,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":90423},"to":{"change":2,"start":90423,"end":90559},"introduced_by":2}],"inode":{"change":4,"pos":531056}},"ins_contents":[{"Add":" std::cell::RefCell::borrow_mut(&std::rc::Rc::get_mut(&mut channel.r).unwrap())"},{"Add":" .name = name.clone();"}],"del_contents":[{"Del":" std::cell::RefCell::borrow_mut(&std::rc::Rc::get_mut(&mut channel.r).unwrap()).name =\n name.clone();\n"}]}},{"Replacement":{"inode":{"change":4,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1647,"ins":{"up_context":[{"change":4,"pos":568289}],"down_context":[{"change":4,"pos":569306}],"flag":"BLOCK","start":12377,"end":13493,"inode":{"change":4,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":568289},"to":{"change":2,"start":90803,"end":92083},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":92083},"to":{"change":4,"start":569194,"end":569217},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":569194},"to":{"change":4,"start":569194,"end":569217},"introduced_by":4}],"inode":{"change":4,"pos":531056}},"ins_contents":[{"Add":" let r = match btree::get(&self.txn, &self.remotes, &name, None)? {"},{"Add":" Some((name_, remote)) if name_ == name.as_ref() => RemoteRef {"},{"Add":" db: Rc::new(RefCell::new(Remote {"},{"Add":" remote: UDb::from_page(remote.0[0].into()),"},{"Add":" rev: UDb::from_page(remote.0[1].into()),"},{"Add":" states: UDb::from_page(remote.0[2].into()),"},{"Add":" })),"},{"Add":" name: name.clone(),"},{"Add":" },"},{"Add":" _ => {"},{"Add":" let br = RemoteRef {"},{"Add":" db: Rc::new(RefCell::new(Remote {"},{"Add":" remote: btree::create_db_(&mut self.txn)?,"},{"Add":" rev: btree::create_db_(&mut self.txn)?,"},{"Add":" states: btree::create_db_(&mut self.txn)?,"},{"Add":" })),"},{"Add":" name: name.clone(),"},{"Add":" };"},{"Add":" commit = Some(br.clone());"},{"Add":" br"},{"Add":" }"},{"Add":" };"}],"del_contents":[{"Del":" let r =\n match btree::get(&self.txn, &self.remotes, &name, None)? {\n Some((name_, remote)) if name_ == name.as_ref() => {\n RemoteRef {\n db: Rc::new(RefCell::new(Remote {\n remote: UDb::from_page(remote.0[0].into()),\n rev: UDb::from_page(remote.0[1].into()),\n states: UDb::from_page(remote.0[2].into()),\n })),\n name: name.clone(),\n }\n }\n _ => {\n let br = RemoteRef {\n db: Rc::new(RefCell::new(Remote {\n remote: btree::create_db_(&mut self.txn)?,\n rev: btree::create_db_(&mut self.txn)?,\n states: btree::create_db_(&mut self.txn)?,\n })),\n name: name.clone(),\n };\n commit = Some(br.clone());\n br\n }\n"},{"Del":" };\n"}]}},{"Replacement":{"inode":{"change":4,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1716,"ins":{"up_context":[{"change":2,"pos":92526}],"down_context":[{"change":2,"pos":92598}],"flag":"BLOCK","start":13494,"end":13579,"inode":{"change":4,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":92526},"to":{"change":2,"start":92526,"end":92598},"introduced_by":2}],"inode":{"change":4,"pos":531056}},"ins_contents":[{"Add":" self.txn"},{"Add":" .set_root(Root::RevInodes as usize, self.revinodes.db);"}],"del_contents":[{"Del":" self.txn.set_root(Root::RevInodes as usize, self.revinodes.db);\n"}]}},{"Replacement":{"inode":{"change":4,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1741,"ins":{"up_context":[{"change":2,"pos":93384}],"down_context":[{"change":2,"pos":93452}],"flag":"BLOCK","start":13580,"end":13648,"inode":{"change":4,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":93384},"to":{"change":2,"start":93384,"end":93452},"introduced_by":2}],"inode":{"change":4,"pos":531056}},"ins_contents":[{"Add":" debug!(\"load_const_channel = {:?} {:?}\", name_, c);"}],"del_contents":[{"Del":" debug!(\"load_const_channel = {:?} {:?}\", name_ ,c);\n"}]}},{"Replacement":{"inode":{"change":4,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1752,"ins":{"up_context":[{"change":2,"pos":93884}],"down_context":[{"change":4,"pos":572745}],"flag":"BLOCK","start":13649,"end":13676,"inode":{"change":4,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":93884},"to":{"change":2,"start":93884,"end":93910},"introduced_by":2}],"inode":{"change":4,"pos":531056}},"ins_contents":[{"Add":" _ => Ok(None),"}],"del_contents":[{"Del":" _ => Ok(None)\n"}]}},{"Replacement":{"inode":{"change":4,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1771,"ins":{"up_context":[{"change":2,"pos":93981}],"down_context":[{"change":2,"pos":94088}],"flag":"BLOCK","start":13677,"end":13754,"inode":{"change":4,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":93981},"to":{"change":2,"start":93981,"end":94087},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":94087},"to":{"change":4,"start":573831,"end":573861},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":573831},"to":{"change":4,"start":573831,"end":573861},"introduced_by":4}],"inode":{"change":4,"pos":531056}},"ins_contents":[{"Add":" btree::del(&mut self.txn, &mut self.channels, &channel.name, None)?;"}],"del_contents":[{"Del":" btree::del(\n &mut self.txn,\n &mut self.channels,\n &channel.name,\n"},{"Del":" None,\n )?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1781,"ins":{"up_context":[{"change":2,"pos":94395}],"down_context":[{"change":2,"pos":94488}],"flag":"BLOCK","start":13755,"end":13831,"inode":{"change":4,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":94395},"to":{"change":2,"start":94395,"end":94442},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":94442},"to":{"change":4,"start":574049,"end":574081},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":574049},"to":{"change":4,"start":574049,"end":574081},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":574081},"to":{"change":2,"start":94443,"end":94487},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":94487},"to":{"change":4,"start":574393,"end":574405},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":574393},"to":{"change":4,"start":574393,"end":574405},"introduced_by":4}],"inode":{"change":4,"pos":531056}},"ins_contents":[{"Add":" btree::put(&mut self.txn, &mut self.channels, &channel.name, &t6)?;"}],"del_contents":[{"Del":" btree::put(\n &mut self.txn,\n"},{"Del":" &mut self.channels,\n"},{"Del":" &channel.name,\n &t6,\n"},{"Del":" )?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1797,"ins":{"up_context":[{"change":4,"pos":53791}],"down_context":[{"change":2,"pos":94665}],"flag":"BLOCK","start":13832,"end":13907,"inode":{"change":4,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":53791},"to":{"change":2,"start":94560,"end":94664},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":94664},"to":{"change":4,"start":575336,"end":575366},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":575336},"to":{"change":4,"start":575336,"end":575366},"introduced_by":4}],"inode":{"change":4,"pos":531056}},"ins_contents":[{"Add":" btree::del(&mut self.txn, &mut self.remotes, &remote.name, None)?;"}],"del_contents":[{"Del":" btree::del(\n &mut self.txn,\n &mut self.remotes,\n &remote.name,\n"},{"Del":" None,\n )?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1804,"ins":{"up_context":[{"change":2,"pos":94807}],"down_context":[{"change":4,"pos":575729}],"flag":"BLOCK","start":13908,"end":13984,"inode":{"change":4,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":94807},"to":{"change":2,"start":94807,"end":94945},"introduced_by":2}],"inode":{"change":4,"pos":531056}},"ins_contents":[{"Add":" &T3([r.remote.db.into(), r.rev.db.into(), r.states.db.into()]),"}],"del_contents":[{"Del":" &T3([\n r.remote.db.into(),\n r.rev.db.into(),\n r.states.db.into()\n ]),\n"}]}},{"Replacement":{"inode":{"change":4,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1862,"ins":{"up_context":[{"change":2,"pos":96056}],"down_context":[{"change":2,"pos":96109}],"flag":"BLOCK","start":13985,"end":14039,"inode":{"change":4,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":96056},"to":{"change":2,"start":96056,"end":96109},"introduced_by":2}],"inode":{"change":4,"pos":531056}},"ins_contents":[{"Add":" basename: SmallString::from_str(\"blablabla\"),"}],"del_contents":[{"Del":" basename: SmallString::from_str(\"blablabla\")\n"}]}},{"Edit":{"inode":{"change":4,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1873,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":581112},"to":{"change":4,"start":581112,"end":581113},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":581991},"to":{"change":4,"start":581991,"end":581992},"introduced_by":4}],"inode":{"change":4,"pos":531056}}},"contents":[{"Del":"\n"},{"Del":"\n"}]}},{"Replacement":{"inode":{"change":4,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1886,"ins":{"up_context":[{"change":2,"pos":96887}],"down_context":[{"change":4,"pos":583598}],"flag":"BLOCK","start":14040,"end":14064,"inode":{"change":4,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":96887},"to":{"change":2,"start":96887,"end":96910},"introduced_by":2}],"inode":{"change":4,"pos":531056}},"ins_contents":[{"Add":" ord => ord,"}],"del_contents":[{"Del":" ord => ord\n"}]}},{"Edit":{"inode":{"change":4,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1915,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":97813},"to":{"change":2,"start":97813,"end":97814},"introduced_by":2}],"inode":{"change":4,"pos":531056}}},"contents":[{"Del":"\n"}]}},{"Replacement":{"inode":{"change":4,"pos":584967},"path":"libpijul/src/pristine/path_id.rs","line":47,"ins":{"up_context":[{"change":2,"pos":98295}],"down_context":[{"change":4,"pos":586065}],"flag":"BLOCK","start":14065,"end":14211,"inode":{"change":4,"pos":584967}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":98295},"to":{"change":2,"start":98295,"end":98394},"introduced_by":2}],"inode":{"change":4,"pos":584967}},"ins_contents":[{"Add":" std::mem::transmute(std::slice::from_raw_parts("},{"Add":" self as *const Self as *const u8,"},{"Add":" len,"},{"Add":" ))"}],"del_contents":[{"Del":" std::mem::transmute(std::slice::from_raw_parts(self as *const Self as *const u8, len))\n"}]}},{"Replacement":{"inode":{"change":4,"pos":584967},"path":"libpijul/src/pristine/path_id.rs","line":59,"ins":{"up_context":[{"change":2,"pos":98481}],"down_context":[{"change":2,"pos":98534}],"flag":"BLOCK","start":14212,"end":14266,"inode":{"change":4,"pos":584967}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":98481},"to":{"change":2,"start":98481,"end":98534},"introduced_by":2}],"inode":{"change":4,"pos":584967}},"ins_contents":[{"Add":" basename: SmallString::from_str(\"blablabla\"),"}],"del_contents":[{"Del":" basename: SmallString::from_str(\"blablabla\")\n"}]}},{"Replacement":{"inode":{"change":4,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":105,"ins":{"up_context":[{"change":2,"pos":100342}],"down_context":[{"change":2,"pos":100457}],"flag":"BLOCK","start":14267,"end":14362,"inode":{"change":4,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":100342},"to":{"change":2,"start":100342,"end":100457},"introduced_by":2}],"inode":{"change":4,"pos":586748}},"ins_contents":[{"Add":" unsafe { std::ptr::copy_nonoverlapping(s.as_ptr(), &mut u as *mut u64 as *mut u8, 8) }"}],"del_contents":[{"Del":" unsafe {\n std::ptr::copy_nonoverlapping(s.as_ptr(), &mut u as *mut u64 as *mut u8, 8)\n }\n"}]}},{"Edit":{"inode":{"change":4,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":116,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":100688},"to":{"change":2,"start":100688,"end":100689},"introduced_by":2}],"inode":{"change":4,"pos":586748}}},"contents":[{"Del":"\n"}]}},{"Edit":{"inode":{"change":4,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":124,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":100887},"to":{"change":2,"start":100887,"end":100888},"introduced_by":2}],"inode":{"change":4,"pos":586748}}},"contents":[{"Del":"\n"}]}},{"Edit":{"inode":{"change":4,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":131,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":587268},"to":{"change":2,"start":101016,"end":101017},"introduced_by":2}],"inode":{"change":4,"pos":586748}}},"contents":[{"Del":"\n"}]}},{"Replacement":{"inode":{"change":4,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":224,"ins":{"up_context":[{"change":4,"pos":54628}],"down_context":[{"change":4,"pos":54719}],"flag":"BLOCK","start":14363,"end":14489,"inode":{"change":4,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":54628},"to":{"change":2,"start":101082,"end":101185},"introduced_by":2}],"inode":{"change":4,"pos":586748}},"ins_contents":[{"Add":" fn get_external("},{"Add":" &self,"},{"Add":" p: &ChangeId,"},{"Add":" ) -> Result, TxnErr>;"}],"del_contents":[{"Del":" fn get_external(&self, p: &ChangeId) -> Result, TxnErr>;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":231,"ins":{"up_context":[{"change":4,"pos":54836}],"down_context":[{"change":4,"pos":48878}],"flag":"BLOCK","start":14490,"end":14616,"inode":{"change":4,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":54836},"to":{"change":2,"start":101186,"end":101289},"introduced_by":2}],"inode":{"change":4,"pos":586748}},"ins_contents":[{"Add":" fn get_internal("},{"Add":" &self,"},{"Add":" p: &SerializedHash,"},{"Add":" ) -> Result, TxnErr>;"}],"del_contents":[{"Del":" fn get_internal(&self, p: &SerializedHash) -> Result, TxnErr>;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":321,"ins":{"up_context":[{"change":4,"pos":51355}],"down_context":[{"change":4,"pos":51443}],"flag":"BLOCK","start":14617,"end":14790,"inode":{"change":4,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":51355},"to":{"change":2,"start":102192,"end":102294},"introduced_by":2}],"inode":{"change":4,"pos":586748}},"ins_contents":[{"Add":" RevCursor<"},{"Add":" Self,"},{"Add":" &'txn Self,"},{"Add":" Self::RevchangesetCursor,"},{"Add":" L64,"},{"Add":" Pair,"},{"Add":" >,"}],"del_contents":[{"Del":" RevCursor>,\n"}]}},{"Replacement":{"inode":{"change":4,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":517,"ins":{"up_context":[{"change":4,"pos":59143}],"down_context":[{"change":4,"pos":59221}],"flag":"BLOCK","start":14791,"end":14964,"inode":{"change":4,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":59143},"to":{"change":2,"start":103426,"end":103528},"introduced_by":2}],"inode":{"change":4,"pos":586748}},"ins_contents":[{"Add":" RevCursor<"},{"Add":" Self,"},{"Add":" &'txn Self,"},{"Add":" Self::RemoteCursor,"},{"Add":" L64,"},{"Add":" Pair,"},{"Add":" >,"}],"del_contents":[{"Del":" RevCursor>,\n"}]}},{"Replacement":{"inode":{"change":4,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":683,"ins":{"up_context":[{"change":2,"pos":104012}],"down_context":[{"change":4,"pos":2878}],"flag":"BLOCK","start":14965,"end":15095,"inode":{"change":4,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":104012},"to":{"change":2,"start":104012,"end":104129},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":104129},"to":{"change":4,"start":62542,"end":62544},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":62542},"to":{"change":4,"start":62542,"end":62544},"introduced_by":4}],"inode":{"change":4,"pos":586748}},"ins_contents":[{"Add":") -> Result<"},{"Add":" Cursor>,"},{"Add":" TxnErr,"},{"Add":"> {"}],"del_contents":[{"Del":") -> Result>, TxnErr>\n"},{"Del":"{\n"}]}},{"Replacement":{"inode":{"change":4,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":726,"ins":{"up_context":[{"change":4,"pos":63629}],"down_context":[{"change":4,"pos":41239}],"flag":"BLOCK","start":15096,"end":15247,"inode":{"change":4,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":63629},"to":{"change":2,"start":104276,"end":104380},"introduced_by":2}],"inode":{"change":4,"pos":586748}},"ins_contents":[{"Add":" iter: T::cursor_revchangeset_ref("},{"Add":" txn,"},{"Add":" txn.rev_changes(&channel),"},{"Add":" Some(from_timestamp.into()),"},{"Add":" )?,"}],"del_contents":[{"Del":" iter: T::cursor_revchangeset_ref(txn, txn.rev_changes(&channel), Some(from_timestamp.into()))?,\n"}]}},{"Replacement":{"inode":{"change":4,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":748,"ins":{"up_context":[{"change":4,"pos":63962}],"down_context":[{"change":4,"pos":41610}],"flag":"BLOCK","start":15248,"end":15361,"inode":{"change":4,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":63962},"to":{"change":2,"start":104381,"end":104481},"introduced_by":2}],"inode":{"change":4,"pos":586748}},"ins_contents":[{"Add":" iter: txn"},{"Add":" .rev_cursor_revchangeset(txn.rev_changes(&channel), Some(from_timestamp.into()))?,"}],"del_contents":[{"Del":" iter: txn.rev_cursor_revchangeset(txn.rev_changes(&channel), Some(from_timestamp.into()))?,\n"}]}},{"Replacement":{"inode":{"change":4,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1191,"ins":{"up_context":[{"change":4,"pos":620373}],"down_context":[{"change":4,"pos":54784}],"flag":"BLOCK","start":15362,"end":15455,"inode":{"change":4,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":620373},"to":{"change":2,"start":107460,"end":107551},"introduced_by":2}],"inode":{"change":4,"pos":586748}},"ins_contents":[{"Add":"pub struct Cursor, Cursor, K: ?Sized, V: ?Sized> {"}],"del_contents":[{"Del":"pub struct Cursor, Cursor, K:?Sized, V:?Sized> {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1199,"ins":{"up_context":[{"change":4,"pos":620582}],"down_context":[{"change":4,"pos":54879}],"flag":"BLOCK","start":15456,"end":15552,"inode":{"change":4,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":620582},"to":{"change":2,"start":107673,"end":107767},"introduced_by":2}],"inode":{"change":4,"pos":586748}},"ins_contents":[{"Add":"pub struct RevCursor, Cursor, K: ?Sized, V: ?Sized> {"}],"del_contents":[{"Del":"pub struct RevCursor, Cursor, K:?Sized, V:?Sized> {\n"}]}},{"Edit":{"inode":{"change":4,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1225,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":68241}],"down_context":[{"change":4,"pos":68241}],"flag":"BLOCK","start":15553,"end":15635,"inode":{"change":4,"pos":586748}}},"contents":[{"Add":"initialized_cursor!(partials, SmallStr, Position, TreeTxnT, TreeError);"}]}},{"Edit":{"inode":{"change":4,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1227,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":68262},"to":{"change":4,"start":68262,"end":68276},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":68276},"to":{"change":2,"start":108188,"end":108202},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":108202},"to":{"change":4,"start":68293,"end":68369},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":68293},"to":{"change":4,"start":68293,"end":68369},"introduced_by":4}],"inode":{"change":4,"pos":586748}}},"contents":[{"Del":" partials,\n"},{"Del":" SmallStr,\n"},{"Del":" Position,\n TreeTxnT,\n TreeError\n);\ninitialized_cursor!(\n"}]}},{"Replacement":{"inode":{"change":4,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1302,"ins":{"up_context":[{"change":2,"pos":108947}],"down_context":[{"change":4,"pos":70696}],"flag":"BLOCK","start":15636,"end":15913,"inode":{"change":4,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":108947},"to":{"change":2,"start":108947,"end":109061},"introduced_by":2}],"inode":{"change":4,"pos":586748}},"ins_contents":[{"Add":" Ok(true) => {"},{"Add":" return self"},{"Add":" .txn"},{"Add":" .get_external(&changeid)"},{"Add":" .transpose()"},{"Add":" .map(|x| x.map(|x| x.into()))"},{"Add":" }"}],"del_contents":[{"Del":" Ok(true) => return self.txn.get_external(&changeid).transpose().map(|x| x.map(|x| x.into())),\n"}]}},{"Replacement":{"inode":{"change":4,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1346,"ins":{"up_context":[{"change":2,"pos":109358}],"down_context":[{"change":4,"pos":71726}],"flag":"BLOCK","start":15914,"end":16189,"inode":{"change":4,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":109358},"to":{"change":2,"start":109358,"end":109470},"introduced_by":2}],"inode":{"change":4,"pos":586748}},"ins_contents":[{"Add":" Ok(true) => {"},{"Add":" return self"},{"Add":" .txn"},{"Add":" .get_external(&changeid)"},{"Add":" .transpose()"},{"Add":" .map(|x| x.map(From::from))"},{"Add":" }"}],"del_contents":[{"Del":" Ok(true) => return self.txn.get_external(&changeid).transpose().map(|x| x.map(From::from)),\n"}]}},{"Replacement":{"inode":{"change":4,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1638,"ins":{"up_context":[{"change":2,"pos":110178}],"down_context":[{"change":4,"pos":52831}],"flag":"BLOCK","start":16190,"end":16327,"inode":{"change":4,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":110178},"to":{"change":2,"start":110178,"end":110256},"introduced_by":2}],"inode":{"change":4,"pos":586748}},"ins_contents":[{"Add":" Some(&SerializedEdge::new("},{"Add":" flag,"},{"Add":" k1.change,"},{"Add":" k1.start,"},{"Add":" introduced_by,"},{"Add":" )),"}],"del_contents":[{"Del":" Some(&SerializedEdge::new(flag, k1.change, k1.start, introduced_by)),\n"}]}},{"Replacement":{"inode":{"change":4,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1648,"ins":{"up_context":[{"change":2,"pos":110270}],"down_context":[{"change":4,"pos":53117}],"flag":"BLOCK","start":16328,"end":16483,"inode":{"change":4,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":110270},"to":{"change":2,"start":110270,"end":110366},"introduced_by":2}],"inode":{"change":4,"pos":586748}},"ins_contents":[{"Add":" Some(&SerializedEdge::new("},{"Add":" flag | EdgeFlags::PARENT,"},{"Add":" k0.change,"},{"Add":" k0.end,"},{"Add":" introduced_by,"},{"Add":" )),"}],"del_contents":[{"Del":" Some(&SerializedEdge::new(flag | EdgeFlags::PARENT, k0.change, k0.end, introduced_by)),\n"}]}},{"Replacement":{"inode":{"change":4,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1656,"ins":{"up_context":[{"change":2,"pos":110399}],"down_context":[{"change":2,"pos":110494}],"flag":"BLOCK","start":16484,"end":16613,"inode":{"change":4,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":110399},"to":{"change":2,"start":110399,"end":110494},"introduced_by":2}],"inode":{"change":4,"pos":586748}},"ins_contents":[{"Add":" panic!("},{"Add":" \"Failed: {:?} {:?} for {:?} {:?} {:?} {:?}\","},{"Add":" a, b, flag, k0, k1, introduced_by"},{"Add":" )"}],"del_contents":[{"Del":" panic!(\"Failed: {:?} {:?} for {:?} {:?} {:?} {:?}\", a, b, flag, k0, k1, introduced_by)\n"}]}},{"Replacement":{"inode":{"change":4,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1683,"ins":{"up_context":[{"change":2,"pos":110514}],"down_context":[{"change":4,"pos":53969}],"flag":"BLOCK","start":16614,"end":16686,"inode":{"change":4,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":110514},"to":{"change":2,"start":110514,"end":110585},"introduced_by":2}],"inode":{"change":4,"pos":586748}},"ins_contents":[{"Add":" &SerializedEdge::new(flag, k1.change, k1.start, introduced_by),"}],"del_contents":[{"Del":" &SerializedEdge::new(flag, k1.change, k1.start, introduced_by)\n"}]}},{"Replacement":{"inode":{"change":4,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1777,"ins":{"up_context":[{"change":4,"pos":3974}],"down_context":[{"change":2,"pos":111724}],"flag":"BLOCK","start":16687,"end":16717,"inode":{"change":4,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":3974},"to":{"change":2,"start":111693,"end":111724},"introduced_by":2}],"inode":{"change":4,"pos":586748}},"ins_contents":[{"Add":" let (&b, state) = e?;"}],"del_contents":[{"Del":" let (&b, state) = e?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":638683},"path":"libpijul/src/pristine/merkle.rs","line":100,"ins":{"up_context":[{"change":2,"pos":112756}],"down_context":[{"change":2,"pos":112966}],"flag":"BLOCK","start":16718,"end":16896,"inode":{"change":4,"pos":638683}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":112756},"to":{"change":2,"start":112756,"end":112966},"introduced_by":2}],"inode":{"change":4,"pos":638683}},"ins_contents":[{"Add":" (self.0)[0] == MerkleAlgorithm::Ed25519 as u8 && {"},{"Add":" let q = q.compress();"},{"Add":" q.as_bytes() == &(self.0)[1..]"},{"Add":" }"}],"del_contents":[{"Del":" (self.0)[0] == MerkleAlgorithm::Ed25519 as u8\n && {\n let q = q.compress();\n q.as_bytes() == &(self.0)[1..]\n }\n"}]}},{"Replacement":{"inode":{"change":4,"pos":644439},"path":"libpijul/src/pristine/hash.rs","line":159,"ins":{"up_context":[{"change":2,"pos":114941}],"down_context":[{"change":2,"pos":114950}],"flag":"BLOCK","start":16897,"end":16907,"inode":{"change":4,"pos":644439}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":114941},"to":{"change":2,"start":114941,"end":114950},"introduced_by":2}],"inode":{"change":4,"pos":644439}},"ins_contents":[{"Add":" h: H,"}],"del_contents":[{"Del":" h: H\n"}]}},{"Replacement":{"inode":{"change":4,"pos":644439},"path":"libpijul/src/pristine/hash.rs","line":191,"ins":{"up_context":[{"change":2,"pos":115671}],"down_context":[{"change":2,"pos":115690}],"flag":"BLOCK","start":16908,"end":16928,"inode":{"change":4,"pos":644439}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":115671},"to":{"change":2,"start":115671,"end":115690},"introduced_by":2}],"inode":{"change":4,"pos":644439}},"ins_contents":[{"Add":" o => o,"}],"del_contents":[{"Del":" o => o\n"}]}},{"Replacement":{"inode":{"change":4,"pos":644439},"path":"libpijul/src/pristine/hash.rs","line":249,"ins":{"up_context":[{"change":2,"pos":117119}],"down_context":[{"change":2,"pos":117133}],"flag":"BLOCK","start":16929,"end":16944,"inode":{"change":4,"pos":644439}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":117119},"to":{"change":2,"start":117119,"end":117133},"introduced_by":2}],"inode":{"change":4,"pos":644439}},"ins_contents":[{"Add":" },"}],"del_contents":[{"Del":" }\n"}]}},{"Replacement":{"inode":{"change":4,"pos":648958},"path":"libpijul/src/pristine/edge.rs","line":89,"ins":{"up_context":[{"change":2,"pos":117505}],"down_context":[{"change":2,"pos":117634}],"flag":"BLOCK","start":16945,"end":17156,"inode":{"change":4,"pos":648958}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":117505},"to":{"change":2,"start":117505,"end":117634},"introduced_by":2}],"inode":{"change":4,"pos":648958}},"ins_contents":[{"Add":" write!("},{"Add":" fmt,"},{"Add":" \"E({:?}, {}[{}], {})\","},{"Add":" self.flag(),"},{"Add":" pos.change.to_base32(),"},{"Add":" (pos.pos.0).0,"},{"Add":" self.introduced_by().to_base32()"},{"Add":" )"}],"del_contents":[{"Del":" write!(fmt, \"E({:?}, {}[{}], {})\", self.flag(), pos.change.to_base32(), (pos.pos.0).0, self.introduced_by().to_base32())\n"}]}},{"Replacement":{"inode":{"change":4,"pos":648958},"path":"libpijul/src/pristine/edge.rs","line":116,"ins":{"up_context":[{"change":2,"pos":118186}],"down_context":[{"change":2,"pos":118257}],"flag":"BLOCK","start":17157,"end":17229,"inode":{"change":4,"pos":648958}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":118186},"to":{"change":2,"start":118186,"end":118257},"introduced_by":2}],"inode":{"change":4,"pos":648958}},"ins_contents":[{"Add":" pos: ChangePosition(L64((pos & 0xffffffffffffff).to_le())),"}],"del_contents":[{"Del":" pos: ChangePosition(L64((pos & 0xffffffffffffff).to_le()))\n"}]}},{"Replacement":{"inode":{"change":4,"pos":648958},"path":"libpijul/src/pristine/edge.rs","line":141,"ins":{"up_context":[{"change":2,"pos":118845}],"down_context":[{"change":2,"pos":118875}],"flag":"BLOCK","start":17230,"end":17261,"inode":{"change":4,"pos":648958}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":118845},"to":{"change":2,"start":118845,"end":118875},"introduced_by":2}],"inode":{"change":4,"pos":648958}},"ins_contents":[{"Add":" s.introduced_by.0,"}],"del_contents":[{"Del":" s.introduced_by.0\n"}]}},{"Replacement":{"inode":{"change":4,"pos":648958},"path":"libpijul/src/pristine/edge.rs","line":162,"ins":{"up_context":[{"change":2,"pos":119421}],"down_context":[{"change":2,"pos":119541}],"flag":"BLOCK","start":17262,"end":17430,"inode":{"change":4,"pos":648958}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":119421},"to":{"change":2,"start":119421,"end":119541},"introduced_by":2}],"inode":{"change":4,"pos":648958}},"ins_contents":[{"Add":" assert!(pos < 1 << 56);"},{"Add":" SerializedEdge(["},{"Add":" (pos | ((flag.bits() as u64) << 56)).into(),"},{"Add":" change.0,"},{"Add":" intro.0,"},{"Add":" ])"}],"del_contents":[{"Del":" assert!(pos < 1 <<56);\n SerializedEdge([(pos | ((flag.bits() as u64) << 56)).into(), change.0, intro.0])\n"}]}},{"Replacement":{"inode":{"change":4,"pos":666427},"path":"libpijul/src/pristine/change_id.rs","line":1,"ins":{"up_context":[{"change":4,"pos":666427}],"down_context":[{"change":4,"pos":666544}],"flag":"BLOCK","start":17431,"end":17457,"inode":{"change":4,"pos":666427}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":666427},"to":{"change":2,"start":119548,"end":119574},"introduced_by":2}],"inode":{"change":4,"pos":666427}},"ins_contents":[{"Add":"use super::{Base32, L64};"}],"del_contents":[{"Del":"use super::{L64, Base32};\n"}]}},{"Replacement":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":311,"ins":{"up_context":[{"change":2,"pos":120919}],"down_context":[{"change":4,"pos":682528}],"flag":"BLOCK","start":17458,"end":17555,"inode":{"change":4,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":120919},"to":{"change":2,"start":120919,"end":120981},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":120981},"to":{"change":4,"start":4834,"end":4886},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":4834},"to":{"change":4,"start":4834,"end":4886},"introduced_by":4}],"inode":{"change":4,"pos":671807}},"ins_contents":[{"Add":" crate::fs::rec_delete(txn, &file_id, inode, true).map_err(PristineOutputError::Fs)?;"}],"del_contents":[{"Del":" crate::fs::rec_delete(txn, &file_id, inode, true)\n"},{"Del":" .map_err(PristineOutputError::Fs)?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":686190},"path":"libpijul/src/output/mod.rs","line":124,"ins":{"up_context":[{"change":4,"pos":24856}],"down_context":[{"change":4,"pos":86543}],"flag":"BLOCK","start":17556,"end":17727,"inode":{"change":4,"pos":686190}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":24856},"to":{"change":2,"start":122090,"end":122198},"introduced_by":2}],"inode":{"change":4,"pos":686190}},"ins_contents":[{"Add":" .get_contents("},{"Add":" |h| txn.get_external(&h).unwrap().map(|x| x.into()),"},{"Add":" *name_vertex,"},{"Add":" &mut name_buf,"},{"Add":" )"}],"del_contents":[{"Del":" .get_contents(|h| txn.get_external(&h).unwrap().map(|x| x.into()), *name_vertex, &mut name_buf)\n"}]}},{"Replacement":{"inode":{"change":4,"pos":696460},"path":"libpijul/src/missing_context.rs","line":229,"ins":{"up_context":[{"change":4,"pos":12667}],"down_context":[{"change":4,"pos":12762}],"flag":"BLOCK","start":17728,"end":17856,"inode":{"change":4,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":12667},"to":{"change":2,"start":123506,"end":123614},"introduced_by":2}],"inode":{"change":4,"pos":696460}},"ins_contents":[{"Add":" if v.introduced_by() == change_id"},{"Add":" || known(txn.get_external(&v.introduced_by())?.unwrap().into())"},{"Add":" {"}],"del_contents":[{"Del":" if v.introduced_by() == change_id || known(txn.get_external(&v.introduced_by())?.unwrap().into()) {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":696460},"path":"libpijul/src/missing_context.rs","line":529,"ins":{"up_context":[{"change":2,"pos":125543}],"down_context":[{"change":4,"pos":715147}],"flag":"BLOCK","start":17857,"end":17941,"inode":{"change":4,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":125543},"to":{"change":2,"start":125543,"end":125614},"introduced_by":2}],"inode":{"change":4,"pos":696460}},"ins_contents":[{"Add":" ws.unknown_parents"},{"Add":" .push((dest_vertex, p, inode, edge.flag()));"}],"del_contents":[{"Del":" ws.unknown_parents.push((dest_vertex, p, inode, edge.flag()));\n"}]}},{"Replacement":{"inode":{"change":4,"pos":717381},"path":"libpijul/src/lib.rs","line":646,"ins":{"up_context":[{"change":4,"pos":99689}],"down_context":[{"change":4,"pos":734553}],"flag":"BLOCK","start":17942,"end":18161,"inode":{"change":4,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":99689},"to":{"change":2,"start":128510,"end":128624},"introduced_by":2}],"inode":{"change":4,"pos":717381}},"ins_contents":[{"Add":" type Item = Result<"},{"Add":" ("},{"Add":" u64,"},{"Add":" ("},{"Add":" &'txn pristine::SerializedHash,"},{"Add":" &'txn pristine::SerializedMerkle,"},{"Add":" ),"},{"Add":" ),"},{"Add":" T::GraphError,"},{"Add":" >;"}],"del_contents":[{"Del":" type Item = Result<(u64, (&'txn pristine::SerializedHash, &'txn pristine::SerializedMerkle)), T::GraphError>;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":717381},"path":"libpijul/src/lib.rs","line":684,"ins":{"up_context":[{"change":4,"pos":100355}],"down_context":[{"change":4,"pos":735067}],"flag":"BLOCK","start":18162,"end":18381,"inode":{"change":4,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":100355},"to":{"change":2,"start":128945,"end":129059},"introduced_by":2}],"inode":{"change":4,"pos":717381}},"ins_contents":[{"Add":" type Item = Result<"},{"Add":" ("},{"Add":" u64,"},{"Add":" ("},{"Add":" &'txn pristine::SerializedHash,"},{"Add":" &'txn pristine::SerializedMerkle,"},{"Add":" ),"},{"Add":" ),"},{"Add":" T::GraphError,"},{"Add":" >;"}],"del_contents":[{"Del":" type Item = Result<(u64, (&'txn pristine::SerializedHash, &'txn pristine::SerializedMerkle)), T::GraphError>;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":737429},"path":"libpijul/src/fs.rs","line":331,"ins":{"up_context":[{"change":4,"pos":748566}],"down_context":[{"change":4,"pos":748693}],"flag":"BLOCK","start":18382,"end":18450,"inode":{"change":4,"pos":737429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":748566},"to":{"change":4,"start":748566,"end":748631},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":748631},"to":{"change":2,"start":131139,"end":131159},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":131159},"to":{"change":4,"start":748664,"end":748693},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":748664},"to":{"change":4,"start":748664,"end":748693},"introduced_by":4}],"inode":{"change":4,"pos":737429}},"ins_contents":[{"Add":" debug!(\"rec_delete: {:?} {:?} not present\", parent, inode);"}],"del_contents":[{"Del":" debug!(\n \"rec_delete: {:?} {:?} not present\",\n"},{"Del":" parent,\n"},{"Del":" inode\n );\n"}]}},{"Replacement":{"inode":{"change":4,"pos":737429},"path":"libpijul/src/fs.rs","line":569,"ins":{"up_context":[{"change":4,"pos":109779}],"down_context":[{"change":4,"pos":109860}],"flag":"BLOCK","start":18451,"end":18615,"inode":{"change":4,"pos":737429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":109779},"to":{"change":2,"start":131957,"end":132058},"introduced_by":2}],"inode":{"change":4,"pos":737429}},"ins_contents":[{"Add":" .get_contents("},{"Add":" |p| self.txn.get_external(&p).unwrap().map(|x| x.into()),"},{"Add":" *dest,"},{"Add":" &mut buf,"},{"Add":" )"}],"del_contents":[{"Del":" .get_contents(|p| self.txn.get_external(&p).unwrap().map(|x| x.into()), *dest, &mut buf)\n"}]}},{"Replacement":{"inode":{"change":4,"pos":737429},"path":"libpijul/src/fs.rs","line":653,"ins":{"up_context":[{"change":4,"pos":111342}],"down_context":[{"change":4,"pos":755231}],"flag":"BLOCK","start":18616,"end":18754,"inode":{"change":4,"pos":737429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":111342},"to":{"change":2,"start":132151,"end":132238},"introduced_by":2}],"inode":{"change":4,"pos":737429}},"ins_contents":[{"Add":" let dest = self"},{"Add":" .txn"},{"Add":" .find_block_end(&self.channel, parent.dest())"},{"Add":" .unwrap();"}],"del_contents":[{"Del":" let dest = self.txn.find_block_end(&self.channel, parent.dest()).unwrap();\n"}]}},{"Replacement":{"inode":{"change":4,"pos":737429},"path":"libpijul/src/fs.rs","line":659,"ins":{"up_context":[{"change":4,"pos":755328}],"down_context":[{"change":4,"pos":755404}],"flag":"BLOCK","start":18755,"end":18939,"inode":{"change":4,"pos":737429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":755328},"to":{"change":2,"start":132239,"end":132344},"introduced_by":2}],"inode":{"change":4,"pos":737429}},"ins_contents":[{"Add":" .get_contents("},{"Add":" |p| self.txn.get_external(&p).unwrap().map(|x| x.into()),"},{"Add":" *dest,"},{"Add":" &mut buf,"},{"Add":" )"}],"del_contents":[{"Del":" .get_contents(|p| self.txn.get_external(&p).unwrap().map(|x| x.into()), *dest, &mut buf)\n"}]}},{"Replacement":{"inode":{"change":4,"pos":737429},"path":"libpijul/src/fs.rs","line":677,"ins":{"up_context":[{"change":4,"pos":111529}],"down_context":[{"change":4,"pos":111628}],"flag":"BLOCK","start":18940,"end":19088,"inode":{"change":4,"pos":737429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":111529},"to":{"change":2,"start":132369,"end":132470},"introduced_by":2}],"inode":{"change":4,"pos":737429}},"ins_contents":[{"Add":" Some(Ok(grandparent)) => {"},{"Add":" return Some(Ok((grandparent.dest(), perms, basename)))"},{"Add":" }"}],"del_contents":[{"Del":" Some(Ok(grandparent)) => return Some(Ok((grandparent.dest(), perms, basename))),\n"}]}},{"Replacement":{"inode":{"change":4,"pos":737429},"path":"libpijul/src/fs.rs","line":796,"ins":{"up_context":[{"change":4,"pos":32131}],"down_context":[{"change":4,"pos":113593}],"flag":"BLOCK","start":19089,"end":19278,"inode":{"change":4,"pos":737429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":32131},"to":{"change":2,"start":132797,"end":132907},"introduced_by":2}],"inode":{"change":4,"pos":737429}},"ins_contents":[{"Add":" .get_contents("},{"Add":" |h| txn.get_external(&h).unwrap().map(|x| x.into()),"},{"Add":" *name_dest,"},{"Add":" &mut name_buf,"},{"Add":" )"}],"del_contents":[{"Del":" .get_contents(|h| txn.get_external(&h).unwrap().map(|x| x.into()), *name_dest, &mut name_buf)\n"}]}},{"Replacement":{"inode":{"change":4,"pos":737429},"path":"libpijul/src/fs.rs","line":890,"ins":{"up_context":[{"change":4,"pos":114694}],"down_context":[{"change":4,"pos":114779}],"flag":"BLOCK","start":19279,"end":19463,"inode":{"change":4,"pos":737429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":114694},"to":{"change":2,"start":133674,"end":133779},"introduced_by":2}],"inode":{"change":4,"pos":737429}},"ins_contents":[{"Add":" .get_contents("},{"Add":" |h| txn.get_external(&h).unwrap().map(|x| x.into()),"},{"Add":" *name,"},{"Add":" &mut name_buf,"},{"Add":" )"}],"del_contents":[{"Del":" .get_contents(|h| txn.get_external(&h).unwrap().map(|x| x.into()), *name, &mut name_buf)\n"}]}},{"Replacement":{"inode":{"change":4,"pos":768903},"path":"libpijul/src/diff/vertex_buffer.rs","line":97,"ins":{"up_context":[{"change":4,"pos":771983}],"down_context":[{"change":4,"pos":772101}],"flag":"BLOCK","start":19464,"end":19559,"inode":{"change":4,"pos":768903}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":771983},"to":{"change":4,"start":771983,"end":772005},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":772005},"to":{"change":2,"start":135510,"end":135599},"introduced_by":2}],"inode":{"change":4,"pos":768903}},"ins_contents":[{"Add":" v.start = ChangePosition(self.pos_a[i].vertex.start.0 + (pos - self.pos_a[i].pos))"}],"del_contents":[{"Del":" v.start =\n"},{"Del":" ChangePosition(self.pos_a[i].vertex.start.0 + (pos - self.pos_a[i].pos))\n"}]}},{"Replacement":{"inode":{"change":4,"pos":768903},"path":"libpijul/src/diff/vertex_buffer.rs","line":100,"ins":{"up_context":[{"change":4,"pos":772185}],"down_context":[{"change":4,"pos":772305}],"flag":"BLOCK","start":19560,"end":19657,"inode":{"change":4,"pos":768903}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":772185},"to":{"change":4,"start":772185,"end":772205},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":772205},"to":{"change":2,"start":135600,"end":135693},"introduced_by":2}],"inode":{"change":4,"pos":768903}},"ins_contents":[{"Add":" v.end = ChangePosition(self.pos_a[i].vertex.start.0 + (end_pos - self.pos_a[i].pos))"}],"del_contents":[{"Del":" v.end =\n"},{"Del":" ChangePosition(self.pos_a[i].vertex.start.0 + (end_pos - self.pos_a[i].pos))\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":966,"ins":{"up_context":[{"change":4,"pos":860639}],"down_context":[{"change":4,"pos":860716}],"flag":"BLOCK","start":19658,"end":19856,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":860639},"to":{"change":2,"start":139573,"end":139684},"introduced_by":2}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" change: up"},{"Add":" .change"},{"Add":" .as_ref()"},{"Add":" .and_then(|a| txn.get_external(a).unwrap().map(Into::into)),"}],"del_contents":[{"Del":" change: up.change.as_ref().and_then(|a| txn.get_external(a).unwrap().map(Into::into)),\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":976,"ins":{"up_context":[{"change":4,"pos":860923}],"down_context":[{"change":4,"pos":861002}],"flag":"BLOCK","start":19857,"end":20057,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":860923},"to":{"change":2,"start":139685,"end":139798},"introduced_by":2}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" change: down"},{"Add":" .change"},{"Add":" .as_ref()"},{"Add":" .and_then(|a| txn.get_external(a).unwrap().map(Into::into)),"}],"del_contents":[{"Del":" change: down.change.as_ref().and_then(|a| txn.get_external(a).unwrap().map(Into::into)),\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":987,"ins":{"up_context":[{"change":4,"pos":861217}],"down_context":[{"change":4,"pos":861293}],"flag":"BLOCK","start":20058,"end":20243,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":861217},"to":{"change":2,"start":139799,"end":139909},"introduced_by":2}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" change: inode"},{"Add":" .change"},{"Add":" .as_ref()"},{"Add":" .and_then(|a| txn.get_external(a).unwrap().map(Into::into)),"}],"del_contents":[{"Del":" change: inode.change.as_ref().and_then(|a| txn.get_external(a).unwrap().map(Into::into)),\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":1001,"ins":{"up_context":[{"change":4,"pos":861673}],"down_context":[{"change":4,"pos":861761}],"flag":"BLOCK","start":20244,"end":20498,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":861673},"to":{"change":2,"start":139910,"end":140032},"introduced_by":2}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" change: edge"},{"Add":" .from"},{"Add":" .change"},{"Add":" .as_ref()"},{"Add":" .and_then(|a| txn.get_external(a).unwrap().map(Into::into)),"}],"del_contents":[{"Del":" change: edge.from.change.as_ref().and_then(|a| txn.get_external(a).unwrap().map(Into::into)),\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":1009,"ins":{"up_context":[{"change":4,"pos":861873}],"down_context":[{"change":4,"pos":861959}],"flag":"BLOCK","start":20499,"end":20751,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":861873},"to":{"change":2,"start":140033,"end":140153},"introduced_by":2}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" change: edge"},{"Add":" .to"},{"Add":" .change"},{"Add":" .as_ref()"},{"Add":" .and_then(|a| txn.get_external(a).unwrap().map(Into::into)),"}],"del_contents":[{"Del":" change: edge.to.change.as_ref().and_then(|a| txn.get_external(a).unwrap().map(Into::into)),\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":1027,"ins":{"up_context":[{"change":4,"pos":862500}],"down_context":[{"change":4,"pos":862576}],"flag":"BLOCK","start":20752,"end":20937,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":862500},"to":{"change":2,"start":140274,"end":140384},"introduced_by":2}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" change: inode"},{"Add":" .change"},{"Add":" .as_ref()"},{"Add":" .and_then(|a| txn.get_external(a).unwrap().map(Into::into)),"}],"del_contents":[{"Del":" change: inode.change.as_ref().and_then(|a| txn.get_external(a).unwrap().map(Into::into)),\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":325,"ins":{"up_context":[{"change":4,"pos":48973}],"down_context":[{"change":4,"pos":49166}],"flag":"BLOCK","start":20938,"end":21104,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":48973},"to":{"change":4,"start":48973,"end":49025},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":49025},"to":{"change":2,"start":140484,"end":140560},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":140560},"to":{"change":4,"start":49113,"end":49166},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":49113},"to":{"change":4,"start":49113,"end":49166},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" let name ="},{"Add":" std::str::from_utf8(&change_contents[add.start.us() + 2..add.end.us()])"},{"Add":" .unwrap();"}],"del_contents":[{"Del":" let name = std::str::from_utf8(\n"},{"Del":" &change_contents[add.start.us() + 2..add.end.us()],\n"},{"Del":" )\n .unwrap();\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":399,"ins":{"up_context":[{"change":4,"pos":51864}],"down_context":[{"change":4,"pos":52053}],"flag":"BLOCK","start":21105,"end":21239,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":51864},"to":{"change":4,"start":51864,"end":51916},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":51916},"to":{"change":2,"start":140640,"end":140712},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":140712},"to":{"change":4,"start":52000,"end":52053},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":52000},"to":{"change":4,"start":52000,"end":52053},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" let name = std::str::from_utf8(&change_contents[n.start.us() + 2..n.end.us()])"},{"Add":" .unwrap();"}],"del_contents":[{"Del":" let name = std::str::from_utf8(\n"},{"Del":" &change_contents[n.start.us() + 2..n.end.us()],\n"},{"Del":" )\n .unwrap();\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":811,"ins":{"up_context":[{"change":4,"pos":216}],"down_context":[{"change":2,"pos":141703}],"flag":"BLOCK","start":21240,"end":21312,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":216},"to":{"change":2,"start":141630,"end":141703},"introduced_by":2}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" if contents_[c.end.us() - 1] == b'\\n' {"}],"del_contents":[{"Del":" if contents_[c.end.us() - 1] == b'\\n' {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":921,"ins":{"up_context":[{"change":4,"pos":73938}],"down_context":[{"change":4,"pos":313}],"flag":"BLOCK","start":21313,"end":21413,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":73938},"to":{"change":4,"start":175,"end":232},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":232},"to":{"change":2,"start":141869,"end":141944},"introduced_by":2}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" if change.end > change.start && contents_[change.end.us() - 1] == b'\\n'"}],"del_contents":[{"Del":" if change.end > change.start\n"},{"Del":" && contents_[change.end.us() - 1] == b'\\n'\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":958,"ins":{"up_context":[{"change":4,"pos":75755}],"down_context":[{"change":2,"pos":142205}],"flag":"BLOCK","start":21414,"end":21510,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":75755},"to":{"change":2,"start":142110,"end":142204},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":142204},"to":{"change":4,"start":444,"end":474},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":444},"to":{"change":4,"start":444,"end":474},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" if repl.end > repl.start && contents_[repl.end.us() - 1] == b'\\n' {"}],"del_contents":[{"Del":" if repl.end > repl.start && contents_[repl.end.us() - 1] == b'\\n'\n"},{"Del":" {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":1010,"ins":{"up_context":[{"change":2,"pos":142457}],"down_context":[{"change":4,"pos":78831}],"flag":"BLOCK","start":21511,"end":21698,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":2,"pos":142457},"to":{"change":4,"start":78688,"end":78733},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":78688},"to":{"change":4,"start":78688,"end":78733},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":78733},"to":{"change":2,"start":142458,"end":142565},"introduced_by":2}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" change.end = ChangePosition("},{"Add":" (contents_.len() as u64 + new_end - new_start).into(),"},{"Add":" );"}],"del_contents":[{"Del":" change.end =\n"},{"Del":" ChangePosition((contents_.len() as u64 + new_end - new_start).into());\n"}]}},{"Replacement":{"inode":{"change":4,"pos":944089},"path":"libpijul/src/apply.rs","line":388,"ins":{"up_context":[{"change":4,"pos":3531}],"down_context":[{"change":2,"pos":144843}],"flag":"BLOCK","start":21699,"end":21768,"inode":{"change":4,"pos":944089}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":3531},"to":{"change":4,"start":955011,"end":955037},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":955011},"to":{"change":4,"start":955011,"end":955037},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":955037},"to":{"change":2,"start":144768,"end":144842},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":144842},"to":{"change":4,"start":127980,"end":127996},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":955259},"to":{"change":4,"start":127980,"end":127996},"introduced_by":4}],"inode":{"change":4,"pos":944089}},"ins_contents":[{"Add":" txn.del_tree(&OwnedPathId::inode(inode), Some(&inode))?;"}],"del_contents":[{"Del":" txn.del_tree(\n"},{"Del":" &OwnedPathId::inode(inode),\n Some(&inode),\n"},{"Del":" )?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":944089},"path":"libpijul/src/apply.rs","line":498,"ins":{"up_context":[{"change":4,"pos":129170}],"down_context":[{"change":4,"pos":68579}],"flag":"BLOCK","start":21769,"end":21884,"inode":{"change":4,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":129170},"to":{"change":2,"start":145086,"end":145189},"introduced_by":2}],"inode":{"change":4,"pos":944089}},"ins_contents":[{"Add":" is_non_folder |="},{"Add":" parent.flag() & (EdgeFlags::PARENT | EdgeFlags::FOLDER) == EdgeFlags::PARENT;"}],"del_contents":[{"Del":" is_non_folder |= parent.flag() & (EdgeFlags::PARENT | EdgeFlags::FOLDER) == EdgeFlags::PARENT;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":944089},"path":"libpijul/src/apply.rs","line":542,"ins":{"up_context":[{"change":4,"pos":129585}],"down_context":[{"change":2,"pos":145559}],"flag":"BLOCK","start":21885,"end":21995,"inode":{"change":4,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":129585},"to":{"change":2,"start":145475,"end":145559},"introduced_by":2}],"inode":{"change":4,"pos":944089}},"ins_contents":[{"Add":" is_folder |= parent"},{"Add":" .flag()"},{"Add":" .contains(EdgeFlags::PARENT | EdgeFlags::FOLDER);"}],"del_contents":[{"Del":" is_folder |= parent.flag().contains(EdgeFlags::PARENT | EdgeFlags::FOLDER);\n"}]}},{"Replacement":{"inode":{"change":4,"pos":944089},"path":"libpijul/src/apply.rs","line":828,"ins":{"up_context":[{"change":4,"pos":230}],"down_context":[{"change":4,"pos":272}],"flag":"BLOCK","start":21996,"end":22078,"inode":{"change":4,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":230},"to":{"change":2,"start":147261,"end":147307},"introduced_by":2}],"inode":{"change":4,"pos":944089}},"ins_contents":[{"Add":" a,"},{"Add":" b,"},{"Add":" p.introduced_by(),"},{"Add":" p.flag()"}],"del_contents":[{"Del":" a, b, p.introduced_by(), p.flag()\n"}]}},{"Replacement":{"inode":{"change":4,"pos":984582},"path":"libpijul/src/alive/retrieve.rs","line":121,"ins":{"up_context":[{"change":4,"pos":988306}],"down_context":[{"change":4,"pos":988393}],"flag":"BLOCK","start":22079,"end":22254,"inode":{"change":4,"pos":984582}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":988306},"to":{"change":2,"start":148744,"end":148836},"introduced_by":2}],"inode":{"change":4,"pos":984582}},"ins_contents":[{"Add":" del_graph_with_rev("},{"Add":" txn,"},{"Add":" channel,"},{"Add":" edge.flag(),"},{"Add":" vertex,"},{"Add":" dest,"},{"Add":" edge.introduced_by(),"},{"Add":" )?;"}],"del_contents":[{"Del":" del_graph_with_rev(txn, channel, edge.flag(), vertex, dest, edge.introduced_by())?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":988425},"path":"libpijul/src/alive/output.rs","line":163,"ins":{"up_context":[{"change":4,"pos":100647}],"down_context":[{"change":4,"pos":100715}],"flag":"BLOCK","start":22255,"end":22430,"inode":{"change":4,"pos":988425}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":100647},"to":{"change":2,"start":149121,"end":149217},"introduced_by":2}],"inode":{"change":4,"pos":988425}},"ins_contents":[{"Add":" .get_contents("},{"Add":" |p| txn.get_external(&p).unwrap().map(|x| x.into()),"},{"Add":" vertex,"},{"Add":" buf,"},{"Add":" )"}],"del_contents":[{"Del":" .get_contents(|p| txn.get_external(&p).unwrap().map(|x| x.into()), vertex, buf)\n"}]}},{"Replacement":{"inode":{"change":4,"pos":1000429},"path":"libpijul/src/alive/dfs.rs","line":120,"ins":{"up_context":[{"change":4,"pos":1003461}],"down_context":[{"change":4,"pos":1003669}],"flag":"BLOCK","start":22431,"end":22734,"inode":{"change":4,"pos":1000429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1003461},"to":{"change":2,"start":149798,"end":149827},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":149827},"to":{"change":4,"start":1003489,"end":1003598},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1003489},"to":{"change":4,"start":1003489,"end":1003598},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1003598},"to":{"change":2,"start":149828,"end":149917},"introduced_by":2}],"inode":{"change":4,"pos":1000429}},"ins_contents":[{"Add":" Some("},{"Add":" (Edge {"},{"Add":" dest: graph.lines[chi].vertex.start_pos(),"},{"Add":" flag: EdgeFlags::empty(),"},{"Add":" introduced_by: ChangeId(4165u64.into()),"},{"Add":" })"},{"Add":" .into(),"},{"Add":" ),"}],"del_contents":[{"Del":" Some((Edge {\n"},{"Del":" dest: graph.lines[chi].vertex.start_pos(),\n flag: EdgeFlags::empty(),\n"},{"Del":" introduced_by: ChangeId(4165u64.into()),\n }).into()),\n"}]}},{"Replacement":{"inode":{"change":4,"pos":1014531},"path":"libpijul/src/alive/debug.rs","line":36,"ins":{"up_context":[{"change":4,"pos":101031}],"down_context":[{"change":4,"pos":101109}],"flag":"BLOCK","start":22735,"end":22920,"inode":{"change":4,"pos":1014531}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":101031},"to":{"change":2,"start":150096,"end":150202},"introduced_by":2}],"inode":{"change":4,"pos":1014531}},"ins_contents":[{"Add":" .get_contents("},{"Add":" |h| txn.get_external(&h).unwrap().map(|x| x.into()),"},{"Add":" line.vertex,"},{"Add":" &mut buf,"},{"Add":" )"}],"del_contents":[{"Del":" .get_contents(|h| txn.get_external(&h).unwrap().map(|x| x.into()), line.vertex, &mut buf)\n"}]}},{"Replacement":{"inode":{"change":4,"pos":1020742},"path":"libpijul/Cargo.toml","line":4,"ins":{"up_context":[{"change":4,"pos":1020894}],"down_context":[{"change":4,"pos":27}],"flag":"BLOCK","start":22921,"end":22948,"inode":{"change":4,"pos":1020742}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1020894},"to":{"change":3,"start":138,"end":165},"introduced_by":3}],"inode":{"change":4,"pos":1020742}},"ins_contents":[{"Add":"version = \"1.0.0-alpha.34\""}],"del_contents":[{"Del":"version = \"1.0.0-alpha.35\"\n"}]}},{"Edit":{"inode":{"change":4,"pos":1020742},"path":"libpijul/Cargo.toml","line":59,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":1022139}],"down_context":[{"change":4,"pos":1022139}],"flag":"BLOCK","start":22949,"end":22963,"inode":{"change":4,"pos":1020742}}},"contents":[{"Add":"\"src/tag.rs\","}]}},{"Replacement":{"inode":{"change":4,"pos":1020742},"path":"libpijul/Cargo.toml","line":108,"ins":{"up_context":[{"change":4,"pos":1023195}],"down_context":[{"change":4,"pos":1023218}],"flag":"BLOCK","start":22964,"end":23027,"inode":{"change":4,"pos":1020742}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1023195},"to":{"change":3,"start":166,"end":229},"introduced_by":3}],"inode":{"change":4,"pos":1020742}},"ins_contents":[{"Add":"pijul-macros = { path = \"../pijul-macros\", version = \"0.3.0\" }"}],"del_contents":[{"Del":"pijul-macros = { path = \"../pijul-macros\", version = \"0.4.0\" }\n"}]}},{"Replacement":{"inode":{"change":4,"pos":1030385},"path":"Cargo.lock","line":948,"ins":{"up_context":[{"change":4,"pos":560}],"down_context":[{"change":4,"pos":729}],"flag":"BLOCK","start":23028,"end":23055,"inode":{"change":4,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":560},"to":{"change":3,"start":230,"end":257},"introduced_by":3}],"inode":{"change":4,"pos":1030385}},"ins_contents":[{"Add":"version = \"1.0.0-alpha.34\""}],"del_contents":[{"Del":"version = \"1.0.0-alpha.35\"\n"}]}},{"Replacement":{"inode":{"change":4,"pos":1030385},"path":"Cargo.lock","line":1310,"ins":{"up_context":[{"change":4,"pos":1064071}],"down_context":[{"change":4,"pos":1064097}],"flag":"BLOCK","start":23056,"end":23083,"inode":{"change":4,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1064071},"to":{"change":3,"start":258,"end":285},"introduced_by":3}],"inode":{"change":4,"pos":1030385}},"ins_contents":[{"Add":"version = \"1.0.0-alpha.41\""}],"del_contents":[{"Del":"version = \"1.0.0-alpha.39\"\n"}]}},{"Replacement":{"inode":{"change":4,"pos":1030385},"path":"Cargo.lock","line":1355,"ins":{"up_context":[{"change":4,"pos":1064574}],"down_context":[{"change":4,"pos":1064592}],"flag":"BLOCK","start":23084,"end":23102,"inode":{"change":4,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1064574},"to":{"change":3,"start":286,"end":304},"introduced_by":3}],"inode":{"change":4,"pos":1030385}},"ins_contents":[{"Add":"version = \"0.3.0\""}],"del_contents":[{"Del":"version = \"0.4.0\"\n"}]}}],"owner":"irevoire","repo":"pijul","token":"ZOpuYss110VSSqPNgz3FV6OK0tdq3mAkwdiy3lzS3Iw=","login":null}

…

Dependencies

Change contents