{"header":{"message":"Upgrading to Sanakirja 0.15 + version bump","description":null,"timestamp":"2020-12-31T12:20:40.630127519Z","authors":[{"full_name":"Pierre-Étienne Meunier","name":"pmeunier"}]},"hash":"CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","authors":[],"deps":{"hashes":[["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","Upgrading to Sanakirja 0.15 + version bump"],["AA",null],["MF3WAHBIH6Q2F7ZOKWPEJF6VGSKJITWLR3Z64GTD6YQZNA5EATWQC","commands/record: amend current change if unspecified"],["7PM25EXLNQ6JUUIZNTAOQYNNIZNG6TJREEBUSAIC3FIOE7FHETSAC","Recursive apply was written a little too fast…"],["SNZ3OAMCPUGFYON5SZHQQQK46ZZMVMJECJYEUCMG657UVLY2PNBQC","use native external subcommand support instead of hand-rolled one"],["VXZNQQHCDC6MBLUMNDJVPM4I7XWTDYBPZZNCPZCA6EJ3GS5WAQGQC","If an existing file is moved to a new directory that is deleted before the record, record the deletion"],["KD4JIMAE6M2LFWEHFPEL4RTRV7UWYWNGGS52N2TKQ42ZNFSNLCEQC","Listing the working copy in alphabetical order (instead of reverse alphabetical)"],["IUGP6ZGBFLDRAKJOHFQNG67LZBDXUJ4QM25GOY3QT6GER3NVTHXQC","Add support for ~/.config/pijul even on macos"],["WKX5S4Z4DOB5S6A6X5V6ECZFCHQUMWRGX5XT4FBOG57P6HPWK7CAC","remove unneccesary explicit lifetimes"],["PH7B6I3U5XCACAX6VX3ZDJD2DQOQS7725R6CTOATNC26NP4VPUFQC","Fixing log --hash-only"],["7T5STZYBIUN5AQPFKASNYO24QFLNBX3YCE4YIIXEQNJYR5LSZ6EQC","Now you can `pijul remove` the root of a repository"],["A7NTQINQCT6GSJZIBPWM6KD2HYGV4XBSV7FWLFYY4YKLSEOW57KQC","pijul channel delete: error if channel doesn't exist"],["A6R6SGCPLFM45QNWJLISFBR3EEXVITYHCWEUOPNH4UIGIWJRTZAQC","Fixing a panic in `pijul change`"],["IM6UFPOZHZTBMESRXGBALOAWJWUUDGLP2TVLSZ3RZPSJITKB3R7QC","Fixing a test related to the tree/revtree tables"],["PSKXR4QEPPVJZR777HW67IEHUPGZB44MFCNQ2KUS422Q3W22IQWAC","Do not load the entire change in memory in log"],["BE7GUCI2N6TX3P2HRMFSH7XLJKILDPOKOXKA7HWOABBFNKCKMZLAC","Completing dependencies only with changes the remote does not have"],["6RVT5X4LTRP5XHVDESXMIC2DHMT5MUQ24ZDWEBJ4XYTF6LJXK7CAC","Current state: return zero instead of an Option if there is no change on the channel"],["4VWXL6KQGYGDUQRCVJCEVIV6CKJSEIYDX4YF33OX6EDNKJNEGD2AC","Correct handling of ignore files"],["Y7YAFMFFJY3SQ3GYN3SS4V3FZWMH3B5L65AXQBXOR5XARSMF5JJQC","Fix path prefix striping on Windows."],["6DOXSHWGKJIMIPFCNLASGKBAJCJMJULW5HFRZAZ67EYSMXXGJ3KAC","Cleanup, and version bump"],["VBMXB443FGZL6DLT6KAP2ICFCCQNXCUMDEUL67HB4CNKFMBBNSSAC","Retrying if the HTTP connection drops while reading the body"],["6YMDOZIB5LVYLFIDGN2WNT5JTHEAMS4TFPVDEZ3OWXWOKJOC5QDAC","Refactoring apply"],["4OCC6D42GZYRDLH3NSKXMJTRKXP7UZ6Z3YNGCNUT7NT6WBDBCBIAC","Recursive add"],["YAJAXIV5VL263Z6FYLKFPROB3MQPRPH22P44GRGRVGEP56HOMBOAC","Unrecording changes atomically"],["L5IUD2DSLEK4SYPF6PLNO7C3TZEFYFHNM42HGEHY5VWW5MHD7CXAC","Fixing the regular expression parsing the protocol lines"],["XL6Y64UPFLIVRV3YVJMTTMZU7VL6SUXVE6BKL6K7DYRKVJ4X727AC","Fixing a panic when iterating over the basenames of a file"],["SPA2OL5ITFMLB5P2WL342QAU2FXPKSFS4XHAMW6HYWOGSGLO2MJAC","keep-changes feature (default) to avoid deleting problematic changes"],["3YDPHBANMNSK7Z5SCG745VLTP4BBQWIXCJTQOSDI6UJGYR6S45EQC","address non-controversial clippy lints"],["IQ4FCHPZYGTZHCQHUIRCMUI5LCHIDSJCM2AZXGRJARWLCPPLXZOQC","HTTP connections: pooling + retry on error"],["ZTVNGFNTYSZKPNWG7PGXTWVXKUM4KL2NKEUSMCUQYLCE4CYA6RVQC","Version bump"],["VZL5OHF5IQN3ORMBBZB7YSCI3VTSN5ZPZEQNLWUHBIE4EGNJ5COQC","Remove the obsolete `remote list` command"],["B5Z4IMEUYAEJPOU5EIAXI7VYZVUM6CWKV7CTSOXK3F4GXTNNMMAAC","Generating Cargo.nix for pijul 1.0.0-alpha.6"],["SAGSYAPXQ2T6GC3B3TNRPNFTZMS7UMME6YQGSF5MOIM66S5NKB2QC","Various version bumps"],["FXT5FS5WIDBA3HPTJRFGRGULZIGAWAJXT2U6RFYGDLO2PYDG4VEAC","Updating Cargo.nix"],["3S4DR77ZU3XFGGDE6XSCUK6TN76IXNOQIKQSLDBM7KUHNILWHS3QC","Version updates"],["K6GWUOD55G377RVEEMMRPZ4EUAHCM2BGXNRJTE5UZJFFMJGFCEZQC","Styling progress bars"],["R3H7D42UZ446V5TO2574BMAQQAYYJPEIMSZVDPAGVIYU2COJSWBAC","Debugging `pijul git`: proper error reporting"],["PJ7T2VFLV5PYG3CV23GC2GIQETXKGC6CO74JBGREV3JC3LG5OXUAC","Do not hang on locked repositories"],["SZWBLWZ4LUJZHTSYOIGJMXM7KPCGWJFPKLHYA5MHY7UTPNLZV5KQC","Reading ~/.ssh/config"],["7A2TSC4PAKK3WOH3DMAJASCEC6D5JLJWNFWJTEEBE4CVS4K76PPQC","Conflict solving code (FOLDER edges)"],["NA5I4WYNE2O3LPSHXGWXW7XL4YNYFDREEGDOP6LJ5HJXTQDXM7BAC","Fixing the inverse of conflict resolutions"],["Q45QHPO4HDTEZF2W4UDZSYYQ46BPEIWSW4GJILZR5HTJNLKXJABQC","Feedback on network stuff"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["UBCBQ5FGH2KASHEUPDLIKGLVVX3GSRQ4F4P2JEJZL2NX2DUSYARAC","Removing pijul/src/commands/checkout.rs (unused file), as well as litorg comments"],["UDHP4ZVBQZT2VBURB2MDCU2IZDNMCAFSIUKWRBDQ5BWMFKSN2LYQC","Fixing SSH asynchronicity issues"],["6T5ULULMRGU5GJ3JQTEH2QFQN5IMP53TYFFXUT5UE6FA6WWFFMFAC","Fixing conflicts with the changes from discussion #143"],["MWKDNWZWM45YH7JJ6ZUQGIOLME4QOPVDWMRGDYPOCCUYDF4ZPKNAC","Version bump"],["QE64ATLZWMKHYABCD3VA547PYXCK6YN3K7RE2TX3SCQNKG7XLVAQC","Fixing asynchronicity problems in SSH"],["VIHXB7SGRETFPHPYZFSRGOFRXEO4RZY57WDZSU6IAUEJRU3HPKQAC","commands: set up pager for diff, change, and credit"],["3WIQYEISUMGOL5FY4LCWOJS55CTTQA7WMJZXAE3Q4GQUTBFLAE7QC","Fixing conflicts in Cargo.lock"],["43AJ37IXON6PMMYRZM6OB2MJXPYCNIWW2XBDVNBXIRH5DD7JDTVQC","Getting rid of edge validation, which does not work for zombie conflicts"],["76PCXGML77EZWTRI5E6KHLVRAFTJ2AB5YRN5EKOYNAPKTWY2KCGAC","Pushing to, and pulling from the local repository"],["GURIBVW66JDQK3SJZRGVJ2MQLMT7JD4KLI5QPQZGPAL7WH3T6T4AC","Fixing the pager"],["FE5ES6Q46FMWYPNNNJLORY377QGDE57LBBDIVWDTC6Z7U4U73NEQC","Stop pushing/pulling if the remote returns an error"],["AEPEFS7O3YT7CRRFYQVJWUXUUSRGJ6K6XZQVK62B6N74UXOIFWYAC","Write help for each argument"],["BXD3IQYNMKMI5BTANCF6NZHZP4CKPWADGJMBT2R3WTMKVKONT5QAC","Fixing --features git"],["73NW2X2MI767RYNTKS67ZB5QUWYEAA4SCORLD52K36ZU3JAK67AQC","Returning a parse error instead of panicking when parsing a text change"],["5BRU2RRWOQBMS2V3RQM7PRFR5UILYZ73GISHAKJA6KIZGC5M2MFAC","Cleanup (debugging a crash related to trees/inodes)"],["Q7CAYX5N2GFOGMZL3VXVWORMAPWEOECXE22BLXK7Q4WEPS4CE2SAC","Fixing Windows compilation"],["FBXYP7QM7SG6P2JDJVQPPCRKJE3GVYXNQ5GVV4GRDUNG6Q4ZRDJQC","Forgot to add remote::http"],["G6YZ7U65AW42M4RSWPXOCJH62XZ5OKVGOQ2UEB6SBNKNJEWYBAEQC","Version bump"],["OUWD436ATBTZJR53B6XDSI5SXRRNZV7YGRUEA5ACHZC2RUDP7G5QC","Version bump"],["LCERQSWMA2YKOPAPNZUSOQ7FLBGDHBZR33OHLYX7T4KTKULRMJDQC","Cleanup"],["737IBW6O6CVVA6K3RT2UO226CUXLURC5KSJUVAGDJHZCDERB7GUAC","Fixing a warning in record"],["OCBM7IFE7CL3PM5KPYTRTKTHYKC76NTFK5C4VA4JFAKQUA6GC7FAC","New release: pijul-1.0.0-alpha.8"],["BD5PC25AB5MKVIYDFSDGRZ4YGX4PKW4SMZ3YAYAPNA5HLDVJUR3QC","Deleting conflict resolution vertices when the sides are deleted"],["QNJBR73KCSCCF6FTHGZDF2K7PZQL3EFKZFOBT77KYZBMALTTW6OQC","don't return Result for infallible functions"],["CFNFIUJVWV2PHHZKAPBY6GLW4TCX2N66DYH2QCFU5X7D7KE5D4AQC","Parsing the correct flags for new vertices"],["GVQ7YSEDDCYYYWDJ5JUVFSBWA5EZVOZJI63KK6E46N6Y2B6LP72AC","Checking for dependencies even for a local change"],["7UPL3Y2A5QOBU6VIUHNWEFGSGQ5CMWGDGOVLRZ53UARXG3TDGLMAC","Unrecord: don't restore the same unrecorded file deletion twice in the inodes and tree tables"],["2K7JLB4Z7BS5VFNWD4DO3MKYU7VNPA5MTVHVSDI3FQZ5ICM6XM6QC","No pager on Windows"],["L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","pijul/*: reorganize imports and remove extern crate"],["VQPAUKBQ2POZKL7CZFAZK5ZQKEBYL27XZYZWYUSH5AH25KK6DWKAC","channel switch as an alias to reset"],["L5PHFTIERPDAFIOSHZSMAN2CUSFM626ISMGTDYRN5KWPLXCOVPXAC","Minor simplification"],["UNZXTNSJI4YRY3EQ3M4HMBKQDNYDTY6B7IZRBNYGDJXTA2UKYWRAC","Change text format: order dependencies in the order they were on the channel at record time"],["WI5BS6BSRA7T3BCDF6EGB2JZHTZRX4SLT5EG4D67PVRBTZH5YIXAC","New published versions"],["MU5GSJAW65PEG3BRYUKZ7O37BPHW3MOX3S5E2RFOXKGUOJEEDQ5AC","Partial push and pull (WARNING: breaks the existing protocol)"],["ERV3644QELKOHAVNMZGRWYCPPN3XELTAH4PPFR6QKGWW73XBOOKQC","Adding the block module"],["HMMMKONLCRAXVT7SO2ITTFDOJIQKKVSRIZPXYVPDC34RCBHWMHVAC","Fixing alive vertices"],["KTTKF3RWYAK2YSH2DYYW5QVG4KSNGWUBJBFHKE24OJ7LFCBF5FEAC","Locking stderr and the progress bar in SSH"],["XWETQ4DE4KL2GQWSEBE5NENLTSLIDF7RIWOCCVWJFQOVQJE5P33AC","Upgrading versions"],["ATZ3BWSEFJBLVGDUZFESRNHVCIO6ZRZ3ALPANZSVGVO7A5BUAFQQC","Fixing the double-deletion of repairs for folder edges"],["23LVKATNTT74YKHG7KJM6SBO2IVZEV24TQ46ZJIHQ2IXONWNVXJAC","Use pager crate for log output"],["WZVCLZKY34KQBQU6YBGJLQCDADBQ67LQVDNRVCMQVY3O3C3EIWSQC","address clippy lints"],["NLGQAH4H35XC5XTH26BRXVFWGPPAMA4MDN3MHMGCOYE6ZZQMQ4AAC","Credit and reset relative to current directory instead of the root"],["OJZWJUF2TCGZ7RFVY6FPKBS5P3C4BGHZDPVH775OHVNVFMJICKNQC","MUCH faster `pijul add -r`"],["ZHABNS3S6FSINO74FOI5KHYXYDTBPO4FQTTYTUS7NNKEVVNLYC4AC","Canonicalize all paths"],["G734WNM64AR5BLAZMN5MDPKSFTYXTUQR6MAGB32NRBC5FXFRWSJAC","flake.nix: use crate2nix"],["H23LO7U7MNB5GTLOUIFYAJ6DP57DM3VFBR4IBOAVPMHS356AYFPQC","a few more clippy lints addressed"],["IYJZVLETBAQDDELENH3FX7ZTOC3HY4UJ3AMC3MACW6O7ZCWZTR6AC","Cleaning up the literate programming bits"],["X6YFD4WVMUYJCR5IYPJH6UKYVWSA7DKBRVJ6XQFXHOE2TRYUTAHAC","Do not download changes if we already have them"],["BT2ZHPY4LTECZDNPNLX5IUAEA6CYB4RRBGVBXUNK3ARHMWQK7KHAC","Version bumps"],["GLMOA3PFDR7HHJ3QMVZBNNJ3CGZAF72AZ5UBNEQON37K5WFNZP6QC","More edges in \"credit\""],["QYY37T6YMICHA57GBXBBR4OYE2A76SFDKXPDKIKSEDDXCNQVC5CAC","Fixing a panic with reset --dry-run and no input"],["KDF6FJRVF72L274BEUJCTUKRFMNL6BDZMTVKDPEYGFX4TC3YOVSQC","bigger clippy refactors"],["4H2XTVJ2BNXDNHQ3RQTMOG3I4NRGZT7JDLC2GRINS56TIYTYTO4QC","Fix some mistakes in the docs"],["H62VFFJEBL2I3O4D3BAJZ57ROPWUISC7JCDIWFBC5DAYJRHMMDXAC","Cargo.nix, and solving conflicts"],["KQTD46KVVWMJ3W6O55BEJLCVTNTDLUH6QT46AEFT7OU2SELXG4IAC","Unrecord: restore files *after* having unapplied the *entire* change"],["5YDI33C4QRHATA6H3HHMBYFOBLAMXLLHWSDGJAH57DR6AMWO7AAQC","Fixing pager on OSX"],["NX5I5H53IWX76GA3MTXTWZXU2HKUDL4ENED7LTGHMPWLHSAHYEAQC","New published versions"],["ZXTHL45OYLOICXTXXEQ6AMNSLMQFZ6BFUJWMO6LZOSDK7ERROC5AC","address clippy lints"],["74HX2XZDHFRE7FIQ6LQZALIIKED2ABSGGBQ34ULYZ5ZBKK7UTHQQC","Cleanup and debugging"],["O4DNWMPDUWI6SKYOZTQKCSX6MSR73CTGCUSM65TSQYVOUSAAS6KAC","Cleaunp and proofreading of libpijul::record"],["N35L72XV5OWBWMEZBKZIKK5K6RMUYQOKGQEQ62N5NJ5N3UCHHWYQC","Versions in Cargo.lock"],["JACZWIJ6UEL5HWZRNOOXTFXUEG67XJDPC5D72LYUPCVVJ6WB7JQAC","Version bump"],["5DVRL6MFXQOCPOZMYSKBERMRRVUTYRL2SRGRTU2MH4IEOFCDKM3QC","Hard-unrecord"],["YACC5QR6WTVC3IJCCVH6GUYFU4KAPITOED43V2MDP3TVGLTL2NEQC","Don't delete non-block edges unless they're at the top of a block"],["BZSC7VMYSFRXDHDDAMCDR6X67FN5VWIBOSE76BQLX7OCVOJFUA3AC","address clippy lints"],["VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","Removing anyhow in libpijul"],["7FFFKQZU3TFXWL45TILYNX5A7AC7HBK526SD5DZGYCELN76YE7TAC","add 'Default' implementations"],["6WFOU7UXCYM5UWA5WVZ72XFRJWJA5GWCIAC5PI5NOEFHNFD3VKNAC","Do a DFS on dependencies to complete the list"],["AN7IDX26RK33ZXASXLJMD4GTFWHCTHMJ6Y5C4ROCPIH33VUT2EYQC","pijul: added ChangesNotFound error variant"],["UFCZKKLXVYQYQBYENCAFHY3ZPPSDAJJAIREZSYNQM4QNXV6G6RXAC","Upgrading to the latest Sanakirja/Rand"],["3M7WBE24JTPTHWQOU5PO2ZJYKPKEH2F6R4M6RWIRFG334PQEA55QC","Re-adding anyhow in the tests of libpijul"],["I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","Massive cleanup, and simplification"],["XAY4DYRRPDEQY7XUWJ3OWSXPCEPZ6VFQ6273JPLE3FEGJQAGV6YQC","Version bump"],["YX3VCEOM36NOK6757SD4SZX4FHB7FBAVRKFJH2QFPCYILC4SBRNAC","Version bump"],["M5FK3ABTKBDG6HHW32G7UKRJEJQKD2U7BPXNZ3HVHBKULWVV6CTQC","Complete dependencies when pushing and pulling"],["WIORLB47KYY5ZDKSAQEQ5NV2J3F3RIO5FVGD6LGF73FD5LWJLUAAC","Version bump"],["62XVBWPYCBULZ2IUWF36JVHAPMKCGQC53PQQ53AAGZGC2KT7VQRQC","remove redundant Clap attributes"],["DNQHXWRZF6EWII3RGQ6HPGFD47BOOFH4FCQHSCACBS3RLQO3DNIQC","address clippy hard errors"],["RR65HCKOJU45UCNU5X3XM5HSIRHVUZU4IO4HEBQYHS22HYIIWITQC","Thrussh versions"],["SLJ3OHD4F6GJGZ3SV2D7DMR3PXYHPSI64X77KZ3RJ24EGEX6ZNQAC","unrecord: show list of changes if none were given as arguments"],["FMKKWCFVK5CPPP55T4VMCHSFPZ47EBK6V7D4MJ5BH55TP4UBOZXAC","Better clap attributes"]],"deps":["MF3WAHBIH6Q2F7ZOKWPEJF6VGSKJITWLR3Z64GTD6YQZNA5EATWQC","7PM25EXLNQ6JUUIZNTAOQYNNIZNG6TJREEBUSAIC3FIOE7FHETSAC","SNZ3OAMCPUGFYON5SZHQQQK46ZZMVMJECJYEUCMG657UVLY2PNBQC","VXZNQQHCDC6MBLUMNDJVPM4I7XWTDYBPZZNCPZCA6EJ3GS5WAQGQC","KD4JIMAE6M2LFWEHFPEL4RTRV7UWYWNGGS52N2TKQ42ZNFSNLCEQC","IUGP6ZGBFLDRAKJOHFQNG67LZBDXUJ4QM25GOY3QT6GER3NVTHXQC","WKX5S4Z4DOB5S6A6X5V6ECZFCHQUMWRGX5XT4FBOG57P6HPWK7CAC","PH7B6I3U5XCACAX6VX3ZDJD2DQOQS7725R6CTOATNC26NP4VPUFQC","7T5STZYBIUN5AQPFKASNYO24QFLNBX3YCE4YIIXEQNJYR5LSZ6EQC","A7NTQINQCT6GSJZIBPWM6KD2HYGV4XBSV7FWLFYY4YKLSEOW57KQC","A6R6SGCPLFM45QNWJLISFBR3EEXVITYHCWEUOPNH4UIGIWJRTZAQC","IM6UFPOZHZTBMESRXGBALOAWJWUUDGLP2TVLSZ3RZPSJITKB3R7QC","PSKXR4QEPPVJZR777HW67IEHUPGZB44MFCNQ2KUS422Q3W22IQWAC","BE7GUCI2N6TX3P2HRMFSH7XLJKILDPOKOXKA7HWOABBFNKCKMZLAC","6RVT5X4LTRP5XHVDESXMIC2DHMT5MUQ24ZDWEBJ4XYTF6LJXK7CAC","4VWXL6KQGYGDUQRCVJCEVIV6CKJSEIYDX4YF33OX6EDNKJNEGD2AC","Y7YAFMFFJY3SQ3GYN3SS4V3FZWMH3B5L65AXQBXOR5XARSMF5JJQC","6DOXSHWGKJIMIPFCNLASGKBAJCJMJULW5HFRZAZ67EYSMXXGJ3KAC","VBMXB443FGZL6DLT6KAP2ICFCCQNXCUMDEUL67HB4CNKFMBBNSSAC","6YMDOZIB5LVYLFIDGN2WNT5JTHEAMS4TFPVDEZ3OWXWOKJOC5QDAC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","G734WNM64AR5BLAZMN5MDPKSFTYXTUQR6MAGB32NRBC5FXFRWSJAC","3S4DR77ZU3XFGGDE6XSCUK6TN76IXNOQIKQSLDBM7KUHNILWHS3QC","AN7IDX26RK33ZXASXLJMD4GTFWHCTHMJ6Y5C4ROCPIH33VUT2EYQC","76PCXGML77EZWTRI5E6KHLVRAFTJ2AB5YRN5EKOYNAPKTWY2KCGAC","XWETQ4DE4KL2GQWSEBE5NENLTSLIDF7RIWOCCVWJFQOVQJE5P33AC","OUWD436ATBTZJR53B6XDSI5SXRRNZV7YGRUEA5ACHZC2RUDP7G5QC","PJ7T2VFLV5PYG3CV23GC2GIQETXKGC6CO74JBGREV3JC3LG5OXUAC","L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","UBCBQ5FGH2KASHEUPDLIKGLVVX3GSRQ4F4P2JEJZL2NX2DUSYARAC","L5PHFTIERPDAFIOSHZSMAN2CUSFM626ISMGTDYRN5KWPLXCOVPXAC","YAJAXIV5VL263Z6FYLKFPROB3MQPRPH22P44GRGRVGEP56HOMBOAC","NLGQAH4H35XC5XTH26BRXVFWGPPAMA4MDN3MHMGCOYE6ZZQMQ4AAC","YACC5QR6WTVC3IJCCVH6GUYFU4KAPITOED43V2MDP3TVGLTL2NEQC","7UPL3Y2A5QOBU6VIUHNWEFGSGQ5CMWGDGOVLRZ53UARXG3TDGLMAC","74HX2XZDHFRE7FIQ6LQZALIIKED2ABSGGBQ34ULYZ5ZBKK7UTHQQC","Q7CAYX5N2GFOGMZL3VXVWORMAPWEOECXE22BLXK7Q4WEPS4CE2SAC","VZL5OHF5IQN3ORMBBZB7YSCI3VTSN5ZPZEQNLWUHBIE4EGNJ5COQC","VQPAUKBQ2POZKL7CZFAZK5ZQKEBYL27XZYZWYUSH5AH25KK6DWKAC","NX5I5H53IWX76GA3MTXTWZXU2HKUDL4ENED7LTGHMPWLHSAHYEAQC","UNZXTNSJI4YRY3EQ3M4HMBKQDNYDTY6B7IZRBNYGDJXTA2UKYWRAC","M5FK3ABTKBDG6HHW32G7UKRJEJQKD2U7BPXNZ3HVHBKULWVV6CTQC","RR65HCKOJU45UCNU5X3XM5HSIRHVUZU4IO4HEBQYHS22HYIIWITQC","UDHP4ZVBQZT2VBURB2MDCU2IZDNMCAFSIUKWRBDQ5BWMFKSN2LYQC","GLMOA3PFDR7HHJ3QMVZBNNJ3CGZAF72AZ5UBNEQON37K5WFNZP6QC","B5Z4IMEUYAEJPOU5EIAXI7VYZVUM6CWKV7CTSOXK3F4GXTNNMMAAC","23LVKATNTT74YKHG7KJM6SBO2IVZEV24TQ46ZJIHQ2IXONWNVXJAC","GURIBVW66JDQK3SJZRGVJ2MQLMT7JD4KLI5QPQZGPAL7WH3T6T4AC","3WIQYEISUMGOL5FY4LCWOJS55CTTQA7WMJZXAE3Q4GQUTBFLAE7QC","FBXYP7QM7SG6P2JDJVQPPCRKJE3GVYXNQ5GVV4GRDUNG6Q4ZRDJQC","VIHXB7SGRETFPHPYZFSRGOFRXEO4RZY57WDZSU6IAUEJRU3HPKQAC","I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","43AJ37IXON6PMMYRZM6OB2MJXPYCNIWW2XBDVNBXIRH5DD7JDTVQC","QE64ATLZWMKHYABCD3VA547PYXCK6YN3K7RE2TX3SCQNKG7XLVAQC","ERV3644QELKOHAVNMZGRWYCPPN3XELTAH4PPFR6QKGWW73XBOOKQC","WI5BS6BSRA7T3BCDF6EGB2JZHTZRX4SLT5EG4D67PVRBTZH5YIXAC","BXD3IQYNMKMI5BTANCF6NZHZP4CKPWADGJMBT2R3WTMKVKONT5QAC","N35L72XV5OWBWMEZBKZIKK5K6RMUYQOKGQEQ62N5NJ5N3UCHHWYQC","OCBM7IFE7CL3PM5KPYTRTKTHYKC76NTFK5C4VA4JFAKQUA6GC7FAC","H62VFFJEBL2I3O4D3BAJZ57ROPWUISC7JCDIWFBC5DAYJRHMMDXAC","AEPEFS7O3YT7CRRFYQVJWUXUUSRGJ6K6XZQVK62B6N74UXOIFWYAC","4H2XTVJ2BNXDNHQ3RQTMOG3I4NRGZT7JDLC2GRINS56TIYTYTO4QC","O4DNWMPDUWI6SKYOZTQKCSX6MSR73CTGCUSM65TSQYVOUSAAS6KAC","Q45QHPO4HDTEZF2W4UDZSYYQ46BPEIWSW4GJILZR5HTJNLKXJABQC","K6GWUOD55G377RVEEMMRPZ4EUAHCM2BGXNRJTE5UZJFFMJGFCEZQC","62XVBWPYCBULZ2IUWF36JVHAPMKCGQC53PQQ53AAGZGC2KT7VQRQC","L5IUD2DSLEK4SYPF6PLNO7C3TZEFYFHNM42HGEHY5VWW5MHD7CXAC","5DVRL6MFXQOCPOZMYSKBERMRRVUTYRL2SRGRTU2MH4IEOFCDKM3QC","R3H7D42UZ446V5TO2574BMAQQAYYJPEIMSZVDPAGVIYU2COJSWBAC","5BRU2RRWOQBMS2V3RQM7PRFR5UILYZ73GISHAKJA6KIZGC5M2MFAC","LCERQSWMA2YKOPAPNZUSOQ7FLBGDHBZR33OHLYX7T4KTKULRMJDQC","2K7JLB4Z7BS5VFNWD4DO3MKYU7VNPA5MTVHVSDI3FQZ5ICM6XM6QC","SAGSYAPXQ2T6GC3B3TNRPNFTZMS7UMME6YQGSF5MOIM66S5NKB2QC","WIORLB47KYY5ZDKSAQEQ5NV2J3F3RIO5FVGD6LGF73FD5LWJLUAAC","SZWBLWZ4LUJZHTSYOIGJMXM7KPCGWJFPKLHYA5MHY7UTPNLZV5KQC","BT2ZHPY4LTECZDNPNLX5IUAEA6CYB4RRBGVBXUNK3ARHMWQK7KHAC","GVQ7YSEDDCYYYWDJ5JUVFSBWA5EZVOZJI63KK6E46N6Y2B6LP72AC","QYY37T6YMICHA57GBXBBR4OYE2A76SFDKXPDKIKSEDDXCNQVC5CAC","3YDPHBANMNSK7Z5SCG745VLTP4BBQWIXCJTQOSDI6UJGYR6S45EQC","DNQHXWRZF6EWII3RGQ6HPGFD47BOOFH4FCQHSCACBS3RLQO3DNIQC","KDF6FJRVF72L274BEUJCTUKRFMNL6BDZMTVKDPEYGFX4TC3YOVSQC","H23LO7U7MNB5GTLOUIFYAJ6DP57DM3VFBR4IBOAVPMHS356AYFPQC","ZXTHL45OYLOICXTXXEQ6AMNSLMQFZ6BFUJWMO6LZOSDK7ERROC5AC","BZSC7VMYSFRXDHDDAMCDR6X67FN5VWIBOSE76BQLX7OCVOJFUA3AC","WZVCLZKY34KQBQU6YBGJLQCDADBQ67LQVDNRVCMQVY3O3C3EIWSQC","6T5ULULMRGU5GJ3JQTEH2QFQN5IMP53TYFFXUT5UE6FA6WWFFMFAC","MWKDNWZWM45YH7JJ6ZUQGIOLME4QOPVDWMRGDYPOCCUYDF4ZPKNAC","4OCC6D42GZYRDLH3NSKXMJTRKXP7UZ6Z3YNGCNUT7NT6WBDBCBIAC","7A2TSC4PAKK3WOH3DMAJASCEC6D5JLJWNFWJTEEBE4CVS4K76PPQC","KTTKF3RWYAK2YSH2DYYW5QVG4KSNGWUBJBFHKE24OJ7LFCBF5FEAC","G6YZ7U65AW42M4RSWPXOCJH62XZ5OKVGOQ2UEB6SBNKNJEWYBAEQC","QNJBR73KCSCCF6FTHGZDF2K7PZQL3EFKZFOBT77KYZBMALTTW6OQC","VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","737IBW6O6CVVA6K3RT2UO226CUXLURC5KSJUVAGDJHZCDERB7GUAC","KQTD46KVVWMJ3W6O55BEJLCVTNTDLUH6QT46AEFT7OU2SELXG4IAC","HMMMKONLCRAXVT7SO2ITTFDOJIQKKVSRIZPXYVPDC34RCBHWMHVAC","BD5PC25AB5MKVIYDFSDGRZ4YGX4PKW4SMZ3YAYAPNA5HLDVJUR3QC","JACZWIJ6UEL5HWZRNOOXTFXUEG67XJDPC5D72LYUPCVVJ6WB7JQAC","7FFFKQZU3TFXWL45TILYNX5A7AC7HBK526SD5DZGYCELN76YE7TAC","XL6Y64UPFLIVRV3YVJMTTMZU7VL6SUXVE6BKL6K7DYRKVJ4X727AC","X6YFD4WVMUYJCR5IYPJH6UKYVWSA7DKBRVJ6XQFXHOE2TRYUTAHAC","3M7WBE24JTPTHWQOU5PO2ZJYKPKEH2F6R4M6RWIRFG334PQEA55QC","ATZ3BWSEFJBLVGDUZFESRNHVCIO6ZRZ3ALPANZSVGVO7A5BUAFQQC","XAY4DYRRPDEQY7XUWJ3OWSXPCEPZ6VFQ6273JPLE3FEGJQAGV6YQC","73NW2X2MI767RYNTKS67ZB5QUWYEAA4SCORLD52K36ZU3JAK67AQC","OJZWJUF2TCGZ7RFVY6FPKBS5P3C4BGHZDPVH775OHVNVFMJICKNQC","FE5ES6Q46FMWYPNNNJLORY377QGDE57LBBDIVWDTC6Z7U4U73NEQC","6WFOU7UXCYM5UWA5WVZ72XFRJWJA5GWCIAC5PI5NOEFHNFD3VKNAC","SPA2OL5ITFMLB5P2WL342QAU2FXPKSFS4XHAMW6HYWOGSGLO2MJAC","ZHABNS3S6FSINO74FOI5KHYXYDTBPO4FQTTYTUS7NNKEVVNLYC4AC","IYJZVLETBAQDDELENH3FX7ZTOC3HY4UJ3AMC3MACW6O7ZCWZTR6AC","FXT5FS5WIDBA3HPTJRFGRGULZIGAWAJXT2U6RFYGDLO2PYDG4VEAC","ZTVNGFNTYSZKPNWG7PGXTWVXKUM4KL2NKEUSMCUQYLCE4CYA6RVQC","SLJ3OHD4F6GJGZ3SV2D7DMR3PXYHPSI64X77KZ3RJ24EGEX6ZNQAC","MU5GSJAW65PEG3BRYUKZ7O37BPHW3MOX3S5E2RFOXKGUOJEEDQ5AC","YX3VCEOM36NOK6757SD4SZX4FHB7FBAVRKFJH2QFPCYILC4SBRNAC","NA5I4WYNE2O3LPSHXGWXW7XL4YNYFDREEGDOP6LJ5HJXTQDXM7BAC","5YDI33C4QRHATA6H3HHMBYFOBLAMXLLHWSDGJAH57DR6AMWO7AAQC","UFCZKKLXVYQYQBYENCAFHY3ZPPSDAJJAIREZSYNQM4QNXV6G6RXAC","IQ4FCHPZYGTZHCQHUIRCMUI5LCHIDSJCM2AZXGRJARWLCPPLXZOQC","CFNFIUJVWV2PHHZKAPBY6GLW4TCX2N66DYH2QCFU5X7D7KE5D4AQC"]},"hunks":[{"Edit":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":36,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":1411},"to":{"change":22,"start":1411,"end":1434},"introduced_by":22}],"inode":{"change":22,"pos":445}}},"contents":[{"Del":" #[doc(hidden)]\n"}]}},{"Edit":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":52,"atom":{"NewVertex":{"up_context":[{"change":22,"pos":2144}],"down_context":[{"change":22,"pos":2144}],"flag":"BLOCK","start":0,"end":185,"inode":{"change":22,"pos":445}}},"contents":[{"Add":" let error = next(&mut input_iter);"},{"Add":" let error = if error.is_empty() {"},{"Add":" quote! { Error }"},{"Add":" } else {"},{"Add":" proc_macro2::TokenStream::from_iter(error.into_iter())"},{"Add":" };"}]}},{"Replacement":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":69,"ins":{"up_context":[{"change":22,"pos":2496}],"down_context":[{"change":22,"pos":2553}],"flag":"BLOCK","start":186,"end":370,"inode":{"change":22,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":2496},"to":{"change":22,"start":2496,"end":2553},"introduced_by":22}],"inode":{"change":22,"pos":445}},"ins_contents":[{"Add":" quote! { if let Ok(x) = self.txn.get(&self.#name, key, value) {"},{"Add":" Ok(x)"},{"Add":" } else {"},{"Add":" Err(TxnErr(SanakirjaError::PristineCorrupt))"},{"Add":" }"},{"Add":" }"}],"del_contents":[{"Del":" quote! { self.txn.get(&self.#name, key, value) }\n"}]}},{"Replacement":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":76,"ins":{"up_context":[{"change":22,"pos":2566}],"down_context":[{"change":22,"pos":2632}],"flag":"BLOCK","start":371,"end":555,"inode":{"change":22,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":2566},"to":{"change":22,"start":2566,"end":2632},"introduced_by":22}],"inode":{"change":22,"pos":445}},"ins_contents":[{"Add":" quote! { if let Ok(x) = self.txn.get(&self.#name, key, value) {"},{"Add":" Ok(x . #post_)"},{"Add":" } else {"},{"Add":" Err(TxnErr(SanakirjaError::PristineCorrupt))"},{"Add":" }}"}],"del_contents":[{"Del":" quote! { self.txn.get(&self.#name, key, value) . #post_ }\n"}]}},{"Replacement":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":83,"ins":{"up_context":[{"change":22,"pos":2682}],"down_context":[{"change":22,"pos":2800}],"flag":"BLOCK","start":556,"end":681,"inode":{"change":22,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":2682},"to":{"change":22,"start":2682,"end":2800},"introduced_by":22}],"inode":{"change":22,"pos":445}},"ins_contents":[{"Add":" fn #name_get <'txn> (&'txn self, key: #key, value: Option<#value>) -> Result, TxnErr> {"}],"del_contents":[{"Del":" #[doc(hidden)]\n fn #name_get <'txn> (&'txn self, key: #key, value: Option<#value>) -> Option<#value> {\n"}]}},{"Edit":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":103,"atom":{"NewVertex":{"up_context":[{"change":22,"pos":3586}],"down_context":[{"change":22,"pos":3586}],"flag":"BLOCK","start":682,"end":867,"inode":{"change":22,"pos":445}}},"contents":[{"Add":" let error = next(&mut input_iter);"},{"Add":" let error = if error.is_empty() {"},{"Add":" quote! { Error }"},{"Add":" } else {"},{"Add":" proc_macro2::TokenStream::from_iter(error.into_iter())"},{"Add":" };"}]}},{"Replacement":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":111,"ins":{"up_context":[{"change":22,"pos":3671}],"down_context":[{"change":22,"pos":3802}],"flag":"BLOCK","start":868,"end":1006,"inode":{"change":22,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":3671},"to":{"change":22,"start":3671,"end":3802},"introduced_by":22}],"inode":{"change":22,"pos":445}},"ins_contents":[{"Add":" fn #name_get(&self, db: &Self::#name_capital, key: #key, value: Option<#value>) -> Result, TxnErr> {"}],"del_contents":[{"Del":" #[doc(hidden)]\n fn #name_get(&self, db: &Self::#name_capital, key: #key, value: Option<#value>) -> Option<#value> {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":113,"ins":{"up_context":[{"change":22,"pos":3844}],"down_context":[{"change":22,"pos":3885}],"flag":"BLOCK","start":1007,"end":1183,"inode":{"change":22,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":3844},"to":{"change":22,"start":3844,"end":3885},"introduced_by":22}],"inode":{"change":22,"pos":445}},"ins_contents":[{"Add":" if let Ok(x) = self.txn.get(db, key, value) {"},{"Add":" Ok(x)"},{"Add":" } else {"},{"Add":" Err(TxnErr(SanakirjaError::PristineCorrupt))"},{"Add":" }"}],"del_contents":[{"Del":" self.txn.get(db, key, value)\n"}]}},{"Edit":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":133,"atom":{"NewVertex":{"up_context":[{"change":22,"pos":4509}],"down_context":[{"change":22,"pos":4509}],"flag":"BLOCK","start":1184,"end":1369,"inode":{"change":22,"pos":445}}},"contents":[{"Add":" let error = next(&mut input_iter);"},{"Add":" let error = if error.is_empty() {"},{"Add":" quote! { Error }"},{"Add":" } else {"},{"Add":" proc_macro2::TokenStream::from_iter(error.into_iter())"},{"Add":" };"}]}},{"Replacement":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":141,"ins":{"up_context":[{"change":22,"pos":4594}],"down_context":[{"change":22,"pos":4709}],"flag":"BLOCK","start":1370,"end":1492,"inode":{"change":22,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":4594},"to":{"change":22,"start":4594,"end":4709},"introduced_by":22}],"inode":{"change":22,"pos":445}},"ins_contents":[{"Add":" fn #name_get<'txn>(&'txn self, key: #key, value: Option<#value>) -> Result, TxnErr>;"}],"del_contents":[{"Del":" #[doc(hidden)]\n fn #name_get<'txn>(&'txn self, key: #key, value: Option<#value>) -> Option<#value>;\n"}]}},{"Edit":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":157,"atom":{"NewVertex":{"up_context":[{"change":22,"pos":5398}],"down_context":[{"change":22,"pos":5398}],"flag":"BLOCK","start":1493,"end":1678,"inode":{"change":22,"pos":445}}},"contents":[{"Add":" let error = next(&mut input_iter);"},{"Add":" let error = if error.is_empty() {"},{"Add":" quote! { Error }"},{"Add":" } else {"},{"Add":" proc_macro2::TokenStream::from_iter(error.into_iter())"},{"Add":" };"}]}},{"Replacement":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":165,"ins":{"up_context":[{"change":22,"pos":5483}],"down_context":[{"change":22,"pos":5624}],"flag":"BLOCK","start":1679,"end":1827,"inode":{"change":22,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":5483},"to":{"change":22,"start":5483,"end":5624},"introduced_by":22}],"inode":{"change":22,"pos":445}},"ins_contents":[{"Add":" fn #name_get<'txn>(&'txn self, db: &Self::#name_capital, key: #key, value: Option<#value>) -> Result, TxnErr>;"}],"del_contents":[{"Del":" #[doc(hidden)]\n fn #name_get<'txn>(&'txn self, db: &Self::#name_capital, key: #key, value: Option<#value>) -> Option<#value>;\n"}]}},{"Edit":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":234,"atom":{"NewVertex":{"up_context":[{"change":22,"pos":8021}],"down_context":[{"change":22,"pos":8021}],"flag":"BLOCK","start":1828,"end":2020,"inode":{"change":22,"pos":445}}},"contents":[{"Add":""},{"Add":" let error = next(&mut input_iter);"},{"Add":" let error = if error.is_empty() {"},{"Add":" quote! { GraphError }"},{"Add":" } else {"},{"Add":" proc_macro2::TokenStream::from_iter(error.into_iter())"},{"Add":" };"},{"Add":""}]}},{"Replacement":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":244,"ins":{"up_context":[{"change":22,"pos":8069}],"down_context":[{"change":22,"pos":8160}],"flag":"BLOCK","start":2021,"end":2142,"inode":{"change":22,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":8069},"to":{"change":22,"start":8069,"end":8160},"introduced_by":22}],"inode":{"change":22,"pos":445}},"ins_contents":[{"Add":" Result, TxnErr>"}],"del_contents":[{"Del":" crate::pristine::RevCursor\n"}]}},{"Replacement":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":248,"ins":{"up_context":[{"change":22,"pos":8200}],"down_context":[{"change":22,"pos":8288}],"flag":"BLOCK","start":2143,"end":2261,"inode":{"change":22,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":8200},"to":{"change":22,"start":8200,"end":8288},"introduced_by":22}],"inode":{"change":22,"pos":445}},"ins_contents":[{"Add":" Result, TxnErr>"}],"del_contents":[{"Del":" crate::pristine::Cursor\n"}]}},{"Edit":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":255,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":8376},"to":{"change":22,"start":8376,"end":8403},"introduced_by":22}],"inode":{"change":22,"pos":445}}},"contents":[{"Del":" #[doc(hidden)]\n"}]}},{"Edit":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":256,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":8434},"to":{"change":22,"start":8434,"end":8461},"introduced_by":22}],"inode":{"change":22,"pos":445}}},"contents":[{"Del":" #[doc(hidden)]\n"}]}},{"Replacement":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":259,"ins":{"up_context":[{"change":22,"pos":8573}],"down_context":[{"change":22,"pos":8641}],"flag":"BLOCK","start":2262,"end":2333,"inode":{"change":22,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":8573},"to":{"change":22,"start":8573,"end":8641},"introduced_by":22}],"inode":{"change":22,"pos":445}},"ins_contents":[{"Add":" ) -> Result, TxnErr>;"}],"del_contents":[{"Del":" ) -> Option<(#key, #value)>;\n #[doc(hidden)]\n"}]}},{"Replacement":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":263,"ins":{"up_context":[{"change":22,"pos":8753}],"down_context":[{"change":22,"pos":8794}],"flag":"BLOCK","start":2334,"end":2405,"inode":{"change":22,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":8753},"to":{"change":22,"start":8753,"end":8794},"introduced_by":22}],"inode":{"change":22,"pos":445}},"ins_contents":[{"Add":" ) -> Result, TxnErr>;"}],"del_contents":[{"Del":" ) -> Option<(#key, #value)>;\n"}]}},{"Edit":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":268,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":8857},"to":{"change":22,"start":8857,"end":8880},"introduced_by":22}],"inode":{"change":22,"pos":445}}},"contents":[{"Del":" #[doc(hidden)]\n"}]}},{"Replacement":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":272,"ins":{"up_context":[{"change":22,"pos":9053}],"down_context":[{"change":22,"pos":9135}],"flag":"BLOCK","start":2406,"end":2518,"inode":{"change":22,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":9053},"to":{"change":22,"start":9053,"end":9135},"introduced_by":22}],"inode":{"change":22,"pos":445}},"ins_contents":[{"Add":" ) -> Result, TxnErr>;"}],"del_contents":[{"Del":" ) -> crate::pristine::Cursor;\n"}]}},{"Edit":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":281,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":9257},"to":{"change":22,"start":9257,"end":9284},"introduced_by":22}],"inode":{"change":22,"pos":445}}},"contents":[{"Del":" #[doc(hidden)]\n"}]}},{"Edit":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":291,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":9552},"to":{"change":22,"start":9552,"end":9575},"introduced_by":22}],"inode":{"change":22,"pos":445}}},"contents":[{"Del":" #[doc(hidden)]\n"}]}},{"Edit":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":372,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":12226},"to":{"change":22,"start":12226,"end":12253},"introduced_by":22}],"inode":{"change":22,"pos":445}}},"contents":[{"Del":" #[doc(hidden)]\n"}]}},{"Replacement":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":376,"ins":{"up_context":[{"change":22,"pos":12375}],"down_context":[{"change":22,"pos":12460}],"flag":"BLOCK","start":2519,"end":2636,"inode":{"change":22,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":12375},"to":{"change":22,"start":12375,"end":12460},"introduced_by":22}],"inode":{"change":22,"pos":445}},"ins_contents":[{"Add":" ) -> Result, TxnErr> {"}],"del_contents":[{"Del":" ) -> super::Cursor {\n"}]}},{"Edit":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":386,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":12630},"to":{"change":22,"start":12630,"end":12657},"introduced_by":22}],"inode":{"change":22,"pos":445}}},"contents":[{"Del":" #[doc(hidden)]\n"}]}},{"Replacement":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":390,"ins":{"up_context":[{"change":22,"pos":12848}],"down_context":[{"change":22,"pos":12925}],"flag":"BLOCK","start":2637,"end":2746,"inode":{"change":22,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":12848},"to":{"change":22,"start":12848,"end":12925},"introduced_by":22}],"inode":{"change":22,"pos":445}},"ins_contents":[{"Add":" ) -> Result, TxnErr> {"}],"del_contents":[{"Del":" ) -> super::Cursor {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":392,"ins":{"up_context":[{"change":22,"pos":12951}],"down_context":[{"change":22,"pos":13156}],"flag":"BLOCK","start":2747,"end":3091,"inode":{"change":22,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":12951},"to":{"change":22,"start":12951,"end":13156},"introduced_by":22}],"inode":{"change":22,"pos":445}},"ins_contents":[{"Add":" if let Ok((cursor, _)) = txn.txn.set_cursors(&db, pos) {"},{"Add":" Ok(super::Cursor {"},{"Add":" cursor,"},{"Add":" txn,"},{"Add":" marker: std::marker::PhantomData,"},{"Add":" })"},{"Add":" } else {"},{"Add":" Err(TxnErr(SanakirjaError::PristineCorrupt))"}],"del_contents":[{"Del":" let mut cursor = txn.txn.set_cursors(&db, pos).0;\n super::Cursor {\n cursor,\n txn,\n marker: std::marker::PhantomData,\n"}]}},{"Edit":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":409,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":13310},"to":{"change":22,"start":13310,"end":13337},"introduced_by":22}],"inode":{"change":22,"pos":445}}},"contents":[{"Del":" #[doc(hidden)]\n"}]}},{"Replacement":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":413,"ins":{"up_context":[{"change":22,"pos":13495}],"down_context":[{"change":22,"pos":13583}],"flag":"BLOCK","start":3092,"end":3212,"inode":{"change":22,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":13495},"to":{"change":22,"start":13495,"end":13583},"introduced_by":22}],"inode":{"change":22,"pos":445}},"ins_contents":[{"Add":" ) -> Result, TxnErr> {"}],"del_contents":[{"Del":" ) -> super::RevCursor {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":416,"ins":{"up_context":[{"change":22,"pos":13661}],"down_context":[{"change":22,"pos":13714}],"flag":"BLOCK","start":3213,"end":3532,"inode":{"change":22,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":13661},"to":{"change":22,"start":13661,"end":13714},"introduced_by":22}],"inode":{"change":22,"pos":445}},"ins_contents":[{"Add":" if let Ok((x, _)) = self.txn.set_cursors(&db, pos) {"},{"Add":" x"},{"Add":" } else {"},{"Add":" return Err(TxnErr(SanakirjaError::PristineCorrupt))"},{"Add":" }"},{"Add":" } else if let Ok(x) = self.txn.set_cursors_last(&db) {"},{"Add":" x"}],"del_contents":[{"Del":" self.txn.set_cursors(&db, pos).0\n"}]}},{"Replacement":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":424,"ins":{"up_context":[{"change":22,"pos":13739}],"down_context":[{"change":22,"pos":13790}],"flag":"BLOCK","start":3533,"end":3605,"inode":{"change":22,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":13739},"to":{"change":22,"start":13739,"end":13790},"introduced_by":22}],"inode":{"change":22,"pos":445}},"ins_contents":[{"Add":" return Err(TxnErr(SanakirjaError::PristineCorrupt))"}],"del_contents":[{"Del":" self.txn.set_cursors_last(&db)\n"}]}},{"Replacement":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":426,"ins":{"up_context":[{"change":22,"pos":13809}],"down_context":[{"change":22,"pos":13844}],"flag":"BLOCK","start":3606,"end":3644,"inode":{"change":22,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":13809},"to":{"change":22,"start":13809,"end":13844},"introduced_by":22}],"inode":{"change":22,"pos":445}},"ins_contents":[{"Add":" Ok(super::RevCursor {"}],"del_contents":[{"Del":" super::RevCursor {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":430,"ins":{"up_context":[{"change":22,"pos":13957}],"down_context":[{"change":22,"pos":13975}],"flag":"BLOCK","start":3645,"end":3664,"inode":{"change":22,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":13957},"to":{"change":22,"start":13957,"end":13975},"introduced_by":22}],"inode":{"change":22,"pos":445}},"ins_contents":[{"Add":" })"}],"del_contents":[{"Del":" }\n"}]}},{"Edit":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":435,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":14029},"to":{"change":22,"start":14029,"end":14056},"introduced_by":22}],"inode":{"change":22,"pos":445}}},"contents":[{"Del":" #[doc(hidden)]\n"}]}},{"Edit":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":436,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":14109},"to":{"change":22,"start":14109,"end":14136},"introduced_by":22}],"inode":{"change":22,"pos":445}}},"contents":[{"Del":" #[doc(hidden)]\n"}]}},{"Replacement":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":440,"ins":{"up_context":[{"change":22,"pos":14294}],"down_context":[{"change":22,"pos":14379}],"flag":"BLOCK","start":3665,"end":3782,"inode":{"change":22,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":14294},"to":{"change":22,"start":14294,"end":14379},"introduced_by":22}],"inode":{"change":22,"pos":445}},"ins_contents":[{"Add":" ) -> Result, TxnErr> {"}],"del_contents":[{"Del":" ) -> super::Cursor {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":442,"ins":{"up_context":[{"change":22,"pos":14405}],"down_context":[{"change":22,"pos":14504}],"flag":"BLOCK","start":3783,"end":4042,"inode":{"change":22,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":14405},"to":{"change":22,"start":14405,"end":14504},"introduced_by":22}],"inode":{"change":22,"pos":445}},"ins_contents":[{"Add":" let mut cursor = if let Ok((x, _)) = self.txn.set_cursors(&db, pos) {"},{"Add":" x"},{"Add":" } else {"},{"Add":" return Err(TxnErr(SanakirjaError::PristineCorrupt))"},{"Add":" };"},{"Add":" Ok(super::Cursor {"}],"del_contents":[{"Del":" let mut cursor = self.txn.set_cursors(&db, pos).0;\n super::Cursor {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":451,"ins":{"up_context":[{"change":22,"pos":14617}],"down_context":[{"change":22,"pos":14635}],"flag":"BLOCK","start":4043,"end":4062,"inode":{"change":22,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":14617},"to":{"change":22,"start":14617,"end":14635},"introduced_by":22}],"inode":{"change":22,"pos":445}},"ins_contents":[{"Add":" })"}],"del_contents":[{"Del":" }\n"}]}},{"Edit":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":454,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":14669},"to":{"change":22,"start":14669,"end":14696},"introduced_by":22}],"inode":{"change":22,"pos":445}}},"contents":[{"Del":" #[doc(hidden)]\n"}]}},{"Replacement":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":457,"ins":{"up_context":[{"change":22,"pos":14808}],"down_context":[{"change":22,"pos":14942}],"flag":"BLOCK","start":4063,"end":4392,"inode":{"change":22,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":14808},"to":{"change":22,"start":14808,"end":14942},"introduced_by":22}],"inode":{"change":22,"pos":445}},"ins_contents":[{"Add":" ) -> Result, TxnErr> {"},{"Add":" let x = if let Ok(x) = unsafe { ::sanakirja::next(&self.txn, cursor) } {"},{"Add":" x"},{"Add":" } else {"},{"Add":" return Err(TxnErr(SanakirjaError::PristineCorrupt))"},{"Add":" };"},{"Add":" Ok(x #post)"}],"del_contents":[{"Del":" ) -> Option<(#key, #value)> {\n (unsafe { ::sanakirja::next(&self.txn, cursor) })\n #post\n"}]}},{"Edit":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":465,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":14956},"to":{"change":22,"start":14956,"end":14983},"introduced_by":22}],"inode":{"change":22,"pos":445}}},"contents":[{"Del":" #[doc(hidden)]\n"}]}},{"Replacement":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":468,"ins":{"up_context":[{"change":22,"pos":15095}],"down_context":[{"change":22,"pos":15229}],"flag":"BLOCK","start":4393,"end":4722,"inode":{"change":22,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":15095},"to":{"change":22,"start":15095,"end":15229},"introduced_by":22}],"inode":{"change":22,"pos":445}},"ins_contents":[{"Add":" ) -> Result, TxnErr> {"},{"Add":" let x = if let Ok(x) = unsafe { ::sanakirja::prev(&self.txn, cursor) } {"},{"Add":" x"},{"Add":" } else {"},{"Add":" return Err(TxnErr(SanakirjaError::PristineCorrupt))"},{"Add":" };"},{"Add":" Ok(x #post)"}],"del_contents":[{"Del":" ) -> Option<(#key, #value)> {\n (unsafe { ::sanakirja::prev(&self.txn, cursor) })\n #post\n"}]}},{"Edit":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":507,"atom":{"NewVertex":{"up_context":[{"change":22,"pos":16388}],"down_context":[{"change":22,"pos":16388}],"flag":"BLOCK","start":4723,"end":5211,"inode":{"change":22,"pos":445}}},"contents":[{"Add":" let txnt = next(&mut input_iter);"},{"Add":" let txnt: proc_macro2::TokenStream = if txnt.is_empty() {"},{"Add":" proc_macro2::TokenStream::from(quote! { TxnT })"},{"Add":" } else {"},{"Add":" proc_macro2::TokenStream::from_iter(txnt.into_iter())"},{"Add":" };"},{"Add":""},{"Add":" let error = next(&mut input_iter);"},{"Add":" let error: proc_macro2::TokenStream = if error.is_empty() {"},{"Add":" proc_macro2::TokenStream::from(quote! { GraphError })"},{"Add":" } else {"},{"Add":" proc_macro2::TokenStream::from_iter(error.into_iter())"},{"Add":" };"},{"Add":""}]}},{"Replacement":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":524,"ins":{"up_context":[{"change":22,"pos":16490}],"down_context":[{"change":22,"pos":16627}],"flag":"BLOCK","start":5212,"end":5350,"inode":{"change":22,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":16490},"to":{"change":22,"start":16490,"end":16627},"introduced_by":22}],"inode":{"change":22,"pos":445}},"ins_contents":[{"Add":" impl> Iterator for crate::pristine::RevCursor"}],"del_contents":[{"Del":" impl> Iterator for crate::pristine::RevCursor\n"}]}},{"Replacement":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":526,"ins":{"up_context":[{"change":22,"pos":16641}],"down_context":[{"change":22,"pos":16806}],"flag":"BLOCK","start":5351,"end":5711,"inode":{"change":22,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":16641},"to":{"change":22,"start":16641,"end":16806},"introduced_by":22}],"inode":{"change":22,"pos":445}},"ins_contents":[{"Add":" type Item = Result<(#key, #value), TxnErr>;"},{"Add":" fn next(&mut self) -> Option {"},{"Add":" match self.txn.#name_prev(&mut self.cursor) {"},{"Add":" Ok(Some(x)) => Some(Ok(x)),"},{"Add":" Ok(None) => None,"},{"Add":" Err(e) => Some(Err(e)),"},{"Add":" }"}],"del_contents":[{"Del":" type Item = (#key, #value);\n fn next(&mut self) -> Option<(#key, #value)> {\n self.txn.#name_prev(&mut self.cursor)\n"}]}},{"Replacement":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":539,"ins":{"up_context":[{"change":22,"pos":16910}],"down_context":[{"change":22,"pos":16969}],"flag":"BLOCK","start":5712,"end":5772,"inode":{"change":22,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":16910},"to":{"change":22,"start":16910,"end":16969},"introduced_by":22}],"inode":{"change":22,"pos":445}},"ins_contents":[{"Add":" impl>"}],"del_contents":[{"Del":" impl>\n"}]}},{"Replacement":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":542,"ins":{"up_context":[{"change":22,"pos":17061}],"down_context":[{"change":22,"pos":17186}],"flag":"BLOCK","start":5773,"end":6097,"inode":{"change":22,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":17061},"to":{"change":22,"start":17061,"end":17186},"introduced_by":22}],"inode":{"change":22,"pos":445}},"ins_contents":[{"Add":" pub fn prev(&mut self) -> Option>> {"},{"Add":" match self.txn.#name_prev(&mut self.cursor) {"},{"Add":" Ok(Some(x)) => Some(Ok(x)),"},{"Add":" Ok(None) => None,"},{"Add":" Err(e) => Some(Err(e)),"},{"Add":" }"}],"del_contents":[{"Del":" pub fn prev(&mut self) -> Option<(#key, #value)> {\n self.txn.#name_prev(&mut self.cursor)\n"}]}},{"Replacement":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":550,"ins":{"up_context":[{"change":22,"pos":17218}],"down_context":[{"change":22,"pos":17352}],"flag":"BLOCK","start":6098,"end":6233,"inode":{"change":22,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":17218},"to":{"change":22,"start":17218,"end":17352},"introduced_by":22}],"inode":{"change":22,"pos":445}},"ins_contents":[{"Add":" impl> Iterator for crate::pristine::Cursor"}],"del_contents":[{"Del":" impl> Iterator for crate::pristine::Cursor\n"}]}},{"Replacement":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":552,"ins":{"up_context":[{"change":22,"pos":17366}],"down_context":[{"change":22,"pos":17531}],"flag":"BLOCK","start":6234,"end":6594,"inode":{"change":22,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":17366},"to":{"change":22,"start":17366,"end":17531},"introduced_by":22}],"inode":{"change":22,"pos":445}},"ins_contents":[{"Add":" type Item = Result<(#key, #value), TxnErr>;"},{"Add":" fn next(&mut self) -> Option {"},{"Add":" match self.txn.#name_next(&mut self.cursor) {"},{"Add":" Ok(Some(x)) => Some(Ok(x)),"},{"Add":" Ok(None) => None,"},{"Add":" Err(e) => Some(Err(e)),"},{"Add":" }"}],"del_contents":[{"Del":" type Item = (#key, #value);\n fn next(&mut self) -> Option<(#key, #value)> {\n self.txn.#name_next(&mut self.cursor)\n"}]}},{"Edit":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":578,"atom":{"NewVertex":{"up_context":[{"change":22,"pos":18257}],"down_context":[{"change":22,"pos":18257}],"flag":"BLOCK","start":6595,"end":6781,"inode":{"change":22,"pos":445}}},"contents":[{"Add":""},{"Add":" let error = next(&mut input_iter);"},{"Add":" let error = if error.is_empty() {"},{"Add":" quote! { Error }"},{"Add":" } else {"},{"Add":" proc_macro2::TokenStream::from_iter(error.into_iter())"},{"Add":" };"}]}},{"Edit":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":587,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":18342},"to":{"change":22,"start":18342,"end":18365},"introduced_by":22}],"inode":{"change":22,"pos":445}}},"contents":[{"Del":" #[doc(hidden)]\n"}]}},{"Replacement":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":591,"ins":{"up_context":[{"change":22,"pos":18449}],"down_context":[{"change":22,"pos":18514}],"flag":"BLOCK","start":6782,"end":6831,"inode":{"change":22,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":18449},"to":{"change":22,"start":0,"end":40},"introduced_by":22},{"previous":"","flag":"DELETED","from":{"change":22,"pos":40},"to":{"change":22,"start":18491,"end":18514},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":18491},"to":{"change":22,"start":18491,"end":18514},"introduced_by":22}],"inode":{"change":22,"pos":445}},"ins_contents":[{"Add":" ) -> Result>;"}],"del_contents":[{"Del":" ) -> Result;\n"},{"Del":" #[doc(hidden)]\n"}]}},{"Replacement":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":596,"ins":{"up_context":[{"change":22,"pos":18606}],"down_context":[{"change":22,"pos":18648}],"flag":"BLOCK","start":6832,"end":6881,"inode":{"change":22,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":18606},"to":{"change":22,"start":41,"end":81},"introduced_by":22}],"inode":{"change":22,"pos":445}},"ins_contents":[{"Add":" ) -> Result>;"}],"del_contents":[{"Del":" ) -> Result;\n"}]}},{"Edit":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":614,"atom":{"NewVertex":{"up_context":[{"change":22,"pos":19400}],"down_context":[{"change":22,"pos":19400}],"flag":"BLOCK","start":6882,"end":7068,"inode":{"change":22,"pos":445}}},"contents":[{"Add":""},{"Add":" let error = next(&mut input_iter);"},{"Add":" let error = if error.is_empty() {"},{"Add":" quote! { Error }"},{"Add":" } else {"},{"Add":" proc_macro2::TokenStream::from_iter(error.into_iter())"},{"Add":" };"}]}},{"Edit":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":624,"atom":{"NewVertex":{"up_context":[{"change":22,"pos":19583}],"down_context":[{"change":22,"pos":19583}],"flag":"BLOCK","start":7069,"end":7070,"inode":{"change":22,"pos":445}}},"contents":[{"Add":""}]}},{"Edit":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":626,"atom":{"NewVertex":{"up_context":[{"change":22,"pos":19625}],"down_context":[{"change":22,"pos":19625}],"flag":"BLOCK","start":7071,"end":7072,"inode":{"change":22,"pos":445}}},"contents":[{"Add":""}]}},{"Edit":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":629,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":19700},"to":{"change":22,"start":19700,"end":19727},"introduced_by":22}],"inode":{"change":22,"pos":445}}},"contents":[{"Del":" #[doc(hidden)]\n"}]}},{"Replacement":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":633,"ins":{"up_context":[{"change":22,"pos":19827}],"down_context":[{"change":22,"pos":19946}],"flag":"BLOCK","start":7073,"end":7215,"inode":{"change":22,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":19827},"to":{"change":22,"start":82,"end":127},"introduced_by":22},{"previous":"","flag":"DELETED","from":{"change":22,"pos":127},"to":{"change":22,"start":19874,"end":19946},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":19874},"to":{"change":22,"start":19874,"end":19946},"introduced_by":22}],"inode":{"change":22,"pos":445}},"ins_contents":[{"Add":" ) -> Result> {"},{"Add":" Ok(self.txn.put(&mut self.rng, &mut self.#name, k, v).map_err(TxnErr)?)"}],"del_contents":[{"Del":" ) -> Result {\n"},{"Del":" Ok(self.txn.put(&mut self.rng, &mut self.#name, k, v)?)\n"}]}},{"Edit":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":636,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":19960},"to":{"change":22,"start":19960,"end":19987},"introduced_by":22}],"inode":{"change":22,"pos":445}}},"contents":[{"Del":" #[doc(hidden)]\n"}]}},{"Replacement":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":640,"ins":{"up_context":[{"change":22,"pos":20095}],"down_context":[{"change":22,"pos":20214}],"flag":"BLOCK","start":7216,"end":7358,"inode":{"change":22,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":20095},"to":{"change":22,"start":128,"end":173},"introduced_by":22},{"previous":"","flag":"DELETED","from":{"change":22,"pos":173},"to":{"change":22,"start":20142,"end":20214},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":20142},"to":{"change":22,"start":20142,"end":20214},"introduced_by":22}],"inode":{"change":22,"pos":445}},"ins_contents":[{"Add":" ) -> Result> {"},{"Add":" Ok(self.txn.del(&mut self.rng, &mut self.#name, k, v).map_err(TxnErr)?)"}],"del_contents":[{"Del":" ) -> Result {\n"},{"Del":" Ok(self.txn.del(&mut self.rng, &mut self.#name, k, v)?)\n"}]}},{"Edit":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":646,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":20299},"to":{"change":22,"start":20299,"end":20326},"introduced_by":22}],"inode":{"change":22,"pos":445}}},"contents":[{"Del":" #[doc(hidden)]\n"}]}},{"Replacement":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":650,"ins":{"up_context":[{"change":22,"pos":20426}],"down_context":[{"change":22,"pos":20473}],"flag":"BLOCK","start":7359,"end":7413,"inode":{"change":22,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":20426},"to":{"change":22,"start":174,"end":219},"introduced_by":22}],"inode":{"change":22,"pos":445}},"ins_contents":[{"Add":" ) -> Result> {"}],"del_contents":[{"Del":" ) -> Result {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":653,"ins":{"up_context":[{"change":22,"pos":20543}],"down_context":[{"change":22,"pos":20615}],"flag":"BLOCK","start":7414,"end":7502,"inode":{"change":22,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":20543},"to":{"change":22,"start":20543,"end":20615},"introduced_by":22}],"inode":{"change":22,"pos":445}},"ins_contents":[{"Add":" Ok(self.txn.put(&mut self.rng, &mut self.#name, k, v).map_err(TxnErr)?)"}],"del_contents":[{"Del":" Ok(self.txn.put(&mut self.rng, &mut self.#name, k, v)?)\n"}]}},{"Edit":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":655,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":20629},"to":{"change":22,"start":20629,"end":20656},"introduced_by":22}],"inode":{"change":22,"pos":445}}},"contents":[{"Del":" #[doc(hidden)]\n"}]}},{"Replacement":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":659,"ins":{"up_context":[{"change":22,"pos":20764}],"down_context":[{"change":22,"pos":20811}],"flag":"BLOCK","start":7503,"end":7557,"inode":{"change":22,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":20764},"to":{"change":22,"start":220,"end":265},"introduced_by":22}],"inode":{"change":22,"pos":445}},"ins_contents":[{"Add":" ) -> Result> {"}],"del_contents":[{"Del":" ) -> Result {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":445},"path":"pijul-macros/src/lib.rs","line":662,"ins":{"up_context":[{"change":22,"pos":20892}],"down_context":[{"change":22,"pos":20964}],"flag":"BLOCK","start":7558,"end":7646,"inode":{"change":22,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":20892},"to":{"change":22,"start":20892,"end":20964},"introduced_by":22}],"inode":{"change":22,"pos":445}},"ins_contents":[{"Add":" Ok(self.txn.del(&mut self.rng, &mut self.#name, k, v).map_err(TxnErr)?)"}],"del_contents":[{"Del":" Ok(self.txn.del(&mut self.rng, &mut self.#name, k, v)?)\n"}]}},{"Replacement":{"inode":{"change":22,"pos":21011},"path":"pijul-macros/Cargo.toml","line":4,"ins":{"up_context":[{"change":22,"pos":21091}],"down_context":[{"change":22,"pos":21109}],"flag":"BLOCK","start":7647,"end":7665,"inode":{"change":22,"pos":21011}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":21091},"to":{"change":22,"start":0,"end":18},"introduced_by":22}],"inode":{"change":22,"pos":21011}},"ins_contents":[{"Add":"version = \"0.3.0\""}],"del_contents":[{"Del":"version = \"0.2.0\"\n"}]}},{"Edit":{"inode":{"change":22,"pos":21431},"path":"pijul/src/repository.rs","line":4,"atom":{"NewVertex":{"up_context":[{"change":22,"pos":21541}],"down_context":[{"change":22,"pos":0}],"flag":"BLOCK","start":7666,"end":7684,"inode":{"change":22,"pos":21431}}},"contents":[{"Add":"use anyhow::bail;"}]}},{"Replacement":{"inode":{"change":22,"pos":21431},"path":"pijul/src/repository.rs","line":8,"ins":{"up_context":[{"change":22,"pos":40}],"down_context":[{"change":22,"pos":81}],"flag":"BLOCK","start":7685,"end":7719,"inode":{"change":22,"pos":21431}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":40},"to":{"change":22,"start":40,"end":81},"introduced_by":22}],"inode":{"change":22,"pos":21431}},"ins_contents":[{"Add":"use crate::{config, current_dir};"}],"del_contents":[{"Del":"use crate::{config, current_dir, Error};\n"}]}},{"Replacement":{"inode":{"change":22,"pos":21431},"path":"pijul/src/repository.rs","line":45,"ins":{"up_context":[{"change":22,"pos":22740}],"down_context":[{"change":22,"pos":22798}],"flag":"BLOCK","start":7720,"end":7775,"inode":{"change":22,"pos":21431}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":22740},"to":{"change":22,"start":22740,"end":22798},"introduced_by":22}],"inode":{"change":22,"pos":21431}},"ins_contents":[{"Add":" bail!(\"No Pijul repository found\")"}],"del_contents":[{"Del":" return Err(Error::NoRepoRoot.into());\n"}]}},{"Replacement":{"inode":{"change":22,"pos":21431},"path":"pijul/src/repository.rs","line":74,"ins":{"up_context":[{"change":22,"pos":23686}],"down_context":[{"change":22,"pos":23779}],"flag":"BLOCK","start":7776,"end":7856,"inode":{"change":22,"pos":21431}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":23686},"to":{"change":22,"start":23686,"end":23779},"introduced_by":22}],"inode":{"change":22,"pos":21431}},"ins_contents":[{"Add":" bail!(\"Could not read configuration file at {:?}\", config_path)"}],"del_contents":[{"Del":" return Err((crate::Error::CouldNotReadConfig { path: config_path }).into());\n"}]}},{"Replacement":{"inode":{"change":22,"pos":21431},"path":"pijul/src/repository.rs","line":114,"ins":{"up_context":[{"change":22,"pos":25296}],"down_context":[{"change":22,"pos":25342}],"flag":"BLOCK","start":7857,"end":7902,"inode":{"change":22,"pos":21431}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":25296},"to":{"change":22,"start":25296,"end":25342},"introduced_by":22}],"inode":{"change":22,"pos":21431}},"ins_contents":[{"Add":" bail!(\"Already in a repository\")"}],"del_contents":[{"Del":" Err(Error::AlreadyInARepo.into())\n"}]}},{"Edit":{"inode":{"change":22,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":21,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":366},"to":{"change":22,"start":366,"end":384},"introduced_by":22}],"inode":{"change":22,"pos":25380}}},"contents":[{"Del":"use crate::Error;\n"}]}},{"Replacement":{"inode":{"change":22,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":103,"ins":{"up_context":[{"change":22,"pos":28303}],"down_context":[{"change":22,"pos":28359}],"flag":"BLOCK","start":7903,"end":7942,"inode":{"change":22,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":28303},"to":{"change":22,"start":28303,"end":28359},"introduced_by":22}],"inode":{"change":22,"pos":25380}},"ins_contents":[{"Add":" bail!(\"Not authenticated\")"}],"del_contents":[{"Del":" return Err(Error::NotAuthenticated.into());\n"}]}},{"Replacement":{"inode":{"change":22,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":561,"ins":{"up_context":[{"change":22,"pos":35811}],"down_context":[{"change":22,"pos":35977}],"flag":"BLOCK","start":7943,"end":8020,"inode":{"change":22,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":35811},"to":{"change":22,"start":35811,"end":35977},"introduced_by":22}],"inode":{"change":22,"pos":25380}},"ins_contents":[{"Add":" bail!(\"Remote exited with status {:?}\", exit_status)"}],"del_contents":[{"Del":" return Err((Error::RemoteExit {\n status: exit_status,\n })\n .into());\n"}]}},{"Replacement":{"inode":{"change":22,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":659,"ins":{"up_context":[{"change":22,"pos":41652}],"down_context":[{"change":22,"pos":41834}],"flag":"BLOCK","start":8021,"end":8102,"inode":{"change":22,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":41652},"to":{"change":22,"start":41652,"end":41834},"introduced_by":22}],"inode":{"change":22,"pos":25380}},"ins_contents":[{"Add":" bail!(\"Remote exited with status {:?}\", exit_status)"}],"del_contents":[{"Del":" return Err((Error::RemoteExit {\n status: exit_status,\n })\n .into());\n"}]}},{"Replacement":{"inode":{"change":22,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":881,"ins":{"up_context":[{"change":22,"pos":51533}],"down_context":[{"change":22,"pos":51716}],"flag":"BLOCK","start":8103,"end":8159,"inode":{"change":22,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":51533},"to":{"change":22,"start":51533,"end":51588},"introduced_by":22}],"inode":{"change":22,"pos":25380}},"ins_contents":[{"Add":" let h = txn.get_external(ch)?.unwrap();"}],"del_contents":[{"Del":" let h = txn.get_external(ch).unwrap();\n"}]}},{"Replacement":{"inode":{"change":22,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":885,"ins":{"up_context":[{"change":22,"pos":51779}],"down_context":[{"change":22,"pos":52059}],"flag":"BLOCK","start":8160,"end":8245,"inode":{"change":22,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":51779},"to":{"change":22,"start":460,"end":515},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":52027},"to":{"change":22,"start":52027,"end":52059},"introduced_by":22}],"inode":{"change":22,"pos":25380}},"ins_contents":[{"Add":" for h in txn.log(&channel_, 0)? {"},{"Add":" hashes.push((h?.1).0);"}],"del_contents":[{"Del":" for (_, (h, _)) in txn.log(&channel_, 0) {\n"},{"Del":" hashes.push(h);\n"}]}},{"Edit":{"inode":{"change":22,"pos":52474},"path":"pijul/src/remote/mod.rs","line":14,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":483},"to":{"change":22,"start":483,"end":501},"introduced_by":22}],"inode":{"change":22,"pos":52474}}},"contents":[{"Del":"use crate::Error;\n"}]}},{"Replacement":{"inode":{"change":22,"pos":52474},"path":"pijul/src/remote/mod.rs","line":75,"ins":{"up_context":[{"change":22,"pos":54147}],"down_context":[{"change":22,"pos":395}],"flag":"BLOCK","start":8246,"end":8296,"inode":{"change":22,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":54147},"to":{"change":22,"start":54147,"end":54266},"introduced_by":22}],"inode":{"change":22,"pos":52474}},"ins_contents":[{"Add":" bail!(\"Remote not found: {:?}\", name)"}],"del_contents":[{"Del":" Err((Error::RemoteNotFound {\n remote: name.to_string(),\n })\n .into())\n"}]}},{"Replacement":{"inode":{"change":22,"pos":52474},"path":"pijul/src/remote/mod.rs","line":106,"ins":{"up_context":[{"change":22,"pos":960}],"down_context":[{"change":22,"pos":1063}],"flag":"BLOCK","start":8297,"end":8343,"inode":{"change":22,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":960},"to":{"change":22,"start":960,"end":1063},"introduced_by":22}],"inode":{"change":22,"pos":52474}},"ins_contents":[{"Add":" bail!(\"Remote not found: {:?}\", name)"}],"del_contents":[{"Del":" Err((Error::RemoteNotFound {\n remote: name.to_string(),\n })\n .into())\n"}]}},{"Replacement":{"inode":{"change":22,"pos":52474},"path":"pijul/src/remote/mod.rs","line":181,"ins":{"up_context":[{"change":22,"pos":57166}],"down_context":[{"change":22,"pos":57289}],"flag":"BLOCK","start":8344,"end":8605,"inode":{"change":22,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":57166},"to":{"change":22,"start":57166,"end":57289},"introduced_by":22}],"inode":{"change":22,"pos":52474}},"ins_contents":[{"Add":" .iter_remote(&remote.borrow().remote, n)?"},{"Add":" .filter_map(|k| {"},{"Add":" let k = k.unwrap().0;"},{"Add":" if k >= n {"},{"Add":" Some(k)"},{"Add":" } else {"},{"Add":" None"},{"Add":" }"},{"Add":" })"}],"del_contents":[{"Del":" .iter_remote(&remote.borrow().remote, n)\n .filter_map(|(k, _)| if k >= n { Some(k) } else { None })\n"}]}},{"Replacement":{"inode":{"change":22,"pos":52474},"path":"pijul/src/remote/mod.rs","line":212,"ins":{"up_context":[{"change":22,"pos":57695}],"down_context":[{"change":22,"pos":57775}],"flag":"BLOCK","start":8606,"end":8687,"inode":{"change":22,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":57695},"to":{"change":22,"start":57695,"end":57775},"introduced_by":22}],"inode":{"change":22,"pos":52474}},"ins_contents":[{"Add":" let (mut b, (_, state)) = if let Some(last) = txn.last_remote(remote)? {"}],"del_contents":[{"Del":" let (mut b, (_, state)) = if let Some(last) = txn.last_remote(remote) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":52474},"path":"pijul/src/remote/mod.rs","line":229,"ins":{"up_context":[{"change":22,"pos":58358}],"down_context":[{"change":22,"pos":1790}],"flag":"BLOCK","start":8688,"end":8769,"inode":{"change":22,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":58358},"to":{"change":22,"start":58358,"end":58438},"introduced_by":22}],"inode":{"change":22,"pos":52474}},"ins_contents":[{"Add":" let (mid, (_, state)) = txn.get_remote_state(remote, mid)?.unwrap();"}],"del_contents":[{"Del":" let (mid, (_, state)) = txn.get_remote_state(remote, mid).unwrap();\n"}]}},{"Replacement":{"inode":{"change":22,"pos":52474},"path":"pijul/src/remote/mod.rs","line":272,"ins":{"up_context":[{"change":22,"pos":59915}],"down_context":[{"change":22,"pos":60067}],"flag":"BLOCK","start":8770,"end":8829,"inode":{"change":22,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":59915},"to":{"change":22,"start":59915,"end":60067},"introduced_by":22}],"inode":{"change":22,"pos":52474}},"ins_contents":[{"Add":" bail!(\"HTTP error {:?}\", res.status())"}],"del_contents":[{"Del":" return Err((crate::Error::Http {\n status: res.status(),\n })\n .into());\n"}]}},{"Replacement":{"inode":{"change":22,"pos":52474},"path":"pijul/src/remote/mod.rs","line":288,"ins":{"up_context":[{"change":22,"pos":1981}],"down_context":[{"change":22,"pos":2110}],"flag":"BLOCK","start":8830,"end":8956,"inode":{"change":22,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":1981},"to":{"change":22,"start":1981,"end":2110},"introduced_by":22}],"inode":{"change":22,"pos":52474}},"ins_contents":[{"Add":" if let Some(channel) = txn.load_channel(&channel)? {"},{"Add":" local::get_state(txn, &channel, mid)"}],"del_contents":[{"Del":" if let Some(channel) = txn.load_channel(&channel) {\n Ok(local::get_state(txn, &channel, mid))\n"}]}},{"Replacement":{"inode":{"change":22,"pos":52474},"path":"pijul/src/remote/mod.rs","line":311,"ins":{"up_context":[{"change":22,"pos":61331}],"down_context":[{"change":22,"pos":61408}],"flag":"BLOCK","start":8957,"end":9035,"inode":{"change":22,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":61331},"to":{"change":22,"start":61331,"end":61408},"introduced_by":22}],"inode":{"change":22,"pos":52474}},"ins_contents":[{"Add":" let mut channel = txn.load_channel(&l.channel)?.unwrap();"}],"del_contents":[{"Del":" let mut channel = txn.load_channel(&l.channel).unwrap();\n"}]}},{"Replacement":{"inode":{"change":22,"pos":52474},"path":"pijul/src/remote/mod.rs","line":315,"ins":{"up_context":[{"change":22,"pos":61584}],"down_context":[{"change":22,"pos":61657}],"flag":"BLOCK","start":9036,"end":9110,"inode":{"change":22,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":61584},"to":{"change":22,"start":61584,"end":61657},"introduced_by":22}],"inode":{"change":22,"pos":52474}},"ins_contents":[{"Add":" let channel = txn.load_channel(&l.channel)?.unwrap();"}],"del_contents":[{"Del":" let channel = txn.load_channel(&l.channel).unwrap();\n"}]}},{"Replacement":{"inode":{"change":22,"pos":52474},"path":"pijul/src/remote/mod.rs","line":338,"ins":{"up_context":[{"change":22,"pos":62677}],"down_context":[{"change":22,"pos":62829}],"flag":"BLOCK","start":9111,"end":9170,"inode":{"change":22,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":62677},"to":{"change":22,"start":62677,"end":62829},"introduced_by":22}],"inode":{"change":22,"pos":52474}},"ins_contents":[{"Add":" bail!(\"HTTP error {:?}\", res.status())"}],"del_contents":[{"Del":" return Err((crate::Error::Http {\n status: res.status(),\n })\n .into());\n"}]}},{"Replacement":{"inode":{"change":22,"pos":52474},"path":"pijul/src/remote/mod.rs","line":595,"ins":{"up_context":[{"change":22,"pos":73610}],"down_context":[{"change":22,"pos":73694}],"flag":"BLOCK","start":9171,"end":9284,"inode":{"change":22,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":73610},"to":{"change":22,"start":73610,"end":73694},"introduced_by":22}],"inode":{"change":22,"pos":52474}},"ins_contents":[{"Add":" for x in txn.iter_rev_remote(&remote.borrow().remote, None)? {"},{"Add":" let (n, (h, s)) = x?;"}],"del_contents":[{"Del":" for (n, (h, s)) in txn.iter_rev_remote(&remote.borrow().remote, None) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":52474},"path":"pijul/src/remote/mod.rs","line":605,"ins":{"up_context":[{"change":22,"pos":73931}],"down_context":[{"change":22,"pos":74000}],"flag":"BLOCK","start":9285,"end":9339,"inode":{"change":22,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":73931},"to":{"change":22,"start":73931,"end":74000},"introduced_by":22}],"inode":{"change":22,"pos":52474}},"ins_contents":[{"Add":" bail!(\"State not found: {:?}\", state)"}],"del_contents":[{"Del":" return Err((Error::StateNotFound { state }).into());\n"}]}},{"Replacement":{"inode":{"change":22,"pos":52474},"path":"pijul/src/remote/mod.rs","line":617,"ins":{"up_context":[{"change":22,"pos":74338}],"down_context":[{"change":22,"pos":74411}],"flag":"BLOCK","start":9340,"end":9438,"inode":{"change":22,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":74338},"to":{"change":22,"start":74338,"end":74411},"introduced_by":22}],"inode":{"change":22,"pos":52474}},"ins_contents":[{"Add":" for x in txn.iter_remote(&remote.borrow().remote, 0)? {"},{"Add":" let (n, (h, s)) = x?;"}],"del_contents":[{"Del":" for (n, (h, s)) in txn.iter_remote(&remote.borrow().remote, 0) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":52474},"path":"pijul/src/remote/mod.rs","line":627,"ins":{"up_context":[{"change":22,"pos":74612}],"down_context":[{"change":22,"pos":74677}],"flag":"BLOCK","start":9439,"end":9489,"inode":{"change":22,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":74612},"to":{"change":22,"start":74612,"end":74677},"introduced_by":22}],"inode":{"change":22,"pos":52474}},"ins_contents":[{"Add":" bail!(\"State not found: {:?}\", state)"}],"del_contents":[{"Del":" return Err((Error::StateNotFound { state }).into());\n"}]}},{"Replacement":{"inode":{"change":22,"pos":52474},"path":"pijul/src/remote/mod.rs","line":659,"ins":{"up_context":[{"change":22,"pos":76104}],"down_context":[{"change":22,"pos":76173}],"flag":"BLOCK","start":9490,"end":9560,"inode":{"change":22,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":76104},"to":{"change":22,"start":76104,"end":76173},"introduced_by":22}],"inode":{"change":22,"pos":52474}},"ins_contents":[{"Add":" if repo.changes.has_contents(*c, txn.get_internal(*c)?) {"}],"del_contents":[{"Del":" if repo.changes.has_contents(*c, txn.get_internal(*c)) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":52474},"path":"pijul/src/remote/mod.rs","line":669,"ins":{"up_context":[{"change":22,"pos":76443}],"down_context":[{"change":22,"pos":76508}],"flag":"BLOCK","start":9561,"end":9627,"inode":{"change":22,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":76443},"to":{"change":22,"start":76443,"end":76508},"introduced_by":22}],"inode":{"change":22,"pos":52474}},"ins_contents":[{"Add":" let change = if let Some(i) = txn.get_internal(*c)? {"}],"del_contents":[{"Del":" let change = if let Some(i) = txn.get_internal(*c) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":52474},"path":"pijul/src/remote/mod.rs","line":681,"ins":{"up_context":[{"change":22,"pos":76925}],"down_context":[{"change":22,"pos":899}],"flag":"BLOCK","start":9628,"end":9672,"inode":{"change":22,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":76925},"to":{"change":22,"start":856,"end":899},"introduced_by":22}],"inode":{"change":22,"pos":52474}},"ins_contents":[{"Add":" if txn.is_alive(&channel, v)? {"}],"del_contents":[{"Del":" if txn.is_alive(&channel, v) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":52474},"path":"pijul/src/remote/mod.rs","line":710,"ins":{"up_context":[{"change":22,"pos":78339}],"down_context":[{"change":22,"pos":78420}],"flag":"BLOCK","start":9673,"end":9779,"inode":{"change":22,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":78339},"to":{"change":22,"start":78339,"end":78420},"introduced_by":22}],"inode":{"change":22,"pos":52474}},"ins_contents":[{"Add":" for x in txn.iter_remote(&remote_changes.borrow().remote, 0)? {"},{"Add":" let (_, (h, _)) = x?;"}],"del_contents":[{"Del":" for (_, (h, _)) in txn.iter_remote(&remote_changes.borrow().remote, 0) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":79745},"path":"pijul/src/remote/local.rs","line":5,"ins":{"up_context":[{"change":22,"pos":535}],"down_context":[{"change":22,"pos":536}],"flag":"BLOCK","start":9780,"end":9862,"inode":{"change":22,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":535},"to":{"change":22,"start":4235,"end":4308},"introduced_by":22},{"previous":"","flag":"DELETED","from":{"change":22,"pos":4308},"to":{"change":22,"start":79831,"end":79868},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":79831},"to":{"change":22,"start":79831,"end":79868},"introduced_by":22}],"inode":{"change":22,"pos":79745}},"ins_contents":[{"Add":"use libpijul::pristine::{Hash, Merkle, MutTxnT, Position, TxnT};"},{"Add":"use libpijul::*;"}],"del_contents":[{"Del":"use libpijul::pristine::{Base32, Hash, Merkle, MutTxnT, Position, TxnT};\n"},{"Del":"use libpijul::{MutTxnTExt, TxnTExt};\n"}]}},{"Replacement":{"inode":{"change":22,"pos":79745},"path":"pijul/src/remote/local.rs","line":24,"ins":{"up_context":[{"change":22,"pos":3106}],"down_context":[{"change":22,"pos":3135}],"flag":"BLOCK","start":9863,"end":9915,"inode":{"change":22,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":3106},"to":{"change":22,"start":3106,"end":3135},"introduced_by":22}],"inode":{"change":22,"pos":79745}},"ins_contents":[{"Add":") -> Result, anyhow::Error> {"}],"del_contents":[{"Del":") -> Option<(u64, Merkle)> {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":79745},"path":"pijul/src/remote/local.rs","line":26,"ins":{"up_context":[{"change":22,"pos":3164}],"down_context":[{"change":22,"pos":3226}],"flag":"BLOCK","start":9916,"end":9983,"inode":{"change":22,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":3164},"to":{"change":22,"start":3164,"end":3226},"introduced_by":22}],"inode":{"change":22,"pos":79745}},"ins_contents":[{"Add":" Ok(txn.get_changes(&channel, mid)?.map(|(_, m)| (mid, m)))"}],"del_contents":[{"Del":" txn.get_changes(&channel, mid).map(|(_, m)| (mid, m))\n"}]}},{"Replacement":{"inode":{"change":22,"pos":79745},"path":"pijul/src/remote/local.rs","line":28,"ins":{"up_context":[{"change":22,"pos":3239}],"down_context":[{"change":22,"pos":3347}],"flag":"BLOCK","start":9984,"end":10127,"inode":{"change":22,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":3239},"to":{"change":22,"start":3239,"end":3347},"introduced_by":22}],"inode":{"change":22,"pos":79745}},"ins_contents":[{"Add":" Ok(txn.reverse_log(&channel.borrow(), None)?.next().map(|n| {"},{"Add":" let (n, (_, m)) = n.unwrap();"},{"Add":" (n, m)"},{"Add":" }))"}],"del_contents":[{"Del":" txn.reverse_log(&channel.borrow(), None)\n .next()\n .map(|(n, (_, m))| (n, m))\n"}]}},{"Replacement":{"inode":{"change":22,"pos":79745},"path":"pijul/src/remote/local.rs","line":38,"ins":{"up_context":[{"change":22,"pos":80263}],"down_context":[{"change":22,"pos":80598}],"flag":"BLOCK","start":10128,"end":10237,"inode":{"change":22,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":80263},"to":{"change":22,"start":80263,"end":80327},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":80327},"to":{"change":22,"start":3354,"end":3397},"introduced_by":22}],"inode":{"change":22,"pos":79745}},"ins_contents":[{"Add":" let channel = txn.load_channel(&self.channel)?.unwrap();"},{"Add":" Ok(get_state(&txn, &channel, mid)?)"}],"del_contents":[{"Del":" let channel = txn.load_channel(&self.channel).unwrap();\n"},{"Del":" Ok(get_state(&txn, &channel, mid))\n"}]}},{"Replacement":{"inode":{"change":22,"pos":79745},"path":"pijul/src/remote/local.rs","line":51,"ins":{"up_context":[{"change":22,"pos":80949}],"down_context":[{"change":22,"pos":81042}],"flag":"BLOCK","start":10238,"end":10332,"inode":{"change":22,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":80949},"to":{"change":22,"start":80949,"end":81042},"introduced_by":22}],"inode":{"change":22,"pos":79745}},"ins_contents":[{"Add":" let remote_channel = if let Some(channel) = remote_txn.load_channel(&self.channel)? {"}],"del_contents":[{"Del":" let remote_channel = if let Some(channel) = remote_txn.load_channel(&self.channel) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":79745},"path":"pijul/src/remote/local.rs","line":63,"ins":{"up_context":[{"change":22,"pos":4571}],"down_context":[{"change":22,"pos":4643}],"flag":"BLOCK","start":10333,"end":10406,"inode":{"change":22,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":4571},"to":{"change":22,"start":4571,"end":4643},"introduced_by":22}],"inode":{"change":22,"pos":79745}},"ins_contents":[{"Add":" change: remote_txn.get_external(p.change)?.unwrap(),"}],"del_contents":[{"Del":" change: remote_txn.get_external(p.change).unwrap(),\n"}]}},{"Replacement":{"inode":{"change":22,"pos":79745},"path":"pijul/src/remote/local.rs","line":67,"ins":{"up_context":[{"change":22,"pos":4729}],"down_context":[{"change":22,"pos":81377}],"flag":"BLOCK","start":10407,"end":10700,"inode":{"change":22,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":4729},"to":{"change":22,"start":4729,"end":4919},"introduced_by":22}],"inode":{"change":22,"pos":79745}},"ins_contents":[{"Add":" paths_.extend("},{"Add":" libpijul::fs::iter_graph_descendants("},{"Add":" &remote_txn,"},{"Add":" &remote_channel.borrow().graph,"},{"Add":" p,"},{"Add":" )?"},{"Add":" .map(|x| x.unwrap()),"},{"Add":" );"}],"del_contents":[{"Del":" paths_.extend(libpijul::fs::iter_graph_descendants(\n &remote_txn,\n &remote_channel.borrow(),\n p,\n ));\n"}]}},{"Replacement":{"inode":{"change":22,"pos":79745},"path":"pijul/src/remote/local.rs","line":78,"ins":{"up_context":[{"change":22,"pos":4961}],"down_context":[{"change":22,"pos":81477}],"flag":"BLOCK","start":10701,"end":10802,"inode":{"change":22,"pos":79745}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":22,"pos":4961},"to":{"change":22,"start":81401,"end":81477},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":81401},"to":{"change":22,"start":81401,"end":81477},"introduced_by":22}],"inode":{"change":22,"pos":79745}},"ins_contents":[{"Add":" for x in remote_txn.log(&remote_channel.borrow(), from)? {"},{"Add":" let (n, (h, m)) = x?;"}],"del_contents":[{"Del":" for (n, (h, m)) in remote_txn.log(&remote_channel.borrow(), from) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":79745},"path":"pijul/src/remote/local.rs","line":87,"ins":{"up_context":[{"change":22,"pos":81705}],"down_context":[{"change":22,"pos":81770}],"flag":"BLOCK","start":10803,"end":10869,"inode":{"change":22,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":81705},"to":{"change":22,"start":81705,"end":81770},"introduced_by":22}],"inode":{"change":22,"pos":79745}},"ins_contents":[{"Add":" let h_int = remote_txn.get_internal(h)?.unwrap();"}],"del_contents":[{"Del":" let h_int = remote_txn.get_internal(h).unwrap();\n"}]}},{"Replacement":{"inode":{"change":22,"pos":79745},"path":"pijul/src/remote/local.rs","line":89,"ins":{"up_context":[{"change":22,"pos":81807}],"down_context":[{"change":22,"pos":81959}],"flag":"BLOCK","start":10870,"end":11116,"inode":{"change":22,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":81807},"to":{"change":22,"start":81807,"end":81959},"introduced_by":22}],"inode":{"change":22,"pos":79745}},"ins_contents":[{"Add":" || paths_.iter().any(|x| {"},{"Add":" remote_txn"},{"Add":" .get_touched_files(*x, Some(h_int))"},{"Add":" .unwrap()"},{"Add":" .is_some()"},{"Add":" })"}],"del_contents":[{"Del":" || paths_\n .iter()\n .any(|x| remote_txn.get_touched_files(*x, Some(h_int)).is_some())\n"}]}},{"Edit":{"inode":{"change":22,"pos":10},"path":"pijul/src/remote/http.rs","line":5,"atom":{"NewVertex":{"up_context":[{"change":22,"pos":1193}],"down_context":[{"change":22,"pos":1193}],"flag":"BLOCK","start":11117,"end":11135,"inode":{"change":22,"pos":10}}},"contents":[{"Add":"use anyhow::bail;"}]}},{"Replacement":{"inode":{"change":22,"pos":10},"path":"pijul/src/remote/http.rs","line":44,"ins":{"up_context":[{"change":20,"pos":240}],"down_context":[{"change":22,"pos":1183}],"flag":"BLOCK","start":11136,"end":11187,"inode":{"change":22,"pos":10}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":240},"to":{"change":22,"start":1063,"end":1183},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":1063},"to":{"change":22,"start":1063,"end":1183},"introduced_by":22}],"inode":{"change":22,"pos":10}},"ins_contents":[{"Add":" bail!(\"HTTP error {:?}\", res.status())"}],"del_contents":[{"Del":" return Err((crate::Error::Http {\n status: res.status(),\n })\n .into());\n"}]}},{"Replacement":{"inode":{"change":22,"pos":10},"path":"pijul/src/remote/http.rs","line":183,"ins":{"up_context":[{"change":22,"pos":5693}],"down_context":[{"change":22,"pos":5813}],"flag":"BLOCK","start":11188,"end":11239,"inode":{"change":22,"pos":10}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":5693},"to":{"change":22,"start":5693,"end":5813},"introduced_by":22}],"inode":{"change":22,"pos":10}},"ins_contents":[{"Add":" bail!(\"HTTP error {:?}\", res.status())"}],"del_contents":[{"Del":" return Err((crate::Error::Http {\n status: res.status(),\n })\n .into());\n"}]}},{"Edit":{"inode":{"change":22,"pos":83981},"path":"pijul/src/main.rs","line":10,"atom":{"NewVertex":{"up_context":[{"change":22,"pos":603}],"down_context":[{"change":124,"pos":0}],"flag":"BLOCK","start":11240,"end":11258,"inode":{"change":22,"pos":83981}}},"contents":[{"Add":"use anyhow::bail;"}]}},{"Edit":{"inode":{"change":22,"pos":83981},"path":"pijul/src/main.rs","line":13,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":716},"to":{"change":22,"start":0,"end":32},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":32},"to":{"change":22,"start":1637,"end":1659},"introduced_by":22}],"inode":{"change":22,"pos":83981}}},"contents":[{"Del":"use libpijul::pristine::Base32;\n"},{"Del":"use thiserror::Error;\n"}]}},{"Edit":{"inode":{"change":22,"pos":83981},"path":"pijul/src/main.rs","line":125,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":98},"to":{"change":22,"start":85867,"end":86849},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":85867},"to":{"change":22,"start":85867,"end":86849},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":86917},"to":{"change":22,"start":86917,"end":87334},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":87413},"to":{"change":22,"start":87413,"end":87666},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":87666},"to":{"change":22,"start":867,"end":909},"introduced_by":22},{"previous":"","flag":"DELETED","from":{"change":22,"pos":909},"to":{"change":22,"start":87719,"end":87776},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":87719},"to":{"change":22,"start":87719,"end":87776},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":87776},"to":{"change":22,"start":0,"end":82},"introduced_by":22},{"previous":"","flag":"DELETED","from":{"change":22,"pos":82},"to":{"change":22,"start":87776,"end":88054},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":87776},"to":{"change":22,"start":87776,"end":88054},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":93},"to":{"change":22,"start":33,"end":133},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":133},"to":{"change":22,"start":1660,"end":1751},"introduced_by":22}],"inode":{"change":22,"pos":83981}}},"contents":[{"Del":"}\n\n#[derive(Debug, Error)]\npub enum Error {\n #[error(\"No Pijul repository found\")]\n NoRepoRoot,\n #[error(\"Cannot access working directory\")]\n CannotAccessWorkingDirectory,\n #[error(\"Already in a repository\")]\n AlreadyInARepo,\n #[error(\"No such channel: {}\", channel)]\n NoSuchChannel { channel: String },\n #[error(\"Protocol error. Is this the correct URL?\")]\n ProtocolError { line: Vec },\n #[error(\"Not authenticated\")]\n NotAuthenticated,\n #[error(\"No change message\")]\n NoChangeMessage,\n #[error(\"Incorrect remote: {}\", name)]\n IncorrectRemote { name: String },\n #[error(\"Unknown host key\")]\n UnknownHostKey,\n #[error(\"Cannot record a binary change interactively. Use -a\")]\n RecordBinaryChange,\n #[error(\"Remote not found: {:?}\", remote)]\n RemoteNotFound { remote: String },\n #[error(\"No global config directory\")]\n NoGlobalConfigDir,\n #[error(\"Could not parse global config\")]\n CouldNotParseGlobal,\n"},{"Del":" #[error(\"Remote error: {}\", msg)]\n Remote { msg: String },\n #[error(\"Remote exited with status {}\", status)]\n RemoteExit { status: u32 },\n #[error(\"Missing remote\")]\n MissingRemote,\n #[error(\"State not found in remote: {:?}\", state)]\n StateNotFound { state: libpijul::pristine::Merkle },\n #[error(\"Missing dependencies for change {:?}\", h)]\n MissingDep { h: libpijul::pristine::Hash },\n"},{"Del":" #[error(\"No prefixes given. Use `.` to record the current directory.\")]\n NoRecordPrefixes,\n #[error(\"HTTP error: {}\", status.as_str())]\n Http { status: reqwest::StatusCode },\n #[error(\"Could not parse configuration file at {:?}\", path)]\n"},{"Del":" CouldNotReadConfig { path: PathBuf },\n"},{"Del":" #[error(\"No current channel\")]\n NoCurrentChannel,\n"},{"Del":" #[error(\"Cannot delete the current channel\")]\n CannotDeleteCurrentChannel,\n"},{"Del":" #[error(\"Channel not found: {:?}\", channel)]\n ChannelNotFound { channel: String },\n #[error(\"Cannot reset, because there are unrecorded changes\")]\n UnrecordedChanges,\n #[error(\"Could not infer repository name\")]\n CouldNotInferRepositoryName { repo: String },\n"},{"Del":" #[error(\"Cannot unrecord change {}, because change {} depends on it\", change, dep.to_base32())]\n"},{"Del":" CannotUnrecord {\n change: String,\n dep: libpijul::pristine::Hash,\n },\n"}]}},{"Replacement":{"inode":{"change":22,"pos":83981},"path":"pijul/src/main.rs","line":207,"ins":{"up_context":[{"change":22,"pos":89714}],"down_context":[{"change":22,"pos":89851}],"flag":"BLOCK","start":11259,"end":11447,"inode":{"change":22,"pos":83981}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":89714},"to":{"change":22,"start":910,"end":959},"introduced_by":22},{"previous":"","flag":"DELETED","from":{"change":22,"pos":959},"to":{"change":22,"start":89774,"end":89851},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":89774},"to":{"change":22,"start":89774,"end":89851},"introduced_by":22}],"inode":{"change":22,"pos":83981}},"ins_contents":[{"Add":"pub fn current_dir() -> Result {"},{"Add":" if let Ok(cur) = std::env::current_dir() {"},{"Add":" Ok(cur)"},{"Add":" } else {"},{"Add":" bail!(\"Cannot access working directory\")"},{"Add":" }"}],"del_contents":[{"Del":"pub fn current_dir() -> Result {\n"},{"Del":" std::env::current_dir().map_err(|_| Error::CannotAccessWorkingDirectory)\n"}]}},{"Edit":{"inode":{"change":22,"pos":89866},"path":"pijul/src/config.rs","line":1,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":89866},"to":{"change":7,"start":0,"end":19},"introduced_by":7}],"inode":{"change":22,"pos":89866}}},"contents":[{"Del":"use crate::Error;\n\n"}]}},{"Edit":{"inode":{"change":22,"pos":89866},"path":"pijul/src/config.rs","line":3,"atom":{"NewVertex":{"up_context":[{"change":22,"pos":89899}],"down_context":[{"change":22,"pos":960}],"flag":"BLOCK","start":11448,"end":11466,"inode":{"change":22,"pos":89866}}},"contents":[{"Add":"use anyhow::bail;"}]}},{"Replacement":{"inode":{"change":22,"pos":89866},"path":"pijul/src/config.rs","line":42,"ins":{"up_context":[{"change":22,"pos":90697}],"down_context":[{"change":22,"pos":90881}],"flag":"BLOCK","start":11467,"end":11646,"inode":{"change":22,"pos":89866}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":90697},"to":{"change":7,"start":701,"end":794},"introduced_by":7}],"inode":{"change":22,"pos":89866}},"ins_contents":[{"Add":" if let Ok(t) = toml::from_slice(&s) {"},{"Add":" Ok(t)"},{"Add":" } else {"},{"Add":" bail!(\"Could not read configuration file at {:?}\", dir)"},{"Add":" }"}],"del_contents":[{"Del":" toml::from_slice(&s).map_err(|_| Error::CouldNotReadConfig { path: dir }.into())\n"}]}},{"Replacement":{"inode":{"change":22,"pos":89866},"path":"pijul/src/config.rs","line":48,"ins":{"up_context":[{"change":22,"pos":90898}],"down_context":[{"change":22,"pos":90954}],"flag":"BLOCK","start":11647,"end":11702,"inode":{"change":22,"pos":89866}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":90898},"to":{"change":7,"start":795,"end":844},"introduced_by":7}],"inode":{"change":22,"pos":89866}},"ins_contents":[{"Add":" bail!(\"Global configuration file missing\")"}],"del_contents":[{"Del":" Err(Error::NoGlobalConfigDir.into())\n"}]}},{"Replacement":{"inode":{"change":22,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":7,"ins":{"up_context":[{"change":22,"pos":59}],"down_context":[{"change":22,"pos":1235}],"flag":"BLOCK","start":11703,"end":11720,"inode":{"change":22,"pos":95630}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":59},"to":{"change":22,"start":900,"end":960},"introduced_by":22}],"inode":{"change":22,"pos":95630}},"ins_contents":[{"Add":"use libpijul::*;"}],"del_contents":[{"Del":"use libpijul::{Base32, MutTxnT, MutTxnTExt, TxnT, TxnTExt};\n"}]}},{"Replacement":{"inode":{"change":22,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":39,"ins":{"up_context":[{"change":22,"pos":96409}],"down_context":[{"change":22,"pos":314}],"flag":"BLOCK","start":11721,"end":11790,"inode":{"change":22,"pos":95630}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":96409},"to":{"change":22,"start":246,"end":314},"introduced_by":22}],"inode":{"change":22,"pos":95630}},"ins_contents":[{"Add":" if let Some(mut channel) = txn.load_channel(channel_name)? {"}],"del_contents":[{"Del":" if let Some(mut channel) = txn.load_channel(channel_name) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":63,"ins":{"up_context":[{"change":22,"pos":2290}],"down_context":[{"change":22,"pos":2390}],"flag":"BLOCK","start":11791,"end":11897,"inode":{"change":22,"pos":95630}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":2290},"to":{"change":22,"start":2290,"end":2390},"introduced_by":22}],"inode":{"change":22,"pos":95630}},"ins_contents":[{"Add":" .reverse_log(&channel.borrow(), None)?"},{"Add":" .map(|h| (h.unwrap().1).0)"}],"del_contents":[{"Del":" .reverse_log(&channel.borrow(), None)\n .map(|(_, (h, _))| h)\n"}]}},{"Replacement":{"inode":{"change":22,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":88,"ins":{"up_context":[{"change":22,"pos":96722}],"down_context":[{"change":22,"pos":96781}],"flag":"BLOCK","start":11898,"end":11990,"inode":{"change":22,"pos":95630}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":96722},"to":{"change":22,"start":96722,"end":96781},"introduced_by":22}],"inode":{"change":22,"pos":95630}},"ins_contents":[{"Add":" for p in txn.iter_revdep(change_id)? {"},{"Add":" let (p, d) = p?;"}],"del_contents":[{"Del":" for (p, d) in txn.iter_revdep(change_id) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":95,"ins":{"up_context":[{"change":22,"pos":96953}],"down_context":[{"change":22,"pos":551}],"flag":"BLOCK","start":11991,"end":12138,"inode":{"change":22,"pos":95630}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":96953},"to":{"change":22,"start":96953,"end":97034},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":97034},"to":{"change":22,"start":487,"end":551},"introduced_by":22}],"inode":{"change":22,"pos":95630}},"ins_contents":[{"Add":" if txn.get_changeset(&channel_.changes, d, None)?.is_some() {"},{"Add":" let dep = txn.get_external(d)?.unwrap();"}],"del_contents":[{"Del":" if txn.get_changeset(&channel_.changes, d, None).is_some() {\n"},{"Del":" let dep = txn.get_external(d).unwrap();\n"}]}},{"Edit":{"inode":{"change":22,"pos":97650},"path":"pijul/src/commands/reset.rs","line":10,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":1383},"to":{"change":22,"start":1383,"end":1401},"introduced_by":22}],"inode":{"change":22,"pos":97650}}},"contents":[{"Del":"use crate::Error;\n"}]}},{"Replacement":{"inode":{"change":22,"pos":97650},"path":"pijul/src/commands/reset.rs","line":41,"ins":{"up_context":[{"change":18,"pos":108}],"down_context":[{"change":22,"pos":98538}],"flag":"BLOCK","start":12139,"end":12223,"inode":{"change":22,"pos":97650}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":108},"to":{"change":22,"start":98455,"end":98538},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":98455},"to":{"change":22,"start":98455,"end":98538},"introduced_by":22}],"inode":{"change":22,"pos":97650}},"ins_contents":[{"Add":" let mut channel = if let Some(channel) = txn.load_channel(&channel_name)? {"}],"del_contents":[{"Del":" let mut channel = if let Some(channel) = txn.load_channel(&channel_name) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":97650},"path":"pijul/src/commands/reset.rs","line":44,"ins":{"up_context":[{"change":22,"pos":98672}],"down_context":[{"change":22,"pos":98807}],"flag":"BLOCK","start":12224,"end":12281,"inode":{"change":22,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":98672},"to":{"change":22,"start":98672,"end":98807},"introduced_by":22}],"inode":{"change":22,"pos":97650}},"ins_contents":[{"Add":" bail!(\"No such channel: {:?}\", channel_name)"}],"del_contents":[{"Del":" return Err((Error::NoSuchChannel {\n channel: channel_name.to_string(),\n })\n .into());\n"}]}},{"Replacement":{"inode":{"change":22,"pos":97650},"path":"pijul/src/commands/reset.rs","line":75,"ins":{"up_context":[{"change":22,"pos":934}],"down_context":[{"change":22,"pos":99917}],"flag":"BLOCK","start":12282,"end":12362,"inode":{"change":22,"pos":97650}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":22,"pos":934},"to":{"change":22,"start":99838,"end":99917},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":99838},"to":{"change":22,"start":99838,"end":99917},"introduced_by":22}],"inode":{"change":22,"pos":97650}},"ins_contents":[{"Add":" if let Some(mut channel) = txn.load_channel(current_channel)? {"}],"del_contents":[{"Del":" if let Some(mut channel) = txn.load_channel(current_channel) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":97650},"path":"pijul/src/commands/reset.rs","line":88,"ins":{"up_context":[{"change":22,"pos":100440}],"down_context":[{"change":22,"pos":100509}],"flag":"BLOCK","start":12363,"end":12452,"inode":{"change":22,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":100440},"to":{"change":22,"start":100440,"end":100509},"introduced_by":22}],"inode":{"change":22,"pos":97650}},"ins_contents":[{"Add":" bail!(\"Cannot change channel, as there are unrecorded changes.\")"}],"del_contents":[{"Del":" return Err(Error::UnrecordedChanges.into());\n"}]}},{"Edit":{"inode":{"change":22,"pos":101759},"path":"pijul/src/commands/record.rs","line":5,"atom":{"NewVertex":{"up_context":[{"change":22,"pos":1486}],"down_context":[{"change":22,"pos":25}],"flag":"BLOCK","start":12453,"end":12471,"inode":{"change":22,"pos":101759}}},"contents":[{"Add":"use anyhow::bail;"}]}},{"Edit":{"inode":{"change":22,"pos":101759},"path":"pijul/src/commands/record.rs","line":17,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":1600},"to":{"change":22,"start":1600,"end":1618},"introduced_by":22}],"inode":{"change":22,"pos":101759}}},"contents":[{"Del":"use crate::Error;\n"}]}},{"Replacement":{"inode":{"change":22,"pos":101759},"path":"pijul/src/commands/record.rs","line":76,"ins":{"up_context":[{"change":2,"pos":174}],"down_context":[{"change":2,"pos":288}],"flag":"BLOCK","start":12472,"end":12584,"inode":{"change":22,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":174},"to":{"change":2,"start":174,"end":288},"introduced_by":2}],"inode":{"change":22,"pos":101759}},"ins_contents":[{"Add":" } else if let Some(h) = txn.reverse_log(&channel.borrow(), None)?.next() {"},{"Add":" (h?.1).0"}],"del_contents":[{"Del":" } else if let Some((_, (h, _))) = txn.reverse_log(&channel.borrow(), None).next() {\n h\n"}]}},{"Replacement":{"inode":{"change":22,"pos":101759},"path":"pijul/src/commands/record.rs","line":200,"ins":{"up_context":[{"change":22,"pos":107689}],"down_context":[{"change":22,"pos":107732}],"flag":"BLOCK","start":12585,"end":12637,"inode":{"change":22,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":107689},"to":{"change":22,"start":107689,"end":107732},"introduced_by":22}],"inode":{"change":22,"pos":101759}},"ins_contents":[{"Add":" .map(|rec| rec.globalize(txn).unwrap())"}],"del_contents":[{"Del":" .map(|rec| rec.globalize(txn))\n"}]}},{"Replacement":{"inode":{"change":22,"pos":101759},"path":"pijul/src/commands/record.rs","line":203,"ins":{"up_context":[{"change":22,"pos":107777}],"down_context":[{"change":22,"pos":107872}],"flag":"BLOCK","start":12638,"end":12734,"inode":{"change":22,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":107777},"to":{"change":22,"start":107777,"end":107872},"introduced_by":22}],"inode":{"change":22,"pos":101759}},"ins_contents":[{"Add":" LocalChange::make_change(txn, channel, actions, rec.contents, header, Vec::new())?;"}],"del_contents":[{"Del":" LocalChange::make_change(txn, channel, actions, rec.contents, header, Vec::new());\n"}]}},{"Replacement":{"inode":{"change":22,"pos":101759},"path":"pijul/src/commands/record.rs","line":210,"ins":{"up_context":[{"change":22,"pos":108130}],"down_context":[{"change":22,"pos":108188}],"flag":"BLOCK","start":12735,"end":12816,"inode":{"change":22,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":108130},"to":{"change":22,"start":108130,"end":108188},"introduced_by":22}],"inode":{"change":22,"pos":101759}},"ins_contents":[{"Add":" bail!(\"Cannot record a binary change interactively. Please use -a.\")"}],"del_contents":[{"Del":" return Err(Error::RecordBinaryChange.into());\n"}]}},{"Replacement":{"inode":{"change":22,"pos":101759},"path":"pijul/src/commands/record.rs","line":243,"ins":{"up_context":[{"change":22,"pos":109346}],"down_context":[{"change":22,"pos":109401}],"flag":"BLOCK","start":12817,"end":12856,"inode":{"change":22,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":109346},"to":{"change":22,"start":109346,"end":109401},"introduced_by":22}],"inode":{"change":22,"pos":101759}},"ins_contents":[{"Add":" bail!(\"No change message\")"}],"del_contents":[{"Del":" return Err(Error::NoChangeMessage.into());\n"}]}},{"Replacement":{"inode":{"change":22,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":10,"ins":{"up_context":[{"change":22,"pos":111707}],"down_context":[{"change":22,"pos":1743}],"flag":"BLOCK","start":12857,"end":12874,"inode":{"change":22,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":111707},"to":{"change":22,"start":2331,"end":2383},"introduced_by":22}],"inode":{"change":22,"pos":111631}},"ins_contents":[{"Add":"use libpijul::*;"}],"del_contents":[{"Del":"use libpijul::{MutTxnT, MutTxnTExt, TxnT, TxnTExt};\n"}]}},{"Replacement":{"inode":{"change":22,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":40,"ins":{"up_context":[{"change":22,"pos":112523}],"down_context":[{"change":22,"pos":112571}],"flag":"BLOCK","start":12875,"end":12956,"inode":{"change":22,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":112523},"to":{"change":22,"start":112523,"end":112571},"introduced_by":22}],"inode":{"change":22,"pos":111631}},"ins_contents":[{"Add":" for r in txn.iter_remotes(\"\")? {"},{"Add":" let r = r?;"}],"del_contents":[{"Del":" for r in txn.iter_remotes(\"\") {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":165,"ins":{"up_context":[{"change":22,"pos":7290}],"down_context":[{"change":22,"pos":7445}],"flag":"BLOCK","start":12957,"end":13128,"inode":{"change":22,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":7290},"to":{"change":22,"start":7290,"end":7445},"introduced_by":22}],"inode":{"change":22,"pos":111631}},"ins_contents":[{"Add":" paths.extend("},{"Add":" libpijul::fs::iter_graph_descendants(&txn, &channel.borrow().graph, p)?"},{"Add":" .map(|x| x.unwrap()),"},{"Add":" );"}],"del_contents":[{"Del":" paths.extend(libpijul::fs::iter_graph_descendants(\n &txn,\n &channel.borrow(),\n p,\n ));\n"}]}},{"Replacement":{"inode":{"change":22,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":172,"ins":{"up_context":[{"change":22,"pos":116268}],"down_context":[{"change":22,"pos":7456}],"flag":"BLOCK","start":13129,"end":13224,"inode":{"change":22,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":116268},"to":{"change":22,"start":116268,"end":116338},"introduced_by":22}],"inode":{"change":22,"pos":111631}},"ins_contents":[{"Add":" for x in txn.reverse_log(&channel.borrow(), None)? {"},{"Add":" let (_, (h, m)) = x?;"}],"del_contents":[{"Del":" for (_, (h, m)) in txn.reverse_log(&channel.borrow(), None) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":175,"ins":{"up_context":[{"change":22,"pos":7524}],"down_context":[{"change":22,"pos":4622}],"flag":"BLOCK","start":13225,"end":13287,"inode":{"change":22,"pos":111631}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":22,"pos":7524},"to":{"change":22,"start":4561,"end":4622},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":4561},"to":{"change":22,"start":4561,"end":4622},"introduced_by":22}],"inode":{"change":22,"pos":111631}},"ins_contents":[{"Add":" if txn.remote_has_state(remote_changes, m)? {"}],"del_contents":[{"Del":" if txn.remote_has_state(remote_changes, m) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":178,"ins":{"up_context":[{"change":22,"pos":4667}],"down_context":[{"change":22,"pos":7525}],"flag":"BLOCK","start":13288,"end":13412,"inode":{"change":22,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":4667},"to":{"change":22,"start":4667,"end":4789},"introduced_by":22}],"inode":{"change":22,"pos":111631}},"ins_contents":[{"Add":" let h_int = txn.get_internal(h)?.unwrap();"},{"Add":" if !txn.remote_has_change(&remote_changes, h)? {"}],"del_contents":[{"Del":" let h_int = txn.get_internal(h).unwrap();\n if !txn.remote_has_change(&remote_changes, h) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":184,"ins":{"up_context":[{"change":22,"pos":7686}],"down_context":[{"change":22,"pos":7768}],"flag":"BLOCK","start":13413,"end":13496,"inode":{"change":22,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":7686},"to":{"change":22,"start":7686,"end":7768},"introduced_by":22}],"inode":{"change":22,"pos":111631}},"ins_contents":[{"Add":" if txn.get_touched_files(*p, Some(h_int))?.is_some() {"}],"del_contents":[{"Del":" if txn.get_touched_files(*p, Some(h_int)).is_some() {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":192,"ins":{"up_context":[{"change":22,"pos":5132}],"down_context":[{"change":22,"pos":5206}],"flag":"BLOCK","start":13497,"end":13572,"inode":{"change":22,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":5132},"to":{"change":22,"start":5132,"end":5206},"introduced_by":22}],"inode":{"change":22,"pos":111631}},"ins_contents":[{"Add":" if let Some(channel) = txn.load_channel(remote_channel)? {"}],"del_contents":[{"Del":" if let Some(channel) = txn.load_channel(remote_channel) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":194,"ins":{"up_context":[{"change":22,"pos":5258}],"down_context":[{"change":22,"pos":7889}],"flag":"BLOCK","start":13573,"end":13721,"inode":{"change":22,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":5258},"to":{"change":22,"start":5258,"end":5404},"introduced_by":22}],"inode":{"change":22,"pos":111631}},"ins_contents":[{"Add":" let h_int = txn.get_internal(h)?.unwrap();"},{"Add":" if txn.get_changeset(&channel.changes, h_int, None)?.is_none() {"}],"del_contents":[{"Del":" let h_int = txn.get_internal(h).unwrap();\n if txn.get_changeset(&channel.changes, h_int, None).is_none() {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":200,"ins":{"up_context":[{"change":22,"pos":8066}],"down_context":[{"change":22,"pos":8152}],"flag":"BLOCK","start":13722,"end":13809,"inode":{"change":22,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":8066},"to":{"change":22,"start":8066,"end":8152},"introduced_by":22}],"inode":{"change":22,"pos":111631}},"ins_contents":[{"Add":" if txn.get_touched_files(*p, Some(h_int))?.is_some() {"}],"del_contents":[{"Del":" if txn.get_touched_files(*p, Some(h_int)).is_some() {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":309,"ins":{"up_context":[{"change":22,"pos":8812}],"down_context":[{"change":22,"pos":6416}],"flag":"BLOCK","start":13810,"end":13990,"inode":{"change":22,"pos":111631}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":22,"pos":8812},"to":{"change":22,"start":6267,"end":6416},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":6267},"to":{"change":22,"start":6267,"end":6416},"introduced_by":22}],"inode":{"change":22,"pos":111631}},"ins_contents":[{"Add":" for x in txn.iter_remote(&remote_changes.borrow().remote, 0)? {"},{"Add":" let (h, m) = x?.1;"},{"Add":" if txn.channel_has_state(&channel, m)? {"}],"del_contents":[{"Del":" for (_, (h, m)) in txn.iter_remote(&remote_changes.borrow().remote, 0) {\n if txn.channel_has_state(&channel, m) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":313,"ins":{"up_context":[{"change":22,"pos":6447}],"down_context":[{"change":22,"pos":6521}],"flag":"BLOCK","start":13991,"end":14066,"inode":{"change":22,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":6447},"to":{"change":22,"start":6447,"end":6521},"introduced_by":22}],"inode":{"change":22,"pos":111631}},"ins_contents":[{"Add":" } else if txn.get_revchanges(&channel, h)?.is_none() {"}],"del_contents":[{"Del":" } else if txn.get_revchanges(&channel, h).is_none() {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":325,"ins":{"up_context":[{"change":22,"pos":9108}],"down_context":[{"change":22,"pos":9305}],"flag":"BLOCK","start":14067,"end":14272,"inode":{"change":22,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":9108},"to":{"change":22,"start":9108,"end":9305},"introduced_by":22}],"inode":{"change":22,"pos":111631}},"ins_contents":[{"Add":" inodes_.extend("},{"Add":" libpijul::fs::iter_graph_descendants(&txn, &channel.borrow().graph, p)?"},{"Add":" .map(|x| x.unwrap()),"},{"Add":" );"}],"del_contents":[{"Del":" inodes_.extend(libpijul::fs::iter_graph_descendants(\n &txn,\n &channel.borrow(),\n p,\n ));\n"}]}},{"Replacement":{"inode":{"change":22,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":331,"ins":{"up_context":[{"change":22,"pos":9407}],"down_context":[{"change":22,"pos":9472}],"flag":"BLOCK","start":14273,"end":14347,"inode":{"change":22,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":9407},"to":{"change":22,"start":9407,"end":9472},"introduced_by":22}],"inode":{"change":22,"pos":111631}},"ins_contents":[{"Add":" change: txn.get_external(x.change).unwrap().unwrap(),"}],"del_contents":[{"Del":" change: txn.get_external(x.change).unwrap(),\n"}]}},{"Replacement":{"inode":{"change":22,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":334,"ins":{"up_context":[{"change":22,"pos":9525}],"down_context":[{"change":22,"pos":7193}],"flag":"BLOCK","start":14348,"end":14430,"inode":{"change":22,"pos":111631}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":22,"pos":9525},"to":{"change":22,"start":7112,"end":7193},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":7112},"to":{"change":22,"start":7112,"end":7193},"introduced_by":22}],"inode":{"change":22,"pos":111631}},"ins_contents":[{"Add":" if let Some(remote_channel) = txn.load_channel(remote_channel)? {"}],"del_contents":[{"Del":" if let Some(remote_channel) = txn.load_channel(remote_channel) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":336,"ins":{"up_context":[{"change":22,"pos":7259}],"down_context":[{"change":22,"pos":7403}],"flag":"BLOCK","start":14431,"end":14610,"inode":{"change":22,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":7259},"to":{"change":22,"start":7259,"end":7403},"introduced_by":22}],"inode":{"change":22,"pos":111631}},"ins_contents":[{"Add":" for x in txn.reverse_log(&remote_channel, None)? {"},{"Add":" let (h, m) = x?.1;"},{"Add":" if txn.channel_has_state(&channel, m)? {"}],"del_contents":[{"Del":" for (_, (h, m)) in txn.reverse_log(&remote_channel, None) {\n if txn.channel_has_state(&channel, m) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":341,"ins":{"up_context":[{"change":22,"pos":7464}],"down_context":[{"change":22,"pos":7530}],"flag":"BLOCK","start":14611,"end":14678,"inode":{"change":22,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":7464},"to":{"change":22,"start":7464,"end":7530},"introduced_by":22}],"inode":{"change":22,"pos":111631}},"ins_contents":[{"Add":" let h_int = txn.get_internal(h)?.unwrap();"}],"del_contents":[{"Del":" let h_int = txn.get_internal(h).unwrap();\n"}]}},{"Replacement":{"inode":{"change":22,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":343,"ins":{"up_context":[{"change":22,"pos":7561}],"down_context":[{"change":22,"pos":7644}],"flag":"BLOCK","start":14679,"end":14763,"inode":{"change":22,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":7561},"to":{"change":22,"start":7561,"end":7644},"introduced_by":22}],"inode":{"change":22,"pos":111631}},"ins_contents":[{"Add":" .get_changeset(&channel.borrow().changes, h_int, None)?"}],"del_contents":[{"Del":" .get_changeset(&channel.borrow().changes, h_int, None)\n"}]}},{"Replacement":{"inode":{"change":22,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":348,"ins":{"up_context":[{"change":22,"pos":9641}],"down_context":[{"change":22,"pos":9733}],"flag":"BLOCK","start":14764,"end":14947,"inode":{"change":22,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":9641},"to":{"change":22,"start":9641,"end":9733},"introduced_by":22}],"inode":{"change":22,"pos":111631}},"ins_contents":[{"Add":" txn.get_rev_touched_files(h_int, Some(inode))"},{"Add":" .unwrap()"},{"Add":" .is_some()"}],"del_contents":[{"Del":" txn.get_rev_touched_files(h_int, Some(inode)).is_some()\n"}]}},{"Replacement":{"inode":{"change":22,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":436,"ins":{"up_context":[{"change":22,"pos":10482}],"down_context":[{"change":22,"pos":10557}],"flag":"BLOCK","start":14948,"end":15024,"inode":{"change":22,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":10482},"to":{"change":22,"start":10482,"end":10557},"introduced_by":22}],"inode":{"change":22,"pos":111631}},"ins_contents":[{"Add":" let i = if let Some(change) = txn.get_internal(i.change)? {"}],"del_contents":[{"Del":" let i = if let Some(change) = txn.get_internal(i.change) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":488,"ins":{"up_context":[{"change":15,"pos":350}],"down_context":[{"change":15,"pos":401}],"flag":"BLOCK","start":15025,"end":15077,"inode":{"change":22,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":15,"pos":350},"to":{"change":15,"start":350,"end":401},"introduced_by":15}],"inode":{"change":22,"pos":111631}},"ins_contents":[{"Add":" if txn.remote_has_change(rem, d)? {"}],"del_contents":[{"Del":" if txn.remote_has_change(rem, d) {\n"}]}},{"Edit":{"inode":{"change":22,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":6,"atom":{"NewVertex":{"up_context":[{"change":22,"pos":1914}],"down_context":[{"change":22,"pos":123335}],"flag":"BLOCK","start":15078,"end":15131,"inode":{"change":22,"pos":123281}}},"contents":[{"Add":"use crate::repository::Repository;"},{"Add":"use anyhow::bail;"}]}},{"Replacement":{"inode":{"change":22,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":11,"ins":{"up_context":[{"change":22,"pos":1961}],"down_context":[{"change":22,"pos":1962}],"flag":"BLOCK","start":15132,"end":15149,"inode":{"change":22,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":1961},"to":{"change":22,"start":3000,"end":3078},"introduced_by":22}],"inode":{"change":22,"pos":123281}},"ins_contents":[{"Add":"use libpijul::*;"}],"del_contents":[{"Del":"use libpijul::{Base32, ChannelRef, Hash, MutTxnT, MutTxnTExt, TxnT, TxnTExt};\n"}]}},{"Edit":{"inode":{"change":22,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":15,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":1989},"to":{"change":22,"start":1989,"end":2042},"introduced_by":22},{"previous":"","flag":"DELETED","from":{"change":22,"pos":2042},"to":{"change":22,"start":123610,"end":123611},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":123610},"to":{"change":22,"start":123610,"end":123611},"introduced_by":22}],"inode":{"change":22,"pos":123281}}},"contents":[{"Del":"use crate::repository::Repository;\nuse crate::Error;\n"},{"Del":"\n"}]}},{"Replacement":{"inode":{"change":22,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":38,"ins":{"up_context":[{"change":22,"pos":124435}],"down_context":[{"change":22,"pos":124564}],"flag":"BLOCK","start":15150,"end":15291,"inode":{"change":22,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":124435},"to":{"change":22,"start":3079,"end":3165},"introduced_by":22},{"previous":"","flag":"DELETED","from":{"change":22,"pos":3165},"to":{"change":22,"start":124518,"end":124564},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":124518},"to":{"change":22,"start":124518,"end":124564},"introduced_by":22}],"inode":{"change":22,"pos":123281}},"ins_contents":[{"Add":"fn load_channel(txn: &T, name: &str) -> Result, anyhow::Error> {"},{"Add":" if let Some(c) = txn.load_channel(name)? {"}],"del_contents":[{"Del":"fn load_channel(txn: &T, name: &str) -> Result, Error> {\n"},{"Del":" if let Some(c) = txn.load_channel(name) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":42,"ins":{"up_context":[{"change":22,"pos":124591}],"down_context":[{"change":22,"pos":124694}],"flag":"BLOCK","start":15292,"end":15337,"inode":{"change":22,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":124591},"to":{"change":22,"start":837,"end":872},"introduced_by":22},{"previous":"","flag":"DELETED","from":{"change":22,"pos":872},"to":{"change":22,"start":124627,"end":124677},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":124627},"to":{"change":22,"start":124627,"end":124677},"introduced_by":22}],"inode":{"change":22,"pos":123281}},"ins_contents":[{"Add":" bail!(\"No such channel: {:?}\", name)"}],"del_contents":[{"Del":" Err(Error::NoSuchChannel {\n"},{"Del":" channel: name.to_string(),\n })\n"}]}},{"Replacement":{"inode":{"change":22,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":72,"ins":{"up_context":[{"change":22,"pos":125737}],"down_context":[{"change":22,"pos":922}],"flag":"BLOCK","start":15338,"end":15448,"inode":{"change":22,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":125737},"to":{"change":22,"start":125737,"end":125810},"introduced_by":22}],"inode":{"change":22,"pos":123281}},"ins_contents":[{"Add":" for x in txn.log(&channel.borrow(), pos)? {"},{"Add":" let (n, (_, m)) = x?;"}],"del_contents":[{"Del":" for (n, (_, m)) in txn.log(&channel.borrow(), pos) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":86,"ins":{"up_context":[{"change":22,"pos":126196}],"down_context":[{"change":22,"pos":1515}],"flag":"BLOCK","start":15449,"end":15582,"inode":{"change":22,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":126196},"to":{"change":22,"start":1415,"end":1515},"introduced_by":22}],"inode":{"change":22,"pos":123281}},"ins_contents":[{"Add":" } else if let Some(x) = txn.reverse_log(&channel.borrow(), None)?.next() {"},{"Add":" let (n, (_, m)) = x?;"}],"del_contents":[{"Del":" } else if let Some((n, (_, m))) = txn.reverse_log(&channel.borrow(), None).next() {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":103,"ins":{"up_context":[{"change":22,"pos":127036}],"down_context":[{"change":22,"pos":127231}],"flag":"BLOCK","start":15583,"end":15635,"inode":{"change":22,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":127036},"to":{"change":22,"start":127036,"end":127231},"introduced_by":22}],"inode":{"change":22,"pos":123281}},"ins_contents":[{"Add":" bail!(\"Ambiguous path\")"}],"del_contents":[{"Del":" return Err((Error::ProtocolError {\n line: buf.as_bytes().to_vec(),\n })\n .into());\n"}]}},{"Replacement":{"inode":{"change":22,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":105,"ins":{"up_context":[{"change":22,"pos":127257}],"down_context":[{"change":22,"pos":11554}],"flag":"BLOCK","start":15636,"end":15706,"inode":{"change":22,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":127257},"to":{"change":22,"start":11485,"end":11554},"introduced_by":22}],"inode":{"change":22,"pos":123281}},"ins_contents":[{"Add":" let h = txn.get_external(p.change)?.unwrap();"}],"del_contents":[{"Del":" let h = txn.get_external(p.change).unwrap();\n"}]}},{"Replacement":{"inode":{"change":22,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":108,"ins":{"up_context":[{"change":22,"pos":11666}],"down_context":[{"change":22,"pos":127295}],"flag":"BLOCK","start":15707,"end":15926,"inode":{"change":22,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":11666},"to":{"change":22,"start":11666,"end":11881},"introduced_by":22}],"inode":{"change":22,"pos":123281}},"ins_contents":[{"Add":" paths.extend("},{"Add":" libpijul::fs::iter_graph_descendants(&txn, &channel.borrow().graph, p)?"},{"Add":" .map(|x| x.unwrap()),"},{"Add":" );"}],"del_contents":[{"Del":" paths.extend(libpijul::fs::iter_graph_descendants(\n &txn,\n &channel.borrow(),\n p,\n ));\n"}]}},{"Replacement":{"inode":{"change":22,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":113,"ins":{"up_context":[{"change":22,"pos":127324}],"down_context":[{"change":22,"pos":127503}],"flag":"BLOCK","start":15927,"end":16035,"inode":{"change":22,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":127324},"to":{"change":22,"start":127324,"end":127503},"introduced_by":22}],"inode":{"change":22,"pos":123281}},"ins_contents":[{"Add":" debug!(\"protocol line: {:?}\", buf);"},{"Add":" bail!(\"Protocol error\")"}],"del_contents":[{"Del":" return Err((Error::ProtocolError {\n line: buf.as_bytes().to_vec(),\n })\n .into());\n"}]}},{"Replacement":{"inode":{"change":22,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":118,"ins":{"up_context":[{"change":22,"pos":11929}],"down_context":[{"change":22,"pos":127675}],"flag":"BLOCK","start":16036,"end":16202,"inode":{"change":22,"pos":123281}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":22,"pos":11929},"to":{"change":22,"start":127543,"end":127675},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":127543},"to":{"change":22,"start":127543,"end":127675},"introduced_by":22}],"inode":{"change":22,"pos":123281}},"ins_contents":[{"Add":" for x in txn.log(&channel.borrow(), from)? {"},{"Add":" let (n, (h, m)) = x?;"},{"Add":" let h_int = txn.get_internal(h)?.unwrap();"}],"del_contents":[{"Del":" for (n, (h, m)) in txn.log(&channel.borrow(), from) {\n let h_int = txn.get_internal(h).unwrap();\n"}]}},{"Replacement":{"inode":{"change":22,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":123,"ins":{"up_context":[{"change":22,"pos":11980}],"down_context":[{"change":22,"pos":12078}],"flag":"BLOCK","start":16203,"end":16342,"inode":{"change":22,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":11980},"to":{"change":22,"start":11980,"end":12078},"introduced_by":22}],"inode":{"change":22,"pos":123281}},"ins_contents":[{"Add":" x.change == h_int"},{"Add":" || txn.get_touched_files(*x, Some(h_int)).unwrap().is_some()"}],"del_contents":[{"Del":" x.change == h_int || txn.get_touched_files(*x, Some(h_int)).is_some()\n"}]}},{"Replacement":{"inode":{"change":22,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":137,"ins":{"up_context":[{"change":22,"pos":128296}],"down_context":[{"change":22,"pos":128459}],"flag":"BLOCK","start":16343,"end":16444,"inode":{"change":22,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":128296},"to":{"change":22,"start":128296,"end":128459},"introduced_by":22}],"inode":{"change":22,"pos":123281}},"ins_contents":[{"Add":" debug!(\"protocol error: {:?}\", buf);"},{"Add":" bail!(\"Protocol error\")"}],"del_contents":[{"Del":" return Err((Error::ProtocolError {\n line: buf.as_bytes().to_vec(),\n })\n .into());\n"}]}},{"Replacement":{"inode":{"change":22,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":168,"ins":{"up_context":[{"change":22,"pos":129776}],"down_context":[{"change":22,"pos":129939}],"flag":"BLOCK","start":16445,"end":16546,"inode":{"change":22,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":129776},"to":{"change":22,"start":129776,"end":129939},"introduced_by":22}],"inode":{"change":22,"pos":123281}},"ins_contents":[{"Add":" debug!(\"protocol error {:?}\", buf);"},{"Add":" bail!(\"Protocol error\");"}],"del_contents":[{"Del":" return Err((Error::ProtocolError {\n line: buf.as_bytes().to_vec(),\n })\n .into());\n"}]}},{"Replacement":{"inode":{"change":22,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":184,"ins":{"up_context":[{"change":22,"pos":130748}],"down_context":[{"change":22,"pos":130875}],"flag":"BLOCK","start":16547,"end":16676,"inode":{"change":22,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":130748},"to":{"change":22,"start":130748,"end":130875},"introduced_by":22}],"inode":{"change":22,"pos":123281}},"ins_contents":[{"Add":" for d in libpijul::pristine::channel_dump::dump_channel(&txn, channel)? {"},{"Add":" o.write_all(&d?)?;"}],"del_contents":[{"Del":" for d in libpijul::pristine::channel_dump::dump_channel(&txn, channel) {\n o.write_all(&d)?;\n"}]}},{"Replacement":{"inode":{"change":22,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":201,"ins":{"up_context":[{"change":22,"pos":131779}],"down_context":[{"change":22,"pos":131876}],"flag":"BLOCK","start":16677,"end":16769,"inode":{"change":22,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":131779},"to":{"change":16,"start":0,"end":91},"introduced_by":16}],"inode":{"change":22,"pos":123281}},"ins_contents":[{"Add":" if txn.current_state(&channel.borrow())? == state && extra.is_empty() {"}],"del_contents":[{"Del":" if txn.current_state(&channel.borrow()) == state && extra.is_empty() {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":133619},"path":"pijul/src/commands/mod.rs","line":80,"ins":{"up_context":[{"change":22,"pos":2244}],"down_context":[{"change":22,"pos":2283}],"flag":"BLOCK","start":16770,"end":16818,"inode":{"change":22,"pos":133619}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":2244},"to":{"change":22,"start":2244,"end":2283},"introduced_by":22}],"inode":{"change":22,"pos":133619}},"ins_contents":[{"Add":" .map(|rec| rec.globalize(txn).unwrap())"}],"del_contents":[{"Del":" .map(|rec| rec.globalize(txn))\n"}]}},{"Replacement":{"inode":{"change":22,"pos":133619},"path":"pijul/src/commands/mod.rs","line":89,"ins":{"up_context":[{"change":22,"pos":2516}],"down_context":[{"change":22,"pos":2523}],"flag":"BLOCK","start":16819,"end":16827,"inode":{"change":22,"pos":133619}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":2516},"to":{"change":22,"start":2516,"end":2523},"introduced_by":22}],"inode":{"change":22,"pos":133619}},"ins_contents":[{"Add":" )?;"}],"del_contents":[{"Del":" );\n"}]}},{"Replacement":{"inode":{"change":22,"pos":133619},"path":"pijul/src/commands/mod.rs","line":91,"ins":{"up_context":[{"change":22,"pos":2561}],"down_context":[{"change":22,"pos":2646}],"flag":"BLOCK","start":16828,"end":16924,"inode":{"change":22,"pos":133619}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":2561},"to":{"change":22,"start":2561,"end":2646},"introduced_by":22}],"inode":{"change":22,"pos":133619}},"ins_contents":[{"Add":" libpijul::change::dependencies(txn, &channel.borrow(), pending_change.changes.iter())?;"}],"del_contents":[{"Del":" libpijul::change::dependencies(txn, channel, pending_change.changes.iter());\n"}]}},{"Edit":{"inode":{"change":22,"pos":134376},"path":"pijul/src/commands/log.rs","line":4,"atom":{"NewVertex":{"up_context":[{"change":22,"pos":2088}],"down_context":[{"change":22,"pos":2088}],"flag":"BLOCK","start":16925,"end":16943,"inode":{"change":22,"pos":134376}}},"contents":[{"Add":"use anyhow::bail;"}]}},{"Edit":{"inode":{"change":22,"pos":134376},"path":"pijul/src/commands/log.rs","line":10,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":2141},"to":{"change":22,"start":2141,"end":2159},"introduced_by":22}],"inode":{"change":22,"pos":134376}}},"contents":[{"Del":"use crate::Error;\n"}]}},{"Replacement":{"inode":{"change":22,"pos":134376},"path":"pijul/src/commands/log.rs","line":35,"ins":{"up_context":[{"change":22,"pos":135173}],"down_context":[{"change":22,"pos":135251}],"flag":"BLOCK","start":16944,"end":17023,"inode":{"change":22,"pos":134376}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":135173},"to":{"change":22,"start":135173,"end":135251},"introduced_by":22}],"inode":{"change":22,"pos":134376}},"ins_contents":[{"Add":" let channel = if let Some(channel) = txn.load_channel(channel_name)? {"}],"del_contents":[{"Del":" let channel = if let Some(channel) = txn.load_channel(channel_name) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":134376},"path":"pijul/src/commands/log.rs","line":38,"ins":{"up_context":[{"change":22,"pos":135288}],"down_context":[{"change":22,"pos":135423}],"flag":"BLOCK","start":17024,"end":17081,"inode":{"change":22,"pos":134376}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":135288},"to":{"change":22,"start":135288,"end":135423},"introduced_by":22}],"inode":{"change":22,"pos":134376}},"ins_contents":[{"Add":" bail!(\"No such channel: {:?}\", channel_name)"}],"del_contents":[{"Del":" return Err((Error::NoSuchChannel {\n channel: channel_name.to_string(),\n })\n .into());\n"}]}},{"Replacement":{"inode":{"change":22,"pos":134376},"path":"pijul/src/commands/log.rs","line":44,"ins":{"up_context":[{"change":22,"pos":135542}],"down_context":[{"change":22,"pos":135619}],"flag":"BLOCK","start":17082,"end":17181,"inode":{"change":22,"pos":134376}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":135542},"to":{"change":9,"start":0,"end":74},"introduced_by":9}],"inode":{"change":22,"pos":134376}},"ins_contents":[{"Add":" for h in txn.reverse_log(&channel.borrow(), None)? {"},{"Add":" let h = (h?.1).0;"}],"del_contents":[{"Del":" for (_, (h, _)) in txn.reverse_log(&channel.borrow(), None) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":134376},"path":"pijul/src/commands/log.rs","line":50,"ins":{"up_context":[{"change":22,"pos":135743}],"down_context":[{"change":14,"pos":0}],"flag":"BLOCK","start":17182,"end":17284,"inode":{"change":22,"pos":134376}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":135743},"to":{"change":22,"start":135743,"end":135819},"introduced_by":22}],"inode":{"change":22,"pos":134376}},"ins_contents":[{"Add":" for h in txn.reverse_log(&channel.borrow(), None)? {"},{"Add":" let (h, mrk) = h?.1;"}],"del_contents":[{"Del":" for (_, (h, mrk)) in txn.reverse_log(&channel.borrow(), None) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":167873},"path":"pijul/src/commands/fork.rs","line":35,"ins":{"up_context":[{"change":22,"pos":168851}],"down_context":[{"change":22,"pos":168919}],"flag":"BLOCK","start":17285,"end":17354,"inode":{"change":22,"pos":167873}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":168851},"to":{"change":22,"start":168851,"end":168919},"introduced_by":22}],"inode":{"change":22,"pos":167873}},"ins_contents":[{"Add":" if let Some(channel) = txn.load_channel(channel_name)? {"}],"del_contents":[{"Del":" if let Some(channel) = txn.load_channel(channel_name) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":169058},"path":"pijul/src/commands/file_operations.rs","line":81,"ins":{"up_context":[{"change":22,"pos":171069}],"down_context":[{"change":22,"pos":171117}],"flag":"BLOCK","start":17355,"end":17424,"inode":{"change":22,"pos":169058}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":171069},"to":{"change":22,"start":171069,"end":171117},"introduced_by":22}],"inode":{"change":22,"pos":169058}},"ins_contents":[{"Add":" for p in txn.iter_working_copy() {"},{"Add":" let p = p?.1;"}],"del_contents":[{"Del":" for (_, p) in txn.iter_working_copy() {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":169058},"path":"pijul/src/commands/file_operations.rs","line":140,"ins":{"up_context":[{"change":22,"pos":891}],"down_context":[{"change":17,"pos":660}],"flag":"BLOCK","start":17425,"end":17474,"inode":{"change":22,"pos":169058}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":891},"to":{"change":22,"start":891,"end":939},"introduced_by":22}],"inode":{"change":22,"pos":169058}},"ins_contents":[{"Add":" if !txn.is_tracked(&path_str)? {"}],"del_contents":[{"Del":" if !txn.is_tracked(&path_str) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":169058},"path":"pijul/src/commands/file_operations.rs","line":184,"ins":{"up_context":[{"change":22,"pos":173382}],"down_context":[{"change":22,"pos":173425}],"flag":"BLOCK","start":17475,"end":17519,"inode":{"change":22,"pos":169058}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":173382},"to":{"change":22,"start":173382,"end":173425},"introduced_by":22}],"inode":{"change":22,"pos":169058}},"ins_contents":[{"Add":" if txn.is_tracked(&path_str)? {"}],"del_contents":[{"Del":" if txn.is_tracked(&path_str) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":173551},"path":"pijul/src/commands/diff.rs","line":71,"ins":{"up_context":[{"change":22,"pos":175217}],"down_context":[{"change":22,"pos":175261}],"flag":"BLOCK","start":17520,"end":17573,"inode":{"change":22,"pos":173551}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":175217},"to":{"change":22,"start":175217,"end":175261},"introduced_by":22}],"inode":{"change":22,"pos":173551}},"ins_contents":[{"Add":" .map(|rec| rec.globalize(&txn).unwrap())"}],"del_contents":[{"Del":" .map(|rec| rec.globalize(&txn))\n"}]}},{"Replacement":{"inode":{"change":22,"pos":173551},"path":"pijul/src/commands/diff.rs","line":80,"ins":{"up_context":[{"change":22,"pos":175484}],"down_context":[{"change":22,"pos":175495}],"flag":"BLOCK","start":17574,"end":17586,"inode":{"change":22,"pos":173551}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":175484},"to":{"change":22,"start":175484,"end":175495},"introduced_by":22}],"inode":{"change":22,"pos":173551}},"ins_contents":[{"Add":" )?;"}],"del_contents":[{"Del":" );\n"}]}},{"Replacement":{"inode":{"change":22,"pos":173551},"path":"pijul/src/commands/diff.rs","line":83,"ins":{"up_context":[{"change":22,"pos":175552}],"down_context":[{"change":22,"pos":175598}],"flag":"BLOCK","start":17587,"end":17634,"inode":{"change":22,"pos":173551}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":175552},"to":{"change":22,"start":175552,"end":175598},"introduced_by":22}],"inode":{"change":22,"pos":173551}},"ins_contents":[{"Add":" full_dependencies(&txn, &channel)?"}],"del_contents":[{"Del":" full_dependencies(&txn, &channel)\n"}]}},{"Replacement":{"inode":{"change":22,"pos":173551},"path":"pijul/src/commands/diff.rs","line":85,"ins":{"up_context":[{"change":22,"pos":175615}],"down_context":[{"change":22,"pos":175679}],"flag":"BLOCK","start":17635,"end":17709,"inode":{"change":22,"pos":173551}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":175615},"to":{"change":22,"start":175615,"end":175679},"introduced_by":22}],"inode":{"change":22,"pos":173551}},"ins_contents":[{"Add":" dependencies(&txn, &channel.borrow(), change.changes.iter())?"}],"del_contents":[{"Del":" dependencies(&txn, &channel, change.changes.iter())\n"}]}},{"Replacement":{"inode":{"change":22,"pos":177758},"path":"pijul/src/commands/debug.rs","line":4,"ins":{"up_context":[{"change":22,"pos":177794}],"down_context":[{"change":22,"pos":0}],"flag":"BLOCK","start":17710,"end":17728,"inode":{"change":22,"pos":177758}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":177794},"to":{"change":22,"start":177794,"end":177812},"introduced_by":22}],"inode":{"change":22,"pos":177758}},"ins_contents":[{"Add":"use anyhow::bail;"}],"del_contents":[{"Del":"use crate::Error;\n"}]}},{"Replacement":{"inode":{"change":22,"pos":177758},"path":"pijul/src/commands/debug.rs","line":26,"ins":{"up_context":[{"change":22,"pos":178297}],"down_context":[{"change":22,"pos":178376}],"flag":"BLOCK","start":17729,"end":17809,"inode":{"change":22,"pos":177758}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":178297},"to":{"change":22,"start":178297,"end":178376},"introduced_by":22}],"inode":{"change":22,"pos":177758}},"ins_contents":[{"Add":" let channel = if let Some(channel) = txn.load_channel(&channel_name)? {"}],"del_contents":[{"Del":" let channel = if let Some(channel) = txn.load_channel(&channel_name) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":177758},"path":"pijul/src/commands/debug.rs","line":29,"ins":{"up_context":[{"change":22,"pos":178413}],"down_context":[{"change":22,"pos":178548}],"flag":"BLOCK","start":17810,"end":17867,"inode":{"change":22,"pos":177758}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":178413},"to":{"change":22,"start":178413,"end":178548},"introduced_by":22}],"inode":{"change":22,"pos":177758}},"ins_contents":[{"Add":" bail!(\"No such channel: {:?}\", channel_name)"}],"del_contents":[{"Del":" return Err((Error::NoSuchChannel {\n channel: channel_name.to_string(),\n })\n .into());\n"}]}},{"Replacement":{"inode":{"change":22,"pos":177758},"path":"pijul/src/commands/debug.rs","line":37,"ins":{"up_context":[{"change":22,"pos":264}],"down_context":[{"change":22,"pos":299}],"flag":"BLOCK","start":17868,"end":17909,"inode":{"change":22,"pos":177758}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":264},"to":{"change":22,"start":264,"end":299},"introduced_by":22}],"inode":{"change":22,"pos":177758}},"ins_contents":[{"Add":" &channel.borrow().graph,"}],"del_contents":[{"Del":" &channel.borrow(),\n"}]}},{"Replacement":{"inode":{"change":22,"pos":177758},"path":"pijul/src/commands/debug.rs","line":44,"ins":{"up_context":[{"change":22,"pos":102}],"down_context":[{"change":22,"pos":177}],"flag":"BLOCK","start":17910,"end":17991,"inode":{"change":22,"pos":177758}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":102},"to":{"change":22,"start":102,"end":177},"introduced_by":22}],"inode":{"change":22,"pos":177758}},"ins_contents":[{"Add":" libpijul::pristine::debug(&txn, &channel.graph, std::io::stdout())?;"}],"del_contents":[{"Del":" libpijul::pristine::debug(&txn, &channel, std::io::stdout())?;\n"}]}},{"Replacement":{"inode":{"change":22,"pos":177758},"path":"pijul/src/commands/debug.rs","line":46,"ins":{"up_context":[{"change":22,"pos":187}],"down_context":[{"change":19,"pos":0}],"flag":"BLOCK","start":17992,"end":18083,"inode":{"change":22,"pos":177758}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":187},"to":{"change":22,"start":187,"end":269},"introduced_by":22}],"inode":{"change":22,"pos":177758}},"ins_contents":[{"Add":" libpijul::pristine::check_alive_debug(&repo.changes, &txn, &channel.borrow(), 0)?;"}],"del_contents":[{"Del":" libpijul::pristine::check_alive_debug(&repo.changes, &txn, &channel, 0)?;\n"}]}},{"Edit":{"inode":{"change":22,"pos":178684},"path":"pijul/src/commands/credit.rs","line":4,"atom":{"NewVertex":{"up_context":[{"change":22,"pos":2811}],"down_context":[{"change":18,"pos":690}],"flag":"BLOCK","start":18084,"end":18102,"inode":{"change":22,"pos":178684}}},"contents":[{"Add":"use anyhow::bail;"}]}},{"Replacement":{"inode":{"change":22,"pos":178684},"path":"pijul/src/commands/credit.rs","line":8,"ins":{"up_context":[{"change":22,"pos":178851}],"down_context":[{"change":22,"pos":2828}],"flag":"BLOCK","start":18103,"end":18120,"inode":{"change":22,"pos":178684}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":178851},"to":{"change":22,"start":5891,"end":5960},"introduced_by":22}],"inode":{"change":22,"pos":178684}},"ins_contents":[{"Add":"use libpijul::*;"}],"del_contents":[{"Del":"use libpijul::{ChangeId, Channel, EdgeFlags, TxnT, TxnTExt, Vertex};\n"}]}},{"Edit":{"inode":{"change":22,"pos":178684},"path":"pijul/src/commands/credit.rs","line":12,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":2880},"to":{"change":22,"start":2880,"end":2898},"introduced_by":22}],"inode":{"change":22,"pos":178684}}},"contents":[{"Del":"use crate::Error;\n"}]}},{"Replacement":{"inode":{"change":22,"pos":178684},"path":"pijul/src/commands/credit.rs","line":31,"ins":{"up_context":[{"change":22,"pos":179431}],"down_context":[{"change":22,"pos":179510}],"flag":"BLOCK","start":18121,"end":18201,"inode":{"change":22,"pos":178684}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":179431},"to":{"change":22,"start":179431,"end":179510},"introduced_by":22}],"inode":{"change":22,"pos":178684}},"ins_contents":[{"Add":" let channel = if let Some(channel) = txn.load_channel(&channel_name)? {"}],"del_contents":[{"Del":" let channel = if let Some(channel) = txn.load_channel(&channel_name) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":178684},"path":"pijul/src/commands/credit.rs","line":34,"ins":{"up_context":[{"change":22,"pos":179547}],"down_context":[{"change":22,"pos":179682}],"flag":"BLOCK","start":18202,"end":18259,"inode":{"change":22,"pos":178684}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":179547},"to":{"change":22,"start":179547,"end":179682},"introduced_by":22}],"inode":{"change":22,"pos":178684}},"ins_contents":[{"Add":" bail!(\"No such channel: {:?}\", channel_name)"}],"del_contents":[{"Del":" return Err((Error::NoSuchChannel {\n channel: channel_name.to_string(),\n })\n .into());\n"}]}},{"Replacement":{"inode":{"change":22,"pos":178684},"path":"pijul/src/commands/credit.rs","line":64,"ins":{"up_context":[{"change":22,"pos":180479}],"down_context":[{"change":22,"pos":180533}],"flag":"BLOCK","start":18260,"end":18321,"inode":{"change":22,"pos":178684}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":180479},"to":{"change":22,"start":5961,"end":6018},"introduced_by":22}],"inode":{"change":22,"pos":178684}},"ins_contents":[{"Add":"pub struct Creditor<'a, W: std::io::Write, T: ChannelTxnT> {"}],"del_contents":[{"Del":"pub struct Creditor<'a, W: std::io::Write, T: TxnTExt> {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":178684},"path":"pijul/src/commands/credit.rs","line":73,"ins":{"up_context":[{"change":22,"pos":180661}],"down_context":[{"change":22,"pos":180719}],"flag":"BLOCK","start":18322,"end":18387,"inode":{"change":22,"pos":178684}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":180661},"to":{"change":22,"start":6019,"end":6080},"introduced_by":22}],"inode":{"change":22,"pos":178684}},"ins_contents":[{"Add":"impl<'a, W: std::io::Write, T: ChannelTxnT> Creditor<'a, W, T> {"}],"del_contents":[{"Del":"impl<'a, W: std::io::Write, T: TxnTExt> Creditor<'a, W, T> {\n"}]}},{"Edit":{"inode":{"change":22,"pos":178684},"path":"pijul/src/commands/credit.rs","line":99,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":181319},"to":{"change":22,"start":6160,"end":6190},"introduced_by":22}],"inode":{"change":22,"pos":178684}}},"contents":[{"Del":" use libpijul::Base32;\n"}]}},{"Replacement":{"inode":{"change":22,"pos":178684},"path":"pijul/src/commands/credit.rs","line":104,"ins":{"up_context":[{"change":22,"pos":181558}],"down_context":[{"change":22,"pos":181558}],"flag":"BLOCK","start":18388,"end":18414,"inode":{"change":22,"pos":178684}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":181558},"to":{"change":22,"start":0,"end":56},"introduced_by":22}],"inode":{"change":22,"pos":178684}},"ins_contents":[{"Add":" .unwrap()"}],"del_contents":[{"Del":" .filter(|e| !e.introduced_by.is_root())\n"}]}},{"Edit":{"inode":{"change":22,"pos":178684},"path":"pijul/src/commands/credit.rs","line":106,"atom":{"NewVertex":{"up_context":[{"change":22,"pos":181572}],"down_context":[{"change":22,"pos":181572}],"flag":"BLOCK","start":18415,"end":18546,"inode":{"change":22,"pos":178684}}},"contents":[{"Add":" let e = e.unwrap();"},{"Add":" if e.introduced_by.is_root() {"},{"Add":" continue;"},{"Add":" }"}]}},{"Edit":{"inode":{"change":22,"pos":182891},"path":"pijul/src/commands/clone.rs","line":4,"atom":{"NewVertex":{"up_context":[{"change":22,"pos":2925}],"down_context":[{"change":22,"pos":2925}],"flag":"BLOCK","start":18547,"end":18591,"inode":{"change":22,"pos":182891}}},"contents":[{"Add":"use crate::repository::*;"},{"Add":"use anyhow::bail;"}]}},{"Edit":{"inode":{"change":22,"pos":182891},"path":"pijul/src/commands/clone.rs","line":10,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":183024},"to":{"change":22,"start":2959,"end":2986},"introduced_by":22}],"inode":{"change":22,"pos":182891}}},"contents":[{"Del":"\nuse crate::repository::*;\n"}]}},{"Replacement":{"inode":{"change":22,"pos":182891},"path":"pijul/src/commands/clone.rs","line":57,"ins":{"up_context":[{"change":22,"pos":184404}],"down_context":[{"change":22,"pos":184502}],"flag":"BLOCK","start":18592,"end":18668,"inode":{"change":22,"pos":182891}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":184404},"to":{"change":22,"start":184404,"end":184502},"introduced_by":22}],"inode":{"change":22,"pos":182891}},"ins_contents":[{"Add":" bail!(\"Could not infer repository name from {:?}\", self.remote)"}],"del_contents":[{"Del":" return Err((crate::Error::CouldNotInferRepositoryName { repo: self.remote }).into());\n"}]}},{"Edit":{"inode":{"change":22,"pos":186892},"path":"pijul/src/commands/channel.rs","line":6,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":20}],"down_context":[{"change":124,"pos":147}],"flag":"BLOCK","start":18669,"end":18687,"inode":{"change":22,"pos":186892}}},"contents":[{"Add":"use anyhow::bail;"}]}},{"Replacement":{"inode":{"change":22,"pos":186892},"path":"pijul/src/commands/channel.rs","line":42,"ins":{"up_context":[{"change":22,"pos":187789}],"down_context":[{"change":22,"pos":187844}],"flag":"BLOCK","start":18688,"end":18788,"inode":{"change":22,"pos":186892}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":187789},"to":{"change":22,"start":187789,"end":187844},"introduced_by":22}],"inode":{"change":22,"pos":186892}},"ins_contents":[{"Add":" for channel in txn.iter_channels(\"\")? {"},{"Add":" let channel = channel?;"}],"del_contents":[{"Del":" for channel in txn.iter_channels(\"\") {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":186892},"path":"pijul/src/commands/channel.rs","line":57,"ins":{"up_context":[{"change":22,"pos":1311}],"down_context":[{"change":22,"pos":1391}],"flag":"BLOCK","start":18789,"end":18848,"inode":{"change":22,"pos":186892}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":1311},"to":{"change":22,"start":6297,"end":6378},"introduced_by":22}],"inode":{"change":22,"pos":186892}},"ins_contents":[{"Add":" bail!(\"Cannot delete current channel\")"}],"del_contents":[{"Del":" return Err(crate::Error::CannotDeleteCurrentChannel.into());\n"}]}},{"Replacement":{"inode":{"change":22,"pos":186892},"path":"pijul/src/commands/channel.rs","line":83,"ins":{"up_context":[{"change":22,"pos":188748}],"down_context":[{"change":22,"pos":188819}],"flag":"BLOCK","start":18849,"end":18897,"inode":{"change":22,"pos":186892}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":188748},"to":{"change":22,"start":188748,"end":188819},"introduced_by":22}],"inode":{"change":22,"pos":186892}},"ins_contents":[{"Add":" bail!(\"No current channel\")"}],"del_contents":[{"Del":" return Err(crate::Error::NoCurrentChannel.into());\n"}]}},{"Replacement":{"inode":{"change":22,"pos":186892},"path":"pijul/src/commands/channel.rs","line":85,"ins":{"up_context":[{"change":22,"pos":188838}],"down_context":[{"change":22,"pos":188920}],"flag":"BLOCK","start":18898,"end":18981,"inode":{"change":22,"pos":186892}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":188838},"to":{"change":22,"start":188838,"end":188920},"introduced_by":22}],"inode":{"change":22,"pos":186892}},"ins_contents":[{"Add":" let mut channel = if let Some(channel) = txn.load_channel(from)? {"}],"del_contents":[{"Del":" let mut channel = if let Some(channel) = txn.load_channel(from) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":186892},"path":"pijul/src/commands/channel.rs","line":88,"ins":{"up_context":[{"change":22,"pos":188973}],"down_context":[{"change":22,"pos":189141}],"flag":"BLOCK","start":18982,"end":19039,"inode":{"change":22,"pos":186892}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":188973},"to":{"change":22,"start":188973,"end":189141},"introduced_by":22}],"inode":{"change":22,"pos":186892}},"ins_contents":[{"Add":" bail!(\"No such channel: {:?}\", from)"}],"del_contents":[{"Del":" return Err((crate::Error::ChannelNotFound {\n channel: from.to_string(),\n })\n .into());\n"}]}},{"Replacement":{"inode":{"change":22,"pos":189306},"path":"pijul/src/commands/change.rs","line":30,"ins":{"up_context":[{"change":12,"pos":70}],"down_context":[{"change":12,"pos":152}],"flag":"BLOCK","start":19040,"end":19123,"inode":{"change":22,"pos":189306}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":12,"pos":70},"to":{"change":12,"start":70,"end":152},"introduced_by":12}],"inode":{"change":22,"pos":189306}},"ins_contents":[{"Add":" let channel = if let Some(channel) = txn.load_channel(channel_name)? {"}],"del_contents":[{"Del":" let channel = if let Some(channel) = txn.load_channel(channel_name) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":189306},"path":"pijul/src/commands/change.rs","line":36,"ins":{"up_context":[{"change":12,"pos":287}],"down_context":[{"change":12,"pos":385}],"flag":"BLOCK","start":19124,"end":19220,"inode":{"change":22,"pos":189306}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":12,"pos":287},"to":{"change":12,"start":287,"end":385},"introduced_by":12}],"inode":{"change":22,"pos":189306}},"ins_contents":[{"Add":" if let Some(h) = txn.reverse_log(&channel, None)?.next() {"},{"Add":" (h?.1).0"}],"del_contents":[{"Del":" if let Some((_, (h, _))) = txn.reverse_log(&channel, None).next() {\n h\n"}]}},{"Replacement":{"inode":{"change":22,"pos":191083},"path":"pijul/src/commands/archive.rs","line":90,"ins":{"up_context":[{"change":22,"pos":193497}],"down_context":[{"change":22,"pos":193573}],"flag":"BLOCK","start":19221,"end":19298,"inode":{"change":22,"pos":191083}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":193497},"to":{"change":22,"start":193497,"end":193573},"introduced_by":22}],"inode":{"change":22,"pos":191083}},"ins_contents":[{"Add":" let mut channel = txn.load_channel(&channel_name)?.unwrap();"}],"del_contents":[{"Del":" let mut channel = txn.load_channel(&channel_name).unwrap();\n"}]}},{"Replacement":{"inode":{"change":22,"pos":191083},"path":"pijul/src/commands/archive.rs","line":100,"ins":{"up_context":[{"change":22,"pos":193869}],"down_context":[{"change":22,"pos":193941}],"flag":"BLOCK","start":19299,"end":19372,"inode":{"change":22,"pos":191083}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":193869},"to":{"change":22,"start":193869,"end":193941},"introduced_by":22}],"inode":{"change":22,"pos":191083}},"ins_contents":[{"Add":" let channel = txn.load_channel(&channel_name)?.unwrap();"}],"del_contents":[{"Del":" let channel = txn.load_channel(&channel_name).unwrap();\n"}]}},{"Replacement":{"inode":{"change":22,"pos":194289},"path":"pijul/src/commands/apply.rs","line":31,"ins":{"up_context":[{"change":22,"pos":195050}],"down_context":[{"change":22,"pos":195133}],"flag":"BLOCK","start":19373,"end":19457,"inode":{"change":22,"pos":194289}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":195050},"to":{"change":22,"start":195050,"end":195133},"introduced_by":22}],"inode":{"change":22,"pos":194289}},"ins_contents":[{"Add":" let mut channel = if let Some(channel) = txn.load_channel(&channel_name)? {"}],"del_contents":[{"Del":" let mut channel = if let Some(channel) = txn.load_channel(&channel_name) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":196374},"path":"pijul/Cargo.toml","line":4,"ins":{"up_context":[{"change":22,"pos":196462}],"down_context":[{"change":22,"pos":196488}],"flag":"BLOCK","start":19458,"end":19485,"inode":{"change":22,"pos":196374}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":196462},"to":{"change":19,"start":51,"end":78},"introduced_by":19}],"inode":{"change":22,"pos":196374}},"ins_contents":[{"Add":"version = \"1.0.0-alpha.27\""}],"del_contents":[{"Del":"version = \"1.0.0-alpha.26\"\n"}]}},{"Replacement":{"inode":{"change":22,"pos":196374},"path":"pijul/Cargo.toml","line":49,"ins":{"up_context":[{"change":22,"pos":197438}],"down_context":[{"change":22,"pos":197523}],"flag":"BLOCK","start":19486,"end":19554,"inode":{"change":22,"pos":196374}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":197438},"to":{"change":22,"start":197438,"end":197456},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":197456},"to":{"change":19,"start":79,"end":147},"introduced_by":19}],"inode":{"change":22,"pos":196374}},"ins_contents":[{"Add":"libpijul = { version = \"1.0.0-alpha.23\", features = [ \"tarball\" ] }"}],"del_contents":[{"Del":"thiserror = \"1.0\"\n"},{"Del":"libpijul = { version = \"1.0.0-alpha.22\", features = [ \"tarball\" ] }\n"}]}},{"Replacement":{"inode":{"change":22,"pos":196374},"path":"pijul/Cargo.toml","line":64,"ins":{"up_context":[{"change":22,"pos":197874}],"down_context":[{"change":22,"pos":197895}],"flag":"BLOCK","start":19555,"end":19576,"inode":{"change":22,"pos":196374}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":197874},"to":{"change":22,"start":0,"end":21},"introduced_by":22}],"inode":{"change":22,"pos":196374}},"ins_contents":[{"Add":"sanakirja = \"0.15.2\""}],"del_contents":[{"Del":"sanakirja = \"0.14.2\"\n"}]}},{"Replacement":{"inode":{"change":22,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":107,"ins":{"up_context":[{"change":22,"pos":398}],"down_context":[{"change":22,"pos":210471}],"flag":"BLOCK","start":19577,"end":19631,"inode":{"change":22,"pos":208900}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":22,"pos":398},"to":{"change":22,"start":3775,"end":3824},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":210434},"to":{"change":22,"start":3775,"end":3824},"introduced_by":22}],"inode":{"change":22,"pos":208900}},"ins_contents":[{"Add":" ) -> Result<(), Error> {"}],"del_contents":[{"Del":" ) -> Result<(), Error> {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":140,"ins":{"up_context":[{"change":22,"pos":875}],"down_context":[{"change":22,"pos":1829}],"flag":"BLOCK","start":19632,"end":19679,"inode":{"change":22,"pos":208900}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":22,"pos":875},"to":{"change":22,"start":3825,"end":3867},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":1792},"to":{"change":22,"start":3825,"end":3867},"introduced_by":22}],"inode":{"change":22,"pos":208900}},"ins_contents":[{"Add":" ) -> Result<(), AddError> {"}],"del_contents":[{"Del":" ) -> Result<(), AddError> {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":149,"ins":{"up_context":[{"change":22,"pos":1902}],"down_context":[{"change":22,"pos":1063}],"flag":"BLOCK","start":19680,"end":19764,"inode":{"change":22,"pos":208900}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":22,"pos":1902},"to":{"change":22,"start":984,"end":1063},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":984},"to":{"change":22,"start":984,"end":1063},"introduced_by":22}],"inode":{"change":22,"pos":208900}},"ins_contents":[{"Add":" let t = std::thread::spawn(move || -> Result<(), AddError> {"}],"del_contents":[{"Del":" let t = std::thread::spawn(move || -> Result<(), AddError> {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":219,"ins":{"up_context":[{"change":22,"pos":3130}],"down_context":[{"change":22,"pos":2643}],"flag":"BLOCK","start":19765,"end":19819,"inode":{"change":22,"pos":208900}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":22,"pos":3130},"to":{"change":22,"start":3868,"end":3917},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":211282},"to":{"change":22,"start":3868,"end":3917},"introduced_by":22}],"inode":{"change":22,"pos":208900}},"ins_contents":[{"Add":" ) -> Result<(), Error> {"}],"del_contents":[{"Del":" ) -> Result<(), Error> {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":6,"ins":{"up_context":[{"change":22,"pos":1}],"down_context":[{"change":22,"pos":226191}],"flag":"BLOCK","start":19820,"end":19927,"inode":{"change":22,"pos":225940}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":22,"pos":1},"to":{"change":22,"start":226152,"end":226191},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":226152},"to":{"change":22,"start":226152,"end":226191},"introduced_by":22}],"inode":{"change":22,"pos":225940}},"ins_contents":[{"Add":"pub fn undo_file_addition<"},{"Add":" T: GraphMutTxnT + TreeMutTxnT::GraphError>,"},{"Add":">("}],"del_contents":[{"Del":"pub fn undo_file_addition(\n"}]}},{"Replacement":{"inode":{"change":22,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":12,"ins":{"up_context":[{"change":22,"pos":226275}],"down_context":[{"change":22,"pos":226308}],"flag":"BLOCK","start":19928,"end":19969,"inode":{"change":22,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":226275},"to":{"change":22,"start":6687,"end":6715},"introduced_by":22}],"inode":{"change":22,"pos":225940}},"ins_contents":[{"Add":") -> Result<(), TxnErr> {"}],"del_contents":[{"Del":") -> Result<(), T::Error> {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":18,"ins":{"up_context":[{"change":22,"pos":226458}],"down_context":[{"change":22,"pos":353}],"flag":"BLOCK","start":19970,"end":20031,"inode":{"change":22,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":226458},"to":{"change":22,"start":226458,"end":226518},"introduced_by":22}],"inode":{"change":22,"pos":225940}},"ins_contents":[{"Add":" if let Some(inode) = txn.get_revinodes(pos, None)? {"}],"del_contents":[{"Del":" if let Some(inode) = txn.get_revinodes(pos, None) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":25,"ins":{"up_context":[{"change":22,"pos":3}],"down_context":[{"change":22,"pos":226784}],"flag":"BLOCK","start":20032,"end":20169,"inode":{"change":22,"pos":225940}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":22,"pos":3},"to":{"change":22,"start":226729,"end":226784},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":226729},"to":{"change":22,"start":226729,"end":226784},"introduced_by":22}],"inode":{"change":22,"pos":225940}},"ins_contents":[{"Add":"pub fn undo_file_deletion<"},{"Add":" T: ChannelTxnT + TreeMutTxnT + TreeTxnT::GraphError>,"},{"Add":" P: ChangeStore,"},{"Add":">("}],"del_contents":[{"Del":"pub fn undo_file_deletion(\n"}]}},{"Replacement":{"inode":{"change":22,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":34,"ins":{"up_context":[{"change":22,"pos":226907}],"down_context":[{"change":22,"pos":226940}],"flag":"BLOCK","start":20170,"end":20234,"inode":{"change":22,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":226907},"to":{"change":22,"start":6716,"end":6776},"introduced_by":22}],"inode":{"change":22,"pos":225940}},"ins_contents":[{"Add":") -> Result<(), super::UnrecordError> {"}],"del_contents":[{"Del":") -> Result<(), super::UnrecordError> {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":37,"ins":{"up_context":[{"change":22,"pos":227037}],"down_context":[{"change":22,"pos":227128}],"flag":"BLOCK","start":20235,"end":20334,"inode":{"change":22,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":227037},"to":{"change":22,"start":6529,"end":6622},"introduced_by":22}],"inode":{"change":22,"pos":225940}},"ins_contents":[{"Add":" let source = find_block_end(txn, &channel.graph, internal_pos(txn, &e.from, change_id)?)?;"}],"del_contents":[{"Del":" let source = find_block_end(txn, &channel, internal_pos(txn, &e.from, change_id)?)?;\n"}]}},{"Replacement":{"inode":{"change":22,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":46,"ins":{"up_context":[{"change":22,"pos":5}],"down_context":[{"change":22,"pos":227468}],"flag":"BLOCK","start":20335,"end":20457,"inode":{"change":22,"pos":225940}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":22,"pos":5},"to":{"change":22,"start":227428,"end":227468},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":227428},"to":{"change":22,"start":227428,"end":227468},"introduced_by":22}],"inode":{"change":22,"pos":225940}},"ins_contents":[{"Add":"fn restore<"},{"Add":" T: ChannelTxnT + TreeMutTxnT + TreeTxnT::GraphError>,"},{"Add":" P: ChangeStore,"},{"Add":">("}],"del_contents":[{"Del":"fn restore(\n"}]}},{"Replacement":{"inode":{"change":22,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":55,"ins":{"up_context":[{"change":22,"pos":227588}],"down_context":[{"change":22,"pos":227621}],"flag":"BLOCK","start":20458,"end":20522,"inode":{"change":22,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":227588},"to":{"change":22,"start":6777,"end":6837},"introduced_by":22}],"inode":{"change":22,"pos":225940}},"ins_contents":[{"Add":") -> Result<(), super::UnrecordError> {"}],"del_contents":[{"Del":") -> Result<(), super::UnrecordError> {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":63,"ins":{"up_context":[{"change":22,"pos":227921}],"down_context":[{"change":22,"pos":6740}],"flag":"BLOCK","start":20523,"end":20593,"inode":{"change":22,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":227921},"to":{"change":22,"start":6697,"end":6740},"introduced_by":22}],"inode":{"change":22,"pos":225940}},"ins_contents":[{"Add":" let mut source_parent = None;"},{"Add":" for e in iter_adjacent("}],"del_contents":[{"Del":" let source_parent = iter_adjacent(\n"}]}},{"Replacement":{"inode":{"change":22,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":66,"ins":{"up_context":[{"change":22,"pos":6757}],"down_context":[{"change":22,"pos":6779}],"flag":"BLOCK","start":20594,"end":20622,"inode":{"change":22,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":6757},"to":{"change":22,"start":6757,"end":6779},"introduced_by":22}],"inode":{"change":22,"pos":225940}},"ins_contents":[{"Add":" &channel.graph,"}],"del_contents":[{"Del":" &channel,\n"}]}},{"Replacement":{"inode":{"change":22,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":70,"ins":{"up_context":[{"change":22,"pos":6880}],"down_context":[{"change":22,"pos":6}],"flag":"BLOCK","start":20623,"end":20877,"inode":{"change":22,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":6880},"to":{"change":22,"start":6880,"end":6890},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":6890},"to":{"change":22,"start":1769,"end":1843},"introduced_by":22},{"previous":"","flag":"DELETED","from":{"change":22,"pos":1843},"to":{"change":22,"start":6982,"end":7015},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":6982},"to":{"change":22,"start":6982,"end":7015},"introduced_by":22}],"inode":{"change":22,"pos":225940}},"ins_contents":[{"Add":" )? {"},{"Add":" let e = e?;"},{"Add":" if e.flag.contains(EdgeFlags::PARENT | EdgeFlags::FOLDER) {"},{"Add":" source_parent = Some(e.dest);"},{"Add":" break;"},{"Add":" }"},{"Add":" }"},{"Add":" let source_parent = source_parent.unwrap();"}],"del_contents":[{"Del":" )\n"},{"Del":" .find(|e| e.flag.contains(EdgeFlags::PARENT | EdgeFlags::FOLDER))\n"},{"Del":" .unwrap()\n .dest;\n"}]}},{"Replacement":{"inode":{"change":22,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":81,"ins":{"up_context":[{"change":22,"pos":6928}],"down_context":[{"change":22,"pos":6929}],"flag":"BLOCK","start":20878,"end":20956,"inode":{"change":22,"pos":225940}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":22,"pos":6928},"to":{"change":22,"start":228471,"end":228548},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":228471},"to":{"change":22,"start":228471,"end":228548},"introduced_by":22}],"inode":{"change":22,"pos":225940}},"ins_contents":[{"Add":" } else if let Some(inode) = txn.get_revinodes(source_parent, None)? {"}],"del_contents":[{"Del":" } else if let Some(inode) = txn.get_revinodes(source_parent, None) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":92,"ins":{"up_context":[{"change":22,"pos":9}],"down_context":[{"change":22,"pos":228969}],"flag":"BLOCK","start":20957,"end":21083,"inode":{"change":22,"pos":225940}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":22,"pos":9},"to":{"change":22,"start":228923,"end":228969},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":228923},"to":{"change":22,"start":228923,"end":228969},"introduced_by":22}],"inode":{"change":22,"pos":225940}},"ins_contents":[{"Add":"fn restore_inode<"},{"Add":" T: TreeMutTxnT + GraphTxnT + TreeTxnT::GraphError>,"},{"Add":" P: ChangeStore,"},{"Add":">("}],"del_contents":[{"Del":"fn restore_inode(\n"}]}},{"Replacement":{"inode":{"change":22,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":101,"ins":{"up_context":[{"change":22,"pos":229088}],"down_context":[{"change":22,"pos":229174}],"flag":"BLOCK","start":21084,"end":21151,"inode":{"change":22,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":229088},"to":{"change":22,"start":7014,"end":7077},"introduced_by":22}],"inode":{"change":22,"pos":225940}},"ins_contents":[{"Add":") -> Result> {"}],"del_contents":[{"Del":") -> Result> {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":104,"ins":{"up_context":[{"change":22,"pos":7110}],"down_context":[{"change":22,"pos":7177}],"flag":"BLOCK","start":21152,"end":21228,"inode":{"change":22,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":7110},"to":{"change":22,"start":7110,"end":7177},"introduced_by":22}],"inode":{"change":22,"pos":225940}},"ins_contents":[{"Add":" .get_file_name(|h| txn.get_external(h).unwrap(), source, &mut name)"}],"del_contents":[{"Del":" .get_file_name(|h| txn.get_external(h), source, &mut name)\n"}]}},{"Replacement":{"inode":{"change":22,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":111,"ins":{"up_context":[{"change":22,"pos":229428}],"down_context":[{"change":22,"pos":67}],"flag":"BLOCK","start":21229,"end":21287,"inode":{"change":22,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":229428},"to":{"change":22,"start":10,"end":67},"introduced_by":22}],"inode":{"change":22,"pos":225940}},"ins_contents":[{"Add":" if let Some(inode) = txn.get_revinodes(dest, None)? {"}],"del_contents":[{"Del":" if let Some(inode) = txn.get_revinodes(dest, None) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":114,"ins":{"up_context":[{"change":22,"pos":98}],"down_context":[{"change":22,"pos":338}],"flag":"BLOCK","start":21288,"end":21453,"inode":{"change":22,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":98},"to":{"change":22,"start":98,"end":152},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":152},"to":{"change":22,"start":7232,"end":7412},"introduced_by":22}],"inode":{"change":22,"pos":225940}},"ins_contents":[{"Add":" let inode = crate::fs::create_new_inode(txn)?;"},{"Add":" put_tree_with_rev(txn, file_id.as_file_id(), inode)?;"},{"Add":" put_inodes_with_rev(txn, inode, dest)?;"}],"del_contents":[{"Del":" let inode = crate::fs::create_new_inode(txn);\n"},{"Del":" put_tree_with_rev(txn, file_id.as_file_id(), inode).map_err(super::UnrecordError::Txn)?;\n put_inodes_with_rev(txn, inode, dest).map_err(super::UnrecordError::Txn)?;\n"}]}},{"Replacement":{"inode":{"change":22,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":121,"ins":{"up_context":[{"change":22,"pos":364}],"down_context":[{"change":22,"pos":229711}],"flag":"BLOCK","start":21454,"end":21495,"inode":{"change":22,"pos":225940}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":22,"pos":364},"to":{"change":22,"start":229677,"end":229711},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":229677},"to":{"change":22,"start":229677,"end":229711},"introduced_by":22}],"inode":{"change":22,"pos":225940}},"ins_contents":[{"Add":"fn find_youngest_parent("}],"del_contents":[{"Del":"fn find_youngest_parent(\n"}]}},{"Replacement":{"inode":{"change":22,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":125,"ins":{"up_context":[{"change":22,"pos":229781}],"down_context":[{"change":22,"pos":229827}],"flag":"BLOCK","start":21496,"end":21555,"inode":{"change":22,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":229781},"to":{"change":22,"start":7413,"end":7457},"introduced_by":22}],"inode":{"change":22,"pos":225940}},"ins_contents":[{"Add":") -> Result, BlockError> {"}],"del_contents":[{"Del":") -> Result, BlockError> {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":129,"ins":{"up_context":[{"change":22,"pos":7057}],"down_context":[{"change":22,"pos":7074}],"flag":"BLOCK","start":21556,"end":21580,"inode":{"change":22,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":7057},"to":{"change":22,"start":7057,"end":7074},"introduced_by":22}],"inode":{"change":22,"pos":225940}},"ins_contents":[{"Add":" &channel.graph,"}],"del_contents":[{"Del":" channel,\n"}]}},{"Replacement":{"inode":{"change":22,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":133,"ins":{"up_context":[{"change":22,"pos":7225}],"down_context":[{"change":22,"pos":230169}],"flag":"BLOCK","start":21581,"end":21711,"inode":{"change":22,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":7225},"to":{"change":22,"start":7225,"end":7303},"introduced_by":22},{"previous":"","flag":"DELETED","from":{"change":22,"pos":7303},"to":{"change":22,"start":230163,"end":230169},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":230163},"to":{"change":22,"start":230163,"end":230169},"introduced_by":22}],"inode":{"change":22,"pos":225940}},"ins_contents":[{"Add":" )? {"},{"Add":" let e = e?;"},{"Add":" if !e.flag.contains(EdgeFlags::FOLDER | EdgeFlags::PARENT) {"},{"Add":" continue;"},{"Add":" }"}],"del_contents":[{"Del":" )\n .filter(|e| e.flag.contains(EdgeFlags::FOLDER | EdgeFlags::PARENT))\n"},{"Del":" {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":141,"ins":{"up_context":[{"change":22,"pos":230244}],"down_context":[{"change":22,"pos":230316}],"flag":"BLOCK","start":21712,"end":21785,"inode":{"change":22,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":230244},"to":{"change":22,"start":230244,"end":230316},"introduced_by":22}],"inode":{"change":22,"pos":225940}},"ins_contents":[{"Add":" .get_changeset(&channel.changes, e.introduced_by, None)?"}],"del_contents":[{"Del":" .get_changeset(&channel.changes, e.introduced_by, None)\n"}]}},{"Replacement":{"inode":{"change":22,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":156,"ins":{"up_context":[{"change":22,"pos":230687}],"down_context":[{"change":22,"pos":230736}],"flag":"BLOCK","start":21786,"end":21843,"inode":{"change":22,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":230687},"to":{"change":22,"start":7304,"end":7354},"introduced_by":22}],"inode":{"change":22,"pos":225940}},"ins_contents":[{"Add":" find_block_end(txn, &channel.graph, next.unwrap().1)"}],"del_contents":[{"Del":" find_block_end(txn, channel, next.unwrap().1)\n"}]}},{"Replacement":{"inode":{"change":22,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":159,"ins":{"up_context":[{"change":22,"pos":230739}],"down_context":[{"change":22,"pos":230836}],"flag":"BLOCK","start":21844,"end":21982,"inode":{"change":22,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":230739},"to":{"change":22,"start":7458,"end":7516},"introduced_by":22}],"inode":{"change":22,"pos":225940}},"ins_contents":[{"Add":"pub fn undo_file_reinsertion<"},{"Add":" P: ChangeStore,"},{"Add":" T: GraphTxnT + TreeMutTxnT + TreeTxnT::GraphError>,"},{"Add":">("}],"del_contents":[{"Del":"pub fn undo_file_reinsertion(\n"}]}},{"Replacement":{"inode":{"change":22,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":166,"ins":{"up_context":[{"change":22,"pos":230916}],"down_context":[{"change":22,"pos":230949}],"flag":"BLOCK","start":21983,"end":22047,"inode":{"change":22,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":230916},"to":{"change":22,"start":7517,"end":7577},"introduced_by":22}],"inode":{"change":22,"pos":225940}},"ins_contents":[{"Add":") -> Result<(), super::UnrecordError> {"}],"del_contents":[{"Del":") -> Result<(), super::UnrecordError> {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":171,"ins":{"up_context":[{"change":22,"pos":7432}],"down_context":[{"change":22,"pos":231440}],"flag":"BLOCK","start":22048,"end":22178,"inode":{"change":22,"pos":225940}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":22,"pos":7432},"to":{"change":22,"start":231227,"end":231296},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":231227},"to":{"change":22,"start":231227,"end":231296},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":231296},"to":{"change":22,"start":7578,"end":7673},"introduced_by":22}],"inode":{"change":22,"pos":225940}},"ins_contents":[{"Add":" if let Some(inode) = txn.get_revinodes(position, None)? {"},{"Add":" del_inodes_with_rev(txn, inode, position)?;"}],"del_contents":[{"Del":" if let Some(inode) = txn.get_revinodes(position, None) {\n"},{"Del":" del_inodes_with_rev(txn, inode, position).map_err(super::UnrecordError::Txn)?;\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":21,"ins":{"up_context":[{"change":22,"pos":7965}],"down_context":[{"change":22,"pos":8013}],"flag":"BLOCK","start":22179,"end":22237,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":7965},"to":{"change":22,"start":7965,"end":8013},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" Block(#[from] crate::pristine::BlockError),"}],"del_contents":[{"Del":" Block(#[from] crate::pristine::BlockError),\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":23,"ins":{"up_context":[{"change":22,"pos":8039}],"down_context":[{"change":22,"pos":8108}],"flag":"BLOCK","start":22238,"end":22317,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":8039},"to":{"change":22,"start":8039,"end":8108},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" InconsistentChange(#[from] crate::pristine::InconsistentChange),"}],"del_contents":[{"Del":" InconsistentChange(#[from] crate::pristine::InconsistentChange),\n"}]}},{"Edit":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":34,"atom":{"NewVertex":{"up_context":[{"change":22,"pos":8611}],"down_context":[{"change":22,"pos":8611}],"flag":"BLOCK","start":22318,"end":22524,"inode":{"change":22,"pos":231493}}},"contents":[{"Add":"}"},{"Add":""},{"Add":"impl std::convert::From>"},{"Add":" for UnrecordError"},{"Add":"{"},{"Add":" fn from(t: TxnErr) -> Self {"},{"Add":" UnrecordError::Txn(t.0)"},{"Add":" }"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":49,"ins":{"up_context":[{"change":22,"pos":231881}],"down_context":[{"change":22,"pos":8670}],"flag":"BLOCK","start":22525,"end":22585,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":231881},"to":{"change":22,"start":8615,"end":8670},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":") -> Result> {"}],"del_contents":[{"Del":") -> Result> {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":53,"ins":{"up_context":[{"change":22,"pos":8768}],"down_context":[{"change":22,"pos":232023}],"flag":"BLOCK","start":22586,"end":22650,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":22,"pos":8768},"to":{"change":22,"start":231960,"end":232023},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":231960},"to":{"change":22,"start":231960,"end":232023},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" let change_id = if let Some(h) = txn.get_internal(*hash)? {"}],"del_contents":[{"Del":" let change_id = if let Some(h) = txn.get_internal(*hash) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":58,"ins":{"up_context":[{"change":22,"pos":232079}],"down_context":[{"change":22,"pos":232148}],"flag":"BLOCK","start":22651,"end":22721,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":232079},"to":{"change":22,"start":232079,"end":232148},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" let unused = unused_in_other_channels(txn, &channel, change_id)?;"}],"del_contents":[{"Del":" let unused = unused_in_other_channels(txn, &channel, change_id);\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":66,"ins":{"up_context":[{"change":22,"pos":232331}],"down_context":[{"change":22,"pos":232522}],"flag":"BLOCK","start":22722,"end":22914,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":232331},"to":{"change":22,"start":232331,"end":232391},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":232391},"to":{"change":22,"start":8834,"end":9062},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" assert!(txn.get_revdep(change_id, None)?.is_none());"},{"Add":" while txn.del_dep(change_id, None)? {}"},{"Add":" txn.del_external(change_id, None)?;"},{"Add":" txn.del_internal(*hash, None)?;"}],"del_contents":[{"Del":" assert!(txn.get_revdep(change_id, None).is_none());\n"},{"Del":" while txn.del_dep(change_id, None).map_err(UnrecordError::Txn)? {}\n txn.del_external(change_id, None)\n .map_err(UnrecordError::Txn)?;\n txn.del_internal(*hash, None).map_err(UnrecordError::Txn)?;\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":71,"ins":{"up_context":[{"change":22,"pos":232570}],"down_context":[{"change":22,"pos":232676}],"flag":"BLOCK","start":22915,"end":23022,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":232570},"to":{"change":22,"start":232570,"end":232625},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":232625},"to":{"change":22,"start":9063,"end":9159},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" let dep = txn.get_internal(*dep)?.unwrap();"},{"Add":" txn.del_revdep(dep, Some(change_id))?;"}],"del_contents":[{"Del":" let dep = txn.get_internal(*dep).unwrap();\n"},{"Del":" txn.del_revdep(dep, Some(change_id))\n .map_err(UnrecordError::Txn)?;\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":80,"ins":{"up_context":[{"change":22,"pos":9161}],"down_context":[{"change":22,"pos":232833}],"flag":"BLOCK","start":23023,"end":23146,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":9161},"to":{"change":22,"start":9161,"end":9213},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":"fn del_channel_changes<"},{"Add":" T: ChannelMutTxnT + DepsTxnT::GraphError>,"},{"Add":" P: ChangeStore,"},{"Add":">("}],"del_contents":[{"Del":"fn del_channel_changes(\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":87,"ins":{"up_context":[{"change":22,"pos":232905}],"down_context":[{"change":22,"pos":233031}],"flag":"BLOCK","start":23147,"end":23299,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":232905},"to":{"change":22,"start":9214,"end":9267},"introduced_by":22},{"previous":"","flag":"DELETED","from":{"change":22,"pos":9267},"to":{"change":22,"start":232938,"end":233031},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":232938},"to":{"change":22,"start":232938,"end":233031},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":") -> Result<(), UnrecordError> {"},{"Add":" let timestamp = if let Some(ts) = txn.get_changeset(&channel.changes, change_id, None)? {"}],"del_contents":[{"Del":") -> Result<(), UnrecordError> {\n"},{"Del":" let timestamp = if let Some(ts) = txn.get_changeset(&channel.changes, change_id, None) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":94,"ins":{"up_context":[{"change":22,"pos":233133}],"down_context":[{"change":22,"pos":233180}],"flag":"BLOCK","start":23300,"end":23368,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":233133},"to":{"change":22,"start":233133,"end":233180},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" for x in txn.iter_revdep(change_id)? {"},{"Add":" let (p, d) = x?;"}],"del_contents":[{"Del":" for (p, d) in txn.iter_revdep(change_id) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":101,"ins":{"up_context":[{"change":22,"pos":233292}],"down_context":[{"change":22,"pos":9344}],"flag":"BLOCK","start":23369,"end":23438,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":233292},"to":{"change":22,"start":233292,"end":233360},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" if txn.get_changeset(&channel.changes, d, None)?.is_some() {"}],"del_contents":[{"Del":" if txn.get_changeset(&channel.changes, d, None).is_some() {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":106,"ins":{"up_context":[{"change":22,"pos":233453}],"down_context":[{"change":22,"pos":233506}],"flag":"BLOCK","start":23439,"end":23492,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":233453},"to":{"change":22,"start":9420,"end":9510},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" txn.del_changes(channel, change_id, timestamp)?;"}],"del_contents":[{"Del":" txn.del_changes(channel, change_id, timestamp)\n .map_err(UnrecordError::Txn)?;\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":114,"ins":{"up_context":[{"change":22,"pos":233683}],"down_context":[{"change":22,"pos":233695}],"flag":"BLOCK","start":23493,"end":23536,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":233683},"to":{"change":22,"start":233683,"end":233695},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":") -> Result> {"}],"del_contents":[{"Del":") -> bool {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":116,"ins":{"up_context":[{"change":22,"pos":233731}],"down_context":[{"change":22,"pos":233769}],"flag":"BLOCK","start":23537,"end":23598,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":233731},"to":{"change":22,"start":233731,"end":233769},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" for br in txn.iter_channels(\"\")? {"},{"Add":" let br = br?;"}],"del_contents":[{"Del":" for br in txn.iter_channels(\"\") {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":119,"ins":{"up_context":[{"change":22,"pos":233799}],"down_context":[{"change":22,"pos":233955}],"flag":"BLOCK","start":23599,"end":23728,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":233799},"to":{"change":22,"start":1844,"end":1968},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" if br.name != channel.name && txn.get_changeset(&br.changes, change_id, None)?.is_some() {"},{"Add":" return Ok(false);"}],"del_contents":[{"Del":" if br.name != channel.name && txn.get_changeset(&br.changes, change_id, None).is_some() {\n return false;\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":123,"ins":{"up_context":[{"change":22,"pos":233971}],"down_context":[{"change":22,"pos":233980}],"flag":"BLOCK","start":23729,"end":23742,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":233971},"to":{"change":22,"start":233971,"end":233980},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" Ok(true)"}],"del_contents":[{"Del":" true\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":126,"ins":{"up_context":[{"change":22,"pos":9514}],"down_context":[{"change":22,"pos":234077}],"flag":"BLOCK","start":23743,"end":23857,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":22,"pos":9514},"to":{"change":22,"start":234037,"end":234077},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":234037},"to":{"change":22,"start":234037,"end":234077},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":"fn unapply<"},{"Add":" T: ChannelMutTxnT + TreeMutTxnT::GraphError>,"},{"Add":" C: ChangeStore,"},{"Add":">("}],"del_contents":[{"Del":"fn unapply(\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":135,"ins":{"up_context":[{"change":22,"pos":234187}],"down_context":[{"change":22,"pos":234220}],"flag":"BLOCK","start":23858,"end":23916,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":234187},"to":{"change":22,"start":9515,"end":9568},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":") -> Result<(), UnrecordError> {"}],"del_contents":[{"Del":") -> Result<(), UnrecordError> {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":140,"ins":{"up_context":[{"change":22,"pos":234399}],"down_context":[{"change":22,"pos":234542}],"flag":"BLOCK","start":23917,"end":24151,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":234399},"to":{"change":22,"start":234399,"end":234542},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" Atom::EdgeMap(ref newedges) => unapply_edges("},{"Add":" changes,"},{"Add":" txn,"},{"Add":" &mut channel.graph,"},{"Add":" change_id,"},{"Add":" newedges,"},{"Add":" &mut ws,"},{"Add":" )?,"}],"del_contents":[{"Del":" Atom::EdgeMap(ref newedges) => {\n unapply_edges(changes, txn, channel, change_id, newedges, &mut ws)?\n }\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":152,"ins":{"up_context":[{"change":22,"pos":234733}],"down_context":[{"change":22,"pos":7433}],"flag":"BLOCK","start":24152,"end":24196,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":234733},"to":{"change":22,"start":234733,"end":234766},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" &mut channel.graph,"}],"del_contents":[{"Del":" channel,\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":154,"ins":{"up_context":[{"change":22,"pos":7506}],"down_context":[{"change":22,"pos":234862}],"flag":"BLOCK","start":24197,"end":24220,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":7506},"to":{"change":22,"start":9569,"end":9642},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" )?"}],"del_contents":[{"Del":" )\n .map_err(UnrecordError::Txn)?;\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":156,"ins":{"up_context":[{"change":22,"pos":234880}],"down_context":[{"change":22,"pos":234960}],"flag":"BLOCK","start":24221,"end":24320,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":234880},"to":{"change":22,"start":9643,"end":9731},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" unapply_newvertex::(txn, &mut channel.graph, change_id, &mut ws, newvertex)?"}],"del_contents":[{"Del":" unapply_newvertex::(txn, channel, change_id, &mut ws, newvertex)?\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":160,"ins":{"up_context":[{"change":22,"pos":234990}],"down_context":[{"change":22,"pos":235104}],"flag":"BLOCK","start":24321,"end":24406,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":234990},"to":{"change":21,"start":40,"end":114},"introduced_by":21}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" repair_newvertex_contexts::(txn, &mut channel.graph, &mut ws, change_id)?;"}],"del_contents":[{"Del":" repair_newvertex_contexts::(txn, channel, &mut ws, change_id)?;\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":163,"ins":{"up_context":[{"change":22,"pos":2017}],"down_context":[{"change":22,"pos":2074}],"flag":"BLOCK","start":24407,"end":24492,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":2017},"to":{"change":21,"start":115,"end":189},"introduced_by":21}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" remove_zombies::<_, C>(txn, &mut channel.graph, &mut ws, change_id, n)?;"}],"del_contents":[{"Del":" remove_zombies::<_, C>(txn, channel, &mut ws, change_id, n)?;\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":167,"ins":{"up_context":[{"change":22,"pos":2154}],"down_context":[{"change":22,"pos":2179}],"flag":"BLOCK","start":24493,"end":24529,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":2154},"to":{"change":22,"start":2154,"end":2179},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" &mut channel.graph,"}],"del_contents":[{"Del":" channel,\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":188,"ins":{"up_context":[{"change":22,"pos":958}],"down_context":[{"change":22,"pos":1086}],"flag":"BLOCK","start":24530,"end":24609,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":958},"to":{"change":22,"start":958,"end":1086},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" working_copy::undo_file_addition(txn, change_id, new_vertex)?;"}],"del_contents":[{"Del":" working_copy::undo_file_addition(txn, change_id, new_vertex)\n .map_err(UnrecordError::Txn)?;\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":194,"ins":{"up_context":[{"change":22,"pos":1137}],"down_context":[{"change":22,"pos":235674}],"flag":"BLOCK","start":24610,"end":24789,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":1137},"to":{"change":21,"start":190,"end":347},"introduced_by":21}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" crate::apply::clean_obsolete_pseudo_edges(txn, &mut channel.graph, &mut ws.apply, change_id)?;"},{"Add":" crate::apply::repair_cyclic_paths(txn, &mut channel.graph, &mut ws.apply)?;"}],"del_contents":[{"Del":" crate::apply::clean_obsolete_pseudo_edges(txn, channel, &mut ws.apply, change_id)?;\n crate::apply::repair_cyclic_paths(txn, channel, &mut ws.apply)?;\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":211,"ins":{"up_context":[{"change":22,"pos":235980}],"down_context":[{"change":22,"pos":236239}],"flag":"BLOCK","start":24790,"end":24845,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":236205},"to":{"change":22,"start":9862,"end":9912},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":"fn unapply_newvertex("}],"del_contents":[{"Del":"fn unapply_newvertex(\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":213,"ins":{"up_context":[{"change":22,"pos":236256}],"down_context":[{"change":22,"pos":236286}],"flag":"BLOCK","start":24846,"end":24874,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":236256},"to":{"change":22,"start":236256,"end":236286},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" channel: &mut T::Graph,"}],"del_contents":[{"Del":" channel: &mut Channel,\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":217,"ins":{"up_context":[{"change":22,"pos":236377}],"down_context":[{"change":22,"pos":236410}],"flag":"BLOCK","start":24875,"end":24933,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":236377},"to":{"change":22,"start":9913,"end":9966},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":") -> Result<(), UnrecordError> {"}],"del_contents":[{"Del":") -> Result<(), UnrecordError> {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":225,"ins":{"up_context":[{"change":22,"pos":237225}],"down_context":[{"change":22,"pos":237317}],"flag":"BLOCK","start":24934,"end":25013,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":237225},"to":{"change":21,"start":611,"end":665},"introduced_by":21}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" for e in iter_adj_all(txn, channel, vertex)? {"},{"Add":" let e = e?;"}],"del_contents":[{"Del":" for e in iter_adj_all(txn, channel, vertex) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":256,"ins":{"up_context":[{"change":21,"pos":1166}],"down_context":[{"change":21,"pos":1214}],"flag":"BLOCK","start":25014,"end":25067,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":21,"pos":1166},"to":{"change":21,"start":1166,"end":1214},"introduced_by":21}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" fn perform_del("}],"del_contents":[{"Del":" fn perform_del(\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":259,"ins":{"up_context":[{"change":21,"pos":1254}],"down_context":[{"change":21,"pos":1288}],"flag":"BLOCK","start":25068,"end":25100,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":21,"pos":1254},"to":{"change":21,"start":1254,"end":1288},"introduced_by":21}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" channel: &mut T::Graph,"}],"del_contents":[{"Del":" channel: &mut Channel,\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":261,"ins":{"up_context":[{"change":21,"pos":1322}],"down_context":[{"change":21,"pos":1379}],"flag":"BLOCK","start":25101,"end":25163,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":21,"pos":1322},"to":{"change":21,"start":1322,"end":1379},"introduced_by":21}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" ) -> Result<(), UnrecordError> {"}],"del_contents":[{"Del":" ) -> Result<(), UnrecordError> {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":275,"ins":{"up_context":[{"change":22,"pos":8203}],"down_context":[{"change":22,"pos":238504}],"flag":"BLOCK","start":25164,"end":25180,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":8203},"to":{"change":22,"start":9967,"end":10024},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" )?;"}],"del_contents":[{"Del":" )\n .map_err(UnrecordError::Txn)?;\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":281,"ins":{"up_context":[{"change":22,"pos":238934}],"down_context":[{"change":22,"pos":238976}],"flag":"BLOCK","start":25181,"end":25244,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":238934},"to":{"change":22,"start":10125,"end":10183},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":"fn repair_newvertex_contexts("}],"del_contents":[{"Del":"fn repair_newvertex_contexts(\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":283,"ins":{"up_context":[{"change":22,"pos":238993}],"down_context":[{"change":22,"pos":239023}],"flag":"BLOCK","start":25245,"end":25273,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":238993},"to":{"change":22,"start":238993,"end":239023},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" channel: &mut T::Graph,"}],"del_contents":[{"Del":" channel: &mut Channel,\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":286,"ins":{"up_context":[{"change":21,"pos":1508}],"down_context":[{"change":22,"pos":239080}],"flag":"BLOCK","start":25274,"end":25332,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":21,"pos":1508},"to":{"change":22,"start":10184,"end":10237},"introduced_by":21},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":239047},"to":{"change":22,"start":10184,"end":10237},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":") -> Result<(), UnrecordError> {"}],"del_contents":[{"Del":") -> Result<(), UnrecordError> {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":289,"ins":{"up_context":[{"change":22,"pos":239152}],"down_context":[{"change":22,"pos":239191}],"flag":"BLOCK","start":25333,"end":25374,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":239152},"to":{"change":22,"start":8220,"end":8260},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" if is_alive(txn, channel, up)? {"}],"del_contents":[{"Del":" if is_alive(txn, channel, up) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":309,"ins":{"up_context":[{"change":22,"pos":239740}],"down_context":[{"change":22,"pos":8316}],"flag":"BLOCK","start":25375,"end":25422,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":239740},"to":{"change":22,"start":239740,"end":239752},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" )? {"},{"Add":" let parent = parent?;"}],"del_contents":[{"Del":" ) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":312,"ins":{"up_context":[{"change":22,"pos":8385}],"down_context":[{"change":21,"pos":1553}],"flag":"BLOCK","start":25423,"end":25473,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":8385},"to":{"change":22,"start":8385,"end":8434},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" if !is_alive(txn, channel, parent)? {"}],"del_contents":[{"Del":" if !is_alive(txn, channel, parent) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":332,"ins":{"up_context":[{"change":22,"pos":10239}],"down_context":[{"change":22,"pos":240406}],"flag":"BLOCK","start":25474,"end":25525,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":22,"pos":10239},"to":{"change":22,"start":240360,"end":240406},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":240360},"to":{"change":22,"start":240360,"end":240406},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":"fn unapply_edges("}],"del_contents":[{"Del":"fn unapply_edges(\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":335,"ins":{"up_context":[{"change":22,"pos":240440}],"down_context":[{"change":22,"pos":240470}],"flag":"BLOCK","start":25526,"end":25554,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":240440},"to":{"change":22,"start":240440,"end":240470},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" channel: &mut T::Graph,"}],"del_contents":[{"Del":" channel: &mut Channel,\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":339,"ins":{"up_context":[{"change":22,"pos":240557}],"down_context":[{"change":22,"pos":240590}],"flag":"BLOCK","start":25555,"end":25613,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":240557},"to":{"change":22,"start":10240,"end":10293},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":") -> Result<(), UnrecordError> {"}],"del_contents":[{"Del":") -> Result<(), UnrecordError> {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":341,"ins":{"up_context":[{"change":22,"pos":240632}],"down_context":[{"change":22,"pos":240757}],"flag":"BLOCK","start":25614,"end":25667,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":240632},"to":{"change":22,"start":240632,"end":240684},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" let ext = txn.get_external(change_id)?.unwrap();"}],"del_contents":[{"Del":" let ext = txn.get_external(change_id).unwrap();\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":343,"ins":{"up_context":[{"change":22,"pos":240797}],"down_context":[{"change":22,"pos":240940}],"flag":"BLOCK","start":25668,"end":25745,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":240797},"to":{"change":21,"start":1710,"end":1786},"introduced_by":21}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" let intro = internal(txn, &edge.introduced_by, change_id)?.unwrap();"}],"del_contents":[{"Del":" let intro = internal(txn, &edge.introduced_by, change_id).unwrap();\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":359,"ins":{"up_context":[{"change":22,"pos":241975}],"down_context":[{"change":22,"pos":242021}],"flag":"BLOCK","start":25746,"end":25797,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":241975},"to":{"change":22,"start":241975,"end":242021},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":"fn must_reintroduce("}],"del_contents":[{"Del":"fn must_reintroduce(\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":361,"ins":{"up_context":[{"change":22,"pos":242034}],"down_context":[{"change":22,"pos":242060}],"flag":"BLOCK","start":25798,"end":25822,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":242034},"to":{"change":22,"start":242034,"end":242060},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" channel: &T::Graph,"}],"del_contents":[{"Del":" channel: &Channel,\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":368,"ins":{"up_context":[{"change":21,"pos":1958}],"down_context":[{"change":22,"pos":242203}],"flag":"BLOCK","start":25823,"end":25883,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":21,"pos":1958},"to":{"change":22,"start":10378,"end":10444},"introduced_by":21},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":242168},"to":{"change":22,"start":10378,"end":10444},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":") -> Result> {"}],"del_contents":[{"Del":") -> Result> {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":373,"ins":{"up_context":[{"change":22,"pos":242373}],"down_context":[{"change":22,"pos":242417}],"flag":"BLOCK","start":25884,"end":25929,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":242373},"to":{"change":22,"start":242373,"end":242417},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" change: txn.get_external(b.change)?,"}],"del_contents":[{"Del":" change: txn.get_external(b.change),\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":377,"ins":{"up_context":[{"change":22,"pos":242478}],"down_context":[{"change":21,"pos":2186}],"flag":"BLOCK","start":25930,"end":26209,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":242478},"to":{"change":21,"start":1959,"end":2185},"introduced_by":21},{"previous":"","flag":"DELETED","from":{"change":21,"pos":2185},"to":{"change":22,"start":8706,"end":8715},"introduced_by":21},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":8706},"to":{"change":22,"start":8706,"end":8715},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" for e in iter_adj_all(txn, channel, a)? {"},{"Add":" let e = e?;"},{"Add":" if e.flag.contains(EdgeFlags::PARENT)"},{"Add":" || e.dest != b.start_pos()"},{"Add":" || e.introduced_by.is_root()"},{"Add":" || e.introduced_by == current_id"},{"Add":" {"},{"Add":" continue;"},{"Add":" }"}],"del_contents":[{"Del":" for e in iter_adj_all(txn, channel, a).filter(|e| {\n !e.flag.contains(EdgeFlags::PARENT)\n && e.dest == b.start_pos()\n && !e.introduced_by.is_root()\n && e.introduced_by != current_id\n"},{"Del":" }) {\n"}]}},{"Edit":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":396,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":243261},"to":{"change":22,"start":10445,"end":10501},"introduced_by":22}],"inode":{"change":22,"pos":231493}}},"contents":[{"Del":" .map_err(crate::apply::ApplyError::Changestore)\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":398,"ins":{"up_context":[{"change":22,"pos":243264}],"down_context":[{"change":22,"pos":243312}],"flag":"BLOCK","start":26210,"end":26263,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":243264},"to":{"change":22,"start":243264,"end":243312},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":"fn edge_is_in_channel("}],"del_contents":[{"Del":"fn edge_is_in_channel(\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":404,"ins":{"up_context":[{"change":22,"pos":243431}],"down_context":[{"change":22,"pos":243466}],"flag":"BLOCK","start":26264,"end":26324,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":243431},"to":{"change":22,"start":10502,"end":10532},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":") -> Result> {"}],"del_contents":[{"Del":") -> Result {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":411,"ins":{"up_context":[{"change":22,"pos":243640}],"down_context":[{"change":22,"pos":243728}],"flag":"BLOCK","start":26325,"end":26492,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":243640},"to":{"change":22,"start":243640,"end":243728},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" for next in changes"},{"Add":" .change_deletes_position(|c| txn.get_external(c).unwrap(), s, pos)"},{"Add":" .map_err(UnrecordError::Changestore)?"},{"Add":" {"}],"del_contents":[{"Del":" for next in changes.change_deletes_position(|c| txn.get_external(c), s, pos)? {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":417,"ins":{"up_context":[{"change":22,"pos":243801}],"down_context":[{"change":22,"pos":243862}],"flag":"BLOCK","start":26493,"end":26555,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":243801},"to":{"change":22,"start":243801,"end":243862},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" } else if let Some(i) = txn.get_internal(next)? {"}],"del_contents":[{"Del":" } else if let Some(i) = txn.get_internal(next) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":425,"ins":{"up_context":[{"change":22,"pos":243938}],"down_context":[{"change":22,"pos":243969}],"flag":"BLOCK","start":26556,"end":26608,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":243938},"to":{"change":22,"start":10533,"end":10580},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":"fn remove_zombies("}],"del_contents":[{"Del":"fn remove_zombies(\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":427,"ins":{"up_context":[{"change":22,"pos":243986}],"down_context":[{"change":21,"pos":2508}],"flag":"BLOCK","start":26609,"end":26637,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":243986},"to":{"change":22,"start":243986,"end":244016},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" channel: &mut T::Graph,"}],"del_contents":[{"Del":" channel: &mut Channel,\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":431,"ins":{"up_context":[{"change":22,"pos":244079}],"down_context":[{"change":22,"pos":244208}],"flag":"BLOCK","start":26638,"end":26696,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":244079},"to":{"change":22,"start":10581,"end":10634},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":") -> Result<(), UnrecordError> {"}],"del_contents":[{"Del":") -> Result<(), UnrecordError> {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":441,"ins":{"up_context":[{"change":21,"pos":2745}],"down_context":[{"change":22,"pos":246602}],"flag":"BLOCK","start":26697,"end":26779,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":21,"pos":2745},"to":{"change":21,"start":2745,"end":2876},"introduced_by":21}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" del_graph_with_rev(txn, channel, e.flag, u, v, e.introduced_by)?;"}],"del_contents":[{"Del":" del_graph_with_rev(txn, channel, e.flag, u, v, e.introduced_by)\n .map_err(UnrecordError::Txn)?;\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":444,"ins":{"up_context":[{"change":22,"pos":9860}],"down_context":[{"change":22,"pos":246762}],"flag":"BLOCK","start":26780,"end":26862,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":9860},"to":{"change":22,"start":10829,"end":10960},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" del_graph_with_rev(txn, channel, e.flag, v, w, e.introduced_by)?;"}],"del_contents":[{"Del":" del_graph_with_rev(txn, channel, e.flag, v, w, e.introduced_by)\n .map_err(UnrecordError::Txn)?;\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":451,"ins":{"up_context":[{"change":22,"pos":246806}],"down_context":[{"change":21,"pos":2953}],"flag":"BLOCK","start":26863,"end":26934,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":246806},"to":{"change":21,"start":2877,"end":2953},"introduced_by":21}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":"fn collect_zombies("},{"Add":" txn: &T,"},{"Add":" channel: &T::Graph,"}],"del_contents":[{"Del":"fn collect_zombies(\n txn: &mut T,\n channel: &mut Channel,\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":457,"ins":{"up_context":[{"change":21,"pos":3030}],"down_context":[{"change":21,"pos":3060}],"flag":"BLOCK","start":26935,"end":26980,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":21,"pos":3030},"to":{"change":21,"start":3030,"end":3060},"introduced_by":21}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":") -> Result<(), BlockError> {"}],"del_contents":[{"Del":") -> Result<(), BlockError> {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":464,"ins":{"up_context":[{"change":21,"pos":3265}],"down_context":[{"change":21,"pos":3314}],"flag":"BLOCK","start":26981,"end":27055,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":21,"pos":3265},"to":{"change":21,"start":3265,"end":3314},"introduced_by":21}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" for e in iter_adj_all(txn, channel, v)? {"},{"Add":" let e = e?;"}],"del_contents":[{"Del":" for e in iter_adj_all(txn, channel, v) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":485,"ins":{"up_context":[{"change":21,"pos":3886}],"down_context":[{"change":22,"pos":246914}],"flag":"BLOCK","start":27056,"end":27114,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":21,"pos":3886},"to":{"change":22,"start":246861,"end":246914},"introduced_by":21},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":246861},"to":{"change":22,"start":246861,"end":246914},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":"fn repair_edges_context("}],"del_contents":[{"Del":"fn repair_edges_context(\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":488,"ins":{"up_context":[{"change":22,"pos":246948}],"down_context":[{"change":22,"pos":246978}],"flag":"BLOCK","start":27115,"end":27143,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":246948},"to":{"change":22,"start":246948,"end":246978},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" channel: &mut T::Graph,"}],"del_contents":[{"Del":" channel: &mut Channel,\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":492,"ins":{"up_context":[{"change":22,"pos":247082}],"down_context":[{"change":22,"pos":247175}],"flag":"BLOCK","start":27144,"end":27263,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":247082},"to":{"change":22,"start":10961,"end":11014},"introduced_by":22},{"previous":"","flag":"DELETED","from":{"change":22,"pos":11014},"to":{"change":22,"start":247115,"end":247175},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":247115},"to":{"change":22,"start":247115,"end":247175},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":") -> Result<(), UnrecordError> {"},{"Add":" let change_hash = txn.get_external(change_id)?.unwrap();"}],"del_contents":[{"Del":") -> Result<(), UnrecordError> {\n"},{"Del":" let change_hash = txn.get_external(change_id).unwrap();\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":496,"ins":{"up_context":[{"change":22,"pos":247259}],"down_context":[{"change":21,"pos":3960}],"flag":"BLOCK","start":27264,"end":27338,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":247259},"to":{"change":21,"start":3887,"end":3960},"introduced_by":21}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" let intro = internal(txn, &e.introduced_by, change_id)?.unwrap();"}],"del_contents":[{"Del":" let intro = internal(txn, &e.introduced_by, change_id).unwrap();\n"}]}},{"Replacement":{"inode":{"change":22,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":511,"ins":{"up_context":[{"change":22,"pos":10222}],"down_context":[{"change":22,"pos":248246}],"flag":"BLOCK","start":27339,"end":27385,"inode":{"change":22,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":10222},"to":{"change":22,"start":10222,"end":10267},"introduced_by":22}],"inode":{"change":22,"pos":231493}},"ins_contents":[{"Add":" if !is_alive(txn, channel, to)? {"}],"del_contents":[{"Del":" if !is_alive(txn, channel, to) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":128,"ins":{"up_context":[{"change":22,"pos":252619}],"down_context":[{"change":22,"pos":252654}],"flag":"BLOCK","start":27386,"end":27421,"inode":{"change":22,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":252619},"to":{"change":22,"start":252619,"end":252654},"introduced_by":22}],"inode":{"change":22,"pos":248807}},"ins_contents":[{"Add":" .map(|n| n.unwrap().1)"}],"del_contents":[{"Del":" .map(|(_, name)| name)\n"}]}},{"Replacement":{"inode":{"change":22,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":137,"ins":{"up_context":[{"change":22,"pos":252958}],"down_context":[{"change":22,"pos":252993}],"flag":"BLOCK","start":27422,"end":27457,"inode":{"change":22,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":252958},"to":{"change":22,"start":252958,"end":252993},"introduced_by":22}],"inode":{"change":22,"pos":248807}},"ins_contents":[{"Add":" .map(|n| n.unwrap().1)"}],"del_contents":[{"Del":" .map(|(_, name)| name)\n"}]}},{"Replacement":{"inode":{"change":22,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":314,"ins":{"up_context":[{"change":22,"pos":258535}],"down_context":[{"change":22,"pos":258593}],"flag":"BLOCK","start":27458,"end":27533,"inode":{"change":22,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":258535},"to":{"change":22,"start":10861,"end":10921},"introduced_by":22}],"inode":{"change":22,"pos":248807}},"ins_contents":[{"Add":" let (alive_, reachable_) = check_alive(&txn, &channel.borrow().graph);"}],"del_contents":[{"Del":" let (alive_, reachable_) = check_alive(&txn, &channel);\n"}]}},{"Replacement":{"inode":{"change":22,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":399,"ins":{"up_context":[{"change":22,"pos":261132}],"down_context":[{"change":22,"pos":261190}],"flag":"BLOCK","start":27534,"end":27609,"inode":{"change":22,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":261132},"to":{"change":22,"start":11125,"end":11185},"introduced_by":22}],"inode":{"change":22,"pos":248807}},"ins_contents":[{"Add":" let (alive_, reachable_) = check_alive(&txn, &channel.borrow().graph);"}],"del_contents":[{"Del":" let (alive_, reachable_) = check_alive(&txn, &channel);\n"}]}},{"Replacement":{"inode":{"change":22,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":449,"ins":{"up_context":[{"change":22,"pos":262885}],"down_context":[{"change":22,"pos":262930}],"flag":"BLOCK","start":27610,"end":27664,"inode":{"change":22,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":262885},"to":{"change":22,"start":262885,"end":262930},"introduced_by":22}],"inode":{"change":22,"pos":248807}},"ins_contents":[{"Add":" for p in txn.log(&channel.borrow(), 0).unwrap() {"}],"del_contents":[{"Del":" for p in txn.log(&channel.borrow(), 0) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":457,"ins":{"up_context":[{"change":22,"pos":263107}],"down_context":[{"change":22,"pos":263152}],"flag":"BLOCK","start":27665,"end":27719,"inode":{"change":22,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":263107},"to":{"change":22,"start":263107,"end":263152},"introduced_by":22}],"inode":{"change":22,"pos":248807}},"ins_contents":[{"Add":" for p in txn.log(&channel.borrow(), 0).unwrap() {"}],"del_contents":[{"Del":" for p in txn.log(&channel.borrow(), 0) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":938,"ins":{"up_context":[{"change":22,"pos":1754}],"down_context":[{"change":22,"pos":1794}],"flag":"BLOCK","start":27720,"end":27769,"inode":{"change":22,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":1754},"to":{"change":22,"start":1754,"end":1794},"introduced_by":22}],"inode":{"change":22,"pos":248807}},"ins_contents":[{"Add":" let mut inodes = txn.iter_inodes().unwrap();"}],"del_contents":[{"Del":" let mut inodes = txn.iter_inodes();\n"}]}},{"Replacement":{"inode":{"change":22,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":53,"ins":{"up_context":[{"change":22,"pos":279859}],"down_context":[{"change":22,"pos":279923}],"flag":"BLOCK","start":27770,"end":27843,"inode":{"change":22,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":279859},"to":{"change":22,"start":279859,"end":279923},"introduced_by":22}],"inode":{"change":22,"pos":278146}},"ins_contents":[{"Add":" let m = txn.cursor_graph(&channel.graph, None).unwrap().count();"}],"del_contents":[{"Del":" let m = txn.cursor_graph(&channel.graph, None).count();\n"}]}},{"Replacement":{"inode":{"change":22,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":136,"ins":{"up_context":[{"change":22,"pos":282440}],"down_context":[{"change":22,"pos":282504}],"flag":"BLOCK","start":27844,"end":27917,"inode":{"change":22,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":282440},"to":{"change":22,"start":282440,"end":282504},"introduced_by":22}],"inode":{"change":22,"pos":278146}},"ins_contents":[{"Add":" let m = txn.cursor_graph(&channel.graph, None).unwrap().count();"}],"del_contents":[{"Del":" let m = txn.cursor_graph(&channel.graph, None).count();\n"}]}},{"Replacement":{"inode":{"change":22,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":145,"ins":{"up_context":[{"change":22,"pos":282737}],"down_context":[{"change":22,"pos":282801}],"flag":"BLOCK","start":27918,"end":27991,"inode":{"change":22,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":282737},"to":{"change":22,"start":282737,"end":282801},"introduced_by":22}],"inode":{"change":22,"pos":278146}},"ins_contents":[{"Add":" let m = txn.cursor_graph(&channel.graph, None).unwrap().count();"}],"del_contents":[{"Del":" let m = txn.cursor_graph(&channel.graph, None).count();\n"}]}},{"Replacement":{"inode":{"change":22,"pos":285224},"path":"libpijul/src/tests/partial.rs","line":35,"ins":{"up_context":[{"change":22,"pos":286507}],"down_context":[{"change":22,"pos":286648}],"flag":"BLOCK","start":27992,"end":28223,"inode":{"change":22,"pos":285224}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":286507},"to":{"change":22,"start":286507,"end":286648},"introduced_by":22}],"inode":{"change":22,"pos":285224}},"ins_contents":[{"Add":" let key = txn.get_inodes(inode, None).unwrap().unwrap();"},{"Add":" let changes: Vec<_> = txn"},{"Add":" .log_for_path(&channel.borrow(), key, 0)"},{"Add":" .unwrap()"},{"Add":" .map(|x| x.unwrap())"},{"Add":" .collect();"}],"del_contents":[{"Del":" let key = txn.get_inodes(inode, None).unwrap();\n let changes: Vec<_> = txn.log_for_path(&channel.borrow(), key, 0).collect();\n"}]}},{"Replacement":{"inode":{"change":22,"pos":289338},"path":"libpijul/src/tests/mod.rs","line":32,"ins":{"up_context":[{"change":22,"pos":289967}],"down_context":[{"change":22,"pos":290043}],"flag":"BLOCK","start":28224,"end":28373,"inode":{"change":22,"pos":289338}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":289967},"to":{"change":22,"start":289967,"end":290043},"introduced_by":22}],"inode":{"change":22,"pos":289338}},"ins_contents":[{"Add":" state.record("},{"Add":" txn,"},{"Add":" Algorithm::default(),"},{"Add":" &mut channel.borrow_mut(),"},{"Add":" repo,"},{"Add":" store,"},{"Add":" prefix,"},{"Add":" )?;"}],"del_contents":[{"Del":" state.record(txn, Algorithm::default(), channel, repo, store, prefix)?;\n"}]}},{"Replacement":{"inode":{"change":22,"pos":289338},"path":"libpijul/src/tests/mod.rs","line":45,"ins":{"up_context":[{"change":22,"pos":290134}],"down_context":[{"change":22,"pos":290173}],"flag":"BLOCK","start":28374,"end":28422,"inode":{"change":22,"pos":289338}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":290134},"to":{"change":22,"start":290134,"end":290173},"introduced_by":22}],"inode":{"change":22,"pos":289338}},"ins_contents":[{"Add":" .map(|rec| rec.globalize(txn).unwrap())"}],"del_contents":[{"Del":" .map(|rec| rec.globalize(txn))\n"}]}},{"Replacement":{"inode":{"change":22,"pos":289338},"path":"libpijul/src/tests/mod.rs","line":62,"ins":{"up_context":[{"change":22,"pos":290724}],"down_context":[{"change":22,"pos":290731}],"flag":"BLOCK","start":28423,"end":28444,"inode":{"change":22,"pos":289338}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":290724},"to":{"change":22,"start":290724,"end":290731},"introduced_by":22}],"inode":{"change":22,"pos":289338}},"ins_contents":[{"Add":" )"},{"Add":" .unwrap();"}],"del_contents":[{"Del":" );\n"}]}},{"Replacement":{"inode":{"change":22,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":569,"ins":{"up_context":[{"change":22,"pos":322581}],"down_context":[{"change":22,"pos":322772}],"flag":"BLOCK","start":28445,"end":28691,"inode":{"change":22,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":322581},"to":{"change":22,"start":322581,"end":322772},"introduced_by":22}],"inode":{"change":22,"pos":305506}},"ins_contents":[{"Add":" for x in txn_alice"},{"Add":" .iter_tree("},{"Add":" OwnedPathId {"},{"Add":" parent_inode: Inode::ROOT,"},{"Add":" basename: crate::small_string::SmallString::new(),"},{"Add":" },"},{"Add":" None,"},{"Add":" )"},{"Add":" .unwrap()"},{"Add":" {"}],"del_contents":[{"Del":" for x in txn_alice.iter_tree(\n OwnedPathId {\n parent_inode: Inode::ROOT,\n basename: crate::small_string::SmallString::new(),\n },\n None,\n ) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1499,"ins":{"up_context":[{"change":22,"pos":352588}],"down_context":[{"change":22,"pos":352656}],"flag":"BLOCK","start":28692,"end":28777,"inode":{"change":22,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":352588},"to":{"change":22,"start":21701,"end":21771},"introduced_by":22}],"inode":{"change":22,"pos":305506}},"ins_contents":[{"Add":" let (alive, reachable) = check_alive(&txn_alice, &channel_alice.borrow().graph);"}],"del_contents":[{"Del":" let (alive, reachable) = check_alive(&txn_alice, &channel_alice);\n"}]}},{"Replacement":{"inode":{"change":22,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1124,"ins":{"up_context":[{"change":22,"pos":393790}],"down_context":[{"change":22,"pos":393826}],"flag":"BLOCK","start":28778,"end":28827,"inode":{"change":22,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":393790},"to":{"change":22,"start":393790,"end":393826},"introduced_by":22}],"inode":{"change":22,"pos":357372}},"ins_contents":[{"Add":" &mut channel_alice.borrow_mut(),"}],"del_contents":[{"Del":" &mut channel_alice,\n"}]}},{"Replacement":{"inode":{"change":22,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2335,"ins":{"up_context":[{"change":22,"pos":30412}],"down_context":[{"change":22,"pos":433556}],"flag":"BLOCK","start":28828,"end":28907,"inode":{"change":22,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":30412},"to":{"change":22,"start":30412,"end":30476},"introduced_by":22}],"inode":{"change":22,"pos":357372}},"ins_contents":[{"Add":" let (alive_, reachable_) = check_alive(&txn, &channel_bob.borrow().graph);"}],"del_contents":[{"Del":" let (alive_, reachable_) = check_alive(&txn, &channel_bob);\n"}]}},{"Replacement":{"inode":{"change":22,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2352,"ins":{"up_context":[{"change":22,"pos":30539}],"down_context":[{"change":22,"pos":434046}],"flag":"BLOCK","start":28908,"end":28985,"inode":{"change":22,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":30539},"to":{"change":22,"start":30539,"end":30601},"introduced_by":22}],"inode":{"change":22,"pos":357372}},"ins_contents":[{"Add":" let (alive, reachable) = check_alive(&txn, &channel_bob.borrow().graph);"}],"del_contents":[{"Del":" let (alive, reachable) = check_alive(&txn, &channel_bob);\n"}]}},{"Replacement":{"inode":{"change":22,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2369,"ins":{"up_context":[{"change":22,"pos":30671}],"down_context":[{"change":22,"pos":434801}],"flag":"BLOCK","start":28986,"end":29067,"inode":{"change":22,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":30671},"to":{"change":22,"start":30671,"end":30737},"introduced_by":22}],"inode":{"change":22,"pos":357372}},"ins_contents":[{"Add":" let (alive, reachable) = check_alive(&txn, &channel_charlie.borrow().graph);"}],"del_contents":[{"Del":" let (alive, reachable) = check_alive(&txn, &channel_charlie);\n"}]}},{"Replacement":{"inode":{"change":22,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2386,"ins":{"up_context":[{"change":22,"pos":435224}],"down_context":[{"change":22,"pos":435288}],"flag":"BLOCK","start":29068,"end":29149,"inode":{"change":22,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":435224},"to":{"change":22,"start":30809,"end":30875},"introduced_by":22}],"inode":{"change":22,"pos":357372}},"ins_contents":[{"Add":" let (alive, reachable) = check_alive(&txn, &channel_charlie.borrow().graph);"}],"del_contents":[{"Del":" let (alive, reachable) = check_alive(&txn, &channel_charlie);\n"}]}},{"Replacement":{"inode":{"change":22,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2465,"ins":{"up_context":[{"change":22,"pos":437747}],"down_context":[{"change":22,"pos":437815}],"flag":"BLOCK","start":29150,"end":29235,"inode":{"change":22,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":437747},"to":{"change":22,"start":31013,"end":31083},"introduced_by":22}],"inode":{"change":22,"pos":357372}},"ins_contents":[{"Add":" let (alive, reachable) = check_alive(&txn_alice, &channel_alice.borrow().graph);"}],"del_contents":[{"Del":" let (alive, reachable) = check_alive(&txn_alice, &channel_alice);\n"}]}},{"Replacement":{"inode":{"change":22,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2550,"ins":{"up_context":[{"change":22,"pos":440414}],"down_context":[{"change":22,"pos":440461}],"flag":"BLOCK","start":29236,"end":29320,"inode":{"change":22,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":440414},"to":{"change":22,"start":440414,"end":440461},"introduced_by":22}],"inode":{"change":22,"pos":357372}},"ins_contents":[{"Add":" for x in txn.iter_inodes().unwrap() {"},{"Add":" let (inode, vertex) = x.unwrap();"}],"del_contents":[{"Del":" for (inode, vertex) in txn.iter_inodes() {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2555,"ins":{"up_context":[{"change":22,"pos":440589}],"down_context":[{"change":22,"pos":440653}],"flag":"BLOCK","start":29321,"end":29394,"inode":{"change":22,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":440589},"to":{"change":22,"start":440589,"end":440653},"introduced_by":22}],"inode":{"change":22,"pos":357372}},"ins_contents":[{"Add":" if let Some(next) = txn.get_revtree(inode_, None).unwrap() {"}],"del_contents":[{"Del":" if let Some(next) = txn.get_revtree(inode_, None) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2562,"ins":{"up_context":[{"change":22,"pos":440857}],"down_context":[{"change":22,"pos":31350}],"flag":"BLOCK","start":29395,"end":29471,"inode":{"change":22,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":440857},"to":{"change":22,"start":31289,"end":31350},"introduced_by":22}],"inode":{"change":22,"pos":357372}},"ins_contents":[{"Add":" if !is_alive(txn, &channel.graph, vertex.inode_vertex()).unwrap() {"}],"del_contents":[{"Del":" if !is_alive(txn, &channel, vertex.inode_vertex()) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2565,"ins":{"up_context":[{"change":22,"pos":31407}],"down_context":[{"change":22,"pos":440983}],"flag":"BLOCK","start":29472,"end":29504,"inode":{"change":22,"pos":357372}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":22,"pos":31407},"to":{"change":22,"start":440957,"end":440983},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":440957},"to":{"change":22,"start":440957,"end":440983},"introduced_by":22}],"inode":{"change":22,"pos":357372}},"ins_contents":[{"Add":" &channel.graph,"}],"del_contents":[{"Del":" &channel,\n"}]}},{"Replacement":{"inode":{"change":22,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2569,"ins":{"up_context":[{"change":22,"pos":441092}],"down_context":[{"change":22,"pos":441108}],"flag":"BLOCK","start":29505,"end":29555,"inode":{"change":22,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":441092},"to":{"change":22,"start":441092,"end":441108},"introduced_by":22}],"inode":{"change":22,"pos":357372}},"ins_contents":[{"Add":" )"},{"Add":" .unwrap()"},{"Add":" {"}],"del_contents":[{"Del":" ) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":441393},"path":"libpijul/src/tests/clone.rs","line":37,"ins":{"up_context":[{"change":22,"pos":442660}],"down_context":[{"change":22,"pos":442770}],"flag":"BLOCK","start":29556,"end":29764,"inode":{"change":22,"pos":441393}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":442660},"to":{"change":22,"start":442660,"end":442770},"introduced_by":22}],"inode":{"change":22,"pos":441393}},"ins_contents":[{"Add":" for channel in txn.iter_channels(\"\").unwrap() {"},{"Add":" let channel = channel.unwrap();"},{"Add":" for x in txn.log(&channel.borrow(), 0).unwrap() {"},{"Add":" let (_, (i, _)) = x.unwrap();"}],"del_contents":[{"Del":" for channel in txn.iter_channels(\"\") {\n for (_, (i, _)) in txn.log(&channel.borrow(), 0) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":446445},"path":"libpijul/src/tests/change.rs","line":48,"ins":{"up_context":[{"change":22,"pos":448033}],"down_context":[{"change":22,"pos":448059}],"flag":"BLOCK","start":29765,"end":29804,"inode":{"change":22,"pos":446445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":448033},"to":{"change":22,"start":448033,"end":448059},"introduced_by":22}],"inode":{"change":22,"pos":446445}},"ins_contents":[{"Add":" &mut channel.borrow_mut(),"}],"del_contents":[{"Del":" &mut channel,\n"}]}},{"Replacement":{"inode":{"change":22,"pos":446445},"path":"libpijul/src/tests/change.rs","line":58,"ins":{"up_context":[{"change":22,"pos":448245}],"down_context":[{"change":22,"pos":448285}],"flag":"BLOCK","start":29805,"end":29854,"inode":{"change":22,"pos":446445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":448245},"to":{"change":22,"start":448245,"end":448285},"introduced_by":22}],"inode":{"change":22,"pos":446445}},"ins_contents":[{"Add":" .map(|rec| rec.globalize(&txn).unwrap())"}],"del_contents":[{"Del":" .map(|rec| rec.globalize(&txn))\n"}]}},{"Replacement":{"inode":{"change":22,"pos":446445},"path":"libpijul/src/tests/change.rs","line":73,"ins":{"up_context":[{"change":22,"pos":448681}],"down_context":[{"change":22,"pos":448688}],"flag":"BLOCK","start":29855,"end":29876,"inode":{"change":22,"pos":446445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":448681},"to":{"change":22,"start":448681,"end":448688},"introduced_by":22}],"inode":{"change":22,"pos":446445}},"ins_contents":[{"Add":" )"},{"Add":" .unwrap();"}],"del_contents":[{"Del":" );\n"}]}},{"Replacement":{"inode":{"change":22,"pos":446445},"path":"libpijul/src/tests/change.rs","line":96,"ins":{"up_context":[{"change":22,"pos":449161}],"down_context":[{"change":22,"pos":449237}],"flag":"BLOCK","start":29877,"end":30026,"inode":{"change":22,"pos":446445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":449161},"to":{"change":22,"start":449161,"end":449237},"introduced_by":22}],"inode":{"change":22,"pos":446445}},"ins_contents":[{"Add":" state.record("},{"Add":" txn,"},{"Add":" Algorithm::default(),"},{"Add":" &mut channel.borrow_mut(),"},{"Add":" repo,"},{"Add":" store,"},{"Add":" prefix,"},{"Add":" )?;"}],"del_contents":[{"Del":" state.record(txn, Algorithm::default(), channel, repo, store, prefix)?;\n"}]}},{"Replacement":{"inode":{"change":22,"pos":446445},"path":"libpijul/src/tests/change.rs","line":109,"ins":{"up_context":[{"change":22,"pos":449328}],"down_context":[{"change":22,"pos":449367}],"flag":"BLOCK","start":30027,"end":30075,"inode":{"change":22,"pos":446445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":449328},"to":{"change":22,"start":449328,"end":449367},"introduced_by":22}],"inode":{"change":22,"pos":446445}},"ins_contents":[{"Add":" .map(|rec| rec.globalize(txn).unwrap())"}],"del_contents":[{"Del":" .map(|rec| rec.globalize(txn))\n"}]}},{"Replacement":{"inode":{"change":22,"pos":446445},"path":"libpijul/src/tests/change.rs","line":126,"ins":{"up_context":[{"change":22,"pos":449926}],"down_context":[{"change":22,"pos":449933}],"flag":"BLOCK","start":30076,"end":30097,"inode":{"change":22,"pos":446445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":449926},"to":{"change":22,"start":449926,"end":449933},"introduced_by":22}],"inode":{"change":22,"pos":446445}},"ins_contents":[{"Add":" )"},{"Add":" .unwrap();"}],"del_contents":[{"Del":" );\n"}]}},{"Replacement":{"inode":{"change":22,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":29,"ins":{"up_context":[{"change":22,"pos":455055}],"down_context":[{"change":22,"pos":455090}],"flag":"BLOCK","start":30098,"end":30133,"inode":{"change":22,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":455055},"to":{"change":22,"start":455055,"end":455090},"introduced_by":22}],"inode":{"change":22,"pos":454125}},"ins_contents":[{"Add":" .map(|n| n.unwrap().1)"}],"del_contents":[{"Del":" .map(|(_, name)| name)\n"}]}},{"Replacement":{"inode":{"change":22,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":33,"ins":{"up_context":[{"change":22,"pos":455167}],"down_context":[{"change":22,"pos":455225}],"flag":"BLOCK","start":30134,"end":30201,"inode":{"change":22,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":455167},"to":{"change":22,"start":455167,"end":455225},"introduced_by":22}],"inode":{"change":22,"pos":454125}},"ins_contents":[{"Add":" let channel_ = txn.load_channel(\"main\").unwrap().unwrap();"}],"del_contents":[{"Del":" let channel_ = txn.load_channel(\"main\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":22,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":35,"ins":{"up_context":[{"change":22,"pos":455266}],"down_context":[{"change":22,"pos":455413}],"flag":"BLOCK","start":30202,"end":30385,"inode":{"change":22,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":455266},"to":{"change":22,"start":455266,"end":455413},"introduced_by":22}],"inode":{"change":22,"pos":454125}},"ins_contents":[{"Add":" let mut it ="},{"Add":" crate::fs::iter_graph_children(&txn, &changes, &channel.graph, Position::ROOT).unwrap();"},{"Add":" let (key, meta, file) = it.next().unwrap().unwrap();"}],"del_contents":[{"Del":" let mut it = crate::fs::iter_graph_children(&txn, &changes, &channel, Position::ROOT);\n let (key, meta, file) = it.next().unwrap();\n"}]}},{"Replacement":{"inode":{"change":22,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":41,"ins":{"up_context":[{"change":22,"pos":455516}],"down_context":[{"change":22,"pos":455717}],"flag":"BLOCK","start":30386,"end":30626,"inode":{"change":22,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":455516},"to":{"change":22,"start":455516,"end":455717},"introduced_by":22}],"inode":{"change":22,"pos":454125}},"ins_contents":[{"Add":" let mut it = crate::fs::iter_graph_children(&txn, &changes, &channel.graph, key).unwrap();"},{"Add":" let (file_key, _, _) = it.next().unwrap().unwrap();"},{"Add":" crate::fs::iter_paths(&txn, &channel_.borrow().graph, file_key, |path| {"}],"del_contents":[{"Del":" let mut it = crate::fs::iter_graph_children(&txn, &changes, &channel, key);\n let (file_key, _, _) = it.next().unwrap();\n crate::fs::iter_paths(&txn, &channel_, file_key, |path| {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":50,"ins":{"up_context":[{"change":22,"pos":455890}],"down_context":[{"change":22,"pos":31734}],"flag":"BLOCK","start":30627,"end":30657,"inode":{"change":22,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":455890},"to":{"change":22,"start":455890,"end":455902},"introduced_by":22}],"inode":{"change":22,"pos":454125}},"ins_contents":[{"Add":" })"},{"Add":" .unwrap();"}],"del_contents":[{"Del":" });\n"}]}},{"Replacement":{"inode":{"change":22,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":54,"ins":{"up_context":[{"change":22,"pos":455960}],"down_context":[{"change":22,"pos":456088}],"flag":"BLOCK","start":30658,"end":30810,"inode":{"change":22,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":455960},"to":{"change":22,"start":455960,"end":456088},"introduced_by":22}],"inode":{"change":22,"pos":454125}},"ins_contents":[{"Add":" let mut it = crate::fs::iter_basenames(&txn, &changes, &channel.graph, key).unwrap();"},{"Add":" let (key, _, name) = it.next().unwrap().unwrap();"}],"del_contents":[{"Del":" let mut it = crate::fs::iter_basenames(&txn, &changes, &channel, key);\n let (key, _, name) = it.next().unwrap();\n"}]}},{"Replacement":{"inode":{"change":22,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":59,"ins":{"up_context":[{"change":22,"pos":456200}],"down_context":[{"change":22,"pos":456245}],"flag":"BLOCK","start":30811,"end":30865,"inode":{"change":22,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":456200},"to":{"change":22,"start":456200,"end":456245},"introduced_by":22}],"inode":{"change":22,"pos":454125}},"ins_contents":[{"Add":" assert!(txn.is_tracked(\"dir/file\").unwrap());"}],"del_contents":[{"Del":" assert!(txn.is_tracked(\"dir/file\"));\n"}]}},{"Replacement":{"inode":{"change":22,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":76,"ins":{"up_context":[{"change":22,"pos":456669}],"down_context":[{"change":22,"pos":456746}],"flag":"BLOCK","start":30866,"end":30961,"inode":{"change":22,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":456669},"to":{"change":22,"start":456669,"end":456746},"introduced_by":22}],"inode":{"change":22,"pos":454125}},"ins_contents":[{"Add":" assert!(txn.is_tracked(\"dir\").unwrap());"},{"Add":" assert!(txn.is_tracked(\"dir/file\").unwrap());"}],"del_contents":[{"Del":" assert!(txn.is_tracked(\"dir\"));\n assert!(txn.is_tracked(\"dir/file\"));\n"}]}},{"Edit":{"inode":{"change":22,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":80,"atom":{"NewVertex":{"up_context":[{"change":22,"pos":456823}],"down_context":[{"change":22,"pos":456823}],"flag":"BLOCK","start":30962,"end":30980,"inode":{"change":22,"pos":454125}}},"contents":[{"Add":" .unwrap()"}]}},{"Edit":{"inode":{"change":22,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":82,"atom":{"NewVertex":{"up_context":[{"change":22,"pos":456839}],"down_context":[{"change":22,"pos":456839}],"flag":"BLOCK","start":30981,"end":30999,"inode":{"change":22,"pos":454125}}},"contents":[{"Add":" .unwrap()"}]}},{"Replacement":{"inode":{"change":22,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":85,"ins":{"up_context":[{"change":22,"pos":456896}],"down_context":[{"change":22,"pos":456934}],"flag":"BLOCK","start":31000,"end":31047,"inode":{"change":22,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":456896},"to":{"change":22,"start":456896,"end":456934},"introduced_by":22}],"inode":{"change":22,"pos":454125}},"ins_contents":[{"Add":" assert!(txn.is_directory(inode).unwrap());"}],"del_contents":[{"Del":" assert!(txn.is_directory(inode));\n"}]}},{"Replacement":{"inode":{"change":22,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":88,"ins":{"up_context":[{"change":22,"pos":31831}],"down_context":[{"change":22,"pos":457107}],"flag":"BLOCK","start":31048,"end":31170,"inode":{"change":22,"pos":454125}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":22,"pos":31831},"to":{"change":22,"start":457003,"end":457107},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":457003},"to":{"change":22,"start":457003,"end":457107},"introduced_by":22}],"inode":{"change":22,"pos":454125}},"ins_contents":[{"Add":" let mut it = crate::fs::working_copy_children(&txn, inode).unwrap();"},{"Add":" let (name, _) = it.next().unwrap().unwrap();"}],"del_contents":[{"Del":" let mut it = crate::fs::working_copy_children(&txn, inode);\n let (name, _) = it.next().unwrap();\n"}]}},{"Replacement":{"inode":{"change":22,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":114,"ins":{"up_context":[{"change":22,"pos":457925}],"down_context":[{"change":22,"pos":457960}],"flag":"BLOCK","start":31171,"end":31206,"inode":{"change":22,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":457925},"to":{"change":22,"start":457925,"end":457960},"introduced_by":22}],"inode":{"change":22,"pos":454125}},"ins_contents":[{"Add":" .map(|f| f.unwrap().1)"}],"del_contents":[{"Del":" .map(|(_, file)| file)\n"}]}},{"Replacement":{"inode":{"change":22,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":122,"ins":{"up_context":[{"change":22,"pos":458186}],"down_context":[{"change":22,"pos":458221}],"flag":"BLOCK","start":31207,"end":31242,"inode":{"change":22,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":458186},"to":{"change":22,"start":458186,"end":458221},"introduced_by":22}],"inode":{"change":22,"pos":454125}},"ins_contents":[{"Add":" .map(|n| n.unwrap().1)"}],"del_contents":[{"Del":" .map(|(_, name)| name)\n"}]}},{"Replacement":{"inode":{"change":22,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":131,"ins":{"up_context":[{"change":22,"pos":458529}],"down_context":[{"change":22,"pos":458564}],"flag":"BLOCK","start":31243,"end":31278,"inode":{"change":22,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":458529},"to":{"change":22,"start":458529,"end":458564},"introduced_by":22}],"inode":{"change":22,"pos":454125}},"ins_contents":[{"Add":" .map(|n| n.unwrap().1)"}],"del_contents":[{"Del":" .map(|(_, name)| name)\n"}]}},{"Replacement":{"inode":{"change":22,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":139,"ins":{"up_context":[{"change":22,"pos":458778}],"down_context":[{"change":22,"pos":458876}],"flag":"BLOCK","start":31279,"end":31377,"inode":{"change":22,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":458778},"to":{"change":22,"start":458778,"end":458876},"introduced_by":22}],"inode":{"change":22,"pos":454125}},"ins_contents":[{"Add":" assert!(crate::fs::iter_working_copy(&txn, Inode::ROOT).all(|f| f.unwrap().1 != \"dir2\"));"}],"del_contents":[{"Del":" assert!(crate::fs::iter_working_copy(&txn, Inode::ROOT).all(|(_, file)| file != \"dir2\"));\n"}]}},{"Replacement":{"inode":{"change":22,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":147,"ins":{"up_context":[{"change":22,"pos":459075}],"down_context":[{"change":22,"pos":459110}],"flag":"BLOCK","start":31378,"end":31413,"inode":{"change":22,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":459075},"to":{"change":22,"start":459075,"end":459110},"introduced_by":22}],"inode":{"change":22,"pos":454125}},"ins_contents":[{"Add":" .map(|n| n.unwrap().1)"}],"del_contents":[{"Del":" .map(|(_, name)| name)\n"}]}},{"Replacement":{"inode":{"change":22,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":172,"ins":{"up_context":[{"change":22,"pos":3597}],"down_context":[{"change":22,"pos":3628}],"flag":"BLOCK","start":31414,"end":31445,"inode":{"change":22,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":3597},"to":{"change":22,"start":3597,"end":3628},"introduced_by":22}],"inode":{"change":22,"pos":454125}},"ins_contents":[{"Add":" .map(|f| f.unwrap().1)"}],"del_contents":[{"Del":" .map(|(_, file)| file)\n"}]}},{"Replacement":{"inode":{"change":22,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":186,"ins":{"up_context":[{"change":22,"pos":4203}],"down_context":[{"change":22,"pos":4234}],"flag":"BLOCK","start":31446,"end":31477,"inode":{"change":22,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":4203},"to":{"change":22,"start":4203,"end":4234},"introduced_by":22}],"inode":{"change":22,"pos":454125}},"ins_contents":[{"Add":" .map(|n| n.unwrap().1)"}],"del_contents":[{"Del":" .map(|(_, name)| name)\n"}]}},{"Replacement":{"inode":{"change":22,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":673,"ins":{"up_context":[{"change":22,"pos":475569}],"down_context":[{"change":22,"pos":475591}],"flag":"BLOCK","start":31478,"end":31513,"inode":{"change":22,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":475569},"to":{"change":22,"start":475569,"end":475591},"introduced_by":22}],"inode":{"change":22,"pos":454125}},"ins_contents":[{"Add":" &mut channel.borrow_mut(),"}],"del_contents":[{"Del":" &mut channel,\n"}]}},{"Replacement":{"inode":{"change":22,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":682,"ins":{"up_context":[{"change":22,"pos":475762}],"down_context":[{"change":22,"pos":475784}],"flag":"BLOCK","start":31514,"end":31549,"inode":{"change":22,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":475762},"to":{"change":22,"start":475762,"end":475784},"introduced_by":22}],"inode":{"change":22,"pos":454125}},"ins_contents":[{"Add":" &mut channel.borrow_mut(),"}],"del_contents":[{"Del":" &mut channel,\n"}]}},{"Replacement":{"inode":{"change":22,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":692,"ins":{"up_context":[{"change":22,"pos":475943}],"down_context":[{"change":22,"pos":475989}],"flag":"BLOCK","start":31550,"end":31605,"inode":{"change":22,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":475943},"to":{"change":22,"start":475943,"end":475989},"introduced_by":22}],"inode":{"change":22,"pos":454125}},"ins_contents":[{"Add":" .map(|rec| rec.globalize(&txn_alice).unwrap())"}],"del_contents":[{"Del":" .map(|rec| rec.globalize(&txn_alice))\n"}]}},{"Replacement":{"inode":{"change":22,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":706,"ins":{"up_context":[{"change":22,"pos":476345}],"down_context":[{"change":22,"pos":476352}],"flag":"BLOCK","start":31606,"end":31627,"inode":{"change":22,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":476345},"to":{"change":22,"start":476345,"end":476352},"introduced_by":22}],"inode":{"change":22,"pos":454125}},"ins_contents":[{"Add":" )"},{"Add":" .unwrap();"}],"del_contents":[{"Del":" );\n"}]}},{"Replacement":{"inode":{"change":22,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":720,"ins":{"up_context":[{"change":22,"pos":476642}],"down_context":[{"change":22,"pos":476704}],"flag":"BLOCK","start":31628,"end":31707,"inode":{"change":22,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":476642},"to":{"change":22,"start":33753,"end":33817},"introduced_by":22}],"inode":{"change":22,"pos":454125}},"ins_contents":[{"Add":" let (alive, reachable) = check_alive(&txn_alice, &channel.borrow().graph);"}],"del_contents":[{"Del":" let (alive, reachable) = check_alive(&txn_alice, &channel);\n"}]}},{"Replacement":{"inode":{"change":22,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":774,"ins":{"up_context":[{"change":22,"pos":478478}],"down_context":[{"change":22,"pos":478513}],"flag":"BLOCK","start":31708,"end":31743,"inode":{"change":22,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":478478},"to":{"change":22,"start":478478,"end":478513},"introduced_by":22}],"inode":{"change":22,"pos":454125}},"ins_contents":[{"Add":" .map(|n| n.unwrap().1)"}],"del_contents":[{"Del":" .map(|(_, name)| name)\n"}]}},{"Replacement":{"inode":{"change":22,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":795,"ins":{"up_context":[{"change":22,"pos":479182}],"down_context":[{"change":22,"pos":479217}],"flag":"BLOCK","start":31744,"end":31779,"inode":{"change":22,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":479182},"to":{"change":22,"start":479182,"end":479217},"introduced_by":22}],"inode":{"change":22,"pos":454125}},"ins_contents":[{"Add":" .map(|n| n.unwrap().1)"}],"del_contents":[{"Del":" .map(|(_, name)| name)\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":28,"ins":{"up_context":[{"change":22,"pos":11461}],"down_context":[{"change":22,"pos":11499}],"flag":"BLOCK","start":31780,"end":31821,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":11461},"to":{"change":22,"start":11461,"end":11499},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" Diff(#[from] diff::DiffError),"}],"del_contents":[{"Del":" Diff(#[from] diff::DiffError),\n"}]}},{"Edit":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":35,"atom":{"NewVertex":{"up_context":[{"change":22,"pos":489268}],"down_context":[{"change":22,"pos":489268}],"flag":"BLOCK","start":31822,"end":32086,"inode":{"change":22,"pos":488880}}},"contents":[{"Add":"impl<"},{"Add":" C: std::error::Error + 'static,"},{"Add":" W: std::error::Error + 'static,"},{"Add":" T: std::error::Error + 'static,"},{"Add":" > std::convert::From> for RecordError"},{"Add":"{"},{"Add":" fn from(e: TxnErr) -> Self {"},{"Add":" RecordError::Txn(e.0)"},{"Add":" }"},{"Add":"}"},{"Add":""}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":150,"ins":{"up_context":[{"change":22,"pos":492241}],"down_context":[{"change":22,"pos":492397}],"flag":"BLOCK","start":32087,"end":32350,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":492241},"to":{"change":22,"start":492241,"end":492397},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":"fn get_inodes::GraphError>>("},{"Add":" txn: &T,"},{"Add":" channel: &Channel,"},{"Add":" inode: Inode,"},{"Add":") -> Result>, TxnErr> {"},{"Add":" if let Some(vertex) = txn.get_inodes(inode, None)? {"}],"del_contents":[{"Del":"fn get_inodes(txn: &T, channel: &Channel, inode: Inode) -> Option> {\n if let Some(vertex) = txn.get_inodes(inode, None) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":157,"ins":{"up_context":[{"change":22,"pos":492412}],"down_context":[{"change":22,"pos":492478}],"flag":"BLOCK","start":32351,"end":32418,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":492412},"to":{"change":22,"start":492412,"end":492478},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" .get_changeset(&channel.changes, vertex.change, None)?"}],"del_contents":[{"Del":" .get_changeset(&channel.changes, vertex.change, None)\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":160,"ins":{"up_context":[{"change":22,"pos":492511}],"down_context":[{"change":22,"pos":492536}],"flag":"BLOCK","start":32419,"end":32448,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":492511},"to":{"change":22,"start":492511,"end":492536},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" Ok(Some(vertex))"}],"del_contents":[{"Del":" Some(vertex)\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":162,"ins":{"up_context":[{"change":22,"pos":492553}],"down_context":[{"change":22,"pos":492570}],"flag":"BLOCK","start":32449,"end":32470,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":492553},"to":{"change":22,"start":492553,"end":492570},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" Ok(None)"}],"del_contents":[{"Del":" None\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":165,"ins":{"up_context":[{"change":22,"pos":492593}],"down_context":[{"change":22,"pos":492606}],"flag":"BLOCK","start":32471,"end":32488,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":492593},"to":{"change":22,"start":492593,"end":492606},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" Ok(None)"}],"del_contents":[{"Del":" None\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":170,"ins":{"up_context":[{"change":22,"pos":492630}],"down_context":[{"change":22,"pos":492700}],"flag":"BLOCK","start":32489,"end":32550,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":492630},"to":{"change":22,"start":492630,"end":492700},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" pub(crate) fn record("}],"del_contents":[{"Del":" pub(crate) fn record(\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":174,"ins":{"up_context":[{"change":22,"pos":492781}],"down_context":[{"change":22,"pos":492818}],"flag":"BLOCK","start":32551,"end":32585,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":492781},"to":{"change":22,"start":492781,"end":492818},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" channel: &mut Channel,"}],"del_contents":[{"Del":" channel: &mut ChannelRef,\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":178,"ins":{"up_context":[{"change":22,"pos":492891}],"down_context":[{"change":22,"pos":492928}],"flag":"BLOCK","start":32586,"end":32806,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":492891},"to":{"change":22,"start":11631,"end":11696},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" ) -> Result<(), RecordError>"},{"Add":" where"},{"Add":" T: ChannelTxnT + TreeTxnT::GraphError> + GraphMutTxnT,"},{"Add":" ::Error: 'static,"},{"Add":" {"}],"del_contents":[{"Del":" ) -> Result<(), RecordError> {\n"}]}},{"Edit":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":184,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":492973},"to":{"change":22,"start":492973,"end":493013},"introduced_by":22}],"inode":{"change":22,"pos":488880}}},"contents":[{"Del":" let channel = channel.borrow();\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":196,"ins":{"up_context":[{"change":22,"pos":493559}],"down_context":[{"change":22,"pos":493589}],"flag":"BLOCK","start":32807,"end":32843,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":493559},"to":{"change":22,"start":493559,"end":493589},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" &channel.graph,"}],"del_contents":[{"Del":" &channel,\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":200,"ins":{"up_context":[{"change":22,"pos":493696}],"down_context":[{"change":22,"pos":493715}],"flag":"BLOCK","start":32844,"end":32864,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":493696},"to":{"change":22,"start":493696,"end":493715},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" )?;"}],"del_contents":[{"Del":" );\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":202,"ins":{"up_context":[{"change":22,"pos":493753}],"down_context":[{"change":22,"pos":493834}],"flag":"BLOCK","start":32865,"end":32947,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":493753},"to":{"change":22,"start":493753,"end":493834},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" } else if let Some(vertex) = get_inodes(txn, &channel, item.inode)? {"}],"del_contents":[{"Del":" } else if let Some(vertex) = get_inodes(txn, &channel, item.inode) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":333,"ins":{"up_context":[{"change":22,"pos":499383}],"down_context":[{"change":22,"pos":499456}],"flag":"BLOCK","start":32948,"end":33109,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":499383},"to":{"change":22,"start":499383,"end":499456},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" fn record_existing_file<"},{"Add":" T: ChannelTxnT + TreeTxnT::GraphError>,"},{"Add":" W: WorkingCopy,"},{"Add":" C: ChangeStore,"},{"Add":" >("}],"del_contents":[{"Del":" fn record_existing_file(\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":346,"ins":{"up_context":[{"change":22,"pos":499681}],"down_context":[{"change":22,"pos":499718}],"flag":"BLOCK","start":33110,"end":33259,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":499681},"to":{"change":22,"start":11806,"end":11871},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" ) -> Result<(), RecordError>"},{"Add":" where"},{"Add":" ::Error: 'static,"},{"Add":" {"}],"del_contents":[{"Del":" ) -> Result<(), RecordError> {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":359,"ins":{"up_context":[{"change":22,"pos":500045}],"down_context":[{"change":22,"pos":500208}],"flag":"BLOCK","start":33260,"end":33479,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":500045},"to":{"change":22,"start":33988,"end":34069},"introduced_by":22},{"previous":"","flag":"DELETED","from":{"change":22,"pos":34069},"to":{"change":22,"start":500138,"end":500208},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":500138},"to":{"change":22,"start":500138,"end":500208},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" for name_ in iter_adjacent(txn, &channel.graph, vertex.inode_vertex(), f0, f1)? {"},{"Add":" let name_ = name_?;"},{"Add":" if !name_.flag.contains(EdgeFlags::PARENT) {"},{"Add":" continue;"},{"Add":" }"}],"del_contents":[{"Del":" for name_ in iter_adjacent(txn, &channel, vertex.inode_vertex(), f0, f1)\n"},{"Del":" .filter(|e| e.flag.contains(EdgeFlags::PARENT))\n {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":370,"ins":{"up_context":[{"change":22,"pos":500452}],"down_context":[{"change":22,"pos":500531}],"flag":"BLOCK","start":33480,"end":33566,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":500452},"to":{"change":22,"start":34070,"end":34150},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" let name_dest = find_block_end(txn, &channel.graph, name_.dest).unwrap();"}],"del_contents":[{"Del":" let name_dest = find_block_end(txn, &channel, name_.dest).unwrap();\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":373,"ins":{"up_context":[{"change":22,"pos":11892}],"down_context":[{"change":22,"pos":11969}],"flag":"BLOCK","start":33567,"end":33653,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":11892},"to":{"change":22,"start":11892,"end":11969},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" .get_contents(|p| txn.get_external(p).unwrap(), name_dest, &mut name)"}],"del_contents":[{"Del":" .get_contents(|p| txn.get_external(p), name_dest, &mut name)\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":379,"ins":{"up_context":[{"change":22,"pos":500926}],"down_context":[{"change":22,"pos":501016}],"flag":"BLOCK","start":33654,"end":33790,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":500926},"to":{"change":22,"start":34151,"end":34242},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" if let Some(v_papa) = iter_adjacent(txn, &channel.graph, name_dest, f0, f1)?.next() {"},{"Add":" let v_papa = v_papa?;"}],"del_contents":[{"Del":" if let Some(v_papa) = iter_adjacent(txn, &channel, name_dest, f0, f1).next() {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":404,"ins":{"up_context":[{"change":22,"pos":501992}],"down_context":[{"change":22,"pos":502032}],"flag":"BLOCK","start":33791,"end":33842,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":501992},"to":{"change":22,"start":501992,"end":502032},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" self.record_moved_file::<_, _, W>("}],"del_contents":[{"Del":" self.record_moved_file(\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":407,"ins":{"up_context":[{"change":22,"pos":502086}],"down_context":[{"change":22,"pos":502116}],"flag":"BLOCK","start":33843,"end":33879,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":502086},"to":{"change":22,"start":502086,"end":502116},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" &channel.graph,"}],"del_contents":[{"Del":" &channel,\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":412,"ins":{"up_context":[{"change":22,"pos":502254}],"down_context":[{"change":22,"pos":502273}],"flag":"BLOCK","start":33880,"end":33899,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":502254},"to":{"change":22,"start":12023,"end":12093},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" )?"}],"del_contents":[{"Del":" )\n .map_err(RecordError::Changestore)?\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":418,"ins":{"up_context":[{"change":22,"pos":502466}],"down_context":[{"change":22,"pos":502529}],"flag":"BLOCK","start":33900,"end":33970,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":502466},"to":{"change":22,"start":502466,"end":502529},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" let mut ret = retrieve(txn, &channel.graph, vertex)?;"}],"del_contents":[{"Del":" let mut ret = retrieve(txn, &channel, vertex);\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":443,"ins":{"up_context":[{"change":22,"pos":503210}],"down_context":[{"change":22,"pos":503301}],"flag":"BLOCK","start":33971,"end":34069,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":503210},"to":{"change":22,"start":503210,"end":503301},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" self.record_deleted_file(txn, &channel.graph, working_copy, &item.full_path, vertex)?"}],"del_contents":[{"Del":" self.record_deleted_file(txn, &channel, working_copy, &item.full_path, vertex)\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":448,"ins":{"up_context":[{"change":22,"pos":503333}],"down_context":[{"change":22,"pos":503398}],"flag":"BLOCK","start":34070,"end":34209,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":503333},"to":{"change":8,"start":383,"end":444},"introduced_by":8}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" fn delete_obsolete_children<"},{"Add":" T: GraphTxnT + TreeTxnT::GraphError>,"},{"Add":" W: WorkingCopy,"},{"Add":" >("}],"del_contents":[{"Del":" fn delete_obsolete_children(\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":454,"ins":{"up_context":[{"change":22,"pos":503434}],"down_context":[{"change":22,"pos":503464}],"flag":"BLOCK","start":34210,"end":34238,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":503434},"to":{"change":22,"start":503434,"end":503464},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" channel: &T::Graph,"}],"del_contents":[{"Del":" channel: &Channel,\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":458,"ins":{"up_context":[{"change":22,"pos":503546}],"down_context":[{"change":22,"pos":503554}],"flag":"BLOCK","start":34239,"end":34284,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":503546},"to":{"change":22,"start":503546,"end":503554},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" ) -> Result<(), TxnErr> {"}],"del_contents":[{"Del":" ) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":462,"ins":{"up_context":[{"change":22,"pos":503681}],"down_context":[{"change":22,"pos":503904}],"flag":"BLOCK","start":34285,"end":34588,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":503681},"to":{"change":22,"start":34243,"end":34469},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" for child in iter_adjacent(txn, channel, v.inode_vertex(), f0, f1)? {"},{"Add":" let child = child?;"},{"Add":" let child = find_block(txn, channel, child.dest).unwrap();"},{"Add":" for grandchild in iter_adjacent(txn, channel, child, f0, f1)? {"},{"Add":" let grandchild = grandchild?;"}],"del_contents":[{"Del":" for child in iter_adjacent(txn, &channel, v.inode_vertex(), f0, f1) {\n let child = find_block(txn, &channel, child.dest).unwrap();\n for grandchild in iter_adjacent(txn, &channel, child, f0, f1) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":468,"ins":{"up_context":[{"change":22,"pos":503959}],"down_context":[{"change":5,"pos":147}],"flag":"BLOCK","start":34589,"end":35049,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":503959},"to":{"change":22,"start":503959,"end":504146},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":504146},"to":{"change":5,"start":0,"end":147},"introduced_by":5}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" let needs_deletion ="},{"Add":" if let Some(inode) = txn.get_revinodes(grandchild.dest, None)? {"},{"Add":" debug!(\"inode = {:?} {:?}\", inode, txn.get_revtree(inode, None));"},{"Add":" if let Some(path) = crate::fs::inode_filename(txn, inode)? {"},{"Add":" working_copy.file_metadata(&path).is_err()"},{"Add":" } else {"},{"Add":" true"},{"Add":" }"}],"del_contents":[{"Del":" let needs_deletion = if let Some(inode) = txn.get_revinodes(grandchild.dest, None) {\n debug!(\"inode = {:?} {:?}\", inode, txn.get_revtree(inode, None));\n"},{"Del":" if let Some(path) = crate::fs::inode_filename(txn, inode) {\n working_copy.file_metadata(&path).is_err()\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":478,"ins":{"up_context":[{"change":5,"pos":205}],"down_context":[{"change":22,"pos":504274}],"flag":"BLOCK","start":35050,"end":35073,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":205},"to":{"change":5,"start":205,"end":227},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":227},"to":{"change":22,"start":504205,"end":504274},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":504205},"to":{"change":22,"start":504205,"end":504274},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" };"}],"del_contents":[{"Del":" }\n"},{"Del":" } else {\n true\n };\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":487,"ins":{"up_context":[{"change":22,"pos":504576}],"down_context":[{"change":22,"pos":504598}],"flag":"BLOCK","start":35074,"end":35097,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":504576},"to":{"change":22,"start":504576,"end":504598},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" )?"}],"del_contents":[{"Del":" )\n"}]}},{"Edit":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":491,"atom":{"NewVertex":{"up_context":[{"change":22,"pos":504640}],"down_context":[{"change":22,"pos":504640}],"flag":"BLOCK","start":35098,"end":35113,"inode":{"change":22,"pos":488880}}},"contents":[{"Add":" Ok(())"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":494,"ins":{"up_context":[{"change":22,"pos":504647}],"down_context":[{"change":22,"pos":504701}],"flag":"BLOCK","start":35114,"end":35280,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":504647},"to":{"change":22,"start":12237,"end":12307},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" fn push_children<"},{"Add":" 'a,"},{"Add":" T: ChannelTxnT + TreeTxnT::GraphError>,"},{"Add":" W: WorkingCopy,"},{"Add":" C: ChangeStore,"},{"Add":" >("}],"del_contents":[{"Del":" fn push_children<'a, T: MutTxnT, W: WorkingCopy, C: ChangeStore>(\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":508,"ins":{"up_context":[{"change":22,"pos":504935}],"down_context":[{"change":22,"pos":504972}],"flag":"BLOCK","start":35281,"end":35430,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":504935},"to":{"change":22,"start":12308,"end":12373},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" ) -> Result<(), RecordError>"},{"Add":" where"},{"Add":" ::Error: 'static,"},{"Add":" {"}],"del_contents":[{"Del":" ) -> Result<(), RecordError> {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":519,"ins":{"up_context":[{"change":22,"pos":505236}],"down_context":[{"change":22,"pos":505312}],"flag":"BLOCK","start":35431,"end":35532,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":505236},"to":{"change":22,"start":505236,"end":505312},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" for x in txn.iter_tree(fileid.clone(), None)? {"},{"Add":" let (fileid_, child_inode) = x?;"}],"del_contents":[{"Del":" for (fileid_, child_inode) in txn.iter_tree(fileid.clone(), None) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":549,"ins":{"up_context":[{"change":22,"pos":506445}],"down_context":[{"change":22,"pos":506617}],"flag":"BLOCK","start":35533,"end":35713,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":506445},"to":{"change":22,"start":506445,"end":506617},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" } else if let Some(vertex) = get_inodes(txn, &channel, child_inode)? {"},{"Add":" self.record_deleted_file(txn, &channel.graph, working_copy, &full_path, vertex)?"}],"del_contents":[{"Del":" } else if let Some(vertex) = get_inodes(txn, &channel, child_inode) {\n self.record_deleted_file(txn, &channel, working_copy, &full_path, vertex)\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":561,"ins":{"up_context":[{"change":22,"pos":506855}],"down_context":[{"change":22,"pos":506966}],"flag":"BLOCK","start":35714,"end":35777,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":506910},"to":{"change":22,"start":506910,"end":506966},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":"fn modified_since_last_commit("}],"del_contents":[{"Del":"fn modified_since_last_commit(\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":585,"ins":{"up_context":[{"change":22,"pos":507625}],"down_context":[{"change":22,"pos":507676}],"flag":"BLOCK","start":35778,"end":35850,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":507625},"to":{"change":22,"start":507625,"end":507676},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" fn record_moved_file("}],"del_contents":[{"Del":" fn record_moved_file(\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":589,"ins":{"up_context":[{"change":22,"pos":507733}],"down_context":[{"change":22,"pos":507763}],"flag":"BLOCK","start":35851,"end":35879,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":507733},"to":{"change":22,"start":507733,"end":507763},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" channel: &T::Graph,"}],"del_contents":[{"Del":" channel: &Channel,\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":594,"ins":{"up_context":[{"change":22,"pos":507905}],"down_context":[{"change":22,"pos":507942}],"flag":"BLOCK","start":35880,"end":36029,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":507905},"to":{"change":22,"start":12496,"end":12528},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" ) -> Result<(), RecordError>"},{"Add":" where"},{"Add":" ::Error: 'static,"},{"Add":" {"}],"del_contents":[{"Del":" ) -> Result<(), C::Error> {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":605,"ins":{"up_context":[{"change":22,"pos":508444}],"down_context":[{"change":22,"pos":508552}],"flag":"BLOCK","start":36030,"end":36086,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":508507},"to":{"change":22,"start":508507,"end":508552},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" let mut moved = collect_moved_edges::<_, _, W>("}],"del_contents":[{"Del":" let mut moved = collect_moved_edges(\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":672,"ins":{"up_context":[{"change":22,"pos":510763}],"down_context":[{"change":22,"pos":510812}],"flag":"BLOCK","start":36087,"end":36157,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":510763},"to":{"change":22,"start":510763,"end":510812},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":"fn collect_moved_edges("}],"del_contents":[{"Del":"fn collect_moved_edges(\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":675,"ins":{"up_context":[{"change":22,"pos":510842}],"down_context":[{"change":22,"pos":510868}],"flag":"BLOCK","start":36158,"end":36182,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":510842},"to":{"change":22,"start":510842,"end":510868},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" channel: &T::Graph,"}],"del_contents":[{"Del":" channel: &Channel,\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":681,"ins":{"up_context":[{"change":22,"pos":511024}],"down_context":[{"change":22,"pos":511065}],"flag":"BLOCK","start":36183,"end":36324,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":511024},"to":{"change":22,"start":12592,"end":12628},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":") -> Result>"},{"Add":"where"},{"Add":" ::Error: 'static,"},{"Add":"{"}],"del_contents":[{"Del":") -> Result {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":701,"ins":{"up_context":[{"change":22,"pos":34642}],"down_context":[{"change":22,"pos":511729}],"flag":"BLOCK","start":36325,"end":36470,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":34642},"to":{"change":22,"start":34642,"end":34720},"introduced_by":22},{"previous":"","flag":"DELETED","from":{"change":22,"pos":34720},"to":{"change":22,"start":511660,"end":511666},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":511660},"to":{"change":22,"start":511660,"end":511666},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" )? {"},{"Add":" let parent = parent?;"},{"Add":" if !parent.flag.contains(EdgeFlags::FOLDER | EdgeFlags::PARENT) {"},{"Add":" continue;"},{"Add":" }"}],"del_contents":[{"Del":" )\n .filter(|e| e.flag.contains(EdgeFlags::FOLDER | EdgeFlags::PARENT))\n"},{"Del":" {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":730,"ins":{"up_context":[{"change":22,"pos":512793}],"down_context":[{"change":22,"pos":512960}],"flag":"BLOCK","start":36471,"end":36770,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":512793},"to":{"change":22,"start":34721,"end":34800},"introduced_by":22},{"previous":"","flag":"DELETED","from":{"change":22,"pos":34800},"to":{"change":22,"start":512871,"end":512960},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":512871},"to":{"change":22,"start":512871,"end":512960},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" let parent_dest = find_block_end(txn, channel, parent.dest).unwrap();"},{"Add":" changes"},{"Add":" .get_contents("},{"Add":" |p| txn.get_external(p).unwrap(),"},{"Add":" parent_dest,"},{"Add":" &mut previous_name,"},{"Add":" )"},{"Add":" .map_err(RecordError::Changestore)?;"}],"del_contents":[{"Del":" let parent_dest = find_block_end(txn, &channel, parent.dest).unwrap();\n"},{"Del":" changes.get_contents(|p| txn.get_external(p), parent_dest, &mut previous_name)?;\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":752,"ins":{"up_context":[{"change":22,"pos":34987}],"down_context":[{"change":22,"pos":513762}],"flag":"BLOCK","start":36771,"end":37061,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":34987},"to":{"change":22,"start":34987,"end":35154},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" )? {"},{"Add":" let grandparent = grandparent?;"},{"Add":" if !grandparent"},{"Add":" .flag"},{"Add":" .contains(EdgeFlags::FOLDER | EdgeFlags::PARENT)"},{"Add":" || grandparent.flag.contains(EdgeFlags::PSEUDO)"},{"Add":" {"},{"Add":" continue;"},{"Add":" }"}],"del_contents":[{"Del":" )\n .filter(|e| {\n e.flag.contains(EdgeFlags::FOLDER | EdgeFlags::PARENT)\n && !e.flag.contains(EdgeFlags::PSEUDO)\n }) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":762,"ins":{"up_context":[{"change":22,"pos":513816}],"down_context":[{"change":22,"pos":513908}],"flag":"BLOCK","start":37062,"end":37154,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":513816},"to":{"change":22,"start":35155,"end":35248},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" let grandparent_dest = find_block_end(txn, channel, grandparent.dest).unwrap();"}],"del_contents":[{"Del":" let grandparent_dest = find_block_end(txn, &channel, grandparent.dest).unwrap();\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":864,"ins":{"up_context":[{"change":22,"pos":518341}],"down_context":[{"change":22,"pos":518394}],"flag":"BLOCK","start":37155,"end":37289,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":518341},"to":{"change":22,"start":518341,"end":518394},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" fn record_deleted_file<"},{"Add":" T: GraphTxnT + TreeTxnT::GraphError>,"},{"Add":" W: WorkingCopy,"},{"Add":" >("}],"del_contents":[{"Del":" fn record_deleted_file(\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":870,"ins":{"up_context":[{"change":22,"pos":518430}],"down_context":[{"change":22,"pos":518460}],"flag":"BLOCK","start":37290,"end":37318,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":518430},"to":{"change":22,"start":518430,"end":518460},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" channel: &T::Graph,"}],"del_contents":[{"Del":" channel: &Channel,\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":874,"ins":{"up_context":[{"change":22,"pos":518555}],"down_context":[{"change":22,"pos":518563}],"flag":"BLOCK","start":37319,"end":37364,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":518555},"to":{"change":22,"start":518555,"end":518563},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" ) -> Result<(), TxnErr> {"}],"del_contents":[{"Del":" ) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":880,"ins":{"up_context":[{"change":22,"pos":518868}],"down_context":[{"change":22,"pos":518936}],"flag":"BLOCK","start":37365,"end":37435,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":518868},"to":{"change":22,"start":35249,"end":35318},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" if let Some(path) = tree_path(txn, vertex.start_pos())? {"}],"del_contents":[{"Del":" if let Some(path) = tree_path(txn, vertex.start_pos()) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":889,"ins":{"up_context":[{"change":22,"pos":519190}],"down_context":[{"change":22,"pos":3339}],"flag":"BLOCK","start":37436,"end":37504,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":519190},"to":{"change":22,"start":519190,"end":519257},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" self.delete_file_edge(txn, channel, vertex, inode)?"}],"del_contents":[{"Del":" self.delete_file_edge(txn, channel, vertex, inode)\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":896,"ins":{"up_context":[{"change":22,"pos":3605}],"down_context":[{"change":22,"pos":3688}],"flag":"BLOCK","start":37505,"end":37589,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":3605},"to":{"change":22,"start":3605,"end":3688},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" if let Some(inode) = txn.get_revinodes(vertex.start_pos(), None)? {"}],"del_contents":[{"Del":" if let Some(inode) = txn.get_revinodes(vertex.start_pos(), None) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":907,"ins":{"up_context":[{"change":22,"pos":520253}],"down_context":[{"change":22,"pos":520253}],"flag":"BLOCK","start":37590,"end":37685,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":520253},"to":{"change":22,"start":4120,"end":4214},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" self.delete_inode_vertex(txn, channel, vertex, vertex.start_pos(), full_path)?"}],"del_contents":[{"Del":" self.delete_inode_vertex(txn, channel, vertex, vertex.start_pos(), full_path)\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":917,"ins":{"up_context":[{"change":22,"pos":520514}],"down_context":[{"change":22,"pos":520530}],"flag":"BLOCK","start":37686,"end":37737,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":520514},"to":{"change":22,"start":520514,"end":520530},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" )? {"},{"Add":" let edge = edge?;"}],"del_contents":[{"Del":" ) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":921,"ins":{"up_context":[{"change":22,"pos":35407}],"down_context":[{"change":22,"pos":520742}],"flag":"BLOCK","start":37738,"end":37837,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":35407},"to":{"change":22,"start":35407,"end":35507},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" find_block(txn, channel, edge.dest).expect(\"delete_recursively, descendants\");"}],"del_contents":[{"Del":" find_block(txn, &channel, edge.dest).expect(\"delete_recursively, descendants\");\n"}]}},{"Edit":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":936,"atom":{"NewVertex":{"up_context":[{"change":22,"pos":521259}],"down_context":[{"change":22,"pos":521259}],"flag":"BLOCK","start":37838,"end":37853,"inode":{"change":22,"pos":488880}}},"contents":[{"Add":" Ok(())"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":939,"ins":{"up_context":[{"change":22,"pos":521266}],"down_context":[{"change":22,"pos":521303}],"flag":"BLOCK","start":37854,"end":37896,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":521266},"to":{"change":22,"start":521266,"end":521303},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" fn delete_inode_vertex("}],"del_contents":[{"Del":" fn delete_inode_vertex(\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":942,"ins":{"up_context":[{"change":22,"pos":521339}],"down_context":[{"change":22,"pos":521369}],"flag":"BLOCK","start":37897,"end":37925,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":521339},"to":{"change":22,"start":521339,"end":521369},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" channel: &T::Graph,"}],"del_contents":[{"Del":" channel: &Channel,\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":946,"ins":{"up_context":[{"change":22,"pos":521458}],"down_context":[{"change":22,"pos":521466}],"flag":"BLOCK","start":37926,"end":37971,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":521458},"to":{"change":22,"start":521458,"end":521466},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" ) -> Result<(), TxnErr> {"}],"del_contents":[{"Del":" ) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":954,"ins":{"up_context":[{"change":22,"pos":35684}],"down_context":[{"change":22,"pos":35822}],"flag":"BLOCK","start":37972,"end":38117,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":35684},"to":{"change":22,"start":35684,"end":35822},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" )? {"},{"Add":" let parent = parent?;"},{"Add":" if !parent.flag.contains(EdgeFlags::PARENT) {"},{"Add":" continue;"},{"Add":" }"}],"del_contents":[{"Del":" )\n .filter(|e| e.flag.contains(EdgeFlags::PARENT))\n {\n assert!(parent.flag.contains(EdgeFlags::PARENT));\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":960,"ins":{"up_context":[{"change":22,"pos":35884}],"down_context":[{"change":22,"pos":35967}],"flag":"BLOCK","start":38118,"end":38200,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":35884},"to":{"change":22,"start":35884,"end":35967},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" let parent_dest = find_block_end(txn, channel, parent.dest).unwrap();"}],"del_contents":[{"Del":" let parent_dest = find_block_end(txn, &channel, parent.dest).unwrap();\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":967,"ins":{"up_context":[{"change":22,"pos":521694}],"down_context":[{"change":22,"pos":522385}],"flag":"BLOCK","start":38201,"end":38465,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":521694},"to":{"change":22,"start":521694,"end":521708},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":521708},"to":{"change":22,"start":36065,"end":36164},"introduced_by":22},{"previous":"","flag":"DELETED","from":{"change":22,"pos":36164},"to":{"change":22,"start":522371,"end":522385},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":522371},"to":{"change":22,"start":522371,"end":522385},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" )? {"},{"Add":" let grandparent = grandparent?;"},{"Add":" if !grandparent.flag.contains(EdgeFlags::PARENT)"},{"Add":" || grandparent.flag.contains(EdgeFlags::PSEUDO)"},{"Add":" {"},{"Add":" continue;"},{"Add":" }"}],"del_contents":[{"Del":" )\n"},{"Del":" .filter(|e| e.flag.contains(EdgeFlags::PARENT) && !e.flag.contains(EdgeFlags::PSEUDO))\n"},{"Del":" {\n"}]}},{"Edit":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":1005,"atom":{"NewVertex":{"up_context":[{"change":22,"pos":523734}],"down_context":[{"change":22,"pos":523734}],"flag":"BLOCK","start":38466,"end":38481,"inode":{"change":22,"pos":488880}}},"contents":[{"Add":" Ok(())"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":1008,"ins":{"up_context":[{"change":22,"pos":523741}],"down_context":[{"change":22,"pos":523775}],"flag":"BLOCK","start":38482,"end":38521,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":523741},"to":{"change":22,"start":523741,"end":523775},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" fn delete_file_edge("}],"del_contents":[{"Del":" fn delete_file_edge(\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":1011,"ins":{"up_context":[{"change":22,"pos":523811}],"down_context":[{"change":22,"pos":523841}],"flag":"BLOCK","start":38522,"end":38550,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":523811},"to":{"change":22,"start":523811,"end":523841},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" channel: &T::Graph,"}],"del_contents":[{"Del":" channel: &Channel,\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":1014,"ins":{"up_context":[{"change":22,"pos":523906}],"down_context":[{"change":22,"pos":523914}],"flag":"BLOCK","start":38551,"end":38596,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":523906},"to":{"change":22,"start":523906,"end":523914},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" ) -> Result<(), TxnErr> {"}],"del_contents":[{"Del":" ) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":1032,"ins":{"up_context":[{"change":22,"pos":36386}],"down_context":[{"change":22,"pos":524658}],"flag":"BLOCK","start":38597,"end":38781,"inode":{"change":22,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":36386},"to":{"change":22,"start":36386,"end":36469},"introduced_by":22},{"previous":"","flag":"DELETED","from":{"change":22,"pos":36469},"to":{"change":22,"start":524640,"end":524658},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":524640},"to":{"change":22,"start":524640,"end":524658},"introduced_by":22}],"inode":{"change":22,"pos":488880}},"ins_contents":[{"Add":" )? {"},{"Add":" let parent = parent?;"},{"Add":" if parent.flag.contains(EdgeFlags::PSEUDO) {"},{"Add":" continue;"},{"Add":" }"}],"del_contents":[{"Del":" )\n .filter(|e| !e.flag.contains(EdgeFlags::PSEUDO))\n"},{"Del":" {\n"}]}},{"Edit":{"inode":{"change":22,"pos":488880},"path":"libpijul/src/record.rs","line":1049,"atom":{"NewVertex":{"up_context":[{"change":22,"pos":525209}],"down_context":[{"change":22,"pos":525209}],"flag":"BLOCK","start":38782,"end":38797,"inode":{"change":22,"pos":488880}}},"contents":[{"Add":" Ok(())"}]}},{"Edit":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":28,"atom":{"NewVertex":{"up_context":[{"change":22,"pos":12924}],"down_context":[{"change":22,"pos":12924}],"flag":"BLOCK","start":38798,"end":39466,"inode":{"change":22,"pos":531056}}},"contents":[{"Add":"}"},{"Add":""},{"Add":"impl std::convert::From<::sanakirja::CRCError> for SanakirjaError {"},{"Add":" fn from(_: ::sanakirja::CRCError) -> Self {"},{"Add":" SanakirjaError::PristineCorrupt"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl std::convert::From<::sanakirja::CRCError> for TxnErr {"},{"Add":" fn from(_: ::sanakirja::CRCError) -> Self {"},{"Add":" TxnErr(SanakirjaError::PristineCorrupt)"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl std::convert::From<::sanakirja::Error> for TxnErr {"},{"Add":" fn from(e: ::sanakirja::Error) -> Self {"},{"Add":" TxnErr(e.into())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl std::convert::From> for TxnErr {"},{"Add":" fn from(e: TxnErr<::sanakirja::Error>) -> Self {"},{"Add":" TxnErr(e.0.into())"},{"Add":" }"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":278,"ins":{"up_context":[{"change":22,"pos":539439}],"down_context":[{"change":22,"pos":539516}],"flag":"BLOCK","start":39467,"end":39585,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":539439},"to":{"change":22,"start":539439,"end":539516},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" for x in self.txn.iter(&self.channels, None).unwrap() {"},{"Add":" let (a, (g, c, r, s, _, _)) = x.unwrap();"}],"del_contents":[{"Del":" for (a, (g, c, r, s, _, _)) in self.txn.iter(&self.channels, None) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":292,"ins":{"up_context":[{"change":22,"pos":540004}],"down_context":[{"change":22,"pos":540071}],"flag":"BLOCK","start":39586,"end":39694,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":540004},"to":{"change":22,"start":540004,"end":540071},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" for x in self.txn.iter(&self.remotes, None).unwrap() {"},{"Add":" let (a, (u, v, w)) = x.unwrap();"}],"del_contents":[{"Del":" for (a, (u, v, w)) in self.txn.iter(&self.remotes, None) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":309,"ins":{"up_context":[{"change":22,"pos":540597}],"down_context":[{"change":22,"pos":540674}],"flag":"BLOCK","start":39695,"end":39813,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":540597},"to":{"change":22,"start":540597,"end":540674},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" for x in self.txn.iter(&self.channels, None).unwrap() {"},{"Add":" let (a, (g, c, r, s, _, _)) = x.unwrap();"}],"del_contents":[{"Del":" for (a, (g, c, r, s, _, _)) in self.txn.iter(&self.channels, None) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":356,"ins":{"up_context":[{"change":22,"pos":542222}],"down_context":[{"change":22,"pos":542300}],"flag":"BLOCK","start":39814,"end":39878,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":542222},"to":{"change":22,"start":542222,"end":542281},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":542281},"to":{"change":22,"start":13666,"end":13699},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":"impl GraphTxnT for GenericTxn {"}],"del_contents":[{"Del":"impl TxnT for GenericTxn {\n"},{"Del":" type Error = SanakirjaError;\n"}]}},{"Edit":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":358,"atom":{"NewVertex":{"up_context":[{"change":22,"pos":542345}],"down_context":[{"change":22,"pos":542345}],"flag":"BLOCK","start":39879,"end":39918,"inode":{"change":22,"pos":531056}}},"contents":[{"Add":" type GraphError = SanakirjaError;"},{"Add":""}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":361,"ins":{"up_context":[{"change":22,"pos":542403}],"down_context":[{"change":22,"pos":542532}],"flag":"BLOCK","start":39919,"end":40074,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":542403},"to":{"change":22,"start":542403,"end":542455},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":542474},"to":{"change":22,"start":542474,"end":542532},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" sanakirja_get!(graph, Vertex, Edge, GraphError);"},{"Add":" fn get_external(&self, p: ChangeId) -> Result, TxnErr> {"}],"del_contents":[{"Del":" sanakirja_get!(graph, Vertex, Edge);\n\n"},{"Del":" fn get_external(&self, p: ChangeId) -> Option {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":364,"ins":{"up_context":[{"change":22,"pos":542557}],"down_context":[{"change":22,"pos":542586}],"flag":"BLOCK","start":40075,"end":40196,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":542557},"to":{"change":22,"start":542557,"end":542586},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" Ok(Some(Hash::None))"},{"Add":" } else if let Ok(x) = self.txn.get(&self.external, p, None) {"},{"Add":" Ok(x)"}],"del_contents":[{"Del":" Some(Hash::None)\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":368,"ins":{"up_context":[{"change":22,"pos":542603}],"down_context":[{"change":22,"pos":542653}],"flag":"BLOCK","start":40197,"end":40254,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":542603},"to":{"change":22,"start":542603,"end":542653},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" Err(TxnErr(SanakirjaError::PristineCorrupt))"}],"del_contents":[{"Del":" self.txn.get(&self.external, p, None)\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":372,"ins":{"up_context":[{"change":22,"pos":36940}],"down_context":[{"change":22,"pos":542746}],"flag":"BLOCK","start":40255,"end":40347,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":22,"pos":36940},"to":{"change":22,"start":542688,"end":542746},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":542688},"to":{"change":22,"start":542688,"end":542746},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" fn get_internal(&self, p: Hash) -> Result, TxnErr> {"}],"del_contents":[{"Del":" fn get_internal(&self, p: Hash) -> Option {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":374,"ins":{"up_context":[{"change":22,"pos":542778}],"down_context":[{"change":22,"pos":542811}],"flag":"BLOCK","start":40348,"end":40473,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":542778},"to":{"change":22,"start":542778,"end":542811},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" Ok(Some(ChangeId::ROOT))"},{"Add":" } else if let Ok(x) = self.txn.get(&self.internal, p, None) {"},{"Add":" Ok(x)"}],"del_contents":[{"Del":" Some(ChangeId::ROOT)\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":378,"ins":{"up_context":[{"change":22,"pos":542828}],"down_context":[{"change":22,"pos":542878}],"flag":"BLOCK","start":40474,"end":40531,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":542828},"to":{"change":22,"start":542828,"end":542878},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" Err(TxnErr(SanakirjaError::PristineCorrupt))"}],"del_contents":[{"Del":" self.txn.get(&self.internal, p, None)\n"}]}},{"Edit":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":381,"atom":{"NewVertex":{"up_context":[{"change":22,"pos":542894}],"down_context":[{"change":22,"pos":542894}],"flag":"BLOCK","start":40532,"end":40534,"inode":{"change":22,"pos":531056}}},"contents":[{"Add":"}"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":383,"ins":{"up_context":[{"change":22,"pos":542895}],"down_context":[{"change":22,"pos":544136}],"flag":"BLOCK","start":40535,"end":41693,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":542895},"to":{"change":22,"start":13700,"end":13794},"introduced_by":22},{"previous":"","flag":"DELETED","from":{"change":22,"pos":13794},"to":{"change":22,"start":542980,"end":543067},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":542980},"to":{"change":22,"start":542980,"end":543067},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":543067},"to":{"change":22,"start":13795,"end":13865},"introduced_by":22},{"previous":"","flag":"DELETED","from":{"change":22,"pos":13865},"to":{"change":22,"start":543147,"end":543716},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":543147},"to":{"change":22,"start":543147,"end":543716},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":543716},"to":{"change":22,"start":13866,"end":13948},"introduced_by":22},{"previous":"","flag":"DELETED","from":{"change":22,"pos":13948},"to":{"change":22,"start":543884,"end":544005},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":543884},"to":{"change":22,"start":543884,"end":544005},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":544005},"to":{"change":22,"start":13949,"end":14014},"introduced_by":22},{"previous":"","flag":"DELETED","from":{"change":22,"pos":14014},"to":{"change":22,"start":544126,"end":544136},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":544126},"to":{"change":22,"start":544126,"end":544136},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":"impl ChannelTxnT for GenericTxn {"},{"Add":" type Changeset = Db;"},{"Add":""},{"Add":" type Revchangeset = Db;"},{"Add":""},{"Add":" type Channelstates = Db;"},{"Add":" sanakirja_get!(changeset, ChangeId, u64, GraphError);"},{"Add":" sanakirja_get!(revchangeset, u64, (ChangeId, Merkle), GraphError);"},{"Add":" sanakirja_cursor!(changeset, ChangeId, u64);"},{"Add":" sanakirja_cursor_ref!(revchangeset, u64, (ChangeId, Merkle));"},{"Add":" sanakirja_rev_cursor!(revchangeset, u64, (ChangeId, Merkle));"},{"Add":"}"},{"Add":""},{"Add":"impl DepsTxnT for GenericTxn {"},{"Add":" type DepsError = SanakirjaError;"},{"Add":" type Dep = Db;"},{"Add":" type Revdep = Db;"},{"Add":""},{"Add":" sanakirja_table_get!(dep, ChangeId, ChangeId, DepsError);"},{"Add":" sanakirja_table_get!(revdep, ChangeId, ChangeId, DepsError);"},{"Add":" sanakirja_cursor_ref!(dep, ChangeId, ChangeId);"},{"Add":" fn iter_dep_ref + Clone>("},{"Add":" txn: RT,"},{"Add":" p: ChangeId,"},{"Add":" ) -> Result, TxnErr>"},{"Add":" {"},{"Add":" Self::cursor_dep_ref(txn.clone(), &txn.dep, Some((p, None)))"}],"del_contents":[{"Del":" fn hash_from_prefix(&self, s: &str) -> Result<(Hash, ChangeId), super::HashPrefixError> {\n"},{"Del":" let h = if let Some(h) = Hash::from_prefix(s) {\n h\n } else {\n"},{"Del":" return Err(super::HashPrefixError::Parse(s.to_string()));\n"},{"Del":" };\n let mut result = None;\n debug!(\"h = {:?}\", h);\n for (e, i) in self.txn.iter(&self.internal, Some((h, None))) {\n debug!(\"{:?} {:?}\", e, i);\n if e < h {\n continue;\n } else {\n let b32 = e.to_base32();\n debug!(\"{:?}\", b32);\n let (b32, _) = b32.split_at(s.len().min(b32.len()));\n if b32 != s {\n break;\n } else if result.is_none() {\n result = Some((e, i))\n } else {\n"},{"Del":" return Err(super::HashPrefixError::Ambiguous(s.to_string()));\n"},{"Del":" }\n }\n }\n if let Some(result) = result {\n Ok(result)\n } else {\n"},{"Del":" Err(super::HashPrefixError::NotFound(s.to_string()))\n"},{"Del":" }\n"}]}},{"Edit":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":411,"atom":{"NewVertex":{"up_context":[{"change":22,"pos":544142}],"down_context":[{"change":22,"pos":544142}],"flag":"BLOCK","start":41694,"end":41923,"inode":{"change":22,"pos":531056}}},"contents":[{"Add":""},{"Add":" sanakirja_table_get!(touched_files, Position, ChangeId, DepsError);"},{"Add":" sanakirja_table_get!(rev_touched_files, ChangeId, Position, DepsError);"},{"Add":""},{"Add":" type Touched_files = Db, ChangeId>;"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":417,"ins":{"up_context":[{"change":22,"pos":544143}],"down_context":[{"change":22,"pos":545469}],"flag":"BLOCK","start":41924,"end":42905,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":544143},"to":{"change":22,"start":544143,"end":544252},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":544252},"to":{"change":22,"start":14015,"end":14063},"introduced_by":22},{"previous":"","flag":"DELETED","from":{"change":22,"pos":14063},"to":{"change":22,"start":544291,"end":544416},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":544291},"to":{"change":22,"start":544291,"end":544416},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":544416},"to":{"change":22,"start":14064,"end":14134},"introduced_by":22},{"previous":"","flag":"DELETED","from":{"change":22,"pos":14134},"to":{"change":22,"start":544496,"end":545049},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":544496},"to":{"change":22,"start":544496,"end":545049},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":545049},"to":{"change":22,"start":14135,"end":14217},"introduced_by":22},{"previous":"","flag":"DELETED","from":{"change":22,"pos":14217},"to":{"change":22,"start":545217,"end":545338},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":545217},"to":{"change":22,"start":545217,"end":545338},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":545338},"to":{"change":22,"start":14218,"end":14283},"introduced_by":22},{"previous":"","flag":"DELETED","from":{"change":22,"pos":14283},"to":{"change":22,"start":545459,"end":545469},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":545459},"to":{"change":22,"start":545459,"end":545469},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" type Rev_touched_files = Db>;"},{"Add":" sanakirja_iter!(touched_files, Position, ChangeId);"},{"Add":" sanakirja_iter!(rev_touched_files, ChangeId, Position);"},{"Add":" fn iter_revdep("},{"Add":" &self,"},{"Add":" k: ChangeId,"},{"Add":" ) -> Result<"},{"Add":" super::Cursor,"},{"Add":" TxnErr,"},{"Add":" > {"},{"Add":" self.cursor_dep(&self.revdep, Some((k, None)))"},{"Add":" }"},{"Add":""},{"Add":" fn iter_dep("},{"Add":" &self,"},{"Add":" k: ChangeId,"},{"Add":" ) -> Result<"},{"Add":" super::Cursor,"},{"Add":" TxnErr,"},{"Add":" > {"},{"Add":" self.cursor_dep(&self.dep, Some((k, None)))"},{"Add":" }"},{"Add":""},{"Add":" fn iter_touched("},{"Add":" &self,"},{"Add":" k: Position,"},{"Add":" ) -> Result<"},{"Add":" super::Cursor, ChangeId>,"},{"Add":" TxnErr,"},{"Add":" > {"},{"Add":" self.cursor_touched_files(&self.touched_files, Some((k, None)))"}],"del_contents":[{"Del":" fn hash_from_prefix_remote<'txn>(\n &'txn self,\n remote: &RemoteRef,\n s: &str,\n"},{"Del":" ) -> Result {\n"},{"Del":" let remote = remote.borrow();\n let h = if let Some(h) = Hash::from_prefix(s) {\n h\n } else {\n"},{"Del":" return Err(super::HashPrefixError::Parse(s.to_string()));\n"},{"Del":" };\n let mut result = None;\n debug!(\"h = {:?}\", h);\n for (e, _) in self.txn.iter(&remote.rev, Some((h, None))) {\n debug!(\"{:?}\", e);\n if e < h {\n continue;\n } else {\n let b32 = e.to_base32();\n debug!(\"{:?}\", b32);\n let (b32, _) = b32.split_at(s.len().min(b32.len()));\n if b32 != s {\n break;\n } else if result.is_none() {\n result = Some(e)\n } else {\n"},{"Del":" return Err(super::HashPrefixError::Ambiguous(s.to_string()));\n"},{"Del":" }\n }\n }\n if let Some(result) = result {\n Ok(result)\n } else {\n"},{"Del":" Err(super::HashPrefixError::NotFound(s.to_string()))\n"},{"Del":" }\n"}]}},{"Edit":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":450,"atom":{"NewVertex":{"up_context":[{"change":22,"pos":545476}],"down_context":[{"change":22,"pos":545495}],"flag":"BLOCK","start":42906,"end":43311,"inode":{"change":22,"pos":531056}}},"contents":[{"Add":" fn iter_rev_touched("},{"Add":" &self,"},{"Add":" k: ChangeId,"},{"Add":" ) -> Result<"},{"Add":" super::Cursor>,"},{"Add":" TxnErr,"},{"Add":" > {"},{"Add":" self.cursor_rev_touched_files(&self.rev_touched_files, Some((k, None)))"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl TreeTxnT for GenericTxn {"},{"Add":" type TreeError = SanakirjaError;"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":465,"ins":{"up_context":[{"change":22,"pos":617}],"down_context":[{"change":22,"pos":545701}],"flag":"BLOCK","start":43312,"end":43459,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":22,"pos":617},"to":{"change":22,"start":545544,"end":545669},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":545544},"to":{"change":22,"start":545544,"end":545669},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" sanakirja_table_get!(inodes, Inode, Position, TreeError);"},{"Add":" sanakirja_table_get!(revinodes, Position, Inode, TreeError);"}],"del_contents":[{"Del":" sanakirja_table_get!(inodes, Inode, Position);\n sanakirja_table_get!(revinodes, Position, Inode);\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":472,"ins":{"up_context":[{"change":22,"pos":545820}],"down_context":[{"change":22,"pos":545909}],"flag":"BLOCK","start":43460,"end":43606,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":545820},"to":{"change":22,"start":545820,"end":545909},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" sanakirja_table_get!("},{"Add":" tree,"},{"Add":" PathId,"},{"Add":" Inode,"},{"Add":" TreeError,"},{"Add":" (UnsafePathId::from_fileid(key), value),"},{"Add":" );"}],"del_contents":[{"Del":" sanakirja_table_get!(tree, PathId, Inode, (UnsafePathId::from_fileid(key), value),);\n"}]}},{"Edit":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":513,"atom":{"NewVertex":{"up_context":[{"change":22,"pos":546862}],"down_context":[{"change":22,"pos":546862}],"flag":"BLOCK","start":43607,"end":43626,"inode":{"change":22,"pos":531056}}},"contents":[{"Add":" TreeError,"}]}},{"Edit":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":524,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":547109},"to":{"change":22,"start":547109,"end":547110},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":547129},"to":{"change":22,"start":547129,"end":547169},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":547169},"to":{"change":22,"start":36943,"end":36944},"introduced_by":22},{"previous":"","flag":"DELETED","from":{"change":22,"pos":36944},"to":{"change":22,"start":547188,"end":547241},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":547188},"to":{"change":22,"start":547188,"end":547241},"introduced_by":22}],"inode":{"change":22,"pos":531056}}},"contents":[{"Del":"\n"},{"Del":" type Changeset = Db;\n"},{"Del":"\n"},{"Del":" type Revchangeset = Db;\n"}]}},{"Edit":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":525,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":22,"pos":36946},"to":{"change":22,"start":547260,"end":547589},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":547260},"to":{"change":22,"start":547260,"end":547589},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":547608},"to":{"change":22,"start":547608,"end":547648},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":547667},"to":{"change":22,"start":547667,"end":548014},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":548033},"to":{"change":22,"start":548033,"end":548208},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":548208},"to":{"change":22,"start":2066,"end":2135},"introduced_by":22},{"previous":"","flag":"DELETED","from":{"change":22,"pos":2135},"to":{"change":22,"start":548302,"end":548309},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":548302},"to":{"change":22,"start":548302,"end":548309},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":548328},"to":{"change":22,"start":548328,"end":548387},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":548387},"to":{"change":22,"start":36947,"end":36948},"introduced_by":22},{"previous":"","flag":"DELETED","from":{"change":22,"pos":36948},"to":{"change":22,"start":548406,"end":548606},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":548406},"to":{"change":22,"start":548406,"end":548606},"introduced_by":22}],"inode":{"change":22,"pos":531056}}},"contents":[{"Del":" type Channelstates = Db;\n sanakirja_get!(changeset, ChangeId, u64);\n sanakirja_get!(revchangeset, u64, (ChangeId, Merkle));\n sanakirja_cursor!(changeset, ChangeId, u64);\n sanakirja_cursor_ref!(revchangeset, u64, (ChangeId, Merkle));\n sanakirja_rev_cursor!(revchangeset, u64, (ChangeId, Merkle));\n\n"},{"Del":" type Dep = Db;\n\n"},{"Del":" type Revdep = Db;\n\n sanakirja_table_get!(dep, ChangeId, ChangeId);\n sanakirja_table_get!(revdep, ChangeId, ChangeId);\n sanakirja_cursor_ref!(dep, ChangeId, ChangeId);\n sanakirja_table_get!(touched_files, Position, ChangeId);\n sanakirja_table_get!(rev_touched_files, ChangeId, Position);\n\n"},{"Del":" fn iter_dep_ref + Clone>(\n txn: RT,\n p: ChangeId,\n ) -> super::Cursor {\n"},{"Del":" Self::cursor_dep_ref(txn.clone(), &txn.dep, Some((p, None)))\n"},{"Del":" }\n\n"},{"Del":" type Touched_files = Db, ChangeId>;\n"},{"Del":"\n"},{"Del":" type Rev_touched_files = Db>;\n sanakirja_iter!(touched_files, Position, ChangeId);\n sanakirja_iter!(rev_touched_files, ChangeId, Position);\n\n"}]}},{"Edit":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":540,"atom":{"NewVertex":{"up_context":[{"change":22,"pos":549082}],"down_context":[{"change":22,"pos":549082}],"flag":"BLOCK","start":43627,"end":45838,"inode":{"change":22,"pos":531056}}},"contents":[{"Add":" fn iter_inodes("},{"Add":" &self,"},{"Add":" ) -> Result<"},{"Add":" super::Cursor>,"},{"Add":" TxnErr,"},{"Add":" > {"},{"Add":" self.cursor_inodes(&self.inodes, None)"},{"Add":" }"},{"Add":""},{"Add":" #[cfg(debug_assertions)]"},{"Add":" fn iter_revinodes("},{"Add":" &self,"},{"Add":" ) -> Result<"},{"Add":" super::Cursor, Inode>,"},{"Add":" TxnErr,"},{"Add":" > {"},{"Add":" self.cursor_revinodes(&self.revinodes, None)"},{"Add":" }"},{"Add":""},{"Add":" fn iter_partials<'txn>("},{"Add":" &'txn self,"},{"Add":" k: &str,"},{"Add":" ) -> Result<"},{"Add":" super::Cursor>,"},{"Add":" TxnErr,"},{"Add":" > {"},{"Add":" let k0 = SmallString::from_str(k);"},{"Add":" self.cursor_partials(&self.partials, Some((k0, None)))"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl TxnT for GenericTxn {"},{"Add":" fn hash_from_prefix("},{"Add":" &self,"},{"Add":" s: &str,"},{"Add":" ) -> Result<(Hash, ChangeId), super::HashPrefixError> {"},{"Add":" let h = if let Some(h) = Hash::from_prefix(s) {"},{"Add":" h"},{"Add":" } else {"},{"Add":" return Err(super::HashPrefixError::Parse(s.to_string()));"},{"Add":" };"},{"Add":" let mut result = None;"},{"Add":" debug!(\"h = {:?}\", h);"},{"Add":" for x in self"},{"Add":" .txn"},{"Add":" .iter(&self.internal, Some((h, None)))"},{"Add":" .map_err(|e| super::HashPrefixError::Txn(e.into()))?"},{"Add":" {"},{"Add":" let (e, i) = x.map_err(|e| super::HashPrefixError::Txn(e.into()))?;"},{"Add":" debug!(\"{:?} {:?}\", e, i);"},{"Add":" if e < h {"},{"Add":" continue;"},{"Add":" } else {"},{"Add":" let b32 = e.to_base32();"},{"Add":" debug!(\"{:?}\", b32);"},{"Add":" let (b32, _) = b32.split_at(s.len().min(b32.len()));"},{"Add":" if b32 != s {"},{"Add":" break;"},{"Add":" } else if result.is_none() {"},{"Add":" result = Some((e, i))"},{"Add":" } else {"},{"Add":" return Err(super::HashPrefixError::Ambiguous(s.to_string()));"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" if let Some(result) = result {"},{"Add":" Ok(result)"},{"Add":" } else {"},{"Add":" Err(super::HashPrefixError::NotFound(s.to_string()))"},{"Add":" }"},{"Add":" }"}]}},{"Edit":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":612,"atom":{"NewVertex":{"up_context":[{"change":22,"pos":549083}],"down_context":[{"change":22,"pos":549083}],"flag":"BLOCK","start":45839,"end":47221,"inode":{"change":22,"pos":531056}}},"contents":[{"Add":" fn hash_from_prefix_remote<'txn>("},{"Add":" &'txn self,"},{"Add":" remote: &RemoteRef,"},{"Add":" s: &str,"},{"Add":" ) -> Result> {"},{"Add":" let remote = remote.borrow();"},{"Add":" let h = if let Some(h) = Hash::from_prefix(s) {"},{"Add":" h"},{"Add":" } else {"},{"Add":" return Err(super::HashPrefixError::Parse(s.to_string()));"},{"Add":" };"},{"Add":" let mut result = None;"},{"Add":" debug!(\"h = {:?}\", h);"},{"Add":" for x in self"},{"Add":" .txn"},{"Add":" .iter(&remote.rev, Some((h, None)))"},{"Add":" .map_err(|e| super::HashPrefixError::Txn(e.into()))?"},{"Add":" {"},{"Add":" let (e, _) = x.map_err(|e| super::HashPrefixError::Txn(e.into()))?;"},{"Add":" debug!(\"{:?}\", e);"},{"Add":" if e < h {"},{"Add":" continue;"},{"Add":" } else {"},{"Add":" let b32 = e.to_base32();"},{"Add":" debug!(\"{:?}\", b32);"},{"Add":" let (b32, _) = b32.split_at(s.len().min(b32.len()));"},{"Add":" if b32 != s {"},{"Add":" break;"},{"Add":" } else if result.is_none() {"},{"Add":" result = Some(e)"},{"Add":" } else {"},{"Add":" return Err(super::HashPrefixError::Ambiguous(s.to_string()));"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" if let Some(result) = result {"},{"Add":" Ok(result)"},{"Add":" } else {"},{"Add":" Err(super::HashPrefixError::NotFound(s.to_string()))"},{"Add":" }"},{"Add":" }"},{"Add":""}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":655,"ins":{"up_context":[{"change":22,"pos":549091}],"down_context":[{"change":22,"pos":549160}],"flag":"BLOCK","start":47222,"end":47348,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":549091},"to":{"change":22,"start":549091,"end":549160},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" fn load_channel("},{"Add":" &self,"},{"Add":" name: &str,"},{"Add":" ) -> Result>, TxnErr> {"}],"del_contents":[{"Del":" fn load_channel(&self, name: &str) -> Option> {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":667,"ins":{"up_context":[{"change":22,"pos":549585}],"down_context":[{"change":22,"pos":549607}],"flag":"BLOCK","start":47349,"end":47372,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":549585},"to":{"change":22,"start":549585,"end":549607},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" )?"}],"del_contents":[{"Del":" )\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":682,"ins":{"up_context":[{"change":22,"pos":550134}],"down_context":[{"change":22,"pos":550167}],"flag":"BLOCK","start":47373,"end":47410,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":550134},"to":{"change":22,"start":550134,"end":550167},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" return Ok(None);"}],"del_contents":[{"Del":" return None;\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":687,"ins":{"up_context":[{"change":22,"pos":550246}],"down_context":[{"change":22,"pos":550312}],"flag":"BLOCK","start":47411,"end":47471,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":550246},"to":{"change":22,"start":374,"end":430},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" Ok(self.open_channels.borrow().get(&name).cloned())"}],"del_contents":[{"Del":" self.open_channels.borrow().get(&name).cloned()\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":690,"ins":{"up_context":[{"change":22,"pos":550319}],"down_context":[{"change":22,"pos":550386}],"flag":"BLOCK","start":47472,"end":47573,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":550319},"to":{"change":22,"start":550319,"end":550386},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" fn load_remote(&self, name: &str) -> Result>, TxnErr> {"}],"del_contents":[{"Del":" fn load_remote(&self, name: &str) -> Option> {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":698,"ins":{"up_context":[{"change":22,"pos":550721}],"down_context":[{"change":22,"pos":550741}],"flag":"BLOCK","start":47574,"end":47595,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":550721},"to":{"change":22,"start":550721,"end":550741},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" )? {"}],"del_contents":[{"Del":" ) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":709,"ins":{"up_context":[{"change":22,"pos":551128}],"down_context":[{"change":22,"pos":551161}],"flag":"BLOCK","start":47596,"end":47633,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":551128},"to":{"change":22,"start":551128,"end":551161},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" return Ok(None);"}],"del_contents":[{"Del":" return None;\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":714,"ins":{"up_context":[{"change":22,"pos":551240}],"down_context":[{"change":22,"pos":551305}],"flag":"BLOCK","start":47634,"end":47693,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":551240},"to":{"change":22,"start":431,"end":486},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" Ok(self.open_remotes.borrow().get(&name).cloned())"}],"del_contents":[{"Del":" self.open_remotes.borrow().get(&name).cloned()\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":733,"ins":{"up_context":[{"change":22,"pos":551813}],"down_context":[{"change":22,"pos":551898}],"flag":"BLOCK","start":47694,"end":47836,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":551813},"to":{"change":22,"start":551813,"end":551898},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" fn iter_channels<'txn>("},{"Add":" &'txn self,"},{"Add":" start: &str,"},{"Add":" ) -> Result, TxnErr> {"}],"del_contents":[{"Del":" fn iter_channels<'txn>(&'txn self, start: &str) -> ChannelIterator<'txn, Self> {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":739,"ins":{"up_context":[{"change":22,"pos":552019}],"down_context":[{"change":22,"pos":552125}],"flag":"BLOCK","start":47837,"end":47947,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":552019},"to":{"change":22,"start":552019,"end":552125},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" Ok(ChannelIterator {"},{"Add":" cursor: self.txn.set_cursors(&self.channels, Some((name, None)))?.0,"}],"del_contents":[{"Del":" ChannelIterator {\n cursor: self.txn.set_cursors(&self.channels, Some((name, None))).0,\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":742,"ins":{"up_context":[{"change":22,"pos":552148}],"down_context":[{"change":22,"pos":552158}],"flag":"BLOCK","start":47948,"end":47959,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":552148},"to":{"change":22,"start":552148,"end":552158},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" })"}],"del_contents":[{"Del":" }\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":760,"ins":{"up_context":[{"change":22,"pos":552611}],"down_context":[{"change":22,"pos":552695}],"flag":"BLOCK","start":47960,"end":48101,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":552611},"to":{"change":22,"start":552611,"end":552695},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" fn iter_remotes<'txn>("},{"Add":" &'txn self,"},{"Add":" start: &str,"},{"Add":" ) -> Result, TxnErr> {"}],"del_contents":[{"Del":" fn iter_remotes<'txn>(&'txn self, start: &str) -> RemotesIterator<'txn, Self> {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":766,"ins":{"up_context":[{"change":22,"pos":552816}],"down_context":[{"change":22,"pos":552921}],"flag":"BLOCK","start":48102,"end":48211,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":552816},"to":{"change":22,"start":552816,"end":552921},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" Ok(RemotesIterator {"},{"Add":" cursor: self.txn.set_cursors(&self.remotes, Some((name, None)))?.0,"}],"del_contents":[{"Del":" RemotesIterator {\n cursor: self.txn.set_cursors(&self.remotes, Some((name, None))).0,\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":769,"ins":{"up_context":[{"change":22,"pos":552944}],"down_context":[{"change":22,"pos":552954}],"flag":"BLOCK","start":48212,"end":48223,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":552944},"to":{"change":22,"start":552944,"end":552954},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" })"}],"del_contents":[{"Del":" }\n"}]}},{"Edit":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":772,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":36950},"to":{"change":22,"start":2136,"end":2256},"introduced_by":22},{"previous":"","flag":"DELETED","from":{"change":22,"pos":2256},"to":{"change":22,"start":553148,"end":553195},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":553148},"to":{"change":22,"start":553148,"end":553195},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":553195},"to":{"change":22,"start":553195,"end":553202},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":553202},"to":{"change":22,"start":709,"end":738},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":738},"to":{"change":8,"start":445,"end":571},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":571},"to":{"change":22,"start":880,"end":940},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":880},"to":{"change":22,"start":880,"end":940},"introduced_by":22},{"previous":"","flag":"DELETED","from":{"change":22,"pos":940},"to":{"change":22,"start":115,"end":115},"introduced_by":22},{"previous":"","flag":"DELETED","from":{"change":22,"pos":115},"to":{"change":22,"start":2257,"end":2292},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":553202},"to":{"change":22,"start":2257,"end":2292},"introduced_by":22},{"previous":"","flag":"DELETED","from":{"change":22,"pos":2292},"to":{"change":22,"start":553267,"end":553288},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":553267},"to":{"change":22,"start":553267,"end":553288},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":553288},"to":{"change":22,"start":2293,"end":2368},"introduced_by":22},{"previous":"","flag":"DELETED","from":{"change":22,"pos":2368},"to":{"change":22,"start":553368,"end":553430},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":553368},"to":{"change":22,"start":553368,"end":553430},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":553430},"to":{"change":22,"start":2369,"end":2401},"introduced_by":22},{"previous":"","flag":"DELETED","from":{"change":22,"pos":2401},"to":{"change":22,"start":553492,"end":553513},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":553492},"to":{"change":22,"start":553492,"end":553513},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":553513},"to":{"change":22,"start":2402,"end":2477},"introduced_by":22},{"previous":"","flag":"DELETED","from":{"change":22,"pos":2477},"to":{"change":22,"start":553593,"end":553652},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":553593},"to":{"change":22,"start":553593,"end":553652},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":553652},"to":{"change":22,"start":2478,"end":2514},"introduced_by":22},{"previous":"","flag":"DELETED","from":{"change":22,"pos":2514},"to":{"change":22,"start":553718,"end":553749},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":553718},"to":{"change":22,"start":553718,"end":553749},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":553749},"to":{"change":22,"start":2515,"end":2610},"introduced_by":22},{"previous":"","flag":"DELETED","from":{"change":22,"pos":2610},"to":{"change":22,"start":553853,"end":553932},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":553853},"to":{"change":22,"start":553853,"end":553932},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":553932},"to":{"change":22,"start":2611,"end":2651},"introduced_by":22},{"previous":"","flag":"DELETED","from":{"change":22,"pos":2651},"to":{"change":22,"start":554002,"end":554023},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":554002},"to":{"change":22,"start":554002,"end":554023},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":554023},"to":{"change":22,"start":2652,"end":2749},"introduced_by":22},{"previous":"","flag":"DELETED","from":{"change":22,"pos":2749},"to":{"change":22,"start":554125,"end":554218},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":554125},"to":{"change":22,"start":554125,"end":554218},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":554237},"to":{"change":22,"start":554237,"end":554517},"introduced_by":22}],"inode":{"change":22,"pos":531056}}},"contents":[{"Del":" fn iter_inodes(\n &self,\n ) -> super::Cursor> {\n"},{"Del":" self.cursor_inodes(&self.inodes, None)\n"},{"Del":" }\n\n"},{"Del":" #[cfg(debug_assertions)]\n"},{"Del":" fn iter_revinodes(\n &self,\n ) -> super::Cursor, Inode> {\n"},{"Del":" self.cursor_revinodes(&self.revinodes, None)\n }\n\n"},{"Del":""},{"Del":" fn iter_revdep(\n &self,\n"},{"Del":" k: ChangeId,\n"},{"Del":" ) -> super::Cursor {\n"},{"Del":" self.cursor_dep(&self.revdep, Some((k, None)))\n }\n\n"},{"Del":" fn iter_dep(\n &self,\n"},{"Del":" k: ChangeId,\n"},{"Del":" ) -> super::Cursor {\n"},{"Del":" self.cursor_dep(&self.dep, Some((k, None)))\n }\n\n"},{"Del":" fn iter_touched(\n &self,\n"},{"Del":" k: Position,\n"},{"Del":" ) -> super::Cursor, ChangeId> {\n"},{"Del":" self.cursor_touched_files(&self.touched_files, Some((k, None)))\n }\n\n"},{"Del":" fn iter_rev_touched(\n &self,\n"},{"Del":" k: ChangeId,\n"},{"Del":" ) -> super::Cursor>\n"},{"Del":" {\n self.cursor_rev_touched_files(&self.rev_touched_files, Some((k, None)))\n }\n\n"},{"Del":" fn iter_partials<'txn>(\n &'txn self,\n k: &str,\n ) -> super::Cursor>\n {\n let k0 = SmallString::from_str(k);\n self.cursor_partials(&self.partials, Some((k0, None)))\n }\n\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":782,"ins":{"up_context":[{"change":22,"pos":554839}],"down_context":[{"change":22,"pos":554923}],"flag":"BLOCK","start":48224,"end":48365,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":554839},"to":{"change":22,"start":554839,"end":554923},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" ) -> Result<"},{"Add":" super::Cursor,"},{"Add":" TxnErr,"},{"Add":" > {"}],"del_contents":[{"Del":" ) -> super::Cursor {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":793,"ins":{"up_context":[{"change":22,"pos":555087}],"down_context":[{"change":22,"pos":555174}],"flag":"BLOCK","start":48366,"end":48510,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":555087},"to":{"change":22,"start":555087,"end":555174},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" ) -> Result<"},{"Add":" super::RevCursor,"},{"Add":" TxnErr,"},{"Add":" > {"}],"del_contents":[{"Del":" ) -> super::RevCursor {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":800,"ins":{"up_context":[{"change":22,"pos":555242}],"down_context":[{"change":22,"pos":555312}],"flag":"BLOCK","start":48511,"end":48638,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":555242},"to":{"change":22,"start":555242,"end":555312},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" fn get_remote("},{"Add":" &mut self,"},{"Add":" name: &str,"},{"Add":" ) -> Result>, TxnErr> {"}],"del_contents":[{"Del":" fn get_remote(&mut self, name: &str) -> Option> {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":811,"ins":{"up_context":[{"change":22,"pos":555647}],"down_context":[{"change":22,"pos":555667}],"flag":"BLOCK","start":48639,"end":48660,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":555647},"to":{"change":22,"start":555647,"end":555667},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" )? {"}],"del_contents":[{"Del":" ) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":822,"ins":{"up_context":[{"change":22,"pos":556054}],"down_context":[{"change":22,"pos":556087}],"flag":"BLOCK","start":48661,"end":48698,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":556054},"to":{"change":22,"start":556054,"end":556087},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" return Ok(None);"}],"del_contents":[{"Del":" return None;\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":827,"ins":{"up_context":[{"change":22,"pos":556166}],"down_context":[{"change":22,"pos":556231}],"flag":"BLOCK","start":48699,"end":48758,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":556166},"to":{"change":22,"start":487,"end":542},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" Ok(self.open_remotes.borrow().get(&name).cloned())"}],"del_contents":[{"Del":" self.open_remotes.borrow().get(&name).cloned()\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":830,"ins":{"up_context":[{"change":22,"pos":556238}],"down_context":[{"change":22,"pos":556369}],"flag":"BLOCK","start":48759,"end":48965,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":556238},"to":{"change":22,"start":556238,"end":556369},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" fn last_remote("},{"Add":" &self,"},{"Add":" remote: &Self::Remote,"},{"Add":" ) -> Result, TxnErr> {"},{"Add":" Ok(self.txn.rev_iter(remote, None)?.next().transpose()?)"}],"del_contents":[{"Del":" fn last_remote(&self, remote: &Self::Remote) -> Option<(u64, (Hash, Merkle))> {\n self.txn.rev_iter(remote, None).next()\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":837,"ins":{"up_context":[{"change":22,"pos":556376}],"down_context":[{"change":22,"pos":556591}],"flag":"BLOCK","start":48966,"end":49322,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":556376},"to":{"change":22,"start":556376,"end":556533},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":556533},"to":{"change":22,"start":543,"end":579},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" fn get_remote_state("},{"Add":" &self,"},{"Add":" remote: &Self::Remote,"},{"Add":" n: u64,"},{"Add":" ) -> Result, TxnErr> {"},{"Add":" for x in self.txn.iter(remote, Some((n, None)))? {"},{"Add":" let (k, m) = x?;"},{"Add":" if k >= n {"},{"Add":" return Ok(Some((k, m)));"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(None)"}],"del_contents":[{"Del":" fn get_remote_state(&self, remote: &Self::Remote, n: u64) -> Option<(u64, (Hash, Merkle))> {\n self.txn\n .iter(remote, Some((n, None)))\n"},{"Del":" .find(|(k, _)| *k >= n)\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":851,"ins":{"up_context":[{"change":22,"pos":556598}],"down_context":[{"change":22,"pos":556746}],"flag":"BLOCK","start":49323,"end":49541,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":556598},"to":{"change":22,"start":556598,"end":556746},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" fn remote_has_change("},{"Add":" &self,"},{"Add":" remote: &RemoteRef,"},{"Add":" hash: Hash,"},{"Add":" ) -> Result> {"},{"Add":" Ok(self.txn.get(&remote.db.borrow().rev, hash, None)?.is_some())"}],"del_contents":[{"Del":" fn remote_has_change(&self, remote: &RemoteRef, hash: Hash) -> bool {\n self.txn.get(&remote.db.borrow().rev, hash, None).is_some()\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":858,"ins":{"up_context":[{"change":22,"pos":556752}],"down_context":[{"change":22,"pos":556898}],"flag":"BLOCK","start":49542,"end":49758,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":556752},"to":{"change":22,"start":556752,"end":556898},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" fn remote_has_state("},{"Add":" &self,"},{"Add":" remote: &RemoteRef,"},{"Add":" m: Merkle,"},{"Add":" ) -> Result> {"},{"Add":" Ok(self.txn.get(&remote.db.borrow().states, m, None)?.is_some())"}],"del_contents":[{"Del":" fn remote_has_state(&self, remote: &RemoteRef, m: Merkle) -> bool {\n self.txn.get(&remote.db.borrow().states, m, None).is_some()\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":865,"ins":{"up_context":[{"change":22,"pos":556904}],"down_context":[{"change":22,"pos":558202}],"flag":"BLOCK","start":49759,"end":49976,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":556904},"to":{"change":22,"start":556904,"end":557051},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":557051},"to":{"change":22,"start":557051,"end":557057},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":557057},"to":{"change":22,"start":557057,"end":557915},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":557915},"to":{"change":22,"start":557915,"end":557921},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":557921},"to":{"change":22,"start":557921,"end":558202},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" fn channel_has_state("},{"Add":" &self,"},{"Add":" channel: &ChannelRef,"},{"Add":" m: Merkle,"},{"Add":" ) -> Result> {"},{"Add":" Ok(self.txn.get(&channel.borrow().states, m, None)?.is_some())"}],"del_contents":[{"Del":" fn channel_has_state(&self, channel: &ChannelRef, m: Merkle) -> bool {\n self.txn.get(&channel.borrow().states, m, None).is_some()\n"},{"Del":" }\n"},{"Del":"}\n\n/*\nimpl MutTxn {\n pub fn with_remote_mut)>(\n &mut self,\n name: &str,\n mut f: F,\n ) -> Result {\n let name = SmallString::from_str(name);\n let name = UnsafeSmallStr::from_small_str(name.as_small_str());\n if let Some((mut db0, db1, db2)) = self.txn.get(&self.remotes, name, None) {\n f(&mut db0);\n\n let mut db: ::sanakirja::Db =\n unsafe { std::mem::transmute(self.remotes) };\n\n self.txn.del(&mut self.rng, &mut db, name, None)?;\n self.remotes = unsafe { std::mem::transmute(db) };\n\n self.txn\n .put(&mut self.rng, &mut self.remotes, name, (db0, db1, db2))?;\n\n Ok(true)\n } else {\n Ok(false)\n }\n"},{"Del":" }\n"},{"Del":"\n pub fn del_remote(&mut self, name: &str) -> Result<(), anyhow::Error> {\n let name = SmallString::from_str(name);\n let name = UnsafeSmallStr::from_small_str(name.as_small_str());\n self.txn.del(&mut self.rng, &mut self.remotes, name, None)?;\n Ok(())\n"}]}},{"Edit":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":873,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":558210},"to":{"change":22,"start":558210,"end":558214},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":558214},"to":{"change":22,"start":558214,"end":558872},"introduced_by":22}],"inode":{"change":22,"pos":531056}}},"contents":[{"Del":" */\n"},{"Del":"\nimpl MutTxnT for MutTxn<()> {\n sanakirja_put_del!(internal, Hash, ChangeId);\n sanakirja_put_del!(external, ChangeId, Hash);\n\n sanakirja_put_del!(inodes, Inode, Position);\n sanakirja_put_del!(revinodes, Position, Inode);\n\n sanakirja_put_del!(tree, PathId, Inode, UnsafePathId::from_fileid(k), v);\n sanakirja_put_del!(revtree, Inode, PathId, k, UnsafePathId::from_fileid(v),);\n\n sanakirja_put_del!(dep, ChangeId, ChangeId);\n sanakirja_put_del!(revdep, ChangeId, ChangeId);\n sanakirja_put_del!(touched_files, Position, ChangeId);\n sanakirja_put_del!(rev_touched_files, ChangeId, Position);\n"}]}},{"Edit":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":874,"atom":{"NewVertex":{"up_context":[{"change":22,"pos":558873}],"down_context":[{"change":22,"pos":558892}],"flag":"BLOCK","start":49977,"end":50012,"inode":{"change":22,"pos":531056}}},"contents":[{"Add":"impl GraphMutTxnT for MutTxn<()> {"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":880,"ins":{"up_context":[{"change":22,"pos":559008}],"down_context":[{"change":22,"pos":559047}],"flag":"BLOCK","start":50013,"end":50063,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":559008},"to":{"change":22,"start":14284,"end":14321},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" ) -> Result> {"}],"del_contents":[{"Del":" ) -> Result {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":889,"ins":{"up_context":[{"change":22,"pos":559250}],"down_context":[{"change":22,"pos":559289}],"flag":"BLOCK","start":50064,"end":50114,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":559250},"to":{"change":22,"start":14322,"end":14359},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" ) -> Result> {"}],"del_contents":[{"Del":" ) -> Result {\n"}]}},{"Edit":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":893,"atom":{"NewVertex":{"up_context":[{"change":22,"pos":559394}],"down_context":[{"change":22,"pos":559394}],"flag":"BLOCK","start":50115,"end":50241,"inode":{"change":22,"pos":531056}}},"contents":[{"Add":" sanakirja_put_del!(internal, Hash, ChangeId, GraphError);"},{"Add":" sanakirja_put_del!(external, ChangeId, Hash, GraphError);"},{"Add":"}"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":897,"ins":{"up_context":[{"change":22,"pos":559395}],"down_context":[{"change":22,"pos":560126}],"flag":"BLOCK","start":50242,"end":50279,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":559395},"to":{"change":22,"start":14360,"end":14454},"introduced_by":22},{"previous":"","flag":"DELETED","from":{"change":22,"pos":14454},"to":{"change":22,"start":559510,"end":559731},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":559510},"to":{"change":22,"start":559510,"end":559731},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":559731},"to":{"change":22,"start":36953,"end":36954},"introduced_by":22},{"previous":"","flag":"DELETED","from":{"change":22,"pos":36954},"to":{"change":22,"start":559750,"end":559846},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":559750},"to":{"change":22,"start":559750,"end":559846},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":559846},"to":{"change":22,"start":14455,"end":14492},"introduced_by":22},{"previous":"","flag":"DELETED","from":{"change":22,"pos":14492},"to":{"change":22,"start":559885,"end":560107},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":559885},"to":{"change":22,"start":559885,"end":560107},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":"impl ChannelMutTxnT for MutTxn<()> {"}],"del_contents":[{"Del":" fn put_partials(&mut self, k: &str, e: Position) -> Result {\n"},{"Del":" let k = SmallString::from_str(k);\n Ok(self.txn.put(\n &mut self.rng,\n &mut self.partials,\n UnsafeSmallStr::from_small_str(k.as_small_str()),\n e,\n )?)\n }\n"},{"Del":"\n"},{"Del":" fn del_partials(\n &mut self,\n k: &str,\n e: Option>,\n"},{"Del":" ) -> Result {\n"},{"Del":" let k = SmallString::from_str(k);\n Ok(self.txn.del(\n &mut self.rng,\n &mut self.partials,\n UnsafeSmallStr::from_small_str(k.as_small_str()),\n e,\n )?)\n }\n\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":904,"ins":{"up_context":[{"change":22,"pos":560268}],"down_context":[{"change":22,"pos":560386}],"flag":"BLOCK","start":50280,"end":50410,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":560268},"to":{"change":22,"start":14493,"end":14540},"introduced_by":22},{"previous":"","flag":"DELETED","from":{"change":22,"pos":14540},"to":{"change":22,"start":560317,"end":560386},"introduced_by":22},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":560317},"to":{"change":22,"start":560317,"end":560386},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" ) -> Result, TxnErr> {"},{"Add":" if self.get_changeset(&channel.changes, p, None)?.is_none() {"}],"del_contents":[{"Del":" ) -> Result, Self::Error> {\n"},{"Del":" if self.get_changeset(&channel.changes, p, None).is_none() {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":908,"ins":{"up_context":[{"change":22,"pos":560477}],"down_context":[{"change":22,"pos":560596}],"flag":"BLOCK","start":50411,"end":50528,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":560477},"to":{"change":22,"start":560477,"end":560596},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" let m = if let Some(x) = self.txn.rev_iter(&channel.revchanges, None)?.next() {"},{"Add":" (x?.1).1"}],"del_contents":[{"Del":" let m = if let Some((_, (_, m))) = self.txn.rev_iter(&channel.revchanges, None).next() {\n m\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":915,"ins":{"up_context":[{"change":22,"pos":560719}],"down_context":[{"change":22,"pos":560783}],"flag":"BLOCK","start":50529,"end":50594,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":560719},"to":{"change":22,"start":560719,"end":560783},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" .get_revchangeset(&channel.revchanges, t, None)?"}],"del_contents":[{"Del":" .get_revchangeset(&channel.revchanges, t, None)\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":932,"ins":{"up_context":[{"change":22,"pos":561234}],"down_context":[{"change":22,"pos":561273}],"flag":"BLOCK","start":50595,"end":50645,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":561234},"to":{"change":22,"start":14541,"end":14578},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" ) -> Result> {"}],"del_contents":[{"Del":" ) -> Result {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":934,"ins":{"up_context":[{"change":22,"pos":561308}],"down_context":[{"change":22,"pos":561390}],"flag":"BLOCK","start":50646,"end":50753,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":561308},"to":{"change":22,"start":561308,"end":561390},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" for x in self.txn.iter(&channel.revchanges, Some((t, None)))? {"},{"Add":" let (t_, (p, _)) = x?;"}],"del_contents":[{"Del":" for (t_, (p, _)) in self.txn.iter(&channel.revchanges, Some((t, None))) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":941,"ins":{"up_context":[{"change":22,"pos":561510}],"down_context":[{"change":22,"pos":561597}],"flag":"BLOCK","start":50754,"end":50866,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":561510},"to":{"change":22,"start":561510,"end":561597},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" for x in self.txn.rev_iter(&channel.revchanges, Some((t, None)))? {"},{"Add":" let (t_, (_, m_)) = x?;"}],"del_contents":[{"Del":" for (t_, (_, m_)) in self.txn.rev_iter(&channel.revchanges, Some((t, None))) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":953,"ins":{"up_context":[{"change":22,"pos":561901}],"down_context":[{"change":22,"pos":561962}],"flag":"BLOCK","start":50867,"end":50929,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":561901},"to":{"change":22,"start":561901,"end":561962},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" m = m.next(&self.get_external(*p)?.unwrap());"}],"del_contents":[{"Del":" m = m.next(&self.get_external(*p).unwrap());\n"}]}},{"Edit":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":961,"atom":{"NewVertex":{"up_context":[{"change":22,"pos":562193}],"down_context":[{"change":22,"pos":562193}],"flag":"BLOCK","start":50930,"end":52083,"inode":{"change":22,"pos":531056}}},"contents":[{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl DepsMutTxnT for MutTxn<()> {"},{"Add":" sanakirja_put_del!(dep, ChangeId, ChangeId, DepsError);"},{"Add":" sanakirja_put_del!(revdep, ChangeId, ChangeId, DepsError);"},{"Add":" sanakirja_put_del!(touched_files, Position, ChangeId, DepsError);"},{"Add":" sanakirja_put_del!(rev_touched_files, ChangeId, Position, DepsError);"},{"Add":"}"},{"Add":""},{"Add":"impl TreeMutTxnT for MutTxn<()> {"},{"Add":" sanakirja_put_del!(inodes, Inode, Position, TreeError);"},{"Add":" sanakirja_put_del!(revinodes, Position, Inode, TreeError);"},{"Add":""},{"Add":" sanakirja_put_del!("},{"Add":" tree,"},{"Add":" PathId,"},{"Add":" Inode,"},{"Add":" TreeError,"},{"Add":" UnsafePathId::from_fileid(k),"},{"Add":" v"},{"Add":" );"},{"Add":" sanakirja_put_del!("},{"Add":" revtree,"},{"Add":" Inode,"},{"Add":" PathId,"},{"Add":" TreeError,"},{"Add":" k,"},{"Add":" UnsafePathId::from_fileid(v)"},{"Add":" );"},{"Add":""},{"Add":" fn put_partials("},{"Add":" &mut self,"},{"Add":" k: &str,"},{"Add":" e: Position,"},{"Add":" ) -> Result> {"},{"Add":" let k = SmallString::from_str(k);"},{"Add":" Ok(self.txn.put("},{"Add":" &mut self.rng,"},{"Add":" &mut self.partials,"},{"Add":" UnsafeSmallStr::from_small_str(k.as_small_str()),"},{"Add":" e,"},{"Add":" )?)"}]}},{"Edit":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1006,"atom":{"NewVertex":{"up_context":[{"change":22,"pos":562200}],"down_context":[{"change":22,"pos":562200}],"flag":"BLOCK","start":52084,"end":52483,"inode":{"change":22,"pos":531056}}},"contents":[{"Add":" fn del_partials("},{"Add":" &mut self,"},{"Add":" k: &str,"},{"Add":" e: Option>,"},{"Add":" ) -> Result> {"},{"Add":" let k = SmallString::from_str(k);"},{"Add":" Ok(self.txn.del("},{"Add":" &mut self.rng,"},{"Add":" &mut self.partials,"},{"Add":" UnsafeSmallStr::from_small_str(k.as_small_str()),"},{"Add":" e,"},{"Add":" )?)"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl MutTxnT for MutTxn<()> {"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1027,"ins":{"up_context":[{"change":22,"pos":562319}],"down_context":[{"change":22,"pos":562358}],"flag":"BLOCK","start":52484,"end":52526,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":562319},"to":{"change":22,"start":14579,"end":14616},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" ) -> Result {"}],"del_contents":[{"Del":" ) -> Result {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1034,"ins":{"up_context":[{"change":22,"pos":562607}],"down_context":[{"change":22,"pos":562707}],"flag":"BLOCK","start":52527,"end":52661,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":562607},"to":{"change":22,"start":14617,"end":14715},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" fn del_remote("},{"Add":" &mut self,"},{"Add":" remote: &mut RemoteRef,"},{"Add":" k: u64,"},{"Add":" ) -> Result {"}],"del_contents":[{"Del":" fn del_remote(&mut self, remote: &mut RemoteRef, k: u64) -> Result {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1040,"ins":{"up_context":[{"change":22,"pos":562753}],"down_context":[{"change":22,"pos":562823}],"flag":"BLOCK","start":52662,"end":52733,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":562753},"to":{"change":22,"start":562753,"end":562823},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" if let Some((h, m)) = self.txn.get(&remote.remote, k, None)? {"}],"del_contents":[{"Del":" if let Some((h, m)) = self.txn.get(&remote.remote, k, None) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1049,"ins":{"up_context":[{"change":22,"pos":563092}],"down_context":[{"change":22,"pos":563190}],"flag":"BLOCK","start":52734,"end":52835,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":563092},"to":{"change":22,"start":14716,"end":14812},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" fn open_or_create_channel(&mut self, name: &str) -> Result, Self::GraphError> {"}],"del_contents":[{"Del":" fn open_or_create_channel(&mut self, name: &str) -> Result, Self::Error> {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1065,"ins":{"up_context":[{"change":22,"pos":563779}],"down_context":[{"change":22,"pos":563799}],"flag":"BLOCK","start":52836,"end":52857,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":563779},"to":{"change":22,"start":563779,"end":563799},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" )? {"}],"del_contents":[{"Del":" ) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1106,"ins":{"up_context":[{"change":22,"pos":565222}],"down_context":[{"change":22,"pos":565273}],"flag":"BLOCK","start":52858,"end":52923,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":565222},"to":{"change":22,"start":14813,"end":14873},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" ) -> Result, ForkError> {"}],"del_contents":[{"Del":" ) -> Result, ForkError> {\n"}]}},{"Edit":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1116,"atom":{"NewVertex":{"up_context":[{"change":22,"pos":565555}],"down_context":[{"change":22,"pos":565555}],"flag":"BLOCK","start":52924,"end":52976,"inode":{"change":22,"pos":531056}}},"contents":[{"Add":" .map_err(|e| ForkError::Txn(e.into()))?"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1153,"ins":{"up_context":[{"change":22,"pos":566578}],"down_context":[{"change":22,"pos":566615}],"flag":"BLOCK","start":52977,"end":53028,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":566578},"to":{"change":22,"start":15715,"end":15761},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" ) -> Result<(), ForkError> {"}],"del_contents":[{"Del":" ) -> Result<(), ForkError> {\n"}]}},{"Edit":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1162,"atom":{"NewVertex":{"up_context":[{"change":22,"pos":566855}],"down_context":[{"change":22,"pos":566855}],"flag":"BLOCK","start":53029,"end":53081,"inode":{"change":22,"pos":531056}}},"contents":[{"Add":" .map_err(|e| ForkError::Txn(e.into()))?"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1193,"ins":{"up_context":[{"change":22,"pos":567504}],"down_context":[{"change":22,"pos":567580}],"flag":"BLOCK","start":53082,"end":53161,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":567504},"to":{"change":22,"start":16141,"end":16215},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" fn drop_channel(&mut self, name: &str) -> Result {"}],"del_contents":[{"Del":" fn drop_channel(&mut self, name: &str) -> Result {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1207,"ins":{"up_context":[{"change":22,"pos":567999}],"down_context":[{"change":22,"pos":568095}],"flag":"BLOCK","start":53162,"end":53261,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":567999},"to":{"change":22,"start":16216,"end":16310},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" fn open_or_create_remote(&mut self, name: &str) -> Result, Self::GraphError> {"}],"del_contents":[{"Del":" fn open_or_create_remote(&mut self, name: &str) -> Result, Self::Error> {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1216,"ins":{"up_context":[{"change":22,"pos":568483}],"down_context":[{"change":22,"pos":568503}],"flag":"BLOCK","start":53262,"end":53283,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":568483},"to":{"change":22,"start":568483,"end":568503},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" )? {"}],"del_contents":[{"Del":" ) {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1247,"ins":{"up_context":[{"change":22,"pos":569566}],"down_context":[{"change":22,"pos":569654}],"flag":"BLOCK","start":53284,"end":53375,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":569566},"to":{"change":22,"start":16311,"end":16397},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" fn drop_remote(&mut self, remote: RemoteRef) -> Result {"}],"del_contents":[{"Del":" fn drop_remote(&mut self, remote: RemoteRef) -> Result {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1260,"ins":{"up_context":[{"change":22,"pos":570030}],"down_context":[{"change":22,"pos":570111}],"flag":"BLOCK","start":53376,"end":53460,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":570030},"to":{"change":22,"start":16398,"end":16477},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" fn drop_named_remote(&mut self, name: &str) -> Result {"}],"del_contents":[{"Del":" fn drop_named_remote(&mut self, name: &str) -> Result {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1273,"ins":{"up_context":[{"change":22,"pos":570478}],"down_context":[{"change":22,"pos":570533}],"flag":"BLOCK","start":53461,"end":53519,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":570478},"to":{"change":22,"start":16478,"end":16531},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" fn commit(mut self) -> Result<(), Self::GraphError> {"}],"del_contents":[{"Del":" fn commit(mut self) -> Result<(), Self::Error> {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1312,"ins":{"up_context":[{"change":22,"pos":572085}],"down_context":[{"change":22,"pos":572161}],"flag":"BLOCK","start":53520,"end":53620,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":572085},"to":{"change":22,"start":572085,"end":572161},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" pub fn load_const_channel(&self, name: &str) -> Result>, SanakirjaError> {"}],"del_contents":[{"Del":" pub fn load_const_channel(&self, name: &str) -> Option> {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1318,"ins":{"up_context":[{"change":22,"pos":572420}],"down_context":[{"change":22,"pos":572459}],"flag":"BLOCK","start":53621,"end":53664,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":572420},"to":{"change":22,"start":572420,"end":572459},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" )? {"},{"Add":" Ok(Some(Channel {"}],"del_contents":[{"Del":" ) {\n Some(Channel {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1327,"ins":{"up_context":[{"change":22,"pos":572696}],"down_context":[{"change":22,"pos":572711}],"flag":"BLOCK","start":53665,"end":53681,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":572696},"to":{"change":22,"start":572696,"end":572711},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" }))"}],"del_contents":[{"Del":" })\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1329,"ins":{"up_context":[{"change":22,"pos":572728}],"down_context":[{"change":22,"pos":572745}],"flag":"BLOCK","start":53682,"end":53703,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":572728},"to":{"change":22,"start":572728,"end":572745},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" Ok(None)"}],"del_contents":[{"Del":" None\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1386,"ins":{"up_context":[{"change":22,"pos":574894}],"down_context":[{"change":22,"pos":574980}],"flag":"BLOCK","start":53704,"end":53791,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":574894},"to":{"change":22,"start":16715,"end":16806},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" fn put_remotes(&mut self, remote: RemoteRef) -> Result<(), SanakirjaError> {"}],"del_contents":[{"Del":" fn put_remotes(&mut self, remote: RemoteRef) -> Result<(), ::sanakirja::Error> {\n"}]}},{"Replacement":{"inode":{"change":22,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1410,"ins":{"up_context":[{"change":22,"pos":575835}],"down_context":[{"change":22,"pos":575923}],"flag":"BLOCK","start":53792,"end":53881,"inode":{"change":22,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":22,"pos":575835},"to":{"change":22,"start":16807,"end":16900},"introduced_by":22}],"inode":{"change":22,"pos":531056}},"ins_contents":[{"Add":" fn commit_remote(&mut self, remote: RemoteRef) -> Result<(), SanakirjaError> {"}],"del_contents":[{"Del":" fn commit_remote(&mut self, remote: RemoteRef

…

Dependencies

Change contents