{"header":{"message":"Various post-fire fixes","description":null,"timestamp":"2021-04-20T20:32:01.883859852Z","authors":[{"full_name":"Pierre-Étienne Meunier","name":"pmeunier"}]},"hash":"I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","authors":[],"deps":{"hashes":[["I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","Various post-fire fixes"],["AA",null],["O4DNWMPDUWI6SKYOZTQKCSX6MSR73CTGCUSM65TSQYVOUSAAS6KAC","Cleaunp and proofreading of libpijul::record"],["IYJZVLETBAQDDELENH3FX7ZTOC3HY4UJ3AMC3MACW6O7ZCWZTR6AC","Cleaning up the literate programming bits"],["NZIK34IMY3L5YMFISBLHUL5ATENBL35VOZJW4EHPINZEL6IQE4UQC","Fixing a bug in diff, where some changes were ignored for no reason"],["YWUZQU3TBJJMUVMX2JJW2D2JLTN57YJA36YJXKHBF7UJ6GEBTWUAC","Formatting (for some reason, this previously escaped the hooks)"],["VL7ZYKHBPKLNY5SA5QBW56SJ7LBBCKCGV5UAYLVF75KY6PPBOD4AC","Running hooks through shell on Windows and Unix"],["OU243LABJJZ3MQHYW2A2MYKW7KZLTZGHJJXDR2BIIIHXT5BSYN3AC","Support for staging"],["PKIHBUGT3N4BUZ2QP2UWJI4ICOIF6EZVXBFKG753SOTYBAKSVTFAC","Setting the oldest modification time to EPOCH if no file has changed"],["NF4O25IELPL2JJBVM3UXMOWP2VIFWXII7PQD3PX5SUW3RYHKP5XQC","Cleaning up useless operations in InodeMetadata"],["I6DVZEFUMGH6BFOLGBPM6J4PL5I4PAAODJYG7REXYPDHPKPBLDTAC","Do not ask for user input if the SSH channel is already closed"],["ADPAFSMYUBTKSK63EPCY5WQGROJQWFCWO4UFPWY3ZXD5ZNH26P2QC","Proper old metadata when recording"],["YTQS4ES362EJ27OE45CE5HLY7ZU57YLVKRMDRJ2OXT623VM5WOBQC","Fixing a parsing problem (related to permissions), and the associated permissions"],["VE2UWMW42VWMOYZWJCJZBX4NYJO37E6WNISFBUXZFLQ5HWN3B4VQC","Trying to fix channel touch"],["YDTN6BGI5TFRJFM3N3Y2J463GKFHU5L3DPBQXBDIQJDWXU5ELKMQC","Touch the channel if no file was changed"],["QV66H4YAO5ASPDY72R3FBFMSFE2DXTKU54W4OSNBY5KPLXNIFPIAC","Prevent --channel from being used with a single file in `pijul reset`"],["2D7P2VKJASU7QDQZHGCLBIT6G2V5WUFYLWTCEVVEI2EZHGM6XYRAC","Change completions (where the whole progress bar story started)"],["X7OHUPL5VYT6ECER2KNGRNFLRX7SBZOM5QWSQ4PBO2UPIE7XM6MAC","Fixing a bug in unrecord, and fixing the tests"],["MFTN7GBWZNQAFHKER57MLZAJGVEAHV2GYAQN2QTDHTPCEURDVIGQC","Pre-tags cleanup + fast Sanakirja"],["EEOOHGQQK43J36LQJDSS3UK56M54DXPYE4VB3K4A2XAYGOYDJAXAC","More atomic \"file moves+transaction\""],["J63VVQ5IQS6MCLK5WAU4OFPBOAVRCLAPLYW6RCZ7NFV4QYPYV6NQC","pijul reset: fixed help message"],["SEWGHUHQEEBJR7UPG3PSU7DSM376R43QEYENAZK325W46DCFMXKAC",".pijul/config: simplify remotes and hooks"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["UNZXTNSJI4YRY3EQ3M4HMBKQDNYDTY6B7IZRBNYGDJXTA2UKYWRAC","Change text format: order dependencies in the order they were on the channel at record time"],["ZXTHL45OYLOICXTXXEQ6AMNSLMQFZ6BFUJWMO6LZOSDK7ERROC5AC","address clippy lints"],["CXM5CBS27BL35Z6TRCI7OS4AHWVJ4VFND7HECGAUC74ZQ5KFZXLAC","Fixing `pijul remove` when files are not deleted"],["NMX52UOGRCY2O7HT7Q45KWISOHNV4PEEMLDYDBJ4QPDIMTVKKJ6AC","Fixing the \"invalid change\" errors"],["VLPIKNFSMJXOG37QYRGUJC6YFMZXZUFDADQV4PYASKKDQOJ24MZAC","clone: make source remote the default"],["SQVWP4LU7AAJSEIHK5CNNUK3XBUVT3FGIJIOPTKMR53PO2P4ARNQC","When clone fails, only remove directories we have created (not other directories)"],["4H2XTVJ2BNXDNHQ3RQTMOG3I4NRGZT7JDLC2GRINS56TIYTYTO4QC","Fix some mistakes in the docs"],["EQLDTLXVCARE36EJE3S6SNEVTW2JJY4EYD36EX7WSIFLG2XMKKQAC","Fixing a bug with empty new files, and another one with empty replacements"],["TZ42DX3BML5C3O5Z6OBVNBCHSIIHT6AOJPD6ICOLOP4LPYFXQN2QC","Properly dropping a channel"],["IM6UFPOZHZTBMESRXGBALOAWJWUUDGLP2TVLSZ3RZPSJITKB3R7QC","Fixing a test related to the tree/revtree tables"],["EGSVRZJVIBSPYAI65A25CH5RYAGL4PUP3B24VSRUS3M4WIUCZWHAC","Avoid converting between base32 and hash in pijul::commands::unrecord"],["OCBM7IFE7CL3PM5KPYTRTKTHYKC76NTFK5C4VA4JFAKQUA6GC7FAC","New release: pijul-1.0.0-alpha.8"],["23LVKATNTT74YKHG7KJM6SBO2IVZEV24TQ46ZJIHQ2IXONWNVXJAC","Use pager crate for log output"],["VNBLGT6GAN2AHKRFKTKED7WNDDRGNULY5H343ZYV3ETSDZZKGBTAC","Do not output unmodified files when resetting (fix)"],["JL4WKA5PBKXRNAMETYO4I52QKASQ3COYHH2JKGA7W5YLIRZZH53AC","Implement the Sanakirja concurrency model in a cross-process way"],["7ZFRYVVQQGJYG3POPWJWL3CDW37YDXZYZQC3OSWFHWEUSEMYQ4EQC","Cargo.nix and formatting"],["CCFJ7VO3I73FE3MZRS5RSDRYNZVW7AXC345P4BXS7JIL2TU3LQJQC","Renaming \"Record\" to \"Hunk\" in the changes"],["IIV3EL2XYI2X7HZWKXEXQFAE3R3KC2Q7SGOT3Q332HSENMYVF32QC","Cleanup, formatting, and fixing the Git feature"],["3AMEP2Y5J6GA4AWQONF4JVA3XSR3ASLHHKMYG44R72SOUY3UQCDAC","More convenient interface for channels"],["4VWXL6KQGYGDUQRCVJCEVIV6CKJSEIYDX4YF33OX6EDNKJNEGD2AC","Correct handling of ignore files"],["62XVBWPYCBULZ2IUWF36JVHAPMKCGQC53PQQ53AAGZGC2KT7VQRQC","remove redundant Clap attributes"],["PH7B6I3U5XCACAX6VX3ZDJD2DQOQS7725R6CTOATNC26NP4VPUFQC","Fixing log --hash-only"],["BD5PC25AB5MKVIYDFSDGRZ4YGX4PKW4SMZ3YAYAPNA5HLDVJUR3QC","Deleting conflict resolution vertices when the sides are deleted"],["GVQ7YSEDDCYYYWDJ5JUVFSBWA5EZVOZJI63KK6E46N6Y2B6LP72AC","Checking for dependencies even for a local change"],["H3NAKE2I2KPGXMKXOYKV23SXSIWFWBEXQJDI2XANONK54NVYPD4QC","Adding num_cpus to Cargo.lock"],["KUMJITTFBIAA7MFVPE6O7ZKIRSX553JNM72LF3KQJ6U3CXZI6MMQC","Version bump in the lockfiles"],["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","Upgrading to Sanakirja 0.15 + version bump"],["ZBNKSYA6PW4DSPC3NCRUZLVHW2GNXMCSDSAGEIKHGHDGGZRBH7ZQC","Fixing a bus error when starting a transaction on a full disk"],["QE64ATLZWMKHYABCD3VA547PYXCK6YN3K7RE2TX3SCQNKG7XLVAQC","Fixing asynchronicity problems in SSH"],["X243Z3Y54ULINQMMRIKLHRV5T237B7VUOAHVJ7DMPOQ6A6GQXY2AC","Recording only the required metadata (can even be changed later!)"],["JP3BYVXXWFBVQ23MEHJ3LE36AN26P6OCZALKUXMNLHS2TSTM3NKAC","Fixing file paths on Windows"],["HKEOO4QJ5EACX37IJG76GEUMNSZMFW4VRKA4IVBCGR52ZQSYTN6QC","Version bump"],["HMMMKONLCRAXVT7SO2ITTFDOJIQKKVSRIZPXYVPDC34RCBHWMHVAC","Fixing alive vertices"],["NA5I4WYNE2O3LPSHXGWXW7XL4YNYFDREEGDOP6LJ5HJXTQDXM7BAC","Fixing the inverse of conflict resolutions"],["CZX6TRWR53F2BRLKSUTBPEONKS65IYNBO2FYB4HSWF6OK7DOEJGAC","Fixing a shortcut to detect alive children without iterating"],["7UPL3Y2A5QOBU6VIUHNWEFGSGQ5CMWGDGOVLRZ53UARXG3TDGLMAC","Unrecord: don't restore the same unrecorded file deletion twice in the inodes and tree tables"],["NO2QPRFLGCYUDXYJTOY3S3NZJCCLAFOQUHITKDZ7LSZLRLOV5W3QC","Adding rollback test"],["UDHP4ZVBQZT2VBURB2MDCU2IZDNMCAFSIUKWRBDQ5BWMFKSN2LYQC","Fixing SSH asynchronicity issues"],["KVBLRDOUFRYB6BPOQJDD7OVBYMTTPDAUX7CJ5DC3U7WFRI5OLWRAC","Concatenating edits with order conflict resolutions (if relevant), and parsing the text format of the result"],["QMTANHVNRPQ5IX66FYQBFRBDCTN6YKMNCO6OHTQ6QCUASPWWXJKAC","Reset: only output changed files"],["7FFFKQZU3TFXWL45TILYNX5A7AC7HBK526SD5DZGYCELN76YE7TAC","add 'Default' implementations"],["UFCZKKLXVYQYQBYENCAFHY3ZPPSDAJJAIREZSYNQM4QNXV6G6RXAC","Upgrading to the latest Sanakirja/Rand"],["G6S6PWZEFJK7ARWBIFKDU6VYC5DCJ2YFJMWZOLLWWKU52R2QPXZAC","Do not touch the channel if this is a partial record"],["ENKQ3QZGH2QW246C7GSZRKYLODJOQHKZZSYV7QHB7VPOFP5PASVQC","Forward the exit status messages from the SSH background loop to the client (solving hangs)"],["TKEVOH7HXON7SOBGXTUDHAHO2U2GPTQRNESP6ERKUQAS526OZIRAC","Fixing a bug when downloading changes, and making change download more efficient (more async)"],["5BRU2RRWOQBMS2V3RQM7PRFR5UILYZ73GISHAKJA6KIZGC5M2MFAC","Cleanup (debugging a crash related to trees/inodes)"],["4OCC6D42GZYRDLH3NSKXMJTRKXP7UZ6Z3YNGCNUT7NT6WBDBCBIAC","Recursive add"],["DNQHXWRZF6EWII3RGQ6HPGFD47BOOFH4FCQHSCACBS3RLQO3DNIQC","address clippy hard errors"],["L4LAD4XMVJZIZGOA4TTFZETDAHNONEPYBYENTTCHMOYCWCV5B4XQC","Fixing clone on WSL (Windows Subsystem for Linux)"],["ZXCRG5RPZU7DKPFI24IRLHV4DZSB6NJKA73J6FC7ARXT2KGOIV7QC","It seems change inverses will need a little more work"],["I7VL7VPZV2NKOZRKBWWEHFOGNGGTYLPONHABVJ767D6HPJJNY5RAC","Minor cleanup"],["GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC","Refactoring iterators"],["5DVRL6MFXQOCPOZMYSKBERMRRVUTYRL2SRGRTU2MH4IEOFCDKM3QC","Hard-unrecord"],["Y6EVFMTA6FOH3OQH6QCSWMI3F6SYZT2FSHO6GF4M3ICENDCWFM4QC","Don't output files if they aren't in the current channel"],["3YDPHBANMNSK7Z5SCG745VLTP4BBQWIXCJTQOSDI6UJGYR6S45EQC","address non-controversial clippy lints"],["JRSBH6HTYXSIZKHW6SGWAF3JCEPMFTUG4JZUSUSF73ODEGFLAAJAC","Identification of line numbers in replacements"],["SPA2OL5ITFMLB5P2WL342QAU2FXPKSFS4XHAMW6HYWOGSGLO2MJAC","keep-changes feature (default) to avoid deleting problematic changes"],["OUWD436ATBTZJR53B6XDSI5SXRRNZV7YGRUEA5ACHZC2RUDP7G5QC","Version bump"],["6YMDOZIB5LVYLFIDGN2WNT5JTHEAMS4TFPVDEZ3OWXWOKJOC5QDAC","Refactoring apply"],["ZAEUSICJC3YOWGF6NZEQCQ34PHPRSBCJEP7FIWE6VIWJGVU734HQC","File deletions were not shown with their names in the metadata during record"],["TPEH2XNBS5RO4IEVKENVF6P65AH7IX64KK2JAYMSJT3J5GXO67EAC","1.0.0-alpha.28, with Tokio 1.0"],["DJYHARZ7CSRMX6ZFM6P52SM2EC57VTSHWAIMFSD7Q3EL7UYZGLXQC","Skipping old files when recording"],["JRENVH5DF2F4SOV7UNJENFA7VDI3H63XK76R3LFZK6QCW7JIBLSQC","Reqwest 0.11"],["MDADYULS5AWVMTJDGYCGNQTN6T7XJDRUBDTFILDY5MLF6I2PE5NAC","Fix a panic when switching between channels that have different files"],["BZSC7VMYSFRXDHDDAMCDR6X67FN5VWIBOSE76BQLX7OCVOJFUA3AC","address clippy lints"],["WIORLB47KYY5ZDKSAQEQ5NV2J3F3RIO5FVGD6LGF73FD5LWJLUAAC","Version bump"],["33SQMZYXPV2A3F7P6WBFKFO2BTQV6THSQXOLV3PCZASC6OTKVHTQC","New versions of dependencies"],["3VJB4ULDDBRUZQ3TSOEJQ3TFVYYHE347ONKMFWGTSCLUYUV536XQC","Updating Cargo.nix"],["43AJ37IXON6PMMYRZM6OB2MJXPYCNIWW2XBDVNBXIRH5DD7JDTVQC","Getting rid of edge validation, which does not work for zombie conflicts"],["B5Z4IMEUYAEJPOU5EIAXI7VYZVUM6CWKV7CTSOXK3F4GXTNNMMAAC","Generating Cargo.nix for pijul 1.0.0-alpha.6"],["XA23FMQM2AI7RMR36AYN7UNP2D5JWVJMJPHURWZO7URM7H46PU6AC","Reset only files that have been modified"],["VIHXB7SGRETFPHPYZFSRGOFRXEO4RZY57WDZSU6IAUEJRU3HPKQAC","commands: set up pager for diff, change, and credit"],["RXNT67OTDNFTBYXS6ECDAZ26PRTDROASNYTR6IEXYQUO4K5YNXYQC","Sanakirja version, and removing an unwrap"],["PJ7T2VFLV5PYG3CV23GC2GIQETXKGC6CO74JBGREV3JC3LG5OXUAC","Do not hang on locked repositories"],["LGEJSLTYI7Y2CYC3AN6ECMT3D3MTWCAKZPVQEG5MPM2OBW5FQ46AC","Fixing output (including its uses in reset and pull)"],["OJZWJUF2TCGZ7RFVY6FPKBS5P3C4BGHZDPVH775OHVNVFMJICKNQC","MUCH faster `pijul add -r`"],["6DOXSHWGKJIMIPFCNLASGKBAJCJMJULW5HFRZAZ67EYSMXXGJ3KAC","Cleanup, and version bump"],["L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","pijul/*: reorganize imports and remove extern crate"],["BT2ZHPY4LTECZDNPNLX5IUAEA6CYB4RRBGVBXUNK3ARHMWQK7KHAC","Version bumps"],["B3QWIGDERNMB3M6P5WTWP5CN2DB3KCS7MVTEPC2XVJ237ZXVQGMAC","Fixing the Git features with the latest Pijul (+ conflicts in Cargo.toml)"],["NLGQAH4H35XC5XTH26BRXVFWGPPAMA4MDN3MHMGCOYE6ZZQMQ4AAC","Credit and reset relative to current directory instead of the root"],["HSVGP2G4D2F56DS3YKZLSYPS4A5BNGH4NTAXAOZ57OCXFM3E5AYAC","Version bump + formatting"],["YDKNUL6B4EFM5U2GG36SSEKXHS6XK4OLIWUVE4BUAJ5VYJFHAOIQC","Add `diff --short` that lists changes without showing them"],["ZHABNS3S6FSINO74FOI5KHYXYDTBPO4FQTTYTUS7NNKEVVNLYC4AC","Canonicalize all paths"],["Q7CAYX5N2GFOGMZL3VXVWORMAPWEOECXE22BLXK7Q4WEPS4CE2SAC","Fixing Windows compilation"],["LLT3GY6ULCVHMO3VUSVI5H4O244Z3ULOWLTW2IGJXIA2TWIHJDSQC","When recording, do not consider deleted filenames as current"],["H62VFFJEBL2I3O4D3BAJZ57ROPWUISC7JCDIWFBC5DAYJRHMMDXAC","Cargo.nix, and solving conflicts"],["23OFHED65KP272FJAYMST42OG7Z7NPAS6F3MUSQLO43B7EQ6GLWQC","Remove .pijul after a failed cloned, in the case we created it but did not its parent"],["R3H7D42UZ446V5TO2574BMAQQAYYJPEIMSZVDPAGVIYU2COJSWBAC","Debugging `pijul git`: proper error reporting"],["3KRGVQFUWFHPOGZOXVTJYNCM4XBRVYITAEOVPKBSAZ5GZIUO5KVQC","Do not update the mtime of unmodified files"],["XWETQ4DE4KL2GQWSEBE5NENLTSLIDF7RIWOCCVWJFQOVQJE5P33AC","Upgrading versions"],["MF3WAHBIH6Q2F7ZOKWPEJF6VGSKJITWLR3Z64GTD6YQZNA5EATWQC","commands/record: amend current change if unspecified"],["HQ56ADNSNBCCEBNK5PE5ZVBKKBGWY3ATGFWEYPXJKJBJDUJ2XKQQC","Formatting, and version bump"],["A6R6SGCPLFM45QNWJLISFBR3EEXVITYHCWEUOPNH4UIGIWJRTZAQC","Fixing a panic in `pijul change`"],["MHQBEHJDJ7MUW46HIS24AZFBC4DZDKZNBVBOBOBPML6GGFIS4LQAC","unrecord --reset without a pending change"],["VMPAOJS2ZFOLNXALHWSVM5AFENWX6ZUACB45EJV3HXI7DQNAZPHQC","Don't output after pushing to a local channel"],["KJDQ2WOMIUTVDEEQ7NMJYBZAVUZ3NIVOVJ6MUCZPRAWIEWOV6TWQC","Fixing the parsing of section headers in the text change format"],["ZRUPLBBTT4S6S7A3LOAHG4ONYEGPA5CFO4L2XBCNFKK45MWX3BDAC","Colours in diff and change: separating concerns and dependencies"],["7A2TSC4PAKK3WOH3DMAJASCEC6D5JLJWNFWJTEEBE4CVS4K76PPQC","Conflict solving code (FOLDER edges)"],["3M7WBE24JTPTHWQOU5PO2ZJYKPKEH2F6R4M6RWIRFG334PQEA55QC","Re-adding anyhow in the tests of libpijul"],["A3DMBJJAPLS6ASSZ7JVVVULRQNZCF2WKYTRUD7EY7PKVYABSATFAC","Upgrading the `git` subcommand to the latest Sanakirja and Libpijul"],["QNJBR73KCSCCF6FTHGZDF2K7PZQL3EFKZFOBT77KYZBMALTTW6OQC","don't return Result for infallible functions"],["BZCGXVS77ZS3N4QPLIHNWZ3YFVV7H4PXQD3U6RN5ZFVOC7QL7MBQC","Fixing two bugs around conflicts on the last line, where invalid patches were produced (first bug) and applied (second bug)"],["H23LO7U7MNB5GTLOUIFYAJ6DP57DM3VFBR4IBOAVPMHS356AYFPQC","a few more clippy lints addressed"],["VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","Removing anyhow in libpijul"],["HR3WK6A7KKILCHI2CD2BZSZQJUS44MJIT2K3WPKJBHUXGRKAQDRQC","When lock times out, check that there are no more clients before quitting"],["DIGICKHOZIYJCIM75ZNRODKP7CUBPWYUGFO7PRCOIOGBZA7HJ2CQC","Fixing a conflict (probably due to unrecord)"],["76PCXGML77EZWTRI5E6KHLVRAFTJ2AB5YRN5EKOYNAPKTWY2KCGAC","Pushing to, and pulling from the local repository"],["BXD3IQYNMKMI5BTANCF6NZHZP4CKPWADGJMBT2R3WTMKVKONT5QAC","Fixing --features git"],["WZVCLZKY34KQBQU6YBGJLQCDADBQ67LQVDNRVCMQVY3O3C3EIWSQC","address clippy lints"],["Q45QHPO4HDTEZF2W4UDZSYYQ46BPEIWSW4GJILZR5HTJNLKXJABQC","Feedback on network stuff"],["WKX5S4Z4DOB5S6A6X5V6ECZFCHQUMWRGX5XT4FBOG57P6HPWK7CAC","remove unneccesary explicit lifetimes"],["FXT5FS5WIDBA3HPTJRFGRGULZIGAWAJXT2U6RFYGDLO2PYDG4VEAC","Updating Cargo.nix"],["KWAMD2KR5UYRHHPZWL7GY2KQKNXNVS4BYBVK3FXDI23NQMWA3U4QC","A few fixes in the documentation comments"],["YAJAXIV5VL263Z6FYLKFPROB3MQPRPH22P44GRGRVGEP56HOMBOAC","Unrecording changes atomically"],["2K7JLB4Z7BS5VFNWD4DO3MKYU7VNPA5MTVHVSDI3FQZ5ICM6XM6QC","No pager on Windows"],["Y7YAFMFFJY3SQ3GYN3SS4V3FZWMH3B5L65AXQBXOR5XARSMF5JJQC","Fix path prefix striping on Windows."],["LYTVEPH3W5UHF7MAYFWBT6NVNC42HEVKJGGMFDKUDZDNDOI33YJQC","Avoid cloning into an existing path"],["KWAGWB73AMLJFK2Z7SBKHHKKHFRX7AQKXCWDN2MBX72RYCNMB36QC","Adding extra dependencies from the config file"],["I2D35LLFDA7KMKGVQWDOYZFZVHTRKOCLVRL3M3ZASSU7QQKL4K5AC","More accurate recording of modification time"],["XJPQKIUGDG3GPBWTRCYU5II653XYWSW2ITC3P5HRNACWP3OSIN5QC",null],["I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","Massive cleanup, and simplification"],["SAGSYAPXQ2T6GC3B3TNRPNFTZMS7UMME6YQGSF5MOIM66S5NKB2QC","Various version bumps"],["HDGRZISM2SS4TK5BMNGDIYG22SOXAZRTTC6YFIOPY4LSO53QDWZQC","Version updates"],["UBCBQ5FGH2KASHEUPDLIKGLVVX3GSRQ4F4P2JEJZL2NX2DUSYARAC","Removing pijul/src/commands/checkout.rs (unused file), as well as litorg comments"],["YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","Sanakirja 1.0"],["6RVT5X4LTRP5XHVDESXMIC2DHMT5MUQ24ZDWEBJ4XYTF6LJXK7CAC","Current state: return zero instead of an Option if there is no change on the channel"],["VXZNQQHCDC6MBLUMNDJVPM4I7XWTDYBPZZNCPZCA6EJ3GS5WAQGQC","If an existing file is moved to a new directory that is deleted before the record, record the deletion"],["VYHHOEYHO67JNJEODX5L3CQFIV3DAXZBBIQUOMCWJDYF3VWICDNQC","Versions and formatting"],["VQPAUKBQ2POZKL7CZFAZK5ZQKEBYL27XZYZWYUSH5AH25KK6DWKAC","channel switch as an alias to reset"],["SLJ3OHD4F6GJGZ3SV2D7DMR3PXYHPSI64X77KZ3RJ24EGEX6ZNQAC","unrecord: show list of changes if none were given as arguments"],["BNPSVXIC72C3WT33YKCH766OBLLNCS7POX6U6JXZSQQPJF2M22MQC","Friendlier progress bars"],["K6GWUOD55G377RVEEMMRPZ4EUAHCM2BGXNRJTE5UZJFFMJGFCEZQC","Styling progress bars"],["MU5GSJAW65PEG3BRYUKZ7O37BPHW3MOX3S5E2RFOXKGUOJEEDQ5AC","Partial push and pull (WARNING: breaks the existing protocol)"],["7PM25EXLNQ6JUUIZNTAOQYNNIZNG6TJREEBUSAIC3FIOE7FHETSAC","Recursive apply was written a little too fast…"],["KDF6FJRVF72L274BEUJCTUKRFMNL6BDZMTVKDPEYGFX4TC3YOVSQC","bigger clippy refactors"],["ATZ3BWSEFJBLVGDUZFESRNHVCIO6ZRZ3ALPANZSVGVO7A5BUAFQQC","Fixing the double-deletion of repairs for folder edges"],["44BN7FWSIXKG75IJUTCXLJE7VANNQFPRHQXTPLQHFU7AKGLSPQRAC","Do not output files introduced by patches that were not applied during a push"],["G734WNM64AR5BLAZMN5MDPKSFTYXTUQR6MAGB32NRBC5FXFRWSJAC","flake.nix: use crate2nix"],["5BB266P6HPUGYEVR7QNNOA62EFPYPUYJ3UMLE5J3LLYMSUWXANIQC","Optional colours in the global config file"],["3WIQYEISUMGOL5FY4LCWOJS55CTTQA7WMJZXAE3Q4GQUTBFLAE7QC","Fixing conflicts in Cargo.lock"]],"deps":["O4DNWMPDUWI6SKYOZTQKCSX6MSR73CTGCUSM65TSQYVOUSAAS6KAC","IYJZVLETBAQDDELENH3FX7ZTOC3HY4UJ3AMC3MACW6O7ZCWZTR6AC","NZIK34IMY3L5YMFISBLHUL5ATENBL35VOZJW4EHPINZEL6IQE4UQC","YWUZQU3TBJJMUVMX2JJW2D2JLTN57YJA36YJXKHBF7UJ6GEBTWUAC","VL7ZYKHBPKLNY5SA5QBW56SJ7LBBCKCGV5UAYLVF75KY6PPBOD4AC","OU243LABJJZ3MQHYW2A2MYKW7KZLTZGHJJXDR2BIIIHXT5BSYN3AC","PKIHBUGT3N4BUZ2QP2UWJI4ICOIF6EZVXBFKG753SOTYBAKSVTFAC","NF4O25IELPL2JJBVM3UXMOWP2VIFWXII7PQD3PX5SUW3RYHKP5XQC","I6DVZEFUMGH6BFOLGBPM6J4PL5I4PAAODJYG7REXYPDHPKPBLDTAC","ADPAFSMYUBTKSK63EPCY5WQGROJQWFCWO4UFPWY3ZXD5ZNH26P2QC","YTQS4ES362EJ27OE45CE5HLY7ZU57YLVKRMDRJ2OXT623VM5WOBQC","VE2UWMW42VWMOYZWJCJZBX4NYJO37E6WNISFBUXZFLQ5HWN3B4VQC","YDTN6BGI5TFRJFM3N3Y2J463GKFHU5L3DPBQXBDIQJDWXU5ELKMQC","QV66H4YAO5ASPDY72R3FBFMSFE2DXTKU54W4OSNBY5KPLXNIFPIAC","2D7P2VKJASU7QDQZHGCLBIT6G2V5WUFYLWTCEVVEI2EZHGM6XYRAC","X7OHUPL5VYT6ECER2KNGRNFLRX7SBZOM5QWSQ4PBO2UPIE7XM6MAC","MFTN7GBWZNQAFHKER57MLZAJGVEAHV2GYAQN2QTDHTPCEURDVIGQC","EEOOHGQQK43J36LQJDSS3UK56M54DXPYE4VB3K4A2XAYGOYDJAXAC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","G734WNM64AR5BLAZMN5MDPKSFTYXTUQR6MAGB32NRBC5FXFRWSJAC","76PCXGML77EZWTRI5E6KHLVRAFTJ2AB5YRN5EKOYNAPKTWY2KCGAC","XWETQ4DE4KL2GQWSEBE5NENLTSLIDF7RIWOCCVWJFQOVQJE5P33AC","OUWD436ATBTZJR53B6XDSI5SXRRNZV7YGRUEA5ACHZC2RUDP7G5QC","PJ7T2VFLV5PYG3CV23GC2GIQETXKGC6CO74JBGREV3JC3LG5OXUAC","L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","UBCBQ5FGH2KASHEUPDLIKGLVVX3GSRQ4F4P2JEJZL2NX2DUSYARAC","YAJAXIV5VL263Z6FYLKFPROB3MQPRPH22P44GRGRVGEP56HOMBOAC","NLGQAH4H35XC5XTH26BRXVFWGPPAMA4MDN3MHMGCOYE6ZZQMQ4AAC","7UPL3Y2A5QOBU6VIUHNWEFGSGQ5CMWGDGOVLRZ53UARXG3TDGLMAC","Q7CAYX5N2GFOGMZL3VXVWORMAPWEOECXE22BLXK7Q4WEPS4CE2SAC","VQPAUKBQ2POZKL7CZFAZK5ZQKEBYL27XZYZWYUSH5AH25KK6DWKAC","YDKNUL6B4EFM5U2GG36SSEKXHS6XK4OLIWUVE4BUAJ5VYJFHAOIQC","UNZXTNSJI4YRY3EQ3M4HMBKQDNYDTY6B7IZRBNYGDJXTA2UKYWRAC","UDHP4ZVBQZT2VBURB2MDCU2IZDNMCAFSIUKWRBDQ5BWMFKSN2LYQC","VMPAOJS2ZFOLNXALHWSVM5AFENWX6ZUACB45EJV3HXI7DQNAZPHQC","B5Z4IMEUYAEJPOU5EIAXI7VYZVUM6CWKV7CTSOXK3F4GXTNNMMAAC","23LVKATNTT74YKHG7KJM6SBO2IVZEV24TQ46ZJIHQ2IXONWNVXJAC","VIHXB7SGRETFPHPYZFSRGOFRXEO4RZY57WDZSU6IAUEJRU3HPKQAC","I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","43AJ37IXON6PMMYRZM6OB2MJXPYCNIWW2XBDVNBXIRH5DD7JDTVQC","QE64ATLZWMKHYABCD3VA547PYXCK6YN3K7RE2TX3SCQNKG7XLVAQC","JRSBH6HTYXSIZKHW6SGWAF3JCEPMFTUG4JZUSUSF73ODEGFLAAJAC","L4LAD4XMVJZIZGOA4TTFZETDAHNONEPYBYENTTCHMOYCWCV5B4XQC","BXD3IQYNMKMI5BTANCF6NZHZP4CKPWADGJMBT2R3WTMKVKONT5QAC","OCBM7IFE7CL3PM5KPYTRTKTHYKC76NTFK5C4VA4JFAKQUA6GC7FAC","H62VFFJEBL2I3O4D3BAJZ57ROPWUISC7JCDIWFBC5DAYJRHMMDXAC","4H2XTVJ2BNXDNHQ3RQTMOG3I4NRGZT7JDLC2GRINS56TIYTYTO4QC","KWAMD2KR5UYRHHPZWL7GY2KQKNXNVS4BYBVK3FXDI23NQMWA3U4QC","SEWGHUHQEEBJR7UPG3PSU7DSM376R43QEYENAZK325W46DCFMXKAC","KVBLRDOUFRYB6BPOQJDD7OVBYMTTPDAUX7CJ5DC3U7WFRI5OLWRAC","VLPIKNFSMJXOG37QYRGUJC6YFMZXZUFDADQV4PYASKKDQOJ24MZAC","Q45QHPO4HDTEZF2W4UDZSYYQ46BPEIWSW4GJILZR5HTJNLKXJABQC","MF3WAHBIH6Q2F7ZOKWPEJF6VGSKJITWLR3Z64GTD6YQZNA5EATWQC","7PM25EXLNQ6JUUIZNTAOQYNNIZNG6TJREEBUSAIC3FIOE7FHETSAC","K6GWUOD55G377RVEEMMRPZ4EUAHCM2BGXNRJTE5UZJFFMJGFCEZQC","62XVBWPYCBULZ2IUWF36JVHAPMKCGQC53PQQ53AAGZGC2KT7VQRQC","J63VVQ5IQS6MCLK5WAU4OFPBOAVRCLAPLYW6RCZ7NFV4QYPYV6NQC","5DVRL6MFXQOCPOZMYSKBERMRRVUTYRL2SRGRTU2MH4IEOFCDKM3QC","R3H7D42UZ446V5TO2574BMAQQAYYJPEIMSZVDPAGVIYU2COJSWBAC","5BRU2RRWOQBMS2V3RQM7PRFR5UILYZ73GISHAKJA6KIZGC5M2MFAC","VXZNQQHCDC6MBLUMNDJVPM4I7XWTDYBPZZNCPZCA6EJ3GS5WAQGQC","2K7JLB4Z7BS5VFNWD4DO3MKYU7VNPA5MTVHVSDI3FQZ5ICM6XM6QC","SAGSYAPXQ2T6GC3B3TNRPNFTZMS7UMME6YQGSF5MOIM66S5NKB2QC","WIORLB47KYY5ZDKSAQEQ5NV2J3F3RIO5FVGD6LGF73FD5LWJLUAAC","BT2ZHPY4LTECZDNPNLX5IUAEA6CYB4RRBGVBXUNK3ARHMWQK7KHAC","GVQ7YSEDDCYYYWDJ5JUVFSBWA5EZVOZJI63KK6E46N6Y2B6LP72AC","JP3BYVXXWFBVQ23MEHJ3LE36AN26P6OCZALKUXMNLHS2TSTM3NKAC","3YDPHBANMNSK7Z5SCG745VLTP4BBQWIXCJTQOSDI6UJGYR6S45EQC","DNQHXWRZF6EWII3RGQ6HPGFD47BOOFH4FCQHSCACBS3RLQO3DNIQC","KDF6FJRVF72L274BEUJCTUKRFMNL6BDZMTVKDPEYGFX4TC3YOVSQC","H23LO7U7MNB5GTLOUIFYAJ6DP57DM3VFBR4IBOAVPMHS356AYFPQC","ZXTHL45OYLOICXTXXEQ6AMNSLMQFZ6BFUJWMO6LZOSDK7ERROC5AC","BZSC7VMYSFRXDHDDAMCDR6X67FN5VWIBOSE76BQLX7OCVOJFUA3AC","WZVCLZKY34KQBQU6YBGJLQCDADBQ67LQVDNRVCMQVY3O3C3EIWSQC","4OCC6D42GZYRDLH3NSKXMJTRKXP7UZ6Z3YNGCNUT7NT6WBDBCBIAC","7A2TSC4PAKK3WOH3DMAJASCEC6D5JLJWNFWJTEEBE4CVS4K76PPQC","WKX5S4Z4DOB5S6A6X5V6ECZFCHQUMWRGX5XT4FBOG57P6HPWK7CAC","QNJBR73KCSCCF6FTHGZDF2K7PZQL3EFKZFOBT77KYZBMALTTW6OQC","VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","PH7B6I3U5XCACAX6VX3ZDJD2DQOQS7725R6CTOATNC26NP4VPUFQC","HMMMKONLCRAXVT7SO2ITTFDOJIQKKVSRIZPXYVPDC34RCBHWMHVAC","BD5PC25AB5MKVIYDFSDGRZ4YGX4PKW4SMZ3YAYAPNA5HLDVJUR3QC","7FFFKQZU3TFXWL45TILYNX5A7AC7HBK526SD5DZGYCELN76YE7TAC","KJDQ2WOMIUTVDEEQ7NMJYBZAVUZ3NIVOVJ6MUCZPRAWIEWOV6TWQC","A6R6SGCPLFM45QNWJLISFBR3EEXVITYHCWEUOPNH4UIGIWJRTZAQC","3M7WBE24JTPTHWQOU5PO2ZJYKPKEH2F6R4M6RWIRFG334PQEA55QC","ATZ3BWSEFJBLVGDUZFESRNHVCIO6ZRZ3ALPANZSVGVO7A5BUAFQQC","IM6UFPOZHZTBMESRXGBALOAWJWUUDGLP2TVLSZ3RZPSJITKB3R7QC","OJZWJUF2TCGZ7RFVY6FPKBS5P3C4BGHZDPVH775OHVNVFMJICKNQC","SPA2OL5ITFMLB5P2WL342QAU2FXPKSFS4XHAMW6HYWOGSGLO2MJAC","H3NAKE2I2KPGXMKXOYKV23SXSIWFWBEXQJDI2XANONK54NVYPD4QC","ZHABNS3S6FSINO74FOI5KHYXYDTBPO4FQTTYTUS7NNKEVVNLYC4AC","6RVT5X4LTRP5XHVDESXMIC2DHMT5MUQ24ZDWEBJ4XYTF6LJXK7CAC","FXT5FS5WIDBA3HPTJRFGRGULZIGAWAJXT2U6RFYGDLO2PYDG4VEAC","4VWXL6KQGYGDUQRCVJCEVIV6CKJSEIYDX4YF33OX6EDNKJNEGD2AC","SLJ3OHD4F6GJGZ3SV2D7DMR3PXYHPSI64X77KZ3RJ24EGEX6ZNQAC","MU5GSJAW65PEG3BRYUKZ7O37BPHW3MOX3S5E2RFOXKGUOJEEDQ5AC","NA5I4WYNE2O3LPSHXGWXW7XL4YNYFDREEGDOP6LJ5HJXTQDXM7BAC","Y7YAFMFFJY3SQ3GYN3SS4V3FZWMH3B5L65AXQBXOR5XARSMF5JJQC","UFCZKKLXVYQYQBYENCAFHY3ZPPSDAJJAIREZSYNQM4QNXV6G6RXAC","ZXCRG5RPZU7DKPFI24IRLHV4DZSB6NJKA73J6FC7ARXT2KGOIV7QC","6DOXSHWGKJIMIPFCNLASGKBAJCJMJULW5HFRZAZ67EYSMXXGJ3KAC","6YMDOZIB5LVYLFIDGN2WNT5JTHEAMS4TFPVDEZ3OWXWOKJOC5QDAC","CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","ZAEUSICJC3YOWGF6NZEQCQ34PHPRSBCJEP7FIWE6VIWJGVU734HQC","GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC","NMX52UOGRCY2O7HT7Q45KWISOHNV4PEEMLDYDBJ4QPDIMTVKKJ6AC","TPEH2XNBS5RO4IEVKENVF6P65AH7IX64KK2JAYMSJT3J5GXO67EAC","KUMJITTFBIAA7MFVPE6O7ZKIRSX553JNM72LF3KQJ6U3CXZI6MMQC","NO2QPRFLGCYUDXYJTOY3S3NZJCCLAFOQUHITKDZ7LSZLRLOV5W3QC","CZX6TRWR53F2BRLKSUTBPEONKS65IYNBO2FYB4HSWF6OK7DOEJGAC","A3DMBJJAPLS6ASSZ7JVVVULRQNZCF2WKYTRUD7EY7PKVYABSATFAC","LYTVEPH3W5UHF7MAYFWBT6NVNC42HEVKJGGMFDKUDZDNDOI33YJQC","B3QWIGDERNMB3M6P5WTWP5CN2DB3KCS7MVTEPC2XVJ237ZXVQGMAC","JRENVH5DF2F4SOV7UNJENFA7VDI3H63XK76R3LFZK6QCW7JIBLSQC","3VJB4ULDDBRUZQ3TSOEJQ3TFVYYHE347ONKMFWGTSCLUYUV536XQC","33SQMZYXPV2A3F7P6WBFKFO2BTQV6THSQXOLV3PCZASC6OTKVHTQC","MHQBEHJDJ7MUW46HIS24AZFBC4DZDKZNBVBOBOBPML6GGFIS4LQAC","HKEOO4QJ5EACX37IJG76GEUMNSZMFW4VRKA4IVBCGR52ZQSYTN6QC","3KRGVQFUWFHPOGZOXVTJYNCM4XBRVYITAEOVPKBSAZ5GZIUO5KVQC","EGSVRZJVIBSPYAI65A25CH5RYAGL4PUP3B24VSRUS3M4WIUCZWHAC","CCFJ7VO3I73FE3MZRS5RSDRYNZVW7AXC345P4BXS7JIL2TU3LQJQC","DJYHARZ7CSRMX6ZFM6P52SM2EC57VTSHWAIMFSD7Q3EL7UYZGLXQC","QMTANHVNRPQ5IX66FYQBFRBDCTN6YKMNCO6OHTQ6QCUASPWWXJKAC","XA23FMQM2AI7RMR36AYN7UNP2D5JWVJMJPHURWZO7URM7H46PU6AC","VNBLGT6GAN2AHKRFKTKED7WNDDRGNULY5H343ZYV3ETSDZZKGBTAC","G6S6PWZEFJK7ARWBIFKDU6VYC5DCJ2YFJMWZOLLWWKU52R2QPXZAC","CXM5CBS27BL35Z6TRCI7OS4AHWVJ4VFND7HECGAUC74ZQ5KFZXLAC","3AMEP2Y5J6GA4AWQONF4JVA3XSR3ASLHHKMYG44R72SOUY3UQCDAC","KWAGWB73AMLJFK2Z7SBKHHKKHFRX7AQKXCWDN2MBX72RYCNMB36QC","ENKQ3QZGH2QW246C7GSZRKYLODJOQHKZZSYV7QHB7VPOFP5PASVQC","SQVWP4LU7AAJSEIHK5CNNUK3XBUVT3FGIJIOPTKMR53PO2P4ARNQC","23OFHED65KP272FJAYMST42OG7Z7NPAS6F3MUSQLO43B7EQ6GLWQC","ZRUPLBBTT4S6S7A3LOAHG4ONYEGPA5CFO4L2XBCNFKK45MWX3BDAC","I2D35LLFDA7KMKGVQWDOYZFZVHTRKOCLVRL3M3ZASSU7QQKL4K5AC","VYHHOEYHO67JNJEODX5L3CQFIV3DAXZBBIQUOMCWJDYF3VWICDNQC","5BB266P6HPUGYEVR7QNNOA62EFPYPUYJ3UMLE5J3LLYMSUWXANIQC","JL4WKA5PBKXRNAMETYO4I52QKASQ3COYHH2JKGA7W5YLIRZZH53AC","HSVGP2G4D2F56DS3YKZLSYPS4A5BNGH4NTAXAOZ57OCXFM3E5AYAC","HR3WK6A7KKILCHI2CD2BZSZQJUS44MJIT2K3WPKJBHUXGRKAQDRQC","LLT3GY6ULCVHMO3VUSVI5H4O244Z3ULOWLTW2IGJXIA2TWIHJDSQC","44BN7FWSIXKG75IJUTCXLJE7VANNQFPRHQXTPLQHFU7AKGLSPQRAC","I7VL7VPZV2NKOZRKBWWEHFOGNGGTYLPONHABVJ767D6HPJJNY5RAC","LGEJSLTYI7Y2CYC3AN6ECMT3D3MTWCAKZPVQEG5MPM2OBW5FQ46AC","BZCGXVS77ZS3N4QPLIHNWZ3YFVV7H4PXQD3U6RN5ZFVOC7QL7MBQC","HQ56ADNSNBCCEBNK5PE5ZVBKKBGWY3ATGFWEYPXJKJBJDUJ2XKQQC","EQLDTLXVCARE36EJE3S6SNEVTW2JJY4EYD36EX7WSIFLG2XMKKQAC","YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","IIV3EL2XYI2X7HZWKXEXQFAE3R3KC2Q7SGOT3Q332HSENMYVF32QC","MDADYULS5AWVMTJDGYCGNQTN6T7XJDRUBDTFILDY5MLF6I2PE5NAC","Y6EVFMTA6FOH3OQH6QCSWMI3F6SYZT2FSHO6GF4M3ICENDCWFM4QC","7ZFRYVVQQGJYG3POPWJWL3CDW37YDXZYZQC3OSWFHWEUSEMYQ4EQC","TZ42DX3BML5C3O5Z6OBVNBCHSIIHT6AOJPD6ICOLOP4LPYFXQN2QC","X243Z3Y54ULINQMMRIKLHRV5T237B7VUOAHVJ7DMPOQ6A6GQXY2AC","TKEVOH7HXON7SOBGXTUDHAHO2U2GPTQRNESP6ERKUQAS526OZIRAC","HDGRZISM2SS4TK5BMNGDIYG22SOXAZRTTC6YFIOPY4LSO53QDWZQC","BNPSVXIC72C3WT33YKCH766OBLLNCS7POX6U6JXZSQQPJF2M22MQC","DIGICKHOZIYJCIM75ZNRODKP7CUBPWYUGFO7PRCOIOGBZA7HJ2CQC","RXNT67OTDNFTBYXS6ECDAZ26PRTDROASNYTR6IEXYQUO4K5YNXYQC","ZBNKSYA6PW4DSPC3NCRUZLVHW2GNXMCSDSAGEIKHGHDGGZRBH7ZQC","XJPQKIUGDG3GPBWTRCYU5II653XYWSW2ITC3P5HRNACWP3OSIN5QC"]},"hunks":[{"Edit":{"inode":{"change":20,"pos":21431},"path":"pijul/src/repository.rs","line":1,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":21496},"to":{"change":20,"start":21496,"end":21516},"introduced_by":20}],"inode":{"change":20,"pos":21431}}},"contents":[{"Del":"use std::io::Write;\n"}]}},{"Edit":{"inode":{"change":20,"pos":21431},"path":"pijul/src/repository.rs","line":2,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":21540}],"down_context":[{"change":20,"pos":21540}],"flag":"BLOCK","start":0,"end":20,"inode":{"change":20,"pos":21431}}},"contents":[{"Add":"use std::sync::Arc;"}]}},{"Replacement":{"inode":{"change":20,"pos":21431},"path":"pijul/src/repository.rs","line":12,"ins":{"up_context":[{"change":20,"pos":21688}],"down_context":[{"change":20,"pos":21758}],"flag":"BLOCK","start":21,"end":96,"inode":{"change":20,"pos":21431}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":21688},"to":{"change":20,"start":21688,"end":21758},"introduced_by":20}],"inode":{"change":20,"pos":21431}},"ins_contents":[{"Add":" pub working_copy: Arc,"}],"del_contents":[{"Del":" pub working_copy: libpijul::working_copy::filesystem::FileSystem,\n"}]}},{"Edit":{"inode":{"change":20,"pos":21431},"path":"pijul/src/repository.rs","line":23,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":22013}],"down_context":[{"change":20,"pos":22013}],"flag":"BLOCK","start":97,"end":197,"inode":{"change":20,"pos":21431}}},"contents":[{"Add":" pub fn config_path(&self) -> PathBuf {"},{"Add":" self.path.join(DOT_DIR).join(CONFIG_FILE)"},{"Add":" }"},{"Add":""}]}},{"Replacement":{"inode":{"change":20,"pos":21431},"path":"pijul/src/repository.rs","line":28,"ins":{"up_context":[{"change":20,"pos":22074}],"down_context":[{"change":20,"pos":22262}],"flag":"BLOCK","start":198,"end":246,"inode":{"change":20,"pos":21431}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":22074},"to":{"change":20,"start":22074,"end":22262},"introduced_by":20}],"inode":{"change":20,"pos":21431}},"ins_contents":[{"Add":" self.config.save(&self.config_path())?;"}],"del_contents":[{"Del":" let config = toml::to_string(&self.config)?;\n let mut file = std::fs::File::create(&self.path.join(DOT_DIR).join(CONFIG_FILE))?;\n file.write_all(config.as_bytes())?;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":21431},"path":"pijul/src/repository.rs","line":82,"ins":{"up_context":[{"change":20,"pos":5906}],"down_context":[{"change":20,"pos":24052}],"flag":"BLOCK","start":247,"end":341,"inode":{"change":20,"pos":21431}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":1623},"to":{"change":20,"start":23967,"end":24052},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":5906},"to":{"change":20,"start":23967,"end":24052},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":23967},"to":{"change":20,"start":23967,"end":24052},"introduced_by":20}],"inode":{"change":20,"pos":21431}},"ins_contents":[{"Add":" working_copy: Arc::new(libpijul::working_copy::filesystem::FileSystem::from_root("}],"del_contents":[{"Del":" working_copy: libpijul::working_copy::filesystem::FileSystem::from_root(\n"}]}},{"Replacement":{"inode":{"change":20,"pos":21431},"path":"pijul/src/repository.rs","line":84,"ins":{"up_context":[{"change":20,"pos":24087}],"down_context":[{"change":20,"pos":24102}],"flag":"BLOCK","start":342,"end":358,"inode":{"change":20,"pos":21431}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":24087},"to":{"change":20,"start":24087,"end":24102},"introduced_by":20}],"inode":{"change":20,"pos":21431}},"ins_contents":[{"Add":" )),"}],"del_contents":[{"Del":" ),\n"}]}},{"Replacement":{"inode":{"change":20,"pos":21431},"path":"pijul/src/repository.rs","line":108,"ins":{"up_context":[{"change":20,"pos":6006}],"down_context":[{"change":20,"pos":25068}],"flag":"BLOCK","start":359,"end":503,"inode":{"change":20,"pos":21431}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":1926},"to":{"change":20,"start":24973,"end":25068},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":6006},"to":{"change":20,"start":24973,"end":25068},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":24973},"to":{"change":20,"start":24973,"end":25068},"introduced_by":20}],"inode":{"change":20,"pos":21431}},"ins_contents":[{"Add":" working_copy: Arc::new(libpijul::working_copy::filesystem::FileSystem::from_root("},{"Add":" &cur,"},{"Add":" )),"}],"del_contents":[{"Del":" working_copy: libpijul::working_copy::filesystem::FileSystem::from_root(&cur),\n"}]}},{"Replacement":{"inode":{"change":20,"pos":52474},"path":"pijul/src/remote/mod.rs","line":174,"ins":{"up_context":[{"change":20,"pos":57008}],"down_context":[{"change":20,"pos":57072}],"flag":"BLOCK","start":504,"end":567,"inode":{"change":20,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":57008},"to":{"change":20,"start":57008,"end":57072},"introduced_by":20}],"inode":{"change":20,"pos":52474}},"ins_contents":[{"Add":" .dichotomy_changelist(txn, &remote.lock()?.remote)"}],"del_contents":[{"Del":" .dichotomy_changelist(txn, &remote.borrow().remote)\n"}]}},{"Replacement":{"inode":{"change":20,"pos":52474},"path":"pijul/src/remote/mod.rs","line":178,"ins":{"up_context":[{"change":20,"pos":57166}],"down_context":[{"change":20,"pos":8398}],"flag":"BLOCK","start":568,"end":621,"inode":{"change":20,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":57166},"to":{"change":20,"start":8344,"end":8398},"introduced_by":20}],"inode":{"change":20,"pos":52474}},"ins_contents":[{"Add":" .iter_remote(&remote.lock()?.remote, n)?"}],"del_contents":[{"Del":" .iter_remote(&remote.borrow().remote, n)?\n"}]}},{"Replacement":{"inode":{"change":20,"pos":52474},"path":"pijul/src/remote/mod.rs","line":542,"ins":{"up_context":[{"change":20,"pos":74338}],"down_context":[{"change":20,"pos":7808}],"flag":"BLOCK","start":622,"end":685,"inode":{"change":20,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":74338},"to":{"change":20,"start":9340,"end":9404},"introduced_by":20}],"inode":{"change":20,"pos":52474}},"ins_contents":[{"Add":" for x in txn.iter_remote(&remote.lock()?.remote, 0)? {"}],"del_contents":[{"Del":" for x in txn.iter_remote(&remote.borrow().remote, 0)? {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":52474},"path":"pijul/src/remote/mod.rs","line":619,"ins":{"up_context":[{"change":20,"pos":76875}],"down_context":[{"change":20,"pos":2348}],"flag":"BLOCK","start":686,"end":735,"inode":{"change":20,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":76875},"to":{"change":20,"start":76875,"end":76925},"introduced_by":20}],"inode":{"change":20,"pos":52474}},"ins_contents":[{"Add":" let channel = local_channel.read()?;"}],"del_contents":[{"Del":" let channel = local_channel.borrow();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":52474},"path":"pijul/src/remote/mod.rs","line":653,"ins":{"up_context":[{"change":20,"pos":78339}],"down_context":[{"change":20,"pos":8361}],"flag":"BLOCK","start":736,"end":807,"inode":{"change":20,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":78339},"to":{"change":20,"start":9673,"end":9745},"introduced_by":20}],"inode":{"change":20,"pos":52474}},"ins_contents":[{"Add":" for x in txn.iter_remote(&remote_changes.lock()?.remote, 0)? {"}],"del_contents":[{"Del":" for x in txn.iter_remote(&remote_changes.borrow().remote, 0)? {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":79745},"path":"pijul/src/remote/local.rs","line":3,"ins":{"up_context":[{"change":20,"pos":11587}],"down_context":[{"change":20,"pos":534}],"flag":"BLOCK","start":808,"end":838,"inode":{"change":20,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":11587},"to":{"change":20,"start":11587,"end":11607},"introduced_by":20}],"inode":{"change":20,"pos":79745}},"ins_contents":[{"Add":"use std::sync::{Arc, RwLock};"}],"del_contents":[{"Del":"use std::sync::Arc;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":79745},"path":"pijul/src/remote/local.rs","line":28,"ins":{"up_context":[{"change":20,"pos":3239}],"down_context":[{"change":20,"pos":10054}],"flag":"BLOCK","start":839,"end":909,"inode":{"change":20,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":3239},"to":{"change":20,"start":9984,"end":10054},"introduced_by":20}],"inode":{"change":20,"pos":79745}},"ins_contents":[{"Add":" Ok(txn.reverse_log(&*channel.read()?, None)?.next().map(|n| {"}],"del_contents":[{"Del":" Ok(txn.reverse_log(&channel.borrow(), None)?.next().map(|n| {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":79745},"path":"pijul/src/remote/local.rs","line":70,"ins":{"up_context":[{"change":20,"pos":10533}],"down_context":[{"change":20,"pos":10589}],"flag":"BLOCK","start":910,"end":965,"inode":{"change":20,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":10533},"to":{"change":20,"start":10533,"end":10589},"introduced_by":20}],"inode":{"change":20,"pos":79745}},"ins_contents":[{"Add":" &remote_channel.read()?.graph,"}],"del_contents":[{"Del":" &remote_channel.borrow().graph,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":79745},"path":"pijul/src/remote/local.rs","line":78,"ins":{"up_context":[{"change":20,"pos":4961}],"down_context":[{"change":20,"pos":10768}],"flag":"BLOCK","start":966,"end":1033,"inode":{"change":20,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":4961},"to":{"change":20,"start":10701,"end":10768},"introduced_by":20}],"inode":{"change":20,"pos":79745}},"ins_contents":[{"Add":" for x in remote_txn.log(&*remote_channel.read()?, from)? {"}],"del_contents":[{"Del":" for x in remote_txn.log(&remote_channel.borrow(), from)? {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":79745},"path":"pijul/src/remote/local.rs","line":120,"ins":{"up_context":[{"change":20,"pos":83228}],"down_context":[{"change":20,"pos":0}],"flag":"BLOCK","start":1034,"end":1124,"inode":{"change":20,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":83228},"to":{"change":20,"start":83228,"end":83322},"introduced_by":20}],"inode":{"change":20,"pos":79745}},"ins_contents":[{"Add":" let repo = libpijul::working_copy::filesystem::FileSystem::from_root(&self.root);"}],"del_contents":[{"Del":" let mut repo = libpijul::working_copy::filesystem::FileSystem::from_root(&self.root);\n"}]}},{"Replacement":{"inode":{"change":20,"pos":79745},"path":"pijul/src/remote/local.rs","line":122,"ins":{"up_context":[{"change":20,"pos":66}],"down_context":[{"change":20,"pos":83408}],"flag":"BLOCK","start":1125,"end":1594,"inode":{"change":20,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":66},"to":{"change":20,"start":64,"end":156},"introduced_by":20}],"inode":{"change":20,"pos":79745}},"ins_contents":[{"Add":" let txn = Arc::new(RwLock::new(txn));"},{"Add":" let wc = Arc::new(repo);"},{"Add":" libpijul::output::output_repository_no_pending("},{"Add":" wc,"},{"Add":" &store,"},{"Add":" txn.clone(),"},{"Add":" channel.clone(),"},{"Add":" \"\","},{"Add":" true,"},{"Add":" None,"},{"Add":" num_cpus::get(),"},{"Add":" )?;"},{"Add":" let txn = if let Ok(txn) = Arc::try_unwrap(txn) {"},{"Add":" txn.into_inner().unwrap()"},{"Add":" } else {"},{"Add":" unreachable!()"},{"Add":" };"}],"del_contents":[{"Del":" txn.output_repository_no_pending(&mut repo, &store, &mut channel, \"\", true, None)?;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":83981},"path":"pijul/src/main.rs","line":88,"ins":{"up_context":[{"change":20,"pos":102}],"down_context":[{"change":20,"pos":85435}],"flag":"BLOCK","start":1595,"end":1627,"inode":{"change":20,"pos":83981}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":102},"to":{"change":20,"start":85378,"end":85407},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":85378},"to":{"change":20,"start":85378,"end":85407},"introduced_by":20}],"inode":{"change":20,"pos":83981}},"ins_contents":[{"Add":" // #[cfg(debug_assertions)]"}],"del_contents":[{"Del":" #[cfg(debug_assertions)]\n"}]}},{"Replacement":{"inode":{"change":20,"pos":83981},"path":"pijul/src/main.rs","line":205,"ins":{"up_context":[{"change":20,"pos":5246}],"down_context":[{"change":20,"pos":5247}],"flag":"BLOCK","start":1628,"end":1664,"inode":{"change":20,"pos":83981}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":5246},"to":{"change":20,"start":89250,"end":89283},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":89250},"to":{"change":20,"start":89250,"end":89283},"introduced_by":20}],"inode":{"change":20,"pos":83981}},"ins_contents":[{"Add":" // #[cfg(debug_assertions)]"}],"del_contents":[{"Del":" #[cfg(debug_assertions)]\n"}]}},{"Edit":{"inode":{"change":20,"pos":89866},"path":"pijul/src/config.rs","line":2,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":89898}],"down_context":[{"change":20,"pos":89898}],"flag":"BLOCK","start":1665,"end":1685,"inode":{"change":20,"pos":89866}}},"contents":[{"Add":"use std::io::Write;"}]}},{"Edit":{"inode":{"change":20,"pos":89866},"path":"pijul/src/config.rs","line":132,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1582},"to":{"change":6,"start":1582,"end":1614},"introduced_by":6}],"inode":{"change":20,"pos":89866}}},"contents":[{"Del":" use std::io::Write;\n"}]}},{"Edit":{"inode":{"change":20,"pos":89866},"path":"pijul/src/config.rs","line":141,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":91314}],"down_context":[{"change":20,"pos":0}],"flag":"BLOCK","start":1686,"end":1928,"inode":{"change":20,"pos":89866}}},"contents":[{"Add":" pub fn save(&self, path: &std::path::Path) -> Result<(), anyhow::Error> {"},{"Add":" let config = toml::to_string(self)?;"},{"Add":" let mut file = std::fs::File::create(path)?;"},{"Add":" file.write_all(config.as_bytes())?;"},{"Add":" Ok(())"},{"Add":" }"},{"Add":""}]}},{"Edit":{"inode":{"change":20,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":2,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":95785}],"down_context":[{"change":20,"pos":1143}],"flag":"BLOCK","start":1929,"end":1959,"inode":{"change":20,"pos":95630}}},"contents":[{"Add":"use std::sync::{Arc, RwLock};"}]}},{"Replacement":{"inode":{"change":20,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":40,"ins":{"up_context":[{"change":20,"pos":362}],"down_context":[{"change":20,"pos":485}],"flag":"BLOCK","start":1960,"end":2546,"inode":{"change":20,"pos":95630}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":362},"to":{"change":20,"start":119,"end":173},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":173},"to":{"change":20,"start":11721,"end":11790},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":96409},"to":{"change":20,"start":11721,"end":11790},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":11790},"to":{"change":20,"start":314,"end":485},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":314},"to":{"change":20,"start":314,"end":485},"introduced_by":20}],"inode":{"change":20,"pos":95630}},"ins_contents":[{"Add":" let txn = repo.pristine.mut_txn_begin()?;"},{"Add":" let channel = if let Some(channel) = txn.load_channel(channel_name)? {"},{"Add":" channel"},{"Add":" } else {"},{"Add":" bail!(\"No such channel: {:?}\", channel_name);"},{"Add":" };"},{"Add":" let txn = Arc::new(RwLock::new(txn));"},{"Add":" let pending_hash = if self.reset {"},{"Add":" super::pending(txn.clone(), &channel, &mut repo)?"},{"Add":" } else {"},{"Add":" None"},{"Add":" };"},{"Add":" let mut txn = if let Ok(txn) = Arc::try_unwrap(txn) {"},{"Add":" txn.into_inner().unwrap()"},{"Add":" } else {"},{"Add":" unreachable!()"},{"Add":" };"}],"del_contents":[{"Del":" let mut txn = repo.pristine.mut_txn_begin()?;\n"},{"Del":" if let Some(mut channel) = txn.load_channel(channel_name)? {\n"},{"Del":" let pending_hash = if self.reset {\n super::pending(&mut txn, &mut channel, &mut repo)?\n } else {\n None\n };\n"}]}},{"Replacement":{"inode":{"change":20,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":58,"ins":{"up_context":[{"change":20,"pos":486}],"down_context":[{"change":20,"pos":41}],"flag":"BLOCK","start":2547,"end":2584,"inode":{"change":20,"pos":95630}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":486},"to":{"change":20,"start":0,"end":41},"introduced_by":20}],"inode":{"change":20,"pos":95630}},"ins_contents":[{"Add":" let mut hashes = Vec::new();"}],"del_contents":[{"Del":" let mut hashes = Vec::new();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":60,"ins":{"up_context":[{"change":20,"pos":42}],"down_context":[{"change":20,"pos":2724}],"flag":"BLOCK","start":2585,"end":2877,"inode":{"change":20,"pos":95630}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":42},"to":{"change":20,"start":42,"end":85},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":85},"to":{"change":20,"start":1459,"end":2257},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1459},"to":{"change":20,"start":1459,"end":2257},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":2257},"to":{"change":20,"start":86,"end":120},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":120},"to":{"change":20,"start":11791,"end":11850},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":2290},"to":{"change":20,"start":11791,"end":11850},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":11850},"to":{"change":20,"start":9091,"end":9145},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":9145},"to":{"change":20,"start":2390,"end":2477},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":11897},"to":{"change":20,"start":2390,"end":2477},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":2390},"to":{"change":20,"start":2390,"end":2477},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":2477},"to":{"change":20,"start":121,"end":279},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":279},"to":{"change":20,"start":9146,"end":9224},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":9224},"to":{"change":20,"start":349,"end":367},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":349},"to":{"change":20,"start":349,"end":367},"introduced_by":20}],"inode":{"change":20,"pos":95630}},"ins_contents":[{"Add":" if self.change_id.is_empty() {"},{"Add":" // No change ids were given, present a list for choosing"},{"Add":" // The number can be set in the global config or passed as a command-line option"},{"Add":" let number_of_changes = if let Some(n) = self.show_changes {"},{"Add":" n"}],"del_contents":[{"Del":" if self.change_id.is_empty() {\n"},{"Del":" // No change ids were given, present a list for choosing\n // The number can be set in the global config or passed as a command-line option\n let number_of_changes = if let Some(n) = self.show_changes {\n n\n } else {\n let cfg = crate::config::Global::load()?;\n cfg.unrecord_changes.ok_or_else(|| {\n anyhow!(\n \"Can't determine how many changes to show. \\\n Please set the `unrecord_changes` option in \\\n your global config or run `pijul unrecord` \\\n with the `--show-changes` option.\"\n )\n })?\n };\n"},{"Del":" let hashes_ = txn\n"},{"Del":" .reverse_log(&channel.borrow(), None)?\n"},{"Del":" .map(|h| (h.unwrap().1).0.into())\n"},{"Del":" .take(number_of_changes)\n .collect::>();\n"},{"Del":" let o = make_changelist(&repo.changes, &hashes_, \"unrecord\")?;\n for h in parse_changelist(&edit::edit_bytes(&o[..])?).iter() {\n"},{"Del":" hashes.push((*h, *txn.get_internal(&h.into())?.unwrap()))\n"},{"Del":" }\n"}]}},{"Replacement":{"inode":{"change":20,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":66,"ins":{"up_context":[{"change":20,"pos":2745}],"down_context":[{"change":20,"pos":2776}],"flag":"BLOCK","start":2878,"end":3330,"inode":{"change":20,"pos":95630}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":2745},"to":{"change":20,"start":368,"end":544},"introduced_by":20}],"inode":{"change":20,"pos":95630}},"ins_contents":[{"Add":" let cfg = crate::config::Global::load()?;"},{"Add":" cfg.unrecord_changes.ok_or_else(|| {"},{"Add":" anyhow!("},{"Add":" \"Can't determine how many changes to show. \\"},{"Add":" Please set the `unrecord_changes` option in \\"},{"Add":" your global config or run `pijul unrecord` \\"},{"Add":" with the `--show-changes` option.\""},{"Add":" )"},{"Add":" })?"}],"del_contents":[{"Del":" for c in self.change_id.iter() {\n let (hash, cid) = txn.hash_from_prefix(c)?;\n hashes.push((hash, cid))\n }\n"}]}},{"Replacement":{"inode":{"change":20,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":76,"ins":{"up_context":[{"change":20,"pos":2791}],"down_context":[{"change":20,"pos":648}],"flag":"BLOCK","start":3331,"end":3946,"inode":{"change":20,"pos":95630}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":2791},"to":{"change":20,"start":356,"end":401},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":356},"to":{"change":20,"start":356,"end":401},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":401},"to":{"change":20,"start":9225,"end":9303},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":9303},"to":{"change":20,"start":545,"end":591},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":2834},"to":{"change":20,"start":545,"end":591},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":591},"to":{"change":20,"start":1855,"end":1883},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":506},"to":{"change":20,"start":1855,"end":1883},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1883},"to":{"change":20,"start":9304,"end":9375},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":70},"to":{"change":20,"start":1954,"end":1985},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":499},"to":{"change":20,"start":1954,"end":1985},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":9375},"to":{"change":20,"start":1954,"end":1985},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1954},"to":{"change":20,"start":1954,"end":1985},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1985},"to":{"change":20,"start":9376,"end":9447},"introduced_by":20}],"inode":{"change":20,"pos":95630}},"ins_contents":[{"Add":" let hashes_ = txn"},{"Add":" .reverse_log(&*channel.read()?, None)?"},{"Add":" .map(|h| (h.unwrap().1).0.into())"},{"Add":" .take(number_of_changes)"},{"Add":" .collect::>();"},{"Add":" let o = make_changelist(&repo.changes, &hashes_, \"unrecord\")?;"},{"Add":" for h in parse_changelist(&edit::edit_bytes(&o[..])?).iter() {"},{"Add":" hashes.push((*h, *txn.get_internal(&h.into())?.unwrap()))"},{"Add":" }"},{"Add":" } else {"},{"Add":" for c in self.change_id.iter() {"},{"Add":" let (hash, cid) = txn.hash_from_prefix(c)?;"},{"Add":" hashes.push((hash, cid))"}],"del_contents":[{"Del":" let channel_ = channel.borrow();\n"},{"Del":" let mut changes: Vec<(Hash, ChangeId, Option)> = Vec::new();\n"},{"Del":" for (hash, change_id) in hashes {\n"},{"Del":" let n = txn\n"},{"Del":" .get_changeset(txn.changes(&channel_), &change_id)\n"},{"Del":" .unwrap();\n"},{"Del":" changes.push((hash, change_id, n.map(|&x| x.into())));\n"}]}},{"Replacement":{"inode":{"change":20,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":90,"ins":{"up_context":[{"change":20,"pos":662}],"down_context":[{"change":20,"pos":96931}],"flag":"BLOCK","start":3947,"end":5379,"inode":{"change":20,"pos":95630}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":662},"to":{"change":20,"start":662,"end":751},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":751},"to":{"change":20,"start":645,"end":695},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":695},"to":{"change":20,"start":96673,"end":96722},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":804},"to":{"change":20,"start":96673,"end":96722},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":96673},"to":{"change":20,"start":96673,"end":96722},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":96722},"to":{"change":20,"start":9448,"end":9504},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":9504},"to":{"change":20,"start":11953,"end":11990},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":11953},"to":{"change":20,"start":11953,"end":11990},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":11990},"to":{"change":20,"start":9505,"end":9545},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":9545},"to":{"change":20,"start":96820,"end":96854},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":96820},"to":{"change":20,"start":96820,"end":96854},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":96854},"to":{"change":20,"start":9546,"end":9593},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":9593},"to":{"change":20,"start":96900,"end":96931},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":96900},"to":{"change":20,"start":96900,"end":96931},"introduced_by":20}],"inode":{"change":20,"pos":95630}},"ins_contents":[{"Add":" };"},{"Add":" let channel_ = channel.read()?;"},{"Add":" let mut changes: Vec<(Hash, ChangeId, Option)> = Vec::new();"},{"Add":" for (hash, change_id) in hashes {"},{"Add":" let n = txn"},{"Add":" .get_changeset(txn.changes(&channel_), &change_id)"},{"Add":" .unwrap();"},{"Add":" changes.push((hash, change_id, n.map(|&x| x.into())));"},{"Add":" }"},{"Add":" std::mem::drop(channel_);"},{"Add":" changes.sort_by(|a, b| b.2.cmp(&a.2));"},{"Add":" for (hash, change_id, _) in changes {"},{"Add":" let channel_ = channel.read()?;"},{"Add":" for p in txn.iter_revdep(&change_id)? {"},{"Add":" let (p, d) = p?;"},{"Add":" if p < &change_id {"},{"Add":" continue;"},{"Add":" } else if p > &change_id {"},{"Add":" break;"},{"Add":" }"},{"Add":" if txn.get_changeset(txn.changes(&channel_), d)?.is_some() {"},{"Add":" let dep: Hash = txn.get_external(d)?.unwrap().into();"},{"Add":" if Some(dep) == pending_hash {"},{"Add":" bail!("},{"Add":" \"Cannot unrecord change {} because unrecorded changes depend on it\","},{"Add":" hash.to_base32()"},{"Add":" );"},{"Add":" } else {"},{"Add":" bail!("},{"Add":" \"Cannot unrecord change {} because {} depend on it\","},{"Add":" hash.to_base32(),"},{"Add":" dep.to_base32()"},{"Add":" );"}],"del_contents":[{"Del":" std::mem::drop(channel_);\n changes.sort_by(|a, b| b.2.cmp(&a.2));\n"},{"Del":" for (hash, change_id, _) in changes {\n"},{"Del":" let channel_ = channel.borrow();\n"},{"Del":" for p in txn.iter_revdep(&change_id)? {\n"},{"Del":" let (p, d) = p?;\n"},{"Del":" if p < &change_id {\n"},{"Del":" continue;\n"},{"Del":" } else if p > &change_id {\n"},{"Del":" break;\n"}]}},{"Edit":{"inode":{"change":20,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":124,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":96953},"to":{"change":20,"start":71,"end":152},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":152},"to":{"change":20,"start":9594,"end":9672},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":9672},"to":{"change":20,"start":551,"end":742},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":12138},"to":{"change":20,"start":551,"end":742},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":551},"to":{"change":20,"start":551,"end":742},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":742},"to":{"change":20,"start":696,"end":745},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":745},"to":{"change":20,"start":776,"end":960},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":776},"to":{"change":20,"start":776,"end":960},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":960},"to":{"change":20,"start":746,"end":796},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":796},"to":{"change":20,"start":995,"end":1100},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":995},"to":{"change":20,"start":995,"end":1100},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":1009},"to":{"change":20,"start":97363,"end":97385},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":1100},"to":{"change":20,"start":97363,"end":97385},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":2047},"to":{"change":20,"start":97363,"end":97385},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":97363},"to":{"change":20,"start":97363,"end":97385},"introduced_by":20}],"inode":{"change":20,"pos":95630}}},"contents":[{"Del":" if txn.get_changeset(txn.changes(&channel_), d)?.is_some() {\n"},{"Del":" let dep: Hash = txn.get_external(d)?.unwrap().into();\n"},{"Del":" if Some(dep) == pending_hash {\n bail!(\n \"Cannot unrecord change {} because unrecorded changes depend on it\",\n"},{"Del":" hash.to_base32()\n"},{"Del":" );\n } else {\n bail!(\n \"Cannot unrecord change {} because {} depend on it\",\n"},{"Del":" hash.to_base32(),\n"},{"Del":" dep.to_base32()\n );\n }\n"},{"Del":" }\n"}]}},{"Edit":{"inode":{"change":20,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":125,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":97403},"to":{"change":20,"start":97403,"end":97445},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":97445},"to":{"change":20,"start":1010,"end":1077},"introduced_by":20}],"inode":{"change":20,"pos":95630}}},"contents":[{"Del":" std::mem::drop(channel_);\n"},{"Del":" txn.unrecord(&repo.changes, &mut channel, &hash)?;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":126,"ins":{"up_context":[{"change":20,"pos":97582}],"down_context":[{"change":20,"pos":29}],"flag":"BLOCK","start":5380,"end":6106,"inode":{"change":20,"pos":95630}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":97582},"to":{"change":20,"start":363,"end":413},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":28},"to":{"change":20,"start":1145,"end":1308},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":413},"to":{"change":20,"start":1145,"end":1308},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1145},"to":{"change":20,"start":1145,"end":1308},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":556},"to":{"change":20,"start":1308,"end":1358},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1308},"to":{"change":20,"start":1308,"end":1358},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1358},"to":{"change":20,"start":38,"end":64},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":64},"to":{"change":20,"start":1358,"end":1378},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1358},"to":{"change":20,"start":1358,"end":1378},"introduced_by":20}],"inode":{"change":20,"pos":95630}},"ins_contents":[{"Add":" std::mem::drop(channel_);"},{"Add":" txn.unrecord(&repo.changes, &channel, &hash)?;"},{"Add":" }"},{"Add":""},{"Add":" let txn = Arc::new(RwLock::new(txn));"},{"Add":" if self.reset && is_current_channel {"},{"Add":" libpijul::output::output_repository_no_pending("},{"Add":" repo.working_copy.clone(),"},{"Add":" &repo.changes,"},{"Add":" txn.clone(),"},{"Add":" channel.clone(),"},{"Add":" \"\","},{"Add":" true,"},{"Add":" None,"},{"Add":" num_cpus::get(),"},{"Add":" )?;"},{"Add":" }"},{"Add":" if let Some(h) = pending_hash {"},{"Add":" txn.write().unwrap().unrecord(&repo.changes, &channel, &h)?;"},{"Add":" if cfg!(feature = \"keep-changes\") {"},{"Add":" repo.changes.del_change(&h)?;"}],"del_contents":[{"Del":" if self.reset && is_current_channel {\n"},{"Del":" txn.output_repository_no_pending(\n &mut repo.working_copy,\n &repo.changes,\n &mut channel,\n"},{"Del":" \"\",\n true,\n"},{"Del":" None,\n"},{"Del":" )?;\n"}]}},{"Edit":{"inode":{"change":20,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":148,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":43},"to":{"change":20,"start":43,"end":87},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":87},"to":{"change":20,"start":1378,"end":1442},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1378},"to":{"change":20,"start":1378,"end":1442},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1442},"to":{"change":20,"start":0,"end":120},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":120},"to":{"change":20,"start":1488,"end":1502},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1488},"to":{"change":20,"start":1488,"end":1502},"introduced_by":20}],"inode":{"change":20,"pos":95630}}},"contents":[{"Del":" if let Some(h) = pending_hash {\n"},{"Del":" txn.unrecord(&repo.changes, &mut channel, &h)?;\n"},{"Del":" if cfg!(feature = \"keep-changes\") {\n repo.changes.del_change(&h)?;\n }\n"},{"Del":" }\n"}]}},{"Edit":{"inode":{"change":20,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":149,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":97592}],"down_context":[{"change":20,"pos":97592}],"flag":"BLOCK","start":6107,"end":6258,"inode":{"change":20,"pos":95630}}},"contents":[{"Add":" let txn = if let Ok(txn) = Arc::try_unwrap(txn) {"},{"Add":" txn.into_inner().unwrap()"},{"Add":" } else {"},{"Add":" unreachable!()"},{"Add":" };"}]}},{"Edit":{"inode":{"change":20,"pos":97650},"path":"pijul/src/commands/reset.rs","line":3,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":1313}],"down_context":[{"change":20,"pos":1313}],"flag":"BLOCK","start":6259,"end":6289,"inode":{"change":20,"pos":97650}}},"contents":[{"Add":"use std::sync::{Arc, RwLock};"}]}},{"Replacement":{"inode":{"change":20,"pos":97650},"path":"pijul/src/commands/reset.rs","line":9,"ins":{"up_context":[{"change":20,"pos":62}],"down_context":[{"change":20,"pos":1347}],"flag":"BLOCK","start":6290,"end":6365,"inode":{"change":20,"pos":97650}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":62},"to":{"change":20,"start":89,"end":164},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":89},"to":{"change":20,"start":89,"end":164},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":164},"to":{"change":20,"start":1331,"end":1347},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":2100},"to":{"change":20,"start":1331,"end":1347},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":97774},"to":{"change":20,"start":1331,"end":1347},"introduced_by":20}],"inode":{"change":20,"pos":97650}},"ins_contents":[{"Add":"use libpijul::{ChannelTxnT, DepsTxnT, MutTxnT, TxnT, TxnTExt};"},{"Add":"use log::*;"}],"del_contents":[{"Del":"use libpijul::{ChannelTxnT, DepsTxnT, MutTxnT, MutTxnTExt, TxnT, TxnTExt};\n"},{"Del":"use log::debug;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":97650},"path":"pijul/src/commands/reset.rs","line":41,"ins":{"up_context":[{"change":20,"pos":98218}],"down_context":[{"change":20,"pos":39}],"flag":"BLOCK","start":6366,"end":6651,"inode":{"change":20,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":98218},"to":{"change":20,"start":6094,"end":6163},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":6163},"to":{"change":20,"start":174,"end":228},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":228},"to":{"change":20,"start":414,"end":504},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":98334},"to":{"change":20,"start":414,"end":504},"introduced_by":20}],"inode":{"change":20,"pos":97650}},"ins_contents":[{"Add":" let repo = Repository::find_root(self.repo_path).await?;"},{"Add":" let txn = repo.pristine.mut_txn_begin()?;"},{"Add":""},{"Add":" let config_path = repo.config_path();"},{"Add":" let mut config = repo.config;"},{"Add":" let (channel_name, _) = config.get_current_channel(self.channel.as_deref());"}],"del_contents":[{"Del":" let mut repo = Repository::find_root(self.repo_path).await?;\n"},{"Del":" let mut txn = repo.pristine.mut_txn_begin()?;\n"},{"Del":" let (channel_name, _) = repo.config.get_current_channel(self.channel.as_deref());\n"}]}},{"Replacement":{"inode":{"change":20,"pos":97650},"path":"pijul/src/commands/reset.rs","line":48,"ins":{"up_context":[{"change":20,"pos":108}],"down_context":[{"change":20,"pos":98538}],"flag":"BLOCK","start":6652,"end":6732,"inode":{"change":20,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":108},"to":{"change":20,"start":12139,"end":12223},"introduced_by":20}],"inode":{"change":20,"pos":97650}},"ins_contents":[{"Add":" let channel = if let Some(channel) = txn.load_channel(&channel_name)? {"}],"del_contents":[{"Del":" let mut channel = if let Some(channel) = txn.load_channel(&channel_name)? {\n"}]}},{"Edit":{"inode":{"change":20,"pos":97650},"path":"pijul/src/commands/reset.rs","line":53,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":98818}],"down_context":[{"change":20,"pos":98818}],"flag":"BLOCK","start":6733,"end":6734,"inode":{"change":20,"pos":97650}}},"contents":[{"Add":""}]}},{"Replacement":{"inode":{"change":20,"pos":97650},"path":"pijul/src/commands/reset.rs","line":69,"ins":{"up_context":[{"change":20,"pos":99409}],"down_context":[{"change":20,"pos":99438}],"flag":"BLOCK","start":6735,"end":6778,"inode":{"change":20,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":99409},"to":{"change":20,"start":99409,"end":99438},"introduced_by":20}],"inode":{"change":20,"pos":97650}},"ins_contents":[{"Add":" libpijul::output::output_file("}],"del_contents":[{"Del":" txn.output_file(\n"}]}},{"Replacement":{"inode":{"change":20,"pos":97650},"path":"pijul/src/commands/reset.rs","line":71,"ins":{"up_context":[{"change":20,"pos":99469}],"down_context":[{"change":20,"pos":99495}],"flag":"BLOCK","start":6779,"end":6843,"inode":{"change":20,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":99469},"to":{"change":20,"start":99469,"end":99495},"introduced_by":20}],"inode":{"change":20,"pos":97650}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel.read().unwrap(),"}],"del_contents":[{"Del":" &channel,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":97650},"path":"pijul/src/commands/reset.rs","line":76,"ins":{"up_context":[{"change":20,"pos":99610}],"down_context":[{"change":15,"pos":141}],"flag":"BLOCK","start":6844,"end":8123,"inode":{"change":20,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":99610},"to":{"change":20,"start":99610,"end":99627},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":99627},"to":{"change":20,"start":505,"end":583},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":583},"to":{"change":20,"start":538,"end":604},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":99700},"to":{"change":20,"start":538,"end":604},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":604},"to":{"change":20,"start":63,"end":138},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":138},"to":{"change":20,"start":869,"end":887},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":545},"to":{"change":20,"start":869,"end":887},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":2136},"to":{"change":20,"start":869,"end":887},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":869},"to":{"change":20,"start":869,"end":887},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":577},"to":{"change":20,"start":887,"end":934},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":887},"to":{"change":20,"start":887,"end":934},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":934},"to":{"change":15,"start":0,"end":141},"introduced_by":15}],"inode":{"change":20,"pos":97650}},"ins_contents":[{"Add":" return Ok(());"},{"Add":" }"},{"Add":""},{"Add":" let txn = Arc::new(RwLock::new(txn));"},{"Add":""},{"Add":" let (current_channel, _) = config.get_current_channel(None);"},{"Add":" if self.channel.as_deref() == Some(current_channel) {"},{"Add":" if !overwrite_changes {"},{"Add":" return Ok(());"},{"Add":" }"},{"Add":" } else if self.channel.is_some() {"},{"Add":" if !self.files.is_empty() {"},{"Add":" bail!(\"Cannot use --channel with individual paths. Did you mean --dry-run?\")"},{"Add":" }"},{"Add":" let channel = {"},{"Add":" let txn = txn.read().unwrap();"},{"Add":" txn.load_channel(current_channel)?"},{"Add":" };"},{"Add":" if let Some(channel) = channel {"},{"Add":" let mut state = libpijul::RecordBuilder::new();"},{"Add":" state.record("},{"Add":" txn.clone(),"},{"Add":" libpijul::Algorithm::default(),"},{"Add":" channel.clone(),"},{"Add":" repo.working_copy.clone(),"},{"Add":" &repo.changes,"},{"Add":" \"\","},{"Add":" num_cpus::get(),"},{"Add":" )?;"},{"Add":" let rec = state.finish();"},{"Add":" debug!(\"actions = {:?}\", rec.actions);"},{"Add":" if !rec.actions.is_empty() {"},{"Add":" bail!(\"Cannot change channel, as there are unrecorded changes.\")"}],"del_contents":[{"Del":" } else {\n"},{"Del":" let (current_channel, _) = repo.config.get_current_channel(None);\n"},{"Del":" if self.channel.as_deref() == Some(current_channel) {\n"},{"Del":" if !overwrite_changes {\n return Ok(());\n"},{"Del":" }\n"},{"Del":" } else if self.channel.is_some() {\n"},{"Del":" if !self.files.is_empty() {\n bail!(\"Cannot use --channel with individual paths. Did you mean --dry-run?\")\n"}]}},{"Edit":{"inode":{"change":20,"pos":97650},"path":"pijul/src/commands/reset.rs","line":110,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":15,"pos":159},"to":{"change":20,"start":12282,"end":12362},"introduced_by":15},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":934},"to":{"change":20,"start":12282,"end":12362},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":12362},"to":{"change":20,"start":99917,"end":100440},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":99917},"to":{"change":20,"start":99917,"end":100440},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":100440},"to":{"change":20,"start":12363,"end":12452},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":12452},"to":{"change":20,"start":100509,"end":100549},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":100509},"to":{"change":20,"start":100509,"end":100549},"introduced_by":20}],"inode":{"change":20,"pos":97650}}},"contents":[{"Del":" if let Some(mut channel) = txn.load_channel(current_channel)? {\n"},{"Del":" let mut state = libpijul::RecordBuilder::new();\n txn.record(\n &mut state,\n libpijul::Algorithm::default(),\n &mut channel,\n &mut repo.working_copy,\n &repo.changes,\n \"\",\n )?;\n let rec = state.finish();\n debug!(\"actions = {:?}\", rec.actions);\n if !rec.actions.is_empty() {\n"},{"Del":" bail!(\"Cannot change channel, as there are unrecorded changes.\")\n"},{"Del":" }\n }\n"}]}},{"Edit":{"inode":{"change":20,"pos":97650},"path":"pijul/src/commands/reset.rs","line":111,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":100715}],"down_context":[{"change":20,"pos":100715}],"flag":"BLOCK","start":8124,"end":8134,"inode":{"change":20,"pos":97650}}},"contents":[{"Add":" }"}]}},{"Replacement":{"inode":{"change":20,"pos":97650},"path":"pijul/src/commands/reset.rs","line":113,"ins":{"up_context":[{"change":20,"pos":100716}],"down_context":[{"change":20,"pos":1226}],"flag":"BLOCK","start":8135,"end":9751,"inode":{"change":20,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":100716},"to":{"change":20,"start":6510,"end":6559},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":6559},"to":{"change":20,"start":100907,"end":100946},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":100907},"to":{"change":20,"start":100907,"end":100946},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":100946},"to":{"change":20,"start":139,"end":494},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":539},"to":{"change":20,"start":539,"end":773},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":6211},"to":{"change":20,"start":773,"end":826},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":773},"to":{"change":20,"start":773,"end":826},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":826},"to":{"change":20,"start":578,"end":1226},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":100946},"to":{"change":20,"start":578,"end":1226},"introduced_by":20}],"inode":{"change":20,"pos":97650}},"ins_contents":[{"Add":" let now = std::time::Instant::now();"},{"Add":" if self.files.is_empty() {"},{"Add":" if self.channel.is_none() || self.channel.as_deref() == Some(current_channel) {"},{"Add":" let last_modified = last_modified(&*txn.read().unwrap(), &*channel.read()?);"},{"Add":" libpijul::output::output_repository_no_pending("},{"Add":" repo.working_copy.clone(),"},{"Add":" &repo.changes,"},{"Add":" txn.clone(),"},{"Add":" channel.clone(),"},{"Add":" \"\","},{"Add":" true,"},{"Add":" Some(last_modified),"},{"Add":" num_cpus::get(),"},{"Add":" )?;"},{"Add":" let mut txn = if let Ok(txn) = Arc::try_unwrap(txn) {"},{"Add":" txn.into_inner().unwrap()"},{"Add":" } else {"},{"Add":" unreachable!()"},{"Add":" };"},{"Add":" txn.touch_channel(&mut *channel.write()?, None);"},{"Add":" txn.commit()?;"},{"Add":" return Ok(());"},{"Add":" }"},{"Add":" let mut inodes = HashSet::new();"},{"Add":" let txn_ = txn.read().unwrap();"},{"Add":" if let Some(cur) = txn_.load_channel(current_channel)? {"},{"Add":" let mut changediff = HashSet::new();"},{"Add":" let (a, b, s) = libpijul::pristine::last_common_state("},{"Add":" &*txn_,"},{"Add":" &*cur.read()?,"},{"Add":" &*channel.read()?,"},{"Add":" )?;"},{"Add":" debug!(\"last common state {:?}\", s);"},{"Add":" changes_after(&*txn_, &*cur.read()?, a, &mut changediff, &mut inodes)?;"},{"Add":" changes_after(&*txn_, &*channel.read()?, b, &mut changediff, &mut inodes)?;"},{"Add":" }"}],"del_contents":[{"Del":" let now = std::time::Instant::now();\n"},{"Del":" if self.files.is_empty() {\n"},{"Del":" if self.channel.is_none() || self.channel.as_deref() == Some(current_channel) {\n let last_modified = last_modified(&txn, &channel.borrow());\n txn.output_repository_no_pending(\n &mut repo.working_copy,\n &repo.changes,\n &mut channel,\n"},{"Del":" \"\",\n true,\n Some(last_modified),\n )?;\n txn.touch_channel(&mut channel.borrow_mut(), None);\n txn.commit()?;\n"},{"Del":" return Ok(());\n }\n"},{"Del":" let mut inodes = HashSet::new();\n if let Some(cur) = txn.load_channel(current_channel)? {\n let mut changediff = HashSet::new();\n let (a, b, s) = libpijul::pristine::last_common_state(\n &txn,\n &cur.borrow(),\n &channel.borrow(),\n )?;\n debug!(\"last common state {:?}\", s);\n changes_after(&txn, &cur.borrow(), a, &mut changediff, &mut inodes)?;\n changes_after(&txn, &channel.borrow(), b, &mut changediff, &mut inodes)?;\n }\n"}]}},{"Replacement":{"inode":{"change":20,"pos":97650},"path":"pijul/src/commands/reset.rs","line":150,"ins":{"up_context":[{"change":20,"pos":1227}],"down_context":[{"change":20,"pos":1376}],"flag":"BLOCK","start":9752,"end":10289,"inode":{"change":20,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1227},"to":{"change":20,"start":1227,"end":1376},"introduced_by":20}],"inode":{"change":20,"pos":97650}},"ins_contents":[{"Add":" if self.channel.is_some() {"},{"Add":" config.current_channel = self.channel;"},{"Add":" config.save(&config_path)?;"},{"Add":" }"},{"Add":" let mut paths = Vec::with_capacity(inodes.len());"},{"Add":" for pos in inodes.iter() {"},{"Add":" if let Some((path, _)) ="},{"Add":" libpijul::fs::find_path(&repo.changes, &*txn_, &*channel.read()?, false, *pos)?"},{"Add":" {"},{"Add":" paths.push(path)"},{"Add":" } else {"},{"Add":" paths.clear();"},{"Add":" break;"}],"del_contents":[{"Del":" if self.channel.is_some() {\n repo.config.current_channel = self.channel;\n repo.save_config()?;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":97650},"path":"pijul/src/commands/reset.rs","line":164,"ins":{"up_context":[{"change":20,"pos":1394}],"down_context":[{"change":20,"pos":101673}],"flag":"BLOCK","start":10290,"end":12217,"inode":{"change":20,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1394},"to":{"change":20,"start":0,"end":66},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":66},"to":{"change":20,"start":1395,"end":1438},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1395},"to":{"change":20,"start":1395,"end":1438},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1438},"to":{"change":20,"start":67,"end":137},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":137},"to":{"change":20,"start":1499,"end":1672},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1499},"to":{"change":20,"start":1499,"end":1672},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1672},"to":{"change":20,"start":138,"end":343},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":343},"to":{"change":16,"start":4180,"end":4442},"introduced_by":16},{"previous":"","flag":"DELETED","from":{"change":16,"pos":4442},"to":{"change":20,"start":343,"end":386},"introduced_by":16},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":343},"to":{"change":20,"start":343,"end":386},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":386},"to":{"change":20,"start":1696,"end":1927},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1696},"to":{"change":20,"start":1696,"end":1927},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1972},"to":{"change":20,"start":1972,"end":2033},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":2033},"to":{"change":20,"start":192,"end":222},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":222},"to":{"change":20,"start":2033,"end":2075},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":2033},"to":{"change":20,"start":2033,"end":2075},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":2075},"to":{"change":20,"start":387,"end":734},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":734},"to":{"change":16,"start":4443,"end":4476},"introduced_by":16},{"previous":"","flag":"DELETED","from":{"change":20,"pos":734},"to":{"change":20,"start":101179,"end":101200},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":2075},"to":{"change":20,"start":101179,"end":101200},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":16,"pos":4476},"to":{"change":20,"start":101179,"end":101200},"introduced_by":16},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":101179},"to":{"change":20,"start":101179,"end":101200},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":101200},"to":{"change":16,"start":4477,"end":4739},"introduced_by":16},{"previous":"","flag":"DELETED","from":{"change":20,"pos":678},"to":{"change":20,"start":101200,"end":101310},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":16,"pos":4739},"to":{"change":20,"start":101200,"end":101310},"introduced_by":16},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":101200},"to":{"change":20,"start":101200,"end":101310},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":101310},"to":{"change":20,"start":265,"end":346},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":346},"to":{"change":20,"start":101391,"end":101570},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":101391},"to":{"change":20,"start":101391,"end":101570},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":714},"to":{"change":20,"start":101570,"end":101631},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":101570},"to":{"change":20,"start":101570,"end":101631},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":101631},"to":{"change":20,"start":223,"end":253},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":253},"to":{"change":20,"start":101631,"end":101673},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":101631},"to":{"change":20,"start":101631,"end":101673},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":101673},"to":{"change":16,"start":4740,"end":4773},"introduced_by":16}],"inode":{"change":20,"pos":97650}},"ins_contents":[{"Add":" }"},{"Add":" PROGRESS"},{"Add":" .borrow_mut()"},{"Add":" .unwrap()"},{"Add":" .push(crate::progress::Cursor::Spin {"},{"Add":" i: 0,"},{"Add":" pre: \"Outputting repository\".into(),"},{"Add":" });"},{"Add":" std::mem::drop(txn_);"},{"Add":" for path in paths.iter() {"},{"Add":" debug!(\"resetting {:?}\", path);"},{"Add":" libpijul::output::output_repository_no_pending("},{"Add":" repo.working_copy.clone(),"},{"Add":" &repo.changes,"},{"Add":" txn.clone(),"},{"Add":" channel.clone(),"},{"Add":" &path,"},{"Add":" true,"},{"Add":" None,"},{"Add":" num_cpus::get(),"},{"Add":" )?;"},{"Add":" }"},{"Add":" if paths.is_empty() {"},{"Add":" libpijul::output::output_repository_no_pending("},{"Add":" repo.working_copy,"},{"Add":" &repo.changes,"},{"Add":" txn.clone(),"},{"Add":" channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" None,"},{"Add":" num_cpus::get(),"},{"Add":" )?;"},{"Add":" }"},{"Add":" PROGRESS.join();"},{"Add":" } else {"},{"Add":" PROGRESS"},{"Add":" .borrow_mut()"},{"Add":" .unwrap()"},{"Add":" .push(crate::progress::Cursor::Spin {"},{"Add":" i: 0,"},{"Add":" pre: \"Outputting repository\".into(),"},{"Add":" });"},{"Add":" for root in self.files.iter() {"},{"Add":" let root = std::fs::canonicalize(&root)?;"},{"Add":" let path = root.strip_prefix(&repo_path)?.to_str().unwrap();"},{"Add":" libpijul::output::output_repository_no_pending("},{"Add":" repo.working_copy.clone(),"},{"Add":" &repo.changes,"},{"Add":" txn.clone(),"},{"Add":" channel.clone(),"},{"Add":" &path,"},{"Add":" true,"},{"Add":" None,"},{"Add":" num_cpus::get(),"},{"Add":" )?;"}],"del_contents":[{"Del":" let mut paths = Vec::with_capacity(inodes.len());\n"},{"Del":" for pos in inodes.iter() {\n"},{"Del":" if let Some((path, _)) = libpijul::fs::find_path(\n"},{"Del":" &repo.changes,\n &txn,\n &channel.borrow(),\n false,\n *pos,\n"},{"Del":" )? {\n paths.push(path)\n } else {\n paths.clear();\n break;\n }\n }\n"},{"Del":" PROGRESS\n .borrow_mut()\n .unwrap()\n .push(crate::progress::Cursor::Spin {\n i: 0,\n pre: \"Outputting repository\".into(),\n });\n"},{"Del":" for path in paths.iter() {\n"},{"Del":" debug!(\"resetting {:?}\", path);\n txn.output_repository_no_pending(\n &mut repo.working_copy,\n &repo.changes,\n &mut channel,\n"},{"Del":" &path,\n true,\n"},{"Del":" None,\n"},{"Del":" )?;\n }\n"},{"Del":" if paths.is_empty() {\n txn.output_repository_no_pending(\n &mut repo.working_copy,\n &repo.changes,\n &mut channel,\n \"\",\n true,\n None,\n )?;\n }\n"},{"Del":" PROGRESS.join();\n"},{"Del":" } else {\n"},{"Del":" PROGRESS\n .borrow_mut()\n .unwrap()\n .push(crate::progress::Cursor::Spin {\n i: 0,\n pre: \"Outputting repository\".into(),\n });\n"},{"Del":" for root in self.files.iter() {\n let root = std::fs::canonicalize(&root)?;\n"},{"Del":" let path = root.strip_prefix(&repo_path)?.to_str().unwrap();\n"},{"Del":" txn.output_repository_no_pending(\n &mut repo.working_copy,\n &repo.changes,\n &mut channel,\n"},{"Del":" &path,\n true,\n"},{"Del":" None,\n"},{"Del":" )?;\n }\n"},{"Del":" PROGRESS.join();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":97650},"path":"pijul/src/commands/reset.rs","line":221,"ins":{"up_context":[{"change":20,"pos":101687}],"down_context":[{"change":20,"pos":101713}],"flag":"BLOCK","start":12218,"end":12247,"inode":{"change":20,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":101687},"to":{"change":20,"start":6560,"end":6587},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":6251},"to":{"change":20,"start":6587,"end":6636},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":6587},"to":{"change":20,"start":6587,"end":6636},"introduced_by":20}],"inode":{"change":20,"pos":97650}},"ins_contents":[{"Add":" PROGRESS.join();"}],"del_contents":[{"Del":" txn.commit()?;\n"},{"Del":" debug!(\"now = {:?}\", now.elapsed());\n"}]}},{"Edit":{"inode":{"change":20,"pos":97650},"path":"pijul/src/commands/reset.rs","line":223,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":101723}],"down_context":[{"change":20,"pos":6637}],"flag":"BLOCK","start":12248,"end":12467,"inode":{"change":20,"pos":97650}}},"contents":[{"Add":" let txn = if let Ok(txn) = Arc::try_unwrap(txn) {"},{"Add":" txn.into_inner().unwrap()"},{"Add":" } else {"},{"Add":" unreachable!()"},{"Add":" };"},{"Add":" txn.commit()?;"},{"Add":" debug!(\"now = {:?}\", now.elapsed());"}]}},{"Replacement":{"inode":{"change":20,"pos":97650},"path":"pijul/src/commands/reset.rs","line":231,"ins":{"up_context":[{"change":20,"pos":6691}],"down_context":[{"change":20,"pos":6707}],"flag":"BLOCK","start":12468,"end":12483,"inode":{"change":20,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":6691},"to":{"change":20,"start":6691,"end":6707},"introduced_by":20}],"inode":{"change":20,"pos":97650}},"ins_contents":[{"Add":" info!("}],"del_contents":[{"Del":" debug!(\n"}]}},{"Edit":{"inode":{"change":20,"pos":101759},"path":"pijul/src/commands/record.rs","line":1,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":101759},"to":{"change":20,"start":64,"end":106},"introduced_by":20}],"inode":{"change":20,"pos":101759}}},"contents":[{"Del":"use std::collections::{HashMap, HashSet};\n"}]}},{"Edit":{"inode":{"change":20,"pos":101759},"path":"pijul/src/commands/record.rs","line":3,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":24}],"down_context":[{"change":20,"pos":1485}],"flag":"BLOCK","start":12484,"end":12514,"inode":{"change":20,"pos":101759}}},"contents":[{"Add":"use std::sync::{Arc, RwLock};"}]}},{"Replacement":{"inode":{"change":20,"pos":101759},"path":"pijul/src/commands/record.rs","line":11,"ins":{"up_context":[{"change":20,"pos":101876}],"down_context":[{"change":20,"pos":1504}],"flag":"BLOCK","start":12515,"end":12657,"inode":{"change":20,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":101876},"to":{"change":20,"start":0,"end":40},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":40},"to":{"change":20,"start":107,"end":192},"introduced_by":20}],"inode":{"change":20,"pos":101759}},"ins_contents":[{"Add":"use libpijul::{"},{"Add":" Base32, ChannelMutTxnT, ChannelRef, ChannelTxnT, MutTxnT, MutTxnTExt, TxnT, TxnTExt,"},{"Add":"};"},{"Add":"use libpijul::{HashMap, HashSet};"}],"del_contents":[{"Del":"use libpijul::pristine::ChannelMutTxnT;\n"},{"Del":"use libpijul::{Base32, ChannelRef, ChannelTxnT, MutTxnT, MutTxnTExt, TxnT, TxnTExt};\n"}]}},{"Replacement":{"inode":{"change":20,"pos":101759},"path":"pijul/src/commands/record.rs","line":59,"ins":{"up_context":[{"change":20,"pos":102832}],"down_context":[{"change":20,"pos":102903}],"flag":"BLOCK","start":12658,"end":12731,"inode":{"change":20,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":102832},"to":{"change":20,"start":6252,"end":6329},"introduced_by":20}],"inode":{"change":20,"pos":101759}},"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"}]}},{"Replacement":{"inode":{"change":20,"pos":101759},"path":"pijul/src/commands/record.rs","line":79,"ins":{"up_context":[{"change":20,"pos":357}],"down_context":[{"change":20,"pos":424}],"flag":"BLOCK","start":12732,"end":12800,"inode":{"change":20,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":357},"to":{"change":20,"start":10065,"end":10133},"introduced_by":20}],"inode":{"change":20,"pos":101759}},"ins_contents":[{"Add":" .get_changeset(txn.changes(&*channel.read()?), &c)?"}],"del_contents":[{"Del":" .get_changeset(txn.changes(&channel.borrow()), &c)?\n"}]}},{"Replacement":{"inode":{"change":20,"pos":101759},"path":"pijul/src/commands/record.rs","line":85,"ins":{"up_context":[{"change":20,"pos":590}],"down_context":[{"change":20,"pos":632}],"flag":"BLOCK","start":12801,"end":12850,"inode":{"change":20,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":590},"to":{"change":20,"start":590,"end":632},"introduced_by":20}],"inode":{"change":20,"pos":101759}},"ins_contents":[{"Add":" channel.read().unwrap().name"}],"del_contents":[{"Del":" channel.borrow().name\n"}]}},{"Replacement":{"inode":{"change":20,"pos":101759},"path":"pijul/src/commands/record.rs","line":94,"ins":{"up_context":[{"change":20,"pos":174}],"down_context":[{"change":20,"pos":10134}],"flag":"BLOCK","start":12851,"end":12938,"inode":{"change":20,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":174},"to":{"change":20,"start":12472,"end":12559},"introduced_by":20}],"inode":{"change":20,"pos":101759}},"ins_contents":[{"Add":" } else if let Some(h) = txn.reverse_log(&*channel.read()?, None)?.next() {"}],"del_contents":[{"Del":" } else if let Some(h) = txn.reverse_log(&channel.borrow(), None)?.next() {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":101759},"path":"pijul/src/commands/record.rs","line":115,"ins":{"up_context":[{"change":7,"pos":355}],"down_context":[{"change":7,"pos":440}],"flag":"BLOCK","start":12939,"end":13020,"inode":{"change":20,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":355},"to":{"change":7,"start":355,"end":440},"introduced_by":7}],"inode":{"change":20,"pos":101759}},"ins_contents":[{"Add":" let (repo_path, working_copy) = if let Some(ref w) = self.working_copy {"}],"del_contents":[{"Del":" let (repo_path, mut working_copy) = if let Some(ref w) = self.working_copy {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":101759},"path":"pijul/src/commands/record.rs","line":118,"ins":{"up_context":[{"change":7,"pos":506}],"down_context":[{"change":7,"pos":590}],"flag":"BLOCK","start":13021,"end":13154,"inode":{"change":20,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":506},"to":{"change":7,"start":506,"end":590},"introduced_by":7}],"inode":{"change":20,"pos":101759}},"ins_contents":[{"Add":" Some(Arc::new("},{"Add":" libpijul::working_copy::filesystem::FileSystem::from_root(w),"},{"Add":" )),"}],"del_contents":[{"Del":" Some(libpijul::working_copy::filesystem::FileSystem::from_root(w)),\n"}]}},{"Edit":{"inode":{"change":20,"pos":101759},"path":"pijul/src/commands/record.rs","line":125,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":696}],"down_context":[{"change":20,"pos":104054}],"flag":"BLOCK","start":13155,"end":13201,"inode":{"change":20,"pos":101759}}},"contents":[{"Add":" let txn = Arc::new(RwLock::new(txn));"}]}},{"Replacement":{"inode":{"change":20,"pos":101759},"path":"pijul/src/commands/record.rs","line":128,"ins":{"up_context":[{"change":14,"pos":17}],"down_context":[{"change":20,"pos":104172}],"flag":"BLOCK","start":13202,"end":13302,"inode":{"change":20,"pos":101759}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":14,"pos":17},"to":{"change":20,"start":104110,"end":104136},"introduced_by":14},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":104110},"to":{"change":20,"start":104110,"end":104136},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":104136},"to":{"change":7,"start":697,"end":766},"introduced_by":7}],"inode":{"change":20,"pos":101759}},"ins_contents":[{"Add":" channel.clone(),"},{"Add":" working_copy.clone().unwrap_or(repo.working_copy.clone()),"}],"del_contents":[{"Del":" &mut channel,\n"},{"Del":" working_copy.as_mut().unwrap_or(&mut repo.working_copy),\n"}]}},{"Replacement":{"inode":{"change":20,"pos":101759},"path":"pijul/src/commands/record.rs","line":135,"ins":{"up_context":[{"change":20,"pos":104255}],"down_context":[{"change":20,"pos":104315}],"flag":"BLOCK","start":13303,"end":13376,"inode":{"change":20,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":104255},"to":{"change":14,"start":18,"end":95},"introduced_by":14}],"inode":{"change":20,"pos":101759}},"ins_contents":[{"Add":" if let Some((txn, mut change, updates, hash, oldest)) = result {"}],"del_contents":[{"Del":" if let Some((mut txn, mut change, updates, hash, oldest)) = result {\n"}]}},{"Edit":{"inode":{"change":20,"pos":101759},"path":"pijul/src/commands/record.rs","line":157,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":105115}],"down_context":[{"change":20,"pos":10252}],"flag":"BLOCK","start":13377,"end":13552,"inode":{"change":20,"pos":101759}}},"contents":[{"Add":" let mut txn = if let Ok(txn) = Arc::try_unwrap(txn) {"},{"Add":" txn.into_inner().unwrap()"},{"Add":" } else {"},{"Add":" unreachable!()"},{"Add":" };"}]}},{"Replacement":{"inode":{"change":20,"pos":101759},"path":"pijul/src/commands/record.rs","line":180,"ins":{"up_context":[{"change":18,"pos":699}],"down_context":[{"change":20,"pos":158}],"flag":"BLOCK","start":13553,"end":13626,"inode":{"change":20,"pos":101759}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":18,"pos":699},"to":{"change":20,"start":82,"end":158},"introduced_by":18},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":82},"to":{"change":20,"start":82,"end":158},"introduced_by":20}],"inode":{"change":20,"pos":101759}},"ins_contents":[{"Add":" txn.touch_channel(&mut *channel.write()?, Some(oldest));"}],"del_contents":[{"Del":" txn.touch_channel(&mut channel.borrow_mut(), Some(oldest));\n"}]}},{"Replacement":{"inode":{"change":20,"pos":101759},"path":"pijul/src/commands/record.rs","line":223,"ins":{"up_context":[{"change":20,"pos":106435}],"down_context":[{"change":20,"pos":106498}],"flag":"BLOCK","start":13627,"end":13755,"inode":{"change":20,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":106435},"to":{"change":20,"start":2210,"end":2266},"introduced_by":20}],"inode":{"change":20,"pos":101759}},"ins_contents":[{"Add":" fn record<"},{"Add":" T: TxnTExt + MutTxnTExt + Sync + Send + 'static,"},{"Add":" C: ChangeStore + Send + Clone + 'static,"},{"Add":" >("}],"del_contents":[{"Del":" fn record(\n"}]}},{"Replacement":{"inode":{"change":20,"pos":101759},"path":"pijul/src/commands/record.rs","line":228,"ins":{"up_context":[{"change":20,"pos":106516}],"down_context":[{"change":20,"pos":106637}],"flag":"BLOCK","start":13756,"end":13880,"inode":{"change":20,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":106516},"to":{"change":14,"start":96,"end":116},"introduced_by":14},{"previous":"","flag":"DELETED","from":{"change":14,"pos":116},"to":{"change":20,"start":106537,"end":106637},"introduced_by":14},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":106537},"to":{"change":20,"start":106537,"end":106637},"introduced_by":20}],"inode":{"change":20,"pos":101759}},"ins_contents":[{"Add":" txn: Arc>,"},{"Add":" channel: ChannelRef,"},{"Add":" working_copy: Arc,"}],"del_contents":[{"Del":" mut txn: T,\n"},{"Del":" channel: &mut ChannelRef,\n working_copy: &mut libpijul::working_copy::FileSystem,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":101759},"path":"pijul/src/commands/record.rs","line":237,"ins":{"up_context":[{"change":20,"pos":106748}],"down_context":[{"change":20,"pos":106748}],"flag":"BLOCK","start":13881,"end":13909,"inode":{"change":20,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":106748},"to":{"change":14,"start":117,"end":132},"introduced_by":14}],"inode":{"change":20,"pos":101759}},"ins_contents":[{"Add":" Arc>,"}],"del_contents":[{"Del":" T,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":101759},"path":"pijul/src/commands/record.rs","line":256,"ins":{"up_context":[{"change":7,"pos":1193}],"down_context":[{"change":7,"pos":1269}],"flag":"BLOCK","start":13910,"end":13989,"inode":{"change":20,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1193},"to":{"change":7,"start":1193,"end":1269},"introduced_by":7}],"inode":{"change":20,"pos":101759}},"ins_contents":[{"Add":" state.record("},{"Add":" txn.clone(),"}],"del_contents":[{"Del":" txn.record(\n &mut state,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":101759},"path":"pijul/src/commands/record.rs","line":259,"ins":{"up_context":[{"change":7,"pos":1329}],"down_context":[{"change":7,"pos":1408}],"flag":"BLOCK","start":13990,"end":14085,"inode":{"change":20,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1329},"to":{"change":7,"start":1329,"end":1408},"introduced_by":7}],"inode":{"change":20,"pos":101759}},"ins_contents":[{"Add":" channel.clone(),"},{"Add":" working_copy.clone(),"}],"del_contents":[{"Del":" channel,\n working_copy,\n"}]}},{"Edit":{"inode":{"change":20,"pos":101759},"path":"pijul/src/commands/record.rs","line":263,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":1494}],"down_context":[{"change":7,"pos":1494}],"flag":"BLOCK","start":14086,"end":14131,"inode":{"change":20,"pos":101759}}},"contents":[{"Add":" num_cpus::get(),"}]}},{"Replacement":{"inode":{"change":20,"pos":101759},"path":"pijul/src/commands/record.rs","line":268,"ins":{"up_context":[{"change":7,"pos":1582}],"down_context":[{"change":7,"pos":1642}],"flag":"BLOCK","start":14132,"end":14195,"inode":{"change":20,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1582},"to":{"change":7,"start":1582,"end":1642},"introduced_by":7}],"inode":{"change":20,"pos":101759}},"ins_contents":[{"Add":" state.record("},{"Add":" txn.clone(),"}],"del_contents":[{"Del":" txn.record(\n &mut state,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":101759},"path":"pijul/src/commands/record.rs","line":271,"ins":{"up_context":[{"change":7,"pos":1694}],"down_context":[{"change":7,"pos":1757}],"flag":"BLOCK","start":14196,"end":14275,"inode":{"change":20,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1694},"to":{"change":7,"start":1694,"end":1757},"introduced_by":7}],"inode":{"change":20,"pos":101759}},"ins_contents":[{"Add":" channel.clone(),"},{"Add":" working_copy.clone(),"}],"del_contents":[{"Del":" channel,\n working_copy,\n"}]}},{"Edit":{"inode":{"change":20,"pos":101759},"path":"pijul/src/commands/record.rs","line":275,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":1810}],"down_context":[{"change":7,"pos":1810}],"flag":"BLOCK","start":14276,"end":14313,"inode":{"change":20,"pos":101759}}},"contents":[{"Add":" num_cpus::get(),"}]}},{"Replacement":{"inode":{"change":20,"pos":101759},"path":"pijul/src/commands/record.rs","line":281,"ins":{"up_context":[{"change":20,"pos":107320}],"down_context":[{"change":20,"pos":107366}],"flag":"BLOCK","start":14314,"end":14376,"inode":{"change":20,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":107320},"to":{"change":14,"start":133,"end":159},"introduced_by":14},{"previous":"","flag":"DELETED","from":{"change":14,"pos":159},"to":{"change":20,"start":107341,"end":107366},"introduced_by":14},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":107341},"to":{"change":20,"start":107341,"end":107366},"introduced_by":20}],"inode":{"change":20,"pos":101759}},"ins_contents":[{"Add":" txn.clone(),"},{"Add":" channel.clone(),"}],"del_contents":[{"Del":" &mut txn,\n"},{"Del":" channel,\n"}]}},{"Edit":{"inode":{"change":20,"pos":101759},"path":"pijul/src/commands/record.rs","line":290,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":107504}],"down_context":[{"change":20,"pos":107504}],"flag":"BLOCK","start":14377,"end":14378,"inode":{"change":20,"pos":101759}}},"contents":[{"Add":""}]}},{"Replacement":{"inode":{"change":20,"pos":101759},"path":"pijul/src/commands/record.rs","line":293,"ins":{"up_context":[{"change":20,"pos":107578}],"down_context":[{"change":14,"pos":224}],"flag":"BLOCK","start":14379,"end":14615,"inode":{"change":20,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":107578},"to":{"change":14,"start":160,"end":224},"introduced_by":14}],"inode":{"change":20,"pos":101759}},"ins_contents":[{"Add":" let mut txn = if let Ok(txn) = Arc::try_unwrap(txn) {"},{"Add":" txn.into_inner().unwrap()"},{"Add":" } else {"},{"Add":" unreachable!()"},{"Add":" };"},{"Add":" txn.touch_channel(&mut *channel.write()?, None);"}],"del_contents":[{"Del":" txn.touch_channel(&mut channel.borrow_mut(), None);\n"}]}},{"Edit":{"inode":{"change":20,"pos":101759},"path":"pijul/src/commands/record.rs","line":302,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":107617}],"down_context":[{"change":20,"pos":107617}],"flag":"BLOCK","start":14616,"end":14700,"inode":{"change":20,"pos":101759}}},"contents":[{"Add":" debug!(\"TAKING LOCK {}\", line!());"},{"Add":" let txn_ = txn.write().unwrap();"}]}},{"Replacement":{"inode":{"change":20,"pos":101759},"path":"pijul/src/commands/record.rs","line":307,"ins":{"up_context":[{"change":20,"pos":107689}],"down_context":[{"change":20,"pos":107732}],"flag":"BLOCK","start":14701,"end":14756,"inode":{"change":20,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":107689},"to":{"change":14,"start":252,"end":305},"introduced_by":14}],"inode":{"change":20,"pos":101759}},"ins_contents":[{"Add":" .map(|rec| rec.globalize(&*txn_).unwrap())"}],"del_contents":[{"Del":" .map(|rec| rec.globalize(&txn).unwrap())\n"}]}},{"Edit":{"inode":{"change":20,"pos":101759},"path":"pijul/src/commands/record.rs","line":309,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":107756}],"down_context":[{"change":20,"pos":762}],"flag":"BLOCK","start":14757,"end":14918,"inode":{"change":20,"pos":101759}}},"contents":[{"Add":" let contents = if let Ok(c) = Arc::try_unwrap(rec.contents) {"},{"Add":" c.into_inner().unwrap()"},{"Add":" } else {"},{"Add":" unreachable!()"},{"Add":" };"}]}},{"Replacement":{"inode":{"change":20,"pos":101759},"path":"pijul/src/commands/record.rs","line":315,"ins":{"up_context":[{"change":20,"pos":787}],"down_context":[{"change":20,"pos":788}],"flag":"BLOCK","start":14919,"end":15015,"inode":{"change":20,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":787},"to":{"change":14,"start":306,"end":403},"introduced_by":14}],"inode":{"change":20,"pos":101759}},"ins_contents":[{"Add":" LocalChange::make_change(&*txn_, &channel, actions, contents, header, Vec::new())?;"}],"del_contents":[{"Del":" LocalChange::make_change(&txn, channel, actions, rec.contents, header, Vec::new())?;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":101759},"path":"pijul/src/commands/record.rs","line":346,"ins":{"up_context":[{"change":20,"pos":108852}],"down_context":[{"change":20,"pos":108942}],"flag":"BLOCK","start":15016,"end":15110,"inode":{"change":20,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":108852},"to":{"change":14,"start":404,"end":495},"introduced_by":14}],"inode":{"change":20,"pos":101759}},"ins_contents":[{"Add":" Change::read_and_deps(&mut change, &mut rec.updatables, &*txn_, &channel)"}],"del_contents":[{"Del":" Change::read_and_deps(&mut change, &mut rec.updatables, &txn, channel)\n"}]}},{"Edit":{"inode":{"change":20,"pos":101759},"path":"pijul/src/commands/record.rs","line":374,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":109803}],"down_context":[{"change":20,"pos":750}],"flag":"BLOCK","start":15111,"end":15141,"inode":{"change":20,"pos":101759}}},"contents":[{"Add":" std::mem::drop(txn_);"}]}},{"Edit":{"inode":{"change":20,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":4,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":1695}],"down_context":[{"change":20,"pos":1695}],"flag":"BLOCK","start":15142,"end":15172,"inode":{"change":20,"pos":111631}}},"contents":[{"Add":"use std::sync::{Arc, RwLock};"}]}},{"Replacement":{"inode":{"change":20,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":170,"ins":{"up_context":[{"change":20,"pos":12983}],"down_context":[{"change":20,"pos":13071}],"flag":"BLOCK","start":15173,"end":15260,"inode":{"change":20,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":12983},"to":{"change":20,"start":12983,"end":13071},"introduced_by":20}],"inode":{"change":20,"pos":111631}},"ins_contents":[{"Add":" libpijul::fs::iter_graph_descendants(&txn, &channel.read()?.graph, p)?"}],"del_contents":[{"Del":" libpijul::fs::iter_graph_descendants(&txn, &channel.borrow().graph, p)?\n"}]}},{"Replacement":{"inode":{"change":20,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":176,"ins":{"up_context":[{"change":20,"pos":10513}],"down_context":[{"change":20,"pos":13190}],"flag":"BLOCK","start":15261,"end":15322,"inode":{"change":20,"pos":111631}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":10513},"to":{"change":20,"start":13129,"end":13190},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":116268},"to":{"change":20,"start":13129,"end":13190},"introduced_by":20}],"inode":{"change":20,"pos":111631}},"ins_contents":[{"Add":" for x in txn.reverse_log(&*channel.read()?, None)? {"}],"del_contents":[{"Del":" for x in txn.reverse_log(&channel.borrow(), None)? {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":197,"ins":{"up_context":[{"change":20,"pos":13572}],"down_context":[{"change":20,"pos":13573}],"flag":"BLOCK","start":15323,"end":15374,"inode":{"change":20,"pos":111631}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":13572},"to":{"change":20,"start":5206,"end":5258},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":5206},"to":{"change":20,"start":5206,"end":5258},"introduced_by":20}],"inode":{"change":20,"pos":111631}},"ins_contents":[{"Add":" let channel = channel.read()?;"}],"del_contents":[{"Del":" let channel = channel.borrow();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":314,"ins":{"up_context":[{"change":20,"pos":8812}],"down_context":[{"change":20,"pos":11155}],"flag":"BLOCK","start":15375,"end":15454,"inode":{"change":20,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":8812},"to":{"change":20,"start":13810,"end":13890},"introduced_by":20}],"inode":{"change":20,"pos":111631}},"ins_contents":[{"Add":" for x in txn.iter_remote(&remote_changes.lock()?.remote, 0)? {"}],"del_contents":[{"Del":" for x in txn.iter_remote(&remote_changes.borrow().remote, 0)? {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":317,"ins":{"up_context":[{"change":20,"pos":27}],"down_context":[{"change":20,"pos":105}],"flag":"BLOCK","start":15455,"end":15536,"inode":{"change":20,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":27},"to":{"change":20,"start":11200,"end":11281},"introduced_by":20}],"inode":{"change":20,"pos":111631}},"ins_contents":[{"Add":" .channel_has_state(txn.states(&*channel.read()?), &p.b)?"}],"del_contents":[{"Del":" .channel_has_state(txn.states(&channel.borrow()), &p.b)?\n"}]}},{"Replacement":{"inode":{"change":20,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":334,"ins":{"up_context":[{"change":20,"pos":14103}],"down_context":[{"change":20,"pos":14199}],"flag":"BLOCK","start":15537,"end":15632,"inode":{"change":20,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":14103},"to":{"change":20,"start":14103,"end":14199},"introduced_by":20}],"inode":{"change":20,"pos":111631}},"ins_contents":[{"Add":" libpijul::fs::iter_graph_descendants(&txn, &channel.read()?.graph, p)?"}],"del_contents":[{"Del":" libpijul::fs::iter_graph_descendants(&txn, &channel.borrow().graph, p)?\n"}]}},{"Replacement":{"inode":{"change":20,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":343,"ins":{"up_context":[{"change":20,"pos":14430}],"down_context":[{"change":20,"pos":14431}],"flag":"BLOCK","start":15633,"end":15698,"inode":{"change":20,"pos":111631}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":14430},"to":{"change":20,"start":7193,"end":7259},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":7193},"to":{"change":20,"start":7193,"end":7259},"introduced_by":20}],"inode":{"change":20,"pos":111631}},"ins_contents":[{"Add":" let remote_channel = remote_channel.read()?;"}],"del_contents":[{"Del":" let remote_channel = remote_channel.borrow();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":347,"ins":{"up_context":[{"change":20,"pos":194}],"down_context":[{"change":20,"pos":276}],"flag":"BLOCK","start":15699,"end":15782,"inode":{"change":20,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":194},"to":{"change":20,"start":11504,"end":11587},"introduced_by":20}],"inode":{"change":20,"pos":111631}},"ins_contents":[{"Add":" .channel_has_state(txn.states(&*channel.read()?), &m)?"}],"del_contents":[{"Del":" .channel_has_state(txn.states(&channel.borrow()), &m)?\n"}]}},{"Replacement":{"inode":{"change":20,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":354,"ins":{"up_context":[{"change":20,"pos":7561}],"down_context":[{"change":20,"pos":7644}],"flag":"BLOCK","start":15783,"end":15866,"inode":{"change":20,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":7561},"to":{"change":20,"start":429,"end":512},"introduced_by":20}],"inode":{"change":20,"pos":111631}},"ins_contents":[{"Add":" .get_changeset(txn.changes(&*channel.read()?), h_int)?"}],"del_contents":[{"Del":" .get_changeset(txn.changes(&channel.borrow()), h_int)?\n"}]}},{"Replacement":{"inode":{"change":20,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":380,"ins":{"up_context":[{"change":20,"pos":9828}],"down_context":[{"change":20,"pos":0}],"flag":"BLOCK","start":15867,"end":16142,"inode":{"change":20,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":9828},"to":{"change":20,"start":9828,"end":9899},"introduced_by":20}],"inode":{"change":20,"pos":111631}},"ins_contents":[{"Add":" let txn = Arc::new(RwLock::new(txn));"},{"Add":" let hash = super::pending(txn.clone(), &mut channel, &mut repo)?;"},{"Add":" let mut txn = if let Ok(txn) = Arc::try_unwrap(txn) {"},{"Add":" txn.into_inner().unwrap()"},{"Add":" } else {"},{"Add":" unreachable!()"},{"Add":" };"}],"del_contents":[{"Del":" let hash = super::pending(&mut txn, &mut channel, &mut repo)?;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":451,"ins":{"up_context":[{"change":20,"pos":1432}],"down_context":[{"change":20,"pos":1479}],"flag":"BLOCK","start":16143,"end":16191,"inode":{"change":20,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1432},"to":{"change":20,"start":1432,"end":1479},"introduced_by":20}],"inode":{"change":20,"pos":111631}},"ins_contents":[{"Add":" touched.insert(*inode);"}],"del_contents":[{"Del":" touched.insert(inode);\n"}]}},{"Edit":{"inode":{"change":20,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":456,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":1543}],"down_context":[{"change":20,"pos":847}],"flag":"BLOCK","start":16192,"end":16238,"inode":{"change":20,"pos":111631}}},"contents":[{"Add":" let txn = Arc::new(RwLock::new(txn));"}]}},{"Replacement":{"inode":{"change":20,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":460,"ins":{"up_context":[{"change":20,"pos":974}],"down_context":[{"change":20,"pos":1129}],"flag":"BLOCK","start":16239,"end":16493,"inode":{"change":20,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":974},"to":{"change":20,"start":974,"end":1129},"introduced_by":20}],"inode":{"change":20,"pos":111631}},"ins_contents":[{"Add":" if let Some((path, _)) = libpijul::fs::find_path("},{"Add":" &repo.changes,"},{"Add":" &*txn.read().unwrap(),"},{"Add":" &*channel.read()?,"},{"Add":" false,"},{"Add":" i,"},{"Add":" )? {"}],"del_contents":[{"Del":" if let Some((path, _)) =\n libpijul::fs::find_path(&repo.changes, &txn, &channel.borrow(), false, *i)?\n {\n"}]}},{"Edit":{"inode":{"change":20,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":482,"atom":{"NewVertex":{"up_context":[{"change":16,"pos":5040}],"down_context":[{"change":20,"pos":1366}],"flag":"BLOCK","start":16494,"end":16538,"inode":{"change":20,"pos":111631}}},"contents":[{"Add":" let mut conflicts = Vec::new();"}]}},{"Replacement":{"inode":{"change":20,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":488,"ins":{"up_context":[{"change":20,"pos":1570}],"down_context":[{"change":20,"pos":1831}],"flag":"BLOCK","start":16539,"end":17016,"inode":{"change":20,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1570},"to":{"change":20,"start":1570,"end":1831},"introduced_by":20}],"inode":{"change":20,"pos":111631}},"ins_contents":[{"Add":" conflicts.extend("},{"Add":" libpijul::output::output_repository_no_pending("},{"Add":" repo.working_copy.clone(),"},{"Add":" &repo.changes,"},{"Add":" txn.clone(),"},{"Add":" channel.clone(),"},{"Add":" path,"},{"Add":" true,"},{"Add":" None,"},{"Add":" num_cpus::get(),"},{"Add":" )?"},{"Add":" .into_iter(),"},{"Add":" );"}],"del_contents":[{"Del":" txn.output_repository_no_pending(\n &mut repo.working_copy,\n &repo.changes,\n &mut channel,\n path,\n true,\n None,\n )?;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":504,"ins":{"up_context":[{"change":20,"pos":1902}],"down_context":[{"change":20,"pos":665}],"flag":"BLOCK","start":17017,"end":17492,"inode":{"change":20,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1902},"to":{"change":20,"start":1902,"end":2161},"introduced_by":20}],"inode":{"change":20,"pos":111631}},"ins_contents":[{"Add":" conflicts.extend("},{"Add":" libpijul::output::output_repository_no_pending("},{"Add":" repo.working_copy.clone(),"},{"Add":" &repo.changes,"},{"Add":" txn.clone(),"},{"Add":" channel.clone(),"},{"Add":" \"\","},{"Add":" true,"},{"Add":" None,"},{"Add":" num_cpus::get(),"},{"Add":" )?"},{"Add":" .into_iter(),"},{"Add":" );"}],"del_contents":[{"Del":" txn.output_repository_no_pending(\n &mut repo.working_copy,\n &repo.changes,\n &mut channel,\n \"\",\n true,\n None,\n )?;\n"}]}},{"Edit":{"inode":{"change":20,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":520,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":11136}],"down_context":[{"change":20,"pos":120956}],"flag":"BLOCK","start":17493,"end":17648,"inode":{"change":20,"pos":111631}}},"contents":[{"Add":" let mut txn = if let Ok(txn) = Arc::try_unwrap(txn) {"},{"Add":" txn.into_inner().unwrap()"},{"Add":" } else {"},{"Add":" unreachable!()"},{"Add":" };"}]}},{"Edit":{"inode":{"change":20,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":5,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":1913}],"down_context":[{"change":20,"pos":1913}],"flag":"BLOCK","start":17649,"end":17679,"inode":{"change":20,"pos":123281}}},"contents":[{"Add":"use std::sync::{Arc, RwLock};"}]}},{"Replacement":{"inode":{"change":20,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":73,"ins":{"up_context":[{"change":20,"pos":125737}],"down_context":[{"change":20,"pos":15402}],"flag":"BLOCK","start":17680,"end":17744,"inode":{"change":20,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":125737},"to":{"change":20,"start":15338,"end":15402},"introduced_by":20}],"inode":{"change":20,"pos":123281}},"ins_contents":[{"Add":" for x in txn.log(&*channel.read()?, pos)? {"}],"del_contents":[{"Del":" for x in txn.log(&channel.borrow(), pos)? {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":88,"ins":{"up_context":[{"change":20,"pos":126196}],"down_context":[{"change":20,"pos":15540}],"flag":"BLOCK","start":17745,"end":17836,"inode":{"change":20,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":126196},"to":{"change":20,"start":15449,"end":15540},"introduced_by":20}],"inode":{"change":20,"pos":123281}},"ins_contents":[{"Add":" } else if let Some(x) = txn.reverse_log(&*channel.read()?, None)?.next() {"}],"del_contents":[{"Del":" } else if let Some(x) = txn.reverse_log(&channel.borrow(), None)?.next() {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":112,"ins":{"up_context":[{"change":20,"pos":15745}],"down_context":[{"change":20,"pos":15845}],"flag":"BLOCK","start":17837,"end":17936,"inode":{"change":20,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":15745},"to":{"change":20,"start":15745,"end":15845},"introduced_by":20}],"inode":{"change":20,"pos":123281}},"ins_contents":[{"Add":" libpijul::fs::iter_graph_descendants(&txn, &channel.read()?.graph, p)?"}],"del_contents":[{"Del":" libpijul::fs::iter_graph_descendants(&txn, &channel.borrow().graph, p)?\n"}]}},{"Replacement":{"inode":{"change":20,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":121,"ins":{"up_context":[{"change":20,"pos":11929}],"down_context":[{"change":20,"pos":16097}],"flag":"BLOCK","start":17937,"end":17998,"inode":{"change":20,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":11929},"to":{"change":20,"start":16036,"end":16097},"introduced_by":20}],"inode":{"change":20,"pos":123281}},"ins_contents":[{"Add":" for x in txn.log(&*channel.read()?, from)? {"}],"del_contents":[{"Del":" for x in txn.log(&channel.borrow(), from)? {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":201,"ins":{"up_context":[{"change":20,"pos":131779}],"down_context":[{"change":20,"pos":131876}],"flag":"BLOCK","start":17999,"end":18091,"inode":{"change":20,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":131779},"to":{"change":20,"start":16677,"end":16769},"introduced_by":20}],"inode":{"change":20,"pos":123281}},"ins_contents":[{"Add":" if txn.current_state(&*channel.read()?)? == state && extra.is_empty() {"}],"del_contents":[{"Del":" if txn.current_state(&channel.borrow())? == state && extra.is_empty() {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":236,"ins":{"up_context":[{"change":20,"pos":133262}],"down_context":[{"change":20,"pos":133390}],"flag":"BLOCK","start":18092,"end":18279,"inode":{"change":20,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":133262},"to":{"change":20,"start":133262,"end":133390},"introduced_by":20}],"inode":{"change":20,"pos":123281}},"ins_contents":[{"Add":" let txn = Arc::new(RwLock::new(txn));"},{"Add":" for (_, channel) in applied {"},{"Add":" libpijul::output::output_repository_no_pending("},{"Add":" repo.working_copy.clone(),"}],"del_contents":[{"Del":" for (_, mut channel) in applied {\n txn.output_repository_no_pending(\n &mut repo.working_copy,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":241,"ins":{"up_context":[{"change":20,"pos":133421}],"down_context":[{"change":20,"pos":133451}],"flag":"BLOCK","start":18280,"end":18342,"inode":{"change":20,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":133421},"to":{"change":20,"start":133421,"end":133451},"introduced_by":20}],"inode":{"change":20,"pos":123281}},"ins_contents":[{"Add":" txn.clone(),"},{"Add":" channel.clone(),"}],"del_contents":[{"Del":" &mut channel,\n"}]}},{"Edit":{"inode":{"change":20,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":246,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":490}],"down_context":[{"change":20,"pos":133493}],"flag":"BLOCK","start":18343,"end":18376,"inode":{"change":20,"pos":123281}}},"contents":[{"Add":" num_cpus::get(),"}]}},{"Edit":{"inode":{"change":20,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":250,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":133549}],"down_context":[{"change":20,"pos":133549}],"flag":"BLOCK","start":18377,"end":18548,"inode":{"change":20,"pos":123281}}},"contents":[{"Add":" let txn = if let Ok(txn) = Arc::try_unwrap(txn) {"},{"Add":" txn.into_inner().unwrap()"},{"Add":" } else {"},{"Add":" unreachable!()"},{"Add":" };"}]}},{"Replacement":{"inode":{"change":20,"pos":133619},"path":"pijul/src/commands/mod.rs","line":57,"ins":{"up_context":[{"change":20,"pos":91}],"down_context":[{"change":20,"pos":134278}],"flag":"BLOCK","start":18549,"end":18577,"inode":{"change":20,"pos":133619}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":91},"to":{"change":20,"start":134253,"end":134278},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":134253},"to":{"change":20,"start":134253,"end":134278},"introduced_by":20}],"inode":{"change":20,"pos":133619}},"ins_contents":[{"Add":"// #[cfg(debug_assertions)]"}],"del_contents":[{"Del":"#[cfg(debug_assertions)]\n"}]}},{"Replacement":{"inode":{"change":20,"pos":133619},"path":"pijul/src/commands/mod.rs","line":59,"ins":{"up_context":[{"change":20,"pos":134289}],"down_context":[{"change":20,"pos":134314}],"flag":"BLOCK","start":18578,"end":18606,"inode":{"change":20,"pos":133619}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":134289},"to":{"change":20,"start":134289,"end":134314},"introduced_by":20}],"inode":{"change":20,"pos":133619}},"ins_contents":[{"Add":"// #[cfg(debug_assertions)]"}],"del_contents":[{"Del":"#[cfg(debug_assertions)]\n"}]}},{"Replacement":{"inode":{"change":20,"pos":133619},"path":"pijul/src/commands/mod.rs","line":64,"ins":{"up_context":[{"change":20,"pos":1687}],"down_context":[{"change":20,"pos":1801}],"flag":"BLOCK","start":18607,"end":18771,"inode":{"change":20,"pos":133619}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1687},"to":{"change":20,"start":1687,"end":1801},"introduced_by":20}],"inode":{"change":20,"pos":133619}},"ins_contents":[{"Add":"fn pending("},{"Add":" txn: std::sync::Arc>,"},{"Add":" channel: &libpijul::ChannelRef,"}],"del_contents":[{"Del":"fn pending(\n txn: &mut T,\n channel: &mut libpijul::ChannelRef,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":133619},"path":"pijul/src/commands/mod.rs","line":70,"ins":{"up_context":[{"change":20,"pos":1944}],"down_context":[{"change":20,"pos":1979}],"flag":"BLOCK","start":18772,"end":18870,"inode":{"change":20,"pos":133619}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1944},"to":{"change":20,"start":1944,"end":1979},"introduced_by":20}],"inode":{"change":20,"pos":133619}},"ins_contents":[{"Add":""},{"Add":" let mut builder = libpijul::record::Builder::new();"},{"Add":" builder.record("},{"Add":" txn.clone(),"}],"del_contents":[{"Del":" let recorded = txn.record_all(\n"}]}},{"Replacement":{"inode":{"change":20,"pos":133619},"path":"pijul/src/commands/mod.rs","line":75,"ins":{"up_context":[{"change":20,"pos":2019}],"down_context":[{"change":20,"pos":2068}],"flag":"BLOCK","start":18871,"end":18931,"inode":{"change":20,"pos":133619}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":2019},"to":{"change":20,"start":2019,"end":2068},"introduced_by":20}],"inode":{"change":20,"pos":133619}},"ins_contents":[{"Add":" channel.clone(),"},{"Add":" repo.working_copy.clone(),"}],"del_contents":[{"Del":" channel,\n &mut repo.working_copy,\n"}]}},{"Edit":{"inode":{"change":20,"pos":133619},"path":"pijul/src/commands/mod.rs","line":79,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":2103}],"down_context":[{"change":20,"pos":2103}],"flag":"BLOCK","start":18932,"end":18957,"inode":{"change":20,"pos":133619}}},"contents":[{"Add":" num_cpus::get(),"}]}},{"Edit":{"inode":{"change":20,"pos":133619},"path":"pijul/src/commands/mod.rs","line":81,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":2111}],"down_context":[{"change":20,"pos":2111}],"flag":"BLOCK","start":18958,"end":18995,"inode":{"change":20,"pos":133619}}},"contents":[{"Add":" let recorded = builder.finish();"}]}},{"Edit":{"inode":{"change":20,"pos":133619},"path":"pijul/src/commands/mod.rs","line":85,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":2179}],"down_context":[{"change":20,"pos":2179}],"flag":"BLOCK","start":18996,"end":19036,"inode":{"change":20,"pos":133619}}},"contents":[{"Add":" let mut txn = txn.write().unwrap();"}]}},{"Replacement":{"inode":{"change":20,"pos":133619},"path":"pijul/src/commands/mod.rs","line":89,"ins":{"up_context":[{"change":20,"pos":2244}],"down_context":[{"change":20,"pos":2283}],"flag":"BLOCK","start":19037,"end":19087,"inode":{"change":20,"pos":133619}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":2244},"to":{"change":20,"start":16770,"end":16818},"introduced_by":20}],"inode":{"change":20,"pos":133619}},"ins_contents":[{"Add":" .map(|rec| rec.globalize(&*txn).unwrap())"}],"del_contents":[{"Del":" .map(|rec| rec.globalize(txn).unwrap())\n"}]}},{"Edit":{"inode":{"change":20,"pos":133619},"path":"pijul/src/commands/mod.rs","line":91,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":2303}],"down_context":[{"change":20,"pos":2303}],"flag":"BLOCK","start":19088,"end":19245,"inode":{"change":20,"pos":133619}}},"contents":[{"Add":" let contents = if let Ok(c) = std::sync::Arc::try_unwrap(recorded.contents) {"},{"Add":" c.into_inner().unwrap()"},{"Add":" } else {"},{"Add":" unreachable!()"},{"Add":" };"}]}},{"Replacement":{"inode":{"change":20,"pos":133619},"path":"pijul/src/commands/mod.rs","line":97,"ins":{"up_context":[{"change":20,"pos":2371}],"down_context":[{"change":20,"pos":2384}],"flag":"BLOCK","start":19246,"end":19261,"inode":{"change":20,"pos":133619}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":2371},"to":{"change":20,"start":2371,"end":2384},"introduced_by":20}],"inode":{"change":20,"pos":133619}},"ins_contents":[{"Add":" &*txn,"}],"del_contents":[{"Del":" txn,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":133619},"path":"pijul/src/commands/mod.rs","line":100,"ins":{"up_context":[{"change":20,"pos":2418}],"down_context":[{"change":20,"pos":2445}],"flag":"BLOCK","start":19262,"end":19280,"inode":{"change":20,"pos":133619}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":2418},"to":{"change":20,"start":2418,"end":2445},"introduced_by":20}],"inode":{"change":20,"pos":133619}},"ins_contents":[{"Add":" contents,"}],"del_contents":[{"Del":" recorded.contents,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":133619},"path":"pijul/src/commands/mod.rs","line":105,"ins":{"up_context":[{"change":20,"pos":2561}],"down_context":[{"change":20,"pos":2646}],"flag":"BLOCK","start":19281,"end":19379,"inode":{"change":20,"pos":133619}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":2561},"to":{"change":20,"start":16828,"end":16924},"introduced_by":20}],"inode":{"change":20,"pos":133619}},"ins_contents":[{"Add":" libpijul::change::dependencies(&*txn, &*channel.read()?, pending_change.changes.iter())?;"}],"del_contents":[{"Del":" libpijul::change::dependencies(txn, &channel.borrow(), pending_change.changes.iter())?;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":134376},"path":"pijul/src/commands/log.rs","line":44,"ins":{"up_context":[{"change":20,"pos":135542}],"down_context":[{"change":20,"pos":12912}],"flag":"BLOCK","start":19380,"end":19445,"inode":{"change":20,"pos":134376}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":135542},"to":{"change":20,"start":17082,"end":17147},"introduced_by":20}],"inode":{"change":20,"pos":134376}},"ins_contents":[{"Add":" for h in txn.reverse_log(&*channel.read()?, None)? {"}],"del_contents":[{"Del":" for h in txn.reverse_log(&channel.borrow(), None)? {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":134376},"path":"pijul/src/commands/log.rs","line":50,"ins":{"up_context":[{"change":20,"pos":135743}],"down_context":[{"change":20,"pos":17247}],"flag":"BLOCK","start":19446,"end":19511,"inode":{"change":20,"pos":134376}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":135743},"to":{"change":20,"start":17182,"end":17247},"introduced_by":20}],"inode":{"change":20,"pos":134376}},"ins_contents":[{"Add":" for h in txn.reverse_log(&*channel.read()?, None)? {"}],"del_contents":[{"Del":" for h in txn.reverse_log(&channel.borrow(), None)? {\n"}]}},{"Edit":{"inode":{"change":20,"pos":169058},"path":"pijul/src/commands/file_operations.rs","line":3,"atom":{"NewVertex":{"up_context":[{"change":19,"pos":32}],"down_context":[{"change":20,"pos":2404}],"flag":"BLOCK","start":19512,"end":19542,"inode":{"change":20,"pos":169058}}},"contents":[{"Add":"use std::sync::{Arc, RwLock};"}]}},{"Replacement":{"inode":{"change":20,"pos":169058},"path":"pijul/src/commands/file_operations.rs","line":124,"ins":{"up_context":[{"change":20,"pos":13499}],"down_context":[{"change":20,"pos":192}],"flag":"BLOCK","start":19543,"end":19593,"inode":{"change":20,"pos":169058}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":13499},"to":{"change":20,"start":677,"end":731},"introduced_by":20}],"inode":{"change":20,"pos":169058}},"ins_contents":[{"Add":" let txn = repo.pristine.mut_txn_begin()?;"}],"del_contents":[{"Del":" let mut txn = repo.pristine.mut_txn_begin()?;\n"}]}},{"Edit":{"inode":{"change":20,"pos":169058},"path":"pijul/src/commands/file_operations.rs","line":128,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":44}],"down_context":[{"change":20,"pos":171551}],"flag":"BLOCK","start":19594,"end":19640,"inode":{"change":20,"pos":169058}}},"contents":[{"Add":" let txn = Arc::new(RwLock::new(txn));"}]}},{"Replacement":{"inode":{"change":20,"pos":169058},"path":"pijul/src/commands/file_operations.rs","line":148,"ins":{"up_context":[{"change":20,"pos":861}],"down_context":[{"change":20,"pos":895}],"flag":"BLOCK","start":19641,"end":19678,"inode":{"change":20,"pos":169058}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":861},"to":{"change":20,"start":861,"end":895},"introduced_by":20}],"inode":{"change":20,"pos":169058}},"ins_contents":[{"Add":" txn.clone(),"}],"del_contents":[{"Del":" &mut txn,\n"}]}},{"Edit":{"inode":{"change":20,"pos":169058},"path":"pijul/src/commands/file_operations.rs","line":156,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":172105}],"down_context":[{"change":20,"pos":562}],"flag":"BLOCK","start":19679,"end":19731,"inode":{"change":20,"pos":169058}}},"contents":[{"Add":" let mut txn = txn.write().unwrap();"}]}},{"Replacement":{"inode":{"change":20,"pos":169058},"path":"pijul/src/commands/file_operations.rs","line":170,"ins":{"up_context":[{"change":20,"pos":172416}],"down_context":[{"change":20,"pos":172439}],"flag":"BLOCK","start":19732,"end":19883,"inode":{"change":20,"pos":169058}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":172416},"to":{"change":20,"start":172416,"end":172439},"introduced_by":20}],"inode":{"change":20,"pos":169058}},"ins_contents":[{"Add":" if let Ok(txn) = Arc::try_unwrap(txn) {"},{"Add":" txn.into_inner().unwrap().commit()?;"},{"Add":" } else {"},{"Add":" unreachable!()"},{"Add":" }"}],"del_contents":[{"Del":" txn.commit()?;\n"}]}},{"Edit":{"inode":{"change":20,"pos":173551},"path":"pijul/src/commands/diff.rs","line":4,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":173738}],"down_context":[{"change":20,"pos":2553}],"flag":"BLOCK","start":19884,"end":19914,"inode":{"change":20,"pos":173551}}},"contents":[{"Add":"use std::sync::{Arc, RwLock};"}]}},{"Replacement":{"inode":{"change":20,"pos":173551},"path":"pijul/src/commands/diff.rs","line":9,"ins":{"up_context":[{"change":20,"pos":2595}],"down_context":[{"change":20,"pos":2654}],"flag":"BLOCK","start":19915,"end":19938,"inode":{"change":20,"pos":173551}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":2595},"to":{"change":20,"start":4174,"end":4211},"introduced_by":20}],"inode":{"change":20,"pos":173551}},"ins_contents":[{"Add":"use libpijul::MutTxnT;"}],"del_contents":[{"Del":"use libpijul::{MutTxnT, MutTxnTExt};\n"}]}},{"Replacement":{"inode":{"change":20,"pos":173551},"path":"pijul/src/commands/diff.rs","line":37,"ins":{"up_context":[{"change":20,"pos":15461}],"down_context":[{"change":20,"pos":787}],"flag":"BLOCK","start":19939,"end":20012,"inode":{"change":20,"pos":173551}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":15461},"to":{"change":20,"start":15461,"end":15538},"introduced_by":20}],"inode":{"change":20,"pos":173551}},"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"}]}},{"Replacement":{"inode":{"change":20,"pos":173551},"path":"pijul/src/commands/diff.rs","line":40,"ins":{"up_context":[{"change":20,"pos":174275}],"down_context":[{"change":20,"pos":2348}],"flag":"BLOCK","start":20013,"end":20035,"inode":{"change":20,"pos":173551}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":174275},"to":{"change":20,"start":174275,"end":174301},"introduced_by":20}],"inode":{"change":20,"pos":173551}},"ins_contents":[{"Add":" let channel ="}],"del_contents":[{"Del":" let mut channel =\n"}]}},{"Edit":{"inode":{"change":20,"pos":173551},"path":"pijul/src/commands/diff.rs","line":44,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":174455}],"down_context":[{"change":20,"pos":174455}],"flag":"BLOCK","start":20036,"end":20082,"inode":{"change":20,"pos":173551}}},"contents":[{"Add":" let txn = Arc::new(RwLock::new(txn));"}]}},{"Replacement":{"inode":{"change":20,"pos":173551},"path":"pijul/src/commands/diff.rs","line":46,"ins":{"up_context":[{"change":20,"pos":174493}],"down_context":[{"change":20,"pos":174545}],"flag":"BLOCK","start":20083,"end":20138,"inode":{"change":20,"pos":173551}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":174493},"to":{"change":20,"start":174493,"end":174545},"introduced_by":20}],"inode":{"change":20,"pos":173551}},"ins_contents":[{"Add":" state.record("},{"Add":" txn.clone(),"}],"del_contents":[{"Del":" txn.record(\n &mut state,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":173551},"path":"pijul/src/commands/diff.rs","line":49,"ins":{"up_context":[{"change":20,"pos":174593}],"down_context":[{"change":20,"pos":174663}],"flag":"BLOCK","start":20139,"end":20215,"inode":{"change":20,"pos":173551}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":174593},"to":{"change":20,"start":174593,"end":174663},"introduced_by":20}],"inode":{"change":20,"pos":173551}},"ins_contents":[{"Add":" channel.clone(),"},{"Add":" repo.working_copy.clone(),"}],"del_contents":[{"Del":" &mut channel,\n &mut repo.working_copy,\n"}]}},{"Edit":{"inode":{"change":20,"pos":173551},"path":"pijul/src/commands/diff.rs","line":53,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":174714}],"down_context":[{"change":20,"pos":174714}],"flag":"BLOCK","start":20216,"end":20249,"inode":{"change":20,"pos":173551}}},"contents":[{"Add":" num_cpus::get(),"}]}},{"Replacement":{"inode":{"change":20,"pos":173551},"path":"pijul/src/commands/diff.rs","line":58,"ins":{"up_context":[{"change":20,"pos":174837}],"down_context":[{"change":20,"pos":174893}],"flag":"BLOCK","start":20250,"end":20312,"inode":{"change":20,"pos":173551}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":174837},"to":{"change":20,"start":174837,"end":174893},"introduced_by":20}],"inode":{"change":20,"pos":173551}},"ins_contents":[{"Add":" txn.clone(),"},{"Add":" channel.clone(),"}],"del_contents":[{"Del":" &mut txn,\n &mut channel,\n"}]}},{"Edit":{"inode":{"change":20,"pos":173551},"path":"pijul/src/commands/diff.rs","line":71,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":175145}],"down_context":[{"change":20,"pos":175145}],"flag":"BLOCK","start":20313,"end":20353,"inode":{"change":20,"pos":173551}}},"contents":[{"Add":" let txn = txn.write().unwrap();"}]}},{"Replacement":{"inode":{"change":20,"pos":173551},"path":"pijul/src/commands/diff.rs","line":75,"ins":{"up_context":[{"change":20,"pos":175217}],"down_context":[{"change":20,"pos":175261}],"flag":"BLOCK","start":20354,"end":20408,"inode":{"change":20,"pos":173551}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":175217},"to":{"change":20,"start":17520,"end":17573},"introduced_by":20}],"inode":{"change":20,"pos":173551}},"ins_contents":[{"Add":" .map(|rec| rec.globalize(&*txn).unwrap())"}],"del_contents":[{"Del":" .map(|rec| rec.globalize(&txn).unwrap())\n"}]}},{"Edit":{"inode":{"change":20,"pos":173551},"path":"pijul/src/commands/diff.rs","line":77,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":175285}],"down_context":[{"change":20,"pos":175285}],"flag":"BLOCK","start":20409,"end":20587,"inode":{"change":20,"pos":173551}}},"contents":[{"Add":" let contents = if let Ok(cont) = std::sync::Arc::try_unwrap(rec.contents) {"},{"Add":" cont.into_inner().unwrap()"},{"Add":" } else {"},{"Add":" unreachable!()"},{"Add":" };"}]}},{"Replacement":{"inode":{"change":20,"pos":173551},"path":"pijul/src/commands/diff.rs","line":83,"ins":{"up_context":[{"change":20,"pos":175336}],"down_context":[{"change":20,"pos":175354}],"flag":"BLOCK","start":20588,"end":20607,"inode":{"change":20,"pos":173551}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":175336},"to":{"change":20,"start":175336,"end":175354},"introduced_by":20}],"inode":{"change":20,"pos":173551}},"ins_contents":[{"Add":" &*txn,"}],"del_contents":[{"Del":" &txn,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":173551},"path":"pijul/src/commands/diff.rs","line":86,"ins":{"up_context":[{"change":20,"pos":175397}],"down_context":[{"change":20,"pos":175423}],"flag":"BLOCK","start":20608,"end":20630,"inode":{"change":20,"pos":173551}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":175397},"to":{"change":20,"start":175397,"end":175423},"introduced_by":20}],"inode":{"change":20,"pos":173551}},"ins_contents":[{"Add":" contents,"}],"del_contents":[{"Del":" rec.contents,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":173551},"path":"pijul/src/commands/diff.rs","line":92,"ins":{"up_context":[{"change":20,"pos":175552}],"down_context":[{"change":20,"pos":175598}],"flag":"BLOCK","start":20631,"end":20679,"inode":{"change":20,"pos":173551}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":175552},"to":{"change":20,"start":17587,"end":17634},"introduced_by":20}],"inode":{"change":20,"pos":173551}},"ins_contents":[{"Add":" full_dependencies(&*txn, &channel)?"}],"del_contents":[{"Del":" full_dependencies(&txn, &channel)?\n"}]}},{"Replacement":{"inode":{"change":20,"pos":173551},"path":"pijul/src/commands/diff.rs","line":94,"ins":{"up_context":[{"change":20,"pos":175615}],"down_context":[{"change":20,"pos":175679}],"flag":"BLOCK","start":20680,"end":20755,"inode":{"change":20,"pos":173551}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":175615},"to":{"change":20,"start":17635,"end":17709},"introduced_by":20}],"inode":{"change":20,"pos":173551}},"ins_contents":[{"Add":" dependencies(&*txn, &*channel.read()?, change.changes.iter())?"}],"del_contents":[{"Del":" dependencies(&txn, &channel.borrow(), change.changes.iter())?\n"}]}},{"Replacement":{"inode":{"change":20,"pos":173551},"path":"pijul/src/commands/diff.rs","line":163,"ins":{"up_context":[{"change":20,"pos":177037}],"down_context":[{"change":20,"pos":177063}],"flag":"BLOCK","start":20756,"end":20788,"inode":{"change":20,"pos":173551}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":177037},"to":{"change":20,"start":177037,"end":177063},"introduced_by":20}],"inode":{"change":20,"pos":173551}},"ins_contents":[{"Add":" match change.write("}],"del_contents":[{"Del":" change.write(\n"}]}},{"Replacement":{"inode":{"change":20,"pos":173551},"path":"pijul/src/commands/diff.rs","line":174,"ins":{"up_context":[{"change":20,"pos":466}],"down_context":[{"change":20,"pos":177338}],"flag":"BLOCK","start":20789,"end":21027,"inode":{"change":20,"pos":173551}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":466},"to":{"change":20,"start":177323,"end":177338},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":177323},"to":{"change":20,"start":177323,"end":177338},"introduced_by":20}],"inode":{"change":20,"pos":173551}},"ins_contents":[{"Add":" ) {"},{"Add":" Ok(()) => {}"},{"Add":" Err(libpijul::change::TextSerError::Io(e))"},{"Add":" if e.kind() == std::io::ErrorKind::BrokenPipe => {}"},{"Add":" Err(e) => return Err(e.into()),"},{"Add":" }"}],"del_contents":[{"Del":" )?\n"}]}},{"Edit":{"inode":{"change":20,"pos":177758},"path":"pijul/src/commands/debug.rs","line":14,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":178003}],"down_context":[{"change":20,"pos":21}],"flag":"BLOCK","start":21028,"end":21091,"inode":{"change":20,"pos":177758}}},"contents":[{"Add":" #[clap(long = \"sanakirja-only\")]"},{"Add":" sanakirja_only: bool,"}]}},{"Edit":{"inode":{"change":20,"pos":177758},"path":"pijul/src/commands/debug.rs","line":23,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":178176},"to":{"change":20,"start":5663,"end":5711},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":5711},"to":{"change":20,"start":63,"end":114},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":114},"to":{"change":20,"start":5711,"end":5818},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":5711},"to":{"change":20,"start":5711,"end":5818},"introduced_by":20}],"inode":{"change":20,"pos":177758}}},"contents":[{"Del":" libpijul::pristine::debug_inodes(&txn);\n"},{"Del":" libpijul::pristine::debug_revinodes(&txn);\n"},{"Del":" libpijul::pristine::debug_tree_print(&txn);\n libpijul::pristine::debug_revtree_print(&txn);\n"}]}},{"Replacement":{"inode":{"change":20,"pos":177758},"path":"pijul/src/commands/debug.rs","line":29,"ins":{"up_context":[{"change":20,"pos":178559}],"down_context":[{"change":20,"pos":177}],"flag":"BLOCK","start":21092,"end":22035,"inode":{"change":20,"pos":177758}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":178559},"to":{"change":20,"start":32,"end":264},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":264},"to":{"change":20,"start":17868,"end":17909},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":17909},"to":{"change":20,"start":299,"end":425},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":299},"to":{"change":20,"start":299,"end":425},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":425},"to":{"change":20,"start":58,"end":102},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":58},"to":{"change":20,"start":58,"end":102},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":102},"to":{"change":20,"start":17910,"end":17991},"introduced_by":20}],"inode":{"change":20,"pos":177758}},"ins_contents":[{"Add":" if !self.sanakirja_only {"},{"Add":" libpijul::pristine::debug_inodes(&txn);"},{"Add":" libpijul::pristine::debug_revinodes(&txn);"},{"Add":" libpijul::pristine::debug_tree_print(&txn);"},{"Add":" libpijul::pristine::debug_revtree_print(&txn);"},{"Add":" if let Some(root) = self.root {"},{"Add":" let (pos, _) = txn"},{"Add":" .follow_oldest_path(&repo.changes, &channel, &root)"},{"Add":" .unwrap();"},{"Add":" libpijul::pristine::debug_root("},{"Add":" &txn,"},{"Add":" &channel.read()?.graph,"},{"Add":" pos.inode_vertex(),"},{"Add":" std::io::stdout(),"},{"Add":" true,"},{"Add":" )?;"},{"Add":" } else {"},{"Add":" let channel = channel.read()?;"},{"Add":" libpijul::pristine::debug(&txn, &channel.graph, std::io::stdout())?;"},{"Add":" }"},{"Add":" libpijul::pristine::check_alive_debug(&repo.changes, &txn, &*channel.read()?, 0)?;"}],"del_contents":[{"Del":" if let Some(root) = self.root {\n let (pos, _) = txn\n .follow_oldest_path(&repo.changes, &channel, &root)\n .unwrap();\n libpijul::pristine::debug_root(\n &txn,\n"},{"Del":" &channel.borrow().graph,\n"},{"Del":" pos.inode_vertex(),\n std::io::stdout(),\n true,\n )?;\n } else {\n"},{"Del":" let channel = channel.borrow();\n"},{"Del":" libpijul::pristine::debug(&txn, &channel.graph, std::io::stdout())?;\n"}]}},{"Edit":{"inode":{"change":20,"pos":177758},"path":"pijul/src/commands/debug.rs","line":51,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":187},"to":{"change":20,"start":17992,"end":18083},"introduced_by":20}],"inode":{"change":20,"pos":177758}}},"contents":[{"Del":" libpijul::pristine::check_alive_debug(&repo.changes, &txn, &channel.borrow(), 0)?;\n"}]}},{"Edit":{"inode":{"change":20,"pos":177758},"path":"pijul/src/commands/debug.rs","line":52,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":50}],"down_context":[{"change":20,"pos":178648}],"flag":"BLOCK","start":22036,"end":22164,"inode":{"change":20,"pos":177758}}},"contents":[{"Add":" let channel = channel.read()?;"},{"Add":" ::sanakirja::debug::debug(&txn.txn, &[&channel.graph], \"debug.sanakirja\", true);"}]}},{"Edit":{"inode":{"change":20,"pos":178684},"path":"pijul/src/commands/credit.rs","line":52,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":180243},"to":{"change":20,"start":180243,"end":180284},"introduced_by":20}],"inode":{"change":20,"pos":178684}}},"contents":[{"Del":" let channel_ = channel.borrow();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":178684},"path":"pijul/src/commands/credit.rs","line":53,"ins":{"up_context":[{"change":20,"pos":237}],"down_context":[{"change":20,"pos":180309}],"flag":"BLOCK","start":22165,"end":22251,"inode":{"change":20,"pos":178684}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":178},"to":{"change":20,"start":180284,"end":180309},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":237},"to":{"change":20,"start":180284,"end":180309},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":180284},"to":{"change":20,"start":180284,"end":180309},"introduced_by":20}],"inode":{"change":20,"pos":178684}},"ins_contents":[{"Add":" let channel = channel.read().unwrap();"},{"Add":" libpijul::output::output_file("}],"del_contents":[{"Del":" txn.output_file(\n"}]}},{"Edit":{"inode":{"change":20,"pos":178684},"path":"pijul/src/commands/credit.rs","line":56,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":180336}],"down_context":[{"change":20,"pos":180336}],"flag":"BLOCK","start":22252,"end":22270,"inode":{"change":20,"pos":178684}}},"contents":[{"Add":" &txn,"}]}},{"Replacement":{"inode":{"change":20,"pos":178684},"path":"pijul/src/commands/credit.rs","line":59,"ins":{"up_context":[{"change":20,"pos":180375}],"down_context":[{"change":20,"pos":180443}],"flag":"BLOCK","start":22271,"end":22338,"inode":{"change":20,"pos":178684}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":180375},"to":{"change":20,"start":180375,"end":180443},"introduced_by":20}],"inode":{"change":20,"pos":178684}},"ins_contents":[{"Add":" &mut Creditor::new(std::io::stdout(), &txn, &channel),"}],"del_contents":[{"Del":" &mut Creditor::new(std::io::stdout(), &txn, &channel_),\n"}]}},{"Replacement":{"inode":{"change":20,"pos":182891},"path":"pijul/src/commands/clone.rs","line":6,"ins":{"up_context":[{"change":20,"pos":2941}],"down_context":[{"change":20,"pos":2942}],"flag":"BLOCK","start":22339,"end":22362,"inode":{"change":20,"pos":182891}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":2941},"to":{"change":20,"start":6191,"end":6228},"introduced_by":20}],"inode":{"change":20,"pos":182891}},"ins_contents":[{"Add":"use libpijul::MutTxnT;"}],"del_contents":[{"Del":"use libpijul::{MutTxnT, MutTxnTExt};\n"}]}},{"Edit":{"inode":{"change":20,"pos":182891},"path":"pijul/src/commands/clone.rs","line":8,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":2958}],"down_context":[{"change":20,"pos":183024}],"flag":"BLOCK","start":22363,"end":22393,"inode":{"change":20,"pos":182891}}},"contents":[{"Add":"use std::sync::{Arc, RwLock};"}]}},{"Replacement":{"inode":{"change":20,"pos":182891},"path":"pijul/src/commands/clone.rs","line":62,"ins":{"up_context":[{"change":20,"pos":53}],"down_context":[{"change":20,"pos":35}],"flag":"BLOCK","start":22394,"end":22438,"inode":{"change":20,"pos":182891}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":53},"to":{"change":20,"start":412,"end":451},"introduced_by":20}],"inode":{"change":20,"pos":182891}},"ins_contents":[{"Add":" let repo_path_ = repo_path.clone();"}],"del_contents":[{"Del":" let repo_path_ = path.clone();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":182891},"path":"pijul/src/commands/clone.rs","line":64,"ins":{"up_context":[{"change":20,"pos":72}],"down_context":[{"change":20,"pos":1705}],"flag":"BLOCK","start":22439,"end":22472,"inode":{"change":20,"pos":182891}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":72},"to":{"change":20,"start":452,"end":516},"introduced_by":20}],"inode":{"change":20,"pos":182891}},"ins_contents":[{"Add":" repo_path_.remove();"}],"del_contents":[{"Del":" std::fs::remove_dir_all(&repo_path_).unwrap_or(());\n"}]}},{"Replacement":{"inode":{"change":20,"pos":182891},"path":"pijul/src/commands/clone.rs","line":88,"ins":{"up_context":[{"change":16,"pos":5072}],"down_context":[{"change":20,"pos":185679}],"flag":"BLOCK","start":22473,"end":22699,"inode":{"change":20,"pos":182891}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":2562},"to":{"change":20,"start":185601,"end":185679},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":16,"pos":5072},"to":{"change":20,"start":185601,"end":185679},"introduced_by":16},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":185601},"to":{"change":20,"start":185601,"end":185679},"introduced_by":20}],"inode":{"change":20,"pos":182891}},"ins_contents":[{"Add":" let config_path = repo.config_path();"},{"Add":" let mut config = repo.config;"},{"Add":""},{"Add":" let txn = Arc::new(RwLock::new(txn));"},{"Add":" libpijul::output::output_repository_no_pending("},{"Add":" repo.working_copy.clone(),"}],"del_contents":[{"Del":" txn.output_repository_no_pending(\n &mut repo.working_copy,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":182891},"path":"pijul/src/commands/clone.rs","line":95,"ins":{"up_context":[{"change":20,"pos":185706}],"down_context":[{"change":20,"pos":185732}],"flag":"BLOCK","start":22700,"end":22746,"inode":{"change":20,"pos":182891}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":185706},"to":{"change":20,"start":185706,"end":185732},"introduced_by":20}],"inode":{"change":20,"pos":182891}},"ins_contents":[{"Add":" txn.clone(),"},{"Add":" channel,"}],"del_contents":[{"Del":" &mut channel,\n"}]}},{"Edit":{"inode":{"change":20,"pos":182891},"path":"pijul/src/commands/clone.rs","line":100,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":509}],"down_context":[{"change":20,"pos":185766}],"flag":"BLOCK","start":22747,"end":22776,"inode":{"change":20,"pos":182891}}},"contents":[{"Add":" num_cpus::get(),"}]}},{"Edit":{"inode":{"change":20,"pos":182891},"path":"pijul/src/commands/clone.rs","line":103,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":534}],"down_context":[{"change":20,"pos":185778}],"flag":"BLOCK","start":22777,"end":22924,"inode":{"change":20,"pos":182891}}},"contents":[{"Add":" let txn = if let Ok(t) = Arc::try_unwrap(txn) {"},{"Add":" t.into_inner().unwrap()"},{"Add":" } else {"},{"Add":" unreachable!()"},{"Add":" };"}]}},{"Replacement":{"inode":{"change":20,"pos":182891},"path":"pijul/src/commands/clone.rs","line":109,"ins":{"up_context":[{"change":20,"pos":185801}],"down_context":[{"change":20,"pos":1742}],"flag":"BLOCK","start":22925,"end":22978,"inode":{"change":20,"pos":182891}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":2590},"to":{"change":20,"start":185801,"end":185859},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":185801},"to":{"change":20,"start":185801,"end":185859},"introduced_by":20}],"inode":{"change":20,"pos":182891}},"ins_contents":[{"Add":" config.current_channel = Some(self.channel);"}],"del_contents":[{"Del":" repo.config.current_channel = Some(self.channel);\n"}]}},{"Replacement":{"inode":{"change":20,"pos":182891},"path":"pijul/src/commands/clone.rs","line":111,"ins":{"up_context":[{"change":20,"pos":1808}],"down_context":[{"change":20,"pos":1881}],"flag":"BLOCK","start":22979,"end":23047,"inode":{"change":20,"pos":182891}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1808},"to":{"change":20,"start":1808,"end":1881},"introduced_by":20}],"inode":{"change":20,"pos":182891}},"ins_contents":[{"Add":" config.default_remote = std::fs::canonicalize(&l.root)?"}],"del_contents":[{"Del":" repo.config.default_remote = std::fs::canonicalize(&l.root)?\n"}]}},{"Replacement":{"inode":{"change":20,"pos":182891},"path":"pijul/src/commands/clone.rs","line":115,"ins":{"up_context":[{"change":20,"pos":1965}],"down_context":[{"change":20,"pos":2025}],"flag":"BLOCK","start":23048,"end":23103,"inode":{"change":20,"pos":182891}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1965},"to":{"change":20,"start":1965,"end":2025},"introduced_by":20}],"inode":{"change":20,"pos":182891}},"ins_contents":[{"Add":" config.default_remote = Some(self.remote);"}],"del_contents":[{"Del":" repo.config.default_remote = Some(self.remote);\n"}]}},{"Replacement":{"inode":{"change":20,"pos":182891},"path":"pijul/src/commands/clone.rs","line":117,"ins":{"up_context":[{"change":20,"pos":2035}],"down_context":[{"change":20,"pos":277}],"flag":"BLOCK","start":23104,"end":23140,"inode":{"change":20,"pos":182891}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":56},"to":{"change":20,"start":185859,"end":185888},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":2035},"to":{"change":20,"start":185859,"end":185888},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":185859},"to":{"change":20,"start":185859,"end":185888},"introduced_by":20}],"inode":{"change":20,"pos":182891}},"ins_contents":[{"Add":" config.save(&config_path)?;"}],"del_contents":[{"Del":" repo.save_config()?;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":186892},"path":"pijul/src/commands/channel.rs","line":43,"ins":{"up_context":[{"change":20,"pos":18744}],"down_context":[{"change":20,"pos":187943}],"flag":"BLOCK","start":23141,"end":23293,"inode":{"change":20,"pos":186892}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":18744},"to":{"change":20,"start":18744,"end":18788},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":18788},"to":{"change":20,"start":187844,"end":187896},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":187844},"to":{"change":20,"start":187844,"end":187896},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":187896},"to":{"change":20,"start":513,"end":564},"introduced_by":20}],"inode":{"change":20,"pos":186892}},"ins_contents":[{"Add":" let (_, channel) = channel?;"},{"Add":" let channel = channel.read()?;"},{"Add":" let name = txn.name(&*channel);"}],"del_contents":[{"Del":" let channel = channel?;\n"},{"Del":" let channel = channel.borrow();\n"},{"Del":" let name = txn.name(&channel);\n"}]}},{"Replacement":{"inode":{"change":20,"pos":189306},"path":"pijul/src/commands/change.rs","line":35,"ins":{"up_context":[{"change":20,"pos":243}],"down_context":[{"change":20,"pos":14140}],"flag":"BLOCK","start":23294,"end":23409,"inode":{"change":20,"pos":189306}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":243},"to":{"change":20,"start":243,"end":287},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":287},"to":{"change":20,"start":19124,"end":19195},"introduced_by":20}],"inode":{"change":20,"pos":189306}},"ins_contents":[{"Add":" let channel = channel.read()?;"},{"Add":" if let Some(h) = txn.reverse_log(&*channel, None)?.next() {"}],"del_contents":[{"Del":" let channel = channel.borrow();\n"},{"Del":" if let Some(h) = txn.reverse_log(&channel, None)?.next() {\n"}]}},{"Edit":{"inode":{"change":20,"pos":194289},"path":"pijul/src/commands/apply.rs","line":1,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":194289},"to":{"change":20,"start":510,"end":552},"introduced_by":20}],"inode":{"change":20,"pos":194289}}},"contents":[{"Del":"use std::collections::{HashMap, HashSet};\n"}]}},{"Edit":{"inode":{"change":20,"pos":194289},"path":"pijul/src/commands/apply.rs","line":2,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":3361}],"down_context":[{"change":20,"pos":3361}],"flag":"BLOCK","start":23410,"end":23440,"inode":{"change":20,"pos":194289}}},"contents":[{"Add":"use std::sync::{Arc, RwLock};"}]}},{"Edit":{"inode":{"change":20,"pos":194289},"path":"pijul/src/commands/apply.rs","line":8,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":617}],"down_context":[{"change":20,"pos":14202}],"flag":"BLOCK","start":23441,"end":23475,"inode":{"change":20,"pos":194289}}},"contents":[{"Add":"use libpijul::{HashMap, HashSet};"}]}},{"Replacement":{"inode":{"change":20,"pos":194289},"path":"pijul/src/commands/apply.rs","line":31,"ins":{"up_context":[{"change":20,"pos":16631}],"down_context":[{"change":20,"pos":1086}],"flag":"BLOCK","start":23476,"end":23541,"inode":{"change":20,"pos":194289}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":16631},"to":{"change":20,"start":16631,"end":16700},"introduced_by":20}],"inode":{"change":20,"pos":194289}},"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":20,"pos":194289},"path":"pijul/src/commands/apply.rs","line":51,"ins":{"up_context":[{"change":20,"pos":195794}],"down_context":[{"change":20,"pos":979}],"flag":"BLOCK","start":23542,"end":23638,"inode":{"change":20,"pos":194289}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":195794},"to":{"change":20,"start":195794,"end":195886},"introduced_by":20}],"inode":{"change":20,"pos":194289}},"ins_contents":[{"Add":" let change = libpijul::change::Change::read(&mut change, &mut HashMap::default())?;"}],"del_contents":[{"Del":" let change = libpijul::change::Change::read(&mut change, &mut HashMap::new())?;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":194289},"path":"pijul/src/commands/apply.rs","line":65,"ins":{"up_context":[{"change":20,"pos":619}],"down_context":[{"change":20,"pos":661}],"flag":"BLOCK","start":23639,"end":23685,"inode":{"change":20,"pos":194289}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":619},"to":{"change":20,"start":619,"end":661},"introduced_by":20}],"inode":{"change":20,"pos":194289}},"ins_contents":[{"Add":" let mut touched = HashSet::default();"}],"del_contents":[{"Del":" let mut touched = HashSet::new();\n"}]}},{"Edit":{"inode":{"change":20,"pos":194289},"path":"pijul/src/commands/apply.rs","line":82,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":1107}],"down_context":[{"change":20,"pos":2923}],"flag":"BLOCK","start":23686,"end":23732,"inode":{"change":20,"pos":194289}}},"contents":[{"Add":" let txn = Arc::new(RwLock::new(txn));"}]}},{"Edit":{"inode":{"change":20,"pos":194289},"path":"pijul/src/commands/apply.rs","line":85,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":3026}],"down_context":[{"change":20,"pos":3026}],"flag":"BLOCK","start":23733,"end":23777,"inode":{"change":20,"pos":194289}}},"contents":[{"Add":" let txn_ = txn.read().unwrap();"}]}},{"Replacement":{"inode":{"change":20,"pos":194289},"path":"pijul/src/commands/apply.rs","line":88,"ins":{"up_context":[{"change":20,"pos":3098}],"down_context":[{"change":20,"pos":3193}],"flag":"BLOCK","start":23778,"end":23875,"inode":{"change":20,"pos":194289}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":3098},"to":{"change":20,"start":3098,"end":3193},"introduced_by":20}],"inode":{"change":20,"pos":194289}},"ins_contents":[{"Add":" libpijul::fs::find_path(&repo.changes, &*txn_, &*channel.read()?, false, i)?"}],"del_contents":[{"Del":" libpijul::fs::find_path(&repo.changes, &txn, &channel.borrow(), false, i)?\n"}]}},{"Edit":{"inode":{"change":20,"pos":194289},"path":"pijul/src/commands/apply.rs","line":96,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":3383}],"down_context":[{"change":16,"pos":5105}],"flag":"BLOCK","start":23876,"end":23910,"inode":{"change":20,"pos":194289}}},"contents":[{"Add":" std::mem::drop(txn_);"}]}},{"Replacement":{"inode":{"change":20,"pos":194289},"path":"pijul/src/commands/apply.rs","line":105,"ins":{"up_context":[{"change":20,"pos":3430}],"down_context":[{"change":20,"pos":3524}],"flag":"BLOCK","start":23911,"end":24022,"inode":{"change":20,"pos":194289}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":3430},"to":{"change":20,"start":3430,"end":3524},"introduced_by":20}],"inode":{"change":20,"pos":194289}},"ins_contents":[{"Add":" libpijul::output::output_repository_no_pending("},{"Add":" repo.working_copy.clone(),"}],"del_contents":[{"Del":" txn.output_repository_no_pending(\n &mut repo.working_copy,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":194289},"path":"pijul/src/commands/apply.rs","line":108,"ins":{"up_context":[{"change":20,"pos":3559}],"down_context":[{"change":20,"pos":3593}],"flag":"BLOCK","start":24023,"end":24093,"inode":{"change":20,"pos":194289}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":3559},"to":{"change":20,"start":3559,"end":3593},"introduced_by":20}],"inode":{"change":20,"pos":194289}},"ins_contents":[{"Add":" txn.clone(),"},{"Add":" channel.clone(),"}],"del_contents":[{"Del":" &mut channel,\n"}]}},{"Edit":{"inode":{"change":20,"pos":194289},"path":"pijul/src/commands/apply.rs","line":113,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":3672}],"down_context":[{"change":20,"pos":3672}],"flag":"BLOCK","start":24094,"end":24131,"inode":{"change":20,"pos":194289}}},"contents":[{"Add":" num_cpus::get(),"}]}},{"Replacement":{"inode":{"change":20,"pos":194289},"path":"pijul/src/commands/apply.rs","line":117,"ins":{"up_context":[{"change":20,"pos":3749}],"down_context":[{"change":20,"pos":3843}],"flag":"BLOCK","start":24132,"end":24243,"inode":{"change":20,"pos":194289}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":3749},"to":{"change":20,"start":3749,"end":3843},"introduced_by":20}],"inode":{"change":20,"pos":194289}},"ins_contents":[{"Add":" libpijul::output::output_repository_no_pending("},{"Add":" repo.working_copy.clone(),"}],"del_contents":[{"Del":" txn.output_repository_no_pending(\n &mut repo.working_copy,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":194289},"path":"pijul/src/commands/apply.rs","line":120,"ins":{"up_context":[{"change":20,"pos":3878}],"down_context":[{"change":20,"pos":3912}],"flag":"BLOCK","start":24244,"end":24314,"inode":{"change":20,"pos":194289}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":3878},"to":{"change":20,"start":3878,"end":3912},"introduced_by":20}],"inode":{"change":20,"pos":194289}},"ins_contents":[{"Add":" txn.clone(),"},{"Add":" channel.clone(),"}],"del_contents":[{"Del":" &mut channel,\n"}]}},{"Edit":{"inode":{"change":20,"pos":194289},"path":"pijul/src/commands/apply.rs","line":125,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":3988}],"down_context":[{"change":20,"pos":3988}],"flag":"BLOCK","start":24315,"end":24352,"inode":{"change":20,"pos":194289}}},"contents":[{"Add":" num_cpus::get(),"}]}},{"Edit":{"inode":{"change":20,"pos":194289},"path":"pijul/src/commands/apply.rs","line":130,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":1652}],"down_context":[{"change":20,"pos":196314}],"flag":"BLOCK","start":24353,"end":24504,"inode":{"change":20,"pos":194289}}},"contents":[{"Add":" let txn = if let Ok(txn) = Arc::try_unwrap(txn) {"},{"Add":" txn.into_inner().unwrap()"},{"Add":" } else {"},{"Add":" unreachable!()"},{"Add":" };"}]}},{"Replacement":{"inode":{"change":20,"pos":196374},"path":"pijul/Cargo.toml","line":64,"ins":{"up_context":[{"change":10,"pos":151}],"down_context":[{"change":20,"pos":1656}],"flag":"BLOCK","start":24505,"end":24529,"inode":{"change":20,"pos":196374}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":10,"pos":151},"to":{"change":20,"start":565,"end":589},"introduced_by":10},{"previous":"","flag":"DELETED","from":{"change":20,"pos":222},"to":{"change":20,"start":565,"end":589},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1634},"to":{"change":20,"start":565,"end":589},"introduced_by":20}],"inode":{"change":20,"pos":196374}},"ins_contents":[{"Add":"thrussh-keys = \"0.20.3\""}],"del_contents":[{"Del":"thrussh-keys = \"0.20.1\"\n"}]}},{"Replacement":{"inode":{"change":20,"pos":196374},"path":"pijul/Cargo.toml","line":68,"ins":{"up_context":[{"change":20,"pos":197874}],"down_context":[{"change":20,"pos":197895}],"flag":"BLOCK","start":24530,"end":24588,"inode":{"change":20,"pos":196374}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":197874},"to":{"change":18,"start":700,"end":758},"introduced_by":18}],"inode":{"change":20,"pos":196374}},"ins_contents":[{"Add":"sanakirja = { version = \"1.2.0\", features = [ \"crc32\" ] }"}],"del_contents":[{"Del":"sanakirja = { version = \"1.1.7\", features = [ \"crc32\" ] }\n"}]}},{"Edit":{"inode":{"change":20,"pos":198172},"path":"libpijul/src/working_copy/mod.rs","line":11,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1193},"to":{"change":20,"start":1193,"end":1367},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":1367},"to":{"change":20,"start":198424,"end":198425},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":198424},"to":{"change":20,"start":198424,"end":198425},"introduced_by":20}],"inode":{"change":20,"pos":198172}}},"contents":[{"Del":"#[derive(Debug, Error)]\npub enum WriteError {\n #[error(transparent)]\n E(E),\n #[error(transparent)]\n Io(#[from] std::io::Error),\n}\n"},{"Del":"\n"}]}},{"Replacement":{"inode":{"change":20,"pos":198172},"path":"libpijul/src/working_copy/mod.rs","line":12,"ins":{"up_context":[{"change":20,"pos":198449}],"down_context":[{"change":20,"pos":1476}],"flag":"BLOCK","start":24589,"end":24700,"inode":{"change":20,"pos":198172}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":198449},"to":{"change":20,"start":1368,"end":1476},"introduced_by":20}],"inode":{"change":20,"pos":198172}},"ins_contents":[{"Add":" type Error: std::error::Error + Send;"},{"Add":" fn create_dir_all(&self, path: &str) -> Result<(), Self::Error>;"}],"del_contents":[{"Del":" type Error: std::error::Error;\n fn create_dir_all(&mut self, path: &str) -> Result<(), Self::Error>;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":198172},"path":"libpijul/src/working_copy/mod.rs","line":17,"ins":{"up_context":[{"change":20,"pos":1728}],"down_context":[{"change":20,"pos":199207}],"flag":"BLOCK","start":24701,"end":25038,"inode":{"change":20,"pos":198172}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1728},"to":{"change":20,"start":1728,"end":2064},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":2064},"to":{"change":20,"start":199114,"end":199172},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":199114},"to":{"change":20,"start":199114,"end":199172},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":199172},"to":{"change":20,"start":2065,"end":2100},"introduced_by":20}],"inode":{"change":20,"pos":198172}},"ins_contents":[{"Add":" fn remove_path(&self, name: &str) -> Result<(), Self::Error>;"},{"Add":" fn rename(&self, former: &str, new: &str) -> Result<(), Self::Error>;"},{"Add":" fn set_permissions(&self, name: &str, permissions: u16) -> Result<(), Self::Error>;"},{"Add":""},{"Add":" type Writer: std::io::Write;"},{"Add":" fn write_file(&self, file: &str) -> Result;"}],"del_contents":[{"Del":" fn remove_path(&mut self, name: &str) -> Result<(), Self::Error>;\n fn rename(&mut self, former: &str, new: &str) -> Result<(), Self::Error>;\n fn set_permissions(&mut self, name: &str, permissions: u16) -> Result<(), Self::Error>;\n fn write_file Result>(\n"},{"Del":" &mut self,\n file: &str,\n writer: F,\n"},{"Del":" ) -> Result>;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":3,"ins":{"up_context":[{"change":20,"pos":199328}],"down_context":[{"change":20,"pos":199359}],"flag":"BLOCK","start":25039,"end":25088,"inode":{"change":20,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":199328},"to":{"change":20,"start":199328,"end":199359},"introduced_by":20}],"inode":{"change":20,"pos":199222}},"ins_contents":[{"Add":"use crate::HashMap;"},{"Add":"use std::sync::{Arc, Mutex};"}],"del_contents":[{"Del":"use std::collections::HashMap;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":8,"ins":{"up_context":[{"change":20,"pos":199404}],"down_context":[{"change":20,"pos":199484}],"flag":"BLOCK","start":25089,"end":25211,"inode":{"change":20,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":199404},"to":{"change":20,"start":199404,"end":199484},"introduced_by":20}],"inode":{"change":20,"pos":199222}},"ins_contents":[{"Add":"pub struct Memory(Mutex);"},{"Add":""},{"Add":"#[derive(Debug)]"},{"Add":"struct Memory_ {"},{"Add":" files: FileTree,"},{"Add":" last_modified: SystemTime,"}],"del_contents":[{"Del":"pub struct Memory {\n pub files: FileTree,\n pub last_modified: SystemTime,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":17,"ins":{"up_context":[{"change":20,"pos":26}],"down_context":[{"change":20,"pos":199526}],"flag":"BLOCK","start":25212,"end":25230,"inode":{"change":20,"pos":199222}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":26},"to":{"change":20,"start":199504,"end":199526},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":199504},"to":{"change":20,"start":199504,"end":199526},"introduced_by":20}],"inode":{"change":20,"pos":199222}},"ins_contents":[{"Add":"struct FileTree {"}],"del_contents":[{"Del":"pub struct FileTree {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":25,"ins":{"up_context":[{"change":20,"pos":199671}],"down_context":[{"change":20,"pos":199698}],"flag":"BLOCK","start":25231,"end":25270,"inode":{"change":20,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":199671},"to":{"change":20,"start":199671,"end":199698},"introduced_by":20}],"inode":{"change":20,"pos":199222}},"ins_contents":[{"Add":" contents: Arc>>,"}],"del_contents":[{"Del":" contents: Vec,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":36,"ins":{"up_context":[{"change":20,"pos":80}],"down_context":[{"change":20,"pos":95}],"flag":"BLOCK","start":25271,"end":25307,"inode":{"change":20,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":80},"to":{"change":20,"start":80,"end":95},"introduced_by":20}],"inode":{"change":20,"pos":199222}},"ins_contents":[{"Add":" Memory(Mutex::new(Memory_ {"}],"del_contents":[{"Del":" Self {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":39,"ins":{"up_context":[{"change":20,"pos":200014}],"down_context":[{"change":20,"pos":200024}],"flag":"BLOCK","start":25308,"end":25320,"inode":{"change":20,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":200014},"to":{"change":20,"start":200014,"end":200024},"introduced_by":20}],"inode":{"change":20,"pos":199222}},"ins_contents":[{"Add":" }))"}],"del_contents":[{"Del":" }\n"}]}},{"Edit":{"inode":{"change":20,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":48,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":200077}],"down_context":[{"change":20,"pos":200077}],"flag":"BLOCK","start":25321,"end":25361,"inode":{"change":20,"pos":199222}}},"contents":[{"Add":" let m = self.0.lock().unwrap();"}]}},{"Replacement":{"inode":{"change":20,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":50,"ins":{"up_context":[{"change":20,"pos":200114}],"down_context":[{"change":20,"pos":200182}],"flag":"BLOCK","start":25362,"end":25427,"inode":{"change":20,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":200114},"to":{"change":20,"start":200114,"end":200182},"introduced_by":20}],"inode":{"change":20,"pos":199222}},"ins_contents":[{"Add":" let mut current_files = vec![(String::new(), &m.files)];"}],"del_contents":[{"Del":" let mut current_files = vec![(String::new(), &self.files)];\n"}]}},{"Replacement":{"inode":{"change":20,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":85,"ins":{"up_context":[{"change":20,"pos":201388}],"down_context":[{"change":20,"pos":201429}],"flag":"BLOCK","start":25428,"end":25491,"inode":{"change":20,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":201388},"to":{"change":20,"start":201388,"end":201429},"introduced_by":20}],"inode":{"change":20,"pos":199222}},"ins_contents":[{"Add":" contents: Arc::new(Mutex::new(file_contents)),"}],"del_contents":[{"Del":" contents: file_contents,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":99,"ins":{"up_context":[{"change":20,"pos":201780}],"down_context":[{"change":20,"pos":201826}],"flag":"BLOCK","start":25492,"end":25542,"inode":{"change":20,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":201780},"to":{"change":20,"start":201780,"end":201826},"introduced_by":20}],"inode":{"change":20,"pos":199222}},"ins_contents":[{"Add":" children: HashMap::default(),"}],"del_contents":[{"Del":" children: HashMap::new(),\n"}]}},{"Replacement":{"inode":{"change":20,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":105,"ins":{"up_context":[{"change":20,"pos":201877}],"down_context":[{"change":20,"pos":201978}],"flag":"BLOCK","start":25543,"end":25639,"inode":{"change":20,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":201877},"to":{"change":20,"start":201877,"end":201978},"introduced_by":20}],"inode":{"change":20,"pos":199222}},"ins_contents":[{"Add":" fn add_inode(&self, file: &str, inode: Inode) {"},{"Add":" let mut m = self.0.lock().unwrap();"}],"del_contents":[{"Del":" fn add_inode(&mut self, file: &str, inode: Inode) {\n let mut file_tree = &mut self.files;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":108,"ins":{"up_context":[{"change":20,"pos":202016}],"down_context":[{"change":20,"pos":202051}],"flag":"BLOCK","start":25640,"end":25714,"inode":{"change":20,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":202016},"to":{"change":20,"start":202016,"end":202051},"introduced_by":20}],"inode":{"change":20,"pos":199222}},"ins_contents":[{"Add":" m.last_modified = last;"},{"Add":" let mut file_tree = &mut m.files;"}],"del_contents":[{"Del":" self.last_modified = last;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":120,"ins":{"up_context":[{"change":20,"pos":202493}],"down_context":[{"change":20,"pos":202547}],"flag":"BLOCK","start":25715,"end":25773,"inode":{"change":20,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":202493},"to":{"change":20,"start":202493,"end":202547},"introduced_by":20}],"inode":{"change":20,"pos":199222}},"ins_contents":[{"Add":" children: HashMap::default(),"}],"del_contents":[{"Del":" children: HashMap::new(),\n"}]}},{"Edit":{"inode":{"change":20,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":136,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":203014}],"down_context":[{"change":20,"pos":203014}],"flag":"BLOCK","start":25774,"end":25776,"inode":{"change":20,"pos":199222}}},"contents":[{"Add":"}"}]}},{"Edit":{"inode":{"change":20,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":138,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":203015}],"down_context":[{"change":20,"pos":203015}],"flag":"BLOCK","start":25777,"end":25792,"inode":{"change":20,"pos":199222}}},"contents":[{"Add":"impl Memory_ {"}]}},{"Edit":{"inode":{"change":20,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":183,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":204591}],"down_context":[{"change":20,"pos":204591}],"flag":"BLOCK","start":25793,"end":25841,"inode":{"change":20,"pos":199222}}},"contents":[{"Add":" self.last_modified = SystemTime::now();"}]}},{"Edit":{"inode":{"change":20,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":187,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":204738},"to":{"change":20,"start":204738,"end":204786},"introduced_by":20}],"inode":{"change":20,"pos":199222}}},"contents":[{"Del":" self.last_modified = SystemTime::now();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":217,"ins":{"up_context":[{"change":20,"pos":2240}],"down_context":[{"change":20,"pos":205553}],"flag":"BLOCK","start":25842,"end":25992,"inode":{"change":20,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":2240},"to":{"change":20,"start":2240,"end":2314},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":2314},"to":{"change":20,"start":205510,"end":205553},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":205510},"to":{"change":20,"start":205510,"end":205553},"introduced_by":20}],"inode":{"change":20,"pos":199222}},"ins_contents":[{"Add":" fn create_dir_all(&self, file: &str) -> Result<(), Self::Error> {"},{"Add":" let m = self.0.lock().unwrap();"},{"Add":" if m.get_file(file).is_none() {"}],"del_contents":[{"Del":" fn create_dir_all(&mut self, file: &str) -> Result<(), Self::Error> {\n"},{"Del":" if self.get_file(file).is_none() {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":226,"ins":{"up_context":[{"change":20,"pos":205780}],"down_context":[{"change":20,"pos":205830}],"flag":"BLOCK","start":25993,"end":26047,"inode":{"change":20,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":205780},"to":{"change":20,"start":205780,"end":205830},"introduced_by":20}],"inode":{"change":20,"pos":199222}},"ins_contents":[{"Add":" children: HashMap::default(),"}],"del_contents":[{"Del":" children: HashMap::new(),\n"}]}},{"Replacement":{"inode":{"change":20,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":235,"ins":{"up_context":[{"change":20,"pos":2395}],"down_context":[{"change":20,"pos":206077}],"flag":"BLOCK","start":26048,"end":26121,"inode":{"change":20,"pos":199222}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":2395},"to":{"change":20,"start":206041,"end":206077},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":206041},"to":{"change":20,"start":206041,"end":206077},"introduced_by":20}],"inode":{"change":20,"pos":199222}},"ins_contents":[{"Add":" let m = self.0.lock().unwrap();"},{"Add":" match m.get_file(file) {"}],"del_contents":[{"Del":" match self.get_file(file) {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":245,"ins":{"up_context":[{"change":20,"pos":2543}],"down_context":[{"change":20,"pos":206468}],"flag":"BLOCK","start":26122,"end":26195,"inode":{"change":20,"pos":199222}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":2543},"to":{"change":20,"start":206432,"end":206468},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":206432},"to":{"change":20,"start":206432,"end":206468},"introduced_by":20}],"inode":{"change":20,"pos":199222}},"ins_contents":[{"Add":" let m = self.0.lock().unwrap();"},{"Add":" match m.get_file(file) {"}],"del_contents":[{"Del":" match self.get_file(file) {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":249,"ins":{"up_context":[{"change":20,"pos":206603}],"down_context":[{"change":20,"pos":206644}],"flag":"BLOCK","start":26196,"end":26258,"inode":{"change":20,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":206603},"to":{"change":20,"start":206603,"end":206644},"introduced_by":20}],"inode":{"change":20,"pos":199222}},"ins_contents":[{"Add":" buffer.extend(&contents.lock().unwrap()[..]);"}],"del_contents":[{"Del":" buffer.extend(contents);\n"}]}},{"Replacement":{"inode":{"change":20,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":258,"ins":{"up_context":[{"change":20,"pos":2693}],"down_context":[{"change":20,"pos":207000}],"flag":"BLOCK","start":26259,"end":26327,"inode":{"change":20,"pos":199222}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":2693},"to":{"change":20,"start":206969,"end":207000},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":206969},"to":{"change":20,"start":206969,"end":207000},"introduced_by":20}],"inode":{"change":20,"pos":199222}},"ins_contents":[{"Add":" let m = self.0.lock().unwrap();"},{"Add":" Ok(m.last_modified)"}],"del_contents":[{"Del":" Ok(self.last_modified)\n"}]}},{"Replacement":{"inode":{"change":20,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":262,"ins":{"up_context":[{"change":20,"pos":207007}],"down_context":[{"change":20,"pos":207113}],"flag":"BLOCK","start":26328,"end":26446,"inode":{"change":20,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":207007},"to":{"change":20,"start":2694,"end":2765},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":2765},"to":{"change":20,"start":207080,"end":207113},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":207080},"to":{"change":20,"start":207080,"end":207113},"introduced_by":20}],"inode":{"change":20,"pos":199222}},"ins_contents":[{"Add":" fn remove_path(&self, path: &str) -> Result<(), Self::Error> {"},{"Add":" self.0.lock().unwrap().remove_path_(path);"}],"del_contents":[{"Del":" fn remove_path(&mut self, path: &str) -> Result<(), Self::Error> {\n"},{"Del":" self.remove_path_(path);\n"}]}},{"Replacement":{"inode":{"change":20,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":267,"ins":{"up_context":[{"change":20,"pos":207135}],"down_context":[{"change":20,"pos":207213}],"flag":"BLOCK","start":26447,"end":26519,"inode":{"change":20,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":207135},"to":{"change":20,"start":2766,"end":2842},"introduced_by":20}],"inode":{"change":20,"pos":199222}},"ins_contents":[{"Add":" fn rename(&self, old: &str, new: &str) -> Result<(), Self::Error> {"}],"del_contents":[{"Del":" fn rename(&mut self, old: &str, new: &str) -> Result<(), Self::Error> {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":269,"ins":{"up_context":[{"change":20,"pos":207262}],"down_context":[{"change":20,"pos":207316}],"flag":"BLOCK","start":26520,"end":26615,"inode":{"change":20,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":207262},"to":{"change":20,"start":207262,"end":207316},"introduced_by":20}],"inode":{"change":20,"pos":199222}},"ins_contents":[{"Add":" let mut m = self.0.lock().unwrap();"},{"Add":" if let Some(inode) = m.remove_path_(old) {"}],"del_contents":[{"Del":" if let Some(inode) = self.remove_path_(old) {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":275,"ins":{"up_context":[{"change":20,"pos":207386}],"down_context":[{"change":20,"pos":207481}],"flag":"BLOCK","start":26616,"end":26705,"inode":{"change":20,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":207386},"to":{"change":20,"start":2843,"end":2936},"introduced_by":20}],"inode":{"change":20,"pos":199222}},"ins_contents":[{"Add":" fn set_permissions(&self, file: &str, permissions: u16) -> Result<(), Self::Error> {"}],"del_contents":[{"Del":" fn set_permissions(&mut self, file: &str, permissions: u16) -> Result<(), Self::Error> {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":277,"ins":{"up_context":[{"change":20,"pos":207527}],"down_context":[{"change":20,"pos":207567}],"flag":"BLOCK","start":26706,"end":26787,"inode":{"change":20,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":207527},"to":{"change":20,"start":207527,"end":207567},"introduced_by":20}],"inode":{"change":20,"pos":199222}},"ins_contents":[{"Add":" let mut m = self.0.lock().unwrap();"},{"Add":" match m.get_file_mut(file) {"}],"del_contents":[{"Del":" match self.get_file_mut(file) {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":289,"ins":{"up_context":[{"change":20,"pos":207946}],"down_context":[{"change":20,"pos":208166}],"flag":"BLOCK","start":26788,"end":26972,"inode":{"change":20,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":207946},"to":{"change":20,"start":2937,"end":3033},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":3033},"to":{"change":20,"start":208032,"end":208090},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":208032},"to":{"change":20,"start":208032,"end":208090},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":208090},"to":{"change":20,"start":3034,"end":3070},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":3070},"to":{"change":20,"start":208126,"end":208166},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":208126},"to":{"change":20,"start":208126,"end":208166},"introduced_by":20}],"inode":{"change":20,"pos":199222}},"ins_contents":[{"Add":""},{"Add":" type Writer = Writer;"},{"Add":" fn write_file(&self, file: &str) -> Result {"},{"Add":" let mut m = self.0.lock().unwrap();"},{"Add":" match m.get_file_mut(file) {"}],"del_contents":[{"Del":" fn write_file Result>(\n"},{"Del":" &mut self,\n file: &str,\n writer: F,\n"},{"Del":" ) -> Result> {\n"},{"Del":" match self.get_file_mut(file) {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":297,"ins":{"up_context":[{"change":20,"pos":208254}],"down_context":[{"change":20,"pos":208321}],"flag":"BLOCK","start":26973,"end":27111,"inode":{"change":20,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":208254},"to":{"change":20,"start":208254,"end":208288},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":208288},"to":{"change":20,"start":3071,"end":3127},"introduced_by":20}],"inode":{"change":20,"pos":199222}},"ins_contents":[{"Add":" contents.lock().unwrap().clear();"},{"Add":" Ok(Writer {"},{"Add":" w: contents.clone(),"},{"Add":" })"}],"del_contents":[{"Del":" contents.clear();\n"},{"Del":" writer(contents).map_err(WriteError::E)\n"}]}},{"Replacement":{"inode":{"change":20,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":303,"ins":{"up_context":[{"change":20,"pos":208357}],"down_context":[{"change":20,"pos":208404}],"flag":"BLOCK","start":27112,"end":27177,"inode":{"change":20,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":208357},"to":{"change":20,"start":208357,"end":208404},"introduced_by":20}],"inode":{"change":20,"pos":199222}},"ins_contents":[{"Add":" let contents = Arc::new(Mutex::new(Vec::new()));"}],"del_contents":[{"Del":" let mut contents = Vec::new();\n"}]}},{"Edit":{"inode":{"change":20,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":305,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":208459},"to":{"change":20,"start":3128,"end":3199},"introduced_by":20}],"inode":{"change":20,"pos":199222}}},"contents":[{"Del":" let a = writer(&mut contents).map_err(WriteError::E)?;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":309,"ins":{"up_context":[{"change":17,"pos":460}],"down_context":[{"change":20,"pos":208697}],"flag":"BLOCK","start":27178,"end":27230,"inode":{"change":20,"pos":199222}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":17,"pos":460},"to":{"change":20,"start":208663,"end":208697},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":208663},"to":{"change":20,"start":208663,"end":208697},"introduced_by":20}],"inode":{"change":20,"pos":199222}},"ins_contents":[{"Add":" contents: contents.clone(),"}],"del_contents":[{"Del":" contents,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":313,"ins":{"up_context":[{"change":20,"pos":208778}],"down_context":[{"change":20,"pos":208800}],"flag":"BLOCK","start":27231,"end":27274,"inode":{"change":20,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":208778},"to":{"change":20,"start":208778,"end":208800},"introduced_by":20}],"inode":{"change":20,"pos":199222}},"ins_contents":[{"Add":" Ok(Writer { w: contents })"}],"del_contents":[{"Del":" Ok(a)\n"}]}},{"Edit":{"inode":{"change":20,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":319,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":208883}],"down_context":[],"flag":"BLOCK","start":27275,"end":27554,"inode":{"change":20,"pos":199222}}},"contents":[{"Add":""},{"Add":"pub struct Writer {"},{"Add":" w: Arc>>,"},{"Add":"}"},{"Add":""},{"Add":"impl std::io::Write for Writer {"},{"Add":" fn write(&mut self, b: &[u8]) -> Result {"},{"Add":" self.w.lock().unwrap().write(b)"},{"Add":" }"},{"Add":" fn flush(&mut self) -> Result<(), std::io::Error> {"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"}]}},{"Edit":{"inode":{"change":20,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":7,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":209063}],"down_context":[{"change":20,"pos":209063}],"flag":"BLOCK","start":27555,"end":27585,"inode":{"change":20,"pos":208900}}},"contents":[{"Add":"use std::sync::{Arc, RwLock};"}]}},{"Replacement":{"inode":{"change":20,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":97,"ins":{"up_context":[{"change":20,"pos":210105}],"down_context":[{"change":20,"pos":210196}],"flag":"BLOCK","start":27586,"end":27726,"inode":{"change":20,"pos":208900}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":210105},"to":{"change":20,"start":210105,"end":210196},"introduced_by":20}],"inode":{"change":20,"pos":208900}},"ins_contents":[{"Add":" T: crate::MutTxnTExt + crate::TxnTExt + Send + Sync + 'static,"},{"Add":" C: crate::changestore::ChangeStore + Clone + Send + 'static,"}],"del_contents":[{"Del":" T: crate::MutTxnTExt + crate::TxnTExt,\n C: crate::changestore::ChangeStore,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":101,"ins":{"up_context":[{"change":20,"pos":210227}],"down_context":[{"change":20,"pos":210321}],"flag":"BLOCK","start":27727,"end":27830,"inode":{"change":20,"pos":208900}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":210227},"to":{"change":20,"start":210227,"end":210321},"introduced_by":20}],"inode":{"change":20,"pos":208900}},"ins_contents":[{"Add":" self: Arc,"},{"Add":" txn: Arc>,"},{"Add":" channel: crate::pristine::ChannelRef,"}],"del_contents":[{"Del":" &mut self,\n txn: &mut T,\n channel: &mut crate::pristine::ChannelRef,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":109,"ins":{"up_context":[{"change":20,"pos":398}],"down_context":[{"change":20,"pos":210471}],"flag":"BLOCK","start":27831,"end":27932,"inode":{"change":20,"pos":208900}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":398},"to":{"change":20,"start":19577,"end":19631},"introduced_by":20}],"inode":{"change":20,"pos":208900}},"ins_contents":[{"Add":" ) -> Result<(), Error>"},{"Add":" where"},{"Add":" T::Channel: Send + Sync,"},{"Add":" {"}],"del_contents":[{"Del":" ) -> Result<(), Error> {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":114,"ins":{"up_context":[{"change":20,"pos":210511}],"down_context":[{"change":20,"pos":477}],"flag":"BLOCK","start":27933,"end":28035,"inode":{"change":20,"pos":208900}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":210511},"to":{"change":20,"start":399,"end":477},"introduced_by":20}],"inode":{"change":20,"pos":208900}},"ins_contents":[{"Add":" self.clone().record_prefix("},{"Add":" txn.clone(),"},{"Add":" channel.clone(),"}],"del_contents":[{"Del":" self.record_prefix(\n txn,\n channel,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":140,"ins":{"up_context":[{"change":20,"pos":1702}],"down_context":[{"change":20,"pos":1756}],"flag":"BLOCK","start":28036,"end":28065,"inode":{"change":20,"pos":208900}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1702},"to":{"change":20,"start":1702,"end":1723},"introduced_by":20}],"inode":{"change":20,"pos":208900}},"ins_contents":[{"Add":" txn: Arc>,"}],"del_contents":[{"Del":" txn: &mut T,\n"}]}},{"Edit":{"inode":{"change":20,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":207,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":2858}],"down_context":[{"change":20,"pos":2858}],"flag":"BLOCK","start":28066,"end":28110,"inode":{"change":20,"pos":208900}}},"contents":[{"Add":" let mut txn = txn.write().unwrap();"}]}},{"Replacement":{"inode":{"change":20,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":225,"ins":{"up_context":[{"change":20,"pos":210978}],"down_context":[{"change":20,"pos":211069}],"flag":"BLOCK","start":28111,"end":28251,"inode":{"change":20,"pos":208900}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":210978},"to":{"change":20,"start":210978,"end":211069},"introduced_by":20}],"inode":{"change":20,"pos":208900}},"ins_contents":[{"Add":" T: crate::MutTxnTExt + crate::TxnTExt + Send + Sync + 'static,"},{"Add":" C: crate::changestore::ChangeStore + Clone + Send + 'static,"}],"del_contents":[{"Del":" T: crate::MutTxnTExt + crate::TxnTExt,\n C: crate::changestore::ChangeStore,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":228,"ins":{"up_context":[{"change":20,"pos":211076}],"down_context":[{"change":20,"pos":211170}],"flag":"BLOCK","start":28252,"end":28355,"inode":{"change":20,"pos":208900}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":211076},"to":{"change":20,"start":211076,"end":211170},"introduced_by":20}],"inode":{"change":20,"pos":208900}},"ins_contents":[{"Add":" self: Arc,"},{"Add":" txn: Arc>,"},{"Add":" channel: crate::pristine::ChannelRef,"}],"del_contents":[{"Del":" &mut self,\n txn: &mut T,\n channel: &mut crate::pristine::ChannelRef,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":236,"ins":{"up_context":[{"change":20,"pos":3130}],"down_context":[{"change":20,"pos":2643}],"flag":"BLOCK","start":28356,"end":28457,"inode":{"change":20,"pos":208900}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":3130},"to":{"change":20,"start":19765,"end":19819},"introduced_by":20}],"inode":{"change":20,"pos":208900}},"ins_contents":[{"Add":" ) -> Result<(), Error>"},{"Add":" where"},{"Add":" T::Channel: Send + Sync,"},{"Add":" {"}],"del_contents":[{"Del":" ) -> Result<(), Error> {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":241,"ins":{"up_context":[{"change":20,"pos":2726}],"down_context":[{"change":20,"pos":213590}],"flag":"BLOCK","start":28458,"end":28540,"inode":{"change":20,"pos":208900}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":2726},"to":{"change":20,"start":2726,"end":2800},"introduced_by":20}],"inode":{"change":20,"pos":208900}},"ins_contents":[{"Add":" self.add_prefix_rec(txn.clone(), repo_path, full, &prefix, threads)?;"}],"del_contents":[{"Del":" self.add_prefix_rec(txn, repo_path, full, &prefix, threads)?;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":243,"ins":{"up_context":[{"change":20,"pos":213648}],"down_context":[{"change":20,"pos":213695}],"flag":"BLOCK","start":28541,"end":28596,"inode":{"change":20,"pos":208900}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":213648},"to":{"change":20,"start":213648,"end":213695},"introduced_by":20}],"inode":{"change":20,"pos":208900}},"ins_contents":[{"Add":" state.record("},{"Add":" txn.clone(),"}],"del_contents":[{"Del":" txn.record(\n state,\n"}]}},{"Edit":{"inode":{"change":20,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":250,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":213837}],"down_context":[{"change":20,"pos":213837}],"flag":"BLOCK","start":28597,"end":28616,"inode":{"change":20,"pos":208900}}},"contents":[{"Add":" 1,"}]}},{"Replacement":{"inode":{"change":20,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":266,"ins":{"up_context":[{"change":20,"pos":3951}],"down_context":[{"change":20,"pos":159}],"flag":"BLOCK","start":28617,"end":28732,"inode":{"change":20,"pos":208900}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":3951},"to":{"change":20,"start":3951,"end":4025},"introduced_by":20}],"inode":{"change":20,"pos":208900}},"ins_contents":[{"Add":" fn create_dir_all(&self, file: &str) -> Result<(), Self::Error> {"},{"Add":" debug!(\"create_dir_all {:?}\", file);"}],"del_contents":[{"Del":" fn create_dir_all(&mut self, file: &str) -> Result<(), Self::Error> {\n"}]}},{"Edit":{"inode":{"change":20,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":271,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":4106}],"down_context":[{"change":20,"pos":215}],"flag":"BLOCK","start":28733,"end":28772,"inode":{"change":20,"pos":208900}}},"contents":[{"Add":" debug!(\"metadata {:?}\", file);"}]}},{"Edit":{"inode":{"change":20,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":279,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":214542}],"down_context":[{"change":20,"pos":273}],"flag":"BLOCK","start":28773,"end":28813,"inode":{"change":20,"pos":208900}}},"contents":[{"Add":" debug!(\"read_file {:?}\", file);"}]}},{"Edit":{"inode":{"change":20,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":285,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":4283}],"down_context":[{"change":20,"pos":334}],"flag":"BLOCK","start":28814,"end":28858,"inode":{"change":20,"pos":208900}}},"contents":[{"Add":" debug!(\"modified_time {:?}\", file);"}]}},{"Replacement":{"inode":{"change":20,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":290,"ins":{"up_context":[{"change":20,"pos":214848}],"down_context":[{"change":20,"pos":392}],"flag":"BLOCK","start":28859,"end":28968,"inode":{"change":20,"pos":208900}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":214848},"to":{"change":20,"start":4284,"end":4355},"introduced_by":20}],"inode":{"change":20,"pos":208900}},"ins_contents":[{"Add":" fn remove_path(&self, path: &str) -> Result<(), Self::Error> {"},{"Add":" debug!(\"remove_path {:?}\", path);"}],"del_contents":[{"Del":" fn remove_path(&mut self, path: &str) -> Result<(), Self::Error> {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":304,"ins":{"up_context":[{"change":20,"pos":215297}],"down_context":[{"change":20,"pos":429}],"flag":"BLOCK","start":28969,"end":29093,"inode":{"change":20,"pos":208900}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":215297},"to":{"change":20,"start":4356,"end":4435},"introduced_by":20}],"inode":{"change":20,"pos":208900}},"ins_contents":[{"Add":" fn rename(&self, former: &str, new: &str) -> Result<(), Self::Error> {"},{"Add":" debug!(\"rename {:?} {:?}\", former, new);"}],"del_contents":[{"Del":" fn rename(&mut self, former: &str, new: &str) -> Result<(), Self::Error> {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":317,"ins":{"up_context":[{"change":20,"pos":215737}],"down_context":[{"change":20,"pos":215832}],"flag":"BLOCK","start":29094,"end":29183,"inode":{"change":20,"pos":208900}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":215737},"to":{"change":20,"start":4436,"end":4529},"introduced_by":20}],"inode":{"change":20,"pos":208900}},"ins_contents":[{"Add":" fn set_permissions(&self, name: &str, permissions: u16) -> Result<(), Self::Error> {"}],"del_contents":[{"Del":" fn set_permissions(&mut self, name: &str, permissions: u16) -> Result<(), Self::Error> {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":327,"ins":{"up_context":[{"change":20,"pos":216195}],"down_context":[{"change":20,"pos":216241}],"flag":"BLOCK","start":29184,"end":29411,"inode":{"change":20,"pos":208900}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":216195},"to":{"change":20,"start":634,"end":697},"introduced_by":20}],"inode":{"change":20,"pos":208900}},"ins_contents":[{"Add":" if permissions & 0o100 != 0 {"},{"Add":" current.set_mode(current.mode() | 0o100);"},{"Add":" } else {"},{"Add":" current.set_mode(current.mode() & ((!0o777) | 0o666));"},{"Add":" }"},{"Add":" debug!(\"setting {:?}\", current);"}],"del_contents":[{"Del":" current.set_mode(current.mode() | permissions as u32);\n"}]}},{"Edit":{"inode":{"change":20,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":334,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":216291}],"down_context":[{"change":20,"pos":216291}],"flag":"BLOCK","start":29412,"end":29435,"inode":{"change":20,"pos":208900}}},"contents":[{"Add":" debug!(\"set\");"}]}},{"Replacement":{"inode":{"change":20,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":341,"ins":{"up_context":[{"change":20,"pos":216450}],"down_context":[{"change":20,"pos":541}],"flag":"BLOCK","start":29436,"end":29566,"inode":{"change":20,"pos":208900}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":216450},"to":{"change":20,"start":4626,"end":4722},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":4722},"to":{"change":20,"start":216536,"end":216594},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":216536},"to":{"change":20,"start":216536,"end":216594},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":216594},"to":{"change":20,"start":4723,"end":4759},"introduced_by":20}],"inode":{"change":20,"pos":208900}},"ins_contents":[{"Add":""},{"Add":" type Writer = std::io::BufWriter;"},{"Add":" fn write_file(&self, file: &str) -> Result {"}],"del_contents":[{"Del":" fn write_file Result>(\n"},{"Del":" &mut self,\n file: &str,\n writer: F,\n"},{"Del":" ) -> Result> {\n"}]}},{"Edit":{"inode":{"change":20,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":345,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":577}],"down_context":[{"change":20,"pos":216671}],"flag":"BLOCK","start":29567,"end":29604,"inode":{"change":20,"pos":208900}}},"contents":[{"Add":" debug!(\"path = {:?}\", path);"}]}},{"Replacement":{"inode":{"change":20,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":347,"ins":{"up_context":[{"change":20,"pos":216712}],"down_context":[{"change":20,"pos":216752}],"flag":"BLOCK","start":29605,"end":29658,"inode":{"change":20,"pos":208900}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":216712},"to":{"change":20,"start":4760,"end":4824},"introduced_by":20}],"inode":{"change":20,"pos":208900}},"ins_contents":[{"Add":" std::fs::create_dir_all(p).unwrap_or(())"}],"del_contents":[{"Del":" std::fs::create_dir_all(p).map_err(WriteError::Io)?\n"}]}},{"Edit":{"inode":{"change":20,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":349,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":216762}],"down_context":[{"change":20,"pos":216762}],"flag":"BLOCK","start":29659,"end":29702,"inode":{"change":20,"pos":208900}}},"contents":[{"Add":" debug!(\"write_file: dir created\");"}]}},{"Replacement":{"inode":{"change":20,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":351,"ins":{"up_context":[{"change":20,"pos":216813}],"down_context":[{"change":20,"pos":216918}],"flag":"BLOCK","start":29703,"end":29819,"inode":{"change":20,"pos":208900}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":216813},"to":{"change":20,"start":4825,"end":4989},"introduced_by":20}],"inode":{"change":20,"pos":208900}},"ins_contents":[{"Add":" let file = std::io::BufWriter::new(std::fs::File::create(&path)?);"},{"Add":" debug!(\"file\");"},{"Add":" Ok(file)"}],"del_contents":[{"Del":" let mut file =\n std::io::BufWriter::new(std::fs::File::create(&path).map_err(WriteError::Io)?);\n writer(&mut file).map_err(WriteError::E)\n"}]}},{"Replacement":{"inode":{"change":20,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":49,"ins":{"up_context":[{"change":20,"pos":231814}],"down_context":[{"change":20,"pos":231847}],"flag":"BLOCK","start":29820,"end":29849,"inode":{"change":20,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":231814},"to":{"change":20,"start":231814,"end":231847},"introduced_by":20}],"inode":{"change":20,"pos":231493}},"ins_contents":[{"Add":" channel: &ChannelRef,"}],"del_contents":[{"Del":" channel: &mut ChannelRef,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":62,"ins":{"up_context":[{"change":20,"pos":22721}],"down_context":[{"change":20,"pos":232194}],"flag":"BLOCK","start":29850,"end":29898,"inode":{"change":20,"pos":231493}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":22721},"to":{"change":20,"start":232148,"end":232194},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":232148},"to":{"change":20,"start":232148,"end":232194},"introduced_by":20}],"inode":{"change":20,"pos":231493}},"ins_contents":[{"Add":" let mut channel = channel.write().unwrap();"}],"del_contents":[{"Del":" let mut channel = channel.r.borrow_mut();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":120,"ins":{"up_context":[{"change":20,"pos":23536}],"down_context":[{"change":20,"pos":23537}],"flag":"BLOCK","start":29899,"end":29942,"inode":{"change":20,"pos":231493}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":23536},"to":{"change":20,"start":233695,"end":233731},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":233695},"to":{"change":20,"start":233695,"end":233731},"introduced_by":20}],"inode":{"change":20,"pos":231493}},"ins_contents":[{"Add":" let channel = channel.read().unwrap();"}],"del_contents":[{"Del":" let channel = channel.borrow();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":122,"ins":{"up_context":[{"change":20,"pos":23576}],"down_context":[{"change":20,"pos":23698}],"flag":"BLOCK","start":29943,"end":30163,"inode":{"change":20,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":23576},"to":{"change":20,"start":23576,"end":23598},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":23598},"to":{"change":20,"start":233769,"end":233799},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":233769},"to":{"change":20,"start":233769,"end":233799},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":233799},"to":{"change":20,"start":1015,"end":1062},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1062},"to":{"change":20,"start":16603,"end":16677},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":1135},"to":{"change":20,"start":1779,"end":1789},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":16677},"to":{"change":20,"start":1779,"end":1789},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1779},"to":{"change":20,"start":1779,"end":1789},"introduced_by":20}],"inode":{"change":20,"pos":231493}},"ins_contents":[{"Add":" let (name, br) = br?;"},{"Add":" if name.as_str() == txn.name(&channel) {"},{"Add":" continue;"},{"Add":" }"},{"Add":" let br = br.read().unwrap();"},{"Add":" if txn.get_changeset(txn.changes(&br), &change_id)?.is_some() {"}],"del_contents":[{"Del":" let br = br?;\n"},{"Del":" let br = br.borrow();\n"},{"Del":" if txn.name(&br) != txn.name(&channel)\n"},{"Del":" && txn.get_changeset(txn.changes(&br), &change_id)?.is_some()\n"},{"Del":" {\n"}]}},{"Edit":{"inode":{"change":20,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":154,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":24110}],"down_context":[{"change":20,"pos":24110}],"flag":"BLOCK","start":30164,"end":30188,"inode":{"change":20,"pos":231493}}},"contents":[{"Add":" change,"}]}},{"Edit":{"inode":{"change":20,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":363,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":240533}],"down_context":[{"change":20,"pos":240533}],"flag":"BLOCK","start":30189,"end":30210,"inode":{"change":20,"pos":231493}}},"contents":[{"Add":" change: &Change,"}]}},{"Edit":{"inode":{"change":20,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":380,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":241619}],"down_context":[{"change":20,"pos":241619}],"flag":"BLOCK","start":30211,"end":30244,"inode":{"change":20,"pos":231493}}},"contents":[{"Add":" |h| change.knows(h),"}]}},{"Replacement":{"inode":{"change":20,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":16,"ins":{"up_context":[{"change":20,"pos":249265}],"down_context":[{"change":20,"pos":249304}],"flag":"BLOCK","start":30245,"end":30293,"inode":{"change":20,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":249265},"to":{"change":20,"start":249265,"end":249304},"introduced_by":20}],"inode":{"change":20,"pos":248807}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":64,"ins":{"up_context":[{"change":20,"pos":250611}],"down_context":[{"change":20,"pos":250650}],"flag":"BLOCK","start":30294,"end":30342,"inode":{"change":20,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":250611},"to":{"change":20,"start":250611,"end":250650},"introduced_by":20}],"inode":{"change":20,"pos":248807}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":114,"ins":{"up_context":[{"change":20,"pos":251955}],"down_context":[{"change":20,"pos":251994}],"flag":"BLOCK","start":30343,"end":30391,"inode":{"change":20,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":251955},"to":{"change":20,"start":251955,"end":251994},"introduced_by":20}],"inode":{"change":20,"pos":248807}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":188,"ins":{"up_context":[{"change":20,"pos":253870}],"down_context":[{"change":20,"pos":253991}],"flag":"BLOCK","start":30392,"end":30540,"inode":{"change":20,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":253870},"to":{"change":20,"start":253870,"end":253991},"introduced_by":20}],"inode":{"change":20,"pos":248807}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"},{"Add":" let mut txn2 = env2.mut_txn_begin().unwrap();"},{"Add":" let mut txn3 = env3.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n let mut txn2 = env2.mut_txn_begin();\n let mut txn3 = env3.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":291,"ins":{"up_context":[{"change":20,"pos":256536}],"down_context":[{"change":20,"pos":256616}],"flag":"BLOCK","start":30541,"end":30639,"inode":{"change":20,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":256536},"to":{"change":20,"start":256536,"end":256616},"introduced_by":20}],"inode":{"change":20,"pos":248807}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"},{"Add":" let mut txn2 = env2.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n let mut txn2 = env2.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":407,"ins":{"up_context":[{"change":20,"pos":259760}],"down_context":[{"change":20,"pos":259799}],"flag":"BLOCK","start":30640,"end":30688,"inode":{"change":20,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":259760},"to":{"change":20,"start":259760,"end":259799},"introduced_by":20}],"inode":{"change":20,"pos":248807}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":482,"ins":{"up_context":[{"change":20,"pos":261703}],"down_context":[{"change":20,"pos":261742}],"flag":"BLOCK","start":30689,"end":30737,"inode":{"change":20,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":261703},"to":{"change":20,"start":261703,"end":261742},"introduced_by":20}],"inode":{"change":20,"pos":248807}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":558,"ins":{"up_context":[{"change":20,"pos":263990}],"down_context":[{"change":20,"pos":264029}],"flag":"BLOCK","start":30738,"end":30786,"inode":{"change":20,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":263990},"to":{"change":20,"start":263990,"end":264029},"introduced_by":20}],"inode":{"change":20,"pos":248807}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":621,"ins":{"up_context":[{"change":20,"pos":265798}],"down_context":[{"change":20,"pos":265837}],"flag":"BLOCK","start":30787,"end":30835,"inode":{"change":20,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":265798},"to":{"change":20,"start":265798,"end":265837},"introduced_by":20}],"inode":{"change":20,"pos":248807}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":728,"ins":{"up_context":[{"change":20,"pos":268744}],"down_context":[{"change":20,"pos":268783}],"flag":"BLOCK","start":30836,"end":30884,"inode":{"change":20,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":268744},"to":{"change":20,"start":268744,"end":268783},"introduced_by":20}],"inode":{"change":20,"pos":248807}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":818,"ins":{"up_context":[{"change":20,"pos":271253}],"down_context":[{"change":20,"pos":271292}],"flag":"BLOCK","start":30885,"end":30933,"inode":{"change":20,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":271253},"to":{"change":20,"start":271253,"end":271292},"introduced_by":20}],"inode":{"change":20,"pos":248807}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":881,"ins":{"up_context":[{"change":20,"pos":273221}],"down_context":[{"change":20,"pos":273260}],"flag":"BLOCK","start":30934,"end":30982,"inode":{"change":20,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":273221},"to":{"change":20,"start":273221,"end":273260},"introduced_by":20}],"inode":{"change":20,"pos":248807}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":988,"ins":{"up_context":[{"change":20,"pos":781}],"down_context":[{"change":20,"pos":820}],"flag":"BLOCK","start":30983,"end":31031,"inode":{"change":20,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":781},"to":{"change":20,"start":781,"end":820},"introduced_by":20}],"inode":{"change":20,"pos":248807}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":13,"ins":{"up_context":[{"change":20,"pos":361}],"down_context":[{"change":20,"pos":400}],"flag":"BLOCK","start":31032,"end":31080,"inode":{"change":20,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":361},"to":{"change":20,"start":361,"end":400},"introduced_by":20}],"inode":{"change":20,"pos":14}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":98,"ins":{"up_context":[{"change":20,"pos":2876}],"down_context":[{"change":20,"pos":2915}],"flag":"BLOCK","start":31081,"end":31129,"inode":{"change":20,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":2876},"to":{"change":20,"start":2876,"end":2915},"introduced_by":20}],"inode":{"change":20,"pos":14}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":276051},"path":"libpijul/src/tests/rm_file.rs","line":17,"ins":{"up_context":[{"change":20,"pos":276599}],"down_context":[{"change":20,"pos":276650}],"flag":"BLOCK","start":31130,"end":31190,"inode":{"change":20,"pos":276051}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":276599},"to":{"change":20,"start":276599,"end":276650},"introduced_by":20}],"inode":{"change":20,"pos":276051}},"ins_contents":[{"Add":" let mut txn_alice = env_alice.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_alice = env_alice.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":276051},"path":"libpijul/src/tests/rm_file.rs","line":19,"ins":{"up_context":[{"change":20,"pos":276712}],"down_context":[{"change":20,"pos":276759}],"flag":"BLOCK","start":31191,"end":31247,"inode":{"change":20,"pos":276051}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":276712},"to":{"change":20,"start":276712,"end":276759},"introduced_by":20}],"inode":{"change":20,"pos":276051}},"ins_contents":[{"Add":" let mut txn_bob = env_bob.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_bob = env_bob.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":16,"ins":{"up_context":[{"change":20,"pos":278660}],"down_context":[{"change":20,"pos":278699}],"flag":"BLOCK","start":31248,"end":31296,"inode":{"change":20,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":278660},"to":{"change":20,"start":278660,"end":278699},"introduced_by":20}],"inode":{"change":20,"pos":278146}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":81,"ins":{"up_context":[{"change":20,"pos":24391}],"down_context":[{"change":20,"pos":280541}],"flag":"BLOCK","start":31297,"end":31345,"inode":{"change":20,"pos":278146}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":24391},"to":{"change":20,"start":280502,"end":280541},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":280502},"to":{"change":20,"start":280502,"end":280541},"introduced_by":20}],"inode":{"change":20,"pos":278146}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":285224},"path":"libpijul/src/tests/partial.rs","line":18,"ins":{"up_context":[{"change":20,"pos":285788}],"down_context":[{"change":20,"pos":285827}],"flag":"BLOCK","start":31346,"end":31394,"inode":{"change":20,"pos":285224}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":285788},"to":{"change":20,"start":285788,"end":285827},"introduced_by":20}],"inode":{"change":20,"pos":285224}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":285224},"path":"libpijul/src/tests/partial.rs","line":61,"ins":{"up_context":[{"change":20,"pos":287232}],"down_context":[{"change":20,"pos":287271}],"flag":"BLOCK","start":31395,"end":31443,"inode":{"change":20,"pos":285224}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":287232},"to":{"change":20,"start":287232,"end":287271},"introduced_by":20}],"inode":{"change":20,"pos":285224}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":285224},"path":"libpijul/src/tests/partial.rs","line":88,"ins":{"up_context":[{"change":20,"pos":288108}],"down_context":[{"change":20,"pos":288149}],"flag":"BLOCK","start":31444,"end":31494,"inode":{"change":20,"pos":285224}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":288108},"to":{"change":20,"start":288108,"end":288149},"introduced_by":20}],"inode":{"change":20,"pos":285224}},"ins_contents":[{"Add":" let mut txn2 = env2.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn2 = env2.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":285224},"path":"libpijul/src/tests/partial.rs","line":127,"ins":{"up_context":[{"change":20,"pos":289223}],"down_context":[{"change":20,"pos":289264}],"flag":"BLOCK","start":31495,"end":31545,"inode":{"change":20,"pos":285224}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":289223},"to":{"change":20,"start":289223,"end":289264},"introduced_by":20}],"inode":{"change":20,"pos":285224}},"ins_contents":[{"Add":" let mut txn2 = env2.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn2 = env2.mut_txn_begin();\n"}]}},{"Edit":{"inode":{"change":20,"pos":289338},"path":"libpijul/src/tests/mod.rs","line":7,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":289563}],"down_context":[{"change":20,"pos":289563}],"flag":"BLOCK","start":31546,"end":31577,"inode":{"change":20,"pos":289338}}},"contents":[{"Add":""},{"Add":"use std::sync::{Arc, RwLock};"}]}},{"Replacement":{"inode":{"change":20,"pos":289338},"path":"libpijul/src/tests/mod.rs","line":24,"ins":{"up_context":[{"change":20,"pos":1847}],"down_context":[{"change":20,"pos":289813}],"flag":"BLOCK","start":31578,"end":31592,"inode":{"change":20,"pos":289338}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":1847},"to":{"change":20,"start":289795,"end":289813},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":289795},"to":{"change":20,"start":289795,"end":289813},"introduced_by":20}],"inode":{"change":20,"pos":289338}},"ins_contents":[{"Add":" repo: &R,"}],"del_contents":[{"Del":" repo: &mut R,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":289338},"path":"libpijul/src/tests/mod.rs","line":27,"ins":{"up_context":[{"change":20,"pos":289845}],"down_context":[{"change":20,"pos":289878}],"flag":"BLOCK","start":31593,"end":31622,"inode":{"change":20,"pos":289338}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":289845},"to":{"change":20,"start":289845,"end":289878},"introduced_by":20}],"inode":{"change":20,"pos":289338}},"ins_contents":[{"Add":" channel: &ChannelRef,"}],"del_contents":[{"Del":" channel: &mut ChannelRef,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":289338},"path":"libpijul/src/tests/mod.rs","line":37,"ins":{"up_context":[{"change":20,"pos":28285}],"down_context":[{"change":20,"pos":28320}],"flag":"BLOCK","start":31623,"end":31662,"inode":{"change":20,"pos":289338}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":28285},"to":{"change":20,"start":28285,"end":28320},"introduced_by":20}],"inode":{"change":20,"pos":289338}},"ins_contents":[{"Add":" &mut *channel.lock().unwrap(),"}],"del_contents":[{"Del":" &mut channel.borrow_mut(),\n"}]}},{"Replacement":{"inode":{"change":20,"pos":289338},"path":"libpijul/src/tests/mod.rs","line":82,"ins":{"up_context":[{"change":20,"pos":291162}],"down_context":[{"change":20,"pos":291344}],"flag":"BLOCK","start":31663,"end":31917,"inode":{"change":20,"pos":289338}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":291162},"to":{"change":20,"start":1848,"end":1939},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":1939},"to":{"change":20,"start":291259,"end":291344},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":291259},"to":{"change":20,"start":291259,"end":291344},"introduced_by":20}],"inode":{"change":20,"pos":289338}},"ins_contents":[{"Add":"fn record_all_output<"},{"Add":" T: MutTxnT + Send + Sync + 'static,"},{"Add":" R: WorkingCopy + Send + Sync + 'static,"},{"Add":" P: ChangeStore + Clone + Send + Sync + 'static,"},{"Add":">("},{"Add":" repo: Arc,"},{"Add":" changes: Arc

,"},{"Add":" txn: Arc>,"},{"Add":" channel: &ChannelRef,"}],"del_contents":[{"Del":"fn record_all_output(\n"},{"Del":" repo: &mut R,\n changes: &P,\n txn: &mut T,\n channel: &mut ChannelRef,\n"}]}},{"Edit":{"inode":{"change":20,"pos":289338},"path":"libpijul/src/tests/mod.rs","line":95,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":1783}],"down_context":[{"change":20,"pos":1783}],"flag":"BLOCK","start":31918,"end":31957,"inode":{"change":20,"pos":289338}}},"contents":[{"Add":" T::Channel: Send + Sync + 'static,"}]}},{"Replacement":{"inode":{"change":20,"pos":289338},"path":"libpijul/src/tests/mod.rs","line":97,"ins":{"up_context":[{"change":20,"pos":1785}],"down_context":[{"change":20,"pos":291552}],"flag":"BLOCK","start":31958,"end":32227,"inode":{"change":20,"pos":289338}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":1785},"to":{"change":20,"start":291397,"end":291462},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":291397},"to":{"change":20,"start":291397,"end":291462},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":291462},"to":{"change":20,"start":25833,"end":25929},"introduced_by":20}],"inode":{"change":20,"pos":289338}},"ins_contents":[{"Add":" let hash = record_all("},{"Add":" repo.as_ref(),"},{"Add":" changes.as_ref(),"},{"Add":" &mut *txn.write().unwrap(),"},{"Add":" channel,"},{"Add":" prefix,"},{"Add":" )?;"},{"Add":" output::output_repository_no_pending(repo, changes, txn, channel.clone(), \"\", true, None, 1)"},{"Add":" .unwrap();"}],"del_contents":[{"Del":" let hash = record_all(repo, changes, txn, channel, prefix)?;\n"},{"Del":" output::output_repository_no_pending(repo, changes, txn, channel, \"\", true, None).unwrap();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":27,"ins":{"up_context":[{"change":20,"pos":292375}],"down_context":[{"change":20,"pos":292426}],"flag":"BLOCK","start":32228,"end":32288,"inode":{"change":20,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":292375},"to":{"change":20,"start":292375,"end":292426},"introduced_by":20}],"inode":{"change":20,"pos":291589}},"ins_contents":[{"Add":" let mut txn_alice = env_alice.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_alice = env_alice.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":42,"ins":{"up_context":[{"change":20,"pos":292844}],"down_context":[{"change":20,"pos":292891}],"flag":"BLOCK","start":32289,"end":32345,"inode":{"change":20,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":292844},"to":{"change":20,"start":292844,"end":292891},"introduced_by":20}],"inode":{"change":20,"pos":291589}},"ins_contents":[{"Add":" let mut txn_bob = env_bob.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_bob = env_bob.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":220,"ins":{"up_context":[{"change":20,"pos":297328}],"down_context":[{"change":20,"pos":297379}],"flag":"BLOCK","start":32346,"end":32406,"inode":{"change":20,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":297328},"to":{"change":20,"start":297328,"end":297379},"introduced_by":20}],"inode":{"change":20,"pos":291589}},"ins_contents":[{"Add":" let mut txn_alice = env_alice.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_alice = env_alice.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":235,"ins":{"up_context":[{"change":20,"pos":297854}],"down_context":[{"change":20,"pos":297901}],"flag":"BLOCK","start":32407,"end":32463,"inode":{"change":20,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":297854},"to":{"change":20,"start":297854,"end":297901},"introduced_by":20}],"inode":{"change":20,"pos":291589}},"ins_contents":[{"Add":" let mut txn_bob = env_bob.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_bob = env_bob.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":300430},"path":"libpijul/src/tests/filesystem.rs","line":19,"ins":{"up_context":[{"change":20,"pos":26914}],"down_context":[{"change":20,"pos":301027}],"flag":"BLOCK","start":32464,"end":32512,"inode":{"change":20,"pos":300430}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":26914},"to":{"change":20,"start":300988,"end":301027},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":300988},"to":{"change":20,"start":300988,"end":301027},"introduced_by":20}],"inode":{"change":20,"pos":300430}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":300430},"path":"libpijul/src/tests/filesystem.rs","line":64,"ins":{"up_context":[{"change":20,"pos":27160}],"down_context":[{"change":20,"pos":302318}],"flag":"BLOCK","start":32513,"end":32561,"inode":{"change":20,"pos":300430}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":27160},"to":{"change":20,"start":302279,"end":302318},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":302279},"to":{"change":20,"start":302279,"end":302318},"introduced_by":20}],"inode":{"change":20,"pos":300430}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":300430},"path":"libpijul/src/tests/filesystem.rs","line":108,"ins":{"up_context":[{"change":20,"pos":27406}],"down_context":[{"change":20,"pos":303620}],"flag":"BLOCK","start":32562,"end":32610,"inode":{"change":20,"pos":300430}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":27406},"to":{"change":20,"start":303581,"end":303620},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":303581},"to":{"change":20,"start":303581,"end":303620},"introduced_by":20}],"inode":{"change":20,"pos":300430}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":300430},"path":"libpijul/src/tests/filesystem.rs","line":148,"ins":{"up_context":[{"change":20,"pos":27652}],"down_context":[{"change":20,"pos":304713}],"flag":"BLOCK","start":32611,"end":32659,"inode":{"change":20,"pos":300430}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":27652},"to":{"change":20,"start":304674,"end":304713},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":304674},"to":{"change":20,"start":304674,"end":304713},"introduced_by":20}],"inode":{"change":20,"pos":300430}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":28,"ins":{"up_context":[{"change":20,"pos":306276}],"down_context":[{"change":20,"pos":306327}],"flag":"BLOCK","start":32660,"end":32720,"inode":{"change":20,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":306276},"to":{"change":20,"start":306276,"end":306327},"introduced_by":20}],"inode":{"change":20,"pos":305506}},"ins_contents":[{"Add":" let mut txn_alice = env_alice.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_alice = env_alice.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":30,"ins":{"up_context":[{"change":20,"pos":306389}],"down_context":[{"change":20,"pos":306436}],"flag":"BLOCK","start":32721,"end":32777,"inode":{"change":20,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":306389},"to":{"change":20,"start":306389,"end":306436},"introduced_by":20}],"inode":{"change":20,"pos":305506}},"ins_contents":[{"Add":" let mut txn_bob = env_bob.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_bob = env_bob.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":189,"ins":{"up_context":[{"change":20,"pos":310854}],"down_context":[{"change":20,"pos":310905}],"flag":"BLOCK","start":32778,"end":32838,"inode":{"change":20,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":310854},"to":{"change":20,"start":310854,"end":310905},"introduced_by":20}],"inode":{"change":20,"pos":305506}},"ins_contents":[{"Add":" let mut txn_alice = env_alice.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_alice = env_alice.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":191,"ins":{"up_context":[{"change":20,"pos":310967}],"down_context":[{"change":20,"pos":311014}],"flag":"BLOCK","start":32839,"end":32895,"inode":{"change":20,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":310967},"to":{"change":20,"start":310967,"end":311014},"introduced_by":20}],"inode":{"change":20,"pos":305506}},"ins_contents":[{"Add":" let mut txn_bob = env_bob.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_bob = env_bob.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":335,"ins":{"up_context":[{"change":20,"pos":315362}],"down_context":[{"change":20,"pos":315413}],"flag":"BLOCK","start":32896,"end":32956,"inode":{"change":20,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":315362},"to":{"change":20,"start":315362,"end":315413},"introduced_by":20}],"inode":{"change":20,"pos":305506}},"ins_contents":[{"Add":" let mut txn_alice = env_alice.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_alice = env_alice.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":337,"ins":{"up_context":[{"change":20,"pos":315475}],"down_context":[{"change":20,"pos":315522}],"flag":"BLOCK","start":32957,"end":33013,"inode":{"change":20,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":315475},"to":{"change":20,"start":315475,"end":315522},"introduced_by":20}],"inode":{"change":20,"pos":305506}},"ins_contents":[{"Add":" let mut txn_bob = env_bob.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_bob = env_bob.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":392,"ins":{"up_context":[{"change":20,"pos":317279}],"down_context":[{"change":20,"pos":317334}],"flag":"BLOCK","start":33014,"end":33078,"inode":{"change":20,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":317279},"to":{"change":20,"start":317279,"end":317334},"introduced_by":20}],"inode":{"change":20,"pos":305506}},"ins_contents":[{"Add":" let mut txn_charlie = env_charlie.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_charlie = env_charlie.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":522,"ins":{"up_context":[{"change":20,"pos":320575}],"down_context":[{"change":20,"pos":320626}],"flag":"BLOCK","start":33079,"end":33139,"inode":{"change":20,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":320575},"to":{"change":20,"start":320575,"end":320626},"introduced_by":20}],"inode":{"change":20,"pos":305506}},"ins_contents":[{"Add":" let mut txn_alice = env_alice.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_alice = env_alice.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":524,"ins":{"up_context":[{"change":20,"pos":320688}],"down_context":[{"change":20,"pos":320735}],"flag":"BLOCK","start":33140,"end":33196,"inode":{"change":20,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":320688},"to":{"change":20,"start":320688,"end":320735},"introduced_by":20}],"inode":{"change":20,"pos":305506}},"ins_contents":[{"Add":" let mut txn_bob = env_bob.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_bob = env_bob.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":654,"ins":{"up_context":[{"change":20,"pos":324441}],"down_context":[{"change":20,"pos":324492}],"flag":"BLOCK","start":33197,"end":33257,"inode":{"change":20,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":324441},"to":{"change":20,"start":324441,"end":324492},"introduced_by":20}],"inode":{"change":20,"pos":305506}},"ins_contents":[{"Add":" let mut txn_alice = env_alice.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_alice = env_alice.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":656,"ins":{"up_context":[{"change":20,"pos":324554}],"down_context":[{"change":20,"pos":324601}],"flag":"BLOCK","start":33258,"end":33314,"inode":{"change":20,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":324554},"to":{"change":20,"start":324554,"end":324601},"introduced_by":20}],"inode":{"change":20,"pos":305506}},"ins_contents":[{"Add":" let mut txn_bob = env_bob.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_bob = env_bob.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":786,"ins":{"up_context":[{"change":20,"pos":328500}],"down_context":[{"change":20,"pos":328551}],"flag":"BLOCK","start":33315,"end":33375,"inode":{"change":20,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":328500},"to":{"change":20,"start":328500,"end":328551},"introduced_by":20}],"inode":{"change":20,"pos":305506}},"ins_contents":[{"Add":" let mut txn_alice = env_alice.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_alice = env_alice.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":788,"ins":{"up_context":[{"change":20,"pos":328613}],"down_context":[{"change":20,"pos":328660}],"flag":"BLOCK","start":33376,"end":33432,"inode":{"change":20,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":328613},"to":{"change":20,"start":328613,"end":328660},"introduced_by":20}],"inode":{"change":20,"pos":305506}},"ins_contents":[{"Add":" let mut txn_bob = env_bob.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_bob = env_bob.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":920,"ins":{"up_context":[{"change":20,"pos":332645}],"down_context":[{"change":20,"pos":332696}],"flag":"BLOCK","start":33433,"end":33493,"inode":{"change":20,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":332645},"to":{"change":20,"start":332645,"end":332696},"introduced_by":20}],"inode":{"change":20,"pos":305506}},"ins_contents":[{"Add":" let mut txn_alice = env_alice.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_alice = env_alice.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":922,"ins":{"up_context":[{"change":20,"pos":332758}],"down_context":[{"change":20,"pos":332805}],"flag":"BLOCK","start":33494,"end":33550,"inode":{"change":20,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":332758},"to":{"change":20,"start":332758,"end":332805},"introduced_by":20}],"inode":{"change":20,"pos":305506}},"ins_contents":[{"Add":" let mut txn_bob = env_bob.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_bob = env_bob.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":924,"ins":{"up_context":[{"change":20,"pos":332871}],"down_context":[{"change":20,"pos":332926}],"flag":"BLOCK","start":33551,"end":33615,"inode":{"change":20,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":332871},"to":{"change":20,"start":332871,"end":332926},"introduced_by":20}],"inode":{"change":20,"pos":305506}},"ins_contents":[{"Add":" let mut txn_charlie = env_charlie.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_charlie = env_charlie.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1138,"ins":{"up_context":[{"change":20,"pos":339458}],"down_context":[{"change":20,"pos":339509}],"flag":"BLOCK","start":33616,"end":33676,"inode":{"change":20,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":339458},"to":{"change":20,"start":339458,"end":339509},"introduced_by":20}],"inode":{"change":20,"pos":305506}},"ins_contents":[{"Add":" let mut txn_alice = env_alice.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_alice = env_alice.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1140,"ins":{"up_context":[{"change":20,"pos":339571}],"down_context":[{"change":20,"pos":339618}],"flag":"BLOCK","start":33677,"end":33733,"inode":{"change":20,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":339571},"to":{"change":20,"start":339571,"end":339618},"introduced_by":20}],"inode":{"change":20,"pos":305506}},"ins_contents":[{"Add":" let mut txn_bob = env_bob.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_bob = env_bob.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1142,"ins":{"up_context":[{"change":20,"pos":339684}],"down_context":[{"change":20,"pos":339739}],"flag":"BLOCK","start":33734,"end":33798,"inode":{"change":20,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":339684},"to":{"change":20,"start":339684,"end":339739},"introduced_by":20}],"inode":{"change":20,"pos":305506}},"ins_contents":[{"Add":" let mut txn_charlie = env_charlie.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_charlie = env_charlie.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1351,"ins":{"up_context":[{"change":20,"pos":346128}],"down_context":[{"change":20,"pos":346179}],"flag":"BLOCK","start":33799,"end":33859,"inode":{"change":20,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":346128},"to":{"change":20,"start":346128,"end":346179},"introduced_by":20}],"inode":{"change":20,"pos":305506}},"ins_contents":[{"Add":" let mut txn_alice = env_alice.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_alice = env_alice.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1364,"ins":{"up_context":[{"change":20,"pos":346538}],"down_context":[{"change":20,"pos":346585}],"flag":"BLOCK","start":33860,"end":33916,"inode":{"change":20,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":346538},"to":{"change":20,"start":346538,"end":346585},"introduced_by":20}],"inode":{"change":20,"pos":305506}},"ins_contents":[{"Add":" let mut txn_bob = env_bob.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_bob = env_bob.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1489,"ins":{"up_context":[{"change":20,"pos":350433}],"down_context":[{"change":20,"pos":350484}],"flag":"BLOCK","start":33917,"end":33977,"inode":{"change":20,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":350433},"to":{"change":20,"start":350433,"end":350484},"introduced_by":20}],"inode":{"change":20,"pos":305506}},"ins_contents":[{"Add":" let mut txn_alice = env_alice.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_alice = env_alice.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1502,"ins":{"up_context":[{"change":20,"pos":350852}],"down_context":[{"change":20,"pos":350899}],"flag":"BLOCK","start":33978,"end":34034,"inode":{"change":20,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":350852},"to":{"change":20,"start":350852,"end":350899},"introduced_by":20}],"inode":{"change":20,"pos":305506}},"ins_contents":[{"Add":" let mut txn_bob = env_bob.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_bob = env_bob.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1588,"ins":{"up_context":[{"change":20,"pos":353672}],"down_context":[{"change":20,"pos":353723}],"flag":"BLOCK","start":34035,"end":34095,"inode":{"change":20,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":353672},"to":{"change":20,"start":353672,"end":353723},"introduced_by":20}],"inode":{"change":20,"pos":305506}},"ins_contents":[{"Add":" let mut txn_alice = env_alice.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_alice = env_alice.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1603,"ins":{"up_context":[{"change":20,"pos":354144}],"down_context":[{"change":20,"pos":354191}],"flag":"BLOCK","start":34096,"end":34152,"inode":{"change":20,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":354144},"to":{"change":20,"start":354144,"end":354191},"introduced_by":20}],"inode":{"change":20,"pos":305506}},"ins_contents":[{"Add":" let mut txn_bob = env_bob.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_bob = env_bob.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":16,"ins":{"up_context":[{"change":20,"pos":357879}],"down_context":[{"change":20,"pos":357918}],"flag":"BLOCK","start":34153,"end":34201,"inode":{"change":20,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":357879},"to":{"change":20,"start":357879,"end":357918},"introduced_by":20}],"inode":{"change":20,"pos":357372}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":182,"ins":{"up_context":[{"change":20,"pos":363167}],"down_context":[{"change":20,"pos":363206}],"flag":"BLOCK","start":34202,"end":34250,"inode":{"change":20,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":363167},"to":{"change":20,"start":363167,"end":363206},"introduced_by":20}],"inode":{"change":20,"pos":357372}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":417,"ins":{"up_context":[{"change":20,"pos":370487}],"down_context":[{"change":20,"pos":370526}],"flag":"BLOCK","start":34251,"end":34299,"inode":{"change":20,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":370487},"to":{"change":20,"start":370487,"end":370526},"introduced_by":20}],"inode":{"change":20,"pos":357372}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":541,"ins":{"up_context":[{"change":20,"pos":374452}],"down_context":[{"change":20,"pos":374491}],"flag":"BLOCK","start":34300,"end":34348,"inode":{"change":20,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":374452},"to":{"change":20,"start":374452,"end":374491},"introduced_by":20}],"inode":{"change":20,"pos":357372}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":674,"ins":{"up_context":[{"change":20,"pos":378650}],"down_context":[{"change":20,"pos":378689}],"flag":"BLOCK","start":34349,"end":34397,"inode":{"change":20,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":378650},"to":{"change":20,"start":378650,"end":378689},"introduced_by":20}],"inode":{"change":20,"pos":357372}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":798,"ins":{"up_context":[{"change":20,"pos":382540}],"down_context":[{"change":20,"pos":382579}],"flag":"BLOCK","start":34398,"end":34446,"inode":{"change":20,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":382540},"to":{"change":20,"start":382540,"end":382579},"introduced_by":20}],"inode":{"change":20,"pos":357372}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":941,"ins":{"up_context":[{"change":20,"pos":386856}],"down_context":[{"change":20,"pos":386895}],"flag":"BLOCK","start":34447,"end":34495,"inode":{"change":20,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":386856},"to":{"change":20,"start":386856,"end":386895},"introduced_by":20}],"inode":{"change":20,"pos":357372}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1081,"ins":{"up_context":[{"change":20,"pos":391307}],"down_context":[{"change":20,"pos":391346}],"flag":"BLOCK","start":34496,"end":34544,"inode":{"change":20,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":391307},"to":{"change":20,"start":391307,"end":391346},"introduced_by":20}],"inode":{"change":20,"pos":357372}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1329,"ins":{"up_context":[{"change":20,"pos":398925}],"down_context":[{"change":20,"pos":398964}],"flag":"BLOCK","start":34545,"end":34593,"inode":{"change":20,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":398925},"to":{"change":20,"start":398925,"end":398964},"introduced_by":20}],"inode":{"change":20,"pos":357372}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1453,"ins":{"up_context":[{"change":20,"pos":402784}],"down_context":[{"change":20,"pos":402823}],"flag":"BLOCK","start":34594,"end":34642,"inode":{"change":20,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":402784},"to":{"change":20,"start":402784,"end":402823},"introduced_by":20}],"inode":{"change":20,"pos":357372}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1598,"ins":{"up_context":[{"change":20,"pos":407484}],"down_context":[{"change":20,"pos":407535}],"flag":"BLOCK","start":34643,"end":34703,"inode":{"change":20,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":407484},"to":{"change":20,"start":407484,"end":407535},"introduced_by":20}],"inode":{"change":20,"pos":357372}},"ins_contents":[{"Add":" let mut txn_alice = env_alice.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_alice = env_alice.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1600,"ins":{"up_context":[{"change":20,"pos":407597}],"down_context":[{"change":20,"pos":407644}],"flag":"BLOCK","start":34704,"end":34760,"inode":{"change":20,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":407597},"to":{"change":20,"start":407597,"end":407644},"introduced_by":20}],"inode":{"change":20,"pos":357372}},"ins_contents":[{"Add":" let mut txn_bob = env_bob.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_bob = env_bob.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1742,"ins":{"up_context":[{"change":20,"pos":411913}],"down_context":[{"change":20,"pos":411964}],"flag":"BLOCK","start":34761,"end":34821,"inode":{"change":20,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":411913},"to":{"change":20,"start":411913,"end":411964},"introduced_by":20}],"inode":{"change":20,"pos":357372}},"ins_contents":[{"Add":" let mut txn_alice = env_alice.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_alice = env_alice.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1744,"ins":{"up_context":[{"change":20,"pos":412026}],"down_context":[{"change":20,"pos":412073}],"flag":"BLOCK","start":34822,"end":34878,"inode":{"change":20,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":412026},"to":{"change":20,"start":412026,"end":412073},"introduced_by":20}],"inode":{"change":20,"pos":357372}},"ins_contents":[{"Add":" let mut txn_bob = env_bob.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_bob = env_bob.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1869,"ins":{"up_context":[{"change":20,"pos":415761}],"down_context":[{"change":20,"pos":415800}],"flag":"BLOCK","start":34879,"end":34927,"inode":{"change":20,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":415761},"to":{"change":20,"start":415761,"end":415800},"introduced_by":20}],"inode":{"change":20,"pos":357372}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2007,"ins":{"up_context":[{"change":20,"pos":420284}],"down_context":[{"change":20,"pos":420323}],"flag":"BLOCK","start":34928,"end":34976,"inode":{"change":20,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":420284},"to":{"change":20,"start":420284,"end":420323},"introduced_by":20}],"inode":{"change":20,"pos":357372}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2228,"ins":{"up_context":[{"change":20,"pos":427320}],"down_context":[{"change":20,"pos":427359}],"flag":"BLOCK","start":34977,"end":35025,"inode":{"change":20,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":427320},"to":{"change":20,"start":427320,"end":427359},"introduced_by":20}],"inode":{"change":20,"pos":357372}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2483,"ins":{"up_context":[{"change":20,"pos":436021}],"down_context":[{"change":20,"pos":436119}],"flag":"BLOCK","start":35026,"end":35142,"inode":{"change":20,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":436021},"to":{"change":20,"start":436021,"end":436119},"introduced_by":20}],"inode":{"change":20,"pos":357372}},"ins_contents":[{"Add":" let mut txn_alice = env_alice.mut_txn_begin().unwrap();"},{"Add":" let mut txn_bob = env_bob.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_alice = env_alice.mut_txn_begin();\n let mut txn_bob = env_bob.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2568,"ins":{"up_context":[{"change":20,"pos":438662}],"down_context":[{"change":20,"pos":438713}],"flag":"BLOCK","start":35143,"end":35203,"inode":{"change":20,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":438662},"to":{"change":20,"start":438662,"end":438713},"introduced_by":20}],"inode":{"change":20,"pos":357372}},"ins_contents":[{"Add":" let mut txn_alice = env_alice.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_alice = env_alice.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2573,"ins":{"up_context":[{"change":20,"pos":438885}],"down_context":[{"change":20,"pos":438932}],"flag":"BLOCK","start":35204,"end":35260,"inode":{"change":20,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":438885},"to":{"change":20,"start":438885,"end":438932},"introduced_by":20}],"inode":{"change":20,"pos":357372}},"ins_contents":[{"Add":" let mut txn_bob = env_bob.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_bob = env_bob.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":441393},"path":"libpijul/src/tests/clone.rs","line":17,"ins":{"up_context":[{"change":20,"pos":441948}],"down_context":[{"change":20,"pos":441987}],"flag":"BLOCK","start":35261,"end":35309,"inode":{"change":20,"pos":441393}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":441948},"to":{"change":20,"start":441948,"end":441987},"introduced_by":20}],"inode":{"change":20,"pos":441393}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":441393},"path":"libpijul/src/tests/clone.rs","line":49,"ins":{"up_context":[{"change":20,"pos":443043}],"down_context":[{"change":20,"pos":443084}],"flag":"BLOCK","start":35310,"end":35360,"inode":{"change":20,"pos":441393}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":443043},"to":{"change":20,"start":443043,"end":443084},"introduced_by":20}],"inode":{"change":20,"pos":441393}},"ins_contents":[{"Add":" let mut txn2 = env2.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn2 = env2.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":441393},"path":"libpijul/src/tests/clone.rs","line":89,"ins":{"up_context":[{"change":20,"pos":444336}],"down_context":[{"change":20,"pos":444375}],"flag":"BLOCK","start":35361,"end":35409,"inode":{"change":20,"pos":441393}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":444336},"to":{"change":20,"start":444336,"end":444375},"introduced_by":20}],"inode":{"change":20,"pos":441393}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":441393},"path":"libpijul/src/tests/clone.rs","line":116,"ins":{"up_context":[{"change":20,"pos":445212}],"down_context":[{"change":20,"pos":445253}],"flag":"BLOCK","start":35410,"end":35460,"inode":{"change":20,"pos":441393}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":445212},"to":{"change":20,"start":445212,"end":445253},"introduced_by":20}],"inode":{"change":20,"pos":441393}},"ins_contents":[{"Add":" let mut txn2 = env2.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn2 = env2.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":441393},"path":"libpijul/src/tests/clone.rs","line":155,"ins":{"up_context":[{"change":20,"pos":446327}],"down_context":[{"change":20,"pos":446368}],"flag":"BLOCK","start":35461,"end":35511,"inode":{"change":20,"pos":441393}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":446327},"to":{"change":20,"start":446327,"end":446368},"introduced_by":20}],"inode":{"change":20,"pos":441393}},"ins_contents":[{"Add":" let mut txn2 = env2.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn2 = env2.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":446445},"path":"libpijul/src/tests/change.rs","line":38,"ins":{"up_context":[{"change":20,"pos":447764}],"down_context":[{"change":20,"pos":447803}],"flag":"BLOCK","start":35512,"end":35560,"inode":{"change":20,"pos":446445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":447764},"to":{"change":20,"start":447764,"end":447803},"introduced_by":20}],"inode":{"change":20,"pos":446445}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":446445},"path":"libpijul/src/tests/change.rs","line":145,"ins":{"up_context":[{"change":20,"pos":450511}],"down_context":[{"change":20,"pos":450550}],"flag":"BLOCK","start":35561,"end":35609,"inode":{"change":20,"pos":446445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":450511},"to":{"change":20,"start":450511,"end":450550},"introduced_by":20}],"inode":{"change":20,"pos":446445}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":446445},"path":"libpijul/src/tests/change.rs","line":170,"ins":{"up_context":[{"change":20,"pos":451437}],"down_context":[{"change":20,"pos":451478}],"flag":"BLOCK","start":35610,"end":35660,"inode":{"change":20,"pos":446445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":451437},"to":{"change":20,"start":451437,"end":451478},"introduced_by":20}],"inode":{"change":20,"pos":446445}},"ins_contents":[{"Add":" let mut txn2 = env2.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn2 = env2.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":446445},"path":"libpijul/src/tests/change.rs","line":222,"ins":{"up_context":[{"change":20,"pos":452756}],"down_context":[{"change":20,"pos":452848}],"flag":"BLOCK","start":35661,"end":35757,"inode":{"change":20,"pos":446445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":452756},"to":{"change":20,"start":452756,"end":452848},"introduced_by":20}],"inode":{"change":20,"pos":446445}},"ins_contents":[{"Add":" let change1 = Change::read(std::io::Cursor::new(&v[..]), &mut HashMap::default()).unwrap();"}],"del_contents":[{"Del":" let change1 = Change::read(std::io::Cursor::new(&v[..]), &mut HashMap::new()).unwrap();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":15,"ins":{"up_context":[{"change":20,"pos":454514}],"down_context":[{"change":20,"pos":454557}],"flag":"BLOCK","start":35758,"end":35810,"inode":{"change":20,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":454514},"to":{"change":20,"start":454514,"end":454557},"introduced_by":20}],"inode":{"change":20,"pos":454125}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":23,"ins":{"up_context":[{"change":20,"pos":454845}],"down_context":[{"change":20,"pos":454900}],"flag":"BLOCK","start":35811,"end":35868,"inode":{"change":20,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":454845},"to":{"change":20,"start":25478,"end":25544},"introduced_by":20}],"inode":{"change":20,"pos":454125}},"ins_contents":[{"Add":" debug_to_file(&txn, &channel, \"debug\").unwrap();"}],"del_contents":[{"Del":" debug_to_file(&txn, &channel.borrow(), \"debug\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":34,"ins":{"up_context":[{"change":20,"pos":30201}],"down_context":[{"change":20,"pos":30202}],"flag":"BLOCK","start":35869,"end":35917,"inode":{"change":20,"pos":454125}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":30201},"to":{"change":20,"start":455225,"end":455266},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":455225},"to":{"change":20,"start":455225,"end":455266},"introduced_by":20}],"inode":{"change":20,"pos":454125}},"ins_contents":[{"Add":" let channel = channel_.lock().unwrap();"}],"del_contents":[{"Del":" let channel = channel_.borrow();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":43,"ins":{"up_context":[{"change":20,"pos":43645}],"down_context":[{"change":20,"pos":455717}],"flag":"BLOCK","start":35918,"end":35989,"inode":{"change":20,"pos":454125}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":43645},"to":{"change":20,"start":30545,"end":30626},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":30545},"to":{"change":20,"start":30545,"end":30626},"introduced_by":20}],"inode":{"change":20,"pos":454125}},"ins_contents":[{"Add":" crate::fs::iter_paths(&txn, &channel.graph, file_key, |path| {"}],"del_contents":[{"Del":" crate::fs::iter_paths(&txn, &channel_.borrow().graph, file_key, |path| {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":52,"ins":{"up_context":[{"change":20,"pos":30657}],"down_context":[{"change":20,"pos":455959}],"flag":"BLOCK","start":35990,"end":36049,"inode":{"change":20,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":30657},"to":{"change":20,"start":25545,"end":25613},"introduced_by":20}],"inode":{"change":20,"pos":454125}},"ins_contents":[{"Add":" debug_to_file(&txn, &channel_, \"debug2\").unwrap();"}],"del_contents":[{"Del":" debug_to_file(&txn, &channel_.borrow(), \"debug2\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":74,"ins":{"up_context":[{"change":20,"pos":456600}],"down_context":[{"change":20,"pos":456639}],"flag":"BLOCK","start":36050,"end":36098,"inode":{"change":20,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":456600},"to":{"change":20,"start":456600,"end":456639},"introduced_by":20}],"inode":{"change":20,"pos":454125}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":101,"ins":{"up_context":[{"change":20,"pos":457332}],"down_context":[{"change":20,"pos":457442}],"flag":"BLOCK","start":36099,"end":36229,"inode":{"change":20,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":457332},"to":{"change":20,"start":457332,"end":457442},"introduced_by":20}],"inode":{"change":20,"pos":454125}},"ins_contents":[{"Add":" let mut repo = Arc::new(working_copy::memory::Memory::new());"},{"Add":" let changes = Arc::new(changestore::memory::Memory::new());"}],"del_contents":[{"Del":" let mut repo = working_copy::memory::Memory::new();\n let changes = changestore::memory::Memory::new();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":106,"ins":{"up_context":[{"change":20,"pos":457507}],"down_context":[{"change":20,"pos":457648}],"flag":"BLOCK","start":36230,"end":36453,"inode":{"change":20,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":457507},"to":{"change":20,"start":457507,"end":457550},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":457550},"to":{"change":20,"start":43735,"end":43849},"introduced_by":20}],"inode":{"change":20,"pos":454125}},"ins_contents":[{"Add":" let mut txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));"},{"Add":" txn.write().unwrap().add_file(\"dir/file\").unwrap();"},{"Add":" let mut channel = txn.write().unwrap().open_or_create_channel(\"main\").unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n"},{"Del":" txn.add_file(\"dir/file\").unwrap();\n let mut channel = txn.open_or_create_channel(\"main\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":111,"ins":{"up_context":[{"change":20,"pos":457716}],"down_context":[{"change":20,"pos":31171}],"flag":"BLOCK","start":36454,"end":36804,"inode":{"change":20,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":457716},"to":{"change":20,"start":43850,"end":43935},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":43935},"to":{"change":20,"start":25614,"end":25681},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":457793},"to":{"change":20,"start":25614,"end":25681},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":25681},"to":{"change":20,"start":457849,"end":457925},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":31890},"to":{"change":20,"start":457849,"end":457925},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":457849},"to":{"change":20,"start":457849,"end":457925},"introduced_by":20}],"inode":{"change":20,"pos":454125}},"ins_contents":[{"Add":" record_all_output("},{"Add":" repo.clone(),"},{"Add":" changes.clone(),"},{"Add":" txn.clone(),"},{"Add":" &channel.clone(),"},{"Add":" \"\","},{"Add":" )"},{"Add":" .unwrap();"},{"Add":" debug_to_file(&*txn.read().unwrap(), &channel, \"debug0\").unwrap();"},{"Add":" let files: Vec<_> = crate::fs::iter_working_copy(&*txn.read().unwrap(), Inode::ROOT)"}],"del_contents":[{"Del":" record_all_output(&mut repo, &changes, &mut txn, &mut channel, \"\").unwrap();\n"},{"Del":" debug_to_file(&txn, &channel.borrow(), \"debug0\").unwrap();\n"},{"Del":" let files: Vec<_> = crate::fs::iter_working_copy(&txn, Inode::ROOT)\n"}]}},{"Replacement":{"inode":{"change":20,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":126,"ins":{"up_context":[{"change":20,"pos":43983}],"down_context":[{"change":20,"pos":458109}],"flag":"BLOCK","start":36805,"end":36863,"inode":{"change":20,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":43983},"to":{"change":20,"start":43983,"end":44024},"introduced_by":20}],"inode":{"change":20,"pos":454125}},"ins_contents":[{"Add":" txn.write().unwrap().remove_file(\"dir\").unwrap();"}],"del_contents":[{"Del":" txn.remove_file(\"dir\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":128,"ins":{"up_context":[{"change":20,"pos":458110}],"down_context":[{"change":20,"pos":31207}],"flag":"BLOCK","start":36864,"end":36957,"inode":{"change":20,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":458110},"to":{"change":20,"start":458110,"end":458186},"introduced_by":20}],"inode":{"change":20,"pos":454125}},"ins_contents":[{"Add":" let files: Vec<_> = crate::fs::iter_working_copy(&*txn.read().unwrap(), Inode::ROOT)"}],"del_contents":[{"Del":" let files: Vec<_> = crate::fs::iter_working_copy(&txn, Inode::ROOT)\n"}]}},{"Replacement":{"inode":{"change":20,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":134,"ins":{"up_context":[{"change":20,"pos":458320}],"down_context":[{"change":20,"pos":458452}],"flag":"BLOCK","start":36958,"end":37102,"inode":{"change":20,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":458320},"to":{"change":20,"start":44025,"end":44110},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":44110},"to":{"change":20,"start":25682,"end":25748},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":458397},"to":{"change":20,"start":25682,"end":25748},"introduced_by":20}],"inode":{"change":20,"pos":454125}},"ins_contents":[{"Add":" record_all_output(repo, changes, txn, &channel, \"\").unwrap();"},{"Add":" debug_to_file(&*txn.read().unwrap(), &channel, \"debug\").unwrap();"}],"del_contents":[{"Del":" record_all_output(&mut repo, &changes, &mut txn, &mut channel, \"\").unwrap();\n"},{"Del":" debug_to_file(&txn, &channel.borrow(), \"debug\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":137,"ins":{"up_context":[{"change":20,"pos":458453}],"down_context":[{"change":20,"pos":31243}],"flag":"BLOCK","start":37103,"end":37196,"inode":{"change":20,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":458453},"to":{"change":20,"start":458453,"end":458529},"introduced_by":20}],"inode":{"change":20,"pos":454125}},"ins_contents":[{"Add":" let files: Vec<_> = crate::fs::iter_working_copy(&*txn.read().unwrap(), Inode::ROOT)"}],"del_contents":[{"Del":" let files: Vec<_> = crate::fs::iter_working_copy(&txn, Inode::ROOT)\n"}]}},{"Replacement":{"inode":{"change":20,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":144,"ins":{"up_context":[{"change":20,"pos":458708}],"down_context":[{"change":20,"pos":458950}],"flag":"BLOCK","start":37197,"end":37587,"inode":{"change":20,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":458708},"to":{"change":20,"start":44111,"end":44197},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":44197},"to":{"change":20,"start":31279,"end":31377},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":458778},"to":{"change":20,"start":31279,"end":31377},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":31377},"to":{"change":20,"start":458876,"end":458927},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":458876},"to":{"change":20,"start":458876,"end":458927},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":458927},"to":{"change":20,"start":44198,"end":44229},"introduced_by":20}],"inode":{"change":20,"pos":454125}},"ins_contents":[{"Add":" txn.write().unwrap().add_file(\"dir2/file\").unwrap();"},{"Add":" txn.write().unwrap().remove_file(\"dir2\").unwrap();"},{"Add":" assert!("},{"Add":" crate::fs::iter_working_copy(&*txn.read().unwrap(), Inode::ROOT)"},{"Add":" .all(|f| f.unwrap().1 != \"dir2\")"},{"Add":" );"},{"Add":" assert!(txn.write().unwrap().remove_file(\"dir2\").is_err());"},{"Add":" txn.write().unwrap().commit().unwrap();"}],"del_contents":[{"Del":" txn.add_file(\"dir2/file\").unwrap();\n txn.remove_file(\"dir2\").unwrap();\n"},{"Del":" assert!(crate::fs::iter_working_copy(&txn, Inode::ROOT).all(|f| f.unwrap().1 != \"dir2\"));\n"},{"Del":" assert!(txn.remove_file(\"dir2\").is_err());\n"},{"Del":" txn.commit().unwrap();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":169,"ins":{"up_context":[{"change":20,"pos":3034}],"down_context":[{"change":20,"pos":3144}],"flag":"BLOCK","start":37588,"end":37718,"inode":{"change":20,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":3034},"to":{"change":20,"start":3034,"end":3144},"introduced_by":20}],"inode":{"change":20,"pos":454125}},"ins_contents":[{"Add":" let mut repo = Arc::new(working_copy::memory::Memory::new());"},{"Add":" let changes = Arc::new(changestore::memory::Memory::new());"}],"del_contents":[{"Del":" let mut repo = working_copy::memory::Memory::new();\n let changes = changestore::memory::Memory::new();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":173,"ins":{"up_context":[{"change":20,"pos":3203}],"down_context":[{"change":20,"pos":3333}],"flag":"BLOCK","start":37719,"end":37915,"inode":{"change":20,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":3203},"to":{"change":20,"start":3203,"end":3333},"introduced_by":20}],"inode":{"change":20,"pos":454125}},"ins_contents":[{"Add":" let mut txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));"},{"Add":" txn.write().unwrap().add_file(\"a/b/c/d/e\")?;"},{"Add":" let mut channel = txn.write().unwrap().open_or_create_channel(\"main\")?;"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n txn.add_file(\"a/b/c/d/e\")?;\n let mut channel = txn.open_or_create_channel(\"main\")?;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":178,"ins":{"up_context":[{"change":20,"pos":3398}],"down_context":[{"change":20,"pos":31414}],"flag":"BLOCK","start":37916,"end":38158,"inode":{"change":20,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":3398},"to":{"change":20,"start":3398,"end":3471},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":3471},"to":{"change":20,"start":25749,"end":25812},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":25812},"to":{"change":20,"start":3525,"end":3597},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":3525},"to":{"change":20,"start":3525,"end":3597},"introduced_by":20}],"inode":{"change":20,"pos":454125}},"ins_contents":[{"Add":" record_all_output(repo.clone(), changes.clone(), txn.clone(), &channel, \"\")?;"},{"Add":" debug_to_file(&*txn.read().unwrap(), &channel, \"debug0\").unwrap();"},{"Add":" let files: Vec<_> = crate::fs::iter_working_copy(&*txn.read().unwrap(), Inode::ROOT)"}],"del_contents":[{"Del":" record_all_output(&mut repo, &changes, &mut txn, &mut channel, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel.borrow(), \"debug0\").unwrap();\n"},{"Del":" let files: Vec<_> = crate::fs::iter_working_copy(&txn, Inode::ROOT)\n"}]}},{"Replacement":{"inode":{"change":20,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":187,"ins":{"up_context":[{"change":20,"pos":3793}],"down_context":[{"change":20,"pos":3919}],"flag":"BLOCK","start":38159,"end":38311,"inode":{"change":20,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":3793},"to":{"change":20,"start":3793,"end":3866},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":3866},"to":{"change":20,"start":25813,"end":25875},"introduced_by":20}],"inode":{"change":20,"pos":454125}},"ins_contents":[{"Add":" record_all_output(repo.clone(), changes.clone(), txn.clone(), &channel, \"\")?;"},{"Add":" debug_to_file(&*txn.read().unwrap(), &channel, \"debug\").unwrap();"}],"del_contents":[{"Del":" record_all_output(&mut repo, &changes, &mut txn, &mut channel, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel.borrow(), \"debug\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":190,"ins":{"up_context":[{"change":20,"pos":3920}],"down_context":[{"change":20,"pos":5386}],"flag":"BLOCK","start":38312,"end":38379,"inode":{"change":20,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":3920},"to":{"change":20,"start":3920,"end":3977},"introduced_by":20}],"inode":{"change":20,"pos":454125}},"ins_contents":[{"Add":" let mut repo2 = Arc::new(working_copy::memory::Memory::new());"}],"del_contents":[{"Del":" let mut repo2 = working_copy::memory::Memory::new();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":192,"ins":{"up_context":[{"change":20,"pos":5428}],"down_context":[{"change":20,"pos":5506}],"flag":"BLOCK","start":38380,"end":38458,"inode":{"change":20,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":5428},"to":{"change":20,"start":5428,"end":5506},"introduced_by":20}],"inode":{"change":20,"pos":454125}},"ins_contents":[{"Add":" repo2,"},{"Add":" changes,"},{"Add":" txn.clone(),"},{"Add":" channel.clone(),"}],"del_contents":[{"Del":" &mut repo2,\n &changes,\n &mut txn,\n &mut channel,\n"}]}},{"Edit":{"inode":{"change":20,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":199,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":5546}],"down_context":[{"change":20,"pos":5546}],"flag":"BLOCK","start":38459,"end":38470,"inode":{"change":20,"pos":454125}}},"contents":[{"Add":" 1,"}]}},{"Replacement":{"inode":{"change":20,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":203,"ins":{"up_context":[{"change":20,"pos":4131}],"down_context":[{"change":20,"pos":31446}],"flag":"BLOCK","start":38471,"end":38560,"inode":{"change":20,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":4131},"to":{"change":20,"start":4131,"end":4203},"introduced_by":20}],"inode":{"change":20,"pos":454125}},"ins_contents":[{"Add":" let files: Vec<_> = crate::fs::iter_working_copy(&*txn.read().unwrap(), Inode::ROOT)"}],"del_contents":[{"Del":" let files: Vec<_> = crate::fs::iter_working_copy(&txn, Inode::ROOT)\n"}]}},{"Replacement":{"inode":{"change":20,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":216,"ins":{"up_context":[{"change":20,"pos":459375}],"down_context":[{"change":20,"pos":459485}],"flag":"BLOCK","start":38561,"end":38691,"inode":{"change":20,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":459375},"to":{"change":20,"start":459375,"end":459485},"introduced_by":20}],"inode":{"change":20,"pos":454125}},"ins_contents":[{"Add":" let mut repo = Arc::new(working_copy::memory::Memory::new());"},{"Add":" let changes = Arc::new(changestore::memory::Memory::new());"}],"del_contents":[{"Del":" let mut repo = working_copy::memory::Memory::new();\n let changes = changestore::memory::Memory::new();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":220,"ins":{"up_context":[{"change":20,"pos":459544}],"down_context":[{"change":20,"pos":459673}],"flag":"BLOCK","start":38692,"end":38887,"inode":{"change":20,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":459544},"to":{"change":20,"start":459544,"end":459673},"introduced_by":20}],"inode":{"change":20,"pos":454125}},"ins_contents":[{"Add":" let mut txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));"},{"Add":" txn.write().unwrap().add_file(\"dir/file\")?;"},{"Add":" let mut channel = txn.write().unwrap().open_or_create_channel(\"main\")?;"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n txn.add_file(\"dir/file\")?;\n let mut channel = txn.open_or_create_channel(\"main\")?;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":225,"ins":{"up_context":[{"change":20,"pos":459737}],"down_context":[{"change":20,"pos":459869}],"flag":"BLOCK","start":38888,"end":39048,"inode":{"change":20,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":459737},"to":{"change":20,"start":459737,"end":459818},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":459818},"to":{"change":20,"start":25876,"end":25938},"introduced_by":20}],"inode":{"change":20,"pos":454125}},"ins_contents":[{"Add":" record_all_output(repo.clone(), changes.clone(), txn.clone(), &channel, \"\").unwrap();"},{"Add":" debug_to_file(&*txn.read().unwrap(), &channel, \"debug\").unwrap();"}],"del_contents":[{"Del":" record_all_output(&mut repo, &changes, &mut txn, &mut channel, \"\").unwrap();\n"},{"Del":" debug_to_file(&txn, &channel.borrow(), \"debug\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":228,"ins":{"up_context":[{"change":20,"pos":459870}],"down_context":[{"change":20,"pos":460049}],"flag":"BLOCK","start":39049,"end":39241,"inode":{"change":20,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":459870},"to":{"change":20,"start":7882,"end":7944},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":7944},"to":{"change":20,"start":459908,"end":460049},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":459908},"to":{"change":20,"start":459908,"end":460049},"introduced_by":20}],"inode":{"change":20,"pos":454125}},"ins_contents":[{"Add":" repo.write_file(\"dir/file\")"},{"Add":" .unwrap()"},{"Add":" .write_all(b\"a\\nb\\nc\\n\")"},{"Add":" .unwrap();"},{"Add":" record_all_output(repo.clone(), changes.clone(), txn.clone(), &channel, \"\").unwrap();"}],"del_contents":[{"Del":" repo.write_file::<_, std::io::Error, _>(\"dir/file\", |w| {\n"},{"Del":" w.write_all(b\"a\\nb\\nc\\n\")?;\n Ok(())\n })?;\n record_all_output(&mut repo, &changes, &mut txn, &mut channel, \"\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":237,"ins":{"up_context":[{"change":20,"pos":26001}],"down_context":[{"change":20,"pos":460263}],"flag":"BLOCK","start":39242,"end":39278,"inode":{"change":20,"pos":454125}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":26001},"to":{"change":20,"start":460244,"end":460263},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":32056},"to":{"change":20,"start":460244,"end":460263},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":460244},"to":{"change":20,"start":460244,"end":460263},"introduced_by":20}],"inode":{"change":20,"pos":454125}},"ins_contents":[{"Add":" txn.write().unwrap().commit()?;"}],"del_contents":[{"Del":" txn.commit()?;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":250,"ins":{"up_context":[{"change":20,"pos":460591}],"down_context":[{"change":20,"pos":460720}],"flag":"BLOCK","start":39279,"end":39451,"inode":{"change":20,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":460591},"to":{"change":20,"start":460591,"end":460720},"introduced_by":20}],"inode":{"change":20,"pos":454125}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"},{"Add":" txn.write().unwrap().add_file(\"dir/file\")?;"},{"Add":" let mut channel = txn.write().unwrap().open_or_create_channel(\"main\")?;"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n txn.add_file(\"dir/file\")?;\n let mut channel = txn.open_or_create_channel(\"main\")?;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":278,"ins":{"up_context":[{"change":20,"pos":26193}],"down_context":[{"change":20,"pos":461699}],"flag":"BLOCK","start":39452,"end":39488,"inode":{"change":20,"pos":454125}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":26193},"to":{"change":20,"start":461680,"end":461699},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":32221},"to":{"change":20,"start":461680,"end":461699},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":461680},"to":{"change":20,"start":461680,"end":461699},"introduced_by":20}],"inode":{"change":20,"pos":454125}},"ins_contents":[{"Add":" txn.write().unwrap().commit()?;"}],"del_contents":[{"Del":" txn.commit()?;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":293,"ins":{"up_context":[{"change":20,"pos":462103}],"down_context":[{"change":20,"pos":462154}],"flag":"BLOCK","start":39489,"end":39549,"inode":{"change":20,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":462103},"to":{"change":20,"start":462103,"end":462154},"introduced_by":20}],"inode":{"change":20,"pos":454125}},"ins_contents":[{"Add":" let mut txn_alice = env_alice.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_alice = env_alice.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":306,"ins":{"up_context":[{"change":20,"pos":462723}],"down_context":[{"change":20,"pos":462770}],"flag":"BLOCK","start":39550,"end":39606,"inode":{"change":20,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":462723},"to":{"change":20,"start":462723,"end":462770},"introduced_by":20}],"inode":{"change":20,"pos":454125}},"ins_contents":[{"Add":" let mut txn_bob = env_bob.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_bob = env_bob.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":351,"ins":{"up_context":[{"change":20,"pos":464130}],"down_context":[{"change":20,"pos":464181}],"flag":"BLOCK","start":39607,"end":39667,"inode":{"change":20,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":464130},"to":{"change":20,"start":464130,"end":464181},"introduced_by":20}],"inode":{"change":20,"pos":454125}},"ins_contents":[{"Add":" let mut txn_alice = env_alice.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_alice = env_alice.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":379,"ins":{"up_context":[{"change":20,"pos":465323}],"down_context":[{"change":20,"pos":465370}],"flag":"BLOCK","start":39668,"end":39724,"inode":{"change":20,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":465323},"to":{"change":20,"start":465323,"end":465370},"introduced_by":20}],"inode":{"change":20,"pos":454125}},"ins_contents":[{"Add":" let mut txn_bob = env_bob.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_bob = env_bob.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":434,"ins":{"up_context":[{"change":20,"pos":466813}],"down_context":[{"change":20,"pos":466864}],"flag":"BLOCK","start":39725,"end":39785,"inode":{"change":20,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":466813},"to":{"change":20,"start":466813,"end":466864},"introduced_by":20}],"inode":{"change":20,"pos":454125}},"ins_contents":[{"Add":" let mut txn_alice = env_alice.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_alice = env_alice.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":469,"ins":{"up_context":[{"change":20,"pos":467955}],"down_context":[{"change":20,"pos":468006}],"flag":"BLOCK","start":39786,"end":39846,"inode":{"change":20,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":467955},"to":{"change":20,"start":467955,"end":468006},"introduced_by":20}],"inode":{"change":20,"pos":454125}},"ins_contents":[{"Add":" let mut txn_alice = env_alice.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_alice = env_alice.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":489,"ins":{"up_context":[{"change":20,"pos":468866}],"down_context":[{"change":20,"pos":468913}],"flag":"BLOCK","start":39847,"end":39903,"inode":{"change":20,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":468866},"to":{"change":20,"start":468866,"end":468913},"introduced_by":20}],"inode":{"change":20,"pos":454125}},"ins_contents":[{"Add":" let mut txn_bob = env_bob.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_bob = env_bob.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":667,"ins":{"up_context":[{"change":20,"pos":474074}],"down_context":[{"change":20,"pos":474125}],"flag":"BLOCK","start":39904,"end":39964,"inode":{"change":20,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":474074},"to":{"change":20,"start":474074,"end":474125},"introduced_by":20}],"inode":{"change":20,"pos":454125}},"ins_contents":[{"Add":" let mut txn_alice = env_alice.mut_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_alice = env_alice.mut_txn_begin();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":778,"ins":{"up_context":[{"change":20,"pos":477335}],"down_context":[{"change":20,"pos":477412}],"flag":"BLOCK","start":39965,"end":40068,"inode":{"change":20,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":477335},"to":{"change":20,"start":477335,"end":477412},"introduced_by":20}],"inode":{"change":20,"pos":454125}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"},{"Add":" txn.write().unwrap().add_file(\"filedir\").unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n txn.add_file(\"filedir\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":781,"ins":{"up_context":[{"change":20,"pos":477413}],"down_context":[{"change":20,"pos":477480}],"flag":"BLOCK","start":40069,"end":40153,"inode":{"change":20,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":477413},"to":{"change":20,"start":477413,"end":477480},"introduced_by":20}],"inode":{"change":20,"pos":454125}},"ins_contents":[{"Add":" let mut channel = txn.write().unwrap().open_or_create_channel(\"main\").unwrap();"}],"del_contents":[{"Del":" let mut channel = txn.open_or_create_channel(\"main\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":786,"ins":{"up_context":[{"change":20,"pos":477664}],"down_context":[{"change":20,"pos":477707}],"flag":"BLOCK","start":40154,"end":40214,"inode":{"change":20,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":477664},"to":{"change":20,"start":477664,"end":477707},"introduced_by":20}],"inode":{"change":20,"pos":454125}},"ins_contents":[{"Add":" txn.write().unwrap().add_file(\"filedir/file\").unwrap();"}],"del_contents":[{"Del":" txn.add_file(\"filedir/file\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":802,"ins":{"up_context":[{"change":20,"pos":478129}],"down_context":[{"change":20,"pos":478270}],"flag":"BLOCK","start":40215,"end":40399,"inode":{"change":20,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":478129},"to":{"change":20,"start":478129,"end":478270},"introduced_by":20}],"inode":{"change":20,"pos":454125}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"},{"Add":" txn.write().unwrap().add_file(\"dir/file\")?;"},{"Add":" let mut channel = txn.write().unwrap().open_or_create_channel(\"main\")?;"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n txn.add_file(\"dir/file\")?;\n let mut channel = txn.open_or_create_channel(\"main\")?;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":824,"ins":{"up_context":[{"change":20,"pos":478868}],"down_context":[{"change":20,"pos":478974}],"flag":"BLOCK","start":40400,"end":40532,"inode":{"change":20,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":478868},"to":{"change":20,"start":478868,"end":478974},"introduced_by":20}],"inode":{"change":20,"pos":454125}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"},{"Add":" let mut channel = txn.write().unwrap().open_or_create_channel(\"main\")?;"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n let mut channel = txn.open_or_create_channel(\"main\")?;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":844,"ins":{"up_context":[{"change":20,"pos":479571}],"down_context":[{"change":20,"pos":479669}],"flag":"BLOCK","start":40533,"end":40657,"inode":{"change":20,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":479571},"to":{"change":20,"start":479571,"end":479669},"introduced_by":20}],"inode":{"change":20,"pos":454125}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"},{"Add":" let mut channel = txn.write().unwrap().open_or_create_channel(\"main\")?;"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n let mut channel = txn.open_or_create_channel(\"main\")?;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":858,"ins":{"up_context":[{"change":20,"pos":480052}],"down_context":[{"change":20,"pos":480150}],"flag":"BLOCK","start":40658,"end":40782,"inode":{"change":20,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":480052},"to":{"change":20,"start":480052,"end":480150},"introduced_by":20}],"inode":{"change":20,"pos":454125}},"ins_contents":[{"Add":" let mut txn = env.mut_txn_begin().unwrap();"},{"Add":" let mut channel = txn.write().unwrap().open_or_create_channel(\"main\")?;"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin();\n let mut channel = txn.open_or_create_channel(\"main\")?;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":862,"ins":{"up_context":[{"change":20,"pos":480210}],"down_context":[{"change":20,"pos":480237}],"flag":"BLOCK","start":40783,"end":40827,"inode":{"change":20,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":480210},"to":{"change":20,"start":480210,"end":480237},"introduced_by":20}],"inode":{"change":20,"pos":454125}},"ins_contents":[{"Add":" txn.write().unwrap().add_file(\"file\")?;"}],"del_contents":[{"Del":" txn.add_file(\"file\")?;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":11,"ins":{"up_context":[{"change":20,"pos":489199}],"down_context":[{"change":20,"pos":11033}],"flag":"BLOCK","start":40828,"end":40928,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":489199},"to":{"change":17,"start":935,"end":977},"introduced_by":17}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":"use crate::{HashMap, HashSet};"},{"Add":"use std::collections::VecDeque;"},{"Add":"use std::sync::{Arc, Mutex, RwLock};"}],"del_contents":[{"Del":"use std::collections::{HashMap, HashSet};\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":51,"ins":{"up_context":[{"change":20,"pos":489392}],"down_context":[{"change":7,"pos":1844}],"flag":"BLOCK","start":40929,"end":41116,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":489392},"to":{"change":20,"start":489392,"end":489422},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":489422},"to":{"change":20,"start":48769,"end":48836},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":48836},"to":{"change":20,"start":489479,"end":489628},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":489479},"to":{"change":20,"start":489479,"end":489628},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" pub(crate) rec: Vec>>,"},{"Add":" recorded_inodes: Arc>>>>,"},{"Add":" deleted_vertices: Arc>>>,"}],"del_contents":[{"Del":" pub(crate) rec: Recorded,\n"},{"Del":" pub(crate) redundant: Vec<(Vertex, SerializedEdge)>,\n"},{"Del":" recorded_inodes: HashMap>>,\n deleted_vertices: HashSet>,\n former_parents: Vec,\n"}]}},{"Edit":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":56,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":1902}],"down_context":[{"change":20,"pos":489652}],"flag":"BLOCK","start":41117,"end":41156,"inode":{"change":20,"pos":488880}}},"contents":[{"Add":" pub contents: Arc>>,"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":69,"ins":{"up_context":[{"change":20,"pos":489885}],"down_context":[{"change":20,"pos":489912}],"flag":"BLOCK","start":41157,"end":41196,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":489885},"to":{"change":20,"start":489885,"end":489912},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" pub contents: Arc>>,"}],"del_contents":[{"Del":" pub contents: Vec,\n"}]}},{"Edit":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":82,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":1061}],"down_context":[{"change":20,"pos":490405}],"flag":"BLOCK","start":41197,"end":41498,"inode":{"change":20,"pos":488880}}},"contents":[{"Add":" /// Redundant edges found during the comparison."},{"Add":" pub redundant: Vec<(Vertex, SerializedEdge)>,"},{"Add":" /// Force a re-diff"},{"Add":" force_rediff: bool,"},{"Add":" deleted_vertices: Arc>>>,"},{"Add":" recorded_inodes: Arc>>>>,"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":93,"ins":{"up_context":[{"change":20,"pos":454}],"down_context":[{"change":20,"pos":1360}],"flag":"BLOCK","start":41499,"end":41599,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":454},"to":{"change":20,"start":1062,"end":1283},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1283},"to":{"change":8,"start":0,"end":66},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":66},"to":{"change":20,"start":1344,"end":1359},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1344},"to":{"change":20,"start":1344,"end":1359},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":492},"to":{"change":20,"start":490736,"end":490902},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":1359},"to":{"change":20,"start":490736,"end":490902},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":490736},"to":{"change":20,"start":490736,"end":490902},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" rec: Vec::new(),"},{"Add":" recorded_inodes: Arc::new(Mutex::new(HashMap::default())),"}],"del_contents":[{"Del":" rec: Recorded {\n contents: Vec::new(),\n actions: Vec::new(),\n updatables: HashMap::new(),\n largest_file: 0,\n has_binary_files: false,\n"},{"Del":" oldest_change: std::time::SystemTime::UNIX_EPOCH,\n"},{"Del":" },\n"},{"Del":" redundant: Vec::new(),\n recorded_inodes: HashMap::new(),\n deleted_vertices: HashSet::new(),\n former_parents: Vec::new(),\n"}]}},{"Edit":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":97,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":1938}],"down_context":[{"change":20,"pos":490934}],"flag":"BLOCK","start":41600,"end":41728,"inode":{"change":20,"pos":488880}}},"contents":[{"Add":" deleted_vertices: Arc::new(Mutex::new(HashSet::default())),"},{"Add":" contents: Arc::new(Mutex::new(Vec::new())),"}]}},{"Edit":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":109,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":601}],"down_context":[{"change":20,"pos":490951}],"flag":"BLOCK","start":41729,"end":42417,"inode":{"change":20,"pos":488880}}},"contents":[{"Add":" pub fn recorded(&mut self) -> Arc> {"},{"Add":" let m = Arc::new(Mutex::new(self.recorded_()));"},{"Add":" self.rec.push(m.clone());"},{"Add":" m"},{"Add":" }"},{"Add":""},{"Add":" fn recorded_(&self) -> Recorded {"},{"Add":" Recorded {"},{"Add":" contents: self.contents.clone(),"},{"Add":" actions: Vec::new(),"},{"Add":" updatables: HashMap::default(),"},{"Add":" largest_file: 0,"},{"Add":" has_binary_files: false,"},{"Add":" oldest_change: std::time::SystemTime::UNIX_EPOCH,"},{"Add":" redundant: Vec::new(),"},{"Add":" force_rediff: self.force_rediff,"},{"Add":" deleted_vertices: self.deleted_vertices.clone(),"},{"Add":" recorded_inodes: self.recorded_inodes.clone(),"},{"Add":" }"},{"Add":" }"},{"Add":""}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":131,"ins":{"up_context":[{"change":20,"pos":490981}],"down_context":[{"change":20,"pos":491036}],"flag":"BLOCK","start":42418,"end":43585,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":490981},"to":{"change":20,"start":490981,"end":491036},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" pub fn finish(mut self) -> Recorded {"},{"Add":" if self.rec.is_empty() {"},{"Add":" self.recorded();"},{"Add":" }"},{"Add":" let mut it = self.rec.into_iter();"},{"Add":" let mut result = if let Ok(rec) = Arc::try_unwrap(it.next().unwrap()) {"},{"Add":" rec.into_inner().unwrap()"},{"Add":" } else {"},{"Add":" unreachable!()"},{"Add":" };"},{"Add":" for rec in it {"},{"Add":" let rec = if let Ok(rec) = Arc::try_unwrap(rec) {"},{"Add":" rec.into_inner().unwrap()"},{"Add":" } else {"},{"Add":" unreachable!()"},{"Add":" };"},{"Add":" let off = result.actions.len();"},{"Add":" result.actions.extend(rec.actions.into_iter());"},{"Add":" for (a, b) in rec.updatables {"},{"Add":" result.updatables.insert(a + off, b);"},{"Add":" }"},{"Add":" result.largest_file = result.largest_file.max(rec.largest_file);"},{"Add":" result.has_binary_files |= rec.has_binary_files;"},{"Add":" result.oldest_change = result.oldest_change.min(rec.oldest_change);"},{"Add":" result.redundant.extend(rec.redundant.into_iter())"},{"Add":" }"},{"Add":" debug!("},{"Add":" \"result = {:?}, updatables = {:?}\","},{"Add":" result.actions, result.updatables"},{"Add":" );"},{"Add":" result"}],"del_contents":[{"Del":" pub fn finish(self) -> Recorded {\n self.rec\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":183,"ins":{"up_context":[{"change":20,"pos":491573}],"down_context":[{"change":20,"pos":491597}],"flag":"BLOCK","start":43586,"end":43606,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":491573},"to":{"change":20,"start":491573,"end":491597},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":"struct RecordItem {"}],"del_contents":[{"Del":"struct RecordItem<'a> {\n"}]}},{"Edit":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":190,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":491746},"to":{"change":20,"start":491746,"end":491778},"introduced_by":20}],"inode":{"change":20,"pos":488880}}},"contents":[{"Del":" components: Components<'a>,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":192,"ins":{"up_context":[{"change":20,"pos":491781}],"down_context":[{"change":20,"pos":491846}],"flag":"BLOCK","start":43607,"end":43649,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":491781},"to":{"change":20,"start":491781,"end":491846},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":"impl RecordItem {"},{"Add":" fn root() -> Self {"}],"del_contents":[{"Del":"impl<'a> RecordItem<'a> {\n fn root(prefix: &'a str) -> Self {\n"}]}},{"Edit":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":201,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":492099},"to":{"change":20,"start":492099,"end":492143},"introduced_by":20}],"inode":{"change":20,"pos":488880}}},"contents":[{"Del":" components: components(prefix),\n"}]}},{"Edit":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":208,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":492241}],"down_context":[{"change":20,"pos":48837}],"flag":"BLOCK","start":43650,"end":44012,"inode":{"change":20,"pos":488880}}},"contents":[{"Add":"fn get_inodes_::GraphError>>("},{"Add":" txn: Arc>,"},{"Add":" channel: ChannelRef,"},{"Add":" inode: &Inode,"},{"Add":") -> Result>, TxnErr> {"},{"Add":" let txn = txn.read().unwrap();"},{"Add":" let channel = channel.r.read().unwrap();"},{"Add":" Ok(get_inodes(&*txn, &*channel, inode)?.map(|x| *x))"},{"Add":"}"},{"Add":""}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":224,"ins":{"up_context":[{"change":20,"pos":32350}],"down_context":[{"change":20,"pos":492501}],"flag":"BLOCK","start":44013,"end":44225,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":32350},"to":{"change":20,"start":492397,"end":492412},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":492397},"to":{"change":20,"start":492397,"end":492412},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":492412},"to":{"change":20,"start":49031,"end":49097},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":1201},"to":{"change":20,"start":492478,"end":492501},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":28094},"to":{"change":20,"start":492478,"end":492501},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":32418},"to":{"change":20,"start":492478,"end":492501},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":49097},"to":{"change":20,"start":492478,"end":492501},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":492478},"to":{"change":20,"start":492478,"end":492501},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" if let Some(e) = iter_adjacent("},{"Add":" txn,"},{"Add":" txn.graph(channel),"},{"Add":" vertex.inode_vertex(),"},{"Add":" EdgeFlags::PARENT,"},{"Add":" EdgeFlags::all(),"},{"Add":" )?"},{"Add":" .next()"}],"del_contents":[{"Del":" if txn\n"},{"Del":" .get_changeset(txn.changes(channel), &vertex.change)?\n"},{"Del":" .is_some()\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":233,"ins":{"up_context":[{"change":20,"pos":492511}],"down_context":[{"change":20,"pos":492570}],"flag":"BLOCK","start":44226,"end":44326,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":492511},"to":{"change":20,"start":32419,"end":32448},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":32448},"to":{"change":20,"start":492536,"end":492553},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":492536},"to":{"change":20,"start":492536,"end":492553},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":492553},"to":{"change":20,"start":32449,"end":32470},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" if e?.flag().is_alive_parent() {"},{"Add":" return Ok(Some(vertex));"},{"Add":" }"}],"del_contents":[{"Del":" Ok(Some(vertex))\n"},{"Del":" } else {\n"},{"Del":" Ok(None)\n"}]}},{"Edit":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":237,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":492580}],"down_context":[{"change":20,"pos":492580}],"flag":"BLOCK","start":44327,"end":44344,"inode":{"change":20,"pos":488880}}},"contents":[{"Add":" Ok(None)"}]}},{"Edit":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":241,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":492612}],"down_context":[{"change":20,"pos":492612}],"flag":"BLOCK","start":44345,"end":44527,"inode":{"change":20,"pos":488880}}},"contents":[{"Add":"}"},{"Add":""},{"Add":"struct Tasks {"},{"Add":" stop: bool,"},{"Add":" t: VecDeque<("},{"Add":" RecordItem,"},{"Add":" Position,"},{"Add":" Arc>,"},{"Add":" Option>>,"},{"Add":" )>,"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":254,"ins":{"up_context":[{"change":20,"pos":492630}],"down_context":[{"change":20,"pos":492700}],"flag":"BLOCK","start":44528,"end":44662,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":492630},"to":{"change":20,"start":28095,"end":28149},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" pub fn record<"},{"Add":" T,"},{"Add":" W: WorkingCopy + Send + Sync + 'static,"},{"Add":" C: ChangeStore + Clone + Send + 'static,"},{"Add":" >("}],"del_contents":[{"Del":" pub fn record(\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":260,"ins":{"up_context":[{"change":20,"pos":492719}],"down_context":[{"change":20,"pos":492740}],"flag":"BLOCK","start":44663,"end":44692,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":492719},"to":{"change":20,"start":492719,"end":492740},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" txn: Arc>,"}],"del_contents":[{"Del":" txn: &mut T,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":262,"ins":{"up_context":[{"change":20,"pos":492781}],"down_context":[{"change":20,"pos":492848}],"flag":"BLOCK","start":44693,"end":44755,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":492781},"to":{"change":20,"start":28150,"end":28184},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":28184},"to":{"change":20,"start":492818,"end":492848},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":32585},"to":{"change":20,"start":492818,"end":492848},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":492818},"to":{"change":20,"start":492818,"end":492848},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" channel: ChannelRef,"},{"Add":" working_copy: Arc,"}],"del_contents":[{"Del":" channel: &mut T::Channel,\n"},{"Del":" working_copy: &mut W,\n"}]}},{"Edit":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":266,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":492891}],"down_context":[{"change":20,"pos":32586}],"flag":"BLOCK","start":44756,"end":44783,"inode":{"change":20,"pos":488880}}},"contents":[{"Add":" _n_workers: usize,"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":269,"ins":{"up_context":[{"change":20,"pos":32664}],"down_context":[{"change":20,"pos":32756}],"flag":"BLOCK","start":44784,"end":44969,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":32664},"to":{"change":20,"start":28185,"end":28265},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" T: ChannelMutTxnT"},{"Add":" + TreeTxnT::GraphError>"},{"Add":" + Send"},{"Add":" + Sync"},{"Add":" + 'static,"},{"Add":" T::Channel: Send + Sync,"}],"del_contents":[{"Del":" T: ChannelMutTxnT + TreeTxnT::GraphError>,\n"}]}},{"Edit":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":277,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":32806}],"down_context":[{"change":20,"pos":492928}],"flag":"BLOCK","start":44970,"end":46638,"inode":{"change":20,"pos":488880}}},"contents":[{"Add":" let work = Arc::new(Mutex::new(Tasks {"},{"Add":" t: VecDeque::new(),"},{"Add":" stop: false,"},{"Add":" }));"},{"Add":" let mut workers: Vec> = Vec::new();"},{"Add":" for t in 0..0 {"},{"Add":" // n_workers - 1 {"},{"Add":" let working_copy = working_copy.clone();"},{"Add":" let changes = changes.clone();"},{"Add":" let channel = channel.clone();"},{"Add":" let work = work.clone();"},{"Add":" let txn = txn.clone();"},{"Add":" workers.push(std::thread::spawn(move || loop {"},{"Add":" let (w, stop) = {"},{"Add":" let mut work = work.lock().unwrap();"},{"Add":" (work.t.pop_front(), work.stop)"},{"Add":" };"},{"Add":" if let Some((item, vertex, rec, new_papa)) = w {"},{"Add":" // This parent has changed."},{"Add":" info!(\"record existing file {:?} on thread {:?}\", item, t);"},{"Add":" rec.lock()"},{"Add":" .unwrap()"},{"Add":" .record_existing_file("},{"Add":" txn.clone(),"},{"Add":" diff_algorithm,"},{"Add":" channel.clone(),"},{"Add":" working_copy.clone(),"},{"Add":" &changes,"},{"Add":" &item,"},{"Add":" new_papa,"},{"Add":" vertex,"},{"Add":" )"},{"Add":" .unwrap();"},{"Add":" } else if stop {"},{"Add":" info!(\"stop {:?}\", t);"},{"Add":" break;"},{"Add":" } else {"},{"Add":" info!(\"yield {:?}\", t);"},{"Add":" std::thread::park_timeout(std::time::Duration::from_secs(1));"},{"Add":" }"},{"Add":" }))"},{"Add":" }"},{"Add":""}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":321,"ins":{"up_context":[{"change":20,"pos":492973}],"down_context":[{"change":20,"pos":493118}],"flag":"BLOCK","start":46639,"end":46778,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":493013},"to":{"change":20,"start":493013,"end":493118},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" let mut stack = vec![(RecordItem::root(), components(prefix))];"},{"Add":" while let Some((mut item, mut components)) = stack.pop() {"}],"del_contents":[{"Del":" let mut stack = vec![RecordItem::root(prefix)];\n while let Some(mut item) = stack.pop() {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":326,"ins":{"up_context":[{"change":20,"pos":493224}],"down_context":[{"change":20,"pos":493335}],"flag":"BLOCK","start":46779,"end":47068,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":493224},"to":{"change":20,"start":493224,"end":493335},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" let vertex: Option>> = self"},{"Add":" .recorded_inodes"},{"Add":" .lock()"},{"Add":" .unwrap()"},{"Add":" .get(&item.inode)"},{"Add":" .cloned();"},{"Add":" let vertex = if let Some(vertex) = vertex {"},{"Add":" vertex"}],"del_contents":[{"Del":" let vertex = if let Some(vertex) = self.recorded_inodes.get(&item.inode) {\n *vertex\n"}]}},{"Edit":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":336,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":493422}],"down_context":[{"change":20,"pos":493422}],"flag":"BLOCK","start":47069,"end":47127,"inode":{"change":20,"pos":488880}}},"contents":[{"Add":" .lock()"},{"Add":" .unwrap()"}]}},{"Edit":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":339,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":493487}],"down_context":[{"change":20,"pos":493487}],"flag":"BLOCK","start":47128,"end":47351,"inode":{"change":20,"pos":488880}}},"contents":[{"Add":" debug!(\"TAKING LOCK {}\", line!());"},{"Add":" let txn = txn.read().unwrap();"},{"Add":" debug!(\"TAKEN\");"},{"Add":" let channel = channel.r.read().unwrap();"},{"Add":" debug!(\"TAKEN 2\");"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":345,"ins":{"up_context":[{"change":20,"pos":493534}],"down_context":[{"change":20,"pos":0}],"flag":"BLOCK","start":47352,"end":47463,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":493534},"to":{"change":20,"start":493534,"end":493559},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":493559},"to":{"change":20,"start":1202,"end":1242},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":1242},"to":{"change":20,"start":493589,"end":493623},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":28305},"to":{"change":20,"start":493589,"end":493623},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":32843},"to":{"change":20,"start":493589,"end":493623},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":493589},"to":{"change":20,"start":493589,"end":493623},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" &*txn,"},{"Add":" txn.graph(&channel),"},{"Add":" working_copy.as_ref(),"}],"del_contents":[{"Del":" txn,\n"},{"Del":" txn.graph(channel),\n"},{"Del":" working_copy,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":353,"ins":{"up_context":[{"change":20,"pos":493753}],"down_context":[{"change":20,"pos":494411}],"flag":"BLOCK","start":47464,"end":48643,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":493753},"to":{"change":20,"start":49098,"end":49182},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":49182},"to":{"change":20,"start":0,"end":72},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":32947},"to":{"change":20,"start":0,"end":72},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":72},"to":{"change":20,"start":1243,"end":1283},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":1283},"to":{"change":20,"start":111,"end":259},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":111},"to":{"change":20,"start":111,"end":259},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":259},"to":{"change":20,"start":493834,"end":494183},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":32947},"to":{"change":20,"start":493834,"end":494183},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":493834},"to":{"change":20,"start":493834,"end":494183},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" } else if let Some(vertex) = get_inodes_(txn.clone(), channel.clone(), &item.inode)? {"},{"Add":" {"},{"Add":" let mut txn = txn.write().unwrap();"},{"Add":" let mut channel = channel.r.write().unwrap();"},{"Add":" let mut graph = txn.graph(&mut *channel);"},{"Add":" self.delete_obsolete_children("},{"Add":" &mut *txn,"},{"Add":" &mut graph,"},{"Add":" working_copy.as_ref(),"},{"Add":" changes,"},{"Add":" &item.full_path,"},{"Add":" vertex,"},{"Add":" )?;"},{"Add":" }"},{"Add":""},{"Add":" let rec = self.recorded();"},{"Add":" let new_papa = {"},{"Add":" let mut recorded = self.recorded_inodes.lock().unwrap();"},{"Add":" recorded.insert(item.inode, vertex.to_option());"},{"Add":" recorded.get(&item.papa).cloned()"},{"Add":" };"},{"Add":" let mut work = work.lock().unwrap();"},{"Add":" work.t.push_back((item.clone(), vertex, rec, new_papa));"},{"Add":" std::mem::drop(work);"},{"Add":" for t in workers.iter() {"},{"Add":" t.thread().unpark()"},{"Add":" }"},{"Add":""}],"del_contents":[{"Del":" } else if let Some(&vertex) = get_inodes(txn, &channel, &item.inode)? {\n"},{"Del":" self.delete_obsolete_children(\n txn,\n"},{"Del":" txn.graph(channel),\n"},{"Del":" working_copy,\n changes,\n &item.full_path,\n vertex,\n )?;\n"},{"Del":" self.record_existing_file(\n txn,\n diff_algorithm,\n &channel,\n working_copy,\n changes,\n &item,\n vertex,\n )?;\n self.recorded_inodes.insert(item.inode, vertex.to_option());\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":383,"ins":{"up_context":[{"change":20,"pos":494467}],"down_context":[{"change":20,"pos":494533}],"flag":"BLOCK","start":48644,"end":48863,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":494467},"to":{"change":20,"start":494467,"end":494533},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" let rec = self.recorded();"},{"Add":" debug!(\"TAKING LOCK {}\", line!());"},{"Add":" let mut rec = rec.lock().unwrap();"},{"Add":" match rec.add_file(working_copy.as_ref(), item.clone()) {"}],"del_contents":[{"Del":" match self.add_file(working_copy, item.clone()) {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":389,"ins":{"up_context":[{"change":20,"pos":494649}],"down_context":[{"change":20,"pos":494722}],"flag":"BLOCK","start":48864,"end":49040,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":494649},"to":{"change":20,"start":494649,"end":494722},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" self.recorded_inodes"},{"Add":" .lock()"},{"Add":" .unwrap()"},{"Add":" .insert(item.inode, vertex);"}],"del_contents":[{"Del":" self.recorded_inodes.insert(item.inode, vertex);\n"}]}},{"Edit":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":400,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":495237}],"down_context":[{"change":20,"pos":11697}],"flag":"BLOCK","start":49041,"end":49184,"inode":{"change":20,"pos":488880}}},"contents":[{"Add":" debug!(\"TAKING LOCK {}\", line!());"},{"Add":" let txn = txn.read().unwrap();"},{"Add":" let channel = channel.r.read().unwrap();"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":404,"ins":{"up_context":[{"change":20,"pos":11740}],"down_context":[{"change":20,"pos":495346}],"flag":"BLOCK","start":49185,"end":49274,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":11740},"to":{"change":20,"start":495269,"end":495346},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":495269},"to":{"change":20,"start":495269,"end":495346},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" &*txn,"},{"Add":" &*channel,"},{"Add":" working_copy.as_ref(),"}],"del_contents":[{"Del":" txn,\n &channel,\n working_copy,\n"}]}},{"Edit":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":408,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":495373}],"down_context":[{"change":20,"pos":495373}],"flag":"BLOCK","start":49275,"end":49308,"inode":{"change":20,"pos":488880}}},"contents":[{"Add":" &mut components,"}]}},{"Edit":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":413,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":495465}],"down_context":[{"change":20,"pos":495465}],"flag":"BLOCK","start":49309,"end":50468,"inode":{"change":20,"pos":488880}}},"contents":[{"Add":" }"},{"Add":""},{"Add":" info!(\"stop work\");"},{"Add":" work.lock().unwrap().stop = true;"},{"Add":" for t in workers.iter() {"},{"Add":" t.thread().unpark()"},{"Add":" }"},{"Add":" loop {"},{"Add":" let w = {"},{"Add":" let mut work = work.lock().unwrap();"},{"Add":" debug!(\"waiting, stop = {:?}\", work.stop);"},{"Add":" work.t.pop_front()"},{"Add":" };"},{"Add":" if let Some((item, vertex, rec, new_papa)) = w {"},{"Add":" // This parent has changed."},{"Add":" info!(\"record existing file {:?}\", item);"},{"Add":" rec.lock()"},{"Add":" .unwrap()"},{"Add":" .record_existing_file("},{"Add":" txn.clone(),"},{"Add":" diff_algorithm,"},{"Add":" channel.clone(),"},{"Add":" working_copy.clone(),"},{"Add":" changes,"},{"Add":" &item,"},{"Add":" new_papa,"},{"Add":" vertex,"},{"Add":" )"},{"Add":" .unwrap();"},{"Add":" } else {"},{"Add":" break;"},{"Add":" }"},{"Add":" }"},{"Add":" for (n, t) in workers.into_iter().enumerate() {"},{"Add":" debug!(\"WAITING {:?}\", n);"},{"Add":" t.join().unwrap()"}]}},{"Edit":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":451,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":495538}],"down_context":[{"change":20,"pos":495538}],"flag":"BLOCK","start":50469,"end":50499,"inode":{"change":20,"pos":488880}}},"contents":[{"Add":" info!(\"record done\");"}]}},{"Edit":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":455,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":1}],"down_context":[{"change":20,"pos":495618}],"flag":"BLOCK","start":50500,"end":56806,"inode":{"change":20,"pos":488880}}},"contents":[{"Add":" fn delete_obsolete_children<"},{"Add":" T: GraphTxnT + TreeTxnT::GraphError>,"},{"Add":" W: WorkingCopy,"},{"Add":" C: ChangeStore,"},{"Add":" >("},{"Add":" &mut self,"},{"Add":" txn: &T,"},{"Add":" channel: &T::Graph,"},{"Add":" working_copy: &W,"},{"Add":" changes: &C,"},{"Add":" full_path: &str,"},{"Add":" v: Position,"},{"Add":" ) -> Result<(), RecordError>"},{"Add":" where"},{"Add":" ::Error: 'static,"},{"Add":" {"},{"Add":" if self.ignore_missing {"},{"Add":" return Ok(());"},{"Add":" }"},{"Add":" let f0 = EdgeFlags::FOLDER | EdgeFlags::BLOCK;"},{"Add":" let f1 = f0 | EdgeFlags::PSEUDO;"},{"Add":" debug!(\"delete_obsolete_children, v = {:?}\", v);"},{"Add":" for child in iter_adjacent(txn, channel, v.inode_vertex(), f0, f1)? {"},{"Add":" let child = child?;"},{"Add":" let child = txn.find_block(channel, child.dest()).unwrap();"},{"Add":" for grandchild in iter_adjacent(txn, channel, *child, f0, f1)? {"},{"Add":" let grandchild = grandchild?;"},{"Add":" debug!(\"grandchild {:?}\", grandchild);"},{"Add":" let needs_deletion ="},{"Add":" if let Some(inode) = txn.get_revinodes(&grandchild.dest(), None)? {"},{"Add":" debug!(\"inode = {:?} {:?}\", inode, txn.get_revtree(inode, None));"},{"Add":" if let Some(path) = crate::fs::inode_filename(txn, *inode)? {"},{"Add":" working_copy.file_metadata(&path).is_err()"},{"Add":" } else {"},{"Add":" true"},{"Add":" }"},{"Add":" } else {"},{"Add":" true"},{"Add":" };"},{"Add":" if needs_deletion {"},{"Add":" let mut name = Vec::new();"},{"Add":" changes"},{"Add":" .get_contents("},{"Add":" |p| txn.get_external(&p).unwrap().map(From::from),"},{"Add":" *child,"},{"Add":" &mut name,"},{"Add":" )"},{"Add":" .map_err(RecordError::Changestore)?;"},{"Add":" let mut full_path = full_path.to_string();"},{"Add":" if name.len() > 2 {"},{"Add":" if let Ok(name) = std::str::from_utf8(&name[2..]) {"},{"Add":" if !full_path.is_empty() {"},{"Add":" full_path.push('/');"},{"Add":" }"},{"Add":" full_path.push_str(name);"},{"Add":" }"},{"Add":" }"},{"Add":" // delete recursively."},{"Add":" let rec = self.recorded();"},{"Add":" let mut rec = rec.lock().unwrap();"},{"Add":" rec.record_deleted_file("},{"Add":" txn,"},{"Add":" &channel,"},{"Add":" working_copy,"},{"Add":" &full_path,"},{"Add":" grandchild.dest(),"},{"Add":" )?"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":""},{"Add":" fn push_children<"},{"Add":" 'a,"},{"Add":" T: ChannelTxnT + TreeTxnT::GraphError>,"},{"Add":" W: WorkingCopy,"},{"Add":" C: ChangeStore,"},{"Add":" >("},{"Add":" &mut self,"},{"Add":" txn: &T,"},{"Add":" channel: &T::Channel,"},{"Add":" working_copy: &W,"},{"Add":" item: &mut RecordItem,"},{"Add":" components: &mut Components<'a>,"},{"Add":" vertex: Position>,"},{"Add":" stack: &mut Vec<(RecordItem, Components<'a>)>,"},{"Add":" prefix: &str,"},{"Add":" ) -> Result<(), RecordError>"},{"Add":" where"},{"Add":" ::Error: 'static,"},{"Add":" {"},{"Add":" debug!(\"push_children, item = {:?}\", item);"},{"Add":" let comp = components.next();"},{"Add":" let full_path = item.full_path.clone();"},{"Add":" let fileid = OwnedPathId {"},{"Add":" parent_inode: item.inode,"},{"Add":" basename: SmallString::new(),"},{"Add":" };"},{"Add":" let mut has_matching_children = false;"},{"Add":" for x in txn.iter_tree(&fileid, None)? {"},{"Add":" let (fileid_, child_inode) = x?;"},{"Add":" debug!(\"push_children {:?} {:?}\", fileid_, child_inode);"},{"Add":" if fileid_.parent_inode < fileid.parent_inode || fileid_.basename.is_empty() {"},{"Add":" continue;"},{"Add":" } else if fileid_.parent_inode > fileid.parent_inode {"},{"Add":" break;"},{"Add":" }"},{"Add":" if let Some(comp) = comp {"},{"Add":" if comp != fileid_.basename.as_str() {"},{"Add":" continue;"},{"Add":" }"},{"Add":" }"},{"Add":" has_matching_children = true;"},{"Add":" let basename = fileid_.basename.as_str().to_string();"},{"Add":" let full_path = if full_path.is_empty() {"},{"Add":" basename.clone()"},{"Add":" } else {"},{"Add":" full_path.clone() + \"/\" + &basename"},{"Add":" };"},{"Add":" debug!(\"fileid_ {:?} child_inode {:?}\", fileid_, child_inode);"},{"Add":" if let Ok(meta) = working_copy.file_metadata(&full_path) {"},{"Add":" stack.push(("},{"Add":" RecordItem {"},{"Add":" papa: item.inode,"},{"Add":" inode: *child_inode,"},{"Add":" v_papa: vertex,"},{"Add":" basename,"},{"Add":" full_path,"},{"Add":" metadata: meta,"},{"Add":" },"},{"Add":" components.clone(),"},{"Add":" ));"},{"Add":" } else if let Some(vertex) = get_inodes(txn, &channel, child_inode)? {"},{"Add":" let rec = self.recorded();"},{"Add":" let mut rec = rec.lock().unwrap();"},{"Add":" rec.record_deleted_file(txn, txn.graph(channel), working_copy, &full_path, *vertex)?"},{"Add":" }"},{"Add":" }"},{"Add":" if comp.is_some() && !has_matching_children {"},{"Add":" debug!(\"comp = {:?}\", comp);"},{"Add":" return Err(RecordError::PathNotInRepo(prefix.to_string()));"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"fn modified_since_last_commit("},{"Add":" txn: &T,"},{"Add":" channel: &T::Channel,"},{"Add":" working_copy: &W,"},{"Add":" prefix: &str,"},{"Add":") -> Result {"},{"Add":" if let Ok(last_modified) = working_copy.modified_time(prefix) {"},{"Add":" debug!("},{"Add":" \"last_modified = {:?}, channel.last = {:?}\","},{"Add":" last_modified"},{"Add":" .duration_since(std::time::UNIX_EPOCH)?"},{"Add":" .as_secs(),"},{"Add":" txn.last_modified(channel)"},{"Add":" );"},{"Add":" Ok(last_modified"},{"Add":" .duration_since(std::time::UNIX_EPOCH)?"},{"Add":" .as_secs()"},{"Add":" >= txn.last_modified(channel))"},{"Add":" } else {"},{"Add":" Ok(true)"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl Recorded {"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":628,"ins":{"up_context":[{"change":20,"pos":495670}],"down_context":[{"change":20,"pos":495700}],"flag":"BLOCK","start":56807,"end":56833,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":495670},"to":{"change":20,"start":495670,"end":495700},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" working_copy: &W,"}],"del_contents":[{"Del":" working_copy: &mut W,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":633,"ins":{"up_context":[{"change":20,"pos":495974}],"down_context":[{"change":20,"pos":496436}],"flag":"BLOCK","start":56834,"end":57327,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":495974},"to":{"change":20,"start":49183,"end":49256},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":49256},"to":{"change":20,"start":496047,"end":496160},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":496047},"to":{"change":20,"start":496047,"end":496160},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":496160},"to":{"change":20,"start":49257,"end":49328},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":49328},"to":{"change":20,"start":496294,"end":496329},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":496294},"to":{"change":20,"start":496294,"end":496329},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":496329},"to":{"change":20,"start":49329,"end":49401},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":49401},"to":{"change":20,"start":496401,"end":496436},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":496401},"to":{"change":20,"start":496401,"end":496436},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" let mut contents = self.contents.lock().unwrap();"},{"Add":" let name_start = ChangePosition(contents.len().into());"},{"Add":" // Push the metadata, big-endian."},{"Add":" contents.push((meta.0 >> 8) as u8);"},{"Add":" contents.push((meta.0 & 0xff) as u8);"},{"Add":" //"},{"Add":" contents.extend(item.basename.as_bytes());"},{"Add":" let name_end = ChangePosition(contents.len().into());"},{"Add":" contents.push(0);"},{"Add":" let inode_pos = ChangePosition(contents.len().into());"},{"Add":" contents.push(0);"}],"del_contents":[{"Del":" let name_start = ChangePosition(self.rec.contents.len().into());\n"},{"Del":" meta.write(&mut self.rec.contents).unwrap();\n self.rec.contents.extend(item.basename.as_bytes());\n"},{"Del":" let name_end = ChangePosition(self.rec.contents.len().into());\n"},{"Del":" self.rec.contents.push(0);\n"},{"Del":" let inode_pos = ChangePosition(self.rec.contents.len().into());\n"},{"Del":" self.rec.contents.push(0);\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":646,"ins":{"up_context":[{"change":20,"pos":496480}],"down_context":[{"change":20,"pos":49644}],"flag":"BLOCK","start":57328,"end":57650,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":496480},"to":{"change":20,"start":49402,"end":49474},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":49474},"to":{"change":20,"start":496552,"end":496630},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":496552},"to":{"change":20,"start":496552,"end":496630},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":496630},"to":{"change":20,"start":49475,"end":49643},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":49643},"to":{"change":20,"start":496780,"end":496823},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":496780},"to":{"change":20,"start":496780,"end":496823},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" let start = ChangePosition(contents.len().into());"},{"Add":" working_copy.read_file(&item.full_path, &mut contents)?;"},{"Add":" let end = ChangePosition(contents.len().into());"},{"Add":" self.largest_file = self.largest_file.max(end.0.as_u64() - start.0.as_u64());"},{"Add":" self.has_binary_files |= {"}],"del_contents":[{"Del":" let start = ChangePosition(self.rec.contents.len().into());\n"},{"Del":" working_copy.read_file(&item.full_path, &mut self.rec.contents)?;\n"},{"Del":" let end = ChangePosition(self.rec.contents.len().into());\n self.rec.largest_file = self.rec.largest_file.max(end.0.as_u64() - start.0.as_u64());\n"},{"Del":" self.rec.has_binary_files |= {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":653,"ins":{"up_context":[{"change":20,"pos":49750}],"down_context":[{"change":20,"pos":497005}],"flag":"BLOCK","start":57651,"end":57716,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":49750},"to":{"change":20,"start":496931,"end":497005},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":496931},"to":{"change":20,"start":496931,"end":497005},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" let utf8 = std::str::from_utf8(&contents[s..e]);"}],"del_contents":[{"Del":" let utf8 = std::str::from_utf8(&self.rec.contents[s..e]);\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":660,"ins":{"up_context":[{"change":20,"pos":497208}],"down_context":[{"change":20,"pos":0}],"flag":"BLOCK","start":57717,"end":57747,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":497208},"to":{"change":20,"start":497208,"end":497247},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" contents.push(0);"}],"del_contents":[{"Del":" self.rec.contents.push(0);\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":682,"ins":{"up_context":[{"change":20,"pos":497912}],"down_context":[{"change":20,"pos":498023}],"flag":"BLOCK","start":57748,"end":57790,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":497912},"to":{"change":20,"start":1663,"end":1709},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" self.actions.push(Hunk::FileAdd {"}],"del_contents":[{"Del":" self.rec.actions.push(Hunk::FileAdd {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":705,"ins":{"up_context":[{"change":20,"pos":498812}],"down_context":[{"change":20,"pos":499005}],"flag":"BLOCK","start":57791,"end":57909,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":498812},"to":{"change":20,"start":498812,"end":498870},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":498933},"to":{"change":20,"start":498933,"end":499005},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" debug!(\"{:?}\", self.actions.last().unwrap());"},{"Add":" self.updatables.insert("},{"Add":" self.actions.len(),"}],"del_contents":[{"Del":" debug!(\"{:?}\", self.rec.actions.last().unwrap());\n"},{"Del":" self.rec.updatables.insert(\n self.rec.actions.len(),\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":724,"ins":{"up_context":[{"change":20,"pos":32977}],"down_context":[{"change":20,"pos":33054}],"flag":"BLOCK","start":57910,"end":57987,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":32977},"to":{"change":20,"start":28306,"end":28386},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" T: ChannelTxnT + TreeTxnT::GraphError>,"}],"del_contents":[{"Del":" T: ChannelMutTxnT + TreeTxnT::GraphError>,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":729,"ins":{"up_context":[{"change":20,"pos":499475}],"down_context":[{"change":20,"pos":499496}],"flag":"BLOCK","start":57988,"end":58017,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":499475},"to":{"change":20,"start":499475,"end":499496},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" txn: Arc>,"}],"del_contents":[{"Del":" txn: &mut T,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":731,"ins":{"up_context":[{"change":20,"pos":499537}],"down_context":[{"change":20,"pos":499597}],"flag":"BLOCK","start":58018,"end":58080,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":499537},"to":{"change":20,"start":28387,"end":28417},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":28417},"to":{"change":20,"start":499567,"end":499597},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":499567},"to":{"change":20,"start":499567,"end":499597},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" channel: ChannelRef,"},{"Add":" working_copy: Arc,"}],"del_contents":[{"Del":" channel: &T::Channel,\n"},{"Del":" working_copy: &mut W,\n"}]}},{"Edit":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":735,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":499645}],"down_context":[{"change":20,"pos":499645}],"flag":"BLOCK","start":58081,"end":58135,"inode":{"change":20,"pos":488880}}},"contents":[{"Add":" new_papa: Option>>,"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":746,"ins":{"up_context":[{"change":20,"pos":499882}],"down_context":[{"change":20,"pos":499919}],"flag":"BLOCK","start":58136,"end":58181,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":499882},"to":{"change":20,"start":499882,"end":499919},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" let mut former_parents = Vec::new();"}],"del_contents":[{"Del":" self.former_parents.clear();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":750,"ins":{"up_context":[{"change":20,"pos":500045}],"down_context":[{"change":20,"pos":49753}],"flag":"BLOCK","start":58182,"end":58442,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":500045},"to":{"change":20,"start":49751,"end":49752},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":49752},"to":{"change":20,"start":1284,"end":1378},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":500045},"to":{"change":20,"start":1284,"end":1378},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" let txn_ = txn.read().unwrap();"},{"Add":" let channel_ = channel.read().unwrap();"},{"Add":" for name_ in iter_adjacent("},{"Add":" &*txn_,"},{"Add":" txn_.graph(&*channel_),"},{"Add":" vertex.inode_vertex(),"},{"Add":" f0,"},{"Add":" f1,"},{"Add":" )? {"}],"del_contents":[{"Del":"\n"},{"Del":" for name_ in iter_adjacent(txn, txn.graph(channel), vertex.inode_vertex(), f0, f1)? {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":770,"ins":{"up_context":[{"change":20,"pos":500452}],"down_context":[{"change":20,"pos":6515}],"flag":"BLOCK","start":58443,"end":58546,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":500452},"to":{"change":20,"start":6417,"end":6515},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" let name_dest = txn_"},{"Add":" .find_block_end(txn_.graph(&*channel_), name_.dest())"}],"del_contents":[{"Del":" let name_dest = txn\n .find_block_end(txn.graph(channel), name_.dest())\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":776,"ins":{"up_context":[{"change":20,"pos":6574}],"down_context":[{"change":20,"pos":6645}],"flag":"BLOCK","start":58547,"end":58619,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":6574},"to":{"change":20,"start":6574,"end":6645},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" |p| txn_.get_external(&p).unwrap().map(From::from),"}],"del_contents":[{"Del":" |p| txn.get_external(&p).unwrap().map(From::from),\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":788,"ins":{"up_context":[{"change":20,"pos":905}],"down_context":[{"change":20,"pos":495}],"flag":"BLOCK","start":58620,"end":58744,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":905},"to":{"change":20,"start":50150,"end":50251},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" if let Some(v_papa) ="},{"Add":" 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":20,"pos":488880},"path":"libpijul/src/record.rs","line":793,"ins":{"up_context":[{"change":20,"pos":50317}],"down_context":[{"change":20,"pos":204}],"flag":"BLOCK","start":58745,"end":58794,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":50317},"to":{"change":20,"start":150,"end":204},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":150},"to":{"change":20,"start":150,"end":204},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" former_parents.push(Parent {"}],"del_contents":[{"Del":" self.former_parents.push(Parent {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":803,"ins":{"up_context":[{"change":20,"pos":501290}],"down_context":[{"change":20,"pos":501341}],"flag":"BLOCK","start":58795,"end":58841,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":501290},"to":{"change":20,"start":501290,"end":501341},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" item, former_parents, is_deleted,"}],"del_contents":[{"Del":" item, self.former_parents, is_deleted,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":805,"ins":{"up_context":[{"change":20,"pos":501352}],"down_context":[{"change":20,"pos":501402}],"flag":"BLOCK","start":58842,"end":58887,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":501352},"to":{"change":20,"start":501352,"end":501402},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" assert!(!former_parents.is_empty());"}],"del_contents":[{"Del":" assert!(!self.former_parents.is_empty());\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":808,"ins":{"up_context":[{"change":20,"pos":501527}],"down_context":[{"change":20,"pos":501772}],"flag":"BLOCK","start":58888,"end":59113,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":501527},"to":{"change":20,"start":501527,"end":501772},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" if former_parents.len() > 1"},{"Add":" || former_parents[0].basename != item.basename"},{"Add":" || former_parents[0].metadata != item.metadata"},{"Add":" || former_parents[0].parent != item.v_papa"}],"del_contents":[{"Del":" if self.former_parents.len() > 1\n || self.former_parents[0].basename != item.basename\n || self.former_parents[0].metadata != item.metadata\n || self.former_parents[0].parent != item.v_papa\n"}]}},{"Edit":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":814,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":501816},"to":{"change":20,"start":501816,"end":501939},"introduced_by":20}],"inode":{"change":20,"pos":488880}}},"contents":[{"Del":" // This parent has changed.\n let new_papa = *self.recorded_inodes.get(&item.papa).unwrap();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":817,"ins":{"up_context":[{"change":20,"pos":502061}],"down_context":[{"change":20,"pos":502116}],"flag":"BLOCK","start":59114,"end":59186,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":502061},"to":{"change":20,"start":502061,"end":502086},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":502086},"to":{"change":20,"start":1572,"end":1612},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" &*txn_,"},{"Add":" txn_.graph(&*channel_),"}],"del_contents":[{"Del":" txn,\n"},{"Del":" txn.graph(channel),\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":821,"ins":{"up_context":[{"change":20,"pos":502171}],"down_context":[{"change":20,"pos":33880}],"flag":"BLOCK","start":59187,"end":59226,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":502171},"to":{"change":20,"start":502171,"end":502201},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" new_papa.unwrap(),"}],"del_contents":[{"Del":" new_papa,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":826,"ins":{"up_context":[{"change":20,"pos":502359}],"down_context":[{"change":20,"pos":452}],"flag":"BLOCK","start":59227,"end":59393,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":502359},"to":{"change":20,"start":1613,"end":1698},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":1698},"to":{"change":20,"start":380,"end":452},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":380},"to":{"change":20,"start":380,"end":452},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" || modified_since_last_commit("},{"Add":" &*txn_,"},{"Add":" &*channel_,"},{"Add":" working_copy.as_ref(),"}],"del_contents":[{"Del":" || self.modified_since_last_commit(\n txn,\n"},{"Del":" &channel,\n working_copy,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":833,"ins":{"up_context":[{"change":20,"pos":502466}],"down_context":[{"change":20,"pos":502529}],"flag":"BLOCK","start":59394,"end":59475,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":502466},"to":{"change":20,"start":1699,"end":1773},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" let mut ret = retrieve(&*txn_, txn_.graph(&*channel_), vertex)?;"}],"del_contents":[{"Del":" let mut ret = retrieve(txn, txn.graph(channel), vertex)?;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":839,"ins":{"up_context":[{"change":20,"pos":502673}],"down_context":[{"change":20,"pos":502723}],"flag":"BLOCK","start":59476,"end":59522,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":502673},"to":{"change":20,"start":502673,"end":502723},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" let len = self.actions.len();"}],"del_contents":[{"Del":" let len = self.rec.actions.len();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":842,"ins":{"up_context":[{"change":20,"pos":502779}],"down_context":[{"change":20,"pos":502834}],"flag":"BLOCK","start":59523,"end":59583,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":502779},"to":{"change":20,"start":502779,"end":502834},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" &*txn_,"},{"Add":" &*channel_,"}],"del_contents":[{"Del":" txn,\n &channel,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":850,"ins":{"up_context":[{"change":20,"pos":503028}],"down_context":[{"change":20,"pos":1551}],"flag":"BLOCK","start":59584,"end":59630,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":503028},"to":{"change":20,"start":1501,"end":1551},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" if self.actions.len() > len {"}],"del_contents":[{"Del":" if self.rec.actions.len() > len {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":852,"ins":{"up_context":[{"change":20,"pos":1644}],"down_context":[{"change":8,"pos":224}],"flag":"BLOCK","start":59631,"end":59780,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1644},"to":{"change":8,"start":67,"end":224},"introduced_by":8}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" if self.oldest_change == std::time::SystemTime::UNIX_EPOCH {"},{"Add":" self.oldest_change = last_modified;"}],"del_contents":[{"Del":" if self.rec.oldest_change == std::time::SystemTime::UNIX_EPOCH {\n self.rec.oldest_change = last_modified;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":855,"ins":{"up_context":[{"change":8,"pos":257}],"down_context":[{"change":8,"pos":353}],"flag":"BLOCK","start":59781,"end":59869,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":257},"to":{"change":8,"start":257,"end":353},"introduced_by":8}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" self.oldest_change = self.oldest_change.min(last_modified);"}],"del_contents":[{"Del":" self.rec.oldest_change = self.rec.oldest_change.min(last_modified);\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":861,"ins":{"up_context":[{"change":20,"pos":2878}],"down_context":[{"change":20,"pos":2972}],"flag":"BLOCK","start":59870,"end":59956,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":2878},"to":{"change":20,"start":2878,"end":2972},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" &self.actions.len() - len,"},{"Add":" self.actions.len()"}],"del_contents":[{"Del":" &self.rec.actions.len() - len,\n self.rec.actions.len()\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":868,"ins":{"up_context":[{"change":20,"pos":28957}],"down_context":[{"change":20,"pos":29043}],"flag":"BLOCK","start":59957,"end":60060,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":28957},"to":{"change":20,"start":28957,"end":28978},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":28978},"to":{"change":20,"start":1774,"end":1810},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":1810},"to":{"change":20,"start":29013,"end":29043},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":29013},"to":{"change":20,"start":29013,"end":29043},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" &*txn_,"},{"Add":" txn_.graph(&*channel_),"},{"Add":" working_copy.as_ref(),"}],"del_contents":[{"Del":" txn,\n"},{"Del":" txn.graph(channel),\n"},{"Del":" working_copy,\n"}]}},{"Edit":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":878,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":503333},"to":{"change":20,"start":34070,"end":34202},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":34202},"to":{"change":20,"start":30,"end":54},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":54},"to":{"change":20,"start":34202,"end":34209},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":34202},"to":{"change":20,"start":34202,"end":34209},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":444},"to":{"change":20,"start":503398,"end":503434},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":34209},"to":{"change":20,"start":503398,"end":503434},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":503398},"to":{"change":20,"start":503398,"end":503434},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":503434},"to":{"change":20,"start":34210,"end":34238},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":34238},"to":{"change":20,"start":503464,"end":503490},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":503464},"to":{"change":20,"start":503464,"end":503490},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":503490},"to":{"change":20,"start":55,"end":76},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":76},"to":{"change":20,"start":503490,"end":503546},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":503490},"to":{"change":20,"start":503490,"end":503546},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":503546},"to":{"change":20,"start":77,"end":205},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":205},"to":{"change":7,"start":1939,"end":2009},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":20,"pos":205},"to":{"change":20,"start":503554,"end":503650},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":7,"pos":2009},"to":{"change":20,"start":503554,"end":503650},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":20,"pos":34284},"to":{"change":20,"start":503554,"end":503650},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":503554},"to":{"change":20,"start":503554,"end":503650},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":503650},"to":{"change":20,"start":260,"end":317},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":317},"to":{"change":20,"start":34285,"end":34395},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":503681},"to":{"change":20,"start":34285,"end":34395},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":34395},"to":{"change":20,"start":50378,"end":50527},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":50527},"to":{"change":20,"start":34542,"end":34588},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":34542},"to":{"change":20,"start":34542,"end":34588},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":34469},"to":{"change":20,"start":503904,"end":503959},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":34588},"to":{"change":20,"start":503904,"end":503959},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":503904},"to":{"change":20,"start":503904,"end":503959},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":503959},"to":{"change":20,"start":34589,"end":34626},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":34626},"to":{"change":20,"start":50528,"end":50616},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":50616},"to":{"change":20,"start":34711,"end":34801},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":34711},"to":{"change":20,"start":34711,"end":34801},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":34801},"to":{"change":20,"start":50617,"end":50703},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":50703},"to":{"change":20,"start":34886,"end":35049},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":34886},"to":{"change":20,"start":34886,"end":35049},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":35049},"to":{"change":20,"start":147,"end":205},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":147},"to":{"change":20,"start":147,"end":205},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":205},"to":{"change":20,"start":35050,"end":35073},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":35073},"to":{"change":20,"start":504274,"end":504310},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":504274},"to":{"change":20,"start":504274,"end":504310},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":504310},"to":{"change":20,"start":206,"end":281},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":281},"to":{"change":20,"start":6727,"end":6946},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":6946},"to":{"change":20,"start":371,"end":851},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":50812},"to":{"change":20,"start":371,"end":851},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":371},"to":{"change":20,"start":371,"end":851},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":851},"to":{"change":20,"start":504310,"end":504500},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":504310},"to":{"change":20,"start":504310,"end":504500},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":504500},"to":{"change":20,"start":852,"end":888},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":888},"to":{"change":20,"start":50813,"end":50856},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":50856},"to":{"change":20,"start":35074,"end":35097},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":504576},"to":{"change":20,"start":35074,"end":35097},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":35097},"to":{"change":20,"start":504598,"end":504640},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":504598},"to":{"change":20,"start":504598,"end":504640},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":504640},"to":{"change":20,"start":35098,"end":35113},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":35113},"to":{"change":20,"start":504640,"end":504647},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":504640},"to":{"change":20,"start":504640,"end":504647},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":504647},"to":{"change":20,"start":35114,"end":35280},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":12307},"to":{"change":20,"start":504701,"end":504737},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":35280},"to":{"change":20,"start":504701,"end":504737},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":504701},"to":{"change":20,"start":504701,"end":504737},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":504737},"to":{"change":20,"start":29187,"end":29217},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":29217},"to":{"change":20,"start":504767,"end":504935},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":504767},"to":{"change":20,"start":504767,"end":504935},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":504935},"to":{"change":20,"start":35281,"end":35430},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":35430},"to":{"change":20,"start":318,"end":370},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":370},"to":{"change":20,"start":504972,"end":505236},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":12373},"to":{"change":20,"start":504972,"end":505236},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":35430},"to":{"change":20,"start":504972,"end":505236},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":504972},"to":{"change":20,"start":504972,"end":505236},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":505236},"to":{"change":20,"start":50857,"end":50906},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":50906},"to":{"change":20,"start":35487,"end":35532},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":35487},"to":{"change":20,"start":35487,"end":35532},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":35532},"to":{"change":20,"start":889,"end":958},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":958},"to":{"change":20,"start":505312,"end":506196},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":35532},"to":{"change":20,"start":505312,"end":506196},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":505312},"to":{"change":20,"start":505312,"end":506196},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":506196},"to":{"change":20,"start":50907,"end":50948},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":50948},"to":{"change":20,"start":506236,"end":506445},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":506236},"to":{"change":20,"start":506236,"end":506445},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":506445},"to":{"change":20,"start":35533,"end":35616},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":35616},"to":{"change":20,"start":6947,"end":7168},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":1912},"to":{"change":20,"start":506617,"end":506695},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":7168},"to":{"change":20,"start":506617,"end":506695},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":29318},"to":{"change":20,"start":506617,"end":506695},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":35713},"to":{"change":20,"start":506617,"end":506695},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":51051},"to":{"change":20,"start":506617,"end":506695},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":506617},"to":{"change":20,"start":506617,"end":506695},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":506695},"to":{"change":20,"start":1620,"end":1661},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1661},"to":{"change":20,"start":12374,"end":12446},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":12446},"to":{"change":20,"start":506821,"end":506852},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":506821},"to":{"change":20,"start":506821,"end":506852},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":506854},"to":{"change":20,"start":506854,"end":506855},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":506855},"to":{"change":20,"start":1777,"end":1863},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1863},"to":{"change":20,"start":1913,"end":1930},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":1930},"to":{"change":20,"start":1863,"end":2268},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1863},"to":{"change":20,"start":1863,"end":2268},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":2268},"to":{"change":20,"start":1931,"end":1974},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":1974},"to":{"change":20,"start":2310,"end":2354},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":2310},"to":{"change":20,"start":2310,"end":2354},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":2354},"to":{"change":20,"start":518,"end":601},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":601},"to":{"change":13,"start":46,"end":93},"introduced_by":13},{"previous":"","flag":"DELETED","from":{"change":13,"pos":93},"to":{"change":20,"start":2499,"end":2547},"introduced_by":13},{"previous":"","flag":"DELETED","from":{"change":20,"pos":667},"to":{"change":20,"start":2499,"end":2547},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":2021},"to":{"change":20,"start":2499,"end":2547},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":2499},"to":{"change":20,"start":2499,"end":2547},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":2547},"to":{"change":20,"start":507547,"end":507555},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":507547},"to":{"change":20,"start":507547,"end":507555},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":507555},"to":{"change":2,"start":2,"end":3},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":3},"to":{"change":20,"start":507610,"end":507625},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":507610},"to":{"change":20,"start":507610,"end":507625},"introduced_by":20}],"inode":{"change":20,"pos":488880}}},"contents":[{"Del":" fn delete_obsolete_children<\n T: GraphTxnT + TreeTxnT::GraphError>,\n W: WorkingCopy,\n"},{"Del":" C: ChangeStore,\n"},{"Del":" >(\n"},{"Del":" &mut self,\n txn: &T,\n"},{"Del":" channel: &T::Graph,\n"},{"Del":" working_copy: &W,\n"},{"Del":" changes: &C,\n"},{"Del":" full_path: &str,\n v: Position,\n"},{"Del":" ) -> Result<(), RecordError>\n where\n ::Error: 'static,\n {\n"},{"Del":" if self.ignore_missing {\n return Ok(());\n }\n"},{"Del":" let f0 = EdgeFlags::FOLDER | EdgeFlags::BLOCK;\n let f1 = f0 | EdgeFlags::PSEUDO;\n"},{"Del":" debug!(\"delete_obsolete_children, v = {:?}\", v);\n"},{"Del":" for child in iter_adjacent(txn, channel, v.inode_vertex(), f0, f1)? {\n let child = child?;\n"},{"Del":" let child = txn.find_block(channel, child.dest()).unwrap();\n for grandchild in iter_adjacent(txn, channel, *child, f0, f1)? {\n"},{"Del":" let grandchild = grandchild?;\n"},{"Del":" debug!(\"grandchild {:?}\", grandchild);\n"},{"Del":" let needs_deletion =\n"},{"Del":" if let Some(inode) = txn.get_revinodes(&grandchild.dest(), None)? {\n"},{"Del":" debug!(\"inode = {:?} {:?}\", inode, txn.get_revtree(inode, None));\n"},{"Del":" if let Some(path) = crate::fs::inode_filename(txn, *inode)? {\n"},{"Del":" working_copy.file_metadata(&path).is_err()\n } else {\n true\n }\n"},{"Del":" } else {\n true\n"},{"Del":" };\n"},{"Del":" if needs_deletion {\n"},{"Del":" let mut name = Vec::new();\n changes\n"},{"Del":" .get_contents(\n |p| txn.get_external(&p).unwrap().map(From::from),\n *child,\n &mut name,\n )\n"},{"Del":" .map_err(RecordError::Changestore)?;\n let mut full_path = full_path.to_string();\n if name.len() > 2 {\n if let Ok(name) = std::str::from_utf8(&name[2..]) {\n if !full_path.is_empty() {\n full_path.push('/');\n }\n full_path.push_str(name);\n }\n }\n"},{"Del":" // delete recursively.\n self.record_deleted_file(\n txn,\n &channel,\n working_copy,\n"},{"Del":" &full_path,\n"},{"Del":" grandchild.dest(),\n"},{"Del":" )?\n"},{"Del":" }\n }\n }\n"},{"Del":" Ok(())\n"},{"Del":" }\n\n"},{"Del":" fn push_children<\n 'a,\n T: ChannelTxnT + TreeTxnT::GraphError>,\n W: WorkingCopy,\n C: ChangeStore,\n >(\n"},{"Del":" &mut self,\n txn: &T,\n"},{"Del":" channel: &T::Channel,\n"},{"Del":" working_copy: &W,\n item: &mut RecordItem<'a>,\n vertex: Position>,\n stack: &mut Vec>,\n prefix: &str,\n"},{"Del":" ) -> Result<(), RecordError>\n where\n ::Error: 'static,\n {\n"},{"Del":" debug!(\"push_children, item = {:?}\", item);\n"},{"Del":" let comp = item.components.next();\n let full_path = item.full_path.clone();\n let fileid = OwnedPathId {\n parent_inode: item.inode,\n basename: SmallString::new(),\n };\n let mut has_matching_children = false;\n"},{"Del":" for x in txn.iter_tree(&fileid, None)? {\n"},{"Del":" let (fileid_, child_inode) = x?;\n"},{"Del":" debug!(\"push_children {:?} {:?}\", fileid_, child_inode);\n"},{"Del":" if fileid_.parent_inode < fileid.parent_inode || fileid_.basename.is_empty() {\n continue;\n } else if fileid_.parent_inode > fileid.parent_inode {\n break;\n }\n if let Some(comp) = comp {\n if comp != fileid_.basename.as_str() {\n continue;\n }\n }\n has_matching_children = true;\n let basename = fileid_.basename.as_str().to_string();\n let full_path = if full_path.is_empty() {\n basename.clone()\n } else {\n full_path.clone() + \"/\" + &basename\n };\n debug!(\"fileid_ {:?} child_inode {:?}\", fileid_, child_inode);\n if let Ok(meta) = working_copy.file_metadata(&full_path) {\n stack.push(RecordItem {\n papa: item.inode,\n"},{"Del":" inode: *child_inode,\n"},{"Del":" v_papa: vertex,\n basename,\n full_path,\n metadata: meta,\n components: item.components.clone(),\n })\n"},{"Del":" } else if let Some(vertex) = get_inodes(txn, &channel, child_inode)? {\n"},{"Del":" self.record_deleted_file(\n txn,\n txn.graph(channel),\n working_copy,\n &full_path,\n *vertex,\n )?\n"},{"Del":" }\n }\n if comp.is_some() && !has_matching_children {\n"},{"Del":" debug!(\"comp = {:?}\", comp);\n"},{"Del":" return Err(RecordError::PathNotInRepo(prefix.to_string()));\n"},{"Del":" }\n Ok(())\n }\n"},{"Del":"\n"},{"Del":" fn modified_since_last_commit(\n &mut self,\n"},{"Del":" txn: &T,\n"},{"Del":" channel: &T::Channel,\n working_copy: &W,\n prefix: &str,\n ) -> Result {\n if let Ok(last_modified) = working_copy.modified_time(prefix) {\n debug!(\n \"last_modified = {:?}, channel.last = {:?}\",\n last_modified\n .duration_since(std::time::UNIX_EPOCH)?\n .as_secs(),\n"},{"Del":" txn.last_modified(channel)\n"},{"Del":" );\n Ok(last_modified\n"},{"Del":" .duration_since(std::time::UNIX_EPOCH)?\n .as_secs()\n"},{"Del":" >= txn.last_modified(channel))\n"},{"Del":" } else {\n Ok(true)\n }\n"},{"Del":" }\n}\n"},{"Del":"\n"},{"Del":"impl Builder {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":891,"ins":{"up_context":[{"change":11,"pos":48}],"down_context":[{"change":20,"pos":36030}],"flag":"BLOCK","start":60061,"end":60561,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":11,"pos":48},"to":{"change":20,"start":51052,"end":51125},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":508005},"to":{"change":20,"start":51052,"end":51125},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":51125},"to":{"change":20,"start":12529,"end":12591},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":508141},"to":{"change":20,"start":12529,"end":12591},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":12591},"to":{"change":20,"start":508195,"end":508255},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":508195},"to":{"change":20,"start":508195,"end":508255},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":508255},"to":{"change":20,"start":51126,"end":51197},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":51197},"to":{"change":20,"start":508326,"end":508361},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":508326},"to":{"change":20,"start":508326,"end":508361},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":508361},"to":{"change":20,"start":51198,"end":51285},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" let mut contents = self.contents.lock().unwrap();"},{"Add":" let name_start = ChangePosition(contents.len().into());"},{"Add":" // Push the metadata, big-endian."},{"Add":" contents.push((item.metadata.0 >> 8) as u8);"},{"Add":" contents.push((item.metadata.0 & 0xff) as u8);"},{"Add":" //"},{"Add":" contents.extend(item.basename.as_bytes());"},{"Add":" let name_end = ChangePosition(contents.len().into());"},{"Add":" contents.push(0);"},{"Add":" let name = &contents[name_start.0.as_usize()..name_end.0.as_usize()];"}],"del_contents":[{"Del":" let name_start = ChangePosition(self.rec.contents.len().into());\n"},{"Del":" item.metadata.write(&mut self.rec.contents).unwrap();\n"},{"Del":" self.rec.contents.extend(item.basename.as_bytes());\n"},{"Del":" let name_end = ChangePosition(self.rec.contents.len().into());\n"},{"Del":" self.rec.contents.push(0);\n"},{"Del":" let name = &self.rec.contents[name_start.0.as_usize()..name_end.0.as_usize()];\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":916,"ins":{"up_context":[{"change":20,"pos":6391}],"down_context":[{"change":20,"pos":508991}],"flag":"BLOCK","start":60562,"end":60610,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":6391},"to":{"change":20,"start":1710,"end":1762},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" self.actions.push(Hunk::FileUndel {"}],"del_contents":[{"Del":" self.rec.actions.push(Hunk::FileUndel {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":927,"ins":{"up_context":[{"change":20,"pos":509321}],"down_context":[{"change":20,"pos":509378}],"flag":"BLOCK","start":60611,"end":60662,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":509321},"to":{"change":20,"start":1763,"end":1818},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" self.actions.push(Hunk::FileMove {"}],"del_contents":[{"Del":" self.rec.actions.push(Hunk::FileMove {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":943,"ins":{"up_context":[{"change":20,"pos":510020}],"down_context":[{"change":20,"pos":510086}],"flag":"BLOCK","start":60663,"end":60723,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":510020},"to":{"change":20,"start":1819,"end":1883},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" self.actions.push(Hunk::SolveNameConflict {"}],"del_contents":[{"Del":" self.rec.actions.push(Hunk::SolveNameConflict {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":950,"ins":{"up_context":[{"change":20,"pos":510318}],"down_context":[{"change":20,"pos":510384}],"flag":"BLOCK","start":60724,"end":60783,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":510318},"to":{"change":20,"start":51286,"end":51354},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" contents.truncate(name_start.0.as_usize())"}],"del_contents":[{"Del":" self.rec.contents.truncate(name_start.0.as_usize())\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":953,"ins":{"up_context":[{"change":20,"pos":510415}],"down_context":[{"change":20,"pos":510477}],"flag":"BLOCK","start":60784,"end":60839,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":510415},"to":{"change":20,"start":51355,"end":51419},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" contents.truncate(name_start.0.as_usize())"}],"del_contents":[{"Del":" self.rec.contents.truncate(name_start.0.as_usize())\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":986,"ins":{"up_context":[{"change":20,"pos":511272}],"down_context":[{"change":20,"pos":511346}],"flag":"BLOCK","start":60840,"end":60922,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":511272},"to":{"change":20,"start":511272,"end":511346},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" let mut del_del = HashMap::default();"},{"Add":" let mut alive = HashMap::default();"}],"del_contents":[{"Del":" let mut del_del = HashMap::new();\n let mut alive = HashMap::new();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":1163,"ins":{"up_context":[{"change":2,"pos":7}],"down_context":[{"change":20,"pos":37155}],"flag":"BLOCK","start":60923,"end":60939,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":2,"pos":7},"to":{"change":20,"start":518326,"end":518341},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":518326},"to":{"change":20,"start":518326,"end":518341},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":"impl Recorded {"}],"del_contents":[{"Del":"impl Builder {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":1177,"ins":{"up_context":[{"change":20,"pos":518708}],"down_context":[{"change":20,"pos":518750}],"flag":"BLOCK","start":60940,"end":60986,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":518708},"to":{"change":20,"start":518708,"end":518750},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" let mut visited = HashSet::default();"}],"del_contents":[{"Del":" let mut visited = HashSet::new();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":1193,"ins":{"up_context":[{"change":20,"pos":3486}],"down_context":[{"change":20,"pos":3587}],"flag":"BLOCK","start":60987,"end":61217,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":3486},"to":{"change":20,"start":3486,"end":3587},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" {"},{"Add":" let mut deleted_vertices = self.deleted_vertices.lock().unwrap();"},{"Add":" if !deleted_vertices.insert(vertex.start_pos()) {"},{"Add":" continue;"},{"Add":" }"}],"del_contents":[{"Del":" if !self.deleted_vertices.insert(vertex.start_pos()) {\n continue;\n"}]}},{"Edit":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":1205,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":3893}],"down_context":[{"change":20,"pos":53959}],"flag":"BLOCK","start":61218,"end":61284,"inode":{"change":20,"pos":488880}}},"contents":[{"Add":" .lock()"},{"Add":" .unwrap()"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":1208,"ins":{"up_context":[{"change":20,"pos":54032}],"down_context":[{"change":20,"pos":520235}],"flag":"BLOCK","start":61285,"end":61414,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":54032},"to":{"change":20,"start":7280,"end":7463},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" self.updatables"},{"Add":" .insert(self.actions.len(), InodeUpdate::Deleted { inode: *inode });"}],"del_contents":[{"Del":" self.rec.updatables.insert(\n self.rec.actions.len(),\n InodeUpdate::Deleted { inode: *inode },\n );\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":1302,"ins":{"up_context":[{"change":20,"pos":523440}],"down_context":[{"change":20,"pos":523492}],"flag":"BLOCK","start":61415,"end":61461,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":523440},"to":{"change":20,"start":1884,"end":1934},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" self.actions.push(Hunk::FileDel {"}],"del_contents":[{"Del":" self.rec.actions.push(Hunk::FileDel {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":488880},"path":"libpijul/src/record.rs","line":1323,"ins":{"up_context":[{"change":20,"pos":523985}],"down_context":[{"change":20,"pos":524026}],"flag":"BLOCK","start":61462,"end":61499,"inode":{"change":20,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":523985},"to":{"change":20,"start":523985,"end":524026},"introduced_by":20}],"inode":{"change":20,"pos":488880}},"ins_contents":[{"Add":" }) = self.actions.last_mut()"}],"del_contents":[{"Del":" }) = self.rec.actions.last_mut()\n"}]}},{"Edit":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":2,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":531126}],"down_context":[{"change":20,"pos":56954}],"flag":"BLOCK","start":61500,"end":61520,"inode":{"change":20,"pos":531056}}},"contents":[{"Add":"use crate::HashMap;"}]}},{"Edit":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":4,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":56974},"to":{"change":20,"start":531262,"end":531286},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":531262},"to":{"change":20,"start":531262,"end":531286},"introduced_by":20}],"inode":{"change":20,"pos":531056}}},"contents":[{"Del":"use std::cell::RefCell;\n"}]}},{"Edit":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":5,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":531325},"to":{"change":20,"start":531325,"end":531356},"introduced_by":20}],"inode":{"change":20,"pos":531056}}},"contents":[{"Del":"use std::collections::HashMap;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":6,"ins":{"up_context":[{"change":20,"pos":531377}],"down_context":[{"change":20,"pos":531397}],"flag":"BLOCK","start":61521,"end":61550,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":531377},"to":{"change":20,"start":531377,"end":531397},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":"use std::sync::{Arc, Mutex};"}],"del_contents":[{"Del":"use std::sync::Arc;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":139,"ins":{"up_context":[{"change":20,"pos":58301}],"down_context":[{"change":20,"pos":533931}],"flag":"BLOCK","start":61551,"end":61676,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":58301},"to":{"change":20,"start":533810,"end":533931},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":533810},"to":{"change":20,"start":533810,"end":533931},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":" open_channels: Mutex::new(HashMap::default()),"},{"Add":" open_remotes: Mutex::new(HashMap::default()),"}],"del_contents":[{"Del":" open_channels: RefCell::new(HashMap::new()),\n open_remotes: RefCell::new(HashMap::new()),\n"}]}},{"Edit":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":142,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":533952}],"down_context":[{"change":20,"pos":533952}],"flag":"BLOCK","start":61677,"end":61705,"inode":{"change":20,"pos":531056}}},"contents":[{"Add":" counter: 0,"}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":227,"ins":{"up_context":[{"change":20,"pos":3608}],"down_context":[{"change":20,"pos":536168}],"flag":"BLOCK","start":61706,"end":61823,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":3608},"to":{"change":20,"start":536055,"end":536168},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":59923},"to":{"change":20,"start":536055,"end":536168},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":536055},"to":{"change":20,"start":536055,"end":536168},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":" open_channels: Mutex::new(HashMap::default()),"},{"Add":" open_remotes: Mutex::new(HashMap::default()),"}],"del_contents":[{"Del":" open_channels: RefCell::new(HashMap::new()),\n open_remotes: RefCell::new(HashMap::new()),\n"}]}},{"Edit":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":230,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":536185}],"down_context":[{"change":20,"pos":3609}],"flag":"BLOCK","start":61824,"end":61848,"inode":{"change":20,"pos":531056}}},"contents":[{"Add":" counter: 0,"}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":268,"ins":{"up_context":[{"change":20,"pos":60428}],"down_context":[{"change":20,"pos":537859}],"flag":"BLOCK","start":61849,"end":62010,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":60428},"to":{"change":20,"start":60428,"end":60507},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":60507},"to":{"change":20,"start":537793,"end":537859},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":537793},"to":{"change":20,"start":537793,"end":537859},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":" pub(crate) open_channels: Mutex>>,"},{"Add":" open_remotes: Mutex>>,"},{"Add":" counter: usize,"}],"del_contents":[{"Del":" pub(crate) open_channels: RefCell>>,\n"},{"Del":" open_remotes: RefCell>>,\n"}]}},{"Edit":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":484,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":34364}],"down_context":[{"change":20,"pos":34364}],"flag":"BLOCK","start":62011,"end":62054,"inode":{"change":20,"pos":531056}}},"contents":[{"Add":" debug!(\"find_block: BLOCK ERROR\");"}]}},{"Edit":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":504,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":35289}],"down_context":[{"change":20,"pos":35289}],"flag":"BLOCK","start":62055,"end":62102,"inode":{"change":20,"pos":531056}}},"contents":[{"Add":" debug!(\"find_block: BLOCK ERROR\");"}]}},{"Edit":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":513,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":35500}],"down_context":[{"change":20,"pos":35572}],"flag":"BLOCK","start":62103,"end":62142,"inode":{"change":20,"pos":531056}}},"contents":[{"Add":" debug!(\"find_block: BLOCK ERROR\");"}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":533,"ins":{"up_context":[{"change":20,"pos":68287}],"down_context":[{"change":20,"pos":36459}],"flag":"BLOCK","start":62143,"end":62647,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":68287},"to":{"change":20,"start":68287,"end":68519},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":68519},"to":{"change":20,"start":36384,"end":36459},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":36384},"to":{"change":20,"start":36384,"end":36459},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":" let mut k = match cursor.set(txn, &key, None) {"},{"Add":" Ok(Some((k, _))) => k,"},{"Add":" Ok(None) => {"},{"Add":" if let Some((k, _)) = cursor.prev(txn).map_err(|x| BlockError::Txn(x.into()))? {"},{"Add":" k"},{"Add":" } else {"},{"Add":" debug!(\"find_block_end, no prev\");"},{"Add":" return Err(BlockError::Block { block: p });"},{"Add":" }"},{"Add":" }"},{"Add":" Err(e) => {"},{"Add":" debug!(\"find_block_end: BLOCK ERROR\");"},{"Add":" return Err(BlockError::Txn(e.into()));"},{"Add":" }"}],"del_contents":[{"Del":" let mut k = if let Some((k, _)) = cursor\n .set(txn, &key, None)\n .map_err(|x| BlockError::Txn(x.into()))?\n {\n k\n } else if let Some((k, _)) = cursor.prev(txn).map_err(|x| BlockError::Txn(x.into()))? {\n"},{"Del":" k\n } else {\n return Err(BlockError::Block { block: p });\n"}]}},{"Edit":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":549,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":36592}],"down_context":[{"change":20,"pos":36705}],"flag":"BLOCK","start":62648,"end":62714,"inode":{"change":20,"pos":531056}}},"contents":[{"Add":" debug!(\"find_block_end, loop, k = {:?}, p = {:?}\", k, p);"}]}},{"Edit":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":571,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":37414}],"down_context":[{"change":20,"pos":37525}],"flag":"BLOCK","start":62715,"end":62762,"inode":{"change":20,"pos":531056}}},"contents":[{"Add":" debug!(\"find_block_end, {:?} {:?}\", k, p);"}]}},{"Edit":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":579,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":37729}],"down_context":[{"change":20,"pos":37841}],"flag":"BLOCK","start":62763,"end":62810,"inode":{"change":20,"pos":531056}}},"contents":[{"Add":" debug!(\"find_block_end, {:?} {:?}\", k, p);"}]}},{"Edit":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":585,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":38015}],"down_context":[{"change":20,"pos":38015}],"flag":"BLOCK","start":62811,"end":62858,"inode":{"change":20,"pos":531056}}},"contents":[{"Add":" debug!(\"find_block_end: BLOCK ERROR\");"}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":991,"ins":{"up_context":[{"change":20,"pos":545759}],"down_context":[{"change":20,"pos":647}],"flag":"BLOCK","start":62859,"end":62891,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":545759},"to":{"change":20,"start":618,"end":647},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":" // #[cfg(debug_assertions)]"}],"del_contents":[{"Del":" #[cfg(debug_assertions)]\n"}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1022,"ins":{"up_context":[{"change":20,"pos":43857}],"down_context":[{"change":20,"pos":75767}],"flag":"BLOCK","start":62892,"end":62924,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":43857},"to":{"change":20,"start":75738,"end":75767},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":" // #[cfg(debug_assertions)]"}],"del_contents":[{"Del":" #[cfg(debug_assertions)]\n"}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1025,"ins":{"up_context":[{"change":20,"pos":75895}],"down_context":[{"change":20,"pos":43886}],"flag":"BLOCK","start":62925,"end":62957,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":75895},"to":{"change":20,"start":43857,"end":43886},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":43857},"to":{"change":20,"start":43857,"end":43886},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":" // #[cfg(debug_assertions)]"}],"del_contents":[{"Del":" #[cfg(debug_assertions)]\n"}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1120,"ins":{"up_context":[{"change":20,"pos":46014}],"down_context":[{"change":20,"pos":77276}],"flag":"BLOCK","start":62958,"end":63006,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":46014},"to":{"change":20,"start":46014,"end":46052},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":" let remote = remote.db.lock().unwrap();"}],"del_contents":[{"Del":" let remote = remote.borrow();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1161,"ins":{"up_context":[{"change":20,"pos":549208}],"down_context":[{"change":20,"pos":549276}],"flag":"BLOCK","start":63007,"end":63078,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":549208},"to":{"change":20,"start":549208,"end":549276},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":" match self.open_channels.lock().unwrap().entry(name.clone()) {"}],"del_contents":[{"Del":" match self.open_channels.borrow_mut().entry(name.clone()) {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1166,"ins":{"up_context":[{"change":20,"pos":45033}],"down_context":[{"change":20,"pos":45090}],"flag":"BLOCK","start":63079,"end":63136,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":45033},"to":{"change":20,"start":45033,"end":45090},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":" r: Arc::new(RwLock::new(c)),"}],"del_contents":[{"Del":" r: Rc::new(RefCell::new(c)),\n"}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1180,"ins":{"up_context":[{"change":20,"pos":550434}],"down_context":[{"change":20,"pos":8251}],"flag":"BLOCK","start":63137,"end":63207,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":550434},"to":{"change":20,"start":550434,"end":550501},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":" match self.open_remotes.lock().unwrap().entry(name.clone()) {"}],"del_contents":[{"Del":" match self.open_remotes.borrow_mut().entry(name.clone()) {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1204,"ins":{"up_context":[{"change":20,"pos":9362}],"down_context":[{"change":20,"pos":9416}],"flag":"BLOCK","start":63208,"end":63261,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":9362},"to":{"change":20,"start":9362,"end":9416},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":" db: Arc::new(Mutex::new(r)),"}],"del_contents":[{"Del":" db: Rc::new(RefCell::new(r)),\n"}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1292,"ins":{"up_context":[{"change":20,"pos":555360}],"down_context":[{"change":20,"pos":9588}],"flag":"BLOCK","start":63262,"end":63332,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":555360},"to":{"change":20,"start":555360,"end":555427},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":" match self.open_remotes.lock().unwrap().entry(name.clone()) {"}],"del_contents":[{"Del":" match self.open_remotes.borrow_mut().entry(name.clone()) {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1296,"ins":{"up_context":[{"change":20,"pos":9788}],"down_context":[{"change":20,"pos":9846}],"flag":"BLOCK","start":63333,"end":63390,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":9788},"to":{"change":20,"start":9788,"end":9846},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":" db: Arc::new(Mutex::new(Remote {"}],"del_contents":[{"Del":" db: Rc::new(RefCell::new(Remote {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1309,"ins":{"up_context":[{"change":20,"pos":556166}],"down_context":[{"change":20,"pos":556231}],"flag":"BLOCK","start":63391,"end":63457,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":556166},"to":{"change":20,"start":48699,"end":48758},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":" Ok(self.open_remotes.lock().unwrap().get(&name).cloned())"}],"del_contents":[{"Del":" Ok(self.open_remotes.borrow().get(&name).cloned())\n"}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1346,"ins":{"up_context":[{"change":20,"pos":49468}],"down_context":[{"change":20,"pos":82067}],"flag":"BLOCK","start":63458,"end":63541,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":49468},"to":{"change":20,"start":81991,"end":82067},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":" match btree::get(&self.txn, &remote.db.lock().unwrap().rev, hash, None)? {"}],"del_contents":[{"Del":" match btree::get(&self.txn, &remote.db.borrow().rev, hash, None)? {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1356,"ins":{"up_context":[{"change":20,"pos":49685}],"down_context":[{"change":20,"pos":82263}],"flag":"BLOCK","start":63542,"end":63625,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":49685},"to":{"change":20,"start":82187,"end":82263},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":" match btree::get(&self.txn, &remote.db.lock().unwrap().states, m, None)? {"}],"del_contents":[{"Del":" match btree::get(&self.txn, &remote.db.borrow().states, m, None)? {\n"}]}},{"Edit":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1370,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":50063}],"down_context":[{"change":20,"pos":82408}],"flag":"BLOCK","start":63626,"end":64393,"inode":{"change":20,"pos":531056}}},"contents":[{"Add":" self.counter += 1;"},{"Add":" debug!(\"put_graph {:?} {:?}, counter = {:?}\", k, e, self.counter);"},{"Add":" /*"},{"Add":" if self.counter >= 12965 {"},{"Add":" let mut x = None;"},{"Add":" let mut cursor = btree::cursor::Cursor::new(&self.txn, graph)?;"},{"Add":" let mut panic = None;"},{"Add":" while let Some((k, v)) = cursor.next(&self.txn)? {"},{"Add":" if let Some((ref k_, ref v_)) = x {"},{"Add":" if k_ > k || (k_== k && v_ > v) {"},{"Add":" panic = Some((*k, *v));"},{"Add":" break"},{"Add":" }"},{"Add":" }"},{"Add":" x = Some((*k, *v))"},{"Add":" }"},{"Add":" self.debug(graph, \".put\");"},{"Add":" if panic.is_some() {"},{"Add":" panic!(\"{:?}\", x);"},{"Add":" }"},{"Add":" }"},{"Add":" */"}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1401,"ins":{"up_context":[{"change":20,"pos":50114}],"down_context":[{"change":20,"pos":559388}],"flag":"BLOCK","start":64394,"end":66496,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":50114},"to":{"change":20,"start":82528,"end":82580},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":" self.counter += 1;"},{"Add":" debug!(\"del_graph {:?} {:?}, counter = {:?}\", k, e, self.counter);"},{"Add":" /*"},{"Add":" if self.counter >= 12965 {"},{"Add":" let mut x = None;"},{"Add":" let mut cursor = btree::cursor::Cursor::new(&self.txn, graph)?;"},{"Add":" let mut panic = None;"},{"Add":" while let Some((k, v)) = cursor.next(&self.txn)? {"},{"Add":" if let Some((ref k_, ref v_)) = x {"},{"Add":" if k_ > k || (k_== k && v_ > v) {"},{"Add":" panic = Some((*k, *v));"},{"Add":" break"},{"Add":" }"},{"Add":" }"},{"Add":" x = Some((*k, *v))"},{"Add":" }"},{"Add":" self.debug(graph, \".del\");"},{"Add":" if panic.is_some() {"},{"Add":" panic!(\"{:?}\", x);"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" let change = ChangeId::from_base32(b\"MM6XEY5S32WRA\").unwrap();"},{"Add":" let mm6v = Vertex {"},{"Add":" change,"},{"Add":" start: ChangePosition(L64(1478218)),"},{"Add":" end: ChangePosition(L64(1478229)),"},{"Add":" };"},{"Add":" let mm6e = (Edge {"},{"Add":" flag: EdgeFlags::BLOCK | EdgeFlags::FOLDER | EdgeFlags::PARENT,"},{"Add":" dest: Position {"},{"Add":" change,"},{"Add":" pos: ChangePosition(L64(1466149)),"},{"Add":" },"},{"Add":" introduced_by: change,"},{"Add":" }).into();"},{"Add":""},{"Add":" let has_mm6 = if let Some((v, e)) = btree::get(&self.txn, graph, &mm6v, Some(&mm6e)).unwrap() {"},{"Add":" v == &mm6v && e == &mm6e"},{"Add":" } else {"},{"Add":" false"},{"Add":" };"},{"Add":" */"},{"Add":" let result = Ok(btree::del(&mut self.txn, graph, k, e)?);"},{"Add":" /*"},{"Add":" if has_mm6 && (k != &mm6v || e != Some(&mm6e)) {"},{"Add":" if let Some((v, e)) = btree::get(&self.txn, graph, &mm6v, Some(&mm6e)).unwrap() {"},{"Add":" assert_eq!(v, &mm6v);"},{"Add":" assert_eq!(e, &mm6e)"},{"Add":" } else {"},{"Add":" panic!(\"Not found\")"},{"Add":" }"},{"Add":" }"},{"Add":" */"},{"Add":" result"},{"Add":" }"},{"Add":""},{"Add":" fn debug(&mut self, graph: &mut Self::Graph, extra: &str) {"},{"Add":" ::sanakirja::debug::debug("},{"Add":" &self.txn,"},{"Add":" &[graph],"},{"Add":" format!(\"debug{}{}\", self.counter, extra),"},{"Add":" true,"},{"Add":" );"}],"del_contents":[{"Del":" Ok(btree::del(&mut self.txn, graph, k, e)?)\n"}]}},{"Edit":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1466,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":559394}],"down_context":[{"change":20,"pos":82581}],"flag":"BLOCK","start":66497,"end":66498,"inode":{"change":20,"pos":531056}}},"contents":[{"Add":""}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1706,"ins":{"up_context":[{"change":20,"pos":52526}],"down_context":[{"change":20,"pos":85694}],"flag":"BLOCK","start":66499,"end":66551,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":14616},"to":{"change":20,"start":562358,"end":562404},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":52526},"to":{"change":20,"start":562358,"end":562404},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":562358},"to":{"change":20,"start":562358,"end":562404},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":" let mut remote = remote.db.lock().unwrap();"}],"del_contents":[{"Del":" let mut remote = remote.borrow_mut();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1724,"ins":{"up_context":[{"change":20,"pos":52661}],"down_context":[{"change":20,"pos":86073}],"flag":"BLOCK","start":66552,"end":66604,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":14715},"to":{"change":20,"start":562707,"end":562753},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":52661},"to":{"change":20,"start":562707,"end":562753},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":562707},"to":{"change":20,"start":562707,"end":562753},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":" let mut remote = remote.db.lock().unwrap();"}],"del_contents":[{"Del":" let mut remote = remote.borrow_mut();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1749,"ins":{"up_context":[{"change":20,"pos":563283}],"down_context":[{"change":20,"pos":563351}],"flag":"BLOCK","start":66605,"end":66689,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":563283},"to":{"change":20,"start":48406,"end":48487},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":" let result = match self.open_channels.lock().unwrap().entry(name.clone()) {"}],"del_contents":[{"Del":" let result = match self.open_channels.borrow_mut().entry(name.clone()) {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1753,"ins":{"up_context":[{"change":20,"pos":79}],"down_context":[{"change":20,"pos":137}],"flag":"BLOCK","start":66690,"end":66748,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":79},"to":{"change":20,"start":79,"end":137},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":" r: Arc::new(RwLock::new(Channel {"}],"del_contents":[{"Del":" r: Rc::new(RefCell::new(Channel {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1766,"ins":{"up_context":[{"change":20,"pos":11175}],"down_context":[{"change":20,"pos":11237}],"flag":"BLOCK","start":66749,"end":66811,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":11175},"to":{"change":20,"start":11175,"end":11237},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":" r: Arc::new(RwLock::new(Channel {"}],"del_contents":[{"Del":" r: Rc::new(RefCell::new(Channel {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1796,"ins":{"up_context":[{"change":20,"pos":52923}],"down_context":[{"change":20,"pos":565315}],"flag":"BLOCK","start":66812,"end":66861,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":14873},"to":{"change":20,"start":565273,"end":565315},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":52923},"to":{"change":20,"start":565273,"end":565315},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":565273},"to":{"change":20,"start":565273,"end":565315},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":" let channel = channel.r.read().unwrap();"}],"del_contents":[{"Del":" let channel = channel.r.borrow();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1806,"ins":{"up_context":[{"change":20,"pos":88794}],"down_context":[{"change":20,"pos":88848}],"flag":"BLOCK","start":66862,"end":66916,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":88794},"to":{"change":20,"start":88794,"end":88848},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":" r: Arc::new(RwLock::new(Channel {"}],"del_contents":[{"Del":" r: Rc::new(RefCell::new(Channel {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1822,"ins":{"up_context":[{"change":20,"pos":89660}],"down_context":[{"change":20,"pos":89734}],"flag":"BLOCK","start":66917,"end":66994,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":89660},"to":{"change":20,"start":89660,"end":89734},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":" self.open_channels.lock().unwrap().insert(name, br.clone());"}],"del_contents":[{"Del":" self.open_channels.borrow_mut().insert(name, br.clone());\n"}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1844,"ins":{"up_context":[{"change":20,"pos":90098}],"down_context":[{"change":20,"pos":15970}],"flag":"BLOCK","start":66995,"end":67048,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":90098},"to":{"change":20,"start":90098,"end":90142},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":" &channel.r.read().unwrap().name,"}],"del_contents":[{"Del":" &channel.borrow().name,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1850,"ins":{"up_context":[{"change":20,"pos":90275}],"down_context":[{"change":20,"pos":90369}],"flag":"BLOCK","start":67049,"end":67180,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":90275},"to":{"change":20,"start":90275,"end":90369},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":" .lock()"},{"Add":" .unwrap()"},{"Add":" .remove(&channel.r.read().unwrap().name)"}],"del_contents":[{"Del":" .borrow_mut()\n .remove(&channel.borrow().name)\n"}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1855,"ins":{"up_context":[{"change":20,"pos":90423}],"down_context":[{"change":20,"pos":566916}],"flag":"BLOCK","start":67181,"end":67245,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":90423},"to":{"change":20,"start":12239,"end":12376},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":" channel.r.write().unwrap().name = name.clone();"}],"del_contents":[{"Del":" std::cell::RefCell::borrow_mut(&std::rc::Rc::get_mut(&mut channel.r).unwrap())\n .name = name.clone();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1857,"ins":{"up_context":[{"change":20,"pos":566951}],"down_context":[{"change":20,"pos":90560}],"flag":"BLOCK","start":67246,"end":67304,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":566951},"to":{"change":20,"start":566951,"end":566985},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":" .lock()"},{"Add":" .unwrap()"}],"del_contents":[{"Del":" .borrow_mut()\n"}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1867,"ins":{"up_context":[{"change":20,"pos":218}],"down_context":[{"change":20,"pos":3664}],"flag":"BLOCK","start":67305,"end":67454,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":218},"to":{"change":20,"start":218,"end":363},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":" let channel = if let Some(channel) = self.open_channels.lock().unwrap().remove(&name) {"},{"Add":" let channel = Arc::try_unwrap(channel.r)"}],"del_contents":[{"Del":" let channel = if let Some(channel) = self.open_channels.borrow_mut().remove(&name) {\n let channel = Rc::try_unwrap(channel.r)\n"}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1872,"ins":{"up_context":[{"change":20,"pos":3783}],"down_context":[{"change":20,"pos":476}],"flag":"BLOCK","start":67455,"end":67512,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":3783},"to":{"change":20,"start":445,"end":476},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":445},"to":{"change":20,"start":445,"end":476},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":" .into_inner()"},{"Add":" .unwrap();"}],"del_contents":[{"Del":" .into_inner();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1906,"ins":{"up_context":[{"change":20,"pos":568188}],"down_context":[{"change":20,"pos":568255}],"flag":"BLOCK","start":67513,"end":67583,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":568188},"to":{"change":20,"start":568188,"end":568255},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":" match self.open_remotes.lock().unwrap().entry(name.clone()) {"}],"del_contents":[{"Del":" match self.open_remotes.borrow_mut().entry(name.clone()) {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1910,"ins":{"up_context":[{"change":20,"pos":12543}],"down_context":[{"change":20,"pos":12601}],"flag":"BLOCK","start":67584,"end":67641,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":12543},"to":{"change":20,"start":12543,"end":12601},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":" db: Arc::new(Mutex::new(Remote {"}],"del_contents":[{"Del":" db: Rc::new(RefCell::new(Remote {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1919,"ins":{"up_context":[{"change":20,"pos":12982}],"down_context":[{"change":20,"pos":13044}],"flag":"BLOCK","start":67642,"end":67703,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":12982},"to":{"change":20,"start":12982,"end":13044},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":" db: Arc::new(Mutex::new(Remote {"}],"del_contents":[{"Del":" db: Rc::new(RefCell::new(Remote {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1937,"ins":{"up_context":[{"change":20,"pos":569492}],"down_context":[{"change":20,"pos":569559}],"flag":"BLOCK","start":67704,"end":67856,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":569492},"to":{"change":20,"start":569492,"end":569559},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":" Ok(self"},{"Add":" .open_remotes"},{"Add":" .lock()"},{"Add":" .unwrap()"},{"Add":" .get(&name)"},{"Add":" .unwrap()"},{"Add":" .clone())"}],"del_contents":[{"Del":" Ok(self.open_remotes.borrow().get(&name).unwrap().clone())\n"}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1948,"ins":{"up_context":[{"change":20,"pos":569694}],"down_context":[{"change":20,"pos":569765}],"flag":"BLOCK","start":67857,"end":67931,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":569694},"to":{"change":20,"start":569694,"end":569765},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":" let r = self.open_remotes.lock().unwrap().remove(&name).unwrap();"}],"del_contents":[{"Del":" let r = self.open_remotes.borrow_mut().remove(&name).unwrap();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1950,"ins":{"up_context":[{"change":20,"pos":569797}],"down_context":[{"change":20,"pos":92084}],"flag":"BLOCK","start":67932,"end":67981,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":569797},"to":{"change":20,"start":569797,"end":569845},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":" assert_eq!(Arc::strong_count(&r.db), 1);"}],"del_contents":[{"Del":" assert_eq!(Rc::strong_count(&r.db), 1);\n"}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1956,"ins":{"up_context":[{"change":20,"pos":570159}],"down_context":[{"change":20,"pos":570283}],"flag":"BLOCK","start":67982,"end":68110,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":570159},"to":{"change":20,"start":570159,"end":570283},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":" if let Some(r) = self.open_remotes.lock().unwrap().remove(&name) {"},{"Add":" assert_eq!(Arc::strong_count(&r.db), 1);"}],"del_contents":[{"Del":" if let Some(r) = self.open_remotes.borrow_mut().remove(&name) {\n assert_eq!(Rc::strong_count(&r.db), 1);\n"}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1965,"ins":{"up_context":[{"change":20,"pos":570575}],"down_context":[{"change":20,"pos":570703}],"flag":"BLOCK","start":68111,"end":68277,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":570575},"to":{"change":20,"start":570575,"end":570703},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":" let open_channels = std::mem::replace("},{"Add":" self.open_channels.lock().unwrap().deref_mut(),"},{"Add":" HashMap::default(),"},{"Add":" );"}],"del_contents":[{"Del":" let open_channels =\n std::mem::replace(self.open_channels.borrow_mut().deref_mut(), HashMap::new());\n"}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1975,"ins":{"up_context":[{"change":20,"pos":570887}],"down_context":[{"change":20,"pos":92228}],"flag":"BLOCK","start":68278,"end":68442,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":570887},"to":{"change":20,"start":570887,"end":571013},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":" let open_remotes = std::mem::replace("},{"Add":" self.open_remotes.lock().unwrap().deref_mut(),"},{"Add":" HashMap::default(),"},{"Add":" );"}],"del_contents":[{"Del":" let open_remotes =\n std::mem::replace(self.open_remotes.borrow_mut().deref_mut(), HashMap::new());\n"}]}},{"Edit":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1984,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":571127}],"down_context":[{"change":20,"pos":92330}],"flag":"BLOCK","start":68443,"end":68505,"inode":{"change":20,"pos":531056}}},"contents":[{"Add":" // No need to set `Root::Version`, it is set at init."}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":2032,"ins":{"up_context":[{"change":20,"pos":183}],"down_context":[{"change":20,"pos":572976}],"flag":"BLOCK","start":68506,"end":68555,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":183},"to":{"change":20,"start":572929,"end":572976},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":572929},"to":{"change":20,"start":572929,"end":572976},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":" let channel = channel.r.read().unwrap();"}],"del_contents":[{"Del":" let channel = channel.r.try_borrow()?;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":2063,"ins":{"up_context":[{"change":20,"pos":574705}],"down_context":[{"change":20,"pos":574786}],"flag":"BLOCK","start":68556,"end":68664,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":574705},"to":{"change":20,"start":574705,"end":574786},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":" .lock()"},{"Add":" .unwrap()"},{"Add":" .remove(&channel.r.read().unwrap().name),"}],"del_contents":[{"Del":" .borrow_mut()\n .remove(&channel.r.borrow().name),\n"}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":2073,"ins":{"up_context":[{"change":20,"pos":94732}],"down_context":[{"change":20,"pos":94733}],"flag":"BLOCK","start":68665,"end":68708,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":94732},"to":{"change":20,"start":575500,"end":575536},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":575500},"to":{"change":20,"start":575500,"end":575536},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":" let r = remote.db.lock().unwrap();"}],"del_contents":[{"Del":" let r = remote.db.borrow();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":2085,"ins":{"up_context":[{"change":20,"pos":53881}],"down_context":[{"change":20,"pos":576000}],"flag":"BLOCK","start":68709,"end":68789,"inode":{"change":20,"pos":531056}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":16900},"to":{"change":20,"start":575923,"end":576000},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":53881},"to":{"change":20,"start":575923,"end":576000},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":575923},"to":{"change":20,"start":575923,"end":576000},"introduced_by":20}],"inode":{"change":20,"pos":531056}},"ins_contents":[{"Add":" std::mem::drop(self.open_remotes.lock().unwrap().remove(&remote.name));"}],"del_contents":[{"Del":" std::mem::drop(self.open_remotes.borrow_mut().remove(&remote.name));\n"}]}},{"Replacement":{"inode":{"change":20,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":3,"ins":{"up_context":[{"change":20,"pos":586854}],"down_context":[{"change":20,"pos":586920}],"flag":"BLOCK","start":68790,"end":68821,"inode":{"change":20,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":586854},"to":{"change":20,"start":586854,"end":586920},"introduced_by":20}],"inode":{"change":20,"pos":586748}},"ins_contents":[{"Add":"use crate::{HashMap, HashSet};"}],"del_contents":[{"Del":"use std::cell::RefCell;\nuse std::collections::{HashMap, HashSet};\n"}]}},{"Replacement":{"inode":{"change":20,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":5,"ins":{"up_context":[{"change":20,"pos":586940}],"down_context":[{"change":20,"pos":586957}],"flag":"BLOCK","start":68822,"end":68859,"inode":{"change":20,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":586940},"to":{"change":20,"start":586940,"end":586957},"introduced_by":20}],"inode":{"change":20,"pos":586748}},"ins_contents":[{"Add":"use std::sync::{Arc, Mutex, RwLock};"}],"del_contents":[{"Del":"use std::rc::Rc;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":138,"ins":{"up_context":[{"change":20,"pos":53960}],"down_context":[{"change":20,"pos":587883}],"flag":"BLOCK","start":68860,"end":69316,"inode":{"change":20,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":53960},"to":{"change":20,"start":48707,"end":48750},"introduced_by":20}],"inode":{"change":20,"pos":586748}},"ins_contents":[{"Add":" pub(crate) r: Arc>,"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Debug, Error)]"},{"Add":"#[error(\"Mutex poison error\")]"},{"Add":"pub struct PoisonError {}"},{"Add":""},{"Add":"impl ChannelRef {"},{"Add":" pub fn read(&self) -> Result, PoisonError> {"},{"Add":" self.r.read().map_err(|_| PoisonError {})"},{"Add":" }"},{"Add":" pub fn write(&self) -> Result, PoisonError> {"},{"Add":" self.r.write().map_err(|_| PoisonError {})"},{"Add":" }"}],"del_contents":[{"Del":" pub(crate) r: Rc>,\n"}]}},{"Edit":{"inode":{"change":20,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":164,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":588197},"to":{"change":20,"start":588197,"end":588199},"introduced_by":20}],"inode":{"change":20,"pos":586748}}},"contents":[{"Del":"}\n"}]}},{"Replacement":{"inode":{"change":20,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":165,"ins":{"up_context":[{"change":20,"pos":588200}],"down_context":[{"change":20,"pos":588311}],"flag":"BLOCK","start":69317,"end":69450,"inode":{"change":20,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":588200},"to":{"change":20,"start":54079,"end":54116},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":54116},"to":{"change":20,"start":48751,"end":48808},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":48808},"to":{"change":20,"start":588287,"end":588311},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":588287},"to":{"change":20,"start":588287,"end":588311},"introduced_by":20}],"inode":{"change":20,"pos":586748}},"ins_contents":[{"Add":" pub fn lock(&self) -> Result>, PoisonError> {"},{"Add":" self.db.lock().map_err(|_| PoisonError {})"}],"del_contents":[{"Del":"impl ChannelRef {\n"},{"Del":" pub fn borrow(&self) -> std::cell::Ref {\n"},{"Del":" self.r.borrow()\n"}]}},{"Edit":{"inode":{"change":20,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":168,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":588317},"to":{"change":20,"start":48809,"end":48877},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":48877},"to":{"change":20,"start":588385,"end":588419},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":588385},"to":{"change":20,"start":588385,"end":588419},"introduced_by":20}],"inode":{"change":20,"pos":586748}}},"contents":[{"Del":" pub fn borrow_mut(&mut self) -> std::cell::RefMut {\n"},{"Del":" self.r.borrow_mut()\n }\n"}]}},{"Replacement":{"inode":{"change":20,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":177,"ins":{"up_context":[{"change":20,"pos":588628}],"down_context":[{"change":20,"pos":588660}],"flag":"BLOCK","start":69451,"end":69482,"inode":{"change":20,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":588628},"to":{"change":20,"start":588628,"end":588660},"introduced_by":20}],"inode":{"change":20,"pos":586748}},"ins_contents":[{"Add":" db: Arc>>,"}],"del_contents":[{"Del":" db: Rc>>,\n"}]}},{"Edit":{"inode":{"change":20,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":187,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":588855},"to":{"change":20,"start":588855,"end":588974},"introduced_by":20}],"inode":{"change":20,"pos":586748}}},"contents":[{"Del":" }\n}\n\nimpl RemoteRef {\n pub fn borrow(&self) -> std::cell::Ref> {\n self.db.borrow()\n"}]}},{"Edit":{"inode":{"change":20,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":188,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":588980},"to":{"change":20,"start":588980,"end":589082},"introduced_by":20}],"inode":{"change":20,"pos":586748}}},"contents":[{"Del":" pub fn borrow_mut(&mut self) -> std::cell::RefMut> {\n self.db.borrow_mut()\n }\n"}]}},{"Replacement":{"inode":{"change":20,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":261,"ins":{"up_context":[{"change":20,"pos":54965}],"down_context":[{"change":20,"pos":49599}],"flag":"BLOCK","start":69483,"end":69514,"inode":{"change":20,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":54965},"to":{"change":20,"start":49581,"end":49599},"introduced_by":20}],"inode":{"change":20,"pos":586748}},"ins_contents":[{"Add":" type Channel: Sync + Send;"}],"del_contents":[{"Del":" type Channel;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":464,"ins":{"up_context":[{"change":20,"pos":590029}],"down_context":[{"change":20,"pos":57573}],"flag":"BLOCK","start":69515,"end":69547,"inode":{"change":20,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":590029},"to":{"change":20,"start":57544,"end":57573},"introduced_by":20}],"inode":{"change":20,"pos":586748}},"ins_contents":[{"Add":" // #[cfg(debug_assertions)]"}],"del_contents":[{"Del":" #[cfg(debug_assertions)]\n"}]}},{"Replacement":{"inode":{"change":20,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":466,"ins":{"up_context":[{"change":20,"pos":57635}],"down_context":[{"change":20,"pos":57664}],"flag":"BLOCK","start":69548,"end":69580,"inode":{"change":20,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":57635},"to":{"change":20,"start":57635,"end":57664},"introduced_by":20}],"inode":{"change":20,"pos":586748}},"ins_contents":[{"Add":" // #[cfg(debug_assertions)]"}],"del_contents":[{"Del":" #[cfg(debug_assertions)]\n"}]}},{"Replacement":{"inode":{"change":20,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":847,"ins":{"up_context":[{"change":20,"pos":608593}],"down_context":[{"change":20,"pos":65191}],"flag":"BLOCK","start":69581,"end":69609,"inode":{"change":20,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":608593},"to":{"change":20,"start":43325,"end":43350},"introduced_by":20}],"inode":{"change":20,"pos":586748}},"ins_contents":[{"Add":"// #[cfg(debug_assertions)]"}],"del_contents":[{"Del":"#[cfg(debug_assertions)]\n"}]}},{"Replacement":{"inode":{"change":20,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":863,"ins":{"up_context":[{"change":20,"pos":608677}],"down_context":[{"change":20,"pos":65343}],"flag":"BLOCK","start":69610,"end":69638,"inode":{"change":20,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":608677},"to":{"change":20,"start":43719,"end":43744},"introduced_by":20}],"inode":{"change":20,"pos":586748}},"ins_contents":[{"Add":"// #[cfg(debug_assertions)]"}],"del_contents":[{"Del":"#[cfg(debug_assertions)]\n"}]}},{"Replacement":{"inode":{"change":20,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":876,"ins":{"up_context":[{"change":20,"pos":44154}],"down_context":[{"change":20,"pos":53834}],"flag":"BLOCK","start":69639,"end":69667,"inode":{"change":20,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":44154},"to":{"change":20,"start":44154,"end":44179},"introduced_by":20}],"inode":{"change":20,"pos":586748}},"ins_contents":[{"Add":"// #[cfg(debug_assertions)]"}],"del_contents":[{"Del":"#[cfg(debug_assertions)]\n"}]}},{"Replacement":{"inode":{"change":20,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":879,"ins":{"up_context":[{"change":20,"pos":44250}],"down_context":[{"change":20,"pos":44279}],"flag":"BLOCK","start":69668,"end":69697,"inode":{"change":20,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":44250},"to":{"change":20,"start":53912,"end":53938},"introduced_by":20}],"inode":{"change":20,"pos":586748}},"ins_contents":[{"Add":" channel: &ChannelRef,"}],"del_contents":[{"Del":" channel: &T::Channel,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":884,"ins":{"up_context":[{"change":20,"pos":44404}],"down_context":[{"change":20,"pos":44488}],"flag":"BLOCK","start":69698,"end":69801,"inode":{"change":20,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":44404},"to":{"change":20,"start":3337,"end":3393},"introduced_by":20}],"inode":{"change":20,"pos":586748}},"ins_contents":[{"Add":" let channel = channel.r.read().unwrap();"},{"Add":" let done = debug(txn, txn.graph(&*channel), &mut f)?;"}],"del_contents":[{"Del":" let done = debug(txn, txn.graph(channel), &mut f)?;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":891,"ins":{"up_context":[{"change":20,"pos":44560}],"down_context":[{"change":20,"pos":65606}],"flag":"BLOCK","start":69802,"end":69830,"inode":{"change":20,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":44560},"to":{"change":20,"start":44560,"end":44585},"introduced_by":20}],"inode":{"change":20,"pos":586748}},"ins_contents":[{"Add":"// #[cfg(debug_assertions)]"}],"del_contents":[{"Del":"#[cfg(debug_assertions)]\n"}]}},{"Replacement":{"inode":{"change":20,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":903,"ins":{"up_context":[{"change":20,"pos":610461}],"down_context":[{"change":20,"pos":65771}],"flag":"BLOCK","start":69831,"end":69859,"inode":{"change":20,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":610461},"to":{"change":20,"start":44846,"end":44871},"introduced_by":20}],"inode":{"change":20,"pos":586748}},"ins_contents":[{"Add":"// #[cfg(debug_assertions)]"}],"del_contents":[{"Del":"#[cfg(debug_assertions)]\n"}]}},{"Replacement":{"inode":{"change":20,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":910,"ins":{"up_context":[{"change":20,"pos":611456}],"down_context":[{"change":20,"pos":65918}],"flag":"BLOCK","start":69860,"end":69888,"inode":{"change":20,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":611456},"to":{"change":20,"start":44999,"end":45024},"introduced_by":20}],"inode":{"change":20,"pos":586748}},"ins_contents":[{"Add":"// #[cfg(debug_assertions)]"}],"del_contents":[{"Del":"#[cfg(debug_assertions)]\n"}]}},{"Replacement":{"inode":{"change":20,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":919,"ins":{"up_context":[{"change":20,"pos":611728}],"down_context":[{"change":20,"pos":66056}],"flag":"BLOCK","start":69889,"end":69917,"inode":{"change":20,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":611728},"to":{"change":20,"start":1210,"end":1235},"introduced_by":20}],"inode":{"change":20,"pos":586748}},"ins_contents":[{"Add":"// #[cfg(debug_assertions)]"}],"del_contents":[{"Del":"#[cfg(debug_assertions)]\n"}]}},{"Replacement":{"inode":{"change":20,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":930,"ins":{"up_context":[{"change":20,"pos":45329}],"down_context":[{"change":20,"pos":53995}],"flag":"BLOCK","start":69918,"end":69946,"inode":{"change":20,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":45329},"to":{"change":20,"start":45329,"end":45354},"introduced_by":20}],"inode":{"change":20,"pos":586748}},"ins_contents":[{"Add":"// #[cfg(debug_assertions)]"}],"del_contents":[{"Del":"#[cfg(debug_assertions)]\n"}]}},{"Replacement":{"inode":{"change":20,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":961,"ins":{"up_context":[{"change":20,"pos":46222}],"down_context":[{"change":20,"pos":46262}],"flag":"BLOCK","start":69947,"end":69991,"inode":{"change":20,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":46222},"to":{"change":20,"start":46222,"end":46262},"introduced_by":20}],"inode":{"change":20,"pos":586748}},"ins_contents":[{"Add":" let mut reachable = HashSet::default();"}],"del_contents":[{"Del":" let mut reachable = HashSet::new();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":983,"ins":{"up_context":[{"change":20,"pos":46734}],"down_context":[{"change":20,"pos":4007}],"flag":"BLOCK","start":69992,"end":70044,"inode":{"change":20,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":46734},"to":{"change":20,"start":46734,"end":46782},"introduced_by":20}],"inode":{"change":20,"pos":586748}},"ins_contents":[{"Add":" let mut alive_unreachable = HashMap::default();"}],"del_contents":[{"Del":" let mut alive_unreachable = HashMap::new();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":986,"ins":{"up_context":[{"change":20,"pos":54330}],"down_context":[{"change":20,"pos":46881}],"flag":"BLOCK","start":70045,"end":70087,"inode":{"change":20,"pos":586748}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":409},"to":{"change":20,"start":46843,"end":46881},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":54330},"to":{"change":20,"start":46843,"end":46881},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":66568},"to":{"change":20,"start":46843,"end":46881},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":46843},"to":{"change":20,"start":46843,"end":46881},"introduced_by":20}],"inode":{"change":20,"pos":586748}},"ins_contents":[{"Add":" let mut visited = HashSet::default();"}],"del_contents":[{"Del":" let mut visited = HashSet::new();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1072,"ins":{"up_context":[{"change":20,"pos":49237}],"down_context":[{"change":20,"pos":49275}],"flag":"BLOCK","start":70088,"end":70130,"inode":{"change":20,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":49237},"to":{"change":20,"start":49237,"end":49275},"introduced_by":20}],"inode":{"change":20,"pos":586748}},"ins_contents":[{"Add":" let mut visited = HashSet::default();"}],"del_contents":[{"Del":" let mut visited = HashSet::new();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1270,"ins":{"up_context":[{"change":20,"pos":68648}],"down_context":[{"change":20,"pos":68649}],"flag":"BLOCK","start":70131,"end":70159,"inode":{"change":20,"pos":586748}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":68648},"to":{"change":20,"start":1431,"end":1456},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":621548},"to":{"change":20,"start":1431,"end":1456},"introduced_by":20}],"inode":{"change":20,"pos":586748}},"ins_contents":[{"Add":"// #[cfg(debug_assertions)]"}],"del_contents":[{"Del":"#[cfg(debug_assertions)]\n"}]}},{"Replacement":{"inode":{"change":20,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1439,"ins":{"up_context":[{"change":20,"pos":625794}],"down_context":[{"change":20,"pos":625825}],"flag":"BLOCK","start":70160,"end":70240,"inode":{"change":20,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":625794},"to":{"change":20,"start":72086,"end":72148},"introduced_by":20}],"inode":{"change":20,"pos":586748}},"ins_contents":[{"Add":" type Item = Result<(&'txn SmallStr, ChannelRef), TxnErr>;"}],"del_contents":[{"Del":" type Item = Result, TxnErr>;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1444,"ins":{"up_context":[{"change":20,"pos":72314}],"down_context":[{"change":20,"pos":72399}],"flag":"BLOCK","start":70241,"end":70342,"inode":{"change":20,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":72314},"to":{"change":20,"start":72314,"end":72399},"introduced_by":20}],"inode":{"change":20,"pos":586748}},"ins_contents":[{"Add":" Ok(Some((name, _))) => Some(Ok((name, self.txn.load_channel(name.as_str()).unwrap()?))),"}],"del_contents":[{"Del":" Ok(Some((name, _))) => self.txn.load_channel(name.as_str()).transpose(),\n"}]}},{"Edit":{"inode":{"change":20,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1486,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":55422}],"down_context":[{"change":20,"pos":55422}],"flag":"BLOCK","start":70343,"end":70513,"inode":{"change":20,"pos":586748}}},"contents":[{"Add":" /// Delete a key and a value from a graph. Returns `true` if and only if `(k, v)` was in the graph."},{"Add":" fn debug(&mut self, channel: &mut Self::Graph, extra: &str);"},{"Add":""}]}},{"Replacement":{"inode":{"change":20,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1679,"ins":{"up_context":[{"change":20,"pos":52571}],"down_context":[{"change":20,"pos":16484}],"flag":"BLOCK","start":70514,"end":71288,"inode":{"change":20,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":52571},"to":{"change":20,"start":52571,"end":52598},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":52598},"to":{"change":20,"start":75944,"end":75959},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":75959},"to":{"change":20,"start":110165,"end":110178},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":110178},"to":{"change":20,"start":16190,"end":16327},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":16327},"to":{"change":20,"start":52831,"end":52866},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":110256},"to":{"change":20,"start":52831,"end":52866},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":52831},"to":{"change":20,"start":52831,"end":52866},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":52866},"to":{"change":20,"start":75960,"end":75975},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":75975},"to":{"change":20,"start":110257,"end":110270},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":110270},"to":{"change":20,"start":16328,"end":16483},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":16483},"to":{"change":20,"start":53117,"end":53125},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":110366},"to":{"change":20,"start":53117,"end":53125},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":53117},"to":{"change":20,"start":53117,"end":53125},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":53125},"to":{"change":20,"start":110367,"end":110399},"introduced_by":20}],"inode":{"change":20,"pos":586748}},"ins_contents":[{"Add":" let v0 = SerializedEdge::new(flag, k1.change, k1.start, introduced_by);"},{"Add":" let a = txn.del_graph(graph, &k0, Some(&v0))?;"},{"Add":" {"},{"Add":" if let Some(&ee) = txn.get_graph(graph, &k0, Some(&v0))? {"},{"Add":" if ee == v0 {"},{"Add":" txn.debug(graph, \".3\");"},{"Add":" panic!(\"Not deleted: {:?} {:?}\", k0, v0);"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" let v1 = SerializedEdge::new(flag | EdgeFlags::PARENT, k0.change, k0.end, introduced_by);"},{"Add":" let b = txn.del_graph(graph, &k1, Some(&v1))?;"},{"Add":" {"},{"Add":" if let Some(&ee) = txn.get_graph(graph, &k1, Some(&v1))? {"},{"Add":" if ee == v1 {"},{"Add":" txn.debug(graph, \".3\");"},{"Add":" panic!(\"Not deleted: {:?} {:?}\", k1, v1);"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" if a != b {"},{"Add":" txn.debug(graph, \".2\");"}],"del_contents":[{"Del":" let a = txn.del_graph(\n"},{"Del":" graph,\n"},{"Del":" &k0,\n"},{"Del":" Some(&SerializedEdge::new(\n flag,\n k1.change,\n k1.start,\n introduced_by,\n )),\n"},{"Del":" )?;\n let b = txn.del_graph(\n"},{"Del":" graph,\n"},{"Del":" &k1,\n"},{"Del":" Some(&SerializedEdge::new(\n flag | EdgeFlags::PARENT,\n k0.change,\n k0.end,\n introduced_by,\n )),\n"},{"Del":" )?;\n"},{"Del":" if (a && !b) || (!a && b) {\n"}]}},{"Edit":{"inode":{"change":20,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1724,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":53652}],"down_context":[{"change":20,"pos":53652}],"flag":"BLOCK","start":71289,"end":71864,"inode":{"change":20,"pos":586748}}},"contents":[{"Add":""},{"Add":" let gaeul = ChangeId::from_base32(b\"GAEULYDRSLJSC\").unwrap();"},{"Add":" let has_gaeul1 = {"},{"Add":" let v = Vertex {"},{"Add":" change: gaeul,"},{"Add":" start: ChangePosition(L64(1677892)),"},{"Add":" end: ChangePosition(L64(1677893)),"},{"Add":" };"},{"Add":" let e = SerializedEdge::new("},{"Add":" EdgeFlags::PSEUDO | EdgeFlags::PARENT,"},{"Add":" gaeul,"},{"Add":" ChangePosition(L64(1677837)),"},{"Add":" ChangeId::ROOT,"},{"Add":" );"},{"Add":" if let Some(&ee) = txn.get_graph(graph, &v, Some(&e))? {"},{"Add":" ee == e"},{"Add":" } else {"},{"Add":" false"},{"Add":" }"},{"Add":" };"},{"Add":""}]}},{"Edit":{"inode":{"change":20,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1757,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":54294}],"down_context":[{"change":20,"pos":54294}],"flag":"BLOCK","start":71865,"end":72480,"inode":{"change":20,"pos":586748}}},"contents":[{"Add":""},{"Add":" let has_gaeul1_ = {"},{"Add":" let v = Vertex {"},{"Add":" change: gaeul,"},{"Add":" start: ChangePosition(L64(1677892)),"},{"Add":" end: ChangePosition(L64(1677893)),"},{"Add":" };"},{"Add":" let e = SerializedEdge::new("},{"Add":" EdgeFlags::PSEUDO | EdgeFlags::PARENT,"},{"Add":" gaeul,"},{"Add":" ChangePosition(L64(1677837)),"},{"Add":" ChangeId::ROOT,"},{"Add":" );"},{"Add":" if let Some(&ee) = txn.get_graph(graph, &v, Some(&e))? {"},{"Add":" ee == e"},{"Add":" } else {"},{"Add":" false"},{"Add":" }"},{"Add":" };"},{"Add":""},{"Add":" if has_gaeul1 && !has_gaeul1_ {"},{"Add":" txn.debug(graph, \".GAEUL\");"},{"Add":" panic!(\"GAEULT\");"},{"Add":" }"},{"Add":""}]}},{"Replacement":{"inode":{"change":20,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1933,"ins":{"up_context":[{"change":20,"pos":1547}],"down_context":[{"change":20,"pos":1579}],"flag":"BLOCK","start":72481,"end":72517,"inode":{"change":20,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1547},"to":{"change":20,"start":1547,"end":1579},"introduced_by":20}],"inode":{"change":20,"pos":586748}},"ins_contents":[{"Add":" let mut h = HashMap::default();"}],"del_contents":[{"Del":" let mut h = HashMap::new();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1954,"ins":{"up_context":[{"change":20,"pos":3821}],"down_context":[{"change":20,"pos":2277}],"flag":"BLOCK","start":72518,"end":72554,"inode":{"change":20,"pos":586748}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":3821},"to":{"change":20,"start":2245,"end":2277},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":56163},"to":{"change":20,"start":2245,"end":2277},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":77260},"to":{"change":20,"start":2245,"end":2277},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":2245},"to":{"change":20,"start":2245,"end":2277},"introduced_by":20}],"inode":{"change":20,"pos":586748}},"ins_contents":[{"Add":" let mut h = HashSet::default();"}],"del_contents":[{"Del":" let mut h = HashSet::new();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":641569},"path":"libpijul/src/pristine/inode_metadata.rs","line":8,"ins":{"up_context":[{"change":20,"pos":641877}],"down_context":[{"change":20,"pos":641931}],"flag":"BLOCK","start":72555,"end":72594,"inode":{"change":20,"pos":641569}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":641877},"to":{"change":20,"start":641877,"end":641931},"introduced_by":20}],"inode":{"change":20,"pos":641569}},"ins_contents":[{"Add":"use byteorder::{BigEndian, ByteOrder};"}],"del_contents":[{"Del":"use byteorder::{BigEndian, ByteOrder, WriteBytesExt};\n"}]}},{"Edit":{"inode":{"change":20,"pos":641569},"path":"libpijul/src/pristine/inode_metadata.rs","line":58,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":9,"pos":220},"to":{"change":20,"start":643482,"end":643608},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":643482},"to":{"change":20,"start":643482,"end":643608},"introduced_by":20}],"inode":{"change":20,"pos":641569}}},"contents":[{"Del":" }\n\n pub fn write(&self, mut w: W) -> std::io::Result<()> {\n w.write_u16::(self.0)\n"}]}},{"Edit":{"inode":{"change":20,"pos":644439},"path":"libpijul/src/pristine/hash.rs","line":160,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":16907}],"down_context":[{"change":20,"pos":114950}],"flag":"BLOCK","start":72595,"end":72845,"inode":{"change":20,"pos":644439}}},"contents":[{"Add":"}"},{"Add":""},{"Add":"impl std::hash::Hash for SerializedHash {"},{"Add":" fn hash(&self, hasher: &mut H) {"},{"Add":" self.t.hash(hasher);"},{"Add":" if self.t == HashAlgorithm::Blake3 as u8 {"},{"Add":" unsafe { self.h.blake3.hash(hasher) }"},{"Add":" }"},{"Add":" }"}]}},{"Edit":{"inode":{"change":20,"pos":644439},"path":"libpijul/src/pristine/hash.rs","line":262,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":117151}],"down_context":[],"flag":"BLOCK","start":72846,"end":73430,"inode":{"change":20,"pos":644439}}},"contents":[{"Add":""},{"Add":"impl SerializedHash {"},{"Add":" pub fn size(b: &[u8]) -> usize {"},{"Add":" if b[0] == HashAlgorithm::Blake3 as u8 {"},{"Add":" 1 + BLAKE3_BYTES"},{"Add":" } else if b[0] == HashAlgorithm::None as u8 {"},{"Add":" 1"},{"Add":" } else {"},{"Add":" panic!(\"Unknown hash algorithm {:?}\", b[0])"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" pub unsafe fn size_from_ptr(b: *const u8) -> usize {"},{"Add":" if *b == HashAlgorithm::Blake3 as u8 {"},{"Add":" 1 + BLAKE3_BYTES"},{"Add":" } else if *b == HashAlgorithm::None as u8 {"},{"Add":" 1"},{"Add":" } else {"},{"Add":" panic!(\"Unknown hash algorithm {:?}\", *b)"},{"Add":" }"},{"Add":" }"},{"Add":"}"}]}},{"Edit":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":11,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":672295}],"down_context":[{"change":20,"pos":672295}],"flag":"BLOCK","start":73431,"end":73463,"inode":{"change":20,"pos":671807}}},"contents":[{"Add":"use crate::{HashMap, HashSet};"},{"Add":""}]}},{"Replacement":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":14,"ins":{"up_context":[{"change":20,"pos":672334}],"down_context":[{"change":20,"pos":672376}],"flag":"BLOCK","start":73464,"end":73494,"inode":{"change":20,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":672334},"to":{"change":20,"start":672334,"end":672376},"introduced_by":20}],"inode":{"change":20,"pos":671807}},"ins_contents":[{"Add":"use std::sync::{Arc, RwLock};"}],"del_contents":[{"Del":"use std::collections::{HashMap, HashSet};\n"}]}},{"Replacement":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":32,"ins":{"up_context":[{"change":20,"pos":673008}],"down_context":[{"change":20,"pos":673107}],"flag":"BLOCK","start":73495,"end":73682,"inode":{"change":20,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":673008},"to":{"change":20,"start":673008,"end":673107},"introduced_by":20}],"inode":{"change":20,"pos":671807}},"ins_contents":[{"Add":"pub fn output_repository_no_pending<"},{"Add":" T: MutTxnT + Send + Sync + 'static,"},{"Add":" R: WorkingCopy + Send + Sync + 'static,"},{"Add":" P: ChangeStore + Send + Clone + 'static,"},{"Add":">("},{"Add":" repo: Arc,"}],"del_contents":[{"Del":"pub fn output_repository_no_pending(\n repo: &mut R,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":39,"ins":{"up_context":[{"change":20,"pos":673124}],"down_context":[{"change":20,"pos":673174}],"flag":"BLOCK","start":73683,"end":73736,"inode":{"change":20,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":673124},"to":{"change":20,"start":673124,"end":673174},"introduced_by":20}],"inode":{"change":20,"pos":671807}},"ins_contents":[{"Add":" txn: Arc>,"},{"Add":" channel: ChannelRef,"}],"del_contents":[{"Del":" txn: &mut T,\n channel: &mut ChannelRef,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":44,"ins":{"up_context":[{"change":20,"pos":1615}],"down_context":[{"change":20,"pos":673269}],"flag":"BLOCK","start":73737,"end":73881,"inode":{"change":20,"pos":671807}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":1615},"to":{"change":20,"start":81906,"end":81983},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":673225},"to":{"change":20,"start":81906,"end":81983},"introduced_by":20}],"inode":{"change":20,"pos":671807}},"ins_contents":[{"Add":" n_workers: usize,"},{"Add":") -> Result, OutputError>"},{"Add":"where"},{"Add":" T::Channel: Send + Sync + 'static,"},{"Add":"{"}],"del_contents":[{"Del":") -> Result, OutputError> {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":53,"ins":{"up_context":[{"change":20,"pos":673336}],"down_context":[{"change":20,"pos":673373}],"flag":"BLOCK","start":73882,"end":73899,"inode":{"change":20,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":673336},"to":{"change":20,"start":673336,"end":673373},"introduced_by":20}],"inode":{"change":20,"pos":671807}},"ins_contents":[{"Add":" channel,"}],"del_contents":[{"Del":" &mut channel.r.borrow_mut(),\n"}]}},{"Edit":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":58,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":1643}],"down_context":[{"change":20,"pos":673474}],"flag":"BLOCK","start":73900,"end":73919,"inode":{"change":20,"pos":671807}}},"contents":[{"Add":" n_workers,"}]}},{"Edit":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":62,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":673483}],"down_context":[{"change":20,"pos":673538}],"flag":"BLOCK","start":73920,"end":75463,"inode":{"change":20,"pos":671807}}},"contents":[{"Add":"fn output_loop<"},{"Add":" T: TreeMutTxnT + ChannelMutTxnT + GraphMutTxnT::TreeError>,"},{"Add":" R: WorkingCopy + 'static,"},{"Add":" P: ChangeStore + Clone + Send,"},{"Add":">("},{"Add":" repo: Arc,"},{"Add":" changes: &P,"},{"Add":" txn: Arc>,"},{"Add":" channel: ChannelRef,"},{"Add":" work: Arc>,"},{"Add":" stop: Arc,"},{"Add":" t: usize,"},{"Add":") -> Result<(), OutputError> {"},{"Add":" use crossbeam_deque::*;"},{"Add":" // let backoff = crossbeam_utils::Backoff::new();"},{"Add":" // let w: Worker<(OutputItem, String)> = Worker::new_fifo();"},{"Add":" loop {"},{"Add":" match work.steal() {"},{"Add":" Steal::Success((item, path)) => {"},{"Add":" let mut conflicts = Vec::new();"},{"Add":" info!(\"Outputting {:?}, on thread {}\", path, t);"},{"Add":" output_item::<_, _, R>("},{"Add":" txn.clone(),"},{"Add":" channel.clone(),"},{"Add":" changes,"},{"Add":" &item,"},{"Add":" &mut conflicts,"},{"Add":" &repo,"},{"Add":" &path,"},{"Add":" )?;"},{"Add":" debug!(\"setting permissions for {:?}\", path);"},{"Add":" repo.set_permissions(&path, item.meta.permissions())"},{"Add":" .map_err(OutputError::WorkingCopy)?;"},{"Add":" debug!(\"output {:?}\", path);"},{"Add":" }"},{"Add":" Steal::Retry => {}"},{"Add":" Steal::Empty => {"},{"Add":" if stop.load(std::sync::atomic::Ordering::Relaxed) {"},{"Add":" break;"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""}]}},{"Replacement":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":110,"ins":{"up_context":[{"change":20,"pos":673568}],"down_context":[{"change":20,"pos":673624}],"flag":"BLOCK","start":75464,"end":75710,"inode":{"change":20,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":673568},"to":{"change":20,"start":57617,"end":57710},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":57710},"to":{"change":20,"start":673584,"end":673624},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":82074},"to":{"change":20,"start":673584,"end":673624},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":673584},"to":{"change":20,"start":673584,"end":673624},"introduced_by":20}],"inode":{"change":20,"pos":671807}},"ins_contents":[{"Add":" T: TreeMutTxnT"},{"Add":" + ChannelMutTxnT"},{"Add":" + GraphMutTxnT::TreeError>"},{"Add":" + Send"},{"Add":" + Sync"},{"Add":" + 'static,"},{"Add":" R: WorkingCopy + Send + Sync + 'static,"},{"Add":" P: ChangeStore + Send + Clone + 'static,"}],"del_contents":[{"Del":" T: TreeMutTxnT + ChannelMutTxnT + GraphMutTxnT::TreeError>,\n"},{"Del":" R: WorkingCopy,\n P: ChangeStore,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":120,"ins":{"up_context":[{"change":20,"pos":673660}],"down_context":[{"change":20,"pos":673678}],"flag":"BLOCK","start":75711,"end":75729,"inode":{"change":20,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":673660},"to":{"change":20,"start":673660,"end":673678},"introduced_by":20}],"inode":{"change":20,"pos":671807}},"ins_contents":[{"Add":" repo: Arc,"}],"del_contents":[{"Del":" repo: &mut R,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":122,"ins":{"up_context":[{"change":20,"pos":673695}],"down_context":[{"change":20,"pos":673742}],"flag":"BLOCK","start":75730,"end":75783,"inode":{"change":20,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":673695},"to":{"change":20,"start":673695,"end":673712},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":673712},"to":{"change":20,"start":57711,"end":57741},"introduced_by":20}],"inode":{"change":20,"pos":671807}},"ins_contents":[{"Add":" txn: Arc>,"},{"Add":" channel: ChannelRef,"}],"del_contents":[{"Del":" txn: &mut T,\n"},{"Del":" channel: &mut T::Channel,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":128,"ins":{"up_context":[{"change":20,"pos":1698}],"down_context":[{"change":20,"pos":673931}],"flag":"BLOCK","start":75784,"end":76470,"inode":{"change":20,"pos":671807}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":1698},"to":{"change":20,"start":82075,"end":82151},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":673828},"to":{"change":20,"start":82075,"end":82151},"introduced_by":20}],"inode":{"change":20,"pos":671807}},"ins_contents":[{"Add":" n_workers: usize,"},{"Add":") -> Result, OutputError>"},{"Add":"where"},{"Add":" T::Channel: Send + Sync + 'static,"},{"Add":"{"},{"Add":" let work = Arc::new(crossbeam_deque::Injector::new());"},{"Add":" let stop = Arc::new(std::sync::atomic::AtomicBool::new(false));"},{"Add":" let mut threads = Vec::new();"},{"Add":" for t in 0..n_workers - 1 {"},{"Add":" let repo = repo.clone();"},{"Add":" let work = work.clone();"},{"Add":" let stop = stop.clone();"},{"Add":" let txn = txn.clone();"},{"Add":" let channel = channel.clone();"},{"Add":" let changes = changes.clone();"},{"Add":" threads.push(std::thread::spawn(move || {"},{"Add":" output_loop(repo, &changes, txn, channel, work, stop, t + 1)"},{"Add":" }))"},{"Add":" }"},{"Add":""}],"del_contents":[{"Del":") -> Result, OutputError> {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":149,"ins":{"up_context":[{"change":20,"pos":673967}],"down_context":[{"change":20,"pos":674044}],"flag":"BLOCK","start":76471,"end":76556,"inode":{"change":20,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":673967},"to":{"change":20,"start":673967,"end":674044},"introduced_by":20}],"inode":{"change":20,"pos":671807}},"ins_contents":[{"Add":" let mut files = HashMap::default();"},{"Add":" let mut next_files = HashMap::default();"}],"del_contents":[{"Del":" let mut files = HashMap::new();\n let mut next_files = HashMap::new();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":154,"ins":{"up_context":[{"change":20,"pos":980}],"down_context":[{"change":20,"pos":1077}],"flag":"BLOCK","start":76557,"end":76810,"inode":{"change":20,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":980},"to":{"change":20,"start":980,"end":1077},"introduced_by":20}],"inode":{"change":20,"pos":671807}},"ins_contents":[{"Add":" let dead = {"},{"Add":" let txn_ = txn.read().unwrap();"},{"Add":" let channel = channel.read().unwrap();"},{"Add":" let graph = txn_.graph(&*channel);"},{"Add":" collect_dead_files(&*txn_, graph, pending_change_id, Inode::ROOT)?"},{"Add":" };"}],"del_contents":[{"Del":" let dead = collect_dead_files(txn, txn.graph(channel), pending_change_id, Inode::ROOT)?;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":161,"ins":{"up_context":[{"change":20,"pos":1133}],"down_context":[{"change":20,"pos":1188}],"flag":"BLOCK","start":76811,"end":76972,"inode":{"change":20,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1133},"to":{"change":20,"start":1133,"end":1188},"introduced_by":20}],"inode":{"change":20,"pos":671807}},"ins_contents":[{"Add":" if !dead.is_empty() {"},{"Add":" let mut txn = txn.write().unwrap();"},{"Add":" kill_dead_files::(&mut *txn, repo.clone(), &dead)?;"},{"Add":" }"}],"del_contents":[{"Del":" kill_dead_files::(txn, repo, &dead)?;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":167,"ins":{"up_context":[{"change":20,"pos":1225}],"down_context":[{"change":20,"pos":674574}],"flag":"BLOCK","start":76973,"end":77312,"inode":{"change":20,"pos":671807}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":1225},"to":{"change":20,"start":674094,"end":674146},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":674094},"to":{"change":20,"start":674094,"end":674146},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":674146},"to":{"change":20,"start":4336,"end":4364},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":4364},"to":{"change":20,"start":674163,"end":674278},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":57769},"to":{"change":20,"start":674163,"end":674278},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":82176},"to":{"change":20,"start":674163,"end":674278},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":674163},"to":{"change":20,"start":674163,"end":674278},"introduced_by":20}],"inode":{"change":20,"pos":671807}},"ins_contents":[{"Add":" {"},{"Add":" let txn = txn.read().unwrap();"},{"Add":" let channel = channel.read().unwrap();"},{"Add":" collect_children("},{"Add":" &*txn,"},{"Add":" &*changes,"},{"Add":" txn.graph(&*channel),"},{"Add":" Position::ROOT,"},{"Add":" Inode::ROOT,"},{"Add":" \"\","},{"Add":" next_prefix_basename,"},{"Add":" &mut files,"},{"Add":" )?;"},{"Add":" }"}],"del_contents":[{"Del":" collect_children(\n txn,\n changes,\n"},{"Del":" txn.graph(channel),\n"},{"Del":" Position::ROOT,\n Inode::ROOT,\n \"\",\n next_prefix_basename,\n &mut files,\n )?;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":182,"ins":{"up_context":[{"change":20,"pos":674618}],"down_context":[{"change":20,"pos":674695}],"flag":"BLOCK","start":77313,"end":77407,"inode":{"change":20,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":674653},"to":{"change":20,"start":674653,"end":674695},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":674695},"to":{"change":20,"start":1226,"end":1270},"introduced_by":20}],"inode":{"change":20,"pos":671807}},"ins_contents":[{"Add":" let mut done_inodes = HashSet::default();"},{"Add":" let mut done_vertices = HashMap::default();"}],"del_contents":[{"Del":" let mut done_inodes = HashSet::new();\n"},{"Del":" let mut done_vertices = HashMap::new();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":194,"ins":{"up_context":[{"change":20,"pos":675153}],"down_context":[{"change":20,"pos":675466}],"flag":"BLOCK","start":77408,"end":77892,"inode":{"change":20,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":675153},"to":{"change":20,"start":9361,"end":9401},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":9401},"to":{"change":20,"start":119754,"end":119824},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":4532},"to":{"change":20,"start":675254,"end":675284},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":57935},"to":{"change":20,"start":675254,"end":675284},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":119824},"to":{"change":20,"start":675254,"end":675284},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":675254},"to":{"change":20,"start":675254,"end":675284},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":675284},"to":{"change":20,"start":741,"end":767},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":767},"to":{"change":20,"start":119825,"end":119904},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":119904},"to":{"change":20,"start":845,"end":906},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":845},"to":{"change":20,"start":845,"end":906},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":906},"to":{"change":20,"start":675450,"end":675466},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":4622},"to":{"change":20,"start":675450,"end":675466},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":58024},"to":{"change":20,"start":675450,"end":675466},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":675450},"to":{"change":20,"start":675450,"end":675466},"introduced_by":20}],"inode":{"change":20,"pos":671807}},"ins_contents":[{"Add":" {"},{"Add":" let txn = txn.read().unwrap();"},{"Add":" let channel = channel.read().unwrap();"},{"Add":" b.sort_unstable_by(|u, v| {"},{"Add":" txn.get_changeset(txn.changes(&channel), &u.0.change)"},{"Add":" .unwrap()"},{"Add":" .cmp("},{"Add":" &txn.get_changeset(txn.changes(&channel), &v.0.change)"},{"Add":" .unwrap(),"},{"Add":" )"},{"Add":" });"},{"Add":" }"}],"del_contents":[{"Del":" b.sort_unstable_by(|u, v| {\n"},{"Del":" txn.get_changeset(txn.changes(&channel), &u.0.change)\n"},{"Del":" .unwrap()\n"},{"Del":" .cmp(\n"},{"Del":" &txn.get_changeset(txn.changes(&channel), &v.0.change)\n"},{"Del":" .unwrap(),\n )\n"},{"Del":" });\n"}]}},{"Replacement":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":223,"ins":{"up_context":[{"change":20,"pos":82272}],"down_context":[{"change":20,"pos":119905}],"flag":"BLOCK","start":77893,"end":77986,"inode":{"change":20,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":82272},"to":{"change":20,"start":82272,"end":82312},"introduced_by":20}],"inode":{"change":20,"pos":671807}},"ins_contents":[{"Add":" let output_item_inode = {"},{"Add":" let txn = txn.read().unwrap();"}],"del_contents":[{"Del":" let output_item_inode =\n"}]}},{"Replacement":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":229,"ins":{"up_context":[{"change":20,"pos":82532}],"down_context":[{"change":20,"pos":82555}],"flag":"BLOCK","start":77987,"end":78028,"inode":{"change":20,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":82532},"to":{"change":20,"start":82532,"end":82555},"introduced_by":20}],"inode":{"change":20,"pos":671807}},"ins_contents":[{"Add":" }"},{"Add":" };"}],"del_contents":[{"Del":" };\n"}]}},{"Replacement":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":258,"ins":{"up_context":[{"change":20,"pos":20338}],"down_context":[{"change":20,"pos":677476}],"flag":"BLOCK","start":78029,"end":78096,"inode":{"change":20,"pos":671807}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":20338},"to":{"change":20,"start":677425,"end":677476},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":677425},"to":{"change":20,"start":677425,"end":677476},"introduced_by":20}],"inode":{"change":20,"pos":671807}},"ins_contents":[{"Add":" txn.clone(),"},{"Add":" repo.clone(),"}],"del_contents":[{"Del":" txn,\n repo,\n"}]}},{"Edit":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":266,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":677628}],"down_context":[{"change":20,"pos":677628}],"flag":"BLOCK","start":78097,"end":78144,"inode":{"change":20,"pos":671807}}},"contents":[{"Add":" debug!(\"inode = {:?}\", inode);"}]}},{"Replacement":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":268,"ins":{"up_context":[{"change":20,"pos":677697}],"down_context":[{"change":20,"pos":677788}],"flag":"BLOCK","start":78145,"end":78421,"inode":{"change":20,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":677697},"to":{"change":20,"start":58025,"end":58056},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":58056},"to":{"change":20,"start":4623,"end":4719},"introduced_by":20}],"inode":{"change":20,"pos":671807}},"ins_contents":[{"Add":" let dead = {"},{"Add":" let txn_ = txn.read().unwrap();"},{"Add":" let channel = channel.read().unwrap();"},{"Add":" collect_dead_files(&*txn_, txn_.graph(&*channel), pending_change_id, inode)?"},{"Add":" };"}],"del_contents":[{"Del":" let dead =\n"},{"Del":" collect_dead_files(txn, txn.graph(channel), pending_change_id, inode)?;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":274,"ins":{"up_context":[{"change":20,"pos":677856}],"down_context":[{"change":20,"pos":677912}],"flag":"BLOCK","start":78422,"end":78631,"inode":{"change":20,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":677856},"to":{"change":20,"start":20339,"end":20406},"introduced_by":20}],"inode":{"change":20,"pos":671807}},"ins_contents":[{"Add":" if !dead.is_empty() {"},{"Add":" let mut txn = txn.write().unwrap();"},{"Add":" kill_dead_files::(&mut *txn, repo.clone(), &dead)?;"},{"Add":" }"}],"del_contents":[{"Del":" kill_dead_files::(txn, repo, &dead)?;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":283,"ins":{"up_context":[{"change":20,"pos":20515}],"down_context":[{"change":20,"pos":678486}],"flag":"BLOCK","start":78632,"end":79405,"inode":{"change":20,"pos":671807}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":20515},"to":{"change":20,"start":678140,"end":678240},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":678140},"to":{"change":20,"start":678140,"end":678240},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":678240},"to":{"change":20,"start":4720,"end":4764},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":4764},"to":{"change":20,"start":678273,"end":678463},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":58195},"to":{"change":20,"start":678273,"end":678463},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":82799},"to":{"change":20,"start":678273,"end":678463},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":678273},"to":{"change":20,"start":678273,"end":678463},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":678463},"to":{"change":20,"start":82800,"end":82824},"introduced_by":20}],"inode":{"change":20,"pos":671807}},"ins_contents":[{"Add":" {"},{"Add":" let txn = txn.read().unwrap();"},{"Add":" let channel = channel.read().unwrap();"},{"Add":" collect_children("},{"Add":" &*txn,"},{"Add":" &*changes,"},{"Add":" txn.graph(&*channel),"},{"Add":" output_item.pos,"},{"Add":" inode,"},{"Add":" &path,"},{"Add":" next_prefix_basename,"},{"Add":" &mut next_files,"},{"Add":" )?;"},{"Add":" }"},{"Add":" debug!(\"setting permissions for {:?}\", path);"},{"Add":" repo.set_permissions(&path, output_item.meta.permissions())"},{"Add":" .map_err(OutputError::WorkingCopy)?;"}],"del_contents":[{"Del":" collect_children(\n txn,\n changes,\n"},{"Del":" txn.graph(channel),\n"},{"Del":" output_item.pos,\n inode,\n &path,\n next_prefix_basename,\n &mut next_files,\n"},{"Del":" )?;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":301,"ins":{"up_context":[{"change":20,"pos":678511}],"down_context":[{"change":20,"pos":963}],"flag":"BLOCK","start":79406,"end":79557,"inode":{"change":20,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":678511},"to":{"change":20,"start":892,"end":962},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":962},"to":{"change":20,"start":2082,"end":2517},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":2082},"to":{"change":20,"start":2082,"end":2517},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":2517},"to":{"change":20,"start":1244,"end":1297},"introduced_by":20}],"inode":{"change":20,"pos":671807}},"ins_contents":[{"Add":" if needs_output(repo.as_ref(), if_modified_after, &path) {"},{"Add":" work.push((output_item.clone(), path.clone()));"}],"del_contents":[{"Del":" if needs_output(repo, if_modified_after, &path) {\n"},{"Del":" repo.write_file(&path, |w: &mut dyn std::io::Write| {\n output_file::<_, _, R>(\n txn,\n channel,\n changes,\n &output_item,\n &mut conflicts,\n w,\n )\n })\n"},{"Del":" .map_err(OutputError::from)?\n"}]}},{"Edit":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":312,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":678910},"to":{"change":20,"start":20887,"end":21020},"introduced_by":20}],"inode":{"change":20,"pos":671807}}},"contents":[{"Del":" repo.set_permissions(&path, output_item.meta.permissions())\n .map_err(OutputError::WorkingCopy)?;\n"}]}},{"Edit":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":318,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":21082}],"down_context":[{"change":20,"pos":679209}],"flag":"BLOCK","start":79558,"end":79744,"inode":{"change":20,"pos":671807}}},"contents":[{"Add":" }"},{"Add":""},{"Add":" stop.store(true, std::sync::atomic::Ordering::Relaxed);"},{"Add":" let o = output_loop(repo, changes, txn, channel, work, stop, 0);"},{"Add":" for t in threads {"},{"Add":" t.join().unwrap()?"}]}},{"Edit":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":325,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":679215}],"down_context":[{"change":20,"pos":679215}],"flag":"BLOCK","start":79745,"end":79753,"inode":{"change":20,"pos":671807}}},"contents":[{"Add":" o?;"}]}},{"Replacement":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":359,"ins":{"up_context":[{"change":20,"pos":82892}],"down_context":[{"change":20,"pos":679767}],"flag":"BLOCK","start":79754,"end":79797,"inode":{"change":20,"pos":671807}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":21147},"to":{"change":20,"start":679732,"end":679767},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":82892},"to":{"change":20,"start":679732,"end":679767},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":679732},"to":{"change":20,"start":679732,"end":679767},"introduced_by":20}],"inode":{"change":20,"pos":671807}},"ins_contents":[{"Add":" txn: Arc>,"},{"Add":" repo: Arc,"}],"del_contents":[{"Del":" txn: &mut T,\n repo: &mut R,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":377,"ins":{"up_context":[{"change":20,"pos":680369}],"down_context":[{"change":20,"pos":680438}],"flag":"BLOCK","start":79798,"end":79911,"inode":{"change":20,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":680369},"to":{"change":20,"start":83074,"end":83144},"introduced_by":20}],"inode":{"change":20,"pos":671807}},"ins_contents":[{"Add":" let txn_ = txn.read().unwrap();"},{"Add":" if let Some(ref current_name) = inode_filename(&*txn_, inode)? {"}],"del_contents":[{"Del":" if let Some(ref current_name) = inode_filename(txn, inode)? {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":381,"ins":{"up_context":[{"change":20,"pos":680552}],"down_context":[{"change":20,"pos":680631}],"flag":"BLOCK","start":79912,"end":80085,"inode":{"change":20,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":680552},"to":{"change":20,"start":120116,"end":120197},"introduced_by":20}],"inode":{"change":20,"pos":671807}},"ins_contents":[{"Add":" std::mem::drop(txn_);"},{"Add":" let mut txn_ = txn.write().unwrap();"},{"Add":" let parent = txn_.get_revtree(&inode, None)?.unwrap().to_owned();"}],"del_contents":[{"Del":" let parent = txn.get_revtree(&inode, None)?.unwrap().to_owned();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":385,"ins":{"up_context":[{"change":20,"pos":680701}],"down_context":[{"change":20,"pos":680852}],"flag":"BLOCK","start":80086,"end":80151,"inode":{"change":20,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":680701},"to":{"change":20,"start":120198,"end":120256},"introduced_by":20}],"inode":{"change":20,"pos":671807}},"ins_contents":[{"Add":" del_tree_with_rev(&mut *txn_, &parent, &inode)?;"}],"del_contents":[{"Del":" del_tree_with_rev(txn, &parent, &inode)?;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":403,"ins":{"up_context":[{"change":20,"pos":681455}],"down_context":[{"change":20,"pos":21529}],"flag":"BLOCK","start":80152,"end":80300,"inode":{"change":20,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":681455},"to":{"change":20,"start":120257,"end":120397},"introduced_by":20}],"inode":{"change":20,"pos":671807}},"ins_contents":[{"Add":" if let Some(&inode) = txn_.get_tree(&file_id, None)? {"},{"Add":" crate::fs::rec_delete(&mut *txn_, &file_id, inode, true)"}],"del_contents":[{"Del":" if let Some(&inode) = txn.get_tree(&file_id, None)? {\n crate::fs::rec_delete(txn, &file_id, inode, true)\n"}]}},{"Replacement":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":407,"ins":{"up_context":[{"change":20,"pos":681620}],"down_context":[{"change":20,"pos":681836}],"flag":"BLOCK","start":80301,"end":80443,"inode":{"change":20,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":681620},"to":{"change":20,"start":120398,"end":120526},"introduced_by":20}],"inode":{"change":20,"pos":671807}},"ins_contents":[{"Add":" put_inodes_with_rev(&mut *txn_, &inode, &output_item.pos)?;"},{"Add":" put_tree_with_rev(&mut *txn_, &file_id, &inode)?;"}],"del_contents":[{"Del":" put_inodes_with_rev(txn, &inode, &output_item.pos)?;\n put_tree_with_rev(txn, &file_id, &inode)?;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":412,"ins":{"up_context":[{"change":20,"pos":120603}],"down_context":[{"change":20,"pos":21878}],"flag":"BLOCK","start":80444,"end":80667,"inode":{"change":20,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":120603},"to":{"change":20,"start":120603,"end":120735},"introduced_by":20}],"inode":{"change":20,"pos":671807}},"ins_contents":[{"Add":" std::mem::drop(txn_);"},{"Add":" let mut txn_ = txn.write().unwrap();"},{"Add":" if let Some(&inode) = txn_.get_tree(&file_id, None)? {"},{"Add":" crate::fs::rec_delete(&mut *txn_, &file_id, inode, true)"}],"del_contents":[{"Del":" if let Some(&inode) = txn.get_tree(&file_id, None)? {\n crate::fs::rec_delete(txn, &file_id, inode, true)\n"}]}},{"Replacement":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":418,"ins":{"up_context":[{"change":20,"pos":682097}],"down_context":[{"change":20,"pos":682297}],"flag":"BLOCK","start":80668,"end":80802,"inode":{"change":20,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":682097},"to":{"change":20,"start":120736,"end":120856},"introduced_by":20}],"inode":{"change":20,"pos":671807}},"ins_contents":[{"Add":" put_inodes_with_rev(&mut *txn_, &inode, &output_item.pos)?;"},{"Add":" put_tree_with_rev(&mut *txn_, &file_id, &inode)?;"}],"del_contents":[{"Del":" put_inodes_with_rev(txn, &inode, &output_item.pos)?;\n put_tree_with_rev(txn, &file_id, &inode)?;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":423,"ins":{"up_context":[{"change":20,"pos":682397}],"down_context":[{"change":20,"pos":682528}],"flag":"BLOCK","start":80803,"end":81032,"inode":{"change":20,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":682397},"to":{"change":20,"start":120857,"end":120919},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":120919},"to":{"change":20,"start":17458,"end":17555},"introduced_by":20}],"inode":{"change":20,"pos":671807}},"ins_contents":[{"Add":" let mut txn_ = txn.write().unwrap();"},{"Add":" if let Some(&inode) = txn_.get_tree(&file_id, None)? {"},{"Add":" crate::fs::rec_delete(&mut *txn_, &file_id, inode, true)"},{"Add":" .map_err(PristineOutputError::Fs)?;"}],"del_contents":[{"Del":" if let Some(&inode) = txn.get_tree(&file_id, None)? {\n"},{"Del":" crate::fs::rec_delete(txn, &file_id, inode, true).map_err(PristineOutputError::Fs)?;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":428,"ins":{"up_context":[{"change":20,"pos":682538}],"down_context":[{"change":20,"pos":682581}],"flag":"BLOCK","start":81033,"end":81084,"inode":{"change":20,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":682538},"to":{"change":20,"start":83738,"end":83782},"introduced_by":20}],"inode":{"change":20,"pos":671807}},"ins_contents":[{"Add":" let inode = create_new_inode(&mut *txn_)?;"}],"del_contents":[{"Del":" let inode = create_new_inode(txn)?;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":433,"ins":{"up_context":[{"change":20,"pos":682701}],"down_context":[{"change":20,"pos":239}],"flag":"BLOCK","start":81085,"end":81211,"inode":{"change":20,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":682701},"to":{"change":20,"start":121027,"end":121139},"introduced_by":20}],"inode":{"change":20,"pos":671807}},"ins_contents":[{"Add":" put_inodes_with_rev(&mut *txn_, &inode, &output_item.pos)?;"},{"Add":" put_tree_with_rev(&mut *txn_, &file_id, &inode)?;"}],"del_contents":[{"Del":" put_inodes_with_rev(txn, &inode, &output_item.pos)?;\n put_tree_with_rev(txn, &file_id, &inode)?;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":440,"ins":{"up_context":[{"change":20,"pos":416}],"down_context":[{"change":20,"pos":523}],"flag":"BLOCK","start":81212,"end":81258,"inode":{"change":20,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":416},"to":{"change":20,"start":121140,"end":121185},"introduced_by":20}],"inode":{"change":20,"pos":671807}},"ins_contents":[{"Add":" txn_.put_tree(&path_id, &inode)?;"}],"del_contents":[{"Del":" txn.put_tree(&path_id, &inode)?;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":446,"ins":{"up_context":[{"change":20,"pos":22422}],"down_context":[{"change":20,"pos":683057}],"flag":"BLOCK","start":81259,"end":81394,"inode":{"change":20,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":22422},"to":{"change":20,"start":58196,"end":58278},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":22482},"to":{"change":20,"start":683010,"end":683027},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":58278},"to":{"change":20,"start":683010,"end":683027},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":84029},"to":{"change":20,"start":683010,"end":683027},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":683010},"to":{"change":20,"start":683010,"end":683027},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":683027},"to":{"change":20,"start":58279,"end":58309},"introduced_by":20}],"inode":{"change":20,"pos":671807}},"ins_contents":[{"Add":"fn output_item("},{"Add":" txn: Arc>,"},{"Add":" channel: ChannelRef,"}],"del_contents":[{"Del":"fn output_file(\n"},{"Del":" txn: &mut T,\n"},{"Del":" channel: &mut T::Channel,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":452,"ins":{"up_context":[{"change":20,"pos":683139}],"down_context":[{"change":20,"pos":84030}],"flag":"BLOCK","start":81395,"end":81425,"inode":{"change":20,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":683139},"to":{"change":20,"start":683139,"end":683171},"introduced_by":20}],"inode":{"change":20,"pos":671807}},"ins_contents":[{"Add":" repo: &W,"},{"Add":" path: &str,"}],"del_contents":[{"Del":" w: &mut dyn std::io::Write,\n"}]}},{"Edit":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":455,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":84096},"to":{"change":20,"start":4887,"end":4956},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":4956},"to":{"change":20,"start":683261,"end":683347},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":58378},"to":{"change":20,"start":683261,"end":683347},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":84161},"to":{"change":20,"start":683261,"end":683347},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":683261},"to":{"change":20,"start":683261,"end":683347},"introduced_by":20}],"inode":{"change":20,"pos":671807}}},"contents":[{"Del":" let mut l = retrieve(txn, txn.graph(channel), output_item.pos)?;\n"},{"Del":" let mut f = vertex_buffer::ConflictsWriter::new(w, &output_item.path, conflicts);\n"}]}},{"Replacement":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":456,"ins":{"up_context":[{"change":20,"pos":683381}],"down_context":[{"change":20,"pos":683460}],"flag":"BLOCK","start":81426,"end":82046,"inode":{"change":20,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":683381},"to":{"change":20,"start":22545,"end":22668},"introduced_by":20}],"inode":{"change":20,"pos":671807}},"ins_contents":[{"Add":" {"},{"Add":" let txn = txn.read().unwrap();"},{"Add":" let channel = channel.read().unwrap();"},{"Add":" let mut l = retrieve(&*txn, txn.graph(&*channel), output_item.pos)?;"},{"Add":" let w = repo.write_file(&path).map_err(OutputError::WorkingCopy)?;"},{"Add":" let mut f = vertex_buffer::ConflictsWriter::new(w, &output_item.path, conflicts);"},{"Add":" alive::output_graph(changes, &*txn, &*channel, &mut f, &mut l, &mut forward)"},{"Add":" .map_err(PristineOutputError::from)?;"},{"Add":" }"},{"Add":" if forward.is_empty() {"},{"Add":" return Ok(());"},{"Add":" }"},{"Add":" let mut txn = txn.write().unwrap();"},{"Add":" let mut channel = channel.write().unwrap();"}],"del_contents":[{"Del":" alive::output_graph(changes, txn, channel, &mut f, &mut l, &mut forward)\n .map_err(PristineOutputError::from)?;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":472,"ins":{"up_context":[{"change":20,"pos":683557}],"down_context":[{"change":20,"pos":683622}],"flag":"BLOCK","start":82047,"end":82127,"inode":{"change":20,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":683557},"to":{"change":20,"start":121186,"end":121264},"introduced_by":20}],"inode":{"change":20,"pos":671807}},"ins_contents":[{"Add":" let dest = *txn.find_block(txn.graph(&*channel), edge.dest()).unwrap();"}],"del_contents":[{"Del":" let dest = *txn.find_block(txn.graph(channel), edge.dest()).unwrap();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":475,"ins":{"up_context":[{"change":20,"pos":84263}],"down_context":[{"change":20,"pos":121265}],"flag":"BLOCK","start":82128,"end":82192,"inode":{"change":20,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":84263},"to":{"change":20,"start":84263,"end":84280},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":84280},"to":{"change":20,"start":58454,"end":58489},"introduced_by":20}],"inode":{"change":20,"pos":671807}},"ins_contents":[{"Add":" &mut *txn,"},{"Add":" T::graph_mut(&mut *channel),"}],"del_contents":[{"Del":" txn,\n"},{"Del":" T::graph_mut(channel),\n"}]}},{"Replacement":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":486,"ins":{"up_context":[{"change":20,"pos":22806}],"down_context":[{"change":20,"pos":84511}],"flag":"BLOCK","start":82193,"end":82295,"inode":{"change":20,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":22806},"to":{"change":20,"start":84418,"end":84510},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":84510},"to":{"change":20,"start":683894,"end":683911},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":683894},"to":{"change":20,"start":683894,"end":683911},"introduced_by":20}],"inode":{"change":20,"pos":671807}},"ins_contents":[{"Add":"fn collect_dead_files::TreeError>>("},{"Add":" txn: &T,"}],"del_contents":[{"Del":"fn collect_dead_files::TreeError>>(\n"},{"Del":" txn: &mut T,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":494,"ins":{"up_context":[{"change":20,"pos":684122}],"down_context":[{"change":20,"pos":684157}],"flag":"BLOCK","start":82296,"end":82335,"inode":{"change":20,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":684122},"to":{"change":20,"start":684122,"end":684157},"introduced_by":20}],"inode":{"change":20,"pos":671807}},"ins_contents":[{"Add":" let mut dead = HashMap::default();"}],"del_contents":[{"Del":" let mut dead = HashMap::new();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":671807},"path":"libpijul/src/output/output.rs","line":533,"ins":{"up_context":[{"change":20,"pos":685468}],"down_context":[{"change":20,"pos":685486}],"flag":"BLOCK","start":82336,"end":82354,"inode":{"change":20,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":685468},"to":{"change":20,"start":685468,"end":685486},"introduced_by":20}],"inode":{"change":20,"pos":671807}},"ins_contents":[{"Add":" repo: Arc,"}],"del_contents":[{"Del":" repo: &mut W,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":686190},"path":"libpijul/src/output/mod.rs","line":4,"ins":{"up_context":[{"change":20,"pos":686269}],"down_context":[{"change":20,"pos":686300}],"flag":"BLOCK","start":82355,"end":82375,"inode":{"change":20,"pos":686190}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":686269},"to":{"change":20,"start":686269,"end":686300},"introduced_by":20}],"inode":{"change":20,"pos":686190}},"ins_contents":[{"Add":"use crate::HashMap;"}],"del_contents":[{"Del":"use std::collections::HashMap;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":686190},"path":"libpijul/src/output/mod.rs","line":15,"ins":{"up_context":[{"change":20,"pos":23329}],"down_context":[{"change":20,"pos":23365}],"flag":"BLOCK","start":82376,"end":82419,"inode":{"change":20,"pos":686190}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":23329},"to":{"change":20,"start":23329,"end":23365},"introduced_by":20}],"inode":{"change":20,"pos":686190}},"ins_contents":[{"Add":" W: std::error::Error + Send + 'static,"}],"del_contents":[{"Del":" W: std::error::Error + 'static,\n"}]}},{"Edit":{"inode":{"change":20,"pos":686190},"path":"libpijul/src/output/mod.rs","line":34,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":23889},"to":{"change":20,"start":23889,"end":24228},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":24228},"to":{"change":20,"start":85289,"end":85295},"introduced_by":20}],"inode":{"change":20,"pos":686190}}},"contents":[{"Del":"}\n\nuse crate::working_copy::WriteError;\n\nimpl\n OutputError\n{\n fn from(e: WriteError) -> Self {\n match e {\n WriteError::Io(e) => OutputError::Pristine(PristineOutputError::Io(e)),\n WriteError::E(e) => e,\n }\n"},{"Del":" }\n"}]}},{"Replacement":{"inode":{"change":20,"pos":686190},"path":"libpijul/src/output/mod.rs","line":44,"ins":{"up_context":[{"change":20,"pos":85492}],"down_context":[{"change":20,"pos":85618}],"flag":"BLOCK","start":82420,"end":82553,"inode":{"change":20,"pos":686190}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":85492},"to":{"change":20,"start":85492,"end":85618},"introduced_by":20}],"inode":{"change":20,"pos":686190}},"ins_contents":[{"Add":"impl"},{"Add":" From> for OutputError"}],"del_contents":[{"Del":"impl From>\n for OutputError\n"}]}},{"Replacement":{"inode":{"change":20,"pos":686190},"path":"libpijul/src/output/mod.rs","line":80,"ins":{"up_context":[{"change":20,"pos":86195}],"down_context":[{"change":20,"pos":686383}],"flag":"BLOCK","start":82554,"end":82578,"inode":{"change":20,"pos":686190}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":24779},"to":{"change":20,"start":686366,"end":686383},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":86195},"to":{"change":20,"start":686366,"end":686383},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":686366},"to":{"change":20,"start":686366,"end":686383},"introduced_by":20}],"inode":{"change":20,"pos":686190}},"ins_contents":[{"Add":"#[derive(Debug, Clone)]"}],"del_contents":[{"Del":"#[derive(Debug)]\n"}]}},{"Edit":{"inode":{"change":20,"pos":686190},"path":"libpijul/src/output/mod.rs","line":192,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":87456}],"down_context":[{"change":20,"pos":690028}],"flag":"BLOCK","start":82579,"end":83088,"inode":{"change":20,"pos":686190}}},"contents":[{"Add":"}"},{"Add":""},{"Add":"pub fn output_file<"},{"Add":" T: TreeTxnT + ChannelTxnT,"},{"Add":" C: crate::changestore::ChangeStore,"},{"Add":" V: crate::vertex_buffer::VertexBuffer,"},{"Add":">("},{"Add":" changes: &C,"},{"Add":" txn: &T,"},{"Add":" channel: &T::Channel,"},{"Add":" v0: Position,"},{"Add":" out: &mut V,"},{"Add":") -> Result<(), FileError> {"},{"Add":" let mut forward = Vec::new();"},{"Add":" let mut graph = crate::alive::retrieve(&*txn, txn.graph(&*channel), v0)?;"},{"Add":" crate::alive::output_graph(changes, &*txn, &*channel, out, &mut graph, &mut forward)?;"},{"Add":" Ok(())"}]}},{"Edit":{"inode":{"change":20,"pos":690044},"path":"libpijul/src/output/archive.rs","line":4,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":690117}],"down_context":[{"change":20,"pos":690117}],"flag":"BLOCK","start":83089,"end":83120,"inode":{"change":20,"pos":690044}}},"contents":[{"Add":"use crate::{HashMap, HashSet};"}]}},{"Edit":{"inode":{"change":20,"pos":690044},"path":"libpijul/src/output/archive.rs","line":6,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":690156},"to":{"change":20,"start":690156,"end":690198},"introduced_by":20}],"inode":{"change":20,"pos":690044}}},"contents":[{"Del":"use std::collections::{HashMap, HashSet};\n"}]}},{"Replacement":{"inode":{"change":20,"pos":690044},"path":"libpijul/src/output/archive.rs","line":146,"ins":{"up_context":[{"change":20,"pos":88013}],"down_context":[{"change":20,"pos":692439}],"flag":"BLOCK","start":83121,"end":83164,"inode":{"change":20,"pos":690044}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":25953},"to":{"change":20,"start":692403,"end":692439},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":88013},"to":{"change":20,"start":692403,"end":692439},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":692403},"to":{"change":20,"start":692403,"end":692439},"introduced_by":20}],"inode":{"change":20,"pos":690044}},"ins_contents":[{"Add":" let channel = channel.read().unwrap();"}],"del_contents":[{"Del":" let channel = channel.borrow();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":690044},"path":"libpijul/src/output/archive.rs","line":148,"ins":{"up_context":[{"change":20,"pos":692475}],"down_context":[{"change":20,"pos":692552}],"flag":"BLOCK","start":83165,"end":83250,"inode":{"change":20,"pos":690044}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":692475},"to":{"change":20,"start":692475,"end":692552},"introduced_by":20}],"inode":{"change":20,"pos":690044}},"ins_contents":[{"Add":" let mut files = HashMap::default();"},{"Add":" let mut next_files = HashMap::default();"}],"del_contents":[{"Del":" let mut files = HashMap::new();\n let mut next_files = HashMap::new();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":690044},"path":"libpijul/src/output/archive.rs","line":162,"ins":{"up_context":[{"change":20,"pos":692788}],"down_context":[{"change":20,"pos":692865}],"flag":"BLOCK","start":83251,"end":83336,"inode":{"change":20,"pos":690044}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":692788},"to":{"change":20,"start":692788,"end":692865},"introduced_by":20}],"inode":{"change":20,"pos":690044}},"ins_contents":[{"Add":" let mut done = HashMap::default();"},{"Add":" let mut done_inodes = HashSet::default();"}],"del_contents":[{"Del":" let mut done = HashMap::new();\n let mut done_inodes = HashSet::new();\n"}]}},{"Edit":{"inode":{"change":20,"pos":696460},"path":"libpijul/src/missing_context.rs","line":5,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":696625}],"down_context":[{"change":20,"pos":696625}],"flag":"BLOCK","start":83337,"end":83368,"inode":{"change":20,"pos":696460}}},"contents":[{"Add":"use crate::{HashMap, HashSet};"}]}},{"Edit":{"inode":{"change":20,"pos":696460},"path":"libpijul/src/missing_context.rs","line":7,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":696664},"to":{"change":20,"start":696664,"end":696706},"introduced_by":20}],"inode":{"change":20,"pos":696460}}},"contents":[{"Del":"use std::collections::{HashMap, HashSet};\n"}]}},{"Replacement":{"inode":{"change":20,"pos":696460},"path":"libpijul/src/missing_context.rs","line":48,"ins":{"up_context":[{"change":20,"pos":697611}],"down_context":[{"change":20,"pos":697661}],"flag":"BLOCK","start":83369,"end":83423,"inode":{"change":20,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":697611},"to":{"change":20,"start":697611,"end":697661},"introduced_by":20}],"inode":{"change":20,"pos":696460}},"ins_contents":[{"Add":" let mut ids = HashMap::default();"}],"del_contents":[{"Del":" let mut ids = HashMap::new();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":696460},"path":"libpijul/src/missing_context.rs","line":185,"ins":{"up_context":[{"change":20,"pos":89883}],"down_context":[{"change":20,"pos":89884}],"flag":"BLOCK","start":83424,"end":83466,"inode":{"change":20,"pos":696460}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":11543},"to":{"change":20,"start":704175,"end":704213},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":89883},"to":{"change":20,"start":704175,"end":704213},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":704175},"to":{"change":20,"start":704175,"end":704213},"introduced_by":20}],"inode":{"change":20,"pos":696460}},"ins_contents":[{"Add":" let mut unknown = HashSet::default();"}],"del_contents":[{"Del":" let mut unknown = HashSet::new();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":696460},"path":"libpijul/src/missing_context.rs","line":236,"ins":{"up_context":[{"change":20,"pos":706744}],"down_context":[{"change":20,"pos":706771}],"flag":"BLOCK","start":83467,"end":83505,"inode":{"change":20,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":706744},"to":{"change":20,"start":706744,"end":706771},"introduced_by":20}],"inode":{"change":20,"pos":696460}},"ins_contents":[{"Add":" pub(crate) unknown_parents: Vec<("}],"del_contents":[{"Del":" unknown_parents: Vec<(\n"}]}},{"Replacement":{"inode":{"change":20,"pos":696460},"path":"libpijul/src/missing_context.rs","line":243,"ins":{"up_context":[{"change":20,"pos":123715}],"down_context":[{"change":20,"pos":106}],"flag":"BLOCK","start":83506,"end":83619,"inode":{"change":20,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":123715},"to":{"change":20,"start":123715,"end":123806},"introduced_by":20}],"inode":{"change":20,"pos":696460}},"ins_contents":[{"Add":" pub(crate) parents: HashSet,"},{"Add":" pub(crate) pseudo: Vec<(Vertex, SerializedEdge)>,"}],"del_contents":[{"Del":" parents: HashSet,\n pseudo: Vec<(Vertex, SerializedEdge)>,\n"}]}},{"Edit":{"inode":{"change":20,"pos":696460},"path":"libpijul/src/missing_context.rs","line":419,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":27318},"to":{"change":20,"start":712749,"end":712811},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":59459},"to":{"change":20,"start":712749,"end":712811},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":92306},"to":{"change":20,"start":712749,"end":712811},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":124988},"to":{"change":20,"start":712749,"end":712811},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":712749},"to":{"change":20,"start":712749,"end":712811},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":712811},"to":{"change":20,"start":92307,"end":92365},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":92365},"to":{"change":20,"start":712864,"end":712881},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":712864},"to":{"change":20,"start":712864,"end":712881},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":712881},"to":{"change":20,"start":92366,"end":92394},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":92394},"to":{"change":20,"start":712911,"end":713044},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":712911},"to":{"change":20,"start":712911,"end":713044},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":713044},"to":{"change":20,"start":92395,"end":92440},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":27359},"to":{"change":20,"start":713075,"end":713184},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":92440},"to":{"change":20,"start":713075,"end":713184},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":713075},"to":{"change":20,"start":713075,"end":713184},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":713184},"to":{"change":20,"start":59460,"end":59594},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":59594},"to":{"change":20,"start":713316,"end":713358},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":713316},"to":{"change":20,"start":713316,"end":713358},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":713358},"to":{"change":20,"start":124989,"end":125054},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":59508},"to":{"change":20,"start":59660,"end":59770},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":125054},"to":{"change":20,"start":59660,"end":59770},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":59660},"to":{"change":20,"start":59660,"end":59770},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":59770},"to":{"change":20,"start":713458,"end":713587},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":713458},"to":{"change":20,"start":713458,"end":713587},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":713587},"to":{"change":20,"start":92441,"end":92478},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":92478},"to":{"change":20,"start":125055,"end":125132},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":125132},"to":{"change":20,"start":713672,"end":713712},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":713672},"to":{"change":20,"start":713672,"end":713712},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":713712},"to":{"change":20,"start":125133,"end":125229},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":125229},"to":{"change":20,"start":713805,"end":713845},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":713805},"to":{"change":20,"start":713805,"end":713845},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":713845},"to":{"change":20,"start":125230,"end":125284},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":125284},"to":{"change":20,"start":713897,"end":713956},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":713897},"to":{"change":20,"start":713897,"end":713956},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":713956},"to":{"change":20,"start":125285,"end":125368},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":92552},"to":{"change":20,"start":714028,"end":714063},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":125368},"to":{"change":20,"start":714028,"end":714063},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":714028},"to":{"change":20,"start":714028,"end":714063},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":714063},"to":{"change":20,"start":59771,"end":59819},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":59819},"to":{"change":20,"start":125369,"end":125429},"introduced_by":20}],"inode":{"change":20,"pos":696460}}},"contents":[{"Del":" }\n }\n }\n }\n Ok(())\n}\n\n"},{"Del":"pub(crate) fn collect_zombie_context(\n"},{"Del":" txn: &mut T,\n"},{"Del":" channel: &mut T::Graph,\n"},{"Del":" ws: &mut Workspace,\n inode: Position>,\n n: &NewEdge>,\n change_id: ChangeId,\n mut known: K,\n"},{"Del":") -> Result<(), MissingError>\n"},{"Del":"where\n K: FnMut(Hash) -> bool,\n{\n if n.flag.contains(EdgeFlags::FOLDER) {\n return Ok(());\n }\n"},{"Del":" let mut pos = internal_pos(txn, &n.to.start_pos(), change_id)?;\n let end_pos = internal_pos(txn, &n.to.end_pos(), change_id)?;\n"},{"Del":" let mut unknown_parents = Vec::new();\n"},{"Del":" while let Ok(&dest_vertex) = txn.find_block(&channel, pos) {\n"},{"Del":" debug!(\"collect zombie context: {:?}\", dest_vertex);\n for v in iter_adjacent(\n txn,\n"},{"Del":" channel,\n dest_vertex,\n EdgeFlags::empty(),\n EdgeFlags::all() - EdgeFlags::DELETED,\n"},{"Del":" )? {\n let v = v?;\n"},{"Del":" if v.introduced_by() == change_id || v.dest().change.is_root() {\n"},{"Del":" continue;\n }\n"},{"Del":" if v.introduced_by().is_root() {\n ws.pseudo.push((dest_vertex, *v));\n"},{"Del":" continue;\n }\n"},{"Del":" if v.flag().contains(EdgeFlags::PARENT) {\n"},{"Del":" // Unwrap ok, since `v` is in the channel.\n"},{"Del":" let intro = txn.get_external(&v.introduced_by())?.unwrap().into();\n"},{"Del":" if !known(intro) {\n"},{"Del":" debug!(\"unknown: {:?}\", v);\n"},{"Del":" unknown_parents.push((dest_vertex, *v))\n"}]}},{"Edit":{"inode":{"change":20,"pos":696460},"path":"libpijul/src/missing_context.rs","line":420,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":714140},"to":{"change":20,"start":714140,"end":714391},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":714391},"to":{"change":20,"start":92553,"end":92582},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":92582},"to":{"change":20,"start":714415,"end":714432},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":714415},"to":{"change":20,"start":714415,"end":714432},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":714432},"to":{"change":20,"start":92583,"end":92611},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":92611},"to":{"change":20,"start":714462,"end":714567},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":714462},"to":{"change":20,"start":714462,"end":714567},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":714567},"to":{"change":20,"start":125430,"end":125482},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":125482},"to":{"change":20,"start":92612,"end":92659},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":714609},"to":{"change":20,"start":92612,"end":92659},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":27402},"to":{"change":20,"start":714642,"end":714691},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":92659},"to":{"change":20,"start":714642,"end":714691},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":714642},"to":{"change":20,"start":714642,"end":714691},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":714691},"to":{"change":20,"start":125483,"end":125543},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":125543},"to":{"change":20,"start":17857,"end":17941},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":17941},"to":{"change":20,"start":715147,"end":715192},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":125614},"to":{"change":20,"start":715147,"end":715192},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":715147},"to":{"change":20,"start":715147,"end":715192},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":715192},"to":{"change":20,"start":342,"end":410},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":410},"to":{"change":20,"start":715438,"end":715461},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":715438},"to":{"change":20,"start":715438,"end":715461},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":715461},"to":{"change":20,"start":125615,"end":125687},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":59638},"to":{"change":20,"start":715532,"end":715608},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":59951},"to":{"change":20,"start":715532,"end":715608},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":125687},"to":{"change":20,"start":715532,"end":715608},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":715532},"to":{"change":20,"start":715532,"end":715608},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":715608},"to":{"change":20,"start":59952,"end":60013},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":60013},"to":{"change":20,"start":715648,"end":715820},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":715648},"to":{"change":20,"start":715648,"end":715820},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":715820},"to":{"change":20,"start":92660,"end":92680},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":27467},"to":{"change":20,"start":715840,"end":715906},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":92680},"to":{"change":20,"start":715840,"end":715906},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":715840},"to":{"change":20,"start":715840,"end":715906},"introduced_by":20}],"inode":{"change":20,"pos":696460}}},"contents":[{"Del":" }\n }\n zombify(txn, channel, ws, change_id, inode, n.flag, &unknown_parents)?;\n if dest_vertex.end < end_pos.pos {\n pos.pos = dest_vertex.end\n } else {\n break;\n }\n }\n Ok(())\n}\n\n"},{"Del":"fn zombify(\n"},{"Del":" txn: &mut T,\n"},{"Del":" channel: &mut T::Graph,\n"},{"Del":" ws: &mut Workspace,\n change_id: ChangeId,\n inode: Position>,\n flag: EdgeFlags,\n"},{"Del":" unknown: &[(Vertex, SerializedEdge)],\n"},{"Del":") -> Result<(), MissingError> {\n"},{"Del":" for &(dest_vertex, edge) in unknown.iter() {\n"},{"Del":" let p = *txn.find_block_end(channel, edge.dest())?;\n"},{"Del":" ws.unknown_parents\n .push((dest_vertex, p, inode, edge.flag()));\n"},{"Del":" let fold = flag & EdgeFlags::FOLDER;\n"},{"Del":" debug!(\"zombify p {:?}, dest_vertex {:?}\", p, dest_vertex);\n"},{"Del":" let mut v = p;\n"},{"Del":" while let Ok(&u) = txn.find_block_end(channel, v.start_pos()) {\n"},{"Del":" if u != v {\n debug!(\"u = {:?}, v = {:?}\", u, v);\n"},{"Del":" put_graph_with_rev(\n txn,\n"},{"Del":" channel,\n EdgeFlags::DELETED | EdgeFlags::BLOCK | fold,\n u,\n v,\n change_id,\n"},{"Del":" )?;\n"},{"Del":" v = u\n } else {\n break;\n"}]}},{"Edit":{"inode":{"change":20,"pos":696460},"path":"libpijul/src/missing_context.rs","line":422,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":715930},"to":{"change":20,"start":715930,"end":715979},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":715979},"to":{"change":20,"start":60014,"end":60068},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":60068},"to":{"change":20,"start":716020,"end":716138},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":716020},"to":{"change":20,"start":716020,"end":716138},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":716138},"to":{"change":20,"start":92681,"end":92728},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":92728},"to":{"change":20,"start":125688,"end":125792},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":125792},"to":{"change":20,"start":716251,"end":716367},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":716251},"to":{"change":20,"start":716251,"end":716367},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":716367},"to":{"change":20,"start":125793,"end":125869},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":59712},"to":{"change":20,"start":716440,"end":716506},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":60143},"to":{"change":20,"start":716440,"end":716506},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":125869},"to":{"change":20,"start":716440,"end":716506},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":716440},"to":{"change":20,"start":716440,"end":716506},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":716506},"to":{"change":20,"start":125870,"end":125929},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":125929},"to":{"change":20,"start":716563,"end":716619},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":716563},"to":{"change":20,"start":716563,"end":716619},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":716619},"to":{"change":20,"start":92729,"end":92809},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":27592},"to":{"change":20,"start":716698,"end":716708},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":60224},"to":{"change":20,"start":716698,"end":716708},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":92809},"to":{"change":20,"start":716698,"end":716708},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":716698},"to":{"change":20,"start":716698,"end":716708},"introduced_by":20}],"inode":{"change":20,"pos":696460}}},"contents":[{"Del":" // Zombify the first chunk of the split.\n"},{"Del":" for parent in iter_adjacent(\n txn,\n"},{"Del":" channel,\n v,\n EdgeFlags::PARENT,\n EdgeFlags::all() - EdgeFlags::DELETED,\n"},{"Del":" )? {\n let parent = parent?;\n"},{"Del":" if !parent.flag().contains(EdgeFlags::PSEUDO) {\n ws.parents.insert(*parent);\n"},{"Del":" }\n }\n debug!(\"ws.parents = {:?}\", ws.parents);\n for parent in ws.parents.drain() {\n"},{"Del":" let parent_dest = *txn.find_block_end(channel, parent.dest())?;\n"},{"Del":" let mut flag = EdgeFlags::DELETED | EdgeFlags::BLOCK;\n"},{"Del":" if parent.flag().contains(EdgeFlags::FOLDER) {\n"},{"Del":" flag |= EdgeFlags::FOLDER\n }\n"},{"Del":" put_graph_with_rev(txn, channel, flag, parent_dest, v, change_id)?;\n"},{"Del":" }\n"}]}},{"Replacement":{"inode":{"change":20,"pos":717381},"path":"libpijul/src/lib.rs","line":105,"ins":{"up_context":[{"change":20,"pos":720352}],"down_context":[{"change":20,"pos":720383}],"flag":"BLOCK","start":83620,"end":84088,"inode":{"change":20,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":720352},"to":{"change":20,"start":720352,"end":720383},"introduced_by":20}],"inode":{"change":20,"pos":717381}},"ins_contents":[{"Add":""},{"Add":"// Making hashmaps deterministic (for testing)"},{"Add":"pub type HashMap ="},{"Add":" std::collections::HashMap>;"},{"Add":"pub type HashSet ="},{"Add":" std::collections::HashSet>;"},{"Add":"// pub type HashMap = std::collections::HashMap;"},{"Add":"// pub type HashSet = std::collections::HashSet;"}],"del_contents":[{"Del":"use std::collections::HashMap;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":717381},"path":"libpijul/src/lib.rs","line":168,"ins":{"up_context":[{"change":20,"pos":722235}],"down_context":[{"change":20,"pos":722285}],"flag":"BLOCK","start":84089,"end":84135,"inode":{"change":20,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":722235},"to":{"change":20,"start":722235,"end":722285},"introduced_by":20}],"inode":{"change":20,"pos":717381}},"ins_contents":[{"Add":" channel: &pristine::ChannelRef,"}],"del_contents":[{"Del":" channel: &mut pristine::ChannelRef,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":717381},"path":"libpijul/src/lib.rs","line":179,"ins":{"up_context":[{"change":20,"pos":722651}],"down_context":[{"change":20,"pos":722708}],"flag":"BLOCK","start":84136,"end":84189,"inode":{"change":20,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":722651},"to":{"change":20,"start":722651,"end":722708},"introduced_by":20}],"inode":{"change":20,"pos":717381}},"ins_contents":[{"Add":" channel: &crate::pristine::ChannelRef,"}],"del_contents":[{"Del":" channel: &mut crate::pristine::ChannelRef,\n"}]}},{"Edit":{"inode":{"change":20,"pos":717381},"path":"libpijul/src/lib.rs","line":187,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":722981}],"down_context":[{"change":20,"pos":722981}],"flag":"BLOCK","start":84190,"end":84197,"inode":{"change":20,"pos":717381}}},"contents":[{"Add":" /*"}]}},{"Replacement":{"inode":{"change":20,"pos":717381},"path":"libpijul/src/lib.rs","line":203,"ins":{"up_context":[{"change":20,"pos":93967}],"down_context":[{"change":20,"pos":94006}],"flag":"BLOCK","start":84198,"end":84240,"inode":{"change":20,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":93967},"to":{"change":20,"start":93967,"end":94006},"introduced_by":20}],"inode":{"change":20,"pos":717381}},"ins_contents":[{"Add":" &mut channel.lock().unwrap(),"}],"del_contents":[{"Del":" &mut channel.borrow_mut(),\n"}]}},{"Replacement":{"inode":{"change":20,"pos":717381},"path":"libpijul/src/lib.rs","line":213,"ins":{"up_context":[{"change":20,"pos":723558}],"down_context":[{"change":20,"pos":723608}],"flag":"BLOCK","start":84241,"end":84287,"inode":{"change":20,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":723558},"to":{"change":20,"start":723558,"end":723608},"introduced_by":20}],"inode":{"change":20,"pos":717381}},"ins_contents":[{"Add":" channel: &pristine::ChannelRef,"}],"del_contents":[{"Del":" channel: &mut pristine::ChannelRef,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":717381},"path":"libpijul/src/lib.rs","line":225,"ins":{"up_context":[{"change":20,"pos":94336}],"down_context":[{"change":20,"pos":94375}],"flag":"BLOCK","start":84288,"end":84330,"inode":{"change":20,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":94336},"to":{"change":20,"start":94336,"end":94375},"introduced_by":20}],"inode":{"change":20,"pos":717381}},"ins_contents":[{"Add":" &mut channel.lock().unwrap(),"}],"del_contents":[{"Del":" &mut channel.borrow_mut(),\n"}]}},{"Edit":{"inode":{"change":20,"pos":717381},"path":"libpijul/src/lib.rs","line":232,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":723911}],"down_context":[{"change":20,"pos":723911}],"flag":"BLOCK","start":84331,"end":84338,"inode":{"change":20,"pos":717381}}},"contents":[{"Add":" */"}]}},{"Replacement":{"inode":{"change":20,"pos":717381},"path":"libpijul/src/lib.rs","line":242,"ins":{"up_context":[{"change":20,"pos":724271}],"down_context":[{"change":20,"pos":724318}],"flag":"BLOCK","start":84339,"end":84406,"inode":{"change":20,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":724271},"to":{"change":20,"start":724271,"end":724318},"introduced_by":20}],"inode":{"change":20,"pos":717381}},"ins_contents":[{"Add":" hasher.update(&recorded.contents.lock().unwrap()[..]);"}],"del_contents":[{"Del":" hasher.update(&recorded.contents);\n"}]}},{"Replacement":{"inode":{"change":20,"pos":717381},"path":"libpijul/src/lib.rs","line":261,"ins":{"up_context":[{"change":20,"pos":724970}],"down_context":[{"change":20,"pos":725011}],"flag":"BLOCK","start":84407,"end":84558,"inode":{"change":20,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":724970},"to":{"change":20,"start":724970,"end":725011},"introduced_by":20}],"inode":{"change":20,"pos":717381}},"ins_contents":[{"Add":" contents: std::sync::Arc::try_unwrap(recorded.contents)"},{"Add":" .unwrap()"},{"Add":" .into_inner()"},{"Add":" .unwrap(),"}],"del_contents":[{"Del":" contents: recorded.contents,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":717381},"path":"libpijul/src/lib.rs","line":276,"ins":{"up_context":[{"change":20,"pos":725282}],"down_context":[{"change":20,"pos":725332}],"flag":"BLOCK","start":84559,"end":84605,"inode":{"change":20,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":725282},"to":{"change":20,"start":725282,"end":725332},"introduced_by":20}],"inode":{"change":20,"pos":717381}},"ins_contents":[{"Add":" channel: &pristine::ChannelRef,"}],"del_contents":[{"Del":" channel: &mut pristine::ChannelRef,\n"}]}},{"Edit":{"inode":{"change":20,"pos":717381},"path":"libpijul/src/lib.rs","line":282,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":725466}],"down_context":[{"change":20,"pos":725466}],"flag":"BLOCK","start":84606,"end":84613,"inode":{"change":20,"pos":717381}}},"contents":[{"Add":" /*"}]}},{"Edit":{"inode":{"change":20,"pos":717381},"path":"libpijul/src/lib.rs","line":303,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":725984}],"down_context":[{"change":20,"pos":725984}],"flag":"BLOCK","start":84614,"end":84621,"inode":{"change":20,"pos":717381}}},"contents":[{"Add":" */"}]}},{"Edit":{"inode":{"change":20,"pos":717381},"path":"libpijul/src/lib.rs","line":333,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":727226},"to":{"change":20,"start":727226,"end":727232},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":727232},"to":{"change":20,"start":126258,"end":126265},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":126265},"to":{"change":20,"start":727233,"end":727334},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":727233},"to":{"change":20,"start":727233,"end":727334},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":727334},"to":{"change":20,"start":29300,"end":29376},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":29376},"to":{"change":20,"start":95239,"end":95307},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":95307},"to":{"change":20,"start":29439,"end":29486},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":29439},"to":{"change":20,"start":29439,"end":29486},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":29486},"to":{"change":20,"start":95308,"end":95356},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":95356},"to":{"change":20,"start":29487,"end":29669},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":727465},"to":{"change":20,"start":29487,"end":29669},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":29669},"to":{"change":20,"start":727603,"end":727620},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":727603},"to":{"change":20,"start":727603,"end":727620},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":727620},"to":{"change":20,"start":29670,"end":29741},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":29741},"to":{"change":20,"start":727740,"end":727750},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":727740},"to":{"change":20,"start":727740,"end":727750},"introduced_by":20}],"inode":{"change":20,"pos":717381}}},"contents":[{"Del":" }\n"},{"Del":" /*\n"},{"Del":" #[cfg(feature = \"dump\")]\n fn channel_from_dump<'a>(\n &'a mut self,\n name: &str,\n"},{"Del":" ) -> Result<\n pristine::channel_dump::ChannelFromDump<'a, Self>,\n"},{"Del":" pristine::channel_dump::ChannelDumpError,\n"},{"Del":" > {\n use pristine::channel_dump::*;\n"},{"Del":" if self.load_channel(name)?.is_none() {\n"},{"Del":" let channel = pristine::MutTxnT::open_or_create_channel(self, name)\n .map_err(ChannelDumpError::Txn)?;\n Ok(ChannelFromDump::new(self, channel))\n"},{"Del":" } else {\n"},{"Del":" Err(ChannelDumpError::ChannelNameExists(name.to_string()))\n"},{"Del":" }\n"}]}},{"Replacement":{"inode":{"change":20,"pos":717381},"path":"libpijul/src/lib.rs","line":334,"ins":{"up_context":[{"change":20,"pos":727756}],"down_context":[{"change":20,"pos":2901}],"flag":"BLOCK","start":84622,"end":84623,"inode":{"change":20,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":727756},"to":{"change":20,"start":126266,"end":126273},"introduced_by":20}],"inode":{"change":20,"pos":717381}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":" */\n"}]}},{"Replacement":{"inode":{"change":20,"pos":717381},"path":"libpijul/src/lib.rs","line":374,"ins":{"up_context":[{"change":20,"pos":728883}],"down_context":[{"change":20,"pos":126344}],"flag":"BLOCK","start":84624,"end":84709,"inode":{"change":20,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":728883},"to":{"change":20,"start":95569,"end":95647},"introduced_by":20}],"inode":{"change":20,"pos":717381}},"ins_contents":[{"Add":" for x in pristine::changeid_rev_log(self, &channel.read().unwrap(), None)? {"}],"del_contents":[{"Del":" for x in pristine::changeid_rev_log(self, &channel.borrow(), None)? {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":717381},"path":"libpijul/src/lib.rs","line":419,"ins":{"up_context":[{"change":20,"pos":126860}],"down_context":[{"change":20,"pos":96217}],"flag":"BLOCK","start":84710,"end":84786,"inode":{"change":20,"pos":717381}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":126860},"to":{"change":20,"start":5370,"end":5439},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":96148},"to":{"change":20,"start":5370,"end":5439},"introduced_by":20}],"inode":{"change":20,"pos":717381}},"ins_contents":[{"Add":" self.get_changeset(self.changes(&channel.read().unwrap()), cid)"}],"del_contents":[{"Del":" self.get_changeset(self.changes(&channel.borrow()), cid)\n"}]}},{"Replacement":{"inode":{"change":20,"pos":717381},"path":"libpijul/src/lib.rs","line":505,"ins":{"up_context":[{"change":20,"pos":127430}],"down_context":[{"change":20,"pos":127483}],"flag":"BLOCK","start":84787,"end":84847,"inode":{"change":20,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":127430},"to":{"change":20,"start":127430,"end":127483},"introduced_by":20}],"inode":{"change":20,"pos":717381}},"ins_contents":[{"Add":" self.rev_changes(&channel.read().unwrap()),"}],"del_contents":[{"Del":" self.rev_changes(&channel.borrow()),\n"}]}},{"Replacement":{"inode":{"change":20,"pos":717381},"path":"libpijul/src/lib.rs","line":528,"ins":{"up_context":[{"change":20,"pos":127881}],"down_context":[{"change":20,"pos":98065}],"flag":"BLOCK","start":84848,"end":84922,"inode":{"change":20,"pos":717381}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":127881},"to":{"change":20,"start":5586,"end":5653},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":98064},"to":{"change":20,"start":5586,"end":5653},"introduced_by":20}],"inode":{"change":20,"pos":717381}},"ins_contents":[{"Add":" self.get_changeset(self.changes(&channel.read().unwrap()), h)"}],"del_contents":[{"Del":" self.get_changeset(self.changes(&channel.borrow()), h)\n"}]}},{"Replacement":{"inode":{"change":20,"pos":717381},"path":"libpijul/src/lib.rs","line":558,"ins":{"up_context":[{"change":20,"pos":732181}],"down_context":[{"change":20,"pos":732254}],"flag":"BLOCK","start":84923,"end":85003,"inode":{"change":20,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":732181},"to":{"change":20,"start":732181,"end":732254},"introduced_by":20}],"inode":{"change":20,"pos":717381}},"ins_contents":[{"Add":" fs::find_path(changes, self, &channel.read().unwrap(), false, position)"}],"del_contents":[{"Del":" fs::find_path(changes, self, &channel.borrow(), false, position)\n"}]}},{"Replacement":{"inode":{"change":20,"pos":717381},"path":"libpijul/src/lib.rs","line":571,"ins":{"up_context":[{"change":20,"pos":732653}],"down_context":[{"change":20,"pos":732725}],"flag":"BLOCK","start":85004,"end":85083,"inode":{"change":20,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":732653},"to":{"change":20,"start":732653,"end":732725},"introduced_by":20}],"inode":{"change":20,"pos":717381}},"ins_contents":[{"Add":" fs::find_path(changes, self, &channel.read().unwrap(), true, position)"}],"del_contents":[{"Del":" fs::find_path(changes, self, &channel.borrow(), true, position)\n"}]}},{"Replacement":{"inode":{"change":20,"pos":717381},"path":"libpijul/src/lib.rs","line":583,"ins":{"up_context":[{"change":20,"pos":98933}],"down_context":[{"change":20,"pos":733552}],"flag":"BLOCK","start":85084,"end":85162,"inode":{"change":20,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":98933},"to":{"change":20,"start":98933,"end":99004},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":99004},"to":{"change":20,"start":733032,"end":733275},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":733032},"to":{"change":20,"start":733032,"end":733275},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":733275},"to":{"change":20,"start":99005,"end":99074},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":30231},"to":{"change":20,"start":733312,"end":733390},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":99074},"to":{"change":20,"start":733312,"end":733390},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":733312},"to":{"change":20,"start":733312,"end":733390},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":733390},"to":{"change":20,"start":5654,"end":5728},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":5728},"to":{"change":20,"start":733451,"end":733552},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":60580},"to":{"change":20,"start":733451,"end":733552},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":99143},"to":{"change":20,"start":733451,"end":733552},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":733451},"to":{"change":20,"start":733451,"end":733552},"introduced_by":20}],"inode":{"change":20,"pos":717381}},"ins_contents":[{"Add":" fs::follow_oldest_path(changes, self, &channel.read().unwrap(), path)"}],"del_contents":[{"Del":" fs::follow_oldest_path(changes, self, &channel.borrow(), path)\n"},{"Del":" }\n\n fn output_file(\n &self,\n changes: &C,\n channel: &pristine::ChannelRef,\n v0: pristine::Position,\n out: &mut V,\n"},{"Del":" ) -> Result<(), output::FileError> {\n"},{"Del":" let mut forward = Vec::new();\n let channel = channel.borrow();\n"},{"Del":" let mut graph = alive::retrieve(self, self.graph(&channel), v0)?;\n"},{"Del":" alive::output_graph(changes, self, &channel, out, &mut graph, &mut forward)?;\n Ok(())\n"}]}},{"Replacement":{"inode":{"change":20,"pos":737429},"path":"libpijul/src/fs.rs","line":20,"ins":{"up_context":[{"change":20,"pos":738443}],"down_context":[{"change":20,"pos":738461}],"flag":"BLOCK","start":85163,"end":85183,"inode":{"change":20,"pos":737429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":738443},"to":{"change":20,"start":13068,"end":13099},"introduced_by":20}],"inode":{"change":20,"pos":737429}},"ins_contents":[{"Add":"use crate::HashSet;"}],"del_contents":[{"Del":"use std::collections::HashSet;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":737429},"path":"libpijul/src/fs.rs","line":538,"ins":{"up_context":[{"change":20,"pos":109176}],"down_context":[{"change":20,"pos":15326}],"flag":"BLOCK","start":85184,"end":85221,"inode":{"change":20,"pos":737429}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":109176},"to":{"change":20,"start":15293,"end":15326},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":15293},"to":{"change":20,"start":15293,"end":15326},"introduced_by":20}],"inode":{"change":20,"pos":737429}},"ins_contents":[{"Add":" visited: HashSet::default(),"}],"del_contents":[{"Del":" visited: HashSet::new(),\n"}]}},{"Replacement":{"inode":{"change":20,"pos":763306},"path":"libpijul/src/find_alive.rs","line":2,"ins":{"up_context":[{"change":20,"pos":64452}],"down_context":[{"change":20,"pos":32357}],"flag":"BLOCK","start":85222,"end":85242,"inode":{"change":20,"pos":763306}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":64452},"to":{"change":20,"start":763435,"end":763466},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":763435},"to":{"change":20,"start":763435,"end":763466},"introduced_by":20}],"inode":{"change":20,"pos":763306}},"ins_contents":[{"Add":"use crate::HashSet;"}],"del_contents":[{"Del":"use std::collections::HashSet;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":763306},"path":"libpijul/src/find_alive.rs","line":10,"ins":{"up_context":[{"change":20,"pos":134264}],"down_context":[{"change":20,"pos":763967}],"flag":"BLOCK","start":85243,"end":85325,"inode":{"change":20,"pos":763306}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":134264},"to":{"change":20,"start":763834,"end":763908},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":763834},"to":{"change":20,"start":763834,"end":763908},"introduced_by":20}],"inode":{"change":20,"pos":763306}},"ins_contents":[{"Add":" let mut visited = HashSet::default();"},{"Add":" let mut alive = HashSet::default();"}],"del_contents":[{"Del":" let mut visited = HashSet::new();\n let mut alive = HashSet::new();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":763306},"path":"libpijul/src/find_alive.rs","line":51,"ins":{"up_context":[{"change":20,"pos":115204}],"down_context":[{"change":20,"pos":134828}],"flag":"BLOCK","start":85326,"end":85366,"inode":{"change":20,"pos":763306}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":15706},"to":{"change":20,"start":765386,"end":765422},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":32501},"to":{"change":20,"start":765386,"end":765422},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":115204},"to":{"change":20,"start":765386,"end":765422},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":765386},"to":{"change":20,"start":765386,"end":765422},"introduced_by":20}],"inode":{"change":20,"pos":763306}},"ins_contents":[{"Add":" let mut alive = HashSet::default();"}],"del_contents":[{"Del":" let mut alive = HashSet::new();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":763306},"path":"libpijul/src/find_alive.rs","line":53,"ins":{"up_context":[{"change":20,"pos":134912}],"down_context":[{"change":20,"pos":765697}],"flag":"BLOCK","start":85367,"end":85409,"inode":{"change":20,"pos":763306}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":134912},"to":{"change":20,"start":765600,"end":765638},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":765600},"to":{"change":20,"start":765600,"end":765638},"introduced_by":20}],"inode":{"change":20,"pos":763306}},"ins_contents":[{"Add":" let mut visited = HashSet::default();"}],"del_contents":[{"Del":" let mut visited = HashSet::new();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":768903},"path":"libpijul/src/diff/vertex_buffer.rs","line":3,"ins":{"up_context":[{"change":20,"pos":769009}],"down_context":[{"change":20,"pos":769106}],"flag":"BLOCK","start":85410,"end":85442,"inode":{"change":20,"pos":768903}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":769009},"to":{"change":20,"start":769009,"end":769051},"introduced_by":20}],"inode":{"change":20,"pos":768903}},"ins_contents":[{"Add":"use crate::{HashMap, HashSet};"},{"Add":""}],"del_contents":[{"Del":"use std::collections::{HashMap, HashSet};\n"}]}},{"Replacement":{"inode":{"change":20,"pos":768903},"path":"libpijul/src/diff/vertex_buffer.rs","line":69,"ins":{"up_context":[{"change":20,"pos":771121}],"down_context":[{"change":20,"pos":771162}],"flag":"BLOCK","start":85443,"end":85488,"inode":{"change":20,"pos":768903}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":771121},"to":{"change":20,"start":771121,"end":771162},"introduced_by":20}],"inode":{"change":20,"pos":768903}},"ins_contents":[{"Add":" missing_eol: HashSet::default(),"}],"del_contents":[{"Del":" missing_eol: HashSet::new(),\n"}]}},{"Replacement":{"inode":{"change":20,"pos":768903},"path":"libpijul/src/diff/vertex_buffer.rs","line":76,"ins":{"up_context":[{"change":20,"pos":771354}],"down_context":[{"change":20,"pos":771390}],"flag":"BLOCK","start":85489,"end":85529,"inode":{"change":20,"pos":768903}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":771354},"to":{"change":20,"start":771354,"end":771390},"introduced_by":20}],"inode":{"change":20,"pos":768903}},"ins_contents":[{"Add":" marker: HashMap::default(),"}],"del_contents":[{"Del":" marker: HashMap::new(),\n"}]}},{"Replacement":{"inode":{"change":20,"pos":768903},"path":"libpijul/src/diff/vertex_buffer.rs","line":83,"ins":{"up_context":[{"change":20,"pos":771601}],"down_context":[{"change":20,"pos":771647}],"flag":"BLOCK","start":85530,"end":85580,"inode":{"change":20,"pos":768903}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":771601},"to":{"change":20,"start":771601,"end":771647},"introduced_by":20}],"inode":{"change":20,"pos":768903}},"ins_contents":[{"Add":" solved_conflicts: HashSet::default(),"}],"del_contents":[{"Del":" solved_conflicts: HashSet::new(),\n"}]}},{"Replacement":{"inode":{"change":20,"pos":778592},"path":"libpijul/src/diff/split.rs","line":1,"ins":{"up_context":[{"change":20,"pos":778592}],"down_context":[{"change":20,"pos":778679}],"flag":"BLOCK","start":85581,"end":85601,"inode":{"change":20,"pos":778592}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":778648},"to":{"change":20,"start":778648,"end":778679},"introduced_by":20}],"inode":{"change":20,"pos":778592}},"ins_contents":[{"Add":"use crate::HashSet;"}],"del_contents":[{"Del":"use std::collections::HashSet;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":779907},"path":"libpijul/src/diff/replace.rs","line":6,"ins":{"up_context":[{"change":20,"pos":780197}],"down_context":[{"change":3,"pos":0}],"flag":"BLOCK","start":85602,"end":85662,"inode":{"change":20,"pos":779907}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":780197},"to":{"change":20,"start":780197,"end":780267},"introduced_by":20}],"inode":{"change":20,"pos":779907}},"ins_contents":[{"Add":"use crate::record::Recorded;"},{"Add":"use crate::{HashMap, HashSet};"}],"del_contents":[{"Del":"use crate::record::Builder;\nuse std::collections::{HashMap, HashSet};\n"}]}},{"Replacement":{"inode":{"change":20,"pos":779907},"path":"libpijul/src/diff/replace.rs","line":19,"ins":{"up_context":[{"change":20,"pos":780618}],"down_context":[{"change":20,"pos":780766}],"flag":"BLOCK","start":85663,"end":85827,"inode":{"change":20,"pos":779907}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":780618},"to":{"change":20,"start":780618,"end":780766},"introduced_by":20}],"inode":{"change":20,"pos":779907}},"ins_contents":[{"Add":" side_ends: HashMap::default(),"},{"Add":" up: HashMap::default(),"},{"Add":" active: HashSet::default(),"},{"Add":" reorderings: HashMap::default(),"}],"del_contents":[{"Del":" side_ends: HashMap::new(),\n up: HashMap::new(),\n active: HashSet::new(),\n reorderings: HashMap::new(),\n"}]}},{"Replacement":{"inode":{"change":20,"pos":779907},"path":"libpijul/src/diff/replace.rs","line":27,"ins":{"up_context":[{"change":3,"pos":3}],"down_context":[{"change":20,"pos":780854}],"flag":"BLOCK","start":85828,"end":85844,"inode":{"change":20,"pos":779907}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":3},"to":{"change":20,"start":780839,"end":780854},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":780839},"to":{"change":20,"start":780839,"end":780854},"introduced_by":20}],"inode":{"change":20,"pos":779907}},"ins_contents":[{"Add":"impl Recorded {"}],"del_contents":[{"Del":"impl Builder {\n"}]}},{"Edit":{"inode":{"change":20,"pos":779907},"path":"libpijul/src/diff/replace.rs","line":42,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":781307}],"down_context":[{"change":20,"pos":781307}],"flag":"BLOCK","start":85845,"end":85904,"inode":{"change":20,"pos":779907}}},"contents":[{"Add":""},{"Add":" let start = self.contents.lock().unwrap().len();"},{"Add":""}]}},{"Replacement":{"inode":{"change":20,"pos":779907},"path":"libpijul/src/diff/replace.rs","line":55,"ins":{"up_context":[{"change":20,"pos":781536}],"down_context":[{"change":20,"pos":781573}],"flag":"BLOCK","start":85905,"end":85924,"inode":{"change":20,"pos":779907}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":781536},"to":{"change":20,"start":781536,"end":781573},"introduced_by":20}],"inode":{"change":20,"pos":779907}},"ins_contents":[{"Add":" start,"}],"del_contents":[{"Del":" self.rec.contents.len(),\n"}]}},{"Replacement":{"inode":{"change":20,"pos":779907},"path":"libpijul/src/diff/replace.rs","line":61,"ins":{"up_context":[{"change":20,"pos":142}],"down_context":[{"change":20,"pos":781630}],"flag":"BLOCK","start":85925,"end":85983,"inode":{"change":20,"pos":779907}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":142},"to":{"change":20,"start":781585,"end":781630},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":781585},"to":{"change":20,"start":781585,"end":781630},"introduced_by":20}],"inode":{"change":20,"pos":779907}},"ins_contents":[{"Add":" let mut contents = self.contents.lock().unwrap();"}],"del_contents":[{"Del":" let start = self.rec.contents.len();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":779907},"path":"libpijul/src/diff/replace.rs","line":63,"ins":{"up_context":[{"change":20,"pos":781690}],"down_context":[{"change":20,"pos":781736}],"flag":"BLOCK","start":85984,"end":86021,"inode":{"change":20,"pos":779907}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":781690},"to":{"change":20,"start":781690,"end":781736},"introduced_by":20}],"inode":{"change":20,"pos":779907}},"ins_contents":[{"Add":" contents.extend(line.l);"}],"del_contents":[{"Del":" self.rec.contents.extend(line.l);\n"}]}},{"Replacement":{"inode":{"change":20,"pos":779907},"path":"libpijul/src/diff/replace.rs","line":65,"ins":{"up_context":[{"change":20,"pos":781746}],"down_context":[{"change":20,"pos":30}],"flag":"BLOCK","start":86022,"end":86056,"inode":{"change":20,"pos":779907}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":781746},"to":{"change":20,"start":781746,"end":781789},"introduced_by":20}],"inode":{"change":20,"pos":779907}},"ins_contents":[{"Add":" let end = contents.len();"}],"del_contents":[{"Del":" let end = self.rec.contents.len();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":779907},"path":"libpijul/src/diff/replace.rs","line":69,"ins":{"up_context":[{"change":20,"pos":86}],"down_context":[{"change":20,"pos":0}],"flag":"BLOCK","start":86057,"end":86118,"inode":{"change":20,"pos":779907}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":86},"to":{"change":20,"start":781789,"end":781824},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":781789},"to":{"change":20,"start":781789,"end":781824},"introduced_by":20}],"inode":{"change":20,"pos":779907}},"ins_contents":[{"Add":" contents.push(0);"},{"Add":" std::mem::drop(contents);"},{"Add":""}],"del_contents":[{"Del":" self.rec.contents.push(0);\n"}]}},{"Replacement":{"inode":{"change":20,"pos":779907},"path":"libpijul/src/diff/replace.rs","line":81,"ins":{"up_context":[{"change":20,"pos":782186}],"down_context":[{"change":20,"pos":2024}],"flag":"BLOCK","start":86119,"end":86158,"inode":{"change":20,"pos":779907}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":782186},"to":{"change":20,"start":782186,"end":782229},"introduced_by":20}],"inode":{"change":20,"pos":779907}},"ins_contents":[{"Add":" match self.actions.pop() {"}],"del_contents":[{"Del":" match self.rec.actions.pop() {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":779907},"path":"libpijul/src/diff/replace.rs","line":84,"ins":{"up_context":[{"change":20,"pos":52}],"down_context":[{"change":20,"pos":782406}],"flag":"BLOCK","start":86159,"end":86221,"inode":{"change":20,"pos":779907}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":52},"to":{"change":20,"start":2084,"end":2150},"introduced_by":20}],"inode":{"change":20,"pos":779907}},"ins_contents":[{"Add":" self.actions.push(Hunk::Replacement {"}],"del_contents":[{"Del":" self.rec.actions.push(Hunk::Replacement {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":779907},"path":"libpijul/src/diff/replace.rs","line":91,"ins":{"up_context":[{"change":20,"pos":782625}],"down_context":[{"change":20,"pos":782706}],"flag":"BLOCK","start":86222,"end":86297,"inode":{"change":20,"pos":779907}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":782625},"to":{"change":20,"start":2151,"end":2230},"introduced_by":20}],"inode":{"change":20,"pos":779907}},"ins_contents":[{"Add":" self.actions.push(Hunk::Edit { change: c, local })"}],"del_contents":[{"Del":" self.rec.actions.push(Hunk::Edit { change: c, local })\n"}]}},{"Replacement":{"inode":{"change":20,"pos":779907},"path":"libpijul/src/diff/replace.rs","line":94,"ins":{"up_context":[{"change":20,"pos":782746}],"down_context":[{"change":4,"pos":0}],"flag":"BLOCK","start":86298,"end":86347,"inode":{"change":20,"pos":779907}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":782746},"to":{"change":20,"start":782746,"end":782799},"introduced_by":20}],"inode":{"change":20,"pos":779907}},"ins_contents":[{"Add":" Some(c) => self.actions.push(c),"}],"del_contents":[{"Del":" Some(c) => self.rec.actions.push(c),\n"}]}},{"Replacement":{"inode":{"change":20,"pos":779907},"path":"libpijul/src/diff/replace.rs","line":98,"ins":{"up_context":[{"change":20,"pos":782847}],"down_context":[{"change":20,"pos":782892}],"flag":"BLOCK","start":86348,"end":86387,"inode":{"change":20,"pos":779907}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":782847},"to":{"change":20,"start":2231,"end":2274},"introduced_by":20}],"inode":{"change":20,"pos":779907}},"ins_contents":[{"Add":" self.actions.push(Hunk::Edit {"}],"del_contents":[{"Del":" self.rec.actions.push(Hunk::Edit {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":793247},"path":"libpijul/src/diff/mod.rs","line":4,"ins":{"up_context":[{"change":20,"pos":793340}],"down_context":[{"change":20,"pos":793368}],"flag":"BLOCK","start":86388,"end":86417,"inode":{"change":20,"pos":793247}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":793340},"to":{"change":20,"start":793340,"end":793368},"introduced_by":20}],"inode":{"change":20,"pos":793247}},"ins_contents":[{"Add":"use crate::record::Recorded;"}],"del_contents":[{"Del":"use crate::record::Builder;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":793247},"path":"libpijul/src/diff/mod.rs","line":49,"ins":{"up_context":[{"change":20,"pos":794101}],"down_context":[{"change":20,"pos":115840}],"flag":"BLOCK","start":86418,"end":86434,"inode":{"change":20,"pos":793247}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":794101},"to":{"change":20,"start":794101,"end":794116},"introduced_by":20}],"inode":{"change":20,"pos":793247}},"ins_contents":[{"Add":"impl Recorded {"}],"del_contents":[{"Del":"impl Builder {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":793247},"path":"libpijul/src/diff/mod.rs","line":61,"ins":{"up_context":[{"change":20,"pos":115955}],"down_context":[{"change":20,"pos":794500}],"flag":"BLOCK","start":86435,"end":86502,"inode":{"change":20,"pos":793247}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":33418},"to":{"change":20,"start":794425,"end":794500},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":115955},"to":{"change":20,"start":794425,"end":794500},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":794425},"to":{"change":20,"start":794425,"end":794500},"introduced_by":20}],"inode":{"change":20,"pos":793247}},"ins_contents":[{"Add":" self.largest_file = self.largest_file.max(b.len() as u64);"}],"del_contents":[{"Del":" self.rec.largest_file = self.rec.largest_file.max(b.len() as u64);\n"}]}},{"Replacement":{"inode":{"change":20,"pos":793247},"path":"libpijul/src/diff/mod.rs","line":149,"ins":{"up_context":[{"change":20,"pos":116221}],"down_context":[{"change":5,"pos":52}],"flag":"BLOCK","start":86503,"end":86541,"inode":{"change":20,"pos":793247}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":116221},"to":{"change":20,"start":797596,"end":797638},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":797596},"to":{"change":20,"start":797596,"end":797638},"introduced_by":20}],"inode":{"change":20,"pos":793247}},"ins_contents":[{"Add":" self.has_binary_files = true;"}],"del_contents":[{"Del":" self.rec.has_binary_files = true;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":793247},"path":"libpijul/src/diff/mod.rs","line":151,"ins":{"up_context":[{"change":5,"pos":129}],"down_context":[{"change":20,"pos":797895}],"flag":"BLOCK","start":86542,"end":86778,"inode":{"change":20,"pos":793247}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":129},"to":{"change":20,"start":797717,"end":797895},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":20,"pos":2352},"to":{"change":20,"start":797717,"end":797895},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":797717},"to":{"change":20,"start":797717,"end":797895},"introduced_by":20}],"inode":{"change":20,"pos":793247}},"ins_contents":[{"Add":""},{"Add":" let mut contents = self.contents.lock().unwrap();"},{"Add":" let pos = contents.len();"},{"Add":" contents.extend_from_slice(&b[..]);"},{"Add":" let pos_end = contents.len();"},{"Add":" contents.push(0);"},{"Add":" std::mem::drop(contents);"},{"Add":""}],"del_contents":[{"Del":" let pos = self.rec.contents.len();\n self.rec.contents.extend_from_slice(&b[..]);\n let pos_end = self.rec.contents.len();\n self.rec.contents.push(0);\n"}]}},{"Replacement":{"inode":{"change":20,"pos":793247},"path":"libpijul/src/diff/mod.rs","line":202,"ins":{"up_context":[{"change":20,"pos":799869}],"down_context":[{"change":20,"pos":799918}],"flag":"BLOCK","start":86779,"end":86822,"inode":{"change":20,"pos":793247}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":799869},"to":{"change":20,"start":2353,"end":2400},"introduced_by":20}],"inode":{"change":20,"pos":793247}},"ins_contents":[{"Add":" self.actions.push(Hunk::Edit {"}],"del_contents":[{"Del":" self.rec.actions.push(Hunk::Edit {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":793247},"path":"libpijul/src/diff/mod.rs","line":213,"ins":{"up_context":[{"change":20,"pos":800193}],"down_context":[{"change":20,"pos":548}],"flag":"BLOCK","start":86823,"end":86869,"inode":{"change":20,"pos":793247}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":800193},"to":{"change":20,"start":2401,"end":2451},"introduced_by":20}],"inode":{"change":20,"pos":793247}},"ins_contents":[{"Add":" self.actions.push(Hunk::Replacement {"}],"del_contents":[{"Del":" self.rec.actions.push(Hunk::Replacement {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":805350},"path":"libpijul/src/diff/delete.rs","line":8,"ins":{"up_context":[{"change":20,"pos":805674}],"down_context":[{"change":20,"pos":805702}],"flag":"BLOCK","start":86870,"end":86899,"inode":{"change":20,"pos":805350}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":805674},"to":{"change":20,"start":805674,"end":805702},"introduced_by":20}],"inode":{"change":20,"pos":805350}},"ins_contents":[{"Add":"use crate::record::Recorded;"}],"del_contents":[{"Del":"use crate::record::Builder;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":805350},"path":"libpijul/src/diff/delete.rs","line":10,"ins":{"up_context":[{"change":20,"pos":805703}],"down_context":[{"change":20,"pos":116378}],"flag":"BLOCK","start":86900,"end":86916,"inode":{"change":20,"pos":805350}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":805703},"to":{"change":20,"start":805703,"end":805718},"introduced_by":20}],"inode":{"change":20,"pos":805350}},"ins_contents":[{"Add":"impl Recorded {"}],"del_contents":[{"Del":"impl Builder {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":805350},"path":"libpijul/src/diff/delete.rs","line":46,"ins":{"up_context":[{"change":20,"pos":806700}],"down_context":[{"change":20,"pos":116574}],"flag":"BLOCK","start":86917,"end":86933,"inode":{"change":20,"pos":805350}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":806700},"to":{"change":20,"start":806700,"end":806715},"introduced_by":20}],"inode":{"change":20,"pos":805350}},"ins_contents":[{"Add":"impl Recorded {"}],"del_contents":[{"Del":"impl Builder {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":805350},"path":"libpijul/src/diff/delete.rs","line":58,"ins":{"up_context":[{"change":20,"pos":807024}],"down_context":[{"change":20,"pos":807073}],"flag":"BLOCK","start":86934,"end":86977,"inode":{"change":20,"pos":805350}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":807024},"to":{"change":20,"start":2513,"end":2560},"introduced_by":20}],"inode":{"change":20,"pos":805350}},"ins_contents":[{"Add":" self.actions.push(Hunk::Edit {"}],"del_contents":[{"Del":" self.rec.actions.push(Hunk::Edit {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":805350},"path":"libpijul/src/diff/delete.rs","line":70,"ins":{"up_context":[{"change":20,"pos":807902}],"down_context":[{"change":20,"pos":807963}],"flag":"BLOCK","start":86978,"end":87033,"inode":{"change":20,"pos":805350}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":807902},"to":{"change":20,"start":2561,"end":2620},"introduced_by":20}],"inode":{"change":20,"pos":805350}},"ins_contents":[{"Add":" self.actions.push(Hunk::ResurrectZombies {"}],"del_contents":[{"Del":" self.rec.actions.push(Hunk::ResurrectZombies {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":805350},"path":"libpijul/src/diff/delete.rs","line":208,"ins":{"up_context":[{"change":20,"pos":812430}],"down_context":[{"change":20,"pos":812445}],"flag":"BLOCK","start":87034,"end":87050,"inode":{"change":20,"pos":805350}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":812430},"to":{"change":20,"start":812430,"end":812445},"introduced_by":20}],"inode":{"change":20,"pos":805350}},"ins_contents":[{"Add":"impl Recorded {"}],"del_contents":[{"Del":"impl Builder {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":805350},"path":"libpijul/src/diff/delete.rs","line":227,"ins":{"up_context":[{"change":20,"pos":813084}],"down_context":[{"change":20,"pos":813346}],"flag":"BLOCK","start":87051,"end":87297,"inode":{"change":20,"pos":805350}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":813147},"to":{"change":20,"start":813147,"end":813182},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":813182},"to":{"change":20,"start":137170,"end":137236},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":137236},"to":{"change":20,"start":813248,"end":813283},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":813248},"to":{"change":20,"start":813248,"end":813283},"introduced_by":20}],"inode":{"change":20,"pos":805350}},"ins_contents":[{"Add":""},{"Add":" let mut contents = self.contents.lock().unwrap();"},{"Add":" contents.push(0);"},{"Add":" let pos = ChangePosition(contents.len().into());"},{"Add":" contents.push(0);"},{"Add":" let contents_len = contents.len();"},{"Add":" std::mem::drop(contents);"},{"Add":""}],"del_contents":[{"Del":" self.rec.contents.push(0);\n"},{"Del":" let pos = ChangePosition(self.rec.contents.len().into());\n"},{"Del":" self.rec.contents.push(0);\n"}]}},{"Replacement":{"inode":{"change":20,"pos":805350},"path":"libpijul/src/diff/delete.rs","line":249,"ins":{"up_context":[{"change":20,"pos":813743}],"down_context":[{"change":20,"pos":813784}],"flag":"BLOCK","start":87298,"end":87328,"inode":{"change":20,"pos":805350}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":813743},"to":{"change":20,"start":813743,"end":813784},"introduced_by":20}],"inode":{"change":20,"pos":805350}},"ins_contents":[{"Add":" contents_len,"}],"del_contents":[{"Del":" self.rec.contents.len(),\n"}]}},{"Replacement":{"inode":{"change":20,"pos":805350},"path":"libpijul/src/diff/delete.rs","line":253,"ins":{"up_context":[{"change":20,"pos":813947}],"down_context":[{"change":20,"pos":814006}],"flag":"BLOCK","start":87329,"end":87382,"inode":{"change":20,"pos":805350}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":813947},"to":{"change":20,"start":2621,"end":2678},"introduced_by":20}],"inode":{"change":20,"pos":805350}},"ins_contents":[{"Add":" self.actions.push(Hunk::SolveOrderConflict {"}],"del_contents":[{"Del":" self.rec.actions.push(Hunk::SolveOrderConflict {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":820702},"path":"libpijul/src/changestore/memory.rs","line":4,"ins":{"up_context":[{"change":20,"pos":820846}],"down_context":[{"change":20,"pos":820895}],"flag":"BLOCK","start":87383,"end":87403,"inode":{"change":20,"pos":820702}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":820864},"to":{"change":20,"start":820864,"end":820895},"introduced_by":20}],"inode":{"change":20,"pos":820702}},"ins_contents":[{"Add":"use crate::HashMap;"}],"del_contents":[{"Del":"use std::collections::HashMap;\n"}]}},{"Edit":{"inode":{"change":20,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":4,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":824179}],"down_context":[{"change":20,"pos":824179}],"flag":"BLOCK","start":87404,"end":87438,"inode":{"change":20,"pos":824013}}},"contents":[{"Add":"use std::cell::{RefCell, RefMut};"}]}},{"Edit":{"inode":{"change":20,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":6,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":824211},"to":{"change":20,"start":824211,"end":824252},"introduced_by":20}],"inode":{"change":20,"pos":824013}}},"contents":[{"Del":"use std::sync::{Arc, Mutex, MutexGuard};\n"}]}},{"Replacement":{"inode":{"change":20,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":10,"ins":{"up_context":[{"change":20,"pos":824324}],"down_context":[{"change":20,"pos":824493}],"flag":"BLOCK","start":87439,"end":87542,"inode":{"change":20,"pos":824013}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":824324},"to":{"change":20,"start":824324,"end":824493},"introduced_by":20}],"inode":{"change":20,"pos":824013}},"ins_contents":[{"Add":"pub struct FileSystem {"},{"Add":" change_cache: RefCell>>,"}],"del_contents":[{"Del":"#[derive(Clone)]\npub struct FileSystem(Arc);\n\nstruct FileSystem_ {\n change_cache: Mutex>>>>,\n"}]}},{"Edit":{"inode":{"change":20,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":13,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":824519}],"down_context":[{"change":20,"pos":35133}],"flag":"BLOCK","start":87543,"end":87777,"inode":{"change":20,"pos":824013}}},"contents":[{"Add":"}"},{"Add":""},{"Add":"impl Clone for FileSystem {"},{"Add":" fn clone(&self) -> Self {"},{"Add":" FileSystem {"},{"Add":" changes_dir: self.changes_dir.clone(),"},{"Add":" change_cache: RefCell::new(lru_cache::LruCache::new(CHANGE_CACHE_SIZE)),"},{"Add":" }"},{"Add":" }"}]}},{"Replacement":{"inode":{"change":20,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":51,"ins":{"up_context":[{"change":20,"pos":824914}],"down_context":[{"change":20,"pos":824965}],"flag":"BLOCK","start":87778,"end":87827,"inode":{"change":20,"pos":824013}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":824914},"to":{"change":20,"start":824914,"end":824965},"introduced_by":20}],"inode":{"change":20,"pos":824013}},"ins_contents":[{"Add":" let mut path = self.changes_dir.clone();"}],"del_contents":[{"Del":" let mut path = self.0.changes_dir.clone();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":72,"ins":{"up_context":[{"change":20,"pos":825724}],"down_context":[{"change":20,"pos":825766}],"flag":"BLOCK","start":87828,"end":87849,"inode":{"change":20,"pos":824013}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":825724},"to":{"change":20,"start":825724,"end":825766},"introduced_by":20}],"inode":{"change":20,"pos":824013}},"ins_contents":[{"Add":" FileSystem {"}],"del_contents":[{"Del":" FileSystem(Arc::new(FileSystem_ {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":74,"ins":{"up_context":[{"change":20,"pos":825791}],"down_context":[{"change":20,"pos":825886}],"flag":"BLOCK","start":87850,"end":87945,"inode":{"change":20,"pos":824013}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":825791},"to":{"change":20,"start":825791,"end":825886},"introduced_by":20}],"inode":{"change":20,"pos":824013}},"ins_contents":[{"Add":" change_cache: RefCell::new(lru_cache::LruCache::new(CHANGE_CACHE_SIZE)),"},{"Add":" }"}],"del_contents":[{"Del":" change_cache: Mutex::new(lru_cache::LruCache::new(CHANGE_CACHE_SIZE)),\n }))\n"}]}},{"Replacement":{"inode":{"change":20,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":83,"ins":{"up_context":[{"change":20,"pos":826014}],"down_context":[{"change":20,"pos":35450}],"flag":"BLOCK","start":87946,"end":88014,"inode":{"change":20,"pos":824013}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":826014},"to":{"change":20,"start":826014,"end":826098},"introduced_by":20}],"inode":{"change":20,"pos":824013}},"ins_contents":[{"Add":" RefMut>>,"}],"del_contents":[{"Del":" MutexGuard>>>>,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":86,"ins":{"up_context":[{"change":20,"pos":826129}],"down_context":[{"change":20,"pos":826232}],"flag":"BLOCK","start":88015,"end":88127,"inode":{"change":20,"pos":824013}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":826129},"to":{"change":20,"start":826129,"end":826232},"introduced_by":20}],"inode":{"change":20,"pos":824013}},"ins_contents":[{"Add":" let mut change_cache = self.change_cache.borrow_mut();"},{"Add":" if !change_cache.contains_key(&change) {"}],"del_contents":[{"Del":" let mut cache = self.0.change_cache.lock().unwrap();\n if !cache.contains_key(&change) {\n"}]}},{"Edit":{"inode":{"change":20,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":90,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":826317}],"down_context":[{"change":20,"pos":826317}],"flag":"BLOCK","start":88128,"end":88174,"inode":{"change":20,"pos":824013}}},"contents":[{"Add":" debug!(\"changefile: {:?}\", path);"}]}},{"Replacement":{"inode":{"change":20,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":92,"ins":{"up_context":[{"change":20,"pos":826399}],"down_context":[{"change":20,"pos":826458}],"flag":"BLOCK","start":88175,"end":88253,"inode":{"change":20,"pos":824013}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":826399},"to":{"change":20,"start":826399,"end":826458},"introduced_by":20}],"inode":{"change":20,"pos":824013}},"ins_contents":[{"Add":" debug!(\"patch done\");"},{"Add":" change_cache.insert(change, p);"}],"del_contents":[{"Del":" cache.insert(change, Arc::new(Mutex::new(p)));\n"}]}},{"Replacement":{"inode":{"change":20,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":95,"ins":{"up_context":[{"change":20,"pos":826468}],"down_context":[{"change":20,"pos":826486}],"flag":"BLOCK","start":88254,"end":88279,"inode":{"change":20,"pos":824013}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":826468},"to":{"change":20,"start":826468,"end":826486},"introduced_by":20}],"inode":{"change":20,"pos":824013}},"ins_contents":[{"Add":" Ok(change_cache)"}],"del_contents":[{"Del":" Ok(cache)\n"}]}},{"Replacement":{"inode":{"change":20,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":115,"ins":{"up_context":[{"change":20,"pos":35653}],"down_context":[{"change":20,"pos":827003}],"flag":"BLOCK","start":88280,"end":88353,"inode":{"change":20,"pos":824013}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":35653},"to":{"change":20,"start":826928,"end":827003},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":826928},"to":{"change":20,"start":826928,"end":827003},"introduced_by":20}],"inode":{"change":20,"pos":824013}},"ins_contents":[{"Add":" let mut f = tempfile::NamedTempFile::new_in(&self.changes_dir)?;"}],"del_contents":[{"Del":" let mut f = tempfile::NamedTempFile::new_in(&self.0.changes_dir)?;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":123,"ins":{"up_context":[{"change":20,"pos":827293}],"down_context":[{"change":20,"pos":827395}],"flag":"BLOCK","start":88354,"end":88416,"inode":{"change":20,"pos":824013}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":827293},"to":{"change":20,"start":827293,"end":827395},"introduced_by":20}],"inode":{"change":20,"pos":824013}},"ins_contents":[{"Add":" self.change_cache.borrow_mut().remove(change_id);"}],"del_contents":[{"Del":" let mut cache = self.0.change_cache.lock().unwrap();\n cache.remove(change_id);\n"}]}},{"Replacement":{"inode":{"change":20,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":133,"ins":{"up_context":[{"change":20,"pos":827590}],"down_context":[{"change":20,"pos":827996}],"flag":"BLOCK","start":88417,"end":88539,"inode":{"change":20,"pos":824013}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":827590},"to":{"change":20,"start":827590,"end":827996},"introduced_by":20}],"inode":{"change":20,"pos":824013}},"ins_contents":[{"Add":" if let Some(l) = self.change_cache.borrow_mut().get_mut(change_id) {"},{"Add":" return l.has_contents();"}],"del_contents":[{"Del":" let mut cache = self.0.change_cache.lock().unwrap();\n let mut poisoned = false;\n if let Some(c) = cache.get_mut(change_id) {\n if let Ok(l) = c.lock() {\n return l.has_contents();\n } else {\n poisoned = true\n }\n }\n if poisoned {\n cache.remove(change_id);\n"}]}},{"Edit":{"inode":{"change":20,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":157,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":35792}],"down_context":[{"change":20,"pos":137809}],"flag":"BLOCK","start":88540,"end":88582,"inode":{"change":20,"pos":824013}}},"contents":[{"Add":" debug!(\"get_contents {:?}\", key);"}]}},{"Edit":{"inode":{"change":20,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":160,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":828761}],"down_context":[{"change":20,"pos":828761}],"flag":"BLOCK","start":88583,"end":88615,"inode":{"change":20,"pos":824013}}},"contents":[{"Add":" debug!(\"return 0\");"}]}},{"Edit":{"inode":{"change":20,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":165,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":828904},"to":{"change":20,"start":828904,"end":828943},"introduced_by":20}],"inode":{"change":20,"pos":824013}}},"contents":[{"Del":" let mut p = p.lock().unwrap();\n"}]}},{"Edit":{"inode":{"change":20,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":166,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":137921}],"down_context":[{"change":20,"pos":828995}],"flag":"BLOCK","start":88616,"end":88656,"inode":{"change":20,"pos":824013}}},"contents":[{"Add":" debug!(\"get_contents {:?}\", n);"}]}},{"Edit":{"inode":{"change":20,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":195,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":829911},"to":{"change":20,"start":829911,"end":829946},"introduced_by":20}],"inode":{"change":20,"pos":824013}}},"contents":[{"Del":" let p = p.lock().unwrap();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":204,"ins":{"up_context":[{"change":20,"pos":35944}],"down_context":[{"change":20,"pos":830302}],"flag":"BLOCK","start":88657,"end":88730,"inode":{"change":20,"pos":824013}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":35944},"to":{"change":20,"start":830227,"end":830302},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":830227},"to":{"change":20,"start":830227,"end":830302},"introduced_by":20}],"inode":{"change":20,"pos":824013}},"ins_contents":[{"Add":" let mut f = tempfile::NamedTempFile::new_in(&self.changes_dir)?;"}],"del_contents":[{"Del":" let mut f = tempfile::NamedTempFile::new_in(&self.0.changes_dir)?;\n"}]}},{"Edit":{"inode":{"change":20,"pos":831311},"path":"libpijul/src/change.rs","line":2,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":831409}],"down_context":[{"change":20,"pos":831409}],"flag":"BLOCK","start":88731,"end":88751,"inode":{"change":20,"pos":831311}}},"contents":[{"Add":"use crate::HashSet;"}]}},{"Replacement":{"inode":{"change":20,"pos":831311},"path":"libpijul/src/change.rs","line":4,"ins":{"up_context":[{"change":20,"pos":831438}],"down_context":[{"change":20,"pos":831519}],"flag":"BLOCK","start":88752,"end":88784,"inode":{"change":20,"pos":831311}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":17,"pos":1226},"to":{"change":20,"start":831438,"end":831481},"introduced_by":17},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":831438},"to":{"change":20,"start":831438,"end":831481},"introduced_by":20}],"inode":{"change":20,"pos":831311}},"ins_contents":[{"Add":"use std::collections::BTreeSet;"}],"del_contents":[{"Del":"use std::collections::{BTreeSet, HashSet};\n"}]}},{"Replacement":{"inode":{"change":20,"pos":831311},"path":"libpijul/src/change.rs","line":11,"ins":{"up_context":[{"change":20,"pos":36136}],"down_context":[{"change":20,"pos":36136}],"flag":"BLOCK","start":88785,"end":88853,"inode":{"change":20,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":36136},"to":{"change":20,"start":2514,"end":2553},"introduced_by":20}],"inode":{"change":20,"pos":831311}},"ins_contents":[{"Add":"pub use text_changes::{TextDeError, TextSerError, WriteChangeLine};"}],"del_contents":[{"Del":"pub use text_changes::WriteChangeLine;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":831311},"path":"libpijul/src/change.rs","line":269,"ins":{"up_context":[{"change":20,"pos":837958}],"down_context":[{"change":20,"pos":138351}],"flag":"BLOCK","start":88854,"end":88897,"inode":{"change":20,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":837958},"to":{"change":20,"start":837958,"end":837994},"introduced_by":20}],"inode":{"change":20,"pos":831311}},"ins_contents":[{"Add":" let channel = channel.read().unwrap();"}],"del_contents":[{"Del":" let channel = channel.borrow();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":831311},"path":"libpijul/src/change.rs","line":362,"ins":{"up_context":[{"change":20,"pos":840488}],"down_context":[{"change":20,"pos":840533}],"flag":"BLOCK","start":88898,"end":88947,"inode":{"change":20,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":840488},"to":{"change":20,"start":840488,"end":840533},"introduced_by":20}],"inode":{"change":20,"pos":831311}},"ins_contents":[{"Add":" let mut internal_deps_ = HashSet::default();"}],"del_contents":[{"Del":" let mut internal_deps_ = HashSet::new();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":831311},"path":"libpijul/src/change.rs","line":378,"ins":{"up_context":[{"change":20,"pos":841017}],"down_context":[{"change":20,"pos":841055}],"flag":"BLOCK","start":88948,"end":88990,"inode":{"change":20,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":841017},"to":{"change":20,"start":841017,"end":841055},"introduced_by":20}],"inode":{"change":20,"pos":831311}},"ins_contents":[{"Add":" let mut visited = HashSet::default();"}],"del_contents":[{"Del":" let mut visited = HashSet::new();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":831311},"path":"libpijul/src/change.rs","line":1175,"ins":{"up_context":[{"change":20,"pos":122645}],"down_context":[{"change":20,"pos":867489}],"flag":"BLOCK","start":88991,"end":89107,"inode":{"change":20,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":122645},"to":{"change":20,"start":122645,"end":122742},"introduced_by":20}],"inode":{"change":20,"pos":831311}},"ins_contents":[{"Add":" let (dependencies, extra_known) ="},{"Add":" dependencies(txn, &channel.read().unwrap(), changes.iter())?;"}],"del_contents":[{"Del":" let (dependencies, extra_known) = dependencies(txn, &channel.borrow(), changes.iter())?;\n"}]}},{"Edit":{"inode":{"change":20,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":4,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":38019}],"down_context":[{"change":20,"pos":38019}],"flag":"BLOCK","start":89108,"end":89128,"inode":{"change":20,"pos":37976}}},"contents":[{"Add":"use crate::HashMap;"}]}},{"Edit":{"inode":{"change":20,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":6,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":38058},"to":{"change":20,"start":38058,"end":38089},"introduced_by":20}],"inode":{"change":20,"pos":37976}}},"contents":[{"Del":"use std::collections::HashMap;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":112,"ins":{"up_context":[{"change":20,"pos":41386}],"down_context":[{"change":20,"pos":41427}],"flag":"BLOCK","start":89129,"end":89174,"inode":{"change":20,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":41386},"to":{"change":20,"start":41386,"end":41427},"introduced_by":20}],"inode":{"change":20,"pos":37976}},"ins_contents":[{"Add":" let mut hashes = HashMap::default();"}],"del_contents":[{"Del":" let mut hashes = HashMap::new();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":172,"ins":{"up_context":[{"change":20,"pos":122944}],"down_context":[{"change":20,"pos":43278}],"flag":"BLOCK","start":89175,"end":89271,"inode":{"change":20,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":122944},"to":{"change":20,"start":122944,"end":123033},"introduced_by":20}],"inode":{"change":20,"pos":37976}},"ins_contents":[{"Add":" dependencies(txn, &channel.read().unwrap(), change.hashed.changes.iter()).unwrap();"}],"del_contents":[{"Del":" dependencies(txn, &channel.borrow(), change.hashed.changes.iter()).unwrap();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":241,"ins":{"up_context":[{"change":20,"pos":45638}],"down_context":[{"change":20,"pos":45730}],"flag":"BLOCK","start":89272,"end":89372,"inode":{"change":20,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":45638},"to":{"change":20,"start":45638,"end":45730},"introduced_by":20}],"inode":{"change":20,"pos":37976}},"ins_contents":[{"Add":" let mut deps = HashMap::default();"},{"Add":" let mut extra_dependencies = HashSet::default();"}],"del_contents":[{"Del":" let mut deps = HashMap::new();\n let mut extra_dependencies = HashSet::new();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":254,"ins":{"up_context":[{"change":20,"pos":46248}],"down_context":[{"change":20,"pos":46297}],"flag":"BLOCK","start":89373,"end":89426,"inode":{"change":20,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":46248},"to":{"change":20,"start":46248,"end":46297},"introduced_by":20}],"inode":{"change":20,"pos":37976}},"ins_contents":[{"Add":" offsets: HashMap::default(),"}],"del_contents":[{"Del":" offsets: HashMap::new(),\n"}]}},{"Replacement":{"inode":{"change":20,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":536,"ins":{"up_context":[{"change":20,"pos":56748}],"down_context":[{"change":20,"pos":56785}],"flag":"BLOCK","start":89427,"end":89460,"inode":{"change":20,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":56748},"to":{"change":20,"start":56748,"end":56785},"introduced_by":20}],"inode":{"change":20,"pos":37976}},"ins_contents":[{"Add":" contents_: &mut Vec,"}],"del_contents":[{"Del":" mut contents_: &mut Vec,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":545,"ins":{"up_context":[{"change":20,"pos":57069}],"down_context":[{"change":20,"pos":57195}],"flag":"BLOCK","start":89461,"end":89589,"inode":{"change":20,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":57069},"to":{"change":12,"start":156,"end":286},"introduced_by":12}],"inode":{"change":20,"pos":37976}},"ins_contents":[{"Add":" Regex::new(r#\"^(?P\\d+)\\. File addition: \"(?P[^\"]*)\" in \"(?P[^\"]*)\"(?P \\S+)?\"#).unwrap();"}],"del_contents":[{"Del":" Regex::new(r#\"^(?P\\d+)\\. File addition: \"(?P[^\"]*)\" in \"(?P[^\"]*)\"(?P [^ ]+)?\"#).unwrap();\n"}]}},{"Edit":{"inode":{"change":20,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":589,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":59406}],"down_context":[{"change":20,"pos":2608}],"flag":"BLOCK","start":89590,"end":89629,"inode":{"change":20,"pos":37976}}},"contents":[{"Add":" debug!(\"cap = {:?}\", cap);"}]}},{"Replacement":{"inode":{"change":20,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":602,"ins":{"up_context":[{"change":20,"pos":59651}],"down_context":[{"change":20,"pos":59700}],"flag":"BLOCK","start":89630,"end":89730,"inode":{"change":20,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":59651},"to":{"change":20,"start":59651,"end":59700},"introduced_by":20}],"inode":{"change":20,"pos":37976}},"ins_contents":[{"Add":" contents_.push((meta.0 >> 8) as u8);"},{"Add":" contents_.push((meta.0 & 0xff) as u8);"}],"del_contents":[{"Del":" meta.write(&mut contents_).unwrap();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":739,"ins":{"up_context":[{"change":20,"pos":64590}],"down_context":[{"change":20,"pos":64639}],"flag":"BLOCK","start":89731,"end":89831,"inode":{"change":20,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":64590},"to":{"change":20,"start":64590,"end":64639},"introduced_by":20}],"inode":{"change":20,"pos":37976}},"ins_contents":[{"Add":" contents_.push((meta.0 >> 8) as u8);"},{"Add":" contents_.push((meta.0 & 0xff) as u8);"}],"del_contents":[{"Del":" meta.write(&mut contents_).unwrap();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":944089},"path":"libpijul/src/apply.rs","line":2,"ins":{"up_context":[{"change":20,"pos":944165}],"down_context":[{"change":20,"pos":944220}],"flag":"BLOCK","start":89832,"end":89887,"inode":{"change":20,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":944165},"to":{"change":20,"start":17202,"end":17266},"introduced_by":20}],"inode":{"change":20,"pos":944089}},"ins_contents":[{"Add":"use crate::change::{Atom, Change, EdgeMap, NewVertex};"}],"del_contents":[{"Del":"use crate::change::{Atom, Change, EdgeMap, NewEdge, NewVertex};\n"}]}},{"Replacement":{"inode":{"change":20,"pos":944089},"path":"libpijul/src/apply.rs","line":7,"ins":{"up_context":[{"change":20,"pos":944344}],"down_context":[{"change":20,"pos":93395}],"flag":"BLOCK","start":89888,"end":89919,"inode":{"change":20,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":944362},"to":{"change":20,"start":944362,"end":944404},"introduced_by":20}],"inode":{"change":20,"pos":944089}},"ins_contents":[{"Add":"use crate::{HashMap, HashSet};"}],"del_contents":[{"Del":"use std::collections::{HashMap, HashSet};\n"}]}},{"Edit":{"inode":{"change":20,"pos":944089},"path":"libpijul/src/apply.rs","line":9,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":93417}],"down_context":[{"change":20,"pos":93417}],"flag":"BLOCK","start":89920,"end":89992,"inode":{"change":20,"pos":944089}}},"contents":[{"Add":"mod edge;"},{"Add":"pub(crate) use edge::*;"},{"Add":"mod vertex;"},{"Add":"pub(crate) use vertex::*;"}]}},{"Replacement":{"inode":{"change":20,"pos":944089},"path":"libpijul/src/apply.rs","line":94,"ins":{"up_context":[{"change":20,"pos":944998}],"down_context":[{"change":20,"pos":94700}],"flag":"BLOCK","start":89993,"end":90041,"inode":{"change":20,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":944998},"to":{"change":20,"start":944998,"end":945044},"introduced_by":20}],"inode":{"change":20,"pos":944089}},"ins_contents":[{"Add":" let mut channel = channel.write().unwrap();"}],"del_contents":[{"Del":" let mut channel = channel.r.borrow_mut();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":944089},"path":"libpijul/src/apply.rs","line":137,"ins":{"up_context":[{"change":20,"pos":946218}],"down_context":[{"change":20,"pos":946264}],"flag":"BLOCK","start":90042,"end":90090,"inode":{"change":20,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":946218},"to":{"change":20,"start":946218,"end":946264},"introduced_by":20}],"inode":{"change":20,"pos":944089}},"ins_contents":[{"Add":" let mut channel = channel.write().unwrap();"}],"del_contents":[{"Del":" let mut channel = channel.r.borrow_mut();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":944089},"path":"libpijul/src/apply.rs","line":140,"ins":{"up_context":[{"change":20,"pos":143642}],"down_context":[{"change":20,"pos":946321}],"flag":"BLOCK","start":90091,"end":90133,"inode":{"change":20,"pos":944089}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":143642},"to":{"change":20,"start":64,"end":102},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":946321},"to":{"change":20,"start":64,"end":102},"introduced_by":20}],"inode":{"change":20,"pos":944089}},"ins_contents":[{"Add":" let mut visited = HashSet::default();"}],"del_contents":[{"Del":" let mut visited = HashSet::new();\n"}]}},{"Edit":{"inode":{"change":20,"pos":944089},"path":"libpijul/src/apply.rs","line":252,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":126099}],"down_context":[{"change":20,"pos":17435}],"flag":"BLOCK","start":90134,"end":90187,"inode":{"change":20,"pos":944089}}},"contents":[{"Add":" |h| change.knows(h),"}]}},{"Edit":{"inode":{"change":20,"pos":944089},"path":"libpijul/src/apply.rs","line":274,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":126451}],"down_context":[{"change":20,"pos":126451}],"flag":"BLOCK","start":90188,"end":90237,"inode":{"change":20,"pos":944089}}},"contents":[{"Add":" |h| change.knows(h),"}]}},{"Edit":{"inode":{"change":20,"pos":944089},"path":"libpijul/src/apply.rs","line":276,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":126479},"to":{"change":20,"start":1126,"end":1231},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1126},"to":{"change":20,"start":1126,"end":1231},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1231},"to":{"change":20,"start":65148,"end":65199},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":65199},"to":{"change":20,"start":1268,"end":1481},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":126528},"to":{"change":20,"start":1268,"end":1481},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1268},"to":{"change":20,"start":1268,"end":1481},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1481},"to":{"change":20,"start":95915,"end":96006},"introduced_by":20}],"inode":{"change":20,"pos":944089}}},"contents":[{"Del":" crate::missing_context::collect_zombie_context(\n txn,\n"},{"Del":" T::graph_mut(channel),\n"},{"Del":" &mut ws.missing_context,\n n.inode,\n edge,\n change_id,\n |h| change.knows(&h),\n"},{"Del":" )\n .map_err(LocalApplyError::from_missing)?\n"}]}},{"Replacement":{"inode":{"change":20,"pos":944089},"path":"libpijul/src/apply.rs","line":303,"ins":{"up_context":[{"change":20,"pos":952507}],"down_context":[{"change":20,"pos":952540}],"flag":"BLOCK","start":90238,"end":90267,"inode":{"change":20,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":952507},"to":{"change":20,"start":952507,"end":952540},"introduced_by":20}],"inode":{"change":20,"pos":944089}},"ins_contents":[{"Add":" channel: &ChannelRef,"}],"del_contents":[{"Del":" channel: &mut ChannelRef,\n"}]}},{"Replacement":{"inode":{"change":20,"pos":944089},"path":"libpijul/src/apply.rs","line":309,"ins":{"up_context":[{"change":20,"pos":126984}],"down_context":[{"change":20,"pos":144106}],"flag":"BLOCK","start":90268,"end":90316,"inode":{"change":20,"pos":944089}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":96241},"to":{"change":20,"start":952760,"end":952806},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":126984},"to":{"change":20,"start":952760,"end":952806},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":952760},"to":{"change":20,"start":952760,"end":952806},"introduced_by":20}],"inode":{"change":20,"pos":944089}},"ins_contents":[{"Add":" let mut channel = channel.write().unwrap();"}],"del_contents":[{"Del":" let mut channel = channel.r.borrow_mut();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":944089},"path":"libpijul/src/apply.rs","line":341,"ins":{"up_context":[{"change":20,"pos":953497}],"down_context":[{"change":20,"pos":953530}],"flag":"BLOCK","start":90317,"end":90346,"inode":{"change":20,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":953497},"to":{"change":20,"start":953497,"end":953530},"introduced_by":20}],"inode":{"change":20,"pos":944089}},"ins_contents":[{"Add":" channel: &ChannelRef,"}],"del_contents":[{"Del":" channel: &mut ChannelRef,\n"}]}},{"Edit":{"inode":{"change":20,"pos":944089},"path":"libpijul/src/apply.rs","line":387,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":3590},"to":{"change":20,"start":955450,"end":955493},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":96840},"to":{"change":20,"start":955450,"end":955493},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":128119},"to":{"change":20,"start":955450,"end":955493},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":144970},"to":{"change":20,"start":955450,"end":955493},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":955450},"to":{"change":20,"start":955450,"end":955493},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":955493},"to":{"change":20,"start":3591,"end":3592},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":3592},"to":{"change":20,"start":128120,"end":128155},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":128155},"to":{"change":20,"start":955578,"end":955595},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":955578},"to":{"change":20,"start":955578,"end":955595},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":955595},"to":{"change":20,"start":128156,"end":128182},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":128182},"to":{"change":20,"start":955625,"end":955721},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":955625},"to":{"change":20,"start":955625,"end":955721},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":955721},"to":{"change":20,"start":128183,"end":128233},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":96886},"to":{"change":20,"start":955754,"end":955847},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":128233},"to":{"change":20,"start":955754,"end":955847},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":955754},"to":{"change":20,"start":955754,"end":955847},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":955847},"to":{"change":20,"start":207,"end":266},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":266},"to":{"change":20,"start":21,"end":194},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":194},"to":{"change":20,"start":447,"end":448},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":447},"to":{"change":20,"start":447,"end":448},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":448},"to":{"change":20,"start":955847,"end":956052},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":955847},"to":{"change":20,"start":955847,"end":956052},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":956052},"to":{"change":20,"start":67441,"end":67490},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":67490},"to":{"change":20,"start":128234,"end":128381},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":128381},"to":{"change":20,"start":17747,"end":17757},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":17747},"to":{"change":20,"start":17747,"end":17757},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":17757},"to":{"change":20,"start":956160,"end":956206},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":956160},"to":{"change":20,"start":956160,"end":956206},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":956206},"to":{"change":20,"start":67491,"end":67544},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":67544},"to":{"change":20,"start":17758,"end":17793},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":17793},"to":{"change":20,"start":128382,"end":128438},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":128438},"to":{"change":20,"start":17849,"end":17859},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":17849},"to":{"change":20,"start":17849,"end":17859},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":17859},"to":{"change":20,"start":128439,"end":128591},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":128591},"to":{"change":20,"start":18012,"end":18022},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":18012},"to":{"change":20,"start":18012,"end":18022},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":18022},"to":{"change":20,"start":956322,"end":956376},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":956322},"to":{"change":20,"start":956322,"end":956376},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":956376},"to":{"change":20,"start":18023,"end":18089},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":18089},"to":{"change":20,"start":956376,"end":956497},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":956376},"to":{"change":20,"start":956376,"end":956497},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":956497},"to":{"change":20,"start":18090,"end":18139},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":18139},"to":{"change":20,"start":128592,"end":128671},"introduced_by":20}],"inode":{"change":20,"pos":944089}}},"contents":[{"Del":" }\n }\n }\n Ok(())\n}\n"},{"Del":"\n"},{"Del":"fn put_newvertex(\n"},{"Del":" txn: &mut T,\n"},{"Del":" graph: &mut T::Graph,\n"},{"Del":" ch: &Change,\n ws: &mut Workspace,\n change: ChangeId,\n n: &NewVertex>,\n"},{"Del":") -> Result<(), LocalApplyError> {\n"},{"Del":" let vertex = Vertex {\n change,\n start: n.start,\n end: n.end,\n };\n"},{"Del":" if txn.find_block_end(graph, vertex.end_pos()).is_ok()\n"},{"Del":" || txn.find_block(graph, vertex.start_pos()).is_ok()\n {\n error!(\"Invalid change: {:?}\", vertex);\n return Err(LocalApplyError::InvalidChange);\n }\n"},{"Del":"\n"},{"Del":" debug!(\n \"put_newvertex {:?} {:?} {:?} {:?} {:?}\",\n vertex, n.up_context, n.down_context, n.flag, change\n );\n assert!(ws.deleted_by.is_empty());\n for up in n.up_context.iter() {\n"},{"Del":" let up = internal_pos(txn, up, change)?;\n"},{"Del":" if put_up_context(txn, graph, ch, ws, up)? && n.flag.contains(EdgeFlags::FOLDER) {\n return Err(LocalApplyError::InvalidChange);\n"},{"Del":" }\n"},{"Del":" }\n for down in n.down_context.iter() {\n"},{"Del":" let down = internal_pos(txn, down, change)?;\n"},{"Del":" if down.change == change {\n"},{"Del":" return Err(LocalApplyError::InvalidChange);\n"},{"Del":" }\n"},{"Del":" if put_down_context(txn, graph, ch, ws, down)? && !n.flag.contains(EdgeFlags::FOLDER) {\n return Err(LocalApplyError::InvalidChange);\n"},{"Del":" }\n"},{"Del":" }\n debug!(\"deleted by: {:?}\", ws.deleted_by);\n\n"},{"Del":" let up_flag = n.flag | EdgeFlags::BLOCK | EdgeFlags::DELETED;\n"},{"Del":" for up in ws.up_context.drain(..) {\n assert_ne!(up, vertex);\n if !n.flag.contains(EdgeFlags::FOLDER) {\n"},{"Del":" for change in ws.deleted_by.iter() {\n"},{"Del":" put_graph_with_rev(txn, graph, up_flag, up, vertex, *change)?;\n"}]}},{"Edit":{"inode":{"change":20,"pos":944089},"path":"libpijul/src/apply.rs","line":389,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":956727},"to":{"change":20,"start":128672,"end":128760},"introduced_by":20}],"inode":{"change":20,"pos":944089}}},"contents":[{"Del":" put_graph_with_rev(txn, graph, n.flag | EdgeFlags::BLOCK, up, vertex, change)?;\n"}]}},{"Edit":{"inode":{"change":20,"pos":944089},"path":"libpijul/src/apply.rs","line":390,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":956822},"to":{"change":20,"start":956822,"end":956872},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":956872},"to":{"change":20,"start":18353,"end":18458},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":18458},"to":{"change":20,"start":67775,"end":67819},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":956872},"to":{"change":20,"start":67775,"end":67819},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":67819},"to":{"change":20,"start":956932,"end":956966},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":956932},"to":{"change":20,"start":956932,"end":956966},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":956966},"to":{"change":20,"start":128761,"end":128835},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":128835},"to":{"change":20,"start":18534,"end":18617},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":97176},"to":{"change":20,"start":18534,"end":18617},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":18617},"to":{"change":20,"start":957497,"end":957540},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":68283},"to":{"change":20,"start":957497,"end":957540},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":97236},"to":{"change":20,"start":957497,"end":957540},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":957497},"to":{"change":20,"start":957497,"end":957540},"introduced_by":20}],"inode":{"change":20,"pos":944089}}},"contents":[{"Del":" debug!(\"down_context {:?}\", ws.down_context);\n"},{"Del":" let mut down_flag = n.flag;\n if !n.flag.is_folder() {\n down_flag -= EdgeFlags::BLOCK\n }\n"},{"Del":" for down in ws.down_context.drain(..) {\n"},{"Del":" assert_ne!(down, vertex);\n"},{"Del":" put_graph_with_rev(txn, graph, down_flag, vertex, down, change)?;\n"},{"Del":" if n.flag.is_folder() {\n ws.missing_context.files.insert(down);\n"},{"Del":" }\n }\n ws.deleted_by.clear();\n"}]}},{"Edit":{"inode":{"change":20,"pos":944089},"path":"libpijul/src/apply.rs","line":391,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":957551},"to":{"change":20,"start":957551,"end":957553},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":957553},"to":{"change":20,"start":1047,"end":1048},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1048},"to":{"change":20,"start":128836,"end":128872},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":128872},"to":{"change":20,"start":957639,"end":957656},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":957639},"to":{"change":20,"start":957639,"end":957656},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":957656},"to":{"change":20,"start":128873,"end":128899},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":128899},"to":{"change":20,"start":957686,"end":957703},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":957686},"to":{"change":20,"start":957686,"end":957703},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":957738},"to":{"change":20,"start":957738,"end":957790},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":957790},"to":{"change":20,"start":128900,"end":128952},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":18665},"to":{"change":20,"start":957823,"end":957945},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":97282},"to":{"change":20,"start":957823,"end":957945},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":128952},"to":{"change":20,"start":957823,"end":957945},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":957823},"to":{"change":20,"start":957823,"end":957945},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":957945},"to":{"change":20,"start":144971,"end":145020},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":65645},"to":{"change":20,"start":957995,"end":958151},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":68335},"to":{"change":20,"start":957995,"end":958151},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":129002},"to":{"change":20,"start":957995,"end":958151},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":145020},"to":{"change":20,"start":957995,"end":958151},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":957995},"to":{"change":20,"start":957995,"end":958151},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":958151},"to":{"change":20,"start":18666,"end":18835},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":18835},"to":{"change":20,"start":145021,"end":145085},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":65709},"to":{"change":20,"start":958502,"end":958670},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":68386},"to":{"change":20,"start":958502,"end":958670},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":97363},"to":{"change":20,"start":958502,"end":958670},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":129067},"to":{"change":20,"start":958502,"end":958670},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":145085},"to":{"change":20,"start":958502,"end":958670},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":958502},"to":{"change":20,"start":958502,"end":958670},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":958670},"to":{"change":20,"start":68387,"end":68505},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":68505},"to":{"change":20,"start":18836,"end":18871},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":18871},"to":{"change":20,"start":129068,"end":129170},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":129170},"to":{"change":20,"start":21769,"end":21884},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":18973},"to":{"change":20,"start":68579,"end":68597},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":21884},"to":{"change":20,"start":68579,"end":68597},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":145189},"to":{"change":20,"start":68579,"end":68597},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":68579},"to":{"change":20,"start":68579,"end":68597},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":68597},"to":{"change":20,"start":145190,"end":145210},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":145210},"to":{"change":20,"start":68615,"end":68706},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":68615},"to":{"change":20,"start":68615,"end":68706},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":68706},"to":{"change":20,"start":145211,"end":145303},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":129253},"to":{"change":20,"start":68849,"end":68892},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":145303},"to":{"change":20,"start":68849,"end":68892},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":68849},"to":{"change":20,"start":68849,"end":68892},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":68892},"to":{"change":20,"start":145304,"end":145366},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":19034},"to":{"change":20,"start":69008,"end":69022},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":145366},"to":{"change":20,"start":69008,"end":69022},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":69008},"to":{"change":20,"start":69008,"end":69022},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":69262},"to":{"change":20,"start":959143,"end":959194},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":959143},"to":{"change":20,"start":959143,"end":959194},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":959194},"to":{"change":20,"start":19035,"end":19057},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":19057},"to":{"change":20,"start":959205,"end":959207},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":959205},"to":{"change":20,"start":959205,"end":959207},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":959207},"to":{"change":20,"start":1049,"end":1050},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1050},"to":{"change":20,"start":129254,"end":129292},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":129292},"to":{"change":20,"start":959295,"end":959312},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":959295},"to":{"change":20,"start":959295,"end":959312},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":959312},"to":{"change":20,"start":129293,"end":129319},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":129319},"to":{"change":20,"start":959342,"end":959359},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":959342},"to":{"change":20,"start":959342,"end":959359},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":959394},"to":{"change":20,"start":959394,"end":959448},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":959448},"to":{"change":20,"start":129320,"end":129372},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":129372},"to":{"change":20,"start":145367,"end":145411},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":65753},"to":{"change":20,"start":959540,"end":959659},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":69309},"to":{"change":20,"start":959540,"end":959659},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":129416},"to":{"change":20,"start":959540,"end":959659},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":145411},"to":{"change":20,"start":959540,"end":959659},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":959540},"to":{"change":20,"start":959540,"end":959659},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":959659},"to":{"change":20,"start":19106,"end":19263},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":19263},"to":{"change":20,"start":145412,"end":145474},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":65815},"to":{"change":20,"start":960115,"end":960275},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":69358},"to":{"change":20,"start":960115,"end":960275},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":97502},"to":{"change":20,"start":960115,"end":960275},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":129479},"to":{"change":20,"start":960115,"end":960275},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":145474},"to":{"change":20,"start":960115,"end":960275},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":960115},"to":{"change":20,"start":960115,"end":960275},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":960275},"to":{"change":20,"start":69359,"end":69360},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":69360},"to":{"change":20,"start":960275,"end":960393},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":960275},"to":{"change":20,"start":960275,"end":960393},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":960393},"to":{"change":20,"start":19264,"end":19295},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":19295},"to":{"change":20,"start":129480,"end":129585},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":129585},"to":{"change":20,"start":21885,"end":21995},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":21995},"to":{"change":20,"start":145559,"end":145789},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":145559},"to":{"change":20,"start":145559,"end":145789},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":129672},"to":{"change":20,"start":960764,"end":960811},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":145789},"to":{"change":20,"start":960764,"end":960811},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":960764},"to":{"change":20,"start":960764,"end":960811},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":960811},"to":{"change":20,"start":145790,"end":145856},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":19443},"to":{"change":20,"start":960935,"end":960953},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":145856},"to":{"change":20,"start":960935,"end":960953},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":960935},"to":{"change":20,"start":960935,"end":960953},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":69573},"to":{"change":20,"start":961010,"end":961040},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":961010},"to":{"change":20,"start":961010,"end":961040},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":961040},"to":{"change":20,"start":69574,"end":69613},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":69613},"to":{"change":20,"start":19444,"end":19462},"introduced_by":20}],"inode":{"change":20,"pos":944089}}},"contents":[{"Del":"}\n"},{"Del":"\n"},{"Del":"fn put_up_context(\n"},{"Del":" txn: &mut T,\n"},{"Del":" graph: &mut T::Graph,\n"},{"Del":" ch: &Change,\n"},{"Del":" ws: &mut Workspace,\n up: Position,\n"},{"Del":") -> Result> {\n"},{"Del":" let up_vertex = if up.change.is_root() {\n Vertex::ROOT\n } else {\n debug!(\"put_up_context {:?}\", up);\n"},{"Del":" let k = *txn.find_block_end(graph, up)?;\n"},{"Del":" assert_eq!(k.change, up.change);\n assert!(k.start <= up.pos);\n debug!(\"k = {:?}\", k);\n if k.start < up.pos && k.end > up.pos {\n"},{"Del":" // The missing context \"graphs\" are only used at the\n // DELETION stage, check that:\n assert!(ws.missing_context.graphs.0.is_empty());\n"},{"Del":" txn.split_block(graph, &k, up.pos, &mut ws.adjbuf)?\n"},{"Del":" }\n Vertex {\n change: k.change,\n start: k.start,\n end: up.pos,\n }\n };\n debug!(\"up_vertex {:?}\", up_vertex);\n"},{"Del":" let flag0 = EdgeFlags::PARENT | EdgeFlags::BLOCK;\n let flag1 = flag0 | EdgeFlags::DELETED | EdgeFlags::FOLDER;\n"},{"Del":" let mut is_non_folder = false;\n"},{"Del":" for parent in iter_adjacent(txn, graph, up_vertex, flag0, flag1)? {\n let parent = parent?;\n"},{"Del":" is_non_folder |=\n parent.flag() & (EdgeFlags::PARENT | EdgeFlags::FOLDER) == EdgeFlags::PARENT;\n"},{"Del":" if parent\n"},{"Del":" .flag()\n"},{"Del":" .contains(EdgeFlags::PARENT | EdgeFlags::DELETED | EdgeFlags::BLOCK)\n {\n"},{"Del":" let introduced_by = txn.get_external(&parent.introduced_by())?.unwrap().into();\n"},{"Del":" if !ch.knows(&introduced_by) {\n"},{"Del":" ws.deleted_by.insert(parent.introduced_by());\n"},{"Del":" }\n"},{"Del":" }\n }\n ws.up_context.push(up_vertex);\n"},{"Del":" Ok(is_non_folder)\n"},{"Del":"}\n"},{"Del":"\n"},{"Del":"fn put_down_context(\n"},{"Del":" txn: &mut T,\n"},{"Del":" graph: &mut T::Graph,\n"},{"Del":" ch: &Change,\n"},{"Del":" ws: &mut Workspace,\n down: Position,\n"},{"Del":") -> Result> {\n"},{"Del":" let k = *txn.find_block(&graph, down)?;\n"},{"Del":" assert_eq!(k.change, down.change);\n assert!(k.end >= down.pos);\n if k.start < down.pos && k.end > down.pos {\n"},{"Del":" // The missing context \"graphs\" are only used at the\n // DELETION stage, check that:\n assert!(ws.missing_context.graphs.0.is_empty());\n"},{"Del":" txn.split_block(graph, &k, down.pos, &mut ws.adjbuf)?\n"},{"Del":" }\n let down_vertex = Vertex {\n change: k.change,\n start: down.pos,\n end: k.end,\n };\n debug!(\"down_vertex {:?}\", down_vertex);\n"},{"Del":"\n"},{"Del":" let flag0 = EdgeFlags::PARENT;\n let flag1 = flag0 | EdgeFlags::FOLDER | EdgeFlags::BLOCK | EdgeFlags::DELETED;\n"},{"Del":" let mut is_folder = false;\n"},{"Del":" for parent in iter_adjacent(txn, &graph, down_vertex, flag0, flag1)? {\n let parent = parent?;\n"},{"Del":" is_folder |= parent\n .flag()\n .contains(EdgeFlags::PARENT | EdgeFlags::FOLDER);\n"},{"Del":" if parent.flag().contains(EdgeFlags::PARENT | EdgeFlags::BLOCK) {\n if parent.flag().contains(EdgeFlags::DELETED) {\n let introduced_by = txn.get_external(&parent.introduced_by())?.unwrap().into();\n"},{"Del":" if !ch.knows(&introduced_by) {\n"},{"Del":" ws.deleted_by.insert(parent.introduced_by());\n"},{"Del":" }\n"},{"Del":" }\n }\n }\n"},{"Del":" ws.down_context.push(down_vertex);\n"},{"Del":" Ok(is_folder)\n"}]}},{"Edit":{"inode":{"change":20,"pos":944089},"path":"libpijul/src/apply.rs","line":434,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":97504},"to":{"change":20,"start":97504,"end":97540},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":355},"to":{"change":20,"start":962794,"end":962811},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":97540},"to":{"change":20,"start":962794,"end":962811},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":962794},"to":{"change":20,"start":962794,"end":962811},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":962811},"to":{"change":20,"start":129810,"end":129836},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":129836},"to":{"change":20,"start":962841,"end":962973},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":962841},"to":{"change":20,"start":962841,"end":962973},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":962973},"to":{"change":20,"start":97541,"end":97560},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":97560},"to":{"change":20,"start":963004,"end":963010},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":963004},"to":{"change":20,"start":963004,"end":963010},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":963010},"to":{"change":20,"start":129837,"end":130022},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":97692},"to":{"change":20,"start":963317,"end":963319},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":130022},"to":{"change":20,"start":963317,"end":963319},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":963317},"to":{"change":20,"start":963317,"end":963319},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":963319},"to":{"change":20,"start":19499,"end":19547},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":19547},"to":{"change":20,"start":963319,"end":963364},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":963319},"to":{"change":20,"start":963319,"end":963364},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":963364},"to":{"change":20,"start":97693,"end":97720},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":97720},"to":{"change":20,"start":130023,"end":130125},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":97825},"to":{"change":20,"start":963425,"end":963431},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":130125},"to":{"change":20,"start":963425,"end":963431},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":963425},"to":{"change":20,"start":963425,"end":963431},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":963431},"to":{"change":20,"start":350,"end":403},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":403},"to":{"change":20,"start":19600,"end":19664},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":19600},"to":{"change":20,"start":19600,"end":19664},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":19664},"to":{"change":20,"start":130126,"end":130185},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":130185},"to":{"change":20,"start":19722,"end":19728},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":19722},"to":{"change":20,"start":19722,"end":19728},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":19728},"to":{"change":20,"start":963431,"end":963432},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":963431},"to":{"change":20,"start":963431,"end":963432},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":963432},"to":{"change":20,"start":19729,"end":19814},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":19814},"to":{"change":20,"start":130186,"end":130272},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":69741},"to":{"change":20,"start":963637,"end":963660},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":130272},"to":{"change":20,"start":963637,"end":963660},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":963637},"to":{"change":20,"start":963637,"end":963660},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":963660},"to":{"change":20,"start":130273,"end":130332},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":19873},"to":{"change":20,"start":963721,"end":963729},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":97953},"to":{"change":20,"start":963721,"end":963729},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":130332},"to":{"change":20,"start":963721,"end":963729},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":963721},"to":{"change":20,"start":963721,"end":963729},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":963729},"to":{"change":20,"start":130333,"end":130511},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":130511},"to":{"change":20,"start":963911,"end":963912},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":963911},"to":{"change":20,"start":963911,"end":963912},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":963912},"to":{"change":20,"start":19874,"end":19974},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":19974},"to":{"change":20,"start":963912,"end":964016},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":963912},"to":{"change":20,"start":963912,"end":964016},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":964016},"to":{"change":20,"start":19975,"end":20045},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":20045},"to":{"change":20,"start":145969,"end":146041},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":475},"to":{"change":20,"start":964696,"end":964790},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":69800},"to":{"change":20,"start":964696,"end":964790},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":98042},"to":{"change":20,"start":964696,"end":964790},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":130632},"to":{"change":20,"start":964696,"end":964790},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":146041},"to":{"change":20,"start":964696,"end":964790},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":964696},"to":{"change":20,"start":964696,"end":964790},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":964790},"to":{"change":20,"start":1333,"end":1434},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":1434},"to":{"change":20,"start":476,"end":542},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":964790},"to":{"change":20,"start":476,"end":542},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":542},"to":{"change":20,"start":964858,"end":964911},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":130730},"to":{"change":20,"start":964858,"end":964911},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":964858},"to":{"change":20,"start":964858,"end":964911},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":964911},"to":{"change":20,"start":130731,"end":130803},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":130803},"to":{"change":20,"start":964985,"end":965032},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":964985},"to":{"change":20,"start":964985,"end":965032},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":965032},"to":{"change":20,"start":20046,"end":20078},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":20078},"to":{"change":20,"start":965032,"end":965043},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":965032},"to":{"change":20,"start":965032,"end":965043},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":965043},"to":{"change":20,"start":130804,"end":131021},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":69979},"to":{"change":20,"start":965876,"end":965923},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":98311},"to":{"change":20,"start":965876,"end":965923},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":131021},"to":{"change":20,"start":965876,"end":965923},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":965876},"to":{"change":20,"start":965876,"end":965923},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":965923},"to":{"change":20,"start":20166,"end":20265},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":20265},"to":{"change":20,"start":965969,"end":966024},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":965969},"to":{"change":20,"start":965969,"end":966024},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":966024},"to":{"change":20,"start":146042,"end":146064},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":146064},"to":{"change":20,"start":65907,"end":66002},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":65907},"to":{"change":20,"start":65907,"end":66002},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":66002},"to":{"change":20,"start":966085,"end":966141},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":70042},"to":{"change":20,"start":966085,"end":966141},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":98406},"to":{"change":20,"start":966085,"end":966141},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":131113},"to":{"change":20,"start":966085,"end":966141},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":966085},"to":{"change":20,"start":966085,"end":966141},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":966141},"to":{"change":20,"start":131114,"end":131154},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":131154},"to":{"change":20,"start":966231,"end":966248},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":966231},"to":{"change":20,"start":966231,"end":966248},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":966248},"to":{"change":20,"start":131155,"end":131183},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":131183},"to":{"change":20,"start":966278,"end":966415},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":966278},"to":{"change":20,"start":966278,"end":966415},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":966415},"to":{"change":20,"start":131184,"end":131248},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":98466},"to":{"change":20,"start":966462,"end":966496},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":131248},"to":{"change":20,"start":966462,"end":966496},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":966462},"to":{"change":20,"start":966462,"end":966496},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":966496},"to":{"change":20,"start":146065,"end":146153},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":66090},"to":{"change":20,"start":966582,"end":966729},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":70131},"to":{"change":20,"start":966582,"end":966729},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":146153},"to":{"change":20,"start":966582,"end":966729},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":966582},"to":{"change":20,"start":966582,"end":966729},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":966729},"to":{"change":20,"start":20266,"end":20332},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":20332},"to":{"change":20,"start":146154,"end":146224},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":66160},"to":{"change":20,"start":967333,"end":967388},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":70186},"to":{"change":20,"start":967333,"end":967388},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":98551},"to":{"change":20,"start":967333,"end":967388},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":131319},"to":{"change":20,"start":967333,"end":967388},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":146224},"to":{"change":20,"start":967333,"end":967388},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":967333},"to":{"change":20,"start":967333,"end":967388},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":967388},"to":{"change":20,"start":131320,"end":131360},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":131360},"to":{"change":20,"start":967423,"end":967440},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":967423},"to":{"change":20,"start":967423,"end":967440},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":967440},"to":{"change":20,"start":131361,"end":131389},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":131389},"to":{"change":20,"start":967470,"end":967603},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":967470},"to":{"change":20,"start":967470,"end":967603},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":967603},"to":{"change":20,"start":131390,"end":131454},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":98611},"to":{"change":20,"start":70187,"end":70249},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":131454},"to":{"change":20,"start":70187,"end":70249},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":967650},"to":{"change":20,"start":70187,"end":70249},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":70249},"to":{"change":20,"start":20333,"end":20382},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":20382},"to":{"change":20,"start":146225,"end":146281},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":66216},"to":{"change":20,"start":967800,"end":967922},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":70306},"to":{"change":20,"start":967800,"end":967922},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":146281},"to":{"change":20,"start":967800,"end":967922},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":967800},"to":{"change":20,"start":967800,"end":967922},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":967922},"to":{"change":20,"start":20383,"end":20449},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":20449},"to":{"change":20,"start":146282,"end":146352},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":66286},"to":{"change":20,"start":968526,"end":968582},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":70361},"to":{"change":20,"start":968526,"end":968582},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":98696},"to":{"change":20,"start":968526,"end":968582},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":131525},"to":{"change":20,"start":968526,"end":968582},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":146352},"to":{"change":20,"start":968526,"end":968582},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":968526},"to":{"change":20,"start":968526,"end":968582},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":968582},"to":{"change":20,"start":1053,"end":1054},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1054},"to":{"change":20,"start":131526,"end":131568},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":131568},"to":{"change":20,"start":968674,"end":968691},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":968674},"to":{"change":20,"start":968674,"end":968691},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":968691},"to":{"change":20,"start":131569,"end":131597},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":131597},"to":{"change":20,"start":968721,"end":968808},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":968721},"to":{"change":20,"start":968721,"end":968808},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":968808},"to":{"change":20,"start":131598,"end":131648},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":98742},"to":{"change":20,"start":70362,"end":70403},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":131648},"to":{"change":20,"start":70362,"end":70403},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":968841},"to":{"change":20,"start":70362,"end":70403},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":70403},"to":{"change":20,"start":968873,"end":968977},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":968873},"to":{"change":20,"start":968873,"end":968977},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":968977},"to":{"change":20,"start":131649,"end":131678},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":131678},"to":{"change":20,"start":968985,"end":969041},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":968985},"to":{"change":20,"start":968985,"end":969041},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":969041},"to":{"change":20,"start":146353,"end":146522},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":66349},"to":{"change":20,"start":131679,"end":131727},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":146522},"to":{"change":20,"start":131679,"end":131727},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":70467},"to":{"change":20,"start":131679,"end":131727},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":131727},"to":{"change":20,"start":146523,"end":146569},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":146569},"to":{"change":20,"start":969295,"end":969334},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":969295},"to":{"change":20,"start":969295,"end":969334},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":969334},"to":{"change":20,"start":146570,"end":146685},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":146685},"to":{"change":20,"start":53,"end":165},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":53},"to":{"change":20,"start":53,"end":165},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":165},"to":{"change":20,"start":146686,"end":146733},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":146733},"to":{"change":20,"start":66549,"end":66567},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":66549},"to":{"change":20,"start":66549,"end":66567},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":66567},"to":{"change":20,"start":969434,"end":969458},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":969434},"to":{"change":20,"start":969434,"end":969458},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":969458},"to":{"change":20,"start":146734,"end":146831},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":146831},"to":{"change":20,"start":969552,"end":969581},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":969552},"to":{"change":20,"start":969552,"end":969581},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":969581},"to":{"change":20,"start":1055,"end":1056},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1056},"to":{"change":20,"start":131728,"end":131772},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":131772},"to":{"change":20,"start":969675,"end":969692},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":969675},"to":{"change":20,"start":969675,"end":969692},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":969692},"to":{"change":20,"start":131773,"end":131801},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":131801},"to":{"change":20,"start":969722,"end":969811},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":969722},"to":{"change":20,"start":969722,"end":969811},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":969811},"to":{"change":20,"start":131802,"end":131852},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":131852},"to":{"change":20,"start":20450,"end":20507},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":98788},"to":{"change":20,"start":20450,"end":20507},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":20507},"to":{"change":20,"start":970152,"end":970181},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":970152},"to":{"change":20,"start":970152,"end":970181},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":970181},"to":{"change":20,"start":20508,"end":20509},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":20509},"to":{"change":20,"start":131853,"end":132022},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":20572},"to":{"change":20,"start":970270,"end":970271},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":132022},"to":{"change":20,"start":970270,"end":970271},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":970270},"to":{"change":20,"start":970270,"end":970271},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":970443},"to":{"change":20,"start":970443,"end":970806},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":970906},"to":{"change":20,"start":970906,"end":970907},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":970907},"to":{"change":20,"start":20573,"end":20607},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":20607},"to":{"change":20,"start":146832,"end":146892},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":132082},"to":{"change":20,"start":20657,"end":20720},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":146892},"to":{"change":20,"start":20657,"end":20720},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":20657},"to":{"change":20,"start":20657,"end":20720},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":20720},"to":{"change":20,"start":146893,"end":146961},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":233},"to":{"change":20,"start":132150,"end":132242},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":146961},"to":{"change":20,"start":132150,"end":132242},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":132150},"to":{"change":20,"start":132150,"end":132242},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":70752},"to":{"change":20,"start":971153,"end":971196},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":98986},"to":{"change":20,"start":971153,"end":971196},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":132242},"to":{"change":20,"start":971153,"end":971196},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":971153},"to":{"change":20,"start":971153,"end":971196},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":971196},"to":{"change":20,"start":1057,"end":1058},"introduced_by":20}],"inode":{"change":20,"pos":944089}}},"contents":[{"Del":"pub(crate) fn put_newedge(\n"},{"Del":" txn: &mut T,\n"},{"Del":" graph: &mut T::Graph,\n"},{"Del":" ws: &mut Workspace,\n change: ChangeId,\n inode: Position>,\n n: &NewEdge>,\n apply_check: F,\n"},{"Del":") -> Result<(), E>\n"},{"Del":"where\n"},{"Del":" T: GraphMutTxnT,\n E: From> + From>,\n F: Fn(&mut T, &mut T::Graph, Vertex, Vertex) -> Result,\n"},{"Del":"{\n"},{"Del":" debug!(\"put_newedge {:?} {:?}\", n, change);\n"},{"Del":" if n.flag.contains(EdgeFlags::DELETED) {\n"},{"Del":" ws.missing_context\n"},{"Del":" .load_graph(txn, graph, inode)\n .map_err(|_| LocalApplyError::InvalidChange)?;\n"},{"Del":" }\n"},{"Del":" if (n.previous.is_block() && !n.flag.is_block())\n"},{"Del":" || (n.previous.is_folder() != n.flag.is_folder())\n {\n"},{"Del":" return Err(LocalApplyError::InvalidChange.into());\n"},{"Del":" }\n"},{"Del":"\n"},{"Del":" debug_assert!(ws.children.is_empty());\n debug_assert!(ws.parents.is_empty());\n"},{"Del":" let n_introduced_by = if let Some(n) = internal(txn, &n.introduced_by, change)? {\n"},{"Del":" n\n } else {\n"},{"Del":" return Err(LocalApplyError::InvalidChange.into());\n"},{"Del":" };\n\n"},{"Del":" let mut source = find_source_vertex(txn, graph, &n.from, change, inode, n.flag, ws)?;\n let mut target = find_target_vertex(txn, graph, &n.to, change, inode, n.flag, ws)?;\n"},{"Del":"\n"},{"Del":" if n.flag.contains(EdgeFlags::FOLDER) {\n ws.missing_context.files.insert(target);\n }\n\n"},{"Del":" loop {\n if target.end > n.to.end {\n assert!(!n.flag.contains(EdgeFlags::FOLDER));\n"},{"Del":" ws.missing_context.graphs.split(inode, target, n.to.end);\n"},{"Del":" txn.split_block(graph, &target, n.to.end, &mut ws.adjbuf)?;\n"},{"Del":" target.end = n.to.end\n }\n\n if n.flag.contains(EdgeFlags::DELETED) {\n"},{"Del":" debug_assert!(ws.children.is_empty());\n debug_assert!(ws.parents.is_empty());\n"},{"Del":" collect_pseudo_edges(txn, graph, ws, inode, target)?;\n"},{"Del":" if !n.flag.contains(EdgeFlags::FOLDER) {\n"},{"Del":" reconnect_pseudo_edges(txn, graph, inode, ws, target)?;\n"},{"Del":" }\n ws.children.clear();\n"},{"Del":" ws.parents.clear();\n"},{"Del":" }\n\n"},{"Del":" del_graph_with_rev(txn, graph, n.previous, source, target, n_introduced_by)?;\n if apply_check(txn, graph, source, target)? {\n put_graph_with_rev(txn, graph, n.flag, source, target, change)?;\n"},{"Del":" }\n\n if target.end >= n.to.end {\n"},{"Del":" debug!(\"{:?} {:?}\", target, n.to);\n debug_assert_eq!(target.end, n.to.end);\n"},{"Del":" break;\n }\n\n source = target;\n"},{"Del":" target = *txn\n"},{"Del":" .find_block(graph, target.end_pos())\n .map_err(LocalApplyError::from)?;\n"},{"Del":" assert_ne!(source, target);\n }\n Ok(())\n}\n\n"},{"Del":"fn find_source_vertex(\n"},{"Del":" txn: &mut T,\n"},{"Del":" channel: &mut T::Graph,\n"},{"Del":" from: &Position>,\n change: ChangeId,\n inode: Position>,\n flag: EdgeFlags,\n ws: &mut Workspace,\n"},{"Del":") -> Result, LocalApplyError> {\n"},{"Del":" debug!(\"find_source_vertex\");\n"},{"Del":" let mut source = *txn.find_block_end(&channel, internal_pos(txn, &from, change)?)?;\n"},{"Del":" debug!(\"source = {:?}\", source);\n if source.start < from.pos && source.end > from.pos {\n assert!(!flag.contains(EdgeFlags::FOLDER));\n"},{"Del":" ws.missing_context.graphs.split(inode, source, from.pos);\n"},{"Del":" txn.split_block(channel, &source, from.pos, &mut ws.adjbuf)?;\n"},{"Del":" source.end = from.pos;\n }\n Ok(source)\n}\n\n"},{"Del":"fn find_target_vertex(\n"},{"Del":" txn: &mut T,\n"},{"Del":" channel: &mut T::Graph,\n"},{"Del":" to: &Vertex>,\n change: ChangeId,\n inode: Position>,\n flag: EdgeFlags,\n ws: &mut Workspace,\n"},{"Del":") -> Result, LocalApplyError> {\n"},{"Del":" let to_pos = internal_pos(txn, &to.start_pos(), change)?;\n"},{"Del":" debug!(\"find_target_vertex, to = {:?}\", to);\n"},{"Del":" let mut target = *txn.find_block(channel, to_pos)?;\n"},{"Del":" debug!(\"target = {:?}\", target);\n if target.start < to.start {\n assert!(!flag.contains(EdgeFlags::FOLDER));\n"},{"Del":" ws.missing_context.graphs.split(inode, target, to.start);\n"},{"Del":" txn.split_block(channel, &target, to.start, &mut ws.adjbuf)?;\n"},{"Del":" target.start = to.start;\n }\n Ok(target)\n}\n"},{"Del":"\n"},{"Del":"fn collect_pseudo_edges(\n"},{"Del":" txn: &mut T,\n"},{"Del":" channel: &mut T::Graph,\n"},{"Del":" apply: &mut Workspace,\n inode: Position>,\n v: Vertex,\n"},{"Del":") -> Result<(), LocalApplyError> {\n"},{"Del":" for e in iter_adjacent(\n txn,\n"},{"Del":" &channel,\n v,\n EdgeFlags::empty(),\n EdgeFlags::all() - EdgeFlags::DELETED,\n"},{"Del":" )? {\n let e = e?;\n"},{"Del":" debug!(\"collect_pseudo_edges {:?} {:?}\", v, e);\n"},{"Del":" if !e.flag().contains(EdgeFlags::FOLDER) {\n if e.flag().contains(EdgeFlags::PARENT) {\n let p = txn.find_block_end(channel, e.dest())?;\n"},{"Del":" if is_alive(txn, channel, p)? {\n"},{"Del":" apply.parents.insert(*p);\n"},{"Del":" }\n } else {\n"},{"Del":" let p = txn.find_block(channel, e.dest())?;\n if e.flag().contains(EdgeFlags::BLOCK)\n"},{"Del":" || p.is_empty()\n || is_alive(txn, channel, p).unwrap()\n {\n"},{"Del":" apply.children.insert(*p);\n"},{"Del":" }\n"},{"Del":" }\n }\n"},{"Del":" if e.flag().contains(EdgeFlags::PSEUDO) {\n apply.pseudo.push((v, *e, inode));\n"},{"Del":" }\n }\n Ok(())\n}\n"},{"Del":"\n"},{"Del":"fn reconnect_pseudo_edges(\n"},{"Del":" txn: &mut T,\n"},{"Del":" channel: &mut T::Graph,\n"},{"Del":" inode: Position>,\n ws: &mut Workspace,\n target: Vertex,\n"},{"Del":") -> Result<(), LocalApplyError> {\n"},{"Del":" if ws.parents.is_empty() || ws.children.is_empty() {\n"},{"Del":" return Ok(());\n }\n"},{"Del":"\n"},{"Del":" let (graph, vids) = if let Some(x) = ws.missing_context.graphs.get(inode) {\n x\n } else {\n return Err(LocalApplyError::InvalidChange.into());\n };\n"},{"Del":"\n"},{"Del":" crate::alive::remove_redundant_parents(\n &graph,\n &vids,\n &mut ws.parents,\n &mut ws.missing_context.covered_parents,\n target,\n );\n for &p in ws.parents.iter() {\n ws.missing_context.covered_parents.insert((p, target));\n }\n\n crate::alive::remove_redundant_children(&graph, &vids, &mut ws.children, target);\n"},{"Del":"\n"},{"Del":" for &p in ws.parents.iter() {\n"},{"Del":" debug_assert!(is_alive(txn, channel, &p).unwrap());\n"},{"Del":" for &c in ws.children.iter() {\n if p != c {\n"},{"Del":" debug_assert!(is_alive(txn, channel, &c).unwrap());\n"},{"Del":" put_graph_with_rev(txn, channel, EdgeFlags::PSEUDO, p, c, ChangeId::ROOT)?;\n"},{"Del":" }\n }\n }\n Ok(())\n}\n"},{"Del":"\n"}]}},{"Replacement":{"inode":{"change":20,"pos":944089},"path":"libpijul/src/apply.rs","line":638,"ins":{"up_context":[{"change":20,"pos":978857}],"down_context":[{"change":20,"pos":25224}],"flag":"BLOCK","start":90347,"end":90437,"inode":{"change":20,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":978857},"to":{"change":20,"start":25138,"end":25224},"introduced_by":20}],"inode":{"change":20,"pos":944089}},"ins_contents":[{"Add":" let mut files = std::mem::replace(&mut ws.missing_context.files, HashSet::default());"}],"del_contents":[{"Del":" let mut files = std::mem::replace(&mut ws.missing_context.files, HashSet::new());\n"}]}},{"FileAdd":{"meta":{"basename":"apply","metadata":576},"context":[{"change":20,"pos":198146}],"contents":[]}},{"FileAdd":{"meta":{"basename":"vertex.rs","metadata":0},"context":[{"change":0,"pos":90446}],"contents":[{"Add":"use super::{LocalApplyError, Workspace};"},{"Add":"use crate::change::{Change, NewVertex};"},{"Add":"use crate::pristine::*;"},{"Add":"use crate::{ChangeId, EdgeFlags, Hash, Vertex};"},{"Add":""},{"Add":"pub fn put_newvertex("},{"Add":" txn: &mut T,"},{"Add":" graph: &mut T::Graph,"},{"Add":" ch: &Change,"},{"Add":" ws: &mut Workspace,"},{"Add":" change: ChangeId,"},{"Add":" n: &NewVertex>,"},{"Add":") -> Result<(), LocalApplyError> {"},{"Add":" let vertex = Vertex {"},{"Add":" change,"},{"Add":" start: n.start,"},{"Add":" end: n.end,"},{"Add":" };"},{"Add":" if txn.find_block_end(graph, vertex.end_pos()).is_ok()"},{"Add":" || txn.find_block(graph, vertex.start_pos()).is_ok()"},{"Add":" {"},{"Add":" error!(\"Invalid change: {:?}\", vertex);"},{"Add":" return Err(LocalApplyError::InvalidChange);"},{"Add":" }"},{"Add":" debug!("},{"Add":" \"put_newvertex {:?} {:?} {:?} {:?} {:?}\","},{"Add":" vertex, n.up_context, n.down_context, n.flag, change"},{"Add":" );"},{"Add":" assert!(ws.deleted_by.is_empty());"},{"Add":" for up in n.up_context.iter() {"},{"Add":" let up = internal_pos(txn, up, change)?;"},{"Add":" if put_up_context(txn, graph, ch, ws, up)? && n.flag.contains(EdgeFlags::FOLDER) {"},{"Add":" return Err(LocalApplyError::InvalidChange);"},{"Add":" }"},{"Add":" }"},{"Add":" for down in n.down_context.iter() {"},{"Add":" let down = internal_pos(txn, down, change)?;"},{"Add":" if down.change == change {"},{"Add":" return Err(LocalApplyError::InvalidChange);"},{"Add":" }"},{"Add":" if put_down_context(txn, graph, ch, ws, down)? && !n.flag.contains(EdgeFlags::FOLDER) {"},{"Add":" return Err(LocalApplyError::InvalidChange);"},{"Add":" }"},{"Add":" }"},{"Add":" debug!(\"deleted by: {:?}\", ws.deleted_by);"},{"Add":""},{"Add":" let up_flag = n.flag | EdgeFlags::BLOCK | EdgeFlags::DELETED;"},{"Add":" for up in ws.up_context.drain(..) {"},{"Add":" assert_ne!(up, vertex);"},{"Add":" if !n.flag.contains(EdgeFlags::FOLDER) {"},{"Add":" for change in ws.deleted_by.iter() {"},{"Add":" put_graph_with_rev(txn, graph, up_flag, up, vertex, *change)?;"},{"Add":" }"},{"Add":" }"},{"Add":" put_graph_with_rev(txn, graph, n.flag | EdgeFlags::BLOCK, up, vertex, change)?;"},{"Add":" }"},{"Add":" debug!(\"down_context {:?}\", ws.down_context);"},{"Add":" let mut down_flag = n.flag;"},{"Add":" if !n.flag.is_folder() {"},{"Add":" down_flag -= EdgeFlags::BLOCK"},{"Add":" }"},{"Add":" for down in ws.down_context.drain(..) {"},{"Add":" assert_ne!(down, vertex);"},{"Add":" put_graph_with_rev(txn, graph, down_flag, vertex, down, change)?;"},{"Add":" if n.flag.is_folder() {"},{"Add":" ws.missing_context.files.insert(down);"},{"Add":" }"},{"Add":" }"},{"Add":" ws.deleted_by.clear();"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"fn put_up_context("},{"Add":" txn: &mut T,"},{"Add":" graph: &mut T::Graph,"},{"Add":" ch: &Change,"},{"Add":" ws: &mut Workspace,"},{"Add":" up: Position,"},{"Add":") -> Result> {"},{"Add":" let up_vertex = if up.change.is_root() {"},{"Add":" Vertex::ROOT"},{"Add":" } else {"},{"Add":" debug!(\"put_up_context {:?}\", up);"},{"Add":" let k = *txn.find_block_end(graph, up)?;"},{"Add":" assert_eq!(k.change, up.change);"},{"Add":" assert!(k.start <= up.pos);"},{"Add":" debug!(\"k = {:?}\", k);"},{"Add":" if k.start < up.pos && k.end > up.pos {"},{"Add":" // The missing context \"graphs\" are only used at the"},{"Add":" // DELETION stage, check that:"},{"Add":" assert!(ws.missing_context.graphs.0.is_empty());"},{"Add":" txn.split_block(graph, &k, up.pos, &mut ws.adjbuf)?"},{"Add":" }"},{"Add":" Vertex {"},{"Add":" change: k.change,"},{"Add":" start: k.start,"},{"Add":" end: up.pos,"},{"Add":" }"},{"Add":" };"},{"Add":" debug!(\"up_vertex {:?}\", up_vertex);"},{"Add":" let flag0 = EdgeFlags::PARENT | EdgeFlags::BLOCK;"},{"Add":" let flag1 = flag0 | EdgeFlags::DELETED | EdgeFlags::FOLDER;"},{"Add":" let mut is_non_folder = false;"},{"Add":" for parent in iter_adjacent(txn, graph, up_vertex, flag0, flag1)? {"},{"Add":" let parent = parent?;"},{"Add":" is_non_folder |="},{"Add":" parent.flag() & (EdgeFlags::PARENT | EdgeFlags::FOLDER) == EdgeFlags::PARENT;"},{"Add":" if parent"},{"Add":" .flag()"},{"Add":" .contains(EdgeFlags::PARENT | EdgeFlags::DELETED | EdgeFlags::BLOCK)"},{"Add":" {"},{"Add":" let introduced_by = txn.get_external(&parent.introduced_by())?.unwrap().into();"},{"Add":" if !ch.knows(&introduced_by) {"},{"Add":" ws.deleted_by.insert(parent.introduced_by());"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" ws.up_context.push(up_vertex);"},{"Add":" Ok(is_non_folder)"},{"Add":"}"},{"Add":""},{"Add":"fn put_down_context("},{"Add":" txn: &mut T,"},{"Add":" graph: &mut T::Graph,"},{"Add":" ch: &Change,"},{"Add":" ws: &mut Workspace,"},{"Add":" down: Position,"},{"Add":") -> Result> {"},{"Add":" let k = *txn.find_block(&graph, down)?;"},{"Add":" assert_eq!(k.change, down.change);"},{"Add":" assert!(k.end >= down.pos);"},{"Add":" if k.start < down.pos && k.end > down.pos {"},{"Add":" // The missing context \"graphs\" are only used at the"},{"Add":" // DELETION stage, check that:"},{"Add":" assert!(ws.missing_context.graphs.0.is_empty());"},{"Add":" txn.split_block(graph, &k, down.pos, &mut ws.adjbuf)?"},{"Add":" }"},{"Add":" let down_vertex = Vertex {"},{"Add":" change: k.change,"},{"Add":" start: down.pos,"},{"Add":" end: k.end,"},{"Add":" };"},{"Add":" debug!(\"down_vertex {:?}\", down_vertex);"},{"Add":""},{"Add":" let flag0 = EdgeFlags::PARENT;"},{"Add":" let flag1 = flag0 | EdgeFlags::FOLDER | EdgeFlags::BLOCK | EdgeFlags::DELETED;"},{"Add":" let mut is_folder = false;"},{"Add":" for parent in iter_adjacent(txn, &graph, down_vertex, flag0, flag1)? {"},{"Add":" let parent = parent?;"},{"Add":" is_folder |= parent"},{"Add":" .flag()"},{"Add":" .contains(EdgeFlags::PARENT | EdgeFlags::FOLDER);"},{"Add":" if parent.flag().contains(EdgeFlags::PARENT | EdgeFlags::BLOCK) {"},{"Add":" if parent.flag().contains(EdgeFlags::DELETED) {"},{"Add":" let introduced_by = txn.get_external(&parent.introduced_by())?.unwrap().into();"},{"Add":" if !ch.knows(&introduced_by) {"},{"Add":" ws.deleted_by.insert(parent.introduced_by());"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" ws.down_context.push(down_vertex);"},{"Add":" Ok(is_folder)"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"edge.rs","metadata":0},"context":[{"change":0,"pos":90446}],"contents":[{"Add":"use super::LocalApplyError;"},{"Add":"use crate::change::NewEdge;"},{"Add":"use crate::missing_context::*;"},{"Add":"use crate::pristine::*;"},{"Add":""},{"Add":"pub fn put_newedge("},{"Add":" txn: &mut T,"},{"Add":" graph: &mut T::Graph,"},{"Add":" ws: &mut super::Workspace,"},{"Add":" change: ChangeId,"},{"Add":" inode: Position>,"},{"Add":" n: &NewEdge>,"},{"Add":" apply_check: F,"},{"Add":" mut known: K,"},{"Add":") -> Result<(), E>"},{"Add":"where"},{"Add":" T: GraphMutTxnT,"},{"Add":" E: From> + From>,"},{"Add":" F: Fn(&mut T, &mut T::Graph, Vertex, Vertex) -> Result,"},{"Add":" K: FnMut(&Hash) -> bool,"},{"Add":"{"},{"Add":" debug!(\"put_newedge {:?} {:?}\", n, change);"},{"Add":" check_valid(txn, graph, inode, n, ws)?;"},{"Add":" let n_introduced_by = if let Some(n) = internal(txn, &n.introduced_by, change)? {"},{"Add":" n"},{"Add":" } else {"},{"Add":" return Err(LocalApplyError::InvalidChange.into());"},{"Add":" };"},{"Add":""},{"Add":" let mut source = find_source_vertex(txn, graph, &n.from, change, inode, n.flag, ws)?;"},{"Add":" let mut target = find_target_vertex(txn, graph, &n.to, change, inode, n.flag, ws)?;"},{"Add":""},{"Add":" if n.flag.contains(EdgeFlags::FOLDER) {"},{"Add":" ws.missing_context.files.insert(target);"},{"Add":" }"},{"Add":""},{"Add":" let mut zombies = Vec::new();"},{"Add":""},{"Add":" loop {"},{"Add":" if !n.flag.contains(EdgeFlags::DELETED) {"},{"Add":" collect_nondeleted_zombies::<_, E, _>("},{"Add":" txn,"},{"Add":" graph,"},{"Add":" &mut known,"},{"Add":" source,"},{"Add":" target,"},{"Add":" &mut zombies,"},{"Add":" )?;"},{"Add":" }"},{"Add":" if target.end > n.to.end {"},{"Add":" assert!(!n.flag.contains(EdgeFlags::FOLDER));"},{"Add":" ws.missing_context.graphs.split(inode, target, n.to.end);"},{"Add":" txn.split_block(graph, &target, n.to.end, &mut ws.adjbuf)?;"},{"Add":" target.end = n.to.end"},{"Add":" }"},{"Add":""},{"Add":" if n.flag.contains(EdgeFlags::DELETED) {"},{"Add":" debug_assert!(ws.children.is_empty());"},{"Add":" debug_assert!(ws.parents.is_empty());"},{"Add":" collect_pseudo_edges(txn, graph, ws, inode, target)?;"},{"Add":" if !n.flag.contains(EdgeFlags::FOLDER) {"},{"Add":" reconnect_pseudo_edges(txn, graph, inode, ws, target)?;"},{"Add":" }"},{"Add":" ws.children.clear();"},{"Add":" ws.parents.clear();"},{"Add":" }"},{"Add":""},{"Add":" del_graph_with_rev(txn, graph, n.previous, source, target, n_introduced_by)?;"},{"Add":" if apply_check(txn, graph, source, target)? {"},{"Add":" put_graph_with_rev(txn, graph, n.flag, source, target, change)?;"},{"Add":" for intro in zombies.drain(..) {"},{"Add":" put_graph_with_rev(txn, graph, EdgeFlags::DELETED, source, target, intro)?;"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" if target.end >= n.to.end {"},{"Add":" debug!(\"{:?} {:?}\", target, n.to);"},{"Add":" debug_assert_eq!(target.end, n.to.end);"},{"Add":" break;"},{"Add":" }"},{"Add":""},{"Add":" source = target;"},{"Add":" target = *txn"},{"Add":" .find_block(graph, target.end_pos())"},{"Add":" .map_err(LocalApplyError::from)?;"},{"Add":" assert_ne!(source, target);"},{"Add":" }"},{"Add":" if n.flag.contains(EdgeFlags::DELETED) {"},{"Add":" collect_zombie_context(txn, graph, &mut ws.missing_context, inode, n, change, known)"},{"Add":" .map_err(LocalApplyError::from_missing)?;"},{"Add":" }"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"fn collect_nondeleted_zombies("},{"Add":" txn: &mut T,"},{"Add":" graph: &mut T::Graph,"},{"Add":" mut known: K,"},{"Add":" source: Vertex,"},{"Add":" target: Vertex,"},{"Add":" zombies: &mut Vec,"},{"Add":") -> Result<(), E>"},{"Add":"where"},{"Add":" T: GraphMutTxnT,"},{"Add":" E: From> + From>,"},{"Add":" K: FnMut(&Hash) -> bool,"},{"Add":"{"},{"Add":" for v in iter_deleted_parents(txn, graph, source)? {"},{"Add":" let v = v?;"},{"Add":" let intro = v.introduced_by();"},{"Add":" if !known(&txn.get_external(&intro)?.unwrap().into()) {"},{"Add":" zombies.push(intro)"},{"Add":" }"},{"Add":" }"},{"Add":" for v in iter_adjacent(txn, graph, target, EdgeFlags::empty(), EdgeFlags::all())? {"},{"Add":" let v = v?;"},{"Add":" if v.flag().contains(EdgeFlags::PARENT) {"},{"Add":" continue;"},{"Add":" }"},{"Add":" for v in iter_deleted_parents(txn, graph, target)? {"},{"Add":" let v = v?;"},{"Add":" let intro = v.introduced_by();"},{"Add":" if !known(&txn.get_external(&intro)?.unwrap().into()) {"},{"Add":" zombies.push(intro)"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"fn check_valid("},{"Add":" txn: &mut T,"},{"Add":" graph: &mut T::Graph,"},{"Add":" inode: Position>,"},{"Add":" n: &NewEdge>,"},{"Add":" ws: &mut super::Workspace,"},{"Add":") -> Result<(), LocalApplyError> {"},{"Add":" if n.flag.contains(EdgeFlags::DELETED) {"},{"Add":" ws.missing_context"},{"Add":" .load_graph(txn, graph, inode)"},{"Add":" .map_err(|_| LocalApplyError::InvalidChange)?;"},{"Add":" }"},{"Add":" if (n.previous.is_block() && !n.flag.is_block())"},{"Add":" || (n.previous.is_folder() != n.flag.is_folder())"},{"Add":" {"},{"Add":" return Err(LocalApplyError::InvalidChange.into());"},{"Add":" }"},{"Add":""},{"Add":" debug_assert!(ws.children.is_empty());"},{"Add":" debug_assert!(ws.parents.is_empty());"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"fn find_source_vertex("},{"Add":" txn: &mut T,"},{"Add":" channel: &mut T::Graph,"},{"Add":" from: &Position>,"},{"Add":" change: ChangeId,"},{"Add":" inode: Position>,"},{"Add":" flag: EdgeFlags,"},{"Add":" ws: &mut super::Workspace,"},{"Add":") -> Result, LocalApplyError> {"},{"Add":" debug!(\"find_source_vertex\");"},{"Add":" let mut source = *txn.find_block_end(&channel, internal_pos(txn, &from, change)?)?;"},{"Add":" debug!(\"source = {:?}\", source);"},{"Add":" if source.start < from.pos && source.end > from.pos {"},{"Add":" assert!(!flag.contains(EdgeFlags::FOLDER));"},{"Add":" ws.missing_context.graphs.split(inode, source, from.pos);"},{"Add":" txn.split_block(channel, &source, from.pos, &mut ws.adjbuf)?;"},{"Add":" source.end = from.pos;"},{"Add":" }"},{"Add":" Ok(source)"},{"Add":"}"},{"Add":""},{"Add":"fn find_target_vertex("},{"Add":" txn: &mut T,"},{"Add":" channel: &mut T::Graph,"},{"Add":" to: &Vertex>,"},{"Add":" change: ChangeId,"},{"Add":" inode: Position>,"},{"Add":" flag: EdgeFlags,"},{"Add":" ws: &mut super::Workspace,"},{"Add":") -> Result, LocalApplyError> {"},{"Add":" let to_pos = internal_pos(txn, &to.start_pos(), change)?;"},{"Add":" debug!(\"find_target_vertex, to = {:?}\", to);"},{"Add":" let mut target = *txn.find_block(channel, to_pos)?;"},{"Add":" debug!(\"target = {:?}\", target);"},{"Add":" if target.start < to.start {"},{"Add":" assert!(!flag.contains(EdgeFlags::FOLDER));"},{"Add":" ws.missing_context.graphs.split(inode, target, to.start);"},{"Add":" txn.split_block(channel, &target, to.start, &mut ws.adjbuf)?;"},{"Add":" target.start = to.start;"},{"Add":" }"},{"Add":" Ok(target)"},{"Add":"}"},{"Add":""},{"Add":"fn collect_pseudo_edges("},{"Add":" txn: &mut T,"},{"Add":" channel: &mut T::Graph,"},{"Add":" apply: &mut super::Workspace,"},{"Add":" inode: Position>,"},{"Add":" v: Vertex,"},{"Add":") -> Result<(), LocalApplyError> {"},{"Add":" for e in iter_adjacent("},{"Add":" txn,"},{"Add":" &channel,"},{"Add":" v,"},{"Add":" EdgeFlags::empty(),"},{"Add":" EdgeFlags::all() - EdgeFlags::DELETED,"},{"Add":" )? {"},{"Add":" let e = e?;"},{"Add":" debug!(\"collect_pseudo_edges {:?} {:?}\", v, e);"},{"Add":" if !e.flag().contains(EdgeFlags::FOLDER) {"},{"Add":" if e.flag().contains(EdgeFlags::PARENT) {"},{"Add":" let p = txn.find_block_end(channel, e.dest())?;"},{"Add":" if is_alive(txn, channel, p)? {"},{"Add":" apply.parents.insert(*p);"},{"Add":" }"},{"Add":" } else {"},{"Add":" let p = txn.find_block(channel, e.dest())?;"},{"Add":" if e.flag().contains(EdgeFlags::BLOCK)"},{"Add":" || p.is_empty()"},{"Add":" || is_alive(txn, channel, p).unwrap()"},{"Add":" {"},{"Add":" apply.children.insert(*p);"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" if e.flag().contains(EdgeFlags::PSEUDO) {"},{"Add":" apply.pseudo.push((v, *e, inode));"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"fn reconnect_pseudo_edges("},{"Add":" txn: &mut T,"},{"Add":" channel: &mut T::Graph,"},{"Add":" inode: Position>,"},{"Add":" ws: &mut super::Workspace,"},{"Add":" target: Vertex,"},{"Add":") -> Result<(), LocalApplyError> {"},{"Add":" if ws.parents.is_empty() || ws.children.is_empty() {"},{"Add":" return Ok(());"},{"Add":" }"},{"Add":""},{"Add":" let (graph, vids) = if let Some(x) = ws.missing_context.graphs.get(inode) {"},{"Add":" x"},{"Add":" } else {"},{"Add":" return Err(LocalApplyError::InvalidChange.into());"},{"Add":" };"},{"Add":""},{"Add":" crate::alive::remove_redundant_parents("},{"Add":" &graph,"},{"Add":" &vids,"},{"Add":" &mut ws.parents,"},{"Add":" &mut ws.missing_context.covered_parents,"},{"Add":" target,"},{"Add":" );"},{"Add":" for &p in ws.parents.iter() {"},{"Add":" ws.missing_context.covered_parents.insert((p, target));"},{"Add":" }"},{"Add":""},{"Add":" crate::alive::remove_redundant_children(&graph, &vids, &mut ws.children, target);"},{"Add":""},{"Add":" for &p in ws.parents.iter() {"},{"Add":" debug_assert!(is_alive(txn, channel, &p).unwrap());"},{"Add":" for &c in ws.children.iter() {"},{"Add":" if p != c {"},{"Add":" debug_assert!(is_alive(txn, channel, &c).unwrap());"},{"Add":" put_graph_with_rev(txn, channel, EdgeFlags::PSEUDO, p, c, ChangeId::ROOT)?;"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":"}"},{"Add":"fn collect_zombie_context("},{"Add":" txn: &mut T,"},{"Add":" channel: &mut T::Graph,"},{"Add":" ws: &mut crate::missing_context::Workspace,"},{"Add":" inode: Position>,"},{"Add":" n: &NewEdge>,"},{"Add":" change_id: ChangeId,"},{"Add":" mut known: K,"},{"Add":") -> Result<(), MissingError>"},{"Add":"where"},{"Add":" K: FnMut(&Hash) -> bool,"},{"Add":"{"},{"Add":" if n.flag.contains(EdgeFlags::FOLDER) {"},{"Add":" return Ok(());"},{"Add":" }"},{"Add":" let mut pos = internal_pos(txn, &n.to.start_pos(), change_id)?;"},{"Add":" let end_pos = internal_pos(txn, &n.to.end_pos(), change_id)?;"},{"Add":" let mut unknown_parents = Vec::new();"},{"Add":" while let Ok(&dest_vertex) = txn.find_block(&channel, pos) {"},{"Add":" debug!(\"collect zombie context: {:?}\", dest_vertex);"},{"Add":" for v in iter_adjacent("},{"Add":" txn,"},{"Add":" channel,"},{"Add":" dest_vertex,"},{"Add":" EdgeFlags::empty(),"},{"Add":" EdgeFlags::all() - EdgeFlags::DELETED,"},{"Add":" )? {"},{"Add":" let v = v?;"},{"Add":" if v.introduced_by() == change_id || v.dest().change.is_root() {"},{"Add":" continue;"},{"Add":" }"},{"Add":" if v.introduced_by().is_root() {"},{"Add":" ws.pseudo.push((dest_vertex, *v));"},{"Add":" continue;"},{"Add":" }"},{"Add":" if v.flag().contains(EdgeFlags::PARENT) {"},{"Add":" // Unwrap ok, since `v` is in the channel."},{"Add":" let intro = txn.get_external(&v.introduced_by())?.unwrap().into();"},{"Add":" if !known(&intro) {"},{"Add":" debug!(\"unknown: {:?}\", v);"},{"Add":" unknown_parents.push((dest_vertex, *v))"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" zombify(txn, channel, ws, change_id, inode, n.flag, &unknown_parents)?;"},{"Add":" if dest_vertex.end < end_pos.pos {"},{"Add":" pos.pos = dest_vertex.end"},{"Add":" } else {"},{"Add":" break;"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"fn zombify("},{"Add":" txn: &mut T,"},{"Add":" channel: &mut T::Graph,"},{"Add":" ws: &mut crate::missing_context::Workspace,"},{"Add":" change_id: ChangeId,"},{"Add":" inode: Position>,"},{"Add":" flag: EdgeFlags,"},{"Add":" unknown: &[(Vertex, SerializedEdge)],"},{"Add":") -> Result<(), MissingError> {"},{"Add":" for &(dest_vertex, edge) in unknown.iter() {"},{"Add":" let p = *txn.find_block_end(channel, edge.dest())?;"},{"Add":" ws.unknown_parents"},{"Add":" .push((dest_vertex, p, inode, edge.flag()));"},{"Add":" let fold = flag & EdgeFlags::FOLDER;"},{"Add":" debug!(\"zombify p {:?}, dest_vertex {:?}\", p, dest_vertex);"},{"Add":" let mut v = p;"},{"Add":" while let Ok(&u) = txn.find_block_end(channel, v.start_pos()) {"},{"Add":" if u != v {"},{"Add":" debug!(\"u = {:?}, v = {:?}\", u, v);"},{"Add":" put_graph_with_rev("},{"Add":" txn,"},{"Add":" channel,"},{"Add":" EdgeFlags::DELETED | EdgeFlags::BLOCK | fold,"},{"Add":" u,"},{"Add":" v,"},{"Add":" change_id,"},{"Add":" )?;"},{"Add":" v = u"},{"Add":" } else {"},{"Add":" break;"},{"Add":" }"},{"Add":" }"},{"Add":" // Zombify the first chunk of the split."},{"Add":" for parent in iter_adjacent("},{"Add":" txn,"},{"Add":" channel,"},{"Add":" v,"},{"Add":" EdgeFlags::PARENT,"},{"Add":" EdgeFlags::all() - EdgeFlags::DELETED,"},{"Add":" )? {"},{"Add":" let parent = parent?;"},{"Add":" if !parent.flag().contains(EdgeFlags::PSEUDO) {"},{"Add":" ws.parents.insert(*parent);"},{"Add":" }"},{"Add":" }"},{"Add":" debug!(\"ws.parents = {:?}\", ws.parents);"},{"Add":" for parent in ws.parents.drain() {"},{"Add":" let parent_dest = *txn.find_block_end(channel, parent.dest())?;"},{"Add":" let mut flag = EdgeFlags::DELETED | EdgeFlags::BLOCK;"},{"Add":" if parent.flag().contains(EdgeFlags::FOLDER) {"},{"Add":" flag |= EdgeFlags::FOLDER"},{"Add":" }"},{"Add":" put_graph_with_rev(txn, channel, flag, parent_dest, v, change_id)?;"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":"}"}]}},{"Edit":{"inode":{"change":20,"pos":984582},"path":"libpijul/src/alive/retrieve.rs","line":3,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":984712}],"down_context":[{"change":20,"pos":984712}],"flag":"BLOCK","start":108698,"end":108718,"inode":{"change":20,"pos":984582}}},"contents":[{"Add":"use crate::HashMap;"}]}},{"Edit":{"inode":{"change":20,"pos":984582},"path":"libpijul/src/alive/retrieve.rs","line":5,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":984751},"to":{"change":20,"start":984751,"end":984782},"introduced_by":20}],"inode":{"change":20,"pos":984582}}},"contents":[{"Del":"use std::collections::HashMap;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":984582},"path":"libpijul/src/alive/retrieve.rs","line":17,"ins":{"up_context":[{"change":20,"pos":985092}],"down_context":[{"change":20,"pos":985226}],"flag":"BLOCK","start":108719,"end":108798,"inode":{"change":20,"pos":984582}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":985151},"to":{"change":20,"start":985151,"end":985226},"introduced_by":20}],"inode":{"change":20,"pos":984582}},"ins_contents":[{"Add":" let mut cache: HashMap, VertexId> = HashMap::default();"}],"del_contents":[{"Del":" let mut cache: HashMap, VertexId> = HashMap::new();\n"}]}},{"Edit":{"inode":{"change":20,"pos":995164},"path":"libpijul/src/alive/mod.rs","line":2,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":149335}],"down_context":[{"change":20,"pos":995267}],"flag":"BLOCK","start":108799,"end":108830,"inode":{"change":20,"pos":995164}}},"contents":[{"Add":"use crate::{HashMap, HashSet};"}]}},{"Edit":{"inode":{"change":20,"pos":995164},"path":"libpijul/src/alive/mod.rs","line":87,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":997255},"to":{"change":20,"start":100952,"end":100953},"introduced_by":20},{"previous":"","flag":"DELETED","from":{"change":20,"pos":100953},"to":{"change":20,"start":997310,"end":997352},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":997310},"to":{"change":20,"start":997310,"end":997352},"introduced_by":20}],"inode":{"change":20,"pos":995164}}},"contents":[{"Del":"\n"},{"Del":"use std::collections::{HashMap, HashSet};\n"}]}},{"Replacement":{"inode":{"change":20,"pos":995164},"path":"libpijul/src/alive/mod.rs","line":110,"ins":{"up_context":[{"change":20,"pos":997975}],"down_context":[{"change":20,"pos":998013}],"flag":"BLOCK","start":108831,"end":108873,"inode":{"change":20,"pos":995164}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":997975},"to":{"change":20,"start":997975,"end":998013},"introduced_by":20}],"inode":{"change":20,"pos":995164}},"ins_contents":[{"Add":" let mut visited = HashSet::default();"}],"del_contents":[{"Del":" let mut visited = HashSet::new();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":995164},"path":"libpijul/src/alive/mod.rs","line":151,"ins":{"up_context":[{"change":20,"pos":999288}],"down_context":[{"change":20,"pos":999326}],"flag":"BLOCK","start":108874,"end":108916,"inode":{"change":20,"pos":995164}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":999288},"to":{"change":20,"start":999288,"end":999326},"introduced_by":20}],"inode":{"change":20,"pos":995164}},"ins_contents":[{"Add":" let mut visited = HashSet::default();"}],"del_contents":[{"Del":" let mut visited = HashSet::new();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":1000429},"path":"libpijul/src/alive/dfs.rs","line":4,"ins":{"up_context":[{"change":20,"pos":1000568}],"down_context":[{"change":20,"pos":100954}],"flag":"BLOCK","start":108917,"end":108937,"inode":{"change":20,"pos":1000429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1000568},"to":{"change":20,"start":1000568,"end":1000599},"introduced_by":20}],"inode":{"change":20,"pos":1000429}},"ins_contents":[{"Add":"use crate::HashSet;"}],"del_contents":[{"Del":"use std::collections::HashSet;\n"}]}},{"Replacement":{"inode":{"change":20,"pos":1000429},"path":"libpijul/src/alive/dfs.rs","line":23,"ins":{"up_context":[{"change":20,"pos":1000970}],"down_context":[{"change":20,"pos":1001004}],"flag":"BLOCK","start":108938,"end":108976,"inode":{"change":20,"pos":1000429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1000970},"to":{"change":20,"start":1000970,"end":1001004},"introduced_by":20}],"inode":{"change":20,"pos":1000429}},"ins_contents":[{"Add":" sccs: HashSet::default(),"}],"del_contents":[{"Del":" sccs: HashSet::new(),\n"}]}},{"Replacement":{"inode":{"change":20,"pos":1000429},"path":"libpijul/src/alive/dfs.rs","line":147,"ins":{"up_context":[{"change":20,"pos":1004207}],"down_context":[{"change":20,"pos":1004299}],"flag":"BLOCK","start":108977,"end":109077,"inode":{"change":20,"pos":1000429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1004207},"to":{"change":20,"start":1004207,"end":1004299},"introduced_by":20}],"inode":{"change":20,"pos":1000429}},"ins_contents":[{"Add":" let mut forward_scc = HashSet::default();"},{"Add":" let mut regular_scc = HashSet::default();"}],"del_contents":[{"Del":" let mut forward_scc = HashSet::new();\n let mut regular_scc = HashSet::new();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":1000429},"path":"libpijul/src/alive/dfs.rs","line":333,"ins":{"up_context":[{"change":20,"pos":1012236}],"down_context":[{"change":20,"pos":1012331}],"flag":"BLOCK","start":109078,"end":109118,"inode":{"change":20,"pos":1000429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1012295},"to":{"change":20,"start":1012295,"end":1012331},"introduced_by":20}],"inode":{"change":20,"pos":1000429}},"ins_contents":[{"Add":" let mut sccs0 = HashSet::default();"}],"del_contents":[{"Del":" let mut sccs0 = HashSet::new();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":1014531},"path":"libpijul/src/alive/debug.rs","line":4,"ins":{"up_context":[{"change":20,"pos":137907}],"down_context":[{"change":20,"pos":1014742}],"flag":"BLOCK","start":109119,"end":109150,"inode":{"change":20,"pos":1014531}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":137907},"to":{"change":20,"start":1014700,"end":1014742},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1014700},"to":{"change":20,"start":1014700,"end":1014742},"introduced_by":20}],"inode":{"change":20,"pos":1014531}},"ins_contents":[{"Add":"use crate::{HashMap, HashSet};"}],"del_contents":[{"Del":"use std::collections::{HashMap, HashSet};\n"}]}},{"Replacement":{"inode":{"change":20,"pos":1014531},"path":"libpijul/src/alive/debug.rs","line":21,"ins":{"up_context":[{"change":20,"pos":1015187}],"down_context":[{"change":20,"pos":1015227}],"flag":"BLOCK","start":109151,"end":109195,"inode":{"change":20,"pos":1014531}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1015187},"to":{"change":20,"start":1015187,"end":1015227},"introduced_by":20}],"inode":{"change":20,"pos":1014531}},"ins_contents":[{"Add":" let mut cache = HashMap::default();"}],"del_contents":[{"Del":" let mut cache = HashMap::new();\n"}]}},{"Replacement":{"inode":{"change":20,"pos":1014531},"path":"libpijul/src/alive/debug.rs","line":33,"ins":{"up_context":[{"change":20,"pos":1015559}],"down_context":[{"change":20,"pos":1015600}],"flag":"BLOCK","start":109196,"end":109241,"inode":{"change":20,"pos":1014531}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1015559},"to":{"change":20,"start":1015559,"end":1015600},"introduced_by":20}],"inode":{"change":20,"pos":1014531}},"ins_contents":[{"Add":" let mut others = HashSet::default();"}],"del_contents":[{"Del":" let mut others = HashSet::new();\n"}]}},{"Edit":{"inode":{"change":20,"pos":1020742},"path":"libpijul/Cargo.toml","line":113,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":1023338}],"down_context":[{"change":20,"pos":675}],"flag":"BLOCK","start":109242,"end":109303,"inode":{"change":20,"pos":1020742}}},"contents":[{"Add":"twox-hash = \"*\""},{"Add":"crossbeam-deque = \"*\""},{"Add":"crossbeam-utils = \"*\""},{"Add":""}]}},{"Edit":{"inode":{"change":20,"pos":1020742},"path":"libpijul/Cargo.toml","line":128,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":1023704}],"down_context":[{"change":20,"pos":1023704}],"flag":"BLOCK","start":109304,"end":109306,"inode":{"change":20,"pos":1020742}}},"contents":[{"Add":""},{"Add":""}]}},{"Edit":{"inode":{"change":20,"pos":12},"path":"Cargo.nix","line":781,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":31074}],"down_context":[{"change":20,"pos":76365}],"flag":"BLOCK","start":109307,"end":111526,"inode":{"change":20,"pos":12}}},"contents":[{"Add":" };"},{"Add":" \"crossbeam-deque\" = rec {"},{"Add":" crateName = \"crossbeam-deque\";"},{"Add":" version = \"0.8.0\";"},{"Add":" edition = \"2018\";"},{"Add":" sha256 = \"1ad995vzq74k7jd1pgn9zxbacyzj9ii6l0svhlb2dxzy8vxnxbwl\";"},{"Add":" authors = ["},{"Add":" \"The Crossbeam Project Developers\""},{"Add":" ];"},{"Add":" dependencies = ["},{"Add":" {"},{"Add":" name = \"cfg-if\";"},{"Add":" packageId = \"cfg-if 1.0.0\";"},{"Add":" }"},{"Add":" {"},{"Add":" name = \"crossbeam-epoch\";"},{"Add":" packageId = \"crossbeam-epoch\";"},{"Add":" optional = true;"},{"Add":" usesDefaultFeatures = false;"},{"Add":" }"},{"Add":" {"},{"Add":" name = \"crossbeam-utils\";"},{"Add":" packageId = \"crossbeam-utils\";"},{"Add":" optional = true;"},{"Add":" usesDefaultFeatures = false;"},{"Add":" }"},{"Add":" ];"},{"Add":" features = {"},{"Add":" \"default\" = [ \"std\" ];"},{"Add":" \"std\" = [ \"crossbeam-epoch/std\" \"crossbeam-utils/std\" ];"},{"Add":" };"},{"Add":" resolvedDefaultFeatures = [ \"crossbeam-epoch\" \"crossbeam-utils\" \"default\" \"std\" ];"},{"Add":" };"},{"Add":" \"crossbeam-epoch\" = rec {"},{"Add":" crateName = \"crossbeam-epoch\";"},{"Add":" version = \"0.9.3\";"},{"Add":" edition = \"2018\";"},{"Add":" sha256 = \"04jbrwrm6ibmd83anc3difsvk0fgjyr1aqs9k33sizlmxcwzd115\";"},{"Add":" authors = ["},{"Add":" \"The Crossbeam Project Developers\""},{"Add":" ];"},{"Add":" dependencies = ["},{"Add":" {"},{"Add":" name = \"cfg-if\";"},{"Add":" packageId = \"cfg-if 1.0.0\";"},{"Add":" }"},{"Add":" {"},{"Add":" name = \"crossbeam-utils\";"},{"Add":" packageId = \"crossbeam-utils\";"},{"Add":" usesDefaultFeatures = false;"},{"Add":" }"},{"Add":" {"},{"Add":" name = \"lazy_static\";"},{"Add":" packageId = \"lazy_static\";"},{"Add":" optional = true;"},{"Add":" }"},{"Add":" {"},{"Add":" name = \"memoffset\";"},{"Add":" packageId = \"memoffset\";"},{"Add":" }"},{"Add":" {"},{"Add":" name = \"scopeguard\";"},{"Add":" packageId = \"scopeguard\";"},{"Add":" usesDefaultFeatures = false;"},{"Add":" }"},{"Add":" ];"},{"Add":" features = {"},{"Add":" \"default\" = [ \"std\" ];"},{"Add":" \"loom\" = [ \"loom-crate\" \"crossbeam-utils/loom\" ];"},{"Add":" \"nightly\" = [ \"crossbeam-utils/nightly\" \"const_fn\" ];"},{"Add":" \"std\" = [ \"alloc\" \"crossbeam-utils/std\" \"lazy_static\" ];"},{"Add":" };"},{"Add":" resolvedDefaultFeatures = [ \"alloc\" \"lazy_static\" \"std\" ];"}]}},{"Edit":{"inode":{"change":20,"pos":12},"path":"Cargo.nix","line":2674,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":85537}],"down_context":[{"change":20,"pos":85537}],"flag":"BLOCK","start":111527,"end":111737,"inode":{"change":20,"pos":12}}},"contents":[{"Add":" }"},{"Add":" {"},{"Add":" name = \"crossbeam-deque\";"},{"Add":" packageId = \"crossbeam-deque\";"},{"Add":" }"},{"Add":" {"},{"Add":" name = \"crossbeam-utils\";"},{"Add":" packageId = \"crossbeam-utils\";"}]}},{"Replacement":{"inode":{"change":20,"pos":12},"path":"Cargo.nix","line":2725,"ins":{"up_context":[{"change":20,"pos":86519}],"down_context":[{"change":20,"pos":86551}],"flag":"BLOCK","start":111738,"end":111776,"inode":{"change":20,"pos":12}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":86519},"to":{"change":20,"start":2511,"end":2543},"introduced_by":20}],"inode":{"change":20,"pos":12}},"ins_contents":[{"Add":" packageId = \"rand 0.8.3\";"}],"del_contents":[{"Del":" packageId = \"rand\";\n"}]}},{"Edit":{"inode":{"change":20,"pos":12},"path":"Cargo.nix","line":2770,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":87495}],"down_context":[{"change":20,"pos":87495}],"flag":"BLOCK","start":111777,"end":111870,"inode":{"change":20,"pos":12}}},"contents":[{"Add":" name = \"twox-hash\";"},{"Add":" packageId = \"twox-hash\";"},{"Add":" }"},{"Add":" {"}]}},{"Edit":{"inode":{"change":20,"pos":12},"path":"Cargo.nix","line":3042,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":4090}],"down_context":[{"change":20,"pos":95019}],"flag":"BLOCK","start":111871,"end":112357,"inode":{"change":20,"pos":12}}},"contents":[{"Add":" };"},{"Add":" \"memoffset\" = rec {"},{"Add":" crateName = \"memoffset\";"},{"Add":" version = \"0.6.1\";"},{"Add":" edition = \"2015\";"},{"Add":" sha256 = \"11yxgw330cf8g4wy0fnb20ag8gg1b33fsnfmg2g8z6h5wc444yqm\";"},{"Add":" authors = ["},{"Add":" \"Gilad Naaman \""},{"Add":" ];"},{"Add":" buildDependencies = ["},{"Add":" {"},{"Add":" name = \"autocfg\";"},{"Add":" packageId = \"autocfg\";"},{"Add":" }"},{"Add":" ];"},{"Add":" features = {"},{"Add":" };"},{"Add":" resolvedDefaultFeatures = [ \"default\" ];"}]}},{"Replacement":{"inode":{"change":20,"pos":12},"path":"Cargo.nix","line":3753,"ins":{"up_context":[{"change":20,"pos":116677}],"down_context":[{"change":20,"pos":116709}],"flag":"BLOCK","start":112358,"end":112396,"inode":{"change":20,"pos":12}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":116677},"to":{"change":20,"start":2918,"end":2950},"introduced_by":20}],"inode":{"change":20,"pos":12}},"ins_contents":[{"Add":" packageId = \"rand 0.8.3\";"}],"del_contents":[{"Del":" packageId = \"rand\";\n"}]}},{"Replacement":{"inode":{"change":20,"pos":12},"path":"Cargo.nix","line":4073,"ins":{"up_context":[{"change":20,"pos":128398}],"down_context":[{"change":20,"pos":3618}],"flag":"BLOCK","start":112397,"end":114388,"inode":{"change":20,"pos":12}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":128398},"to":{"change":20,"start":3391,"end":3412},"introduced_by":20}],"inode":{"change":20,"pos":12}},"ins_contents":[{"Add":" \"rand 0.7.3\" = rec {"},{"Add":" crateName = \"rand\";"},{"Add":" version = \"0.7.3\";"},{"Add":" edition = \"2018\";"},{"Add":" sha256 = \"00sdaimkbz491qgi6qxkv582yivl32m2jd401kzbn94vsiwicsva\";"},{"Add":" authors = ["},{"Add":" \"The Rand Project Developers\""},{"Add":" \"The Rust Project Developers\""},{"Add":" ];"},{"Add":" dependencies = ["},{"Add":" {"},{"Add":" name = \"getrandom\";"},{"Add":" packageId = \"getrandom 0.1.16\";"},{"Add":" rename = \"getrandom_package\";"},{"Add":" optional = true;"},{"Add":" }"},{"Add":" {"},{"Add":" name = \"libc\";"},{"Add":" packageId = \"libc\";"},{"Add":" optional = true;"},{"Add":" usesDefaultFeatures = false;"},{"Add":" target = { target, features }: (target.\"unix\" or false);"},{"Add":" }"},{"Add":" {"},{"Add":" name = \"rand_chacha\";"},{"Add":" packageId = \"rand_chacha 0.2.2\";"},{"Add":" usesDefaultFeatures = false;"},{"Add":" target = { target, features }: (!(target.\"os\" == \"emscripten\"));"},{"Add":" }"},{"Add":" {"},{"Add":" name = \"rand_core\";"},{"Add":" packageId = \"rand_core 0.5.1\";"},{"Add":" }"},{"Add":" {"},{"Add":" name = \"rand_hc\";"},{"Add":" packageId = \"rand_hc 0.2.0\";"},{"Add":" target = { target, features }: (target.\"os\" == \"emscripten\");"},{"Add":" }"},{"Add":" ];"},{"Add":" devDependencies = ["},{"Add":" {"},{"Add":" name = \"rand_hc\";"},{"Add":" packageId = \"rand_hc 0.2.0\";"},{"Add":" }"},{"Add":" ];"},{"Add":" features = {"},{"Add":" \"alloc\" = [ \"rand_core/alloc\" ];"},{"Add":" \"default\" = [ \"std\" ];"},{"Add":" \"getrandom\" = [ \"getrandom_package\" \"rand_core/getrandom\" ];"},{"Add":" \"nightly\" = [ \"simd_support\" ];"},{"Add":" \"simd_support\" = [ \"packed_simd\" ];"},{"Add":" \"small_rng\" = [ \"rand_pcg\" ];"},{"Add":" \"std\" = [ \"rand_core/std\" \"rand_chacha/std\" \"alloc\" \"getrandom\" \"libc\" ];"},{"Add":" \"stdweb\" = [ \"getrandom_package/stdweb\" ];"},{"Add":" \"wasm-bindgen\" = [ \"getrandom_package/wasm-bindgen\" ];"},{"Add":" };"},{"Add":" resolvedDefaultFeatures = [ \"alloc\" \"default\" \"getrandom\" \"getrandom_package\" \"libc\" \"std\" ];"},{"Add":" };"},{"Add":" \"rand 0.8.3\" = rec {"}],"del_contents":[{"Del":" \"rand\" = rec {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":12},"path":"Cargo.nix","line":4150,"ins":{"up_context":[{"change":20,"pos":4165}],"down_context":[{"change":20,"pos":4210}],"flag":"BLOCK","start":114389,"end":114434,"inode":{"change":20,"pos":12}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":4165},"to":{"change":20,"start":3515,"end":3554},"introduced_by":20}],"inode":{"change":20,"pos":12}},"ins_contents":[{"Add":" packageId = \"rand_chacha 0.3.0\";"}],"del_contents":[{"Del":" packageId = \"rand_chacha\";\n"}]}},{"Replacement":{"inode":{"change":20,"pos":12},"path":"Cargo.nix","line":4161,"ins":{"up_context":[{"change":20,"pos":4510}],"down_context":[{"change":20,"pos":4551}],"flag":"BLOCK","start":114435,"end":114476,"inode":{"change":20,"pos":12}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":4510},"to":{"change":20,"start":3555,"end":3590},"introduced_by":20}],"inode":{"change":20,"pos":12}},"ins_contents":[{"Add":" packageId = \"rand_hc 0.3.0\";"}],"del_contents":[{"Del":" packageId = \"rand_hc\";\n"}]}},{"Replacement":{"inode":{"change":20,"pos":12},"path":"Cargo.nix","line":4169,"ins":{"up_context":[{"change":20,"pos":4747}],"down_context":[{"change":20,"pos":4788}],"flag":"BLOCK","start":114477,"end":114518,"inode":{"change":20,"pos":12}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":4747},"to":{"change":20,"start":3591,"end":3626},"introduced_by":20}],"inode":{"change":20,"pos":12}},"ins_contents":[{"Add":" packageId = \"rand_hc 0.3.0\";"}],"del_contents":[{"Del":" packageId = \"rand_hc\";\n"}]}},{"Replacement":{"inode":{"change":20,"pos":12},"path":"Cargo.nix","line":4183,"ins":{"up_context":[{"change":20,"pos":5320}],"down_context":[{"change":20,"pos":128426}],"flag":"BLOCK","start":114519,"end":114553,"inode":{"change":20,"pos":12}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":5320},"to":{"change":20,"start":3627,"end":3655},"introduced_by":20}],"inode":{"change":20,"pos":12}},"ins_contents":[{"Add":" \"rand_chacha 0.2.2\" = rec {"}],"del_contents":[{"Del":" \"rand_chacha\" = rec {\n"}]}},{"Edit":{"inode":{"change":20,"pos":12},"path":"Cargo.nix","line":4185,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":128461}],"down_context":[{"change":20,"pos":5468}],"flag":"BLOCK","start":114554,"end":115377,"inode":{"change":20,"pos":12}}},"contents":[{"Add":" version = \"0.2.2\";"},{"Add":" edition = \"2018\";"},{"Add":" sha256 = \"00il36fkdbsmpr99p9ksmmp6dn1md7rmnwmz0rr77jbrca2yvj7l\";"},{"Add":" authors = ["},{"Add":" \"The Rand Project Developers\""},{"Add":" \"The Rust Project Developers\""},{"Add":" \"The CryptoCorrosion Contributors\""},{"Add":" ];"},{"Add":" dependencies = ["},{"Add":" {"},{"Add":" name = \"ppv-lite86\";"},{"Add":" packageId = \"ppv-lite86\";"},{"Add":" usesDefaultFeatures = false;"},{"Add":" features = [ \"simd\" ];"},{"Add":" }"},{"Add":" {"},{"Add":" name = \"rand_core\";"},{"Add":" packageId = \"rand_core 0.5.1\";"},{"Add":" }"},{"Add":" ];"},{"Add":" features = {"},{"Add":" \"default\" = [ \"std\" \"simd\" ];"},{"Add":" \"std\" = [ \"ppv-lite86/std\" ];"},{"Add":" };"},{"Add":" resolvedDefaultFeatures = [ \"std\" ];"},{"Add":" };"},{"Add":" \"rand_chacha 0.3.0\" = rec {"},{"Add":" crateName = \"rand_chacha\";"}]}},{"Replacement":{"inode":{"change":20,"pos":12},"path":"Cargo.nix","line":4283,"ins":{"up_context":[{"change":20,"pos":129862}],"down_context":[{"change":20,"pos":129886}],"flag":"BLOCK","start":115378,"end":115811,"inode":{"change":20,"pos":12}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":129862},"to":{"change":20,"start":3656,"end":3680},"introduced_by":20}],"inode":{"change":20,"pos":12}},"ins_contents":[{"Add":" \"rand_hc 0.2.0\" = rec {"},{"Add":" crateName = \"rand_hc\";"},{"Add":" version = \"0.2.0\";"},{"Add":" edition = \"2018\";"},{"Add":" sha256 = \"0g31sqwpmsirdlwr0svnacr4dbqyz339im4ssl9738cjgfpjjcfa\";"},{"Add":" authors = ["},{"Add":" \"The Rand Project Developers\""},{"Add":" ];"},{"Add":" dependencies = ["},{"Add":" {"},{"Add":" name = \"rand_core\";"},{"Add":" packageId = \"rand_core 0.5.1\";"},{"Add":" }"},{"Add":" ];"},{"Add":""},{"Add":" };"},{"Add":" \"rand_hc 0.3.0\" = rec {"}],"del_contents":[{"Del":" \"rand_hc\" = rec {\n"}]}},{"Replacement":{"inode":{"change":20,"pos":12},"path":"Cargo.nix","line":4766,"ins":{"up_context":[{"change":20,"pos":144463}],"down_context":[{"change":20,"pos":144491}],"flag":"BLOCK","start":115812,"end":115839,"inode":{"change":20,"pos":12}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":144463},"to":{"change":18,"start":818,"end":845},"introduced_by":18}],"inode":{"change":20,"pos":12}},"ins_contents":[{"Add":" version = \"1.2.0\";"}],"del_contents":[{"Del":" version = \"1.1.7\";\n"}]}},{"Replacement":{"inode":{"change":20,"pos":12},"path":"Cargo.nix","line":4768,"ins":{"up_context":[{"change":20,"pos":144517}],"down_context":[{"change":20,"pos":144590}],"flag":"BLOCK","start":115840,"end":115933,"inode":{"change":20,"pos":12}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":144517},"to":{"change":18,"start":846,"end":919},"introduced_by":18}],"inode":{"change":20,"pos":12}},"ins_contents":[{"Add":" src = lib.cleanSourceWith { filter = sourceFilter; src = ../sanakirja/sanakirja; };"}],"del_contents":[{"Del":" sha256 = \"1v73b74y36jyqjab2qmycchbqkkg4flwybzwij2v7lazc77qfbgi\";\n"}]}},{"Replacement":{"inode":{"change":20,"pos":12},"path":"Cargo.nix","line":4820,"ins":{"up_context":[{"change":20,"pos":10521}],"down_context":[{"change":20,"pos":10548}],"flag":"BLOCK","start":115934,"end":115961,"inode":{"change":20,"pos":12}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":10521},"to":{"change":20,"start":343,"end":370},"introduced_by":20}],"inode":{"change":20,"pos":12}},"ins_contents":[{"Add":" version = \"1.2.3\";"}],"del_contents":[{"Del":" version = \"1.1.1\";\n"}]}},{"Replacement":{"inode":{"change":20,"pos":12},"path":"Cargo.nix","line":4823,"ins":{"up_context":[{"change":20,"pos":10597}],"down_context":[{"change":20,"pos":10670}],"flag":"BLOCK","start":115962,"end":116060,"inode":{"change":20,"pos":12}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":10597},"to":{"change":20,"start":371,"end":444},"introduced_by":20}],"inode":{"change":20,"pos":12}},"ins_contents":[{"Add":" src = lib.cleanSourceWith { filter = sourceFilter; src = ../sanakirja/sanakirja-core; };"}],"del_contents":[{"Del":" sha256 = \"1i0d8kidgfrhxnv6gwbad1dn783x5y8365ki081v8l0ljd0rv6hi\";\n"}]}},{"Edit":{"inode":{"change":20,"pos":12},"path":"Cargo.nix","line":5130,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":153908}],"down_context":[{"change":20,"pos":4260}],"flag":"BLOCK","start":116061,"end":116362,"inode":{"change":20,"pos":12}}},"contents":[{"Add":" \"static_assertions\" = rec {"},{"Add":" crateName = \"static_assertions\";"},{"Add":" version = \"1.1.0\";"},{"Add":" edition = \"2015\";"},{"Add":" sha256 = \"0gsl6xmw10gvn3zs1rv99laj5ig7ylffnh71f9l34js4nr4r7sx2\";"},{"Add":" authors = ["},{"Add":" \"Nikolai Vazquez\""},{"Add":" ];"},{"Add":" features = {"},{"Add":" };"},{"Add":" };"}]}},{"Replacement":{"inode":{"change":20,"pos":12},"path":"Cargo.nix","line":5251,"ins":{"up_context":[{"change":20,"pos":157717}],"down_context":[{"change":20,"pos":157749}],"flag":"BLOCK","start":116363,"end":116401,"inode":{"change":20,"pos":12}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":157717},"to":{"change":20,"start":6224,"end":6256},"introduced_by":20}],"inode":{"change":20,"pos":12}},"ins_contents":[{"Add":" packageId = \"rand 0.8.3\";"}],"del_contents":[{"Del":" packageId = \"rand\";\n"}]}},{"Replacement":{"inode":{"change":20,"pos":12},"path":"Cargo.nix","line":5509,"ins":{"up_context":[{"change":20,"pos":163485}],"down_context":[{"change":20,"pos":163513}],"flag":"BLOCK","start":116402,"end":116430,"inode":{"change":20,"pos":12}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":163485},"to":{"change":20,"start":877,"end":905},"introduced_by":20}],"inode":{"change":20,"pos":12}},"ins_contents":[{"Add":" version = \"0.20.3\";"}],"del_contents":[{"Del":" version = \"0.20.2\";\n"}]}},{"Replacement":{"inode":{"change":20,"pos":12},"path":"Cargo.nix","line":5511,"ins":{"up_context":[{"change":20,"pos":163539}],"down_context":[{"change":20,"pos":163612}],"flag":"BLOCK","start":116431,"end":116504,"inode":{"change":20,"pos":12}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":163539},"to":{"change":20,"start":906,"end":979},"introduced_by":20}],"inode":{"change":20,"pos":12}},"ins_contents":[{"Add":" sha256 = \"0582s732sdgns8dsgwpm52p26vrr8jwr14w7fmvmlzrjw8r4q89j\";"}],"del_contents":[{"Del":" sha256 = \"0mny64g0b22dj663lihwkzvyvdsc69c3wcqcpbaj020rmqhsqd9j\";\n"}]}},{"Edit":{"inode":{"change":20,"pos":12},"path":"Cargo.nix","line":5961,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":6823}],"down_context":[{"change":20,"pos":177881}],"flag":"BLOCK","start":116505,"end":117438,"inode":{"change":20,"pos":12}}},"contents":[{"Add":" };"},{"Add":" \"twox-hash\" = rec {"},{"Add":" crateName = \"twox-hash\";"},{"Add":" version = \"1.6.0\";"},{"Add":" edition = \"2018\";"},{"Add":" crateBin = [];"},{"Add":" sha256 = \"0ndb4pil758kn0av83jjgq8kkfkwc5lhi5ii7fk5yw96h1wapy04\";"},{"Add":" authors = ["},{"Add":" \"Jake Goulding \""},{"Add":" ];"},{"Add":" dependencies = ["},{"Add":" {"},{"Add":" name = \"cfg-if\";"},{"Add":" packageId = \"cfg-if 0.1.10\";"},{"Add":" usesDefaultFeatures = false;"},{"Add":" }"},{"Add":" {"},{"Add":" name = \"rand\";"},{"Add":" packageId = \"rand 0.7.3\";"},{"Add":" optional = true;"},{"Add":" }"},{"Add":" {"},{"Add":" name = \"static_assertions\";"},{"Add":" packageId = \"static_assertions\";"},{"Add":" usesDefaultFeatures = false;"},{"Add":" }"},{"Add":" ];"},{"Add":" features = {"},{"Add":" \"default\" = [ \"std\" ];"},{"Add":" \"serialize\" = [ \"serde\" ];"},{"Add":" \"std\" = [ \"rand\" ];"},{"Add":" };"},{"Add":" resolvedDefaultFeatures = [ \"default\" \"rand\" \"std\" ];"}]}},{"Edit":{"inode":{"change":20,"pos":1030385},"path":"Cargo.lock","line":257,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":1038874}],"down_context":[{"change":20,"pos":1038874}],"flag":"BLOCK","start":117439,"end":117674,"inode":{"change":20,"pos":1030385}}},"contents":[{"Add":"dependencies = ["},{"Add":" \"cfg-if 1.0.0\","},{"Add":"]"},{"Add":""},{"Add":"[[package]]"},{"Add":"name = \"crossbeam-deque\""},{"Add":"version = \"0.8.0\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9\""}]}},{"Edit":{"inode":{"change":20,"pos":1030385},"path":"Cargo.lock","line":268,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":1038908}],"down_context":[{"change":164,"pos":862}],"flag":"BLOCK","start":117675,"end":117715,"inode":{"change":20,"pos":1030385}}},"contents":[{"Add":" \"crossbeam-epoch\","},{"Add":" \"crossbeam-utils\","}]}},{"Edit":{"inode":{"change":20,"pos":1030385},"path":"Cargo.lock","line":273,"atom":{"NewVertex":{"up_context":[{"change":164,"pos":877}],"down_context":[{"change":164,"pos":877}],"flag":"BLOCK","start":117716,"end":118016,"inode":{"change":20,"pos":1030385}}},"contents":[{"Add":"name = \"crossbeam-epoch\""},{"Add":"version = \"0.9.3\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"2584f639eb95fea8c798496315b297cf81b9b58b6d30ab066a75455333cf4b12\""},{"Add":"dependencies = ["},{"Add":" \"cfg-if 1.0.0\","},{"Add":" \"crossbeam-utils\","},{"Add":" \"lazy_static\","},{"Add":" \"memoffset\","},{"Add":" \"scopeguard\","},{"Add":"]"},{"Add":""},{"Add":"[[package]]"}]}},{"Edit":{"inode":{"change":20,"pos":1030385},"path":"Cargo.lock","line":933,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":818}],"down_context":[{"change":20,"pos":818}],"flag":"BLOCK","start":118017,"end":118057,"inode":{"change":20,"pos":1030385}}},"contents":[{"Add":" \"crossbeam-deque\","},{"Add":" \"crossbeam-utils\","}]}},{"Replacement":{"inode":{"change":20,"pos":1030385},"path":"Cargo.lock","line":945,"ins":{"up_context":[{"change":20,"pos":1055747}],"down_context":[{"change":20,"pos":1055756}],"flag":"BLOCK","start":118058,"end":118073,"inode":{"change":20,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1055747},"to":{"change":20,"start":9113,"end":9122},"introduced_by":20}],"inode":{"change":20,"pos":1030385}},"ins_contents":[{"Add":" \"rand 0.8.3\","}],"del_contents":[{"Del":" \"rand\",\n"}]}},{"Edit":{"inode":{"change":20,"pos":1030385},"path":"Cargo.lock","line":955,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":1055861}],"down_context":[{"change":20,"pos":1055861}],"flag":"BLOCK","start":118074,"end":118088,"inode":{"change":20,"pos":1030385}}},"contents":[{"Add":" \"twox-hash\","}]}},{"Edit":{"inode":{"change":20,"pos":1030385},"path":"Cargo.lock","line":1049,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":1416}],"down_context":[{"change":20,"pos":1058161}],"flag":"BLOCK","start":118089,"end":118313,"inode":{"change":20,"pos":1030385}}},"contents":[{"Add":"]"},{"Add":""},{"Add":"[[package]]"},{"Add":"name = \"memoffset\""},{"Add":"version = \"0.6.1\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87\""},{"Add":"dependencies = ["},{"Add":" \"autocfg\","}]}},{"Replacement":{"inode":{"change":20,"pos":1030385},"path":"Cargo.lock","line":1305,"ins":{"up_context":[{"change":20,"pos":1067}],"down_context":[{"change":20,"pos":1064359}],"flag":"BLOCK","start":118314,"end":118329,"inode":{"change":20,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1067},"to":{"change":20,"start":9123,"end":9132},"introduced_by":20}],"inode":{"change":20,"pos":1030385}},"ins_contents":[{"Add":" \"rand 0.8.3\","}],"del_contents":[{"Del":" \"rand\",\n"}]}},{"Edit":{"inode":{"change":20,"pos":1030385},"path":"Cargo.lock","line":1434,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":1068089}],"down_context":[{"change":20,"pos":156089}],"flag":"BLOCK","start":118330,"end":118627,"inode":{"change":20,"pos":1030385}}},"contents":[{"Add":"version = \"0.7.3\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03\""},{"Add":"dependencies = ["},{"Add":" \"getrandom 0.1.16\","},{"Add":" \"libc\","},{"Add":" \"rand_chacha 0.2.2\","},{"Add":" \"rand_core 0.5.1\","},{"Add":" \"rand_hc 0.2.0\","},{"Add":"]"},{"Add":""},{"Add":"[[package]]"},{"Add":"name = \"rand\""}]}},{"Replacement":{"inode":{"change":20,"pos":1030385},"path":"Cargo.lock","line":1452,"ins":{"up_context":[{"change":20,"pos":1068290}],"down_context":[{"change":20,"pos":156187}],"flag":"BLOCK","start":118628,"end":118650,"inode":{"change":20,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1068290},"to":{"change":20,"start":9231,"end":9247},"introduced_by":20}],"inode":{"change":20,"pos":1030385}},"ins_contents":[{"Add":" \"rand_chacha 0.3.0\","}],"del_contents":[{"Del":" \"rand_chacha\",\n"}]}},{"Replacement":{"inode":{"change":20,"pos":1030385},"path":"Cargo.lock","line":1454,"ins":{"up_context":[{"change":20,"pos":156207}],"down_context":[{"change":20,"pos":1068332}],"flag":"BLOCK","start":118651,"end":118918,"inode":{"change":20,"pos":1030385}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":20,"pos":156207},"to":{"change":20,"start":9248,"end":9260},"introduced_by":20},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":4511},"to":{"change":20,"start":9248,"end":9260},"introduced_by":20}],"inode":{"change":20,"pos":1030385}},"ins_contents":[{"Add":" \"rand_hc 0.3.0\","},{"Add":"]"},{"Add":""},{"Add":"[[package]]"},{"Add":"name = \"rand_chacha\""},{"Add":"version = \"0.2.2\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402\""},{"Add":"dependencies = ["},{"Add":" \"ppv-lite86\","},{"Add":" \"rand_core 0.5.1\","}],"del_contents":[{"Del":" \"rand_hc\",\n"}]}},{"Edit":{"inode":{"change":20,"pos":1030385},"path":"Cargo.lock","line":1497,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":1428}],"down_context":[{"change":20,"pos":1428}],"flag":"BLOCK","start":118919,"end":119149,"inode":{"change":20,"pos":1030385}}},"contents":[{"Add":"version = \"0.2.0\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c\""},{"Add":"dependencies = ["},{"Add":" \"rand_core 0.5.1\","},{"Add":"]"},{"Add":""},{"Add":"[[package]]"},{"Add":"name = \"rand_hc\""}]}},{"Replacement":{"inode":{"change":20,"pos":1030385},"path":"Cargo.lock","line":1655,"ins":{"up_context":[{"change":20,"pos":1072132}],"down_context":[{"change":20,"pos":1072151}],"flag":"BLOCK","start":119150,"end":119168,"inode":{"change":20,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1072132},"to":{"change":18,"start":920,"end":938},"introduced_by":18}],"inode":{"change":20,"pos":1030385}},"ins_contents":[{"Add":"version = \"1.2.0\""}],"del_contents":[{"Del":"version = \"1.1.7\"\n"}]}},{"Replacement":{"inode":{"change":20,"pos":1030385},"path":"Cargo.lock","line":1657,"ins":{"up_context":[{"change":20,"pos":1072216}],"down_context":[{"change":20,"pos":1072294}],"flag":"BLOCK","start":119169,"end":119247,"inode":{"change":20,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1072216},"to":{"change":18,"start":939,"end":1017},"introduced_by":18}],"inode":{"change":20,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"d822992da34989ceda221b7cc3f99381da3130c8e90f393054b0ea4e80617265\""}],"del_contents":[{"Del":"checksum = \"f12d87cf615fd1b3858cfc2fcfa9236f4ebc2063be62b194c45e9ae1c959e3ec\"\n"}]}},{"Replacement":{"inode":{"change":20,"pos":1030385},"path":"Cargo.lock","line":1671,"ins":{"up_context":[{"change":20,"pos":157079}],"down_context":[{"change":20,"pos":157097}],"flag":"BLOCK","start":119248,"end":119266,"inode":{"change":20,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":157079},"to":{"change":20,"start":543,"end":561},"introduced_by":20}],"inode":{"change":20,"pos":1030385}},"ins_contents":[{"Add":"version = \"1.2.4\""}],"del_contents":[{"Del":"version = \"1.1.1\"\n"}]}},{"Replacement":{"inode":{"change":20,"pos":1030385},"path":"Cargo.lock","line":1673,"ins":{"up_context":[{"change":20,"pos":157162}],"down_context":[{"change":20,"pos":157240}],"flag":"BLOCK","start":119267,"end":119345,"inode":{"change":20,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":157162},"to":{"change":20,"start":562,"end":640},"introduced_by":20}],"inode":{"change":20,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"c15b6118bc265955b685bee694a1f04c70dfb65344411495d88e716a2cd74a3b\""}],"del_contents":[{"Del":"checksum = \"119a9d41931450b40302711633902f7da0635b686af167b6ed30bbd7e2440dc4\"\n"}]}},{"Edit":{"inode":{"change":20,"pos":1030385},"path":"Cargo.lock","line":1793,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":1075404}],"down_context":[{"change":20,"pos":1075404}],"flag":"BLOCK","start":119346,"end":119547,"inode":{"change":20,"pos":1030385}}},"contents":[{"Add":"name = \"static_assertions\""},{"Add":"version = \"1.1.0\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f\""},{"Add":""},{"Add":"[[package]]"}]}},{"Replacement":{"inode":{"change":20,"pos":1030385},"path":"Cargo.lock","line":1840,"ins":{"up_context":[{"change":20,"pos":1076514}],"down_context":[{"change":20,"pos":158160}],"flag":"BLOCK","start":119548,"end":119563,"inode":{"change":20,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1076514},"to":{"change":20,"start":9943,"end":9952},"introduced_by":20}],"inode":{"change":20,"pos":1030385}},"ins_contents":[{"Add":" \"rand 0.8.3\","}],"del_contents":[{"Del":" \"rand\",\n"}]}},{"Replacement":{"inode":{"change":20,"pos":1030385},"path":"Cargo.lock","line":1947,"ins":{"up_context":[{"change":20,"pos":1078612}],"down_context":[{"change":20,"pos":1078631}],"flag":"BLOCK","start":119564,"end":119583,"inode":{"change":20,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1078612},"to":{"change":20,"start":688,"end":707},"introduced_by":20}],"inode":{"change":20,"pos":1030385}},"ins_contents":[{"Add":"version = \"0.20.3\""}],"del_contents":[{"Del":"version = \"0.20.2\"\n"}]}},{"Replacement":{"inode":{"change":20,"pos":1030385},"path":"Cargo.lock","line":1949,"ins":{"up_context":[{"change":20,"pos":1078696}],"down_context":[{"change":20,"pos":1078774}],"flag":"BLOCK","start":119584,"end":119662,"inode":{"change":20,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":20,"pos":1078696},"to":{"change":20,"start":708,"end":786},"introduced_by":20}],"inode":{"change":20,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"32214c32e2327f5a7775879390b944396f23ae28f5f2a71bd2f6352dc6d10215\""}],"del_contents":[{"Del":"checksum = \"3235ac21ae190820d5ba0c333e58324cb7edf79f1c463a8c914d88051e31de56\"\n"}]}},{"Edit":{"inode":{"change":20,"pos":1030385},"path":"Cargo.lock","line":2103,"atom":{"NewVertex":{"up_context":[{"change":20,"pos":1082536}],"down_context":[{"change":20,"pos":1082536}],"flag":"BLOCK","start":119663,"end":119930,"inode":{"change":20,"pos":1030385}}},"contents":[{"Add":"name = \"twox-hash\""},{"Add":"version = \"1.6.0\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"04f8ab788026715fa63b31960869617cba39117e520eb415b0139543e325ab59\""},{"Add":"dependencies = ["},{"Add":" \"cfg-if 0.1.10\","},{"Add":" \"rand 0.7.3\","},{"Add":" \"static_assertions\","},{"Add":"]"},{"Add":""},{"Add":"[[package]]"}]}}],"owner":"irevoire","repo":"pijul","token":"3JLd0O9Kj2IIvlMVXmFh84CnpV9ud9NVys+ezskSqC8=","login":null}

…

Dependencies

Change contents