{"header":{"message":"Sanakirja 1.0","description":null,"timestamp":"2021-02-25T20:49:57.245342352Z","authors":[{"full_name":"Pierre-Étienne Meunier","name":"pmeunier"}]},"hash":"YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","authors":[],"deps":{"hashes":[["YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","Sanakirja 1.0"],["AA",null],["GMGTWOWOPYCGOD3QEQAF5PSQVZWURAIVU6S6URXNHDAGQSC4P3EAC","Fixing a corruption error in channel rename (the channel was being deallocated in Sanakirja, but still referenced by the transaction)"],["SPA2OL5ITFMLB5P2WL342QAU2FXPKSFS4XHAMW6HYWOGSGLO2MJAC","keep-changes feature (default) to avoid deleting problematic changes"],["ZXCRG5RPZU7DKPFI24IRLHV4DZSB6NJKA73J6FC7ARXT2KGOIV7QC","It seems change inverses will need a little more work"],["ZAEUSICJC3YOWGF6NZEQCQ34PHPRSBCJEP7FIWE6VIWJGVU734HQC","File deletions were not shown with their names in the metadata during record"],["NO2QPRFLGCYUDXYJTOY3S3NZJCCLAFOQUHITKDZ7LSZLRLOV5W3QC","Adding rollback test"],["CZX6TRWR53F2BRLKSUTBPEONKS65IYNBO2FYB4HSWF6OK7DOEJGAC","Fixing a shortcut to detect alive children without iterating"],["2BKYJ2JM5PTXWO6HTVBKFQANWWSCJ4UHJYKAXWGTVZB35AZJ76CQC","Fixing a bug introduced by the recent refactoring"],["JACZYXK43IU5HWLHQBY3BOAE7CUO6NGEXQ3HSZL3CQP3SLGKMBOAC","Fixing a bug in unrecord"],["U4F5G3AU7NBRVVLBLLWU774XAFNB6M5KHK4ENNDQN4FR6HUUNOQQC","Do not delete unknown files during a reset"],["EGSVRZJVIBSPYAI65A25CH5RYAGL4PUP3B24VSRUS3M4WIUCZWHAC","Avoid converting between base32 and hash in pijul::commands::unrecord"],["ZZXBHCN3WGJG26SBKZP3ZG4FYUKY7WK2EDSDXLDMQLK7PDKXISPQC","fixing the protocol"],["KWAGWB73AMLJFK2Z7SBKHHKKHFRX7AQKXCWDN2MBX72RYCNMB36QC","Adding extra dependencies from the config file"],["44BN7FWSIXKG75IJUTCXLJE7VANNQFPRHQXTPLQHFU7AKGLSPQRAC","Do not output files introduced by patches that were not applied during a push"],["LGEJSLTYI7Y2CYC3AN6ECMT3D3MTWCAKZPVQEG5MPM2OBW5FQ46AC","Fixing output (including its uses in reset and pull)"],["JGJOYE3JQD7RJVM2RLMFX4QWOZ62V6RZ4RARBW6JUIJTEQG4ORJQC","document ignore capability in pijul add"],["EQLDTLXVCARE36EJE3S6SNEVTW2JJY4EYD36EX7WSIFLG2XMKKQAC","Fixing a bug with empty new files, and another one with empty replacements"],["WEHUTJUKHOJIBMEK2M7ILPK532FMO7YGWTEAHOIXZP5WOOOSF3ZAC","Lockfile update"],["HMMMKONLCRAXVT7SO2ITTFDOJIQKKVSRIZPXYVPDC34RCBHWMHVAC","Fixing alive vertices"],["7MNTFTDF62XHPRL56GJLTGRVB6QOLYDRYGY2XOKDO745RXOCBB4QC","Exit with an error when a change could not be signed"],["I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","Massive cleanup, and simplification"],["V2MDXX622MAXHXGLX7ERVKGYZVZDCYJIFET3TGGIK455XIADYJUAC","Channel rename: do not leave the old name behind"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["23LVKATNTT74YKHG7KJM6SBO2IVZEV24TQ46ZJIHQ2IXONWNVXJAC","Use pager crate for log output"],["GVQ7YSEDDCYYYWDJ5JUVFSBWA5EZVOZJI63KK6E46N6Y2B6LP72AC","Checking for dependencies even for a local change"],["BZSC7VMYSFRXDHDDAMCDR6X67FN5VWIBOSE76BQLX7OCVOJFUA3AC","address clippy lints"],["KD4JIMAE6M2LFWEHFPEL4RTRV7UWYWNGGS52N2TKQ42ZNFSNLCEQC","Listing the working copy in alphabetical order (instead of reverse alphabetical)"],["7T5STZYBIUN5AQPFKASNYO24QFLNBX3YCE4YIIXEQNJYR5LSZ6EQC","Now you can `pijul remove` the root of a repository"],["DNQHXWRZF6EWII3RGQ6HPGFD47BOOFH4FCQHSCACBS3RLQO3DNIQC","address clippy hard errors"],["KQTD46KVVWMJ3W6O55BEJLCVTNTDLUH6QT46AEFT7OU2SELXG4IAC","Unrecord: restore files *after* having unapplied the *entire* change"],["SLJ3OHD4F6GJGZ3SV2D7DMR3PXYHPSI64X77KZ3RJ24EGEX6ZNQAC","unrecord: show list of changes if none were given as arguments"],["CIEUBH465IFZXO3YDG7XYHP54NJ4TGVQD47SKNW6P5XM4X7IVNBAC","Fixing an index-out-of-bounds error when serialising bad changes"],["NA5I4WYNE2O3LPSHXGWXW7XL4YNYFDREEGDOP6LJ5HJXTQDXM7BAC","Fixing the inverse of conflict resolutions"],["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","Upgrading to Sanakirja 0.15 + version bump"],["43AJ37IXON6PMMYRZM6OB2MJXPYCNIWW2XBDVNBXIRH5DD7JDTVQC","Getting rid of edge validation, which does not work for zombie conflicts"],["B3QWIGDERNMB3M6P5WTWP5CN2DB3KCS7MVTEPC2XVJ237ZXVQGMAC","Fixing the Git features with the latest Pijul (+ conflicts in Cargo.toml)"],["CXM5CBS27BL35Z6TRCI7OS4AHWVJ4VFND7HECGAUC74ZQ5KFZXLAC","Fixing `pijul remove` when files are not deleted"],["ENKQ3QZGH2QW246C7GSZRKYLODJOQHKZZSYV7QHB7VPOFP5PASVQC","Forward the exit status messages from the SSH background loop to the client (solving hangs)"],["UFCZKKLXVYQYQBYENCAFHY3ZPPSDAJJAIREZSYNQM4QNXV6G6RXAC","Upgrading to the latest Sanakirja/Rand"],["PSKXR4QEPPVJZR777HW67IEHUPGZB44MFCNQ2KUS422Q3W22IQWAC","Do not load the entire change in memory in log"],["D3LR4GTKRC3RKLTLFY3PB265YI3GR7ELCCB4U2STH3YEH4BZI6KAC","Fixing a panic when decoding ChangeId from base32"],["WKX5S4Z4DOB5S6A6X5V6ECZFCHQUMWRGX5XT4FBOG57P6HPWK7CAC","remove unneccesary explicit lifetimes"],["6RVT5X4LTRP5XHVDESXMIC2DHMT5MUQ24ZDWEBJ4XYTF6LJXK7CAC","Current state: return zero instead of an Option if there is no change on the channel"],["B5Z4IMEUYAEJPOU5EIAXI7VYZVUM6CWKV7CTSOXK3F4GXTNNMMAAC","Generating Cargo.nix for pijul 1.0.0-alpha.6"],["JL4WKA5PBKXRNAMETYO4I52QKASQ3COYHH2JKGA7W5YLIRZZH53AC","Implement the Sanakirja concurrency model in a cross-process way"],["UZZQ3VIA4YVL7C6P22LBPWWPB4BKH6VQLYKVHGQ3XRFISKM52TRQC","lorri needs to be told which Nix shell definition to use"],["SNZ3OAMCPUGFYON5SZHQQQK46ZZMVMJECJYEUCMG657UVLY2PNBQC","use native external subcommand support instead of hand-rolled one"],["YAJAXIV5VL263Z6FYLKFPROB3MQPRPH22P44GRGRVGEP56HOMBOAC","Unrecording changes atomically"],["OJZWJUF2TCGZ7RFVY6FPKBS5P3C4BGHZDPVH775OHVNVFMJICKNQC","MUCH faster `pijul add -r`"],["33SQMZYXPV2A3F7P6WBFKFO2BTQV6THSQXOLV3PCZASC6OTKVHTQC","New versions of dependencies"],["5BRU2RRWOQBMS2V3RQM7PRFR5UILYZ73GISHAKJA6KIZGC5M2MFAC","Cleanup (debugging a crash related to trees/inodes)"],["JMBGCWM5FYXPAMTU5R7UCMBIHJMUVCT44B6KGQ7P7XZRX662TC4QC","Fixing a zombie, probably due to the new conflict algorithm"],["73NW2X2MI767RYNTKS67ZB5QUWYEAA4SCORLD52K36ZU3JAK67AQC","Returning a parse error instead of panicking when parsing a text change"],["QE64ATLZWMKHYABCD3VA547PYXCK6YN3K7RE2TX3SCQNKG7XLVAQC","Fixing asynchronicity problems in SSH"],["BZCGXVS77ZS3N4QPLIHNWZ3YFVV7H4PXQD3U6RN5ZFVOC7QL7MBQC","Fixing two bugs around conflicts on the last line, where invalid patches were produced (first bug) and applied (second bug)"],["H62VFFJEBL2I3O4D3BAJZ57ROPWUISC7JCDIWFBC5DAYJRHMMDXAC","Cargo.nix, and solving conflicts"],["VMPAOJS2ZFOLNXALHWSVM5AFENWX6ZUACB45EJV3HXI7DQNAZPHQC","Don't output after pushing to a local channel"],["R3H7D42UZ446V5TO2574BMAQQAYYJPEIMSZVDPAGVIYU2COJSWBAC","Debugging `pijul git`: proper error reporting"],["QMTANHVNRPQ5IX66FYQBFRBDCTN6YKMNCO6OHTQ6QCUASPWWXJKAC","Reset: only output changed files"],["UBCBQ5FGH2KASHEUPDLIKGLVVX3GSRQ4F4P2JEJZL2NX2DUSYARAC","Removing pijul/src/commands/checkout.rs (unused file), as well as litorg comments"],["BAUL3WR2ACY2HCJIM7K6HJOJ3UXDJISGLMDCSPH3WMPGJPL5AR4QC","Format, versions, README"],["MF3WAHBIH6Q2F7ZOKWPEJF6VGSKJITWLR3Z64GTD6YQZNA5EATWQC","commands/record: amend current change if unspecified"],["CCFJ7VO3I73FE3MZRS5RSDRYNZVW7AXC345P4BXS7JIL2TU3LQJQC","Renaming \"Record\" to \"Hunk\" in the changes"],["XA23FMQM2AI7RMR36AYN7UNP2D5JWVJMJPHURWZO7URM7H46PU6AC","Reset only files that have been modified"],["ZXTHL45OYLOICXTXXEQ6AMNSLMQFZ6BFUJWMO6LZOSDK7ERROC5AC","address clippy lints"],["L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","pijul/*: reorganize imports and remove extern crate"],["OCBM7IFE7CL3PM5KPYTRTKTHYKC76NTFK5C4VA4JFAKQUA6GC7FAC","New release: pijul-1.0.0-alpha.8"],["EEKB5MHJ7KTQSDOLZ26PVZFVQZIQM2RBSYAEVUDKZE6ZG6QIKCGAC","Fixing an error message in unrecord"],["K6GWUOD55G377RVEEMMRPZ4EUAHCM2BGXNRJTE5UZJFFMJGFCEZQC","Styling progress bars"],["NLGQAH4H35XC5XTH26BRXVFWGPPAMA4MDN3MHMGCOYE6ZZQMQ4AAC","Credit and reset relative to current directory instead of the root"],["33ANCTMFGDEI4CDYZCDERYDSWLL2UVXUVAX3GA75RY5VZWYMQSLQC","Fixing a panic when decoding a bad ChangeId"],["A7NTQINQCT6GSJZIBPWM6KD2HYGV4XBSV7FWLFYY4YKLSEOW57KQC","pijul channel delete: error if channel doesn't exist"],["6YMDOZIB5LVYLFIDGN2WNT5JTHEAMS4TFPVDEZ3OWXWOKJOC5QDAC","Refactoring apply"],["IYJZVLETBAQDDELENH3FX7ZTOC3HY4UJ3AMC3MACW6O7ZCWZTR6AC","Cleaning up the literate programming bits"],["Y7YAFMFFJY3SQ3GYN3SS4V3FZWMH3B5L65AXQBXOR5XARSMF5JJQC","Fix path prefix striping on Windows."],["7A2TSC4PAKK3WOH3DMAJASCEC6D5JLJWNFWJTEEBE4CVS4K76PPQC","Conflict solving code (FOLDER edges)"],["NE4A4WUK5IKCMMVWC7MYD6AF2NFJDCJT5EWTP64MRGLDN3WKSIIQC","Parsing of file addition metadata"],["A3DMBJJAPLS6ASSZ7JVVVULRQNZCF2WKYTRUD7EY7PKVYABSATFAC","Upgrading the `git` subcommand to the latest Sanakirja and Libpijul"],["I2D35LLFDA7KMKGVQWDOYZFZVHTRKOCLVRL3M3ZASSU7QQKL4K5AC","More accurate recording of modification time"],["VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","Removing anyhow in libpijul"],["27PYHR6LO4M4RMSMLVMUKSYNQ72V6RRMRXLYQI3JA3LBHJO747YAC","Making the get_latest_touch function (useful to make archives) public in libpijul"],["X6YFD4WVMUYJCR5IYPJH6UKYVWSA7DKBRVJ6XQFXHOE2TRYUTAHAC","Do not download changes if we already have them"],["UNZXTNSJI4YRY3EQ3M4HMBKQDNYDTY6B7IZRBNYGDJXTA2UKYWRAC","Change text format: order dependencies in the order they were on the channel at record time"],["YS2HLPX6S3FCPI3Q7TVFP3XIZPK4JRKV6PFWRNZHCWWC2P2SDDLQC","Don't propose an empty list of changes to push"],["HSVGP2G4D2F56DS3YKZLSYPS4A5BNGH4NTAXAOZ57OCXFM3E5AYAC","Version bump + formatting"],["VQPAUKBQ2POZKL7CZFAZK5ZQKEBYL27XZYZWYUSH5AH25KK6DWKAC","channel switch as an alias to reset"],["DJYHARZ7CSRMX6ZFM6P52SM2EC57VTSHWAIMFSD7Q3EL7UYZGLXQC","Skipping old files when recording"],["Q45QHPO4HDTEZF2W4UDZSYYQ46BPEIWSW4GJILZR5HTJNLKXJABQC","Feedback on network stuff"],["I7VL7VPZV2NKOZRKBWWEHFOGNGGTYLPONHABVJ767D6HPJJNY5RAC","Minor cleanup"],["SAGSYAPXQ2T6GC3B3TNRPNFTZMS7UMME6YQGSF5MOIM66S5NKB2QC","Various version bumps"],["LLT3GY6ULCVHMO3VUSVI5H4O244Z3ULOWLTW2IGJXIA2TWIHJDSQC","When recording, do not consider deleted filenames as current"],["XWETQ4DE4KL2GQWSEBE5NENLTSLIDF7RIWOCCVWJFQOVQJE5P33AC","Upgrading versions"],["3YDPHBANMNSK7Z5SCG745VLTP4BBQWIXCJTQOSDI6UJGYR6S45EQC","address non-controversial clippy lints"],["PCEJFKFXAFGYGHMM4BOBGFV3WRFXEBF2UQYQHLJ7MURRYBKRM3EAC","Progress bar for upload and apply"],["LCERQSWMA2YKOPAPNZUSOQ7FLBGDHBZR33OHLYX7T4KTKULRMJDQC","Cleanup"],["3KRGVQFUWFHPOGZOXVTJYNCM4XBRVYITAEOVPKBSAZ5GZIUO5KVQC","Do not update the mtime of unmodified files"],["PJ7T2VFLV5PYG3CV23GC2GIQETXKGC6CO74JBGREV3JC3LG5OXUAC","Do not hang on locked repositories"],["KVBLRDOUFRYB6BPOQJDD7OVBYMTTPDAUX7CJ5DC3U7WFRI5OLWRAC","Concatenating edits with order conflict resolutions (if relevant), and parsing the text format of the result"],["76PCXGML77EZWTRI5E6KHLVRAFTJ2AB5YRN5EKOYNAPKTWY2KCGAC","Pushing to, and pulling from the local repository"],["6T5ULULMRGU5GJ3JQTEH2QFQN5IMP53TYFFXUT5UE6FA6WWFFMFAC","Fixing conflicts with the changes from discussion #143"],["L5PHFTIERPDAFIOSHZSMAN2CUSFM626ISMGTDYRN5KWPLXCOVPXAC","Minor simplification"],["H23LO7U7MNB5GTLOUIFYAJ6DP57DM3VFBR4IBOAVPMHS356AYFPQC","a few more clippy lints addressed"],["VXZNQQHCDC6MBLUMNDJVPM4I7XWTDYBPZZNCPZCA6EJ3GS5WAQGQC","If an existing file is moved to a new directory that is deleted before the record, record the deletion"],["BD5PC25AB5MKVIYDFSDGRZ4YGX4PKW4SMZ3YAYAPNA5HLDVJUR3QC","Deleting conflict resolution vertices when the sides are deleted"],["WLUID7NANDWTN5GOECNEKFTLZF3MUVS7K26YWLYLSGJ56G63NV4QC","Do not block when downloading more than 100 changes over SSH"],["3WIQYEISUMGOL5FY4LCWOJS55CTTQA7WMJZXAE3Q4GQUTBFLAE7QC","Fixing conflicts in Cargo.lock"],["BXD3IQYNMKMI5BTANCF6NZHZP4CKPWADGJMBT2R3WTMKVKONT5QAC","Fixing --features git"],["ZHABNS3S6FSINO74FOI5KHYXYDTBPO4FQTTYTUS7NNKEVVNLYC4AC","Canonicalize all paths"],["4H2XTVJ2BNXDNHQ3RQTMOG3I4NRGZT7JDLC2GRINS56TIYTYTO4QC","Fix some mistakes in the docs"],["2K7JLB4Z7BS5VFNWD4DO3MKYU7VNPA5MTVHVSDI3FQZ5ICM6XM6QC","No pager on Windows"],["WIORLB47KYY5ZDKSAQEQ5NV2J3F3RIO5FVGD6LGF73FD5LWJLUAAC","Version bump"],["GLMOA3PFDR7HHJ3QMVZBNNJ3CGZAF72AZ5UBNEQON37K5WFNZP6QC","More edges in \"credit\""],["6WFOU7UXCYM5UWA5WVZ72XFRJWJA5GWCIAC5PI5NOEFHNFD3VKNAC","Do a DFS on dependencies to complete the list"],["6DOXSHWGKJIMIPFCNLASGKBAJCJMJULW5HFRZAZ67EYSMXXGJ3KAC","Cleanup, and version bump"],["JRENVH5DF2F4SOV7UNJENFA7VDI3H63XK76R3LFZK6QCW7JIBLSQC","Reqwest 0.11"],["VNBLGT6GAN2AHKRFKTKED7WNDDRGNULY5H343ZYV3ETSDZZKGBTAC","Do not output unmodified files when resetting (fix)"],["G734WNM64AR5BLAZMN5MDPKSFTYXTUQR6MAGB32NRBC5FXFRWSJAC","flake.nix: use crate2nix"],["SQVWP4LU7AAJSEIHK5CNNUK3XBUVT3FGIJIOPTKMR53PO2P4ARNQC","When clone fails, only remove directories we have created (not other directories)"],["CFNFIUJVWV2PHHZKAPBY6GLW4TCX2N66DYH2QCFU5X7D7KE5D4AQC","Parsing the correct flags for new vertices"],["VYHHOEYHO67JNJEODX5L3CQFIV3DAXZBBIQUOMCWJDYF3VWICDNQC","Versions and formatting"],["7UPL3Y2A5QOBU6VIUHNWEFGSGQ5CMWGDGOVLRZ53UARXG3TDGLMAC","Unrecord: don't restore the same unrecorded file deletion twice in the inodes and tree tables"],["XL6Y64UPFLIVRV3YVJMTTMZU7VL6SUXVE6BKL6K7DYRKVJ4X727AC","Fixing a panic when iterating over the basenames of a file"],["NMX52UOGRCY2O7HT7Q45KWISOHNV4PEEMLDYDBJ4QPDIMTVKKJ6AC","Fixing the \"invalid change\" errors"],["UDHP4ZVBQZT2VBURB2MDCU2IZDNMCAFSIUKWRBDQ5BWMFKSN2LYQC","Fixing SSH asynchronicity issues"],["BE7GUCI2N6TX3P2HRMFSH7XLJKILDPOKOXKA7HWOABBFNKCKMZLAC","Completing dependencies only with changes the remote does not have"],["64M73LNCB2V57AWAAKHK2NNERXANMV5V3XI3TFC4XR7FLJNCDCRQC","Hide `pijul lock` and avoid panics when used improperly"],["O4DNWMPDUWI6SKYOZTQKCSX6MSR73CTGCUSM65TSQYVOUSAAS6KAC","Cleaunp and proofreading of libpijul::record"],["MU5GSJAW65PEG3BRYUKZ7O37BPHW3MOX3S5E2RFOXKGUOJEEDQ5AC","Partial push and pull (WARNING: breaks the existing protocol)"],["65S67T3EKKLFRBCU73Z542V7A4JSMGP37OJINON6N563UIBQAITAC","Parsing \\\\ for empty additions (rare problem)"],["ATZ3BWSEFJBLVGDUZFESRNHVCIO6ZRZ3ALPANZSVGVO7A5BUAFQQC","Fixing the double-deletion of repairs for folder edges"],["G6S6PWZEFJK7ARWBIFKDU6VYC5DCJ2YFJMWZOLLWWKU52R2QPXZAC","Do not touch the channel if this is a partial record"],["62XVBWPYCBULZ2IUWF36JVHAPMKCGQC53PQQ53AAGZGC2KT7VQRQC","remove redundant Clap attributes"],["2GQCLJZGIXMTKDVMYIIQJDOR5EXGBZS5FKH2S4DTN25WKKBUMQQQC","Displaying errors returned by the server in the protocol"],["JACZWIJ6UEL5HWZRNOOXTFXUEG67XJDPC5D72LYUPCVVJ6WB7JQAC","Version bump"],["KJDQ2WOMIUTVDEEQ7NMJYBZAVUZ3NIVOVJ6MUCZPRAWIEWOV6TWQC","Fixing the parsing of section headers in the text change format"],["KDF6FJRVF72L274BEUJCTUKRFMNL6BDZMTVKDPEYGFX4TC3YOVSQC","bigger clippy refactors"],["BT2ZHPY4LTECZDNPNLX5IUAEA6CYB4RRBGVBXUNK3ARHMWQK7KHAC","Version bumps"],["QNJBR73KCSCCF6FTHGZDF2K7PZQL3EFKZFOBT77KYZBMALTTW6OQC","don't return Result for infallible functions"],["GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC","Refactoring iterators"],["TPEH2XNBS5RO4IEVKENVF6P65AH7IX64KK2JAYMSJT3J5GXO67EAC","1.0.0-alpha.28, with Tokio 1.0"],["H565UUPCG3M3BQNQPC4DUYJN2GO3DYTODYSHQYIZ2FT6JVSHBE3AC","Use correct pattern for workspace interdependencies"],["ZRUPLBBTT4S6S7A3LOAHG4ONYEGPA5CFO4L2XBCNFKK45MWX3BDAC","Colours in diff and change: separating concerns and dependencies"],["WZVCLZKY34KQBQU6YBGJLQCDADBQ67LQVDNRVCMQVY3O3C3EIWSQC","address clippy lints"],["4OCC6D42GZYRDLH3NSKXMJTRKXP7UZ6Z3YNGCNUT7NT6WBDBCBIAC","Recursive add"],["M5FK3ABTKBDG6HHW32G7UKRJEJQKD2U7BPXNZ3HVHBKULWVV6CTQC","Complete dependencies when pushing and pulling"],["TZVUNELWO5SIK7FKUTAR3ORAV2YYDFJ3EO7CTUOBDX4TXZOL5L3AC","Documentation comments"],["KTTKF3RWYAK2YSH2DYYW5QVG4KSNGWUBJBFHKE24OJ7LFCBF5FEAC","Locking stderr and the progress bar in SSH"],["A6R6SGCPLFM45QNWJLISFBR3EEXVITYHCWEUOPNH4UIGIWJRTZAQC","Fixing a panic in `pijul change`"],["3AMEP2Y5J6GA4AWQONF4JVA3XSR3ASLHHKMYG44R72SOUY3UQCDAC","More convenient interface for channels"],["367UBQ6KNAKUEWG32R4QRJ6H7IE7NAZFOPTC3ZOE4Z6E44RV3ISQC","Forwarding SSH stderr, and progress bar for push"],["7PM25EXLNQ6JUUIZNTAOQYNNIZNG6TJREEBUSAIC3FIOE7FHETSAC","Recursive apply was written a little too fast…"],["7FFFKQZU3TFXWL45TILYNX5A7AC7HBK526SD5DZGYCELN76YE7TAC","add 'Default' implementations"],["3M7WBE24JTPTHWQOU5PO2ZJYKPKEH2F6R4M6RWIRFG334PQEA55QC","Re-adding anyhow in the tests of libpijul"],["OU243LABJJZ3MQHYW2A2MYKW7KZLTZGHJJXDR2BIIIHXT5BSYN3AC","Support for staging"],["LYTVEPH3W5UHF7MAYFWBT6NVNC42HEVKJGGMFDKUDZDNDOI33YJQC","Avoid cloning into an existing path"],["5HF7C67M4DZMYTCIG32XEQQ662AHQMIHTHUK7TAVSO52XLMFBZPAC","push/pull: fixed \"changes\" arguments"],["5DVRL6MFXQOCPOZMYSKBERMRRVUTYRL2SRGRTU2MH4IEOFCDKM3QC","Hard-unrecord"],["AEPEFS7O3YT7CRRFYQVJWUXUUSRGJ6K6XZQVK62B6N74UXOIFWYAC","Write help for each argument"],["IM6UFPOZHZTBMESRXGBALOAWJWUUDGLP2TVLSZ3RZPSJITKB3R7QC","Fixing a test related to the tree/revtree tables"]],"deps":["GMGTWOWOPYCGOD3QEQAF5PSQVZWURAIVU6S6URXNHDAGQSC4P3EAC","SPA2OL5ITFMLB5P2WL342QAU2FXPKSFS4XHAMW6HYWOGSGLO2MJAC","ZXCRG5RPZU7DKPFI24IRLHV4DZSB6NJKA73J6FC7ARXT2KGOIV7QC","ZAEUSICJC3YOWGF6NZEQCQ34PHPRSBCJEP7FIWE6VIWJGVU734HQC","NO2QPRFLGCYUDXYJTOY3S3NZJCCLAFOQUHITKDZ7LSZLRLOV5W3QC","CZX6TRWR53F2BRLKSUTBPEONKS65IYNBO2FYB4HSWF6OK7DOEJGAC","2BKYJ2JM5PTXWO6HTVBKFQANWWSCJ4UHJYKAXWGTVZB35AZJ76CQC","JACZYXK43IU5HWLHQBY3BOAE7CUO6NGEXQ3HSZL3CQP3SLGKMBOAC","U4F5G3AU7NBRVVLBLLWU774XAFNB6M5KHK4ENNDQN4FR6HUUNOQQC","EGSVRZJVIBSPYAI65A25CH5RYAGL4PUP3B24VSRUS3M4WIUCZWHAC","ZZXBHCN3WGJG26SBKZP3ZG4FYUKY7WK2EDSDXLDMQLK7PDKXISPQC","KWAGWB73AMLJFK2Z7SBKHHKKHFRX7AQKXCWDN2MBX72RYCNMB36QC","44BN7FWSIXKG75IJUTCXLJE7VANNQFPRHQXTPLQHFU7AKGLSPQRAC","LGEJSLTYI7Y2CYC3AN6ECMT3D3MTWCAKZPVQEG5MPM2OBW5FQ46AC","JGJOYE3JQD7RJVM2RLMFX4QWOZ62V6RZ4RARBW6JUIJTEQG4ORJQC","EQLDTLXVCARE36EJE3S6SNEVTW2JJY4EYD36EX7WSIFLG2XMKKQAC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","G734WNM64AR5BLAZMN5MDPKSFTYXTUQR6MAGB32NRBC5FXFRWSJAC","5HF7C67M4DZMYTCIG32XEQQ662AHQMIHTHUK7TAVSO52XLMFBZPAC","UZZQ3VIA4YVL7C6P22LBPWWPB4BKH6VQLYKVHGQ3XRFISKM52TRQC","BAUL3WR2ACY2HCJIM7K6HJOJ3UXDJISGLMDCSPH3WMPGJPL5AR4QC","76PCXGML77EZWTRI5E6KHLVRAFTJ2AB5YRN5EKOYNAPKTWY2KCGAC","XWETQ4DE4KL2GQWSEBE5NENLTSLIDF7RIWOCCVWJFQOVQJE5P33AC","PJ7T2VFLV5PYG3CV23GC2GIQETXKGC6CO74JBGREV3JC3LG5OXUAC","L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","UBCBQ5FGH2KASHEUPDLIKGLVVX3GSRQ4F4P2JEJZL2NX2DUSYARAC","L5PHFTIERPDAFIOSHZSMAN2CUSFM626ISMGTDYRN5KWPLXCOVPXAC","YAJAXIV5VL263Z6FYLKFPROB3MQPRPH22P44GRGRVGEP56HOMBOAC","NLGQAH4H35XC5XTH26BRXVFWGPPAMA4MDN3MHMGCOYE6ZZQMQ4AAC","7UPL3Y2A5QOBU6VIUHNWEFGSGQ5CMWGDGOVLRZ53UARXG3TDGLMAC","VQPAUKBQ2POZKL7CZFAZK5ZQKEBYL27XZYZWYUSH5AH25KK6DWKAC","UNZXTNSJI4YRY3EQ3M4HMBKQDNYDTY6B7IZRBNYGDJXTA2UKYWRAC","M5FK3ABTKBDG6HHW32G7UKRJEJQKD2U7BPXNZ3HVHBKULWVV6CTQC","TZVUNELWO5SIK7FKUTAR3ORAV2YYDFJ3EO7CTUOBDX4TXZOL5L3AC","YS2HLPX6S3FCPI3Q7TVFP3XIZPK4JRKV6PFWRNZHCWWC2P2SDDLQC","UDHP4ZVBQZT2VBURB2MDCU2IZDNMCAFSIUKWRBDQ5BWMFKSN2LYQC","VMPAOJS2ZFOLNXALHWSVM5AFENWX6ZUACB45EJV3HXI7DQNAZPHQC","GLMOA3PFDR7HHJ3QMVZBNNJ3CGZAF72AZ5UBNEQON37K5WFNZP6QC","B5Z4IMEUYAEJPOU5EIAXI7VYZVUM6CWKV7CTSOXK3F4GXTNNMMAAC","23LVKATNTT74YKHG7KJM6SBO2IVZEV24TQ46ZJIHQ2IXONWNVXJAC","3WIQYEISUMGOL5FY4LCWOJS55CTTQA7WMJZXAE3Q4GQUTBFLAE7QC","I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","43AJ37IXON6PMMYRZM6OB2MJXPYCNIWW2XBDVNBXIRH5DD7JDTVQC","QE64ATLZWMKHYABCD3VA547PYXCK6YN3K7RE2TX3SCQNKG7XLVAQC","BXD3IQYNMKMI5BTANCF6NZHZP4CKPWADGJMBT2R3WTMKVKONT5QAC","OCBM7IFE7CL3PM5KPYTRTKTHYKC76NTFK5C4VA4JFAKQUA6GC7FAC","H62VFFJEBL2I3O4D3BAJZ57ROPWUISC7JCDIWFBC5DAYJRHMMDXAC","JMBGCWM5FYXPAMTU5R7UCMBIHJMUVCT44B6KGQ7P7XZRX662TC4QC","AEPEFS7O3YT7CRRFYQVJWUXUUSRGJ6K6XZQVK62B6N74UXOIFWYAC","4H2XTVJ2BNXDNHQ3RQTMOG3I4NRGZT7JDLC2GRINS56TIYTYTO4QC","KVBLRDOUFRYB6BPOQJDD7OVBYMTTPDAUX7CJ5DC3U7WFRI5OLWRAC","O4DNWMPDUWI6SKYOZTQKCSX6MSR73CTGCUSM65TSQYVOUSAAS6KAC","Q45QHPO4HDTEZF2W4UDZSYYQ46BPEIWSW4GJILZR5HTJNLKXJABQC","MF3WAHBIH6Q2F7ZOKWPEJF6VGSKJITWLR3Z64GTD6YQZNA5EATWQC","7PM25EXLNQ6JUUIZNTAOQYNNIZNG6TJREEBUSAIC3FIOE7FHETSAC","367UBQ6KNAKUEWG32R4QRJ6H7IE7NAZFOPTC3ZOE4Z6E44RV3ISQC","K6GWUOD55G377RVEEMMRPZ4EUAHCM2BGXNRJTE5UZJFFMJGFCEZQC","PCEJFKFXAFGYGHMM4BOBGFV3WRFXEBF2UQYQHLJ7MURRYBKRM3EAC","62XVBWPYCBULZ2IUWF36JVHAPMKCGQC53PQQ53AAGZGC2KT7VQRQC","SNZ3OAMCPUGFYON5SZHQQQK46ZZMVMJECJYEUCMG657UVLY2PNBQC","5DVRL6MFXQOCPOZMYSKBERMRRVUTYRL2SRGRTU2MH4IEOFCDKM3QC","R3H7D42UZ446V5TO2574BMAQQAYYJPEIMSZVDPAGVIYU2COJSWBAC","5BRU2RRWOQBMS2V3RQM7PRFR5UILYZ73GISHAKJA6KIZGC5M2MFAC","33ANCTMFGDEI4CDYZCDERYDSWLL2UVXUVAX3GA75RY5VZWYMQSLQC","VXZNQQHCDC6MBLUMNDJVPM4I7XWTDYBPZZNCPZCA6EJ3GS5WAQGQC","LCERQSWMA2YKOPAPNZUSOQ7FLBGDHBZR33OHLYX7T4KTKULRMJDQC","2K7JLB4Z7BS5VFNWD4DO3MKYU7VNPA5MTVHVSDI3FQZ5ICM6XM6QC","SAGSYAPXQ2T6GC3B3TNRPNFTZMS7UMME6YQGSF5MOIM66S5NKB2QC","WLUID7NANDWTN5GOECNEKFTLZF3MUVS7K26YWLYLSGJ56G63NV4QC","WIORLB47KYY5ZDKSAQEQ5NV2J3F3RIO5FVGD6LGF73FD5LWJLUAAC","BT2ZHPY4LTECZDNPNLX5IUAEA6CYB4RRBGVBXUNK3ARHMWQK7KHAC","KD4JIMAE6M2LFWEHFPEL4RTRV7UWYWNGGS52N2TKQ42ZNFSNLCEQC","GVQ7YSEDDCYYYWDJ5JUVFSBWA5EZVOZJI63KK6E46N6Y2B6LP72AC","V2MDXX622MAXHXGLX7ERVKGYZVZDCYJIFET3TGGIK455XIADYJUAC","3YDPHBANMNSK7Z5SCG745VLTP4BBQWIXCJTQOSDI6UJGYR6S45EQC","DNQHXWRZF6EWII3RGQ6HPGFD47BOOFH4FCQHSCACBS3RLQO3DNIQC","KDF6FJRVF72L274BEUJCTUKRFMNL6BDZMTVKDPEYGFX4TC3YOVSQC","H23LO7U7MNB5GTLOUIFYAJ6DP57DM3VFBR4IBOAVPMHS356AYFPQC","ZXTHL45OYLOICXTXXEQ6AMNSLMQFZ6BFUJWMO6LZOSDK7ERROC5AC","BZSC7VMYSFRXDHDDAMCDR6X67FN5VWIBOSE76BQLX7OCVOJFUA3AC","WZVCLZKY34KQBQU6YBGJLQCDADBQ67LQVDNRVCMQVY3O3C3EIWSQC","6T5ULULMRGU5GJ3JQTEH2QFQN5IMP53TYFFXUT5UE6FA6WWFFMFAC","4OCC6D42GZYRDLH3NSKXMJTRKXP7UZ6Z3YNGCNUT7NT6WBDBCBIAC","7A2TSC4PAKK3WOH3DMAJASCEC6D5JLJWNFWJTEEBE4CVS4K76PPQC","WKX5S4Z4DOB5S6A6X5V6ECZFCHQUMWRGX5XT4FBOG57P6HPWK7CAC","KTTKF3RWYAK2YSH2DYYW5QVG4KSNGWUBJBFHKE24OJ7LFCBF5FEAC","QNJBR73KCSCCF6FTHGZDF2K7PZQL3EFKZFOBT77KYZBMALTTW6OQC","VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","7T5STZYBIUN5AQPFKASNYO24QFLNBX3YCE4YIIXEQNJYR5LSZ6EQC","KQTD46KVVWMJ3W6O55BEJLCVTNTDLUH6QT46AEFT7OU2SELXG4IAC","A7NTQINQCT6GSJZIBPWM6KD2HYGV4XBSV7FWLFYY4YKLSEOW57KQC","HMMMKONLCRAXVT7SO2ITTFDOJIQKKVSRIZPXYVPDC34RCBHWMHVAC","BD5PC25AB5MKVIYDFSDGRZ4YGX4PKW4SMZ3YAYAPNA5HLDVJUR3QC","JACZWIJ6UEL5HWZRNOOXTFXUEG67XJDPC5D72LYUPCVVJ6WB7JQAC","7FFFKQZU3TFXWL45TILYNX5A7AC7HBK526SD5DZGYCELN76YE7TAC","KJDQ2WOMIUTVDEEQ7NMJYBZAVUZ3NIVOVJ6MUCZPRAWIEWOV6TWQC","X6YFD4WVMUYJCR5IYPJH6UKYVWSA7DKBRVJ6XQFXHOE2TRYUTAHAC","XL6Y64UPFLIVRV3YVJMTTMZU7VL6SUXVE6BKL6K7DYRKVJ4X727AC","A6R6SGCPLFM45QNWJLISFBR3EEXVITYHCWEUOPNH4UIGIWJRTZAQC","3M7WBE24JTPTHWQOU5PO2ZJYKPKEH2F6R4M6RWIRFG334PQEA55QC","ATZ3BWSEFJBLVGDUZFESRNHVCIO6ZRZ3ALPANZSVGVO7A5BUAFQQC","IM6UFPOZHZTBMESRXGBALOAWJWUUDGLP2TVLSZ3RZPSJITKB3R7QC","65S67T3EKKLFRBCU73Z542V7A4JSMGP37OJINON6N563UIBQAITAC","PSKXR4QEPPVJZR777HW67IEHUPGZB44MFCNQ2KUS422Q3W22IQWAC","73NW2X2MI767RYNTKS67ZB5QUWYEAA4SCORLD52K36ZU3JAK67AQC","OJZWJUF2TCGZ7RFVY6FPKBS5P3C4BGHZDPVH775OHVNVFMJICKNQC","BE7GUCI2N6TX3P2HRMFSH7XLJKILDPOKOXKA7HWOABBFNKCKMZLAC","6WFOU7UXCYM5UWA5WVZ72XFRJWJA5GWCIAC5PI5NOEFHNFD3VKNAC","ZHABNS3S6FSINO74FOI5KHYXYDTBPO4FQTTYTUS7NNKEVVNLYC4AC","6RVT5X4LTRP5XHVDESXMIC2DHMT5MUQ24ZDWEBJ4XYTF6LJXK7CAC","IYJZVLETBAQDDELENH3FX7ZTOC3HY4UJ3AMC3MACW6O7ZCWZTR6AC","SLJ3OHD4F6GJGZ3SV2D7DMR3PXYHPSI64X77KZ3RJ24EGEX6ZNQAC","MU5GSJAW65PEG3BRYUKZ7O37BPHW3MOX3S5E2RFOXKGUOJEEDQ5AC","NA5I4WYNE2O3LPSHXGWXW7XL4YNYFDREEGDOP6LJ5HJXTQDXM7BAC","Y7YAFMFFJY3SQ3GYN3SS4V3FZWMH3B5L65AXQBXOR5XARSMF5JJQC","UFCZKKLXVYQYQBYENCAFHY3ZPPSDAJJAIREZSYNQM4QNXV6G6RXAC","6DOXSHWGKJIMIPFCNLASGKBAJCJMJULW5HFRZAZ67EYSMXXGJ3KAC","CFNFIUJVWV2PHHZKAPBY6GLW4TCX2N66DYH2QCFU5X7D7KE5D4AQC","6YMDOZIB5LVYLFIDGN2WNT5JTHEAMS4TFPVDEZ3OWXWOKJOC5QDAC","CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC","NMX52UOGRCY2O7HT7Q45KWISOHNV4PEEMLDYDBJ4QPDIMTVKKJ6AC","CIEUBH465IFZXO3YDG7XYHP54NJ4TGVQD47SKNW6P5XM4X7IVNBAC","TPEH2XNBS5RO4IEVKENVF6P65AH7IX64KK2JAYMSJT3J5GXO67EAC","NE4A4WUK5IKCMMVWC7MYD6AF2NFJDCJT5EWTP64MRGLDN3WKSIIQC","A3DMBJJAPLS6ASSZ7JVVVULRQNZCF2WKYTRUD7EY7PKVYABSATFAC","LYTVEPH3W5UHF7MAYFWBT6NVNC42HEVKJGGMFDKUDZDNDOI33YJQC","H565UUPCG3M3BQNQPC4DUYJN2GO3DYTODYSHQYIZ2FT6JVSHBE3AC","B3QWIGDERNMB3M6P5WTWP5CN2DB3KCS7MVTEPC2XVJ237ZXVQGMAC","JRENVH5DF2F4SOV7UNJENFA7VDI3H63XK76R3LFZK6QCW7JIBLSQC","33SQMZYXPV2A3F7P6WBFKFO2BTQV6THSQXOLV3PCZASC6OTKVHTQC","3KRGVQFUWFHPOGZOXVTJYNCM4XBRVYITAEOVPKBSAZ5GZIUO5KVQC","CCFJ7VO3I73FE3MZRS5RSDRYNZVW7AXC345P4BXS7JIL2TU3LQJQC","2GQCLJZGIXMTKDVMYIIQJDOR5EXGBZS5FKH2S4DTN25WKKBUMQQQC","DJYHARZ7CSRMX6ZFM6P52SM2EC57VTSHWAIMFSD7Q3EL7UYZGLXQC","QMTANHVNRPQ5IX66FYQBFRBDCTN6YKMNCO6OHTQ6QCUASPWWXJKAC","XA23FMQM2AI7RMR36AYN7UNP2D5JWVJMJPHURWZO7URM7H46PU6AC","VNBLGT6GAN2AHKRFKTKED7WNDDRGNULY5H343ZYV3ETSDZZKGBTAC","G6S6PWZEFJK7ARWBIFKDU6VYC5DCJ2YFJMWZOLLWWKU52R2QPXZAC","27PYHR6LO4M4RMSMLVMUKSYNQ72V6RRMRXLYQI3JA3LBHJO747YAC","WEHUTJUKHOJIBMEK2M7ILPK532FMO7YGWTEAHOIXZP5WOOOSF3ZAC","CXM5CBS27BL35Z6TRCI7OS4AHWVJ4VFND7HECGAUC74ZQ5KFZXLAC","3AMEP2Y5J6GA4AWQONF4JVA3XSR3ASLHHKMYG44R72SOUY3UQCDAC","ENKQ3QZGH2QW246C7GSZRKYLODJOQHKZZSYV7QHB7VPOFP5PASVQC","SQVWP4LU7AAJSEIHK5CNNUK3XBUVT3FGIJIOPTKMR53PO2P4ARNQC","ZRUPLBBTT4S6S7A3LOAHG4ONYEGPA5CFO4L2XBCNFKK45MWX3BDAC","I2D35LLFDA7KMKGVQWDOYZFZVHTRKOCLVRL3M3ZASSU7QQKL4K5AC","VYHHOEYHO67JNJEODX5L3CQFIV3DAXZBBIQUOMCWJDYF3VWICDNQC","OU243LABJJZ3MQHYW2A2MYKW7KZLTZGHJJXDR2BIIIHXT5BSYN3AC","JL4WKA5PBKXRNAMETYO4I52QKASQ3COYHH2JKGA7W5YLIRZZH53AC","64M73LNCB2V57AWAAKHK2NNERXANMV5V3XI3TFC4XR7FLJNCDCRQC","EEKB5MHJ7KTQSDOLZ26PVZFVQZIQM2RBSYAEVUDKZE6ZG6QIKCGAC","HSVGP2G4D2F56DS3YKZLSYPS4A5BNGH4NTAXAOZ57OCXFM3E5AYAC","LLT3GY6ULCVHMO3VUSVI5H4O244Z3ULOWLTW2IGJXIA2TWIHJDSQC","7MNTFTDF62XHPRL56GJLTGRVB6QOLYDRYGY2XOKDO745RXOCBB4QC","I7VL7VPZV2NKOZRKBWWEHFOGNGGTYLPONHABVJ767D6HPJJNY5RAC","D3LR4GTKRC3RKLTLFY3PB265YI3GR7ELCCB4U2STH3YEH4BZI6KAC","BZCGXVS77ZS3N4QPLIHNWZ3YFVV7H4PXQD3U6RN5ZFVOC7QL7MBQC"]},"hunks":[{"Replacement":{"inode":{"change":18,"pos":12},"path":"shell.nix","line":1,"ins":{"up_context":[{"change":18,"pos":12}],"down_context":[],"flag":"BLOCK","start":0,"end":562,"inode":{"change":18,"pos":12}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":12},"to":{"change":18,"start":248286,"end":248496},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":248496},"to":{"change":18,"start":0,"end":35},"introduced_by":18}],"inode":{"change":18,"pos":12}},"ins_contents":[{"Add":"with import {};"},{"Add":""},{"Add":"stdenv.mkDerivation {"},{"Add":" name = \"Pijul\";"},{"Add":" buildInputs = with pkgs; ["},{"Add":" xxHash"},{"Add":" zstd"},{"Add":" libsodium"},{"Add":" openssl"},{"Add":" pkgconfig"},{"Add":" ] ++ lib.optionals stdenv.isDarwin"},{"Add":" (with darwin.apple_sdk.frameworks; ["},{"Add":" CoreServices"},{"Add":" Security"},{"Add":" SystemConfiguration"},{"Add":" ]);"},{"Add":"}"},{"Add":""},{"Add":"# (import"},{"Add":"# (fetchTarball {"},{"Add":"# url = \"https://github.com/edolstra/flake-compat/archive/c71d063a2fce96001c7ef99b301dfbd0c29ebde1.tar.gz\";"},{"Add":"# sha256 = \"0vnbhqf0lc4mf2zmzqbfv6kqj9raijxz8xfaimxihz3c6s5gma2x\";"},{"Add":"# })"},{"Add":"# { src = ./.; }).shellNix.default"}],"del_contents":[{"Del":"(import\n (fetchTarball {\n url = \"https://github.com/edolstra/flake-compat/archive/c71d063a2fce96001c7ef99b301dfbd0c29ebde1.tar.gz\";\n sha256 = \"0vnbhqf0lc4mf2zmzqbfv6kqj9raijxz8xfaimxihz3c6s5gma2x\";\n })\n"},{"Del":" { src = ./.; }).shellNix.default\n"}]}},{"Edit":{"inode":{"change":18,"pos":445},"path":"pijul-macros/src/lib.rs","line":57,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":178},"to":{"change":18,"start":178,"end":185},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":185},"to":{"change":18,"start":2144,"end":2496},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":2144},"to":{"change":18,"start":2144,"end":2496},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":2496},"to":{"change":18,"start":186,"end":370},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":370},"to":{"change":18,"start":2553,"end":2566},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":2553},"to":{"change":18,"start":2553,"end":2566},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":2566},"to":{"change":18,"start":371,"end":555},"introduced_by":18}],"inode":{"change":18,"pos":445}}},"contents":[{"Del":" };\n"},{"Del":"\n let pre_ = proc_macro2::TokenStream::from_iter(next(&mut input_iter).into_iter());\n let pre = if !pre_.is_empty() {\n quote! {\n let (key, value) = #pre_;\n }\n } else {\n quote! {}\n };\n let post_ = proc_macro2::TokenStream::from_iter(next(&mut input_iter).into_iter());\n let post = if post_.is_empty() {\n"},{"Del":" quote! { if let Ok(x) = self.txn.get(&self.#name, key, value) {\n Ok(x)\n } else {\n Err(TxnErr(SanakirjaError::PristineCorrupt))\n }\n }\n"},{"Del":" } else {\n"},{"Del":" quote! { if let Ok(x) = self.txn.get(&self.#name, key, value) {\n Ok(x . #post_)\n } else {\n Err(TxnErr(SanakirjaError::PristineCorrupt))\n }}\n"}]}},{"Replacement":{"inode":{"change":18,"pos":445},"path":"pijul-macros/src/lib.rs","line":59,"ins":{"up_context":[{"change":18,"pos":2682}],"down_context":[{"change":18,"pos":2877}],"flag":"BLOCK","start":563,"end":1036,"inode":{"change":18,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":2682},"to":{"change":18,"start":556,"end":681},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":681},"to":{"change":18,"start":2800,"end":2877},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":2800},"to":{"change":18,"start":2800,"end":2877},"introduced_by":18}],"inode":{"change":18,"pos":445}},"ins_contents":[{"Add":" fn #name_get <'txn> (&'txn self, key: &#key, value: Option<&#value>) -> Result, TxnErr> {"},{"Add":" match ::sanakirja::btree::get(&self.txn, &self.#name, key, value) {"},{"Add":" Ok(Some((k, v))) if k == key => Ok(Some(v)),"},{"Add":" Ok(_) => Ok(None),"},{"Add":" Err(e) => {"},{"Add":" error!(\"{:?}\", e);"},{"Add":" Err(TxnErr(SanakirjaError::PristineCorrupt))"},{"Add":" }"},{"Add":" }"}],"del_contents":[{"Del":" fn #name_get <'txn> (&'txn self, key: #key, value: Option<#value>) -> Result, TxnErr> {\n"},{"Del":" use ::sanakirja::Transaction;\n #pre\n #post\n"}]}},{"Replacement":{"inode":{"change":18,"pos":445},"path":"pijul-macros/src/lib.rs","line":92,"ins":{"up_context":[{"change":18,"pos":3671}],"down_context":[{"change":18,"pos":1169}],"flag":"BLOCK","start":1037,"end":1511,"inode":{"change":18,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":3671},"to":{"change":18,"start":868,"end":1006},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":1006},"to":{"change":18,"start":3802,"end":3844},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":3802},"to":{"change":18,"start":3802,"end":3844},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":3844},"to":{"change":18,"start":1007,"end":1169},"introduced_by":18}],"inode":{"change":18,"pos":445}},"ins_contents":[{"Add":" fn #name_get<'txn>(&'txn self, db: &Self::#name_capital, key: &#key, value: Option<&#value>) -> Result, TxnErr> {"},{"Add":" match ::sanakirja::btree::get(&self.txn, db, key, value) {"},{"Add":" Ok(Some((k, v))) if k == key => Ok(Some(v)),"},{"Add":" Ok(_) => Ok(None),"},{"Add":" Err(e) => {"},{"Add":" error!(\"{:?}\", e);"},{"Add":" Err(TxnErr(SanakirjaError::PristineCorrupt))"},{"Add":" }"}],"del_contents":[{"Del":" fn #name_get(&self, db: &Self::#name_capital, key: #key, value: Option<#value>) -> Result, TxnErr> {\n"},{"Del":" use ::sanakirja::Transaction;\n"},{"Del":" if let Ok(x) = self.txn.get(db, key, value) {\n Ok(x)\n } else {\n Err(TxnErr(SanakirjaError::PristineCorrupt))\n"}]}},{"Replacement":{"inode":{"change":18,"pos":445},"path":"pijul-macros/src/lib.rs","line":124,"ins":{"up_context":[{"change":18,"pos":4594}],"down_context":[{"change":18,"pos":4709}],"flag":"BLOCK","start":1512,"end":1642,"inode":{"change":18,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":4594},"to":{"change":18,"start":1370,"end":1492},"introduced_by":18}],"inode":{"change":18,"pos":445}},"ins_contents":[{"Add":" fn #name_get<'txn>(&'txn self, key: &#key, value: Option<&#value>) -> Result, TxnErr>;"}],"del_contents":[{"Del":" fn #name_get<'txn>(&'txn self, key: #key, value: Option<#value>) -> Result, TxnErr>;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":445},"path":"pijul-macros/src/lib.rs","line":148,"ins":{"up_context":[{"change":18,"pos":5483}],"down_context":[{"change":18,"pos":5624}],"flag":"BLOCK","start":1643,"end":1799,"inode":{"change":18,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":5483},"to":{"change":18,"start":1679,"end":1827},"introduced_by":18}],"inode":{"change":18,"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":" fn #name_get<'txn>(&'txn self, db: &Self::#name_capital, key: #key, value: Option<#value>) -> Result, TxnErr>;\n"}]}},{"Edit":{"inode":{"change":18,"pos":445},"path":"pijul-macros/src/lib.rs","line":155,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":5778}],"down_context":[{"change":18,"pos":5778}],"flag":"BLOCK","start":1800,"end":1823,"inode":{"change":18,"pos":445}}},"contents":[{"Add":" let mut level = 0;"}]}},{"Replacement":{"inode":{"change":18,"pos":445},"path":"pijul-macros/src/lib.rs","line":161,"ins":{"up_context":[{"change":18,"pos":5941}],"down_context":[{"change":18,"pos":5980}],"flag":"BLOCK","start":1824,"end":2027,"inode":{"change":18,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":5941},"to":{"change":18,"start":5941,"end":5980},"introduced_by":18}],"inode":{"change":18,"pos":445}},"ins_contents":[{"Add":" if level == 0 {"},{"Add":" return result;"},{"Add":" } else {"},{"Add":" result.push(TokenTree::Punct(p))"},{"Add":" }"}],"del_contents":[{"Del":" return result;\n"}]}},{"Edit":{"inode":{"change":18,"pos":445},"path":"pijul-macros/src/lib.rs","line":167,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":6002}],"down_context":[{"change":18,"pos":6002}],"flag":"BLOCK","start":2028,"end":2305,"inode":{"change":18,"pos":445}}},"contents":[{"Add":" } else if p.as_char() == '<' {"},{"Add":" level += 1;"},{"Add":" result.push(TokenTree::Punct(p))"},{"Add":" } else if level > 0 && p.as_char() == '>' {"},{"Add":" level -= 1;"},{"Add":" result.push(TokenTree::Punct(p))"}]}},{"Replacement":{"inode":{"change":18,"pos":445},"path":"pijul-macros/src/lib.rs","line":177,"ins":{"up_context":[{"change":18,"pos":6112}],"down_context":[{"change":18,"pos":6151}],"flag":"BLOCK","start":2306,"end":2377,"inode":{"change":18,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":6112},"to":{"change":18,"start":6112,"end":6151},"introduced_by":18}],"inode":{"change":18,"pos":445}},"ins_contents":[{"Add":" Some(e) => {"},{"Add":" result.push(e)"},{"Add":" },"}],"del_contents":[{"Del":" Some(e) => result.push(e),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":445},"path":"pijul-macros/src/lib.rs","line":255,"ins":{"up_context":[{"change":18,"pos":8573}],"down_context":[{"change":18,"pos":8641}],"flag":"BLOCK","start":2378,"end":2461,"inode":{"change":18,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":8573},"to":{"change":18,"start":2262,"end":2333},"introduced_by":18}],"inode":{"change":18,"pos":445}},"ins_contents":[{"Add":" ) -> Result, TxnErr>;"}],"del_contents":[{"Del":" ) -> Result, TxnErr>;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":445},"path":"pijul-macros/src/lib.rs","line":259,"ins":{"up_context":[{"change":18,"pos":8753}],"down_context":[{"change":18,"pos":8794}],"flag":"BLOCK","start":2462,"end":2545,"inode":{"change":18,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":8753},"to":{"change":18,"start":2334,"end":2405},"introduced_by":18}],"inode":{"change":18,"pos":445}},"ins_contents":[{"Add":" ) -> Result, TxnErr>;"}],"del_contents":[{"Del":" ) -> Result, TxnErr>;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":445},"path":"pijul-macros/src/lib.rs","line":267,"ins":{"up_context":[{"change":18,"pos":9004}],"down_context":[{"change":18,"pos":2406}],"flag":"BLOCK","start":2546,"end":2597,"inode":{"change":18,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":9004},"to":{"change":18,"start":9004,"end":9053},"introduced_by":18}],"inode":{"change":18,"pos":445}},"ins_contents":[{"Add":" pos: Option<(&#key, Option<&#value>)>,"}],"del_contents":[{"Del":" pos: Option<(#key, Option<#value>)>,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":445},"path":"pijul-macros/src/lib.rs","line":279,"ins":{"up_context":[{"change":18,"pos":9347}],"down_context":[{"change":18,"pos":9406}],"flag":"BLOCK","start":2598,"end":2659,"inode":{"change":18,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":9347},"to":{"change":18,"start":9347,"end":9406},"introduced_by":18}],"inode":{"change":18,"pos":445}},"ins_contents":[{"Add":" k: &#key,"},{"Add":" v: Option<&#value>"}],"del_contents":[{"Del":" k: #key,\n v: Option<#value>\n"}]}},{"Replacement":{"inode":{"change":18,"pos":445},"path":"pijul-macros/src/lib.rs","line":290,"ins":{"up_context":[{"change":18,"pos":9668}],"down_context":[{"change":18,"pos":9717}],"flag":"BLOCK","start":2660,"end":2711,"inode":{"change":18,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":9668},"to":{"change":18,"start":9668,"end":9717},"introduced_by":18}],"inode":{"change":18,"pos":445}},"ins_contents":[{"Add":" pos: Option<(&#key, Option<&#value>)>,"}],"del_contents":[{"Del":" pos: Option<(#key, Option<#value>)>,\n"}]}},{"Edit":{"inode":{"change":18,"pos":445},"path":"pijul-macros/src/lib.rs","line":354,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":11796},"to":{"change":18,"start":11796,"end":12184},"introduced_by":18}],"inode":{"change":18,"pos":445}}},"contents":[{"Del":" let pre = proc_macro2::TokenStream::from_iter(next(&mut input_iter).into_iter());\n let post = proc_macro2::TokenStream::from_iter(next(&mut input_iter).into_iter());\n let pre_init = if !pre.is_empty() {\n quote! { let pos = #pre; }\n } else {\n quote! {}\n };\n let post = if !post.is_empty() {\n quote! { . #post }\n } else {\n quote! {}\n };\n"}]}},{"Replacement":{"inode":{"change":18,"pos":445},"path":"pijul-macros/src/lib.rs","line":358,"ins":{"up_context":[{"change":18,"pos":12316}],"down_context":[{"change":18,"pos":0}],"flag":"BLOCK","start":2712,"end":2773,"inode":{"change":18,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":12316},"to":{"change":18,"start":12316,"end":12375},"introduced_by":18}],"inode":{"change":18,"pos":445}},"ins_contents":[{"Add":" k: &#key,"},{"Add":" v: Option<&#value>"}],"del_contents":[{"Del":" k: #key,\n v: Option<#value>\n"}]}},{"Replacement":{"inode":{"change":18,"pos":445},"path":"pijul-macros/src/lib.rs","line":373,"ins":{"up_context":[{"change":18,"pos":12795}],"down_context":[{"change":18,"pos":111}],"flag":"BLOCK","start":2774,"end":2829,"inode":{"change":18,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":12795},"to":{"change":18,"start":12795,"end":12848},"introduced_by":18}],"inode":{"change":18,"pos":445}},"ins_contents":[{"Add":" pos: Option<(&#key, Option<&#value>)>,"}],"del_contents":[{"Del":" pos: Option<(#key, Option<#value>)>,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":445},"path":"pijul-macros/src/lib.rs","line":375,"ins":{"up_context":[{"change":18,"pos":213}],"down_context":[{"change":18,"pos":13156}],"flag":"BLOCK","start":2830,"end":3013,"inode":{"change":18,"pos":445}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":213},"to":{"change":18,"start":12925,"end":12951},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":2746},"to":{"change":18,"start":12925,"end":12951},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":12925},"to":{"change":18,"start":12925,"end":12951},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":12951},"to":{"change":18,"start":2747,"end":2820},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":2820},"to":{"change":18,"start":214,"end":246},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":246},"to":{"change":18,"start":2859,"end":3091},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":2859},"to":{"change":18,"start":2859,"end":3091},"introduced_by":18}],"inode":{"change":18,"pos":445}},"ins_contents":[{"Add":" let mut cursor = ::sanakirja::btree::cursor::Cursor::new(&txn.txn, &db)?;"},{"Add":" if let Some((k, v)) = pos {"},{"Add":" cursor.set(&txn.txn, k, v)?;"}],"del_contents":[{"Del":" #pre_init\n"},{"Del":" if let Ok((cursor, _)) = txn.txn.set_cursors(&db, pos) {\n"},{"Del":" Ok(Cursor {\n"},{"Del":" cursor,\n txn,\n marker: std::marker::PhantomData,\n })\n } else {\n Err(TxnErr(SanakirjaError::PristineCorrupt))\n"}]}},{"Edit":{"inode":{"change":18,"pos":445},"path":"pijul-macros/src/lib.rs","line":379,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":13174}],"down_context":[{"change":18,"pos":13174}],"flag":"BLOCK","start":3014,"end":3261,"inode":{"change":18,"pos":445}}},"contents":[{"Add":" Ok(Cursor {"},{"Add":" cursor,"},{"Add":" txn,"},{"Add":" k: std::marker::PhantomData,"},{"Add":" v: std::marker::PhantomData,"},{"Add":" t: std::marker::PhantomData,"},{"Add":" })"}]}},{"Replacement":{"inode":{"change":18,"pos":445},"path":"pijul-macros/src/lib.rs","line":397,"ins":{"up_context":[{"change":18,"pos":13442}],"down_context":[{"change":18,"pos":3092}],"flag":"BLOCK","start":3262,"end":3317,"inode":{"change":18,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":13442},"to":{"change":18,"start":13442,"end":13495},"introduced_by":18}],"inode":{"change":18,"pos":445}},"ins_contents":[{"Add":" pos: Option<(&#key, Option<&#value>)>,"}],"del_contents":[{"Del":" pos: Option<(#key, Option<#value>)>,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":445},"path":"pijul-macros/src/lib.rs","line":399,"ins":{"up_context":[{"change":18,"pos":3212}],"down_context":[{"change":18,"pos":13714}],"flag":"BLOCK","start":3318,"end":3503,"inode":{"change":18,"pos":445}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":3212},"to":{"change":18,"start":13583,"end":13661},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":13583},"to":{"change":18,"start":13583,"end":13661},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":13661},"to":{"change":18,"start":3213,"end":3532},"introduced_by":18}],"inode":{"change":18,"pos":445}},"ins_contents":[{"Add":" let mut cursor = ::sanakirja::btree::cursor::Cursor::new(&self.txn, &db)?;"},{"Add":" if let Some((k, v)) = pos {"},{"Add":" cursor.set(&self.txn, k, v)?;"}],"del_contents":[{"Del":" #pre_init\n let mut cursor = if pos.is_some() {\n"},{"Del":" if let Ok((x, _)) = self.txn.set_cursors(&db, pos) {\n x\n } else {\n return Err(TxnErr(SanakirjaError::PristineCorrupt))\n }\n } else if let Ok(x) = self.txn.set_cursors_last(&db) {\n x\n"}]}},{"Replacement":{"inode":{"change":18,"pos":445},"path":"pijul-macros/src/lib.rs","line":403,"ins":{"up_context":[{"change":18,"pos":13739}],"down_context":[{"change":18,"pos":3606}],"flag":"BLOCK","start":3504,"end":3571,"inode":{"change":18,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":13739},"to":{"change":18,"start":3533,"end":3605},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":3605},"to":{"change":18,"start":13790,"end":13809},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":13790},"to":{"change":18,"start":13790,"end":13809},"introduced_by":18}],"inode":{"change":18,"pos":445}},"ins_contents":[{"Add":" cursor.set_last(&self.txn)?;"},{"Add":" }"}],"del_contents":[{"Del":" return Err(TxnErr(SanakirjaError::PristineCorrupt))\n"},{"Del":" };\n"}]}},{"Replacement":{"inode":{"change":18,"pos":445},"path":"pijul-macros/src/lib.rs","line":408,"ins":{"up_context":[{"change":18,"pos":13903}],"down_context":[{"change":18,"pos":3645}],"flag":"BLOCK","start":3572,"end":3719,"inode":{"change":18,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":13903},"to":{"change":18,"start":13903,"end":13957},"introduced_by":18}],"inode":{"change":18,"pos":445}},"ins_contents":[{"Add":" k: std::marker::PhantomData,"},{"Add":" v: std::marker::PhantomData,"},{"Add":" t: std::marker::PhantomData,"}],"del_contents":[{"Del":" marker: std::marker::PhantomData,\n"}]}},{"Edit":{"inode":{"change":18,"pos":445},"path":"pijul-macros/src/lib.rs","line":416,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":14056},"to":{"change":18,"start":14056,"end":14109},"introduced_by":18}],"inode":{"change":18,"pos":445}}},"contents":[{"Del":" type #cursor_name = ::sanakirja::Cursor;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":445},"path":"pijul-macros/src/lib.rs","line":419,"ins":{"up_context":[{"change":18,"pos":14241}],"down_context":[{"change":18,"pos":247}],"flag":"BLOCK","start":3720,"end":3775,"inode":{"change":18,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":14241},"to":{"change":18,"start":14241,"end":14294},"introduced_by":18}],"inode":{"change":18,"pos":445}},"ins_contents":[{"Add":" pos: Option<(&#key, Option<&#value>)>,"}],"del_contents":[{"Del":" pos: Option<(#key, Option<#value>)>,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":445},"path":"pijul-macros/src/lib.rs","line":421,"ins":{"up_context":[{"change":18,"pos":357}],"down_context":[{"change":18,"pos":358}],"flag":"BLOCK","start":3776,"end":3979,"inode":{"change":18,"pos":445}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":357},"to":{"change":18,"start":14379,"end":14405},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":3782},"to":{"change":18,"start":14379,"end":14405},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":14379},"to":{"change":18,"start":14379,"end":14405},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":14405},"to":{"change":18,"start":3783,"end":4007},"introduced_by":18}],"inode":{"change":18,"pos":445}},"ins_contents":[{"Add":" let mut cursor = ::sanakirja::btree::cursor::Cursor::new(&self.txn, &db)?;"},{"Add":" if let Some((k, v)) = pos {"},{"Add":" cursor.set(&self.txn, k, v)?;"},{"Add":" }"}],"del_contents":[{"Del":" #pre_init\n"},{"Del":" let mut cursor = if let Ok((x, _)) = self.txn.set_cursors(&db, pos) {\n x\n } else {\n return Err(TxnErr(SanakirjaError::PristineCorrupt))\n };\n"}]}},{"Replacement":{"inode":{"change":18,"pos":445},"path":"pijul-macros/src/lib.rs","line":428,"ins":{"up_context":[{"change":18,"pos":14563}],"down_context":[{"change":18,"pos":4043}],"flag":"BLOCK","start":3980,"end":4127,"inode":{"change":18,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":14563},"to":{"change":18,"start":14563,"end":14617},"introduced_by":18}],"inode":{"change":18,"pos":445}},"ins_contents":[{"Add":" k: std::marker::PhantomData,"},{"Add":" v: std::marker::PhantomData,"},{"Add":" t: std::marker::PhantomData,"}],"del_contents":[{"Del":" marker: std::marker::PhantomData,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":445},"path":"pijul-macros/src/lib.rs","line":437,"ins":{"up_context":[{"change":18,"pos":14808}],"down_context":[{"change":18,"pos":4226}],"flag":"BLOCK","start":4128,"end":4278,"inode":{"change":18,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":14808},"to":{"change":18,"start":4063,"end":4226},"introduced_by":18}],"inode":{"change":18,"pos":445}},"ins_contents":[{"Add":" ) -> Result, TxnErr> {"},{"Add":" let x = if let Ok(x) = cursor.next(&self.txn) {"}],"del_contents":[{"Del":" ) -> Result, TxnErr> {\n let x = if let Ok(x) = unsafe { ::sanakirja::next(&self.txn, cursor) } {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":445},"path":"pijul-macros/src/lib.rs","line":443,"ins":{"up_context":[{"change":18,"pos":4364}],"down_context":[{"change":18,"pos":14942}],"flag":"BLOCK","start":4279,"end":4301,"inode":{"change":18,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":4364},"to":{"change":18,"start":4364,"end":4392},"introduced_by":18}],"inode":{"change":18,"pos":445}},"ins_contents":[{"Add":" Ok(x)"}],"del_contents":[{"Del":" Ok(x #post)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":445},"path":"pijul-macros/src/lib.rs","line":448,"ins":{"up_context":[{"change":18,"pos":15095}],"down_context":[{"change":18,"pos":4556}],"flag":"BLOCK","start":4302,"end":4452,"inode":{"change":18,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":15095},"to":{"change":18,"start":4393,"end":4556},"introduced_by":18}],"inode":{"change":18,"pos":445}},"ins_contents":[{"Add":" ) -> Result, TxnErr> {"},{"Add":" let x = if let Ok(x) = cursor.next(&self.txn) {"}],"del_contents":[{"Del":" ) -> Result, TxnErr> {\n let x = if let Ok(x) = unsafe { ::sanakirja::prev(&self.txn, cursor) } {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":445},"path":"pijul-macros/src/lib.rs","line":454,"ins":{"up_context":[{"change":18,"pos":4694}],"down_context":[{"change":18,"pos":15229}],"flag":"BLOCK","start":4453,"end":4475,"inode":{"change":18,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":4694},"to":{"change":18,"start":4694,"end":4722},"introduced_by":18}],"inode":{"change":18,"pos":445}},"ins_contents":[{"Add":" Ok(x)"}],"del_contents":[{"Del":" Ok(x #post)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":445},"path":"pijul-macros/src/lib.rs","line":504,"ins":{"up_context":[{"change":18,"pos":16490}],"down_context":[{"change":18,"pos":16627}],"flag":"BLOCK","start":4476,"end":4588,"inode":{"change":18,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":16490},"to":{"change":18,"start":5212,"end":5350},"introduced_by":18}],"inode":{"change":18,"pos":445}},"ins_contents":[{"Add":" impl<'a, T: #txnt> Iterator for crate::pristine::RevCursor"}],"del_contents":[{"Del":" impl> Iterator for crate::pristine::RevCursor\n"}]}},{"Replacement":{"inode":{"change":18,"pos":445},"path":"pijul-macros/src/lib.rs","line":506,"ins":{"up_context":[{"change":18,"pos":16641}],"down_context":[{"change":18,"pos":5422}],"flag":"BLOCK","start":4589,"end":4668,"inode":{"change":18,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":16641},"to":{"change":18,"start":5351,"end":5422},"introduced_by":18}],"inode":{"change":18,"pos":445}},"ins_contents":[{"Add":" type Item = Result<(&'a #key, &'a #value), TxnErr>;"}],"del_contents":[{"Del":" type Item = Result<(#key, #value), TxnErr>;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":445},"path":"pijul-macros/src/lib.rs","line":518,"ins":{"up_context":[{"change":18,"pos":16909}],"down_context":[{"change":18,"pos":17047}],"flag":"BLOCK","start":4669,"end":4781,"inode":{"change":18,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":16909},"to":{"change":18,"start":16909,"end":16910},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":16910},"to":{"change":18,"start":5712,"end":5772},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":5772},"to":{"change":18,"start":16969,"end":17047},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":16969},"to":{"change":18,"start":16969,"end":17047},"introduced_by":18}],"inode":{"change":18,"pos":445}},"ins_contents":[{"Add":" impl<'a, T: #txnt>"},{"Add":" crate::pristine::Cursor"}],"del_contents":[{"Del":"\n"},{"Del":" impl>\n"},{"Del":" crate::pristine::Cursor\n"}]}},{"Replacement":{"inode":{"change":18,"pos":445},"path":"pijul-macros/src/lib.rs","line":521,"ins":{"up_context":[{"change":18,"pos":17061}],"down_context":[{"change":18,"pos":5867}],"flag":"BLOCK","start":4782,"end":4884,"inode":{"change":18,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":17061},"to":{"change":18,"start":5773,"end":5867},"introduced_by":18}],"inode":{"change":18,"pos":445}},"ins_contents":[{"Add":" pub fn prev(&mut self) -> Option>> {"}],"del_contents":[{"Del":" pub fn prev(&mut self) -> Option>> {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":445},"path":"pijul-macros/src/lib.rs","line":529,"ins":{"up_context":[{"change":18,"pos":17218}],"down_context":[{"change":18,"pos":17352}],"flag":"BLOCK","start":4885,"end":4994,"inode":{"change":18,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":17218},"to":{"change":18,"start":6098,"end":6233},"introduced_by":18}],"inode":{"change":18,"pos":445}},"ins_contents":[{"Add":" impl<'a, T: #txnt> Iterator for crate::pristine::Cursor"}],"del_contents":[{"Del":" impl> Iterator for crate::pristine::Cursor\n"}]}},{"Replacement":{"inode":{"change":18,"pos":445},"path":"pijul-macros/src/lib.rs","line":531,"ins":{"up_context":[{"change":18,"pos":17366}],"down_context":[{"change":18,"pos":6305}],"flag":"BLOCK","start":4995,"end":5074,"inode":{"change":18,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":17366},"to":{"change":18,"start":6234,"end":6305},"introduced_by":18}],"inode":{"change":18,"pos":445}},"ins_contents":[{"Add":" type Item = Result<(&'a #key, &'a #value), TxnErr>;"}],"del_contents":[{"Del":" type Item = Result<(#key, #value), TxnErr>;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":445},"path":"pijul-macros/src/lib.rs","line":568,"ins":{"up_context":[{"change":18,"pos":18405}],"down_context":[{"change":18,"pos":6782}],"flag":"BLOCK","start":5075,"end":5121,"inode":{"change":18,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":18405},"to":{"change":18,"start":18405,"end":18449},"introduced_by":18}],"inode":{"change":18,"pos":445}},"ins_contents":[{"Add":" k: &#key,"},{"Add":" e: &#value,"}],"del_contents":[{"Del":" k: #key,\n e: #value,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":445},"path":"pijul-macros/src/lib.rs","line":573,"ins":{"up_context":[{"change":18,"pos":18554}],"down_context":[{"change":18,"pos":6832}],"flag":"BLOCK","start":5122,"end":5176,"inode":{"change":18,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":18554},"to":{"change":18,"start":18554,"end":18606},"introduced_by":18}],"inode":{"change":18,"pos":445}},"ins_contents":[{"Add":" k: &#key,"},{"Add":" e: Option<&#value>,"}],"del_contents":[{"Del":" k: #key,\n e: Option<#value>,\n"}]}},{"Edit":{"inode":{"change":18,"pos":445},"path":"pijul-macros/src/lib.rs","line":600,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":7068},"to":{"change":18,"start":19400,"end":19583},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":19400},"to":{"change":18,"start":19400,"end":19583},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":19583},"to":{"change":18,"start":7069,"end":7070},"introduced_by":18}],"inode":{"change":18,"pos":445}}},"contents":[{"Del":"\n let pre_key = proc_macro2::TokenStream::from_iter(next(&mut input_iter).into_iter());\n let pre_value = proc_macro2::TokenStream::from_iter(next(&mut input_iter).into_iter());\n"},{"Del":"\n"}]}},{"Replacement":{"inode":{"change":18,"pos":445},"path":"pijul-macros/src/lib.rs","line":601,"ins":{"up_context":[{"change":18,"pos":19625}],"down_context":[{"change":18,"pos":20995}],"flag":"BLOCK","start":5177,"end":5717,"inode":{"change":18,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":19625},"to":{"change":18,"start":7071,"end":7072},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":7072},"to":{"change":18,"start":19625,"end":19700},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":19625},"to":{"change":18,"start":19625,"end":19700},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":19727},"to":{"change":18,"start":19727,"end":19827},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":19827},"to":{"change":18,"start":7073,"end":7215},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":7215},"to":{"change":18,"start":19946,"end":19960},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":19946},"to":{"change":18,"start":19946,"end":19960},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":19987},"to":{"change":18,"start":19987,"end":20095},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":20095},"to":{"change":18,"start":7216,"end":7358},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":7358},"to":{"change":18,"start":20214,"end":20299},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":20214},"to":{"change":18,"start":20214,"end":20299},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":20326},"to":{"change":18,"start":20326,"end":20426},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":20426},"to":{"change":18,"start":7359,"end":7413},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":219},"to":{"change":18,"start":20473,"end":20543},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":7413},"to":{"change":18,"start":20473,"end":20543},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":20473},"to":{"change":18,"start":20473,"end":20543},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":20543},"to":{"change":18,"start":7414,"end":7502},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":7502},"to":{"change":18,"start":20615,"end":20629},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":20615},"to":{"change":18,"start":20615,"end":20629},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":20656},"to":{"change":18,"start":20656,"end":20764},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":20764},"to":{"change":18,"start":7503,"end":7557},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":265},"to":{"change":18,"start":20811,"end":20892},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":7557},"to":{"change":18,"start":20811,"end":20892},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":20811},"to":{"change":18,"start":20811,"end":20892},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":20892},"to":{"change":18,"start":7558,"end":7646},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":7646},"to":{"change":18,"start":20964,"end":20995},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":20964},"to":{"change":18,"start":20964,"end":20995},"introduced_by":18}],"inode":{"change":18,"pos":445}},"ins_contents":[{"Add":" proc_macro::TokenStream::from(quote! {"},{"Add":" fn #put("},{"Add":" &mut self,"},{"Add":" k: &#key,"},{"Add":" v: &#value,"},{"Add":" ) -> Result> {"},{"Add":" Ok(::sanakirja::btree::put(&mut self.txn, &mut self.#name, k, v).map_err(TxnErr)?)"},{"Add":" }"},{"Add":" fn #del("},{"Add":" &mut self,"},{"Add":" k: &#key,"},{"Add":" v: Option<&#value>,"},{"Add":" ) -> Result> {"},{"Add":" Ok(::sanakirja::btree::del(&mut self.txn, &mut self.#name, k, v).map_err(TxnErr)?)"},{"Add":" }"},{"Add":" })"}],"del_contents":[{"Del":"\n"},{"Del":" if pre_key.is_empty() {\n proc_macro::TokenStream::from(quote! {\n"},{"Del":" fn #put(\n &mut self,\n k: #key,\n v: #value,\n"},{"Del":" ) -> Result> {\n Ok(self.txn.put(&mut self.rng, &mut self.#name, k, v).map_err(TxnErr)?)\n"},{"Del":" }\n"},{"Del":" fn #del(\n &mut self,\n k: #key,\n v: Option<#value>,\n"},{"Del":" ) -> Result> {\n Ok(self.txn.del(&mut self.rng, &mut self.#name, k, v).map_err(TxnErr)?)\n"},{"Del":" }\n })\n } else {\n proc_macro::TokenStream::from(quote! {\n"},{"Del":" fn #put(\n &mut self,\n k: #key,\n v: #value,\n"},{"Del":" ) -> Result> {\n"},{"Del":" let k = #pre_key;\n let v = #pre_value;\n"},{"Del":" Ok(self.txn.put(&mut self.rng, &mut self.#name, k, v).map_err(TxnErr)?)\n"},{"Del":" }\n"},{"Del":" fn #del(\n &mut self,\n k: #key,\n v: Option<#value>,\n"},{"Del":" ) -> Result> {\n"},{"Del":" let k = #pre_key;\n let v = v.map(|v| #pre_value);\n"},{"Del":" Ok(self.txn.del(&mut self.rng, &mut self.#name, k, v).map_err(TxnErr)?)\n"},{"Del":" }\n })\n }\n"}]}},{"Edit":{"inode":{"change":18,"pos":21431},"path":"pijul/src/repository.rs","line":4,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":21541}],"down_context":[{"change":18,"pos":7666}],"flag":"BLOCK","start":5718,"end":5752,"inode":{"change":18,"pos":21431}}},"contents":[{"Add":"use crate::{config, current_dir};"}]}},{"Edit":{"inode":{"change":18,"pos":21431},"path":"pijul/src/repository.rs","line":8,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":39},"to":{"change":18,"start":0,"end":282},"introduced_by":18}],"inode":{"change":18,"pos":21431}}},"contents":[{"Del":"\n#[cfg(not(unix))]\nmod basic_lock;\n#[cfg(unix)]\nmod unix_lock;\n\nmod lock {\n #[cfg(not(unix))]\n pub use super::basic_lock::*;\n #[cfg(unix)]\n pub use super::unix_lock::*;\n use std::path::Path;\n pub enum Lock {\n Txn(TxnLock),\n MutTxn(MutTxnLock),\n }\n"}]}},{"Edit":{"inode":{"change":18,"pos":21431},"path":"pijul/src/repository.rs","line":9,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":40},"to":{"change":18,"start":283,"end":894},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":894},"to":{"change":18,"start":7685,"end":7719},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":40},"to":{"change":18,"start":7685,"end":7719},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":7719},"to":{"change":18,"start":81,"end":82},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":81},"to":{"change":18,"start":81,"end":82},"introduced_by":18}],"inode":{"change":18,"pos":21431}}},"contents":[{"Del":" impl Lock {\n pub async fn mut_txn_lock>(p: P) -> Result {\n let pp = p.as_ref().join(\"db_lock\");\n Ok(Lock::MutTxn(mut_txn(&pp).await?))\n }\n pub async fn txn_lock>(p: P) -> Result {\n let pp = p.as_ref().join(\"db_lock\");\n Ok(Lock::Txn(txn(&pp).await?))\n }\n\n pub async fn commit(&mut self) -> Result<(), anyhow::Error> {\n match self {\n Lock::MutTxn(m) => m.commit().await,\n _ => Ok(()),\n }\n }\n }\n}\n"},{"Del":"use crate::{config, current_dir};\n"},{"Del":"\n"}]}},{"Edit":{"inode":{"change":18,"pos":21431},"path":"pijul/src/repository.rs","line":10,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":21565},"to":{"change":18,"start":895,"end":921},"introduced_by":18}],"inode":{"change":18,"pos":21431}}},"contents":[{"Del":" pub lock: lock::Lock,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":21431},"path":"pijul/src/repository.rs","line":54,"ins":{"up_context":[{"change":18,"pos":1004}],"down_context":[{"change":18,"pos":23034}],"flag":"BLOCK","start":5753,"end":5810,"inode":{"change":18,"pos":21431}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":1004},"to":{"change":18,"start":1004,"end":1067},"introduced_by":18}],"inode":{"change":18,"pos":21431}},"ins_contents":[{"Add":" Self::find_root_with_dot_dir(cur, DOT_DIR).await"}],"del_contents":[{"Del":" Self::find_root_with_dot_dir(cur, DOT_DIR, true).await\n"}]}},{"Edit":{"inode":{"change":18,"pos":21431},"path":"pijul/src/repository.rs","line":57,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":23041},"to":{"change":18,"start":1068,"end":1238},"introduced_by":18}],"inode":{"change":18,"pos":21431}}},"contents":[{"Del":" pub async unsafe fn find_root_immutable(cur: Option) -> Result {\n Self::find_root_with_dot_dir(cur, DOT_DIR, false).await\n }\n\n"}]}},{"Edit":{"inode":{"change":18,"pos":21431},"path":"pijul/src/repository.rs","line":60,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":23129},"to":{"change":18,"start":1280,"end":1303},"introduced_by":18}],"inode":{"change":18,"pos":21431}}},"contents":[{"Del":" mutable: bool,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":21431},"path":"pijul/src/repository.rs","line":79,"ins":{"up_context":[{"change":18,"pos":23883}],"down_context":[{"change":18,"pos":23967}],"flag":"BLOCK","start":5811,"end":5906,"inode":{"change":18,"pos":21431}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":23883},"to":{"change":18,"start":1304,"end":1623},"introduced_by":18}],"inode":{"change":18,"pos":21431}},"ins_contents":[{"Add":" pristine: libpijul::pristine::sanakirja::Pristine::new(&pristine_dir.join(\"db\"))?,"}],"del_contents":[{"Del":" lock: if mutable {\n lock::Lock::mut_txn_lock(&pristine_dir).await?\n } else {\n lock::Lock::txn_lock(&pristine_dir).await?\n },\n pristine: unsafe {\n libpijul::pristine::sanakirja::Pristine::new_nolock(&pristine_dir)?\n },\n"}]}},{"Replacement":{"inode":{"change":18,"pos":21431},"path":"pijul/src/repository.rs","line":105,"ins":{"up_context":[{"change":18,"pos":24885}],"down_context":[{"change":18,"pos":24973}],"flag":"BLOCK","start":5907,"end":6006,"inode":{"change":18,"pos":21431}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":24885},"to":{"change":18,"start":1714,"end":1926},"introduced_by":18}],"inode":{"change":18,"pos":21431}},"ins_contents":[{"Add":" pristine: libpijul::pristine::sanakirja::Pristine::new(&pristine_dir.join(\"db\"))?,"}],"del_contents":[{"Del":" lock: lock::Lock::mut_txn_lock(&pristine_dir).await?,\n pristine: unsafe {\n libpijul::pristine::sanakirja::Pristine::new_nolock(&pristine_dir)?\n },\n"}]}},{"Replacement":{"inode":{"change":18,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":13,"ins":{"up_context":[{"change":18,"pos":66}],"down_context":[{"change":18,"pos":251}],"flag":"BLOCK","start":6007,"end":6054,"inode":{"change":18,"pos":25380}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":66},"to":{"change":18,"start":0,"end":80},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":156},"to":{"change":18,"start":0,"end":80},"introduced_by":18}],"inode":{"change":18,"pos":25380}},"ins_contents":[{"Add":"use libpijul::{Base32, Hash, Merkle, MutTxnT};"}],"del_contents":[{"Del":"use libpijul::{Base32, ChannelRef, Hash, Merkle, MutTxnT, MutTxnTExt, TxnTExt};\n"}]}},{"Edit":{"inode":{"change":18,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":20,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":331},"to":{"change":18,"start":331,"end":366},"introduced_by":18}],"inode":{"change":18,"pos":25380}}},"contents":[{"Del":"use crate::repository::Repository;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":268,"ins":{"up_context":[{"change":18,"pos":135}],"down_context":[{"change":18,"pos":732}],"flag":"BLOCK","start":6055,"end":6081,"inode":{"change":18,"pos":25380}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":135},"to":{"change":18,"start":659,"end":732},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":659},"to":{"change":18,"start":659,"end":732},"introduced_by":18}],"inode":{"change":18,"pos":25380}},"ins_contents":[{"Add":" pending: Vec,"}],"del_contents":[{"Del":" },\n Channel {\n sender: tokio::sync::mpsc::Sender>,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":475,"ins":{"up_context":[{"change":18,"pos":5725}],"down_context":[{"change":18,"pos":5783}],"flag":"BLOCK","start":6082,"end":6214,"inode":{"change":18,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":5725},"to":{"change":18,"start":5725,"end":5783},"introduced_by":18}],"inode":{"change":18,"pos":25380}},"ins_contents":[{"Add":" State::Changelist {"},{"Add":" ref mut sender,"},{"Add":" ref mut pending,"},{"Add":" } => {"}],"del_contents":[{"Del":" State::Changelist { ref mut sender } => {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":483,"ins":{"up_context":[{"change":18,"pos":5981}],"down_context":[{"change":18,"pos":6103}],"flag":"BLOCK","start":6215,"end":6771,"inode":{"change":18,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":5981},"to":{"change":18,"start":5981,"end":6103},"introduced_by":18}],"inode":{"change":18,"pos":25380}},"ins_contents":[{"Add":" } else {"},{"Add":" debug!(\"{:?}\", data);"},{"Add":" let mut p = 0;"},{"Add":" while let Some(i) = (&data[p..]).iter().position(|i| *i == b'\\n') {"},{"Add":" let line = if !pending.is_empty() {"},{"Add":" pending.extend(&data[p..p + i]);"},{"Add":" &pending"},{"Add":" } else {"},{"Add":" &data[p..p + i]"},{"Add":" };"},{"Add":" let l = std::str::from_utf8(line)?;"}],"del_contents":[{"Del":" } else if let Ok(data) = std::str::from_utf8(&data) {\n for l in data.lines() {\n"}]}},{"Edit":{"inode":{"change":18,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":500,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":6492}],"down_context":[{"change":18,"pos":6492}],"flag":"BLOCK","start":6772,"end":6857,"inode":{"change":18,"pos":25380}}},"contents":[{"Add":" pending.clear();"},{"Add":" p += i + 1;"}]}},{"Edit":{"inode":{"change":18,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":503,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":6518}],"down_context":[{"change":18,"pos":6518}],"flag":"BLOCK","start":6858,"end":6910,"inode":{"change":18,"pos":25380}}},"contents":[{"Add":" pending.extend(&data[p..]);"}]}},{"Edit":{"inode":{"change":18,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":506,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":18},"to":{"change":18,"start":18,"end":163},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":163},"to":{"change":18,"start":6540,"end":6558},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":6540},"to":{"change":18,"start":6540,"end":6558},"introduced_by":18}],"inode":{"change":18,"pos":25380}}},"contents":[{"Del":" State::Channel { ref mut sender } => {\n debug!(\"state channel\");\n sender.send(data).await?\n"},{"Del":" }\n"}]}},{"Replacement":{"inode":{"change":18,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":698,"ins":{"up_context":[{"change":18,"pos":8468}],"down_context":[{"change":18,"pos":42222}],"flag":"BLOCK","start":6911,"end":7030,"inode":{"change":18,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":8468},"to":{"change":18,"start":312,"end":377},"introduced_by":18}],"inode":{"change":18,"pos":25380}},"ins_contents":[{"Add":" *self.state.lock().await = State::Changelist {"},{"Add":" sender,"},{"Add":" pending: Vec::new(),"},{"Add":" };"}],"del_contents":[{"Del":" *self.state.lock().await = State::Changelist { sender };\n"}]}},{"Edit":{"inode":{"change":18,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":858,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":9964},"to":{"change":18,"start":49799,"end":49821},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":49799},"to":{"change":18,"start":49799,"end":49821},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":49821},"to":{"change":18,"start":402,"end":459},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":459},"to":{"change":18,"start":49868,"end":50033},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":49868},"to":{"change":18,"start":49868,"end":50033},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":50033},"to":{"change":18,"start":9965,"end":10092},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":10092},"to":{"change":18,"start":50033,"end":50069},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":50033},"to":{"change":18,"start":50033,"end":50069},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":50069},"to":{"change":18,"start":10093,"end":10126},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":10126},"to":{"change":18,"start":50069,"end":50173},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":50069},"to":{"change":18,"start":50069,"end":50173},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":50173},"to":{"change":18,"start":10127,"end":10128},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":10128},"to":{"change":18,"start":282,"end":520},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":520},"to":{"change":18,"start":1458,"end":1507},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":520},"to":{"change":18,"start":50173,"end":50331},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":1507},"to":{"change":18,"start":50173,"end":50331},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":10128},"to":{"change":18,"start":50173,"end":50331},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":50173},"to":{"change":18,"start":50173,"end":50331},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":50331},"to":{"change":18,"start":210,"end":251},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":251},"to":{"change":18,"start":10129,"end":10183},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":50331},"to":{"change":18,"start":10129,"end":10183},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":10183},"to":{"change":18,"start":252,"end":301},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":301},"to":{"change":18,"start":10183,"end":10226},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":10183},"to":{"change":18,"start":10183,"end":10226},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":10226},"to":{"change":18,"start":302,"end":339},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":339},"to":{"change":18,"start":10226,"end":10253},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":10226},"to":{"change":18,"start":10226,"end":10253},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":10253},"to":{"change":18,"start":51267,"end":51299},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":51267},"to":{"change":18,"start":51267,"end":51299},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":51299},"to":{"change":18,"start":340,"end":378},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":378},"to":{"change":18,"start":51299,"end":51338},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":51299},"to":{"change":18,"start":51299,"end":51338},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":51338},"to":{"change":18,"start":1508,"end":1754},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":548},"to":{"change":18,"start":51338,"end":51533},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":1754},"to":{"change":18,"start":51338,"end":51533},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":51338},"to":{"change":18,"start":51338,"end":51533},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":51533},"to":{"change":18,"start":8103,"end":8159},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":8159},"to":{"change":18,"start":51716,"end":51779},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":51716},"to":{"change":18,"start":51716,"end":51779},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":51779},"to":{"change":18,"start":8160,"end":8245},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":8245},"to":{"change":18,"start":52059,"end":52117},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":52059},"to":{"change":18,"start":52059,"end":52117},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":52117},"to":{"change":18,"start":379,"end":421},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":421},"to":{"change":18,"start":619,"end":694},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":501},"to":{"change":18,"start":52289,"end":52310},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":694},"to":{"change":18,"start":52289,"end":52310},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":10334},"to":{"change":18,"start":52289,"end":52310},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":52289},"to":{"change":18,"start":52289,"end":52310},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":52310},"to":{"change":18,"start":43,"end":169},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":202},"to":{"change":18,"start":202,"end":236},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":236},"to":{"change":18,"start":0,"end":18},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":18},"to":{"change":18,"start":236,"end":248},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":236},"to":{"change":18,"start":236,"end":248},"introduced_by":18}],"inode":{"change":18,"pos":25380}}},"contents":[{"Del":" Ok(())\n }\n\n"},{"Del":" pub async fn clone_channel(\n"},{"Del":" &mut self,\n repo: &mut Repository,\n txn: &mut T,\n channel: &mut ChannelRef,\n lazy: bool,\n ) -> Result<(), anyhow::Error> {\n"},{"Del":" let (sender, mut recv) = tokio::sync::mpsc::channel(10);\n *self.state.lock().await = State::Channel { sender };\n"},{"Del":" self.run_protocol().await?;\n"},{"Del":" debug!(\"clone channel\");\n"},{"Del":" self.c\n .data(format!(\"channel {}\\n\", self.channel).as_bytes())\n .await?;\n"},{"Del":"\n"},{"Del":" let progress = indicatif::ProgressBar::new_spinner();\n progress.set_style(\n indicatif::ProgressStyle::default_spinner().template(\"{spinner} Cloning channel\"),\n );\n progress.enable_steady_tick(100);\n"},{"Del":" *PROGRESS.lock().await = Some(progress);\n"},{"Del":" let from_dump_alive = {\n let mut from_dump =\n libpijul::pristine::channel_dump::ChannelFromDump::new(txn, channel.clone());\n"},{"Del":" debug!(\"receiving channel\");\n"},{"Del":" while let Some(msg) = recv.recv().await {\n"},{"Del":" debug!(\"msg = {:?}\", msg.len());\n"},{"Del":" if from_dump.read(&msg)? {\n"},{"Del":" debug!(\"break\");\n"},{"Del":" break;\n"},{"Del":" }\n }\n"},{"Del":" debug!(\"from dump done\");\n"},{"Del":" from_dump.alive\n };\n"},{"Del":" if let Some(ref mut progress) = *PROGRESS.lock().await {\n progress.set_style(\n indicatif::ProgressStyle::default_spinner().template(\"✓ Cloning channel\"),\n );\n progress.finish();\n }\n"},{"Del":" let channel_ = channel.borrow();\n debug!(\"cloned, now downloading changes\");\n let mut hashes = Vec::new();\n if lazy {\n for &ch in from_dump_alive.iter() {\n"},{"Del":" let h = txn.get_external(ch)?.unwrap();\n"},{"Del":" hashes.push(h);\n }\n } else {\n"},{"Del":" for h in txn.log(&channel_, 0)? {\n hashes.push((h?.1).0);\n"},{"Del":" }\n }\n std::mem::drop(channel_);\n"},{"Del":" debug!(\"hashes = {:#?}\", hashes);\n"},{"Del":" self.download_changes_(&hashes, None, &mut repo.changes_dir, true)\n"},{"Del":" .await?;\n"},{"Del":" txn.output_repository_no_pending(\n &mut repo.working_copy,\n &repo.changes,\n channel,\n"},{"Del":" \"\",\n true,\n"},{"Del":" None,\n"},{"Del":" )?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":52474},"path":"pijul/src/remote/mod.rs","line":95,"ins":{"up_context":[{"change":18,"pos":54479}],"down_context":[{"change":18,"pos":54566}],"flag":"BLOCK","start":7031,"end":7129,"inode":{"change":18,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":54479},"to":{"change":18,"start":54479,"end":54566},"introduced_by":18}],"inode":{"change":18,"pos":52474}},"ins_contents":[{"Add":" if let Ok(pristine) = libpijul::pristine::sanakirja::Pristine::new(&dot_dir.join(\"db\")) {"}],"del_contents":[{"Del":" if let Ok(pristine) = libpijul::pristine::sanakirja::Pristine::new(&dot_dir) {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":52474},"path":"pijul/src/remote/mod.rs","line":191,"ins":{"up_context":[{"change":18,"pos":8428}],"down_context":[{"change":18,"pos":8466}],"flag":"BLOCK","start":7130,"end":7224,"inode":{"change":18,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":8428},"to":{"change":18,"start":8428,"end":8466},"introduced_by":18}],"inode":{"change":18,"pos":52474}},"ins_contents":[{"Add":" debug!(\"filter_map {:?}\", k);"},{"Add":" let k = (*k.unwrap().0).into();"}],"del_contents":[{"Del":" let k = k.unwrap().0;\n"}]}},{"Edit":{"inode":{"change":18,"pos":52474},"path":"pijul/src/remote/mod.rs","line":204,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":57429}],"down_context":[{"change":18,"pos":987}],"flag":"BLOCK","start":7225,"end":7252,"inode":{"change":18,"pos":52474}}},"contents":[{"Add":" debug!(\"deleted\");"}]}},{"Replacement":{"inode":{"change":18,"pos":52474},"path":"pijul/src/remote/mod.rs","line":222,"ins":{"up_context":[{"change":18,"pos":57695}],"down_context":[{"change":18,"pos":57792}],"flag":"BLOCK","start":7253,"end":7436,"inode":{"change":18,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":57695},"to":{"change":18,"start":8606,"end":8687},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":8687},"to":{"change":18,"start":57775,"end":57792},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":57775},"to":{"change":18,"start":57775,"end":57792},"introduced_by":18}],"inode":{"change":18,"pos":52474}},"ins_contents":[{"Add":" let (mut b, state): (_, Merkle) = if let Some((u, v)) = txn.last_remote(remote)? {"},{"Add":" debug!(\"dichotomy_changelist: {:?} {:?}\", u, v);"},{"Add":" (u, (&v.b).into())"}],"del_contents":[{"Del":" let (mut b, (_, state)) = if let Some(last) = txn.last_remote(remote)? {\n"},{"Del":" last\n"}]}},{"Replacement":{"inode":{"change":18,"pos":52474},"path":"pijul/src/remote/mod.rs","line":240,"ins":{"up_context":[{"change":18,"pos":58358}],"down_context":[{"change":18,"pos":1790}],"flag":"BLOCK","start":7437,"end":7513,"inode":{"change":18,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":58358},"to":{"change":18,"start":8688,"end":8769},"introduced_by":18}],"inode":{"change":18,"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":18,"pos":52474},"path":"pijul/src/remote/mod.rs","line":244,"ins":{"up_context":[{"change":18,"pos":58637}],"down_context":[{"change":18,"pos":58680}],"flag":"BLOCK","start":7514,"end":7559,"inode":{"change":18,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":58637},"to":{"change":18,"start":58637,"end":58680},"introduced_by":18}],"inode":{"change":18,"pos":52474}},"ins_contents":[{"Add":" if remote_state == state.b {"}],"del_contents":[{"Del":" if remote_state == state {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":52474},"path":"pijul/src/remote/mod.rs","line":296,"ins":{"up_context":[{"change":18,"pos":9035}],"down_context":[{"change":18,"pos":61504}],"flag":"BLOCK","start":7560,"end":7657,"inode":{"change":18,"pos":52474}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":9035},"to":{"change":18,"start":61408,"end":61504},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":61408},"to":{"change":18,"start":61408,"end":61504},"introduced_by":18}],"inode":{"change":18,"pos":52474}},"ins_contents":[{"Add":" txn.archive_with_state(&changes, &mut channel, &state, extra, &mut tarball)?"}],"del_contents":[{"Del":" txn.archive_with_state(&changes, &mut channel, state, extra, &mut tarball)?\n"}]}},{"Replacement":{"inode":{"change":18,"pos":52474},"path":"pijul/src/remote/mod.rs","line":460,"ins":{"up_context":[{"change":18,"pos":1048}],"down_context":[{"change":18,"pos":70594}],"flag":"BLOCK","start":7658,"end":7732,"inode":{"change":18,"pos":52474}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":1048},"to":{"change":18,"start":70519,"end":70594},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":70519},"to":{"change":18,"start":70519,"end":70594},"introduced_by":18}],"inode":{"change":18,"pos":52474}},"ins_contents":[{"Add":" txn.apply_change_ws(&repo.changes, channel, h, &mut ws)?;"}],"del_contents":[{"Del":" txn.apply_change_ws(&repo.changes, channel, *h, &mut ws)?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":52474},"path":"pijul/src/remote/mod.rs","line":523,"ins":{"up_context":[{"change":18,"pos":72852}],"down_context":[{"change":18,"pos":72925}],"flag":"BLOCK","start":7733,"end":7807,"inode":{"change":18,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":72852},"to":{"change":18,"start":72852,"end":72925},"introduced_by":18}],"inode":{"change":18,"pos":52474}},"ins_contents":[{"Add":" txn.apply_change_ws(&repo.changes, channel, &hash, &mut ws)?;"}],"del_contents":[{"Del":" txn.apply_change_ws(&repo.changes, channel, hash, &mut ws)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":52474},"path":"pijul/src/remote/mod.rs","line":536,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":73215},"to":{"change":18,"start":73215,"end":73235},"introduced_by":18}],"inode":{"change":18,"pos":52474}}},"contents":[{"Del":" lazy: bool,\n"}]}},{"Edit":{"inode":{"change":18,"pos":52474},"path":"pijul/src/remote/mod.rs","line":540,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":73416},"to":{"change":18,"start":73416,"end":73610},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":73610},"to":{"change":18,"start":9171,"end":9284},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":9284},"to":{"change":18,"start":73694,"end":73931},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":73694},"to":{"change":18,"start":73694,"end":73931},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":73931},"to":{"change":18,"start":9285,"end":9339},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":9339},"to":{"change":18,"start":74000,"end":74014},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":74000},"to":{"change":18,"start":74000,"end":74014},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":74014},"to":{"change":18,"start":2559,"end":2664},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":819},"to":{"change":18,"start":74109,"end":74269},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":2664},"to":{"change":18,"start":74109,"end":74269},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":74109},"to":{"change":18,"start":74109,"end":74269},"introduced_by":18}],"inode":{"change":18,"pos":52474}}},"contents":[{"Del":" if let RemoteRepo::Ssh(ref mut s) = self {\n s.clone_channel(repo, txn, channel, lazy).await?;\n let mut to_unrecord = Vec::new();\n let mut found = false;\n"},{"Del":" for x in txn.iter_rev_remote(&remote.borrow().remote, None)? {\n let (n, (h, s)) = x?;\n"},{"Del":" debug!(\"{:?} {:?} {:?}\", n, h, s);\n if s == state {\n found = true;\n break;\n }\n to_unrecord.push(h);\n }\n if !found {\n"},{"Del":" bail!(\"State not found: {:?}\", state)\n"},{"Del":" }\n"},{"Del":" self.pull(repo, txn, channel, &to_unrecord, &HashSet::new(), false)\n .await?;\n"},{"Del":" for unrec in to_unrecord.iter() {\n txn.unrecord(&repo.changes, channel, unrec)?;\n }\n return Ok(());\n }\n\n"}]}},{"Replacement":{"inode":{"change":18,"pos":52474},"path":"pijul/src/remote/mod.rs","line":543,"ins":{"up_context":[{"change":18,"pos":9404}],"down_context":[{"change":18,"pos":74515}],"flag":"BLOCK","start":7808,"end":7944,"inode":{"change":18,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":9404},"to":{"change":18,"start":9404,"end":9438},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":9438},"to":{"change":18,"start":74411,"end":74515},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":74411},"to":{"change":18,"start":74411,"end":74515},"introduced_by":18}],"inode":{"change":18,"pos":52474}},"ins_contents":[{"Add":" let (n, p) = x?;"},{"Add":" debug!(\"{:?} {:?}\", n, p);"},{"Add":" to_pull.push(p.a.into());"},{"Add":" if p.b == state {"}],"del_contents":[{"Del":" let (n, (h, s)) = x?;\n"},{"Del":" debug!(\"{:?} {:?} {:?}\", n, h, s);\n to_pull.push(h);\n if s == state {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":52474},"path":"pijul/src/remote/mod.rs","line":584,"ins":{"up_context":[{"change":18,"pos":76104}],"down_context":[{"change":18,"pos":76173}],"flag":"BLOCK","start":7945,"end":8102,"inode":{"change":18,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":76104},"to":{"change":18,"start":9490,"end":9560},"introduced_by":18}],"inode":{"change":18,"pos":52474}},"ins_contents":[{"Add":" let sc = c.into();"},{"Add":" if repo"},{"Add":" .changes"},{"Add":" .has_contents(*c, txn.get_internal(&sc)?.cloned())"},{"Add":" {"}],"del_contents":[{"Del":" if repo.changes.has_contents(*c, txn.get_internal(*c)?) {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":52474},"path":"pijul/src/remote/mod.rs","line":598,"ins":{"up_context":[{"change":18,"pos":76443}],"down_context":[{"change":18,"pos":76508}],"flag":"BLOCK","start":8103,"end":8171,"inode":{"change":18,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":76443},"to":{"change":18,"start":9561,"end":9627},"introduced_by":18}],"inode":{"change":18,"pos":52474}},"ins_contents":[{"Add":" let change = if let Some(&i) = txn.get_internal(&sc)? {"}],"del_contents":[{"Del":" let change = if let Some(i) = txn.get_internal(*c)? {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":52474},"path":"pijul/src/remote/mod.rs","line":606,"ins":{"up_context":[{"change":18,"pos":76738}],"down_context":[{"change":18,"pos":76860}],"flag":"BLOCK","start":8172,"end":8314,"inode":{"change":18,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":76738},"to":{"change":18,"start":76738,"end":76860},"introduced_by":18}],"inode":{"change":18,"pos":52474}},"ins_contents":[{"Add":" start: libpijul::pristine::ChangePosition(0u64.into()),"},{"Add":" end: libpijul::pristine::ChangePosition(0u64.into()),"}],"del_contents":[{"Del":" start: libpijul::pristine::ChangePosition(0),\n end: libpijul::pristine::ChangePosition(0),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":52474},"path":"pijul/src/remote/mod.rs","line":610,"ins":{"up_context":[{"change":18,"pos":76925}],"down_context":[{"change":18,"pos":899}],"flag":"BLOCK","start":8315,"end":8360,"inode":{"change":18,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":76925},"to":{"change":18,"start":9628,"end":9672},"introduced_by":18}],"inode":{"change":18,"pos":52474}},"ins_contents":[{"Add":" if txn.is_alive(&channel, &v)? {"}],"del_contents":[{"Del":" if txn.is_alive(&channel, v)? {\n"}]}},{"Edit":{"inode":{"change":18,"pos":52474},"path":"pijul/src/remote/mod.rs","line":626,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":77897},"to":{"change":18,"start":77897,"end":77917},"introduced_by":18}],"inode":{"change":18,"pos":52474}}},"contents":[{"Del":" lazy: bool,\n"}]}},{"Edit":{"inode":{"change":18,"pos":52474},"path":"pijul/src/remote/mod.rs","line":628,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":77979},"to":{"change":18,"start":77979,"end":78008},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":78008},"to":{"change":18,"start":328,"end":453},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":453},"to":{"change":18,"start":78205,"end":78229},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":78205},"to":{"change":18,"start":78205,"end":78229},"introduced_by":18}],"inode":{"change":18,"pos":52474}}},"contents":[{"Del":" if path.is_empty() {\n"},{"Del":" if let RemoteRepo::Ssh(s) = self {\n return s.clone_channel(repo, txn, local_channel, lazy).await;\n"},{"Del":" }\n }\n"}]}},{"Replacement":{"inode":{"change":18,"pos":52474},"path":"pijul/src/remote/mod.rs","line":634,"ins":{"up_context":[{"change":18,"pos":9745}],"down_context":[{"change":18,"pos":78449}],"flag":"BLOCK","start":8361,"end":8428,"inode":{"change":18,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":9745},"to":{"change":18,"start":9745,"end":9779},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":9779},"to":{"change":18,"start":78420,"end":78449},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":78420},"to":{"change":18,"start":78420,"end":78449},"introduced_by":18}],"inode":{"change":18,"pos":52474}},"ins_contents":[{"Add":" let (_, p) = x?;"},{"Add":" pullable.push(p.a.into())"}],"del_contents":[{"Del":" let (_, (h, _)) = x?;\n"},{"Del":" pullable.push(h)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":52474},"path":"pijul/src/remote/mod.rs","line":679,"ins":{"up_context":[{"change":18,"pos":4046}],"down_context":[{"change":18,"pos":4132}],"flag":"BLOCK","start":8429,"end":8665,"inode":{"change":18,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":4046},"to":{"change":18,"start":4046,"end":4132},"introduced_by":18}],"inode":{"change":18,"pos":52474}},"ins_contents":[{"Add":" pos: ChangePosition("},{"Add":" caps.name(\"num\")"},{"Add":" .unwrap()"},{"Add":" .as_str()"},{"Add":" .parse::()"},{"Add":" .unwrap()"},{"Add":" .into(),"},{"Add":" ),"}],"del_contents":[{"Del":" pos: ChangePosition(caps.name(\"num\").unwrap().as_str().parse().unwrap()),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":79745},"path":"pijul/src/remote/local.rs","line":30,"ins":{"up_context":[{"change":18,"pos":10096}],"down_context":[{"change":18,"pos":10115}],"flag":"BLOCK","start":8666,"end":8692,"inode":{"change":18,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":10096},"to":{"change":18,"start":10096,"end":10115},"introduced_by":18}],"inode":{"change":18,"pos":79745}},"ins_contents":[{"Add":" (n, m.into())"}],"del_contents":[{"Del":" (n, m)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":79745},"path":"pijul/src/remote/local.rs","line":63,"ins":{"up_context":[{"change":18,"pos":4571}],"down_context":[{"change":18,"pos":4643}],"flag":"BLOCK","start":8693,"end":8774,"inode":{"change":18,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":4571},"to":{"change":18,"start":10333,"end":10406},"introduced_by":18}],"inode":{"change":18,"pos":79745}},"ins_contents":[{"Add":" change: remote_txn.get_external(&p.change)?.unwrap().into(),"}],"del_contents":[{"Del":" change: remote_txn.get_external(p.change)?.unwrap(),\n"}]}},{"Edit":{"inode":{"change":18,"pos":79745},"path":"pijul/src/remote/local.rs","line":81,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":81504},"to":{"change":18,"start":81504,"end":81705},"introduced_by":18}],"inode":{"change":18,"pos":79745}}},"contents":[{"Del":" debug!(\n \"downloading changelist item {:?} {:?} {:?}\",\n n,\n h.to_base32(),\n m.to_base32()\n );\n"}]}},{"Replacement":{"inode":{"change":18,"pos":79745},"path":"pijul/src/remote/local.rs","line":85,"ins":{"up_context":[{"change":18,"pos":10952}],"down_context":[{"change":18,"pos":11016}],"flag":"BLOCK","start":8775,"end":8838,"inode":{"change":18,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":10952},"to":{"change":18,"start":10952,"end":11016},"introduced_by":18}],"inode":{"change":18,"pos":79745}},"ins_contents":[{"Add":" .get_touched_files(x, Some(h_int))"}],"del_contents":[{"Del":" .get_touched_files(*x, Some(h_int))\n"}]}},{"Replacement":{"inode":{"change":18,"pos":79745},"path":"pijul/src/remote/local.rs","line":90,"ins":{"up_context":[{"change":18,"pos":81977}],"down_context":[{"change":18,"pos":82033}],"flag":"BLOCK","start":8839,"end":8909,"inode":{"change":18,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":81977},"to":{"change":18,"start":81977,"end":82033},"introduced_by":18}],"inode":{"change":18,"pos":79745}},"ins_contents":[{"Add":" txn.put_remote(remote, n, (h.into(), m.into()))?;"}],"del_contents":[{"Del":" txn.put_remote(remote, n, (h, m))?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":79745},"path":"pijul/src/remote/local.rs","line":163,"ins":{"up_context":[{"change":18,"pos":4116}],"down_context":[{"change":18,"pos":4175}],"flag":"BLOCK","start":8910,"end":8968,"inode":{"change":18,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":4116},"to":{"change":18,"start":4116,"end":4175},"introduced_by":18}],"inode":{"change":18,"pos":79745}},"ins_contents":[{"Add":" txn.apply_change_ws(store, channel, c, &mut ws)?;"}],"del_contents":[{"Del":" txn.apply_change_ws(store, channel, *c, &mut ws)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":83981},"path":"pijul/src/main.rs","line":77,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":180},"to":{"change":16,"start":0,"end":153},"introduced_by":16}],"inode":{"change":18,"pos":83981}}},"contents":[{"Del":" /// \n /// Users can ignore files and directories by placing the relevant paths\n /// in one or more `.ignore` files using git's pattern syntax.\n"}]}},{"Replacement":{"inode":{"change":18,"pos":83981},"path":"pijul/src/main.rs","line":123,"ins":{"up_context":[{"change":18,"pos":4574}],"down_context":[{"change":18,"pos":25}],"flag":"BLOCK","start":8969,"end":9037,"inode":{"change":18,"pos":83981}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":4574},"to":{"change":18,"start":4574,"end":4591},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":4591},"to":{"change":18,"start":0,"end":43},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":43},"to":{"change":18,"start":4591,"end":4607},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":4591},"to":{"change":18,"start":4591,"end":4607},"introduced_by":18}],"inode":{"change":18,"pos":83981}},"ins_contents":[{"Add":" /// Manage tags (create tags, check out a tag)"},{"Add":" // Tag(Tag),"}],"del_contents":[{"Del":" #[cfg(unix)]\n"},{"Del":" #[clap(setting = AppSettings::Hidden)]\n"},{"Del":" Lock(Lock),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":83981},"path":"pijul/src/main.rs","line":212,"ins":{"up_context":[{"change":18,"pos":5590}],"down_context":[{"change":18,"pos":600}],"flag":"BLOCK","start":9038,"end":9090,"inode":{"change":18,"pos":83981}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":5590},"to":{"change":18,"start":5590,"end":5663},"introduced_by":18}],"inode":{"change":18,"pos":83981}},"ins_contents":[{"Add":" // SubCommand::Tag(tag) => tag.run().await,"}],"del_contents":[{"Del":" #[cfg(unix)]\n SubCommand::Lock(lock) => lock.run().await,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":66,"ins":{"up_context":[{"change":18,"pos":11850}],"down_context":[{"change":18,"pos":2390}],"flag":"BLOCK","start":9091,"end":9145,"inode":{"change":18,"pos":95630}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":11850},"to":{"change":18,"start":11850,"end":11897},"introduced_by":18}],"inode":{"change":18,"pos":95630}},"ins_contents":[{"Add":" .map(|h| (h.unwrap().1).0.into())"}],"del_contents":[{"Del":" .map(|h| (h.unwrap().1).0)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":71,"ins":{"up_context":[{"change":11,"pos":279}],"down_context":[{"change":11,"pos":349}],"flag":"BLOCK","start":9146,"end":9224,"inode":{"change":18,"pos":95630}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":279},"to":{"change":11,"start":279,"end":349},"introduced_by":11}],"inode":{"change":18,"pos":95630}},"ins_contents":[{"Add":" hashes.push((*h, *txn.get_internal(&h.into())?.unwrap()))"}],"del_contents":[{"Del":" hashes.push((*h, txn.get_internal(*h)?.unwrap()))\n"}]}},{"Replacement":{"inode":{"change":18,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":80,"ins":{"up_context":[{"change":18,"pos":401}],"down_context":[{"change":11,"pos":545}],"flag":"BLOCK","start":9225,"end":9303,"inode":{"change":18,"pos":95630}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":401},"to":{"change":18,"start":2792,"end":2834},"introduced_by":18}],"inode":{"change":18,"pos":95630}},"ins_contents":[{"Add":" let mut changes: Vec<(Hash, ChangeId, Option)> = Vec::new();"}],"del_contents":[{"Del":" let mut changes = Vec::new();\n"}]}},{"Replacement":{"inode":{"change":18,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":83,"ins":{"up_context":[{"change":18,"pos":1883}],"down_context":[{"change":18,"pos":1954}],"flag":"BLOCK","start":9304,"end":9375,"inode":{"change":18,"pos":95630}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":1883},"to":{"change":18,"start":0,"end":70},"introduced_by":18}],"inode":{"change":18,"pos":95630}},"ins_contents":[{"Add":" .get_changeset(txn.changes(&channel_), &change_id)"}],"del_contents":[{"Del":" .get_changeset(txn.changes(&channel_), change_id)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":85,"ins":{"up_context":[{"change":18,"pos":1985}],"down_context":[{"change":18,"pos":648}],"flag":"BLOCK","start":9376,"end":9447,"inode":{"change":18,"pos":95630}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":1985},"to":{"change":11,"start":592,"end":644},"introduced_by":11}],"inode":{"change":18,"pos":95630}},"ins_contents":[{"Add":" changes.push((hash, change_id, n.map(|&x| x.into())));"}],"del_contents":[{"Del":" changes.push((hash, change_id, n));\n"}]}},{"Replacement":{"inode":{"change":18,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":91,"ins":{"up_context":[{"change":18,"pos":96722}],"down_context":[{"change":18,"pos":11953}],"flag":"BLOCK","start":9448,"end":9504,"inode":{"change":18,"pos":95630}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":96722},"to":{"change":18,"start":11898,"end":11953},"introduced_by":18}],"inode":{"change":18,"pos":95630}},"ins_contents":[{"Add":" for p in txn.iter_revdep(&change_id)? {"}],"del_contents":[{"Del":" for p in txn.iter_revdep(change_id)? {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":93,"ins":{"up_context":[{"change":18,"pos":11990}],"down_context":[{"change":18,"pos":96820}],"flag":"BLOCK","start":9505,"end":9545,"inode":{"change":18,"pos":95630}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":11990},"to":{"change":18,"start":96781,"end":96820},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":96781},"to":{"change":18,"start":96781,"end":96820},"introduced_by":18}],"inode":{"change":18,"pos":95630}},"ins_contents":[{"Add":" if p < &change_id {"}],"del_contents":[{"Del":" if p < change_id {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":95,"ins":{"up_context":[{"change":18,"pos":96854}],"down_context":[{"change":18,"pos":96900}],"flag":"BLOCK","start":9546,"end":9593,"inode":{"change":18,"pos":95630}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":96854},"to":{"change":18,"start":96854,"end":96900},"introduced_by":18}],"inode":{"change":18,"pos":95630}},"ins_contents":[{"Add":" } else if p > &change_id {"}],"del_contents":[{"Del":" } else if p > change_id {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":99,"ins":{"up_context":[{"change":18,"pos":152}],"down_context":[{"change":18,"pos":551}],"flag":"BLOCK","start":9594,"end":9672,"inode":{"change":18,"pos":95630}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":152},"to":{"change":18,"start":12073,"end":12138},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":582},"to":{"change":18,"start":12073,"end":12138},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":12073},"to":{"change":18,"start":12073,"end":12138},"introduced_by":18}],"inode":{"change":18,"pos":95630}},"ins_contents":[{"Add":" let dep: Hash = txn.get_external(d)?.unwrap().into();"}],"del_contents":[{"Del":" let dep = txn.get_external(d)?.unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":135,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":97615},"to":{"change":18,"start":5792,"end":5827},"introduced_by":18}],"inode":{"change":18,"pos":95630}}},"contents":[{"Del":" repo.lock.commit().await?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":97650},"path":"pijul/src/commands/reset.rs","line":108,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":773},"to":{"change":18,"start":6164,"end":6211},"introduced_by":18}],"inode":{"change":18,"pos":97650}}},"contents":[{"Del":" repo.lock.commit().await?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":97650},"path":"pijul/src/commands/reset.rs","line":161,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":6587},"to":{"change":18,"start":6212,"end":6251},"introduced_by":18}],"inode":{"change":18,"pos":97650}}},"contents":[{"Del":" repo.lock.commit().await?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":97650},"path":"pijul/src/commands/reset.rs","line":179,"ins":{"up_context":[{"change":18,"pos":2300}],"down_context":[{"change":18,"pos":2442}],"flag":"BLOCK","start":9673,"end":9851,"inode":{"change":18,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":2300},"to":{"change":18,"start":2300,"end":2442},"introduced_by":18}],"inode":{"change":18,"pos":97650}},"ins_contents":[{"Add":" for x in libpijul::pristine::changeid_log(txn, chan, from.into())? {"},{"Add":" let (n, p) = x?;"},{"Add":" let n: u64 = (*n).into();"},{"Add":" debug!(\"{:?} {:?} {:?}\", n, p, from);"}],"del_contents":[{"Del":" for x in libpijul::pristine::changeid_log(txn, chan, from)? {\n let (n, (u, _)) = x?;\n debug!(\"{:?} {:?} {:?}\", n, u, from);\n"}]}},{"Replacement":{"inode":{"change":18,"pos":97650},"path":"pijul/src/commands/reset.rs","line":186,"ins":{"up_context":[{"change":18,"pos":2497}],"down_context":[{"change":18,"pos":2591}],"flag":"BLOCK","start":9852,"end":9951,"inode":{"change":18,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":2497},"to":{"change":18,"start":2497,"end":2591},"introduced_by":18}],"inode":{"change":18,"pos":97650}},"ins_contents":[{"Add":" if changediff.insert(p.a) {"},{"Add":" for y in txn.iter_rev_touched_files(&p.a, None)? {"}],"del_contents":[{"Del":" if changediff.insert(u) {\n for y in txn.iter_rev_touched_files(u, None)? {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":97650},"path":"pijul/src/commands/reset.rs","line":189,"ins":{"up_context":[{"change":18,"pos":2627}],"down_context":[{"change":18,"pos":2720}],"flag":"BLOCK","start":9952,"end":10026,"inode":{"change":18,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":2627},"to":{"change":18,"start":2627,"end":2720},"introduced_by":18}],"inode":{"change":18,"pos":97650}},"ins_contents":[{"Add":" debug_assert!(uu >= &p.a);"},{"Add":" if uu > &p.a {"}],"del_contents":[{"Del":" if uu < u {\n continue;\n } else if uu > u {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":97650},"path":"pijul/src/commands/reset.rs","line":193,"ins":{"up_context":[{"change":18,"pos":2765}],"down_context":[{"change":18,"pos":2801}],"flag":"BLOCK","start":10027,"end":10064,"inode":{"change":18,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":2765},"to":{"change":18,"start":2765,"end":2801},"introduced_by":18}],"inode":{"change":18,"pos":97650}},"ins_contents":[{"Add":" inodes.insert(*pos);"}],"del_contents":[{"Del":" inodes.insert(pos);\n"}]}},{"Edit":{"inode":{"change":18,"pos":101759},"path":"pijul/src/commands/record.rs","line":42,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":102621},"to":{"change":18,"start":102621,"end":102666},"introduced_by":18}],"inode":{"change":18,"pos":101759}}},"contents":[{"Del":" #[clap(long = \"tag\")]\n pub tag: bool,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":101759},"path":"pijul/src/commands/record.rs","line":73,"ins":{"up_context":[{"change":13,"pos":357}],"down_context":[{"change":13,"pos":424}],"flag":"BLOCK","start":10065,"end":10133,"inode":{"change":18,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":13,"pos":357},"to":{"change":13,"start":357,"end":424},"introduced_by":13}],"inode":{"change":18,"pos":101759}},"ins_contents":[{"Add":" .get_changeset(txn.changes(&channel.borrow()), &c)?"}],"del_contents":[{"Del":" .get_changeset(txn.changes(&channel.borrow()), c)?\n"}]}},{"Replacement":{"inode":{"change":18,"pos":101759},"path":"pijul/src/commands/record.rs","line":89,"ins":{"up_context":[{"change":18,"pos":12559}],"down_context":[{"change":18,"pos":288}],"flag":"BLOCK","start":10134,"end":10166,"inode":{"change":18,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":12559},"to":{"change":18,"start":12559,"end":12584},"introduced_by":18}],"inode":{"change":18,"pos":101759}},"ins_contents":[{"Add":" (h?.1).0.into()"}],"del_contents":[{"Del":" (h?.1).0\n"}]}},{"Replacement":{"inode":{"change":18,"pos":101759},"path":"pijul/src/commands/record.rs","line":148,"ins":{"up_context":[{"change":18,"pos":105115}],"down_context":[{"change":18,"pos":105191}],"flag":"BLOCK","start":10167,"end":10329,"inode":{"change":18,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":105115},"to":{"change":18,"start":105115,"end":105191},"introduced_by":18}],"inode":{"change":18,"pos":101759}},"ins_contents":[{"Add":" ::sanakirja::debug::debug(&txn.txn, &[&txn.internal], \"internal\", true);"},{"Add":" txn.apply_local_change(&mut channel, &change, &hash, &updates)?;"}],"del_contents":[{"Del":" txn.apply_local_change(&mut channel, &change, hash, &updates)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":101759},"path":"pijul/src/commands/record.rs","line":160,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":105279},"to":{"change":18,"start":6330,"end":6369},"introduced_by":18}],"inode":{"change":18,"pos":101759}}},"contents":[{"Del":" repo.lock.commit().await?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":101759},"path":"pijul/src/commands/record.rs","line":165,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":301},"to":{"change":18,"start":6370,"end":6413},"introduced_by":18}],"inode":{"change":18,"pos":101759}}},"contents":[{"Del":" repo.lock.commit().await?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":34,"ins":{"up_context":[{"change":18,"pos":6472}],"down_context":[{"change":18,"pos":112314}],"flag":"BLOCK","start":10330,"end":10395,"inode":{"change":18,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":6472},"to":{"change":18,"start":6472,"end":6541},"introduced_by":18}],"inode":{"change":18,"pos":111631}},"ins_contents":[{"Add":" let repo = Repository::find_root(self.repo_path).await?;"}],"del_contents":[{"Del":" let mut repo = Repository::find_root(self.repo_path).await?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":51,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":112970},"to":{"change":18,"start":6542,"end":6589},"introduced_by":18}],"inode":{"change":18,"pos":111631}}},"contents":[{"Del":" repo.lock.commit().await?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":122,"ins":{"up_context":[{"change":18,"pos":1981}],"down_context":[{"change":18,"pos":114570}],"flag":"BLOCK","start":10396,"end":10461,"inode":{"change":18,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":1981},"to":{"change":18,"start":6590,"end":6659},"introduced_by":18}],"inode":{"change":18,"pos":111631}},"ins_contents":[{"Add":" let repo = Repository::find_root(self.repo_path).await?;"}],"del_contents":[{"Del":" let mut repo = Repository::find_root(self.repo_path).await?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":173,"ins":{"up_context":[{"change":18,"pos":116228}],"down_context":[{"change":18,"pos":13129}],"flag":"BLOCK","start":10462,"end":10513,"inode":{"change":18,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":116228},"to":{"change":18,"start":116228,"end":116268},"introduced_by":18}],"inode":{"change":18,"pos":111631}},"ins_contents":[{"Add":" let mut to_upload: Vec = Vec::new();"}],"del_contents":[{"Del":" let mut to_upload = Vec::new();\n"}]}},{"Replacement":{"inode":{"change":18,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":177,"ins":{"up_context":[{"change":18,"pos":7524}],"down_context":[{"change":18,"pos":4622}],"flag":"BLOCK","start":10514,"end":10577,"inode":{"change":18,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":7524},"to":{"change":18,"start":13225,"end":13287},"introduced_by":18}],"inode":{"change":18,"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":18,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":181,"ins":{"up_context":[{"change":18,"pos":13347}],"down_context":[{"change":18,"pos":7525}],"flag":"BLOCK","start":10578,"end":10644,"inode":{"change":18,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":13347},"to":{"change":18,"start":13347,"end":13412},"introduced_by":18}],"inode":{"change":18,"pos":111631}},"ins_contents":[{"Add":" if !txn.remote_has_change(&remote_changes, &h)? {"}],"del_contents":[{"Del":" if !txn.remote_has_change(&remote_changes, h)? {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":183,"ins":{"up_context":[{"change":18,"pos":7567}],"down_context":[{"change":18,"pos":7609}],"flag":"BLOCK","start":10645,"end":10694,"inode":{"change":18,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":7567},"to":{"change":18,"start":7567,"end":7609},"introduced_by":18}],"inode":{"change":18,"pos":111631}},"ins_contents":[{"Add":" to_upload.push(h.into())"}],"del_contents":[{"Del":" to_upload.push(h)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":186,"ins":{"up_context":[{"change":18,"pos":7686}],"down_context":[{"change":18,"pos":7819}],"flag":"BLOCK","start":10695,"end":10835,"inode":{"change":18,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":7686},"to":{"change":18,"start":13413,"end":13496},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":13496},"to":{"change":18,"start":7768,"end":7819},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":7768},"to":{"change":18,"start":7768,"end":7819},"introduced_by":18}],"inode":{"change":18,"pos":111631}},"ins_contents":[{"Add":" if txn.get_touched_files(p, Some(h_int))?.is_some() {"},{"Add":" to_upload.push(h.into());"}],"del_contents":[{"Del":" if txn.get_touched_files(*p, Some(h_int))?.is_some() {\n"},{"Del":" to_upload.push(h);\n"}]}},{"Replacement":{"inode":{"change":18,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":199,"ins":{"up_context":[{"change":18,"pos":7935}],"down_context":[{"change":18,"pos":7981}],"flag":"BLOCK","start":10836,"end":10889,"inode":{"change":18,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":7935},"to":{"change":18,"start":7935,"end":7981},"introduced_by":18}],"inode":{"change":18,"pos":111631}},"ins_contents":[{"Add":" to_upload.push(h.into())"}],"del_contents":[{"Del":" to_upload.push(h)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":202,"ins":{"up_context":[{"change":18,"pos":8066}],"down_context":[{"change":18,"pos":8207}],"flag":"BLOCK","start":10890,"end":11038,"inode":{"change":18,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":8066},"to":{"change":18,"start":13722,"end":13809},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":13809},"to":{"change":18,"start":8152,"end":8207},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":8152},"to":{"change":18,"start":8152,"end":8207},"introduced_by":18}],"inode":{"change":18,"pos":111631}},"ins_contents":[{"Add":" if txn.get_touched_files(p, Some(h_int))?.is_some() {"},{"Add":" to_upload.push(h.into());"}],"del_contents":[{"Del":" if txn.get_touched_files(*p, Some(h_int))?.is_some() {\n"},{"Del":" to_upload.push(h);\n"}]}},{"Replacement":{"inode":{"change":18,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":221,"ins":{"up_context":[{"change":18,"pos":426}],"down_context":[{"change":18,"pos":462}],"flag":"BLOCK","start":11039,"end":11096,"inode":{"change":18,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":426},"to":{"change":18,"start":426,"end":462},"introduced_by":18}],"inode":{"change":18,"pos":111631}},"ins_contents":[{"Add":" let mut u: Vec = Vec::new();"}],"del_contents":[{"Del":" let mut u = Vec::new();\n"}]}},{"Edit":{"inode":{"change":18,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":269,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":117458},"to":{"change":18,"start":6660,"end":6695},"introduced_by":18}],"inode":{"change":18,"pos":111631}}},"contents":[{"Del":" repo.lock.commit().await?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":308,"ins":{"up_context":[{"change":18,"pos":118760}],"down_context":[{"change":18,"pos":8690}],"flag":"BLOCK","start":11097,"end":11154,"inode":{"change":18,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":118760},"to":{"change":18,"start":118760,"end":118806},"introduced_by":18}],"inode":{"change":18,"pos":111631}},"ins_contents":[{"Add":" let mut to_download: Vec = Vec::new();"}],"del_contents":[{"Del":" let mut to_download = Vec::new();\n"}]}},{"Replacement":{"inode":{"change":18,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":312,"ins":{"up_context":[{"change":18,"pos":13890}],"down_context":[{"change":18,"pos":0}],"flag":"BLOCK","start":11155,"end":11199,"inode":{"change":18,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":13890},"to":{"change":18,"start":13890,"end":13929},"introduced_by":18}],"inode":{"change":18,"pos":111631}},"ins_contents":[{"Add":" let p = x?.1; // (h, m)"}],"del_contents":[{"Del":" let (h, m) = x?.1;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":314,"ins":{"up_context":[{"change":18,"pos":27}],"down_context":[{"change":18,"pos":105}],"flag":"BLOCK","start":11200,"end":11281,"inode":{"change":18,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":27},"to":{"change":18,"start":27,"end":105},"introduced_by":18}],"inode":{"change":18,"pos":111631}},"ins_contents":[{"Add":" .channel_has_state(txn.states(&channel.borrow()), &p.b)?"}],"del_contents":[{"Del":" .channel_has_state(txn.states(&channel.borrow()), m)?\n"}]}},{"Replacement":{"inode":{"change":18,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":318,"ins":{"up_context":[{"change":18,"pos":6447}],"down_context":[{"change":18,"pos":6565}],"flag":"BLOCK","start":11282,"end":11420,"inode":{"change":18,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":6447},"to":{"change":18,"start":13991,"end":14066},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":14066},"to":{"change":18,"start":6521,"end":6565},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":6521},"to":{"change":18,"start":6521,"end":6565},"introduced_by":18}],"inode":{"change":18,"pos":111631}},"ins_contents":[{"Add":" } else if txn.get_revchanges(&channel, &p.a.into())?.is_none() {"},{"Add":" to_download.push(p.a.into())"}],"del_contents":[{"Del":" } else if txn.get_revchanges(&channel, h)?.is_none() {\n"},{"Del":" to_download.push(h)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":336,"ins":{"up_context":[{"change":18,"pos":9407}],"down_context":[{"change":18,"pos":9472}],"flag":"BLOCK","start":11421,"end":11503,"inode":{"change":18,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":9407},"to":{"change":18,"start":14273,"end":14347},"introduced_by":18}],"inode":{"change":18,"pos":111631}},"ins_contents":[{"Add":" change: txn.get_external(&x.change).unwrap().unwrap().into(),"}],"del_contents":[{"Del":" change: txn.get_external(x.change).unwrap().unwrap(),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":344,"ins":{"up_context":[{"change":18,"pos":194}],"down_context":[{"change":18,"pos":276}],"flag":"BLOCK","start":11504,"end":11587,"inode":{"change":18,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":194},"to":{"change":18,"start":194,"end":276},"introduced_by":18}],"inode":{"change":18,"pos":111631}},"ins_contents":[{"Add":" .channel_has_state(txn.states(&channel.borrow()), &m)?"}],"del_contents":[{"Del":" .channel_has_state(txn.states(&channel.borrow()), m)?\n"}]}},{"Replacement":{"inode":{"change":18,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":356,"ins":{"up_context":[{"change":18,"pos":9641}],"down_context":[{"change":18,"pos":14846}],"flag":"BLOCK","start":11588,"end":11671,"inode":{"change":18,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":9641},"to":{"change":18,"start":14764,"end":14846},"introduced_by":18}],"inode":{"change":18,"pos":111631}},"ins_contents":[{"Add":" txn.get_rev_touched_files(h_int, Some(&inode))"}],"del_contents":[{"Del":" txn.get_rev_touched_files(h_int, Some(inode))\n"}]}},{"Replacement":{"inode":{"change":18,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":361,"ins":{"up_context":[{"change":18,"pos":9798}],"down_context":[{"change":18,"pos":8030}],"flag":"BLOCK","start":11672,"end":11731,"inode":{"change":18,"pos":111631}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":9798},"to":{"change":18,"start":7978,"end":8030},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":7978},"to":{"change":18,"start":7978,"end":8030},"introduced_by":18}],"inode":{"change":18,"pos":111631}},"ins_contents":[{"Add":" to_download.push(h.into())"}],"del_contents":[{"Del":" to_download.push(h)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":406,"ins":{"up_context":[{"change":18,"pos":120394}],"down_context":[{"change":14,"pos":72}],"flag":"BLOCK","start":11732,"end":11788,"inode":{"change":18,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":120394},"to":{"change":18,"start":120394,"end":120449},"introduced_by":18}],"inode":{"change":18,"pos":111631}},"ins_contents":[{"Add":" debug!(\"to_download = {:#?}\", to_download);"}],"del_contents":[{"Del":" debug!(\"to_download = {:?}\", to_download);\n"}]}},{"Replacement":{"inode":{"change":18,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":413,"ins":{"up_context":[{"change":14,"pos":197}],"down_context":[{"change":18,"pos":750}],"flag":"BLOCK","start":11789,"end":11872,"inode":{"change":18,"pos":111631}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":14,"pos":197},"to":{"change":18,"start":120481,"end":120565},"introduced_by":14},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":120481},"to":{"change":18,"start":120481,"end":120565},"introduced_by":18}],"inode":{"change":18,"pos":111631}},"ins_contents":[{"Add":" txn.apply_change_rec_ws(&repo.changes, &mut channel, h, &mut ws)?;"}],"del_contents":[{"Del":" txn.apply_change_rec_ws(&repo.changes, &mut channel, *h, &mut ws)?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":437,"ins":{"up_context":[{"change":18,"pos":839}],"down_context":[{"change":18,"pos":894}],"flag":"BLOCK","start":11873,"end":11935,"inode":{"change":18,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":839},"to":{"change":18,"start":839,"end":894},"introduced_by":18}],"inode":{"change":18,"pos":111631}},"ins_contents":[{"Add":" if let Some(int) = txn.get_internal(&d.into())? {"}],"del_contents":[{"Del":" if let Some(int) = txn.get_internal(*d)? {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":446,"ins":{"up_context":[{"change":18,"pos":1227}],"down_context":[{"change":18,"pos":1301}],"flag":"BLOCK","start":11936,"end":12018,"inode":{"change":18,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":1227},"to":{"change":18,"start":1227,"end":1301},"introduced_by":18}],"inode":{"change":18,"pos":111631}},"ins_contents":[{"Add":" change: txn.get_external(&inode.change)?.unwrap().into(),"}],"del_contents":[{"Del":" change: txn.get_external(inode.change)?.unwrap(),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":459,"ins":{"up_context":[{"change":15,"pos":369}],"down_context":[{"change":15,"pos":469}],"flag":"BLOCK","start":12019,"end":12120,"inode":{"change":18,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":15,"pos":369},"to":{"change":15,"start":369,"end":469},"introduced_by":15}],"inode":{"change":18,"pos":111631}},"ins_contents":[{"Add":" .push(libpijul::fs::find_path(&repo.changes, &txn, &channel.borrow(), false, *i)?.0)"}],"del_contents":[{"Del":" .push(libpijul::fs::find_path(&repo.changes, &txn, &channel.borrow(), false, i)?.0)\n"}]}},{"Edit":{"inode":{"change":18,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":489,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":121124},"to":{"change":18,"start":6766,"end":6801},"introduced_by":18}],"inode":{"change":18,"pos":111631}}},"contents":[{"Del":" repo.lock.commit().await?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":513,"ins":{"up_context":[{"change":18,"pos":350}],"down_context":[{"change":18,"pos":401}],"flag":"BLOCK","start":12121,"end":12181,"inode":{"change":18,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":350},"to":{"change":18,"start":15025,"end":15077},"introduced_by":18}],"inode":{"change":18,"pos":111631}},"ins_contents":[{"Add":" if txn.remote_has_change(rem, &d.into())? {"}],"del_contents":[{"Del":" if txn.remote_has_change(rem, d)? {\n"}]}},{"Edit":{"inode":{"change":18,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":81,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":1272}],"down_context":[{"change":18,"pos":1272}],"flag":"BLOCK","start":12182,"end":12250,"inode":{"change":18,"pos":123281}}},"contents":[{"Add":" let m: libpijul::Merkle = m.into();"}]}},{"Edit":{"inode":{"change":18,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":89,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":15582}],"down_context":[{"change":18,"pos":1515}],"flag":"BLOCK","start":12251,"end":12297,"inode":{"change":18,"pos":123281}}},"contents":[{"Add":" let m: Merkle = m.into();"}]}},{"Replacement":{"inode":{"change":18,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":107,"ins":{"up_context":[{"change":18,"pos":127257}],"down_context":[{"change":18,"pos":11554}],"flag":"BLOCK","start":12298,"end":12392,"inode":{"change":18,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":127257},"to":{"change":18,"start":15636,"end":15706},"introduced_by":18}],"inode":{"change":18,"pos":123281}},"ins_contents":[{"Add":" let h: libpijul::Hash = txn.get_external(&p.change)?.unwrap().into();"}],"del_contents":[{"Del":" let h = txn.get_external(p.change)?.unwrap();\n"}]}},{"Replacement":{"inode":{"change":18,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":125,"ins":{"up_context":[{"change":18,"pos":11980}],"down_context":[{"change":18,"pos":12078}],"flag":"BLOCK","start":12393,"end":12532,"inode":{"change":18,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":11980},"to":{"change":18,"start":16203,"end":16342},"introduced_by":18}],"inode":{"change":18,"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\n || txn.get_touched_files(*x, Some(h_int)).unwrap().is_some()\n"}]}},{"Edit":{"inode":{"change":18,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":129,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":127893}],"down_context":[{"change":18,"pos":127893}],"flag":"BLOCK","start":12533,"end":12631,"inode":{"change":18,"pos":123281}}},"contents":[{"Add":" let h: Hash = h.into();"},{"Add":" let m: Merkle = m.into();"}]}},{"Replacement":{"inode":{"change":18,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":184,"ins":{"up_context":[{"change":18,"pos":130437}],"down_context":[{"change":12,"pos":67}],"flag":"BLOCK","start":12632,"end":12712,"inode":{"change":18,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":130437},"to":{"change":18,"start":130437,"end":130516},"introduced_by":18}],"inode":{"change":18,"pos":123281}},"ins_contents":[{"Add":" txn.apply_change_ws(&repo.changes, &mut channel, &h, &mut ws)?;"}],"del_contents":[{"Del":" txn.apply_change_ws(&repo.changes, &mut channel, h, &mut ws)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":186,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":12,"pos":128},"to":{"change":18,"start":130577,"end":130748},"introduced_by":12},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":130577},"to":{"change":18,"start":130577,"end":130748},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":130748},"to":{"change":18,"start":16547,"end":16676},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":16676},"to":{"change":18,"start":130875,"end":130921},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":130875},"to":{"change":18,"start":130875,"end":130921},"introduced_by":18}],"inode":{"change":18,"pos":123281}}},"contents":[{"Del":" } else if let Some(cap) = CHANNEL.captures(&buf) {\n let channel = load_channel(&txn, &cap[1])?;\n let channel = channel.borrow();\n"},{"Del":" for d in libpijul::pristine::channel_dump::dump_channel(&txn, channel)? {\n o.write_all(&d?)?;\n"},{"Del":" }\n o.flush()?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":212,"ins":{"up_context":[{"change":18,"pos":132460}],"down_context":[{"change":18,"pos":132495}],"flag":"BLOCK","start":12713,"end":12749,"inode":{"change":18,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":132460},"to":{"change":18,"start":132460,"end":132495},"introduced_by":18}],"inode":{"change":18,"pos":123281}},"ins_contents":[{"Add":" &state,"}],"del_contents":[{"Del":" state,\n"}]}},{"Edit":{"inode":{"change":18,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":246,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":133576},"to":{"change":18,"start":6930,"end":6969},"introduced_by":18}],"inode":{"change":18,"pos":123281}}},"contents":[{"Del":" repo.lock.commit().await?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":133619},"path":"pijul/src/commands/mod.rs","line":59,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":134333},"to":{"change":18,"start":6970,"end":7024},"introduced_by":18}],"inode":{"change":18,"pos":133619}}},"contents":[{"Del":"#[cfg(unix)]\nmod lock;\n#[cfg(unix)]\npub use lock::*;\n\n"}]}},{"Replacement":{"inode":{"change":18,"pos":133619},"path":"pijul/src/commands/mod.rs","line":95,"ins":{"up_context":[{"change":18,"pos":2807}],"down_context":[{"change":18,"pos":2890}],"flag":"BLOCK","start":12750,"end":12834,"inode":{"change":18,"pos":133619}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":2807},"to":{"change":18,"start":2807,"end":2890},"introduced_by":18}],"inode":{"change":18,"pos":133619}},"ins_contents":[{"Add":" txn.apply_local_change(channel, &pending_change, &hash, &recorded.updatables)?;"}],"del_contents":[{"Del":" txn.apply_local_change(channel, &pending_change, hash, &recorded.updatables)?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":134376},"path":"pijul/src/commands/log.rs","line":32,"ins":{"up_context":[{"change":18,"pos":7083}],"down_context":[{"change":18,"pos":135006}],"flag":"BLOCK","start":12835,"end":12911,"inode":{"change":18,"pos":134376}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":7083},"to":{"change":18,"start":7083,"end":7169},"introduced_by":18}],"inode":{"change":18,"pos":134376}},"ins_contents":[{"Add":" let repo = unsafe { Repository::find_root(self.repo_path).await? };"}],"del_contents":[{"Del":" let repo = unsafe { Repository::find_root_immutable(self.repo_path).await? };\n"}]}},{"Replacement":{"inode":{"change":18,"pos":134376},"path":"pijul/src/commands/log.rs","line":45,"ins":{"up_context":[{"change":18,"pos":17147}],"down_context":[{"change":18,"pos":135619}],"flag":"BLOCK","start":12912,"end":12969,"inode":{"change":18,"pos":134376}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":17147},"to":{"change":18,"start":17147,"end":17181},"introduced_by":18}],"inode":{"change":18,"pos":134376}},"ins_contents":[{"Add":" let h: libpijul::Hash = (h?.1).0.into();"}],"del_contents":[{"Del":" let h = (h?.1).0;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":134376},"path":"pijul/src/commands/log.rs","line":52,"ins":{"up_context":[{"change":18,"pos":17284}],"down_context":[{"change":18,"pos":135873}],"flag":"BLOCK","start":12970,"end":13137,"inode":{"change":18,"pos":134376}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":17284},"to":{"change":18,"start":0,"end":54},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":135819},"to":{"change":18,"start":0,"end":54},"introduced_by":18}],"inode":{"change":18,"pos":134376}},"ins_contents":[{"Add":" let h: libpijul::Hash = h.into();"},{"Add":" let mrk: libpijul::Merkle = mrk.into();"},{"Add":" let header = changes.get_header(&h.into())?;"}],"del_contents":[{"Del":" let header = changes.get_header(&h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":136543},"path":"pijul/src/commands/init.rs","line":28,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":137177},"to":{"change":18,"start":14199,"end":14234},"introduced_by":18}],"inode":{"change":18,"pos":136543}}},"contents":[{"Del":" repo.lock.commit().await?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":167873},"path":"pijul/src/commands/fork.rs","line":26,"ins":{"up_context":[{"change":18,"pos":14628}],"down_context":[{"change":18,"pos":168420}],"flag":"BLOCK","start":13138,"end":13203,"inode":{"change":18,"pos":167873}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":14628},"to":{"change":18,"start":14628,"end":14697},"introduced_by":18}],"inode":{"change":18,"pos":167873}},"ins_contents":[{"Add":" let repo = Repository::find_root(self.repo_path).await?;"}],"del_contents":[{"Del":" let mut repo = Repository::find_root(self.repo_path).await?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":167873},"path":"pijul/src/commands/fork.rs","line":32,"ins":{"up_context":[{"change":18,"pos":168678}],"down_context":[{"change":18,"pos":168747}],"flag":"BLOCK","start":13204,"end":13274,"inode":{"change":18,"pos":167873}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":168678},"to":{"change":18,"start":168678,"end":168747},"introduced_by":18}],"inode":{"change":18,"pos":167873}},"ins_contents":[{"Add":" txn.apply_change_rec(&repo.changes, &mut channel, &hash)?"}],"del_contents":[{"Del":" txn.apply_change_rec(&repo.changes, &mut channel, hash)?\n"}]}},{"Edit":{"inode":{"change":18,"pos":167873},"path":"pijul/src/commands/fork.rs","line":40,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":169013},"to":{"change":18,"start":14698,"end":14733},"introduced_by":18}],"inode":{"change":18,"pos":167873}}},"contents":[{"Del":" repo.lock.commit().await?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":169058},"path":"pijul/src/commands/file_operations.rs","line":25,"ins":{"up_context":[{"change":18,"pos":14796}],"down_context":[{"change":18,"pos":169474}],"flag":"BLOCK","start":13275,"end":13348,"inode":{"change":18,"pos":169058}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":14796},"to":{"change":18,"start":14796,"end":14873},"introduced_by":18}],"inode":{"change":18,"pos":169058}},"ins_contents":[{"Add":" let repo = Repository::find_root(self.repo_path.clone()).await?;"}],"del_contents":[{"Del":" let mut repo = Repository::find_root(self.repo_path.clone()).await?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":169058},"path":"pijul/src/commands/file_operations.rs","line":57,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":170571},"to":{"change":18,"start":14874,"end":14909},"introduced_by":18}],"inode":{"change":18,"pos":169058}}},"contents":[{"Del":" repo.lock.commit().await?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":169058},"path":"pijul/src/commands/file_operations.rs","line":78,"ins":{"up_context":[{"change":18,"pos":14968}],"down_context":[{"change":18,"pos":170979}],"flag":"BLOCK","start":13349,"end":13425,"inode":{"change":18,"pos":169058}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":14968},"to":{"change":18,"start":14968,"end":15054},"introduced_by":18}],"inode":{"change":18,"pos":169058}},"ins_contents":[{"Add":" let repo = unsafe { Repository::find_root(self.repo_path).await? };"}],"del_contents":[{"Del":" let repo = unsafe { Repository::find_root_immutable(self.repo_path).await? };\n"}]}},{"Replacement":{"inode":{"change":18,"pos":169058},"path":"pijul/src/commands/file_operations.rs","line":104,"ins":{"up_context":[{"change":18,"pos":15113}],"down_context":[{"change":18,"pos":171454}],"flag":"BLOCK","start":13426,"end":13499,"inode":{"change":18,"pos":169058}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":15113},"to":{"change":18,"start":15113,"end":15190},"introduced_by":18}],"inode":{"change":18,"pos":169058}},"ins_contents":[{"Add":" let repo = Repository::find_root(self.repo_path.clone()).await?;"}],"del_contents":[{"Del":" let mut repo = Repository::find_root(self.repo_path.clone()).await?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":169058},"path":"pijul/src/commands/file_operations.rs","line":150,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":172439},"to":{"change":18,"start":15191,"end":15226},"introduced_by":18}],"inode":{"change":18,"pos":169058}}},"contents":[{"Del":" repo.lock.commit().await?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":169058},"path":"pijul/src/commands/file_operations.rs","line":165,"ins":{"up_context":[{"change":18,"pos":15285}],"down_context":[{"change":18,"pos":172733}],"flag":"BLOCK","start":13500,"end":13573,"inode":{"change":18,"pos":169058}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":15285},"to":{"change":18,"start":15285,"end":15362},"introduced_by":18}],"inode":{"change":18,"pos":169058}},"ins_contents":[{"Add":" let repo = Repository::find_root(self.repo_path.clone()).await?;"}],"del_contents":[{"Del":" let mut repo = Repository::find_root(self.repo_path.clone()).await?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":169058},"path":"pijul/src/commands/file_operations.rs","line":191,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":173517},"to":{"change":18,"start":15363,"end":15398},"introduced_by":18}],"inode":{"change":18,"pos":169058}}},"contents":[{"Del":" repo.lock.commit().await?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":178684},"path":"pijul/src/commands/credit.rs","line":28,"ins":{"up_context":[{"change":18,"pos":179239}],"down_context":[{"change":18,"pos":179302}],"flag":"BLOCK","start":13574,"end":13643,"inode":{"change":18,"pos":178684}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":179239},"to":{"change":18,"start":15722,"end":15812},"introduced_by":18}],"inode":{"change":18,"pos":178684}},"ins_contents":[{"Add":" let mut repo = Repository::find_root(self.repo_path).await?;"}],"del_contents":[{"Del":" let mut repo = unsafe { Repository::find_root_immutable(self.repo_path).await? };\n"}]}},{"Replacement":{"inode":{"change":18,"pos":178684},"path":"pijul/src/commands/credit.rs","line":107,"ins":{"up_context":[{"change":18,"pos":18451}],"down_context":[{"change":18,"pos":18498}],"flag":"BLOCK","start":13644,"end":13693,"inode":{"change":18,"pos":178684}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":18451},"to":{"change":18,"start":18451,"end":18498},"introduced_by":18}],"inode":{"change":18,"pos":178684}},"ins_contents":[{"Add":" if e.introduced_by().is_root() {"}],"del_contents":[{"Del":" if e.introduced_by.is_root() {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":178684},"path":"pijul/src/commands/credit.rs","line":110,"ins":{"up_context":[{"change":18,"pos":18546}],"down_context":[{"change":18,"pos":181626}],"flag":"BLOCK","start":13694,"end":13750,"inode":{"change":18,"pos":178684}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":18546},"to":{"change":18,"start":181572,"end":181626},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":181572},"to":{"change":18,"start":181572,"end":181626},"introduced_by":18}],"inode":{"change":18,"pos":178684}},"ins_contents":[{"Add":" self.changes.insert(e.introduced_by());"}],"del_contents":[{"Del":" self.changes.insert(e.introduced_by);\n"}]}},{"Edit":{"inode":{"change":18,"pos":182891},"path":"pijul/src/commands/clone.rs","line":11,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":183067},"to":{"change":18,"start":4552,"end":4629},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":4629},"to":{"change":18,"start":183147,"end":183163},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":183147},"to":{"change":18,"start":183147,"end":183163},"introduced_by":18}],"inode":{"change":18,"pos":182891}}},"contents":[{"Del":" /// Only download changes with alive contents\n #[clap(long = \"lazy\")]\n"},{"Del":" lazy: bool,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":182891},"path":"pijul/src/commands/clone.rs","line":75,"ins":{"up_context":[{"change":18,"pos":185211}],"down_context":[{"change":18,"pos":185289}],"flag":"BLOCK","start":13751,"end":13818,"inode":{"change":18,"pos":182891}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":185211},"to":{"change":18,"start":185211,"end":185289},"introduced_by":18}],"inode":{"change":18,"pos":182891}},"ins_contents":[{"Add":" .clone_state(&mut repo, &mut txn, &mut channel, h)"}],"del_contents":[{"Del":" .clone_state(&mut repo, &mut txn, &mut channel, h, self.lazy)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":182891},"path":"pijul/src/commands/clone.rs","line":79,"ins":{"up_context":[{"change":18,"pos":185349}],"down_context":[{"change":18,"pos":185566}],"flag":"BLOCK","start":13819,"end":13906,"inode":{"change":18,"pos":182891}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":185349},"to":{"change":18,"start":185349,"end":185566},"introduced_by":18}],"inode":{"change":18,"pos":182891}},"ins_contents":[{"Add":" .clone_channel(&mut repo, &mut txn, &mut channel, &self.partial_paths)"}],"del_contents":[{"Del":" .clone_channel(\n &mut repo,\n &mut txn,\n &mut channel,\n self.lazy,\n &self.partial_paths,\n )\n"}]}},{"Edit":{"inode":{"change":18,"pos":182891},"path":"pijul/src/commands/clone.rs","line":97,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":185801},"to":{"change":18,"start":15874,"end":15909},"introduced_by":18}],"inode":{"change":18,"pos":182891}}},"contents":[{"Del":" repo.lock.commit().await?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":186892},"path":"pijul/src/commands/channel.rs","line":54,"ins":{"up_context":[{"change":18,"pos":188244}],"down_context":[{"change":18,"pos":1196}],"flag":"BLOCK","start":13907,"end":13980,"inode":{"change":18,"pos":186892}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":188244},"to":{"change":18,"start":16043,"end":16120},"introduced_by":18}],"inode":{"change":18,"pos":186892}},"ins_contents":[{"Add":" let repo = Repository::find_root(self.repo_path).await?;"}],"del_contents":[{"Del":" let mut repo = Repository::find_root(self.repo_path).await?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":186892},"path":"pijul/src/commands/channel.rs","line":64,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":188379},"to":{"change":18,"start":16121,"end":16164},"introduced_by":18}],"inode":{"change":18,"pos":186892}}},"contents":[{"Del":" repo.lock.commit().await?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":186892},"path":"pijul/src/commands/channel.rs","line":76,"ins":{"up_context":[{"change":18,"pos":188456}],"down_context":[{"change":18,"pos":1809}],"flag":"BLOCK","start":13981,"end":14054,"inode":{"change":18,"pos":186892}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":188456},"to":{"change":18,"start":16217,"end":16294},"introduced_by":18}],"inode":{"change":18,"pos":186892}},"ins_contents":[{"Add":" let repo = Repository::find_root(self.repo_path).await?;"}],"del_contents":[{"Del":" let mut repo = Repository::find_root(self.repo_path).await?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":186892},"path":"pijul/src/commands/channel.rs","line":93,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":189246},"to":{"change":18,"start":16295,"end":16338},"introduced_by":18}],"inode":{"change":18,"pos":186892}}},"contents":[{"Del":" repo.lock.commit().await?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":189306},"path":"pijul/src/commands/change.rs","line":22,"ins":{"up_context":[{"change":18,"pos":16397}],"down_context":[{"change":18,"pos":189800}],"flag":"BLOCK","start":14055,"end":14139,"inode":{"change":18,"pos":189306}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":16397},"to":{"change":18,"start":16397,"end":16491},"introduced_by":18}],"inode":{"change":18,"pos":189306}},"ins_contents":[{"Add":" let repo = unsafe { Repository::find_root(self.repo_path.clone()).await? };"}],"del_contents":[{"Del":" let repo = unsafe { Repository::find_root_immutable(self.repo_path.clone()).await? };\n"}]}},{"Replacement":{"inode":{"change":18,"pos":189306},"path":"pijul/src/commands/change.rs","line":37,"ins":{"up_context":[{"change":18,"pos":19195}],"down_context":[{"change":18,"pos":385}],"flag":"BLOCK","start":14140,"end":14172,"inode":{"change":18,"pos":189306}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":19195},"to":{"change":18,"start":19195,"end":19220},"introduced_by":18}],"inode":{"change":18,"pos":189306}},"ins_contents":[{"Add":" (h?.1).0.into()"}],"del_contents":[{"Del":" (h?.1).0\n"}]}},{"Replacement":{"inode":{"change":18,"pos":191083},"path":"pijul/src/commands/archive.rs","line":99,"ins":{"up_context":[{"change":18,"pos":193682}],"down_context":[{"change":18,"pos":193709}],"flag":"BLOCK","start":14173,"end":14201,"inode":{"change":18,"pos":191083}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":193682},"to":{"change":18,"start":193682,"end":193709},"introduced_by":18}],"inode":{"change":18,"pos":191083}},"ins_contents":[{"Add":" &state,"}],"del_contents":[{"Del":" state,\n"}]}},{"Edit":{"inode":{"change":18,"pos":194289},"path":"pijul/src/commands/apply.rs","line":8,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":617}],"down_context":[{"change":18,"pos":3379}],"flag":"BLOCK","start":14202,"end":14214,"inode":{"change":18,"pos":194289}}},"contents":[{"Add":"use log::*;"}]}},{"Replacement":{"inode":{"change":18,"pos":194289},"path":"pijul/src/commands/apply.rs","line":55,"ins":{"up_context":[{"change":18,"pos":1173}],"down_context":[{"change":18,"pos":196040}],"flag":"BLOCK","start":14215,"end":14301,"inode":{"change":18,"pos":194289}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":1173},"to":{"change":18,"start":1173,"end":1258},"introduced_by":18}],"inode":{"change":18,"pos":194289}},"ins_contents":[{"Add":" txn.apply_deps_rec(&repo.changes, &mut channel, hashes.last().unwrap())?;"}],"del_contents":[{"Del":" txn.apply_deps_rec(&repo.changes, &mut channel, hashes.pop().unwrap())?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":194289},"path":"pijul/src/commands/apply.rs","line":57,"ins":{"up_context":[{"change":18,"pos":196057}],"down_context":[{"change":18,"pos":1302}],"flag":"BLOCK","start":14302,"end":14342,"inode":{"change":18,"pos":194289}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":196057},"to":{"change":18,"start":1259,"end":1302},"introduced_by":18}],"inode":{"change":18,"pos":194289}},"ins_contents":[{"Add":" for hash in hashes.iter() {"}],"del_contents":[{"Del":" for hash in hashes.drain(..) {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":194289},"path":"pijul/src/commands/apply.rs","line":64,"ins":{"up_context":[{"change":18,"pos":694}],"down_context":[{"change":18,"pos":749}],"flag":"BLOCK","start":14343,"end":14448,"inode":{"change":18,"pos":194289}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":694},"to":{"change":18,"start":694,"end":749},"introduced_by":18}],"inode":{"change":18,"pos":194289}},"ins_contents":[{"Add":" if let Some(int) = txn.get_internal(&d.into())? {"},{"Add":" debug!(\"int = {:?}\", int);"}],"del_contents":[{"Del":" if let Some(int) = txn.get_internal(*d)? {\n"}]}},{"Edit":{"inode":{"change":18,"pos":194289},"path":"pijul/src/commands/apply.rs","line":67,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":807}],"down_context":[{"change":18,"pos":807}],"flag":"BLOCK","start":14449,"end":14492,"inode":{"change":18,"pos":194289}}},"contents":[{"Add":" debug!(\"{:?}\", inode);"}]}},{"Replacement":{"inode":{"change":18,"pos":194289},"path":"pijul/src/commands/apply.rs","line":74,"ins":{"up_context":[{"change":18,"pos":1021}],"down_context":[{"change":18,"pos":1064}],"flag":"BLOCK","start":14493,"end":14537,"inode":{"change":18,"pos":194289}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":1021},"to":{"change":18,"start":1021,"end":1064},"introduced_by":18}],"inode":{"change":18,"pos":194289}},"ins_contents":[{"Add":" touched.insert(*inode);"}],"del_contents":[{"Del":" touched.insert(inode);\n"}]}},{"Edit":{"inode":{"change":18,"pos":194289},"path":"pijul/src/commands/apply.rs","line":92,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":196337},"to":{"change":18,"start":16701,"end":16736},"introduced_by":18}],"inode":{"change":18,"pos":194289}}},"contents":[{"Del":" repo.lock.commit().await?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":196374},"path":"pijul/Cargo.toml","line":33,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":16789}],"down_context":[{"change":18,"pos":197171}],"flag":"BLOCK","start":14538,"end":14561,"inode":{"change":18,"pos":196374}}},"contents":[{"Add":"\"src/commands/tag.rs\","}]}},{"Replacement":{"inode":{"change":18,"pos":196374},"path":"pijul/Cargo.toml","line":46,"ins":{"up_context":[{"change":18,"pos":197316}],"down_context":[{"change":3,"pos":121}],"flag":"BLOCK","start":14562,"end":14579,"inode":{"change":18,"pos":196374}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":197316},"to":{"change":18,"start":197316,"end":197351},"introduced_by":18}],"inode":{"change":18,"pos":196374}},"ins_contents":[{"Add":"git = [ \"git2\" ]"}],"del_contents":[{"Del":"git = [ \"git2\", \"sanakirja/git2\" ]\n"}]}},{"Replacement":{"inode":{"change":18,"pos":196374},"path":"pijul/Cargo.toml","line":69,"ins":{"up_context":[{"change":18,"pos":197874}],"down_context":[{"change":18,"pos":197895}],"flag":"BLOCK","start":14580,"end":14636,"inode":{"change":18,"pos":196374}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":197874},"to":{"change":18,"start":0,"end":57},"introduced_by":18}],"inode":{"change":18,"pos":196374}},"ins_contents":[{"Add":"sanakirja = { version = \"1.1.2\", features = [\"crc32\"] }"}],"del_contents":[{"Del":"sanakirja = { version = \"0.15.8\", features = [\"crc32\"] }\n"}]}},{"Replacement":{"inode":{"change":18,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":18,"ins":{"up_context":[{"change":18,"pos":226458}],"down_context":[{"change":18,"pos":226645}],"flag":"BLOCK","start":14637,"end":14753,"inode":{"change":18,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":226458},"to":{"change":18,"start":19970,"end":20031},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":20031},"to":{"change":18,"start":353,"end":404},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":226518},"to":{"change":18,"start":353,"end":404},"introduced_by":18}],"inode":{"change":18,"pos":225940}},"ins_contents":[{"Add":" if let Some(&inode) = txn.get_revinodes(&pos, None)? {"},{"Add":" del_inodes_with_rev(txn, &inode, &pos)?;"}],"del_contents":[{"Del":" if let Some(inode) = txn.get_revinodes(pos, None)? {\n"},{"Del":" del_inodes_with_rev(txn, inode, pos)?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":38,"ins":{"up_context":[{"change":18,"pos":1134}],"down_context":[{"change":18,"pos":227128}],"flag":"BLOCK","start":14754,"end":14848,"inode":{"change":18,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":1134},"to":{"change":18,"start":565,"end":658},"introduced_by":18}],"inode":{"change":18,"pos":225940}},"ins_contents":[{"Add":" *txn.find_block_end(txn.graph(channel), internal_pos(txn, &e.from, change_id)?)?;"}],"del_contents":[{"Del":" txn.find_block_end(txn.graph(channel), internal_pos(txn, &e.from, change_id)?)?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":73,"ins":{"up_context":[{"change":18,"pos":20660}],"down_context":[{"change":18,"pos":20778}],"flag":"BLOCK","start":14849,"end":14971,"inode":{"change":18,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":20660},"to":{"change":18,"start":20660,"end":20778},"introduced_by":18}],"inode":{"change":18,"pos":225940}},"ins_contents":[{"Add":" if e.flag().contains(EdgeFlags::PARENT | EdgeFlags::FOLDER) {"},{"Add":" source_parent = Some(e.dest());"}],"del_contents":[{"Del":" if e.flag.contains(EdgeFlags::PARENT | EdgeFlags::FOLDER) {\n source_parent = Some(e.dest);\n"}]}},{"Replacement":{"inode":{"change":18,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":82,"ins":{"up_context":[{"change":18,"pos":6928}],"down_context":[{"change":18,"pos":6929}],"flag":"BLOCK","start":14972,"end":15052,"inode":{"change":18,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":6928},"to":{"change":18,"start":20878,"end":20956},"introduced_by":18}],"inode":{"change":18,"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":18,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":105,"ins":{"up_context":[{"change":18,"pos":7110}],"down_context":[{"change":18,"pos":7177}],"flag":"BLOCK","start":15053,"end":15146,"inode":{"change":18,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":7110},"to":{"change":18,"start":21152,"end":21228},"introduced_by":18}],"inode":{"change":18,"pos":225940}},"ins_contents":[{"Add":" .get_file_name(|h| txn.get_external(&h).unwrap().map(From::from), source, &mut name)"}],"del_contents":[{"Del":" .get_file_name(|h| txn.get_external(h).unwrap(), source, &mut name)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":112,"ins":{"up_context":[{"change":18,"pos":229428}],"down_context":[{"change":18,"pos":85}],"flag":"BLOCK","start":15147,"end":15225,"inode":{"change":18,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":229428},"to":{"change":18,"start":21229,"end":21287},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":21287},"to":{"change":18,"start":67,"end":85},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":67},"to":{"change":18,"start":67,"end":85},"introduced_by":18}],"inode":{"change":18,"pos":225940}},"ins_contents":[{"Add":" if let Some(inode) = txn.get_revinodes(&dest, None)? {"},{"Add":" Ok(*inode)"}],"del_contents":[{"Del":" if let Some(inode) = txn.get_revinodes(dest, None)? {\n"},{"Del":" Ok(inode)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":116,"ins":{"up_context":[{"change":18,"pos":21343}],"down_context":[{"change":18,"pos":338}],"flag":"BLOCK","start":15226,"end":15327,"inode":{"change":18,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":21343},"to":{"change":18,"start":21343,"end":21453},"introduced_by":18}],"inode":{"change":18,"pos":225940}},"ins_contents":[{"Add":" put_tree_with_rev(txn, &file_id, &inode)?;"},{"Add":" put_inodes_with_rev(txn, &inode, &dest)?;"}],"del_contents":[{"Del":" put_tree_with_rev(txn, file_id.as_file_id(), inode)?;\n put_inodes_with_rev(txn, inode, dest)?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":136,"ins":{"up_context":[{"change":18,"pos":21610}],"down_context":[{"change":18,"pos":21679}],"flag":"BLOCK","start":15328,"end":15399,"inode":{"change":18,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":21610},"to":{"change":18,"start":21610,"end":21679},"introduced_by":18}],"inode":{"change":18,"pos":225940}},"ins_contents":[{"Add":" if !e.flag().contains(EdgeFlags::FOLDER | EdgeFlags::PARENT) {"}],"del_contents":[{"Del":" if !e.flag.contains(EdgeFlags::FOLDER | EdgeFlags::PARENT) {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":139,"ins":{"up_context":[{"change":18,"pos":21711}],"down_context":[{"change":18,"pos":230218}],"flag":"BLOCK","start":15400,"end":15507,"inode":{"change":18,"pos":225940}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":21711},"to":{"change":18,"start":230169,"end":230218},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":230169},"to":{"change":18,"start":230169,"end":230218},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":230218},"to":{"change":18,"start":44,"end":98},"introduced_by":18}],"inode":{"change":18,"pos":225940}},"ins_contents":[{"Add":" if e.flag().contains(EdgeFlags::DELETED) {"},{"Add":" debug!(\"deleted: {:?}\", e.introduced_by());"}],"del_contents":[{"Del":" if e.flag.contains(EdgeFlags::DELETED) {\n"},{"Del":" debug!(\"deleted: {:?}\", e.introduced_by);\n"}]}},{"Replacement":{"inode":{"change":18,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":142,"ins":{"up_context":[{"change":18,"pos":230244}],"down_context":[{"change":18,"pos":230316}],"flag":"BLOCK","start":15508,"end":15582,"inode":{"change":18,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":230244},"to":{"change":18,"start":721,"end":792},"introduced_by":18}],"inode":{"change":18,"pos":225940}},"ins_contents":[{"Add":" .get_changeset(txn.changes(channel), &e.introduced_by())?"}],"del_contents":[{"Del":" .get_changeset(txn.changes(channel), e.introduced_by)?\n"}]}},{"Replacement":{"inode":{"change":18,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":147,"ins":{"up_context":[{"change":18,"pos":230469}],"down_context":[{"change":18,"pos":230501}],"flag":"BLOCK","start":15583,"end":15617,"inode":{"change":18,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":230469},"to":{"change":18,"start":230469,"end":230501},"introduced_by":18}],"inode":{"change":18,"pos":225940}},"ins_contents":[{"Add":" *v = e.dest()"}],"del_contents":[{"Del":" *v = e.dest\n"}]}},{"Replacement":{"inode":{"change":18,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":150,"ins":{"up_context":[{"change":18,"pos":230540}],"down_context":[{"change":18,"pos":230583}],"flag":"BLOCK","start":15618,"end":15663,"inode":{"change":18,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":230540},"to":{"change":18,"start":230540,"end":230583},"introduced_by":18}],"inode":{"change":18,"pos":225940}},"ins_contents":[{"Add":" next = Some((age, e.dest()))"}],"del_contents":[{"Del":" next = Some((age, e.dest))\n"}]}},{"Replacement":{"inode":{"change":18,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":153,"ins":{"up_context":[{"change":18,"pos":230614}],"down_context":[{"change":18,"pos":230652}],"flag":"BLOCK","start":15664,"end":15710,"inode":{"change":18,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":230614},"to":{"change":18,"start":230614,"end":230652},"introduced_by":18}],"inode":{"change":18,"pos":225940}},"ins_contents":[{"Add":" next = Some((&L64(0), e.dest()));"}],"del_contents":[{"Del":" next = Some((0, e.dest));\n"}]}},{"Replacement":{"inode":{"change":18,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":157,"ins":{"up_context":[{"change":18,"pos":230687}],"down_context":[{"change":18,"pos":230736}],"flag":"BLOCK","start":15711,"end":15777,"inode":{"change":18,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":230687},"to":{"change":18,"start":793,"end":853},"introduced_by":18}],"inode":{"change":18,"pos":225940}},"ins_contents":[{"Add":" Ok(*txn.find_block_end(txn.graph(channel), next.unwrap().1)?)"}],"del_contents":[{"Del":" txn.find_block_end(txn.graph(channel), next.unwrap().1)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":172,"ins":{"up_context":[{"change":18,"pos":7432}],"down_context":[{"change":18,"pos":231440}],"flag":"BLOCK","start":15778,"end":15912,"inode":{"change":18,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":7432},"to":{"change":18,"start":22048,"end":22178},"introduced_by":18}],"inode":{"change":18,"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_inodes_with_rev(txn, inode, position)?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":56,"ins":{"up_context":[{"change":18,"pos":8768}],"down_context":[{"change":18,"pos":232023}],"flag":"BLOCK","start":15913,"end":15985,"inode":{"change":18,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":8768},"to":{"change":18,"start":22586,"end":22650},"introduced_by":18}],"inode":{"change":18,"pos":231493}},"ins_contents":[{"Add":" let change_id = if let Some(&h) = txn.get_internal(&hash.into())? {"}],"del_contents":[{"Del":" let change_id = if let Some(h) = txn.get_internal(*hash)? {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":69,"ins":{"up_context":[{"change":18,"pos":232331}],"down_context":[{"change":18,"pos":232522}],"flag":"BLOCK","start":15986,"end":16188,"inode":{"change":18,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":232331},"to":{"change":18,"start":22722,"end":22914},"introduced_by":18}],"inode":{"change":18,"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.into(), None)?;"}],"del_contents":[{"Del":" assert!(txn.get_revdep(change_id, None)?.is_none());\n while txn.del_dep(change_id, None)? {}\n txn.del_external(change_id, None)?;\n txn.del_internal(*hash, None)?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":74,"ins":{"up_context":[{"change":18,"pos":232570}],"down_context":[{"change":18,"pos":232676}],"flag":"BLOCK","start":16189,"end":16306,"inode":{"change":18,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":232570},"to":{"change":18,"start":22915,"end":23022},"introduced_by":18}],"inode":{"change":18,"pos":231493}},"ins_contents":[{"Add":" let dep = *txn.get_internal(&dep.into())?.unwrap();"},{"Add":" txn.del_revdep(&dep, Some(&change_id))?;"}],"del_contents":[{"Del":" let dep = txn.get_internal(*dep)?.unwrap();\n txn.del_revdep(dep, Some(change_id))?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":91,"ins":{"up_context":[{"change":18,"pos":23205}],"down_context":[{"change":18,"pos":233031}],"flag":"BLOCK","start":16307,"end":16401,"inode":{"change":18,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":23205},"to":{"change":18,"start":854,"end":946},"introduced_by":18}],"inode":{"change":18,"pos":231493}},"ins_contents":[{"Add":" let timestamp = if let Some(&ts) = txn.get_changeset(txn.changes(channel), &change_id)? {"}],"del_contents":[{"Del":" let timestamp = if let Some(ts) = txn.get_changeset(txn.changes(channel), change_id)? {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":97,"ins":{"up_context":[{"change":18,"pos":233133}],"down_context":[{"change":18,"pos":23343}],"flag":"BLOCK","start":16402,"end":16446,"inode":{"change":18,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":233133},"to":{"change":18,"start":23300,"end":23343},"introduced_by":18}],"inode":{"change":18,"pos":231493}},"ins_contents":[{"Add":" for x in txn.iter_revdep(&change_id)? {"}],"del_contents":[{"Del":" for x in txn.iter_revdep(change_id)? {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":99,"ins":{"up_context":[{"change":18,"pos":23368}],"down_context":[{"change":18,"pos":233263}],"flag":"BLOCK","start":16447,"end":16509,"inode":{"change":18,"pos":231493}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":23368},"to":{"change":18,"start":233180,"end":233263},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":233180},"to":{"change":18,"start":233180,"end":233263},"introduced_by":18}],"inode":{"change":18,"pos":231493}},"ins_contents":[{"Add":" assert!(*p >= change_id);"},{"Add":" if *p > change_id {"}],"del_contents":[{"Del":" if p < change_id {\n continue;\n } else if p > change_id {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":106,"ins":{"up_context":[{"change":18,"pos":614}],"down_context":[{"change":18,"pos":644}],"flag":"BLOCK","start":16510,"end":16541,"inode":{"change":18,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":614},"to":{"change":18,"start":614,"end":644},"introduced_by":18}],"inode":{"change":18,"pos":231493}},"ins_contents":[{"Add":" dependent: *d,"}],"del_contents":[{"Del":" dependent: d,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":111,"ins":{"up_context":[{"change":18,"pos":233453}],"down_context":[{"change":18,"pos":233506}],"flag":"BLOCK","start":16542,"end":16602,"inode":{"change":18,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":233453},"to":{"change":18,"start":23439,"end":23492},"introduced_by":18}],"inode":{"change":18,"pos":231493}},"ins_contents":[{"Add":" txn.del_changes(channel, change_id, timestamp.into())?;"}],"del_contents":[{"Del":" txn.del_changes(channel, change_id, timestamp)?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":125,"ins":{"up_context":[{"change":18,"pos":1062}],"down_context":[{"change":18,"pos":1779}],"flag":"BLOCK","start":16603,"end":16677,"inode":{"change":18,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":1062},"to":{"change":18,"start":1062,"end":1135},"introduced_by":18}],"inode":{"change":18,"pos":231493}},"ins_contents":[{"Add":" && txn.get_changeset(txn.changes(&br), &change_id)?.is_some()"}],"del_contents":[{"Del":" && txn.get_changeset(txn.changes(&br), change_id)?.is_some()\n"}]}},{"Replacement":{"inode":{"change":18,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":169,"ins":{"up_context":[{"change":18,"pos":2111}],"down_context":[{"change":18,"pos":234960}],"flag":"BLOCK","start":16678,"end":16698,"inode":{"change":18,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":2111},"to":{"change":18,"start":2111,"end":2130},"introduced_by":18}],"inode":{"change":18,"pos":231493}},"ins_contents":[{"Add":" )?;"}],"del_contents":[{"Del":" )?\n"}]}},{"Replacement":{"inode":{"change":18,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":223,"ins":{"up_context":[{"change":18,"pos":469}],"down_context":[{"change":18,"pos":235941}],"flag":"BLOCK","start":16699,"end":16729,"inode":{"change":18,"pos":231493}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":469},"to":{"change":18,"start":235921,"end":235941},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":235921},"to":{"change":18,"start":235921,"end":235941},"introduced_by":18}],"inode":{"change":18,"pos":231493}},"ins_contents":[{"Add":" del: Vec,"}],"del_contents":[{"Del":" del: Vec,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":226,"ins":{"up_context":[{"change":18,"pos":504}],"down_context":[{"change":18,"pos":235977}],"flag":"BLOCK","start":16730,"end":16786,"inode":{"change":18,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":504},"to":{"change":18,"start":504,"end":550},"introduced_by":18}],"inode":{"change":18,"pos":231493}},"ins_contents":[{"Add":" del_edges: Vec<(Vertex, SerializedEdge)>,"}],"del_contents":[{"Del":" del_edges: Vec<(Vertex, Edge)>,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":241,"ins":{"up_context":[{"change":18,"pos":236556}],"down_context":[{"change":18,"pos":237184}],"flag":"BLOCK","start":16787,"end":16846,"inode":{"change":18,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":236556},"to":{"change":18,"start":2614,"end":2672},"introduced_by":18}],"inode":{"change":18,"pos":231493}},"ins_contents":[{"Add":" while let Ok(&vertex) = txn.find_block(channel, pos) {"}],"del_contents":[{"Del":" while let Ok(vertex) = txn.find_block(channel, pos) {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":246,"ins":{"up_context":[{"change":18,"pos":237352}],"down_context":[{"change":18,"pos":237658}],"flag":"BLOCK","start":16847,"end":17114,"inode":{"change":18,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":237352},"to":{"change":18,"start":666,"end":789},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":789},"to":{"change":18,"start":2673,"end":2746},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":2746},"to":{"change":18,"start":237596,"end":237658},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":7814},"to":{"change":18,"start":237596,"end":237658},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":237596},"to":{"change":18,"start":237596,"end":237658},"introduced_by":18}],"inode":{"change":18,"pos":231493}},"ins_contents":[{"Add":" if !e.flag().is_deleted() {"},{"Add":" if e.flag().is_parent() {"},{"Add":" if !e.flag().is_folder() {"},{"Add":" let up_v = txn.find_block_end(channel, e.dest())?;"},{"Add":" ws.up.insert(*up_v, new_vertex.inode);"}],"del_contents":[{"Del":" if !e.flag.is_deleted() {\n if e.flag.is_parent() {\n if !e.flag.is_folder() {\n"},{"Del":" let up_v = txn.find_block_end(channel, e.dest)?;\n"},{"Del":" ws.up.insert(up_v, new_vertex.inode);\n"}]}},{"Replacement":{"inode":{"change":18,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":253,"ins":{"up_context":[{"change":18,"pos":237705}],"down_context":[{"change":18,"pos":967}],"flag":"BLOCK","start":17115,"end":17365,"inode":{"change":18,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":237705},"to":{"change":18,"start":2747,"end":2814},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":2814},"to":{"change":18,"start":790,"end":967},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":7883},"to":{"change":18,"start":790,"end":967},"introduced_by":18}],"inode":{"change":18,"pos":231493}},"ins_contents":[{"Add":" let down_v = txn.find_block(channel, e.dest())?;"},{"Add":" ws.down.insert(*down_v, new_vertex.inode);"},{"Add":" if e.flag().is_folder() {"},{"Add":" ws.apply.missing_context.files.insert(*down_v);"}],"del_contents":[{"Del":" let down_v = txn.find_block(channel, e.dest)?;\n"},{"Del":" ws.down.insert(down_v, new_vertex.inode);\n if e.flag.is_folder() {\n ws.apply.missing_context.files.insert(down_v);\n"}]}},{"Replacement":{"inode":{"change":18,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":260,"ins":{"up_context":[{"change":18,"pos":237975}],"down_context":[{"change":18,"pos":238002}],"flag":"BLOCK","start":17366,"end":17394,"inode":{"change":18,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":237975},"to":{"change":18,"start":237975,"end":238002},"introduced_by":18}],"inode":{"change":18,"pos":231493}},"ins_contents":[{"Add":" ws.del.push(*e)"}],"del_contents":[{"Del":" ws.del.push(e)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":281,"ins":{"up_context":[{"change":18,"pos":1417}],"down_context":[{"change":18,"pos":238312}],"flag":"BLOCK","start":17395,"end":17512,"inode":{"change":18,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":1417},"to":{"change":18,"start":1417,"end":1466},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":1466},"to":{"change":18,"start":2815,"end":2878},"introduced_by":18}],"inode":{"change":18,"pos":231493}},"ins_contents":[{"Add":" let (a, b) = if e.flag().is_parent() {"},{"Add":" (*txn.find_block_end(channel, e.dest())?, vertex)"}],"del_contents":[{"Del":" let (a, b) = if e.flag.is_parent() {\n"},{"Del":" (txn.find_block_end(channel, e.dest)?, vertex)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":284,"ins":{"up_context":[{"change":18,"pos":238333}],"down_context":[{"change":18,"pos":238392}],"flag":"BLOCK","start":17513,"end":17575,"inode":{"change":18,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":238333},"to":{"change":18,"start":2879,"end":2938},"introduced_by":18}],"inode":{"change":18,"pos":231493}},"ins_contents":[{"Add":" (vertex, *txn.find_block(channel, e.dest())?)"}],"del_contents":[{"Del":" (vertex, txn.find_block(channel, e.dest)?)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":289,"ins":{"up_context":[{"change":18,"pos":8088}],"down_context":[{"change":18,"pos":8132}],"flag":"BLOCK","start":17576,"end":17622,"inode":{"change":18,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":8088},"to":{"change":18,"start":8088,"end":8132},"introduced_by":18}],"inode":{"change":18,"pos":231493}},"ins_contents":[{"Add":" e.flag() - EdgeFlags::PARENT,"}],"del_contents":[{"Del":" e.flag - EdgeFlags::PARENT,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":292,"ins":{"up_context":[{"change":18,"pos":8170}],"down_context":[{"change":18,"pos":25164}],"flag":"BLOCK","start":17623,"end":17658,"inode":{"change":18,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":8170},"to":{"change":18,"start":8170,"end":8203},"introduced_by":18}],"inode":{"change":18,"pos":231493}},"ins_contents":[{"Add":" e.introduced_by(),"}],"del_contents":[{"Del":" e.introduced_by,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":307,"ins":{"up_context":[{"change":18,"pos":239152}],"down_context":[{"change":18,"pos":42}],"flag":"BLOCK","start":17659,"end":17702,"inode":{"change":18,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":239152},"to":{"change":18,"start":0,"end":42},"introduced_by":18}],"inode":{"change":18,"pos":231493}},"ins_contents":[{"Add":" if !is_alive(txn, channel, &up)? {"}],"del_contents":[{"Del":" if !is_alive(txn, channel, up)? {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":322,"ins":{"up_context":[{"change":18,"pos":1552}],"down_context":[{"change":18,"pos":317}],"flag":"BLOCK","start":17703,"end":17748,"inode":{"change":18,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":1552},"to":{"change":18,"start":273,"end":317},"introduced_by":18}],"inode":{"change":18,"pos":231493}},"ins_contents":[{"Add":" if !is_alive(txn, channel, &down)? {"}],"del_contents":[{"Del":" if !is_alive(txn, channel, down)? {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":333,"ins":{"up_context":[{"change":18,"pos":25422}],"down_context":[{"change":18,"pos":25423}],"flag":"BLOCK","start":17749,"end":17819,"inode":{"change":18,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":25422},"to":{"change":18,"start":2939,"end":3007},"introduced_by":18}],"inode":{"change":18,"pos":231493}},"ins_contents":[{"Add":" let parent = txn.find_block_end(channel, parent.dest())?;"}],"del_contents":[{"Del":" let parent = txn.find_block_end(channel, parent.dest)?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":335,"ins":{"up_context":[{"change":18,"pos":25473}],"down_context":[{"change":18,"pos":239908}],"flag":"BLOCK","start":17820,"end":17864,"inode":{"change":18,"pos":231493}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":25473},"to":{"change":18,"start":1553,"end":1596},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":8434},"to":{"change":18,"start":1553,"end":1596},"introduced_by":18}],"inode":{"change":18,"pos":231493}},"ins_contents":[{"Add":" ws.parents.insert(*parent);"}],"del_contents":[{"Del":" ws.parents.insert(parent);\n"}]}},{"Replacement":{"inode":{"change":18,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":363,"ins":{"up_context":[{"change":18,"pos":240632}],"down_context":[{"change":18,"pos":240757}],"flag":"BLOCK","start":17865,"end":17932,"inode":{"change":18,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":240632},"to":{"change":18,"start":25614,"end":25667},"introduced_by":18}],"inode":{"change":18,"pos":231493}},"ins_contents":[{"Add":" let ext: Hash = txn.get_external(&change_id)?.unwrap().into();"}],"del_contents":[{"Del":" let ext = txn.get_external(change_id)?.unwrap();\n"}]}},{"Replacement":{"inode":{"change":18,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":395,"ins":{"up_context":[{"change":18,"pos":242373}],"down_context":[{"change":18,"pos":242417}],"flag":"BLOCK","start":17933,"end":17995,"inode":{"change":18,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":242373},"to":{"change":18,"start":25884,"end":25929},"introduced_by":18}],"inode":{"change":18,"pos":231493}},"ins_contents":[{"Add":" change: txn.get_external(&b.change)?.map(From::from),"}],"del_contents":[{"Del":" change: txn.get_external(b.change)?,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":401,"ins":{"up_context":[{"change":18,"pos":25996}],"down_context":[{"change":18,"pos":26167}],"flag":"BLOCK","start":17996,"end":18175,"inode":{"change":18,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":25996},"to":{"change":18,"start":25996,"end":26167},"introduced_by":18}],"inode":{"change":18,"pos":231493}},"ins_contents":[{"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"}],"del_contents":[{"Del":" if e.flag.contains(EdgeFlags::PARENT)\n || e.dest != b.start_pos()\n || e.introduced_by.is_root()\n || e.introduced_by == current_id\n"}]}},{"Replacement":{"inode":{"change":18,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":415,"ins":{"up_context":[{"change":18,"pos":243156}],"down_context":[{"change":18,"pos":243192}],"flag":"BLOCK","start":18176,"end":18214,"inode":{"change":18,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":243156},"to":{"change":18,"start":243156,"end":243192},"introduced_by":18}],"inode":{"change":18,"pos":231493}},"ins_contents":[{"Add":" stack.push(e.introduced_by())"}],"del_contents":[{"Del":" stack.push(e.introduced_by)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":434,"ins":{"up_context":[{"change":18,"pos":26353}],"down_context":[{"change":18,"pos":26432}],"flag":"BLOCK","start":18215,"end":18311,"inode":{"change":18,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":26353},"to":{"change":18,"start":26353,"end":26432},"introduced_by":18}],"inode":{"change":18,"pos":231493}},"ins_contents":[{"Add":" .change_deletes_position(|c| txn.get_external(&c).unwrap().map(From::from), s, pos)"}],"del_contents":[{"Del":" .change_deletes_position(|c| txn.get_external(c).unwrap(), s, pos)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":439,"ins":{"up_context":[{"change":18,"pos":243801}],"down_context":[{"change":18,"pos":243892}],"flag":"BLOCK","start":18312,"end":18413,"inode":{"change":18,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":243801},"to":{"change":18,"start":26493,"end":26555},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":26555},"to":{"change":18,"start":243862,"end":243892},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":243862},"to":{"change":18,"start":243862,"end":243892},"introduced_by":18}],"inode":{"change":18,"pos":231493}},"ins_contents":[{"Add":" } else if let Some(i) = txn.get_internal(&next.into())? {"},{"Add":" stack.push(*i)"}],"del_contents":[{"Del":" } else if let Some(i) = txn.get_internal(next)? {\n"},{"Del":" stack.push(i)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":460,"ins":{"up_context":[{"change":18,"pos":2699}],"down_context":[{"change":18,"pos":246602}],"flag":"BLOCK","start":18414,"end":18659,"inode":{"change":18,"pos":231493}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":2699},"to":{"change":18,"start":245689,"end":245741},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":245689},"to":{"change":18,"start":245689,"end":245741},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":245741},"to":{"change":18,"start":3008,"end":3070},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":3070},"to":{"change":18,"start":2700,"end":2745},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":9132},"to":{"change":18,"start":2700,"end":2745},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":2745},"to":{"change":18,"start":26697,"end":26779},"introduced_by":18}],"inode":{"change":18,"pos":231493}},"ins_contents":[{"Add":" if e.flag().contains(EdgeFlags::PARENT) {"},{"Add":" let u = *txn.find_block_end(channel, e.dest())?;"},{"Add":" e -= EdgeFlags::PARENT;"},{"Add":" del_graph_with_rev(txn, channel, e.flag(), u, v, e.introduced_by())?;"}],"del_contents":[{"Del":" if e.flag.contains(EdgeFlags::PARENT) {\n"},{"Del":" let u = txn.find_block_end(channel, e.dest)?;\n"},{"Del":" e.flag -= EdgeFlags::PARENT;\n"},{"Del":" del_graph_with_rev(txn, channel, e.flag, u, v, e.introduced_by)?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":465,"ins":{"up_context":[{"change":18,"pos":246623}],"down_context":[{"change":18,"pos":246762}],"flag":"BLOCK","start":18660,"end":18807,"inode":{"change":18,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":246623},"to":{"change":18,"start":3071,"end":3129},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":3129},"to":{"change":18,"start":26780,"end":26862},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":9860},"to":{"change":18,"start":26780,"end":26862},"introduced_by":18}],"inode":{"change":18,"pos":231493}},"ins_contents":[{"Add":" let w = *txn.find_block(channel, e.dest())?;"},{"Add":" del_graph_with_rev(txn, channel, e.flag(), v, w, e.introduced_by())?;"}],"del_contents":[{"Del":" let w = txn.find_block(channel, e.dest)?;\n"},{"Del":" del_graph_with_rev(txn, channel, e.flag, v, w, e.introduced_by)?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":480,"ins":{"up_context":[{"change":18,"pos":26980}],"down_context":[{"change":18,"pos":3110}],"flag":"BLOCK","start":18808,"end":18858,"inode":{"change":18,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":26980},"to":{"change":18,"start":3130,"end":3179},"introduced_by":18}],"inode":{"change":18,"pos":231493}},"ins_contents":[{"Add":" ws.stack.push(*txn.find_block(channel, to)?);"}],"del_contents":[{"Del":" ws.stack.push(txn.find_block(channel, to)?);\n"}]}},{"Replacement":{"inode":{"change":18,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":489,"ins":{"up_context":[{"change":18,"pos":3349}],"down_context":[{"change":18,"pos":3447}],"flag":"BLOCK","start":18859,"end":18961,"inode":{"change":18,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":3349},"to":{"change":18,"start":3349,"end":3447},"introduced_by":18}],"inode":{"change":18,"pos":231493}},"ins_contents":[{"Add":" if !(e.introduced_by() == change_id || e.flag() & EdgeFlags::bp() == EdgeFlags::PARENT) {"}],"del_contents":[{"Del":" if !(e.introduced_by == change_id || e.flag & EdgeFlags::bp() == EdgeFlags::PARENT) {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":492,"ins":{"up_context":[{"change":18,"pos":3487}],"down_context":[{"change":18,"pos":3608}],"flag":"BLOCK","start":18962,"end":19087,"inode":{"change":18,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":3487},"to":{"change":18,"start":3487,"end":3539},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":3539},"to":{"change":18,"start":3180,"end":3248},"introduced_by":18}],"inode":{"change":18,"pos":231493}},"ins_contents":[{"Add":" if e.flag().contains(EdgeFlags::PARENT) {"},{"Add":" ws.stack.push(*txn.find_block_end(channel, e.dest())?)"}],"del_contents":[{"Del":" if e.flag.contains(EdgeFlags::PARENT) {\n"},{"Del":" ws.stack.push(txn.find_block_end(channel, e.dest)?)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":495,"ins":{"up_context":[{"change":18,"pos":3629}],"down_context":[{"change":18,"pos":3694}],"flag":"BLOCK","start":19088,"end":19155,"inode":{"change":18,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":3629},"to":{"change":18,"start":3249,"end":3313},"introduced_by":18}],"inode":{"change":18,"pos":231493}},"ins_contents":[{"Add":" ws.stack.push(*txn.find_block(channel, e.dest())?)"}],"del_contents":[{"Del":" ws.stack.push(txn.find_block(channel, e.dest)?)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":497,"ins":{"up_context":[{"change":18,"pos":3708}],"down_context":[{"change":18,"pos":3796}],"flag":"BLOCK","start":19156,"end":19247,"inode":{"change":18,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":3708},"to":{"change":18,"start":3708,"end":3796},"introduced_by":18}],"inode":{"change":18,"pos":231493}},"ins_contents":[{"Add":" if e.introduced_by() == change_id {"},{"Add":" ws.del_edges.push((v, *e))"}],"del_contents":[{"Del":" if e.introduced_by == change_id {\n ws.del_edges.push((v, e))\n"}]}},{"Replacement":{"inode":{"change":18,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":515,"ins":{"up_context":[{"change":18,"pos":27202}],"down_context":[{"change":18,"pos":247175}],"flag":"BLOCK","start":19248,"end":19323,"inode":{"change":18,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":27202},"to":{"change":18,"start":27202,"end":27263},"introduced_by":18}],"inode":{"change":18,"pos":231493}},"ins_contents":[{"Add":" let change_hash: Hash = txn.get_external(&change_id)?.unwrap().into();"}],"del_contents":[{"Del":" let change_hash = txn.get_external(change_id)?.unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":38,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":249931}],"down_context":[{"change":18,"pos":249931}],"flag":"BLOCK","start":19324,"end":19338,"inode":{"change":18,"pos":248807}}},"contents":[{"Add":" None,"}]}},{"Edit":{"inode":{"change":18,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":78,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":251045}],"down_context":[{"change":18,"pos":251045}],"flag":"BLOCK","start":19339,"end":19397,"inode":{"change":18,"pos":248807}}},"contents":[{"Add":" debug_to_file(&txn, &channel.borrow(), \"debug_un0\")?;"}]}},{"Edit":{"inode":{"change":18,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":80,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":251116}],"down_context":[{"change":18,"pos":251116}],"flag":"BLOCK","start":19398,"end":19456,"inode":{"change":18,"pos":248807}}},"contents":[{"Add":" debug_to_file(&txn, &channel.borrow(), \"debug_un1\")?;"}]}},{"Edit":{"inode":{"change":18,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":88,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":251277}],"down_context":[{"change":18,"pos":251277}],"flag":"BLOCK","start":19457,"end":19471,"inode":{"change":18,"pos":248807}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":138,"ins":{"up_context":[{"change":18,"pos":252788}],"down_context":[{"change":18,"pos":252886}],"flag":"BLOCK","start":19472,"end":19576,"inode":{"change":18,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":252788},"to":{"change":18,"start":252788,"end":252886},"introduced_by":18}],"inode":{"change":18,"pos":248807}},"ins_contents":[{"Add":" output::output_repository_no_pending(&mut repo, &changes, &mut txn, &mut channel, \"\", true, None)?;"}],"del_contents":[{"Del":" output::output_repository_no_pending(&mut repo, &changes, &mut txn, &mut channel, \"\", true)?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":145,"ins":{"up_context":[{"change":18,"pos":253055}],"down_context":[{"change":18,"pos":253104}],"flag":"BLOCK","start":19577,"end":19773,"inode":{"change":18,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":253055},"to":{"change":18,"start":253055,"end":253104},"introduced_by":18}],"inode":{"change":18,"pos":248807}},"ins_contents":[{"Add":""},{"Add":" // Checking that unrecord doesn't delete `dir`, and moves `file`"},{"Add":" // back to the root."},{"Add":" let mut files = repo.list_files();"},{"Add":" files.sort();"},{"Add":" assert_eq!(files, vec![\"dir\", \"file\"]);"}],"del_contents":[{"Del":" assert_eq!(repo.list_files(), vec![\"file\"]);\n"}]}},{"Replacement":{"inode":{"change":18,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":191,"ins":{"up_context":[{"change":18,"pos":254277}],"down_context":[{"change":18,"pos":254611}],"flag":"BLOCK","start":19774,"end":20122,"inode":{"change":18,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":254277},"to":{"change":18,"start":254277,"end":254611},"introduced_by":18}],"inode":{"change":18,"pos":248807}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn2, &mut channel2, &h0)?;"},{"Add":" output::output_repository_no_pending(&mut repo2, &changes, &mut txn2, &mut channel2, \"\", true, None)?;"},{"Add":" apply::apply_change(&changes, &mut txn3, &mut channel3, &h0)?;"},{"Add":" output::output_repository_no_pending(&mut repo3, &changes, &mut txn3, &mut channel3, \"\", true, None)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn2, &mut channel2, h0)?;\n output::output_repository_no_pending(&mut repo2, &changes, &mut txn2, &mut channel2, \"\", true)?;\n apply::apply_change(&changes, &mut txn3, &mut channel3, h0)?;\n output::output_repository_no_pending(&mut repo3, &changes, &mut txn3, &mut channel3, \"\", true)?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":226,"ins":{"up_context":[{"change":18,"pos":255511}],"down_context":[{"change":18,"pos":255737}],"flag":"BLOCK","start":20123,"end":20357,"inode":{"change":18,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":255511},"to":{"change":18,"start":255511,"end":255737},"introduced_by":18}],"inode":{"change":18,"pos":248807}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel, &h2)?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel, &h3)?;"},{"Add":" output::output_repository_no_pending(&mut repo, &changes, &mut txn, &mut channel, \"\", true, None)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel, h2)?;\n apply::apply_change(&changes, &mut txn, &mut channel, h3)?;\n output::output_repository_no_pending(&mut repo, &changes, &mut txn, &mut channel, \"\", true)?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":267,"ins":{"up_context":[{"change":18,"pos":256840}],"down_context":[{"change":18,"pos":257007}],"flag":"BLOCK","start":20358,"end":20532,"inode":{"change":18,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":256840},"to":{"change":18,"start":256840,"end":257007},"introduced_by":18}],"inode":{"change":18,"pos":248807}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn2, &mut channel2, &h0)?;"},{"Add":" output::output_repository_no_pending(&mut repo2, &changes, &mut txn2, &mut channel2, \"\", true, None)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn2, &mut channel2, h0)?;\n output::output_repository_no_pending(&mut repo2, &changes, &mut txn2, &mut channel2, \"\", true)?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":292,"ins":{"up_context":[{"change":18,"pos":257606}],"down_context":[{"change":18,"pos":257670}],"flag":"BLOCK","start":20533,"end":20598,"inode":{"change":18,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":257606},"to":{"change":18,"start":257606,"end":257670},"introduced_by":18}],"inode":{"change":18,"pos":248807}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel, &h2)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel, h2)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":304,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":257976}],"down_context":[{"change":18,"pos":257976}],"flag":"BLOCK","start":20599,"end":20613,"inode":{"change":18,"pos":248807}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":335,"ins":{"up_context":[{"change":18,"pos":258803}],"down_context":[{"change":18,"pos":4067}],"flag":"BLOCK","start":20614,"end":20681,"inode":{"change":18,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":258803},"to":{"change":18,"start":258803,"end":258869},"introduced_by":18}],"inode":{"change":18,"pos":248807}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn2, &mut channel2, &h1)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn2, &mut channel2, h1)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":348,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":259244}],"down_context":[{"change":18,"pos":259244}],"flag":"BLOCK","start":20682,"end":20696,"inode":{"change":18,"pos":248807}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":378,"ins":{"up_context":[{"change":18,"pos":260186}],"down_context":[{"change":18,"pos":260284}],"flag":"BLOCK","start":20697,"end":20801,"inode":{"change":18,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":260186},"to":{"change":18,"start":260186,"end":260284},"introduced_by":18}],"inode":{"change":18,"pos":248807}},"ins_contents":[{"Add":" output::output_repository_no_pending(&mut repo, &changes, &mut txn, &mut channel, \"\", true, None)?;"}],"del_contents":[{"Del":" output::output_repository_no_pending(&mut repo, &changes, &mut txn, &mut channel, \"\", true)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":395,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":260711}],"down_context":[{"change":18,"pos":260711}],"flag":"BLOCK","start":20802,"end":20816,"inode":{"change":18,"pos":248807}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":478,"ins":{"up_context":[{"change":18,"pos":263374}],"down_context":[{"change":18,"pos":263593}],"flag":"BLOCK","start":20817,"end":21138,"inode":{"change":18,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":263374},"to":{"change":18,"start":263374,"end":263593},"introduced_by":18}],"inode":{"change":18,"pos":248807}},"ins_contents":[{"Add":" output::output_repository_no_pending(&mut repo, &changes, &mut txn, &mut channel, \"\", true, None)?;"},{"Add":""},{"Add":" // Checking that unrecord doesn't delete files on the filesystem,"},{"Add":" // but updates the tree/revtree tables."},{"Add":" let mut files = repo.list_files();"},{"Add":" files.sort();"},{"Add":" assert_eq!(files, &[\"dir\", \"dir/file\"]);"}],"del_contents":[{"Del":" output::output_repository_no_pending(&mut repo, &changes, &mut txn, &mut channel, \"\", true)?;\n let files = repo.list_files();\n if !files.is_empty() {\n panic!(\"Files should be empty {:?}\", files);\n }\n"}]}},{"Edit":{"inode":{"change":18,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":525,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":264723}],"down_context":[{"change":18,"pos":264723}],"flag":"BLOCK","start":21139,"end":21153,"inode":{"change":18,"pos":248807}}},"contents":[{"Add":" None,"}]}},{"Edit":{"inode":{"change":18,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":543,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":265208}],"down_context":[{"change":18,"pos":265208}],"flag":"BLOCK","start":21154,"end":21168,"inode":{"change":18,"pos":248807}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":549,"ins":{"up_context":[{"change":18,"pos":265336}],"down_context":[{"change":18,"pos":265423}],"flag":"BLOCK","start":21169,"end":21265,"inode":{"change":18,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":265336},"to":{"change":18,"start":265336,"end":265423},"introduced_by":18}],"inode":{"change":18,"pos":248807}},"ins_contents":[{"Add":" // Unrecording a file addition shouldn't delete the file."},{"Add":" assert_eq!(files, &[\"file\"]);"}],"del_contents":[{"Del":" if !files.is_empty() {\n panic!(\"Files should be empty {:?}\", files);\n }\n\n"}]}},{"Edit":{"inode":{"change":18,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":552,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":265442},"to":{"change":18,"start":265442,"end":265443},"introduced_by":18}],"inode":{"change":18,"pos":248807}}},"contents":[{"Del":"\n"}]}},{"Replacement":{"inode":{"change":18,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":580,"ins":{"up_context":[{"change":18,"pos":266367}],"down_context":[{"change":18,"pos":4640}],"flag":"BLOCK","start":21266,"end":21330,"inode":{"change":18,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":266367},"to":{"change":18,"start":266367,"end":266430},"introduced_by":18}],"inode":{"change":18,"pos":248807}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel, &b)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel, b)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":589,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":266634}],"down_context":[{"change":18,"pos":266634}],"flag":"BLOCK","start":21331,"end":21345,"inode":{"change":18,"pos":248807}}},"contents":[{"Add":" None,"}]}},{"Edit":{"inode":{"change":18,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":624,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":267630}],"down_context":[{"change":18,"pos":267630}],"flag":"BLOCK","start":21346,"end":21360,"inode":{"change":18,"pos":248807}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":706,"ins":{"up_context":[{"change":18,"pos":269719}],"down_context":[{"change":18,"pos":269786}],"flag":"BLOCK","start":21361,"end":21429,"inode":{"change":18,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":269719},"to":{"change":18,"start":269719,"end":269786},"introduced_by":18}],"inode":{"change":18,"pos":248807}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel, &h_inv)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel, h_inv)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":714,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":269947}],"down_context":[{"change":18,"pos":269947}],"flag":"BLOCK","start":21430,"end":21444,"inode":{"change":18,"pos":248807}}},"contents":[{"Add":" None,"}]}},{"Edit":{"inode":{"change":18,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":733,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":270476}],"down_context":[{"change":18,"pos":270476}],"flag":"BLOCK","start":21445,"end":21459,"inode":{"change":18,"pos":248807}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":740,"ins":{"up_context":[{"change":18,"pos":270642}],"down_context":[{"change":18,"pos":270688}],"flag":"BLOCK","start":21460,"end":21507,"inode":{"change":18,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":270642},"to":{"change":18,"start":270642,"end":270688},"introduced_by":18}],"inode":{"change":18,"pos":248807}},"ins_contents":[{"Add":" repo.read_file(\"file\", &mut buf).unwrap();"}],"del_contents":[{"Del":" let r = repo.read_file(\"file\", &mut buf);\n"}]}},{"Replacement":{"inode":{"change":18,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":742,"ins":{"up_context":[{"change":18,"pos":270709}],"down_context":[{"change":18,"pos":270737}],"flag":"BLOCK","start":21508,"end":21572,"inode":{"change":18,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":270709},"to":{"change":18,"start":270709,"end":270737},"introduced_by":18}],"inode":{"change":18,"pos":248807}},"ins_contents":[{"Add":" assert_eq!(std::str::from_utf8(&buf), Ok(\"a\\nb\\nc\\n\"));"}],"del_contents":[{"Del":" assert!(r.is_err())\n"}]}},{"Replacement":{"inode":{"change":18,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":771,"ins":{"up_context":[{"change":18,"pos":271610}],"down_context":[{"change":18,"pos":271675}],"flag":"BLOCK","start":21573,"end":21639,"inode":{"change":18,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":271610},"to":{"change":18,"start":271610,"end":271675},"introduced_by":18}],"inode":{"change":18,"pos":248807}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel2, &h0)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel2, h0)?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":789,"ins":{"up_context":[{"change":18,"pos":272221}],"down_context":[{"change":18,"pos":272285}],"flag":"BLOCK","start":21640,"end":21705,"inode":{"change":18,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":272221},"to":{"change":18,"start":272221,"end":272285},"introduced_by":18}],"inode":{"change":18,"pos":248807}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel, &h2)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel, h2)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":804,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":272680}],"down_context":[{"change":18,"pos":272680}],"flag":"BLOCK","start":21706,"end":21720,"inode":{"change":18,"pos":248807}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":834,"ins":{"up_context":[{"change":18,"pos":273578}],"down_context":[{"change":18,"pos":273643}],"flag":"BLOCK","start":21721,"end":21787,"inode":{"change":18,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":273578},"to":{"change":18,"start":273578,"end":273643},"introduced_by":18}],"inode":{"change":18,"pos":248807}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel2, &h0)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel2, h0)?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":856,"ins":{"up_context":[{"change":18,"pos":274217}],"down_context":[{"change":18,"pos":274281}],"flag":"BLOCK","start":21788,"end":21853,"inode":{"change":18,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":274217},"to":{"change":18,"start":274217,"end":274281},"introduced_by":18}],"inode":{"change":18,"pos":248807}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel, &h2)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel, h2)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":871,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":274676}],"down_context":[{"change":18,"pos":274676}],"flag":"BLOCK","start":21854,"end":21868,"inode":{"change":18,"pos":248807}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":879,"ins":{"up_context":[{"change":18,"pos":274878}],"down_context":[{"change":18,"pos":274943}],"flag":"BLOCK","start":21869,"end":21935,"inode":{"change":18,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":274878},"to":{"change":18,"start":274878,"end":274943},"introduced_by":18}],"inode":{"change":18,"pos":248807}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel2, &h1)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel2, h1)?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":898,"ins":{"up_context":[{"change":18,"pos":275468}],"down_context":[{"change":18,"pos":5370}],"flag":"BLOCK","start":21936,"end":22013,"inode":{"change":18,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":275468},"to":{"change":18,"start":275468,"end":275544},"introduced_by":18}],"inode":{"change":18,"pos":248807}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel2, &r).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel2, r).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":912,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":275911}],"down_context":[{"change":18,"pos":275911}],"flag":"BLOCK","start":22014,"end":22028,"inode":{"change":18,"pos":248807}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":941,"ins":{"up_context":[{"change":18,"pos":1138}],"down_context":[{"change":18,"pos":276023}],"flag":"BLOCK","start":22029,"end":22095,"inode":{"change":18,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":1138},"to":{"change":18,"start":1138,"end":1203},"introduced_by":18}],"inode":{"change":18,"pos":248807}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel2, &h0)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel2, h0)?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":953,"ins":{"up_context":[{"change":18,"pos":1546}],"down_context":[{"change":18,"pos":1610}],"flag":"BLOCK","start":22096,"end":22161,"inode":{"change":18,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":1546},"to":{"change":18,"start":1546,"end":1610},"introduced_by":18}],"inode":{"change":18,"pos":248807}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel, &h2)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel, h2)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":5,"ins":{"up_context":[{"change":6,"pos":76}],"down_context":[{"change":6,"pos":148}],"flag":"BLOCK","start":22162,"end":22205,"inode":{"change":6,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":76},"to":{"change":6,"start":76,"end":148},"introduced_by":6}],"inode":{"change":6,"pos":14}},"ins_contents":[{"Add":"fn rollback_conflict_resolution_simple() {"}],"del_contents":[{"Del":"fn rollback_conflict_resolution_simple() -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":11,"ins":{"up_context":[{"change":6,"pos":302}],"down_context":[{"change":6,"pos":360}],"flag":"BLOCK","start":22206,"end":22272,"inode":{"change":6,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":302},"to":{"change":6,"start":302,"end":360},"introduced_by":6}],"inode":{"change":6,"pos":14}},"ins_contents":[{"Add":" let env = pristine::sanakirja::Pristine::new_anon().unwrap();"}],"del_contents":[{"Del":" let env = pristine::sanakirja::Pristine::new_anon()?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":15,"ins":{"up_context":[{"change":6,"pos":401}],"down_context":[{"change":6,"pos":461}],"flag":"BLOCK","start":22273,"end":22341,"inode":{"change":6,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":401},"to":{"change":6,"start":401,"end":461},"introduced_by":6}],"inode":{"change":6,"pos":14}},"ins_contents":[{"Add":" let mut channela = txn.open_or_create_channel(\"main\").unwrap();"}],"del_contents":[{"Del":" let mut channela = txn.open_or_create_channel(\"main\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":19,"ins":{"up_context":[{"change":6,"pos":561}],"down_context":[{"change":6,"pos":655}],"flag":"BLOCK","start":22342,"end":22452,"inode":{"change":6,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":561},"to":{"change":6,"start":561,"end":655},"introduced_by":6}],"inode":{"change":6,"pos":14}},"ins_contents":[{"Add":" txn.add_file(\"file\").unwrap();"},{"Add":" record_all(&mut repo, &changes, &mut txn, &mut channela, \"\").unwrap();"}],"del_contents":[{"Del":" txn.add_file(\"file\")?;\n record_all(&mut repo, &changes, &mut txn, &mut channela, \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":22,"ins":{"up_context":[{"change":6,"pos":656}],"down_context":[{"change":6,"pos":710}],"flag":"BLOCK","start":22453,"end":22515,"inode":{"change":6,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":656},"to":{"change":6,"start":656,"end":710},"introduced_by":6}],"inode":{"change":6,"pos":14}},"ins_contents":[{"Add":" let mut channelb = txn.fork(&channela, \"other\").unwrap();"}],"del_contents":[{"Del":" let mut channelb = txn.fork(&channela, \"other\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":25,"ins":{"up_context":[{"change":6,"pos":769}],"down_context":[{"change":6,"pos":805}],"flag":"BLOCK","start":22516,"end":22560,"inode":{"change":6,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":769},"to":{"change":6,"start":769,"end":805},"introduced_by":6}],"inode":{"change":6,"pos":14}},"ins_contents":[{"Add":" w.write_all(b\"a\\nx\\nb\\n\").unwrap();"}],"del_contents":[{"Del":" w.write_all(b\"a\\nx\\nb\\n\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":27,"ins":{"up_context":[{"change":6,"pos":820}],"down_context":[{"change":6,"pos":905}],"flag":"BLOCK","start":22561,"end":22662,"inode":{"change":6,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":820},"to":{"change":6,"start":820,"end":905},"introduced_by":6}],"inode":{"change":6,"pos":14}},"ins_contents":[{"Add":" }).unwrap();"},{"Add":" let ha = record_all(&mut repo, &changes, &mut txn, &mut channela, \"\").unwrap();"}],"del_contents":[{"Del":" })?;\n let ha = record_all(&mut repo, &changes, &mut txn, &mut channela, \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":31,"ins":{"up_context":[{"change":6,"pos":964}],"down_context":[{"change":6,"pos":1000}],"flag":"BLOCK","start":22663,"end":22707,"inode":{"change":6,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":964},"to":{"change":6,"start":964,"end":1000},"introduced_by":6}],"inode":{"change":6,"pos":14}},"ins_contents":[{"Add":" w.write_all(b\"a\\ny\\nb\\n\").unwrap();"}],"del_contents":[{"Del":" w.write_all(b\"a\\ny\\nb\\n\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":33,"ins":{"up_context":[{"change":6,"pos":1015}],"down_context":[{"change":6,"pos":1100}],"flag":"BLOCK","start":22708,"end":22809,"inode":{"change":6,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1015},"to":{"change":6,"start":1015,"end":1100},"introduced_by":6}],"inode":{"change":6,"pos":14}},"ins_contents":[{"Add":" }).unwrap();"},{"Add":" let hb = record_all(&mut repo, &changes, &mut txn, &mut channelb, \"\").unwrap();"}],"del_contents":[{"Del":" })?;\n let hb = record_all(&mut repo, &changes, &mut txn, &mut channelb, \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":36,"ins":{"up_context":[{"change":6,"pos":1101}],"down_context":[{"change":6,"pos":1231}],"flag":"BLOCK","start":22810,"end":22958,"inode":{"change":6,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1101},"to":{"change":6,"start":1101,"end":1231},"introduced_by":6}],"inode":{"change":6,"pos":14}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channelb, &ha).unwrap();"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channela, &hb).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channelb, ha)?;\n apply::apply_change(&changes, &mut txn, &mut channela, hb)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":39,"ins":{"up_context":[{"change":6,"pos":1232}],"down_context":[{"change":6,"pos":1344}],"flag":"BLOCK","start":22959,"end":23087,"inode":{"change":6,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1232},"to":{"change":6,"start":1232,"end":1344},"introduced_by":6}],"inode":{"change":6,"pos":14}},"ins_contents":[{"Add":" debug_to_file(&txn, &channela.borrow(), \"debuga\").unwrap();"},{"Add":" debug_to_file(&txn, &channelb.borrow(), \"debugb\").unwrap();"}],"del_contents":[{"Del":" debug_to_file(&txn, &channela.borrow(), \"debuga\")?;\n debug_to_file(&txn, &channelb.borrow(), \"debugb\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":42,"ins":{"up_context":[{"change":6,"pos":1345}],"down_context":[{"change":6,"pos":1444}],"flag":"BLOCK","start":23088,"end":23201,"inode":{"change":6,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1345},"to":{"change":6,"start":1345,"end":1444},"introduced_by":6}],"inode":{"change":6,"pos":14}},"ins_contents":[{"Add":" output::output_repository_no_pending(&mut repo, &changes, &mut txn, &mut channela, \"\", true, None).unwrap();"}],"del_contents":[{"Del":" output::output_repository_no_pending(&mut repo, &changes, &mut txn, &mut channela, \"\", true)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":44,"ins":{"up_context":[{"change":6,"pos":1474}],"down_context":[{"change":6,"pos":1513}],"flag":"BLOCK","start":23202,"end":23249,"inode":{"change":6,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1474},"to":{"change":6,"start":1474,"end":1513},"introduced_by":6}],"inode":{"change":6,"pos":14}},"ins_contents":[{"Add":" repo.read_file(\"file\", &mut buf).unwrap();"}],"del_contents":[{"Del":" repo.read_file(\"file\", &mut buf)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":48,"ins":{"up_context":[{"change":6,"pos":1595}],"down_context":[{"change":6,"pos":1668}],"flag":"BLOCK","start":23250,"end":23331,"inode":{"change":6,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1595},"to":{"change":6,"start":1595,"end":1668},"introduced_by":6}],"inode":{"change":6,"pos":14}},"ins_contents":[{"Add":" let conflict: Vec<_> = std::str::from_utf8(&buf).unwrap().lines().collect();"}],"del_contents":[{"Del":" let conflict: Vec<_> = std::str::from_utf8(&buf)?.lines().collect();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":51,"ins":{"up_context":[{"change":6,"pos":1786}],"down_context":[{"change":6,"pos":1820}],"flag":"BLOCK","start":23332,"end":23374,"inode":{"change":6,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1786},"to":{"change":6,"start":1786,"end":1820},"introduced_by":6}],"inode":{"change":6,"pos":14}},"ins_contents":[{"Add":" writeln!(w, \"{}\", l).unwrap()"}],"del_contents":[{"Del":" writeln!(w, \"{}\", l)?\n"}]}},{"Replacement":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":54,"ins":{"up_context":[{"change":6,"pos":1845}],"down_context":[{"change":6,"pos":1854}],"flag":"BLOCK","start":23375,"end":23392,"inode":{"change":6,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1845},"to":{"change":6,"start":1845,"end":1854},"introduced_by":6}],"inode":{"change":6,"pos":14}},"ins_contents":[{"Add":" }).unwrap();"}],"del_contents":[{"Del":" })?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":57,"ins":{"up_context":[{"change":6,"pos":1872}],"down_context":[{"change":6,"pos":1911}],"flag":"BLOCK","start":23393,"end":23440,"inode":{"change":6,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1872},"to":{"change":6,"start":1872,"end":1911},"introduced_by":6}],"inode":{"change":6,"pos":14}},"ins_contents":[{"Add":" repo.read_file(\"file\", &mut buf).unwrap();"}],"del_contents":[{"Del":" repo.read_file(\"file\", &mut buf)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":59,"ins":{"up_context":[{"change":6,"pos":1965}],"down_context":[{"change":6,"pos":2101}],"flag":"BLOCK","start":23441,"end":23593,"inode":{"change":6,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1965},"to":{"change":6,"start":1965,"end":2101},"introduced_by":6}],"inode":{"change":6,"pos":14}},"ins_contents":[{"Add":" let resb = record_all(&mut repo, &changes, &mut txn, &mut channela, \"\").unwrap();"},{"Add":" debug_to_file(&txn, &channela.borrow(), \"debugres\").unwrap();"}],"del_contents":[{"Del":" let resb = record_all(&mut repo, &changes, &mut txn, &mut channela, \"\")?;\n debug_to_file(&txn, &channela.borrow(), \"debugres\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":72,"ins":{"up_context":[{"change":6,"pos":2401}],"down_context":[{"change":6,"pos":2582}],"flag":"BLOCK","start":23594,"end":23788,"inode":{"change":6,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2401},"to":{"change":6,"start":2401,"end":2582},"introduced_by":6}],"inode":{"change":6,"pos":14}},"ins_contents":[{"Add":" let h_inv = changes.save_change(&p_inv).unwrap();"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channela, &h_inv).unwrap();"},{"Add":" debug_to_file(&txn, &channela.borrow(), \"debug\").unwrap();"}],"del_contents":[{"Del":" let h_inv = changes.save_change(&p_inv)?;\n apply::apply_change(&changes, &mut txn, &mut channela, h_inv)?;\n debug_to_file(&txn, &channela.borrow(), \"debug\")?;\n\n Ok(())\n"}]}},{"Replacement":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":109,"ins":{"up_context":[{"change":6,"pos":3616}],"down_context":[{"change":6,"pos":3746}],"flag":"BLOCK","start":23789,"end":23921,"inode":{"change":6,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3616},"to":{"change":6,"start":3616,"end":3746},"introduced_by":6}],"inode":{"change":6,"pos":14}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channelb, &ha)?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channela, &hb)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channelb, ha)?;\n apply::apply_change(&changes, &mut txn, &mut channela, hb)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":115,"ins":{"up_context":[{"change":6,"pos":3860}],"down_context":[{"change":6,"pos":3959}],"flag":"BLOCK","start":23922,"end":24027,"inode":{"change":6,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3860},"to":{"change":6,"start":3860,"end":3959},"introduced_by":6}],"inode":{"change":6,"pos":14}},"ins_contents":[{"Add":" output::output_repository_no_pending(&mut repo, &changes, &mut txn, &mut channela, \"\", true, None)?;"}],"del_contents":[{"Del":" output::output_repository_no_pending(&mut repo, &changes, &mut txn, &mut channela, \"\", true)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":146,"ins":{"up_context":[{"change":6,"pos":4962}],"down_context":[{"change":6,"pos":5030}],"flag":"BLOCK","start":24028,"end":24097,"inode":{"change":6,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":4962},"to":{"change":6,"start":4962,"end":5030},"introduced_by":6}],"inode":{"change":6,"pos":14}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channelb, &h_inv)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channelb, h_inv)?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":276051},"path":"libpijul/src/tests/rm_file.rs","line":34,"ins":{"up_context":[{"change":18,"pos":277183}],"down_context":[{"change":18,"pos":277267}],"flag":"BLOCK","start":24098,"end":24183,"inode":{"change":18,"pos":276051}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":277183},"to":{"change":18,"start":277183,"end":277267},"introduced_by":18}],"inode":{"change":18,"pos":276051}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &init_h).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, init_h).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":276051},"path":"libpijul/src/tests/rm_file.rs","line":42,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":277424}],"down_context":[{"change":18,"pos":277424}],"flag":"BLOCK","start":24184,"end":24198,"inode":{"change":18,"pos":276051}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":276051},"path":"libpijul/src/tests/rm_file.rs","line":53,"ins":{"up_context":[{"change":18,"pos":277803}],"down_context":[{"change":18,"pos":5717}],"flag":"BLOCK","start":24199,"end":24279,"inode":{"change":18,"pos":276051}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":277803},"to":{"change":18,"start":277803,"end":277882},"introduced_by":18}],"inode":{"change":18,"pos":276051}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &bob_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, bob_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":276051},"path":"libpijul/src/tests/rm_file.rs","line":62,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":278107}],"down_context":[{"change":18,"pos":278107}],"flag":"BLOCK","start":24280,"end":24294,"inode":{"change":18,"pos":276051}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":71,"ins":{"up_context":[{"change":18,"pos":280147}],"down_context":[{"change":18,"pos":280205}],"flag":"BLOCK","start":24295,"end":24324,"inode":{"change":18,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":280147},"to":{"change":18,"start":280147,"end":280205},"introduced_by":18}],"inode":{"change":18,"pos":278146}},"ins_contents":[{"Add":"fn linear_context_repair() {"}],"del_contents":[{"Del":"fn linear_context_repair() -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":80,"ins":{"up_context":[{"change":18,"pos":280444}],"down_context":[{"change":18,"pos":280502}],"flag":"BLOCK","start":24325,"end":24391,"inode":{"change":18,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":280444},"to":{"change":18,"start":280444,"end":280502},"introduced_by":18}],"inode":{"change":18,"pos":278146}},"ins_contents":[{"Add":" let env = pristine::sanakirja::Pristine::new_anon().unwrap();"}],"del_contents":[{"Del":" let env = pristine::sanakirja::Pristine::new_anon()?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":84,"ins":{"up_context":[{"change":18,"pos":280609}],"down_context":[{"change":18,"pos":280636}],"flag":"BLOCK","start":24392,"end":24427,"inode":{"change":18,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":280609},"to":{"change":18,"start":280609,"end":280636},"introduced_by":18}],"inode":{"change":18,"pos":278146}},"ins_contents":[{"Add":" txn.add_file(\"file\").unwrap();"}],"del_contents":[{"Del":" txn.add_file(\"file\")?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":87,"ins":{"up_context":[{"change":18,"pos":6256}],"down_context":[{"change":18,"pos":280777}],"flag":"BLOCK","start":24428,"end":24444,"inode":{"change":18,"pos":278146}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":6256},"to":{"change":18,"start":280761,"end":280777},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":12880},"to":{"change":18,"start":280761,"end":280777},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":280761},"to":{"change":18,"start":280761,"end":280777},"introduced_by":18}],"inode":{"change":18,"pos":278146}},"ins_contents":[{"Add":" let n = 20;"}],"del_contents":[{"Del":" let n = 10;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":91,"ins":{"up_context":[{"change":18,"pos":280864}],"down_context":[{"change":18,"pos":280903}],"flag":"BLOCK","start":24445,"end":24492,"inode":{"change":18,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":280864},"to":{"change":18,"start":280864,"end":280903},"introduced_by":18}],"inode":{"change":18,"pos":278146}},"ins_contents":[{"Add":" writeln!(w, \"{}\", j).unwrap();"}],"del_contents":[{"Del":" writeln!(w, \"{}\", j)?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":93,"ins":{"up_context":[{"change":18,"pos":280917}],"down_context":[{"change":18,"pos":280958}],"flag":"BLOCK","start":24493,"end":24542,"inode":{"change":18,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":280917},"to":{"change":18,"start":280917,"end":280958},"introduced_by":18}],"inode":{"change":18,"pos":278146}},"ins_contents":[{"Add":" w.write_all(&contents[..]).unwrap();"}],"del_contents":[{"Del":" w.write_all(&contents[..])?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":95,"ins":{"up_context":[{"change":18,"pos":280994}],"down_context":[{"change":18,"pos":281033}],"flag":"BLOCK","start":24543,"end":24590,"inode":{"change":18,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":280994},"to":{"change":18,"start":280994,"end":281033},"introduced_by":18}],"inode":{"change":18,"pos":278146}},"ins_contents":[{"Add":" writeln!(w, \"{}\", j).unwrap();"}],"del_contents":[{"Del":" writeln!(w, \"{}\", j)?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":103,"ins":{"up_context":[{"change":18,"pos":281250}],"down_context":[{"change":18,"pos":1378}],"flag":"BLOCK","start":24591,"end":24651,"inode":{"change":18,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":281250},"to":{"change":18,"start":281250,"end":281302},"introduced_by":18}],"inode":{"change":18,"pos":278146}},"ins_contents":[{"Add":" let mut channel2 = txn.fork(&channel, \"fork\").unwrap();"}],"del_contents":[{"Del":" let mut channel2 = txn.fork(&channel, \"fork\")?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":106,"ins":{"up_context":[{"change":18,"pos":281360}],"down_context":[{"change":18,"pos":281395}],"flag":"BLOCK","start":24652,"end":24695,"inode":{"change":18,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":281360},"to":{"change":18,"start":281360,"end":281395},"introduced_by":18}],"inode":{"change":18,"pos":278146}},"ins_contents":[{"Add":" writeln!(w, \"{}\", j).unwrap();"}],"del_contents":[{"Del":" writeln!(w, \"{}\", j)?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":108,"ins":{"up_context":[{"change":18,"pos":281405}],"down_context":[{"change":18,"pos":281453}],"flag":"BLOCK","start":24696,"end":24752,"inode":{"change":18,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":281405},"to":{"change":18,"start":12954,"end":13002},"introduced_by":18}],"inode":{"change":18,"pos":278146}},"ins_contents":[{"Add":" w.write_all(b\"TxnTX\\nYYYYY\\nZZZZZ\\n\").unwrap();"}],"del_contents":[{"Del":" w.write_all(b\"TxnTX\\nYYYYY\\nZZZZZ\\n\")?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":110,"ins":{"up_context":[{"change":18,"pos":281485}],"down_context":[{"change":18,"pos":281520}],"flag":"BLOCK","start":24753,"end":24796,"inode":{"change":18,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":281485},"to":{"change":18,"start":281485,"end":281520},"introduced_by":18}],"inode":{"change":18,"pos":278146}},"ins_contents":[{"Add":" writeln!(w, \"{}\", j).unwrap();"}],"del_contents":[{"Del":" writeln!(w, \"{}\", j)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":115,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":281567}],"down_context":[{"change":18,"pos":281567}],"flag":"BLOCK","start":24797,"end":24798,"inode":{"change":18,"pos":278146}}},"contents":[{"Add":""}]}},{"Replacement":{"inode":{"change":18,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":117,"ins":{"up_context":[{"change":18,"pos":281651}],"down_context":[{"change":18,"pos":281708}],"flag":"BLOCK","start":24799,"end":24953,"inode":{"change":18,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":281651},"to":{"change":18,"start":6339,"end":6407},"introduced_by":18}],"inode":{"change":18,"pos":278146}},"ins_contents":[{"Add":""},{"Add":" ::sanakirja::debug::debug(&txn.txn, &["},{"Add":" txn.graph(&channel.borrow()),"},{"Add":" txn.graph(&channel2.borrow()),"},{"Add":" ], \"debug_sanakirja\", true);"}],"del_contents":[{"Del":" debug_to_file(&txn, &channel2.borrow(), \"debug_bob0\").unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":123,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":281709}],"down_context":[{"change":18,"pos":1437}],"flag":"BLOCK","start":24954,"end":25023,"inode":{"change":18,"pos":278146}}},"contents":[{"Add":""},{"Add":" debug_to_file(&txn, &channel2.borrow(), \"debug_bob0\").unwrap();"}]}},{"Replacement":{"inode":{"change":18,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":127,"ins":{"up_context":[{"change":18,"pos":281767}],"down_context":[{"change":18,"pos":281802}],"flag":"BLOCK","start":25024,"end":25067,"inode":{"change":18,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":281767},"to":{"change":18,"start":281767,"end":281802},"introduced_by":18}],"inode":{"change":18,"pos":278146}},"ins_contents":[{"Add":" writeln!(w, \"{}\", j).unwrap();"}],"del_contents":[{"Del":" writeln!(w, \"{}\", j)?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":130,"ins":{"up_context":[{"change":18,"pos":281844}],"down_context":[{"change":18,"pos":281879}],"flag":"BLOCK","start":25068,"end":25111,"inode":{"change":18,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":281844},"to":{"change":18,"start":281844,"end":281879},"introduced_by":18}],"inode":{"change":18,"pos":278146}},"ins_contents":[{"Add":" writeln!(w, \"{}\", j).unwrap();"}],"del_contents":[{"Del":" writeln!(w, \"{}\", j)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":136,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":282009}],"down_context":[{"change":18,"pos":6408}],"flag":"BLOCK","start":25112,"end":25113,"inode":{"change":18,"pos":278146}}},"contents":[{"Add":""}]}},{"Replacement":{"inode":{"change":18,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":139,"ins":{"up_context":[{"change":18,"pos":282094}],"down_context":[{"change":18,"pos":6478}],"flag":"BLOCK","start":25114,"end":25174,"inode":{"change":18,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":282094},"to":{"change":18,"start":282094,"end":282145},"introduced_by":18}],"inode":{"change":18,"pos":278146}},"ins_contents":[{"Add":" txn.apply_change(&changes, &mut channel, &p1).unwrap();"}],"del_contents":[{"Del":" txn.apply_change(&changes, &mut channel, p1)?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":142,"ins":{"up_context":[{"change":18,"pos":282229}],"down_context":[{"change":18,"pos":6547}],"flag":"BLOCK","start":25175,"end":25236,"inode":{"change":18,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":282229},"to":{"change":18,"start":282229,"end":282281},"introduced_by":18}],"inode":{"change":18,"pos":278146}},"ins_contents":[{"Add":" txn.apply_change(&changes, &mut channel2, &p2).unwrap();"}],"del_contents":[{"Del":" txn.apply_change(&changes, &mut channel2, p2)?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":154,"ins":{"up_context":[{"change":18,"pos":282552}],"down_context":[{"change":18,"pos":282593}],"flag":"BLOCK","start":25237,"end":25278,"inode":{"change":18,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":282552},"to":{"change":18,"start":282552,"end":282593},"introduced_by":18}],"inode":{"change":18,"pos":278146}},"ins_contents":[{"Add":" let original_edges = 8 * n + 27;"}],"del_contents":[{"Del":" let original_edges = 8 * n + 18;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":156,"ins":{"up_context":[{"change":18,"pos":282625}],"down_context":[{"change":18,"pos":282674}],"flag":"BLOCK","start":25279,"end":25335,"inode":{"change":18,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":282625},"to":{"change":18,"start":282625,"end":282674},"introduced_by":18}],"inode":{"change":18,"pos":278146}},"ins_contents":[{"Add":" panic!(\"{}: {} > {}\", n, m, original_edges)"}],"del_contents":[{"Del":" panic!(\"{} > {}\", m, original_edges)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":167,"ins":{"up_context":[{"change":18,"pos":282848}],"down_context":[{"change":18,"pos":282889}],"flag":"BLOCK","start":25336,"end":25377,"inode":{"change":18,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":282848},"to":{"change":18,"start":282848,"end":282889},"introduced_by":18}],"inode":{"change":18,"pos":278146}},"ins_contents":[{"Add":" let original_edges = 8 * n + 27;"}],"del_contents":[{"Del":" let original_edges = 8 * n + 18;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":169,"ins":{"up_context":[{"change":18,"pos":282921}],"down_context":[{"change":18,"pos":282970}],"flag":"BLOCK","start":25378,"end":25434,"inode":{"change":18,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":282921},"to":{"change":18,"start":282921,"end":282970},"introduced_by":18}],"inode":{"change":18,"pos":278146}},"ins_contents":[{"Add":" panic!(\"{}: {} > {}\", n, m, original_edges)"}],"del_contents":[{"Del":" panic!(\"{} > {}\", m, original_edges)\n"}]}},{"Edit":{"inode":{"change":18,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":173,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":283013},"to":{"change":18,"start":283013,"end":283024},"introduced_by":18}],"inode":{"change":18,"pos":278146}}},"contents":[{"Del":" Ok(())\n"}]}},{"Replacement":{"inode":{"change":18,"pos":285224},"path":"libpijul/src/tests/partial.rs","line":35,"ins":{"up_context":[{"change":18,"pos":286507}],"down_context":[{"change":18,"pos":28057}],"flag":"BLOCK","start":25435,"end":25501,"inode":{"change":18,"pos":285224}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":286507},"to":{"change":18,"start":27992,"end":28057},"introduced_by":18}],"inode":{"change":18,"pos":285224}},"ins_contents":[{"Add":" let key = txn.get_inodes(&inode, None).unwrap().unwrap();"}],"del_contents":[{"Del":" let key = txn.get_inodes(inode, None).unwrap().unwrap();\n"}]}},{"Replacement":{"inode":{"change":18,"pos":285224},"path":"libpijul/src/tests/partial.rs","line":37,"ins":{"up_context":[{"change":18,"pos":28091}],"down_context":[{"change":18,"pos":28144}],"flag":"BLOCK","start":25502,"end":25556,"inode":{"change":18,"pos":285224}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":28091},"to":{"change":18,"start":28091,"end":28144},"introduced_by":18}],"inode":{"change":18,"pos":285224}},"ins_contents":[{"Add":" .log_for_path(&channel.borrow(), *key, 0)"}],"del_contents":[{"Del":" .log_for_path(&channel.borrow(), key, 0)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":285224},"path":"libpijul/src/tests/partial.rs","line":91,"ins":{"up_context":[{"change":18,"pos":288228}],"down_context":[{"change":18,"pos":288304}],"flag":"BLOCK","start":25557,"end":25634,"inode":{"change":18,"pos":285224}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":288228},"to":{"change":18,"start":288228,"end":288304},"introduced_by":18}],"inode":{"change":18,"pos":285224}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn2, &mut channel, &h).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn2, &mut channel, h).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":285224},"path":"libpijul/src/tests/partial.rs","line":99,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":288482}],"down_context":[{"change":18,"pos":288482}],"flag":"BLOCK","start":25635,"end":25653,"inode":{"change":18,"pos":285224}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":285224},"path":"libpijul/src/tests/partial.rs","line":109,"ins":{"up_context":[{"change":18,"pos":288704}],"down_context":[{"change":18,"pos":288781}],"flag":"BLOCK","start":25654,"end":25732,"inode":{"change":18,"pos":285224}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":288704},"to":{"change":18,"start":288704,"end":288781},"introduced_by":18}],"inode":{"change":18,"pos":285224}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn2, &mut channel, &h2).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn2, &mut channel, h2).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":285224},"path":"libpijul/src/tests/partial.rs","line":117,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":288956}],"down_context":[{"change":18,"pos":288956}],"flag":"BLOCK","start":25733,"end":25751,"inode":{"change":18,"pos":285224}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":289338},"path":"libpijul/src/tests/mod.rs","line":76,"ins":{"up_context":[{"change":18,"pos":291067}],"down_context":[{"change":18,"pos":291146}],"flag":"BLOCK","start":25752,"end":25832,"inode":{"change":18,"pos":289338}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":291067},"to":{"change":18,"start":291067,"end":291146},"introduced_by":18}],"inode":{"change":18,"pos":289338}},"ins_contents":[{"Add":" apply::apply_local_change(txn, channel, &change0, &hash, &rec.updatables)?;"}],"del_contents":[{"Del":" apply::apply_local_change(txn, channel, &change0, hash, &rec.updatables)?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":289338},"path":"libpijul/src/tests/mod.rs","line":91,"ins":{"up_context":[{"change":18,"pos":291462}],"down_context":[{"change":18,"pos":291552}],"flag":"BLOCK","start":25833,"end":25929,"inode":{"change":18,"pos":289338}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":291462},"to":{"change":18,"start":291462,"end":291552},"introduced_by":18}],"inode":{"change":18,"pos":289338}},"ins_contents":[{"Add":" output::output_repository_no_pending(repo, changes, txn, channel, \"\", true, None).unwrap();"}],"del_contents":[{"Del":" output::output_repository_no_pending(repo, changes, txn, channel, \"\", true).unwrap();\n"}]}},{"Replacement":{"inode":{"change":18,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":44,"ins":{"up_context":[{"change":18,"pos":292966}],"down_context":[{"change":18,"pos":293050}],"flag":"BLOCK","start":25930,"end":26015,"inode":{"change":18,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":292966},"to":{"change":18,"start":292966,"end":293050},"introduced_by":18}],"inode":{"change":18,"pos":291589}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &init_h).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, init_h).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":52,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":293207}],"down_context":[{"change":18,"pos":293207}],"flag":"BLOCK","start":26016,"end":26030,"inode":{"change":18,"pos":291589}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":94,"ins":{"up_context":[{"change":18,"pos":294016}],"down_context":[{"change":18,"pos":13891}],"flag":"BLOCK","start":26031,"end":26192,"inode":{"change":18,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":294016},"to":{"change":18,"start":294016,"end":294095},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":294095},"to":{"change":18,"start":13811,"end":13891},"introduced_by":18}],"inode":{"change":18,"pos":291589}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &bob_h)?;"},{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &bob_h2)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, bob_h)?;\n"},{"Del":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, bob_h2)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":104,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":294258}],"down_context":[{"change":18,"pos":294258}],"flag":"BLOCK","start":26193,"end":26207,"inode":{"change":18,"pos":291589}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":112,"ins":{"up_context":[{"change":18,"pos":7343}],"down_context":[{"change":18,"pos":14402}],"flag":"BLOCK","start":26208,"end":26369,"inode":{"change":18,"pos":291589}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":7343},"to":{"change":18,"start":14243,"end":14402},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":14243},"to":{"change":18,"start":14243,"end":14402},"introduced_by":18}],"inode":{"change":18,"pos":291589}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &bob_h)?;"},{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &bob_h2)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, bob_h)?;\n apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, bob_h2)?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":155,"ins":{"up_context":[{"change":18,"pos":7485}],"down_context":[{"change":18,"pos":7486}],"flag":"BLOCK","start":26370,"end":26456,"inode":{"change":18,"pos":291589}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":7485},"to":{"change":18,"start":295552,"end":295637},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":14869},"to":{"change":18,"start":295552,"end":295637},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":295552},"to":{"change":18,"start":295552,"end":295637},"introduced_by":18}],"inode":{"change":18,"pos":291589}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &alice_h).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, alice_h).unwrap();\n"}]}},{"Replacement":{"inode":{"change":18,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":162,"ins":{"up_context":[{"change":18,"pos":7627}],"down_context":[{"change":18,"pos":2265}],"flag":"BLOCK","start":26457,"end":26535,"inode":{"change":18,"pos":291589}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":7627},"to":{"change":18,"start":2188,"end":2265},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":2188},"to":{"change":18,"start":2188,"end":2265},"introduced_by":18}],"inode":{"change":18,"pos":291589}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &alice_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, alice_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":174,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":295894}],"down_context":[{"change":18,"pos":295894}],"flag":"BLOCK","start":26536,"end":26550,"inode":{"change":18,"pos":291589}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":237,"ins":{"up_context":[{"change":18,"pos":297968}],"down_context":[{"change":18,"pos":298044}],"flag":"BLOCK","start":26551,"end":26628,"inode":{"change":18,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":297968},"to":{"change":18,"start":297968,"end":298044},"introduced_by":18}],"inode":{"change":18,"pos":291589}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &init_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, init_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":245,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":298201}],"down_context":[{"change":18,"pos":298201}],"flag":"BLOCK","start":26629,"end":26643,"inode":{"change":18,"pos":291589}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":279,"ins":{"up_context":[{"change":18,"pos":299215}],"down_context":[{"change":18,"pos":299294}],"flag":"BLOCK","start":26644,"end":26724,"inode":{"change":18,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":299215},"to":{"change":18,"start":299215,"end":299294},"introduced_by":18}],"inode":{"change":18,"pos":291589}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &bob_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, bob_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":287,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":299457}],"down_context":[{"change":18,"pos":299457}],"flag":"BLOCK","start":26725,"end":26739,"inode":{"change":18,"pos":291589}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":307,"ins":{"up_context":[{"change":18,"pos":300061}],"down_context":[{"change":18,"pos":300140}],"flag":"BLOCK","start":26740,"end":26820,"inode":{"change":18,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":300061},"to":{"change":18,"start":300061,"end":300140},"introduced_by":18}],"inode":{"change":18,"pos":291589}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &inv_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, inv_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":315,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":300303}],"down_context":[{"change":18,"pos":300303}],"flag":"BLOCK","start":26821,"end":26835,"inode":{"change":18,"pos":291589}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":300430},"path":"libpijul/src/tests/filesystem.rs","line":18,"ins":{"up_context":[{"change":18,"pos":300887}],"down_context":[{"change":18,"pos":300988}],"flag":"BLOCK","start":26836,"end":26914,"inode":{"change":18,"pos":300430}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":300887},"to":{"change":18,"start":300887,"end":300988},"introduced_by":18}],"inode":{"change":18,"pos":300430}},"ins_contents":[{"Add":" let env = pristine::sanakirja::Pristine::new(f.path().join(\"pristine\"))?;"}],"del_contents":[{"Del":" std::fs::create_dir_all(f.path())?;\n let env = pristine::sanakirja::Pristine::new(f.path())?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":300430},"path":"libpijul/src/tests/filesystem.rs","line":26,"ins":{"up_context":[{"change":18,"pos":301307}],"down_context":[{"change":18,"pos":301466}],"flag":"BLOCK","start":26915,"end":27081,"inode":{"change":18,"pos":300430}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":301307},"to":{"change":18,"start":301307,"end":301466},"introduced_by":18}],"inode":{"change":18,"pos":300430}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel, &p)?;"},{"Add":" output::output_repository_no_pending(&mut repo, &changes, &mut txn, &mut channel, \"\", true, None)"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel, p)?;\n output::output_repository_no_pending(&mut repo, &changes, &mut txn, &mut channel, \"\", true)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":300430},"path":"libpijul/src/tests/filesystem.rs","line":55,"ins":{"up_context":[{"change":18,"pos":302218}],"down_context":[{"change":18,"pos":302279}],"flag":"BLOCK","start":27082,"end":27160,"inode":{"change":18,"pos":300430}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":302218},"to":{"change":18,"start":302218,"end":302279},"introduced_by":18}],"inode":{"change":18,"pos":300430}},"ins_contents":[{"Add":" let env = pristine::sanakirja::Pristine::new(f.path().join(\"pristine\"))?;"}],"del_contents":[{"Del":" let env = pristine::sanakirja::Pristine::new(f.path())?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":300430},"path":"libpijul/src/tests/filesystem.rs","line":64,"ins":{"up_context":[{"change":18,"pos":302637}],"down_context":[{"change":18,"pos":302796}],"flag":"BLOCK","start":27161,"end":27327,"inode":{"change":18,"pos":300430}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":302637},"to":{"change":18,"start":302637,"end":302796},"introduced_by":18}],"inode":{"change":18,"pos":300430}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel, &p)?;"},{"Add":" output::output_repository_no_pending(&mut repo, &changes, &mut txn, &mut channel, \"\", true, None)"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel, p)?;\n output::output_repository_no_pending(&mut repo, &changes, &mut txn, &mut channel, \"\", true)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":300430},"path":"libpijul/src/tests/filesystem.rs","line":91,"ins":{"up_context":[{"change":18,"pos":303520}],"down_context":[{"change":18,"pos":303581}],"flag":"BLOCK","start":27328,"end":27406,"inode":{"change":18,"pos":300430}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":303520},"to":{"change":18,"start":303520,"end":303581},"introduced_by":18}],"inode":{"change":18,"pos":300430}},"ins_contents":[{"Add":" let env = pristine::sanakirja::Pristine::new(f.path().join(\"pristine\"))?;"}],"del_contents":[{"Del":" let env = pristine::sanakirja::Pristine::new(f.path())?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":300430},"path":"libpijul/src/tests/filesystem.rs","line":99,"ins":{"up_context":[{"change":18,"pos":303900}],"down_context":[{"change":18,"pos":304059}],"flag":"BLOCK","start":27407,"end":27573,"inode":{"change":18,"pos":300430}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":303900},"to":{"change":18,"start":303900,"end":304059},"introduced_by":18}],"inode":{"change":18,"pos":300430}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel, &p)?;"},{"Add":" output::output_repository_no_pending(&mut repo, &changes, &mut txn, &mut channel, \"\", true, None)"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel, p)?;\n output::output_repository_no_pending(&mut repo, &changes, &mut txn, &mut channel, \"\", true)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":300430},"path":"libpijul/src/tests/filesystem.rs","line":123,"ins":{"up_context":[{"change":18,"pos":304613}],"down_context":[{"change":18,"pos":304674}],"flag":"BLOCK","start":27574,"end":27652,"inode":{"change":18,"pos":300430}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":304613},"to":{"change":18,"start":304613,"end":304674},"introduced_by":18}],"inode":{"change":18,"pos":300430}},"ins_contents":[{"Add":" let env = pristine::sanakirja::Pristine::new(f.path().join(\"pristine\"))?;"}],"del_contents":[{"Del":" let env = pristine::sanakirja::Pristine::new(f.path())?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":300430},"path":"libpijul/src/tests/filesystem.rs","line":137,"ins":{"up_context":[{"change":18,"pos":305266}],"down_context":[{"change":18,"pos":305425}],"flag":"BLOCK","start":27653,"end":27819,"inode":{"change":18,"pos":300430}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":305266},"to":{"change":18,"start":305266,"end":305425},"introduced_by":18}],"inode":{"change":18,"pos":300430}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel, &p)?;"},{"Add":" output::output_repository_no_pending(&mut repo, &changes, &mut txn, &mut channel, \"\", true, None)"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel, p)?;\n output::output_repository_no_pending(&mut repo, &changes, &mut txn, &mut channel, \"\", true)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":46,"ins":{"up_context":[{"change":18,"pos":306856}],"down_context":[{"change":18,"pos":306940}],"flag":"BLOCK","start":27820,"end":27905,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":306856},"to":{"change":18,"start":306856,"end":306940},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &init_h).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, init_h).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":54,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":307097}],"down_context":[{"change":18,"pos":307097}],"flag":"BLOCK","start":27906,"end":27920,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":80,"ins":{"up_context":[{"change":18,"pos":307900}],"down_context":[{"change":18,"pos":8460}],"flag":"BLOCK","start":27921,"end":28001,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":307900},"to":{"change":18,"start":307900,"end":307979},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &bob_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, bob_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":89,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":308220}],"down_context":[{"change":18,"pos":308220}],"flag":"BLOCK","start":28002,"end":28016,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":97,"ins":{"up_context":[{"change":18,"pos":308376}],"down_context":[{"change":18,"pos":8534}],"flag":"BLOCK","start":28017,"end":28095,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":308376},"to":{"change":18,"start":308376,"end":308453},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &alice_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, alice_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":106,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":308685}],"down_context":[{"change":18,"pos":308685}],"flag":"BLOCK","start":28096,"end":28110,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":118,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":308952}],"down_context":[{"change":18,"pos":308952}],"flag":"BLOCK","start":28111,"end":28125,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":131,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":309219}],"down_context":[{"change":18,"pos":309219}],"flag":"BLOCK","start":28126,"end":28140,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":148,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":309646}],"down_context":[{"change":18,"pos":309646}],"flag":"BLOCK","start":28141,"end":28155,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":155,"ins":{"up_context":[{"change":18,"pos":309777}],"down_context":[{"change":18,"pos":309863}],"flag":"BLOCK","start":28156,"end":28243,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":309777},"to":{"change":18,"start":309777,"end":309863},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &bob_solution)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, bob_solution)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":163,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":310042}],"down_context":[{"change":18,"pos":310042}],"flag":"BLOCK","start":28244,"end":28258,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":211,"ins":{"up_context":[{"change":18,"pos":311582}],"down_context":[{"change":18,"pos":311666}],"flag":"BLOCK","start":28259,"end":28344,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":311582},"to":{"change":18,"start":311582,"end":311666},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &init_h).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, init_h).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":219,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":311823}],"down_context":[{"change":18,"pos":311823}],"flag":"BLOCK","start":28345,"end":28359,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":246,"ins":{"up_context":[{"change":18,"pos":312649}],"down_context":[{"change":18,"pos":8886}],"flag":"BLOCK","start":28360,"end":28440,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":312649},"to":{"change":18,"start":312649,"end":312728},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &bob_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, bob_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":255,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":312953}],"down_context":[{"change":18,"pos":312953}],"flag":"BLOCK","start":28441,"end":28455,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":259,"ins":{"up_context":[{"change":18,"pos":312996}],"down_context":[{"change":18,"pos":8960}],"flag":"BLOCK","start":28456,"end":28534,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":312996},"to":{"change":18,"start":312996,"end":313073},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &alice_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, alice_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":268,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":313302}],"down_context":[{"change":18,"pos":313302}],"flag":"BLOCK","start":28535,"end":28549,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":301,"ins":{"up_context":[{"change":18,"pos":314246}],"down_context":[{"change":18,"pos":314330}],"flag":"BLOCK","start":28550,"end":28635,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":314246},"to":{"change":18,"start":314246,"end":314330},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &solution_alice)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, solution_alice)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":309,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":314503}],"down_context":[{"change":18,"pos":314503}],"flag":"BLOCK","start":28636,"end":28650,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":357,"ins":{"up_context":[{"change":18,"pos":316120}],"down_context":[{"change":18,"pos":316204}],"flag":"BLOCK","start":28651,"end":28736,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":316120},"to":{"change":18,"start":316120,"end":316204},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &init_h).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, init_h).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":365,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":316361}],"down_context":[{"change":18,"pos":316361}],"flag":"BLOCK","start":28737,"end":28751,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":394,"ins":{"up_context":[{"change":18,"pos":317420}],"down_context":[{"change":18,"pos":317512}],"flag":"BLOCK","start":28752,"end":28845,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":317420},"to":{"change":18,"start":317420,"end":317512},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_charlie, &mut channel_charlie, &init_h).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_charlie, &mut channel_charlie, init_h).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":402,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":317681}],"down_context":[{"change":18,"pos":317681}],"flag":"BLOCK","start":28846,"end":28860,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":416,"ins":{"up_context":[{"change":18,"pos":318014}],"down_context":[{"change":18,"pos":318182}],"flag":"BLOCK","start":28861,"end":29031,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":318014},"to":{"change":18,"start":318014,"end":318182},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_charlie, &mut channel_charlie, &bob_h)?;"},{"Add":" apply::apply_change(&changes, &mut txn_charlie, &mut channel_charlie, &alice_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_charlie, &mut channel_charlie, bob_h)?;\n apply::apply_change(&changes, &mut txn_charlie, &mut channel_charlie, alice_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":425,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":318351}],"down_context":[{"change":18,"pos":318351}],"flag":"BLOCK","start":29032,"end":29046,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":454,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":5594}],"down_context":[{"change":18,"pos":5594}],"flag":"BLOCK","start":29047,"end":29061,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":461,"ins":{"up_context":[{"change":18,"pos":318584}],"down_context":[{"change":18,"pos":9620}],"flag":"BLOCK","start":29062,"end":29226,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":318584},"to":{"change":18,"start":318584,"end":318746},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &bob_h)?;"},{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &charlie_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, bob_h)?;\n apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, charlie_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":471,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":318971}],"down_context":[{"change":18,"pos":318971}],"flag":"BLOCK","start":29227,"end":29241,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":488,"ins":{"up_context":[{"change":18,"pos":5867}],"down_context":[{"change":18,"pos":9768}],"flag":"BLOCK","start":29242,"end":29400,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":5867},"to":{"change":18,"start":319388,"end":319544},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":319388},"to":{"change":18,"start":319388,"end":319544},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &alice_h)?;"},{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &charlie_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, alice_h)?;\n apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, charlie_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":498,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":319757}],"down_context":[{"change":18,"pos":319757}],"flag":"BLOCK","start":29401,"end":29415,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":540,"ins":{"up_context":[{"change":18,"pos":321163}],"down_context":[{"change":18,"pos":321247}],"flag":"BLOCK","start":29416,"end":29501,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":321163},"to":{"change":18,"start":321163,"end":321247},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &init_h).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, init_h).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":548,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":321404}],"down_context":[{"change":18,"pos":321404}],"flag":"BLOCK","start":29502,"end":29516,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":573,"ins":{"up_context":[{"change":18,"pos":322068}],"down_context":[{"change":18,"pos":10188}],"flag":"BLOCK","start":29517,"end":29597,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":322068},"to":{"change":18,"start":322068,"end":322147},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &bob_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, bob_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":583,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":322394}],"down_context":[{"change":18,"pos":322394}],"flag":"BLOCK","start":29598,"end":29612,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":590,"ins":{"up_context":[{"change":18,"pos":28488}],"down_context":[{"change":18,"pos":28514}],"flag":"BLOCK","start":29613,"end":29640,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":28488},"to":{"change":18,"start":28488,"end":28514},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" &OwnedPathId {"}],"del_contents":[{"Del":" OwnedPathId {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":612,"ins":{"up_context":[{"change":18,"pos":323107}],"down_context":[{"change":18,"pos":10410}],"flag":"BLOCK","start":29641,"end":29719,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":323107},"to":{"change":18,"start":323107,"end":323184},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &alice_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, alice_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":621,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":323397}],"down_context":[{"change":18,"pos":323397}],"flag":"BLOCK","start":29720,"end":29734,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":625,"ins":{"up_context":[{"change":18,"pos":323517}],"down_context":[{"change":18,"pos":10478}],"flag":"BLOCK","start":29735,"end":29820,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":323517},"to":{"change":18,"start":323517,"end":323601},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &alice_solution)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, alice_solution)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":634,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":323814}],"down_context":[{"change":18,"pos":323814}],"flag":"BLOCK","start":29821,"end":29835,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":672,"ins":{"up_context":[{"change":18,"pos":325029}],"down_context":[{"change":18,"pos":325113}],"flag":"BLOCK","start":29836,"end":29921,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":325029},"to":{"change":18,"start":325029,"end":325113},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &init_h).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, init_h).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":680,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":325270}],"down_context":[{"change":18,"pos":325270}],"flag":"BLOCK","start":29922,"end":29936,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":707,"ins":{"up_context":[{"change":18,"pos":326041}],"down_context":[{"change":18,"pos":10830}],"flag":"BLOCK","start":29937,"end":30017,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":326041},"to":{"change":18,"start":326041,"end":326120},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &bob_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, bob_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":718,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":326368}],"down_context":[{"change":18,"pos":326368}],"flag":"BLOCK","start":30018,"end":30032,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":742,"ins":{"up_context":[{"change":18,"pos":327117}],"down_context":[{"change":18,"pos":11052}],"flag":"BLOCK","start":30033,"end":30111,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":327117},"to":{"change":18,"start":327117,"end":327194},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &alice_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, alice_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":751,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":327407}],"down_context":[{"change":18,"pos":327407}],"flag":"BLOCK","start":30112,"end":30126,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":755,"ins":{"up_context":[{"change":18,"pos":327527}],"down_context":[{"change":18,"pos":11120}],"flag":"BLOCK","start":30127,"end":30212,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":327527},"to":{"change":18,"start":327527,"end":327611},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &alice_solution)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, alice_solution)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":764,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":327824}],"down_context":[{"change":18,"pos":327824}],"flag":"BLOCK","start":30213,"end":30227,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":804,"ins":{"up_context":[{"change":18,"pos":329088}],"down_context":[{"change":18,"pos":329172}],"flag":"BLOCK","start":30228,"end":30313,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":329088},"to":{"change":18,"start":329088,"end":329172},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &init_h).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, init_h).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":812,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":329329}],"down_context":[{"change":18,"pos":329329}],"flag":"BLOCK","start":30314,"end":30328,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":839,"ins":{"up_context":[{"change":18,"pos":330077}],"down_context":[{"change":18,"pos":11472}],"flag":"BLOCK","start":30329,"end":30409,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":330077},"to":{"change":18,"start":330077,"end":330156},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &bob_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, bob_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":849,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":330403}],"down_context":[{"change":18,"pos":330403}],"flag":"BLOCK","start":30410,"end":30424,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":873,"ins":{"up_context":[{"change":18,"pos":331166}],"down_context":[{"change":18,"pos":11694}],"flag":"BLOCK","start":30425,"end":30503,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":331166},"to":{"change":18,"start":331166,"end":331243},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &alice_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, alice_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":882,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":331456}],"down_context":[{"change":18,"pos":331456}],"flag":"BLOCK","start":30504,"end":30518,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":887,"ins":{"up_context":[{"change":18,"pos":331577}],"down_context":[{"change":18,"pos":11762}],"flag":"BLOCK","start":30519,"end":30604,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":331577},"to":{"change":18,"start":331577,"end":331661},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &alice_solution)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, alice_solution)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":896,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":331874}],"down_context":[{"change":18,"pos":331874}],"flag":"BLOCK","start":30605,"end":30619,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":941,"ins":{"up_context":[{"change":18,"pos":333423}],"down_context":[{"change":18,"pos":333507}],"flag":"BLOCK","start":30620,"end":30705,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":333423},"to":{"change":18,"start":333423,"end":333507},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &init_h).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, init_h).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":949,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":333664}],"down_context":[{"change":18,"pos":333664}],"flag":"BLOCK","start":30706,"end":30720,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":954,"ins":{"up_context":[{"change":18,"pos":333815}],"down_context":[{"change":18,"pos":333907}],"flag":"BLOCK","start":30721,"end":30814,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":333815},"to":{"change":18,"start":333815,"end":333907},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_charlie, &mut channel_charlie, &init_h).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_charlie, &mut channel_charlie, init_h).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":962,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":334092}],"down_context":[{"change":18,"pos":334092}],"flag":"BLOCK","start":30815,"end":30829,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1005,"ins":{"up_context":[{"change":18,"pos":335246}],"down_context":[{"change":18,"pos":12274}],"flag":"BLOCK","start":30830,"end":30994,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":335246},"to":{"change":18,"start":335246,"end":335408},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &bob_h)?;"},{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &charlie_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, bob_h)?;\n apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, charlie_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1016,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":335671}],"down_context":[{"change":18,"pos":335671}],"flag":"BLOCK","start":30995,"end":31009,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1048,"ins":{"up_context":[{"change":18,"pos":336631}],"down_context":[{"change":18,"pos":12496}],"flag":"BLOCK","start":31010,"end":31168,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":336631},"to":{"change":18,"start":336631,"end":336787},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &alice_h)?;"},{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &charlie_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, alice_h)?;\n apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, charlie_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1058,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":337016}],"down_context":[{"change":18,"pos":337016}],"flag":"BLOCK","start":31169,"end":31183,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1067,"ins":{"up_context":[{"change":18,"pos":337275}],"down_context":[{"change":18,"pos":12632}],"flag":"BLOCK","start":31184,"end":31269,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":337275},"to":{"change":18,"start":337275,"end":337359},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &alice_solution)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, alice_solution)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1076,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":337588}],"down_context":[{"change":18,"pos":337588}],"flag":"BLOCK","start":31270,"end":31284,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1083,"ins":{"up_context":[{"change":18,"pos":337711}],"down_context":[{"change":18,"pos":12700}],"flag":"BLOCK","start":31285,"end":31369,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":337711},"to":{"change":18,"start":337711,"end":337794},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_charlie, &mut channel_charlie, &bob_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_charlie, &mut channel_charlie, bob_h)?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1086,"ins":{"up_context":[{"change":18,"pos":337908}],"down_context":[{"change":18,"pos":12780}],"flag":"BLOCK","start":31370,"end":31456,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":337908},"to":{"change":18,"start":337908,"end":337993},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_charlie, &mut channel_charlie, &alice_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_charlie, &mut channel_charlie, alice_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1095,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":338246}],"down_context":[{"change":18,"pos":338246}],"flag":"BLOCK","start":31457,"end":31471,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1107,"ins":{"up_context":[{"change":18,"pos":338595}],"down_context":[{"change":18,"pos":338619}],"flag":"BLOCK","start":31472,"end":31497,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":338595},"to":{"change":18,"start":338595,"end":338619},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" &alice_solution,"}],"del_contents":[{"Del":" alice_solution,\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1117,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":338880}],"down_context":[{"change":18,"pos":338880}],"flag":"BLOCK","start":31498,"end":31512,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1170,"ins":{"up_context":[{"change":18,"pos":340541}],"down_context":[{"change":18,"pos":340625}],"flag":"BLOCK","start":31513,"end":31598,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":340541},"to":{"change":18,"start":340541,"end":340625},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &init_h).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, init_h).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1178,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":340782}],"down_context":[{"change":18,"pos":340782}],"flag":"BLOCK","start":31599,"end":31613,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1185,"ins":{"up_context":[{"change":18,"pos":341012}],"down_context":[{"change":18,"pos":13156}],"flag":"BLOCK","start":31614,"end":31700,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":341012},"to":{"change":18,"start":341012,"end":341097},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &alice_h).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, alice_h).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1194,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":341326}],"down_context":[{"change":18,"pos":341326}],"flag":"BLOCK","start":31701,"end":31715,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1214,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":341953}],"down_context":[{"change":18,"pos":341953}],"flag":"BLOCK","start":31716,"end":31730,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1222,"ins":{"up_context":[{"change":18,"pos":342146}],"down_context":[{"change":18,"pos":342329}],"flag":"BLOCK","start":31731,"end":31916,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":342146},"to":{"change":18,"start":342146,"end":342329},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &bob_h).unwrap();"},{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &bob_resolution).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, bob_h).unwrap();\n apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, bob_resolution).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1231,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":342508}],"down_context":[{"change":18,"pos":342508}],"flag":"BLOCK","start":31917,"end":31931,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1240,"ins":{"up_context":[{"change":18,"pos":342807}],"down_context":[{"change":18,"pos":342992}],"flag":"BLOCK","start":31932,"end":32119,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":342807},"to":{"change":18,"start":342807,"end":342992},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_charlie, &mut channel_charlie, &init_h).unwrap();"},{"Add":" apply::apply_change(&changes, &mut txn_charlie, &mut channel_charlie, &alice_h).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_charlie, &mut channel_charlie, init_h).unwrap();\n apply::apply_change(&changes, &mut txn_charlie, &mut channel_charlie, alice_h).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1249,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":343177}],"down_context":[{"change":18,"pos":343177}],"flag":"BLOCK","start":32120,"end":32134,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1270,"ins":{"up_context":[{"change":18,"pos":5992}],"down_context":[{"change":18,"pos":13526}],"flag":"BLOCK","start":32135,"end":32227,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":5992},"to":{"change":18,"start":343693,"end":343784},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":343693},"to":{"change":18,"start":343693,"end":343784},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_charlie, &mut channel_charlie, &bob_h).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_charlie, &mut channel_charlie, bob_h).unwrap();\n"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1277,"ins":{"up_context":[{"change":18,"pos":343951}],"down_context":[{"change":18,"pos":343975}],"flag":"BLOCK","start":32228,"end":32253,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":343951},"to":{"change":18,"start":343951,"end":343975},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" &bob_resolution,"}],"del_contents":[{"Del":" bob_resolution,\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1288,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":344249}],"down_context":[{"change":18,"pos":344249}],"flag":"BLOCK","start":32254,"end":32268,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1298,"ins":{"up_context":[{"change":18,"pos":6230}],"down_context":[{"change":18,"pos":13686}],"flag":"BLOCK","start":32269,"end":32361,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":6230},"to":{"change":18,"start":344643,"end":344734},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":344643},"to":{"change":18,"start":344643,"end":344734},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &charlie_h).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, charlie_h).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1307,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":344975}],"down_context":[{"change":18,"pos":344975}],"flag":"BLOCK","start":32362,"end":32376,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1316,"ins":{"up_context":[{"change":18,"pos":345216}],"down_context":[{"change":18,"pos":13760}],"flag":"BLOCK","start":32377,"end":32465,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":345216},"to":{"change":18,"start":345216,"end":345303},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &charlie_h).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, charlie_h).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1326,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":345533}],"down_context":[{"change":18,"pos":345533}],"flag":"BLOCK","start":32466,"end":32480,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1361,"ins":{"up_context":[{"change":18,"pos":346664}],"down_context":[{"change":18,"pos":346720}],"flag":"BLOCK","start":32481,"end":32538,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":346664},"to":{"change":18,"start":346664,"end":346720},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" .apply_change(&changes, &mut channel_bob, &init)"}],"del_contents":[{"Del":" .apply_change(&changes, &mut channel_bob, init)\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1370,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":346896}],"down_context":[{"change":18,"pos":346896}],"flag":"BLOCK","start":32539,"end":32553,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1393,"ins":{"up_context":[{"change":18,"pos":347602}],"down_context":[{"change":18,"pos":347661}],"flag":"BLOCK","start":32554,"end":32614,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":347602},"to":{"change":18,"start":347602,"end":347661},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" .apply_change(&changes, &mut channel_bob, &alice_h)"}],"del_contents":[{"Del":" .apply_change(&changes, &mut channel_bob, alice_h)\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1403,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":347917}],"down_context":[{"change":18,"pos":347917}],"flag":"BLOCK","start":32615,"end":32629,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1426,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":348701}],"down_context":[{"change":18,"pos":348701}],"flag":"BLOCK","start":32630,"end":32644,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1435,"ins":{"up_context":[{"change":18,"pos":348891}],"down_context":[{"change":18,"pos":349038}],"flag":"BLOCK","start":32645,"end":32705,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":348891},"to":{"change":18,"start":348891,"end":348950},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" .apply_change(&changes, &mut channel_alice, &bob_h)"}],"del_contents":[{"Del":" .apply_change(&changes, &mut channel_alice, bob_h)\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1445,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":349236}],"down_context":[{"change":18,"pos":349236}],"flag":"BLOCK","start":32706,"end":32720,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1454,"ins":{"up_context":[{"change":18,"pos":349505}],"down_context":[{"change":18,"pos":349569}],"flag":"BLOCK","start":32721,"end":32786,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":349505},"to":{"change":18,"start":349505,"end":349569},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" .apply_change(&changes, &mut channel_alice, &resolution)"}],"del_contents":[{"Del":" .apply_change(&changes, &mut channel_alice, resolution)\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1463,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":349767}],"down_context":[{"change":18,"pos":349767}],"flag":"BLOCK","start":32787,"end":32801,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1499,"ins":{"up_context":[{"change":18,"pos":350978}],"down_context":[{"change":18,"pos":351034}],"flag":"BLOCK","start":32802,"end":32859,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":350978},"to":{"change":18,"start":350978,"end":351034},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" .apply_change(&changes, &mut channel_bob, &init)"}],"del_contents":[{"Del":" .apply_change(&changes, &mut channel_bob, init)\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1508,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":351210}],"down_context":[{"change":18,"pos":351210}],"flag":"BLOCK","start":32860,"end":32874,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1540,"ins":{"up_context":[{"change":18,"pos":352208}],"down_context":[{"change":18,"pos":352356}],"flag":"BLOCK","start":32875,"end":32936,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":352208},"to":{"change":18,"start":352208,"end":352268},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" .apply_change(&changes, &mut channel_alice, &bob_h1)"}],"del_contents":[{"Del":" .apply_change(&changes, &mut channel_alice, bob_h1)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1545,"ins":{"up_context":[{"change":18,"pos":352420}],"down_context":[{"change":18,"pos":352568}],"flag":"BLOCK","start":32937,"end":32998,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":352420},"to":{"change":18,"start":352420,"end":352480},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" .apply_change(&changes, &mut channel_alice, &bob_h2)"}],"del_contents":[{"Del":" .apply_change(&changes, &mut channel_alice, bob_h2)\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1566,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":353171}],"down_context":[{"change":18,"pos":353171}],"flag":"BLOCK","start":32999,"end":33013,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1600,"ins":{"up_context":[{"change":18,"pos":354270}],"down_context":[{"change":18,"pos":354326}],"flag":"BLOCK","start":33014,"end":33071,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":354270},"to":{"change":18,"start":354270,"end":354326},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" .apply_change(&changes, &mut channel_bob, &init)"}],"del_contents":[{"Del":" .apply_change(&changes, &mut channel_bob, init)\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1609,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":354502}],"down_context":[{"change":18,"pos":354502}],"flag":"BLOCK","start":33072,"end":33086,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1632,"ins":{"up_context":[{"change":18,"pos":355202}],"down_context":[{"change":18,"pos":355261}],"flag":"BLOCK","start":33087,"end":33147,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":355202},"to":{"change":18,"start":355202,"end":355261},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" .apply_change(&changes, &mut channel_bob, &alice_h)"}],"del_contents":[{"Del":" .apply_change(&changes, &mut channel_bob, alice_h)\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1642,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":355517}],"down_context":[{"change":18,"pos":355517}],"flag":"BLOCK","start":33148,"end":33162,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1659,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":356095}],"down_context":[{"change":18,"pos":356095}],"flag":"BLOCK","start":33163,"end":33177,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1668,"ins":{"up_context":[{"change":18,"pos":356285}],"down_context":[{"change":18,"pos":356344}],"flag":"BLOCK","start":33178,"end":33238,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":356285},"to":{"change":18,"start":356285,"end":356344},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" .apply_change(&changes, &mut channel_alice, &bob_h)"}],"del_contents":[{"Del":" .apply_change(&changes, &mut channel_alice, bob_h)\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1678,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":356630}],"down_context":[{"change":18,"pos":356630}],"flag":"BLOCK","start":33239,"end":33253,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1687,"ins":{"up_context":[{"change":18,"pos":356892}],"down_context":[{"change":18,"pos":356956}],"flag":"BLOCK","start":33254,"end":33319,"inode":{"change":18,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":356892},"to":{"change":18,"start":356892,"end":356956},"introduced_by":18}],"inode":{"change":18,"pos":305506}},"ins_contents":[{"Add":" .apply_change(&changes, &mut channel_alice, &resolution)"}],"del_contents":[{"Del":" .apply_change(&changes, &mut channel_alice, resolution)\n"}]}},{"Edit":{"inode":{"change":18,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1696,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":357154}],"down_context":[{"change":18,"pos":357154}],"flag":"BLOCK","start":33320,"end":33334,"inode":{"change":18,"pos":305506}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":25,"ins":{"up_context":[{"change":18,"pos":358305}],"down_context":[{"change":18,"pos":358377}],"flag":"BLOCK","start":33335,"end":33408,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":358305},"to":{"change":18,"start":358305,"end":358377},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &init_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, init_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":33,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":358530}],"down_context":[{"change":18,"pos":358530}],"flag":"BLOCK","start":33409,"end":33423,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":61,"ins":{"up_context":[{"change":18,"pos":359463}],"down_context":[{"change":18,"pos":359536}],"flag":"BLOCK","start":33424,"end":33498,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":359463},"to":{"change":18,"start":359463,"end":359536},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_alice, &bob_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_alice, bob_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":69,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":359693}],"down_context":[{"change":18,"pos":359693}],"flag":"BLOCK","start":33499,"end":33513,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":121,"ins":{"up_context":[{"change":18,"pos":361378}],"down_context":[{"change":18,"pos":361459}],"flag":"BLOCK","start":33514,"end":33596,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":361378},"to":{"change":18,"start":361378,"end":361459},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &alice_h).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, alice_h).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":129,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":361612}],"down_context":[{"change":18,"pos":361612}],"flag":"BLOCK","start":33597,"end":33611,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":137,"ins":{"up_context":[{"change":18,"pos":361806}],"down_context":[{"change":18,"pos":361890}],"flag":"BLOCK","start":33612,"end":33697,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":361806},"to":{"change":18,"start":361806,"end":361890},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &resolution).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, resolution).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":145,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":362043}],"down_context":[{"change":18,"pos":362043}],"flag":"BLOCK","start":33698,"end":33712,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":161,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":362547}],"down_context":[{"change":18,"pos":362547}],"flag":"BLOCK","start":33713,"end":33727,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":191,"ins":{"up_context":[{"change":18,"pos":363593}],"down_context":[{"change":18,"pos":363665}],"flag":"BLOCK","start":33728,"end":33801,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":363593},"to":{"change":18,"start":363593,"end":363665},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &init_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, init_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":199,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":363818}],"down_context":[{"change":18,"pos":363818}],"flag":"BLOCK","start":33802,"end":33816,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":211,"ins":{"up_context":[{"change":18,"pos":364189}],"down_context":[{"change":18,"pos":364265}],"flag":"BLOCK","start":33817,"end":33894,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":364189},"to":{"change":18,"start":364189,"end":364265},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, &init_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, init_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":219,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":364426}],"down_context":[{"change":18,"pos":364426}],"flag":"BLOCK","start":33895,"end":33909,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":255,"ins":{"up_context":[{"change":18,"pos":365514}],"down_context":[{"change":18,"pos":365587}],"flag":"BLOCK","start":33910,"end":33984,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":365514},"to":{"change":18,"start":365514,"end":365587},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_alice, &bob_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_alice, bob_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":263,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":365744}],"down_context":[{"change":18,"pos":365744}],"flag":"BLOCK","start":33985,"end":33999,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":309,"ins":{"up_context":[{"change":18,"pos":367282}],"down_context":[{"change":18,"pos":367446}],"flag":"BLOCK","start":34000,"end":34166,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":367282},"to":{"change":18,"start":367282,"end":367446},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &alice_h).unwrap();"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &charlie_h).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, alice_h).unwrap();\n apply::apply_change(&changes, &mut txn, &mut channel_bob, charlie_h).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":318,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":367599}],"down_context":[{"change":18,"pos":367599}],"flag":"BLOCK","start":34167,"end":34181,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":325,"ins":{"up_context":[{"change":18,"pos":367755}],"down_context":[{"change":18,"pos":367839}],"flag":"BLOCK","start":34182,"end":34267,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":367755},"to":{"change":18,"start":367755,"end":367839},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &resolution).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, resolution).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":333,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":367992}],"down_context":[{"change":18,"pos":367992}],"flag":"BLOCK","start":34268,"end":34282,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":367,"ins":{"up_context":[{"change":18,"pos":369024}],"down_context":[{"change":18,"pos":369192}],"flag":"BLOCK","start":34283,"end":34453,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":369024},"to":{"change":18,"start":369024,"end":369192},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, &alice_h).unwrap();"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, &bob_h).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, alice_h).unwrap();\n apply::apply_change(&changes, &mut txn, &mut channel_charlie, bob_h).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":376,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":369353}],"down_context":[{"change":18,"pos":369353}],"flag":"BLOCK","start":34454,"end":34468,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":383,"ins":{"up_context":[{"change":18,"pos":369530}],"down_context":[{"change":18,"pos":369707}],"flag":"BLOCK","start":34469,"end":34648,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":369530},"to":{"change":18,"start":369530,"end":369707},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, &resolution).unwrap();"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, &resolution2).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, resolution).unwrap();\n apply::apply_change(&changes, &mut txn, &mut channel_charlie, resolution2).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":392,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":369868}],"down_context":[{"change":18,"pos":369868}],"flag":"BLOCK","start":34649,"end":34663,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":426,"ins":{"up_context":[{"change":18,"pos":370913}],"down_context":[{"change":18,"pos":370985}],"flag":"BLOCK","start":34664,"end":34737,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":370913},"to":{"change":18,"start":370913,"end":370985},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &init_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, init_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":434,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":371138}],"down_context":[{"change":18,"pos":371138}],"flag":"BLOCK","start":34738,"end":34752,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":457,"ins":{"up_context":[{"change":18,"pos":371914}],"down_context":[{"change":18,"pos":371987}],"flag":"BLOCK","start":34753,"end":34827,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":371914},"to":{"change":18,"start":371914,"end":371987},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_alice, &bob_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_alice, bob_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":465,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":372144}],"down_context":[{"change":18,"pos":372144}],"flag":"BLOCK","start":34828,"end":34842,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":497,"ins":{"up_context":[{"change":18,"pos":373238}],"down_context":[{"change":18,"pos":373319}],"flag":"BLOCK","start":34843,"end":34925,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":373238},"to":{"change":18,"start":373238,"end":373319},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &alice_h).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, alice_h).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":505,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":373472}],"down_context":[{"change":18,"pos":373472}],"flag":"BLOCK","start":34926,"end":34940,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":511,"ins":{"up_context":[{"change":18,"pos":373614}],"down_context":[{"change":18,"pos":373698}],"flag":"BLOCK","start":34941,"end":35026,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":373614},"to":{"change":18,"start":373614,"end":373698},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &resolution).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, resolution).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":519,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":373851}],"down_context":[{"change":18,"pos":373851}],"flag":"BLOCK","start":35027,"end":35041,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":549,"ins":{"up_context":[{"change":18,"pos":374812}],"down_context":[{"change":18,"pos":374884}],"flag":"BLOCK","start":35042,"end":35115,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":374812},"to":{"change":18,"start":374812,"end":374884},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &init_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, init_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":557,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":375033}],"down_context":[{"change":18,"pos":375033}],"flag":"BLOCK","start":35116,"end":35130,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":580,"ins":{"up_context":[{"change":18,"pos":375789}],"down_context":[{"change":18,"pos":375862}],"flag":"BLOCK","start":35131,"end":35205,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":375789},"to":{"change":18,"start":375789,"end":375862},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_alice, &bob_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_alice, bob_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":588,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":376013}],"down_context":[{"change":18,"pos":376013}],"flag":"BLOCK","start":35206,"end":35220,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":631,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":377305}],"down_context":[{"change":18,"pos":377305}],"flag":"BLOCK","start":35221,"end":35235,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":640,"ins":{"up_context":[{"change":18,"pos":377595}],"down_context":[{"change":18,"pos":377744}],"flag":"BLOCK","start":35236,"end":35387,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":377595},"to":{"change":18,"start":377595,"end":377744},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &alice_h)?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &resolution)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, alice_h)?;\n apply::apply_change(&changes, &mut txn, &mut channel_bob, resolution)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":649,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":377893}],"down_context":[{"change":18,"pos":377893}],"flag":"BLOCK","start":35388,"end":35402,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":682,"ins":{"up_context":[{"change":18,"pos":379010}],"down_context":[{"change":18,"pos":379082}],"flag":"BLOCK","start":35403,"end":35476,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":379010},"to":{"change":18,"start":379010,"end":379082},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &init_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, init_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":690,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":379231}],"down_context":[{"change":18,"pos":379231}],"flag":"BLOCK","start":35477,"end":35491,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":713,"ins":{"up_context":[{"change":18,"pos":379987}],"down_context":[{"change":18,"pos":380060}],"flag":"BLOCK","start":35492,"end":35566,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":379987},"to":{"change":18,"start":379987,"end":380060},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_alice, &bob_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_alice, bob_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":721,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":380211}],"down_context":[{"change":18,"pos":380211}],"flag":"BLOCK","start":35567,"end":35581,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":752,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":381147}],"down_context":[{"change":18,"pos":381147}],"flag":"BLOCK","start":35582,"end":35596,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":760,"ins":{"up_context":[{"change":18,"pos":381418}],"down_context":[{"change":18,"pos":381567}],"flag":"BLOCK","start":35597,"end":35748,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":381418},"to":{"change":18,"start":381418,"end":381567},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &alice_h)?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &resolution)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, alice_h)?;\n apply::apply_change(&changes, &mut txn, &mut channel_bob, resolution)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":769,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":381716}],"down_context":[{"change":18,"pos":381716}],"flag":"BLOCK","start":35749,"end":35763,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":806,"ins":{"up_context":[{"change":18,"pos":382900}],"down_context":[{"change":18,"pos":382972}],"flag":"BLOCK","start":35764,"end":35837,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":382900},"to":{"change":18,"start":382900,"end":382972},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &init_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, init_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":814,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":383121}],"down_context":[{"change":18,"pos":383121}],"flag":"BLOCK","start":35838,"end":35852,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":848,"ins":{"up_context":[{"change":18,"pos":384098}],"down_context":[{"change":18,"pos":384176}],"flag":"BLOCK","start":35853,"end":35930,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":384098},"to":{"change":18,"start":384098,"end":384176},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_alice, bob_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_alice, *bob_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":857,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":384333}],"down_context":[{"change":18,"pos":384333}],"flag":"BLOCK","start":35931,"end":35945,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":894,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":385430}],"down_context":[{"change":18,"pos":385430}],"flag":"BLOCK","start":35946,"end":35960,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":904,"ins":{"up_context":[{"change":18,"pos":385760}],"down_context":[{"change":18,"pos":385838}],"flag":"BLOCK","start":35961,"end":36040,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":385760},"to":{"change":18,"start":385760,"end":385838},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &*alice_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, *alice_h)?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":906,"ins":{"up_context":[{"change":18,"pos":385844}],"down_context":[{"change":18,"pos":385924}],"flag":"BLOCK","start":36041,"end":36122,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":385844},"to":{"change":18,"start":385844,"end":385924},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &conflict_edits)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, conflict_edits)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":914,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":386073}],"down_context":[{"change":18,"pos":386073}],"flag":"BLOCK","start":36123,"end":36137,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":950,"ins":{"up_context":[{"change":18,"pos":387282}],"down_context":[{"change":18,"pos":387354}],"flag":"BLOCK","start":36138,"end":36211,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":387282},"to":{"change":18,"start":387282,"end":387354},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &init_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, init_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":958,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":387507}],"down_context":[{"change":18,"pos":387507}],"flag":"BLOCK","start":36212,"end":36226,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":985,"ins":{"up_context":[{"change":18,"pos":388439}],"down_context":[{"change":18,"pos":388512}],"flag":"BLOCK","start":36227,"end":36301,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":388439},"to":{"change":18,"start":388439,"end":388512},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_alice, &bob_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_alice, bob_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":993,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":388669}],"down_context":[{"change":18,"pos":388669}],"flag":"BLOCK","start":36302,"end":36316,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1036,"ins":{"up_context":[{"change":18,"pos":390058}],"down_context":[{"change":18,"pos":390139}],"flag":"BLOCK","start":36317,"end":36399,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":390058},"to":{"change":18,"start":390058,"end":390139},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &alice_h).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, alice_h).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1044,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":390292}],"down_context":[{"change":18,"pos":390292}],"flag":"BLOCK","start":36400,"end":36414,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1051,"ins":{"up_context":[{"change":18,"pos":390448}],"down_context":[{"change":18,"pos":19331}],"flag":"BLOCK","start":36415,"end":36500,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":390448},"to":{"change":18,"start":390448,"end":390532},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &resolution).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, resolution).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1060,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":390745}],"down_context":[{"change":18,"pos":390745}],"flag":"BLOCK","start":36501,"end":36515,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1090,"ins":{"up_context":[{"change":18,"pos":391733}],"down_context":[{"change":18,"pos":391805}],"flag":"BLOCK","start":36516,"end":36589,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":391733},"to":{"change":18,"start":391733,"end":391805},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &init_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, init_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1098,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":391958}],"down_context":[{"change":18,"pos":391958}],"flag":"BLOCK","start":36590,"end":36604,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1125,"ins":{"up_context":[{"change":18,"pos":392890}],"down_context":[{"change":18,"pos":392963}],"flag":"BLOCK","start":36605,"end":36679,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":392890},"to":{"change":18,"start":392890,"end":392963},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_alice, &bob_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_alice, bob_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1133,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":393120}],"down_context":[{"change":18,"pos":393120}],"flag":"BLOCK","start":36680,"end":36694,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1181,"ins":{"up_context":[{"change":18,"pos":394452}],"down_context":[{"change":18,"pos":394533}],"flag":"BLOCK","start":36695,"end":36777,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":394452},"to":{"change":18,"start":394452,"end":394533},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &alice_h).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, alice_h).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1189,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":394686}],"down_context":[{"change":18,"pos":394686}],"flag":"BLOCK","start":36778,"end":36792,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1196,"ins":{"up_context":[{"change":18,"pos":394842}],"down_context":[{"change":18,"pos":19994}],"flag":"BLOCK","start":36793,"end":36878,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":394842},"to":{"change":18,"start":394842,"end":394926},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &resolution).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, resolution).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1205,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":395139}],"down_context":[{"change":18,"pos":395139}],"flag":"BLOCK","start":36879,"end":36893,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1338,"ins":{"up_context":[{"change":18,"pos":399351}],"down_context":[{"change":18,"pos":399423}],"flag":"BLOCK","start":36894,"end":36967,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":399351},"to":{"change":18,"start":399351,"end":399423},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &init_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, init_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1346,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":399576}],"down_context":[{"change":18,"pos":399576}],"flag":"BLOCK","start":36968,"end":36982,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1373,"ins":{"up_context":[{"change":18,"pos":400508}],"down_context":[{"change":18,"pos":400581}],"flag":"BLOCK","start":36983,"end":37057,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":400508},"to":{"change":18,"start":400508,"end":400581},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_alice, &bob_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_alice, bob_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1381,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":400738}],"down_context":[{"change":18,"pos":400738}],"flag":"BLOCK","start":37058,"end":37072,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1399,"ins":{"up_context":[{"change":18,"pos":401256}],"down_context":[{"change":18,"pos":401337}],"flag":"BLOCK","start":37073,"end":37155,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":401256},"to":{"change":18,"start":401256,"end":401337},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &alice_h).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, alice_h).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1407,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":401490}],"down_context":[{"change":18,"pos":401490}],"flag":"BLOCK","start":37156,"end":37170,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1415,"ins":{"up_context":[{"change":18,"pos":401673}],"down_context":[{"change":18,"pos":401757}],"flag":"BLOCK","start":37171,"end":37256,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":401673},"to":{"change":18,"start":401673,"end":401757},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &resolution).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, resolution).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1423,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":401910}],"down_context":[{"change":18,"pos":401910}],"flag":"BLOCK","start":37257,"end":37271,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1462,"ins":{"up_context":[{"change":18,"pos":403210}],"down_context":[{"change":18,"pos":403282}],"flag":"BLOCK","start":37272,"end":37345,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":403210},"to":{"change":18,"start":403210,"end":403282},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &init_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, init_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1470,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":403435}],"down_context":[{"change":18,"pos":403435}],"flag":"BLOCK","start":37346,"end":37360,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1500,"ins":{"up_context":[{"change":18,"pos":404426}],"down_context":[{"change":18,"pos":404499}],"flag":"BLOCK","start":37361,"end":37435,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":404426},"to":{"change":18,"start":404426,"end":404499},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_alice, &bob_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_alice, bob_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1508,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":404656}],"down_context":[{"change":18,"pos":404656}],"flag":"BLOCK","start":37436,"end":37450,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1525,"ins":{"up_context":[{"change":18,"pos":405243}],"down_context":[{"change":18,"pos":405324}],"flag":"BLOCK","start":37451,"end":37533,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":405243},"to":{"change":18,"start":405243,"end":405324},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &alice_h).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, alice_h).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1533,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":405477}],"down_context":[{"change":18,"pos":405477}],"flag":"BLOCK","start":37534,"end":37548,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1552,"ins":{"up_context":[{"change":18,"pos":406026}],"down_context":[{"change":18,"pos":406116}],"flag":"BLOCK","start":37549,"end":37640,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":406026},"to":{"change":18,"start":406026,"end":406116},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_alice, &resolution_bob).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_alice, resolution_bob).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1560,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":406273}],"down_context":[{"change":18,"pos":406273}],"flag":"BLOCK","start":37641,"end":37655,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1568,"ins":{"up_context":[{"change":18,"pos":406500}],"down_context":[{"change":18,"pos":406590}],"flag":"BLOCK","start":37656,"end":37747,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":406500},"to":{"change":18,"start":406500,"end":406590},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &resolution_alice).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, resolution_alice).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1576,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":406743}],"down_context":[{"change":18,"pos":406743}],"flag":"BLOCK","start":37748,"end":37762,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1630,"ins":{"up_context":[{"change":18,"pos":408475}],"down_context":[{"change":18,"pos":408563}],"flag":"BLOCK","start":37763,"end":37852,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":408475},"to":{"change":18,"start":408475,"end":408563},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &p_alice[0]).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, p_alice[0]).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1638,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":408720}],"down_context":[{"change":18,"pos":408720}],"flag":"BLOCK","start":37853,"end":37867,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1655,"ins":{"up_context":[{"change":18,"pos":409309}],"down_context":[{"change":18,"pos":21531}],"flag":"BLOCK","start":37868,"end":37951,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":409309},"to":{"change":18,"start":409309,"end":409393},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, p).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, *p).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1668,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":409631}],"down_context":[{"change":18,"pos":409631}],"flag":"BLOCK","start":37952,"end":37966,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1692,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":410330}],"down_context":[{"change":18,"pos":410330}],"flag":"BLOCK","start":37967,"end":37981,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1700,"ins":{"up_context":[{"change":18,"pos":28017}],"down_context":[{"change":18,"pos":21686}],"flag":"BLOCK","start":37982,"end":38070,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":28017},"to":{"change":18,"start":410481,"end":410568},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":410481},"to":{"change":18,"start":410481,"end":410568},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &p_bob).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, p_bob).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1709,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":410793}],"down_context":[{"change":18,"pos":410793}],"flag":"BLOCK","start":38071,"end":38085,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1717,"ins":{"up_context":[{"change":18,"pos":411023}],"down_context":[{"change":18,"pos":411115}],"flag":"BLOCK","start":38086,"end":38179,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":411023},"to":{"change":18,"start":411023,"end":411115},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &resolution).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, resolution).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1725,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":411278}],"down_context":[{"change":18,"pos":411278}],"flag":"BLOCK","start":38180,"end":38194,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1774,"ins":{"up_context":[{"change":18,"pos":412880}],"down_context":[{"change":18,"pos":412968}],"flag":"BLOCK","start":38195,"end":38284,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":412880},"to":{"change":18,"start":412880,"end":412968},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &p_alice[0]).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, p_alice[0]).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1782,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":413125}],"down_context":[{"change":18,"pos":413125}],"flag":"BLOCK","start":38285,"end":38299,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1796,"ins":{"up_context":[{"change":18,"pos":413565}],"down_context":[{"change":18,"pos":413649}],"flag":"BLOCK","start":38300,"end":38383,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":413565},"to":{"change":18,"start":413565,"end":413649},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, p).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, *p).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1806,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":413868}],"down_context":[{"change":18,"pos":413868}],"flag":"BLOCK","start":38384,"end":38398,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1829,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":414523}],"down_context":[{"change":18,"pos":414523}],"flag":"BLOCK","start":38399,"end":38413,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1837,"ins":{"up_context":[{"change":18,"pos":414733}],"down_context":[{"change":18,"pos":414912}],"flag":"BLOCK","start":38414,"end":38595,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":414733},"to":{"change":18,"start":414733,"end":414912},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &p_bob).unwrap();"},{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &resolution).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, p_bob).unwrap();\n apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, resolution).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1846,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":415075}],"down_context":[{"change":18,"pos":415075}],"flag":"BLOCK","start":38596,"end":38610,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1878,"ins":{"up_context":[{"change":18,"pos":416187}],"down_context":[{"change":18,"pos":416259}],"flag":"BLOCK","start":38611,"end":38684,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":416187},"to":{"change":18,"start":416187,"end":416259},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &init_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, init_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1886,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":416412}],"down_context":[{"change":18,"pos":416412}],"flag":"BLOCK","start":38685,"end":38699,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1898,"ins":{"up_context":[{"change":18,"pos":416783}],"down_context":[{"change":18,"pos":416859}],"flag":"BLOCK","start":38700,"end":38777,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":416783},"to":{"change":18,"start":416783,"end":416859},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, &init_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, init_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1906,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":417020}],"down_context":[{"change":18,"pos":417020}],"flag":"BLOCK","start":38778,"end":38792,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1940,"ins":{"up_context":[{"change":18,"pos":417976}],"down_context":[{"change":18,"pos":418049}],"flag":"BLOCK","start":38793,"end":38867,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":417976},"to":{"change":18,"start":417976,"end":418049},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_alice, &bob_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_alice, bob_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1948,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":418206}],"down_context":[{"change":18,"pos":418206}],"flag":"BLOCK","start":38868,"end":38882,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1966,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":418765}],"down_context":[{"change":18,"pos":418765}],"flag":"BLOCK","start":38883,"end":38897,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1971,"ins":{"up_context":[{"change":18,"pos":418887}],"down_context":[{"change":18,"pos":22561}],"flag":"BLOCK","start":38898,"end":39049,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":418887},"to":{"change":18,"start":418887,"end":419036},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &alice_h)?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &resolution)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, alice_h)?;\n apply::apply_change(&changes, &mut txn, &mut channel_bob, resolution)?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1983,"ins":{"up_context":[{"change":18,"pos":419271}],"down_context":[{"change":18,"pos":22633}],"flag":"BLOCK","start":39050,"end":39126,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":419271},"to":{"change":18,"start":419271,"end":419346},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, &bob_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, bob_h)?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1985,"ins":{"up_context":[{"change":18,"pos":22712}],"down_context":[{"change":18,"pos":22713}],"flag":"BLOCK","start":39127,"end":39205,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":22712},"to":{"change":18,"start":419423,"end":419500},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":28918},"to":{"change":18,"start":419423,"end":419500},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":419423},"to":{"change":18,"start":419423,"end":419500},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, &alice_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, alice_h)?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1987,"ins":{"up_context":[{"change":18,"pos":22792}],"down_context":[{"change":18,"pos":22793}],"flag":"BLOCK","start":39206,"end":39287,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":22792},"to":{"change":18,"start":419577,"end":419657},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":28989},"to":{"change":18,"start":419577,"end":419657},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":419577},"to":{"change":18,"start":419577,"end":419657},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, &resolution)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, resolution)?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2016,"ins":{"up_context":[{"change":18,"pos":420710}],"down_context":[{"change":18,"pos":420782}],"flag":"BLOCK","start":39288,"end":39361,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":420710},"to":{"change":18,"start":420710,"end":420782},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &init_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, init_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2024,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":420935}],"down_context":[{"change":18,"pos":420935}],"flag":"BLOCK","start":39362,"end":39376,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2036,"ins":{"up_context":[{"change":18,"pos":421339}],"down_context":[{"change":18,"pos":421415}],"flag":"BLOCK","start":39377,"end":39454,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":421339},"to":{"change":18,"start":421339,"end":421415},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, &init_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, init_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2044,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":421576}],"down_context":[{"change":18,"pos":421576}],"flag":"BLOCK","start":39455,"end":39469,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2083,"ins":{"up_context":[{"change":18,"pos":422771}],"down_context":[{"change":18,"pos":422844}],"flag":"BLOCK","start":39470,"end":39544,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":422771},"to":{"change":18,"start":422771,"end":422844},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_alice, &bob_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_alice, bob_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2091,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":423001}],"down_context":[{"change":18,"pos":423001}],"flag":"BLOCK","start":39545,"end":39559,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2114,"ins":{"up_context":[{"change":18,"pos":423734}],"down_context":[{"change":18,"pos":423815}],"flag":"BLOCK","start":39560,"end":39642,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":423734},"to":{"change":18,"start":423734,"end":423815},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &alice_h).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, alice_h).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2122,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":423968}],"down_context":[{"change":18,"pos":423968}],"flag":"BLOCK","start":39643,"end":39657,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2141,"ins":{"up_context":[{"change":18,"pos":424570}],"down_context":[{"change":18,"pos":424661}],"flag":"BLOCK","start":39658,"end":39750,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":424570},"to":{"change":18,"start":424570,"end":424661},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &alices_resolution).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, alices_resolution).unwrap();\n"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2143,"ins":{"up_context":[{"change":18,"pos":424695}],"down_context":[{"change":18,"pos":23464}],"flag":"BLOCK","start":39751,"end":39835,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":424695},"to":{"change":18,"start":424695,"end":424778},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &charlie_h).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, charlie_h).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2153,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":425022}],"down_context":[{"change":18,"pos":425022}],"flag":"BLOCK","start":39836,"end":39850,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2180,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":425914}],"down_context":[{"change":18,"pos":425914}],"flag":"BLOCK","start":39851,"end":39865,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2198,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":426422}],"down_context":[{"change":18,"pos":426422}],"flag":"BLOCK","start":39866,"end":39880,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2237,"ins":{"up_context":[{"change":18,"pos":427746}],"down_context":[{"change":18,"pos":427818}],"flag":"BLOCK","start":39881,"end":39954,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":427746},"to":{"change":18,"start":427746,"end":427818},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &init_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, init_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2245,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":427971}],"down_context":[{"change":18,"pos":427971}],"flag":"BLOCK","start":39955,"end":39969,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2291,"ins":{"up_context":[{"change":18,"pos":429544}],"down_context":[{"change":18,"pos":429766}],"flag":"BLOCK","start":39970,"end":40195,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":429544},"to":{"change":18,"start":429544,"end":429766},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_alice, &bob_h1)?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_alice, &bob_h2)?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_alice, &bob_h3)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_alice, bob_h1)?;\n apply::apply_change(&changes, &mut txn, &mut channel_alice, bob_h2)?;\n apply::apply_change(&changes, &mut txn, &mut channel_alice, bob_h3)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2301,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":429923}],"down_context":[{"change":18,"pos":429923}],"flag":"BLOCK","start":40196,"end":40210,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2324,"ins":{"up_context":[{"change":18,"pos":430656}],"down_context":[{"change":18,"pos":430902}],"flag":"BLOCK","start":40211,"end":40460,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":430656},"to":{"change":18,"start":430656,"end":430902},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &alice_h1).unwrap();"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &alice_h2).unwrap();"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &alice_h3).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, alice_h1).unwrap();\n apply::apply_change(&changes, &mut txn, &mut channel_bob, alice_h2).unwrap();\n apply::apply_change(&changes, &mut txn, &mut channel_bob, alice_h3).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2334,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":431055}],"down_context":[{"change":18,"pos":431055}],"flag":"BLOCK","start":40461,"end":40475,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2356,"ins":{"up_context":[{"change":18,"pos":431817}],"down_context":[{"change":18,"pos":432355}],"flag":"BLOCK","start":40476,"end":41021,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":431817},"to":{"change":18,"start":431817,"end":432355},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, &init_h)?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, &alice_h1)?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, &alice_h2)?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, &alice_h3)?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, &bob_h1)?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, &bob_h2)?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, &bob_h3)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, init_h)?;\n apply::apply_change(&changes, &mut txn, &mut channel_charlie, alice_h1)?;\n apply::apply_change(&changes, &mut txn, &mut channel_charlie, alice_h2)?;\n apply::apply_change(&changes, &mut txn, &mut channel_charlie, alice_h3)?;\n apply::apply_change(&changes, &mut txn, &mut channel_charlie, bob_h1)?;\n apply::apply_change(&changes, &mut txn, &mut channel_charlie, bob_h2)?;\n apply::apply_change(&changes, &mut txn, &mut channel_charlie, bob_h3)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2370,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":432516}],"down_context":[{"change":18,"pos":432516}],"flag":"BLOCK","start":41022,"end":41036,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2385,"ins":{"up_context":[{"change":18,"pos":432813}],"down_context":[{"change":18,"pos":24198}],"flag":"BLOCK","start":41037,"end":41129,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":432813},"to":{"change":18,"start":432813,"end":432904},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &alices_resolution).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, alices_resolution).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2395,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":433148}],"down_context":[{"change":18,"pos":433148}],"flag":"BLOCK","start":41130,"end":41144,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2403,"ins":{"up_context":[{"change":18,"pos":433351}],"down_context":[{"change":18,"pos":24342}],"flag":"BLOCK","start":41145,"end":41229,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":433351},"to":{"change":18,"start":433351,"end":433434},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &charlie_h).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, charlie_h).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2420,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":433918}],"down_context":[{"change":18,"pos":433918}],"flag":"BLOCK","start":41230,"end":41244,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2437,"ins":{"up_context":[{"change":18,"pos":434473}],"down_context":[{"change":18,"pos":24486}],"flag":"BLOCK","start":41245,"end":41435,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":434473},"to":{"change":18,"start":434473,"end":434661},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, &alices_resolution).unwrap();"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, &bobs_resolution).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, alices_resolution).unwrap();\n apply::apply_change(&changes, &mut txn, &mut channel_charlie, bobs_resolution).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2454,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":435138}],"down_context":[{"change":18,"pos":435138}],"flag":"BLOCK","start":41436,"end":41450,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2499,"ins":{"up_context":[{"change":18,"pos":436595}],"down_context":[{"change":18,"pos":436671}],"flag":"BLOCK","start":41451,"end":41528,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":436595},"to":{"change":18,"start":436595,"end":436671},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &init_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, init_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2507,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":436828}],"down_context":[{"change":18,"pos":436828}],"flag":"BLOCK","start":41529,"end":41543,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2524,"ins":{"up_context":[{"change":18,"pos":437318}],"down_context":[{"change":18,"pos":24725}],"flag":"BLOCK","start":41544,"end":41621,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":437318},"to":{"change":18,"start":437318,"end":437394},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &ab)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, ab)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2534,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":437652}],"down_context":[{"change":18,"pos":437652}],"flag":"BLOCK","start":41622,"end":41636,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2588,"ins":{"up_context":[{"change":18,"pos":439343}],"down_context":[{"change":18,"pos":439419}],"flag":"BLOCK","start":41637,"end":41714,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":439343},"to":{"change":18,"start":439343,"end":439419},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &init_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, init_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2596,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":439576}],"down_context":[{"change":18,"pos":439576}],"flag":"BLOCK","start":41715,"end":41729,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2609,"ins":{"up_context":[{"change":18,"pos":440000}],"down_context":[{"change":18,"pos":440079}],"flag":"BLOCK","start":41730,"end":41810,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":440000},"to":{"change":18,"start":440000,"end":440079},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &bob_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, bob_h)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2617,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":440242}],"down_context":[{"change":18,"pos":440242}],"flag":"BLOCK","start":41811,"end":41825,"inode":{"change":18,"pos":357372}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2627,"ins":{"up_context":[{"change":18,"pos":29278}],"down_context":[{"change":18,"pos":440461}],"flag":"BLOCK","start":41826,"end":41870,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":29278},"to":{"change":18,"start":29278,"end":29320},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" let (&inode, &vertex) = x.unwrap();"}],"del_contents":[{"Del":" let (inode, vertex) = x.unwrap();\n"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2631,"ins":{"up_context":[{"change":18,"pos":440589}],"down_context":[{"change":18,"pos":440653}],"flag":"BLOCK","start":41871,"end":41945,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":440589},"to":{"change":18,"start":29321,"end":29394},"introduced_by":18}],"inode":{"change":18,"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).unwrap() {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2638,"ins":{"up_context":[{"change":18,"pos":440857}],"down_context":[{"change":18,"pos":31350}],"flag":"BLOCK","start":41946,"end":42032,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":440857},"to":{"change":18,"start":25096,"end":25176},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" if !is_alive(txn, T::graph(txn, &channel), &vertex.inode_vertex()).unwrap() {"}],"del_contents":[{"Del":" if !is_alive(txn, T::graph(&channel), vertex.inode_vertex()).unwrap() {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2641,"ins":{"up_context":[{"change":18,"pos":31407}],"down_context":[{"change":18,"pos":440983}],"flag":"BLOCK","start":42033,"end":42074,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":31407},"to":{"change":18,"start":25177,"end":25213},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" T::graph(txn, &channel),"}],"del_contents":[{"Del":" T::graph(&channel),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2654,"ins":{"up_context":[{"change":18,"pos":441311}],"down_context":[{"change":18,"pos":441349}],"flag":"BLOCK","start":42075,"end":42115,"inode":{"change":18,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":441311},"to":{"change":18,"start":31408,"end":31447},"introduced_by":18}],"inode":{"change":18,"pos":357372}},"ins_contents":[{"Add":" tree_path(txn, &vertex)"}],"del_contents":[{"Del":" tree_path(txn, vertex)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":441393},"path":"libpijul/src/tests/clone.rs","line":54,"ins":{"up_context":[{"change":18,"pos":443244}],"down_context":[{"change":18,"pos":25350}],"flag":"BLOCK","start":42116,"end":42196,"inode":{"change":18,"pos":441393}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":443244},"to":{"change":18,"start":443244,"end":443325},"introduced_by":18}],"inode":{"change":18,"pos":441393}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn2, &mut channel, h).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn2, &mut channel, *h).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":441393},"path":"libpijul/src/tests/clone.rs","line":63,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":443589}],"down_context":[{"change":18,"pos":443589}],"flag":"BLOCK","start":42197,"end":42219,"inode":{"change":18,"pos":441393}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":441393},"path":"libpijul/src/tests/clone.rs","line":119,"ins":{"up_context":[{"change":18,"pos":445332}],"down_context":[{"change":18,"pos":445408}],"flag":"BLOCK","start":42220,"end":42297,"inode":{"change":18,"pos":441393}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":445332},"to":{"change":18,"start":445332,"end":445408},"introduced_by":18}],"inode":{"change":18,"pos":441393}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn2, &mut channel, &h).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn2, &mut channel, h).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":441393},"path":"libpijul/src/tests/clone.rs","line":127,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":445586}],"down_context":[{"change":18,"pos":445586}],"flag":"BLOCK","start":42298,"end":42316,"inode":{"change":18,"pos":441393}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":441393},"path":"libpijul/src/tests/clone.rs","line":137,"ins":{"up_context":[{"change":18,"pos":445808}],"down_context":[{"change":18,"pos":445885}],"flag":"BLOCK","start":42317,"end":42395,"inode":{"change":18,"pos":441393}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":445808},"to":{"change":18,"start":445808,"end":445885},"introduced_by":18}],"inode":{"change":18,"pos":441393}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn2, &mut channel, &h2).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn2, &mut channel, h2).unwrap();\n"}]}},{"Edit":{"inode":{"change":18,"pos":441393},"path":"libpijul/src/tests/clone.rs","line":145,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":446060}],"down_context":[{"change":18,"pos":446060}],"flag":"BLOCK","start":42396,"end":42414,"inode":{"change":18,"pos":441393}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":446445},"path":"libpijul/src/tests/change.rs","line":76,"ins":{"up_context":[{"change":18,"pos":448734}],"down_context":[{"change":18,"pos":448824}],"flag":"BLOCK","start":42415,"end":42506,"inode":{"change":18,"pos":446445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":448734},"to":{"change":18,"start":448734,"end":448824},"introduced_by":18}],"inode":{"change":18,"pos":446445}},"ins_contents":[{"Add":" apply::apply_local_change(&mut txn, &mut channel, &change0, &hash0, &rec.updatables)?;"}],"del_contents":[{"Del":" apply::apply_local_change(&mut txn, &mut channel, &change0, hash0, &rec.updatables)?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":446445},"path":"libpijul/src/tests/change.rs","line":129,"ins":{"up_context":[{"change":18,"pos":449978}],"down_context":[{"change":18,"pos":450057}],"flag":"BLOCK","start":42507,"end":42587,"inode":{"change":18,"pos":446445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":449978},"to":{"change":18,"start":449978,"end":450057},"introduced_by":18}],"inode":{"change":18,"pos":446445}},"ins_contents":[{"Add":" apply::apply_local_change(txn, channel, &change0, &hash, &rec.updatables)?;"}],"del_contents":[{"Del":" apply::apply_local_change(txn, channel, &change0, hash, &rec.updatables)?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":446445},"path":"libpijul/src/tests/change.rs","line":174,"ins":{"up_context":[{"change":18,"pos":451597}],"down_context":[{"change":18,"pos":451888}],"flag":"BLOCK","start":42588,"end":42888,"inode":{"change":18,"pos":446445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":451597},"to":{"change":18,"start":451597,"end":451888},"introduced_by":18}],"inode":{"change":18,"pos":446445}},"ins_contents":[{"Add":" apply::apply_change(&store, &mut txn2, &mut channel2, &h0)?;"},{"Add":" apply::apply_change(&store, &mut txn2, &mut channel2, &h1)?;"},{"Add":" apply::apply_change(&store, &mut txn2, &mut channel2, &h2)?;"},{"Add":" output::output_repository_no_pending(&mut repo2, &store, &mut txn2, &mut channel2, \"\", true, None)?;"}],"del_contents":[{"Del":" apply::apply_change(&store, &mut txn2, &mut channel2, h0)?;\n apply::apply_change(&store, &mut txn2, &mut channel2, h1)?;\n apply::apply_change(&store, &mut txn2, &mut channel2, h2)?;\n output::output_repository_no_pending(&mut repo2, &store, &mut txn2, &mut channel2, \"\", true)?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":446445},"path":"libpijul/src/tests/change.rs","line":182,"ins":{"up_context":[{"change":18,"pos":452043}],"down_context":[{"change":18,"pos":452206}],"flag":"BLOCK","start":42889,"end":43059,"inode":{"change":18,"pos":446445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":452043},"to":{"change":18,"start":452043,"end":452206},"introduced_by":18}],"inode":{"change":18,"pos":446445}},"ins_contents":[{"Add":" apply::apply_change(&store, &mut txn2, &mut channel2, &h3)?;"},{"Add":" output::output_repository_no_pending(&mut repo2, &store, &mut txn2, &mut channel2, \"\", true, None)?;"}],"del_contents":[{"Del":" apply::apply_change(&store, &mut txn2, &mut channel2, h3)?;\n output::output_repository_no_pending(&mut repo2, &store, &mut txn2, &mut channel2, \"\", true)?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":446445},"path":"libpijul/src/tests/change.rs","line":227,"ins":{"up_context":[{"change":18,"pos":453555}],"down_context":[{"change":18,"pos":453683}],"flag":"BLOCK","start":43060,"end":43188,"inode":{"change":18,"pos":446445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":453555},"to":{"change":18,"start":453555,"end":453683},"introduced_by":18}],"inode":{"change":18,"pos":446445}},"ins_contents":[{"Add":" trace!(\"change0.changes = {:#?}\", change0.changes);"},{"Add":" trace!(\"change1.changes = {:#?}\", change1.changes);"}],"del_contents":[{"Del":" error!(\"change0.changes = {:#?}\", change0.changes);\n error!(\"change1.changes = {:#?}\", change1.changes);\n"}]}},{"Replacement":{"inode":{"change":18,"pos":446445},"path":"libpijul/src/tests/change.rs","line":231,"ins":{"up_context":[{"change":18,"pos":453779}],"down_context":[{"change":18,"pos":453869}],"flag":"BLOCK","start":43189,"end":43516,"inode":{"change":18,"pos":446445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":453779},"to":{"change":18,"start":453779,"end":453869},"introduced_by":18}],"inode":{"change":18,"pos":446445}},"ins_contents":[{"Add":" trace!(\"change0: {:#?}\", a);"},{"Add":" trace!(\"change1: {:#?}\", b);"},{"Add":" for (a, b) in a.iter().zip(b.iter()) {"},{"Add":" if a != b {"},{"Add":" error!(\"change0 -> {:#?}\", a);"},{"Add":" error!(\"change1 -> {:#?}\", b);"},{"Add":" }"},{"Add":" }"}],"del_contents":[{"Del":" error!(\"change0: {:#?}\", a);\n error!(\"change1: {:#?}\", b);\n"}]}},{"Replacement":{"inode":{"change":18,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":37,"ins":{"up_context":[{"change":18,"pos":30324}],"down_context":[{"change":18,"pos":455413}],"flag":"BLOCK","start":43517,"end":43581,"inode":{"change":18,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":30324},"to":{"change":18,"start":30324,"end":30385},"introduced_by":18}],"inode":{"change":18,"pos":454125}},"ins_contents":[{"Add":" let (key, _, meta, file) = it.next().unwrap().unwrap();"}],"del_contents":[{"Del":" let (key, meta, file) = it.next().unwrap().unwrap();\n"}]}},{"Replacement":{"inode":{"change":18,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":42,"ins":{"up_context":[{"change":18,"pos":30485}],"down_context":[{"change":18,"pos":30545}],"flag":"BLOCK","start":43582,"end":43645,"inode":{"change":18,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":30485},"to":{"change":18,"start":30485,"end":30545},"introduced_by":18}],"inode":{"change":18,"pos":454125}},"ins_contents":[{"Add":" let (file_key, _, _, _) = it.next().unwrap().unwrap();"}],"del_contents":[{"Del":" let (file_key, _, _) = it.next().unwrap().unwrap();\n"}]}},{"Replacement":{"inode":{"change":18,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":98,"ins":{"up_context":[{"change":18,"pos":457239}],"down_context":[{"change":18,"pos":457289}],"flag":"BLOCK","start":43646,"end":43667,"inode":{"change":18,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":457239},"to":{"change":18,"start":457239,"end":457289},"introduced_by":18}],"inode":{"change":18,"pos":454125}},"ins_contents":[{"Add":"fn del_file_test() {"}],"del_contents":[{"Del":"fn del_file_test() -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":104,"ins":{"up_context":[{"change":18,"pos":457443}],"down_context":[{"change":18,"pos":457501}],"flag":"BLOCK","start":43668,"end":43734,"inode":{"change":18,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":457443},"to":{"change":18,"start":457443,"end":457501},"introduced_by":18}],"inode":{"change":18,"pos":454125}},"ins_contents":[{"Add":" let env = pristine::sanakirja::Pristine::new_anon().unwrap();"}],"del_contents":[{"Del":" let env = pristine::sanakirja::Pristine::new_anon()?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":107,"ins":{"up_context":[{"change":18,"pos":457550}],"down_context":[{"change":18,"pos":457648}],"flag":"BLOCK","start":43735,"end":43849,"inode":{"change":18,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":457550},"to":{"change":18,"start":457550,"end":457648},"introduced_by":18}],"inode":{"change":18,"pos":454125}},"ins_contents":[{"Add":" txn.add_file(\"dir/file\").unwrap();"},{"Add":" let mut channel = txn.open_or_create_channel(\"main\").unwrap();"}],"del_contents":[{"Del":" txn.add_file(\"dir/file\")?;\n let mut channel = txn.open_or_create_channel(\"main\")?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":111,"ins":{"up_context":[{"change":18,"pos":457716}],"down_context":[{"change":18,"pos":25614}],"flag":"BLOCK","start":43850,"end":43935,"inode":{"change":18,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":457716},"to":{"change":18,"start":457716,"end":457793},"introduced_by":18}],"inode":{"change":18,"pos":454125}},"ins_contents":[{"Add":" record_all_output(&mut repo, &changes, &mut txn, &mut channel, \"\").unwrap();"}],"del_contents":[{"Del":" record_all_output(&mut repo, &changes, &mut txn, &mut channel, \"\")?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":118,"ins":{"up_context":[{"change":18,"pos":458037}],"down_context":[{"change":18,"pos":458109}],"flag":"BLOCK","start":43936,"end":44024,"inode":{"change":18,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":458037},"to":{"change":18,"start":458037,"end":458109},"introduced_by":18}],"inode":{"change":18,"pos":454125}},"ins_contents":[{"Add":" repo.remove_path(\"dir/file\").unwrap();"},{"Add":" txn.remove_file(\"dir\").unwrap();"}],"del_contents":[{"Del":" repo.remove_path(\"dir/file\")?;\n txn.remove_file(\"dir\")?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":127,"ins":{"up_context":[{"change":18,"pos":458320}],"down_context":[{"change":18,"pos":25682}],"flag":"BLOCK","start":44025,"end":44110,"inode":{"change":18,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":458320},"to":{"change":18,"start":458320,"end":458397},"introduced_by":18}],"inode":{"change":18,"pos":454125}},"ins_contents":[{"Add":" record_all_output(&mut repo, &changes, &mut txn, &mut channel, \"\").unwrap();"}],"del_contents":[{"Del":" record_all_output(&mut repo, &changes, &mut txn, &mut channel, \"\")?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":137,"ins":{"up_context":[{"change":18,"pos":458708}],"down_context":[{"change":18,"pos":31279}],"flag":"BLOCK","start":44111,"end":44197,"inode":{"change":18,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":458708},"to":{"change":18,"start":458708,"end":458778},"introduced_by":18}],"inode":{"change":18,"pos":454125}},"ins_contents":[{"Add":" txn.add_file(\"dir2/file\").unwrap();"},{"Add":" txn.remove_file(\"dir2\").unwrap();"}],"del_contents":[{"Del":" txn.add_file(\"dir2/file\")?;\n txn.remove_file(\"dir2\")?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":141,"ins":{"up_context":[{"change":18,"pos":458927}],"down_context":[{"change":18,"pos":458950}],"flag":"BLOCK","start":44198,"end":44229,"inode":{"change":18,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":458927},"to":{"change":18,"start":458927,"end":458950},"introduced_by":18}],"inode":{"change":18,"pos":454125}},"ins_contents":[{"Add":" txn.commit().unwrap();"}],"del_contents":[{"Del":" txn.commit()?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":145,"ins":{"up_context":[{"change":18,"pos":458963}],"down_context":[{"change":18,"pos":458999}],"flag":"BLOCK","start":44230,"end":44274,"inode":{"change":18,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":458963},"to":{"change":18,"start":458963,"end":458999},"introduced_by":18}],"inode":{"change":18,"pos":454125}},"ins_contents":[{"Add":" let txn = env.txn_begin().unwrap();"}],"del_contents":[{"Del":" let txn = env.txn_begin()?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":152,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":459214},"to":{"change":18,"start":2860,"end":2871},"introduced_by":18}],"inode":{"change":18,"pos":454125}}},"contents":[{"Del":" Ok(())\n"}]}},{"Replacement":{"inode":{"change":18,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":181,"ins":{"up_context":[{"change":18,"pos":3977}],"down_context":[{"change":18,"pos":4076}],"flag":"BLOCK","start":44275,"end":44380,"inode":{"change":18,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":3977},"to":{"change":18,"start":3977,"end":4076},"introduced_by":18}],"inode":{"change":18,"pos":454125}},"ins_contents":[{"Add":" output::output_repository_no_pending(&mut repo2, &changes, &mut txn, &mut channel, \"\", true, None)?;"}],"del_contents":[{"Del":" output::output_repository_no_pending(&mut repo2, &changes, &mut txn, &mut channel, \"\", true)?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":289,"ins":{"up_context":[{"change":18,"pos":462833}],"down_context":[{"change":18,"pos":462905}],"flag":"BLOCK","start":44381,"end":44454,"inode":{"change":18,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":462833},"to":{"change":18,"start":462833,"end":462905},"introduced_by":18}],"inode":{"change":18,"pos":454125}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel, &alice0)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel, alice0)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":297,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":463058}],"down_context":[{"change":18,"pos":463058}],"flag":"BLOCK","start":44455,"end":44469,"inode":{"change":18,"pos":454125}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":303,"ins":{"up_context":[{"change":18,"pos":463214}],"down_context":[{"change":18,"pos":463286}],"flag":"BLOCK","start":44470,"end":44543,"inode":{"change":18,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":463214},"to":{"change":18,"start":463214,"end":463286},"introduced_by":18}],"inode":{"change":18,"pos":454125}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel, &alice1)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel, alice1)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":311,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":463439}],"down_context":[{"change":18,"pos":463439}],"flag":"BLOCK","start":44544,"end":44558,"inode":{"change":18,"pos":454125}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":362,"ins":{"up_context":[{"change":18,"pos":465433}],"down_context":[{"change":18,"pos":465505}],"flag":"BLOCK","start":44559,"end":44632,"inode":{"change":18,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":465433},"to":{"change":18,"start":465433,"end":465505},"introduced_by":18}],"inode":{"change":18,"pos":454125}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel, &alice0)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel, alice0)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":370,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":465658}],"down_context":[{"change":18,"pos":465658}],"flag":"BLOCK","start":44633,"end":44647,"inode":{"change":18,"pos":454125}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":374,"ins":{"up_context":[{"change":18,"pos":465717}],"down_context":[{"change":18,"pos":465789}],"flag":"BLOCK","start":44648,"end":44721,"inode":{"change":18,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":465717},"to":{"change":18,"start":465717,"end":465789},"introduced_by":18}],"inode":{"change":18,"pos":454125}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel, &alice1)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel, alice1)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":382,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":465942}],"down_context":[{"change":18,"pos":465942}],"flag":"BLOCK","start":44722,"end":44736,"inode":{"change":18,"pos":454125}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":388,"ins":{"up_context":[{"change":18,"pos":466058}],"down_context":[{"change":18,"pos":466130}],"flag":"BLOCK","start":44737,"end":44810,"inode":{"change":18,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":466058},"to":{"change":18,"start":466058,"end":466130},"introduced_by":18}],"inode":{"change":18,"pos":454125}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel, &alice2)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel, alice2)?;\n"}]}},{"Edit":{"inode":{"change":18,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":396,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":466283}],"down_context":[{"change":18,"pos":466283}],"flag":"BLOCK","start":44811,"end":44825,"inode":{"change":18,"pos":454125}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":473,"ins":{"up_context":[{"change":18,"pos":468992}],"down_context":[{"change":18,"pos":469050}],"flag":"BLOCK","start":44826,"end":44885,"inode":{"change":18,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":468992},"to":{"change":18,"start":468992,"end":469050},"introduced_by":18}],"inode":{"change":18,"pos":454125}},"ins_contents":[{"Add":" .apply_change(&changes, &mut channel_bob, &alice1)"}],"del_contents":[{"Del":" .apply_change(&changes, &mut channel_bob, alice1)\n"}]}},{"Edit":{"inode":{"change":18,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":482,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":469226}],"down_context":[{"change":18,"pos":469226}],"flag":"BLOCK","start":44886,"end":44900,"inode":{"change":18,"pos":454125}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":488,"ins":{"up_context":[{"change":18,"pos":469431}],"down_context":[{"change":18,"pos":469489}],"flag":"BLOCK","start":44901,"end":44960,"inode":{"change":18,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":469431},"to":{"change":18,"start":469431,"end":469489},"introduced_by":18}],"inode":{"change":18,"pos":454125}},"ins_contents":[{"Add":" .apply_change(&changes, &mut channel_bob, &alice2)"}],"del_contents":[{"Del":" .apply_change(&changes, &mut channel_bob, alice2)\n"}]}},{"Edit":{"inode":{"change":18,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":498,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":469725}],"down_context":[{"change":18,"pos":469725}],"flag":"BLOCK","start":44961,"end":44975,"inode":{"change":18,"pos":454125}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":502,"ins":{"up_context":[{"change":18,"pos":469782}],"down_context":[{"change":18,"pos":469840}],"flag":"BLOCK","start":44976,"end":45035,"inode":{"change":18,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":469782},"to":{"change":18,"start":469782,"end":469840},"introduced_by":18}],"inode":{"change":18,"pos":454125}},"ins_contents":[{"Add":" .apply_change(&changes, &mut channel_bob, &alice3)"}],"del_contents":[{"Del":" .apply_change(&changes, &mut channel_bob, alice3)\n"}]}},{"Edit":{"inode":{"change":18,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":512,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":470076}],"down_context":[{"change":18,"pos":470076}],"flag":"BLOCK","start":45036,"end":45050,"inode":{"change":18,"pos":454125}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":522,"ins":{"up_context":[{"change":18,"pos":470374}],"down_context":[{"change":18,"pos":470430}],"flag":"BLOCK","start":45051,"end":45108,"inode":{"change":18,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":470374},"to":{"change":18,"start":470374,"end":470430},"introduced_by":18}],"inode":{"change":18,"pos":454125}},"ins_contents":[{"Add":" .apply_change(&changes, &mut channel, &bob1)"}],"del_contents":[{"Del":" .apply_change(&changes, &mut channel, bob1)\n"}]}},{"Edit":{"inode":{"change":18,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":533,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":470723}],"down_context":[{"change":18,"pos":470723}],"flag":"BLOCK","start":45109,"end":45127,"inode":{"change":18,"pos":454125}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":540,"ins":{"up_context":[{"change":18,"pos":470883}],"down_context":[{"change":18,"pos":470939}],"flag":"BLOCK","start":45128,"end":45185,"inode":{"change":18,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":470883},"to":{"change":18,"start":470883,"end":470939},"introduced_by":18}],"inode":{"change":18,"pos":454125}},"ins_contents":[{"Add":" .apply_change(&changes, &mut channel, &bob2)"}],"del_contents":[{"Del":" .apply_change(&changes, &mut channel, bob2)\n"}]}},{"Edit":{"inode":{"change":18,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":550,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":471231}],"down_context":[{"change":18,"pos":471231}],"flag":"BLOCK","start":45186,"end":45204,"inode":{"change":18,"pos":454125}}},"contents":[{"Add":" None,"}]}},{"Edit":{"inode":{"change":18,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":563,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":471575}],"down_context":[{"change":18,"pos":471575}],"flag":"BLOCK","start":45205,"end":45223,"inode":{"change":18,"pos":454125}}},"contents":[{"Add":" None,"}]}},{"Edit":{"inode":{"change":18,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":576,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":471939}],"down_context":[{"change":18,"pos":471939}],"flag":"BLOCK","start":45224,"end":45242,"inode":{"change":18,"pos":454125}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":584,"ins":{"up_context":[{"change":18,"pos":472144}],"down_context":[{"change":18,"pos":472200}],"flag":"BLOCK","start":45243,"end":45300,"inode":{"change":18,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":472144},"to":{"change":18,"start":472144,"end":472200},"introduced_by":18}],"inode":{"change":18,"pos":454125}},"ins_contents":[{"Add":" .apply_change(&changes, &mut channel, &bob1)"}],"del_contents":[{"Del":" .apply_change(&changes, &mut channel, bob1)\n"}]}},{"Edit":{"inode":{"change":18,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":595,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":472493}],"down_context":[{"change":18,"pos":472493}],"flag":"BLOCK","start":45301,"end":45319,"inode":{"change":18,"pos":454125}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":606,"ins":{"up_context":[{"change":18,"pos":472825}],"down_context":[{"change":18,"pos":472881}],"flag":"BLOCK","start":45320,"end":45377,"inode":{"change":18,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":472825},"to":{"change":18,"start":472825,"end":472881},"introduced_by":18}],"inode":{"change":18,"pos":454125}},"ins_contents":[{"Add":" .apply_change(&changes, &mut channel, &bob2)"}],"del_contents":[{"Del":" .apply_change(&changes, &mut channel, bob2)\n"}]}},{"Edit":{"inode":{"change":18,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":615,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":473105}],"down_context":[{"change":18,"pos":473105}],"flag":"BLOCK","start":45378,"end":45396,"inode":{"change":18,"pos":454125}}},"contents":[{"Add":" None,"}]}},{"Edit":{"inode":{"change":18,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":628,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":473449}],"down_context":[{"change":18,"pos":473449}],"flag":"BLOCK","start":45397,"end":45415,"inode":{"change":18,"pos":454125}}},"contents":[{"Add":" None,"}]}},{"Edit":{"inode":{"change":18,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":673,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":475068}],"down_context":[{"change":18,"pos":475068}],"flag":"BLOCK","start":45416,"end":45430,"inode":{"change":18,"pos":454125}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":18,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":728,"ins":{"up_context":[{"change":18,"pos":476496}],"down_context":[{"change":18,"pos":476514}],"flag":"BLOCK","start":45431,"end":45450,"inode":{"change":18,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":476496},"to":{"change":18,"start":476496,"end":476514},"introduced_by":18}],"inode":{"change":18,"pos":454125}},"ins_contents":[{"Add":" &h_alice2,"}],"del_contents":[{"Del":" h_alice2,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":480474},"path":"libpijul/src/small_string.rs","line":12,"ins":{"up_context":[{"change":18,"pos":480774}],"down_context":[{"change":18,"pos":480895}],"flag":"BLOCK","start":45451,"end":45501,"inode":{"change":18,"pos":480474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":480774},"to":{"change":18,"start":480774,"end":480895},"introduced_by":18}],"inode":{"change":18,"pos":480474}},"ins_contents":[{"Add":"pub struct SmallStr {"},{"Add":" len: u8,"},{"Add":" _str: [u8]"}],"del_contents":[{"Del":"#[derive(Clone, Copy)]\npub struct SmallStr<'a> {\n pub p: *const u8,\n pub marker: std::marker::PhantomData<&'a ()>,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":480474},"path":"libpijul/src/small_string.rs","line":25,"ins":{"up_context":[{"change":18,"pos":481114}],"down_context":[{"change":18,"pos":481151}],"flag":"BLOCK","start":45502,"end":45561,"inode":{"change":18,"pos":480474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":481114},"to":{"change":18,"start":481114,"end":481151},"introduced_by":18}],"inode":{"change":18,"pos":480474}},"ins_contents":[{"Add":" use std::ops::Deref;"},{"Add":" self.deref().fmt(fmt)"}],"del_contents":[{"Del":" self.as_small_str().fmt(fmt)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":480474},"path":"libpijul/src/small_string.rs","line":30,"ins":{"up_context":[{"change":18,"pos":481160}],"down_context":[{"change":18,"pos":481198}],"flag":"BLOCK","start":45562,"end":45592,"inode":{"change":18,"pos":480474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":481160},"to":{"change":18,"start":481160,"end":481198},"introduced_by":18}],"inode":{"change":18,"pos":480474}},"ins_contents":[{"Add":"impl PartialEq for SmallStr {"}],"del_contents":[{"Del":"impl<'a> PartialEq for SmallStr<'a> {\n"}]}},{"Edit":{"inode":{"change":18,"pos":480474},"path":"libpijul/src/small_string.rs","line":36,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":481285}],"down_context":[{"change":18,"pos":481285}],"flag":"BLOCK","start":45593,"end":46654,"inode":{"change":18,"pos":480474}}},"contents":[{"Add":"impl std::ops::Deref for SmallString {"},{"Add":" type Target = SmallStr;"},{"Add":" fn deref(&self) -> &Self::Target {"},{"Add":" let len = self.len as usize;"},{"Add":" unsafe {"},{"Add":" std::mem::transmute(std::slice::from_raw_parts(self as *const Self as *const u8, 1 + len))"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl AsRef for SmallString {"},{"Add":" fn as_ref(&self) -> &SmallStr {"},{"Add":" let len = self.len as usize;"},{"Add":" unsafe {"},{"Add":" std::mem::transmute(std::slice::from_raw_parts(self as *const Self as *const u8, 1 + len))"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl AsMut for SmallString {"},{"Add":" fn as_mut(&mut self) -> &mut SmallStr {"},{"Add":" let len = self.len as usize;"},{"Add":" unsafe {"},{"Add":" std::mem::transmute(std::slice::from_raw_parts_mut(self as *mut Self as *mut u8, 1 + len))"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl std::ops::DerefMut for SmallString {"},{"Add":" fn deref_mut(&mut self) -> &mut Self::Target {"},{"Add":" let len = self.len as usize;"},{"Add":" unsafe {"},{"Add":" std::mem::transmute(std::slice::from_raw_parts_mut(self as *mut Self as *mut u8, 1 + len))"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""}]}},{"Replacement":{"inode":{"change":18,"pos":480474},"path":"libpijul/src/small_string.rs","line":81,"ins":{"up_context":[{"change":18,"pos":481501}],"down_context":[{"change":18,"pos":481663}],"flag":"BLOCK","start":46655,"end":46727,"inode":{"change":18,"pos":480474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":481501},"to":{"change":18,"start":481501,"end":481663},"introduced_by":18}],"inode":{"change":18,"pos":480474}},"ins_contents":[{"Add":" assert_eq!(s0, s1);"},{"Add":" assert_eq!(s0, s0);"},{"Add":" assert_eq!(s1, s1);"}],"del_contents":[{"Del":" assert_eq!(s0.as_small_str(), s1.as_small_str());\n assert_eq!(s0.as_small_str(), s0.as_small_str());\n assert_eq!(s1.as_small_str(), s1.as_small_str());\n"}]}},{"Edit":{"inode":{"change":18,"pos":480474},"path":"libpijul/src/small_string.rs","line":90,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":481782},"to":{"change":18,"start":481782,"end":481847},"introduced_by":18}],"inode":{"change":18,"pos":480474}}},"contents":[{"Del":" assert_eq!(format!(\"{:?}\", s.as_small_str()), \"\\\"blabla\\\"\");\n"}]}},{"Replacement":{"inode":{"change":18,"pos":480474},"path":"libpijul/src/small_string.rs","line":92,"ins":{"up_context":[{"change":18,"pos":481850}],"down_context":[{"change":18,"pos":481882}],"flag":"BLOCK","start":46728,"end":46752,"inode":{"change":18,"pos":480474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":481850},"to":{"change":18,"start":481850,"end":481882},"introduced_by":18}],"inode":{"change":18,"pos":480474}},"ins_contents":[{"Add":"impl Eq for SmallStr {}"}],"del_contents":[{"Del":"impl<'a> Eq for SmallStr<'a> {}\n"}]}},{"Replacement":{"inode":{"change":18,"pos":480474},"path":"libpijul/src/small_string.rs","line":100,"ins":{"up_context":[{"change":18,"pos":482032}],"down_context":[{"change":18,"pos":482158}],"flag":"BLOCK","start":46753,"end":46754,"inode":{"change":18,"pos":480474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":482032},"to":{"change":18,"start":482032,"end":482158},"introduced_by":18}],"inode":{"change":18,"pos":480474}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":"/*\nimpl<'a> std::hash::Hash for SmallStr<'a> {\nfn hash(&self, x: &mut H) {\nself.as_str().hash(x)\n}\n}\n*/\n"}]}},{"Replacement":{"inode":{"change":18,"pos":480474},"path":"libpijul/src/small_string.rs","line":107,"ins":{"up_context":[{"change":18,"pos":482290}],"down_context":[{"change":18,"pos":482329}],"flag":"BLOCK","start":46755,"end":46786,"inode":{"change":18,"pos":480474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":482290},"to":{"change":18,"start":482290,"end":482329},"introduced_by":18}],"inode":{"change":18,"pos":480474}},"ins_contents":[{"Add":"impl PartialOrd for SmallStr {"}],"del_contents":[{"Del":"impl<'a> PartialOrd for SmallStr<'a> {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":480474},"path":"libpijul/src/small_string.rs","line":112,"ins":{"up_context":[{"change":18,"pos":482455}],"down_context":[{"change":18,"pos":482487}],"flag":"BLOCK","start":46787,"end":46811,"inode":{"change":18,"pos":480474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":482455},"to":{"change":18,"start":482455,"end":482487},"introduced_by":18}],"inode":{"change":18,"pos":480474}},"ins_contents":[{"Add":"impl Ord for SmallStr {"}],"del_contents":[{"Del":"impl<'a> Ord for SmallStr<'a> {\n"}]}},{"Edit":{"inode":{"change":18,"pos":480474},"path":"libpijul/src/small_string.rs","line":133,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":482993},"to":{"change":18,"start":482993,"end":483045},"introduced_by":18}],"inode":{"change":18,"pos":480474}}},"contents":[{"Del":" assert!(s0.as_small_str() < s1.as_small_str());\n"}]}},{"Edit":{"inode":{"change":18,"pos":480474},"path":"libpijul/src/small_string.rs","line":134,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":483067}],"down_context":[{"change":18,"pos":483067}],"flag":"BLOCK","start":46812,"end":46834,"inode":{"change":18,"pos":480474}}},"contents":[{"Add":" assert!(s0 < s1);"}]}},{"Replacement":{"inode":{"change":18,"pos":480474},"path":"libpijul/src/small_string.rs","line":138,"ins":{"up_context":[{"change":18,"pos":483125}],"down_context":[{"change":18,"pos":483169}],"flag":"BLOCK","start":46835,"end":46871,"inode":{"change":18,"pos":480474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":483125},"to":{"change":18,"start":483125,"end":483169},"introduced_by":18}],"inode":{"change":18,"pos":480474}},"ins_contents":[{"Add":"impl std::fmt::Debug for SmallStr {"}],"del_contents":[{"Del":"impl<'a> std::fmt::Debug for SmallStr<'a> {\n"}]}},{"Edit":{"inode":{"change":18,"pos":480474},"path":"libpijul/src/small_string.rs","line":204,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":484725},"to":{"change":18,"start":484725,"end":485173},"introduced_by":18}],"inode":{"change":18,"pos":480474}}},"contents":[{"Del":" }\n\n /// ```ignore\n /// use libpijul::small_string::*;\n /// let mut s = SmallString::from_str(\"blah\");\n /// let s_ = s.as_small_str();\n /// let s2_ = s_;\n /// let s3_ = s_.clone();\n /// assert_eq!(s_, s2_);\n /// assert_eq!(s_, s3_);\n /// ```\n pub fn as_small_str(&self) -> SmallStr {\n SmallStr {\n p: self as *const SmallString as *const u8,\n marker: std::marker::PhantomData,\n }\n"}]}},{"Replacement":{"inode":{"change":18,"pos":480474},"path":"libpijul/src/small_string.rs","line":207,"ins":{"up_context":[{"change":18,"pos":485215}],"down_context":[{"change":18,"pos":485252}],"flag":"BLOCK","start":46872,"end":46931,"inode":{"change":18,"pos":480474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":485215},"to":{"change":18,"start":485215,"end":485252},"introduced_by":18}],"inode":{"change":18,"pos":480474}},"ins_contents":[{"Add":" use std::ops::Deref;"},{"Add":" self.deref().as_str()"}],"del_contents":[{"Del":" self.as_small_str().as_str()\n"}]}},{"Replacement":{"inode":{"change":18,"pos":480474},"path":"libpijul/src/small_string.rs","line":212,"ins":{"up_context":[{"change":18,"pos":485297}],"down_context":[{"change":18,"pos":485336}],"flag":"BLOCK","start":46932,"end":46993,"inode":{"change":18,"pos":480474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":485297},"to":{"change":18,"start":485297,"end":485336},"introduced_by":18}],"inode":{"change":18,"pos":480474}},"ins_contents":[{"Add":" use std::ops::Deref;"},{"Add":" self.deref().as_bytes()"}],"del_contents":[{"Del":" self.as_small_str().as_bytes()\n"}]}},{"Replacement":{"inode":{"change":18,"pos":480474},"path":"libpijul/src/small_string.rs","line":216,"ins":{"up_context":[{"change":18,"pos":485344}],"down_context":[{"change":18,"pos":485489}],"flag":"BLOCK","start":46994,"end":47102,"inode":{"change":18,"pos":480474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":485344},"to":{"change":18,"start":485344,"end":485489},"introduced_by":18}],"inode":{"change":18,"pos":480474}},"ins_contents":[{"Add":"/*"},{"Add":"impl SmallStr {"},{"Add":" pub const EMPTY: &'static SmallStr = &SmallStr {"},{"Add":" len: 0,"},{"Add":" str: [][..]"}],"del_contents":[{"Del":"\nimpl SmallStr<'static> {\n pub const EMPTY: SmallStr<'static> = SmallStr {\n p: [0].as_ptr(),\n marker: std::marker::PhantomData,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":480474},"path":"libpijul/src/small_string.rs","line":223,"ins":{"up_context":[{"change":18,"pos":485498}],"down_context":[{"change":18,"pos":485523}],"flag":"BLOCK","start":47103,"end":47122,"inode":{"change":18,"pos":480474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":485498},"to":{"change":18,"start":485498,"end":485523},"introduced_by":18}],"inode":{"change":18,"pos":480474}},"ins_contents":[{"Add":"*/"},{"Add":"impl SmallStr {"}],"del_contents":[{"Del":"\nimpl<'a> SmallStr<'a> {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":480474},"path":"libpijul/src/small_string.rs","line":242,"ins":{"up_context":[{"change":18,"pos":486038}],"down_context":[{"change":18,"pos":486076}],"flag":"BLOCK","start":47123,"end":47149,"inode":{"change":18,"pos":480474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":486038},"to":{"change":18,"start":486038,"end":486076},"introduced_by":18}],"inode":{"change":18,"pos":480474}},"ins_contents":[{"Add":" self.len as usize"}],"del_contents":[{"Del":" unsafe { (*self.p) as usize }\n"}]}},{"Replacement":{"inode":{"change":18,"pos":480474},"path":"libpijul/src/small_string.rs","line":245,"ins":{"up_context":[{"change":18,"pos":486083}],"down_context":[{"change":18,"pos":486121}],"flag":"BLOCK","start":47150,"end":47185,"inode":{"change":18,"pos":480474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":486083},"to":{"change":18,"start":486083,"end":486121},"introduced_by":18}],"inode":{"change":18,"pos":480474}},"ins_contents":[{"Add":" pub fn as_str(&self) -> &str {"}],"del_contents":[{"Del":" pub fn as_str(&self) -> &'a str {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":480474},"path":"libpijul/src/small_string.rs","line":249,"ins":{"up_context":[{"change":18,"pos":486194}],"down_context":[{"change":18,"pos":486317}],"flag":"BLOCK","start":47186,"end":47301,"inode":{"change":18,"pos":480474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":486194},"to":{"change":18,"start":486194,"end":486317},"introduced_by":18}],"inode":{"change":18,"pos":480474}},"ins_contents":[{"Add":" pub fn as_bytes(&self) -> &[u8] {"},{"Add":" let s: &[u8] = unsafe { std::mem::transmute(self) };"},{"Add":" &s[1..]"}],"del_contents":[{"Del":" pub fn as_bytes(&self) -> &'a [u8] {\n unsafe { std::slice::from_raw_parts(self.p.offset(1), *self.p as usize) }\n"}]}},{"Edit":{"inode":{"change":18,"pos":480474},"path":"libpijul/src/small_string.rs","line":278,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":486861},"to":{"change":18,"start":486861,"end":487065},"introduced_by":18}],"inode":{"change":18,"pos":480474}}},"contents":[{"Del":" let s = SmallString::from_str(\"blah\");\n let s_ = s.as_small_str();\n let s2_ = s_;\n let s3_ = s_.clone();\n assert_eq!(s_, s2_);\n assert_eq!(s_, s3_);\n }\n {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":480474},"path":"libpijul/src/small_string.rs","line":279,"ins":{"up_context":[{"change":18,"pos":487112}],"down_context":[{"change":18,"pos":487158}],"flag":"BLOCK","start":47302,"end":47333,"inode":{"change":18,"pos":480474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":487112},"to":{"change":18,"start":487112,"end":487158},"introduced_by":18}],"inode":{"change":18,"pos":480474}},"ins_contents":[{"Add":" assert!(s.is_empty());"}],"del_contents":[{"Del":" assert!(s.as_small_str().is_empty());\n"}]}},{"Replacement":{"inode":{"change":18,"pos":480474},"path":"libpijul/src/small_string.rs","line":281,"ins":{"up_context":[{"change":18,"pos":487186}],"down_context":[{"change":18,"pos":487233}],"flag":"BLOCK","start":47334,"end":47366,"inode":{"change":18,"pos":480474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":487186},"to":{"change":18,"start":487186,"end":487233},"introduced_by":18}],"inode":{"change":18,"pos":480474}},"ins_contents":[{"Add":" assert!(!s.is_empty());"}],"del_contents":[{"Del":" assert!(!s.as_small_str().is_empty());\n"}]}},{"Replacement":{"inode":{"change":18,"pos":480474},"path":"libpijul/src/small_string.rs","line":285,"ins":{"up_context":[{"change":18,"pos":487292}],"down_context":[{"change":18,"pos":487349}],"flag":"BLOCK","start":47367,"end":47409,"inode":{"change":18,"pos":480474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":487292},"to":{"change":18,"start":487292,"end":487349},"introduced_by":18}],"inode":{"change":18,"pos":480474}},"ins_contents":[{"Add":" assert_eq!(s.len(), \"blah\".len())"}],"del_contents":[{"Del":" assert_eq!(s.as_small_str().len(), \"blah\".len())\n"}]}},{"Replacement":{"inode":{"change":18,"pos":480474},"path":"libpijul/src/small_string.rs","line":289,"ins":{"up_context":[{"change":18,"pos":487358}],"down_context":[{"change":18,"pos":487619}],"flag":"BLOCK","start":47410,"end":47485,"inode":{"change":18,"pos":480474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":487358},"to":{"change":18,"start":487358,"end":487619},"introduced_by":18}],"inode":{"change":18,"pos":480474}},"ins_contents":[{"Add":"impl sanakirja::UnsizedStorable for SmallStr {"},{"Add":" const ALIGN: usize = 1;"}],"del_contents":[{"Del":"/// An internal \"unsafe\" version of a [`small_string::SmallStr`], used\n/// to circumvent the absence of associated type constructors in Rust\n/// (else this would be borrow on a table).\n#[derive(Clone, Copy)]\n#[doc(hidden)]\npub struct UnsafeSmallStr(*const u8);\n"}]}},{"Replacement":{"inode":{"change":18,"pos":480474},"path":"libpijul/src/small_string.rs","line":292,"ins":{"up_context":[{"change":18,"pos":487620}],"down_context":[{"change":18,"pos":487781}],"flag":"BLOCK","start":47486,"end":47546,"inode":{"change":18,"pos":480474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":487620},"to":{"change":18,"start":487620,"end":487781},"introduced_by":18}],"inode":{"change":18,"pos":480474}},"ins_contents":[{"Add":" fn size(&self) -> usize {"},{"Add":" 1 + self.len as usize"}],"del_contents":[{"Del":"impl std::fmt::Debug for UnsafeSmallStr {\n fn fmt(&self, fmt: &mut std::fmt::Formatter) -> std::fmt::Result {\n unsafe { self.to_small_str().fmt(fmt) }\n"}]}},{"Edit":{"inode":{"change":18,"pos":480474},"path":"libpijul/src/small_string.rs","line":295,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":487787}],"down_context":[{"change":18,"pos":487787}],"flag":"BLOCK","start":47547,"end":48042,"inode":{"change":18,"pos":480474}}},"contents":[{"Add":" unsafe fn write_to_page(&self, p: *mut u8) {"},{"Add":" std::ptr::copy(&self.len, p, 1 + self.len as usize);"},{"Add":" debug!(\"writing {:?}\", std::slice::from_raw_parts(p, 1+self.len as usize));"},{"Add":" }"},{"Add":" unsafe fn from_raw_ptr<'a, T>(_: &T, p: *const u8) -> &'a Self {"},{"Add":" smallstr_from_raw_ptr(p)"},{"Add":" }"},{"Add":" unsafe fn onpage_size(p: *const u8) -> usize {"},{"Add":" let len = *p as usize;"},{"Add":" debug!(\"onpage_size {:?}\", std::slice::from_raw_parts(p, 1+len as usize));"},{"Add":" 1 + len"},{"Add":" }"}]}},{"Replacement":{"inode":{"change":18,"pos":480474},"path":"libpijul/src/small_string.rs","line":309,"ins":{"up_context":[{"change":18,"pos":487790}],"down_context":[{"change":18,"pos":487899}],"flag":"BLOCK","start":48043,"end":48169,"inode":{"change":18,"pos":480474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":487790},"to":{"change":18,"start":487790,"end":487899},"introduced_by":18}],"inode":{"change":18,"pos":480474}},"ins_contents":[{"Add":"impl sanakirja::Storable for SmallStr {"},{"Add":" fn compare(&self, _: &T, x: &Self) -> std::cmp::Ordering {"},{"Add":" self.cmp(x)"}],"del_contents":[{"Del":"impl UnsafeSmallStr {\n pub fn from_small_str(u: SmallStr) -> UnsafeSmallStr {\n UnsafeSmallStr(u.p)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":480474},"path":"libpijul/src/small_string.rs","line":313,"ins":{"up_context":[{"change":18,"pos":487905}],"down_context":[{"change":18,"pos":488063}],"flag":"BLOCK","start":48170,"end":48302,"inode":{"change":18,"pos":480474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":487905},"to":{"change":18,"start":487905,"end":488063},"introduced_by":18}],"inode":{"change":18,"pos":480474}},"ins_contents":[{"Add":" type PageReferences = std::iter::Empty;"},{"Add":" fn page_references(&self) -> Self::PageReferences {"},{"Add":" std::iter::empty()"}],"del_contents":[{"Del":" pub unsafe fn to_small_str<'a>(&self) -> SmallStr<'a> {\n SmallStr {\n p: self.0,\n marker: std::marker::PhantomData,\n }\n"}]}},{"Replacement":{"inode":{"change":18,"pos":480474},"path":"libpijul/src/small_string.rs","line":319,"ins":{"up_context":[{"change":18,"pos":488072}],"down_context":[{"change":18,"pos":488859}],"flag":"BLOCK","start":48303,"end":48768,"inode":{"change":18,"pos":480474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":488072},"to":{"change":18,"start":488072,"end":488859},"introduced_by":18}],"inode":{"change":18,"pos":480474}},"ins_contents":[{"Add":"unsafe fn smallstr_from_raw_ptr<'a>(p: *const u8) -> &'a SmallStr {"},{"Add":" let len = *p as usize;"},{"Add":" std::mem::transmute(std::slice::from_raw_parts(p, 1 + len as usize))"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn smallstr_repr() {"},{"Add":" use sanakirja::UnsizedStorable;"},{"Add":" let o = SmallString::from_str(\"blablabla\");"},{"Add":" let mut x = vec![0u8; 200];"},{"Add":" unsafe {"},{"Add":" o.write_to_page(x.as_mut_ptr());"},{"Add":" let p = smallstr_from_raw_ptr(x.as_ptr());"},{"Add":" assert_eq!(p.as_str(), \"blablabla\")"}],"del_contents":[{"Del":"impl sanakirja::Representable for UnsafeSmallStr {\n fn alignment() -> sanakirja::Alignment {\n sanakirja::Alignment::B1\n }\n fn onpage_size(&self) -> u16 {\n unsafe {\n let len = (*self.0) as u16;\n 1 + len\n }\n }\n unsafe fn write_value(&self, p: *mut u8) {\n std::ptr::copy(self.0, p, self.onpage_size() as usize)\n }\n unsafe fn read_value(p: *const u8) -> Self {\n UnsafeSmallStr(p)\n }\n unsafe fn cmp_value(&self, _: &T, x: Self) -> std::cmp::Ordering {\n let a = UnsafeSmallStr(self.0).to_small_str();\n let b = x.to_small_str();\n a.as_str().cmp(b.as_str())\n }\n type PageOffsets = std::iter::Empty;\n fn page_offsets(&self) -> Self::PageOffsets {\n std::iter::empty()\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":50,"ins":{"up_context":[{"change":18,"pos":489422}],"down_context":[{"change":18,"pos":489479}],"flag":"BLOCK","start":48769,"end":48836,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":489422},"to":{"change":18,"start":489422,"end":489479},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" pub(crate) redundant: Vec<(Vertex, SerializedEdge)>,"}],"del_contents":[{"Del":" pub(crate) redundant: Vec<(Vertex, Edge)>,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":161,"ins":{"up_context":[{"change":18,"pos":492241}],"down_context":[{"change":18,"pos":28003}],"flag":"BLOCK","start":48837,"end":48941,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":492241},"to":{"change":18,"start":32087,"end":32184},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":"fn get_inodes<'a, T: ChannelTxnT + TreeTxnT::GraphError>>("},{"Add":" txn: &'a T,"}],"del_contents":[{"Del":"fn get_inodes::GraphError>>(\n txn: &T,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":164,"ins":{"up_context":[{"change":18,"pos":28029}],"down_context":[{"change":18,"pos":32293}],"flag":"BLOCK","start":48942,"end":49030,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":28029},"to":{"change":18,"start":32210,"end":32293},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":32210},"to":{"change":18,"start":32210,"end":32293},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" inode: &Inode,"},{"Add":") -> Result>, TxnErr> {"}],"del_contents":[{"Del":" inode: Inode,\n) -> Result>, TxnErr> {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":168,"ins":{"up_context":[{"change":18,"pos":492412}],"down_context":[{"change":18,"pos":492478}],"flag":"BLOCK","start":49031,"end":49097,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":492412},"to":{"change":18,"start":1136,"end":1201},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" .get_changeset(txn.changes(channel), &vertex.change)?"}],"del_contents":[{"Del":" .get_changeset(txn.changes(channel), vertex.change)?\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":214,"ins":{"up_context":[{"change":18,"pos":493753}],"down_context":[{"change":18,"pos":0}],"flag":"BLOCK","start":49098,"end":49182,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":493753},"to":{"change":18,"start":32865,"end":32947},"introduced_by":18}],"inode":{"change":18,"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":18,"pos":488880},"path":"libpijul/src/record.rs","line":267,"ins":{"up_context":[{"change":18,"pos":495974}],"down_context":[{"change":18,"pos":496047}],"flag":"BLOCK","start":49183,"end":49256,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":495974},"to":{"change":18,"start":495974,"end":496047},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" let name_start = ChangePosition(self.rec.contents.len().into());"}],"del_contents":[{"Del":" let name_start = ChangePosition(self.rec.contents.len() as u64);\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":270,"ins":{"up_context":[{"change":18,"pos":496160}],"down_context":[{"change":18,"pos":496294}],"flag":"BLOCK","start":49257,"end":49328,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":496160},"to":{"change":18,"start":496160,"end":496231},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" let name_end = ChangePosition(self.rec.contents.len().into());"}],"del_contents":[{"Del":" let name_end = ChangePosition(self.rec.contents.len() as u64);\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":272,"ins":{"up_context":[{"change":18,"pos":496329}],"down_context":[{"change":18,"pos":496401}],"flag":"BLOCK","start":49329,"end":49401,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":496329},"to":{"change":18,"start":496329,"end":496401},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" let inode_pos = ChangePosition(self.rec.contents.len().into());"}],"del_contents":[{"Del":" let inode_pos = ChangePosition(self.rec.contents.len() as u64);\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":276,"ins":{"up_context":[{"change":18,"pos":496480}],"down_context":[{"change":18,"pos":496552}],"flag":"BLOCK","start":49402,"end":49474,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":496480},"to":{"change":18,"start":496480,"end":496552},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" let start = ChangePosition(self.rec.contents.len().into());"}],"del_contents":[{"Del":" let start = ChangePosition(self.rec.contents.len() as u64);\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":278,"ins":{"up_context":[{"change":18,"pos":496630}],"down_context":[{"change":18,"pos":496780}],"flag":"BLOCK","start":49475,"end":49643,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":496630},"to":{"change":18,"start":496630,"end":496780},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" let end = ChangePosition(self.rec.contents.len().into());"},{"Add":" self.rec.largest_file = self.rec.largest_file.max(end.0.as_u64() - start.0.as_u64());"}],"del_contents":[{"Del":" let end = ChangePosition(self.rec.contents.len() as u64);\n self.rec.largest_file = self.rec.largest_file.max(end.0 - start.0);\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":281,"ins":{"up_context":[{"change":18,"pos":496823}],"down_context":[{"change":18,"pos":496931}],"flag":"BLOCK","start":49644,"end":49750,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":496823},"to":{"change":18,"start":496823,"end":496931},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" let s = start.0.into();"},{"Add":" let e = end.0.as_usize().min(s + CHECK_UTF8 + 4);"}],"del_contents":[{"Del":" let s = start.0 as usize;\n let e = (end.0 as usize).min(s + CHECK_UTF8 + 4);\n"}]}},{"Edit":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":379,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":500045}],"down_context":[{"change":18,"pos":1284}],"flag":"BLOCK","start":49751,"end":49752,"inode":{"change":18,"pos":488880}}},"contents":[{"Add":""}]}},{"Edit":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":381,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":1378}],"down_context":[{"change":18,"pos":33350}],"flag":"BLOCK","start":49753,"end":49796,"inode":{"change":18,"pos":488880}}},"contents":[{"Add":" debug!(\"name_ = {:?}\", name_);"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":383,"ins":{"up_context":[{"change":18,"pos":33382}],"down_context":[{"change":18,"pos":33439}],"flag":"BLOCK","start":49797,"end":49892,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":33382},"to":{"change":18,"start":33382,"end":33439},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" if !name_.flag().contains(EdgeFlags::PARENT) {"},{"Add":" debug!(\"continue\");"}],"del_contents":[{"Del":" if !name_.flag.contains(EdgeFlags::PARENT) {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":387,"ins":{"up_context":[{"change":18,"pos":33479}],"down_context":[{"change":18,"pos":500308}],"flag":"BLOCK","start":49893,"end":49952,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":33479},"to":{"change":18,"start":500208,"end":500308},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":500208},"to":{"change":18,"start":500208,"end":500308},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" if name_.flag().contains(EdgeFlags::DELETED) {"}],"del_contents":[{"Del":" debug!(\"name_ = {:?}\", name_);\n if name_.flag.contains(EdgeFlags::DELETED) {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":392,"ins":{"up_context":[{"change":18,"pos":500452}],"down_context":[{"change":18,"pos":500531}],"flag":"BLOCK","start":49953,"end":50044,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":500452},"to":{"change":18,"start":1379,"end":1468},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" let name_dest = txn.find_block_end(txn.graph(channel), name_.dest()).unwrap();"}],"del_contents":[{"Del":" let name_dest = txn.find_block_end(txn.graph(channel), name_.dest).unwrap();\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":395,"ins":{"up_context":[{"change":18,"pos":11892}],"down_context":[{"change":18,"pos":11969}],"flag":"BLOCK","start":50045,"end":50149,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":11892},"to":{"change":18,"start":33567,"end":33653},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" .get_contents(|p| txn.get_external(&p).unwrap().map(From::from), *name_dest, &mut name)"}],"del_contents":[{"Del":" .get_contents(|p| txn.get_external(p).unwrap(), name_dest, &mut name)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":404,"ins":{"up_context":[{"change":15,"pos":905}],"down_context":[{"change":18,"pos":495}],"flag":"BLOCK","start":50150,"end":50251,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":86},"to":{"change":18,"start":395,"end":495},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":15,"pos":905},"to":{"change":18,"start":395,"end":495},"introduced_by":15},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":500926},"to":{"change":18,"start":395,"end":495},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" if let Some(v_papa) = iter_adjacent(txn, txn.graph(channel), *name_dest, f0, f1)?.next()"}],"del_contents":[{"Del":" if let Some(v_papa) = iter_adjacent(txn, txn.graph(channel), name_dest, f0, f1)?.next()\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":407,"ins":{"up_context":[{"change":18,"pos":33790}],"down_context":[{"change":18,"pos":150}],"flag":"BLOCK","start":50252,"end":50317,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":33790},"to":{"change":18,"start":87,"end":150},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" if !v_papa.flag().contains(EdgeFlags::DELETED) {"}],"del_contents":[{"Del":" if !v_papa.flag.contains(EdgeFlags::DELETED) {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":411,"ins":{"up_context":[{"change":18,"pos":272}],"down_context":[{"change":18,"pos":329}],"flag":"BLOCK","start":50318,"end":50377,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":272},"to":{"change":18,"start":272,"end":329},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" parent: v_papa.dest().to_option(),"}],"del_contents":[{"Del":" parent: v_papa.dest.to_option(),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":520,"ins":{"up_context":[{"change":18,"pos":34395}],"down_context":[{"change":18,"pos":34542}],"flag":"BLOCK","start":50378,"end":50527,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":34395},"to":{"change":18,"start":29116,"end":29186},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":29186},"to":{"change":18,"start":34466,"end":34542},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":34466},"to":{"change":18,"start":34466,"end":34542},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" let child = txn.find_block(channel, child.dest()).unwrap();"},{"Add":" for grandchild in iter_adjacent(txn, channel, *child, f0, f1)? {"}],"del_contents":[{"Del":" let child = txn.find_block(channel, child.dest).unwrap();\n"},{"Del":" for grandchild in iter_adjacent(txn, channel, child, f0, f1)? {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":525,"ins":{"up_context":[{"change":18,"pos":34626}],"down_context":[{"change":18,"pos":34711}],"flag":"BLOCK","start":50528,"end":50616,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":34626},"to":{"change":18,"start":34626,"end":34711},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" if let Some(inode) = txn.get_revinodes(&grandchild.dest(), None)? {"}],"del_contents":[{"Del":" if let Some(inode) = txn.get_revinodes(grandchild.dest, None)? {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":527,"ins":{"up_context":[{"change":18,"pos":34801}],"down_context":[{"change":18,"pos":34886}],"flag":"BLOCK","start":50617,"end":50703,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":34801},"to":{"change":18,"start":34801,"end":34886},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" if let Some(path) = crate::fs::inode_filename(txn, *inode)? {"}],"del_contents":[{"Del":" if let Some(path) = crate::fs::inode_filename(txn, inode)? {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":538,"ins":{"up_context":[{"change":5,"pos":281}],"down_context":[{"change":5,"pos":371}],"flag":"BLOCK","start":50704,"end":50812,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":281},"to":{"change":5,"start":281,"end":371},"introduced_by":5}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" .get_contents(|p| txn.get_external(&p).unwrap().map(From::from), *child, &mut name)"}],"del_contents":[{"Del":" .get_contents(|p| txn.get_external(p).unwrap(), child, &mut name)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":555,"ins":{"up_context":[{"change":5,"pos":888}],"down_context":[{"change":18,"pos":35074}],"flag":"BLOCK","start":50813,"end":50856,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":888},"to":{"change":18,"start":504535,"end":504576},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":504535},"to":{"change":18,"start":504535,"end":504576},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" grandchild.dest(),"}],"del_contents":[{"Del":" grandchild.dest,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":589,"ins":{"up_context":[{"change":18,"pos":505236}],"down_context":[{"change":18,"pos":35487}],"flag":"BLOCK","start":50857,"end":50906,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":505236},"to":{"change":18,"start":35431,"end":35487},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" for x in txn.iter_tree(&fileid, None)? {"}],"del_contents":[{"Del":" for x in txn.iter_tree(fileid.clone(), None)? {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":613,"ins":{"up_context":[{"change":18,"pos":506196}],"down_context":[{"change":18,"pos":506236}],"flag":"BLOCK","start":50907,"end":50948,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":506196},"to":{"change":18,"start":506196,"end":506236},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" inode: *child_inode,"}],"del_contents":[{"Del":" inode: child_inode,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":621,"ins":{"up_context":[{"change":18,"pos":35616}],"down_context":[{"change":18,"pos":506617}],"flag":"BLOCK","start":50949,"end":51051,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":35616},"to":{"change":18,"start":1811,"end":1912},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" self.record_deleted_file(txn, txn.graph(channel), working_copy, &full_path, *vertex)?"}],"del_contents":[{"Del":" self.record_deleted_file(txn, txn.graph(channel), working_copy, &full_path, vertex)?\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":671,"ins":{"up_context":[{"change":18,"pos":508005}],"down_context":[{"change":18,"pos":12529}],"flag":"BLOCK","start":51052,"end":51125,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":508068},"to":{"change":18,"start":508068,"end":508141},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" let name_start = ChangePosition(self.rec.contents.len().into());"}],"del_contents":[{"Del":" let name_start = ChangePosition(self.rec.contents.len() as u64);\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":674,"ins":{"up_context":[{"change":18,"pos":508255}],"down_context":[{"change":18,"pos":508326}],"flag":"BLOCK","start":51126,"end":51197,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":508255},"to":{"change":18,"start":508255,"end":508326},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" let name_end = ChangePosition(self.rec.contents.len().into());"}],"del_contents":[{"Del":" let name_end = ChangePosition(self.rec.contents.len() as u64);\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":676,"ins":{"up_context":[{"change":18,"pos":508361}],"down_context":[{"change":18,"pos":36030}],"flag":"BLOCK","start":51198,"end":51285,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":508361},"to":{"change":18,"start":508361,"end":508444},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" let name = &self.rec.contents[name_start.0.as_usize()..name_end.0.as_usize()];"}],"del_contents":[{"Del":" let name = &self.rec.contents[name_start.0 as usize..name_end.0 as usize];\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":727,"ins":{"up_context":[{"change":18,"pos":510318}],"down_context":[{"change":18,"pos":510384}],"flag":"BLOCK","start":51286,"end":51354,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":510318},"to":{"change":18,"start":510318,"end":510384},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" self.rec.contents.truncate(name_start.0.as_usize())"}],"del_contents":[{"Del":" self.rec.contents.truncate(name_start.0 as usize)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":730,"ins":{"up_context":[{"change":18,"pos":510415}],"down_context":[{"change":18,"pos":510477}],"flag":"BLOCK","start":51355,"end":51419,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":510415},"to":{"change":18,"start":510415,"end":510477},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" self.rec.contents.truncate(name_start.0.as_usize())"}],"del_contents":[{"Del":" self.rec.contents.truncate(name_start.0 as usize)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":775,"ins":{"up_context":[{"change":18,"pos":36364}],"down_context":[{"change":18,"pos":36438}],"flag":"BLOCK","start":51420,"end":51496,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":36364},"to":{"change":18,"start":36364,"end":36438},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" if !parent.flag().contains(EdgeFlags::FOLDER | EdgeFlags::PARENT) {"}],"del_contents":[{"Del":" if !parent.flag.contains(EdgeFlags::FOLDER | EdgeFlags::PARENT) {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":780,"ins":{"up_context":[{"change":18,"pos":511818}],"down_context":[{"change":18,"pos":511930}],"flag":"BLOCK","start":51497,"end":51613,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":511818},"to":{"change":18,"start":511818,"end":511930},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" if !parent.flag().contains(EdgeFlags::PSEUDO) {"},{"Add":" if parent.flag().contains(EdgeFlags::DELETED) {"}],"del_contents":[{"Del":" if !parent.flag.contains(EdgeFlags::PSEUDO) {\n if parent.flag.contains(EdgeFlags::DELETED) {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":783,"ins":{"up_context":[{"change":18,"pos":511977}],"down_context":[{"change":18,"pos":512040}],"flag":"BLOCK","start":51614,"end":51679,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":511977},"to":{"change":18,"start":511977,"end":512040},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" previous: parent.flag() - EdgeFlags::PARENT,"}],"del_contents":[{"Del":" previous: parent.flag - EdgeFlags::PARENT,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":785,"ins":{"up_context":[{"change":18,"pos":512104}],"down_context":[{"change":18,"pos":512155}],"flag":"BLOCK","start":51680,"end":51733,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":512104},"to":{"change":18,"start":512104,"end":512155},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" from: parent.dest().to_option(),"}],"del_contents":[{"Del":" from: parent.dest.to_option(),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":787,"ins":{"up_context":[{"change":18,"pos":512219}],"down_context":[{"change":18,"pos":512282}],"flag":"BLOCK","start":51734,"end":51799,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":512219},"to":{"change":18,"start":512219,"end":512282},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" introduced_by: Some(parent.introduced_by()),"}],"del_contents":[{"Del":" introduced_by: Some(parent.introduced_by),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":791,"ins":{"up_context":[{"change":18,"pos":512379}],"down_context":[{"change":18,"pos":93}],"flag":"BLOCK","start":51800,"end":51872,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":512379},"to":{"change":18,"start":512379,"end":512449},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" .entry((parent.dest(), current_pos.inode_vertex()))"}],"del_contents":[{"Del":" .entry((parent.dest, current_pos.inode_vertex()))\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":796,"ins":{"up_context":[{"change":18,"pos":512573}],"down_context":[{"change":18,"pos":141}],"flag":"BLOCK","start":51873,"end":51945,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":512573},"to":{"change":18,"start":512573,"end":512643},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" .entry((parent.dest(), current_pos.inode_vertex()))"}],"del_contents":[{"Del":" .entry((parent.dest, current_pos.inode_vertex()))\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":798,"ins":{"up_context":[{"change":18,"pos":188}],"down_context":[{"change":18,"pos":512738}],"flag":"BLOCK","start":51946,"end":51999,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":188},"to":{"change":18,"start":512687,"end":512738},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":512687},"to":{"change":18,"start":512687,"end":512738},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" v.push(Some(parent.introduced_by()))"}],"del_contents":[{"Del":" v.push(Some(parent.introduced_by))\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":802,"ins":{"up_context":[{"change":18,"pos":512793}],"down_context":[{"change":18,"pos":36549}],"flag":"BLOCK","start":52000,"end":52079,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":512793},"to":{"change":18,"start":29428,"end":29505},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" let parent_dest = txn.find_block_end(channel, parent.dest()).unwrap();"}],"del_contents":[{"Del":" let parent_dest = txn.find_block_end(channel, parent.dest).unwrap();\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":805,"ins":{"up_context":[{"change":18,"pos":36592}],"down_context":[{"change":18,"pos":36671}],"flag":"BLOCK","start":52080,"end":52177,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":36592},"to":{"change":18,"start":36592,"end":36671},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" |p| txn.get_external(&p).unwrap().map(From::from),"},{"Add":" *parent_dest,"}],"del_contents":[{"Del":" |p| txn.get_external(p).unwrap(),\n parent_dest,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":821,"ins":{"up_context":[{"change":18,"pos":34881}],"down_context":[{"change":18,"pos":34906}],"flag":"BLOCK","start":52178,"end":52204,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":34881},"to":{"change":18,"start":34881,"end":34906},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" *parent_dest,"}],"del_contents":[{"Del":" parent_dest,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":827,"ins":{"up_context":[{"change":18,"pos":36856}],"down_context":[{"change":18,"pos":36878}],"flag":"BLOCK","start":52205,"end":52229,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":36856},"to":{"change":18,"start":36856,"end":36878},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" .flag()"}],"del_contents":[{"Del":" .flag\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":829,"ins":{"up_context":[{"change":18,"pos":36943}],"down_context":[{"change":18,"pos":37007}],"flag":"BLOCK","start":52230,"end":52296,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":36943},"to":{"change":18,"start":36943,"end":37007},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" || grandparent.flag().contains(EdgeFlags::PSEUDO)"}],"del_contents":[{"Del":" || grandparent.flag.contains(EdgeFlags::PSEUDO)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":834,"ins":{"up_context":[{"change":18,"pos":513816}],"down_context":[{"change":18,"pos":513908}],"flag":"BLOCK","start":52297,"end":52390,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":513816},"to":{"change":18,"start":29506,"end":29597},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" let grandparent_dest = txn.find_block_end(channel, grandparent.dest()).unwrap();"}],"del_contents":[{"Del":" let grandparent_dest = txn.find_block_end(channel, grandparent.dest).unwrap();\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":841,"ins":{"up_context":[{"change":18,"pos":514150}],"down_context":[{"change":18,"pos":514232}],"flag":"BLOCK","start":52391,"end":52475,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":514150},"to":{"change":18,"start":514150,"end":514232},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" let grandparent_changed = parent_pos != grandparent.dest().to_option();"}],"del_contents":[{"Del":" let grandparent_changed = parent_pos != grandparent.dest.to_option();\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":844,"ins":{"up_context":[{"change":18,"pos":514307}],"down_context":[{"change":18,"pos":514370}],"flag":"BLOCK","start":52476,"end":52541,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":514307},"to":{"change":18,"start":514307,"end":514370},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" if grandparent.flag().contains(EdgeFlags::DELETED) {"}],"del_contents":[{"Del":" if grandparent.flag.contains(EdgeFlags::DELETED) {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":848,"ins":{"up_context":[{"change":18,"pos":514525}],"down_context":[{"change":18,"pos":514597}],"flag":"BLOCK","start":52542,"end":52616,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":514525},"to":{"change":18,"start":514525,"end":514597},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" previous: grandparent.flag() - EdgeFlags::PARENT,"}],"del_contents":[{"Del":" previous: grandparent.flag - EdgeFlags::PARENT,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":850,"ins":{"up_context":[{"change":18,"pos":514665}],"down_context":[{"change":18,"pos":514725}],"flag":"BLOCK","start":52617,"end":52679,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":514665},"to":{"change":18,"start":514665,"end":514725},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" from: grandparent.dest().to_option(),"}],"del_contents":[{"Del":" from: grandparent.dest.to_option(),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":852,"ins":{"up_context":[{"change":18,"pos":514778}],"down_context":[{"change":18,"pos":514850}],"flag":"BLOCK","start":52680,"end":52754,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":514778},"to":{"change":18,"start":514778,"end":514850},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" introduced_by: Some(grandparent.introduced_by()),"}],"del_contents":[{"Del":" introduced_by: Some(grandparent.introduced_by),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":854,"ins":{"up_context":[{"change":18,"pos":514874}],"down_context":[{"change":18,"pos":514967}],"flag":"BLOCK","start":52755,"end":52850,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":514874},"to":{"change":18,"start":514874,"end":514967},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" if !parent_was_resurrected && !parent.flag().contains(EdgeFlags::PSEUDO) {"}],"del_contents":[{"Del":" if !parent_was_resurrected && !parent.flag.contains(EdgeFlags::PSEUDO) {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":856,"ins":{"up_context":[{"change":18,"pos":515018}],"down_context":[{"change":18,"pos":515089}],"flag":"BLOCK","start":52851,"end":52924,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":515018},"to":{"change":18,"start":515018,"end":515089},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" previous: parent.flag() - EdgeFlags::PARENT,"}],"del_contents":[{"Del":" previous: parent.flag - EdgeFlags::PARENT,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":858,"ins":{"up_context":[{"change":18,"pos":515161}],"down_context":[{"change":18,"pos":515220}],"flag":"BLOCK","start":52925,"end":52986,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":515161},"to":{"change":18,"start":515161,"end":515220},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" from: parent.dest().to_option(),"}],"del_contents":[{"Del":" from: parent.dest.to_option(),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":860,"ins":{"up_context":[{"change":18,"pos":515292}],"down_context":[{"change":18,"pos":515363}],"flag":"BLOCK","start":52987,"end":53060,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":515292},"to":{"change":18,"start":515292,"end":515363},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" introduced_by: Some(parent.introduced_by()),"}],"del_contents":[{"Del":" introduced_by: Some(parent.introduced_by),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":868,"ins":{"up_context":[{"change":18,"pos":515617}],"down_context":[{"change":18,"pos":189}],"flag":"BLOCK","start":53061,"end":53127,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":515617},"to":{"change":18,"start":515617,"end":515681},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" .entry((grandparent.dest(), parent_dest))"}],"del_contents":[{"Del":" .entry((grandparent.dest, parent_dest))\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":870,"ins":{"up_context":[{"change":18,"pos":240}],"down_context":[{"change":18,"pos":515789}],"flag":"BLOCK","start":53128,"end":53190,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":240},"to":{"change":18,"start":515729,"end":515789},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":515729},"to":{"change":18,"start":515729,"end":515789},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" v.push(Some(grandparent.introduced_by()))"}],"del_contents":[{"Del":" v.push(Some(grandparent.introduced_by))\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":874,"ins":{"up_context":[{"change":18,"pos":515910}],"down_context":[{"change":18,"pos":515973}],"flag":"BLOCK","start":53191,"end":53256,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":515910},"to":{"change":18,"start":515910,"end":515973},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" previous: parent.flag() - EdgeFlags::PARENT,"}],"del_contents":[{"Del":" previous: parent.flag - EdgeFlags::PARENT,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":876,"ins":{"up_context":[{"change":18,"pos":516058}],"down_context":[{"change":18,"pos":516114}],"flag":"BLOCK","start":53257,"end":53315,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":516058},"to":{"change":18,"start":516058,"end":516114},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" from: grandparent.dest().to_option(),"}],"del_contents":[{"Del":" from: grandparent.dest.to_option(),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":878,"ins":{"up_context":[{"change":18,"pos":516163}],"down_context":[{"change":18,"pos":516231}],"flag":"BLOCK","start":53316,"end":53386,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":516163},"to":{"change":18,"start":516163,"end":516231},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" introduced_by: Some(grandparent.introduced_by()),"}],"del_contents":[{"Del":" introduced_by: Some(grandparent.introduced_by),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":881,"ins":{"up_context":[{"change":18,"pos":516334}],"down_context":[{"change":18,"pos":516423}],"flag":"BLOCK","start":53387,"end":53478,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":516334},"to":{"change":18,"start":516334,"end":516423},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" if !parent_was_resurrected && !parent.flag().contains(EdgeFlags::PSEUDO) {"}],"del_contents":[{"Del":" if !parent_was_resurrected && !parent.flag.contains(EdgeFlags::PSEUDO) {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":883,"ins":{"up_context":[{"change":18,"pos":516470}],"down_context":[{"change":18,"pos":516537}],"flag":"BLOCK","start":53479,"end":53548,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":516470},"to":{"change":18,"start":516470,"end":516537},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" previous: parent.flag() - EdgeFlags::PARENT,"}],"del_contents":[{"Del":" previous: parent.flag - EdgeFlags::PARENT,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":885,"ins":{"up_context":[{"change":18,"pos":516605}],"down_context":[{"change":18,"pos":516660}],"flag":"BLOCK","start":53549,"end":53606,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":516605},"to":{"change":18,"start":516605,"end":516660},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" from: parent.dest().to_option(),"}],"del_contents":[{"Del":" from: parent.dest.to_option(),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":887,"ins":{"up_context":[{"change":18,"pos":516728}],"down_context":[{"change":18,"pos":516795}],"flag":"BLOCK","start":53607,"end":53676,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":516728},"to":{"change":18,"start":516728,"end":516795},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" introduced_by: Some(parent.introduced_by()),"}],"del_contents":[{"Del":" introduced_by: Some(parent.introduced_by),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":892,"ins":{"up_context":[{"change":18,"pos":516887}],"down_context":[{"change":18,"pos":241}],"flag":"BLOCK","start":53677,"end":53740,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":516887},"to":{"change":18,"start":516887,"end":516947},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" .entry((grandparent.dest(), *parent_dest))"}],"del_contents":[{"Del":" .entry((grandparent.dest, parent_dest))\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":894,"ins":{"up_context":[{"change":18,"pos":288}],"down_context":[{"change":18,"pos":517048}],"flag":"BLOCK","start":53741,"end":53800,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":288},"to":{"change":18,"start":516991,"end":517048},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":516991},"to":{"change":18,"start":516991,"end":517048},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" v.push(Some(grandparent.introduced_by()));"}],"del_contents":[{"Del":" v.push(Some(grandparent.introduced_by));\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":952,"ins":{"up_context":[{"change":18,"pos":518868}],"down_context":[{"change":18,"pos":518936}],"flag":"BLOCK","start":53801,"end":53872,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":518868},"to":{"change":18,"start":37365,"end":37435},"introduced_by":18}],"inode":{"change":18,"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":18,"pos":488880},"path":"libpijul/src/record.rs","line":968,"ins":{"up_context":[{"change":18,"pos":3605}],"down_context":[{"change":18,"pos":3688}],"flag":"BLOCK","start":53873,"end":53958,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":3605},"to":{"change":18,"start":37505,"end":37589},"introduced_by":18}],"inode":{"change":18,"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":18,"pos":488880},"path":"libpijul/src/record.rs","line":974,"ins":{"up_context":[{"change":18,"pos":3893}],"down_context":[{"change":18,"pos":3965}],"flag":"BLOCK","start":53959,"end":54032,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":3893},"to":{"change":18,"start":3893,"end":3965},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" .insert(*inode, vertex.start_pos().to_option());"}],"del_contents":[{"Del":" .insert(inode, vertex.start_pos().to_option());\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":977,"ins":{"up_context":[{"change":18,"pos":4030}],"down_context":[{"change":18,"pos":520235}],"flag":"BLOCK","start":54033,"end":54130,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":4030},"to":{"change":18,"start":4030,"end":4119},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" .insert(self.rec.actions.len(), InodeUpdate::Deleted { inode: *inode });"}],"del_contents":[{"Del":" .insert(self.rec.actions.len(), InodeUpdate::Deleted { inode });\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":993,"ins":{"up_context":[{"change":18,"pos":29629}],"down_context":[{"change":18,"pos":29681}],"flag":"BLOCK","start":54131,"end":54185,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":29629},"to":{"change":18,"start":29629,"end":29681},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" .find_block(channel, edge.dest())"}],"del_contents":[{"Del":" .find_block(channel, edge.dest)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":996,"ins":{"up_context":[{"change":18,"pos":520791}],"down_context":[{"change":18,"pos":520860}],"flag":"BLOCK","start":54186,"end":54257,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":520791},"to":{"change":18,"start":520791,"end":520860},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" assert!(!edge.flag().contains(EdgeFlags::FOLDER));"}],"del_contents":[{"Del":" assert!(!edge.flag.contains(EdgeFlags::FOLDER));\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":998,"ins":{"up_context":[{"change":18,"pos":520886}],"down_context":[{"change":18,"pos":520952}],"flag":"BLOCK","start":54258,"end":54326,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":520886},"to":{"change":18,"start":520886,"end":520952},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" } else if edge.flag().contains(EdgeFlags::FOLDER) {"}],"del_contents":[{"Del":" } else if edge.flag.contains(EdgeFlags::FOLDER) {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":1004,"ins":{"up_context":[{"change":18,"pos":521124}],"down_context":[{"change":18,"pos":521217}],"flag":"BLOCK","start":54327,"end":54423,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":521124},"to":{"change":18,"start":521124,"end":521217},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" if visited.insert(edge.dest()) {"},{"Add":" stack.push((*dest, inode))"}],"del_contents":[{"Del":" if visited.insert(edge.dest) {\n stack.push((dest, inode))\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":1030,"ins":{"up_context":[{"change":18,"pos":38019}],"down_context":[{"change":18,"pos":38077}],"flag":"BLOCK","start":54424,"end":54484,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":38019},"to":{"change":18,"start":38019,"end":38077},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" if !parent.flag().contains(EdgeFlags::PARENT) {"}],"del_contents":[{"Del":" if !parent.flag.contains(EdgeFlags::PARENT) {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":1033,"ins":{"up_context":[{"change":18,"pos":38117}],"down_context":[{"change":18,"pos":35967}],"flag":"BLOCK","start":54485,"end":54632,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":38117},"to":{"change":18,"start":35822,"end":35884},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":35822},"to":{"change":18,"start":35822,"end":35884},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":35884},"to":{"change":18,"start":29746,"end":29827},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" assert!(parent.flag().contains(EdgeFlags::FOLDER));"},{"Add":" let parent_dest = txn.find_block_end(channel, parent.dest()).unwrap();"}],"del_contents":[{"Del":" assert!(parent.flag.contains(EdgeFlags::FOLDER));\n"},{"Del":" let parent_dest = txn.find_block_end(channel, parent.dest).unwrap();\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":1038,"ins":{"up_context":[{"change":18,"pos":521581}],"down_context":[{"change":18,"pos":521605}],"flag":"BLOCK","start":54633,"end":54663,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":521581},"to":{"change":18,"start":36035,"end":36064},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" *parent_dest,"}],"del_contents":[{"Del":" parent_dest,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":1043,"ins":{"up_context":[{"change":18,"pos":38266}],"down_context":[{"change":18,"pos":38399}],"flag":"BLOCK","start":54664,"end":54801,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":38266},"to":{"change":18,"start":38266,"end":38399},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" if !grandparent.flag().contains(EdgeFlags::PARENT)"},{"Add":" || grandparent.flag().contains(EdgeFlags::PSEUDO)"}],"del_contents":[{"Del":" if !grandparent.flag.contains(EdgeFlags::PARENT)\n || grandparent.flag.contains(EdgeFlags::PSEUDO)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":1048,"ins":{"up_context":[{"change":18,"pos":38465}],"down_context":[{"change":18,"pos":522527}],"flag":"BLOCK","start":54802,"end":54948,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":38465},"to":{"change":18,"start":522385,"end":522527},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":522385},"to":{"change":18,"start":522385,"end":522527},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" assert!(grandparent.flag().contains(EdgeFlags::PARENT));"},{"Add":" assert!(grandparent.flag().contains(EdgeFlags::FOLDER));"}],"del_contents":[{"Del":" assert!(grandparent.flag.contains(EdgeFlags::PARENT));\n assert!(grandparent.flag.contains(EdgeFlags::FOLDER));\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":1051,"ins":{"up_context":[{"change":18,"pos":522564}],"down_context":[{"change":18,"pos":522632}],"flag":"BLOCK","start":54949,"end":55019,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":522564},"to":{"change":18,"start":522564,"end":522632},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" previous: grandparent.flag() - EdgeFlags::PARENT,"}],"del_contents":[{"Del":" previous: grandparent.flag - EdgeFlags::PARENT,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":1053,"ins":{"up_context":[{"change":18,"pos":522717}],"down_context":[{"change":18,"pos":522773}],"flag":"BLOCK","start":55020,"end":55078,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":522717},"to":{"change":18,"start":522717,"end":522773},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" from: grandparent.dest().to_option(),"}],"del_contents":[{"Del":" from: grandparent.dest.to_option(),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":1055,"ins":{"up_context":[{"change":18,"pos":522822}],"down_context":[{"change":18,"pos":522890}],"flag":"BLOCK","start":55079,"end":55149,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":522822},"to":{"change":18,"start":522822,"end":522890},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" introduced_by: Some(grandparent.introduced_by()),"}],"del_contents":[{"Del":" introduced_by: Some(grandparent.introduced_by),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":1058,"ins":{"up_context":[{"change":18,"pos":522924}],"down_context":[{"change":18,"pos":522982}],"flag":"BLOCK","start":55150,"end":55210,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":522924},"to":{"change":18,"start":522924,"end":522982},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" if !parent.flag().contains(EdgeFlags::PSEUDO) {"}],"del_contents":[{"Del":" if !parent.flag.contains(EdgeFlags::PSEUDO) {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":1060,"ins":{"up_context":[{"change":18,"pos":523019}],"down_context":[{"change":18,"pos":523082}],"flag":"BLOCK","start":55211,"end":55276,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":523019},"to":{"change":18,"start":523019,"end":523082},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" previous: parent.flag() - EdgeFlags::PARENT,"}],"del_contents":[{"Del":" previous: parent.flag - EdgeFlags::PARENT,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":1062,"ins":{"up_context":[{"change":18,"pos":523167}],"down_context":[{"change":18,"pos":523218}],"flag":"BLOCK","start":55277,"end":55330,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":523167},"to":{"change":18,"start":523167,"end":523218},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" from: parent.dest().to_option(),"}],"del_contents":[{"Del":" from: parent.dest.to_option(),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":1064,"ins":{"up_context":[{"change":18,"pos":523262}],"down_context":[{"change":18,"pos":523325}],"flag":"BLOCK","start":55331,"end":55396,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":523262},"to":{"change":18,"start":523262,"end":523325},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" introduced_by: Some(parent.introduced_by()),"}],"del_contents":[{"Del":" introduced_by: Some(parent.introduced_by),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":1108,"ins":{"up_context":[{"change":18,"pos":38660}],"down_context":[{"change":18,"pos":38725}],"flag":"BLOCK","start":55397,"end":55464,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":38660},"to":{"change":18,"start":38660,"end":38725},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" if parent.flag().contains(EdgeFlags::PSEUDO) {"}],"del_contents":[{"Del":" if parent.flag.contains(EdgeFlags::PSEUDO) {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":1111,"ins":{"up_context":[{"change":18,"pos":38781}],"down_context":[{"change":18,"pos":524799}],"flag":"BLOCK","start":55465,"end":55610,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":38781},"to":{"change":18,"start":524658,"end":524799},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":524658},"to":{"change":18,"start":524658,"end":524799},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" assert!(parent.flag().contains(EdgeFlags::PARENT));"},{"Add":" assert!(!parent.flag().contains(EdgeFlags::FOLDER));"}],"del_contents":[{"Del":" assert!(parent.flag.contains(EdgeFlags::PARENT));\n assert!(!parent.flag.contains(EdgeFlags::FOLDER));\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":1114,"ins":{"up_context":[{"change":18,"pos":524842}],"down_context":[{"change":18,"pos":525033}],"flag":"BLOCK","start":55611,"end":55825,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":524842},"to":{"change":18,"start":524842,"end":524909},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":524909},"to":{"change":18,"start":29828,"end":29914},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":29914},"to":{"change":18,"start":524978,"end":525033},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":524978},"to":{"change":18,"start":524978,"end":525033},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" previous: parent.flag() - EdgeFlags::PARENT,"},{"Add":" flag: (parent.flag() - EdgeFlags::PARENT) | EdgeFlags::DELETED,"},{"Add":" from: parent.dest().to_option(),"}],"del_contents":[{"Del":" previous: parent.flag - EdgeFlags::PARENT,\n"},{"Del":" flag: (parent.flag - EdgeFlags::PARENT) | EdgeFlags::DELETED,\n"},{"Del":" from: parent.dest.to_option(),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":488880},"path":"libpijul/src/record.rs","line":1118,"ins":{"up_context":[{"change":18,"pos":525077}],"down_context":[{"change":18,"pos":525144}],"flag":"BLOCK","start":55826,"end":55895,"inode":{"change":18,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":525077},"to":{"change":18,"start":525077,"end":525144},"introduced_by":18}],"inode":{"change":18,"pos":488880}},"ins_contents":[{"Add":" introduced_by: Some(parent.introduced_by()),"}],"del_contents":[{"Del":" introduced_by: Some(parent.introduced_by),\n"}]}},{"Edit":{"inode":{"change":18,"pos":525242},"path":"libpijul/src/pristine/vertex.rs","line":1,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":525242}],"down_context":[{"change":18,"pos":525298}],"flag":"BLOCK","start":55896,"end":55912,"inode":{"change":18,"pos":525242}}},"contents":[{"Add":"use super::L64;"}]}},{"Replacement":{"inode":{"change":18,"pos":525242},"path":"libpijul/src/pristine/vertex.rs","line":6,"ins":{"up_context":[{"change":18,"pos":525440}],"down_context":[{"change":18,"pos":525532}],"flag":"BLOCK","start":55913,"end":55998,"inode":{"change":18,"pos":525242}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":525440},"to":{"change":18,"start":525440,"end":525532},"introduced_by":18}],"inode":{"change":18,"pos":525242}},"ins_contents":[{"Add":"#[derive(Clone, Copy, PartialEq, PartialOrd, Eq, Ord, Hash, Serialize, Deserialize)]"}],"del_contents":[{"Del":"#[derive(Clone, Copy, Debug, PartialEq, PartialOrd, Eq, Ord, Hash, Serialize, Deserialize)]\n"}]}},{"Edit":{"inode":{"change":18,"pos":525242},"path":"libpijul/src/pristine/vertex.rs","line":17,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":525822}],"down_context":[{"change":18,"pos":525822}],"flag":"BLOCK","start":55999,"end":56221,"inode":{"change":18,"pos":525242}}},"contents":[{"Add":"impl std::fmt::Debug for Vertex {"},{"Add":" fn fmt(&self, fmt: &mut std::fmt::Formatter) -> std::fmt::Result {"},{"Add":" write!(fmt, \"V({:?}[{}:{}])\", self.change, (self.start.0).0, (self.end.0).0)"},{"Add":" }"},{"Add":"}"},{"Add":""}]}},{"Replacement":{"inode":{"change":18,"pos":525242},"path":"libpijul/src/pristine/vertex.rs","line":85,"ins":{"up_context":[{"change":18,"pos":527553}],"down_context":[{"change":18,"pos":527589}],"flag":"BLOCK","start":56222,"end":56265,"inode":{"change":18,"pos":525242}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":527553},"to":{"change":18,"start":527553,"end":527589},"introduced_by":18}],"inode":{"change":18,"pos":525242}},"ins_contents":[{"Add":"pub struct ChangePosition(pub super::L64);"}],"del_contents":[{"Del":"pub struct ChangePosition(pub u64);\n"}]}},{"Replacement":{"inode":{"change":18,"pos":525242},"path":"libpijul/src/pristine/vertex.rs","line":88,"ins":{"up_context":[{"change":18,"pos":527612}],"down_context":[{"change":18,"pos":527740}],"flag":"BLOCK","start":56266,"end":56418,"inode":{"change":18,"pos":525242}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":527612},"to":{"change":18,"start":527612,"end":527740},"introduced_by":18}],"inode":{"change":18,"pos":525242}},"ins_contents":[{"Add":" pub(crate) const ROOT: ChangePosition = ChangePosition(L64(0u64));"},{"Add":" pub(crate) const BOTTOM: ChangePosition = ChangePosition(L64(1u64.to_le()));"}],"del_contents":[{"Del":" pub(crate) const ROOT: ChangePosition = ChangePosition(0);\n pub(crate) const BOTTOM: ChangePosition = ChangePosition(1);\n"}]}},{"Replacement":{"inode":{"change":18,"pos":525242},"path":"libpijul/src/pristine/vertex.rs","line":95,"ins":{"up_context":[{"change":18,"pos":527869}],"down_context":[{"change":18,"pos":527911}],"flag":"BLOCK","start":56419,"end":56454,"inode":{"change":18,"pos":525242}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":527869},"to":{"change":18,"start":527869,"end":527911},"introduced_by":18}],"inode":{"change":18,"pos":525242}},"ins_contents":[{"Add":" ChangePosition(self.0 + x)"}],"del_contents":[{"Del":" ChangePosition(self.0 + x as u64)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":525242},"path":"libpijul/src/pristine/vertex.rs","line":102,"ins":{"up_context":[{"change":18,"pos":528055}],"down_context":[{"change":18,"pos":528087}],"flag":"BLOCK","start":56455,"end":56776,"inode":{"change":18,"pos":525242}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":528055},"to":{"change":18,"start":528055,"end":528087},"introduced_by":18}],"inode":{"change":18,"pos":525242}},"ins_contents":[{"Add":" let a: u64 = self.0.into();"},{"Add":" let b: u64 = x.0.into();"},{"Add":" (a - b) as usize"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl ChangePosition {"},{"Add":" pub(crate) fn us(&self) -> usize {"},{"Add":" u64::from_le((self.0).0) as usize"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl From for u64 {"},{"Add":" fn from(f: ChangePosition) -> u64 {"},{"Add":" u64::from_le((f.0).0)"}],"del_contents":[{"Del":" (self.0 - x.0) as usize\n"}]}},{"Edit":{"inode":{"change":18,"pos":525242},"path":"libpijul/src/pristine/vertex.rs","line":119,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":528095}],"down_context":[{"change":18,"pos":528150}],"flag":"BLOCK","start":56777,"end":56778,"inode":{"change":18,"pos":525242}}},"contents":[{"Add":""}]}},{"Edit":{"inode":{"change":18,"pos":525242},"path":"libpijul/src/pristine/vertex.rs","line":129,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":528415},"to":{"change":18,"start":528415,"end":528457},"introduced_by":18}],"inode":{"change":18,"pos":525242}}},"contents":[{"Del":"use byteorder::{ByteOrder, LittleEndian};\n"}]}},{"Replacement":{"inode":{"change":18,"pos":525242},"path":"libpijul/src/pristine/vertex.rs","line":134,"ins":{"up_context":[{"change":18,"pos":528619}],"down_context":[{"change":18,"pos":528676}],"flag":"BLOCK","start":56779,"end":56823,"inode":{"change":18,"pos":525242}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":528619},"to":{"change":18,"start":528619,"end":528676},"introduced_by":18}],"inode":{"change":18,"pos":525242}},"ins_contents":[{"Add":" self.pos.0.to_slice_le(&mut bytes);"}],"del_contents":[{"Del":" LittleEndian::write_u64(&mut bytes, self.pos.0);\n"}]}},{"Replacement":{"inode":{"change":18,"pos":525242},"path":"libpijul/src/pristine/vertex.rs","line":158,"ins":{"up_context":[{"change":18,"pos":379}],"down_context":[{"change":18,"pos":430}],"flag":"BLOCK","start":56824,"end":56871,"inode":{"change":18,"pos":525242}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":379},"to":{"change":18,"start":379,"end":430},"introduced_by":18}],"inode":{"change":18,"pos":525242}},"ins_contents":[{"Add":" .map(|_| L64::from_slice_le(&dec))"}],"del_contents":[{"Del":" .map(|_| LittleEndian::read_u64(&dec))\n"}]}},{"Replacement":{"inode":{"change":18,"pos":525242},"path":"libpijul/src/pristine/vertex.rs","line":199,"ins":{"up_context":[{"change":18,"pos":530709}],"down_context":[{"change":18,"pos":530741}],"flag":"BLOCK","start":56872,"end":56912,"inode":{"change":18,"pos":525242}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":530709},"to":{"change":18,"start":530709,"end":530741},"introduced_by":18}],"inode":{"change":18,"pos":525242}},"ins_contents":[{"Add":" pos: ChangePosition(L64(0u64)),"}],"del_contents":[{"Del":" pos: ChangePosition(0),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":525242},"path":"libpijul/src/pristine/vertex.rs","line":204,"ins":{"up_context":[{"change":18,"pos":530861}],"down_context":[{"change":18,"pos":530893}],"flag":"BLOCK","start":56913,"end":56953,"inode":{"change":18,"pos":525242}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":530861},"to":{"change":18,"start":530861,"end":530893},"introduced_by":18}],"inode":{"change":18,"pos":525242}},"ins_contents":[{"Add":" pos: ChangePosition(L64(0u64)),"}],"del_contents":[{"Del":" pos: ChangePosition(0),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":2,"ins":{"up_context":[{"change":18,"pos":531126}],"down_context":[{"change":18,"pos":531262}],"flag":"BLOCK","start":56954,"end":56974,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":531126},"to":{"change":18,"start":531126,"end":531151},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":531151},"to":{"change":18,"start":29915,"end":29995},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":29995},"to":{"change":18,"start":531171,"end":531262},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":531171},"to":{"change":18,"start":531171,"end":531262},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":"use ::sanakirja::*;"}],"del_contents":[{"Del":"use crate::small_string;\n"},{"Del":"use ::sanakirja::{Alignment, Commit, Db, Representable, Transaction, UnsafeDb};\n"},{"Del":"use byteorder::{ByteOrder, LittleEndian};\nuse rand::rngs::ThreadRng;\nuse rand::thread_rng;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":11,"ins":{"up_context":[{"change":18,"pos":531446}],"down_context":[{"change":18,"pos":531482}],"flag":"BLOCK","start":56975,"end":57011,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":531446},"to":{"change":18,"start":22,"end":82},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" pub env: Arc<::sanakirja::Env>,"}],"del_contents":[{"Del":" pub env: Arc<::sanakirja::Env<::sanakirja::Exclusive>>,\n"}]}},{"Edit":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":13,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":531484}],"down_context":[{"change":18,"pos":531484}],"flag":"BLOCK","start":57012,"end":57180,"inode":{"change":18,"pos":531056}}},"contents":[{"Add":""},{"Add":"type P = btree::page::Page;"},{"Add":"type Db = btree::Db;"},{"Add":"type UP = btree::page_unsized::Page;"},{"Add":"type UDb = btree::Db_>;"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":63,"ins":{"up_context":[{"change":18,"pos":13187}],"down_context":[{"change":18,"pos":138}],"flag":"BLOCK","start":57181,"end":57237,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":13187},"to":{"change":18,"start":29996,"end":30053},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" let env = ::sanakirja::Env::new(name, size, 2);"}],"del_contents":[{"Del":" let env = ::sanakirja::Env::try_new(name, size);\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":81,"ins":{"up_context":[{"change":18,"pos":532113}],"down_context":[{"change":18,"pos":532181}],"flag":"BLOCK","start":57238,"end":57311,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":532113},"to":{"change":18,"start":30182,"end":30252},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" env: Arc::new(::sanakirja::Env::new_nolock(name, size, 2)?),"}],"del_contents":[{"Del":" env: Arc::new(::sanakirja::Env::new_nolock(name, size)?),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":89,"ins":{"up_context":[{"change":18,"pos":532397}],"down_context":[{"change":18,"pos":532457}],"flag":"BLOCK","start":57312,"end":57377,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":532397},"to":{"change":18,"start":30253,"end":30315},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" env: Arc::new(::sanakirja::Env::new_anon(size, 2)?),"}],"del_contents":[{"Del":" env: Arc::new(::sanakirja::Env::new_anon(size)?),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":115,"ins":{"up_context":[{"change":18,"pos":532869}],"down_context":[{"change":18,"pos":532949}],"flag":"BLOCK","start":57378,"end":57458,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":532869},"to":{"change":18,"start":36508,"end":36706},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" fn begin(txn: ::sanakirja::Txn>) -> Option {"}],"del_contents":[{"Del":" fn begin(\n txn: ::sanakirja::Txn<\n ::sanakirja::Exclusive,\n Arc<::sanakirja::Env<::sanakirja::Exclusive>>,\n >,\n ) -> Option {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":117,"ins":{"up_context":[{"change":18,"pos":532972}],"down_context":[{"change":18,"pos":533810}],"flag":"BLOCK","start":57459,"end":58301,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":532972},"to":{"change":18,"start":532972,"end":533810},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" channels: txn.root_db(Root::Channels as usize)?,"},{"Add":" external: txn.root_db(Root::External as usize)?,"},{"Add":" internal: txn.root_db(Root::Internal as usize)?,"},{"Add":" inodes: txn.root_db(Root::Inodes as usize)?,"},{"Add":" revinodes: txn.root_db(Root::RevInodes as usize)?,"},{"Add":" tree: txn.root_db(Root::Tree as usize)?,"},{"Add":" revtree: txn.root_db(Root::RevTree as usize)?,"},{"Add":" revdep: txn.root_db(Root::RevDep as usize)?,"},{"Add":" touched_files: txn.root_db(Root::TouchedFiles as usize)?,"},{"Add":" rev_touched_files: txn.root_db(Root::RevTouchedFiles as usize)?,"},{"Add":" partials: txn.root_db(Root::Partials as usize)?,"},{"Add":" dep: txn.root_db(Root::Dep as usize)?,"},{"Add":" remotes: txn.root_db(Root::Remotes as usize)?,"}],"del_contents":[{"Del":" channels: txn.root(Root::Channels as usize)?,\n external: txn.root(Root::External as usize)?,\n internal: txn.root(Root::Internal as usize)?,\n inodes: txn.root(Root::Inodes as usize)?,\n revinodes: txn.root(Root::RevInodes as usize)?,\n tree: txn.root(Root::Tree as usize)?,\n revtree: txn.root(Root::RevTree as usize)?,\n revdep: txn.root(Root::RevDep as usize)?,\n touched_files: txn.root(Root::TouchedFiles as usize)?,\n rev_touched_files: txn.root(Root::RevTouchedFiles as usize)?,\n partials: txn.root(Root::Partials as usize)?,\n dep: txn.root(Root::Dep as usize)?,\n remotes: txn.root(Root::Remotes as usize)?,\n rng: thread_rng(),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":146,"ins":{"up_context":[{"change":18,"pos":534298}],"down_context":[{"change":18,"pos":534407}],"flag":"BLOCK","start":58302,"end":58426,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":534298},"to":{"change":18,"start":534298,"end":534407},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" .root_db(Root::Channels as usize)"},{"Add":" .unwrap_or_else(|| btree::create_db_(&mut txn).unwrap()),"}],"del_contents":[{"Del":" .root(Root::Channels as usize)\n .unwrap_or_else(|| txn.create_db().unwrap()),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":149,"ins":{"up_context":[{"change":18,"pos":534433}],"down_context":[{"change":18,"pos":534542}],"flag":"BLOCK","start":58427,"end":58551,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":534433},"to":{"change":18,"start":534433,"end":534542},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" .root_db(Root::External as usize)"},{"Add":" .unwrap_or_else(|| btree::create_db_(&mut txn).unwrap()),"}],"del_contents":[{"Del":" .root(Root::External as usize)\n .unwrap_or_else(|| txn.create_db().unwrap()),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":152,"ins":{"up_context":[{"change":18,"pos":534568}],"down_context":[{"change":18,"pos":534677}],"flag":"BLOCK","start":58552,"end":58676,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":534568},"to":{"change":18,"start":534568,"end":534677},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" .root_db(Root::Internal as usize)"},{"Add":" .unwrap_or_else(|| btree::create_db_(&mut txn).unwrap()),"}],"del_contents":[{"Del":" .root(Root::Internal as usize)\n .unwrap_or_else(|| txn.create_db().unwrap()),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":155,"ins":{"up_context":[{"change":18,"pos":534701}],"down_context":[{"change":18,"pos":534808}],"flag":"BLOCK","start":58677,"end":58799,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":534701},"to":{"change":18,"start":534701,"end":534808},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" .root_db(Root::Inodes as usize)"},{"Add":" .unwrap_or_else(|| btree::create_db_(&mut txn).unwrap()),"}],"del_contents":[{"Del":" .root(Root::Inodes as usize)\n .unwrap_or_else(|| txn.create_db().unwrap()),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":158,"ins":{"up_context":[{"change":18,"pos":534835}],"down_context":[{"change":18,"pos":534945}],"flag":"BLOCK","start":58800,"end":58925,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":534835},"to":{"change":18,"start":534835,"end":534945},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" .root_db(Root::RevInodes as usize)"},{"Add":" .unwrap_or_else(|| btree::create_db_(&mut txn).unwrap()),"}],"del_contents":[{"Del":" .root(Root::RevInodes as usize)\n .unwrap_or_else(|| txn.create_db().unwrap()),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":161,"ins":{"up_context":[{"change":18,"pos":534967}],"down_context":[{"change":18,"pos":535072}],"flag":"BLOCK","start":58926,"end":59046,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":534967},"to":{"change":18,"start":534967,"end":535072},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" .root_db(Root::Tree as usize)"},{"Add":" .unwrap_or_else(|| btree::create_db_(&mut txn).unwrap()),"}],"del_contents":[{"Del":" .root(Root::Tree as usize)\n .unwrap_or_else(|| txn.create_db().unwrap()),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":164,"ins":{"up_context":[{"change":18,"pos":535097}],"down_context":[{"change":18,"pos":535205}],"flag":"BLOCK","start":59047,"end":59170,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":535097},"to":{"change":18,"start":535097,"end":535205},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" .root_db(Root::RevTree as usize)"},{"Add":" .unwrap_or_else(|| btree::create_db_(&mut txn).unwrap()),"}],"del_contents":[{"Del":" .root(Root::RevTree as usize)\n .unwrap_or_else(|| txn.create_db().unwrap()),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":167,"ins":{"up_context":[{"change":18,"pos":535229}],"down_context":[{"change":18,"pos":535336}],"flag":"BLOCK","start":59171,"end":59293,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":535229},"to":{"change":18,"start":535229,"end":535336},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" .root_db(Root::RevDep as usize)"},{"Add":" .unwrap_or_else(|| btree::create_db_(&mut txn).unwrap()),"}],"del_contents":[{"Del":" .root(Root::RevDep as usize)\n .unwrap_or_else(|| txn.create_db().unwrap()),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":170,"ins":{"up_context":[{"change":18,"pos":535357}],"down_context":[{"change":18,"pos":535461}],"flag":"BLOCK","start":59294,"end":59413,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":535357},"to":{"change":18,"start":535357,"end":535461},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" .root_db(Root::Dep as usize)"},{"Add":" .unwrap_or_else(|| btree::create_db_(&mut txn).unwrap()),"}],"del_contents":[{"Del":" .root(Root::Dep as usize)\n .unwrap_or_else(|| txn.create_db().unwrap()),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":173,"ins":{"up_context":[{"change":18,"pos":535492}],"down_context":[{"change":18,"pos":535605}],"flag":"BLOCK","start":59414,"end":59542,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":535492},"to":{"change":18,"start":535492,"end":535605},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" .root_db(Root::TouchedFiles as usize)"},{"Add":" .unwrap_or_else(|| btree::create_db_(&mut txn).unwrap()),"}],"del_contents":[{"Del":" .root(Root::TouchedFiles as usize)\n .unwrap_or_else(|| txn.create_db().unwrap()),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":176,"ins":{"up_context":[{"change":18,"pos":535640}],"down_context":[{"change":18,"pos":535756}],"flag":"BLOCK","start":59543,"end":59674,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":535640},"to":{"change":18,"start":535640,"end":535756},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" .root_db(Root::RevTouchedFiles as usize)"},{"Add":" .unwrap_or_else(|| btree::create_db_(&mut txn).unwrap()),"}],"del_contents":[{"Del":" .root(Root::RevTouchedFiles as usize)\n .unwrap_or_else(|| txn.create_db().unwrap()),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":179,"ins":{"up_context":[{"change":18,"pos":535782}],"down_context":[{"change":18,"pos":535891}],"flag":"BLOCK","start":59675,"end":59799,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":535782},"to":{"change":18,"start":535782,"end":535891},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" .root_db(Root::Partials as usize)"},{"Add":" .unwrap_or_else(|| btree::create_db_(&mut txn).unwrap()),"}],"del_contents":[{"Del":" .root(Root::Partials as usize)\n .unwrap_or_else(|| txn.create_db().unwrap()),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":182,"ins":{"up_context":[{"change":18,"pos":535916}],"down_context":[{"change":18,"pos":536055}],"flag":"BLOCK","start":59800,"end":59923,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":535916},"to":{"change":18,"start":535916,"end":536055},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" .root_db(Root::Remotes as usize)"},{"Add":" .unwrap_or_else(|| btree::create_db_(&mut txn).unwrap()),"}],"del_contents":[{"Del":" .root(Root::Remotes as usize)\n .unwrap_or_else(|| txn.create_db().unwrap()),\n rng: thread_rng(),\n"}]}},{"Edit":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":191,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":536204},"to":{"change":18,"start":536204,"end":536442},"introduced_by":18}],"inode":{"change":18,"pos":531056}}},"contents":[{"Del":"type Graph = ::sanakirja::Db, Edge>;\ntype ChangeSet = ::sanakirja::Db;\ntype RevChangeSet = ::sanakirja::Db;\ntype ChannelStates = ::sanakirja::Db;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":192,"ins":{"up_context":[{"change":18,"pos":536443}],"down_context":[{"change":18,"pos":536591}],"flag":"BLOCK","start":59924,"end":60072,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":536443},"to":{"change":18,"start":36707,"end":36938},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":"pub type Txn = GenericTxn<::sanakirja::Txn>>;"},{"Add":"pub type MutTxn = GenericTxn<::sanakirja::MutTxn, T>>;"}],"del_contents":[{"Del":"pub type Txn = GenericTxn<\n ::sanakirja::Txn<::sanakirja::Exclusive, Arc<::sanakirja::Env<::sanakirja::Exclusive>>>,\n>;\npub type MutTxn =\n GenericTxn<::sanakirja::MutTxn>, T>>;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":203,"ins":{"up_context":[{"change":18,"pos":536988}],"down_context":[{"change":18,"pos":30333}],"flag":"BLOCK","start":60073,"end":60151,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":536988},"to":{"change":18,"start":536988,"end":537041},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":"pub struct GenericTxn> {"}],"del_contents":[{"Del":"pub struct GenericTxn {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":207,"ins":{"up_context":[{"change":18,"pos":30387}],"down_context":[{"change":18,"pos":30425}],"flag":"BLOCK","start":60152,"end":60200,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":30387},"to":{"change":18,"start":30387,"end":30425},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" pub internal: Db,"}],"del_contents":[{"Del":" pub internal: Db,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":209,"ins":{"up_context":[{"change":18,"pos":30444}],"down_context":[{"change":18,"pos":537121}],"flag":"BLOCK","start":60201,"end":60249,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":30444},"to":{"change":18,"start":30444,"end":30482},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" pub external: Db,"}],"del_contents":[{"Del":" pub external: Db,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":213,"ins":{"up_context":[{"change":18,"pos":537211}],"down_context":[{"change":18,"pos":537284}],"flag":"BLOCK","start":60250,"end":60313,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":537211},"to":{"change":18,"start":537211,"end":537284},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" tree: UDb,"},{"Add":" revtree: UDb,"}],"del_contents":[{"Del":" tree: Db,\n revtree: Db,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":222,"ins":{"up_context":[{"change":18,"pos":537466}],"down_context":[{"change":18,"pos":537793}],"flag":"BLOCK","start":60314,"end":60507,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":537466},"to":{"change":18,"start":537466,"end":537793},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" partials: UDb>,"},{"Add":" channels: UDb,"},{"Add":" remotes: UDb,"},{"Add":" pub(crate) open_channels: RefCell>>,"}],"del_contents":[{"Del":" partials: Db>,\n channels: Db,\n remotes: Db, Db, Db)>,\n rng: ThreadRng,\n open_channels: RefCell>>,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":232,"ins":{"up_context":[{"change":18,"pos":538066}],"down_context":[{"change":18,"pos":538133}],"flag":"BLOCK","start":60508,"end":60600,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":538066},"to":{"change":18,"start":538066,"end":538133},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":"unsafe impl> Send for GenericTxn {}"}],"del_contents":[{"Del":"unsafe impl Send for GenericTxn {}\n"}]}},{"Edit":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":234,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":538134},"to":{"change":18,"start":538134,"end":538243},"introduced_by":18}],"inode":{"change":18,"pos":531056}}},"contents":[{"Del":"#[derive(Debug)]\npub struct DatabaseReport {\n pub refs: usize,\n pub stats: ::sanakirja::Statistics,\n}\n\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":235,"ins":{"up_context":[{"change":18,"pos":538254}],"down_context":[{"change":18,"pos":539904}],"flag":"BLOCK","start":60601,"end":63539,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":538254},"to":{"change":18,"start":538254,"end":539439},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":539439},"to":{"change":18,"start":39467,"end":39585},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":39585},"to":{"change":18,"start":539516,"end":539904},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":539516},"to":{"change":18,"start":539516,"end":539904},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" pub fn check_database(&self) {"},{"Add":" let mut refs = std::collections::BTreeMap::new();"},{"Add":" debug!(\"check: internal 0x{:x}\", self.internal.db);"},{"Add":" ::sanakirja::debug::add_refs(&self.txn, &self.internal, &mut refs).unwrap();"},{"Add":" debug!(\"check: external 0x{:x}\", self.external.db);"},{"Add":" ::sanakirja::debug::add_refs(&self.txn, &self.external, &mut refs).unwrap();"},{"Add":" debug!(\"check: inodes 0x{:x}\", self.inodes.db);"},{"Add":" ::sanakirja::debug::add_refs(&self.txn, &self.inodes, &mut refs).unwrap();"},{"Add":" debug!(\"check: revinodes 0x{:x}\", self.revinodes.db);"},{"Add":" ::sanakirja::debug::add_refs(&self.txn, &self.revinodes, &mut refs).unwrap();"},{"Add":" debug!(\"check: tree 0x{:x}\", self.tree.db);"},{"Add":" ::sanakirja::debug::add_refs(&self.txn, &self.tree, &mut refs).unwrap();"},{"Add":" debug!(\"check: revtree 0x{:x}\", self.revtree.db);"},{"Add":" ::sanakirja::debug::add_refs(&self.txn, &self.revtree, &mut refs).unwrap();"},{"Add":" debug!(\"check: revdep 0x{:x}\", self.revdep.db);"},{"Add":" ::sanakirja::debug::add_refs(&self.txn, &self.revdep, &mut refs).unwrap();"},{"Add":" debug!(\"check: dep 0x{:x}\", self.dep.db);"},{"Add":" ::sanakirja::debug::add_refs(&self.txn, &self.dep, &mut refs).unwrap();"},{"Add":" debug!(\"check: touched_files 0x{:x}\", self.touched_files.db);"},{"Add":" ::sanakirja::debug::add_refs(&self.txn, &self.touched_files, &mut refs).unwrap();"},{"Add":" debug!(\"check: rev_touched_files 0x{:x}\", self.rev_touched_files.db);"},{"Add":" ::sanakirja::debug::add_refs(&self.txn, &self.rev_touched_files, &mut refs).unwrap();"},{"Add":" debug!(\"check: partials 0x{:x}\", self.partials.db);"},{"Add":" ::sanakirja::debug::add_refs(&self.txn, &self.partials, &mut refs).unwrap();"},{"Add":" debug!(\"check: channels 0x{:x}\", self.channels.db);"},{"Add":" ::sanakirja::debug::add_refs(&self.txn, &self.channels, &mut refs).unwrap();"},{"Add":" for x in btree::iter(&self.txn, &self.channels, None).unwrap() {"},{"Add":" let (name, tup) = x.unwrap();"},{"Add":" debug!(\"check: channel name: {:?}\", name.as_str());"},{"Add":" let graph: Db, SerializedEdge> = Db::from_page(tup.0[0].into());"},{"Add":" let changes: Db = Db::from_page(tup.0[1].into());"},{"Add":" let revchanges: UDb> = UDb::from_page(tup.0[2].into());"},{"Add":" let states: UDb = UDb::from_page(tup.0[3].into());"},{"Add":" debug!(\"check: graph 0x{:x}\", graph.db);"},{"Add":" ::sanakirja::debug::add_refs(&self.txn, &graph, &mut refs).unwrap();"},{"Add":" debug!(\"check: changes 0x{:x}\", changes.db);"},{"Add":" ::sanakirja::debug::add_refs(&self.txn, &changes, &mut refs).unwrap();"},{"Add":" debug!(\"check: revchanges 0x{:x}\", revchanges.db);"},{"Add":" ::sanakirja::debug::add_refs(&self.txn, &revchanges, &mut refs).unwrap();"},{"Add":" debug!(\"check: states 0x{:x}\", states.db);"},{"Add":" ::sanakirja::debug::add_refs(&self.txn, &states, &mut refs).unwrap();"}],"del_contents":[{"Del":" pub fn check_database(&self) -> DatabaseReport {\n let mut refs = HashMap::new();\n self.txn.references(&mut refs, self.internal);\n info!(\"refs = {:?}\", refs);\n self.txn.references(&mut refs, self.external);\n info!(\"refs = {:?}\", refs);\n self.txn.references(&mut refs, self.inodes);\n info!(\"refs = {:?}\", refs);\n self.txn.references(&mut refs, self.revinodes);\n info!(\"refs = {:?}\", refs);\n self.txn.references(&mut refs, self.tree);\n info!(\"refs = {:?}\", refs);\n self.txn.references(&mut refs, self.revtree);\n info!(\"refs = {:?}\", refs);\n self.txn.references(&mut refs, self.revdep);\n info!(\"refs = {:?}\", refs);\n self.txn.references(&mut refs, self.dep);\n info!(\"refs = {:?}\", refs);\n self.txn.references(&mut refs, self.touched_files);\n info!(\"refs = {:?}\", refs);\n self.txn.references(&mut refs, self.rev_touched_files);\n info!(\"refs = {:?}\", refs);\n self.txn.references(&mut refs, self.partials);\n info!(\"refs = {:?}\", refs);\n self.txn.references(&mut refs, self.channels);\n info!(\"refs = {:?}\", refs);\n"},{"Del":" for x in self.txn.iter(&self.channels, None).unwrap() {\n let (a, (g, c, r, s, _, _)) = x.unwrap();\n"},{"Del":" info!(\"channel = {:?}\", a);\n self.txn.references(&mut refs, g);\n info!(\"refs = {:?}\", refs);\n self.txn.references(&mut refs, c);\n info!(\"refs = {:?}\", refs);\n self.txn.references(&mut refs, r);\n info!(\"refs = {:?}\", refs);\n self.txn.references(&mut refs, s);\n info!(\"refs = {:?}\", refs);\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":277,"ins":{"up_context":[{"change":18,"pos":539914}],"down_context":[{"change":18,"pos":541955}],"flag":"BLOCK","start":63540,"end":64505,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":539914},"to":{"change":18,"start":539914,"end":540004},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":540004},"to":{"change":18,"start":39586,"end":39694},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":39694},"to":{"change":18,"start":540071,"end":540597},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":540071},"to":{"change":18,"start":540071,"end":540597},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":540597},"to":{"change":18,"start":39695,"end":39813},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":39813},"to":{"change":18,"start":540674,"end":541955},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":540674},"to":{"change":18,"start":540674,"end":541955},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" debug!(\"check: remotes 0x{:x}\", self.remotes.db);"},{"Add":" ::sanakirja::debug::add_refs(&self.txn, &self.remotes, &mut refs).unwrap();"},{"Add":" for x in btree::iter(&self.txn, &self.remotes, None).unwrap() {"},{"Add":" let (name, tup) = x.unwrap();"},{"Add":" debug!(\"check: remote name: {:?}\", name.as_str());"},{"Add":" let remote: UDb = UDb::from_page(tup.0[0].into());"},{"Add":" let rev: UDb = UDb::from_page(tup.0[1].into());"},{"Add":" let states: UDb = UDb::from_page(tup.0[2].into());"},{"Add":" debug!(\"check: remote 0x{:x}\", remote.db);"},{"Add":" ::sanakirja::debug::add_refs(&self.txn, &remote, &mut refs).unwrap();"},{"Add":" debug!(\"check: rev 0x{:x}\", rev.db);"},{"Add":" ::sanakirja::debug::add_refs(&self.txn, &rev, &mut refs).unwrap();"},{"Add":" debug!(\"check: states 0x{:x}\", states.db);"},{"Add":" ::sanakirja::debug::add_refs(&self.txn, &states, &mut refs).unwrap();"}],"del_contents":[{"Del":" self.txn.references(&mut refs, self.remotes);\n info!(\"refs = {:?}\", refs);\n"},{"Del":" for x in self.txn.iter(&self.remotes, None).unwrap() {\n let (a, (u, v, w)) = x.unwrap();\n"},{"Del":" info!(\"remote = {:?}\", a);\n self.txn.references(&mut refs, u);\n info!(\"refs = {:?}\", refs);\n self.txn.references(&mut refs, v);\n info!(\"refs = {:?}\", refs);\n self.txn.references(&mut refs, w);\n info!(\"refs = {:?}\", refs);\n }\n\n let stats = self.txn.statistics();\n let report = DatabaseReport {\n refs: refs.len(),\n stats: stats.clone(),\n };\n let mut channel_roots: Vec = Vec::new();\n"},{"Del":" for x in self.txn.iter(&self.channels, None).unwrap() {\n let (a, (g, c, r, s, _, _)) = x.unwrap();\n"},{"Del":" info!(\"channel: {:?}\", a);\n unsafe {\n channel_roots.push(std::mem::transmute(g));\n channel_roots.push(std::mem::transmute(c));\n channel_roots.push(std::mem::transmute(r));\n channel_roots.push(std::mem::transmute(s));\n }\n }\n ::sanakirja::debug_(&self.txn, &channel_roots[..], \"debug_sanakirja\", true);\n self.txn.check_references(&mut refs);\n\n info!(\"stats = {:?}\", stats);\n let occupied_pages =\n stats.total_pages - stats.free_pages.len() - stats.bookkeeping_pages.len();\n for i in 1..(stats.total_pages as u64) {\n let p = i * 4096;\n if !refs.contains_key(&p)\n && !stats.free_pages.contains(&p)\n && !stats.bookkeeping_pages.contains(&p)\n {\n panic!(\"does not contain {:?} ({:?})\", i, p);\n }\n }\n\n // check that there is no intersection.\n for (r, _) in refs.iter() {\n if stats.free_pages.contains(r) {\n panic!(\"referenced page is free: {:?}\", r);\n }\n if stats.bookkeeping_pages.contains(r) {\n panic!(\"referenced page is a bookkeeping page: {:?}\", r);\n }\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":292,"ins":{"up_context":[{"change":18,"pos":541965}],"down_context":[{"change":18,"pos":542213}],"flag":"BLOCK","start":64506,"end":64638,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":541965},"to":{"change":18,"start":541965,"end":542213},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" ::sanakirja::debug::add_free_refs(&self.txn, &mut refs).unwrap();"},{"Add":" ::sanakirja::debug::check_free(&self.txn, &refs);"}],"del_contents":[{"Del":" for p in stats.free_pages.iter() {\n if stats.bookkeeping_pages.contains(p) {\n panic!(\"bookkeeping inter free: {:?}\", p);\n }\n }\n\n assert_eq!(1 + refs.len(), occupied_pages);\n\n report\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":297,"ins":{"up_context":[{"change":18,"pos":542222}],"down_context":[{"change":18,"pos":39879}],"flag":"BLOCK","start":64639,"end":64783,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":542222},"to":{"change":18,"start":39814,"end":39878},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":13699},"to":{"change":18,"start":542300,"end":542345},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":39878},"to":{"change":18,"start":542300,"end":542345},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":542300},"to":{"change":18,"start":542300,"end":542345},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":"impl> GraphTxnT for GenericTxn {"},{"Add":" type Graph = Db, SerializedEdge>;"}],"del_contents":[{"Del":"impl GraphTxnT for GenericTxn {\n"},{"Del":" type Graph = Db, Edge>;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":301,"ins":{"up_context":[{"change":18,"pos":39918}],"down_context":[{"change":18,"pos":542532}],"flag":"BLOCK","start":64784,"end":65024,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":542403},"to":{"change":18,"start":39919,"end":40074},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" sanakirja_get!(graph, Vertex, SerializedEdge, GraphError);"},{"Add":" fn get_external("},{"Add":" &self,"},{"Add":" p: &ChangeId,"},{"Add":" ) -> Result, TxnErr> {"},{"Add":" debug!(\"get_external {:?}\", p);"}],"del_contents":[{"Del":" sanakirja_get!(graph, Vertex, Edge, GraphError);\n fn get_external(&self, p: ChangeId) -> Result, TxnErr> {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":308,"ins":{"up_context":[{"change":18,"pos":542557}],"down_context":[{"change":18,"pos":542586}],"flag":"BLOCK","start":65025,"end":65058,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":542557},"to":{"change":18,"start":40075,"end":40196},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" Ok(Some(&HASH_NONE))"}],"del_contents":[{"Del":" Ok(Some(Hash::None))\n } else if let Ok(x) = self.txn.get(&self.external, p, None) {\n Ok(x)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":310,"ins":{"up_context":[{"change":18,"pos":542603}],"down_context":[{"change":18,"pos":542653}],"flag":"BLOCK","start":65059,"end":65384,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":542603},"to":{"change":18,"start":40197,"end":40254},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" match btree::get(&self.txn, &self.external, p, None) {"},{"Add":" Ok(Some((k, v))) if k == p => Ok(Some(v)),"},{"Add":" Ok(_) => Ok(None),"},{"Add":" Err(e) => {"},{"Add":" error!(\"{:?}\", e);"},{"Add":" Err(TxnErr(SanakirjaError::PristineCorrupt))"},{"Add":" }"},{"Add":" }"}],"del_contents":[{"Del":" Err(TxnErr(SanakirjaError::PristineCorrupt))\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":321,"ins":{"up_context":[{"change":18,"pos":36940}],"down_context":[{"change":18,"pos":30483}],"flag":"BLOCK","start":65385,"end":65573,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":36940},"to":{"change":18,"start":40255,"end":40347},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":40347},"to":{"change":18,"start":542746,"end":542778},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":542746},"to":{"change":18,"start":542746,"end":542778},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":542778},"to":{"change":18,"start":40348,"end":40473},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" fn get_internal(&self, p: &SerializedHash) -> Result, TxnErr> {"},{"Add":" if p.t == HashAlgorithm::None as u8 {"},{"Add":" Ok(Some(&ChangeId::ROOT))"}],"del_contents":[{"Del":" fn get_internal(&self, p: Hash) -> Result, TxnErr> {\n"},{"Del":" if let Hash::None = p {\n"},{"Del":" Ok(Some(ChangeId::ROOT))\n } else if let Ok(x) = self.txn.get(&self.internal, p, None) {\n Ok(x)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":325,"ins":{"up_context":[{"change":18,"pos":30500}],"down_context":[{"change":18,"pos":30557}],"flag":"BLOCK","start":65574,"end":65900,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":30500},"to":{"change":18,"start":30500,"end":30557},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" match btree::get(&self.txn, &self.internal, &p, None) {"},{"Add":" Ok(Some((k, v))) if k == p => Ok(Some(v)),"},{"Add":" Ok(_) => Ok(None),"},{"Add":" Err(e) => {"},{"Add":" error!(\"{:?}\", e);"},{"Add":" Err(TxnErr(SanakirjaError::PristineCorrupt))"},{"Add":" }"},{"Add":" }"}],"del_contents":[{"Del":" Err(TxnErr(SanakirjaError::PristineCorrupt))\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":346,"ins":{"up_context":[{"change":18,"pos":30830}],"down_context":[{"change":18,"pos":31257}],"flag":"BLOCK","start":65901,"end":66234,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":30830},"to":{"change":18,"start":30830,"end":31257},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" let edge = SerializedEdge::new(min_flag, dest.change, dest.pos, ChangeId::ROOT);"},{"Add":" let mut cursor = btree::cursor::Cursor::new(&self.txn, g).map_err(TxnErr)?;"},{"Add":" cursor.set(&self.txn, &key, Some(&edge))?;"},{"Add":" Ok(Adj {"},{"Add":" cursor,"},{"Add":" key,"},{"Add":" min_flag,"},{"Add":" max_flag,"},{"Add":" })"}],"del_contents":[{"Del":" let edge = Edge {\n flag: min_flag,\n dest,\n introduced_by: ChangeId::ROOT,\n };\n if let Ok((cursor, _)) = self.txn.set_cursors(g, Some((key, Some(edge)))) {\n Ok(Adj {\n cursor,\n key,\n min_flag,\n max_flag,\n })\n } else {\n Err(TxnErr(SanakirjaError::PristineCorrupt))\n }\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":357,"ins":{"up_context":[{"change":18,"pos":31264}],"down_context":[{"change":18,"pos":31296}],"flag":"BLOCK","start":66235,"end":66274,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":31264},"to":{"change":18,"start":31264,"end":31296},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" fn next_adj<'a>("},{"Add":" &'a self,"}],"del_contents":[{"Del":" fn next_adj(\n &self,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":361,"ins":{"up_context":[{"change":18,"pos":31348}],"down_context":[{"change":18,"pos":31406}],"flag":"BLOCK","start":66275,"end":66347,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":31348},"to":{"change":18,"start":31348,"end":31406},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" ) -> Option>> {"}],"del_contents":[{"Del":" ) -> Option>> {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":369,"ins":{"up_context":[{"change":18,"pos":31538}],"down_context":[{"change":18,"pos":31604}],"flag":"BLOCK","start":66348,"end":66415,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":31538},"to":{"change":18,"start":31538,"end":31604},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" ) -> Result<&Vertex, BlockError> {"}],"del_contents":[{"Del":" ) -> Result, BlockError> {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":377,"ins":{"up_context":[{"change":18,"pos":31749}],"down_context":[{"change":18,"pos":31815}],"flag":"BLOCK","start":66416,"end":66483,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":31749},"to":{"change":18,"start":31749,"end":31815},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" ) -> Result<&Vertex, BlockError> {"}],"del_contents":[{"Del":" ) -> Result, BlockError> {\n"}]}},{"Edit":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":382,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":31868},"to":{"change":18,"start":31868,"end":32626},"introduced_by":18}],"inode":{"change":18,"pos":531056}}},"contents":[{"Del":"unsafe fn next_graph(\n txn: &T,\n cursor: &mut ::sanakirja::Cursor,\n) -> Result, Edge)>, BlockError> {\n match ::sanakirja::next::<_, Vertex, Edge>(txn, cursor) {\n Ok(x) => Ok(x),\n Err(::sanakirja::CRCError {}) => Err(BlockError::Txn(SanakirjaError::PristineCorrupt)),\n }\n}\n\nunsafe fn prev_graph(\n txn: &T,\n cursor: &mut ::sanakirja::Cursor,\n) -> Result, Edge)>, BlockError> {\n match ::sanakirja::prev::<_, Vertex, Edge>(txn, cursor) {\n Ok(x) => Ok(x),\n Err(::sanakirja::CRCError {}) => Err(BlockError::Txn(SanakirjaError::PristineCorrupt)),\n }\n}\n\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":383,"ins":{"up_context":[{"change":18,"pos":32641}],"down_context":[{"change":18,"pos":32700}],"flag":"BLOCK","start":66484,"end":66575,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":32641},"to":{"change":18,"start":32641,"end":32700},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":"pub fn next_adj<'a, T: ::sanakirja::LoadPage>("},{"Add":" txn: &'a T,"}],"del_contents":[{"Del":"pub fn next_adj(\n txn: &T,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":386,"ins":{"up_context":[{"change":18,"pos":32717}],"down_context":[{"change":18,"pos":32769}],"flag":"BLOCK","start":66576,"end":66642,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":32717},"to":{"change":18,"start":32717,"end":32769},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":") -> Option>> {"}],"del_contents":[{"Del":") -> Option>> {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":388,"ins":{"up_context":[{"change":18,"pos":32780}],"down_context":[{"change":18,"pos":32903}],"flag":"BLOCK","start":66643,"end":66736,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":32780},"to":{"change":18,"start":32780,"end":32903},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" let x: Result, &SerializedEdge)>, _> = a.cursor.next(txn);"}],"del_contents":[{"Del":" let x: Result, Edge)>, _> =\n unsafe { ::sanakirja::next(txn, &mut a.cursor) };\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":391,"ins":{"up_context":[{"change":18,"pos":32955}],"down_context":[{"change":18,"pos":33145}],"flag":"BLOCK","start":66737,"end":66870,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":32955},"to":{"change":18,"start":32955,"end":33145},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" if *v == a.key {"},{"Add":" if e.flag() >= a.min_flag {"},{"Add":" if e.flag() <= a.max_flag {"}],"del_contents":[{"Del":" debug!(\"adjacent iterator: {:?} {:?}\", v, e);\n if v == a.key {\n if e.flag >= a.min_flag {\n if e.flag <= a.max_flag {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":399,"ins":{"up_context":[{"change":18,"pos":33315}],"down_context":[{"change":18,"pos":33353}],"flag":"BLOCK","start":66871,"end":66910,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":33315},"to":{"change":18,"start":33315,"end":33353},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" } else if *v > a.key {"}],"del_contents":[{"Del":" } else if v > a.key {\n"}]}},{"Edit":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":405,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":33502},"to":{"change":18,"start":33502,"end":33553},"introduced_by":18}],"inode":{"change":18,"pos":531056}}},"contents":[{"Del":" debug!(\"adjacent iterator: over\");\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":412,"ins":{"up_context":[{"change":18,"pos":33630}],"down_context":[{"change":18,"pos":33744}],"flag":"BLOCK","start":66911,"end":67074,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":33630},"to":{"change":18,"start":33630,"end":33744},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":"pub fn find_block<'a, T: ::sanakirja::LoadPage>("},{"Add":" txn: &'a T,"},{"Add":" graph: &::sanakirja::btree::Db, SerializedEdge>,"}],"del_contents":[{"Del":"pub fn find_block(\n txn: &T,\n graph: &::sanakirja::Db, Edge>,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":416,"ins":{"up_context":[{"change":18,"pos":33771}],"down_context":[{"change":18,"pos":33831}],"flag":"BLOCK","start":67075,"end":67139,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":33771},"to":{"change":18,"start":33771,"end":33831},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":") -> Result<&'a Vertex, BlockError> {"}],"del_contents":[{"Del":") -> Result, BlockError> {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":418,"ins":{"up_context":[{"change":18,"pos":33859}],"down_context":[{"change":18,"pos":33892}],"flag":"BLOCK","start":67140,"end":67174,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":33859},"to":{"change":18,"start":33859,"end":33892},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" return Ok(&Vertex::ROOT);"}],"del_contents":[{"Del":" return Ok(Vertex::ROOT);\n"}]}},{"Edit":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":424,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":33989},"to":{"change":18,"start":33989,"end":34253},"introduced_by":18}],"inode":{"change":18,"pos":531056}}},"contents":[{"Del":" };\n debug!(target: \"libpijul::find_block\", \"find_block {:?}\", key);\n let mut cursor = if let Ok((cursor, _)) = txn.set_cursors(&graph, Some((key, None))) {\n cursor\n } else {\n return Err(BlockError::Txn(SanakirjaError::PristineCorrupt));\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":425,"ins":{"up_context":[{"change":18,"pos":34260}],"down_context":[{"change":18,"pos":34341}],"flag":"BLOCK","start":67175,"end":67495,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":34260},"to":{"change":18,"start":34260,"end":34341},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" let mut cursor ="},{"Add":" btree::cursor::Cursor::new(txn, &graph).map_err(|x| BlockError::Txn(x.into()))?;"},{"Add":" let mut k = if let Some((k, _)) = cursor.set(txn, &key, None).map_err(|x| BlockError::Txn(x.into()))? {"},{"Add":" k"},{"Add":" } else if let Some((k, _)) = cursor.prev(txn).map_err(|x| BlockError::Txn(x.into()))? {"}],"del_contents":[{"Del":" let mut k = if let Some((k, _)) = unsafe { next_graph(txn, &mut cursor)? } {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":434,"ins":{"up_context":[{"change":18,"pos":34423}],"down_context":[{"change":18,"pos":34696}],"flag":"BLOCK","start":67496,"end":67713,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":34423},"to":{"change":18,"start":34423,"end":34696},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" // The only guarantee here is that k is either the first key >="},{"Add":" // `key`. We might need to rewind by one step if key is strictly"},{"Add":" // larger than the result (i.e. if `p` is in the middle of the"},{"Add":" // key)."}],"del_contents":[{"Del":" debug!(\"k = {:?}\", k);\n // The only guarantee here is that k is either the first key\n // >= `key`, or the key just before that. We might need to\n // rewind by one step if key is strictly larger than the\n // result (i.e. if `p` is in the middle of the key).\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":439,"ins":{"up_context":[{"change":18,"pos":34773}],"down_context":[{"change":18,"pos":34923}],"flag":"BLOCK","start":67714,"end":67804,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":34773},"to":{"change":18,"start":34773,"end":34923},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" if let Some((k_, _)) = cursor.prev(txn).map_err(|x| BlockError::Txn(x.into()))? {"}],"del_contents":[{"Del":" debug!(target: \"libpijul::find_block\", \"find_block while {:?}\", k);\n if let Some((k_, _)) = unsafe { prev_graph(txn, &mut cursor)? } {\n"}]}},{"Edit":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":446,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":35005},"to":{"change":18,"start":35005,"end":35080},"introduced_by":18}],"inode":{"change":18,"pos":531056}}},"contents":[{"Del":" debug!(target: \"libpijul::find_block\", \"find_block loop {:?}\", k);\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":453,"ins":{"up_context":[{"change":18,"pos":35355}],"down_context":[{"change":18,"pos":35429}],"flag":"BLOCK","start":67805,"end":67895,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":35355},"to":{"change":18,"start":35355,"end":35429},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" if let Some((k_, _)) = cursor.next(txn).map_err(|x| BlockError::Txn(x.into()))? {"}],"del_contents":[{"Del":" if let Some((k_, _)) = unsafe { next_graph(txn, &mut cursor)? } {\n"}]}},{"Edit":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":459,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":35500},"to":{"change":18,"start":35500,"end":35572},"introduced_by":18}],"inode":{"change":18,"pos":531056}}},"contents":[{"Del":" debug!(target: \"libpijul::find_block\", \"find_block None, {:?}\", k);\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":463,"ins":{"up_context":[{"change":18,"pos":35630}],"down_context":[{"change":18,"pos":35748}],"flag":"BLOCK","start":67896,"end":68063,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":35630},"to":{"change":18,"start":35630,"end":35748},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":"pub fn find_block_end<'a, T: ::sanakirja::LoadPage>("},{"Add":" txn: &'a T,"},{"Add":" graph: &::sanakirja::btree::Db, SerializedEdge>,"}],"del_contents":[{"Del":"pub fn find_block_end(\n txn: &T,\n graph: &::sanakirja::Db, Edge>,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":467,"ins":{"up_context":[{"change":18,"pos":35775}],"down_context":[{"change":18,"pos":35835}],"flag":"BLOCK","start":68064,"end":68128,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":35775},"to":{"change":18,"start":35775,"end":35835},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":") -> Result<&'a Vertex, BlockError> {"}],"del_contents":[{"Del":") -> Result, BlockError> {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":469,"ins":{"up_context":[{"change":18,"pos":35863}],"down_context":[{"change":18,"pos":35896}],"flag":"BLOCK","start":68129,"end":68163,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":35863},"to":{"change":18,"start":35863,"end":35896},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" return Ok(&Vertex::ROOT);"}],"del_contents":[{"Del":" return Ok(Vertex::ROOT);\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":476,"ins":{"up_context":[{"change":18,"pos":36000}],"down_context":[{"change":18,"pos":36384}],"flag":"BLOCK","start":68164,"end":68519,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":36000},"to":{"change":18,"start":36000,"end":36384},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" let mut cursor = ::sanakirja::btree::cursor::Cursor::new(txn, graph)"},{"Add":" .map_err(|x| BlockError::Txn(x.into()))?;"},{"Add":" let mut k = if let Some((k, _)) = cursor"},{"Add":" .set(txn, &key, None)"},{"Add":" .map_err(|x| BlockError::Txn(x.into()))?"},{"Add":" {"},{"Add":" k"},{"Add":" } else if let Some((k, _)) = cursor.prev(txn).map_err(|x| BlockError::Txn(x.into()))? {"}],"del_contents":[{"Del":" debug!(target: \"libpijul::find_block_end\", \"find_block_end {:?}, p.change.0 = {:?}\", key, p.change.0);\n let mut cursor = if let Ok((cursor, _)) = txn.set_cursors(&graph, Some((key, None))) {\n cursor\n } else {\n return Err(BlockError::Txn(SanakirjaError::PristineCorrupt));\n };\n let mut k = if let Some((k, _)) = unsafe { next_graph(txn, &mut cursor)? } {\n"}]}},{"Edit":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":488,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":36466},"to":{"change":18,"start":36466,"end":36581},"introduced_by":18}],"inode":{"change":18,"pos":531056}}},"contents":[{"Del":" // The only guarantee here is that k is either the first key\n // before `key`, or the key just before that.\n"}]}},{"Edit":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":489,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":36592},"to":{"change":18,"start":36592,"end":36705},"introduced_by":18}],"inode":{"change":18,"pos":531056}}},"contents":[{"Del":" debug!(target: \"libpijul::find_block_end\", \"find_block_end loop {:?} k.change.0 = {:?}\", k, k.change.0);\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":502,"ins":{"up_context":[{"change":18,"pos":37183}],"down_context":[{"change":18,"pos":37257}],"flag":"BLOCK","start":68520,"end":68610,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":37183},"to":{"change":18,"start":37183,"end":37257},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" if let Some((k_, _)) = cursor.prev(txn).map_err(|x| BlockError::Txn(x.into()))? {"}],"del_contents":[{"Del":" if let Some((k_, _)) = unsafe { prev_graph(txn, &mut cursor)? } {\n"}]}},{"Edit":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":510,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":37414},"to":{"change":18,"start":37414,"end":37525},"introduced_by":18}],"inode":{"change":18,"pos":531056}}},"contents":[{"Del":" debug!(target: \"libpijul::find_block_end\", \"find_block_end k(0) = {:?} k.change.0 = {:?}\", k, k.change.0);\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":511,"ins":{"up_context":[{"change":18,"pos":37600}],"down_context":[{"change":18,"pos":37674}],"flag":"BLOCK","start":68611,"end":68701,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":37600},"to":{"change":18,"start":37600,"end":37674},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" if let Some((k_, _)) = cursor.next(txn).map_err(|x| BlockError::Txn(x.into()))? {"}],"del_contents":[{"Del":" if let Some((k_, _)) = unsafe { next_graph(txn, &mut cursor)? } {\n"}]}},{"Edit":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":517,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":37729},"to":{"change":18,"start":37729,"end":37841},"introduced_by":18}],"inode":{"change":18,"pos":531056}}},"contents":[{"Del":" debug!(target: \"libpijul::find_block_end\", \"find_block_end k(1) = {:?}, k.change.0 = {:?}\", k, k.change.0);\n"}]}},{"Edit":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":520,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":37966},"to":{"change":18,"start":37966,"end":37988},"introduced_by":18}],"inode":{"change":18,"pos":531056}}},"contents":[{"Del":" debug!(\"ok\");\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":527,"ins":{"up_context":[{"change":18,"pos":38085}],"down_context":[{"change":18,"pos":38122}],"flag":"BLOCK","start":68702,"end":68856,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":38085},"to":{"change":18,"start":38085,"end":38122},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" pub cursor: ::sanakirja::btree::cursor::Cursor<"},{"Add":" Vertex,"},{"Add":" SerializedEdge,"},{"Add":" P, SerializedEdge>,"},{"Add":" >,"}],"del_contents":[{"Del":" pub cursor: ::sanakirja::Cursor,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":537,"ins":{"up_context":[{"change":18,"pos":38214}],"down_context":[{"change":18,"pos":38322}],"flag":"BLOCK","start":68857,"end":69107,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":38214},"to":{"change":18,"start":38214,"end":38322},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":"impl> GraphIter for GenericTxn {"},{"Add":" type GraphCursor = ::sanakirja::btree::cursor::Cursor<"},{"Add":" Vertex,"},{"Add":" SerializedEdge,"},{"Add":" P, SerializedEdge>,"},{"Add":" >;"}],"del_contents":[{"Del":"impl GraphIter for GenericTxn {\n type GraphCursor = ::sanakirja::Cursor;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":545,"ins":{"up_context":[{"change":18,"pos":38422}],"down_context":[{"change":18,"pos":38539}],"flag":"BLOCK","start":69108,"end":69176,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":38422},"to":{"change":18,"start":38422,"end":38528},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":38528},"to":{"change":18,"start":40474,"end":40531},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":542828},"to":{"change":18,"start":40474,"end":40531},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":40531},"to":{"change":18,"start":38529,"end":38539},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" Ok(::sanakirja::btree::cursor::Cursor::new(&self.txn, &g)?)"}],"del_contents":[{"Del":" if let Ok((cursor, _)) = self.txn.set_cursors(&g, None) {\n Ok(cursor)\n } else {\n"},{"Del":" Err(TxnErr(SanakirjaError::PristineCorrupt))\n"},{"Del":" }\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":548,"ins":{"up_context":[{"change":18,"pos":38546}],"down_context":[{"change":18,"pos":38580}],"flag":"BLOCK","start":69177,"end":69222,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":38546},"to":{"change":18,"start":38546,"end":38580},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" fn next_graph<'txn>("},{"Add":" &'txn self,"}],"del_contents":[{"Del":" fn next_graph(\n &self,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":552,"ins":{"up_context":[{"change":18,"pos":38640}],"down_context":[{"change":18,"pos":38777}],"flag":"BLOCK","start":69223,"end":69361,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":38640},"to":{"change":18,"start":38640,"end":38777},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" ) -> Option, &'txn SerializedEdge), TxnErr>>"},{"Add":" {"},{"Add":" match a.next(&self.txn) {"}],"del_contents":[{"Del":" ) -> Option, Edge), TxnErr>> {\n match unsafe { ::sanakirja::next(&self.txn, a) } {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":557,"ins":{"up_context":[{"change":18,"pos":38847}],"down_context":[{"change":18,"pos":542878}],"flag":"BLOCK","start":69362,"end":69502,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":38847},"to":{"change":18,"start":38847,"end":38944},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" Err(e) => {"},{"Add":" error!(\"{:?}\", e);"},{"Add":" Some(Err(TxnErr(SanakirjaError::PristineCorrupt)))"},{"Add":" }"}],"del_contents":[{"Del":" Err(::sanakirja::CRCError {}) => Some(Err(TxnErr(SanakirjaError::PristineCorrupt))),\n"}]}},{"Edit":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":565,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":542895}],"down_context":[{"change":18,"pos":38945}],"flag":"BLOCK","start":69503,"end":70302,"inode":{"change":18,"pos":531056}}},"contents":[{"Add":"// There is a choice here: the datastructure for `revchanges` is"},{"Add":"// intuitively a list. Moreover, when removing a change, we must"},{"Add":"// recompute the entire merkle tree after the removed change."},{"Add":"//"},{"Add":"// This seems to indicate that a linked list could be an appropriate"},{"Add":"// structure (a growable array is excluded because amortised"},{"Add":"// complexity is not really acceptable here)."},{"Add":"//"},{"Add":"// However, we want to be able to answers queries such as \"when was"},{"Add":"// change X introduced?\" without having to read the entire database."},{"Add":"//"},{"Add":"// Additionally, even though `SerializedMerkle` has only one"},{"Add":"// implementation, and is therefore sized in the current"},{"Add":"// implementation, we can't exclude that other algorithms may be"},{"Add":"// added, which means that the pages inside linked lists won't even be"},{"Add":"// randomly-accessible arrays."}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":582,"ins":{"up_context":[{"change":18,"pos":38966}],"down_context":[{"change":18,"pos":39127}],"flag":"BLOCK","start":70303,"end":70500,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":38966},"to":{"change":18,"start":38966,"end":39127},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" pub graph: Db, SerializedEdge>,"},{"Add":" pub changes: Db,"},{"Add":" pub revchanges: UDb>,"},{"Add":" pub states: UDb,"}],"del_contents":[{"Del":" pub graph: Db, Edge>,\n pub changes: Db,\n pub revchanges: Db,\n pub states: Db,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":591,"ins":{"up_context":[{"change":18,"pos":39224}],"down_context":[{"change":18,"pos":39225}],"flag":"BLOCK","start":70501,"end":70592,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":39224},"to":{"change":18,"start":40535,"end":40601},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":542895},"to":{"change":18,"start":40535,"end":40601},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":"impl> ChannelTxnT for GenericTxn {"}],"del_contents":[{"Del":"impl ChannelTxnT for GenericTxn {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":594,"ins":{"up_context":[{"change":18,"pos":40642}],"down_context":[{"change":18,"pos":39313}],"flag":"BLOCK","start":70593,"end":70685,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":40642},"to":{"change":18,"start":2022,"end":2104},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" fn graph<'a>(&self, c: &'a Self::Channel) -> &'a Db, SerializedEdge> {"}],"del_contents":[{"Del":" fn graph<'a>(&self, c: &'a Self::Channel) -> &'a Db, Edge> {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":601,"ins":{"up_context":[{"change":18,"pos":2226}],"down_context":[{"change":18,"pos":39486}],"flag":"BLOCK","start":70686,"end":70723,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":2226},"to":{"change":18,"start":39456,"end":39486},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":39456},"to":{"change":18,"start":39456,"end":39486},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" channel.apply_counter.into()"}],"del_contents":[{"Del":" channel.apply_counter\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":604,"ins":{"up_context":[{"change":18,"pos":2289}],"down_context":[{"change":18,"pos":39577}],"flag":"BLOCK","start":70724,"end":70761,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":2289},"to":{"change":18,"start":39547,"end":39577},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":39547},"to":{"change":18,"start":39547,"end":39577},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" channel.last_modified.into()"}],"del_contents":[{"Del":" channel.last_modified\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":613,"ins":{"up_context":[{"change":18,"pos":39780}],"down_context":[{"change":18,"pos":40695}],"flag":"BLOCK","start":70762,"end":70870,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":39780},"to":{"change":18,"start":39780,"end":39899},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" type Changeset = Db;"},{"Add":" type RevChangeset = UDb>;"}],"del_contents":[{"Del":" type Changeset = ::sanakirja::Db;\n type RevChangeset = ::sanakirja::Db;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":619,"ins":{"up_context":[{"change":18,"pos":39972}],"down_context":[{"change":18,"pos":40198}],"flag":"BLOCK","start":70871,"end":71310,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":39972},"to":{"change":18,"start":39972,"end":40198},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" c: &ChangeId,"},{"Add":" ) -> Result, TxnErr> {"},{"Add":" match btree::get(&self.txn, channel, c, None) {"},{"Add":" Ok(Some((k, x))) if k == c => Ok(Some(x)),"},{"Add":" Ok(x) => {"},{"Add":" debug!(\"get_changeset = {:?}\", x);"},{"Add":" Ok(None)"},{"Add":" },"},{"Add":" Err(e) => {"},{"Add":" error!(\"{:?}\", e);"},{"Add":" Err(TxnErr(SanakirjaError::PristineCorrupt))"},{"Add":" }"}],"del_contents":[{"Del":" c: ChangeId,\n ) -> Result, TxnErr> {\n if let Ok(x) = self.txn.get(channel, c, None) {\n Ok(x)\n } else {\n Err(TxnErr(SanakirjaError::PristineCorrupt))\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":636,"ins":{"up_context":[{"change":18,"pos":40295}],"down_context":[{"change":18,"pos":40534}],"flag":"BLOCK","start":71311,"end":71694,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":40295},"to":{"change":18,"start":40295,"end":40534},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" c: &L64,"},{"Add":" ) -> Result>, TxnErr> {"},{"Add":" match btree::get(&self.txn, revchanges, c, None) {"},{"Add":" Ok(Some((k, x))) if k == c => Ok(Some(x)),"},{"Add":" Ok(_) => Ok(None),"},{"Add":" Err(e) => {"},{"Add":" error!(\"{:?}\", e);"},{"Add":" Err(TxnErr(SanakirjaError::PristineCorrupt))"},{"Add":" }"}],"del_contents":[{"Del":" c: u64,\n ) -> Result, TxnErr> {\n if let Ok(x) = self.txn.get(revchanges, c, None) {\n Ok(x)\n } else {\n Err(TxnErr(SanakirjaError::PristineCorrupt))\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":648,"ins":{"up_context":[{"change":18,"pos":40551}],"down_context":[{"change":18,"pos":40599}],"flag":"BLOCK","start":71695,"end":71791,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":40551},"to":{"change":18,"start":40551,"end":40599},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" type ChangesetCursor = ::sanakirja::btree::cursor::Cursor>;"}],"del_contents":[{"Del":" type ChangesetCursor = ::sanakirja::Cursor;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":654,"ins":{"up_context":[{"change":18,"pos":40713}],"down_context":[{"change":18,"pos":40815}],"flag":"BLOCK","start":71792,"end":71894,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":40713},"to":{"change":18,"start":40713,"end":40815},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" ) -> Result, TxnErr>"}],"del_contents":[{"Del":" ) -> Result, TxnErr>\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":656,"ins":{"up_context":[{"change":18,"pos":40821}],"down_context":[{"change":18,"pos":41125}],"flag":"BLOCK","start":71895,"end":72047,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":40821},"to":{"change":18,"start":40821,"end":41125},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" let mut cursor = btree::cursor::Cursor::new(&self.txn, &channel)?;"},{"Add":" if let Some(k) = pos {"},{"Add":" cursor.set(&self.txn, &k, None)?;"}],"del_contents":[{"Del":" if let Ok((cursor, _)) = self.txn.set_cursors(&channel, pos.map(|x| (x, None))) {\n Ok(Cursor {\n cursor,\n txn: self,\n marker: std::marker::PhantomData,\n })\n } else {\n Err(TxnErr(SanakirjaError::PristineCorrupt))\n"}]}},{"Edit":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":660,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":41135}],"down_context":[{"change":18,"pos":41135}],"flag":"BLOCK","start":72048,"end":72245,"inode":{"change":18,"pos":531056}}},"contents":[{"Add":" Ok(Cursor {"},{"Add":" cursor,"},{"Add":" txn: self,"},{"Add":" k: std::marker::PhantomData,"},{"Add":" v: std::marker::PhantomData,"},{"Add":" t: std::marker::PhantomData,"},{"Add":" })"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":669,"ins":{"up_context":[{"change":18,"pos":41142}],"down_context":[{"change":18,"pos":41193}],"flag":"BLOCK","start":72246,"end":72425,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":41142},"to":{"change":18,"start":41142,"end":41193},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" type RevchangesetCursor = ::sanakirja::btree::cursor::Cursor<"},{"Add":" L64,"},{"Add":" Pair,"},{"Add":" UP>,"},{"Add":" >;"}],"del_contents":[{"Del":" type RevchangesetCursor = ::sanakirja::Cursor;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":678,"ins":{"up_context":[{"change":18,"pos":41321}],"down_context":[{"change":18,"pos":41347}],"flag":"BLOCK","start":72426,"end":72452,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":41321},"to":{"change":18,"start":41321,"end":41347},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" pos: Option,"}],"del_contents":[{"Del":" pos: Option,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":680,"ins":{"up_context":[{"change":18,"pos":41364}],"down_context":[{"change":18,"pos":41441}],"flag":"BLOCK","start":72453,"end":72544,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":41364},"to":{"change":18,"start":41364,"end":41441},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" Cursor>,"}],"del_contents":[{"Del":" Cursor,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":683,"ins":{"up_context":[{"change":18,"pos":41481}],"down_context":[{"change":18,"pos":41777}],"flag":"BLOCK","start":72545,"end":72694,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":41481},"to":{"change":18,"start":41481,"end":41777},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" let mut cursor = btree::cursor::Cursor::new(&txn.txn, channel)?;"},{"Add":" if let Some(k) = pos {"},{"Add":" cursor.set(&txn.txn, &k, None)?;"}],"del_contents":[{"Del":" if let Ok((cursor, _)) = txn.txn.set_cursors(channel, pos.map(|x| (x, None))) {\n Ok(Cursor {\n cursor,\n txn,\n marker: std::marker::PhantomData,\n })\n } else {\n Err(TxnErr(SanakirjaError::PristineCorrupt))\n"}]}},{"Edit":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":687,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":41787}],"down_context":[{"change":18,"pos":41787}],"flag":"BLOCK","start":72695,"end":72886,"inode":{"change":18,"pos":531056}}},"contents":[{"Add":" Ok(Cursor {"},{"Add":" cursor,"},{"Add":" txn,"},{"Add":" k: std::marker::PhantomData,"},{"Add":" v: std::marker::PhantomData,"},{"Add":" t: std::marker::PhantomData,"},{"Add":" })"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":699,"ins":{"up_context":[{"change":18,"pos":41886}],"down_context":[{"change":18,"pos":41912}],"flag":"BLOCK","start":72887,"end":72913,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":41886},"to":{"change":18,"start":41886,"end":41912},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" pos: Option,"}],"del_contents":[{"Del":" pos: Option,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":701,"ins":{"up_context":[{"change":18,"pos":41929}],"down_context":[{"change":18,"pos":42015}],"flag":"BLOCK","start":72914,"end":73014,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":41929},"to":{"change":18,"start":41929,"end":42015},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" RevCursor>,"}],"del_contents":[{"Del":" RevCursor,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":704,"ins":{"up_context":[{"change":18,"pos":42055}],"down_context":[{"change":18,"pos":42387}],"flag":"BLOCK","start":73015,"end":73173,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":42055},"to":{"change":18,"start":42055,"end":42387},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" let mut cursor = btree::cursor::Cursor::new(&self.txn, channel)?;"},{"Add":" if let Some(ref pos) = pos {"},{"Add":" cursor.set(&self.txn, pos, None)?;"}],"del_contents":[{"Del":" let cursor = if let Some(pos) = pos {\n if let Ok((x, _)) = self.txn.set_cursors(channel, Some((pos, None))) {\n x\n } else {\n return Err(TxnErr(SanakirjaError::PristineCorrupt));\n }\n } else if let Ok(x) = self.txn.set_cursors_last(channel) {\n x\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":708,"ins":{"up_context":[{"change":18,"pos":42404}],"down_context":[{"change":18,"pos":42469}],"flag":"BLOCK","start":73174,"end":73215,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":42404},"to":{"change":18,"start":42404,"end":42469},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" cursor.set_last(&self.txn)?;"}],"del_contents":[{"Del":" return Err(TxnErr(SanakirjaError::PristineCorrupt));\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":713,"ins":{"up_context":[{"change":18,"pos":42546}],"down_context":[{"change":18,"pos":42592}],"flag":"BLOCK","start":73216,"end":73339,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":42546},"to":{"change":18,"start":42546,"end":42592},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" k: std::marker::PhantomData,"},{"Add":" v: std::marker::PhantomData,"},{"Add":" t: std::marker::PhantomData,"}],"del_contents":[{"Del":" marker: std::marker::PhantomData,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":722,"ins":{"up_context":[{"change":18,"pos":42705}],"down_context":[{"change":18,"pos":42855}],"flag":"BLOCK","start":73340,"end":73481,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":42705},"to":{"change":18,"start":42705,"end":42855},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" ) -> Result)>, TxnErr> {"},{"Add":" if let Ok(x) = cursor.next(&self.txn) {"}],"del_contents":[{"Del":" ) -> Result, TxnErr> {\n if let Ok(x) = unsafe { ::sanakirja::next(&self.txn, cursor) } {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":732,"ins":{"up_context":[{"change":18,"pos":43058}],"down_context":[{"change":18,"pos":43208}],"flag":"BLOCK","start":73482,"end":73623,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":43058},"to":{"change":18,"start":43058,"end":43208},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" ) -> Result)>, TxnErr> {"},{"Add":" if let Ok(x) = cursor.prev(&self.txn) {"}],"del_contents":[{"Del":" ) -> Result, TxnErr> {\n if let Ok(x) = unsafe { ::sanakirja::prev(&self.txn, cursor) } {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":743,"ins":{"up_context":[{"change":18,"pos":43406}],"down_context":[{"change":18,"pos":43546}],"flag":"BLOCK","start":73624,"end":73741,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":43406},"to":{"change":18,"start":43406,"end":43546},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" ) -> Result, TxnErr> {"},{"Add":" if let Ok(x) = cursor.next(&self.txn) {"}],"del_contents":[{"Del":" ) -> Result, TxnErr> {\n if let Ok(x) = unsafe { ::sanakirja::next(&self.txn, cursor) } {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":753,"ins":{"up_context":[{"change":18,"pos":43743}],"down_context":[{"change":18,"pos":43883}],"flag":"BLOCK","start":73742,"end":73859,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":43743},"to":{"change":18,"start":43743,"end":43883},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" ) -> Result, TxnErr> {"},{"Add":" if let Ok(x) = cursor.prev(&self.txn) {"}],"del_contents":[{"Del":" ) -> Result, TxnErr> {\n if let Ok(x) = unsafe { ::sanakirja::prev(&self.txn, cursor) } {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":761,"ins":{"up_context":[{"change":18,"pos":3011}],"down_context":[{"change":18,"pos":709}],"flag":"BLOCK","start":73860,"end":73906,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":3011},"to":{"change":18,"start":661,"end":709},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" type States = UDb;"}],"del_contents":[{"Del":" type States = ::sanakirja::Db;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":768,"ins":{"up_context":[{"change":18,"pos":847}],"down_context":[{"change":18,"pos":43985}],"flag":"BLOCK","start":73907,"end":74139,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":847},"to":{"change":18,"start":3085,"end":3161},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":3085},"to":{"change":18,"start":3085,"end":3161},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":3161},"to":{"change":18,"start":848,"end":892},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" m: &SerializedMerkle,"},{"Add":" ) -> Result, TxnErr> {"},{"Add":" match btree::get(&self.txn, channel, m, None)? {"},{"Add":" Some((k, v)) if k == m => Ok(Some(*v)),"},{"Add":" _ => Ok(None)"},{"Add":" }"}],"del_contents":[{"Del":" m: Merkle,\n ) -> Result, TxnErr> {\n"},{"Del":" Ok(self.txn.get(channel, m, None)?)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":777,"ins":{"up_context":[{"change":18,"pos":41051}],"down_context":[{"change":18,"pos":41114}],"flag":"BLOCK","start":74140,"end":74228,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":41051},"to":{"change":18,"start":41051,"end":41114},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":"impl> DepsTxnT for GenericTxn {"}],"del_contents":[{"Del":"impl DepsTxnT for GenericTxn {\n"}]}},{"Edit":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":784,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":41360}],"down_context":[{"change":18,"pos":41360}],"flag":"BLOCK","start":74229,"end":74329,"inode":{"change":18,"pos":531056}}},"contents":[{"Add":" type DepCursor = ::sanakirja::btree::cursor::Cursor>;"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":788,"ins":{"up_context":[{"change":18,"pos":41494}],"down_context":[{"change":18,"pos":41515}],"flag":"BLOCK","start":74330,"end":74352,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":41494},"to":{"change":18,"start":41494,"end":41515},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" p: &ChangeId,"}],"del_contents":[{"Del":" p: ChangeId,\n"}]}},{"Edit":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":800,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":41987}],"down_context":[{"change":18,"pos":41987}],"flag":"BLOCK","start":74353,"end":74515,"inode":{"change":18,"pos":531056}}},"contents":[{"Add":""},{"Add":" type Touched_filesCursor = ::sanakirja::btree::cursor::Cursor<"},{"Add":" Position,"},{"Add":" ChangeId,"},{"Add":" P, ChangeId>,"},{"Add":" >;"}]}},{"Edit":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":807,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":42053}],"down_context":[{"change":18,"pos":42053}],"flag":"BLOCK","start":74516,"end":74682,"inode":{"change":18,"pos":531056}}},"contents":[{"Add":""},{"Add":" type Rev_touched_filesCursor = ::sanakirja::btree::cursor::Cursor<"},{"Add":" ChangeId,"},{"Add":" Position,"},{"Add":" P>,"},{"Add":" >;"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":816,"ins":{"up_context":[{"change":18,"pos":42158}],"down_context":[{"change":18,"pos":42179}],"flag":"BLOCK","start":74683,"end":74705,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":42158},"to":{"change":18,"start":42158,"end":42179},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" k: &ChangeId,"}],"del_contents":[{"Del":" k: ChangeId,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":826,"ins":{"up_context":[{"change":18,"pos":42404}],"down_context":[{"change":18,"pos":42425}],"flag":"BLOCK","start":74706,"end":74728,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":42404},"to":{"change":18,"start":42404,"end":42425},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" k: &ChangeId,"}],"del_contents":[{"Del":" k: ChangeId,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":836,"ins":{"up_context":[{"change":18,"pos":42651}],"down_context":[{"change":18,"pos":42682}],"flag":"BLOCK","start":74729,"end":74761,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":42651},"to":{"change":18,"start":42651,"end":42682},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" k: &Position,"}],"del_contents":[{"Del":" k: Position,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":846,"ins":{"up_context":[{"change":18,"pos":42946}],"down_context":[{"change":18,"pos":42967}],"flag":"BLOCK","start":74762,"end":74784,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":42946},"to":{"change":18,"start":42946,"end":42967},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" k: &ChangeId,"}],"del_contents":[{"Del":" k: ChangeId,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":855,"ins":{"up_context":[{"change":18,"pos":43211}],"down_context":[{"change":18,"pos":43274}],"flag":"BLOCK","start":74785,"end":74873,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":43211},"to":{"change":18,"start":43211,"end":43274},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":"impl> TreeTxnT for GenericTxn {"}],"del_contents":[{"Del":"impl TreeTxnT for GenericTxn {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":865,"ins":{"up_context":[{"change":18,"pos":545760}],"down_context":[{"change":18,"pos":36941}],"flag":"BLOCK","start":74874,"end":75260,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":545779},"to":{"change":18,"start":545779,"end":545820},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":545820},"to":{"change":18,"start":43460,"end":43606},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":43606},"to":{"change":18,"start":545909,"end":546725},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":545909},"to":{"change":18,"start":545909,"end":546725},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" type Tree = UDb;"},{"Add":" sanakirja_table_get!(tree, PathId, Inode, TreeError,);"},{"Add":" type TreeCursor ="},{"Add":" ::sanakirja::btree::cursor::Cursor>;"},{"Add":" sanakirja_iter!(tree, PathId, Inode,);"},{"Add":" type RevtreeCursor ="},{"Add":" ::sanakirja::btree::cursor::Cursor>;"},{"Add":" sanakirja_iter!(revtree, Inode, PathId);"}],"del_contents":[{"Del":" type Tree = Db;\n"},{"Del":" sanakirja_table_get!(\n tree,\n PathId,\n Inode,\n TreeError,\n (UnsafePathId::from_fileid(key), value),\n );\n"},{"Del":" sanakirja_iter!(\n tree,\n OwnedPathId,\n Inode,\n if let Some((ref k, ref v)) = pos {\n info!(\"tree iter {:?} {:?}\", k, v);\n Some((UnsafePathId::from_fileid(k.as_file_id()), *v))\n } else {\n None\n },\n map(|(k, v): (UnsafePathId, Inode)| (unsafe { k.to_fileid().to_owned() }, v))\n );\n sanakirja_iter!(\n revtree,\n Inode,\n OwnedPathId,\n if let Some((ref k, ref v)) = pos {\n let v = if let Some(ref v) = *v {\n Some(UnsafePathId::from_fileid(v.as_file_id()))\n } else {\n None\n };\n Some((*k, v))\n } else {\n None\n },\n map(|(k, v): (Inode, UnsafePathId)| (k, unsafe { v.to_fileid().to_owned() }))\n );\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":874,"ins":{"up_context":[{"change":18,"pos":36942}],"down_context":[{"change":18,"pos":36945}],"flag":"BLOCK","start":75261,"end":75362,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":36942},"to":{"change":18,"start":546744,"end":546862},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":546744},"to":{"change":18,"start":546744,"end":546862},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":546862},"to":{"change":18,"start":43607,"end":43626},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":43626},"to":{"change":18,"start":546862,"end":547109},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":546862},"to":{"change":18,"start":546862,"end":547109},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" type Revtree = UDb;"},{"Add":" sanakirja_table_get!(revtree, Inode, PathId, TreeError,);"}],"del_contents":[{"Del":" type Revtree = Db;\n sanakirja_table_get!(\n revtree,\n Inode,\n PathId,\n"},{"Del":" TreeError,\n"},{"Del":" (\n key,\n if let Some(value) = value {\n Some(UnsafePathId::from_fileid(value))\n } else {\n None\n }\n ),\n map(|value| unsafe { value.to_fileid() })\n );\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":877,"ins":{"up_context":[{"change":18,"pos":36946}],"down_context":[{"change":18,"pos":548747}],"flag":"BLOCK","start":75363,"end":75498,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":548625},"to":{"change":18,"start":548625,"end":548747},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" type Partials = UDb>;"},{"Add":" type PartialsCursor = ::sanakirja::btree::cursor::Cursor<"},{"Add":" SmallStr,"}],"del_contents":[{"Del":" type Partials = Db>;\n sanakirja_cursor!(\n partials,\n SmallString,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":881,"ins":{"up_context":[{"change":18,"pos":548775}],"down_context":[{"change":18,"pos":43627}],"flag":"BLOCK","start":75499,"end":75737,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":548775},"to":{"change":18,"start":548775,"end":549082},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" UP>,"},{"Add":" >;"},{"Add":" sanakirja_cursor!(partials, SmallStr, Position,);"},{"Add":" type InodesCursor ="},{"Add":" ::sanakirja::btree::cursor::Cursor, P>>;"}],"del_contents":[{"Del":" if let Some((ref k, ref v)) = pos {\n Some((UnsafeSmallStr::from_small_str(k.as_small_str()), *v))\n } else {\n None\n },\n map(|(k, v): (UnsafeSmallStr, Position)| (\n unsafe { k.to_small_str().to_owned() },\n v\n ))\n );\n"}]}},{"Edit":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":895,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":43857}],"down_context":[{"change":18,"pos":43857}],"flag":"BLOCK","start":75738,"end":75895,"inode":{"change":18,"pos":531056}}},"contents":[{"Add":" #[cfg(debug_assertions)]"},{"Add":" type RevinodesCursor ="},{"Add":" ::sanakirja::btree::cursor::Cursor, Inode, P, Inode>>;"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":912,"ins":{"up_context":[{"change":18,"pos":44209}],"down_context":[{"change":18,"pos":44305}],"flag":"BLOCK","start":75896,"end":75989,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":44209},"to":{"change":18,"start":44209,"end":44305},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" super::Cursor>,"}],"del_contents":[{"Del":" super::Cursor>,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":916,"ins":{"up_context":[{"change":18,"pos":44388}],"down_context":[{"change":18,"pos":43992}],"flag":"BLOCK","start":75990,"end":76054,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":44388},"to":{"change":18,"start":44388,"end":44451},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" self.cursor_partials(&self.partials, Some((&k0, None)))"}],"del_contents":[{"Del":" self.cursor_partials(&self.partials, Some((k0, None)))\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":920,"ins":{"up_context":[{"change":18,"pos":44001}],"down_context":[{"change":18,"pos":44051}],"flag":"BLOCK","start":76055,"end":76130,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":44001},"to":{"change":18,"start":44001,"end":44051},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":"impl> GenericTxn {"}],"del_contents":[{"Del":"impl GenericTxn {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":926,"ins":{"up_context":[{"change":18,"pos":44210}],"down_context":[{"change":18,"pos":44869}],"flag":"BLOCK","start":76131,"end":76907,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":44210},"to":{"change":18,"start":44210,"end":44869},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" match btree::get(&self.txn, &self.channels, &name, None)? {"},{"Add":" Some((name_, tup)) => {"},{"Add":" assert_eq!(name_, name.as_ref());"},{"Add":" debug!(\"load_channel: {:?} {:?}\", name, tup);"},{"Add":" Ok(Some(Channel {"},{"Add":" graph: Db::from_page(tup.0[0].into()),"},{"Add":" changes: Db::from_page(tup.0[1].into()),"},{"Add":" revchanges: UDb::from_page(tup.0[2].into()),"},{"Add":" states: UDb::from_page(tup.0[3].into()),"},{"Add":" apply_counter: tup.0[4].into(),"},{"Add":" last_modified: tup.0[5].into(),"},{"Add":" name,"},{"Add":" }))"},{"Add":" }"},{"Add":" _ => {"},{"Add":" debug!(\"unsafe_load_channel: not found\");"},{"Add":" Ok(None)"},{"Add":" }"}],"del_contents":[{"Del":" if let Some((channel, changes, revchanges, states, counter, last_modified)) = self.txn.get(\n &self.channels,\n UnsafeSmallStr::from_small_str(name.as_small_str()),\n None,\n )? {\n debug!(\"unsafe_load_channel: found {:?} {:?}\", changes, revchanges);\n Ok(Some(Channel {\n graph: channel,\n changes,\n revchanges,\n apply_counter: counter,\n states,\n name: name.clone(),\n last_modified,\n }))\n } else {\n debug!(\"unsafe_load_channel: not found\");\n Ok(None)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":948,"ins":{"up_context":[{"change":18,"pos":44460}],"down_context":[{"change":18,"pos":44519}],"flag":"BLOCK","start":76908,"end":76992,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":44460},"to":{"change":18,"start":44460,"end":44519},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":"impl> TxnT for GenericTxn {"}],"del_contents":[{"Del":"impl TxnT for GenericTxn {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":953,"ins":{"up_context":[{"change":18,"pos":44654}],"down_context":[{"change":18,"pos":44724}],"flag":"BLOCK","start":76993,"end":77090,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":44654},"to":{"change":18,"start":44654,"end":44724},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" let h: SerializedHash = if let Some(ref h) = Hash::from_prefix(s) {"},{"Add":" h.into()"}],"del_contents":[{"Del":" let h = if let Some(h) = Hash::from_prefix(s) {\n h\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":960,"ins":{"up_context":[{"change":18,"pos":44884}],"down_context":[{"change":18,"pos":44974}],"flag":"BLOCK","start":77091,"end":77165,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":44884},"to":{"change":18,"start":44884,"end":44974},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" for x in btree::iter(&self.txn, &self.internal, Some((&h, None)))"}],"del_contents":[{"Del":" for x in self\n .txn\n .iter(&self.internal, Some((h, None)))\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":965,"ins":{"up_context":[{"change":18,"pos":45168}],"down_context":[{"change":18,"pos":45191}],"flag":"BLOCK","start":77166,"end":77190,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":45168},"to":{"change":18,"start":45168,"end":45191},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" if e < &h {"}],"del_contents":[{"Del":" if e < h {\n"}]}},{"Edit":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":968,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":45238}],"down_context":[{"change":18,"pos":45238}],"flag":"BLOCK","start":77191,"end":77231,"inode":{"change":18,"pos":531056}}},"contents":[{"Add":" let e: Hash = e.into();"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":975,"ins":{"up_context":[{"change":18,"pos":45487}],"down_context":[{"change":18,"pos":45529}],"flag":"BLOCK","start":77232,"end":77275,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":45487},"to":{"change":18,"start":45487,"end":45529},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" result = Some((e, *i))"}],"del_contents":[{"Del":" result = Some((e, i))\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":994,"ins":{"up_context":[{"change":18,"pos":46052}],"down_context":[{"change":18,"pos":46122}],"flag":"BLOCK","start":77276,"end":77372,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":46052},"to":{"change":18,"start":46052,"end":46122},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" let h: SerializedHash = if let Some(h) = Hash::from_prefix(s) {"},{"Add":" (&h).into()"}],"del_contents":[{"Del":" let h = if let Some(h) = Hash::from_prefix(s) {\n h\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1001,"ins":{"up_context":[{"change":18,"pos":46282}],"down_context":[{"change":18,"pos":46369}],"flag":"BLOCK","start":77373,"end":77444,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":46282},"to":{"change":18,"start":46282,"end":46369},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" for x in btree::iter(&self.txn, &remote.rev, Some((&h, None)))"}],"del_contents":[{"Del":" for x in self\n .txn\n .iter(&remote.rev, Some((h, None)))\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1006,"ins":{"up_context":[{"change":18,"pos":46555}],"down_context":[{"change":18,"pos":46578}],"flag":"BLOCK","start":77445,"end":77469,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":46555},"to":{"change":18,"start":46555,"end":46578},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" if e < &h {"}],"del_contents":[{"Del":" if e < h {\n"}]}},{"Edit":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1009,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":46625}],"down_context":[{"change":18,"pos":46625}],"flag":"BLOCK","start":77470,"end":77510,"inode":{"change":18,"pos":531056}}},"contents":[{"Add":" let e: Hash = e.into();"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1055,"ins":{"up_context":[{"change":18,"pos":550535}],"down_context":[{"change":18,"pos":551161}],"flag":"BLOCK","start":77511,"end":78957,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":550535},"to":{"change":18,"start":550535,"end":550721},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":550721},"to":{"change":18,"start":47574,"end":47595},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":47595},"to":{"change":18,"start":550741,"end":551070},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":550741},"to":{"change":18,"start":550741,"end":551070},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":551070},"to":{"change":18,"start":45271,"end":45321},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":45321},"to":{"change":18,"start":551103,"end":551128},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":551103},"to":{"change":18,"start":551103,"end":551128},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":551128},"to":{"change":18,"start":47596,"end":47633},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" match btree::get(&self.txn, &self.remotes, &name, None)? {"},{"Add":" Some((name_, remote)) if name.as_ref() == name_ => {"},{"Add":" debug!(\"load_remote: {:?} {:?}\", name_, remote);"},{"Add":" let r = Remote {"},{"Add":" remote: UDb::from_page(remote.0[0].into()),"},{"Add":" rev: UDb::from_page(remote.0[1].into()),"},{"Add":" states: UDb::from_page(remote.0[2].into()),"},{"Add":" };"},{"Add":" for x in btree::iter(&self.txn, &r.remote, None).unwrap() {"},{"Add":" debug!(\"remote -> {:?}\", x);"},{"Add":" }"},{"Add":" for x in btree::iter(&self.txn, &r.rev, None).unwrap() {"},{"Add":" debug!(\"rev -> {:?}\", x);"},{"Add":" }"},{"Add":" for x in btree::iter(&self.txn, &r.states, None).unwrap() {"},{"Add":" debug!(\"states -> {:?}\", x);"},{"Add":" }"},{"Add":""},{"Add":" for x in self.iter_remote(&r.remote, 0).unwrap() {"},{"Add":" debug!(\"ITER {:?}\", x);"},{"Add":" }"},{"Add":""},{"Add":" let r = RemoteRef {"},{"Add":" db: Rc::new(RefCell::new(r)),"},{"Add":" name: name.clone(),"},{"Add":" };"},{"Add":" Ok(Some(v.insert(r).clone()))"},{"Add":" }"},{"Add":" _ => return Ok(None)"}],"del_contents":[{"Del":" if let Some(remote) = self.txn.get(\n &self.remotes,\n UnsafeSmallStr::from_small_str(name.as_small_str()),\n None,\n"},{"Del":" )? {\n"},{"Del":" let r = RemoteRef {\n db: Rc::new(RefCell::new(Remote {\n remote: remote.0,\n rev: remote.1,\n states: remote.2,\n })),\n name: name.clone(),\n };\n"},{"Del":" Ok(Some(v.insert(r).clone()))\n"},{"Del":" } else {\n"},{"Del":" return Ok(None);\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1091,"ins":{"up_context":[{"change":18,"pos":551320}],"down_context":[{"change":18,"pos":47694}],"flag":"BLOCK","start":78958,"end":79139,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":551320},"to":{"change":18,"start":551320,"end":551813},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" type Channels = UDb;"},{"Add":" type ChannelsCursor = ::sanakirja::btree::cursor::Cursor>;"},{"Add":" sanakirja_cursor!(channels, SmallStr, T6,);"}],"del_contents":[{"Del":" type Channels = Db;\n sanakirja_cursor!(\n channels,\n SmallString,\n (u64, u64, u64, u64, u64, u64),\n if let Some((ref k, ref v)) = pos {\n Some((UnsafeSmallStr::from_small_str(k.as_small_str()), *v))\n } else {\n None\n },\n map(|(k, v): (UnsafeSmallStr, (u64, u64, u64, u64, u64, u64))| (\n unsafe { k.to_small_str().to_owned() },\n v\n ))\n );\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1099,"ins":{"up_context":[{"change":18,"pos":551947}],"down_context":[{"change":18,"pos":552158}],"flag":"BLOCK","start":79140,"end":79316,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":551947},"to":{"change":18,"start":551947,"end":552019},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":552019},"to":{"change":18,"start":47837,"end":47947},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":47947},"to":{"change":18,"start":552125,"end":552148},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":552125},"to":{"change":18,"start":552125,"end":552148},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":552148},"to":{"change":18,"start":47948,"end":47959},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" let mut cursor = btree::cursor::Cursor::new(&self.txn, &self.channels)?;"},{"Add":" cursor.set(&self.txn, &name, None)?;"},{"Add":" Ok(ChannelIterator { cursor, txn: self })"}],"del_contents":[{"Del":" let name = UnsafeSmallStr::from_small_str(name.as_small_str());\n"},{"Del":" Ok(ChannelIterator {\n cursor: self.txn.set_cursors(&self.channels, Some((name, None)))?.0,\n"},{"Del":" txn: self,\n"},{"Del":" })\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1104,"ins":{"up_context":[{"change":18,"pos":552165}],"down_context":[{"change":18,"pos":47960}],"flag":"BLOCK","start":79317,"end":79494,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":552165},"to":{"change":18,"start":552165,"end":552611},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" type Remotes = UDb;"},{"Add":" type RemotesCursor = ::sanakirja::btree::cursor::Cursor>;"},{"Add":" sanakirja_cursor!(remotes, SmallStr, T3);"}],"del_contents":[{"Del":" type Remotes = Db;\n sanakirja_cursor!(\n remotes,\n SmallString,\n (u64, u64, u64),\n if let Some((ref k, ref v)) = pos {\n Some((UnsafeSmallStr::from_small_str(k.as_small_str()), *v))\n } else {\n None\n },\n map(|(k, v): (UnsafeSmallStr, (u64, u64, u64))| (\n unsafe { k.to_small_str().to_owned() },\n v\n ))\n );\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1112,"ins":{"up_context":[{"change":18,"pos":552744}],"down_context":[{"change":18,"pos":552954}],"flag":"BLOCK","start":79495,"end":79670,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":552744},"to":{"change":18,"start":552744,"end":552816},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":552816},"to":{"change":18,"start":48102,"end":48211},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":48211},"to":{"change":18,"start":552921,"end":552944},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":552921},"to":{"change":18,"start":552921,"end":552944},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":552944},"to":{"change":18,"start":48212,"end":48223},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" let mut cursor = btree::cursor::Cursor::new(&self.txn, &self.remotes)?;"},{"Add":" cursor.set(&self.txn, &name, None)?;"},{"Add":" Ok(RemotesIterator { cursor, txn: self })"}],"del_contents":[{"Del":" let name = UnsafeSmallStr::from_small_str(name.as_small_str());\n"},{"Del":" Ok(RemotesIterator {\n cursor: self.txn.set_cursors(&self.remotes, Some((name, None)))?.0,\n"},{"Del":" txn: self,\n"},{"Del":" })\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1117,"ins":{"up_context":[{"change":18,"pos":552961}],"down_context":[{"change":18,"pos":554745}],"flag":"BLOCK","start":79671,"end":80179,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":554517},"to":{"change":18,"start":554517,"end":554745},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" type Remote = UDb>;"},{"Add":" type Revremote = UDb;"},{"Add":" type Remotestates = UDb;"},{"Add":" type RemoteCursor = ::sanakirja::btree::cursor::Cursor<"},{"Add":" L64,"},{"Add":" Pair,"},{"Add":" UP>,"},{"Add":" >;"},{"Add":" sanakirja_cursor!(remote, L64, Pair);"},{"Add":" sanakirja_rev_cursor!(remote, L64, Pair);"}],"del_contents":[{"Del":" type Remote = Db;\n type Revremote = Db;\n type Remotestates = Db;\n sanakirja_cursor!(remote, u64, (Hash, Merkle));\n sanakirja_rev_cursor!(remote, u64, (Hash, Merkle));\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1133,"ins":{"up_context":[{"change":18,"pos":48241}],"down_context":[{"change":18,"pos":48323}],"flag":"BLOCK","start":80180,"end":80357,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":48241},"to":{"change":18,"start":48241,"end":48323},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" super::Cursor<"},{"Add":" Self,"},{"Add":" &'txn Self,"},{"Add":" Self::RemoteCursor,"},{"Add":" L64,"},{"Add":" Pair,"},{"Add":" >,"}],"del_contents":[{"Del":" super::Cursor,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1142,"ins":{"up_context":[{"change":18,"pos":48365}],"down_context":[{"change":18,"pos":554975}],"flag":"BLOCK","start":80358,"end":80418,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":48365},"to":{"change":18,"start":554923,"end":554975},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":554923},"to":{"change":18,"start":554923,"end":554975},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" self.cursor_remote(remote, Some((&k.into(), None)))"}],"del_contents":[{"Del":" self.cursor_remote(remote, Some((k, None)))\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1148,"ins":{"up_context":[{"change":18,"pos":555063}],"down_context":[{"change":18,"pos":48366}],"flag":"BLOCK","start":80419,"end":80443,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":555063},"to":{"change":18,"start":555063,"end":555087},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" k: Option,"}],"del_contents":[{"Del":" k: Option,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1150,"ins":{"up_context":[{"change":18,"pos":48383}],"down_context":[{"change":18,"pos":48468}],"flag":"BLOCK","start":80444,"end":80624,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":48383},"to":{"change":18,"start":48383,"end":48468},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" super::RevCursor<"},{"Add":" Self,"},{"Add":" &'txn Self,"},{"Add":" Self::RemoteCursor,"},{"Add":" L64,"},{"Add":" Pair,"},{"Add":" >,"}],"del_contents":[{"Del":" super::RevCursor,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1159,"ins":{"up_context":[{"change":18,"pos":48510}],"down_context":[{"change":18,"pos":555235}],"flag":"BLOCK","start":80625,"end":80695,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":48510},"to":{"change":18,"start":555174,"end":555235},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":555174},"to":{"change":18,"start":555174,"end":555235},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" self.rev_cursor_remote(remote, k.as_ref().map(|k| (k, None)))"}],"del_contents":[{"Del":" self.rev_cursor_remote(remote, k.map(|k| (k, None)))\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1169,"ins":{"up_context":[{"change":18,"pos":555461}],"down_context":[{"change":18,"pos":556087}],"flag":"BLOCK","start":80696,"end":81384,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":555461},"to":{"change":18,"start":555461,"end":555647},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":555647},"to":{"change":18,"start":48639,"end":48660},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":48660},"to":{"change":18,"start":555667,"end":556054},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":555667},"to":{"change":18,"start":555667,"end":556054},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":556054},"to":{"change":18,"start":48661,"end":48698},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" match btree::get(&self.txn, &self.remotes, &name, None)? {"},{"Add":" Some((name_, remote)) if name_ == name.as_ref() => {"},{"Add":" let r = RemoteRef {"},{"Add":" db: Rc::new(RefCell::new(Remote {"},{"Add":" remote: UDb::from_page(remote.0[0].into()),"},{"Add":" rev: UDb::from_page(remote.0[1].into()),"},{"Add":" states: UDb::from_page(remote.0[2].into()),"},{"Add":" })),"},{"Add":" name: name.clone(),"},{"Add":" };"},{"Add":" v.insert(r);"},{"Add":" }"},{"Add":" _ => return Ok(None),"}],"del_contents":[{"Del":" if let Some(remote) = self.txn.get(\n &self.remotes,\n UnsafeSmallStr::from_small_str(name.as_small_str()),\n None,\n"},{"Del":" )? {\n"},{"Del":" let r = RemoteRef {\n db: Rc::new(RefCell::new(Remote {\n remote: remote.0,\n rev: remote.1,\n states: remote.2,\n })),\n name: name.clone(),\n };\n v.insert(r);\n } else {\n"},{"Del":" return Ok(None);\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1192,"ins":{"up_context":[{"change":18,"pos":48825}],"down_context":[{"change":18,"pos":556369}],"flag":"BLOCK","start":81385,"end":81679,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":48825},"to":{"change":18,"start":48825,"end":48965},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" ) -> Result)>, TxnErr>"},{"Add":" {"},{"Add":" if let Some(x) = btree::rev_iter(&self.txn, remote, None)?.next() {"},{"Add":" let (&k, v) = x?;"},{"Add":" Ok(Some((k.into(), v)))"},{"Add":" } else {"},{"Add":" Ok(None)"},{"Add":" }"}],"del_contents":[{"Del":" ) -> Result, TxnErr> {\n Ok(self.txn.rev_iter(remote, None)?.next().transpose()?)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1206,"ins":{"up_context":[{"change":18,"pos":49053}],"down_context":[{"change":18,"pos":49216}],"flag":"BLOCK","start":81680,"end":81909,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":49053},"to":{"change":18,"start":49053,"end":49216},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" ) -> Result)>, TxnErr>"},{"Add":" {"},{"Add":" let n = n.into();"},{"Add":" for x in btree::iter(&self.txn, remote, Some((&n, None)))? {"},{"Add":" let (&k, m) = x?;"}],"del_contents":[{"Del":" ) -> Result, TxnErr> {\n for x in self.txn.iter(remote, Some((n, None)))? {\n let (k, m) = x?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1212,"ins":{"up_context":[{"change":18,"pos":49240}],"down_context":[{"change":18,"pos":49281}],"flag":"BLOCK","start":81910,"end":81958,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":49240},"to":{"change":18,"start":49240,"end":49281},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" return Ok(Some((k.into(), m)));"}],"del_contents":[{"Del":" return Ok(Some((k, m)));\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1221,"ins":{"up_context":[{"change":18,"pos":49398}],"down_context":[{"change":18,"pos":49418}],"flag":"BLOCK","start":81959,"end":81990,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":49398},"to":{"change":18,"start":49398,"end":49418},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" hash: &SerializedHash,"}],"del_contents":[{"Del":" hash: Hash,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1223,"ins":{"up_context":[{"change":18,"pos":49468}],"down_context":[{"change":18,"pos":556746}],"flag":"BLOCK","start":81991,"end":82155,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":49468},"to":{"change":18,"start":49468,"end":49541},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" match btree::get(&self.txn, &remote.db.borrow().rev, hash, None)? {"},{"Add":" Some((k, _)) if k == hash => Ok(true),"},{"Add":" _ => Ok(false)"},{"Add":" }"}],"del_contents":[{"Del":" Ok(self.txn.get(&remote.db.borrow().rev, hash, None)?.is_some())\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1231,"ins":{"up_context":[{"change":18,"pos":49616}],"down_context":[{"change":18,"pos":49635}],"flag":"BLOCK","start":82156,"end":82186,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":49616},"to":{"change":18,"start":49616,"end":49635},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" m: &SerializedMerkle,"}],"del_contents":[{"Del":" m: Merkle,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1233,"ins":{"up_context":[{"change":18,"pos":49685}],"down_context":[{"change":18,"pos":556898}],"flag":"BLOCK","start":82187,"end":82348,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":49685},"to":{"change":18,"start":49685,"end":49758},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" match btree::get(&self.txn, &remote.db.borrow().states, m, None)? {"},{"Add":" Some((k, _)) if k == m => Ok(true),"},{"Add":" _ => Ok(false)"},{"Add":" }"}],"del_contents":[{"Del":" Ok(self.txn.get(&remote.db.borrow().states, m, None)?.is_some())\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1244,"ins":{"up_context":[{"change":18,"pos":558962}],"down_context":[{"change":18,"pos":50013}],"flag":"BLOCK","start":82349,"end":82407,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":558962},"to":{"change":18,"start":558962,"end":559008},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" k: &Vertex,"},{"Add":" e: &SerializedEdge,"}],"del_contents":[{"Del":" k: Vertex,\n e: Edge,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1247,"ins":{"up_context":[{"change":18,"pos":50063}],"down_context":[{"change":18,"pos":559101}],"flag":"BLOCK","start":82408,"end":82460,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":14321},"to":{"change":18,"start":559047,"end":559101},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":50063},"to":{"change":18,"start":559047,"end":559101},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":559047},"to":{"change":18,"start":559047,"end":559101},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" Ok(btree::put(&mut self.txn, graph, k, e)?)"}],"del_contents":[{"Del":" Ok(self.txn.put(&mut self.rng, graph, k, e)?)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1253,"ins":{"up_context":[{"change":18,"pos":559196}],"down_context":[{"change":18,"pos":50064}],"flag":"BLOCK","start":82461,"end":82527,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":559196},"to":{"change":18,"start":559196,"end":559250},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" k: &Vertex,"},{"Add":" e: Option<&SerializedEdge>,"}],"del_contents":[{"Del":" k: Vertex,\n e: Option,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1256,"ins":{"up_context":[{"change":18,"pos":50114}],"down_context":[{"change":18,"pos":559388}],"flag":"BLOCK","start":82528,"end":82580,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":14359},"to":{"change":18,"start":559289,"end":559388},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":50114},"to":{"change":18,"start":559289,"end":559388},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":559289},"to":{"change":18,"start":559289,"end":559388},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" Ok(btree::del(&mut self.txn, graph, k, e)?)"}],"del_contents":[{"Del":" debug!(\"del_graph {:?} {:?}\", k, e);\n Ok(self.txn.del(&mut self.rng, graph, k, e)?)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1258,"ins":{"up_context":[{"change":18,"pos":559394}],"down_context":[{"change":18,"pos":45388}],"flag":"BLOCK","start":82581,"end":82725,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":559394},"to":{"change":18,"start":50115,"end":50239},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" sanakirja_put_del!(internal, SerializedHash, ChangeId, GraphError);"},{"Add":" sanakirja_put_del!(external, ChangeId, SerializedHash, GraphError);"}],"del_contents":[{"Del":" sanakirja_put_del!(internal, Hash, ChangeId, GraphError);\n sanakirja_put_del!(external, ChangeId, Hash, GraphError);\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1264,"ins":{"up_context":[{"change":18,"pos":45461}],"down_context":[{"change":18,"pos":45492}],"flag":"BLOCK","start":82726,"end":82758,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":45461},"to":{"change":18,"start":45461,"end":45492},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" key: &Vertex,"}],"del_contents":[{"Del":" key: Vertex,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1266,"ins":{"up_context":[{"change":18,"pos":45521}],"down_context":[{"change":18,"pos":45550}],"flag":"BLOCK","start":82759,"end":82798,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":45521},"to":{"change":18,"start":45521,"end":45550},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" buf: &mut Vec,"}],"del_contents":[{"Del":" buf: &mut Vec,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1270,"ins":{"up_context":[{"change":18,"pos":66}],"down_context":[{"change":18,"pos":45677}],"flag":"BLOCK","start":82799,"end":82914,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":66},"to":{"change":18,"start":45598,"end":45677},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":45598},"to":{"change":18,"start":45598,"end":45677},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" let mut cursor = btree::cursor::Cursor::new(&self.txn, graph)?;"},{"Add":" cursor.set(&self.txn, key, None)?;"}],"del_contents":[{"Del":" let (mut cursor, _) = self.txn.set_cursors(graph, Some((key, None)))?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1273,"ins":{"up_context":[{"change":18,"pos":45692}],"down_context":[{"change":18,"pos":45806}],"flag":"BLOCK","start":82915,"end":82958,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":45692},"to":{"change":18,"start":45692,"end":45806},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" match cursor.next(&self.txn) {"}],"del_contents":[{"Del":" match unsafe { ::sanakirja::next::<_, Vertex, Edge>(&self.txn, &mut cursor) }\n {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1280,"ins":{"up_context":[{"change":18,"pos":46004}],"down_context":[{"change":18,"pos":46036}],"flag":"BLOCK","start":82959,"end":82992,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":46004},"to":{"change":18,"start":46004,"end":46036},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" buf.push(*v)"}],"del_contents":[{"Del":" buf.push(v)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1283,"ins":{"up_context":[{"change":18,"pos":46089}],"down_context":[{"change":18,"pos":46212}],"flag":"BLOCK","start":82993,"end":83133,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":46089},"to":{"change":18,"start":46089,"end":46212},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" Err(e) => {"},{"Add":" error!(\"{:?}\", e);"},{"Add":" return Err(TxnErr(SanakirjaError::PristineCorrupt));"}],"del_contents":[{"Del":" Err(::sanakirja::CRCError {}) => {\n return Err(TxnErr(SanakirjaError::PristineCorrupt))\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1290,"ins":{"up_context":[{"change":18,"pos":46289}],"down_context":[{"change":18,"pos":46460}],"flag":"BLOCK","start":83134,"end":83341,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":46289},"to":{"change":18,"start":46289,"end":46460},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" assert!("},{"Add":" chi.introduced_by() != ChangeId::ROOT || chi.flag().contains(EdgeFlags::PSEUDO)"},{"Add":" );"},{"Add":" if chi.flag().contains(EdgeFlags::PARENT | EdgeFlags::BLOCK) {"}],"del_contents":[{"Del":" assert!(chi.introduced_by != ChangeId::ROOT || chi.flag.contains(EdgeFlags::PSEUDO));\n if chi.flag.contains(EdgeFlags::PARENT | EdgeFlags::BLOCK) {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1297,"ins":{"up_context":[{"change":18,"pos":46549}],"down_context":[{"change":18,"pos":46599}],"flag":"BLOCK","start":83342,"end":83394,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":46549},"to":{"change":18,"start":46549,"end":46599},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" chi.flag() - EdgeFlags::PARENT,"}],"del_contents":[{"Del":" chi.flag - EdgeFlags::PARENT,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1308,"ins":{"up_context":[{"change":18,"pos":46941}],"down_context":[{"change":18,"pos":46980}],"flag":"BLOCK","start":83395,"end":83436,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":46941},"to":{"change":18,"start":46941,"end":46980},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" chi.introduced_by(),"}],"del_contents":[{"Del":" chi.introduced_by,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1312,"ins":{"up_context":[{"change":18,"pos":47015}],"down_context":[{"change":18,"pos":47067}],"flag":"BLOCK","start":83437,"end":83490,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":47015},"to":{"change":18,"start":47015,"end":47067},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" self.del_graph(graph, key, Some(&chi))?;"}],"del_contents":[{"Del":" self.del_graph(graph, key, Some(chi))?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1315,"ins":{"up_context":[{"change":18,"pos":47118}],"down_context":[{"change":18,"pos":47176}],"flag":"BLOCK","start":83491,"end":83552,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":47118},"to":{"change":18,"start":47118,"end":47176},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" &if chi.flag().contains(EdgeFlags::PARENT) {"}],"del_contents":[{"Del":" if chi.flag.contains(EdgeFlags::PARENT) {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1328,"ins":{"up_context":[{"change":18,"pos":47560}],"down_context":[{"change":18,"pos":47581}],"flag":"BLOCK","start":83553,"end":83575,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":47560},"to":{"change":18,"start":47560,"end":47581},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" &chi,"}],"del_contents":[{"Del":" chi,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1342,"ins":{"up_context":[{"change":18,"pos":47850}],"down_context":[{"change":18,"pos":47888}],"flag":"BLOCK","start":83576,"end":83621,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":47850},"to":{"change":18,"start":47850,"end":47888},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" channel.last_modified = t.into()"}],"del_contents":[{"Del":" channel.last_modified = t\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1344,"ins":{"up_context":[{"change":18,"pos":47984}],"down_context":[{"change":18,"pos":48039}],"flag":"BLOCK","start":83622,"end":83684,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":47984},"to":{"change":18,"start":47984,"end":48039},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" channel.last_modified = duration.as_secs().into()"}],"del_contents":[{"Del":" channel.last_modified = duration.as_secs()\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1355,"ins":{"up_context":[{"change":18,"pos":50340}],"down_context":[{"change":18,"pos":560386}],"flag":"BLOCK","start":83685,"end":83893,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":50340},"to":{"change":18,"start":48095,"end":48159},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" debug!(\"put_changes {:?} {:?}\", p, h);"},{"Add":" if let Some(m) = self.get_changeset(&channel.changes, &p)? {"},{"Add":" debug!(\"found m = {:?}, p = {:?}\", m, p);"},{"Add":" Ok(None)"},{"Add":" } else {"}],"del_contents":[{"Del":" if self.get_changeset(&channel.changes, p)?.is_none() {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1362,"ins":{"up_context":[{"change":18,"pos":560477}],"down_context":[{"change":18,"pos":560596}],"flag":"BLOCK","start":83894,"end":84030,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":560477},"to":{"change":18,"start":48160,"end":48287},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":48287},"to":{"change":18,"start":50411,"end":50528},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":560477},"to":{"change":18,"start":50411,"end":50528},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" let m = if let Some(x) = btree::rev_iter(&self.txn, &channel.revchanges, None)?.next() {"},{"Add":" (&(x?.1).b).into()"}],"del_contents":[{"Del":" for i in self.txn.iter(&channel.changes, None).unwrap() {\n debug!(\"changes {:?}\", i);\n }\n"},{"Del":" let m = if let Some(x) = self.txn.rev_iter(&channel.revchanges, None)?.next() {\n (x?.1).1\n"}]}},{"Edit":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1368,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":560694},"to":{"change":18,"start":48288,"end":48367},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":48367},"to":{"change":18,"start":560812,"end":560891},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":560812},"to":{"change":18,"start":560812,"end":560891},"introduced_by":18}],"inode":{"change":18,"pos":531056}}},"contents":[{"Del":" assert!(self.get_revchangeset(&channel.revchanges, t)?.is_none());\n"},{"Del":" assert!(self.txn.put(&mut self.rng, &mut channel.changes, p, t)?);\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1369,"ins":{"up_context":[{"change":18,"pos":560916}],"down_context":[{"change":18,"pos":561074}],"flag":"BLOCK","start":84031,"end":84514,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":560916},"to":{"change":18,"start":560916,"end":561074},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" .get_revchangeset(&channel.revchanges, &t.into())?"},{"Add":" .is_none());"},{"Add":" assert!(btree::put("},{"Add":" &mut self.txn,"},{"Add":" &mut channel.changes,"},{"Add":" &p,"},{"Add":" &t.into()"},{"Add":" )?);"},{"Add":" assert!(btree::put("},{"Add":" &mut self.txn,"},{"Add":" &mut channel.revchanges,"},{"Add":" &t.into(),"},{"Add":" &Pair { a: p, b: m.into() }"},{"Add":" )?);"},{"Add":" Ok(Some(m.into()))"}],"del_contents":[{"Del":" .txn\n .put(&mut self.rng, &mut channel.revchanges, t, (p, m))?);\n Ok(Some(m))\n } else {\n Ok(None)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1394,"ins":{"up_context":[{"change":18,"pos":561308}],"down_context":[{"change":18,"pos":561450}],"flag":"BLOCK","start":84515,"end":84720,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":561308},"to":{"change":18,"start":50646,"end":50753},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":50753},"to":{"change":18,"start":561390,"end":561450},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":561390},"to":{"change":18,"start":561390,"end":561450},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" let tl = t.into();"},{"Add":" for x in btree::iter(&self.txn, &channel.revchanges, Some((&tl, None)))? {"},{"Add":" let (t_, p) = x?;"},{"Add":" if *t_ >= tl {"},{"Add":" repl.push((*t_, p.a))"}],"del_contents":[{"Del":" for x in self.txn.iter(&channel.revchanges, Some((t, None)))? {\n let (t_, (p, _)) = x?;\n"},{"Del":" if t_ >= t {\n repl.push((t_, p))\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1402,"ins":{"up_context":[{"change":18,"pos":561510}],"down_context":[{"change":18,"pos":561645}],"flag":"BLOCK","start":84721,"end":84901,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":561510},"to":{"change":18,"start":50754,"end":50866},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":50866},"to":{"change":18,"start":561597,"end":561645},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":561597},"to":{"change":18,"start":561597,"end":561645},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" for x in btree::rev_iter(&self.txn, &channel.revchanges, Some((&tl, None)))? {"},{"Add":" let (t_, mm) = x?;"},{"Add":" if t_ < &tl {"},{"Add":" m = (&mm.b).into();"}],"del_contents":[{"Del":" for x in self.txn.rev_iter(&channel.revchanges, Some((t, None)))? {\n let (t_, (_, m_)) = x?;\n"},{"Del":" if t_ < t {\n m = m_;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1411,"ins":{"up_context":[{"change":18,"pos":561781}],"down_context":[{"change":18,"pos":562068}],"flag":"BLOCK","start":84902,"end":85273,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":561781},"to":{"change":18,"start":561781,"end":561901},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":561901},"to":{"change":18,"start":50867,"end":50929},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":50929},"to":{"change":18,"start":561962,"end":562068},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":561962},"to":{"change":18,"start":561962,"end":562068},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" btree::del(&mut self.txn, &mut channel.revchanges, t_, None)?;"},{"Add":" if *t_ > tl {"},{"Add":" m = m.next(&self.get_external(p)?.unwrap().into());"},{"Add":" btree::put("},{"Add":" &mut self.txn,"},{"Add":" &mut channel.revchanges,"},{"Add":" t_,"},{"Add":" &Pair { a: *p, b: m.into() },"},{"Add":" )?;"}],"del_contents":[{"Del":" self.txn\n .del(&mut self.rng, &mut channel.revchanges, *t_, None)?;\n if *t_ > t {\n"},{"Del":" m = m.next(&self.get_external(*p)?.unwrap());\n"},{"Del":" self.txn\n .put(&mut self.rng, &mut channel.revchanges, *t_, (*p, m))?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1422,"ins":{"up_context":[{"change":18,"pos":562092}],"down_context":[{"change":18,"pos":50930}],"flag":"BLOCK","start":85274,"end":85415,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":562092},"to":{"change":18,"start":562092,"end":562193},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" Ok(btree::del("},{"Add":" &mut self.txn,"},{"Add":" &mut channel.changes,"},{"Add":" &p,"},{"Add":" Some(&t.into()),"},{"Add":" )?)"}],"del_contents":[{"Del":" Ok(self\n .txn\n .del(&mut self.rng, &mut channel.changes, p, Some(t))?)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1442,"ins":{"up_context":[{"change":18,"pos":51441}],"down_context":[{"change":18,"pos":51730}],"flag":"BLOCK","start":85416,"end":85533,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":51441},"to":{"change":18,"start":51441,"end":51730},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" sanakirja_put_del!(tree, PathId, Inode, TreeError,);"},{"Add":" sanakirja_put_del!(revtree, Inode, PathId, TreeError,);"}],"del_contents":[{"Del":" sanakirja_put_del!(\n tree,\n PathId,\n Inode,\n TreeError,\n UnsafePathId::from_fileid(k),\n v\n );\n sanakirja_put_del!(\n revtree,\n Inode,\n PathId,\n TreeError,\n k,\n UnsafePathId::from_fileid(v)\n );\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1451,"ins":{"up_context":[{"change":18,"pos":51910}],"down_context":[{"change":18,"pos":562193}],"flag":"BLOCK","start":85534,"end":85601,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":51910},"to":{"change":18,"start":51910,"end":52083},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" Ok(btree::put(&mut self.txn, &mut self.partials, &k, &e)?)"}],"del_contents":[{"Del":" 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"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1460,"ins":{"up_context":[{"change":18,"pos":52271}],"down_context":[{"change":18,"pos":52323}],"flag":"BLOCK","start":85602,"end":85652,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":52271},"to":{"change":18,"start":52271,"end":52323},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" Ok(btree::del("},{"Add":" &mut self.txn,"}],"del_contents":[{"Del":" Ok(self.txn.del(\n &mut self.rng,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1463,"ins":{"up_context":[{"change":18,"pos":52355}],"down_context":[{"change":18,"pos":52432}],"flag":"BLOCK","start":85653,"end":85693,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":52355},"to":{"change":18,"start":52355,"end":52432},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" &k,"},{"Add":" e.as_ref(),"}],"del_contents":[{"Del":" UnsafeSmallStr::from_small_str(k.as_small_str()),\n e,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1477,"ins":{"up_context":[{"change":18,"pos":562404}],"down_context":[{"change":18,"pos":562600}],"flag":"BLOCK","start":85694,"end":86072,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":562404},"to":{"change":18,"start":562404,"end":562600},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" let h = (&v.0).into();"},{"Add":" let m: SerializedMerkle = (&v.1).into();"},{"Add":" btree::put("},{"Add":" &mut self.txn,"},{"Add":" &mut remote.remote,"},{"Add":" &k.into(),"},{"Add":" &Pair { a: h, b: m.clone() },"},{"Add":" )?;"},{"Add":" btree::put(&mut self.txn, &mut remote.states, &m, &k.into())?;"},{"Add":" Ok(btree::put(&mut self.txn, &mut remote.rev, &h, &k.into())?)"}],"del_contents":[{"Del":" self.txn.put(&mut self.rng, &mut remote.remote, k, v)?;\n self.txn.put(&mut self.rng, &mut remote.states, v.1, k)?;\n Ok(self.txn.put(&mut self.rng, &mut remote.rev, v.0, k)?)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1495,"ins":{"up_context":[{"change":18,"pos":562753}],"down_context":[{"change":18,"pos":563075}],"flag":"BLOCK","start":86073,"end":86748,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":562753},"to":{"change":18,"start":52662,"end":52733},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":52733},"to":{"change":18,"start":562823,"end":563075},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":562823},"to":{"change":18,"start":562823,"end":563075},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" let k = k.into();"},{"Add":" match btree::get(&self.txn, &remote.remote, &k, None)? {"},{"Add":" Some((k0, p)) if k0 == &k => {"},{"Add":" debug!(\"del_remote {:?} {:?}\", k0, p);"},{"Add":" let p = p.clone();"},{"Add":" btree::del(&mut self.txn, &mut remote.rev, &p.a, None)?;"},{"Add":" btree::del(&mut self.txn, &mut remote.states, &p.b, None)?;"},{"Add":" Ok(btree::del("},{"Add":" &mut self.txn,"},{"Add":" &mut remote.remote,"},{"Add":" &k.into(),"},{"Add":" None,"},{"Add":" )?)"},{"Add":" }"},{"Add":" x => {"},{"Add":" debug!(\"not found, {:?}\", x);"},{"Add":" Ok(false)"},{"Add":" }"}],"del_contents":[{"Del":" if let Some((h, m)) = self.txn.get(&remote.remote, k, None)? {\n"},{"Del":" self.txn.del(&mut self.rng, &mut remote.rev, h, None)?;\n self.txn.del(&mut self.rng, &mut remote.states, m, None)?;\n Ok(self.txn.del(&mut self.rng, &mut remote.remote, k, None)?)\n } else {\n Ok(false)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1517,"ins":{"up_context":[{"change":18,"pos":52835}],"down_context":[{"change":18,"pos":563252}],"flag":"BLOCK","start":86749,"end":86818,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":14812},"to":{"change":18,"start":563190,"end":563252},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":52835},"to":{"change":18,"start":563190,"end":563252},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":563190},"to":{"change":18,"start":563190,"end":563252},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" let name = crate::small_string::SmallString::from_str(name);"}],"del_contents":[{"Del":" let name = small_string::SmallString::from_str(name);\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1521,"ins":{"up_context":[{"change":18,"pos":563385}],"down_context":[{"change":18,"pos":564757}],"flag":"BLOCK","start":86819,"end":88532,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":563385},"to":{"change":18,"start":563385,"end":563779},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":563779},"to":{"change":18,"start":52836,"end":52857},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":52857},"to":{"change":18,"start":563799,"end":564757},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":563799},"to":{"change":18,"start":563799,"end":564757},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" let r ="},{"Add":" match btree::get(&self.txn, &self.channels, &name, None)? {"},{"Add":" Some((name_, b)) => {"},{"Add":" assert_eq!(name_, name.as_ref());"},{"Add":" ChannelRef {"},{"Add":" r: Rc::new(RefCell::new(Channel {"},{"Add":" graph: Db::from_page(b.0[0].into()),"},{"Add":" changes: Db::from_page(b.0[1].into()),"},{"Add":" revchanges: UDb::from_page(b.0[2].into()),"},{"Add":" states: UDb::from_page(b.0[3].into()),"},{"Add":" apply_counter: b.0[4].into(),"},{"Add":" name: name.clone(),"},{"Add":" last_modified: b.0[5].into(),"},{"Add":" })),"},{"Add":" }"},{"Add":" }"},{"Add":" _ => {"},{"Add":" let br = ChannelRef {"},{"Add":" r: Rc::new(RefCell::new(Channel {"},{"Add":" graph: btree::create_db_(&mut self.txn)?,"},{"Add":" changes: btree::create_db_(&mut self.txn)?,"},{"Add":" revchanges: btree::create_db_(&mut self.txn)?,"},{"Add":" states: btree::create_db_(&mut self.txn)?,"},{"Add":" apply_counter: 0,"},{"Add":" name: name.clone(),"},{"Add":" last_modified: 0,"},{"Add":" })),"},{"Add":" };"},{"Add":" commit = Some(br.clone());"},{"Add":" br"},{"Add":" }"}],"del_contents":[{"Del":" let r = if let Some((\n graph,\n changes,\n revchanges,\n states,\n apply_counter,\n last_modified,\n )) = self.txn.get(\n &self.channels,\n UnsafeSmallStr::from_small_str(name.as_small_str()),\n None,\n"},{"Del":" )? {\n"},{"Del":" ChannelRef {\n r: Rc::new(RefCell::new(Channel {\n graph,\n changes,\n revchanges,\n states,\n apply_counter,\n name: name.clone(),\n last_modified,\n })),\n }\n } else {\n let br = ChannelRef {\n r: Rc::new(RefCell::new(Channel {\n graph: self.txn.create_db()?,\n changes: self.txn.create_db()?,\n revchanges: self.txn.create_db()?,\n states: self.txn.create_db()?,\n apply_counter: 0,\n name: name.clone(),\n last_modified: 0,\n })),\n"}]}},{"Edit":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1553,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":564780},"to":{"change":18,"start":564780,"end":564869},"introduced_by":18}],"inode":{"change":18,"pos":531056}}},"contents":[{"Del":" commit = Some(br.clone());\n br\n };\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1570,"ins":{"up_context":[{"change":18,"pos":565367}],"down_context":[{"change":18,"pos":52924}],"flag":"BLOCK","start":88533,"end":88598,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":565367},"to":{"change":18,"start":565367,"end":565555},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" match btree::get(&self.txn, &self.channels, &name, None)"}],"del_contents":[{"Del":" if self\n .txn\n .get(\n &self.channels,\n UnsafeSmallStr::from_small_str(name.as_small_str()),\n None,\n )\n"}]}},{"Edit":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1572,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":52976},"to":{"change":18,"start":565555,"end":565578},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":565555},"to":{"change":18,"start":565555,"end":565578},"introduced_by":18}],"inode":{"change":18,"pos":531056}}},"contents":[{"Del":" .is_none()\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1573,"ins":{"up_context":[{"change":18,"pos":565588}],"down_context":[{"change":18,"pos":566455}],"flag":"BLOCK","start":88599,"end":89771,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":565588},"to":{"change":18,"start":565588,"end":565672},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":565672},"to":{"change":18,"start":14874,"end":15638},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":15638},"to":{"change":18,"start":565984,"end":566176},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":565984},"to":{"change":18,"start":565984,"end":566176},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":566176},"to":{"change":18,"start":4215,"end":4285},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":4285},"to":{"change":18,"start":566288,"end":566324},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":566288},"to":{"change":18,"start":566288,"end":566324},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":566324},"to":{"change":18,"start":15639,"end":15714},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" Some((name_, _)) if name_ == name.as_ref() =>"},{"Add":" Err(super::ForkError::ChannelNameExists(new_name.to_string())),"},{"Add":" _ => {"},{"Add":" let br = ChannelRef {"},{"Add":" r: Rc::new(RefCell::new(Channel {"},{"Add":" graph: btree::fork_db(&mut self.txn, &channel.graph)"},{"Add":" .map_err(|e| ForkError::Txn(e.into()))?,"},{"Add":" changes: btree::fork_db(&mut self.txn, &channel.changes)"},{"Add":" .map_err(|e| ForkError::Txn(e.into()))?,"},{"Add":" revchanges: btree::fork_db(&mut self.txn, &channel.revchanges)"},{"Add":" .map_err(|e| ForkError::Txn(e.into()))?,"},{"Add":" states: btree::fork_db(&mut self.txn, &channel.states)"},{"Add":" .map_err(|e| ForkError::Txn(e.into()))?,"},{"Add":" name: name.clone(),"},{"Add":" apply_counter: channel.apply_counter,"},{"Add":" last_modified: channel.last_modified,"},{"Add":" })),"},{"Add":" };"},{"Add":" self.open_channels.borrow_mut().insert(name, br.clone());"},{"Add":" Ok(br)"},{"Add":" }"}],"del_contents":[{"Del":" let br = ChannelRef {\n r: Rc::new(RefCell::new(Channel {\n"},{"Del":" graph: self\n .txn\n .fork(&mut self.rng, &channel.graph)\n .map_err(|e| ForkError::Txn(e.into()))?,\n changes: self\n .txn\n .fork(&mut self.rng, &channel.changes)\n .map_err(|e| ForkError::Txn(e.into()))?,\n revchanges: self\n .txn\n .fork(&mut self.rng, &channel.revchanges)\n .map_err(|e| ForkError::Txn(e.into()))?,\n states: self\n .txn\n .fork(&mut self.rng, &channel.states)\n .map_err(|e| ForkError::Txn(e.into()))?,\n"},{"Del":" name: name.clone(),\n apply_counter: channel.apply_counter,\n last_modified: channel.last_modified,\n })),\n };\n"},{"Del":" self.open_channels.borrow_mut().insert(name, br.clone());\n"},{"Del":" Ok(br)\n } else {\n"},{"Del":" Err(super::ForkError::ChannelNameExists(new_name.to_string()))\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1603,"ins":{"up_context":[{"change":18,"pos":566667}],"down_context":[{"change":18,"pos":53029}],"flag":"BLOCK","start":89772,"end":89837,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":566667},"to":{"change":18,"start":566667,"end":566855},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" match btree::get(&self.txn, &self.channels, &name, None)"}],"del_contents":[{"Del":" if self\n .txn\n .get(\n &self.channels,\n UnsafeSmallStr::from_small_str(name.as_small_str()),\n None,\n )\n"}]}},{"Edit":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1605,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":53081},"to":{"change":18,"start":566855,"end":566878},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":566855},"to":{"change":18,"start":566855,"end":566878},"introduced_by":18}],"inode":{"change":18,"pos":531056}}},"contents":[{"Del":" .is_none()\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1606,"ins":{"up_context":[{"change":18,"pos":566888}],"down_context":[{"change":18,"pos":15970}],"flag":"BLOCK","start":89838,"end":90142,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":566888},"to":{"change":2,"start":0,"end":163},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":163},"to":{"change":18,"start":15762,"end":15840},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":566888},"to":{"change":18,"start":15762,"end":15840},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":15840},"to":{"change":2,"start":164,"end":203},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":203},"to":{"change":18,"start":15880,"end":15970},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":15880},"to":{"change":18,"start":15880,"end":15970},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" Some((name_, _)) if name_ == name.as_ref() =>"},{"Add":" Err(super::ForkError::ChannelNameExists(new_name.to_string())),"},{"Add":" _ => {"},{"Add":" btree::del("},{"Add":" &mut self.txn,"},{"Add":" &mut self.channels,"},{"Add":" &channel.borrow().name,"}],"del_contents":[{"Del":" let mut dbs_channels: ::sanakirja::Db =\n unsafe { std::mem::transmute(self.channels) };\n"},{"Del":" self.txn\n .del(\n &mut self.rng,\n"},{"Del":" &mut dbs_channels,\n"},{"Del":" UnsafeSmallStr::from_small_str(channel.borrow().name.as_small_str()),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1615,"ins":{"up_context":[{"change":18,"pos":16014}],"down_context":[{"change":18,"pos":566916}],"flag":"BLOCK","start":90143,"end":90559,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":16014},"to":{"change":18,"start":16014,"end":16071},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":16071},"to":{"change":2,"start":204,"end":278},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":18,"pos":217},"to":{"change":18,"start":566888,"end":566916},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":2,"pos":278},"to":{"change":18,"start":566888,"end":566916},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":18,"pos":16071},"to":{"change":18,"start":566888,"end":566916},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":566888},"to":{"change":18,"start":566888,"end":566916},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" .map_err(|e| ForkError::Txn(e.into()))?;"},{"Add":" std::mem::drop("},{"Add":" self.open_channels"},{"Add":" .borrow_mut()"},{"Add":" .remove(&channel.borrow().name)"},{"Add":" .unwrap(),"},{"Add":" );"},{"Add":" std::cell::RefCell::borrow_mut(&std::rc::Rc::get_mut(&mut channel.r).unwrap()).name ="},{"Add":" name.clone();"}],"del_contents":[{"Del":" .map_err(|e| ForkError::Txn(e.into()))?;\n"},{"Del":" self.channels = unsafe { std::mem::transmute(dbs_channels) };\n"},{"Del":" std::mem::drop(\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1626,"ins":{"up_context":[{"change":18,"pos":566985}],"down_context":[{"change":18,"pos":567487}],"flag":"BLOCK","start":90560,"end":90649,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":566985},"to":{"change":18,"start":566985,"end":567356},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":567356},"to":{"change":18,"start":16072,"end":16140},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" .insert(name, channel.clone());"},{"Add":" Ok(())"},{"Add":" }"}],"del_contents":[{"Del":" .remove(&channel.borrow().name)\n .unwrap(),\n );\n std::cell::RefCell::borrow_mut(&std::rc::Rc::get_mut(&mut channel.r).unwrap()).name =\n name.clone();\n self.open_channels\n .borrow_mut()\n .insert(name, channel.clone());\n Ok(())\n } else {\n"},{"Del":" Err(ForkError::ChannelNameExists(new_name.to_string()))\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1636,"ins":{"up_context":[{"change":18,"pos":567726}],"down_context":[{"change":18,"pos":567915}],"flag":"BLOCK","start":90650,"end":90732,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":567726},"to":{"change":18,"start":567726,"end":567915},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" let result = btree::del(&mut self.txn, &mut self.channels, &name, None)?;"}],"del_contents":[{"Del":" let result = self.txn.del(\n &mut self.rng,\n &mut self.channels,\n UnsafeSmallStr::from_small_str(name.as_small_str()),\n None,\n )?;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1642,"ins":{"up_context":[{"change":18,"pos":53261}],"down_context":[{"change":18,"pos":568157}],"flag":"BLOCK","start":90733,"end":90802,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":16310},"to":{"change":18,"start":568095,"end":568157},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":53261},"to":{"change":18,"start":568095,"end":568157},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":568095},"to":{"change":18,"start":568095,"end":568157},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" let name = crate::small_string::SmallString::from_str(name);"}],"del_contents":[{"Del":" let name = small_string::SmallString::from_str(name);\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1646,"ins":{"up_context":[{"change":18,"pos":568289}],"down_context":[{"change":18,"pos":569194}],"flag":"BLOCK","start":90803,"end":92083,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":568289},"to":{"change":18,"start":568289,"end":568483},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":568483},"to":{"change":18,"start":53262,"end":53283},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":53283},"to":{"change":18,"start":568503,"end":569194},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":568503},"to":{"change":18,"start":568503,"end":569194},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" let r ="},{"Add":" match btree::get(&self.txn, &self.remotes, &name, None)? {"},{"Add":" Some((name_, remote)) if name_ == name.as_ref() => {"},{"Add":" RemoteRef {"},{"Add":" db: Rc::new(RefCell::new(Remote {"},{"Add":" remote: UDb::from_page(remote.0[0].into()),"},{"Add":" rev: UDb::from_page(remote.0[1].into()),"},{"Add":" states: UDb::from_page(remote.0[2].into()),"},{"Add":" })),"},{"Add":" name: name.clone(),"},{"Add":" }"},{"Add":" }"},{"Add":" _ => {"},{"Add":" let br = RemoteRef {"},{"Add":" db: Rc::new(RefCell::new(Remote {"},{"Add":" remote: btree::create_db_(&mut self.txn)?,"},{"Add":" rev: btree::create_db_(&mut self.txn)?,"},{"Add":" states: btree::create_db_(&mut self.txn)?,"},{"Add":" })),"},{"Add":" name: name.clone(),"},{"Add":" };"},{"Add":" commit = Some(br.clone());"},{"Add":" br"},{"Add":" }"}],"del_contents":[{"Del":" let r = if let Some(remote) = self.txn.get(\n &self.remotes,\n UnsafeSmallStr::from_small_str(name.as_small_str()),\n None,\n"},{"Del":" )? {\n"},{"Del":" RemoteRef {\n db: Rc::new(RefCell::new(Remote {\n remote: remote.0,\n rev: remote.1,\n states: remote.2,\n })),\n name: name.clone(),\n }\n } else {\n let br = RemoteRef {\n db: Rc::new(RefCell::new(Remote {\n remote: self.txn.create_db()?,\n rev: self.txn.create_db()?,\n states: self.txn.create_db()?,\n })),\n name: name.clone(),\n"}]}},{"Edit":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1671,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":569217},"to":{"change":18,"start":569217,"end":569306},"introduced_by":18}],"inode":{"change":18,"pos":531056}}},"contents":[{"Del":" commit = Some(br.clone());\n br\n };\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1686,"ins":{"up_context":[{"change":18,"pos":569845}],"down_context":[{"change":18,"pos":570023}],"flag":"BLOCK","start":92084,"end":92155,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":569845},"to":{"change":18,"start":569845,"end":570023},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" Ok(btree::del(&mut self.txn, &mut self.remotes, &name, None)?)"}],"del_contents":[{"Del":" Ok(self.txn.del(\n &mut self.rng,\n &mut self.remotes,\n UnsafeSmallStr::from_small_str(name.as_small_str()),\n None,\n )?)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1694,"ins":{"up_context":[{"change":18,"pos":570293}],"down_context":[{"change":18,"pos":570471}],"flag":"BLOCK","start":92156,"end":92227,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":570293},"to":{"change":18,"start":570293,"end":570471},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" Ok(btree::del(&mut self.txn, &mut self.remotes, &name, None)?)"}],"del_contents":[{"Del":" Ok(self.txn.del(\n &mut self.rng,\n &mut self.remotes,\n UnsafeSmallStr::from_small_str(name.as_small_str()),\n None,\n )?)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1710,"ins":{"up_context":[{"change":18,"pos":571013}],"down_context":[{"change":18,"pos":571059}],"flag":"BLOCK","start":92228,"end":92329,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":571013},"to":{"change":18,"start":571013,"end":571059},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" for (name, remote) in open_remotes {"},{"Add":" debug!(\"commit remote {:?}\", name);"}],"del_contents":[{"Del":" for (_, remote) in open_remotes {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1715,"ins":{"up_context":[{"change":18,"pos":571127}],"down_context":[{"change":18,"pos":571712}],"flag":"BLOCK","start":92330,"end":92942,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":571127},"to":{"change":18,"start":571127,"end":571712},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" self.txn.set_root(Root::Tree as usize, self.tree.db);"},{"Add":" self.txn.set_root(Root::RevTree as usize, self.revtree.db);"},{"Add":" self.txn.set_root(Root::Inodes as usize, self.inodes.db);"},{"Add":" self.txn.set_root(Root::RevInodes as usize, self.revinodes.db);"},{"Add":" self.txn.set_root(Root::Internal as usize, self.internal.db);"},{"Add":" self.txn.set_root(Root::External as usize, self.external.db);"},{"Add":" self.txn.set_root(Root::RevDep as usize, self.revdep.db);"},{"Add":" self.txn.set_root(Root::Channels as usize, self.channels.db);"},{"Add":" self.txn.set_root(Root::Remotes as usize, self.remotes.db);"}],"del_contents":[{"Del":" self.txn.set_root(Root::Tree as usize, self.tree);\n self.txn.set_root(Root::RevTree as usize, self.revtree);\n self.txn.set_root(Root::Inodes as usize, self.inodes);\n self.txn.set_root(Root::RevInodes as usize, self.revinodes);\n self.txn.set_root(Root::Internal as usize, self.internal);\n self.txn.set_root(Root::External as usize, self.external);\n self.txn.set_root(Root::RevDep as usize, self.revdep);\n self.txn.set_root(Root::Channels as usize, self.channels);\n self.txn.set_root(Root::Remotes as usize, self.remotes);\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1725,"ins":{"up_context":[{"change":18,"pos":571729}],"down_context":[{"change":18,"pos":571858}],"flag":"BLOCK","start":92943,"end":93078,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":571729},"to":{"change":18,"start":571729,"end":571858},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" .set_root(Root::TouchedFiles as usize, self.touched_files.db);"},{"Add":" self.txn.set_root(Root::Dep as usize, self.dep.db);"}],"del_contents":[{"Del":" .set_root(Root::TouchedFiles as usize, self.touched_files);\n self.txn.set_root(Root::Dep as usize, self.dep);\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1728,"ins":{"up_context":[{"change":18,"pos":571875}],"down_context":[{"change":18,"pos":572021}],"flag":"BLOCK","start":93079,"end":93231,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":571875},"to":{"change":18,"start":571875,"end":572021},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" .set_root(Root::RevTouchedFiles as usize, self.rev_touched_files.db);"},{"Add":" self.txn.set_root(Root::Partials as usize, self.partials.db);"}],"del_contents":[{"Del":" .set_root(Root::RevTouchedFiles as usize, self.rev_touched_files);\n self.txn.set_root(Root::Partials as usize, self.partials);\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1739,"ins":{"up_context":[{"change":18,"pos":572209}],"down_context":[{"change":18,"pos":572745}],"flag":"BLOCK","start":93232,"end":93910,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":572209},"to":{"change":18,"start":572209,"end":572420},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":572420},"to":{"change":18,"start":53621,"end":53664},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":53664},"to":{"change":18,"start":572459,"end":572491},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":572459},"to":{"change":18,"start":572459,"end":572491},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":572491},"to":{"change":18,"start":247,"end":300},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":300},"to":{"change":18,"start":572565,"end":572629},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":572565},"to":{"change":18,"start":572565,"end":572629},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":572629},"to":{"change":18,"start":357,"end":379},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":379},"to":{"change":18,"start":572665,"end":572696},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":572665},"to":{"change":18,"start":572665,"end":572696},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":572696},"to":{"change":18,"start":53665,"end":53681},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":53681},"to":{"change":18,"start":572711,"end":572728},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":572711},"to":{"change":18,"start":572711,"end":572728},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":572728},"to":{"change":18,"start":53682,"end":53703},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" match btree::get(&self.txn, &self.channels, &name, None)? {"},{"Add":" Some((name_, c)) => {"},{"Add":" assert_eq!(name.as_ref(), name_);"},{"Add":" debug!(\"load_const_channel = {:?} {:?}\", name_ ,c);"},{"Add":" Ok(Some(Channel {"},{"Add":" graph: Db::from_page(c.0[0].into()),"},{"Add":" changes: Db::from_page(c.0[1].into()),"},{"Add":" revchanges: UDb::from_page(c.0[2].into()),"},{"Add":" states: UDb::from_page(c.0[3].into()),"},{"Add":" apply_counter: c.0[4].into(),"},{"Add":" last_modified: c.0[5].into(),"},{"Add":" name,"},{"Add":" }))"},{"Add":" }"},{"Add":" _ => Ok(None)"}],"del_contents":[{"Del":" if let Some((channel, changes, revchanges, states, counter, last_modified)) = self.txn.get(\n &self.channels,\n UnsafeSmallStr::from_small_str(name.as_small_str()),\n None,\n"},{"Del":" )? {\n Ok(Some(Channel {\n"},{"Del":" graph: channel,\n"},{"Del":" changes,\n revchanges,\n"},{"Del":" states,\n apply_counter: counter,\n"},{"Del":" name,\n"},{"Del":" last_modified,\n"},{"Del":" }))\n"},{"Del":" } else {\n"},{"Del":" Ok(None)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1771,"ins":{"up_context":[{"change":18,"pos":573453}],"down_context":[{"change":18,"pos":573831}],"flag":"BLOCK","start":93911,"end":94087,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":573453},"to":{"change":18,"start":573453,"end":573831},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" debug!(\"Commit_channel, dbs_channels = {:?}\", self.channels);"},{"Add":" btree::del("},{"Add":" &mut self.txn,"},{"Add":" &mut self.channels,"},{"Add":" &channel.name,"}],"del_contents":[{"Del":" let mut dbs_channels: ::sanakirja::Db =\n unsafe { std::mem::transmute(self.channels) };\n\n debug!(\"Commit_channel, dbs_channels = {:?}\", dbs_channels);\n self.txn.del(\n &mut self.rng,\n &mut dbs_channels,\n UnsafeSmallStr::from_small_str(channel.name.as_small_str()),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1778,"ins":{"up_context":[{"change":18,"pos":573861}],"down_context":[{"change":18,"pos":574049}],"flag":"BLOCK","start":94088,"end":94442,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":573861},"to":{"change":18,"start":573861,"end":574049},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" let t6 = T6(["},{"Add":" channel.graph.db.into(),"},{"Add":" channel.changes.db.into(),"},{"Add":" channel.revchanges.db.into(),"},{"Add":" channel.states.db.into(),"},{"Add":" channel.apply_counter.into(),"},{"Add":" channel.last_modified.into(),"},{"Add":" ]);"},{"Add":" debug!(\"t6 = {:?}\", t6);"},{"Add":" btree::put("},{"Add":" &mut self.txn,"}],"del_contents":[{"Del":" debug!(\"Commit_channel, dbs_channels = {:?}\", dbs_channels);\n self.channels = unsafe { std::mem::transmute(dbs_channels) };\n self.txn.put(\n &mut self.rng,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1790,"ins":{"up_context":[{"change":18,"pos":574081}],"down_context":[{"change":18,"pos":574393}],"flag":"BLOCK","start":94443,"end":94487,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":574081},"to":{"change":18,"start":574081,"end":574393},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" &channel.name,"},{"Add":" &t6,"}],"del_contents":[{"Del":" UnsafeSmallStr::from_small_str(channel.name.as_small_str()),\n (\n channel.graph,\n channel.changes,\n channel.revchanges,\n channel.states,\n channel.apply_counter,\n channel.last_modified,\n ),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1793,"ins":{"up_context":[{"change":18,"pos":574405}],"down_context":[{"change":18,"pos":574480}],"flag":"BLOCK","start":94488,"end":94559,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":574405},"to":{"change":18,"start":574405,"end":574480},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" debug!(\"Commit_channel, self.channels = {:?}\", self.channels);"}],"del_contents":[{"Del":" debug!(\"Commit_channel, self.dbs.channels = {:?}\", self.channels);\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1808,"ins":{"up_context":[{"change":18,"pos":53791}],"down_context":[{"change":18,"pos":575336}],"flag":"BLOCK","start":94560,"end":94664,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":16806},"to":{"change":18,"start":574980,"end":575336},"introduced_by":18},{"previous":"","flag":"DELETED","from":{"change":18,"pos":53791},"to":{"change":18,"start":574980,"end":575336},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":574980},"to":{"change":18,"start":574980,"end":575336},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" btree::del("},{"Add":" &mut self.txn,"},{"Add":" &mut self.remotes,"},{"Add":" &remote.name,"}],"del_contents":[{"Del":" let mut dbs_remotes: ::sanakirja::Db =\n unsafe { std::mem::transmute(self.remotes) };\n\n debug!(\"Commit_remote, dbs_remotes = {:?}\", dbs_remotes);\n self.txn.del(\n &mut self.rng,\n &mut dbs_remotes,\n UnsafeSmallStr::from_small_str(remote.name.as_small_str()),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1814,"ins":{"up_context":[{"change":18,"pos":575366}],"down_context":[{"change":18,"pos":575500}],"flag":"BLOCK","start":94665,"end":94732,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":575366},"to":{"change":18,"start":575366,"end":575500},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" debug!(\"Commit_remote, dbs_remotes = {:?}\", self.remotes);"}],"del_contents":[{"Del":" debug!(\"Commit_remote, dbs_remotes = {:?}\", dbs_remotes);\n self.remotes = unsafe { std::mem::transmute(dbs_remotes) };\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1816,"ins":{"up_context":[{"change":18,"pos":575536}],"down_context":[{"change":18,"pos":575585}],"flag":"BLOCK","start":94733,"end":94780,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":575536},"to":{"change":18,"start":575536,"end":575585},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" btree::put("},{"Add":" &mut self.txn,"}],"del_contents":[{"Del":" self.txn.put(\n &mut self.rng,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1819,"ins":{"up_context":[{"change":18,"pos":575616}],"down_context":[{"change":18,"pos":575729}],"flag":"BLOCK","start":94781,"end":94945,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":575616},"to":{"change":18,"start":575616,"end":575729},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" &remote.name,"},{"Add":" &T3(["},{"Add":" r.remote.db.into(),"},{"Add":" r.rev.db.into(),"},{"Add":" r.states.db.into()"},{"Add":" ]),"}],"del_contents":[{"Del":" UnsafeSmallStr::from_small_str(remote.name.as_small_str()),\n (r.remote, r.rev, r.states),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1837,"ins":{"up_context":[{"change":18,"pos":576098}],"down_context":[{"change":18,"pos":576850}],"flag":"BLOCK","start":94946,"end":94965,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":576153},"to":{"change":18,"start":576153,"end":576850},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":"direct_repr!(L64);"}],"del_contents":[{"Del":"const CHANGE_ID_SIZE: usize = 8;\nimpl Representable for ChangeId {\n fn alignment() -> Alignment {\n Alignment::B8\n }\n fn onpage_size(&self) -> u16 {\n CHANGE_ID_SIZE as u16\n }\n unsafe fn write_value(&self, p: *mut u8) {\n LittleEndian::write_u64(std::slice::from_raw_parts_mut(p, 8), self.0)\n }\n unsafe fn read_value(p: *const u8) -> Self {\n ChangeId(LittleEndian::read_u64(std::slice::from_raw_parts(p, 8)))\n }\n unsafe fn cmp_value(&self, _: &T, x: Self) -> std::cmp::Ordering {\n self.0.cmp(&x.0)\n }\n type PageOffsets = std::iter::Empty;\n fn page_offsets(&self) -> Self::PageOffsets {\n std::iter::empty()\n }\n}\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1839,"ins":{"up_context":[{"change":18,"pos":576851}],"down_context":[{"change":18,"pos":576899}],"flag":"BLOCK","start":94966,"end":94990,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":576851},"to":{"change":18,"start":576851,"end":576899},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":"direct_repr!(ChangeId);"}],"del_contents":[{"Del":"const VERTEX_SIZE: usize = CHANGE_ID_SIZE + 16;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1841,"ins":{"up_context":[{"change":18,"pos":576900}],"down_context":[{"change":18,"pos":578062}],"flag":"BLOCK","start":94991,"end":95057,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":576900},"to":{"change":18,"start":576900,"end":578062},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":"direct_repr!(Vertex);"},{"Add":"direct_repr!(Position);"}],"del_contents":[{"Del":"impl Representable for Vertex {\n fn alignment() -> Alignment {\n Alignment::B1\n }\n fn onpage_size(&self) -> u16 {\n VERTEX_SIZE as u16\n }\n unsafe fn write_value(&self, p: *mut u8) {\n let p = std::slice::from_raw_parts_mut(p, VERTEX_SIZE);\n LittleEndian::write_u64(p, self.change.0);\n LittleEndian::write_u64(&mut p[CHANGE_ID_SIZE..], self.start.0);\n LittleEndian::write_u64(&mut p[CHANGE_ID_SIZE + 8..], self.end.0);\n }\n unsafe fn read_value(p: *const u8) -> Self {\n let p = std::slice::from_raw_parts(p, VERTEX_SIZE);\n let change = LittleEndian::read_u64(p);\n let start = LittleEndian::read_u64(&p[CHANGE_ID_SIZE..]);\n let end = LittleEndian::read_u64(&p[CHANGE_ID_SIZE + 8..]);\n Vertex {\n change: ChangeId(change),\n start: ChangePosition(start),\n end: ChangePosition(end),\n }\n }\n unsafe fn cmp_value(&self, _: &T, x: Self) -> std::cmp::Ordering {\n self.cmp(&x)\n }\n type PageOffsets = std::iter::Empty;\n fn page_offsets(&self) -> Self::PageOffsets {\n std::iter::empty()\n }\n}\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1844,"ins":{"up_context":[{"change":18,"pos":578063}],"down_context":[{"change":18,"pos":578926}],"flag":"BLOCK","start":95058,"end":95202,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":578063},"to":{"change":18,"start":578063,"end":578926},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":"direct_repr!(SerializedEdge);"},{"Add":""},{"Add":"impl Storable for PathId {"},{"Add":" fn compare(&self, _: &T, x: &Self) -> std::cmp::Ordering {"},{"Add":" self.cmp(x)"}],"del_contents":[{"Del":"impl Representable for Position {\n fn alignment() -> Alignment {\n Alignment::B1\n }\n fn onpage_size(&self) -> u16 {\n (CHANGE_ID_SIZE + 8) as u16\n }\n unsafe fn write_value(&self, p: *mut u8) {\n let p = std::slice::from_raw_parts_mut(p, CHANGE_ID_SIZE + 8);\n LittleEndian::write_u64(p, self.change.0);\n LittleEndian::write_u64(&mut p[CHANGE_ID_SIZE..], self.pos.0);\n }\n unsafe fn read_value(p: *const u8) -> Self {\n let p = std::slice::from_raw_parts(p, CHANGE_ID_SIZE + 8);\n let change = LittleEndian::read_u64(p);\n let pos = LittleEndian::read_u64(&p[CHANGE_ID_SIZE..]);\n Position {\n change: ChangeId(change),\n pos: ChangePosition(pos),\n }\n }\n unsafe fn cmp_value(&self, _: &T, x: Self) -> std::cmp::Ordering {\n self.cmp(&x)\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1850,"ins":{"up_context":[{"change":18,"pos":578932}],"down_context":[{"change":18,"pos":579028}],"flag":"BLOCK","start":95203,"end":95308,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":578932},"to":{"change":18,"start":578932,"end":579028},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" type PageReferences = std::iter::Empty;"},{"Add":" fn page_references(&self) -> Self::PageReferences {"}],"del_contents":[{"Del":" type PageOffsets = std::iter::Empty;\n fn page_offsets(&self) -> Self::PageOffsets {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1855,"ins":{"up_context":[{"change":18,"pos":579063}],"down_context":[{"change":18,"pos":579202}],"flag":"BLOCK","start":95309,"end":95433,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":579063},"to":{"change":18,"start":579063,"end":579202},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":"impl UnsizedStorable for PathId {"},{"Add":" const ALIGN: usize = 8;"},{"Add":" fn size(&self) -> usize {"},{"Add":" 9 + self.basename.len()"}],"del_contents":[{"Del":"\nimpl Representable for Edge {\n fn alignment() -> Alignment {\n Alignment::B1\n }\n fn onpage_size(&self) -> u16 {\n 25\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1860,"ins":{"up_context":[{"change":18,"pos":579208}],"down_context":[{"change":18,"pos":579553}],"flag":"BLOCK","start":95434,"end":95541,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":579208},"to":{"change":18,"start":579208,"end":579553},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" unsafe fn onpage_size(p: *const u8) -> usize {"},{"Add":" let len = *(p.add(8)) as usize;"},{"Add":" 9 + len"}],"del_contents":[{"Del":" unsafe fn write_value(&self, p: *mut u8) {\n let s = std::slice::from_raw_parts_mut(p, 25);\n s[0] = (*self).flag.bits();\n LittleEndian::write_u64(&mut s[1..], (*self).dest.change.0);\n LittleEndian::write_u64(&mut s[9..], (*self).dest.pos.0);\n LittleEndian::write_u64(&mut s[17..], (*self).introduced_by.0);\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1864,"ins":{"up_context":[{"change":18,"pos":579559}],"down_context":[{"change":18,"pos":580108}],"flag":"BLOCK","start":95542,"end":95643,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":579559},"to":{"change":18,"start":579559,"end":580108},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" unsafe fn from_raw_ptr<'a, T>(_: &T, p: *const u8) -> &'a Self {"},{"Add":" path_id_from_raw_ptr(p)"}],"del_contents":[{"Del":" unsafe fn read_value(p: *const u8) -> Self {\n let s = std::slice::from_raw_parts(p, 25);\n Edge {\n flag: if let Some(b) = EdgeFlags::from_bits(s[0]) {\n b\n } else {\n panic!(\"read_value, edge = {:?}\", s);\n },\n dest: Position {\n change: ChangeId(LittleEndian::read_u64(&s[1..])),\n pos: ChangePosition(LittleEndian::read_u64(&s[9..])),\n },\n introduced_by: ChangeId(LittleEndian::read_u64(&s[17..])),\n }\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1867,"ins":{"up_context":[{"change":18,"pos":580114}],"down_context":[{"change":18,"pos":580261}],"flag":"BLOCK","start":95644,"end":95791,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":580114},"to":{"change":18,"start":580114,"end":580261},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" unsafe fn write_to_page(&self, p: *mut u8) {"},{"Add":" *(p as *mut u64) = (self.parent_inode.0).0;"},{"Add":" self.basename.write_to_page(p.add(8))"}],"del_contents":[{"Del":" unsafe fn cmp_value(&self, _: &T, x: Self) -> std::cmp::Ordering {\n let a: &Edge = self;\n let b: &Edge = &x;\n a.cmp(b)\n"}]}},{"Edit":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1871,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":580267},"to":{"change":18,"start":580267,"end":580396},"introduced_by":18}],"inode":{"change":18,"pos":531056}}},"contents":[{"Del":" type PageOffsets = std::iter::Empty;\n fn page_offsets(&self) -> Self::PageOffsets {\n std::iter::empty()\n }\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1873,"ins":{"up_context":[{"change":18,"pos":580399}],"down_context":[{"change":18,"pos":580704}],"flag":"BLOCK","start":95792,"end":95966,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":580399},"to":{"change":18,"start":580399,"end":580608},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":580623},"to":{"change":18,"start":580623,"end":580704},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":"unsafe fn path_id_from_raw_ptr<'a>(p: *const u8) -> &'a PathId {"},{"Add":" let len = *(p.add(8)) as usize;"},{"Add":" std::mem::transmute(std::slice::from_raw_parts(p, 1 + len as usize))"}],"del_contents":[{"Del":"/// An internal \"unsafe\" version of a [`pristine::PathId`], used to\n/// circumvent the absence of associated type constructors in Rust\n/// (else this would be borrow on a table).\n#[derive(Clone, Copy, Debug)]\n"},{"Del":"pub struct UnsafePathId {\n parent_inode: Inode,\n basename: UnsafeSmallStr,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1877,"ins":{"up_context":[{"change":18,"pos":580706}],"down_context":[{"change":18,"pos":581104}],"flag":"BLOCK","start":95967,"end":96356,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":580706},"to":{"change":18,"start":580706,"end":581104},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":""},{"Add":"#[test]"},{"Add":"fn pathid_repr() {"},{"Add":" let o = OwnedPathId {"},{"Add":" parent_inode: Inode::ROOT,"},{"Add":" basename: SmallString::from_str(\"blablabla\")"},{"Add":" };"},{"Add":" let mut x = vec![0u8; 200];"},{"Add":""},{"Add":" unsafe {"},{"Add":" o.write_to_page(x.as_mut_ptr());"},{"Add":" let p = path_id_from_raw_ptr(x.as_ptr());"},{"Add":" assert_eq!(p.basename.as_str(), \"blablabla\");"},{"Add":" assert_eq!(p.parent_inode, Inode::ROOT);"}],"del_contents":[{"Del":"impl UnsafePathId {\n pub fn from_fileid(f: PathId) -> UnsafePathId {\n UnsafePathId {\n parent_inode: f.parent_inode,\n basename: UnsafeSmallStr::from_small_str(f.basename),\n }\n }\n pub unsafe fn to_fileid<'a>(&self) -> PathId<'a> {\n PathId {\n parent_inode: self.parent_inode,\n basename: self.basename.to_small_str(),\n }\n"}]}},{"Edit":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1894,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":581113},"to":{"change":18,"start":581113,"end":581991},"introduced_by":18}],"inode":{"change":18,"pos":531056}}},"contents":[{"Del":"impl Representable for UnsafePathId {\n fn alignment() -> Alignment {\n Alignment::B1\n }\n fn onpage_size(&self) -> u16 {\n INODE_SIZE + self.basename.onpage_size()\n }\n unsafe fn write_value(&self, p: *mut u8) {\n self.parent_inode.write_value(p);\n self.basename.write_value(p.offset(INODE_SIZE as isize));\n }\n unsafe fn read_value(p: *const u8) -> Self {\n UnsafePathId {\n parent_inode: Inode::read_value(p),\n basename: UnsafeSmallStr::read_value(p.offset(INODE_SIZE as isize)),\n }\n }\n unsafe fn cmp_value(&self, _: &T, x: Self) -> std::cmp::Ordering {\n let a: PathId = self.to_fileid();\n let b: PathId = x.to_fileid();\n a.cmp(&b)\n }\n type PageOffsets = std::iter::Empty;\n fn page_offsets(&self) -> Self::PageOffsets {\n std::iter::empty()\n }\n}\n"}]}},{"Edit":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1895,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":581992},"to":{"change":18,"start":581992,"end":582666},"introduced_by":18}],"inode":{"change":18,"pos":531056}}},"contents":[{"Del":"const INODE_SIZE: u16 = 8;\nimpl Representable for Inode {\n fn alignment() -> Alignment {\n Alignment::B8\n }\n fn onpage_size(&self) -> u16 {\n INODE_SIZE\n }\n unsafe fn write_value(&self, p: *mut u8) {\n LittleEndian::write_u64(std::slice::from_raw_parts_mut(p, 8), self.0)\n }\n unsafe fn read_value(p: *const u8) -> Self {\n Inode(LittleEndian::read_u64(std::slice::from_raw_parts(p, 8)))\n }\n unsafe fn cmp_value(&self, _: &T, x: Self) -> std::cmp::Ordering {\n self.0.cmp(&x.0)\n }\n type PageOffsets = std::iter::Empty;\n fn page_offsets(&self) -> Self::PageOffsets {\n std::iter::empty()\n }\n}\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1896,"ins":{"up_context":[{"change":18,"pos":582667}],"down_context":[{"change":18,"pos":582759}],"flag":"BLOCK","start":96357,"end":96440,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":582667},"to":{"change":18,"start":582667,"end":582759},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":"direct_repr!(Inode);"},{"Add":"direct_repr!(SerializedMerkle);"},{"Add":"direct_repr!(SerializedHash);"}],"del_contents":[{"Del":"impl Representable for Hash {\n fn alignment() -> Alignment {\n Alignment::B1\n }\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1900,"ins":{"up_context":[{"change":18,"pos":582760}],"down_context":[{"change":18,"pos":583197}],"flag":"BLOCK","start":96441,"end":96702,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":582760},"to":{"change":18,"start":582760,"end":583197},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":"impl Storable for Pair {"},{"Add":" type PageReferences = core::iter::Chain;"},{"Add":" fn page_references(&self) -> Self::PageReferences {"},{"Add":" self.a.page_references().chain(self.b.page_references())"}],"del_contents":[{"Del":" fn onpage_size(&self) -> u16 {\n 1 + (match *self {\n Hash::Blake3(_) => 32,\n Hash::None => 0,\n })\n }\n unsafe fn write_value(&self, p: *mut u8) {\n match *self {\n Hash::Blake3(q) => {\n *p = HashAlgorithm::Blake3 as u8;\n std::ptr::copy(q.as_ptr(), p.offset(1), 32)\n }\n Hash::None => *p = HashAlgorithm::None as u8,\n }\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1905,"ins":{"up_context":[{"change":18,"pos":583203}],"down_context":[{"change":18,"pos":583598}],"flag":"BLOCK","start":96703,"end":96910,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":583203},"to":{"change":18,"start":583203,"end":583598},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" fn compare(&self, t: &T, b: &Self) -> core::cmp::Ordering {"},{"Add":" match self.a.compare(t, &b.a) {"},{"Add":" core::cmp::Ordering::Equal => self.b.compare(t, &b.b),"},{"Add":" ord => ord"}],"del_contents":[{"Del":" unsafe fn read_value(p: *const u8) -> Self {\n assert!(*p <= HashAlgorithm::Blake3 as u8);\n match std::mem::transmute(*p) {\n HashAlgorithm::Blake3 => {\n let mut h = [0; BLAKE3_BYTES];\n std::ptr::copy(p.offset(1), h.as_mut_ptr(), BLAKE3_BYTES);\n Hash::Blake3(h)\n }\n HashAlgorithm::None => Hash::None,\n"}]}},{"Edit":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1910,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":583608},"to":{"change":18,"start":583608,"end":583838},"introduced_by":18}],"inode":{"change":18,"pos":531056}}},"contents":[{"Del":" }\n unsafe fn cmp_value(&self, _: &T, x: Self) -> std::cmp::Ordering {\n self.cmp(&x)\n }\n type PageOffsets = std::iter::Empty;\n fn page_offsets(&self) -> Self::PageOffsets {\n std::iter::empty()\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1913,"ins":{"up_context":[{"change":18,"pos":583847}],"down_context":[{"change":18,"pos":583941}],"flag":"BLOCK","start":96911,"end":97058,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":583847},"to":{"change":18,"start":583847,"end":583941},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":"impl UnsizedStorable for Pair {"},{"Add":" const ALIGN: usize = std::mem::align_of::<(A, B)>();"}],"del_contents":[{"Del":"impl Representable for Merkle {\n fn alignment() -> Alignment {\n Alignment::B1\n }\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1916,"ins":{"up_context":[{"change":18,"pos":583942}],"down_context":[{"change":18,"pos":583988}],"flag":"BLOCK","start":97059,"end":97253,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":583942},"to":{"change":18,"start":583942,"end":583988},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" fn size(&self) -> usize {"},{"Add":" let a = self.a.size();"},{"Add":" let b_off = (a + (B::ALIGN - 1)) & !(B::ALIGN - 1);"},{"Add":" (b_off + self.b.size() + (Self::ALIGN - 1)) & !(Self::ALIGN - 1)"}],"del_contents":[{"Del":" fn onpage_size(&self) -> u16 {\n 33\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1921,"ins":{"up_context":[{"change":18,"pos":583994}],"down_context":[{"change":18,"pos":584693}],"flag":"BLOCK","start":97254,"end":97517,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":583994},"to":{"change":18,"start":583994,"end":584693},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" unsafe fn onpage_size(p: *const u8) -> usize {"},{"Add":" let a = A::onpage_size(p);"},{"Add":" let b_off = (a + (B::ALIGN - 1)) & !(B::ALIGN - 1);"},{"Add":" let b_size = B::onpage_size(p.add(b_off));"},{"Add":" (b_off + b_size + (Self::ALIGN - 1)) & !(Self::ALIGN - 1)"}],"del_contents":[{"Del":" unsafe fn write_value(&self, p: *mut u8) {\n match *self {\n Merkle::Ed25519(q) => {\n *p = MerkleAlgorithm::Ed25519 as u8;\n assert_eq!(*p, 1);\n let q = q.compress();\n let q = q.as_bytes();\n std::ptr::copy(q.as_ptr(), p.offset(1), 32);\n }\n }\n }\n unsafe fn read_value(p: *const u8) -> Self {\n assert_eq!(*p, MerkleAlgorithm::Ed25519 as u8);\n let slice = std::slice::from_raw_parts(p.offset(1), 32);\n Merkle::Ed25519(\n curve25519_dalek::edwards::CompressedEdwardsY::from_slice(slice)\n .decompress()\n .unwrap(),\n )\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1927,"ins":{"up_context":[{"change":18,"pos":584699}],"down_context":[{"change":18,"pos":584816}],"flag":"BLOCK","start":97518,"end":97616,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":584699},"to":{"change":18,"start":584699,"end":584816},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" unsafe fn from_raw_ptr<'a, T>(_: &T, p: *const u8) -> &'a Self {"},{"Add":" &*(p as *const Self)"}],"del_contents":[{"Del":" unsafe fn cmp_value(&self, _: &T, x: Self) -> std::cmp::Ordering {\n self.to_bytes().cmp(&x.to_bytes())\n"}]}},{"Replacement":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1930,"ins":{"up_context":[{"change":18,"pos":584822}],"down_context":[{"change":18,"pos":584945}],"flag":"BLOCK","start":97617,"end":97811,"inode":{"change":18,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":584822},"to":{"change":18,"start":584822,"end":584945},"introduced_by":18}],"inode":{"change":18,"pos":531056}},"ins_contents":[{"Add":" unsafe fn write_to_page(&self, p: *mut u8) {"},{"Add":" self.a.write_to_page(p);"},{"Add":" let off = (self.a.size() + (B::ALIGN - 1)) & !(B::ALIGN - 1);"},{"Add":" self.b.write_to_page(p.add(off));"}],"del_contents":[{"Del":" type PageOffsets = std::iter::Empty;\n fn page_offsets(&self) -> Self::PageOffsets {\n std::iter::empty()\n"}]}},{"Edit":{"inode":{"change":18,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1936,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":584953}],"down_context":[],"flag":"BLOCK","start":97812,"end":97850,"inode":{"change":18,"pos":531056}}},"contents":[{"Add":""},{"Add":""},{"Add":"direct_repr!(T3);"},{"Add":"direct_repr!(T6);"}]}},{"Replacement":{"inode":{"change":18,"pos":584967},"path":"libpijul/src/pristine/path_id.rs","line":16,"ins":{"up_context":[{"change":18,"pos":585429}],"down_context":[{"change":18,"pos":585584}],"flag":"BLOCK","start":97851,"end":97989,"inode":{"change":18,"pos":584967}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":585429},"to":{"change":18,"start":585429,"end":585584},"introduced_by":18}],"inode":{"change":18,"pos":584967}},"ins_contents":[{"Add":" pub fn inode(parent_inode: Inode) -> Self {"},{"Add":" OwnedPathId {"},{"Add":" parent_inode,"},{"Add":" basename: SmallString::new(),"}],"del_contents":[{"Del":" pub fn as_file_id(&self) -> PathId {\n PathId {\n parent_inode: self.parent_inode,\n basename: self.basename.as_small_str(),\n"}]}},{"Replacement":{"inode":{"change":18,"pos":584967},"path":"libpijul/src/pristine/path_id.rs","line":25,"ins":{"up_context":[{"change":18,"pos":585663}],"down_context":[{"change":18,"pos":585725}],"flag":"BLOCK","start":97990,"end":98039,"inode":{"change":18,"pos":584967}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":585663},"to":{"change":18,"start":585663,"end":585725},"introduced_by":18}],"inode":{"change":18,"pos":584967}},"ins_contents":[{"Add":"#[derive(Debug, Eq, PartialEq, Ord, PartialOrd)]"}],"del_contents":[{"Del":"#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Clone, Copy)]\n"}]}},{"Replacement":{"inode":{"change":18,"pos":584967},"path":"libpijul/src/pristine/path_id.rs","line":27,"ins":{"up_context":[{"change":18,"pos":585740}],"down_context":[{"change":18,"pos":585764}],"flag":"BLOCK","start":98040,"end":98060,"inode":{"change":18,"pos":584967}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":585740},"to":{"change":18,"start":585740,"end":585764},"introduced_by":18}],"inode":{"change":18,"pos":584967}},"ins_contents":[{"Add":"pub struct PathId {"}],"del_contents":[{"Del":"pub struct PathId<'a> {\n"}]}},{"Replacement":{"inode":{"change":18,"pos":584967},"path":"libpijul/src/pristine/path_id.rs","line":29,"ins":{"up_context":[{"change":18,"pos":585793}],"down_context":[{"change":18,"pos":585825}],"flag":"BLOCK","start":98061,"end":98089,"inode":{"change":18,"pos":584967}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":585793},"to":{"change":18,"start":585793,"end":585825},"introduced_by":18}],"inode":{"change":18,"pos":584967}},"ins_contents":[{"Add":" pub basename: SmallStr,"}],"del_contents":[{"Del":" pub basename: SmallStr<'a>,\n"}]}},{"Replacement":{"inode":{"change":18,"pos":584967},"path":"libpijul/src/pristine/path_id.rs","line":32,"ins":{"up_context":[{"change":18,"pos":585828}],"down_context":[{"change":18,"pos":585850}],"flag":"BLOCK","start":98090,"end":98104,"inode":{"change":18,"pos":584967}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":585828},"to":{"change":18,"start":585828,"end":585850},"introduced_by":18}],"inode":{"change":18,"pos":584967}},"ins_contents":[{"Add":"impl PathId {"}],"del_contents":[{"Del":"impl<'a> PathId<'a> {\n"}]}},{"Edit":{"inode":{"change":18,"pos":584967},"path":"libpijul/src/pristine/path_id.rs","line":38,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":586065}],"down_context":[{"change":18,"pos":586065}],"flag":"BLOCK","start":98105,"end":98394,"inode":{"change":18,"pos":584967}}},"contents":[{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl std::ops::Deref for OwnedPathId {"},{"Add":" type Target = PathId;"},{"Add":" fn deref(&self) -> &Self::Target {"},{"Add":" let len = 1 + self.basename.len as usize;"},{"Add":" unsafe {"},{"Add":" std::mem::transmute(std::slice::from_raw_parts(self as *const Self as *const u8, len))"}]}},{"Edit":{"inode":{"change":18,"pos":584967},"path":"libpijul/src/pristine/path_id.rs","line":50,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":586081}],"down_context":[{"change":18,"pos":586081}],"flag":"BLOCK","start":98395,"end":98620,"inode":{"change":18,"pos":584967}}},"contents":[{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn pathid() {"},{"Add":" let o = OwnedPathId {"},{"Add":" parent_inode: Inode::ROOT,"},{"Add":" basename: SmallString::from_str(\"blablabla\")"},{"Add":" };"},{"Add":" use std::ops::Deref;"},{"Add":" println!(\"{:?} {:?}\", o.basename.len, o.deref());"}]}},{"Replacement":{"inode":{"change":18,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":24,"ins":{"up_context":[{"change":18,"pos":587220}],"down_context":[{"change":18,"pos":587267}],"flag":"BLOCK","start":98621,"end":101015,"inode":{"change":18,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":587220},"to":{"change":18,"start":587220,"end":587267},"introduced_by":18}],"inode":{"change":18,"pos":586748}},"ins_contents":[{"Add":"// #[cfg(feature = \"dump\")]"},{"Add":"// pub mod channel_dump;"},{"Add":""},{"Add":"#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]"},{"Add":"pub struct L64(pub u64);"},{"Add":""},{"Add":"impl From for L64 {"},{"Add":" fn from(u: usize) -> Self {"},{"Add":" L64((u as u64).to_le())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl From for L64 {"},{"Add":" fn from(u: u64) -> Self {"},{"Add":" L64(u.to_le())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl From for u64 {"},{"Add":" fn from(u: L64) -> Self {"},{"Add":" u64::from_le(u.0)"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl From for usize {"},{"Add":" fn from(u: L64) -> Self {"},{"Add":" u64::from_le(u.0) as usize"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl L64 {"},{"Add":" pub fn as_u64(&self) -> u64 {"},{"Add":" u64::from_le(self.0)"},{"Add":" }"},{"Add":" pub fn as_usize(&self) -> usize {"},{"Add":" u64::from_le(self.0) as usize"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl std::fmt::Display for L64 {"},{"Add":" fn fmt(&self, fmt: &mut std::fmt::Formatter) -> std::fmt::Result {"},{"Add":" self.0.fmt(fmt)"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl Ord for L64 {"},{"Add":" fn cmp(&self, x: &Self) -> std::cmp::Ordering {"},{"Add":" u64::from_le(self.0).cmp(&u64::from_le(x.0))"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl PartialOrd for L64 {"},{"Add":" fn partial_cmp(&self, x: &Self) -> Option {"},{"Add":" Some(u64::from_le(self.0).cmp(&u64::from_le(x.0)))"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl std::ops::Add for L64 {"},{"Add":" type Output = Self;"},{"Add":" fn add(self, x: L64) -> L64 {"},{"Add":" L64((u64::from_le(self.0) + u64::from_le(x.0)).to_le())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl std::ops::Add for L64 {"},{"Add":" type Output = Self;"},{"Add":" fn add(self, x: usize) -> L64 {"},{"Add":" L64((u64::from_le(self.0) + x as u64).to_le())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl std::ops::SubAssign for L64 {"},{"Add":" fn sub_assign(&mut self, x: usize) {"},{"Add":" self.0 = ((u64::from_le(self.0)) - x as u64).to_le()"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl L64 {"},{"Add":" pub fn from_slice_le(s: &[u8]) -> Self {"},{"Add":" let mut u = 0u64;"},{"Add":" assert!(s.len() >= 8);"},{"Add":" unsafe {"},{"Add":" std::ptr::copy_nonoverlapping(s.as_ptr(), &mut u as *mut u64 as *mut u8, 8)"},{"Add":" }"},{"Add":" L64(u)"},{"Add":" }"},{"Add":" pub fn to_slice_le(&self, s: &mut [u8]) {"},{"Add":" assert!(s.len() >= 8);"},{"Add":" unsafe {"},{"Add":" std::ptr::copy_nonoverlapping(&self.0 as *const u64 as *const u8, s.as_mut_ptr(), 8)"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":""},{"Add":"#[derive(Debug, Clone, Copy, PartialOrd, Ord, PartialEq, Eq)]"},{"Add":"#[repr(C)]"},{"Add":"pub struct T3([L64; 3]);"},{"Add":""},{"Add":"#[derive(Debug, Clone, Copy, PartialOrd, Ord, PartialEq, Eq)]"},{"Add":"#[repr(C)]"},{"Add":"pub struct T6([L64; 6]);"},{"Add":""},{"Add":""},{"Add":"#[derive(Debug, Clone, Copy, PartialOrd, Ord, PartialEq, Eq)]"},{"Add":"#[repr(C)]"},{"Add":"pub struct Pair {"},{"Add":" pub a: A,"},{"Add":" pub b: B,"},{"Add":"}"}],"del_contents":[{"Del":"#[cfg(feature = \"dump\")]\npub mod channel_dump;\n"}]}},{"Edit":{"inode":{"change":18,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":135,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":587268}],"down_context":[{"change":18,"pos":587268}],"flag":"BLOCK","start":101016,"end":101017,"inode":{"change":18,"pos":586748}}},"contents":[{"Add":""}]}},{"Replacement":{"inode":{"change":18,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":226,"ins":{"up_context":[{"change":18,"pos":589224}],"down_context":[{"change":18,"pos":54528}],"flag":"BLOCK","start":101018,"end":101081,"inode":{"change":18,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":54475},"to":{"change":18,"start":54475,"end":54528},"introduced_by":18}],"inode":{"change":18,"pos":586748}},"ins_contents":[{"Add":" get!(graph, Vertex, SerializedEdge, GraphError);"}],"del_contents":[{"Del":" get!(graph, Vertex, Edge, GraphError);\n"}]}},{"Replacement":{"inode":{"change":18,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":229,"ins":{"up_context":[{"change":18,"pos":54628}],"down_context":[{"change":18,"pos":54719}],"flag":"BLOCK","start":101082,"end":101185,"inode":{"change":18,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":54628},"to":{"change":18,"start":54628,"end":54719},"introduced_by":18}],"inode":{"change":18,"pos":586748}},"ins_contents":[{"Add":" fn get_external(&self, p: &ChangeId) -> Result, TxnErr>;"}],"del_contents":[{"Del":" fn get_external(&self, p: ChangeId) -> Result, TxnErr>;\n"}]}},{"Replacement":{"inode":{"change":18,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":233,"ins":{"up_context":[{"change":18,"pos":54836}],"down_context":[{"change":18,"pos":48878}],"flag":"BLOCK","start":101186,"end":101289,"inode":{"change":18,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":18,"pos":54836},"to":{"change":18,"start":54836,"end":54927},"introduced_by":18}],"inode":{"change":18,"pos":586748}},"ins_contents":[{"Add":" fn get_internal(&self, p: &SerializedHash) -> Result

…

Dependencies

Change contents